Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotfix: merge the hotfix to main branch #1201

Merged
merged 4 commits into from
Feb 27, 2024
Merged

hotfix: merge the hotfix to main branch #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19bd21c
fix: rollbacked to zKatana (#1199)
impelcrypto Feb 22, 2024
0f3b4e3
AgeOfChronos Dapp Promotion V3 (#1185)
SfyLabs-HASC Feb 22, 2024
57f8587
add Destore for Promotion (#1198)
TopCodeBeast Feb 23, 2024
d48713f
fix: image name
impelcrypto Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/images/dapp_promotions/age_of_chronos.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/dapp_promotions/destore.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/boot/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions src/components/assets/Account.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/components/assets/EvmNativeToken.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -161,7 +161,7 @@ export default defineComponent({
isFaucet,
isModalFaucet,
isZkEvm,
isZkyoto,
isZkatana,
faucetSethLink,
width,
screenSize,
Expand Down
8 changes: 4 additions & 4 deletions src/components/bridge/BridgeSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(() => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/bridge/common/ImportTokenInfo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/bridge/ethereum/L1History.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/components/header/mobile/MobileNav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</router-link>

<button
v-if="isZkyoto"
v-if="isZkatana"
:disabled="true"
:class="['link', path === 'dashboard' && 'active-link']"
>
Expand Down Expand Up @@ -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']);
Expand All @@ -127,7 +127,7 @@ export default defineComponent({
path,
RoutePath,
network,
isZkyoto,
isZkatana,
};
},
});
Expand Down
32 changes: 16 additions & 16 deletions src/components/header/modals/ModalNetworkWallet.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 => {
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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 => {
Expand All @@ -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;
}
};

Expand All @@ -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);
}
};

Expand All @@ -391,7 +391,7 @@ export default defineComponent({
randomizedEndpoint(endpointKey.SHIDEN);
randomizedEndpoint(endpointKey.SHIBUYA);
randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
randomizedEndpoint(endpointKey.ZKYOTO);
randomizedEndpoint(endpointKey.ZKATANA);
return;
}

Expand All @@ -400,7 +400,7 @@ export default defineComponent({
randomizedEndpoint(endpointKey.ASTAR);
randomizedEndpoint(endpointKey.SHIBUYA);
randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
randomizedEndpoint(endpointKey.ZKYOTO);
randomizedEndpoint(endpointKey.ZKATANA);
return;
}

Expand All @@ -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);
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/header/modals/SelectNetwork.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/components/sidenav/SidebarDesktop.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' : '']"
Expand Down Expand Up @@ -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']);
Expand Down Expand Up @@ -179,7 +179,7 @@ export default defineComponent({
path,
RoutePath,
socialUrl,
isZkyoto,
isZkatana,
};
},
});
Expand Down
8 changes: 4 additions & 4 deletions src/config/chain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export enum astarChain {
ASTAR = 'Astar',
DEVELOPMENT = 'Development',
ASTAR_ZKEVM = 'Astar zkEVM',
ZKYOTO = 'zKyoto Testnet',
ZKATANA = 'zKatana Testnet',
ROCSTAR = 'Rocstar Testnet',
}

Expand All @@ -15,7 +15,7 @@ export type ASTAR_CHAIN =
| astarChain.ASTAR
| astarChain.SHIBUYA
| astarChain.ASTAR_ZKEVM
| astarChain.ZKYOTO
| astarChain.ZKATANA
| astarChain.DEVELOPMENT
| astarChain.ROCSTAR;

Expand All @@ -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'];
14 changes: 7 additions & 7 deletions src/config/chainEndpoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export enum endpointKey {
SHIDEN = 1,
SHIBUYA = 2,
ASTAR_ZKEVM = 3,
ZKYOTO = 4,
ZKATANA = 4,
LOCAL = 5,
CUSTOM = 6,
ROCSTAR = 7,
Expand Down Expand Up @@ -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',
Expand Down
Loading
Loading