@instadapp/avocado-base 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",

package/utils/metadata.ts

@@ -13,6 +13,7 @@ export const MetadataEnums = {
   deploy: "deploy",
   permit2: "permit2",
   "cross-transfer": "cross-transfer",
+  'cross-transfer-v2': 'cross-transfer-v2',
   auth: "auth",
   rejection: "rejection",
   "instadapp-pro": "instadapp-pro",
@@ -38,6 +39,14 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
     "uint256 amount",
     "address receiver",
   ],
+  "cross-transfer-v2": [
+    "address fromToken",
+    "address toToken",
+    "uint256 toChainId",
+    "uint256 amount",
+    "address receiver",
+    "bytes32 provider",
+  ],
   bridge: [
     "uint256 amount",
     "address receiver",
@@ -165,8 +174,21 @@ export const encodeCrossTransferMetadata = (
   params: CrossSendMetadataProps,
   single = true
 ) => {
-  const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes["cross-transfer"],
+
+  const type = params.provider ? MetadataEnums["cross-transfer-v2"] : MetadataEnums["cross-transfer"]
+
+  const encodedData = params.provider ? ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes[type],
+    [
+      params.fromToken,
+      params.toToken,
+      params.toChainId,
+      params.amount,
+      params.receiver,
+      params.provider
+    ]
+  ) : ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes[type],
     [
       params.fromToken,
       params.toToken,
@@ -177,7 +199,7 @@ export const encodeCrossTransferMetadata = (
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums["cross-transfer"],
+    type: MetadataEnums[type],
     encodedData,
   });
 
@@ -571,6 +593,15 @@ const typesPayload: IPayload = {
     amount: toBN(data.amount).toFixed(),
     receiver: data.receiver,
   }),
