@instadapp/avocado-base 0.0.37 → 0.0.38

package/components/ActionMetadata.vue

@@ -1,7 +1,10 @@
 <script lang="ts" setup>
 
 const props = defineProps<{
-  metadata: any;
+  metadata: {
+    type: MetadataTypes
+    [key: string]: any
+  };
   chain_id: number | string;
   compact?: boolean;
 }>();
@@ -31,7 +34,7 @@ provide('compact', props.compact);
     <div v-if="metadata.type === 'deploy'" class="self-start capitalize">
       {{ metadata?.type }}
     </div>
-    <div v-if="metadata.type === 'add-authority' || metadata.type === 'remove-authority'" class="self-start capitalize flex gap-3">
+    <div v-if="metadata.type === 'auth'" class="self-start capitalize flex gap-3">
       Authority {{ metadata.remove ? 'Removed' : 'Added' }}:
        <a
           class="text-primary break-all"
@@ -49,5 +52,22 @@ provide('compact', props.compact);
       Instadapp Pro |
       {{ metadata?.castDetails }}
     </div>
+
+    <div v-if="metadata.type === 'add-signers' || metadata.type === 'remove-signers'" class="text-left w-fit" v-tippy="formatMultipleAddresses(metadata.addresses, false)" >
+      {{ formatMultipleAddresses(metadata.addresses) }}
+    </div>
+
+     <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) }}
+    </div>
   </div>
 </template>

package/package.json

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

package/utils/helper.ts

@@ -52,3 +52,10 @@ export function onImageError(this: HTMLImageElement) {
     parentElement.classList.add("bg-gray-300");
   }
 }
+
+export function formatMultipleAddresses(addresses: string[], shorten = true) {
+  const formatter = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' })
+  const formattedString = formatter.format(addresses.map(i => shorten ? shortenHash(i) || '' : i))
+  
+  return formattedString
+}

package/utils/metadata.ts

@@ -5,7 +5,7 @@ const multiMetadataTypes = ["bytes[]"];
 
 const metadataTypes = ["bytes32 type", "uint8 version", "bytes data"];
 
