remove localAmount call

Author: 0xsuryansh

ccv/chains/evm/gobindings/generated/latest/burn_mint_with_lock_release_flag_token_pool/burn_mint_with_lock_release_flag_token_pool.go

@@ -37,9 +37,9 @@ BurnMintTokenPool_releaseOrMint:test_releaseOrMint_WithFinalityParam() (gas: 107
 BurnMintTokenPool_typeAndVersion:test_typeAndVersion() (gas: 3888688)
 BurnMintWithLockReleaseFlagTokenPool_lockOrBurn:test_LockOrBurn_CorrectReturnData() (gas: 246205)
 BurnMintWithLockReleaseFlagTokenPool_lockOrBurn:test_lockOrBurnV2_ReturnsLockReleaseFlag() (gas: 239608)
-BurnMintWithLockReleaseFlagTokenPool_releaseOrMint:test_releaseOrMintV2_LockReleaseFlagInSourcePoolData() (gas: 105933)
-BurnMintWithLockReleaseFlagTokenPool_releaseOrMint:test_releaseOrMint_EmptySourcePoolData() (gas: 107334)
-BurnMintWithLockReleaseFlagTokenPool_releaseOrMint:test_releaseOrMint_LockReleaseFlagInSourcePoolData() (gas: 107350)
+BurnMintWithLockReleaseFlagTokenPool_releaseOrMint:test_releaseOrMintV2_LockReleaseFlagInSourcePoolData() (gas: 105858)
+BurnMintWithLockReleaseFlagTokenPool_releaseOrMint:test_releaseOrMint_EmptySourcePoolData() (gas: 107259)
+BurnMintWithLockReleaseFlagTokenPool_releaseOrMint:test_releaseOrMint_LockReleaseFlagInSourcePoolData() (gas: 107275)
 BurnMintWithLockReleaseFlagTokenPool_typeAndVersion:test_typeAndVersion() (gas: 10254)
 BurnToAddressMintTokenPool_lockOrBurn:test_LockOrBurn() (gas: 242315)
 BurnWithFromMintTokenPool_lockOrBurn:test_constructor() (gas: 21718)
@@ -516,9 +516,9 @@ SiloedUSDCTokenPool_lockOrBurn:test_lockOrBurn_UpdatesLockedTokensAccounting() (
 SiloedUSDCTokenPool_lockOrBurn:test_lockOrBurn_UpdatesSiloedTokensAccounting() (gas: 103700)
 SiloedUSDCTokenPool_proposeCCTPMigration:test_proposeCCTPMigration() (gas: 38080)
 SiloedUSDCTokenPool_proposeCCTPMigration:test_proposeCCTPMigration_AfterCancellation() (gas: 50832)
-SiloedUSDCTokenPool_releaseOrMint:test_releaseOrMintV2_Success() (gas: 154798)
-SiloedUSDCTokenPool_releaseOrMint:test_releaseOrMint_SubtractsFromExcludedTokens() (gas: 372888)
-SiloedUSDCTokenPool_releaseOrMint:test_releaseOrMint_Success() (gas: 157468)
+SiloedUSDCTokenPool_releaseOrMint:test_releaseOrMintV2_Success() (gas: 154723)
+SiloedUSDCTokenPool_releaseOrMint:test_releaseOrMint_SubtractsFromExcludedTokens() (gas: 372774)
+SiloedUSDCTokenPool_releaseOrMint:test_releaseOrMint_Success() (gas: 157393)
 SiloedUSDCTokenPool_typeAndVersion:test_typeAndVersion() (gas: 9927)
 TokenAdminRegistry_acceptAdminRole:test_acceptAdminRole() (gas: 45424)
 TokenAdminRegistry_addRegistryModule:test_addRegistryModule() (gas: 67792)

ccv/chains/evm/gobindings/generated/latest/siloed_usdc_token_pool/siloed_usdc_token_pool.go

@@ -58,22 +58,21 @@ contract BurnMintWithLockReleaseFlagTokenPool is BurnMintTokenPool {
     Pool.ReleaseOrMintInV1 calldata releaseOrMintIn,
     uint16 blockConfirmationRequested
   ) public virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
-    // Since the remote token is always canonical USDC, the decimals should always be 6 for remote tokens,
-    // which enables potentially local non-canonical USDC with different decimals to be minted.
-    uint256 localAmount = _calculateLocalAmount(releaseOrMintIn.sourceDenominatedAmount, 6);
+    // Since USDC is 6 decimals on all chains, we don't need to convert to a different denomination.
+    _validateReleaseOrMint(releaseOrMintIn, releaseOrMintIn.sourceDenominatedAmount, blockConfirmationRequested);
 
-    _validateReleaseOrMint(releaseOrMintIn, localAmount, blockConfirmationRequested);
-
-    _releaseOrMint(releaseOrMintIn.receiver, localAmount, releaseOrMintIn.remoteChainSelector);
+    _releaseOrMint(
+      releaseOrMintIn.receiver, releaseOrMintIn.sourceDenominatedAmount, releaseOrMintIn.remoteChainSelector
+    );
 
     emit ReleasedOrMinted({
       remoteChainSelector: releaseOrMintIn.remoteChainSelector,
       token: address(i_token),
       sender: msg.sender,
       recipient: releaseOrMintIn.receiver,
-      amount: localAmount
+      amount: releaseOrMintIn.sourceDenominatedAmount
     });
 
-    return Pool.ReleaseOrMintOutV1({destinationAmount: localAmount});
+    return Pool.ReleaseOrMintOutV1({destinationAmount: releaseOrMintIn.sourceDenominatedAmount});
   }
 }

