From c8a565c88f58ea2f9b479130cd314fc7849069a0 Mon Sep 17 00:00:00 2001 From: Mauro Piazza Date: Wed, 3 Apr 2024 15:22:34 +0200 Subject: [PATCH] chore(get-router-state): add human readable chain id --- lib/get-router-state.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/get-router-state.js b/lib/get-router-state.js index 3f0b18c..d8477df 100644 --- a/lib/get-router-state.js +++ b/lib/get-router-state.js @@ -6,6 +6,7 @@ const { flatten, toPairs, fromPairs, + mergeAll, } = require('ramda') /* eslint-disable-next-line no-shadow */ const ethers = require('ethers') @@ -34,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' @@ -193,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) @@ -342,7 +344,10 @@ const getSafeVaultTokenBalancesAndAddToState = _state => 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(_originChainId => mergeAll([_keyValuePair[1], { + [ORIGIN_CHAIN_ID_STATE_KEY]: _originChainId, + [ORIGIN_CHAIN_STATE_KEY]: getHumanReadableOriginChainIdFromHex(_originChainId), + }])) .then(_newObj => [_keyValuePair[0], _newObj]) )