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

Jump to bottom

Update Optimism/Arbitrum SDKs. Add Goerli setups #47

Merged
merged 21 commits into from
Jul 28, 2023
Merged

Update Optimism/Arbitrum SDKs. Add Goerli setups #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ac7698e
Update Arbitrum's bridge address
Psirex Sep 8, 2022
b3b1f1c
Add goerli networks to utils and deploy script
Psirex Sep 8, 2022
2d31ce2
Add optimistic goerli to hardhat.etherscan config
Psirex Sep 8, 2022
e569dbc
Update sdk packages. Add patch for hardhat node
Psirex Sep 8, 2022
aa8aee5
Update network.chainId method. Update optimism sdk usage
Psirex Sep 8, 2022
4ec1bd9
Add wsteth optimism goerli deploy config
Psirex Sep 8, 2022
f34758e
Add standalone bridging e2e test for depositTo/withdrawTo
Psirex Sep 9, 2022
24cb66c
Remove outdated testnets
Psirex Jul 18, 2023
1045551
Remove outdated scripts, update & pin dependencies
Psirex Jul 18, 2023
8a75235
Add deploy config for arb-goerli wstETH
Psirex Jul 18, 2023
0920261
Exclude launch tests from integration tests
Psirex Jul 18, 2023
8321cd6
Update finalize-message script
Psirex Jul 18, 2023
8a6103e
Merge branch 'main' of github.com:lidofinance/lido-l2 into feature/go…
Psirex Jul 18, 2023
76b3bde
Use yarn as default dependency manager
Psirex Jul 18, 2023
b65d171
Add script to prove message on Optimism
Psirex Jul 18, 2023
d27c84b
Update tests and Optimism ABIs
Psirex Jul 18, 2023
aee0a9e
Remove patch for hardhat node
Psirex Jul 19, 2023
13d431d
Return npm as a package manager for compatibility with CI
Psirex Jul 19, 2023
0a797bb
Recreate package-lock.json
Psirex Jul 19, 2023
a130d97
Fix typos in the .env example files comments
Psirex Jul 28, 2023
3486162
Remove duplication in the .env.wsteth.arb_goerli
Psirex Jul 28, 2023
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
12 changes: 2 additions & 10 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,14 @@
# RPCs
# ############################

# The following variables are required for the @arbitrum/sdk library when it works on Nitro
MAINNET_RPC=
RINKEBY_RPC=

RPC_ETH_MAINNET=
RPC_ETH_GOERLI=
RPC_ETH_RINKEBY=
RPC_ETH_KOVAN=

RPC_OPT_MAINNET=https://mainnet.optimism.io
RPC_OPT_GOERLI=https://goerli.optimism.io
RPC_OPT_KOVAN=https://kovan.optimism.io

RPC_ARB_MAINNET=https://arb1.arbitrum.io/rpc
RPC_ARB_GOERLI=https://goerli-rollup.arbitrum.io/rpc
RPC_ARB_RINKEBY=https://rinkeby.arbitrum.io/rpc

# ############################
# Etherscan
Expand All @@ -37,7 +29,7 @@ ETHERSCAN_API_KEY_OPT=
TOKEN=

# Name of the network environments used by deployment scripts.
# Might be one of: "mainnet", "goerli", "rinkeby", "kovan".
# Might be one of: "mainnet", "goerli".
NETWORK=mainnet

# Run deployment in the forking network instead of public ones
Expand Down Expand Up @@ -86,7 +78,7 @@ TESTING_OPT_L1_ERC20_TOKEN_BRIDGE=0x243b661276670bD17399C488E7287ea4D416115b
TESTING_OPT_L2_ERC20_TOKEN_BRIDGE=0x447CD1794d209Ac4E6B4097B34658bc00C4d0a51

# ############################
# Integraion Testing
# Integration Testing
# ############################

TESTING_USE_DEPLOYED_CONTRACTS=false
Expand Down
75 changes: 75 additions & 0 deletions .env.wsteth.arb_goerli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Detailed info: https://github.com/lidofinance/lido-l2#Project-Configuration

# ############################
# RPCs
# ############################

RPC_ETH_GOERLI=
RPC_ARB_GOERLI=https://goerli-rollup.arbitrum.io/rpc

# ############################
# Etherscan
# ############################

ETHERSCAN_API_KEY_ETH=
ETHERSCAN_API_KEY_ARB=

# ############################
# Bridge/Gateway Deployment
# ############################

