bump version to 1.5 (#1263)

Final release of all 1.5 contracts - don't merge before the other PRs are all in TODO - #1258 - #1256 - #1273 --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
smartcontractkit · Aug 9, 2024 · a097381 · a097381
1 parent 1cfd5e7
commit a097381
Show file tree

Hide file tree

Showing 37 changed files with 59 additions and 332 deletions.
diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
@@ -22,7 +22,7 @@ AggregateTokenLimiter_setRateLimiterConfig:test_TokenLimitAdmin_Success() (gas:
 BurnFromMintTokenPool_lockOrBurn:test_ChainNotAllowed_Revert() (gas: 28761)
 BurnFromMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas: 55115)
 BurnFromMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 243491)
-BurnFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 23951)
+BurnFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 23947)
 BurnMintTokenPool_lockOrBurn:test_ChainNotAllowed_Revert() (gas: 27522)
 BurnMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas: 55115)
 BurnMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 241381)
@@ -33,7 +33,7 @@ BurnMintTokenPool_releaseOrMint:test_PoolMint_Success() (gas: 112319)
 BurnWithFromMintTokenPool_lockOrBurn:test_ChainNotAllowed_Revert() (gas: 28761)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurnRevertNotHealthy_Revert() (gas: 55115)
 BurnWithFromMintTokenPool_lockOrBurn:test_PoolBurn_Success() (gas: 243517)
-BurnWithFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 24304)
+BurnWithFromMintTokenPool_lockOrBurn:test_Setup_Success() (gas: 23951)
 CCIPClientExample_sanity:test_ImmutableExamples_Success() (gas: 2132747)
 CCIPConfigSetup:test_getCapabilityConfiguration_Success() (gas: 9517)
 CCIPConfig_ConfigStateMachine:test__computeConfigDigest_Success() (gas: 70831)
@@ -502,8 +502,8 @@ EtherSenderReceiverTest_validatedMessage:test_validatedMessage_tokenOverwrittenT
 EtherSenderReceiverTest_validatedMessage:test_validatedMessage_validMessage_extraArgs() (gas: 26292)
 LockReleaseTokenPoolAndProxy_setRebalancer:test_SetRebalancer_Revert() (gas: 10992)
 LockReleaseTokenPoolAndProxy_setRebalancer:test_SetRebalancer_Success() (gas: 18058)
-LockReleaseTokenPoolPoolAndProxy_canAcceptLiquidity:test_CanAcceptLiquidity_Success() (gas: 3360094)
-LockReleaseTokenPoolPoolAndProxy_provideLiquidity:test_LiquidityNotAccepted_Revert() (gas: 3356493)
+LockReleaseTokenPoolPoolAndProxy_canAcceptLiquidity:test_CanAcceptLiquidity_Success() (gas: 3359294)
+LockReleaseTokenPoolPoolAndProxy_provideLiquidity:test_LiquidityNotAccepted_Revert() (gas: 3355693)
 LockReleaseTokenPoolPoolAndProxy_provideLiquidity:test_Unauthorized_Revert() (gas: 11380)
 LockReleaseTokenPoolPoolAndProxy_supportsInterface:test_SupportsInterface_Success() (gas: 9977)
 LockReleaseTokenPoolPoolAndProxy_withdrawalLiquidity:test_InsufficientLiquidity_Revert() (gas: 60043)
@@ -835,7 +835,7 @@ RateLimiter_consume:test_TokenRateLimitReached_Revert() (gas: 24706)
 RateLimiter_currentTokenBucketState:test_CurrentTokenBucketState_Success() (gas: 38647)
 RateLimiter_currentTokenBucketState:test_Refill_Success() (gas: 46384)
 RateLimiter_setTokenBucketConfig:test_SetRateLimiterConfig_Success() (gas: 38017)
