Merge pull request #11 from pnetwork-association/fix/output

Few improvements

hardhat.config.js

@@ -12,6 +12,7 @@ require('hardhat-storage-layout')
 require('@nomiclabs/hardhat-waffle')
 require('@nomiclabs/hardhat-etherscan')
 require('@openzeppelin/hardhat-upgrades')
+require('dotenv').config()
 
 const SUPPORTED_NETWORKS = [
   'rinkeby',

lib/get-router-state.js

@@ -4,6 +4,9 @@ const {
   curry,
   assoc,
   flatten,
+  toPairs,
+  fromPairs,
+  mergeAll,
 } = require('ramda')
 /* eslint-disable-next-line no-shadow */
 const ethers = require('ethers')
@@ -32,6 +35,7 @@ const VAULT_DICTIONARY = 'vaultDictionary'
 const TOKEN_INFOS_STATE_KEY = 'tokenInfos'
 const FEE_CONTRACT_STATE_KEY = 'feeContract'
 const ORIGIN_CHAIN_ID_FXN = 'ORIGIN_CHAIN_ID'
+const ORIGIN_CHAIN_STATE_KEY = 'originChain'
 const CHAIN_ID_NAMES = keys(metadataChainIds)
 const GLOBAL_MIN_FEE_STATE_KEY = 'globalMinFee'
 const SAFE_VAULT_ADDRESS_STATE_KEY = 'safeVault'
@@ -43,6 +47,7 @@ const VAULT_CONTRACTS_STATE_KEY = 'vaultContracts'
 const ROUTER_CONTRACT_STATE_KEY = 'routerContract'
 const TOKEN_ADDRESSES_STATE_KEY = 'tokenAddresses'
 const SAFE_VAULT_STATE_STATE_KEY = 'safeVaultState'
+const ORIGIN_CHAIN_ID_STATE_KEY = 'originChainId'
 const SUPPORTED_TOKENS_STATE_KEY = 'supportedTokens'
 const GET_SUPPORTED_TOKENS_FXN = 'getSupportedTokens'
 const CHAIN_MULTIPLIERS_STATE_KEY = 'chainMultipliers'
@@ -190,9 +195,9 @@ const getTokenDetailsFromContract = (_tokenContract, _maybeAddress = null) =>
         name: normalizeName(_name),
         address: _tokenContract.address,
         symbol: normalizeSymbol(_symbol),
-        originChainId: _originChainIdHex,
+        [ORIGIN_CHAIN_ID_STATE_KEY]: _originChainIdHex,
         totalSupply: _totalSupply.toString(),
-        originChain: getHumanReadableOriginChainIdFromHex(_originChainIdHex)
+        [ORIGIN_CHAIN_STATE_KEY]: getHumanReadableOriginChainIdFromHex(_originChainIdHex)
       }
 
       if (_maybeBalance === false)
@@ -315,6 +320,7 @@ const getAllTokenBalances = (_tokenInfos, _tokenContracts, _address) =>
               .divUnsafe(FixedNumber.fromString(`${1e18}`))
               .round(4)
           } ${_tokenInfos[_i].symbol}`,
+          actualAmount: _balance.toString(),
           address: _tokenInfos[_i].address,
         }
         return assoc(_tokenInfos[_i].symbol, balanceInfo, _obj)
@@ -331,12 +337,33 @@ const getSafeVaultTokenBalancesAndAddToState = _state =>
   )
     .then(_balances => assoc(SAFE_VAULT_CONTRACT_TOKEN_BALANCES_STATE_KEY, _balances, _state))
 
+// _keyValuePair is
+// ['pNAME', { balance: '...', approxAmount: '..', address: '..'} ]
+// Will get
+// ['pNAME', { balance: '...', approxAmount: '..', address: '..', originChainId: '..'} ]
+const attachOriginChainId = curry((_signer, _keyValuePair) =>
+  Promise.resolve(getErc777Contract(_signer, _keyValuePair[1].address))
+    .then(_contract => _contract.ORIGIN_CHAIN_ID())
+    .then(_originChainId => mergeAll([_keyValuePair[1], {
+      [ORIGIN_CHAIN_ID_STATE_KEY]: _originChainId,
+      [ORIGIN_CHAIN_STATE_KEY]: getHumanReadableOriginChainIdFromHex(_originChainId),
+    }]))
+    .then(_newObj => [_keyValuePair[0], _newObj])
+)
+
+const attachOriginChainIdToEachTokenBalance = curry((_signer, _balances) =>
+  Promise.resolve(toPairs(_balances))
+    .then(_pairs => Promise.all(_pairs.map(attachOriginChainId(_signer))))
+    .then(fromPairs)
+)
+
 const getNodeOperatorFeeSinkTokenBalancesAndAddToState = _state =>
   getAllTokenBalances(
     _state[TOKEN_INFOS_STATE_KEY],
     _state[TOKEN_CONTRACTS_STATE_KEY],
     _state[FEE_SINK_ADDRESSES_STATE_KEY].nodeOperatorsFeeSinkAddress
   )
+    .then(attachOriginChainIdToEachTokenBalance(_state[ROUTER_CONTRACT_STATE_KEY].signer))
     .then(_balances => assoc(NODE_OPERATORS_FEE_TOKEN_BALANCES_STATE_KEY, _balances, _state))
 
 const getNetworkFeeSinkTokenBalancesAndAddToState = _state =>
@@ -462,12 +489,12 @@ const getRouterState = _routerAddress =>
     .then(getSafeVaultContractOwnerAndAddToState)
     .then(getSafeVaultContractStateAndAddToState)
     .then(prepareOutputAndPutInState)
-    .then(_state => console.dir(_state[OUTPUT_STATE_KEY], { depth: null }))
+    .then(_state => console.info(JSON.stringify(_state[OUTPUT_STATE_KEY])))
     .catch(console.warn)
 
 const getSupportedTokens = _routerAddress =>
   getSupportedTokensList(_routerAddress)
-    .then(_state => console.dir(_state[TOKEN_INFOS_STATE_KEY], { depth: null }))
+    .then(_state => console.dir(JSON.stringify(_state[TOKEN_INFOS_STATE_KEY], { depth: null })))
     .catch(console.warn)
 
 module.exports = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ptokens-router-contract",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "The pTokens interim-chain router contract & CLI",
   "main": "cli.js",
   "scripts": {