@instadapp/avocado-base 0.0.0-dev.f5f443b → 0.0.0-dev.fa14908

package/components/metadata/Bridge.vue

@@ -0,0 +1,59 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  metadata: any;
+  chain_id: number | string
+}>();
+
+const compact = inject('compact');
+const tokens = inject<ITokenPrice[]>('tokens');
+
+const toToken = asyncComputed(() =>
+{
+   if (Array.isArray(tokens) && !tokens.length) return null;
+    return  fetchTokenByAddress(props.metadata?.toToken, props.metadata?.toChainId, tokens)
+  }
+);
+
+const fromToken = asyncComputed(() =>
+{
+   if (Array.isArray(tokens) && !tokens.length) return null;
+    return  fetchTokenByAddress(props.metadata?.fromToken, props.chain_id, tokens)
+  }
+);
+
+const isTokensSame = computed(() => {
+  return toToken.value?.symbol === fromToken.value?.symbol
+})
+
+const bridgeAmountFormatted = computed(() =>
+  formatDecimal(
+    fromWei(props.metadata?.amount, fromToken?.value?.decimals).toFixed()
+  )
+);
+</script>
+
+<template>
+  <div v-if="!toToken || !fromToken" class="rounded-5 w-24 h-4 loading-box" />
+  <div
+    class="flex gap-5 items-center"
+    v-if="toToken && fromToken"
+  >
+    <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="fromToken.logo_url" />
+      {{ bridgeAmountFormatted }}
+      <span class="uppercase">{{ fromToken?.symbol }}</span>
+      <SvgoBridge class="text-slate-400 w-4 h-4" />
+      <template v-if="!isTokensSame">
+        <img width="20" height="20" class="w-5 h-5" :src="toToken.logo_url" />
+        <span class="uppercase">{{ toToken?.symbol }}</span>
+      </template>
+      <span class="flex items-center gap-2.5">
+        on
+        <ChainLogo class="w-5" :chain="metadata.toChainId" />
+        <span>{{ chainIdToName(metadata.toChainId) }}</span>
+      </span>
+    </span>
+  </div>
+</template>

package/components/metadata/CrossTransfer.vue

@@ -0,0 +1,71 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  metadata: any;
+  chain_id: number | string
+}>();
+
+const compact = inject('compact');
+const tokens = inject<ITokenPrice[]>('tokens');
+
+const fromToken = asyncComputed(() => {
+  if (!props?.chain_id) return null;
+
+  if (Array.isArray(tokens) && !tokens.length) return null;
+
+  return fetchTokenByAddress(
+    props.metadata?.fromToken,
+    props?.chain_id,
+    tokens
+  );
+});
+
+const formattedFromAmount = computed(() =>
+  formatDecimal(
+    fromWei(props.metadata?.amount, fromToken?.value?.decimals).toFixed()
+  )
+);
+</script>
+
+<template>
+  <div class="h-[60px]" v-if="!fromToken">
+    <div class="rounded-5 w-24 h-4 loading-box" />
+  </div>
+  <div class="flex gap-5 flex-col" v-else>
+    <div class="flex items-center gap-5">
+      <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 }}
+        <span class="uppercase">{{ fromToken?.symbol }}</span>
+      </span>
+    </div>
+
+    <div class="flex items-center gap-2.5">
+      <span class="flex items-center gap-2.5">
+        <ChainLogo class="w-5" :chain="chain_id" />
+        <span>{{ chainIdToName(chain_id) }}</span>
+      </span>
+
+      <SvgoArrowRight class="w-4 h-4 text-slate-400" />
+
+      <span class="flex items-center gap-2.5">
+        <ChainLogo class="w-5" :chain="metadata?.toChainId" />
+
+        <a
+          target="_blank"
+          class="text-primary"
+          :href="
+            getExplorerUrl(
+              metadata?.toChainId,
+              `/address/${metadata.receiver}`
+            )
+          "
+          >{{ shortenHash(metadata.receiver) }}</a
+        >
+        on
+        <span>{{ chainIdToName(metadata?.toChainId) }}</span>
+      </span>
+    </div>
+  </div>
+</template>

package/components/metadata/GasTopup.vue

