@instadapp/avocado-base 0.0.0-dev.b89d937 → 0.0.0-dev.b8bae6e

package/components/ActionLogo.vue

@@ -36,5 +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'"/>
+    <HammerSVG v-else-if="action === 'tx-builder'"/>
 </template>

package/components/ActionMetadata.vue

@@ -24,7 +24,7 @@ provide('tokens', props.tokens);
     <MetadataPermit2 v-if="metadata.type === 'permit2'" :metadata="metadata" :chain_id="chain_id" />
 
     <div class="text-left w-fit capitalize" v-if="metadata.type === 'import'">
-      Import from {{ metadata.protocol }}  ({{ (formatUsd(fromWei(metadata.valueInUsd, 10)))}})
+      Import from {{ metadata.protocol }} ({{ (formatUsd(fromWei(metadata.valueInUsd, 10))) }})
     </div>
 
     <div v-if="metadata.type === 'upgrade'" class="self-start">
@@ -32,7 +32,7 @@ provide('tokens', props.tokens);
     </div>
     <div v-if="metadata.type === 'dapp'" class="self-start flex items-center gap-2 text-primary">
       <a :href="metadata?.url" target="_blank" rel="noopener noreferrer">{{
-        metadata?.name
+        metadata?.name || metadata?.url
       }}</a>
       <SvgoExternalLink />
     </div>
@@ -41,39 +41,38 @@ provide('tokens', props.tokens);
     </div>
     <div v-if="metadata.type === 'auth'" class="self-start capitalize flex gap-3">
       Authority {{ metadata.remove ? 'Removed' : 'Added' }}:
-       <a
-          class="text-primary break-all"
-          :href="getExplorerUrl(metadata.chainId, `/address/${metadata.address}`)"
-          target="_blank"
-          >
-          {{ shortenHash(metadata.address) }}
-        </a>
-        <div class="flex gap-3">
-           <ChainLogo class="w-5 h-5" :chain="metadata.chainId"/>
-            {{ chainIdToName(metadata.chainId) }}
-        </div>
+      <a class="text-primary break-all" :href="getExplorerUrl(metadata.chainId, `/address/${metadata.address}`)"
+        target="_blank">
+        {{ shortenHash(metadata.address) }}
+      </a>
+      <div class="flex gap-3">
+        <ChainLogo class="w-5 h-5" :chain="metadata.chainId" />
+        {{ 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 v-if="metadata.type === 'tx-builder'" class="self-start capitalize flex gap-3">
+      <span v-if="!compact">
+        Transaction Builder
+      </span> ({{ metadata?.actionCount }} {{ toBN(metadata?.actionCount).lt(2) ? 'action' : 'actions' }})
     </div>
     <div v-if="metadata.type === 'instadapp-pro'" class="self-start capitalize flex gap-3">
       Instadapp Pro |
       {{ metadata?.castDetails }}
     </div>
 
-    <MetadataSigners v-if="metadata.type === 'add-signers' || metadata.type === 'remove-signers'" :metadata="metadata" :compact="compact" />
+    <MetadataSigners v-if="metadata.type === 'add-signers' || metadata.type === 'remove-signers'" :metadata="metadata"
+      :compact="compact" />
 
-     <div v-if="metadata.type === 'change-threshold'" class="text-left w-fit" >
-     Change Threshold to {{ metadata.count }}
+    <div v-if="metadata.type === 'change-threshold'" class="text-left w-fit">
+      Change Threshold to {{ metadata.count }}
     </div>
 
     <div v-tippy="{
-        content: metadata.id,
-        maxWidth: 'none',
-        interactive: true,
-      }" 
-      v-if="metadata.type === 'rejection'" class="text-left w-fit">
-     {{ shortenHash(metadata.id) }}
+      content: metadata.id,
+      maxWidth: 'none',
+      interactive: true,
+    }" v-if="metadata.type === 'rejection'" class="text-left w-fit">
+      {{ shortenHash(metadata.id) }}
     </div>
   </div>
 </template>

package/components/metadata/CrossTransfer.vue

@@ -20,9 +20,17 @@ const fromToken = asyncComputed(() => {
   );
 });
 