# Address of the token to deploy the bridge/gateway for
TOKEN=0x6320cd32aa674d2898a68ec82e869385fc5f7e2f

# Name of the network environments used by deployment scripts.
# Might be one of: "mainnet", "goerli".
NETWORK=goerli

# Run deployment in the forking network instead of public ones
FORKING=true

# Private key of the deployer account used for deployment process

ETH_DEPLOYER_PRIVATE_KEY=
ARB_DEPLOYER_PRIVATE_KEY=

L1_PROXY_ADMIN=0x4333218072D5d7008546737786663c38B4D561A4
L1_BRIDGE_ADMIN=0x4333218072D5d7008546737786663c38B4D561A4
L1_DEPOSITS_ENABLED=true
L1_WITHDRAWALS_ENABLED=true
L1_DEPOSITS_ENABLERS=["0x4333218072D5d7008546737786663c38B4D561A4"]
L1_DEPOSITS_DISABLERS=["0x4333218072D5d7008546737786663c38B4D561A4","0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]
L1_WITHDRAWALS_ENABLERS=["0x4333218072D5d7008546737786663c38B4D561A4"]
L1_WITHDRAWALS_DISABLERS=["0x4333218072D5d7008546737786663c38B4D561A4","0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]

L2_PROXY_ADMIN=0x43De3B7115baA4EbAbd7c5Eaf4cB2856238C6A50
L2_BRIDGE_ADMIN=0x43De3B7115baA4EbAbd7c5Eaf4cB2856238C6A50
L2_DEPOSITS_ENABLED=true
L2_WITHDRAWALS_ENABLED=true
L2_DEPOSITS_ENABLERS=["0x43De3B7115baA4EbAbd7c5Eaf4cB2856238C6A50"]
L2_DEPOSITS_DISABLERS=["0x43De3B7115baA4EbAbd7c5Eaf4cB2856238C6A50","0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]
L2_WITHDRAWALS_ENABLERS=["0x43De3B7115baA4EbAbd7c5Eaf4cB2856238C6A50"]
L2_WITHDRAWALS_DISABLERS=["0x43De3B7115baA4EbAbd7c5Eaf4cB2856238C6A50","0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]

# ############################
# Integration Acceptance & E2E Testing
# ############################

TESTING_ARB_NETWORK=goerli
TESTING_ARB_L1_TOKEN=0x6320cd32aa674d2898a68ec82e869385fc5f7e2f
TESTING_ARB_L2_TOKEN=0xbED18985eC648Ce4b0C5Fc3061d1323116702BC4
TESTING_ARB_L1_ERC20_TOKEN_GATEWAY=0x0ecCFbBEe34f04187361818832385EB4cC11b678
TESTING_ARB_L2_ERC20_TOKEN_GATEWAY=0x12dD5832Fd7e02e49d97D1CBBd14579794945c1E

# ############################
# Integration Testing
# ############################

TESTING_USE_DEPLOYED_CONTRACTS=true
TESTING_L1_TOKENS_HOLDER=

# ############################
# E2E Testing
# ############################

TESTING_PRIVATE_KEY=
Psirex marked this conversation as resolved.
Show resolved Hide resolved
15 changes: 2 additions & 13 deletions .env.wsteth.arb_mainnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,14 @@
# ############################

RPC_ETH_MAINNET=
RPC_ETH_GOERLI=
RPC_ETH_RINKEBY=
RPC_ETH_KOVAN=

RPC_OPT_MAINNET=
RPC_OPT_GOERLI=https://goerli.optimism.io
RPC_OPT_KOVAN=https://kovan.optimism.io

RPC_ARB_MAINNET=
RPC_ARB_GOERLI=https://goerli-rollup.arbitrum.io/rpc
RPC_ARB_RINKEBY=https://rinkeby.arbitrum.io/rpc

# ############################
# Etherscan
# ############################

ETHERSCAN_API_KEY_ETH=
ETHERSCAN_API_KEY_ARB=
ETHERSCAN_API_KEY_OPT=

# ############################
# Bridge/Gateway Deployment
Expand All @@ -33,7 +22,7 @@ ETHERSCAN_API_KEY_OPT=
TOKEN=0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0

# Name of the network environments used by deployment scripts.
# Might be one of: "mainnet", "goerli", "rinkeby", "kovan".
# Might be one of: "mainnet", "goerli".
NETWORK=mainnet

# Run deployment in the forking network instead of public ones
Expand Down Expand Up @@ -73,7 +62,7 @@ TESTING_ARB_L1_ERC20_TOKEN_GATEWAY=0x0F25c1DC2a9922304f2eac71DCa9B07E310e8E5a
TESTING_ARB_L2_ERC20_TOKEN_GATEWAY=0x07D4692291B9E30E326fd31706f686f83f331B82

# ############################
# Integraion Testing
# Integration Testing
# ############################

TESTING_USE_DEPLOYED_CONTRACTS=true
Expand Down
78 changes: 0 additions & 78 deletions .env.wsteth.arb_rinkeby
View file
Open in desktop

This file was deleted.

71 changes: 71 additions & 0 deletions .env.wsteth.opt_goerli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Detailed info: https://github.com/lidofinance/lido-l2#Project-Configuration

# ############################
# RPCs
# ############################

RPC_ETH_GOERLI=
RPC_OPT_GOERLI=https://goerli.optimism.io

# ############################
# Etherscan
# ############################

ETHERSCAN_API_KEY_ETH=
ETHERSCAN_API_KEY_OPT=

# ############################
# Bridge/Gateway Deployment
# ############################

# Address of the token to deploy the bridge/gateway for
TOKEN=0x6320cd32aa674d2898a68ec82e869385fc5f7e2f

# Name of the network environments used by deployment scripts.
# Might be one of: "mainnet", "goerli".
NETWORK=goerli

# Private key of the deployer account used for deployment process
ETH_DEPLOYER_PRIVATE_KEY=
OPT_DEPLOYER_PRIVATE_KEY=

L1_PROXY_ADMIN=0x4333218072D5d7008546737786663c38B4D561A4
L1_BRIDGE_ADMIN=0x4333218072D5d7008546737786663c38B4D561A4
L1_DEPOSITS_ENABLED=true
L1_WITHDRAWALS_ENABLED=true
L1_DEPOSITS_ENABLERS=["0x4333218072D5d7008546737786663c38B4D561A4"]
L1_DEPOSITS_DISABLERS="["0x4333218072D5d7008546737786663c38B4D561A4", "0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]"
L1_WITHDRAWALS_ENABLERS=["0x4333218072D5d7008546737786663c38B4D561A4"]
L1_WITHDRAWALS_DISABLERS="["0x4333218072D5d7008546737786663c38B4D561A4", "0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]"

L2_PROXY_ADMIN=0x55C39356C714Cde16F8a80302c1Ce9DfAC6f5a35
L2_BRIDGE_ADMIN=0x55C39356C714Cde16F8a80302c1Ce9DfAC6f5a35
L2_DEPOSITS_ENABLED=true
L2_WITHDRAWALS_ENABLED=true
L2_DEPOSITS_ENABLERS=["0x55C39356C714Cde16F8a80302c1Ce9DfAC6f5a35"]
L2_DEPOSITS_DISABLERS="["0x55C39356C714Cde16F8a80302c1Ce9DfAC6f5a35", "0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]"
L2_WITHDRAWALS_ENABLERS=["0x55C39356C714Cde16F8a80302c1Ce9DfAC6f5a35"]
L2_WITHDRAWALS_DISABLERS="["0x55C39356C714Cde16F8a80302c1Ce9DfAC6f5a35", "0x7fE7fa4EF7D134Dbf8B616Ba7B675F26286BC2cd"]"

# ############################
# Integration & E2E Testing
# ############################

TESTING_OPT_NETWORK=goerli
TESTING_OPT_L1_TOKEN=0x6320cd32aa674d2898a68ec82e869385fc5f7e2f
TESTING_OPT_L2_TOKEN=0xe8964a99d5DE7cEE2743B20113a52C953b0916E9
TESTING_OPT_L1_ERC20_TOKEN_BRIDGE=0xDdC89Bd27F9A1C47A5c20dF0783dE52f55513598
TESTING_OPT_L2_ERC20_TOKEN_BRIDGE=0x423702bC3Fb92f59Be440354456f0481934bF1f5

# ############################
# Integration Testing
# ############################

TESTING_USE_DEPLOYED_CONTRACTS=true
TESTING_L1_TOKENS_HOLDER=

# ############################
# E2E Testing
# ############################

TESTING_PRIVATE_KEY=
79 changes: 0 additions & 79 deletions .env.wsteth.opt_kovan
View file
Open in desktop

This file was deleted.

Loading
Loading