update

Author: aelmanaa

package-lock.json

@@ -63,23 +63,23 @@
     "@chainlink/design-system": "^0.2.8",
     "@chainlink/local": "0.2.5-beta.0",
     "@chainlink/solana-sdk": "^0.2.2",
-    "@metamask/providers": "^20.0.0",
+    "@metamask/providers": "^22.1.0",
     "@nanostores/preact": "^0.5.2",
     "@nanostores/react": "^0.8.4",
     "@openzeppelin/contracts": "^4.9.6",
     "astro": "^5.13.5",
-    "@solana-program/compute-budget": "^0.8.0",
-    "@solana-program/system": "^0.7.0",
-    "@solana-program/token": "^0.5.1",
-    "@solana-program/token-2022": "^0.4.2",
-    "@solana/addresses": "^2.3.0",
-    "@solana/instructions": "^2.3.0",
-    "@solana/keys": "^2.3.0",
-    "@solana/kit": "^2.3.0",
-    "@solana/react": "^2.3.0",
-    "@solana/rpc-types": "^2.3.0",
-    "@solana/transaction-messages": "^2.3.0",
-    "@solana/transactions": "^2.3.0",
+    "@solana-program/compute-budget": "^0.9.0",
+    "@solana-program/system": "^0.8.0",
+    "@solana-program/token": "^0.6.0",
+    "@solana-program/token-2022": "^0.5.0",
+    "@solana/addresses": "^3.0.2",
+    "@solana/instructions": "^3.0.2",
+    "@solana/keys": "^3.0.2",
+    "@solana/kit": "^3.0.2",
+    "@solana/react": "^3.0.2",
+    "@solana/rpc-types": "^3.0.2",
+    "@solana/transaction-messages": "^3.0.2",
+    "@solana/transactions": "^3.0.2",
     "@solana/wallet-adapter-base": "^0.9.27",
     "@solana/wallet-adapter-react": "^0.15.39",
     "@solana/wallet-adapter-react-ui": "^0.9.39",

package.json

