From d3249229f56d1748325a668db95f7d4814517beb Mon Sep 17 00:00:00 2001 From: neokry Date: Wed, 1 Nov 2023 14:06:03 +0700 Subject: [PATCH] Add event and comments --- addresses/84531.json | 14 +++++++------- deploys/84531.version2_core.txt | 14 +++++++------- deploys/84531.version2_new.txt | 4 ++-- src/token/IToken.sol | 2 ++ src/token/Token.sol | 4 ++++ 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/addresses/84531.json b/addresses/84531.json index aa197c7..8df0853 100644 --- a/addresses/84531.json +++ b/addresses/84531.json @@ -3,13 +3,13 @@ "WETH": "0x4200000000000000000000000000000000000006", "CrossDomainMessenger": "0x4200000000000000000000000000000000000007", "ProtocolRewards": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B", - "Manager": "0x58cc1c84f1176cb1b05d1c3e63eafbbc10019efb", + "Manager": "0x5e89c0d43b47af1855b1033fc5b80845ba859c3f", "ManagerImpl": "0x2c3b472e6f7bafa4f1bd3c5728388e1c046a3a73", - "Auction": "0xe46bce14dc5fcdca8628cc4b78bda75aef6717fe", - "Token": "0x8fdc5959e45567e1e4ec96cc1119e36d2e54bc0c", - "MetadataRenderer": "0xdcfcd6df2500b919e16ccae3366b765f6573dc25", + "Auction": "0x6199de26c88d3630e3cf2758b20fb6f59d595092", + "Token": "0x3175bcde4eb750952d030079fea1acf3055101df", + "MetadataRenderer": "0x05938e558a8d73ea0685e305c82edf115bb55121", "Treasury": "0x06dfa84ea3867211670cfae7f2cff4aeb5fdf176", - "Governor": "0x22c95521d0850aa09078de7d5826faf3dbd638a6", - "MerkleReserveMinter": "0x8dfa3bc1683c8ad8ef34eabfd39bc733a1df5395", - "MigrationDeployer": "0x01e2d618d5752f99047ba611ad35d9f8a9cc85bf" + "Governor": "0x25947b4b5a1d6900bd0ec3dfe422862946ced190", + "MerkleReserveMinter": "0x2b8aeb7c62c37b289e326616f73988ee96fa2cc1", + "MigrationDeployer": "0xeb12f3460e7883cea008a71a4f4f796a72f01f13" } diff --git a/deploys/84531.version2_core.txt b/deploys/84531.version2_core.txt index 5ab396f..537cf4c 100644 --- a/deploys/84531.version2_core.txt +++ b/deploys/84531.version2_core.txt @@ -1,7 +1,7 @@ -Manager: 0x58cc1c84f1176cb1b05d1c3e63eafbbc10019efb -Token implementation: 0x8fdc5959e45567e1e4ec96cc1119e36d2e54bc0c -Metadata Renderer implementation: 0xdcfcd6df2500b919e16ccae3366b765f6573dc25 -Auction implementation: 0xe46bce14dc5fcdca8628cc4b78bda75aef6717fe -Treasury implementation: 0x06dfa84ea3867211670cfae7f2cff4aeb5fdf176 -Governor implementation: 0x22c95521d0850aa09078de7d5826faf3dbd638a6 -Manager implementation: 0x2c3b472e6f7bafa4f1bd3c5728388e1c046a3a73 +Manager: 0x5d5a243a69128db6fab3a65d9929ff85a7774571 +Token implementation: 0xc203ab3f5f48a81ef74864f51f5ee926d85d160a +Metadata Renderer implementation: 0x05938e558a8d73ea0685e305c82edf115bb55121 +Auction implementation: 0x6199de26c88d3630e3cf2758b20fb6f59d595092 +Treasury implementation: 0x3175bcde4eb750952d030079fea1acf3055101df +Governor implementation: 0x25947b4b5a1d6900bd0ec3dfe422862946ced190 +Manager implementation: 0x5e89c0d43b47af1855b1033fc5b80845ba859c3f diff --git a/deploys/84531.version2_new.txt b/deploys/84531.version2_new.txt index 0dbe807..34079c5 100644 --- a/deploys/84531.version2_new.txt +++ b/deploys/84531.version2_new.txt @@ -1,2 +1,2 @@ -Merkle Reserve Minter: 0x8dfa3bc1683c8ad8ef34eabfd39bc733a1df5395 -Migration Deployer: 0x01e2d618d5752f99047ba611ad35d9f8a9cc85bf +Merkle Reserve Minter: 0x2b8aeb7c62c37b289e326616f73988ee96fa2cc1 +Migration Deployer: 0xeb12f3460e7883cea008a71a4f4f796a72f01f13 diff --git a/src/token/IToken.sol b/src/token/IToken.sol index 8f72ced..e486c9b 100644 --- a/src/token/IToken.sol +++ b/src/token/IToken.sol @@ -41,6 +41,8 @@ interface IToken is IUUPS, IERC721Votes, TokenTypesV1, TokenTypesV2 { /// @param renderer new metadata renderer address event MetadataRendererUpdated(address renderer); + event ReservedUntilTokenIDUpdated(uint256 reservedUntilTokenId); + /// /// /// ERRORS /// /// /// diff --git a/src/token/Token.sol b/src/token/Token.sol index 5886b03..154ecf8 100644 --- a/src/token/Token.sol +++ b/src/token/Token.sol @@ -481,6 +481,8 @@ contract Token is IToken, VersionedContract, UUPS, Ownable, ReentrancyGuard, ERC return minter[_minter]; } + /// @notice Set the tokenId that the reserve will end at + /// @param newReservedUntilTokenId The tokenId that the reserve will end at function setReservedUntilTokenId(uint256 newReservedUntilTokenId) external onlyOwner { // Cannot change the reserve after any non reserved tokens have been minted // Added to prevent making any tokens inaccessible @@ -496,6 +498,8 @@ contract Token is IToken, VersionedContract, UUPS, Ownable, ReentrancyGuard, ERC // Set the new reserve reservedUntilTokenId = newReservedUntilTokenId; + + emit ReservedUntilTokenIDUpdated(newReservedUntilTokenId); } /// @notice Set a new metadata renderer