Permissionless token pools

contracts/gas-snapshots/rebalancer.gas-snapshot

@@ -23,16 +23,16 @@ Rebalancer_addLiquidity:test_addLiquiditySuccess() (gas: 249272)
 Rebalancer_rebalanceLiquidity:test_InsufficientLiquidityReverts() (gas: 19570)
 Rebalancer_rebalanceLiquidity:test_InvalidRemoteChainReverts() (gas: 162331)
 Rebalancer_rebalanceLiquidity:test_rebalanceBetweenPoolsSuccess() (gas: 8160294)
-Rebalancer_rebalanceLiquidity:test_rebalanceBetweenPoolsSuccess_AlreadyFinalized() (gas: 7623474)
-Rebalancer_rebalanceLiquidity:test_rebalanceLiquiditySuccess() (gas: 348830)
+Rebalancer_rebalanceLiquidity:test_rebalanceBetweenPoolsSuccess_AlreadyFinalized() (gas: 7827484)
+Rebalancer_rebalanceLiquidity:test_rebalanceLiquiditySuccess() (gas: 348848)
 Rebalancer_removeLiquidity:test_InsufficientLiquidityReverts() (gas: 156437)
 Rebalancer_removeLiquidity:test_OnlyOwnerReverts() (gas: 10923)
-Rebalancer_removeLiquidity:test_removeLiquiditySuccess() (gas: 207712)
+Rebalancer_removeLiquidity:test_removeLiquiditySuccess() (gas: 207729)
 Rebalancer_setCrossChainRebalancer:test_OnlyOwnerReverts() (gas: 16994)
 Rebalancer_setCrossChainRebalancer:test_ZeroAddressReverts() (gas: 21630)
 Rebalancer_setCrossChainRebalancer:test_ZeroChainSelectorReverts() (gas: 13102)
 Rebalancer_setCrossChainRebalancer:test_setCrossChainRebalancerSuccess() (gas: 157897)
 Rebalancer_setLocalLiquidityContainer:test_OnlyOwnerReverts() (gas: 10986)
-Rebalancer_setLocalLiquidityContainer:test_setLocalLiquidityContainerSuccess() (gas: 2887034)
+Rebalancer_setLocalLiquidityContainer:test_setLocalLiquidityContainerSuccess() (gas: 3091139)
 Rebalancer_setMinimumLiquidity:test_OnlyOwnerReverts() (gas: 10925)
 Rebalancer_setMinimumLiquidity:test_setMinimumLiquiditySuccess() (gas: 36097)

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

@@ -3,8 +3,6 @@ pragma solidity ^0.8.0;
 
 import {IEVM2AnyOnRampClient} from "./IEVM2AnyOnRampClient.sol";
 
