Merge pull request #2 from pendulum-chain/sync-forked-repo

Sync forked repo
AstarNetwork · Aug 12, 2024 · 9b5c335 · 9b5c335
2 parents 3e7e676 + 9e89be7
commit 9b5c335
Show file tree

Hide file tree

Showing 57 changed files with 3,466 additions and 551 deletions.
diff --git a/package.json b/package.json
@@ -31,22 +31,22 @@
     "@astar-network/metamask-astar-types": "^0.6.1",
     "@ethersproject/bignumber": "^5.5.0",
     "@layerzerolabs/scan-client": "^0.0.8",
-    "@polkadot/api": "^10.9.1",
-    "@polkadot/api-contract": "^10.9.1",
-    "@polkadot/extension-dapp": "0.46.5",
-    "@polkadot/hw-ledger": "^12.3.2",
-    "@polkadot/keyring": "^12.3.2",
-    "@polkadot/networks": "^12.3.2",
-    "@polkadot/rpc-provider": "^10.9.1",
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/types-known": "^10.9.1",
-    "@polkadot/types-support": "^10.9.1",
-    "@polkadot/ui-keyring": "^3.5.1",
-    "@polkadot/util": "^12.3.2",
-    "@polkadot/util-crypto": "^12.3.2",
-    "@polkadot/vue-identicon": "^3.5.1",
-    "@polkadot/wasm-crypto": "^7.2.1",
-    "@polkadot/x-randomvalues": "^12.3.2",
+    "@polkadot/api": "^11.3.1",
+    "@polkadot/api-contract": "^11.3.1",
+    "@polkadot/extension-dapp": "0.47.5",
+    "@polkadot/hw-ledger": "^12.6.2",
+    "@polkadot/keyring": "^12.6.2",
+    "@polkadot/networks": "^12.6.2",
+    "@polkadot/rpc-provider": "^11.3.1",
+    "@polkadot/types": "^11.3.1",
+    "@polkadot/types-known": "^11.3.1",
+    "@polkadot/types-support": "^11.3.1",
+    "@polkadot/ui-keyring": "^3.6.6",
+    "@polkadot/util": "^12.6.2",
+    "@polkadot/util-crypto": "^12.6.2",
+    "@polkadot/vue-identicon": "^3.6.6",
+    "@polkadot/wasm-crypto": "^7.3.2",
+    "@polkadot/x-randomvalues": "^12.6.2",
     "@quasar/app-webpack": "^3.11.2",
     "@quasar/extras": "^1.16.7",
     "@vue/apollo-composable": "^4.0.0-beta.4",
@@ -72,7 +72,7 @@
     "luxon": "^2.5.2",
     "marked": "^4.0.15",
     "path": "^0.12.7",
-    "polkasafe": "^1.1.10",
+    "polkasafe": "^1.4.2",
     "quasar": "^2.12.7",
     "query-string": "^7.1.0",
     "reflect-metadata": "^0.1.13",

diff --git a/src/components/assets/Account.vue b/src/components/assets/Account.vue
@@ -72,7 +72,7 @@
                 width="24"
                 :src="iconWallet"
                 alt="wallet-icon"
-                :class="multisig && 'img--polkasafe'"
+                :class="multisig && 'img--polkasafe-account'"
               />
             </div>
 
@@ -145,7 +145,7 @@
 </template>
 <script lang="ts">
 import { getShortenAddress, isValidEvmAddress, wait } from '@astar-network/astar-sdk-core';
-import { FrameSystemAccountInfo } from '@polkadot/types/lookup';
+import { FrameSystemAccountInfo } from 'src/v2/repositories/implementations';
 import copy from 'copy-to-clipboard';
 import { ethers } from 'ethers';
 import { $api } from 'src/boot/api';

diff --git a/src/components/assets/Erc20Currency.vue b/src/components/assets/Erc20Currency.vue
@@ -53,41 +53,43 @@
           </router-link>
 
           <div v-if="token.isWrappedToken && !token.isXC20">
