Solana ccip_messaging_test

core/capabilities/ccip/ccipsolana/commitcodec.go

@@ -28,17 +28,23 @@ func (c *CommitPluginCodecV1) Encode(ctx context.Context, report cciptypes.Commi
 	encoder := agbinary.NewBorshEncoder(&buf)
 	combinedRoots := report.BlessedMerkleRoots
 	combinedRoots = append(combinedRoots, report.UnblessedMerkleRoots...)
-	if len(combinedRoots) != 1 {
-		return nil, fmt.Errorf("unexpected merkle root length in report: %d", len(combinedRoots))
-	}
+	var mr *ccip_offramp.MerkleRoot
+	switch len(combinedRoots) {
+	case 0:
+		// price updates only, zero the root
+	case 1:
+		// valid
+		merkleRoot := combinedRoots[0]
+		mr = &ccip_offramp.MerkleRoot{
+			SourceChainSelector: uint64(merkleRoot.ChainSel),
+			OnRampAddress:       merkleRoot.OnRampAddress,
+			MinSeqNr:            uint64(merkleRoot.SeqNumsRange.Start()),
+			MaxSeqNr:            uint64(merkleRoot.SeqNumsRange.End()),
+			MerkleRoot:          merkleRoot.MerkleRoot,
+		}
 
-	merkleRoot := combinedRoots[0]
-	mr := &ccip_offramp.MerkleRoot{
-		SourceChainSelector: uint64(merkleRoot.ChainSel),
-		OnRampAddress:       merkleRoot.OnRampAddress,
-		MinSeqNr:            uint64(merkleRoot.SeqNumsRange.Start()),
-		MaxSeqNr:            uint64(merkleRoot.SeqNumsRange.End()),
-		MerkleRoot:          merkleRoot.MerkleRoot,
+	default:
+		return nil, fmt.Errorf("unexpected merkle root length in report: %d", len(combinedRoots))
 	}
 
 	tpu := make([]ccip_offramp.TokenPriceUpdate, 0, len(report.PriceUpdates.TokenPriceUpdates))
@@ -110,16 +116,18 @@ func (c *CommitPluginCodecV1) Decode(ctx context.Context, bytes []byte) (cciptyp
 		return cciptypes.CommitPluginReport{}, err
 	}
 
-	merkleRoots := []cciptypes.MerkleRootChain{
-		{
+	merkleRoots := make([]cciptypes.MerkleRootChain, 0, 1)
+	// if the merkle root is nil, ignore it
+	if commitReport.MerkleRoot != nil {
+		merkleRoots = append(merkleRoots, cciptypes.MerkleRootChain{
 			ChainSel:      cciptypes.ChainSelector(commitReport.MerkleRoot.SourceChainSelector),
 			OnRampAddress: commitReport.MerkleRoot.OnRampAddress,
 			SeqNumsRange: cciptypes.NewSeqNumRange(
 				cciptypes.SeqNum(commitReport.MerkleRoot.MinSeqNr),
 				cciptypes.SeqNum(commitReport.MerkleRoot.MaxSeqNr),
 			),
 			MerkleRoot: commitReport.MerkleRoot.MerkleRoot,
-		},
+		})
 	}
 
 	tokenPriceUpdates := make([]cciptypes.TokenPrice, 0, len(commitReport.PriceUpdates.TokenPriceUpdates))

core/capabilities/ccip/ccipsolana/executecodec.go

@@ -30,6 +30,13 @@ func NewExecutePluginCodecV1(extraDataCodec common.ExtraDataCodec) *ExecutePlugi
 }
 
 func (e *ExecutePluginCodecV1) Encode(ctx context.Context, report cciptypes.ExecutePluginReport) ([]byte, error) {
+	if len(report.ChainReports) == 0 {
+		// OCR3 runs in a constant loop and will produce empty reports, so we need to handle this case
+		// return an empty report, CCIP will discard it on ShouldAcceptAttestedReport/ShouldTransmitAcceptedReport
+		// via validateReport before attempting to decode
+		return nil, nil
+	}
+
 	if len(report.ChainReports) != 1 {
 		return nil, fmt.Errorf("unexpected chain report length: %d", len(report.ChainReports))
 	}
@@ -88,6 +95,8 @@ func (e *ExecutePluginCodecV1) Encode(ctx context.Context, report cciptypes.Exec
 			return nil, fmt.Errorf("invalid receiver address: %v", msg.Receiver)
 		}
 
+		fmt.Printf("ONRAMP %+v\n", msg.Header.OnRamp)
+
 		message = ccip_offramp.Any2SVMRampMessage{
 			Header: ccip_offramp.RampMessageHeader{
 				MessageId:           msg.Header.MessageID,
@@ -101,6 +110,8 @@ func (e *ExecutePluginCodecV1) Encode(ctx context.Context, report cciptypes.Exec
 			TokenReceiver: solana.PublicKeyFromBytes(msg.Receiver),
 			TokenAmounts:  tokenAmounts,
 			ExtraArgs:     extraArgs,
+			// TODO: is this available?
+			OnRampAddress: msg.Header.OnRamp,
 		}
 
 		// should only have an offchain token data if there are tokens as part of the message

core/capabilities/ccip/ccipsolana/gas_helpers.go

@@ -13,10 +13,10 @@ type EstimateProvider struct {
 
 // CalculateMerkleTreeGas is not implemented
 func (gp EstimateProvider) CalculateMerkleTreeGas(numRequests int) uint64 {
-	return 0
+	return 1
 }
 
 // CalculateMessageMaxGas is not implemented.
 func (gp EstimateProvider) CalculateMessageMaxGas(msg cciptypes.Message) uint64 {
-	return 0
+	return 1
 }

core/capabilities/ccip/configs/solana/chain_writer.go

@@ -1,7 +1,6 @@
 package solana
 
 import (
-	"encoding/binary"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -28,8 +27,7 @@
 	merkleRoot                    = "Info.MerkleRoots.MerkleRoot"
 )
 
-func getCommitMethodConfig(fromAddress string, offrampProgramAddress string, destChainSelector uint64, priceOnly bool) chainwriter.MethodConfig {
-	destChainSelectorBytes := binary.LittleEndian.AppendUint64([]byte{}, destChainSelector)
+func getCommitMethodConfig(fromAddress string, offrampProgramAddress string, priceOnly bool) chainwriter.MethodConfig {
 	chainSpecificName := "commit"
 	if priceOnly {
 		chainSpecificName = "commitPriceOnly"
@@ -45,17 +43,18 @@
 			},
 		},
 		ChainSpecificName: chainSpecificName,
+		ArgsTransform:     "CCIPCommit",
 		LookupTables: chainwriter.LookupTables{
 			DerivedLookupTables: []chainwriter.DerivedLookupTable{
 				getCommonAddressLookupTableConfig(offrampProgramAddress),
 			},
 		},
-		Accounts:        buildCommitAccountsList(fromAddress, offrampProgramAddress, destChainSelectorBytes, priceOnly),
+		Accounts:        buildCommitAccountsList(fromAddress, offrampProgramAddress, priceOnly),
 		DebugIDLocation: "",
 	}
 }
 
-func buildCommitAccountsList(fromAddress, offrampProgramAddress string, destChainSelectorBytes []byte, priceOnly bool) []chainwriter.Lookup {
+func buildCommitAccountsList(fromAddress, offrampProgramAddress string, priceOnly bool) []chainwriter.Lookup {
 	accounts := []chainwriter.Lookup{}
 	accounts = append(accounts,
 		getOfframpAccountConfig(offrampProgramAddress),
@@ -100,7 +99,7 @@
 		getFeeQuoterConfigLookup(offrampProgramAddress),
 		getGlobalStateConfig(offrampProgramAddress),
 		getBillingTokenConfig(offrampProgramAddress),
-		getChainConfigGasPriceConfig(offrampProgramAddress, destChainSelectorBytes),
+		getChainConfigGasPriceConfig(offrampProgramAddress),
 	)
 	return accounts
 }
@@ -117,7 +116,7 @@
 			},
 		},
 		ChainSpecificName: "execute",
-		ArgsTransform:     "CCIP",
+		ArgsTransform:     "CCIPExecute",
 		LookupTables: chainwriter.LookupTables{
 			DerivedLookupTables: []chainwriter.DerivedLookupTable{
 				{
@@ -140,6 +139,7 @@
 							},
 						},
 					},
+					Optional: true, // Lookup table is optional if DestTokenAddress is not present in report
 				},
 				getCommonAddressLookupTableConfig(offrampProgramAddress),
 			},
@@ -155,6 +155,7 @@
 					},
 				},
 				MintAddress: chainwriter.Lookup{AccountLookup: &chainwriter.AccountLookup{Location: destTokenAddress}},
