Self Serve Token Pool Factory Contract

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/gas-snapshots/shared.gas-snapshot

@@ -7,42 +7,69 @@ AuthorizedCallers_applyAuthorizedCallerUpdates:test_SkipRemove_Success() (gas: 3
 AuthorizedCallers_applyAuthorizedCallerUpdates:test_ZeroAddressNotAllowed_Revert() (gas: 64473)
 AuthorizedCallers_constructor:test_ZeroAddressNotAllowed_Revert() (gas: 64473)
 AuthorizedCallers_constructor:test_constructor_Success() (gas: 720513)
-BurnMintERC677_approve:testApproveSuccess() (gas: 55512)
+BurnMintERC20_approve:testApproveSuccess() (gas: 55477)
+BurnMintERC20_approve:testInvalidAddressReverts() (gas: 10663)
+BurnMintERC20_burn:testBasicBurnSuccess() (gas: 173886)
+BurnMintERC20_burn:testBurnFromZeroAddressReverts() (gas: 47201)
+BurnMintERC20_burn:testExceedsBalanceReverts() (gas: 21819)
+BurnMintERC20_burn:testSenderNotBurnerReverts() (gas: 16739)
+BurnMintERC20_burnFrom:testBurnFromSuccess() (gas: 57957)
+BurnMintERC20_burnFrom:testExceedsBalanceReverts() (gas: 35916)
+BurnMintERC20_burnFrom:testInsufficientAllowanceReverts() (gas: 21914)
+BurnMintERC20_burnFrom:testSenderNotBurnerReverts() (gas: 16739)
+BurnMintERC20_burnFromAlias:testBurnFromSuccess() (gas: 57932)
+BurnMintERC20_burnFromAlias:testExceedsBalanceReverts() (gas: 35880)
+BurnMintERC20_burnFromAlias:testInsufficientAllowanceReverts() (gas: 21869)
+BurnMintERC20_burnFromAlias:testSenderNotBurnerReverts() (gas: 16694)
+BurnMintERC20_constructor:testConstructorSuccess() (gas: 1600593)
+BurnMintERC20_decreaseApproval:testDecreaseApprovalSuccess() (gas: 31123)
+BurnMintERC20_grantMintAndBurnRoles:testGrantMintAndBurnRolesSuccess() (gas: 121170)
+BurnMintERC20_grantRole:testGrantBurnAccessSuccess() (gas: 53407)
+BurnMintERC20_grantRole:testGrantManySuccess() (gas: 944594)
+BurnMintERC20_grantRole:testGrantMintAccessSuccess() (gas: 94200)
+BurnMintERC20_increaseApproval:testIncreaseApprovalSuccess() (gas: 44121)
+BurnMintERC20_mint:testBasicMintSuccess() (gas: 149743)
+BurnMintERC20_mint:testMaxSupplyExceededReverts() (gas: 50429)
+BurnMintERC20_mint:testSenderNotMinterReverts() (gas: 14596)
+BurnMintERC20_supportsInterface:testConstructorSuccess() (gas: 11123)
+BurnMintERC20_transfer:testInvalidAddressReverts() (gas: 10661)
+BurnMintERC20_transfer:testTransferSuccess() (gas: 42277)
+BurnMintERC677_approve:testApproveSuccess() (gas: 55477)
 BurnMintERC677_approve:testInvalidAddressReverts() (gas: 10663)
-BurnMintERC677_burn:testBasicBurnSuccess() (gas: 173939)
-BurnMintERC677_burn:testBurnFromZeroAddressReverts() (gas: 47201)
+BurnMintERC677_burn:testBasicBurnSuccess() (gas: 173904)
+BurnMintERC677_burn:testBurnFromZeroAddressReverts() (gas: 47223)
 BurnMintERC677_burn:testExceedsBalanceReverts() (gas: 21841)
-BurnMintERC677_burn:testSenderNotBurnerReverts() (gas: 13359)
-BurnMintERC677_burnFrom:testBurnFromSuccess() (gas: 57923)
-BurnMintERC677_burnFrom:testExceedsBalanceReverts() (gas: 35864)
-BurnMintERC677_burnFrom:testInsufficientAllowanceReverts() (gas: 21849)
-BurnMintERC677_burnFrom:testSenderNotBurnerReverts() (gas: 13359)
-BurnMintERC677_burnFromAlias:testBurnFromSuccess() (gas: 57949)
+BurnMintERC677_burn:testSenderNotBurnerReverts() (gas: 13424)
+BurnMintERC677_burnFrom:testBurnFromSuccess() (gas: 57957)
+BurnMintERC677_burnFrom:testExceedsBalanceReverts() (gas: 35916)
+BurnMintERC677_burnFrom:testInsufficientAllowanceReverts() (gas: 21914)
+BurnMintERC677_burnFrom:testSenderNotBurnerReverts() (gas: 13424)
+BurnMintERC677_burnFromAlias:testBurnFromSuccess() (gas: 57932)
 BurnMintERC677_burnFromAlias:testExceedsBalanceReverts() (gas: 35880)
 BurnMintERC677_burnFromAlias:testInsufficientAllowanceReverts() (gas: 21869)
 BurnMintERC677_burnFromAlias:testSenderNotBurnerReverts() (gas: 13379)
-BurnMintERC677_constructor:testConstructorSuccess() (gas: 1672809)
-BurnMintERC677_decreaseApproval:testDecreaseApprovalSuccess() (gas: 31069)
-BurnMintERC677_grantMintAndBurnRoles:testGrantMintAndBurnRolesSuccess() (gas: 121324)
-BurnMintERC677_grantRole:testGrantBurnAccessSuccess() (gas: 53460)
-BurnMintERC677_grantRole:testGrantManySuccess() (gas: 937759)
-BurnMintERC677_grantRole:testGrantMintAccessSuccess() (gas: 94340)
-BurnMintERC677_increaseApproval:testIncreaseApprovalSuccess() (gas: 44076)
-BurnMintERC677_mint:testBasicMintSuccess() (gas: 149699)
-BurnMintERC677_mint:testMaxSupplyExceededReverts() (gas: 50385)
+BurnMintERC677_constructor:testConstructorSuccess() (gas: 1763863)
+BurnMintERC677_decreaseApproval:testDecreaseApprovalSuccess() (gas: 31088)
+BurnMintERC677_grantMintAndBurnRoles:testGrantMintAndBurnRolesSuccess() (gas: 121214)
+BurnMintERC677_grantRole:testGrantBurnAccessSuccess() (gas: 53477)
+BurnMintERC677_grantRole:testGrantManySuccess() (gas: 937980)
+BurnMintERC677_grantRole:testGrantMintAccessSuccess() (gas: 94200)
+BurnMintERC677_increaseApproval:testIncreaseApprovalSuccess() (gas: 44121)
+BurnMintERC677_mint:testBasicMintSuccess() (gas: 149677)
+BurnMintERC677_mint:testMaxSupplyExceededReverts() (gas: 50297)
 BurnMintERC677_mint:testSenderNotMinterReverts() (gas: 11195)
-BurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 12476)
-BurnMintERC677_transfer:testInvalidAddressReverts() (gas: 10639)
-BurnMintERC677_transfer:testTransferSuccess() (gas: 42299)
+BurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 12610)
+BurnMintERC677_transfer:testInvalidAddressReverts() (gas: 10661)
+BurnMintERC677_transfer:testTransferSuccess() (gas: 42277)
 CallWithExactGas__callWithExactGas:test_CallWithExactGasReceiverErrorSuccess() (gas: 67209)
 CallWithExactGas__callWithExactGas:test_CallWithExactGasSafeReturnDataExactGas() (gas: 18324)
 CallWithExactGas__callWithExactGas:test_NoContractReverts() (gas: 11559)
 CallWithExactGas__callWithExactGas:test_NoGasForCallExactCheckReverts() (gas: 15788)
 CallWithExactGas__callWithExactGas:test_NotEnoughGasForCallReverts() (gas: 16241)
-CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 257, μ: 15767, ~: 15719)
+CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 257, μ: 15766, ~: 15719)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 20116)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 67721)
-CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 257, μ: 16277, ~: 16229)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 257, μ: 16276, ~: 16229)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoContractSuccess() (gas: 12962)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoGasForCallExactCheckReturnFalseSuccess() (gas: 13005)
 CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NotEnoughGasForCallReturnsFalseSuccess() (gas: 13317)
@@ -74,11 +101,11 @@ EnumerableMapAddresses_set:testSetSuccess() (gas: 94685)
 EnumerableMapAddresses_tryGet:testBytes32TryGetSuccess() (gas: 94622)
 EnumerableMapAddresses_tryGet:testBytesTryGetSuccess() (gas: 96279)
 EnumerableMapAddresses_tryGet:testTryGetSuccess() (gas: 94893)
-OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1743649)
-OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 298649)
-OpStackBurnMintERC677_interfaceCompatibility:testMintCompatibility() (gas: 137957)
+OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1829158)
+OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 298741)
+OpStackBurnMintERC677_interfaceCompatibility:testMintCompatibility() (gas: 138155)
 OpStackBurnMintERC677_interfaceCompatibility:testStaticFunctionsCompatibility() (gas: 13781)
-OpStackBurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 12752)
+OpStackBurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 12814)
 SortedSetValidationUtil_CheckIsValidUniqueSubsetTest:test__checkIsValidUniqueSubset_EmptySubset_Reverts() (gas: 5460)
 SortedSetValidationUtil_CheckIsValidUniqueSubsetTest:test__checkIsValidUniqueSubset_EmptySuperset_Reverts() (gas: 4661)
 SortedSetValidationUtil_CheckIsValidUniqueSubsetTest:test__checkIsValidUniqueSubset_HasDuplicates_Reverts() (gas: 8265)

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/helpers/BurnMintERC677Helper.sol