-RegistryModuleOwnerCustom_constructor:test_constructor_Revert() (gas: 36031)
+RegistryModuleOwnerCustom_constructor:test_constructor_Revert() (gas: 36028)
 RegistryModuleOwnerCustom_registerAdminViaGetCCIPAdmin:test_registerAdminViaGetCCIPAdmin_Revert() (gas: 19637)
 RegistryModuleOwnerCustom_registerAdminViaGetCCIPAdmin:test_registerAdminViaGetCCIPAdmin_Success() (gas: 129918)
 RegistryModuleOwnerCustom_registerAdminViaOwner:test_registerAdminViaOwner_Revert() (gas: 19451)
@@ -900,10 +900,10 @@ TokenAdminRegistry_setPool:test_setPool_Success() (gas: 35943)
 TokenAdminRegistry_setPool:test_setPool_ZeroAddressRemovesPool_Success() (gas: 30617)
 TokenAdminRegistry_transferAdminRole:test_transferAdminRole_OnlyAdministrator_Revert() (gas: 18043)
 TokenAdminRegistry_transferAdminRole:test_transferAdminRole_Success() (gas: 49390)
-TokenPoolAndProxy:test_lockOrBurn_burnMint_Success() (gas: 6066750)
-TokenPoolAndProxy:test_lockOrBurn_lockRelease_Success() (gas: 6311731)
-TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_2() (gas: 6910329)
-TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_4() (gas: 7094420)
+TokenPoolAndProxy:test_lockOrBurn_burnMint_Success() (gas: 6064542)
+TokenPoolAndProxy:test_lockOrBurn_lockRelease_Success() (gas: 6310931)
+TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_2() (gas: 6908121)
+TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_4() (gas: 7092212)
 TokenPoolWithAllowList_applyAllowListUpdates:test_AllowListNotEnabled_Revert() (gas: 2209837)
 TokenPoolWithAllowList_applyAllowListUpdates:test_OnlyOwner_Revert() (gas: 12089)
 TokenPoolWithAllowList_applyAllowListUpdates:test_SetAllowListSkipsZero_Success() (gas: 23324)

diff --git a/contracts/src/v0.8/ccip/CommitStore.sol b/contracts/src/v0.8/ccip/CommitStore.sol
@@ -59,7 +59,7 @@ contract CommitStore is ICommitStore, ITypeAndVersion, OCR2Base {
   }
 
   // STATIC CONFIG
-  string public constant override typeAndVersion = "CommitStore 1.5.0-dev";
+  string public constant override typeAndVersion = "CommitStore 1.5.0";
   // Chain ID of this chain
   uint64 internal immutable i_chainSelector;
   // Chain ID of the source chain

diff --git a/contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol b/contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol
@@ -33,7 +33,6 @@ contract EVM2EVMMultiOffRamp is ITypeAndVersion, MultiOCR3Base {
   using ERC165Checker for address;
   using EnumerableMapAddresses for EnumerableMapAddresses.AddressToAddressMap;
 
-  error AlreadyExecuted(uint64 sourceChainSelector, uint64 sequenceNumber);
   error ZeroChainSelectorNotAllowed();
   error ExecutionError(bytes32 messageId, bytes err);
   error SourceChainNotEnabled(uint64 sourceChainSelector);

diff --git a/contracts/src/v0.8/ccip/offRamp/EVM2EVMOffRamp.sol b/contracts/src/v0.8/ccip/offRamp/EVM2EVMOffRamp.sol
@@ -34,7 +34,6 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
   using ERC165Checker for address;
   using EnumerableMapAddresses for EnumerableMapAddresses.AddressToAddressMap;
 
-  error AlreadyExecuted(uint64 sequenceNumber);
   error ZeroAddressNotAllowed();
   error CommitStoreAlreadyInUse();
   error ExecutionError(bytes err);
@@ -112,7 +111,7 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
   }
 
   // STATIC CONFIG
-  string public constant override typeAndVersion = "EVM2EVMOffRamp 1.5.0-dev";
+  string public constant override typeAndVersion = "EVM2EVMOffRamp 1.5.0";
 
   /// @dev Commit store address on the destination chain
   address internal immutable i_commitStore;