@@ -0,0 +1,39 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  metadata: any;
+  chain_id: number | string
+}>();
+
+const tokens = inject<ITokenPrice[]>('tokens');
+
+const token = asyncComputed(() =>
+{
+  if (Array.isArray(tokens) && !tokens.length) return null;
+
+  return fetchTokenByAddress(props.metadata?.token, props?.chain_id, tokens)
+ }
+);
+
+const compact = inject('compact');
+
+const formattedAmount = computed(() =>
+  formatDecimal(
+    fromWei(props.metadata?.amount, token?.value?.decimals).toFixed()
+  )
+);
+</script>
+
+<template>
+  <div v-if="!token" 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="token?.logo_url" />
+      {{ formattedAmount }}
+      <span class="uppercase">{{ token?.symbol }}</span>
+      <SvgoGas class="w-4 h-4 text-slate-400 mx-2" />
+      <span>{{ shortenHash(metadata.onBehalf) }}</span>
+    </span>
+  </div>
+</template>

package/components/metadata/Permit2.vue

@@ -0,0 +1,42 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  metadata: any;
+  chain_id: number | string
+}>();
+
+const tokens = inject<ITokenPrice[]>('tokens');
+
+const token = asyncComputed(() =>
+{
+  if (Array.isArray(tokens) && !tokens.length) return null;
+  return fetchTokenByAddress(props.metadata?.token, props?.chain_id, tokens)
+}
+);
+
+const calculateDate = (timestamp: number) => {
+  return new Date(timestamp * 1000).toLocaleString();
+};
+</script>
+
+<template>
+  <div v-if="!token" class="rounded-5 w-24 h-4 loading-box" />
+  <div v-else class="inline-flex items-center gap-2 flex-wrap">
+    <span>Permit2 Allowance: </span>
+    <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url" />
+    <span class="capitalize">{{ token?.symbol }}</span>
+    to
+    <NuxtLink
+      class="text-primary"
+      :href="
+        getExplorerUrl(chain_id, `/address/${metadata.spender}`)
+      "
+      target="_blank"
+      external
+    >
+      {{ shortenHash(metadata.spender) }}
+    </NuxtLink>
+    |
+    <span> Expiration date at {{ calculateDate(metadata?.expiration) }}</span>
+  </div>
+</template>

package/components/metadata/Signers.vue

@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import { Tippy } from 'vue-tippy'
+const props = defineProps<{
+  metadata: {
+    type: MetadataTypes,
+    [key: string]: any
+  };
+  compact?: boolean;
+}>();
+</script>
+
+<template>
+  <div>
+    <div v-if="!compact || metadata.addresses.length < 3" class="flex gap-[14px] flex-wrap">
+        <div v-for="address of metadata.addresses" :key="address" class="flex gap-[8px] rounded-full bg-slate-50 dark:bg-gray-850 justify-start items-center px-[8px] py-[6px]">
+          <AuthorityAvatar :address="address" class="w-[18px] h-[18px]" />
+          <p class="text-xs leading-5">
+            {{ shortenHash(address, compact ? 2 : 4) }}
+          </p>
+        </div>
+    </div>
+    <div v-else class="flex gap-2 flex-wrap items-center">
+      <div v-for="address of [metadata.addresses[0], metadata.addresses[1]]" :key="address" class="flex gap-[8px] rounded-full bg-slate-50 dark:bg-gray-850 justify-start items-center px-[8px] py-[6px]">
+        <AuthorityAvatar :address="address" class="w-[18px] h-[18px]" />
+        <p class="text-xs leading-5">
+          {{ shortenHash(address, 2) }}
+        </p>
+      </div>
+      ...
+      <Tippy max-width="none" interactive tag="button" content-tag="div" content-class="content-wrapper">
+        <template #default>
+          <SvgoInfo2 class="w-[16px] h-[16px] text-slate-500 rounded-full" />
+        </template>
+        <template #content>
+          <ul class="flex flex-col gap-2.5">
+            <li v-for="address in metadata.addresses" :key="address" class="flex text-xs items-center gap-2.5">
+              <AuthorityAvatar class="shrink-0 w-5 h-5" :address="address" />
+              {{ address }}
+            </li>
+          </ul>
+        </template>
+      </Tippy>
+    </div>
+  </div>
+</template>