+  "cross-transfer-v2": (data, type) => ({
+    type: 'cross-transfer',
+    fromToken: data.fromToken,
+    toToken: data.toToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+    provider: utils.parseBytes32String(data.provider || ""),
+  }),
   auth: (data) => ({
     type: data.remove ? "remove-authority" : "add-authority",
     address: data.address,

package/utils/network.ts

@@ -77,7 +77,7 @@ export const networks: Network[] = [
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
     explorerUrl: "https://polygonscan.com",
-    apiURL: "https://api.polygonscan.com",
+    apiURL: "https://api.polygonscan.com/api",
     fakeTransactionHash:
       "0x906c551abd5873a428505b6530ac14d91367820706c7ee525f6d7313265d1c92",
     get serverRpcUrl() {
@@ -106,7 +106,7 @@ export const networks: Network[] = [
     fakeTransactionHash:
       "0x9fa291c3b09d31f19b1fa5dd05f30169d1364036d5f7c14b026410bc07bd8843",
     explorerUrl: "https://arbiscan.io",
-    apiURL: "https://api.arbiscan.io",
+    apiURL: "https://api.arbiscan.io/api",
     get serverRpcUrl() {
       return process.env?.ARBITRUM_RPC_URL || this.params.rpcUrls[0];
     },
@@ -130,7 +130,7 @@ export const networks: Network[] = [
     explorerUrl: "https://etherscan.io",
     fakeTransactionHash:
       "0x13232dd32cef2f641ead890a507710c96560c8c9c3d5fab6facb5ec563c49433",
-    apiURL: "https://api.etherscan.io",
+    apiURL: "https://api.etherscan.io/api",
     color: "#5D5FEF",
     get serverRpcUrl() {
       return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
@@ -155,7 +155,7 @@ export const networks: Network[] = [
     explorerUrl: "https://basescan.org",
     fakeTransactionHash:
       "0xf7833d80da33730c4fc5d4c64151f0eaa64c0c0535be022af0228a44cc4e9c8e",
-    apiURL: "https://api.basescan.org",
+    apiURL: "https://api.basescan.org/api",
     get serverRpcUrl() {
       return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
     },
@@ -179,7 +179,7 @@ export const networks: Network[] = [
     color: "#FF0420",
     viemChain: optimism,
     chainId: 10,
-    apiURL: "https://api-optimistic.etherscan.io",
+    apiURL: "https://api-optimistic.etherscan.io/api",
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
     fakeTransactionHash:
@@ -205,7 +205,7 @@ export const networks: Network[] = [
     ankrName: "polygon_zkevm",
     viemChain: polygonZkEvm,
     explorerUrl: "https://zkevm.polygonscan.com",
-    apiURL: "https://api-zkevm.polygonscan.com",
+    apiURL: "https://api-zkevm.polygonscan.com/api",
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
     fakeTransactionHash:
       "0x1077130463ade91ad4e9c43c3195298e26a99970975238128912490eea12bf41",
@@ -234,7 +234,7 @@ export const networks: Network[] = [
     viemChain: bsc,
     fakeTransactionHash:
       "0x897d54bf8e492f840bd4d8f1e743bfcab8226ab4d5a899e47ee433dcd6d6abf7",
-    apiURL: "https://api.bscscan.com",
+    apiURL: "https://api.bscscan.com/api",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
     balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
     get serverRpcUrl() {
@@ -263,7 +263,7 @@ export const networks: Network[] = [
     explorerUrl: "https://snowtrace.io",
     fakeTransactionHash:
       "0x233aac7402558dd4e23f938a50f983e67f5c9604233981c7ac74e63737b8294e",
-    apiURL: "https://api.snowtrace.io",
+    apiURL: "https://api.routescan.io/v2/network/mainnet/evm/43114/etherscan/api",
     get serverRpcUrl() {
       return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
     },
@@ -282,6 +282,7 @@ export const networks: Network[] = [
     chainId: 250,
     zerionName: "fantom",
     explorerUrl: "https://ftmscan.com",
+    apiURL: 'https://api.ftmscan.com/api',
     ankrName: "fantom",
     color: "#1969ff",
     viemChain: fantom,
@@ -314,7 +315,7 @@ export const networks: Network[] = [
     explorerUrl: "https://gnosisscan.io",
     fakeTransactionHash:
       "0x1513033806310a2c3b29f2276f8aa7388461b0ef9f8499c297e68c12187c179b",
-    apiURL: "https://api.gnosisscan.io",
+    apiURL: "https://api.gnosisscan.io/api",
     usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
     get serverRpcUrl() {
       return process.env?.GNOSIS_RPC_URL || this.params.rpcUrls[0];
@@ -336,6 +337,7 @@ export const networks: Network[] = [
     color: "#78d64b",
     viemChain: aurora,
     explorerUrl: "https://explorer.mainnet.aurora.dev",
+    apiURL:'https://explorer.mainnet.aurora.dev/api/v2',
     fakeTransactionHash:
       "0x0923401c5a80c39a5cd57c098a6c4729edbefd0db6894def7d349493f4ff3ec6",
     get serverRpcUrl() {
@@ -359,6 +361,7 @@ export const networks: Network[] = [
     zerionName: "fuse",
     color: "#78d64b",
     explorerUrl: "https://explorer.fuse.io",
+    apiURL: 'https://explorer.fuse.io/api/v2',
     viemChain: fuse,
     fakeTransactionHash:
       "0xf22a8031de9b978a57c728e18c6b54633356c39db4d0466e53b9b7c3ee7f8def",
@@ -383,6 +386,7 @@ export const networks: Network[] = [
     color: "#78d64b",
     ankrName: 'scroll',
     explorerUrl: "https://scrollscan.com",
+    apiURL: 'https://api.scrollscan.com/api',
     viemChain: scroll,
     fakeTransactionHash:
       "0x6bf297c414264fc8cddd47224632b4426a02138df2f50fe891eca87f6aefea01",
@@ -404,6 +408,7 @@ export const networks: Network[] = [
     chainId: 204,
     color: "#78d64b",
     explorerUrl: "https://opbnbscan.com",
+    apiURL: null,
     viemChain: opBNB,
     fakeTransactionHash:
       "0xb9438a3eae61442bc7d419d79930370ce09ac0f46e0695025751e3bfe1a931e7",
@@ -426,6 +431,7 @@ export const networks: Network[] = [
     color: "#d7ff00",
     explorerUrl: 'https://explorer.mode.network',
     fakeTransactionHash: '0xb58002db3481f2c51855a91280ec940d0bebec075c4b362b9f90c21a2b14edbe',
+    apiURL: 'https://explorer.mode.network/api/v2',
     params: {
       rpcUrls: ["https://1rpc.io/mode"],
       chainName: "Mode",
@@ -445,6 +451,7 @@ export const networks: Network[] = [
     name: "Blast",
     color: "#78d64b",
     explorerUrl: 'https://blastscan.io',
+    apiURL:'https://api.blastscan.io/api',
     fakeTransactionHash: '0x934ed8516242f8c08bb9e0e90bb1f989d92ceb6b0333e86ac2d555f25ac27e58',
     params: {
       rpcUrls: ['https://rpc.ankr.com/blast'],
@@ -482,6 +489,7 @@ export const networks: Network[] = [
   {
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
+    apiURL:null,
     isAvocado: true,
     balanceResolverAddress: "",
     fakeTransactionHash: "",
@@ -503,6 +511,7 @@ export const networks: Network[] = [
   },
   {
     name: AVO_STAGING_CHAIN_NAME,
+    apiURL: null,
     chainId: AVO_STAGING_CHAIN_ID,
     serverRpcUrl: AVO_STAGING_RPC_URL,
     color: "#16A34A",

package/utils/utils.d.ts

@@ -44,7 +44,8 @@ declare global {
     explorerUrl: string;
     fakeTransactionHash: string;
     viemChain: Chain;
-    apiURL?: string;
+    // must start with https://
+    apiURL: `https://${string}` | null;
     params: {
       chainName?: string;
       iconUrls?: string[];
@@ -81,8 +82,10 @@ declare global {
     toChainId: string;
     amount: string;
     receiver: string;
+    provider?: string;
   };
 
+
   type AuthMetadataProps = {
     address: string;
     chainId: string;