-            <a :href="token.bridgeUrl" target="_blank" rel="noopener noreferrer">
+            <custom-router-link
+              :to="token.bridgeUrl ?? ''"
+              :is-disabled="!token.bridgeUrl || !isBridgeEnabled(token.bridgeUrl)"
+            >
               <button class="btn btn--icon">
                 <astar-icon-bridge class="icon--bridge" />
               </button>
               <span class="text--expand-menu">{{ $t('assets.wrap') }}</span>
               <q-tooltip>
                 <span class="text--tooltip">{{ $t('assets.wrap') }}</span>
               </q-tooltip>
-            </a>
+            </custom-router-link>
           </div>
 
           <div v-if="isZkEvm">
-            <a
+            <custom-router-link
               v-if="token.bridgeUrl"
-              :href="token.bridgeUrl"
-              target="_blank"
-              rel="noopener noreferrer"
+              :to="token.bridgeUrl"
+              :is-disabled="!isBridgeEnabled(token.bridgeUrl)"
             >
-              <button class="btn btn--icon">
-                <astar-icon-bridge class="icon--bridge" />
-              </button>
+              <button class="btn btn--icon"><astar-icon-bridge class="icon--bridge" /></button>
               <span class="text--expand-menu">{{ $t('assets.bridge') }}</span>
               <q-tooltip>
                 <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
               </q-tooltip>
-            </a>
-            <router-link v-else :to="buildEthereumBridgePageLink()">
-              <button class="btn btn--icon">
-                <astar-icon-bridge class="icon--bridge" />
-              </button>
+            </custom-router-link>
+            <custom-router-link
+              v-else
+              :to="buildEthereumBridgePageLink()"
+              :is-disabled="!nativeBridgeEnabled"
+            >
+              <button class="btn btn--icon"><astar-icon-bridge class="icon--bridge" /></button>
               <span class="text--expand-menu">{{ $t('assets.bridge') }}</span>
               <q-tooltip>
                 <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
               </q-tooltip>
-            </router-link>
+            </custom-router-link>
           </div>
 
           <a :href="explorerLink" target="_blank" rel="noopener noreferrer">
@@ -165,10 +167,13 @@ import { useStore } from 'src/store';
 import { PropType, computed, defineComponent, ref } from 'vue';
 import Jazzicon from 'vue3-jazzicon/src/components';
 import { truncate } from '@astar-network/astar-sdk-core';
