Skip to content

Commit

Permalink
Sepolia upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
@neokry
neokry committed Jan 29, 2024
1 parent ae2398f commit 2fc3c89
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 20 deletions.
11 changes: 7 additions & 4 deletions addresses/11155111.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
13 changes: 8 additions & 5 deletions addresses/11155420.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
11 changes: 7 additions & 4 deletions addresses/84532.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
11 changes: 7 additions & 4 deletions addresses/999999999.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 4 additions & 0 deletions deploys/11155111.version2_upgrade.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Token implementation: 0x44d9fd02e6d8d96ca9c2bbd26c232024977674c5
Auction implementation: 0xca8f9a4805ccffdccfc5bf7973302a0c01f4347b
Governor implementation: 0xaa21afd73e6fd5f69c87a6839d0beedee075e9a3
Manager implementation: 0xabdedc8730410716dd0a5e54a89c85546a3458ba
4 changes: 4 additions & 0 deletions deploys/11155420.version2_upgrade.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Token implementation: 0xca8f9a4805ccffdccfc5bf7973302a0c01f4347b
Auction implementation: 0xaa21afd73e6fd5f69c87a6839d0beedee075e9a3
Governor implementation: 0xabdedc8730410716dd0a5e54a89c85546a3458ba
Manager implementation: 0x93f9d43a7bd751f8546a54785ae48d049ddd2697
4 changes: 4 additions & 0 deletions deploys/84532.version2_upgrade.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Token implementation: 0xec23ce6407ef841adf52e7232d3df5a44cb38041
Auction implementation: 0xee970f19ed4960234e75ee8d3a42c98ca65b5c34
Governor implementation: 0x5daabe9382158c3f133b360a5f0b46ca5a7f6e86
Manager implementation: 0xf896daa9e7cdca767202d2f9699e7a30b22f6087
4 changes: 4 additions & 0 deletions deploys/999999999.version2_upgrade.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Token implementation: 0xec23ce6407ef841adf52e7232d3df5a44cb38041
Auction implementation: 0xee970f19ed4960234e75ee8d3a42c98ca65b5c34
Governor implementation: 0x5daabe9382158c3f133b360a5f0b46ca5a7f6e86
Manager implementation: 0xf896daa9e7cdca767202d2f9699e7a30b22f6087
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/auction/Auction.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 2fc3c89

Please sign in to comment.