Self Serve Token Pool Factory Contract

contracts/gas-snapshots/ccip.gas-snapshot

@@ -996,6 +996,12 @@ TokenPoolAndProxy:test_lockOrBurn_lockRelease_Success() (gas: 5793246)
 TokenPoolAndProxy:test_setPreviousPool_Success() (gas: 3070731)
 TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_2() (gas: 6434801)
 TokenPoolAndProxyMigration:test_tokenPoolMigration_Success_1_4() (gas: 6634934)
+TokenPoolFactoryTests:test_TokenPoolFactory_Constructor_Revert() (gas: 1188046)
+TokenPoolFactoryTests:test_createTokenPoolLockRelease_NoExistingToken_predict_Success() (gas: 12420072)
+TokenPoolFactoryTests:test_createTokenPool_ExistingRemoteToken_AndPredictPool_Success() (gas: 12434881)
+TokenPoolFactoryTests:test_createTokenPool_WithNoExistingRemoteContracts_predict_Success() (gas: 12702418)
+TokenPoolFactoryTests:test_createTokenPool_WithNoExistingTokenOnRemoteChain_Success() (gas: 5740593)
+TokenPoolFactoryTests:test_createTokenPool_WithRemoteTokenAndRemotePool_Success() (gas: 5880940)
 TokenPoolWithAllowList_applyAllowListUpdates:test_AllowListNotEnabled_Revert() (gas: 1979943)
 TokenPoolWithAllowList_applyAllowListUpdates:test_OnlyOwner_Revert() (gas: 12113)
 TokenPoolWithAllowList_applyAllowListUpdates:test_SetAllowListSkipsZero_Success() (gas: 23476)

contracts/gas-snapshots/operatorforwarder.gas-snapshot

@@ -4,12 +4,12 @@ FactoryTest:test_DeployNewOperatorAndForwarder_Success() (gas: 4069305)
 FactoryTest:test_DeployNewOperator_Success() (gas: 3020464)
 ForwarderTest:test_Forward_Success(uint256) (runs: 257, μ: 226979, ~: 227289)
 ForwarderTest:test_MultiForward_Success(uint256,uint256) (runs: 257, μ: 258577, ~: 259120)
-ForwarderTest:test_OwnerForward_Success() (gas: 30118)
+ForwarderTest:test_OwnerForward_Success() (gas: 30096)
 ForwarderTest:test_SetAuthorizedSenders_Success() (gas: 160524)
 ForwarderTest:test_TransferOwnershipWithMessage_Success() (gas: 35123)
-OperatorTest:test_CancelOracleRequest_Success() (gas: 274436)
-OperatorTest:test_FulfillOracleRequest_Success() (gas: 330603)
-OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246716)
-OperatorTest:test_OracleRequest_Success() (gas: 250019)
-OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 257, μ: 387121, ~: 387124)
-OperatorTest:test_SendRequest_Success(uint96) (runs: 257, μ: 303612, ~: 303615)
+OperatorTest:test_CancelOracleRequest_Success() (gas: 274295)
+OperatorTest:test_FulfillOracleRequest_Success() (gas: 330480)
+OperatorTest:test_NotAuthorizedSender_Revert() (gas: 246628)
+OperatorTest:test_OracleRequest_Success() (gas: 249843)
+OperatorTest:test_SendRequestAndCancelRequest_Success(uint96) (runs: 257, μ: 386787, ~: 386790)
+OperatorTest:test_SendRequest_Success(uint96) (runs: 257, μ: 303436, ~: 303439)

contracts/src/v0.8/ccip/interfaces/IRegistryModuleOwnerCustom.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.19;
+
+interface IRegistryModuleOwnerCustom {
+  /// @notice Registers the admin of the token using the `getCCIPAdmin` method.
+  /// @param token The token to register the admin for.
+  /// @dev The caller must be the admin returned by the `getCCIPAdmin` method.
+  function registerAdminViaGetCCIPAdmin(address token) external;
+
+  /// @notice Registers the admin of the token using the `owner` method.
+  /// @param token The token to register the admin for.
+  /// @dev The caller must be the admin returned by the `owner` method.
+  function registerAdminViaOwner(address token) external;
+}

contracts/src/v0.8/ccip/interfaces/ITokenAdminRegistry.sol

@@ -9,4 +9,22 @@ interface ITokenAdminRegistry {
   /// @param localToken The token to register the administrator for.
   /// @param administrator The administrator to register.
   function proposeAdministrator(address localToken, address administrator) external;
+
+  /// @notice Accepts the administrator role for a token.
+  /// @param localToken The token to accept the administrator role for.
+  /// @dev This function can only be called by the pending administrator.
+  function acceptAdminRole(address localToken) external;
+
+  /// @notice Sets the pool for a token. Setting the pool to address(0) effectively delists the token
+  /// from CCIP. Setting the pool to any other address enables the token on CCIP.
+  /// @param localToken The token to set the pool for.
+  /// @param pool The pool to set for the token.
+  function setPool(address localToken, address pool) external;
+
+  /// @notice Transfers the administrator role for a token to a new address with a 2-step process.
+  /// @param localToken The token to transfer the administrator role for.
+  /// @param newAdmin The address to transfer the administrator role to. Can be address(0) to cancel
+  /// a pending transfer.
+  /// @dev The new admin must call `acceptAdminRole` to accept the role.
+  function transferAdminRole(address localToken, address newAdmin) external;
 }

contracts/src/v0.8/ccip/test/legacy/TokenPoolAndProxy.t.sol

