Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions libs/moloch-v3-data/src/vaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
14 changes: 7 additions & 7 deletions libs/tx-builder/src/utils/abi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ const getABIUrl = ({
}) => {
const ABI_ADDRESS = '<<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);
Expand Down
13 changes: 11 additions & 2 deletions libs/tx-builder/src/utils/deepDecoding.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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,
});
Expand Down
Loading