-const actionMetadataTypes = {
+const actionMetadataTypes: Record<MetadataTypes, string[]> = {
   transfer: ["address token", "uint256 amount", "address receiver"],
   "cross-transfer": [
     "address fromToken",
@@ -43,7 +43,10 @@ const actionMetadataTypes = {
     "uint48 expiration",
   ],
   "instadapp-pro": ["string castDetails"],
-  reject: ["string reason"],
+  'add-signers': ['address[] signers'],
+  'remove-signers': ['address[] signers'],
+  'change-threshold': ['uint8 count'],
+  'rejection': ['bytes32 id'],
 };
 
 const encodeMetadata = (props: MetadataProps) => {
@@ -88,14 +91,14 @@ export const encodeTransferMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
-export const encodeRejectMetadata = (reason: string, single = true) => {
+export const encodeRejectionMetadata = (id: string, single = true) => {
   const encodedData = ethers.utils.defaultAbiCoder.encode(
-    actionMetadataTypes.reject,
-    [reason]
+    actionMetadataTypes.rejection,
+    [id]
   );
 
   const data = encodeMetadata({
-    type: "reject",
+    type: "rejection",
     encodedData,
   });
 
@@ -253,6 +256,57 @@ export const encodeBridgeMetadata = (
   return single ? encodeMultipleActions(data) : data;
 };
 
+export const encodeChangeThresholdMetadata = (
+  threshold: string | number,
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["change-threshold"],
+    [toBN(threshold).toNumber()]
+  );
+
+  const data = encodeMetadata({
+    type: "change-threshold",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeRemoveSignersMetadata = (
+  addresses: string[],
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["remove-signers"],
+    [addresses]
+  );
+
+  const data = encodeMetadata({
+    type: "remove-signers",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
+export const encodeAddSignersMetadata = (
+  addresses: string[],
+  single = true
+) => {
+  const encodedData = ethers.utils.defaultAbiCoder.encode(
+    actionMetadataTypes["add-signers"],
+    [addresses]
+  );
+
+  const data = encodeMetadata({
+    type: "add-signers",
+    encodedData,
+  });
+
+  return single ? encodeMultipleActions(data) : data;
+};
+
 export const encodeMultipleActions = (...actionData: string[]) => {
   return ethers.utils.defaultAbiCoder.encode(multiMetadataTypes, [actionData]);
 };
@@ -325,9 +379,96 @@ const getMetadataFromData = (data: string) => {
   return metadata;
 };
 
+
+const typesPayload: IPayload = {
+  "transfer": (data, type) => ({
+    type,
+    token: data.token,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+  }),
+  "bridge": (data, type) => ({
+    type,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+    toToken: data.toToken,
+    fromToken: data.fromToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    bridgeFee: toBN(data.bridgeFee).toFixed(),
+  }),
+  "swap": (data, type) => ({
+    type,
+    buyAmount: toBN(data.buyAmount).toFixed(),
+    sellAmount: toBN(data.sellAmount).toFixed(),
+    buyToken: data.buyToken,
+    sellToken: data.sellToken,
+    receiver: data.receiver,
+    protocol: utils.parseBytes32String(data.protocol || ""),
+  }),
+  "upgrade": (data, type) => ({
+    type,
+    version: utils.parseBytes32String(data.version || ""),
+    walletImpl: data.walletImpl,
+  }),
+  "gas-topup": (data, type) => ({
+    type,
+    amount: toBN(data.amount).toFixed(),
+    token: data.token,
+    onBehalf: data.onBehalf,
+  }),
+  "dapp": (data, type) => ({
+    type,
+    name: data.name,
+    url: data.url,
+  }),
+  "deploy": (data, type) => ({
+    type,
+  }),
+  "permit2": (data, type) => ({
+    type,
+    token: data.token,
+    spender: data.spender,
+    amount: toBN(data.amount).toFixed(),
+    expiration: data.expiration,
+  }),
+  "cross-transfer": (data, type) => ({
+    type,
+    fromToken: data.fromToken,
+    toToken: data.toToken,
+    toChainId: data.toChainId ? data.toChainId.toString() : null,
+    amount: toBN(data.amount).toFixed(),
+    receiver: data.receiver,
+  }),
+  "auth": (data) => ({
+    type: data.remove ? "remove-authority" : "add-authority",
+    address: data.address,
+    chainId: data.chainId ? data.chainId.toString() : null,
+    remove: data.remove,
+  }),
+  "instadapp-pro": (data, type) => ({
+    type,
+    castDetails: data.castDetails,
+  }),
+  "rejection": (data, type) => ({
+    type,
+    id: data.id,
+  }),
+  "add-signers": (data, type) => ({
+    type,
+    addresses: data.signers,
+  }),
+  "remove-signers": (data, type) => ({
+    type,
+    addresses: data.signers,
+  }),
+  "change-threshold": (data, type) => ({
+    type,
+    count: data.count,
+  })
+};
+
 const parseMetadata = (metadata: string) => {
   const metadataArr = [];
-  let payload = {};
 
   const [decodedMultiMetadata = []] =
     (ethers.utils.defaultAbiCoder.decode(
@@ -350,121 +491,20 @@ const parseMetadata = (metadata: string) => {
       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;
-
-      case "reject":
-        payload = {
-          type,
-          reason: decodedData.reason,
-        };
-        break;
+    const payloadFunc = typesPayload[type]
+    
+    if (payloadFunc) {
+      const payload = payloadFunc(decodedData, type)
+      metadataArr.push(payload);
     }
 
-    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/utils.d.ts

@@ -13,6 +13,25 @@ type ChainId =
   | 63400;
 
 type ISlackMessageType = "danger" | "error" | "success" | "banner";
+type MetadataTypes =  "transfer"
+    | "bridge"
+    | "swap"
+    | "gas-topup"
+    | "upgrade"
+    | "dapp"
+    | "deploy"
+    | "permit2"
+    | "cross-transfer"
+    | "auth"
+  | "rejection"
+  | 'instadapp-pro'
+  | 'add-signers'
+  | 'remove-signers'
+  | 'change-threshold'
+
+type PayloadFunction = (data: any, type: MetadataTypes) => any;
+
+type IPayload = Record<MetadataTypes, PayloadFunction>;
 
 interface Network {
   name: string;
@@ -101,19 +120,7 @@ type SwapMetadataProps = {
 };
 
 type MetadataProps = {
-  type:
-    | "transfer"
-    | "bridge"
-    | "swap"
-    | "multi"
-    | "gas-topup"
-    | "upgrade"
-    | "dapp"
-    | "deploy"
-    | "permit2"
-    | "cross-transfer"
-    | "auth"
-    | "reject";
+  type: MetadataTypes,
   encodedData: string;
   version?: string;
 };