From d8d48ae4ed7c904a7fba4affd3b628b462c5e3b4 Mon Sep 17 00:00:00 2001 From: Satyam Bansal Date: Thu, 13 Jun 2024 18:43:02 +0530 Subject: [PATCH] Update devnet prod url --- .github/workflows/manual-api-deploy-prod.yml | 2 +- .github/workflows/manual-ui-deploy-prod.yml | 2 +- api/src/cors.rs | 2 +- plugin/src/utils/network.ts | 102 +++++++++++-------- 4 files changed, 61 insertions(+), 47 deletions(-) diff --git a/.github/workflows/manual-api-deploy-prod.yml b/.github/workflows/manual-api-deploy-prod.yml index 498ae682..a08edd37 100644 --- a/.github/workflows/manual-api-deploy-prod.yml +++ b/.github/workflows/manual-api-deploy-prod.yml @@ -14,7 +14,7 @@ env: PROD_CLUSTER: "zksync-remix-plugin-production-ecs-cluster" PROD_SERVICE_NAME: "rocket-production-svc" API_SERVICE_URL: "https://zksync-plugin-api.nethermind.io" - ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.dev" + ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.io" WALLETCONNECT_PROJECT_ID: '${{secrets.WALLECTCONNECT_PROJECT_ID_PROD}}' jobs: diff --git a/.github/workflows/manual-ui-deploy-prod.yml b/.github/workflows/manual-ui-deploy-prod.yml index 07ed12bc..deb84957 100644 --- a/.github/workflows/manual-ui-deploy-prod.yml +++ b/.github/workflows/manual-ui-deploy-prod.yml @@ -7,7 +7,7 @@ env: BUCKET_NAME: 'zksync-remix-plugin-web' PROD_BUCKET_NAME: 'zksync-remix-plugin-prod-web' API_SERVICE_URL: "https://zksync-plugin-api.nethermind.io" - ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.dev" + ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.io" WALLETCONNECT_PROJECT_ID: '${{secrets.WALLECTCONNECT_PROJECT_ID_PROD}}' diff --git a/api/src/cors.rs b/api/src/cors.rs index 45830b9d..8b43e585 100644 --- a/api/src/cors.rs +++ b/api/src/cors.rs @@ -33,7 +33,7 @@ impl Fairing for CORS { Err(_) => { response.set_header(Header::new( "Access-Control-Allow-Origin", - "https://zksync-plugin.nethermind.dev/", + "https://zksync-plugin.nethermind.io/", )); } } diff --git a/plugin/src/utils/network.ts b/plugin/src/utils/network.ts index 01f9076d..3cb5222a 100644 --- a/plugin/src/utils/network.ts +++ b/plugin/src/utils/network.ts @@ -1,9 +1,11 @@ import { type DevnetAccount } from '../types/accounts' import { Wallet } from 'zksync-ethers' -const apiUrl: string = import.meta.env.VITE_API_URL ?? 'solidity-compile-remix-test.nethermind.io' +const apiUrl: string = + import.meta.env.VITE_API_URL ?? 'solidity-compile-remix-test.nethermind.io' const devnetUrl = import.meta.env.VITE_DEVNET_URL ?? 'http://localhost:8011' -const remoteDevnetUrl = process.env.VITE_REMOTE_DEVNET_URL ?? 'https://zksync-devnet.nethermind.dev' +const remoteDevnetUrl = + process.env.VITE_REMOTE_DEVNET_URL ?? 'https://zksync-devnet.nethermind.io' interface Devnet { name: string @@ -23,7 +25,9 @@ const devnets: Devnet[] = [ const testnetUrl = 'https://testnet.era.zksync.dev' -const getAccounts = async (customDevnetUrl: string): Promise => { +const getAccounts = async ( + customDevnetUrl: string +): Promise => { const privateKeys = [ '0xac1e735be8536c6534bb4f17f06f6afc73b2b5ba84ac2cfb12f7461b20c0bbe3', '0x3eb15da85647edd9a1159a4a13b9e7c56877c4eb33f614546d4db06a51868b1c', @@ -37,32 +41,34 @@ const getAccounts = async (customDevnetUrl: string): Promise => '0x850683b40d4a740aa6e745f889a6fdc8327be76e122f5aba645a5b02d0248db8' ] - const accountPromises: Array> = privateKeys.map(async (privateKey: string) => { - const wallet = new Wallet(privateKey) - const address = wallet.address + const accountPromises: Array> = privateKeys.map( + async (privateKey: string) => { + const wallet = new Wallet(privateKey) + const address = wallet.address - try { - const initialBalance = await getAccountBalance(address, customDevnetUrl) + try { + const initialBalance = await getAccountBalance(address, customDevnetUrl) - const result: DevnetAccount = { - initial_balance: initialBalance, - address, - private_key: privateKey - } + const result: DevnetAccount = { + initial_balance: initialBalance, + address, + private_key: privateKey + } - return result - } catch (error) { - console.error(`Failed to get balance for address ${address}: `, error) + return result + } catch (error) { + console.error(`Failed to get balance for address ${address}: `, error) - const result: DevnetAccount = { - initial_balance: 0, - address, - private_key: privateKey - } + const result: DevnetAccount = { + initial_balance: 0, + address, + private_key: privateKey + } - return result + return result + } } - }) + ) return await Promise.all(accountPromises) } @@ -71,29 +77,37 @@ const updateBalances = async ( accounts: DevnetAccount[], customDevnetUrl: string ): Promise => { - const accountPromises: Array> = accounts.map(async (account: DevnetAccount) => { - try { - const initialBalance = await getAccountBalance(account.address, customDevnetUrl) - - const result: DevnetAccount = { - initial_balance: initialBalance, - address: account.address, - private_key: account.private_key + const accountPromises: Array> = accounts.map( + async (account: DevnetAccount) => { + try { + const initialBalance = await getAccountBalance( + account.address, + customDevnetUrl + ) + + const result: DevnetAccount = { + initial_balance: initialBalance, + address: account.address, + private_key: account.private_key + } + + return result + } catch (error) { + console.error( + `Failed to get balance for address ${account.address}: `, + error + ) + + const result: DevnetAccount = { + initial_balance: 0, + address: account.address, + private_key: account.private_key + } + + return result } - - return result - } catch (error) { - console.error(`Failed to get balance for address ${account.address}: `, error) - - const result: DevnetAccount = { - initial_balance: 0, - address: account.address, - private_key: account.private_key - } - - return result } - }) + ) return await Promise.all(accountPromises) }