chains/evm/.gas-snapshot

@@ -80,35 +80,37 @@ contract SiloedUSDCTokenPool is SiloedLockReleaseTokenPool, AuthorizedCallers {
     Pool.ReleaseOrMintInV1 calldata releaseOrMintIn,
     uint16 blockConfirmationRequested
   ) public virtual override returns (Pool.ReleaseOrMintOutV1 memory) {
-    // Calculate the local amount. Since USDC is always 6 decimals, we can hard code the decimals to 6.
-    uint256 localAmount = _calculateLocalAmount(releaseOrMintIn.sourceDenominatedAmount, 6);
-
-    _validateReleaseOrMint(releaseOrMintIn, localAmount, blockConfirmationRequested);
+    // Since USDC is 6 decimals on all chains, we don't need to convert to a different denomination.
+    _validateReleaseOrMint(releaseOrMintIn, releaseOrMintIn.sourceDenominatedAmount, blockConfirmationRequested);
 
     uint256 excludedTokens = s_tokensExcludedFromBurn[releaseOrMintIn.remoteChainSelector];
     if (excludedTokens != 0) {
       // The existence of excluded tokens indicates a migration has occurred on the chain, and that any tokens
       // being released should come from those excluded tokens reserved for processing inflight messages.
-      if (localAmount > excludedTokens) revert InsufficientLiquidity(excludedTokens, localAmount);
-      s_tokensExcludedFromBurn[releaseOrMintIn.remoteChainSelector] -= localAmount;
+      if (releaseOrMintIn.sourceDenominatedAmount > excludedTokens) {
+        revert InsufficientLiquidity(excludedTokens, releaseOrMintIn.sourceDenominatedAmount);
+      }
+      s_tokensExcludedFromBurn[releaseOrMintIn.remoteChainSelector] -= releaseOrMintIn.sourceDenominatedAmount;
       // During a proposed migration, the lockbox balance is the source of truth. Any release here reduces the
       // lockbox balance, so burnLockedUSDC will not over-burn even without separate per-chain accounting.
     }
     // No excluded tokens is the common path, as it means no migration has occurred yet, and any released
     // tokens should come from the stored token balance of previously deposited tokens.
 
     // Release to the recipient using the lockbox tied to the remote chain selector.
-    _releaseOrMint(releaseOrMintIn.receiver, localAmount, releaseOrMintIn.remoteChainSelector);
+    _releaseOrMint(
+      releaseOrMintIn.receiver, releaseOrMintIn.sourceDenominatedAmount, releaseOrMintIn.remoteChainSelector
+    );
 
     emit ReleasedOrMinted({
       remoteChainSelector: releaseOrMintIn.remoteChainSelector,
       token: address(i_token),
       sender: msg.sender,
       recipient: releaseOrMintIn.receiver,
-      amount: localAmount
+      amount: releaseOrMintIn.sourceDenominatedAmount
     });
 
-    return Pool.ReleaseOrMintOutV1({destinationAmount: localAmount});
+    return Pool.ReleaseOrMintOutV1({destinationAmount: releaseOrMintIn.sourceDenominatedAmount});
   }
 
   /// @dev This function is overridden to prevent providing liquidity to a chain that has already been migrated, and thus should use CCTP-proper instead of a Lock/Release mechanism.

