Skip to content

Commit

Permalink
ci: use latest testnode
Browse files Browse the repository at this point in the history
  • Loading branch information
fionnachan committed Jul 22, 2024
1 parent 5bf9681 commit f936ea0
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 39 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,10 @@ jobs:
file_name: medium-res.env

- name: Set up the local node
uses: OffchainLabs/actions/run-nitro-test-node@e3b7f5bdfc62cad21026c1d1f424f3fbadc046e0
uses: OffchainLabs/actions/run-nitro-test-node@main
with:
nitro-testnode-ref: old-release-v2.1.1
l3-node: false
no-l3-token-bridge: true

- name: Restore node_modules
uses: OffchainLabs/actions/node-modules/restore@main
Expand Down
35 changes: 35 additions & 0 deletions packages/arb-token-bridge-ui/src/arbLocalNodeConstants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { ArbitrumNetwork } from '@arbitrum/sdk'

export const defaultL2Network: ArbitrumNetwork = {
chainId: 412346,
parentChainId: 1337,
confirmPeriodBlocks: 20,
ethBridge: {
bridge: '0x5eCF728ffC5C5E802091875f96281B5aeECf6C49',
inbox: '0x9f8c1c641336A371031499e3c362e40d58d0f254',
outbox: '0x50143333b44Ea46255BEb67255C9Afd35551072F',
rollup: '0x46966d871d29e1772c2809459469f849d8AAb1A3',
sequencerInbox: '0x18d19C5d3E685f5be5b9C86E097f0E439285D216'
},
isCustom: true,
name: 'Arbitrum Local',
retryableLifetimeSeconds: 604800,
tokenBridge: {
parentCustomGateway: '0x8407E6180dC009D20D26D4BABB4790C1d4E6D2aA',
parentErc20Gateway: '0x00D9fE1a2B67B8151aEdE8855c95E58D73FB4245',
parentGatewayRouter: '0x093AAa96CD4387A68FC0e24C60140938Dc812549',
parentMultiCall: '0x49117fC32930E324F2E9A7BeA588FFb26008b8eC',
parentProxyAdmin: '0x2A1f38c9097e7883570e0b02BFBE6869Cc25d8a3',
parentWeth: '0x7E32b54800705876d3b5cFbc7d9c226a211F7C1a',
parentWethGateway: '0xB8F48Ba39fCfB44d70F6008fe1bf4F3E744044AF',
childCustomGateway: '0x0B35cfE62314C3852A0942b5830c728353BD654F',
childErc20Gateway: '0x7424e3DAAAAcd867c85ceB75c1E00119F2ee5eb7',
childGatewayRouter: '0x32656396981868E925280FB772b3f806892cf4bF',
childMultiCall: '0x6B1E93aE298B64e8f5b9f43B65Dd8F1eaA6DD4c3',
childProxyAdmin: '0x9F95547ABB0FfC92b4E37b3124d1e8613d5aB74A',
childWeth: '0xA1abD387192e3bb4e84D3109181F9f005aBaF5CA',
childWethGateway: '0x67aE8014BD1A0c1Ed747715d22b3b3a188aC324B'
}
// l1TokenBridgeCreator: '0x4Af567288e68caD4aA93A272fe6139Ca53859C70',
// retryableSender: '0x75E0E92A79880Bd81A69F72983D03c75e2B33dC8'
}
33 changes: 1 addition & 32 deletions packages/arb-token-bridge-ui/src/util/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { loadEnvironmentVariableWithFallback } from './index'
import { getBridgeUiConfigForChain } from './bridgeUiConfig'
import { orbitMainnets, orbitTestnets } from './orbitChainsList'
import { chainIdToInfuraUrl } from './infura'
import { defaultL2Network } from '../arbLocalNodeConstants'

