fix issues created during merge, and

smartcontractkit · Jun 26, 2024 · 13b9c91 · 13b9c91
1 parent 7f41744
commit 13b9c91
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 485 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/applications/CCIPClientExample.sol b/contracts/src/v0.8/ccip/applications/CCIPClientExample.sol
diff --git a/contracts/src/v0.8/ccip/applications/EtherSenderReceiver.sol b/contracts/src/v0.8/ccip/applications/EtherSenderReceiver.sol
diff --git a/contracts/src/v0.8/ccip/applications/external/CCIPClient.sol b/contracts/src/v0.8/ccip/applications/external/CCIPClient.sol
@@ -1,12 +1,12 @@
 pragma solidity ^0.8.0;
 
-import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IRouterClient} from "../../interfaces/IRouterClient.sol";
 
+import {Client} from "../../libraries/Client.sol";
 import {CCIPReceiverWithACK} from "./CCIPReceiverWithACK.sol";
 
-import {IRouterClient} from "../../interfaces/IRouterClient.sol";
-import {Client} from "../../libraries/Client.sol";
+import {IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract CCIPClient is CCIPReceiverWithACK {
   using SafeERC20 for IERC20;
@@ -28,10 +28,10 @@ contract CCIPClient is CCIPReceiverWithACK {
     address feeToken
   ) public payable validChain(destChainSelector) returns (bytes32 messageId) {
     Client.EVM2AnyMessage memory message = Client.EVM2AnyMessage({
-      receiver: s_chains[destChainSelector],
+      receiver: s_chains[destChainSelector].recipient,
       data: data,
       tokenAmounts: tokenAmounts,
-      extraArgs: s_extraArgsBytes[destChainSelector],
+      extraArgs: s_chains[destChainSelector].extraArgsBytes,
       feeToken: feeToken
     });