@instadapp/avocado-base 0.0.71 → 0.0.74

package/assets/images/icons/hammer.svg

@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none"
+    xmlns="http://www.w3.org/2000/svg">
+    <path d="M16.0678 8.64793L17.2102 9.79039C17.4404 10.0205 17.4334 10.4006 17.1947 10.6393L14.169 13.6651C13.9302 13.9038 13.5501 13.9108 13.32 13.6806L12.0532 12.4139C11.8231 12.1837 11.83 11.8036 12.0687 11.5649C12.6078 11.0259 12.9103 10.7041 12.4882 9.98816C12.128 9.37711 10.7867 8.04387 9.9829 8.84766L9.026 9.80457C8.79152 10.0391 8.42065 10.0499 8.18946 9.83216C8.18527 9.82822 8.18113 9.8242 8.17704 9.82011C7.60427 9.24734 6.86936 8.69159 6.39943 8.03122C6.20623 7.75971 6.27917 7.35876 6.56293 7.14058C7.13082 6.70394 7.83604 6.05667 7.51626 5.73688C7.00756 5.22819 6.64232 4.84336 6.00502 4.36291C4.84749 3.49024 2.98873 2.86307 1.68669 2.5009C1.49898 2.44869 1.54877 2.11407 1.74553 2.11091C1.74865 2.11086 1.74938 2.1109 1.7525 2.11067C1.8512 2.10361 5.1158 1.87459 7.10771 2.35491C8.41273 2.66961 9.17363 2.87223 10.3122 3.56383C11.7706 4.44979 12.9611 5.54124 13.3465 6.69684C13.732 7.85244 12.8562 8.45813 13.6146 8.8618C14.0693 9.10386 14.6271 9.08774 15.0305 8.72253C15.3277 8.4534 15.7944 8.37456 16.0678 8.64793Z" fill="currentColor"/>
+    <path d="M8.17704 9.82011C8.18113 9.8242 8.18527 9.82822 8.18946 9.83216M8.17704 9.82011L8.18946 9.83216M8.17704 9.82011C7.60427 9.24734 6.86936 8.69159 6.39943 8.03122M8.18946 9.83216C8.42065 10.0499 8.79152 10.0391 9.026 9.80457L9.9829 8.84766C10.7867 8.04387 12.128 9.37711 12.4882 9.98816C12.9103 10.7041 12.6078 11.0259 12.0687 11.5649C11.83 11.8036 11.8231 12.1837 12.0532 12.4139L13.32 13.6806C13.5501 13.9108 13.9302 13.9038 14.169 13.6651L17.1947 10.6393C17.4334 10.4006 17.4404 10.0205 17.2102 9.79039L16.0678 8.64793C15.7944 8.37456 15.3277 8.4534 15.0305 8.72253C14.6271 9.08774 14.0693 9.10386 13.6146 8.8618C12.8562 8.45813 13.732 7.85244 13.3465 6.69684C12.9611 5.54124 11.7706 4.44979 10.3122 3.56383C9.17363 2.87223 8.41273 2.66961 7.10771 2.35492C5.1158 1.87459 1.8512 2.10361 1.7525 2.11067C1.74938 2.1109 1.74865 2.11086 1.74553 2.11091C1.54877 2.11407 1.49898 2.44869 1.68669 2.5009C2.98873 2.86307 4.84749 3.49024 6.00502 4.36291C6.64232 4.84336 7.00756 5.22819 7.51626 5.73688C7.83604 6.05667 7.13082 6.70394 6.56293 7.14058C6.27917 7.35876 6.20623 7.75971 6.39943 8.03122M8.18946 9.83216L2.8021 15.2195C2.47839 15.5432 1.97213 15.6105 1.60516 15.3369C1.46424 15.2318 1.32499 15.1183 1.2164 15.0097C1.1078 14.9011 0.994378 14.7619 0.889279 14.621C0.615587 14.254 0.682904 13.7477 1.00661 13.424L6.39943 8.03122" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

package/components/ActionLogo.vue

