Merge branch 'main' into CCIP-4618-use-encoded-sizes-hash

commit/report.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"golang.org/x/exp/maps"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
 
 	"github.com/smartcontractkit/chainlink-ccip/commit/committypes"

execute/report/report.go

@@ -236,7 +236,7 @@ func (b *execReportBuilder) checkMessageNonce(
 		}
 
 		chainNonces := b.sendersNonce[execReport.SourceChain]
-		sender := typeconv.AddressBytesToString(msg.Sender[:], uint64(b.destChainSelector))
+		sender := typeconv.AddressBytesToString(msg.Sender[:], uint64(msg.Header.SourceChainSelector))
 		if _, ok := chainNonces[sender]; !ok {
 			b.lggr.Errorw("Skipping message - missing nonce",
 				"messageID", msg.Header.MessageID,

pkg/reader/ccip.go

@@ -435,7 +435,7 @@ func (r *ccipChainReader) Nonces(
 	responses := make([]uint64, len(addresses))
 
 	for i, address := range addresses {
-		sender, err := typeconv.AddressStringToBytes(address, uint64(destChainSelector))
+		sender, err := typeconv.AddressStringToBytes(address, uint64(sourceChainSelector))
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert address %s to bytes: %w", address, err)
 		}

pkg/reader/ccip_interface.go

@@ -114,7 +114,7 @@ type CCIPReader interface {
 	GetContractAddress(contractName string, chain cciptypes.ChainSelector) ([]byte, error)
 
 	// Nonces fetches all nonces for the provided selector/address pairs. Addresses are a string encoded raw address,
-	// it must be encoding according to the destination chain requirements with typeconv.AddressBytesToString.
+	// it must be encoding according to the source chain requirements with typeconv.AddressBytesToString.
 	Nonces(
 		ctx context.Context,
 		source, dest cciptypes.ChainSelector,