@@ -4,15 +4,11 @@ pragma solidity 0.8.24;
 import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
 import {IGetCCIPAdmin} from "../../interfaces/IGetCCIPAdmin.sol";
 
-contract BurnMintERC677Helper is BurnMintERC677, IGetCCIPAdmin {
+contract BurnMintERC677Helper is BurnMintERC677 {
   constructor(string memory name, string memory symbol) BurnMintERC677(name, symbol, 18, 0) {}
 
   // Gives one full token to any given address.
   function drip(address to) external {
     _mint(to, 1e18);
   }
-
-  function getCCIPAdmin() external view override returns (address) {
-    return owner();
-  }
 }

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

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import {IPoolV1} from "../../interfaces/IPool.sol";
 import {IPoolPriorTo1_5} from "../../interfaces/IPoolPriorTo1_5.sol";
 
+import {BurnMintERC20} from "../../../shared/token/ERC20/BurnMintERC20.sol";
 import {BurnMintERC677} from "../../../shared/token/ERC677/BurnMintERC677.sol";
 import {Router} from "../../Router.sol";
 import {Client} from "../../libraries/Client.sol";
@@ -112,9 +113,9 @@ contract TokenPoolAndProxyMigration is EVM2EVMOnRampSetup {
     s_newPool.setPreviousPool(IPoolPriorTo1_5(address(0)));
 
     // The new pool is now active, but is has not been given permissions to burn/mint yet
-    vm.expectRevert(abi.encodeWithSelector(BurnMintERC677.SenderNotBurner.selector, address(s_newPool)));
+    vm.expectRevert(abi.encodeWithSelector(BurnMintERC20.SenderNotBurner.selector, address(s_newPool)));
     _ccipSend1_5();
-    vm.expectRevert(abi.encodeWithSelector(BurnMintERC677.SenderNotMinter.selector, address(s_newPool)));
+    vm.expectRevert(abi.encodeWithSelector(BurnMintERC20.SenderNotMinter.selector, address(s_newPool)));
     _fakeReleaseOrMintFromOffRamp1_5();
 
     // When we do give burn/mint, the new pool is fully active
@@ -176,9 +177,9 @@ contract TokenPoolAndProxyMigration is EVM2EVMOnRampSetup {
     s_newPool.setPreviousPool(IPoolPriorTo1_5(address(0)));
 
     // The new pool is now active, but is has not been given permissions to burn/mint yet
-    vm.expectRevert(abi.encodeWithSelector(BurnMintERC677.SenderNotBurner.selector, address(s_newPool)));
+    vm.expectRevert(abi.encodeWithSelector(BurnMintERC20.SenderNotBurner.selector, address(s_newPool)));
     _ccipSend1_5();
-    vm.expectRevert(abi.encodeWithSelector(BurnMintERC677.SenderNotMinter.selector, address(s_newPool)));
+    vm.expectRevert(abi.encodeWithSelector(BurnMintERC20.SenderNotMinter.selector, address(s_newPool)));
     _fakeReleaseOrMintFromOffRamp1_5();
 
     // When we do give burn/mint, the new pool is fully active