package/components/metadata/Swap.vue

@@ -0,0 +1,74 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  metadata: any;
+  chain_id: number | string
+}>();
+
+const compact = inject('compact');
+const tokens = inject<ITokenPrice[]>('tokens');
+
+const buyToken = asyncComputed(() =>
+{
+  if (Array.isArray(tokens) && !tokens.length) return null;
+    return fetchTokenByAddress(props.metadata?.buyToken, props?.chain_id, tokens) 
+  }
+);
+const sellToken = asyncComputed(() =>
+{
+  if (Array.isArray(tokens) && !tokens.length) return null;
+  return  fetchTokenByAddress(props.metadata?.sellToken, props?.chain_id, tokens)
+  }
+);
+
+const sellAmountFormatted = computed(() =>
+  formatDecimal(
+    fromWei(props.metadata?.sellAmount, sellToken?.value?.decimals).toFixed()
+  )
+);
+
+const buyAmountFormatted = computed(() =>
+  formatDecimal(
+    fromWei(props.metadata?.buyAmount, buyToken?.value?.decimals).toFixed()
+  )
+);
+
+const formatProtocol = (protocol: string) => {
+  return (
+    new Map([
+      ["1inch-v5", "1inch"],
+      ["0x-v1", "0x"],
+      ["paraswap-v5", "Paraswap"],
+      ["kyber-v1", "Kyber Network"],
+    ]).get(protocol) || protocol
+  );
+};
+
+
+</script>
+
+<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>
+      </span>
+    </div>
+</template>

package/components/metadata/Transfer.vue

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+
+const props = defineProps<{
+  metadata: any;
+  chain_id: number | string
+}>();
+
+const compact = inject('compact');
+const tokens = inject<ITokenPrice[]>('tokens');
+
+const token = asyncComputed(() => {
+  if (!props?.chain_id) return null;
+
+  if (Array.isArray(tokens) && !tokens.length) return null;
+
+  return fetchTokenByAddress(
+    props.metadata?.token,
+    props?.chain_id,
+    tokens
+  );
+});
+
+const formattedAmount = computed(() =>
+  formatDecimal(
+    fromWei(props.metadata?.amount, token?.value?.decimals).toFixed()
+  )
+);
+</script>
+
+<template>
+  <div v-if="!token" 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">
+      {{ formattedAmount }}
+      <span class="uppercase">{{ token?.symbol }}</span>
+      <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url" />
+      <SvgoArrowRight class="w-4 h-4 text-slate-400 mx-2" />
+      <NuxtLink
+        class="text-primary"
+        target="_blank"
+        external
+        :to="
+          getExplorerUrl(chain_id, `/address/${metadata.receiver}`)
+        "
+        >{{ shortenHash(metadata.receiver) }}
+        </NuxtLink>
+    </span>
+  </div>
+</template>

package/components.d.ts

@@ -0,0 +1,13 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+  }
+}

package/contracts/Forwarder.ts

@@ -84,9 +84,9 @@ export declare namespace AvoCoreStructs {
 
   export type CastForwardParamsStruct = {
     gas: PromiseOrValue<BigNumberish>;
-    validUntil: PromiseOrValue<BigNumberish>;
-    validAfter: PromiseOrValue<BigNumberish>;
     gasPrice: PromiseOrValue<BigNumberish>;
+    validAfter: PromiseOrValue<BigNumberish>;
+    validUntil: PromiseOrValue<BigNumberish>;
   };
 
   export type CastForwardParamsStructOutput = [
@@ -96,9 +96,9 @@ export declare namespace AvoCoreStructs {
     BigNumber
   ] & {
     gas: BigNumber;
-    validUntil: BigNumber;
-    validAfter: BigNumber;
     gasPrice: BigNumber;
+    validAfter: BigNumber;
+    validUntil: BigNumber;
   };
 
   export type SignatureParamsStruct = {

package/contracts/factories/Forwarder__factory.ts

@@ -535,7 +535,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -545,7 +545,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],
@@ -788,7 +788,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -798,7 +798,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],
@@ -1122,7 +1122,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -1132,7 +1132,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],
@@ -1393,7 +1393,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "validUntil",
+            name: "gasPrice",
             type: "uint256",
           },
           {
@@ -1403,7 +1403,7 @@ const _abi = [
           },
           {
             internalType: "uint256",
-            name: "gasPrice",
+            name: "validUntil",
             type: "uint256",
           },
         ],

