fix: variable names and comment fix , added hasher for token amounts

Signed-off-by: 0xsuryansh <[email protected]>
smartcontractkit · Sep 13, 2024 · 2640d6d · 2640d6d
1 parent 9a6f624
commit 2640d6d
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 123 deletions.
diff --git a/contracts/gas-snapshots/ccip.gas-snapshot b/contracts/gas-snapshots/ccip.gas-snapshot
diff --git a/contracts/src/v0.8/ccip/libraries/Internal.sol b/contracts/src/v0.8/ccip/libraries/Internal.sol
@@ -306,7 +306,7 @@ library Internal {
     bytes extraData;
     uint256 amount; // Amount of tokens.
     // Destination chain specific execution data encoded in bytes
-    // for an EVM destination, it consists of the amount of gas available for the releaseOrMint 
+    // for an EVM destination, it consists of the amount of gas available for the releaseOrMint
     // and transfer calls made by the offRamp
     bytes destExecData;
   }

diff --git a/contracts/src/v0.8/ccip/offRamp/OffRamp.sol b/contracts/src/v0.8/ccip/offRamp/OffRamp.sol
@@ -631,8 +631,7 @@ contract OffRamp is ITypeAndVersion, MultiOCR3Base {
     }
 
     // We retrieve the local token balance of the receiver before the pool call.
-    (uint256 balancePre, uint256 gasLeft) =
-      _getBalanceOfReceiver(receiver, localToken, sourceTokenAmount.destGasAmount);
+    (uint256 balancePre, uint256 gasLeft) = _getBalanceOfReceiver(receiver, localToken, sourceTokenAmount.destGasAmount);
 
     // We determined that the pool address is a valid EVM address, but that does not mean the code at this
     // address is a (compatible) pool contract. _callWithExactGasSafeReturnData will check if the location

diff --git a/contracts/src/v0.8/ccip/test/BaseTest.t.sol b/contracts/src/v0.8/ccip/test/BaseTest.t.sol
@@ -40,7 +40,7 @@ contract BaseTest is Test {
   uint16 internal constant DEST_GAS_PER_PAYLOAD_BYTE = 16;
 
   uint16 internal constant DEFAULT_TOKEN_FEE_USD_CENTS = 50;
-  uint32 internal constant DEFAULT_TOKEN_DEST_GAS_OVERHEAD = 90_000;
+  uint32 internal constant DEFAULT_TOKEN_DEST_GAS_OVERHEAD = 100_000;
   uint32 internal constant DEFAULT_TOKEN_BYTES_OVERHEAD = 32;
 
   bool private s_baseTestInitialized;

diff --git a/contracts/src/v0.8/ccip/test/e2e/MultiRampsEnd2End.t.sol b/contracts/src/v0.8/ccip/test/e2e/MultiRampsEnd2End.t.sol
@@ -276,7 +276,7 @@ contract MultiRampsE2E is OnRampSetup, OffRampSetup {
         destTokenAddress: abi.decode(msgEvent.tokenAmounts[i].destTokenAddress, (address)),
         extraData: msgEvent.tokenAmounts[i].extraData,
         amount: msgEvent.tokenAmounts[i].amount,
-        destGasAmount: abi.decode(msgEvent.tokenAmounts[i].destExecData, (uint32))
+        destGasAmount: DEFAULT_TOKEN_DEST_GAS_OVERHEAD
       });
     }
     return Internal.Any2EVMRampMessage({

diff --git a/core/gethwrappers/ccip/mocks/fee_quoter_interface.go b/core/gethwrappers/ccip/mocks/fee_quoter_interface.go