@@ -361,8 +361,12 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
   }
 
   function test_lockOrBurn_burnWithFromMint_Success() public {
-    s_pool =
-      new BurnWithFromMintTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), address(s_sourceRouter));
+    s_pool = new BurnWithFromMintTokenPoolAndProxy(
+      s_token,
+      new address[](0),
+      address(s_mockRMN),
+      address(s_sourceRouter)
+    );
     _configurePool();
     _deployOldPool();
     _assertLockOrBurnCorrect();
@@ -374,8 +378,13 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
   }
 
   function test_lockOrBurn_lockRelease_Success() public {
-    s_pool =
-      new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), false, address(s_sourceRouter));
+    s_pool = new LockReleaseTokenPoolAndProxy(
+      s_token,
+      new address[](0),
+      address(s_mockRMN),
+      false,
+      address(s_sourceRouter)
+    );
     _configurePool();
     _deployOldPool();
     _assertLockOrBurnCorrect();
@@ -391,11 +400,17 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
     s_token.grantMintAndBurnRoles(address(s_legacyPool));
 
     TokenPool1_2.RampUpdate[] memory onRampUpdates = new TokenPool1_2.RampUpdate[](1);
-    onRampUpdates[0] =
-      TokenPool1_2.RampUpdate({ramp: address(s_pool), allowed: true, rateLimiterConfig: _getInboundRateLimiterConfig()});
+    onRampUpdates[0] = TokenPool1_2.RampUpdate({
+      ramp: address(s_pool),
+      allowed: true,
+      rateLimiterConfig: _getInboundRateLimiterConfig()
+    });
     TokenPool1_2.RampUpdate[] memory offRampUpdates = new TokenPool1_2.RampUpdate[](1);
-    offRampUpdates[0] =
-      TokenPool1_2.RampUpdate({ramp: address(s_pool), allowed: true, rateLimiterConfig: _getInboundRateLimiterConfig()});
+    offRampUpdates[0] = TokenPool1_2.RampUpdate({
+      ramp: address(s_pool),
+      allowed: true,
+      rateLimiterConfig: _getInboundRateLimiterConfig()
+    });
     BurnMintTokenPool1_2(address(s_legacyPool)).applyRampUpdates(onRampUpdates, offRampUpdates);
   }
 
@@ -506,8 +521,13 @@ contract TokenPoolAndProxy is EVM2EVMOnRampSetup {
   }
 
   function test_setPreviousPool_Success() public {
-    LockReleaseTokenPoolAndProxy pool =
-      new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), true, address(s_sourceRouter));
+    LockReleaseTokenPoolAndProxy pool = new LockReleaseTokenPoolAndProxy(
+      s_token,
+      new address[](0),
+      address(s_mockRMN),
+      true,
+      address(s_sourceRouter)
+    );
 
     assertEq(pool.getPreviousPool(), address(0));
 
@@ -539,13 +559,23 @@ contract LockReleaseTokenPoolAndProxySetup is RouterSetup {
     RouterSetup.setUp();
     s_token = new BurnMintERC677("LINK", "LNK", 18, 0);
     deal(address(s_token), OWNER, type(uint256).max);
-    s_lockReleaseTokenPoolAndProxy =
-      new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), true, address(s_sourceRouter));
+    s_lockReleaseTokenPoolAndProxy = new LockReleaseTokenPoolAndProxy(
+      s_token,
+      new address[](0),
+      address(s_mockRMN),
+      true,
+      address(s_sourceRouter)
+    );
 
     s_allowedList.push(USER_1);
     s_allowedList.push(DUMMY_CONTRACT_ADDRESS);
-    s_lockReleaseTokenPoolAndProxyWithAllowList =
-      new LockReleaseTokenPoolAndProxy(s_token, s_allowedList, address(s_mockRMN), true, address(s_sourceRouter));
+    s_lockReleaseTokenPoolAndProxyWithAllowList = new LockReleaseTokenPoolAndProxy(
+      s_token,
+      s_allowedList,
+      address(s_mockRMN),
+      true,
+      address(s_sourceRouter)
+    );
 
     TokenPool.ChainUpdate[] memory chainUpdate = new TokenPool.ChainUpdate[](1);
     chainUpdate[0] = TokenPool.ChainUpdate({
@@ -588,8 +618,13 @@ contract LockReleaseTokenPoolPoolAndProxy_canAcceptLiquidity is LockReleaseToken
   function test_CanAcceptLiquidity_Success() public {
     assertEq(true, s_lockReleaseTokenPoolAndProxy.canAcceptLiquidity());
 
-    s_lockReleaseTokenPoolAndProxy =
-      new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), false, address(s_sourceRouter));
+    s_lockReleaseTokenPoolAndProxy = new LockReleaseTokenPoolAndProxy(
+      s_token,
+      new address[](0),
+      address(s_mockRMN),
+      false,
+      address(s_sourceRouter)
+    );
     assertEq(false, s_lockReleaseTokenPoolAndProxy.canAcceptLiquidity());
   }
 }
@@ -621,8 +656,13 @@ contract LockReleaseTokenPoolPoolAndProxy_provideLiquidity is LockReleaseTokenPo
   }
 
   function test_LiquidityNotAccepted_Revert() public {
-    s_lockReleaseTokenPoolAndProxy =
-      new LockReleaseTokenPoolAndProxy(s_token, new address[](0), address(s_mockRMN), false, address(s_sourceRouter));
+    s_lockReleaseTokenPoolAndProxy = new LockReleaseTokenPoolAndProxy(
+      s_token,
+      new address[](0),
+      address(s_mockRMN),
+      false,
+      address(s_sourceRouter)
+    );
 
     vm.expectRevert(LockReleaseTokenPoolAndProxy.LiquidityNotAccepted.selector);
     s_lockReleaseTokenPoolAndProxy.provideLiquidity(1);