Merge branch 'main' of github.com:smartcontractkit/chainlink-ccip int…

…o refactor/standalone-fee-quoter
smartcontractkit · Feb 3, 2025 · 6b0636c · 6b0636c
2 parents fc622fd + c7a9e99
commit 6b0636c
Show file tree

Hide file tree

Showing 60 changed files with 3,131 additions and 344 deletions.
diff --git a/chains/solana/contracts/Anchor.toml b/chains/solana/contracts/Anchor.toml
@@ -24,11 +24,12 @@ wallet = "id.json"
 
 [programs.localnet]
 access_controller = "9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW"
-ccip_receiver = "CtEVnHsQzhTNWav8skikiV2oF6Xx7r7uGGa8eCDQtTjH"
-ccip_invalid_receiver = "9Vjda3WU2gsJgE4VdU6QuDw8rfHLyigfFyWs3XDPNUn8"
 ccip_router = "C8WSPj3yyus1YN3yNB6YA5zStYtbjQWtpmKadmvyUXq8"
-token_pool = "GRvFSLwR7szpjgNEZbGe4HtxfJYXqySXuuRUAJDpu4WH"
-external_program_cpi_stub  = "4HeqEoSyfYpeC2goFLj9eHgkxV33mR5G7JYAbRsN14uQ"
 mcm = "6UmMZr5MEqiKWD5jqTJd1WCR5kT8oZuFYBLJFi1o6GQX"
 timelock = "LoCoNsJFuhTkSQjfdDfn3yuwqhSYoPujmviRHVCzsqn"
 fee_quoter = "FeeVB9Q77QvyaENRL1i77BjW6cTkaWwNLjNbZg9JHqpw"
+token_pool = "GRvFSLwR7szpjgNEZbGe4HtxfJYXqySXuuRUAJDpu4WH"
+example_ccip_receiver = "CcipReceiver1111111111111111111111111111111"
+test_ccip_receiver = "CtEVnHsQzhTNWav8skikiV2oF6Xx7r7uGGa8eCDQtTjH"
+test_ccip_invalid_receiver = "9Vjda3WU2gsJgE4VdU6QuDw8rfHLyigfFyWs3XDPNUn8"
+external_program_cpi_stub  = "4HeqEoSyfYpeC2goFLj9eHgkxV33mR5G7JYAbRsN14uQ"
diff --git a/chains/solana/contracts/Cargo.lock b/chains/solana/contracts/Cargo.lock
diff --git a/chains/solana/contracts/programs/ccip-router/src/instructions/v1/offramp.rs b/chains/solana/contracts/programs/ccip-router/src/instructions/v1/offramp.rs
@@ -380,11 +380,13 @@ fn internal_execute<'info>(
             CcipRouterError::OfframpInvalidDataLength
         );
 
+        // parse pool return data into SVMTokenAmount
         token_amounts[i] = SVMTokenAmount {
             token: accs.mint.key(),
             amount: ReleaseOrMintOutV1::try_from_slice(&return_data)?.destination_amount,
         };
 
+        // validate user recieved tokens according to the amount returned by the token pool
         let post_bal = get_balance(accs.user_token_account)?;
         require!(
             post_bal >= init_bal && post_bal - init_bal == token_amounts[i].amount,

diff --git a/...ntracts/programs/ccip-receiver/Cargo.toml → ...programs/example-ccip-receiver/Cargo.toml b/...ntracts/programs/ccip-receiver/Cargo.toml → ...programs/example-ccip-receiver/Cargo.toml
@@ -1,19 +1,20 @@
 [package]
-name = "ccip_receiver"
+name = "example_ccip_receiver"
 version = "0.1.0-dev"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "ccip_receiver"
+name = "example_ccip_receiver"
 
 [features]
 no-entrypoint = []
 no-idl = []
 no-log-ix-name = []
 cpi = ["no-entrypoint"]
 default = []
+idel-build = ["anchor-lang/idl-build"]
 
 [dependencies]
 solana-program = "1.17.25" # pin solana to 1.17

diff --git a/...programs/ccip-invalid-receiver/Xargo.toml → ...programs/example-ccip-receiver/Xargo.toml b/...programs/ccip-invalid-receiver/Xargo.toml → ...programs/example-ccip-receiver/Xargo.toml