From 19bd21c9ec101e497e4b98ea9e648f9aab10bd5f Mon Sep 17 00:00:00 2001
From: Roy <92044428+impelcrypto@users.noreply.github.com>
Date: Thu, 22 Feb 2024 10:35:42 +0800
Subject: [PATCH 1/4] fix: rollbacked to zKatana (#1199)
---
src/boot/api.ts | 2 +-
src/components/assets/Account.vue | 8 +-
src/components/assets/EvmNativeToken.vue | 6 +-
src/components/bridge/BridgeSelection.vue | 8 +-
.../bridge/common/ImportTokenInfo.vue | 6 +-
src/components/bridge/ethereum/L1History.vue | 4 +-
src/components/header/mobile/MobileNav.vue | 6 +-
.../header/modals/ModalNetworkWallet.vue | 32 +--
.../header/modals/SelectNetwork.vue | 4 +-
src/components/sidenav/SidebarDesktop.vue | 6 +-
src/config/chain.ts | 8 +-
src/config/chainEndpoints.ts | 14 +-
src/config/web3/abi/zkevm-bridge-abi.json | 241 ++----------------
src/config/web3/index.ts | 14 +-
src/config/web3/utils/index.ts | 6 +-
src/hooks/bridge/useL1Bridge.ts | 2 +-
src/hooks/bridge/useL1History.ts | 4 +-
src/hooks/helper/wallet.ts | 6 +-
src/hooks/useGasPrice.ts | 8 +-
src/hooks/useNetworkInfo.ts | 8 +-
src/i18n/en-US/index.ts | 2 +-
src/i18n/es/index.ts | 2 +-
src/i18n/fr/index.ts | 2 +-
src/i18n/ja/index.ts | 2 +-
src/i18n/pt/index.ts | 2 +-
src/modules/xcm/index.ts | 2 +-
src/modules/xcm/tokens/index.ts | 2 +-
src/modules/zk-evm-bridge/l1-bridge/index.ts | 23 +-
src/modules/zk-evm-bridge/l1-bridge/utils.ts | 4 +-
.../implementations/EvmAssetsRepository.ts | 2 +-
.../implementations/ZkBridgeRepository.ts | 20 +-
31 files changed, 124 insertions(+), 332 deletions(-)
diff --git a/src/boot/api.ts b/src/boot/api.ts
index 023c02181..8d89896a3 100644
--- 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
index 7f0b8b6de..6816c9e25 100644
--- a/src/components/assets/Account.vue
+++ b/src/components/assets/Account.vue
@@ -18,7 +18,7 @@
Shibuya EVM (L1)
- Astar zKyoto
+ Astar zKatana
@@ -27,8 +27,8 @@
{{ currentNetworkName.replace('Network', '') }}
EVM (L1)
-
- Astar zKyoto
+
+ Astar zKatana
Astar zkEVM
@@ -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
index eb41cacb8..68d179a53 100644
--- a/src/components/assets/EvmNativeToken.vue
+++ b/src/components/assets/EvmNativeToken.vue
@@ -56,7 +56,7 @@
-
+
@@ -105,7 +105,7 @@ export default defineComponent({
const isFaucet = ref(false);
const isModalFaucet = ref(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
index 589ca2433..131e9fbd6 100644
--- 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(() => {
- return currentNetworkName.value === EthBridgeNetworkName.Zkyoto
+ return currentNetworkName.value === EthBridgeNetworkName.Zkatana
? EthBridgeNetworkName.Sepolia
: EthBridgeNetworkName.Ethereum;
});
const l2Name = computed(() => {
- return currentNetworkName.value === EthBridgeNetworkName.Zkyoto
- ? EthBridgeNetworkName.Zkyoto
+ return currentNetworkName.value === EthBridgeNetworkName.Zkatana
+ ? EthBridgeNetworkName.Zkatana
: EthBridgeNetworkName.AstarZk;
});
const substrateNetwork = computed(() => {
- return currentNetworkName.value === EthBridgeNetworkName.Zkyoto ? 'Shibuya' : 'Astar';
+ return currentNetworkName.value === EthBridgeNetworkName.Zkatana ? 'Shibuya' : 'Astar';
});
const cbridgeNetworkName = computed(() => {
diff --git a/src/components/bridge/common/ImportTokenInfo.vue b/src/components/bridge/common/ImportTokenInfo.vue
index a5699782d..95b0ef6e1 100644
--- 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
index 9421a1a93..89ea18da1 100644
--- 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
index 0c275a21f..dc8682af6 100644
--- a/src/components/header/mobile/MobileNav.vue
+++ b/src/components/header/mobile/MobileNav.vue
@@ -38,7 +38,7 @@