@@ -37,7 +37,7 @@ This tutorial is similar to the [programmable token transfers example](/ccip/tut
 1. You should understand how to write, compile, deploy, and fund a smart contract. If you need to brush up on the basics, read this [tutorial](/quickstarts/deploy-your-first-contract), which will guide you through using the [Solidity programming language](https://soliditylang.org/), interacting with the [MetaMask wallet](https://metamask.io) and working within the [Remix Development Environment](https://remix.ethereum.org/).
 1. Your account must have some AVAX and LINK tokens on _Avalanche Fuji_ and ETH tokens on _Ethereum Sepolia_. Learn how to [Acquire testnet LINK](/resources/acquire-link).
 1. Check the [CCIP Directory](/ccip/directory) to confirm that the tokens you will transfer are supported for your lane. In this example, you will transfer tokens from _Avalanche Fuji_ to _Ethereum Sepolia_ so check the list of supported tokens [here](/ccip/directory/testnet/chain/avalanche-fuji-testnet).
-1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#mint-test-tokens). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
+1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#evm-chains). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
 1. Learn how to [fund your contract](/resources/fund-your-contract). This guide shows how to fund your contract in LINK, but you can use the same guide for funding your contract with any ERC20 tokens as long as they appear in the list of tokens in MetaMask.
 1. Follow the previous tutorial: [_Transfer Tokens with Data_](/ccip/tutorials/evm/programmable-token-transfers) to learn how to make programmable token transfers using CCIP.
 1. Create a free account on [Tenderly](https://tenderly.co/). You will use Tenderly to investigate the failed execution of the receiver contract.

src/content/ccip/tutorials/evm/manual-execution.mdx

@@ -46,7 +46,7 @@ In this tutorial, you will use Chainlink CCIP to transfer tokens directly from y
 
 1.  Check the [CCIP Directory](/ccip/directory) to confirm that the tokens you will transfer are supported for your lane. In this example, you will transfer tokens from _Avalanche Fuji_ to _Ethereum Sepolia_ so check the list of supported tokens [here](/ccip/directory/testnet/chain/avalanche-fuji-testnet). Alternatively, you can use the [Get Supported Tokens](/ccip/tutorials/evm/offchain/ccip-tools/get-supported-tokens) tutorial to retrieve the list of supported tokens programmatically.
 
-1.  Learn how to [acquire CCIP test tokens](/ccip/test-tokens#mint-test-tokens). After following this guide, your [EOA (Externally Owned Account)](https://ethereum.org/en/developers/docs/accounts/#types-of-account) should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
+1.  Learn how to [acquire CCIP test tokens](/ccip/test-tokens#evm-chains). After following this guide, your [EOA (Externally Owned Account)](https://ethereum.org/en/developers/docs/accounts/#types-of-account) should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
 
 1.  In a terminal, clone the [ccip-tools-ts repository](https://github.com/smartcontractkit/ccip-tools-ts) and change to the `ccip-tools-ts` directory.
 

src/content/ccip/tutorials/evm/offchain/ccip-tools/transfer-tokens-from-eoa.mdx

@@ -46,7 +46,7 @@ In this tutorial, you will use Chainlink CCIP to transfer tokens directly from y
 
 1.  Check the [CCIP Directory](/ccip/directory) to confirm that the tokens you will transfer are supported for your lane. In this example, you will transfer tokens from _Avalanche Fuji_ to _Ethereum Sepolia_ so check the list of supported tokens [here](/ccip/directory/testnet/chain/avalanche-fuji-testnet).
 
-1.  Learn how to [acquire CCIP test tokens](/ccip/test-tokens#mint-test-tokens). After following this guide, your [EOA (Externally Owned Account)](https://ethereum.org/en/developers/docs/accounts/#types-of-account) should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
+1.  Learn how to [acquire CCIP test tokens](/ccip/test-tokens#evm-chains). After following this guide, your [EOA (Externally Owned Account)](https://ethereum.org/en/developers/docs/accounts/#types-of-account) should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
 
 1.  In a terminal, clone the [smart-contract-examples repository](https://github.com/smartcontractkit/smart-contract-examples) and change to the `smart-contract-examples/ccip/offchain/javascript` directory.
 

src/content/ccip/tutorials/evm/offchain/transfer-tokens-from-eoa.mdx

@@ -34,7 +34,7 @@ This tutorial extends the [programmable token transfers example](/ccip/tutorials
 1. You should understand how to write, compile, deploy, and fund a smart contract. If you need to brush up on the basics, read this [tutorial](/quickstarts/deploy-your-first-contract), which will guide you through using the [Solidity programming language](https://soliditylang.org/), interacting with the [MetaMask wallet](https://metamask.io) and working within the [Remix Development Environment](https://remix.ethereum.org/).
 1. Your account must have some AVAX and LINK tokens on _Avalanche Fuji_ and ETH tokens on _Ethereum Sepolia_. Learn how to [Acquire testnet LINK](/resources/acquire-link).
 1. Check the [CCIP Directory](/ccip/directory) to confirm that the tokens you will transfer are supported for your lane. In this example, you will transfer tokens from _Avalanche Fuji_ to _Ethereum Sepolia_ so check the list of supported tokens [here](/ccip/directory/testnet/chain/avalanche-fuji-testnet).
-1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#mint-test-tokens). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
+1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#evm-chains). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
 1. Learn how to [fund your contract](/resources/fund-your-contract). This guide shows how to fund your contract in LINK, but you can use the same guide for funding your contract with any ERC20 tokens as long as they appear in the list of tokens in MetaMask.
 1. Follow the previous tutorial: [_Transfer Tokens with Data_](/ccip/tutorials/evm/programmable-token-transfers) to learn how to make programmable token transfers using CCIP.
 

src/content/ccip/tutorials/evm/programmable-token-transfers-defensive.mdx

@@ -40,7 +40,7 @@ In this tutorial, you will use Chainlink CCIP to transfer tokens and arbitrary d
 1. You should understand how to write, compile, deploy, and fund a smart contract. If you need to brush up on the basics, read this [tutorial](/quickstarts/deploy-your-first-contract), which will guide you through using the [Solidity programming language](https://soliditylang.org/), interacting with the [MetaMask wallet](https://metamask.io) and working within the [Remix Development Environment](https://remix.ethereum.org/).
 1. Your account must have some AVAX and LINK tokens on _Avalanche Fuji_ and ETH tokens on _Ethereum Sepolia_. Learn how to [Acquire testnet LINK](/resources/acquire-link).
 1. Check the [CCIP Directory](/ccip/directory) to confirm that the tokens you will transfer are supported for your lane. In this example, you will transfer tokens from _Avalanche Fuji_ to _Ethereum Sepolia_ so check the list of supported tokens [here](/ccip/directory/testnet/chain/avalanche-fuji-testnet).
-1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#mint-test-tokens). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
+1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#evm-chains). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
 1. Learn how to [fund your contract](/resources/fund-your-contract). This guide shows how to fund your contract in LINK, but you can use the same guide for funding your contract with any ERC20 tokens as long as they appear in the list of tokens in MetaMask.
 1. Follow the previous tutorial: [_Transfer tokens_](/ccip/tutorials/evm/transfer-tokens-from-contract).
 

src/content/ccip/tutorials/evm/programmable-token-transfers.mdx

@@ -39,14 +39,14 @@ In this tutorial, you will use Chainlink CCIP to transfer tokens from a smart co
 
 1. Your account must have some AVAX and LINK tokens on _Avalanche Fuji_. Learn how to [Acquire testnet LINK](/resources/acquire-link).
 1. Check the [CCIP Directory](/ccip/directory) to confirm that the tokens you will transfer are supported for your lane. In this example, you will transfer tokens from _Avalanche Fuji_ to _Ethereum Sepolia_ so check the list of supported tokens [here](/ccip/directory/testnet/chain/avalanche-fuji-testnet).
-1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#mint-test-tokens). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
+1. Learn how to [acquire CCIP test tokens](/ccip/test-tokens#evm-chains). Following this guide, you should have CCIP-BnM tokens, and CCIP-BnM should appear in the list of your tokens in MetaMask.
 1. Learn how to [fund your contract](/resources/fund-your-contract). This guide shows how to fund your contract in LINK, but you can use the same guide to fund your contract with any ERC20 tokens as long as they appear in the list of tokens in MetaMask.
 
 ## Tutorial
 
 <CcipCommon callout="useSimulator" />
 
-In this tutorial, you will transfer [CCIP-BnM](/ccip/test-tokens#tokens) tokens from a contract on Avalanche Fuji to an account on Ethereum Sepolia. First, you will pay [CCIP fees in LINK](#transfer-tokens-and-pay-in-link), then you will pay [CCIP fees in native gas](#transfer-tokens-and-pay-in-native). The destination account can be an [EOA (Externally Owned Account)](https://ethereum.org/en/developers/docs/accounts/#types-of-account) or a smart contract. Moreover, the example shows how to transfer CCIP-BnM tokens, but you can re-use the same example to transfer other tokens as long as they are supported for your [lane](/ccip/concepts/architecture/key-concepts#lane).
+In this tutorial, you will transfer [CCIP-BnM](/ccip/test-tokens#about-ccip-test-tokens) tokens from a contract on Avalanche Fuji to an account on Ethereum Sepolia. First, you will pay [CCIP fees in LINK](#transfer-tokens-and-pay-in-link), then you will pay [CCIP fees in native gas](#transfer-tokens-and-pay-in-native). The destination account can be an [EOA (Externally Owned Account)](https://ethereum.org/en/developers/docs/accounts/#types-of-account) or a smart contract. Moreover, the example shows how to transfer CCIP-BnM tokens, but you can re-use the same example to transfer other tokens as long as they are supported for your [lane](/ccip/concepts/architecture/key-concepts#lane).
 
 <CodeSample src="samples/CCIP/TokenTransferor.sol" />
 

src/content/ccip/tutorials/evm/transfer-tokens-from-contract.mdx

@@ -15,6 +15,7 @@ import {
   type AccountInfoBase,
   type AccountInfoWithBase64EncodedData,
 } from "@solana/kit"
+import { assertIsTransactionWithinSizeLimit, assertIsSendableTransaction } from "@solana/transactions"
 import type { IRpcContext } from "../../../infrastructure/rpc/types.ts"
 import type { Logger } from "@lib/logging/index.js"
 import { TransactionBuilder } from "./builder.ts"
@@ -99,6 +100,8 @@ export class TransactionManager {
         })
 
         try {
+          assertIsTransactionWithinSizeLimit(signedTransaction)
+          assertIsSendableTransaction(signedTransaction)
           await sendAndConfirm(signedTransaction, {
             commitment: this.rpcContext.commitment,
             minContextSlot: context.slot, // Race-free confirmation
@@ -134,6 +137,8 @@ export class TransactionManager {
             )
             signature = getSignatureFromTransaction(retrySignedTransaction)
 
+            assertIsTransactionWithinSizeLimit(retrySignedTransaction)
+            assertIsSendableTransaction(retrySignedTransaction)
             await sendAndConfirm(retrySignedTransaction, {
               commitment: this.rpcContext.commitment,
               minContextSlot: freshContext.slot,

src/lib/solana/domain/transaction/services/manager.ts

@@ -10,7 +10,7 @@ import {
   getCompiledTransactionMessageDecoder,
   getCompiledTransactionMessageEncoder,
 } from "@solana/transaction-messages"
-import type { FullySignedTransaction, TransactionMessageBytesBase64 } from "@solana/transactions"
+import type { FullySignedTransaction, Transaction, TransactionMessageBytesBase64 } from "@solana/transactions"
 import {
   type TransactionCostBreakdown,
   type TransactionPreferences,
@@ -53,7 +53,7 @@ export class TransactionCostEstimator {
    * @throws Error when RPC methods fail or transaction is invalid
    */
   async estimateTransactionCost(
-    transaction: FullySignedTransaction,
+    transaction: FullySignedTransaction & Transaction,
     feeMarketAnalysis: FeeMarketAnalysisResult,
     preferences: TransactionPreferences = DEFAULT_TRANSACTION_PREFERENCES,
     requestId?: string
@@ -309,7 +309,7 @@ export class TransactionCostEstimator {
    * @returns Estimated compute units required
    */
   private estimateComputeUnitsRequired(
-    transaction: FullySignedTransaction,
+    transaction: FullySignedTransaction & Transaction,
     preferences: TransactionPreferences
   ): number {
     // Base estimation - will be refined with actual simulation