+				Optional:    true, // ATA lookup is optional if DestTokenAddress is not present in report
 			},
 		},
 		Accounts: []chainwriter.Lookup{
@@ -307,7 +308,7 @@
 	}
 }
 
-func GetSolanaChainWriterConfig(offrampProgramAddress string, fromAddress string, destChainSelector uint64) (chainwriter.ChainWriterConfig, error) {
+func GetSolanaChainWriterConfig(offrampProgramAddress string, fromAddress string) (chainwriter.ChainWriterConfig, error) {
 	// check fromAddress
 	pk, err := solana.PublicKeyFromBase58(fromAddress)
 	if err != nil {
@@ -333,8 +334,8 @@
 			ccipconsts.ContractNameOffRamp: {
 				Methods: map[string]chainwriter.MethodConfig{
 					ccipconsts.MethodExecute:         getExecuteMethodConfig(fromAddress, offrampProgramAddress),
-					ccipconsts.MethodCommit:          getCommitMethodConfig(fromAddress, offrampProgramAddress, destChainSelector, false),
-					ccipconsts.MethodCommitPriceOnly: getCommitMethodConfig(fromAddress, offrampProgramAddress, destChainSelector, true),
+					ccipconsts.MethodCommit:          getCommitMethodConfig(fromAddress, offrampProgramAddress, false),
+					ccipconsts.MethodCommitPriceOnly: getCommitMethodConfig(fromAddress, offrampProgramAddress, true),
 				},
 				IDL: ccipOfframpIDL,
 			},
@@ -484,7 +485,7 @@
 				{Static: []byte("state")},
 			},
 			IsSigner:   false,
-			IsWritable: false,
+			IsWritable: true,
 		},
 		Optional: true,
 	}