diff --git a/contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol b/contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol
@@ -149,7 +149,7 @@ contract EVM2EVMOnRamp is IEVM2AnyOnRamp, ILinkAvailable, AggregateRateLimiter,
   }
 
   // STATIC CONFIG
-  string public constant override typeAndVersion = "EVM2EVMOnRamp 1.5.0-dev";
+  string public constant override typeAndVersion = "EVM2EVMOnRamp 1.5.0";
   /// @dev metadataHash is a lane-specific prefix for a message hash preimage which ensures global uniqueness
   /// Ensures that 2 identical messages sent to 2 different lanes will have a distinct hash.
   /// Must match the metadataHash used in computing leaf hashes offchain for the root committed in

diff --git a/contracts/src/v0.8/ccip/pools/BurnFromMintTokenPool.sol b/contracts/src/v0.8/ccip/pools/BurnFromMintTokenPool.sol
@@ -18,7 +18,7 @@ import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/tok
 contract BurnFromMintTokenPool is BurnMintTokenPoolAbstract, ITypeAndVersion {
   using SafeERC20 for IBurnMintERC20;
 
-  string public constant override typeAndVersion = "BurnFromMintTokenPool 1.5.0-dev";
+  string public constant override typeAndVersion = "BurnFromMintTokenPool 1.5.0";
 
   constructor(
     IBurnMintERC20 token,

diff --git a/contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol b/contracts/src/v0.8/ccip/pools/BurnMintTokenPool.sol
@@ -14,7 +14,7 @@ import {TokenPool} from "./TokenPool.sol";
 /// If that is expected, please make sure the token's burner/minter roles are adjustable.
 /// @dev This contract is a variant of BurnMintTokenPool that uses `burn(amount)`.
 contract BurnMintTokenPool is BurnMintTokenPoolAbstract, ITypeAndVersion {
-  string public constant override typeAndVersion = "BurnMintTokenPool 1.5.0-dev";
+  string public constant override typeAndVersion = "BurnMintTokenPool 1.5.0";
 
   constructor(
     IBurnMintERC20 token,

diff --git a/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol b/contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol
@@ -8,7 +8,7 @@ import {Pool} from "../libraries/Pool.sol";
 import {LegacyPoolWrapper} from "./LegacyPoolWrapper.sol";
 
 contract BurnMintTokenPoolAndProxy is ITypeAndVersion, LegacyPoolWrapper {
-  string public constant override typeAndVersion = "BurnMintTokenPoolAndProxy 1.5.0-dev";
+  string public constant override typeAndVersion = "BurnMintTokenPoolAndProxy 1.5.0";
 
   constructor(
     IBurnMintERC20 token,

diff --git a/contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol b/contracts/src/v0.8/ccip/pools/BurnWithFromMintTokenPool.sol
@@ -18,7 +18,7 @@ import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/tok
 contract BurnWithFromMintTokenPool is BurnMintTokenPoolAbstract, ITypeAndVersion {
   using SafeERC20 for IBurnMintERC20;
 
-  string public constant override typeAndVersion = "BurnWithFromMintTokenPool 1.5.0-dev";
+  string public constant override typeAndVersion = "BurnWithFromMintTokenPool 1.5.0";
 
   constructor(
     IBurnMintERC20 token,

diff --git a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPool.sol
@@ -22,7 +22,7 @@ contract LockReleaseTokenPool is TokenPool, ILiquidityContainer, ITypeAndVersion
 
   event LiquidityTransferred(address indexed from, uint256 amount);
 
-  string public constant override typeAndVersion = "LockReleaseTokenPool 1.5.0-dev";
+  string public constant override typeAndVersion = "LockReleaseTokenPool 1.5.0";
 
   /// @dev Whether or not the pool accepts liquidity.
   /// External liquidity is not required when there is one canonical token deployed to a chain,

diff --git a/contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol b/contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol
@@ -20,7 +20,7 @@ contract LockReleaseTokenPoolAndProxy is LegacyPoolWrapper, ILiquidityContainer,
   error InsufficientLiquidity();
   error LiquidityNotAccepted();
 
-  string public constant override typeAndVersion = "LockReleaseTokenPoolAndProxy 1.5.0-dev";
+  string public constant override typeAndVersion = "LockReleaseTokenPoolAndProxy 1.5.0";
 
   /// @dev Whether or not the pool accepts liquidity.
   /// External liquidity is not required when there is one canonical token deployed to a chain,

diff --git a/contracts/src/v0.8/ccip/test/commitStore/CommitStore.t.sol b/contracts/src/v0.8/ccip/test/commitStore/CommitStore.t.sol
@@ -113,7 +113,7 @@ contract CommitStore_constructor is PriceRegistrySetup, OCR2BaseSetup {
     // CommitStore initial values
     assertEq(0, commitStore.getLatestPriceEpochAndRound());
     assertEq(1, commitStore.getExpectedNextSequenceNumber());
-    assertEq(commitStore.typeAndVersion(), "CommitStore 1.5.0-dev");
+    assertEq(commitStore.typeAndVersion(), "CommitStore 1.5.0");
     assertEq(OWNER, commitStore.owner());
     assertTrue(commitStore.isUnpausedAndNotCursed());
   }

diff --git a/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRamp.t.sol b/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMOffRamp.t.sol
@@ -71,7 +71,7 @@ contract EVM2EVMOffRamp_constructor is EVM2EVMOffRampSetup {
     assertEq(block.number, blockNumber);
 
     // OffRamp initial values
-    assertEq("EVM2EVMOffRamp 1.5.0-dev", s_offRamp.typeAndVersion());
+    assertEq("EVM2EVMOffRamp 1.5.0", s_offRamp.typeAndVersion());
     assertEq(OWNER, s_offRamp.owner());
   }
 

diff --git a/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRamp.t.sol b/contracts/src/v0.8/ccip/test/onRamp/EVM2EVMOnRamp.t.sol
@@ -59,7 +59,7 @@ contract EVM2EVMOnRamp_constructor is EVM2EVMOnRampSetup {
     assertEq(dynamicConfig.maxPerMsgGasLimit, gotDynamicConfig.maxPerMsgGasLimit);
 
     // Initial values
-    assertEq("EVM2EVMOnRamp 1.5.0-dev", s_onRamp.typeAndVersion());
+    assertEq("EVM2EVMOnRamp 1.5.0", s_onRamp.typeAndVersion());
     assertEq(OWNER, s_onRamp.owner());
     assertEq(1, s_onRamp.getExpectedNextSequenceNumber());
   }

diff --git a/contracts/src/v0.8/ccip/test/pools/BurnFromMintTokenPool.t.sol b/contracts/src/v0.8/ccip/test/pools/BurnFromMintTokenPool.t.sol
@@ -29,7 +29,7 @@ contract BurnFromMintTokenPool_lockOrBurn is BurnFromMintTokenPoolSetup {
     assertEq(address(s_mockRMN), s_pool.getRmnProxy());
     assertEq(false, s_pool.getAllowListEnabled());
     assertEq(type(uint256).max, s_burnMintERC677.allowance(address(s_pool), address(s_pool)));
-    assertEq("BurnFromMintTokenPool 1.5.0-dev", s_pool.typeAndVersion());
+    assertEq("BurnFromMintTokenPool 1.5.0", s_pool.typeAndVersion());
   }
 
   function test_PoolBurn_Success() public {

diff --git a/contracts/src/v0.8/ccip/test/pools/BurnMintTokenPool.t.sol b/contracts/src/v0.8/ccip/test/pools/BurnMintTokenPool.t.sol
@@ -32,7 +32,7 @@ contract BurnMintTokenPool_lockOrBurn is BurnMintTokenPoolSetup {
     assertEq(address(s_burnMintERC677), address(s_pool.getToken()));
     assertEq(address(s_mockRMN), s_pool.getRmnProxy());
     assertEq(false, s_pool.getAllowListEnabled());
-    assertEq("BurnMintTokenPool 1.5.0-dev", s_pool.typeAndVersion());
+    assertEq("BurnMintTokenPool 1.5.0", s_pool.typeAndVersion());
   }
 
   function test_PoolBurn_Success() public {

diff --git a/contracts/src/v0.8/ccip/test/pools/BurnWithFromMintTokenPool.t.sol b/contracts/src/v0.8/ccip/test/pools/BurnWithFromMintTokenPool.t.sol
@@ -30,7 +30,7 @@ contract BurnWithFromMintTokenPool_lockOrBurn is BurnWithFromMintTokenPoolSetup
     assertEq(address(s_mockRMN), s_pool.getRmnProxy());
     assertEq(false, s_pool.getAllowListEnabled());
     assertEq(type(uint256).max, s_burnMintERC677.allowance(address(s_pool), address(s_pool)));
-    assertEq("BurnWithFromMintTokenPool 1.5.0-dev", s_pool.typeAndVersion());
+    assertEq("BurnWithFromMintTokenPool 1.5.0", s_pool.typeAndVersion());
   }
 
   function test_PoolBurn_Success() public {

diff --git a/contracts/src/v0.8/ccip/tokenAdminRegistry/RegistryModuleOwnerCustom.sol b/contracts/src/v0.8/ccip/tokenAdminRegistry/RegistryModuleOwnerCustom.sol
@@ -12,7 +12,7 @@ contract RegistryModuleOwnerCustom is ITypeAndVersion {
 
   event AdministratorRegistered(address indexed token, address indexed administrator);
 
-  string public constant override typeAndVersion = "RegistryModuleOwnerCustom 1.5.0-dev";
+  string public constant override typeAndVersion = "RegistryModuleOwnerCustom 1.5.0";
 
   // The TokenAdminRegistry contract
   ITokenAdminRegistry internal immutable i_tokenAdminRegistry;

diff --git a/contracts/src/v0.8/ccip/tokenAdminRegistry/TokenAdminRegistry.sol b/contracts/src/v0.8/ccip/tokenAdminRegistry/TokenAdminRegistry.sol
@@ -26,8 +26,6 @@ contract TokenAdminRegistry is ITokenAdminRegistry, ITypeAndVersion, OwnerIsCrea
   event PoolSet(address indexed token, address indexed previousPool, address indexed newPool);
   event AdministratorTransferRequested(address indexed token, address indexed currentAdmin, address indexed newAdmin);
   event AdministratorTransferred(address indexed token, address indexed newAdmin);
-  event DisableReRegistrationSet(address indexed token, bool disabled);
-  event RemovedAdministrator(address token);
   event RegistryModuleAdded(address module);
   event RegistryModuleRemoved(address indexed module);
 
@@ -39,7 +37,7 @@ contract TokenAdminRegistry is ITokenAdminRegistry, ITypeAndVersion, OwnerIsCrea
     address tokenPool; // the token pool for this token. Can be address(0) if not deployed or not configured.
   }
 
-  string public constant override typeAndVersion = "TokenAdminRegistry 1.5.0-dev";
+  string public constant override typeAndVersion = "TokenAdminRegistry 1.5.0";
 
   // Mapping of token address to token configuration
   mapping(address token => TokenConfig) internal s_tokenConfig;

diff --git a/core/gethwrappers/ccip/generated/burn_from_mint_token_pool/burn_from_mint_token_pool.go b/core/gethwrappers/ccip/generated/burn_from_mint_token_pool/burn_from_mint_token_pool.go
diff --git a/core/gethwrappers/ccip/generated/burn_mint_token_pool/burn_mint_token_pool.go b/core/gethwrappers/ccip/generated/burn_mint_token_pool/burn_mint_token_pool.go
diff --git a/...hwrappers/ccip/generated/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go b/...hwrappers/ccip/generated/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go
diff --git a/...hwrappers/ccip/generated/burn_with_from_mint_token_pool/burn_with_from_mint_token_pool.go b/...hwrappers/ccip/generated/burn_with_from_mint_token_pool/burn_with_from_mint_token_pool.go