diff --git a/libs/moloch-v3-data/src/vaults.ts b/libs/moloch-v3-data/src/vaults.ts index 92f5eb65..8060e925 100644 --- a/libs/moloch-v3-data/src/vaults.ts +++ b/libs/moloch-v3-data/src/vaults.ts @@ -41,14 +41,10 @@ export const listTokenBalances = async ({ // metadataOptions: { verifiedOnly: true }, }); - console.log('tokenBalances', tokenBalances); - const balance = await indexer.getEtherBalance({ accountAddress: safeAddress, }); - console.log('balance', balance); - const transformedTokenBalances = tokenBalances.balances.map((tokenBal) => { return { token: { diff --git a/libs/tx-builder/src/utils/abi.ts b/libs/tx-builder/src/utils/abi.ts index b5725069..6b6e6ae0 100644 --- a/libs/tx-builder/src/utils/abi.ts +++ b/libs/tx-builder/src/utils/abi.ts @@ -46,13 +46,13 @@ const getABIUrl = ({ }) => { const ABI_ADDRESS = '<
>'; const TEMPORARY_ABI_EXPLORER: Keychain = { - '0x1': `https://api.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, - '0x64': `https://api.gnosisscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, - '0x89': `https://api.polygonscan.com/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, - '0xa': `https://api-optimistic.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, - '0xa4b1': `https://api.arbiscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apiKey=${explorerKeys[chainId]}`, - '0xaa36a7': `https://api-sepolia.etherscan.io/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys[chainId]}`, - '0x2105': `https://api.basescan.org/api?module=contract&action=getabi&address=${ABI_ADDRESS}&apiKey=${explorerKeys[chainId]}`, + '0x1': `https://api.etherscan.io/v2/api?chainid=1&module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys['0x1']}`, + '0x64': `https://api.etherscan.io/v2/api?chainid=100&module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys['0x1']}`, + '0x89': `https://api.etherscan.io/v2/api?chainid=137&module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys['0x1']}`, + '0xa': `https://api.etherscan.io/v2/api?chainid=10&module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys['0x1']}`, + '0xa4b1': `https://api.etherscan.io/v2/api?chainid=42161&module=contract&action=getabi&address=${ABI_ADDRESS}&apiKey=${explorerKeys['0x1']}`, + '0xaa36a7': `https://api.etherscan.io/v2/api?chainid=11155111&module=contract&action=getabi&address=${ABI_ADDRESS}&apikey=${explorerKeys['0x1']}`, + '0x2105': `https://api.etherscan.io/v2/api?chainid=8453&module=contract&action=getabi&address=${ABI_ADDRESS}&apiKey=${explorerKeys['0x1']}`, }; return TEMPORARY_ABI_EXPLORER[chainId]?.replace(ABI_ADDRESS, contractAddress); diff --git a/libs/tx-builder/src/utils/deepDecoding.ts b/libs/tx-builder/src/utils/deepDecoding.ts index 805afa97..e3fef416 100644 --- a/libs/tx-builder/src/utils/deepDecoding.ts +++ b/libs/tx-builder/src/utils/deepDecoding.ts @@ -1,16 +1,18 @@ import { + createPublicClient, decodeAbiParameters, decodeFunctionData, fromHex, getAbiItem, } from 'viem'; -import { ENCODED_0X0_DATA } from '@daohaus/utils'; +import { createTransport, ENCODED_0X0_DATA } from '@daohaus/utils'; import { ABI_EXPLORER_KEYS, HAUS_NETWORK_DATA, HAUS_RPC, Keychain, ValidNetwork, + VIEM_CHAINS, } from '@daohaus/keychain-utils'; import { MetaTransaction, OperationType, decodeMulti } from 'ethers-multisend'; @@ -434,8 +436,15 @@ const decodeAction = async ( }; } + const transport = createTransport({ chainId, rpcs }); + const client = createPublicClient({ + chain: VIEM_CHAINS[chainId], + transport, + }); + const { abi } = await whatsabi.autoload(to, { - provider: new providers.JsonRpcProvider(rpcs[chainId]), + // provider: new providers.JsonRpcProvider(rpcs[chainId]), + provider: client, followProxies: true, abiLoader: loader, });