-const formattedFromAmount = computed(() =>
+const toToken = asyncComputed(() => {
+  if (!props?.metadata?.toChainId) return null;
+
+  if (Array.isArray(tokens) && !tokens.length) return null;
+
+  return fetchTokenByAddress(props.metadata?.toToken, props?.metadata?.toChainId, tokens);
+});
+
+const formattedToAmount = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.amount, fromToken?.value?.decimals).toFixed()
+    fromWei(props.metadata?.amount, toToken?.value?.decimals).toFixed()
   )
 );
 </script>
@@ -36,7 +44,7 @@ const formattedFromAmount = computed(() =>
       <span v-if="!compact" class="capitalize text-xs sm:text-sm">Cross-chain send</span>
       <span class="inline-flex gap-2.5 items-center">
         <img width="20" height="20" class="w-5 h-5" :src="fromToken?.logo_url" />
-        {{ formattedFromAmount }}
+        {{ formattedToAmount }}
         <span class="uppercase">{{ fromToken?.symbol }}</span>
       </span>
     </div>

package/components/metadata/Swap.vue

@@ -8,17 +8,15 @@ const props = defineProps<{
 const compact = inject('compact');
 const tokens = inject<ITokenPrice[]>('tokens');
 
-const buyToken = asyncComputed(() =>
-{
+const buyToken = asyncComputed(() => {
   if (Array.isArray(tokens) && !tokens.length) return null;
-    return fetchTokenByAddress(props.metadata?.buyToken, props?.chain_id, tokens) 
-  }
+  return fetchTokenByAddress(props.metadata?.buyToken, props?.chain_id, tokens)
+}
 );
-const sellToken = asyncComputed(() =>
-{
+const sellToken = asyncComputed(() => {
   if (Array.isArray(tokens) && !tokens.length) return null;
-  return  fetchTokenByAddress(props.metadata?.sellToken, props?.chain_id, tokens)
-  }
+  return fetchTokenByAddress(props.metadata?.sellToken, props?.chain_id, tokens)
+}
 );
 
 const sellAmountFormatted = computed(() =>
@@ -49,26 +47,21 @@ const formatProtocol = (protocol: string) => {
 
 <template>
   <div v-if="!sellToken || !buyToken" class="rounded-5 w-24 h-4 loading-box" />
-  <div
-      class="flex items-center gap-5"
-        v-else
-    >
-      <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
-      <span class="inline-flex gap-2.5 items-center">
-        <img width="20" height="20" class="w-5 h-5" :src="sellToken?.logo_url" />
-        {{ sellAmountFormatted }}
-        <span class="uppercase">{{ sellToken?.symbol }}</span>
-        <SvgoRefresh class="w-4 h-4 text-slate-400 mx-2" />
-        <img width="20" height="20" class="w-5 h-5" :src="buyToken?.logo_url" />
-        {{ buyAmountFormatted }}
-        <span class="uppercase">{{ buyToken?.symbol }}</span>
-        <span
-          class="capitalize hidden sm:flex items-center gap-2.5"
-          v-if="metadata.protocol && !compact"
-        >
-          On <ProtocolLogo class="w-5 h-5" :name="metadata.protocol" />
-          {{ formatProtocol(metadata.protocol) }}
-        </span>
+  <div class="flex items-center gap-5" v-else>
+    <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
+    <span class="inline-flex gap-2.5 items-center">
+      <img width="20" height="20" class="w-5 h-5" :src="sellToken?.logo_url" />
+      {{ sellAmountFormatted }}
+      <span class="uppercase">{{ sellToken?.symbol }}</span>
+      <SvgoRefresh class="w-4 h-4 text-slate-400 mx-2" />
+      <img width="20" height="20" class="w-5 h-5" :src="buyToken?.logo_url" />
+      ~ {{ buyAmountFormatted }}
+      <span class="uppercase">{{ buyToken?.symbol }}</span>
+      <span class="capitalize hidden sm:flex items-center gap-2.5" v-if="metadata.protocol && !compact">
+        On
+        <ProtocolLogo class="w-5 h-5" :name="metadata.protocol" />
+        {{ formatProtocol(metadata.protocol) }}
       </span>
-    </div>
+    </span>
+  </div>
 </template>

package/package.json

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

package/utils/metadata.ts

@@ -19,7 +19,8 @@ export const MetadataEnums = {
   "remove-signers": "remove-signers",
   "change-threshold": "change-threshold",
   import: "import",
-  "transaction-builder": "transaction-builder",
+  "tx-builder": "tx-builder",
+  "avocado-bridge": "avocado-bridge",
 } as const;
 
 const multiMetadataTypes = ["bytes[]"];
@@ -58,7 +59,7 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   import: ["bytes32 protocol", "uint256 valueInUsd"],
   auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
-  "transaction-builder": ["bytes32 actionCount"],
+  "tx-builder": ["bytes32 actionCount"],
   permit2: [
     "address token",
     "address spender",
@@ -70,6 +71,7 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   "remove-signers": ["address[] signers"],
   "change-threshold": ["uint8 count"],
   rejection: ["bytes32 id"],
+  "avocado-bridge": ["bytes32 id", "uint256 toChainId"],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -97,6 +99,24 @@ export const encodeDappMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeAvocadoBridgeMetadata = (
+  id: string,
+  toChainId: string | number,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["avocado-bridge"],
+    [id, toChainId]
+  );
+
+  const data = encodeMetadata({
+    type: MetadataEnums["avocado-bridge"],
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeTransferMetadata = (
   params: SendMetadataProps,
   single = true
@@ -182,12 +202,12 @@ export const encodeTransactionBuilderMetadata = (
   single = true
 ) => {
   const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes["transaction-builder"],
+    actionMetadataTypes["tx-builder"],
     [actionCount]
   );
 
   const data = encodeMetadata({
-    type: MetadataEnums["transaction-builder"],
+    type: MetadataEnums["tx-builder"],
     encodedData,
   });
 
@@ -476,9 +496,9 @@ const typesPayload: IPayload = {
   deploy: (data, type) => ({
     type,
   }),
-  "transaction-builder": (data, type) => ({
+  "tx-builder": (data, type) => ({
     type,
-    actionCount: data.actionCount ? toBN(data.actionCount).toNumber() : 0,
+    actionCount: utils.parseBytes32String(data.actionCount || ""),
   }),
   permit2: (data, type) => ({
     type,
@@ -521,6 +541,11 @@ const typesPayload: IPayload = {
     type,
     count: data.count,
   }),
+  "avocado-bridge": (data, type) => ({
+    type,
+    id: data.id,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+  }),
 };
 
 const parseMetadata = (metadata: string) => {

package/utils/network.ts

@@ -26,6 +26,8 @@ export const networks: Network[] = [
     usdcAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
     explorerUrl: "https://polygonscan.com",
     apiURL: "https://api.polygonscan.com",
+    fakeTransactionHash:
+      "0x906c551abd5873a428505b6530ac14d91367820706c7ee525f6d7313265d1c92",
     get serverRpcUrl() {
       return process.env?.POLYGON_RPC_URL || this.params.rpcUrls[0];
     },
@@ -48,6 +50,8 @@ export const networks: Network[] = [
     chainId: 42161,
     usdcAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
+    fakeTransactionHash:
+      "0x9fa291c3b09d31f19b1fa5dd05f30169d1364036d5f7c14b026410bc07bd8843",
     explorerUrl: "https://arbiscan.io",
     apiURL: "https://api.arbiscan.io",
     get serverRpcUrl() {
@@ -70,6 +74,8 @@ export const networks: Network[] = [
     zerionName: "ethereum",
     chainId: 1,
     explorerUrl: "https://etherscan.io",
+    fakeTransactionHash:
+      "0x13232dd32cef2f641ead890a507710c96560c8c9c3d5fab6facb5ec563c49433",
     apiURL: "https://api.etherscan.io",
     color: "#5D5FEF",
     get serverRpcUrl() {
@@ -92,6 +98,8 @@ export const networks: Network[] = [
     color: "#1E2024",
     ankrName: "base",
     explorerUrl: "https://basescan.org",
+    fakeTransactionHash:
+      "0xf7833d80da33730c4fc5d4c64151f0eaa64c0c0535be022af0228a44cc4e9c8e",
     apiURL: "https://api.basescan.org",
     get serverRpcUrl() {
       return process.env?.BASE_RPC_URL || this.params.rpcUrls[0];
@@ -118,6 +126,8 @@ export const networks: Network[] = [
     apiURL: "https://api-optimistic.etherscan.io",
     usdcAddress: "0x7f5c764cbc14f9669b88837ca1490cca17c31607",
     balanceResolverAddress: "0xca5f37e6D8bB24c5A7958d5eccE7Bd9Aacc944f2",
+    fakeTransactionHash:
+      "0xee7311d68059732b05088f2144dfec6c7a4f5fd0433eb85306afcd6bdf17cebc",
     explorerUrl: "https://optimistic.etherscan.io",
     get serverRpcUrl() {
       return process.env?.OPTIMISM_RPC_URL || this.params.rpcUrls[0];
@@ -140,6 +150,8 @@ export const networks: Network[] = [
     explorerUrl: "https://zkevm.polygonscan.com",
     apiURL: "https://api-zkevm.polygonscan.com",
     balanceResolverAddress: "0x48D1Fa5Ee6691a1E0B45d2B515650997BEA27a01",
+    fakeTransactionHash:
+      "0x1077130463ade91ad4e9c43c3195298e26a99970975238128912490eea12bf41",
     usdcAddress: "0xa8ce8aee21bc2a48a5ef670afcc9274c7bbbc035",
     get serverRpcUrl() {
       return process.env?.POLYGON_ZKEVM_RPC_URL || this.params.rpcUrls[0];
@@ -162,6 +174,8 @@ export const networks: Network[] = [
     color: "#F3BA2F",
     chainId: 56,
     explorerUrl: "https://bscscan.com",
+    fakeTransactionHash:
+      "0x897d54bf8e492f840bd4d8f1e743bfcab8226ab4d5a899e47ee433dcd6d6abf7",
     apiURL: "https://api.bscscan.com",
     usdcAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
     balanceResolverAddress: "0xb808cff38706e267067b0af427726aa099f69f89",
@@ -188,6 +202,8 @@ export const networks: Network[] = [
     usdcAddress: "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
     balanceResolverAddress: "0x63009f31D054E0ac9F321Cf0D642375236A4Bf1E",
     explorerUrl: "https://snowtrace.io",
+    fakeTransactionHash:
+      "0x233aac7402558dd4e23f938a50f983e67f5c9604233981c7ac74e63737b8294e",
     apiURL: "https://api.snowtrace.io",
     get serverRpcUrl() {
       return process.env?.AVALANCHE_RPC_URL || this.params.rpcUrls[0];
@@ -214,6 +230,8 @@ export const networks: Network[] = [
     },
     usdcAddress: "0x04068da6c83afcfa0e13ba15a6696662335d5b75",
     balanceResolverAddress: "0x929376c77a2fb8152375a089a4fccf84ff481479",
+    fakeTransactionHash:
+      "0x1e9a8405d660172314124e06896212c0786d7fb1550b89410d4bc87e9e8054e4",
     params: {
       rpcUrls: ["https://rpc.ankr.com/fantom"],
       chainName: "Fantom",
@@ -233,6 +251,8 @@ export const networks: Network[] = [
     chainId: 100,
     balanceResolverAddress: "0xfaa244e276b1597f663975ed007ee4ff70d27849",
     explorerUrl: "https://gnosisscan.io",
+    fakeTransactionHash:
+      "0x1513033806310a2c3b29f2276f8aa7388461b0ef9f8499c297e68c12187c179b",
     apiURL: "https://api.gnosisscan.io",
     usdcAddress: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83",
     get serverRpcUrl() {
@@ -254,6 +274,8 @@ export const networks: Network[] = [
     zerionName: "aurora",
     color: "#78d64b",
     explorerUrl: "https://explorer.mainnet.aurora.dev",
+    fakeTransactionHash:
+      "0x0923401c5a80c39a5cd57c098a6c4729edbefd0db6894def7d349493f4ff3ec6",
     get serverRpcUrl() {
       return process.env?.AURORA_RPC_URL || this.params.rpcUrls[0];
     },
@@ -269,32 +291,75 @@ 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: "Fuse",
+    chainId: 122,
+    zerionName: "fuse",
+    color: "#78d64b",
+    explorerUrl: "https://explorer.fuse.io",
+    fakeTransactionHash:
+      "0xf22a8031de9b978a57c728e18c6b54633356c39db4d0466e53b9b7c3ee7f8def",
+    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: "Scroll",
+    chainId: 534352,
+    color: "#78d64b",
+    explorerUrl: "https://scrollscan.com",
+    fakeTransactionHash:
+      "0x6bf297c414264fc8cddd47224632b4426a02138df2f50fe891eca87f6aefea01",
+    get serverRpcUrl() {
+      return process.env?.SCROLL_RPC_URL || this.params.rpcUrls[0];
+    },
+    params: {
+      rpcUrls: ["https://rpc.scroll.io"],
+      chainName: "Scroll",
+      nativeCurrency: {
+        name: "Ethereum",
+        symbol: "ETH",
+        decimals: 18,
+      },
+    },
+  },
+  {
+    name: "opBNB",
+    chainId: 204,
+    color: "#78d64b",
+    explorerUrl: "https://opbnbscan.com",
+    fakeTransactionHash:
+      "0xb9438a3eae61442bc7d419d79930370ce09ac0f46e0695025751e3bfe1a931e7",
+    get serverRpcUrl() {
+      return process.env?.OPBNB_RPC_URL || this.params.rpcUrls[0];
+    },
+    params: {
+      rpcUrls: ["https://opbnb-mainnet-rpc.bnbchain.org"],
+      chainName: "opBNB",
+      nativeCurrency: {
+        name: "BNB",
+        symbol: "BNB",
+        decimals: 18,
+      },
+    },
+  },
   {
     name: AVO_PROD_CHAIN_NAME,
     chainId: AVO_PROD_CHAIN_ID,
     isAvocado: true,
     balanceResolverAddress: "",
+    fakeTransactionHash: "",
     color: "#16A34A",
     usdcAddress: "",
     serverRpcUrl: AVO_PROD_RPC_URL,
@@ -316,6 +381,7 @@ export const networks: Network[] = [
     serverRpcUrl: AVO_STAGING_RPC_URL,
     color: "#16A34A",
     explorerUrl: AVO_STAGING_EXPLORER_URL,
+    fakeTransactionHash: "",
     isAvocado: true,
     balanceResolverAddress: "",
     usdcAddress: "",
@@ -338,6 +404,7 @@ export const chainUsdcAddresses = [
   { chainId: 56, address: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d" },
   { chainId: 100, address: "0xddafbb505ad214d7b80b1f830fccc89b60fb7a83" },
   { chainId: 137, address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174" },
+  { chainId: 137, address: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359" },
   { chainId: 250, address: "0x04068da6c83afcfa0e13ba15a6696662335d5b75" },
   { chainId: 42161, address: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8" },
   { chainId: 42161, address: "0xaf88d065e77c8cc2239327c5edb3a432268e5831" },
@@ -363,12 +430,16 @@ export const availableNetworks = networks.filter(
 
 export const chainIdToName = (chainId: ChainId | number | string) => {
   const network = getNetworkByChainId(chainId);
-  return network.name;
+  return network?.name;
 };
 
 export const getRpcURLByChainId = (chainId: ChainId | number | string) => {
-  const network = getNetworkByChainId(chainId);
-  return network.params.rpcUrls[0];
+  try {
+    const network = getNetworkByChainId(chainId);
+    return network.params.rpcUrls[0];
+  } catch (e) {
+    return "";
+  }
 };
 
 export const RPCMap = networks.reduce((acc, network) => {
@@ -410,5 +481,6 @@ export const getExplorerUrl = (
   suffix: `/${string}` = "/"
 ) => {
   const network = getNetworkByChainId(chainId);
+  if (!network) return "";
   return `${network.explorerUrl}${suffix}`;
 };

package/utils/utils.d.ts

@@ -13,6 +13,8 @@ declare global {
     | 1313161554
     | 8453
     | 122
+    | 534352
+    | 204
     | 63400;
 
   type ISlackMessageType = "danger" | "error" | "success" | "banner";
@@ -33,8 +35,9 @@ declare global {
     isAvocado?: boolean;
     serverRpcUrl: string | undefined;
     balanceResolverAddress?: string;
-    usdcAddress: string;
+    usdcAddress?: string;
     explorerUrl: string;
+    fakeTransactionHash: string;
     apiURL?: string;
     params: {
       chainName?: string;