-import {Internal} from "../libraries/Internal.sol";
-
 interface IEVM2AnyOnRamp is IEVM2AnyOnRampClient {
   /// @notice Gets the next sequence number to be used in the onRamp
   /// @return the next sequence number to be used
@@ -14,9 +12,4 @@ interface IEVM2AnyOnRamp is IEVM2AnyOnRampClient {
   /// @param sender The sender to get the nonce for
   /// @return nonce The next nonce for the sender
   function getSenderNonce(address sender) external view returns (uint64 nonce);
-
-  /// @notice Adds and removed token pools.
-  /// @param removes The tokens and pools to be removed
-  /// @param adds The tokens and pools to be added.
-  function applyPoolUpdates(Internal.PoolUpdate[] memory removes, Internal.PoolUpdate[] memory adds) external;
 }

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

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+interface ITokenAdminRegistry {
+  /// @notice Returns the pool for the given token.
+  function getPool(address token) external view returns (address);
+}

contracts/src/v0.8/ccip/interfaces/pools/IPool.sol

@@ -6,29 +6,37 @@ import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/tok
 // Shared public interface for multiple pool types.
 // Each pool type handles a different child token model (lock/unlock, mint/burn.)
 interface IPool {
+  struct SourceTokenData {
+    bytes sourcePoolAddress;
+    bytes destPoolAddress;
+    bytes extraData;
+  }
+
   /// @notice Lock tokens into the pool or burn the tokens.
   /// @param originalSender Original sender of the tokens.
   /// @param receiver Receiver of the tokens on destination chain.
   /// @param amount Amount to lock or burn.
   /// @param remoteChainSelector Destination chain Id.
   /// @param extraArgs Additional data passed in by sender for lockOrBurn processing
   /// in custom pools on source chain.
-  /// @return retData Optional field that contains bytes. Unused for now but already
-  /// implemented to allow future upgrades while preserving the interface.
+  /// @return destPoolAddress The address of the destination pool, abi encoded.
+  /// @return extraData Additional data to be passed to the destination pool.
   function lockOrBurn(
     address originalSender,
     bytes calldata receiver,
     uint256 amount,
     uint64 remoteChainSelector,
     bytes calldata extraArgs
-  ) external returns (bytes memory);
+  ) external returns (bytes memory destPoolAddress, bytes memory extraData);
 
   /// @notice Releases or mints tokens to the receiver address.
   /// @param originalSender Original sender of the tokens.
   /// @param receiver Receiver of the tokens.
   /// @param amount Amount to release or mint.
   /// @param remoteChainSelector Source chain Id.
-  /// @param extraData Additional data supplied offchain for releaseOrMint processing in
+  /// @param sourceTokenData The source and dest pool addresses, as well as any additional data
+  /// from calling lockOrBurn on the source chain.
+  /// @param offchainTokenData Additional data supplied offchain for releaseOrMint processing in
   /// custom pools on dest chain. This could be an attestation that was retrieved through a
   /// third party API.
   /// @dev offchainData can come from any untrusted source.
@@ -37,10 +45,13 @@ interface IPool {
     address receiver,
     uint256 amount,
     uint64 remoteChainSelector,
-    bytes memory extraData
+    SourceTokenData memory sourceTokenData,
+    bytes memory offchainTokenData
   ) external;
 
   /// @notice Gets the IERC20 token that this pool can lock or burn.
   /// @return token The IERC20 token representation.
   function getToken() external view returns (IERC20 token);
+
+  //function getRemotePool(uint64 remoteChainSelector) external view returns (bytes memory);
 }

contracts/src/v0.8/ccip/libraries/Internal.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import {IPool} from "../interfaces/pools/IPool.sol";
 import {MerkleMultiProof} from "../libraries/MerkleMultiProof.sol";
 import {Client} from "./Client.sol";
 
