From 84a4ba3fdab581d11fb9e7d1e62c8164f810f721 Mon Sep 17 00:00:00 2001 From: neokry Date: Tue, 30 Jan 2024 14:13:09 -0800 Subject: [PATCH] Deploy to L2s --- addresses/10.json | 11 +++++++---- addresses/7777777.json | 11 +++++++---- addresses/8453.json | 11 +++++++---- deploys/10.version2_upgrade.txt | 4 ++++ deploys/7777777.version2_upgrade.txt | 4 ++++ deploys/8453.version2_upgrade.txt | 4 ++++ package.json | 2 +- 7 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 deploys/10.version2_upgrade.txt create mode 100644 deploys/7777777.version2_upgrade.txt create mode 100644 deploys/8453.version2_upgrade.txt diff --git a/addresses/10.json b/addresses/10.json index 18418ca..c8cca09 100644 --- a/addresses/10.json +++ b/addresses/10.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x7C69609645837a77915410B9B5605f54C79Da5D2", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", "Manager": "0x3ac0e64fe2931f8e082c6bb29283540de9b5371c", - "ManagerImpl": "0x15567b396077f698fcf211629e650d898e4b4e26", + "ManagerImpl": "0x7bf440c100240A6154cDc6013dc6CdA647b994e2", "WETH": "0x4200000000000000000000000000000000000006", - "Auction": "0x639dc4bdcaa16dd626eaa6a1480a852d5427252c", - "Token": "0x127f22a79d123780f7e9ff38578d16a78799c131", + "Auction": "0xf958872ceb73bA7d0acA0c7a9905119BCb371dEC", + "Token": "0xE77e4FA003b2cC07ad10a9D1dB216Cae5Ed14d3f", "MetadataRenderer": "0xb4ca85d61f7fcce0d176fdb743860dabf3fc03f9", "Treasury": "0xaf75199b91aedbe2b99476899782c5bb507393e0", - "Governor": "0x46e4eae74254346867bbf53e7d30baa6f6c8cd5a" + "Governor": "0x9Af9f31BAE469c13528B458E007A7EA965BD14bB" } diff --git a/addresses/7777777.json b/addresses/7777777.json index 18418ca..673c7dd 100644 --- a/addresses/7777777.json +++ b/addresses/7777777.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x7229F0c537e64f3EA9E9b993601578A7B09c402C", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", "Manager": "0x3ac0e64fe2931f8e082c6bb29283540de9b5371c", - "ManagerImpl": "0x15567b396077f698fcf211629e650d898e4b4e26", + "ManagerImpl": "0x7bf440c100240A6154cDc6013dc6CdA647b994e2", "WETH": "0x4200000000000000000000000000000000000006", - "Auction": "0x639dc4bdcaa16dd626eaa6a1480a852d5427252c", - "Token": "0x127f22a79d123780f7e9ff38578d16a78799c131", + "Auction": "0xf958872ceb73ba7d0aca0c7a9905119bcb371dec", + "Token": "0xe77e4fa003b2cc07ad10a9d1db216cae5ed14d3f", "MetadataRenderer": "0xb4ca85d61f7fcce0d176fdb743860dabf3fc03f9", "Treasury": "0xaf75199b91aedbe2b99476899782c5bb507393e0", - "Governor": "0x46e4eae74254346867bbf53e7d30baa6f6c8cd5a" + "Governor": "0x9af9f31bae469c13528b458e007a7ea965bd14bb" } diff --git a/addresses/8453.json b/addresses/8453.json index 18418ca..c60b15c 100644 --- a/addresses/8453.json +++ b/addresses/8453.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x894F30da29216516b5aE85207dED77038C107f22", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", "Manager": "0x3ac0e64fe2931f8e082c6bb29283540de9b5371c", - "ManagerImpl": "0x15567b396077f698fcf211629e650d898e4b4e26", + "ManagerImpl": "0x7bf440c100240A6154cDc6013dc6CdA647b994e2", "WETH": "0x4200000000000000000000000000000000000006", - "Auction": "0x639dc4bdcaa16dd626eaa6a1480a852d5427252c", - "Token": "0x127f22a79d123780f7e9ff38578d16a78799c131", + "Auction": "0xf958872ceb73bA7d0acA0c7a9905119BCb371dEC", + "Token": "0xE77e4FA003b2cC07ad10a9D1dB216Cae5Ed14d3f", "MetadataRenderer": "0xb4ca85d61f7fcce0d176fdb743860dabf3fc03f9", "Treasury": "0xaf75199b91aedbe2b99476899782c5bb507393e0", - "Governor": "0x46e4eae74254346867bbf53e7d30baa6f6c8cd5a" + "Governor": "0x9Af9f31BAE469c13528B458E007A7EA965BD14bB" } diff --git a/deploys/10.version2_upgrade.txt b/deploys/10.version2_upgrade.txt new file mode 100644 index 0000000..5d9635a --- /dev/null +++ b/deploys/10.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0xe77e4fa003b2cc07ad10a9d1db216cae5ed14d3f +Auction implementation: 0xf958872ceb73ba7d0aca0c7a9905119bcb371dec +Governor implementation: 0x9af9f31bae469c13528b458e007a7ea965bd14bb +Manager implementation: 0x7bf440c100240a6154cdc6013dc6cda647b994e2 diff --git a/deploys/7777777.version2_upgrade.txt b/deploys/7777777.version2_upgrade.txt new file mode 100644 index 0000000..5d9635a --- /dev/null +++ b/deploys/7777777.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0xe77e4fa003b2cc07ad10a9d1db216cae5ed14d3f +Auction implementation: 0xf958872ceb73ba7d0aca0c7a9905119bcb371dec +Governor implementation: 0x9af9f31bae469c13528b458e007a7ea965bd14bb +Manager implementation: 0x7bf440c100240a6154cdc6013dc6cda647b994e2 diff --git a/deploys/8453.version2_upgrade.txt b/deploys/8453.version2_upgrade.txt new file mode 100644 index 0000000..5d9635a --- /dev/null +++ b/deploys/8453.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0xe77e4fa003b2cc07ad10a9d1db216cae5ed14d3f +Auction implementation: 0xf958872ceb73ba7d0aca0c7a9905119bcb371dec +Governor implementation: 0x9af9f31bae469c13528b458e007a7ea965bd14bb +Manager implementation: 0x7bf440c100240a6154cdc6013dc6cda647b994e2 diff --git a/package.json b/package.json index 9a9164f..1892482 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "deploy:v2-core": "source .env && forge script script/DeployV2Core.s.sol:DeployContracts --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast --verify --etherscan-api-key $ETHERSCAN_API_KEY", "deploy:v2-upgrade": "source .env && forge script script/DeployV2Upgrade.s.sol:DeployContracts --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast --verify --etherscan-api-key $ETHERSCAN_API_KEY", "deploy:v2-new": "source .env && forge script script/DeployV2New.s.sol:DeployContracts --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast --verify --etherscan-api-key $ETHERSCAN_API_KEY", - "deploy:zora": "source .env && forge script script/DeployV2Upgrade.s.sol:DeployContracts --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast --verify --verifier blockscout --verifier-url https://sepolia.explorer.zora.energy/api? -vvvv", + "deploy:zora": "source .env && forge script script/DeployV2Upgrade.s.sol:DeployContracts --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast --verify --verifier blockscout --verifier-url https://explorer.zora.energy/api? -vvvv", "test": "echo 'temporarily skipping metadata tests, remove this when fixed' && forge test --no-match-test 'WithAddress' -vvv", "typechain": "typechain --target=ethers-v5 'dist/artifacts/*/*.json' --out-dir dist/typechain", "storage-inspect:check": "./script/storage-check.sh check Manager Auction Governor Treasury Token",