From 2fc3c897697d3825b4b1b168506e0e47a973ceaf Mon Sep 17 00:00:00 2001 From: neokry Date: Mon, 29 Jan 2024 14:09:58 -0800 Subject: [PATCH] Sepolia upgrade --- addresses/11155111.json | 11 +++++++---- addresses/11155420.json | 13 ++++++++----- addresses/84532.json | 11 +++++++---- addresses/999999999.json | 11 +++++++---- deploys/11155111.version2_upgrade.txt | 4 ++++ deploys/11155420.version2_upgrade.txt | 4 ++++ deploys/84532.version2_upgrade.txt | 4 ++++ deploys/999999999.version2_upgrade.txt | 4 ++++ package.json | 4 ++-- src/auction/Auction.sol | 2 +- 10 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 deploys/11155111.version2_upgrade.txt create mode 100644 deploys/11155420.version2_upgrade.txt create mode 100644 deploys/84532.version2_upgrade.txt create mode 100644 deploys/999999999.version2_upgrade.txt diff --git a/addresses/11155111.json b/addresses/11155111.json index c70817b..06d73c8 100644 --- a/addresses/11155111.json +++ b/addresses/11155111.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x7498e6e471f31e869f038D8DBffbDFdf650c3F95", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", "Manager": "0x0ca90a96ac58f19b1f69f67103245c9263bc4bfc", - "ManagerImpl": "0x30bc8ae9bfe8a4132e4bb3393e0cbe439557fd68", + "ManagerImpl": "0xABdEdc8730410716DD0a5E54A89C85546A3458bA", "WETH": "0x7b79995e5f793a07bc00c21412e50ecae098e7f9", - "Auction": "0xee970f19ed4960234e75ee8d3a42c98ca65b5c34", - "Token": "0x5652d5fc630d3334a961b0b6be876e9f94899baa", + "Auction": "0xca8F9A4805CCFfdCcfc5Bf7973302a0c01f4347b", + "Token": "0x44D9FD02e6d8d96ca9c2bBD26C232024977674C5", "MetadataRenderer": "0xec23ce6407ef841adf52e7232d3df5a44cb38041", "Treasury": "0x5daabe9382158c3f133b360a5f0b46ca5a7f6e86", - "Governor": "0xf896daa9e7cdca767202d2f9699e7a30b22f6087" + "Governor": "0xaa21AFD73e6Fd5f69C87A6839D0beEDEE075e9a3" } diff --git a/addresses/11155420.json b/addresses/11155420.json index b2a1c24..f149f2e 100644 --- a/addresses/11155420.json +++ b/addresses/11155420.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x7498e6e471f31e869f038D8DBffbDFdf650c3F95", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", "Manager": "0x1004e43b540af4dfde2737c29893716817b0a1d7", - "ManagerImpl": "0xf888b57b0cf99052dcd55d021f8bd0c916374a84", + "ManagerImpl": "0x93f9d43a7bD751f8546A54785AE48D049dDd2697", "WETH": "0x7b79995e5f793a07bc00c21412e50ecae098e7f9", - "Auction": "0xd91e5a7f72b41c1eb443110299c4961795b6c69c", - "Token": "0x424f1c2b85bcec187fc22fba2b307e31950992bc", - "MetadataRenderer": "0x5652d5fc630d3334a961b0b6be876e9f94899baa", + "Auction": "0xaa21AFD73e6Fd5f69C87A6839D0beEDEE075e9a3", + "Token": "0xca8F9A4805CCFfdCcfc5Bf7973302a0c01f4347b", + "MetadataRenderer": "0xDA804D6e0Da967E2A7359Dd0777898f577A0B995", "Treasury": "0x7abe363c6dd3a4dec6a3311681723f35740f69e7", - "Governor": "0x1e57cad7c22042bd765011d0f2eb36606fe12c3f" + "Governor": "0xABdEdc8730410716DD0a5E54A89C85546A3458bA" } diff --git a/addresses/84532.json b/addresses/84532.json index bfd15b5..640b862 100644 --- a/addresses/84532.json +++ b/addresses/84532.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x7498e6e471f31e869f038D8DBffbDFdf650c3F95", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", "Manager": "0x550c326d688fd51ae65ac6a2d48749e631023a03", - "ManagerImpl": "0xa644ba2dd0740acd6fe6f9a031c6b7b2ce466299", + "ManagerImpl": "0xf896daA9E7CdCa767202D2f9699e7A30B22F6087", "WETH": "0x7b79995e5f793a07bc00c21412e50ecae098e7f9", - "Auction": "0x3fb5d8e80835d07056c12757a183ab659b1a44bf", - "Token": "0x3cc6ba057f394b00ac1ff48707d5c04de29504c6", + "Auction": "0xEe970F19eD4960234e75ee8d3A42c98cA65B5c34", + "Token": "0xec23Ce6407Ef841aDf52e7232d3dF5A44cB38041", "MetadataRenderer": "0x0b3a22e5c5824d9d227986f76190f504c0906ad6", "Treasury": "0x047b1e00eb4726afc57d559f851146e84e31d1dc", - "Governor": "0x2eff3083bff979c349c59c14ce3945afea023927" + "Governor": "0x5DaabE9382158C3F133B360a5F0b46cA5a7f6E86" } diff --git a/addresses/999999999.json b/addresses/999999999.json index bfd15b5..5b9bec4 100644 --- a/addresses/999999999.json +++ b/addresses/999999999.json @@ -1,10 +1,13 @@ { + "BuilderDAO": "0x7498e6e471f31e869f038D8DBffbDFdf650c3F95", + "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", + "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", "Manager": "0x550c326d688fd51ae65ac6a2d48749e631023a03", - "ManagerImpl": "0xa644ba2dd0740acd6fe6f9a031c6b7b2ce466299", + "ManagerImpl": "0xf896daA9E7CdCa767202D2f9699e7A30B22F6087", "WETH": "0x7b79995e5f793a07bc00c21412e50ecae098e7f9", - "Auction": "0x3fb5d8e80835d07056c12757a183ab659b1a44bf", - "Token": "0x3cc6ba057f394b00ac1ff48707d5c04de29504c6", + "Auction": "0xee970f19ed4960234e75ee8d3a42c98ca65b5c34", + "Token": "0xec23ce6407ef841adf52e7232d3df5a44cb38041", "MetadataRenderer": "0x0b3a22e5c5824d9d227986f76190f504c0906ad6", "Treasury": "0x047b1e00eb4726afc57d559f851146e84e31d1dc", - "Governor": "0x2eff3083bff979c349c59c14ce3945afea023927" + "Governor": "0x5daabe9382158c3f133b360a5f0b46ca5a7f6e86" } diff --git a/deploys/11155111.version2_upgrade.txt b/deploys/11155111.version2_upgrade.txt new file mode 100644 index 0000000..ea06be3 --- /dev/null +++ b/deploys/11155111.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0x44d9fd02e6d8d96ca9c2bbd26c232024977674c5 +Auction implementation: 0xca8f9a4805ccffdccfc5bf7973302a0c01f4347b +Governor implementation: 0xaa21afd73e6fd5f69c87a6839d0beedee075e9a3 +Manager implementation: 0xabdedc8730410716dd0a5e54a89c85546a3458ba diff --git a/deploys/11155420.version2_upgrade.txt b/deploys/11155420.version2_upgrade.txt new file mode 100644 index 0000000..27e9df9 --- /dev/null +++ b/deploys/11155420.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0xca8f9a4805ccffdccfc5bf7973302a0c01f4347b +Auction implementation: 0xaa21afd73e6fd5f69c87a6839d0beedee075e9a3 +Governor implementation: 0xabdedc8730410716dd0a5e54a89c85546a3458ba +Manager implementation: 0x93f9d43a7bd751f8546a54785ae48d049ddd2697 diff --git a/deploys/84532.version2_upgrade.txt b/deploys/84532.version2_upgrade.txt new file mode 100644 index 0000000..ae216cc --- /dev/null +++ b/deploys/84532.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0xec23ce6407ef841adf52e7232d3df5a44cb38041 +Auction implementation: 0xee970f19ed4960234e75ee8d3a42c98ca65b5c34 +Governor implementation: 0x5daabe9382158c3f133b360a5f0b46ca5a7f6e86 +Manager implementation: 0xf896daa9e7cdca767202d2f9699e7a30b22f6087 diff --git a/deploys/999999999.version2_upgrade.txt b/deploys/999999999.version2_upgrade.txt new file mode 100644 index 0000000..ae216cc --- /dev/null +++ b/deploys/999999999.version2_upgrade.txt @@ -0,0 +1,4 @@ +Token implementation: 0xec23ce6407ef841adf52e7232d3df5a44cb38041 +Auction implementation: 0xee970f19ed4960234e75ee8d3a42c98ca65b5c34 +Governor implementation: 0x5daabe9382158c3f133b360a5f0b46ca5a7f6e86 +Manager implementation: 0xf896daa9e7cdca767202d2f9699e7a30b22f6087 diff --git a/package.json b/package.json index ab8e816..9a9164f 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,9 @@ "deploy:local": "source .env && forge script script/DeployContracts.s.sol:DeployContracts --private-key $PRIVATE_KEY --broadcast --rpc-url $RPC_URL", "deploy:v2-local": "source .env && forge script script/DeployContractsV2.s.sol:DeployContracts --private-key $PRIVATE_KEY --broadcast --rpc-url $RPC_URL", "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 --resume --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/DeployV2New.s.sol:DeployContracts --private-key $PRIVATE_KEY --rpc-url $RPC_URL --broadcast --verify --verifier blockscout --verifier-url https://testnet.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://sepolia.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", diff --git a/src/auction/Auction.sol b/src/auction/Auction.sol index 62b4217..672c619 100644 --- a/src/auction/Auction.sol +++ b/src/auction/Auction.sol @@ -33,7 +33,7 @@ contract Auction is IAuction, VersionedContract, UUPS, Ownable, ReentrancyGuard, uint256 private constant BPS_PER_100_PERCENT = 10_000; /// @notice The maximum rewards percentage - uint256 private constant MAX_FOUNDER_REWARD_BPS = 3_000; + uint256 private constant MAX_FOUNDER_REWARD_BPS = 5_000; bytes4 public constant REWARDS_REASON = bytes4(0x0B411DE6);