@@ -13,6 +13,7 @@ import InstadappProSVG from '~/assets/images/icons/instadapp-pro.svg'
 import PermitSignSVG from '~/assets/images/icons/permit-sign.svg'
 import RejectProposalSVG from '~/assets/images/icons/reject-proposal.svg'
 import UpgradeSVG from '~/assets/images/icons/upgrade.svg'
+import HammerSVG from '~/assets/images/icons/hammer.svg'
 
 defineProps<{
   action: MetadataTypes
@@ -35,4 +36,5 @@ defineProps<{
     <InstadappProSVG v-else-if="action === 'instadapp-pro'"/>
     <PermitSignSVG v-else-if="action === 'permit2'"/>
     <UpgradeSVG v-else-if="action === 'upgrade'"/>
+    <HammerSVG v-else-if="action === 'transaction-builder'"/>
 </template>

package/components/ActionMetadata.vue

@@ -53,6 +53,9 @@ provide('tokens', props.tokens);
             {{ chainIdToName(metadata.chainId) }}
         </div>
     </div>
+    <div v-if="metadata.type === 'transaction-builder'" class="self-start capitalize flex gap-3">
+     Transaction Builder ({{ metadata?.actionCount }} actions)
+    </div>
     <div v-if="metadata.type === 'instadapp-pro'" class="self-start capitalize flex gap-3">
       Instadapp Pro |
       {{ metadata?.castDetails }}

package/components/metadata/Signers.vue

@@ -13,7 +13,8 @@ defineProps<{
 
 <template>
   <div class="font-medium">
-    <div v-if="!compact || metadata.addresses.length < 3" class="flex gap-[14px] flex-wrap">
+    <div v-if="!compact || metadata.addresses.length < 3" class="flex gap-[14px] flex-wrap items-end">
+        <p v-if="!compact" class="text-xs"> {{ formatTxType(metadata.type) }} </p>
         <div v-for="address of metadata.addresses" :key="address" class="flex gap-2 rounded-full bg-slate-100 dark:bg-slate-800 justify-start items-center px-2 py-1.5">
           <AuthorityAvatar :address="address" class="w-[18px] h-[18px]" />
           <Tippy max-width="none" interactive>

package/package.json

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

package/utils/metadata.ts

@@ -2,24 +2,25 @@ import { ethers, utils } from "ethers";
 import { Forwarder__factory, MultisigForwarder__factory } from "../contracts";
 import { toBN } from "./bignumber";
 
-  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",
-    "import": "import",
-  } as const;
+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",
+  import: "import",
+  "transaction-builder": "transaction-builder",
+} as const;
 
 const multiMetadataTypes = ["bytes[]"];
 
@@ -54,9 +55,10 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   "gas-topup": ["uint256 amount", "address token", "address onBehalf"],
   upgrade: ["bytes32 version", "address walletImpl"],
   dapp: ["string name", "string url"],
-  "import": ["bytes32 protocol", "uint256 valueInUsd"],
+  import: ["bytes32 protocol", "uint256 valueInUsd"],
   auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
+  "transaction-builder": ["bytes32 actionCount"],
   permit2: [
     "address token",
     "address spender",
@@ -64,10 +66,10 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
     "uint48 expiration",
   ],
   "instadapp-pro": ["string castDetails"],
-  'add-signers': ['address[] signers'],
-  'remove-signers': ['address[] signers'],
-  'change-threshold': ['uint8 count'],
-  'rejection': ['bytes32 id'],
+  "add-signers": ["address[] signers"],
+  "remove-signers": ["address[] signers"],
+  "change-threshold": ["uint8 count"],
+  rejection: ["bytes32 id"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -175,6 +177,23 @@ export const encodeDeployMetadata = (single = true) => {
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeTransactionBuilderMetadata = (
+  actionCount: string,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["transaction-builder"],
+    [actionCount]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["transaction-builder"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeWCSignMetadata = (
   params: SignMetadataProps,
   single = true
@@ -408,7 +427,6 @@ const getMetadataFromData = (data: string) => {
   return metadata;
 };
 
-
 const typesPayload: IPayload = {
   import: (data, type) => ({
     type,
@@ -450,15 +468,19 @@ const typesPayload: IPayload = {
     token: data.token,
     onBehalf: data.onBehalf,
   }),
-  "dapp": (data, type) => ({
+  dapp: (data, type) => ({
     type,
     name: data.name,
     url: data.url,
   }),
-  "deploy": (data, type) => ({
+  deploy: (data, type) => ({
+    type,
+  }),
+  "transaction-builder": (data, type) => ({
     type,
+    actionCount: data.actionCount ? toBN(data.actionCount).toNumber() : 0,
   }),
-  "permit2": (data, type) => ({
+  permit2: (data, type) => ({
     type,
     token: data.token,
     spender: data.spender,
@@ -473,7 +495,7 @@ const typesPayload: IPayload = {
     amount: toBN(data.amount).toFixed(),
     receiver: data.receiver,
   }),
-  "auth": (data) => ({
+  auth: (data) => ({
     type: data.remove ? "remove-authority" : "add-authority",
     address: data.address,
     chainId: data.chainId ? data.chainId.toString() : null,
@@ -483,7 +505,7 @@ const typesPayload: IPayload = {
     type,
     castDetails: data.castDetails,
   }),
-  "rejection": (data, type) => ({
+  rejection: (data, type) => ({
     type,
     id: data.id,
   }),
@@ -525,20 +547,17 @@ const parseMetadata = (metadata: string) => {
       decodedMetadata.data
     );
 
-    const payloadFunc = typesPayload[type]
-    
+    const payloadFunc = typesPayload[type];
+
     if (payloadFunc) {
-      const payload = payloadFunc(decodedData, type)
+      const payload = payloadFunc(decodedData, type);
       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

@@ -8,11 +8,11 @@ import {
   AVO_STAGING_CHAIN_ID,
   AVO_STAGING_RPC_URL,
   AVO_STAGING_EXPLORER_URL,
-} from './avocado'
+} from "./avocado";
 
 export const bridgeDisabledNetworks = [];
 
-export const networksSimulationNotSupported = [1313161554, 1101]
+export const networksSimulationNotSupported = [1313161554, 1101];
 
 export const networks: Network[] = [
   {
@@ -25,7 +25,7 @@ export const networks: Network[] = [
     balanceResolverAddress: "0x58632D23120b20650262b8A629a14e4F4043E0D9",
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
     explorerUrl: "https://polygonscan.com",
-    apiURL: 'https://api.polygonscan.com',
+    apiURL: "https://api.polygonscan.com",
     get serverRpcUrl() {
       return process.env?.POLYGON_RPC_URL || this.params.rpcUrls[0];
     },
@@ -49,7 +49,7 @@ export const networks: Network[] = [
     usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
     explorerUrl: "https://arbiscan.io",
-    apiURL: 'https://api.arbiscan.io',
+    apiURL: "https://api.arbiscan.io",
     get serverRpcUrl() {
       return process.env?.ARBITRUM_RPC_URL || this.params.rpcUrls[0];
     },
@@ -70,7 +70,7 @@ export const networks: Network[] = [
     zerionName: "ethereum",
     chainId: 1,
     explorerUrl: "https://etherscan.io",
-    apiURL: 'https://api.etherscan.io',
+    apiURL: "https://api.etherscan.io",
     color: "#5D5FEF",
     get serverRpcUrl() {
       return process.env?.MAINNET_RPC_URL || this.params.rpcUrls[0];
@@ -85,28 +85,28 @@ export const networks: Network[] = [
         decimals: 18,
       },
     },
-  }, 
+  },
   {
-    name: 'Base',
+    name: "Base",
     chainId: 8453,
-    color: '#1E2024',
-    ankrName:'base',
-    explorerUrl: 'https://basescan.org',
-    apiURL: 'https://api.basescan.org',
+    color: "#1E2024",
+    ankrName: "base",
+    explorerUrl: "https://basescan.org",
+    apiURL: "https://api.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'],
+    },
+    usdcAddress: "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA",
+    balanceResolverAddress: "0x23c8EAb8a4373dD16b0947Ebe8bf76Ff7A49d13C",
+    params: {
+      rpcUrls: ["https://rpc.ankr.com/base"],
       chainName: "Base",
       nativeCurrency: {
         name: "Ethereum",
         symbol: "ETH",
         decimals: 18,
       },
-    }
+    },
   },
   {
     name: "Optimism",
@@ -115,7 +115,7 @@ export const networks: Network[] = [
     zerionName: "optimism",
     color: "#FF0420",
     chainId: 10,
-    apiURL: 'https://api-optimistic.etherscan.io',
+    apiURL: "https://api-optimistic.etherscan.io",
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
     explorerUrl: "https://optimistic.etherscan.io",
@@ -136,9 +136,9 @@ export const networks: Network[] = [
     name: "Polygon zkEVM",
     chainId: 1101,
     color: "#8544f6",
-    ankrName: 'polygon_zkevm',
+    ankrName: "polygon_zkevm",
     explorerUrl: "https://zkevm.polygonscan.com",
-    apiURL: 'https://api-zkevm.polygonscan.com',
+    apiURL: "https://api-zkevm.polygonscan.com",
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
     usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
     get serverRpcUrl() {
@@ -162,7 +162,7 @@ export const networks: Network[] = [
     color: "#F3BA2F",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
-    apiURL: 'https://api.bscscan.com',
+    apiURL: "https://api.bscscan.com",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
     balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
     get serverRpcUrl() {
@@ -188,7 +188,7 @@ export const networks: Network[] = [
     usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
     balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
     explorerUrl: "https://snowtrace.io",
-    apiURL: 'https://api.snowtrace.io',
+    apiURL: "https://api.snowtrace.io",
     get serverRpcUrl() {
       return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
     },
@@ -229,11 +229,11 @@ export const networks: Network[] = [
     debankName: "xdai",
     zerionName: "xdai",
     color: "#04795C",
-    ankrName: 'gnosis',
+    ankrName: "gnosis",
     chainId: 100,
     balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
     explorerUrl: "https://gnosisscan.io",
-    apiURL:'https://api.gnosisscan.io',
+    apiURL: "https://api.gnosisscan.io",
     usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
     get serverRpcUrl() {
       return process.env?.GNOSIS_RPC_URL || this.params.rpcUrls[0];
@@ -269,6 +269,27 @@ export const networks: Network[] = [
       },
     },
   },
+  // {
+  //   name: "Fuse",
+  //   chainId: 122,
+  //   zerionName: "fuse",
+  //   color: "#78d64b",
+  //   explorerUrl: "https://explorer.fuse.io",
+  //   get serverRpcUrl() {
+  //     return process.env?.FUSE_RPC_URL || this.params.rpcUrls[0];
+  //   },
+  //   usdcAddress: "",
+  //   balanceResolverAddress: "0xdF19Da523DA64bBE82eE0E4DFf00d676A8386474",
+  //   params: {
+  //     rpcUrls: ["https://fuse-mainnet.chainstacklabs.com"],
+  //     chainName: "Fuse",
+  //     nativeCurrency: {
+  //       decimals: 18,
+  //       name: "Fuse",
+  //       symbol: "fuse",
+  //     },
+  //   },
+  // },
   {
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
@@ -312,19 +333,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'}
+  { 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 = (

package/utils/utils.d.ts

@@ -12,8 +12,9 @@ declare global {
     | 634
     | 1313161554
     | 8453
+    | 122
     | 63400;
- 
+
   type ISlackMessageType = "danger" | "error" | "success" | "banner";
 
   type MetadataTypes = keyof typeof MetadataEnums;
@@ -110,7 +111,7 @@ declare global {
   };
 
   type MetadataProps = {
-    type: MetadataTypes,
+    type: MetadataTypes;
     encodedData: string;
     version?: string;
   };
@@ -126,8 +127,6 @@ declare global {
     coingecko_id: string;
     sparkline_price_7d: number[];
   }
-
 }
 
-export { }
-
+export {};