@instadapp/avocado-base 0.0.0-dev.991c44c → 0.0.0-dev.9df8ea5

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

@@ -53,6 +53,11 @@ provide('tokens', props.tokens);
             {{ chainIdToName(metadata.chainId) }}
         </div>
     </div>
+    <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 }}

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/package.json

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

package/utils/metadata.ts

@@ -19,7 +19,7 @@ export const MetadataEnums = {
   "remove-signers": "remove-signers",
   "change-threshold": "change-threshold",
   import: "import",
-  "transaction-builder": "transaction-builder",
+  "tx-builder": "tx-builder",
 } as const;
 
 const multiMetadataTypes = ["bytes[]"];
@@ -58,7 +58,7 @@ const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   import: ["bytes32 protocol", "uint256 valueInUsd"],
   auth: ["address address", "uint256 chainId", "bool remove"],
   deploy: [],
-  "transaction-builder": [],
+  "tx-builder": ["bytes32 actionCount"],
   permit2: [
     "address token",
     "address spender",
@@ -177,10 +177,18 @@ export const encodeDeployMetadata = (single = true) => {
   return single ? encodeMultipleActions(data) : data;
 };
 
-export const encodeTransactionBuilderMetadata = (single = true) => {
+export const encodeTransactionBuilderMetadata = (
+  actionCount: string,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["tx-builder"],
+    [actionCount]
+  );
+
   const data = encodeMetadata({
-    type: MetadataEnums["transaction-builder"],
-    encodedData: "0x",
+    type: MetadataEnums["tx-builder"],
+    encodedData,
   });
 
   return single ? encodeMultipleActions(data) : data;
@@ -468,8 +476,9 @@ const typesPayload: IPayload = {
   deploy: (data, type) => ({
     type,
   }),
-  "transaction-builder": (data, type) => ({
+  "tx-builder": (data, type) => ({
     type,
+    actionCount: utils.parseBytes32String(data.actionCount || ""),
   }),
   permit2: (data, type) => ({
     type,

package/utils/network.ts

@@ -269,27 +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: "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,