Few improvements

lib/get-router-state.js

@@ -4,6 +4,8 @@
   curry,
   assoc,
   flatten,
+  toPairs,
+  fromPairs,
 } = require('ramda')
 /* eslint-disable-next-line no-shadow */
 const ethers = require('ethers')
@@ -16,8 +18,8 @@
 const { getDeployedRouterContract } = require('./get-deployed-contract')
 const { constants: { metadataChainIds, ZERO_ADDRESS } } = require('@pnetwork-association/ptokens-utils')
 
 // TODO Remove the need to decrypt a private key for this CLI command!
 // TODO Remove the need to decrypt the key twice due to getting the fee other contract!
 
 const INITIAL_STATE = {}
 const EMPTY_FXN_ARGS = []
@@ -43,6 +45,7 @@
 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'
@@ -221,7 +224,7 @@
 const getPNetworkAddressesFromVaultContracts = _vaultContracts =>
   Promise.all(_vaultContracts.map(getPNetworkAddressFromVaultContract))
 
 // FIXME flatten this out too!
 const getVaultInfo = (_vaultNetworks, _vaultContracts) =>
   Promise.all([
     getSupportedTokensFromVaultContracts(_vaultContracts),
@@ -315,6 +318,7 @@
               .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 +335,30 @@
   )
     .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 => assoc(ORIGIN_CHAIN_ID_STATE_KEY, _originChainId, _keyValuePair[1]))
+    .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 +484,12 @@
     .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 = {