@@ -500,23 +501,23 @@
 				{Dynamic: chainwriter.Lookup{AccountLookup: &chainwriter.AccountLookup{Location: "Info.TokenPrices.TokenID"}}},
 			},
 			IsSigner:   false,
-			IsWritable: false,
+			IsWritable: true,
 		},
 		Optional: true,
 	}
 }
 
-func getChainConfigGasPriceConfig(offrampProgramAddress string, destChainSelector []byte) chainwriter.Lookup {
+func getChainConfigGasPriceConfig(offrampProgramAddress string) chainwriter.Lookup {
 	return chainwriter.Lookup{
 		PDALookups: &chainwriter.PDALookups{
 			Name:      "ChainConfigGasPrice",
 			PublicKey: getFeeQuoterProgramAccount(offrampProgramAddress),
 			Seeds: []chainwriter.Seed{
 				{Static: []byte("dest_chain")},
-				{Static: destChainSelector},
+				{Dynamic: chainwriter.Lookup{AccountLookup: &chainwriter.AccountLookup{Location: "Info.GasPrices.ChainSel"}}},
 			},
 			IsSigner:   false,
-			IsWritable: false,
+			IsWritable: true,
 		},
 		Optional: true,
 	}

core/capabilities/ccip/configs/solana/chain_writer_test.go

@@ -30,7 +30,7 @@ func TestChainWriterConfigRaw(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			config, err := GetSolanaChainWriterConfig("4Nn9dsYBcSTzRbK9hg9kzCUdrCSkMZq1UR6Vw1Tkaf6H", tt.fromAddress, 0)
+			config, err := GetSolanaChainWriterConfig("4Nn9dsYBcSTzRbK9hg9kzCUdrCSkMZq1UR6Vw1Tkaf6H", tt.fromAddress)
 			if tt.expectedError != "" {
 				assert.EqualError(t, err, tt.expectedError)
 			} else {