Skip to content

Commit

Permalink
Update devnet prod url
Browse files Browse the repository at this point in the history
  • Loading branch information
satyambnsal committed Jun 13, 2024
1 parent 17135e1 commit d8d48ae
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manual-api-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-ui-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}'


Expand Down
2 changes: 1 addition & 1 deletion api/src/cors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
));
}
}
Expand Down
102 changes: 58 additions & 44 deletions plugin/src/utils/network.ts
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,7 +25,9 @@ const devnets: Devnet[] = [

const testnetUrl = 'https://testnet.era.zksync.dev'

const getAccounts = async (customDevnetUrl: string): Promise<DevnetAccount[]> => {
const getAccounts = async (
customDevnetUrl: string
): Promise<DevnetAccount[]> => {
const privateKeys = [
'0xac1e735be8536c6534bb4f17f06f6afc73b2b5ba84ac2cfb12f7461b20c0bbe3',
'0x3eb15da85647edd9a1159a4a13b9e7c56877c4eb33f614546d4db06a51868b1c',
Expand All @@ -37,32 +41,34 @@ const getAccounts = async (customDevnetUrl: string): Promise<DevnetAccount[]> =>
'0x850683b40d4a740aa6e745f889a6fdc8327be76e122f5aba645a5b02d0248db8'
]

const accountPromises: Array<Promise<DevnetAccount>> = privateKeys.map(async (privateKey: string) => {
const wallet = new Wallet(privateKey)
const address = wallet.address
const accountPromises: Array<Promise<DevnetAccount>> = 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)
}
Expand All @@ -71,29 +77,37 @@ const updateBalances = async (
accounts: DevnetAccount[],
customDevnetUrl: string
): Promise<DevnetAccount[]> => {
const accountPromises: Array<Promise<DevnetAccount>> = 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<Promise<DevnetAccount>> = 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)
}
Expand Down

0 comments on commit d8d48ae

Please sign in to comment.