hotfix: merge the hotfix to main branch (#1201)

* fix: rollbacked to zKatana (#1199) * AgeOfChronos Dapp Promotion V3 (#1185) * Enable dApp staking v3 on Astar (#1182) * AgeOfChronos Dapp Promotion V3 --------- Co-authored-by: Bobo <[email protected]> * add Destore for Promotion (#1198) * Enable dApp staking v3 on Astar (#1182) * add Destore for Promotion --------- Co-authored-by: Bobo <[email protected]> * fix: image name --------- Co-authored-by: SFY Labs <[email protected]> Co-authored-by: Bobo <[email protected]> Co-authored-by: TopCodeBeast <[email protected]>
AstarNetwork · Feb 27, 2024 · 296b9a4 · 296b9a4
1 parent dfeab9e
commit 296b9a4
Show file tree

Hide file tree

Showing 34 changed files with 131 additions and 333 deletions.
diff --git a/public/images/dapp_promotions/age_of_chronos.png b/public/images/dapp_promotions/age_of_chronos.png
diff --git a/public/images/dapp_promotions/destore.jpg b/public/images/dapp_promotions/destore.jpg
diff --git a/src/boot/api.ts b/src/boot/api.ts
@@ -133,7 +133,7 @@ export default boot(async ({ store }) => {
   watchPostEffect(async () => {
     store.commit('general/setChainInfo', chainInfo.value);
     const networkIdx = store.getters['general/networkIdx'];
-    const isZkEvm = networkIdx === endpointKey.ZKYOTO || networkIdx === endpointKey.ASTAR_ZKEVM;
+    const isZkEvm = networkIdx === endpointKey.ZKATANA || networkIdx === endpointKey.ASTAR_ZKEVM;
 
     if (isZkEvm) {
       await setWeb3(networkIdx);

diff --git a/src/components/assets/Account.vue b/src/components/assets/Account.vue
@@ -18,7 +18,7 @@
               <!-- zkEVM -->
               <template v-if="isZkEvm">
                 <a class="btn" href="/shibuya-testnet/assets"> Shibuya EVM (L1) </a>
-                <div v-if="isZkEvm" class="btn active">Astar zKyoto</div>
+                <div v-if="isZkEvm" class="btn active">Astar zKatana</div>
               </template>
 
               <!-- Astar EVM -->
@@ -27,8 +27,8 @@
                   {{ currentNetworkName.replace('Network', '') }}
                   EVM (L1)
                 </div>
-                <a v-if="currentNetworkIdx === 2" class="btn" href="/zkyoto-testnet/assets">
-                  Astar zKyoto
+                <a v-if="currentNetworkIdx === 2" class="btn" href="/zkatana-testnet/assets">
+                  Astar zKatana
                 </a>
                 <a v-else-if="currentNetworkIdx !== 1" class="btn" disabled>Astar zkEVM</a>
               </template>
@@ -313,7 +313,7 @@ export default defineComponent({
         return bg_img.native;
       } else if (currentNetworkIdx.value === endpointKey.SHIDEN) {
         return bg_img.shiden;
-      } else if (currentNetworkIdx.value === endpointKey.ZKYOTO) {
+      } else if (currentNetworkIdx.value === endpointKey.ZKATANA) {
         return bg_img.testnet_zk;
       }
       return bg_img.testnet;

diff --git a/src/components/assets/EvmNativeToken.vue b/src/components/assets/EvmNativeToken.vue
@@ -56,7 +56,7 @@
           </q-tooltip>
         </a>
 
-        <a v-if="isZkyoto" :href="faucetSethLink" target="_blank" rel="noopener noreferrer">
+        <a v-if="isZkatana" :href="faucetSethLink" target="_blank" rel="noopener noreferrer">
           <button class="btn btn--icon">
             <astar-icon-faucet />
           </button>
@@ -105,7 +105,7 @@ export default defineComponent({
     const isFaucet = ref<boolean>(false);
     const isModalFaucet = ref<boolean>(false);
 
-    const { currentNetworkName, nativeTokenSymbol, isZkEvm, isZkyoto } = useNetworkInfo();
+    const { currentNetworkName, nativeTokenSymbol, isZkEvm, isZkatana } = useNetworkInfo();
     const { currentAccount } = useAccount();
     const { nativeTokenUsd } = usePrice();
     const store = useStore();
@@ -161,7 +161,7 @@ export default defineComponent({
       isFaucet,
       isModalFaucet,
       isZkEvm,
-      isZkyoto,
+      isZkatana,
       faucetSethLink,
       width,
       screenSize,

diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
@@ -97,19 +97,19 @@ export default defineComponent({
     const { isZkEvm, currentNetworkName, networkNameSubstrate, isMainnet } = useNetworkInfo();
 
     const l1Name = computed<string>(() => {
-      return currentNetworkName.value === EthBridgeNetworkName.Zkyoto
+      return currentNetworkName.value === EthBridgeNetworkName.Zkatana
         ? EthBridgeNetworkName.Sepolia
         : EthBridgeNetworkName.Ethereum;
     });
 
     const l2Name = computed<string>(() => {
-      return currentNetworkName.value === EthBridgeNetworkName.Zkyoto
-        ? EthBridgeNetworkName.Zkyoto
+      return currentNetworkName.value === EthBridgeNetworkName.Zkatana
+        ? EthBridgeNetworkName.Zkatana
         : EthBridgeNetworkName.AstarZk;
     });
 
     const substrateNetwork = computed<string>(() => {
-      return currentNetworkName.value === EthBridgeNetworkName.Zkyoto ? 'Shibuya' : 'Astar';
+      return currentNetworkName.value === EthBridgeNetworkName.Zkatana ? 'Shibuya' : 'Astar';
     });
 
     const cbridgeNetworkName = computed<string>(() => {

diff --git a/src/components/bridge/common/ImportTokenInfo.vue b/src/components/bridge/common/ImportTokenInfo.vue
@@ -227,10 +227,10 @@ export default defineComponent({
           return String(blockExplorerUrls[EVM.SEPOLIA_TESTNET][0]);
         case EthBridgeNetworkName.AstarZk:
           return String(blockExplorerUrls[EVM.ASTAR_ZKEVM_MAINNET][0]);
-        case EthBridgeNetworkName.Zkyoto:
-          return String(blockExplorerUrls[EVM.ZKYOTO_TESTNET][0]);
+        case EthBridgeNetworkName.Zkatana:
+          return String(blockExplorerUrls[EVM.ZKATANA_TESTNET][0]);
         default:
-          return String(blockExplorerUrls[EVM.ZKYOTO_TESTNET][0]);
+          return String(blockExplorerUrls[EVM.ZKATANA_TESTNET][0]);
       }
     };
 

diff --git a/src/components/bridge/ethereum/L1History.vue b/src/components/bridge/ethereum/L1History.vue
@@ -246,8 +246,8 @@ export default defineComponent({
           return blockExplorerUrls[EVM.ETHEREUM_MAINNET] + txUrl;
         case EthBridgeNetworkName.Sepolia:
           return blockExplorerUrls[EVM.SEPOLIA_TESTNET] + txUrl;
-        case EthBridgeNetworkName.Zkyoto:
-          return blockExplorerUrls[EVM.ZKYOTO_TESTNET] + txUrl;
+        case EthBridgeNetworkName.Zkatana:
+          return blockExplorerUrls[EVM.ZKATANA_TESTNET] + txUrl;
         case EthBridgeNetworkName.AstarZk:
           return blockExplorerUrls[EVM.SEPOLIA_TESTNET] + txUrl;
 

diff --git a/src/components/header/mobile/MobileNav.vue b/src/components/header/mobile/MobileNav.vue
@@ -38,7 +38,7 @@
           </router-link>
 
           <button
-            v-if="isZkyoto"
+            v-if="isZkatana"
             :disabled="true"
             :class="['link', path === 'dashboard' && 'active-link']"
           >
@@ -114,7 +114,7 @@ export default defineComponent({
     const showNav = ref<boolean>(false);
     const router = useRouter();
     const path = computed(() => router.currentRoute.value.path.split('/')[2]);
-    const { isZkyoto } = useNetworkInfo();
+    const { isZkatana } = useNetworkInfo();
 
     const store = useStore();
     const currentNetworkIdx = computed(() => store.getters['general/networkIdx']);
@@ -127,7 +127,7 @@ export default defineComponent({
       path,
       RoutePath,
       network,
-      isZkyoto,
+      isZkatana,
     };
   },
 });

diff --git a/src/components/header/modals/ModalNetworkWallet.vue b/src/components/header/modals/ModalNetworkWallet.vue
@@ -168,7 +168,7 @@ export default defineComponent({
     const selEndpointShiden = ref<string>('');
     const selEndpointShibuya = ref<string>('');
     const selEndpointAstarZkevm = ref<string>('');
-    const selEndpointZkyoto = ref<string>('');
+    const selEndpointZkatana = ref<string>('');
 
     const setIsAnimatedIn = (result: boolean): void => {
       isAnimatedIn.value = result;
@@ -184,7 +184,7 @@ export default defineComponent({
     const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
     const isZkEvm = computed<boolean>(
       () =>
-        selNetworkId.value === endpointKey.ASTAR_ZKEVM || selNetworkId.value === endpointKey.ZKYOTO
+        selNetworkId.value === endpointKey.ASTAR_ZKEVM || selNetworkId.value === endpointKey.ZKATANA
     );
 
     const setInitialCustomEndpoint = (): string => {
@@ -219,8 +219,8 @@ export default defineComponent({
           return selEndpointShiden.value;
         case endpointKey.SHIBUYA:
           return selEndpointShibuya.value;
-        case endpointKey.ZKYOTO:
-          return selEndpointZkyoto.value;
+        case endpointKey.ZKATANA:
+          return selEndpointZkatana.value;
         case endpointKey.ASTAR_ZKEVM:
           return selEndpointAstarZkevm.value;
 
@@ -255,7 +255,7 @@ export default defineComponent({
       // Memo: zkEVM configuration is using substrate API to fetch the dApp staking information
       // that's why `isEndpointChange` returns fails in `isChangeNetwork` variable
       const isSwitchBetweenZkEvmTestnet =
-        networkIdxRef === endpointKey.SHIBUYA && currentNetworkIdx.value === endpointKey.ZKYOTO;
+        networkIdxRef === endpointKey.SHIBUYA && currentNetworkIdx.value === endpointKey.ZKATANA;
       const isSwitchBetweenZkEvmMainnet =
         networkIdxRef === endpointKey.ASTAR && currentNetworkIdx.value === endpointKey.ASTAR_ZKEVM;
 
@@ -333,7 +333,7 @@ export default defineComponent({
         ? selEndpointShibuya.value === endpoint
         : index === endpointKey.ASTAR_ZKEVM
         ? selEndpointAstarZkevm.value === endpoint
-        : selEndpointZkyoto.value === endpoint;
+        : selEndpointZkatana.value === endpoint;
     };
 
     const setSelNetwork = (networkId: number): void => {
@@ -355,8 +355,8 @@ export default defineComponent({
         selEndpointShibuya.value = endpointObj.endpoint;
       } else if (networkIdx === endpointKey.ASTAR_ZKEVM) {
         selEndpointAstarZkevm.value = endpointObj.endpoint;
-      } else if (networkIdx === endpointKey.ZKYOTO) {
-        selEndpointZkyoto.value = endpointObj.endpoint;
+      } else if (networkIdx === endpointKey.ZKATANA) {
+        selEndpointZkatana.value = endpointObj.endpoint;
       }
     };
 
@@ -380,8 +380,8 @@ export default defineComponent({
       if (networkIdx === endpointKey.ASTAR_ZKEVM) {
         selEndpointAstarZkevm.value = getRandomizedEndpoint(endpointKey.ASTAR_ZKEVM);
       }
-      if (networkIdx === endpointKey.ZKYOTO) {
-        selEndpointZkyoto.value = getRandomizedEndpoint(endpointKey.ZKYOTO);
+      if (networkIdx === endpointKey.ZKATANA) {
+        selEndpointZkatana.value = getRandomizedEndpoint(endpointKey.ZKATANA);
       }
     };
 
@@ -391,7 +391,7 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.SHIBUYA);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
-        randomizedEndpoint(endpointKey.ZKYOTO);
+        randomizedEndpoint(endpointKey.ZKATANA);
         return;
       }
 
@@ -400,7 +400,7 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIBUYA);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
-        randomizedEndpoint(endpointKey.ZKYOTO);
+        randomizedEndpoint(endpointKey.ZKATANA);
         return;
       }
 
@@ -409,18 +409,18 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
-        randomizedEndpoint(endpointKey.ZKYOTO);
+        randomizedEndpoint(endpointKey.ZKATANA);
         return;
       }
       if (networkIdx === endpointKey.ASTAR_ZKEVM) {
         selEndpointShibuya.value = setInitialSelEndpoint();
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.SHIBUYA);
-        randomizedEndpoint(endpointKey.ZKYOTO);
+        randomizedEndpoint(endpointKey.ZKATANA);
         return;
       }
-      if (networkIdx === endpointKey.ZKYOTO) {
+      if (networkIdx === endpointKey.ZKATANA) {
         selEndpointShibuya.value = setInitialSelEndpoint();
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
@@ -432,7 +432,7 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.SHIBUYA);
-        randomizedEndpoint(endpointKey.ZKYOTO);
+        randomizedEndpoint(endpointKey.ZKATANA);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
         return;
       }

diff --git a/src/components/header/modals/SelectNetwork.vue b/src/components/header/modals/SelectNetwork.vue
@@ -60,8 +60,8 @@
         </button>
         <button
           class="row--network box--hover--active"
-          :class="selNetworkId === endpointKey.ZKYOTO && 'border--active'"
-          @click="setSelNetwork(endpointKey.ZKYOTO)"
+          :class="selNetworkId === endpointKey.ZKATANA && 'border--active'"
+          @click="setSelNetwork(endpointKey.ZKATANA)"
         >
           <img
             class="img--network-logo"

diff --git a/src/components/sidenav/SidebarDesktop.vue b/src/components/sidenav/SidebarDesktop.vue
@@ -23,7 +23,7 @@
       </div>
       <div>
         <button
-          v-if="isZkyoto"
+          v-if="isZkatana"
           :disabled="true"
           class="link--disabled"
           :class="['link', $route.path.split('/')[2] === 'dashboard' ? 'activeLink' : '']"
@@ -143,7 +143,7 @@ export default defineComponent({
   },
   setup() {
     const { isOpen } = useSidebar();
-    const { isZkEvm, isZkyoto } = useNetworkInfo();
+    const { isZkEvm, isZkatana } = useNetworkInfo();
 
     const store = useStore();
     const currentNetworkIdx = computed<number>(() => store.getters['general/networkIdx']);
@@ -179,7 +179,7 @@ export default defineComponent({
       path,
       RoutePath,
       socialUrl,
-      isZkyoto,
+      isZkatana,
     };
   },
 });

diff --git a/src/config/chain.ts b/src/config/chain.ts
@@ -6,7 +6,7 @@ export enum astarChain {
   ASTAR = 'Astar',
   DEVELOPMENT = 'Development',
   ASTAR_ZKEVM = 'Astar zkEVM',
-  ZKYOTO = 'zKyoto Testnet',
+  ZKATANA = 'zKatana Testnet',
   ROCSTAR = 'Rocstar Testnet',
 }
 
@@ -15,7 +15,7 @@ export type ASTAR_CHAIN =
   | astarChain.ASTAR
   | astarChain.SHIBUYA
   | astarChain.ASTAR_ZKEVM
-  | astarChain.ZKYOTO
+  | astarChain.ZKATANA
   | astarChain.DEVELOPMENT
   | astarChain.ROCSTAR;
 
@@ -24,12 +24,12 @@ export type ASTAR_NETWORK_IDX =
   | endpointKey.SHIDEN
   | endpointKey.SHIBUYA
   | endpointKey.ASTAR_ZKEVM
-  | endpointKey.ZKYOTO
+  | endpointKey.ZKATANA
   | endpointKey.LOCAL
   | endpointKey.ROCSTAR;
 
 //Todo: add Astar zkEVM
-export type ASTAR_EVM_NETWORK_IDX = 592 | 336 | 81 | 4369 | 692 | 7759 | 6038361;
+export type ASTAR_EVM_NETWORK_IDX = 592 | 336 | 81 | 4369 | 692 | 7759;
 
 export type ASTAR_NATIVE_TOKEN = 'ASTR' | 'SDN' | 'SBY' | 'LOC' | 'RSTR' | 'ETH';
 export const astarMainnetNativeToken: ASTAR_NATIVE_TOKEN[] = ['ASTR', 'SDN'];
diff --git a/src/config/chainEndpoints.ts b/src/config/chainEndpoints.ts
@@ -28,7 +28,7 @@ export enum endpointKey {
   SHIDEN = 1,
   SHIBUYA = 2,
   ASTAR_ZKEVM = 3,
-  ZKYOTO = 4,
+  ZKATANA = 4,
   LOCAL = 5,
   CUSTOM = 6,
   ROCSTAR = 7,
@@ -139,20 +139,20 @@ export const providerEndpoints: ChainProvider[] = [
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/zkatana-logo.png?raw=true',
   },
   {
-    networkAlias: 'zkyoto-testnet',
-    displayName: 'zKyoto Network',
+    networkAlias: 'zkatana-testnet',
+    displayName: 'zKatana Network',
     endpoints: [
       { name: 'Shibuya', endpoint: 'wss://rpc.shibuya.astar.network' },
       { name: 'Dwellir', endpoint: 'wss://shibuya-rpc.dwellir.com' },
     ],
     isSupportContract: false,
     typeDef: typeDefs.plasmCollatorDefinitions,
-    key: endpointKey.ZKYOTO,
+    key: endpointKey.ZKATANA,
     isStoreEnabled: true,
     subscan: 'https://shibuya.subscan.io',
-    blockscout: 'https://explorer.zkyoto.gelato.digital',
-    evmChainId: '6038361',
-    evmEndpoints: ['https://rpc.zkyoto.gelato.digital'],
+    blockscout: 'https://zkatana.explorer.startale.com',
+    evmChainId: '1261120',
+    evmEndpoints: ['https://rpc.startale.com/zkatana', 'https://rpc.zkatana.gelato.digital'],
     faucetEndpoint: '',
     defaultLogo:
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/zkatana-logo.png?raw=true',