@instadapp/avocado-base 0.0.0-dev.a1a59bd → 0.0.0-dev.a24334b

package/utils/metadata.ts

@@ -1,11 +1,29 @@
 import { ethers, utils } from "ethers";
 import { Forwarder__factory } from "../contracts";
 
+  export const MetadataEnums = {
+    "transfer": "transfer",
+    "bridge": "bridge",
+    "swap": "swap",
+    "gas-topup": "gas-topup",
+    "upgrade": "upgrade",
+    "dapp": "dapp",
+    "deploy": "deploy",
+    "permit2": "permit2",
+    "cross-transfer": "cross-transfer",
+    "auth": "auth",
+    "rejection": "rejection",
+    "instadapp-pro": "instadapp-pro",
+    "add-signers": "add-signers",
+    "remove-signers": "remove-signers",
+    "change-threshold": "change-threshold",
+  } as const;
+
 const multiMetadataTypes = ["bytes[]"];
 
 const metadataTypes = ["bytes32 type", "uint8 version", "bytes data"];
 
-const actionMetadataTypes = {
+const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   transfer: ["address token", "uint256 amount", "address receiver"],
   "cross-transfer": [
     "address fromToken",
@@ -43,7 +61,10 @@ const actionMetadataTypes = {
     "uint48 expiration",
   ],
   "instadapp-pro": ["string castDetails"],
-  reject: ["string reason"],
+  'add-signers': ['address[] signers'],
+  'remove-signers': ['address[] signers'],
+  'change-threshold': ['uint8 count'],
+  'rejection': ['bytes32 id'],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -64,7 +85,7 @@ export const encodeDappMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "dapp",
+    type: MetadataEnums.dapp,
     encodedData,
   });
 
@@ -81,21 +102,21 @@ export const encodeTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "transfer",
+    type: MetadataEnums.transfer,
     encodedData,
   });
 
   return single ? encodeMultipleActions(data) : data;
 };
 
-export const encodeRejectMetadata = (reason: string, single = true) => {
+export const encodeRejectionMetadata = (id: string, single = true) => {
   const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes.reject,
-    [reason]
+    actionMetadataTypes.rejection,
+    [id]
   );
 
   const data = encodeMetadata({
-    type: "reject",
+    type: MetadataEnums.rejection,
     encodedData,
   });
 
@@ -118,7 +139,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "cross-transfer",
+    type: MetadataEnums["cross-transfer"],
     encodedData,
   });
 
@@ -135,7 +156,7 @@ export const encodeAuthMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "auth",
+    type: MetadataEnums.auth,
     encodedData,
   });
 
@@ -144,7 +165,7 @@ export const encodeAuthMetadata = (
 
 export const encodeDeployMetadata = (single = true) => {
   const data = encodeMetadata({
-    type: "deploy",
+    type: MetadataEnums.deploy,
     encodedData: "0x",
   });
 
@@ -161,7 +182,7 @@ export const encodeWCSignMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "permit2",
+    type: MetadataEnums.permit2,
     encodedData,
   });
 
@@ -178,7 +199,7 @@ export const encodeUpgradeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "upgrade",
+    type: MetadataEnums.upgrade,
     encodedData,
   });
 
@@ -202,7 +223,7 @@ export const encodeSwapMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "swap",
+    type: MetadataEnums.swap,
     encodedData,
   });
 
@@ -218,10 +239,8 @@ export const encodeTopupMetadata = (
     [params.amount, params.token, params.onBehalf]
   );
 
-  console.log(params);
-
   const data = encodeMetadata({
-    type: "gas-topup",
+    type: MetadataEnums["gas-topup"],
     encodedData,
   });
 