+import { nativeBridgeEnabled, isBridgeEnabled } from 'src/features';
+import CustomRouterLink from '../common/CustomRouterLink.vue';
 
 export default defineComponent({
   components: {
     [Jazzicon.name]: Jazzicon,
+    CustomRouterLink,
   },
   props: {
     token: {
@@ -225,11 +230,13 @@ export default defineComponent({
       isTruncate,
       isFavorite,
       isZkEvm,
+      nativeBridgeEnabled,
       truncate,
       buildTransferPageLink,
       addToEvmProvider,
       handleDeleteStoredToken,
       buildEthereumBridgePageLink,
+      isBridgeEnabled,
     };
   },
 });

diff --git a/src/components/assets/EvmAssetList.vue b/src/components/assets/EvmAssetList.vue
@@ -43,7 +43,7 @@
   </div>
 </template>
 <script lang="ts">
-import { cbridgeAppLink, checkIsCbridgeToken } from 'src/c-bridge';
+import { checkIsCbridgeToken } from 'src/c-bridge';
 import AssetSearchOption from 'src/components/assets/AssetSearchOption.vue';
 import Erc20Currency from 'src/components/assets/Erc20Currency.vue';
 import EvmCbridgeToken from 'src/components/assets/EvmCbridgeToken.vue';
@@ -141,7 +141,6 @@ export default defineComponent({
       isSearch,
       search,
       filteredTokens,
-      cbridgeAppLink,
       isHideSmallBalances,
       isDarkTheme,
       icon_img,

diff --git a/src/components/assets/EvmCbridgeToken.vue b/src/components/assets/EvmCbridgeToken.vue
@@ -39,25 +39,27 @@
 
       <q-slide-transition :duration="150">
         <div v-show="isExpand || width >= screenSize.sm" class="row__right">
-          <router-link :to="buildTransferPageLink(token.symbol)">
-            <button class="btn btn--icon">
-              <astar-icon-transfer />
-            </button>
+          <custom-router-link :to="buildTransferPageLink(token.symbol)">
+            <button class="btn btn--icon"><astar-icon-transfer /></button>
             <span class="text--expand-menu">{{ $t('assets.send') }}</span>
             <q-tooltip>
               <span class="text--tooltip">{{ $t('assets.send') }}</span>
             </q-tooltip>
-          </router-link>
+          </custom-router-link>
 
-          <a :href="cbridgeAppLink" target="_blank" rel="noopener noreferrer">
-            <button class="btn btn--icon">
+          <div>
+            <button
+              class="btn btn--icon"
+              :disabled="!celerBridgeEnabled"
+              @click="navigateInNewTab(cbridgeAppLink)"
+            >
               <astar-icon-bridge class="icon--bridge" />
             </button>
             <span class="text--expand-menu">{{ $t('assets.bridge') }}</span>
             <q-tooltip>
               <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
             </q-tooltip>
-          </a>
+          </div>
 
           <a :href="explorerLink" target="_blank" rel="noopener noreferrer">
             <button class="btn btn--icon">
@@ -118,12 +120,15 @@ import { computed, defineComponent, PropType, ref } from 'vue';
 import { buildTransferPageLink } from 'src/router/routes';
 import { useNetworkInfo, useBreakpoints } from 'src/hooks';
 import Jazzicon from 'vue3-jazzicon/src/components';
-import TokenBalance from 'src/components/common/TokenBalance.vue';
 import { truncate } from '@astar-network/astar-sdk-core';
+import { celerBridgeEnabled } from 'src/features';
+import { navigateInNewTab } from 'src/util-general';
+import CustomRouterLink from '../common/CustomRouterLink.vue';
 
 export default defineComponent({
   components: {
     [Jazzicon.name]: Jazzicon,
+    CustomRouterLink,
   },
   props: {
     token: {
@@ -176,10 +181,12 @@ export default defineComponent({
       isExpand,
       isTruncate,
       isFavorite,
+      celerBridgeEnabled,
       truncate,
       buildTransferPageLink,
       formatTokenName,
       addToEvmProvider,
+      navigateInNewTab,
     };
   },
 });

diff --git a/src/components/assets/EvmNativeToken.vue b/src/components/assets/EvmNativeToken.vue
@@ -43,28 +43,32 @@
           </q-tooltip>
         </router-link>
 
-        <router-link v-if="isAstar" :to="buildLzBridgePageLink()">
-          <button class="btn btn--icon">
-            <astar-icon-bridge />
-          </button>
+        <custom-router-link
+          v-if="isAstar"
+          :to="buildLzBridgePageLink()"
+          :is-disabled="!layerZeroBridgeEnabled"
+        >
+          <button class="btn btn--icon"><astar-icon-bridge /></button>
           <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
           <q-tooltip>
             <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
           </q-tooltip>
-        </router-link>
+        </custom-router-link>
 
-        <router-link v-if="isZkEvm" :to="buildEthereumBridgePageLink()">
-          <button class="btn btn--icon">
-            <astar-icon-bridge />
-          </button>
+        <custom-router-link
+          v-if="isZkEvm"
+          :to="buildEthereumBridgePageLink()"
+          :is-disabled="!nativeBridgeEnabled"
+        >
+          <button class="btn btn--icon"><astar-icon-bridge /></button>
           <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
           <q-tooltip>
             <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
           </q-tooltip>
-        </router-link>
+        </custom-router-link>
 
         <!-- Only SDN is able to bridge via cBridge at this moment -->
-        <a
+        <!-- <a
           v-if="nativeTokenSymbol === 'SDN'"
           :href="cbridgeAppLink"
           target="_blank"
@@ -77,6 +81,15 @@
           <q-tooltip>
             <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
           </q-tooltip>
+        </a> -->
+        <a v-if="nativeTokenSymbol === 'SDN'">
+          <button class="btn btn--icon" disabled>
+            <astar-icon-bridge />
+          </button>
+          <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
+          <q-tooltip>
+            <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
+          </q-tooltip>
         </a>
 
         <a v-if="isZkyoto" :href="faucetSethLink" target="_blank" rel="noopener noreferrer">
@@ -120,9 +133,11 @@ import {
 } from 'src/router/routes';
 import { useStore } from 'src/store';
 import { computed, defineComponent, ref, watchEffect } from 'vue';
+import { nativeBridgeEnabled, layerZeroBridgeEnabled } from 'src/features';
+import CustomRouterLink from '../common/CustomRouterLink.vue';
 
 export default defineComponent({
-  components: { ModalFaucet },
+  components: { ModalFaucet, CustomRouterLink },
   props: {
     nativeTokenUsd: {
       type: Number,
@@ -199,6 +214,8 @@ export default defineComponent({
       screenSize,
       isTruncate,
       isAstar,
+      nativeBridgeEnabled,
+      layerZeroBridgeEnabled,
       truncate,
       handleModalFaucet,
       buildTransferPageLink,

diff --git a/src/components/assets/ZkAstr.vue b/src/components/assets/ZkAstr.vue
@@ -42,25 +42,35 @@
           </q-tooltip>
         </router-link>
 
-        <router-link v-if="t.symbol === 'ASTR'" :to="buildLzBridgePageLink()" class="box--icon">
+        <custom-router-link
+          v-if="t.symbol === 'ASTR'"
+          :to="buildLzBridgePageLink()"
+          :is-disabled="!layerZeroBridgeEnabled"
+          class="box--icon"
+        >
           <button class="btn btn--icon">
             <astar-icon-bridge />
           </button>
           <span class="text--mobile-menu">{{ $t('assets.bridge') }}</span>
           <q-tooltip>
             <span class="text--tooltip">{{ $t('assets.bridge') }}</span>
           </q-tooltip>
-        </router-link>
+        </custom-router-link>
 
-        <a v-else :href="vAstrOmniLink" target="_blank" rel="noopener noreferrer" class="box--icon">
+        <custom-router-link
+          v-else
+          :to="vAstrOmniLink"
+          :is-disabled="!omniBridgeEnabled"
+          class="box--icon"
+        >
           <button class="btn btn--icon">
             <astar-icon-bridge />
           </button>
           <span class="text--mobile-menu">{{ $t('assets.swap') }}</span>
           <q-tooltip>
             <span class="text--tooltip">{{ $t('assets.swap') }}</span>
           </q-tooltip>
-        </a>
+        </custom-router-link>
 
         <a
           :href="getExplorerLink(t.address)"
@@ -115,9 +125,11 @@ import { Erc20Token, getErc20Explorer } from 'src/modules/token';
 import { buildTransferPageLink, buildLzBridgePageLink } from 'src/router/routes';
 import { PropType, defineComponent } from 'vue';
 import { vAstrOmniLink } from '../../modules/zk-evm-bridge';
+import CustomRouterLink from 'src/components/common/CustomRouterLink.vue';
+import { layerZeroBridgeEnabled, omniBridgeEnabled } from 'src/features';
 
 export default defineComponent({
-  components: {},
+  components: { CustomRouterLink },
   props: {
     astrTokens: {
       type: Array as PropType<Erc20Token[]>,
@@ -140,6 +152,8 @@ export default defineComponent({
       addToEvmProvider,
       buildTransferPageLink,
       getExplorerLink,
+      layerZeroBridgeEnabled,
+      omniBridgeEnabled,
     };
   },
 });