package/nuxt.config.ts

@@ -1,4 +1,20 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
+import ViteComponents from "unplugin-vue-components/vite";
+
 export default defineNuxtConfig({
-  modules: ["@nuxtjs/tailwindcss"],
+  modules: ["@nuxtjs/tailwindcss", "nuxt-svgo", "@vueuse/nuxt"],
+  svgo: {
+    defaultImport: "component",
+    autoImportPath: "./assets/images/icons",
+    svgoConfig: {
+      plugins: ["prefixIds"],
+    },
+  },
+  vite: {
+    plugins: [
+      ViteComponents({
+        dts: true,
+      }),
+    ],
+  },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/avocado-base",
-  "version": "0.0.0-dev.f5f443b",
+  "version": "0.0.0-dev.fa14908",
   "type": "module",
   "main": "./nuxt.config.ts",
   "types": "global.d.ts",
@@ -16,12 +16,17 @@
     "@instadapp/avocado-dev": "npm:@instadapp/avocado@dev",
     "@nuxtjs/tailwindcss": "^6.6.5",
     "@typechain/ethers-v5": "^10.2.0",
-    "nuxt": "^3.3.3",
+    "nuxt": "^3.6.1",
+    "nuxt-svgo": "^3.1.0",
     "rimraf": "^3.0.2",
-    "typechain": "^8.1.1"
+    "typechain": "^8.1.1",
+    "unplugin-vue-components": "^0.25.1",
+    "vue-tippy": "^6.0.0"
   },
   "dependencies": {
+    "@vueuse/nuxt": "^10.2.0",
     "bignumber.js": "^9.1.1",
-    "ethers": "^5.7.2"
+    "ethers": "^5.7.2",
+    "xxhashjs": "^0.2.2"
   }
 }

package/utils/avocado.ts

@@ -20,3 +20,5 @@ export const AVO_STAGING_DEPOSIT_ADDRESS =
 export const AVO_PROD_RPC_URL = "https://rpc.avocado.instadapp.io";
 
 export const AVO_STAGING_RPC_URL = "https://rpc.avocado.instad.app";
+
+export const blockQueryURL = "https://blockquery.instadapp.io";

package/utils/bignumber.ts

@@ -1,6 +1,8 @@
 import { BigNumber } from "bignumber.js";
 import { BigNumber as BN } from "ethers";
 
+type CombinedBigNumber = BigNumber | string | number;
+
 export const toBN = (value: BigNumber.Value | BN) =>
   new BigNumber(BN.isBigNumber(value) ? value.toString() : value);
 export const isZero = (value: BigNumber.Value | BN) => toBN(value).isZero();
@@ -29,3 +31,21 @@ export const ensureValue = (value: any) => {
 export const max = (...args: BigNumber.Value[]) => {
   return BigNumber.max(...args);
 };
+
+export function pow(value: CombinedBigNumber, exponent: string | number) {
+  return toBN(value).pow(toBN(exponent));
+}
+
+export function toWei(val: CombinedBigNumber, decimals: number): string {
+  const num = toBN(val);
+  const multiplier = pow(10, decimals);
+  return times(num, multiplier).toFixed(0);
+}
+
+export function fromWei(val: CombinedBigNumber, decimal = 18) {
+  return toBN(val).div(new BigNumber(10).pow(decimal));
+}
+
+export function abs(value: CombinedBigNumber) {
+  return toBN(value).abs();
+}

package/utils/formatter.ts

@@ -72,7 +72,7 @@ export function formatDecimal(value: string | number, fractionDigits?: number) {
     let decimals;
 
     if (num.lt(1)) {
-      decimals = 8;
+      decimals = 4;
     } else if (num.lt(10)) {
       decimals = 6;
     } else if (num.lt(100)) {

package/utils/helper.ts

@@ -52,3 +52,11 @@ 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
+}
+