@@ -246,7 +265,58 @@ export const encodeBridgeMetadata = (
   );
 
   const data = encodeMetadata({
-    type: "bridge",
+    type: MetadataEnums.bridge,
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeChangeThresholdMetadata = (
+  threshold: string | number,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["change-threshold"],
+    [toBN(threshold).toNumber()]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["change-threshold"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeRemoveSignersMetadata = (
+  addresses: string[],
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["remove-signers"],
+    [addresses]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["remove-signers"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeAddSignersMetadata = (
+  addresses: string[],
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["add-signers"],
+    [addresses]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["add-signers"],
     encodedData,
   });
 
@@ -325,9 +395,96 @@ const getMetadataFromData = (data: string) => {
   return metadata;
 };
 
+
+const typesPayload: IPayload = {
+  transfer: (data, type) => ({
+    type,
+    token: data.token,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+  }),
+  bridge: (data, type) => ({
+    type,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+    toToken: data.toToken,
+    fromToken: data.fromToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    bridgeFee: toBN(data.bridgeFee).toFixed(),
+  }),
+  swap: (data, type) => ({
+    type,
+    buyAmount: toBN(data.buyAmount).toFixed(),
+    sellAmount: toBN(data.sellAmount).toFixed(),
+    buyToken: data.buyToken,
+    sellToken: data.sellToken,
+    receiver: data.receiver,
+    protocol: utils.parseBytes32String(data.protocol || ""),
+  }),
+  upgrade: (data, type) => ({
+    type,
+    version: utils.parseBytes32String(data.version || ""),
+    walletImpl: data.walletImpl,
+  }),
+  "gas-topup": (data, type) => ({
+    type,
+    amount: toBN(data.amount).toFixed(),
+    token: data.token,
+    onBehalf: data.onBehalf,
+  }),
+  "dapp": (data, type) => ({
+    type,
+    name: data.name,
+    url: data.url,
+  }),
+  "deploy": (data, type) => ({
+    type,
+  }),
+  "permit2": (data, type) => ({
+    type,
+    token: data.token,
+    spender: data.spender,
+    amount: toBN(data.amount).toFixed(),
+    expiration: data.expiration,
+  }),
+  "cross-transfer": (data, type) => ({
+    type,
+    fromToken: data.fromToken,
+    toToken: data.toToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+  }),
+  "auth": (data) => ({
+    type: data.remove ? "remove-authority" : "add-authority",
+    address: data.address,
+    chainId: data.chainId ? data.chainId.toString() : null,
+    remove: data.remove,
+  }),
+  "instadapp-pro": (data, type) => ({
+    type,
+    castDetails: data.castDetails,
+  }),
+  "rejection": (data, type) => ({
+    type,
+    id: data.id,
+  }),
+  "add-signers": (data, type) => ({
+    type,
+    addresses: data.signers,
+  }),
+  "remove-signers": (data, type) => ({
+    type,
+    addresses: data.signers,
+  }),
+  "change-threshold": (data, type) => ({
+    type,
+    count: data.count,
+  }),
+};
+
 const parseMetadata = (metadata: string) => {
   const metadataArr = [];
-  let payload = {};
 
   const [decodedMultiMetadata = []] =
     (ethers.utils.defaultAbiCoder.decode(
@@ -350,121 +507,20 @@ const parseMetadata = (metadata: string) => {
       decodedMetadata.data
     );
 
-    switch (type) {
-      case "transfer":
-        payload = {
-          type,
-          token: decodedData.token,
-          amount: toBN(decodedData.amount).toFixed(),
-          receiver: decodedData.receiver,
-        };
-        break;
-      case "bridge":
-        payload = {
-          type,
-          amount: toBN(decodedData.amount).toFixed(),
-          receiver: decodedData.receiver,
-          toToken: decodedData.toToken,
-          fromToken: decodedData.fromToken,
-          toChainId: decodedData.toChainId
-            ? decodedData.toChainId.toString()
-            : null,
-          bridgeFee: toBN(decodedData.bridgeFee).toFixed(),
-        };
-        break;
-      case "swap":
-        payload = {
-          type,
-          buyAmount: toBN(decodedData.buyAmount).toFixed(),
-          sellAmount: toBN(decodedData.sellAmount).toFixed(),
-          buyToken: decodedData.buyToken,
-          sellToken: decodedData.sellToken,
-          receiver: decodedData.receiver,
-          protocol: utils.parseBytes32String(decodedData?.protocol || ""),
-        };
-        break;
-      case "upgrade":
-        payload = {
-          type,
-          version: utils.parseBytes32String(decodedData?.version || ""),
-          walletImpl: decodedData?.walletImpl,
-        };
-        break;
-      case "gas-topup":
-        payload = {
-          type,
-          amount: toBN(decodedData.amount).toFixed(),
-          token: decodedData.token,
-          onBehalf: decodedData.onBehalf,
-        };
-        break;
-      case "dapp":
-        payload = {
-          type,
-          name: decodedData?.name,
-          url: decodedData?.url,
-        };
-        break;
-      case "deploy":
-        payload = {
-          type,
-        };
-        break;
-
-      case "permit2":
-        payload = {
-          type,
-          token: decodedData.token,
-          spender: decodedData.spender,
-          amount: toBN(decodedData.amount).toFixed(),
-          expiration: decodedData.expiration,
-        };
-        break;
-
-      case "cross-transfer":
-        payload = {
-          type,
-          fromToken: decodedData.fromToken,
-          toToken: decodedData.toToken,
-          toChainId: decodedData.toChainId
-            ? decodedData.toChainId.toString()
-            : null,
-          amount: toBN(decodedData.amount).toFixed(),
-          receiver: decodedData.receiver,
-        };
-
-        break;
-      case "auth":
-        payload = {
-          type: decodedData.remove ? "remove-authority" : "add-authority",
-          address: decodedData.address,
-          chainId: decodedData.chainId ? decodedData.chainId.toString() : null,
-          remove: decodedData.remove,
-        };
-
-        break;
-      case "instadapp-pro":
-        payload = {
-          type,
-          castDetails: decodedData.castDetails,
-        };
-
-        break;
-
-      case "reject":
-        payload = {
-          type,
-          reason: decodedData.reason,
-        };
-        break;
+    const payloadFunc = typesPayload[type]
+    
+    if (payloadFunc) {
+      const payload = payloadFunc(decodedData, type)
+      metadataArr.push(payload);
     }
 
-    metadataArr.push(payload);
   }
 
   return metadataArr;
 };
 
+
+
 /**
  * Replaces hyphens with spaces and capitalizes the first letter of each word in a sentence.
  * @param {string} txType - The input sentence to modify

package/utils/network.ts

@@ -1,30 +1,18 @@
 import { ethers } from "ethers";
+import {
+  AVO_PROD_CHAIN_NAME,
+  AVO_PROD_CHAIN_ID,
+  AVO_PROD_RPC_URL,
+  AVO_PROD_EXPLORER_URL,
+  AVO_STAGING_CHAIN_NAME,
+  AVO_STAGING_CHAIN_ID,
+  AVO_STAGING_RPC_URL,
+  AVO_STAGING_EXPLORER_URL,
+} from './avocado'
 
 export const bridgeDisabledNetworks = [1101];
 
 export const networks: Network[] = [
-  {
-    name: "Ethereum",
-    debankName: "eth",
-    ankrName: "eth",
-    zerionName: "ethereum",
-    chainId: 1,
-    explorerUrl: "https://etherscan.io",
-    color: "#5D5FEF",
-    get serverRpcUrl() {
-      return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
-    },
-    balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
-    usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-    params: {
-      rpcUrls: ["https://rpc.ankr.com/eth"],
-      nativeCurrency: {
-        name: "Ethereum",
-        symbol: "ETH",
-        decimals: 18,
-      },
-    },
-  },
   {
     name: "Polygon",
     debankName: "matic",
@@ -71,6 +59,48 @@ export const networks: Network[] = [
       rpcUrls: ["https://arb1.arbitrum.io/rpc"],
     },
   },
+  {
+    name: "Ethereum",
+    debankName: "eth",
+    ankrName: "eth",
+    zerionName: "ethereum",
+    chainId: 1,
+    explorerUrl: "https://etherscan.io",
+    color: "#5D5FEF",
+    get serverRpcUrl() {
+      return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
+    },
+    balanceResolverAddress: "0x5b7D61b389D12e1f5873d0cCEe7E675915AB5F43",
+    usdcAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+    params: {
+      rpcUrls: ["https://rpc.ankr.com/eth"],
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      },
+    },
+  }, 
+  {
+    name: 'Base',
+    chainId: 8453,
+    color: '#1E2024',
+    explorerUrl: 'https://basescan.org',
+    get serverRpcUrl() {
+      return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
+     },
+     usdcAddress: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
+     balanceResolverAddress: '0x23c8EAb8a4373dD16b0947Ebe8bf76Ff7A49d13C',
+     params: {
+      rpcUrls: ['https://rpc.ankr.com/base'],
+      chainName: "Base",
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      },
+    }
+  },
   {
     name: "Optimism",
     debankName: "op",
@@ -95,26 +125,23 @@ export const networks: Network[] = [
     },
   },
   {
-    name: "Avalanche",
-    debankName: "avax",
-    ankrName: "avalanche",
-    zerionName: "avalanche",
-    color: "#EB5757",
-    chainId: 43114,
-    usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
-    balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
-    explorerUrl: "https://snowtrace.io",
+    name: "Polygon zkEVM",
+    chainId: 1101,
+    color: "#8544f6",
+    explorerUrl: "https://zkevm.polygonscan.com",
+    balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
+    usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
     get serverRpcUrl() {
-      return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
+      return process.env?.POLYGON_ZKEVM_RPC_URL || this.params.rpcUrls[0];
     },
     params: {
-      chainName: "Avalanche Network",
+      chainName: "polygon zkEVM",
+      rpcUrls: ["https://zkevm-rpc.com"],
       nativeCurrency: {
-        name: "Avalanche",
-        symbol: "AVAX",
+        name: "Ethereum",
+        symbol: "ETH",
         decimals: 18,
       },
-      rpcUrls: ["https://rpc.ankr.com/avalanche"],
     },
   },
   {
@@ -140,6 +167,51 @@ export const networks: Network[] = [
       },
     },
   },
+  {
+    name: "Avalanche",
+    debankName: "avax",
+    ankrName: "avalanche",
+    zerionName: "avalanche",
+    color: "#EB5757",
+    chainId: 43114,
+    usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
+    balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
+    explorerUrl: "https://snowtrace.io",
+    get serverRpcUrl() {
+      return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
+    },
+    params: {
+      chainName: "Avalanche Network",
+      nativeCurrency: {
+        name: "Avalanche",
+        symbol: "AVAX",
+        decimals: 18,
+      },
+      rpcUrls: ["https://rpc.ankr.com/avalanche"],
+    },
+  },
+  {
+    name: "Fantom",
+    chainId: 250,
+    zerionName: "fantom",
+    explorerUrl: "https://ftmscan.com",
+    ankrName: "fantom",
+    color: "#1969ff",
+    get serverRpcUrl() {
+      return process.env?.FANTOM_RPC_URL || this.params.rpcUrls[0];
+    },
+    usdcAddress: "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
+    balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
+    params: {
+      rpcUrls: ["https://rpc.ankr.com/fantom"],
+      chainName: "Fantom",
+      nativeCurrency: {
+        name: "Fantom",
+        symbol: "FTM",
+        decimals: 18,
+      },
+    },
+  },
   {
     name: "Gnosis",
     debankName: "xdai",
@@ -162,27 +234,6 @@ export const networks: Network[] = [
       },
     },
   },
-  {
-    name: "Polygon zkEVM",
-    chainId: 1101,
-    color: "#8544f6",
-    explorerUrl: "https://zkevm.polygonscan.com",
-    balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
-    usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
-    get serverRpcUrl() {
-      return process.env?.POLYGON_ZKEVM_RPC_URL || this.params.rpcUrls[0];
-    },
-    params: {
-      chainName: "polygon zkEVM",
-      rpcUrls: ["https://zkevm-rpc.com"],
-
-      nativeCurrency: {
-        name: "Ethereum",
-        symbol: "ETH",
-        decimals: 18,
-      },
-    },
-  },
   {
     name: "Aurora",
     chainId: 1313161554,
@@ -204,28 +255,6 @@ export const networks: Network[] = [
       },
     },
   },
-  {
-    name: "Fantom",
-    chainId: 250,
-    zerionName: "fantom",
-    explorerUrl: "https://ftmscan.com",
-    ankrName: "fantom",
-    color: "#1969ff",
-    get serverRpcUrl() {
-      return process.env?.FANTOM_RPC_URL || this.params.rpcUrls[0];
-    },
-    usdcAddress: "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
-    balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
-    params: {
-      rpcUrls: ["https://rpc.ankr.com/fantom"],
-      chainName: "Fantom",
-      nativeCurrency: {
-        name: "Fantom",
-        symbol: "FTM",
-        decimals: 18,
-      },
-    },
-  },
   {
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
@@ -268,6 +297,22 @@ export const networks: Network[] = [
   },
 ];
 
+export const chainUsdcAddresses = [
+  { chainId: 1, address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' },
+  { chainId: 10, address: '0x7f5c764cbc14f9669b88837ca1490cca17c31607' },
+  { chainId: 56, address: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d' },
+  { chainId: 100, address: '0xddafbb505ad214d7b80b1f830fccc89b60fb7a83' },
+  { chainId: 137, address: '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174' },
+  { chainId: 250, address: '0x04068da6c83afcfa0e13ba15a6696662335d5b75' },
+  { chainId: 42161, address: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8' },
+  { chainId: 42161, address: '0xaf88d065e77c8cc2239327c5edb3a432268e5831' },
+  { chainId: 43114, address: '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e' },
+  { chainId: 43114, address: '0xa7d7079b0fead91f3e65f86e8915cb59c1a4c664' },
+  { chainId: 1101, address: '0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035' },
+  { chainId: 1313161554, address: '0xB12BFcA5A55806AaF64E99521918A4bf0fC40802' },
+  { chainId: 8453, address: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA'}
+];
+
 export const getNetworkByChainId = (
   chainId: ChainId | number | string
 ): Network => {

package/utils/services.ts

@@ -1,8 +1,15 @@
 export const fetchTokenByAddress = async (
   address: string,
-  chainId: string | number
+  chainId: string | number,
+  tokens?: ITokenPrice[]
 ) => {
   if (!address || !chainId) return null;
+
+  if (tokens?.length) {
+    const token = tokens.find((token) => token.address?.toLocaleLowerCase() === address?.toLocaleLowerCase() && token.chain_id == chainId);
+    if (token) return token;
+  }
+
   const [token] = (await $fetch(`${blockQueryURL}/${chainId}/tokens`, {
     params: {
       sparkline: false,