export enum ChainId {
// L1
Expand Down Expand Up @@ -268,38 +269,6 @@ const defaultL1Network: L1Network = {
chainId: 1337
}

const defaultL2Network: ArbitrumNetwork = {
chainId: 412346,
parentChainId: ChainId.Local,
confirmPeriodBlocks: 20,
ethBridge: {
bridge: '0x2b360a9881f21c3d7aa0ea6ca0de2a3341d4ef3c',
inbox: '0xff4a24b22f94979e9ba5f3eb35838aa814bad6f1',
outbox: '0x49940929c7cA9b50Ff57a01d3a92817A414E6B9B',
rollup: '0x65a59d67da8e710ef9a01eca37f83f84aedec416',
sequencerInbox: '0xe7362d0787b51d8c72d504803e5b1d6dcda89540'
},
isCustom: true,
name: 'Arbitrum Local',
retryableLifetimeSeconds: 604800,
tokenBridge: {
parentCustomGateway: '0x75E0E92A79880Bd81A69F72983D03c75e2B33dC8',
parentErc20Gateway: '0x4Af567288e68caD4aA93A272fe6139Ca53859C70',
parentGatewayRouter: '0x85D9a8a4bd77b9b5559c1B7FCb8eC9635922Ed49',
parentMultiCall: '0xA39FFA43ebA037D67a0f4fe91956038ABA0CA386',
parentProxyAdmin: '0x7E32b54800705876d3b5cFbc7d9c226a211F7C1a',
parentWeth: '0xDB2D15a3EB70C347E0D2C2c7861cAFb946baAb48',
parentWethGateway: '0x408Da76E87511429485C32E4Ad647DD14823Fdc4',
childCustomGateway: '0x525c2aBA45F66987217323E8a05EA400C65D06DC',
childErc20Gateway: '0xe1080224B632A93951A7CFA33EeEa9Fd81558b5e',
childGatewayRouter: '0x1294b86822ff4976BfE136cB06CF43eC7FCF2574',
childMultiCall: '0xDB2D15a3EB70C347E0D2C2c7861cAFb946baAb48',
childProxyAdmin: '0xda52b25ddB0e3B9CC393b0690Ac62245Ac772527',
childWeth: '0x408Da76E87511429485C32E4Ad647DD14823Fdc4',
childWethGateway: '0x4A2bA922052bA54e29c5417bC979Daaf7D5Fe4f4'
}
}

export const localL1NetworkRpcUrl = loadEnvironmentVariableWithFallback({
env: process.env.NEXT_PUBLIC_LOCAL_ETHEREUM_RPC_URL,
fallback: 'http://localhost:8545'
Expand Down
11 changes: 6 additions & 5 deletions packages/arb-token-bridge-ui/tests/support/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { StaticJsonRpcProvider } from '@ethersproject/providers'
import { BigNumber } from 'ethers'
import { MultiCaller } from '@arbitrum/sdk'
import { MULTICALL_TESTNET_ADDRESS } from '../../src/constants'
import { defaultL2Network } from '../../src/arbLocalNodeConstants'

export type NetworkType = 'L1' | 'L2'
export type NetworkName =
Expand All @@ -31,7 +32,7 @@ export const getL1NetworkConfig = (): NetworkConfig => {
chainId: '1337',
symbol: 'ETH',
isTestnet: true,
multiCall: '0xA39FFA43ebA037D67a0f4fe91956038ABA0CA386'
multiCall: defaultL2Network.tokenBridge.parentMultiCall
}
}

Expand All @@ -42,7 +43,7 @@ export const getL2NetworkConfig = (): NetworkConfig => {
chainId: '412346',
symbol: 'ETH',
isTestnet: true,
multiCall: '0xDB2D15a3EB70C347E0D2C2c7861cAFb946baAb48'
multiCall: defaultL2Network.tokenBridge.childMultiCall
}
}

Expand All @@ -68,9 +69,9 @@ export const getL2TestnetNetworkConfig = (): NetworkConfig => {
}
}

export const l1WethGateway = '0x408Da76E87511429485C32E4Ad647DD14823Fdc4'
export const wethTokenAddressL1 = '0xDB2D15a3EB70C347E0D2C2c7861cAFb946baAb48'
export const wethTokenAddressL2 = '0x408Da76E87511429485C32E4Ad647DD14823Fdc4'
export const l1WethGateway = defaultL2Network.tokenBridge.parentWethGateway
export const wethTokenAddressL1 = defaultL2Network.tokenBridge.parentWeth
export const wethTokenAddressL2 = defaultL2Network.tokenBridge.childWeth
export const ERC20TokenName = 'IntArbTestToken'
export const ERC20TokenSymbol = 'IARB'
export const invalidTokenAddress = '0x0000000000000000000000000000000000000000'
Expand Down

0 comments on commit f936ea0

Please sign in to comment.