chains/evm/contracts/pools/USDC/BurnMintWithLockReleaseFlagTokenPool.sol

@@ -2,7 +2,7 @@ GETH_VERSION: 1.15.3
 advanced_pool_hooks: ../solc/ccip/AdvancedPoolHooks/AdvancedPoolHooks.sol/AdvancedPoolHooks.abi.json ../solc/ccip/AdvancedPoolHooks/AdvancedPoolHooks.sol/AdvancedPoolHooks.bin ed1186bfe57828c397acdc6c4179e057a814e4bf1bccf5cf2cc98575cb393949
 burn_from_mint_token_pool: ../solc/ccip/BurnFromMintTokenPool/BurnFromMintTokenPool.sol/BurnFromMintTokenPool.abi.json ../solc/ccip/BurnFromMintTokenPool/BurnFromMintTokenPool.sol/BurnFromMintTokenPool.bin dfd8fa72e17dd182c3ea41301203480b4dd4efc9c346feb40448975029adef76
 burn_mint_token_pool: ../solc/ccip/BurnMintTokenPool/BurnMintTokenPool.sol/BurnMintTokenPool.abi.json ../solc/ccip/BurnMintTokenPool/BurnMintTokenPool.sol/BurnMintTokenPool.bin e1e3bbb104eb1a0096549cbdf039485e6037358800874e82f66c2fa12022149a
-burn_mint_with_lock_release_flag_token_pool: ../solc/ccip/BurnMintWithLockReleaseFlagTokenPool/BurnMintWithLockReleaseFlagTokenPool.sol/BurnMintWithLockReleaseFlagTokenPool.abi.json ../solc/ccip/BurnMintWithLockReleaseFlagTokenPool/BurnMintWithLockReleaseFlagTokenPool.sol/BurnMintWithLockReleaseFlagTokenPool.bin 76646ddd5e990559101edf514ec144e36670d83c42a7cc774997d9f176fa1234
+burn_mint_with_lock_release_flag_token_pool: ../solc/ccip/BurnMintWithLockReleaseFlagTokenPool/BurnMintWithLockReleaseFlagTokenPool.sol/BurnMintWithLockReleaseFlagTokenPool.abi.json ../solc/ccip/BurnMintWithLockReleaseFlagTokenPool/BurnMintWithLockReleaseFlagTokenPool.sol/BurnMintWithLockReleaseFlagTokenPool.bin 723b2929026ca82c891e93274cec41b0c0cce0636d532f130f1b4650140c040f
 burn_to_address_mint_token_pool: ../solc/ccip/BurnToAddressMintTokenPool/BurnToAddressMintTokenPool.sol/BurnToAddressMintTokenPool.abi.json ../solc/ccip/BurnToAddressMintTokenPool/BurnToAddressMintTokenPool.sol/BurnToAddressMintTokenPool.bin b58c7254925493b43eb512ebec15a57f6b6cc140f732e6b5c1e4de29f343c1ce
 burn_with_from_mint_token_pool: ../solc/ccip/BurnWithFromMintTokenPool/BurnWithFromMintTokenPool.sol/BurnWithFromMintTokenPool.abi.json ../solc/ccip/BurnWithFromMintTokenPool/BurnWithFromMintTokenPool.sol/BurnWithFromMintTokenPool.bin 277c055a0112dc14e1631a61baa647424344271a4ed207b557cb207b832c9570
 ccip_reader_tester: ../solc/ccip/CCIPReaderTester/CCIPReaderTester.sol/CCIPReaderTester.abi.json ../solc/ccip/CCIPReaderTester/CCIPReaderTester.sol/CCIPReaderTester.bin fcc137fc5a0f322abc37a370eee6b75fda2e26bd7e8859b0c79d0da320a75fa8
