@instadapp/avocado-base 0.0.34 → 0.0.36

package/components/ActionMetadata.vue

@@ -1,10 +1,13 @@
 <script lang="ts" setup>
 
-defineProps<{
+const props = defineProps<{
   metadata: any;
   chain_id: number | string;
+  compact?: boolean;
 }>();
 
+provide('compact', props.compact);
+
 </script>
 
 <template>

package/components/metadata/Bridge.vue

@@ -5,6 +5,8 @@ const props = defineProps<{
   chain_id: number | string
 }>();
 
+const compact = inject('compact');
+
 const toToken = asyncComputed(() =>
   fetchTokenByAddress(props.metadata?.toToken, props.metadata?.toChainId)
 );
@@ -22,12 +24,12 @@ const bridgeAmountFormatted = computed(() =>
     class="flex gap-5 items-center"
     v-if="metadata.type === 'bridge' && toToken"
   >
-    <span class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
+    <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="toToken.logo_url" />
       {{ bridgeAmountFormatted }}
       <span class="uppercase">{{ toToken?.symbol }}</span>
-      <SvgoBridge class="text-slate-400 w-5 h-5" />
+      <SvgoBridge class="text-slate-400 w-4 h-4" />
       <span class="flex items-center gap-2.5">
         <ChainLogo class="w-5" :chain="metadata.toChainId" />
         <span>{{ chainIdToName(metadata.toChainId) }}</span>

package/components/metadata/CrossTransfer.vue

@@ -5,6 +5,8 @@ const props = defineProps<{
   chain_id: number | string
 }>();
 
+const compact = inject('compact');
+
 const fromToken = asyncComputed(() => {
   if (!props?.chain_id) return null;
 
@@ -27,7 +29,7 @@ const formattedFromAmount = computed(() =>
   </div>
   <div class="flex gap-5 flex-col" v-else>
     <div class="flex items-center gap-5">
-      <span class="capitalize text-xs sm:text-sm">Cross-chain send</span>
+      <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 }}

package/components/metadata/GasTopup.vue

@@ -9,6 +9,8 @@ const token = asyncComputed(() =>
   fetchTokenByAddress(props.metadata?.token, props?.chain_id)
 );
 
+const compact = inject('compact');
+
 const formattedAmount = computed(() =>
   formatDecimal(
     fromWei(props.metadata?.amount, token?.value?.decimals).toFixed()
@@ -19,7 +21,7 @@ const formattedAmount = computed(() =>
 <template>
   <div v-if="!token" class="rounded-5 w-24 h-4 loading-box" />
   <div class="flex items-center gap-5" v-else>
-    <span class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
+    <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="token?.logo_url" />
       {{ formattedAmount }}

package/components/metadata/Swap.vue

@@ -5,6 +5,7 @@ const props = defineProps<{
   chain_id: number | string
 }>();
 
+const compact = inject('compact');
 
 const buyToken = asyncComputed(() =>
   fetchTokenByAddress(props.metadata?.buyToken, props?.chain_id)
@@ -45,7 +46,7 @@ const formatProtocol = (protocol: string) => {
       class="flex items-center gap-5"
         v-else
     >
-      <span class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
+      <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 }}
@@ -56,7 +57,7 @@ const formatProtocol = (protocol: string) => {
         <span class="uppercase">{{ buyToken?.symbol }}</span>
         <span
           class="capitalize hidden sm:flex items-center gap-2.5"
-          v-if="metadata.protocol"
+          v-if="metadata.protocol && !compact"
         >
           On <ProtocolLogo class="w-5 h-5" :name="metadata.protocol" />
           {{ formatProtocol(metadata.protocol) }}

package/components/metadata/Transfer.vue

@@ -5,6 +5,7 @@ const props = defineProps<{
   chain_id: number | string
 }>();
 
+const compact = inject('compact');
 
 const token = asyncComputed(() => {
   if (!props?.chain_id) return null;
@@ -25,19 +26,21 @@ const formattedAmount = computed(() =>
 <template>
   <div v-if="!token" class="rounded-5 w-24 h-4 loading-box" />
   <div class="flex items-center gap-5" v-else>
-    <span class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
+    <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="token?.logo_url" />
       {{ formattedAmount }}
       <span class="uppercase">{{ token?.symbol }}</span>
       <SvgoArrowRight class="w-4 h-4 text-slate-400 mx-2" />
-      <a
+      <NuxtLink
         class="text-primary"
-        :href="
+        target="_blank"
+        external
+        :to="
           getExplorerUrl(chain_id, `/address/${metadata.receiver}`)
         "
-        >{{ shortenHash(metadata.receiver) }}</a
-      >
+        >{{ shortenHash(metadata.receiver) }}
+        </NuxtLink>
     </span>
   </div>
 </template>

package/package.json

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

package/utils/metadata.ts

@@ -242,191 +242,205 @@ export const encodeMultipleActions = (...actionData: string[]) => {
   return ethers.utils.defaultAbiCoder.encode(multiMetadataTypes, [actionData]);
 };
 
-export const decodeMetadata = (data: string) => {
+export const decodeData = (data: string) => {
   try {
-    const iface = Forwarder__factory.createInterface();
-    let metadata = "0x";
-    let payload = {};
-
-    if (!data) return payload;
-
-    if (data.startsWith("0x18e7f485")) {
-      const executeData = iface.decodeFunctionData("execute", data);
-      if (executeData.metadata_ === "0x" || !executeData.metadata_) {
-        return null;
-      } else {
-        metadata = executeData.metadata_;
-      }
-    } else if (data.startsWith("0x14f80a8d")) {
-      const executeDataV2 = iface.decodeFunctionData("executeV2", data);
-      if (
-        executeDataV2.params_.metadata === "0x" ||
-        !executeDataV2.params_.metadata
-      ) {
-        return null;
-      } else {
-        metadata = executeDataV2.params_.metadata;
-      }
-    } else if (data.startsWith("0x85114d53")) {
-      const executeDataV3 = iface.decodeFunctionData("executeV3", data);
-      if (
-        executeDataV3.params_.metadata === "0x" ||
-        !executeDataV3.params_.metadata
-      ) {
-        return null;
-      } else {
-        metadata = executeDataV3.params_.metadata;
-      }
+    const metadata = getMetadataFromData(data) || "0x";
+
+    return parseMetadata(metadata);
+  } catch (e) {
+    // console.log(e);
+    return null;
+  }
+};
+
+export const decodeMetadata = (metadata: string) => {
+  try {
+    return parseMetadata(metadata);
+  } catch (e) {
+    return null;
+  }
+};
+
+const getMetadataFromData = (data: string) => {
+  const iface = Forwarder__factory.createInterface();
+  let metadata = "0x";
+
+  if (data.startsWith("0x18e7f485")) {
+    const executeData = iface.decodeFunctionData("execute", data);
+    if (executeData.metadata_ === "0x" || !executeData.metadata_) {
+      return null;
     } else {
-      const executeDataMultisigV3 = iface.decodeFunctionData(
-        "executeMultisigV3",
-        data
-      );
-      if (
-        executeDataMultisigV3.params_.metadata === "0x" ||
-        !executeDataMultisigV3.params_.metadata
-      ) {
-        return null;
-      } else {
-        metadata = executeDataMultisigV3.params_.metadata;
-      }
+      metadata = executeData.metadata_;
     }
+  } else if (data.startsWith("0x14f80a8d")) {
+    const executeDataV2 = iface.decodeFunctionData("executeV2", data);
+    if (
+      executeDataV2.params_.metadata === "0x" ||
+      !executeDataV2.params_.metadata
+    ) {
+      return null;
+    } else {
+      metadata = executeDataV2.params_.metadata;
+    }
+  } else if (data.startsWith("0x85114d53")) {
+    const executeDataV3 = iface.decodeFunctionData("executeV3", data);
+    if (
+      executeDataV3.params_.metadata === "0x" ||
+      !executeDataV3.params_.metadata
+    ) {
+      return null;
+    } else {
+      metadata = executeDataV3.params_.metadata;
+    }
+  } else {
+    const executeDataMultisigV3 = iface.decodeFunctionData(
+      "executeMultisigV3",
+      data
+    );
+    if (
+      executeDataMultisigV3.params_.metadata === "0x" ||
+      !executeDataMultisigV3.params_.metadata
+    ) {
+      return null;
+    } else {
+      metadata = executeDataMultisigV3.params_.metadata;
+    }
+  }
 
-    const metadataArr = [];
-
-    const [decodedMultiMetadata = []] =
-      (ethers.utils.defaultAbiCoder.decode(
-        multiMetadataTypes,
-        metadata
-      ) as string[]) || [];
-
-    for (let metadata of decodedMultiMetadata) {
-      const decodedMetadata = ethers.utils.defaultAbiCoder.decode(
-        metadataTypes,
-        metadata
-      );
-
-      const type = ethers.utils.parseBytes32String(
-        decodedMetadata.type
-      ) as keyof typeof actionMetadataTypes;
-
-      const decodedData = ethers.utils.defaultAbiCoder.decode(
-        actionMetadataTypes[type],
-        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;
-      }
-
-      metadataArr.push(payload);
+  return metadata;
+};
+
+const parseMetadata = (metadata: string) => {
+  const metadataArr = [];
+  let payload = {};
+
+  const [decodedMultiMetadata = []] =
+    (ethers.utils.defaultAbiCoder.decode(
+      multiMetadataTypes,
+      metadata
+    ) as string[]) || [];
+
+  for (let metadata of decodedMultiMetadata) {
+    const decodedMetadata = ethers.utils.defaultAbiCoder.decode(
+      metadataTypes,
+      metadata
+    );
+
+    const type = ethers.utils.parseBytes32String(
+      decodedMetadata.type
+    ) as keyof typeof actionMetadataTypes;
+
+    const decodedData = ethers.utils.defaultAbiCoder.decode(
+      actionMetadataTypes[type],
+      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;
     }
 
-    return metadataArr;
-  } catch (e) {
-    // console.log(e);
-    return null;
+    metadataArr.push(payload);
   }
+
+  return metadataArr;
 };
 
 /**