@@ -65,19 +66,19 @@ library Internal {
   /// @notice The cross chain message that gets committed to EVM chains.
   /// @dev RMN depends on this struct, if changing, please notify the RMN maintainers.
   struct EVM2EVMMessage {
-    uint64 sourceChainSelector; // ─────────╮ the chain selector of the source chain, note: not chainId
-    address sender; // ─────────────────────╯ sender address on the source chain
-    address receiver; // ───────────────────╮ receiver address on the destination chain
-    uint64 sequenceNumber; // ──────────────╯ sequence number, not unique across lanes
-    uint256 gasLimit; //                      user supplied maximum gas amount available for dest chain execution
-    bool strict; // ────────────────────────╮ DEPRECATED
-    uint64 nonce; //                        │ nonce for this lane for this sender, not unique across senders/lanes
-    address feeToken; // ───────────────────╯ fee token
-    uint256 feeTokenAmount; //                fee token amount
-    bytes data; //                            arbitrary data payload supplied by the message sender
-    Client.EVMTokenAmount[] tokenAmounts; //  array of tokens and amounts to transfer
-    bytes[] sourceTokenData; //               array of token pool return values, one per token
-    bytes32 messageId; //                     a hash of the message data
+    uint64 sourceChainSelector; // ───────────╮ the chain selector of the source chain, note: not chainId
+    address sender; // ───────────────────────╯ sender address on the source chain
+    address receiver; // ─────────────────────╮ receiver address on the destination chain
+    uint64 sequenceNumber; // ────────────────╯ sequence number, not unique across lanes
+    uint256 gasLimit; //                        user supplied maximum gas amount available for dest chain execution
+    bool strict; // ──────────────────────────╮ DEPRECATED
+    uint64 nonce; //                          │ nonce for this lane for this sender, not unique across senders/lanes
+    address feeToken; // ─────────────────────╯ fee token
+    uint256 feeTokenAmount; //                  fee token amount
+    bytes data; //                              arbitrary data payload supplied by the message sender
+    Client.EVMTokenAmount[] tokenAmounts; //    array of tokens and amounts to transfer
+    IPool.SourceTokenData[] sourceTokenData; // array of token data, one per token
+    bytes32 messageId; //                       a hash of the message data
   }
 
   /// @dev EVM2EVMMessage struct has 13 fields, including 3 variable arrays.

contracts/src/v0.8/ccip/offRamp/EVM2EVMOffRamp.sol

@@ -18,7 +18,6 @@ import {Internal} from "../libraries/Internal.sol";
 import {RateLimiter} from "../libraries/RateLimiter.sol";
 import {OCR2BaseNoChecks} from "../ocr/OCR2BaseNoChecks.sol";
 
-import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {ERC165Checker} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/ERC165Checker.sol";
 
 /// @notice EVM2EVMOffRamp enables OCR networks to execute multiple messages
@@ -46,7 +45,6 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
   error ManualExecutionGasLimitMismatch();
   error InvalidManualExecutionGasLimit(uint256 index, uint256 newLimit);
   error RootNotCommitted();
-  error UnsupportedToken(IERC20 token);
   error CanOnlySelfCall();
   error ReceiverError(bytes error);
   error TokenHandlingError(bytes error);
@@ -115,10 +113,6 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
 
   // DYNAMIC CONFIG
   DynamicConfig internal s_dynamicConfig;
-  /// @dev source token => token pool
-  EnumerableMapAddresses.AddressToAddressMap private s_poolsBySourceToken;
-  /// @dev dest token => token pool
-  EnumerableMapAddresses.AddressToAddressMap private s_poolsByDestToken;
 
   // STATE
   /// @dev The expected nonce for a given sender.
@@ -133,11 +127,8 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
 
   constructor(
     StaticConfig memory staticConfig,
-    IERC20[] memory sourceTokens,
-    IPool[] memory pools,
     RateLimiter.Config memory rateLimiterConfig
   ) OCR2BaseNoChecks() AggregateRateLimiter(rateLimiterConfig) {
-    if (sourceTokens.length != pools.length) revert InvalidTokenPoolConfig();
     if (staticConfig.onRamp == address(0) || staticConfig.commitStore == address(0)) revert ZeroAddressNotAllowed();
     // Ensures we can never deploy a new offRamp that points to a commitStore that
     // already has roots committed.
@@ -151,13 +142,6 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
     i_armProxy = staticConfig.armProxy;
 
     i_metadataHash = _metadataHash(Internal.EVM_2_EVM_MESSAGE_HASH);
-
-    // Set new tokens and pools
-    for (uint256 i = 0; i < sourceTokens.length; ++i) {
-      s_poolsBySourceToken.set(address(sourceTokens[i]), address(pools[i]));
-      s_poolsByDestToken.set(address(pools[i].getToken()), address(pools[i]));
-      emit PoolAdded(address(sourceTokens[i]), address(pools[i]));
-    }
   }
 
   // ================================================================
@@ -499,91 +483,6 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
   // │                      Tokens and pools                        │
   // ================================================================
 
-  /// @notice Get all supported source tokens
-  /// @return sourceTokens of supported source tokens
-  function getSupportedTokens() external view returns (IERC20[] memory sourceTokens) {
-    sourceTokens = new IERC20[](s_poolsBySourceToken.length());
-    for (uint256 i = 0; i < sourceTokens.length; ++i) {
-      (address token,) = s_poolsBySourceToken.at(i);
-      sourceTokens[i] = IERC20(token);
-    }
-    return sourceTokens;
-  }
-
-  /// @notice Get a token pool by its source token
-  /// @param sourceToken token
-  /// @return Token Pool
-  function getPoolBySourceToken(IERC20 sourceToken) public view returns (IPool) {
-    (bool success, address pool) = s_poolsBySourceToken.tryGet(address(sourceToken));
-    if (!success) revert UnsupportedToken(sourceToken);
-    return IPool(pool);
-  }
-
-  /// @notice Get the destination token from the pool based on a given source token.
-  /// @param sourceToken The source token
-  /// @return the destination token
-  function getDestinationToken(IERC20 sourceToken) external view returns (IERC20) {
-    return getPoolBySourceToken(sourceToken).getToken();
-  }
-
-  /// @notice Get a token pool by its dest token
-  /// @param destToken token
-  /// @return Token Pool
-  function getPoolByDestToken(IERC20 destToken) external view returns (IPool) {
-    (bool success, address pool) = s_poolsByDestToken.tryGet(address(destToken));
-    if (!success) revert UnsupportedToken(destToken);
-    return IPool(pool);
-  }
-
-  /// @notice Get all configured destination tokens
-  /// @return destTokens Array of configured destination tokens
-  function getDestinationTokens() external view returns (IERC20[] memory destTokens) {
-    destTokens = new IERC20[](s_poolsByDestToken.length());
-    for (uint256 i = 0; i < destTokens.length; ++i) {
-      (address token,) = s_poolsByDestToken.at(i);
-      destTokens[i] = IERC20(token);
-    }
-    return destTokens;
-  }
-
-  /// @notice Adds and removed token pools.
-  /// @param removes The tokens and pools to be removed
-  /// @param adds The tokens and pools to be added.
-  function applyPoolUpdates(
-    Internal.PoolUpdate[] calldata removes,
-    Internal.PoolUpdate[] calldata adds
-  ) external onlyOwner {
-    for (uint256 i = 0; i < removes.length; ++i) {
-      address token = removes[i].token;
-      address pool = removes[i].pool;
-
-      // Check if the pool exists
-      if (!s_poolsBySourceToken.contains(token)) revert PoolDoesNotExist();
-      // Sanity check
-      if (s_poolsBySourceToken.get(token) != pool) revert TokenPoolMismatch();
-
-      s_poolsBySourceToken.remove(token);
-      s_poolsByDestToken.remove(address(IPool(pool).getToken()));
-
-      emit PoolRemoved(token, pool);
-    }
-
-    for (uint256 i = 0; i < adds.length; ++i) {
-      address token = adds[i].token;
-      address pool = adds[i].pool;
-
-      if (token == address(0) || pool == address(0)) revert InvalidTokenPoolConfig();
-      // Check if the pool is already set
-      if (s_poolsBySourceToken.contains(token)) revert PoolAlreadyAdded();
-
-      // Set the s_pools with new config values
-      s_poolsBySourceToken.set(token, pool);
-      s_poolsByDestToken.set(address(IPool(pool).getToken()), pool);
-
-      emit PoolAdded(token, pool);
-    }
-  }
-
   /// @notice Uses pools to release or mint a number of different tokens to a receiver address.
   /// @param sourceTokenAmounts List of tokens and amount values to be released/minted.
   /// @param originalSender The message sender.
@@ -597,12 +496,12 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
     Client.EVMTokenAmount[] memory sourceTokenAmounts,
     bytes memory originalSender,
     address receiver,
-    bytes[] memory sourceTokenData,
+    IPool.SourceTokenData[] memory sourceTokenData,
     bytes[] memory offchainTokenData
   ) internal returns (Client.EVMTokenAmount[] memory) {
     Client.EVMTokenAmount[] memory destTokenAmounts = new Client.EVMTokenAmount[](sourceTokenAmounts.length);
     for (uint256 i = 0; i < sourceTokenAmounts.length; ++i) {
-      IPool pool = getPoolBySourceToken(IERC20(sourceTokenAmounts[i].token));
+      IPool pool = IPool(abi.decode(sourceTokenData[i].destPoolAddress, (address)));
       uint256 sourceTokenAmount = sourceTokenAmounts[i].amount;
 
       // Call the pool with exact gas to increase resistance against malicious tokens or token pools.
@@ -615,7 +514,8 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
           receiver,
           sourceTokenAmount,
           i_sourceChainSelector,
-          abi.encode(sourceTokenData[i], offchainTokenData[i])
+          sourceTokenData[i],
+          offchainTokenData[i]
         ),
         address(pool),
         s_dynamicConfig.maxPoolReleaseOrMintGas,