@@ -42,7 +42,7 @@ rmn_proxy_contract: ../solc/ccip/RMNProxy/RMNProxy.sol/RMNProxy.abi.json ../solc
 rmn_remote: ../solc/ccip/RMNRemote/RMNRemote.sol/RMNRemote.abi.json ../solc/ccip/RMNRemote/RMNRemote.sol/RMNRemote.bin e345511af2c05588a6875c9c5cc728732e8728e76217caa3de3966b0051b0ad2
 router: ../solc/ccip/Router/Router.sol/Router.abi.json ../solc/ccip/Router/Router.sol/Router.bin 4048d8be7531670b5e054b7dc18aa8394f2b6dd44fd7fff83aa0cb4aeb38e926
 siloed_lock_release_token_pool: ../solc/ccip/SiloedLockReleaseTokenPool/SiloedLockReleaseTokenPool.sol/SiloedLockReleaseTokenPool.abi.json ../solc/ccip/SiloedLockReleaseTokenPool/SiloedLockReleaseTokenPool.sol/SiloedLockReleaseTokenPool.bin caeb6312ea1b78f51e11873faa7bf95db0b966148e9416871ee896d8b25db213
-siloed_usdc_token_pool: ../solc/ccip/SiloedUSDCTokenPool/SiloedUSDCTokenPool.sol/SiloedUSDCTokenPool.abi.json ../solc/ccip/SiloedUSDCTokenPool/SiloedUSDCTokenPool.sol/SiloedUSDCTokenPool.bin 67fceba00fd91f20f5bac1c127dbb7543b1253989b1d2325ff3d59de7becd314
+siloed_usdc_token_pool: ../solc/ccip/SiloedUSDCTokenPool/SiloedUSDCTokenPool.sol/SiloedUSDCTokenPool.abi.json ../solc/ccip/SiloedUSDCTokenPool/SiloedUSDCTokenPool.sol/SiloedUSDCTokenPool.bin 4149800a69c2beba6d3278ee6a2ff7f8c88e1385581334c2f28e260d5963404d
 token_admin_registry: ../solc/ccip/TokenAdminRegistry/TokenAdminRegistry.sol/TokenAdminRegistry.abi.json ../solc/ccip/TokenAdminRegistry/TokenAdminRegistry.sol/TokenAdminRegistry.bin 086268b9df56e089a69a96ce3e4fd03a07a00a1c8812ba9504e31930a5c3ff1d
 token_pool: ../solc/ccip/TokenPool/TokenPool.sol/TokenPool.abi.json ../solc/ccip/TokenPool/TokenPool.sol/TokenPool.bin 11ccfca8caeff8fc446fab8ffb72a91853a114dd3c8f6a52fa7a46324ef2db2b
 token_pool_factory: ../solc/ccip/TokenPoolFactory/TokenPoolFactory.sol/TokenPoolFactory.abi.json ../solc/ccip/TokenPoolFactory/TokenPoolFactory.sol/TokenPoolFactory.bin 0264e3b1d37b4d22028774f2516e37542684c6d1de17cb36096a17afbbc44b29