Solana USDC Reader #1022

winder · 2025-06-16T20:17:04Z

No description provided.

* Updated USDC reader queries and binding * Added CCTP event query to constructor for test * Cleaned up test code and added new contract name const * Fixed lint error * Fixed lint error * Updated Solana USDC reader to use the SourceMessageTransmitter address

amit-momin · 2025-07-14T14:42:16Z

pkg/reader/usdc_reader.go

+	keyFilter, err := query.Where(
+		// Using same as EVM for consistency. Only used by off-chain components so name does not have to align with on-chain
+		consts.EventNameCCTPMessageSent,
+		expressions...,


I think this logic could break if we get multiple CCTP data. The default operator in the LogPoller is AND so stringing expressions together like this would make a query like nonce=1 && domain=5 && nonce=2 && domain=5. I think we probably need to use the Or comparator here

Suggested change

expressions...,

query.Or(expressions...),

Oh and we should probably move the query.Confidence(primitives.Finalized) from above here so it doesn't get mixed up the with the nonce/domain queries

Suggested change

expressions...,

query.Confidence(primitives.Finalized),

expressions...,

Unresolving this since I noticed the query.Confidence(primitives.Finalized) expression wasn't moved down into the where clause

mateusz-sekara

It would be great to have some e2e tests to cover that, especially to cover the full flow with CR/LogPoller for Solana

pkg/reader/usdc_reader.go

mateusz-sekara · 2025-07-14T15:36:48Z

pkg/reader/usdc_reader.go

+
+	// Query the token pool contract for the MessageSent event data.
+	expressions := []query.Expression{query.Confidence(primitives.Finalized)}
+	for _, data := range cctpData {


That would definitely require perf tests using database like the ones we have for evm usdc reader
https://github.com/smartcontractkit/chainlink/blob/develop/core/capabilities/ccip/ccip_integration_tests/usdcreader/usdcreader_test.go

github-actions · 2025-07-28T21:16:54Z

Metric	`will/solana-usdc-reader`	`main`
Coverage	69.7%	69.7%

mateusz-sekara · 2025-07-29T07:56:28Z

execute/observation.go

@@ -127,6 +127,13 @@ func (p *Plugin) Observation(
 		"numCommitReports", numCommitReports,
 		"numMessages", observation.Messages.Count())

+	lggr.Debugw("[verbose] execute plugin got observation",


Do we want to keep it? There might be non-zero overhead to json serialization of observation with every round.

mateusz-sekara · 2025-07-29T07:57:36Z

execute/tokendata/usdc/attestation.go

@@ -128,12 +128,16 @@ func (s *USDCAttestationClient) fetchSingleMessage(
 	messageHash := cciptypes.Bytes32(s.hasher.Hash(message))
 	body, _, err := s.client.Get(ctx, fmt.Sprintf("%s/%s/%s", apiVersion, attestationPath, messageHash.String()))
 	if err != nil {
+		s.lggr.Warnw("Failed to fetch attestation from the API", "err", err)


👍 I think it might be an error level

mateusz-sekara · 2025-07-29T07:57:41Z

execute/tokendata/usdc/attestation.go

 		return tokendata.ErrorAttestationStatus(err)
 	}
 	response, err := attestationFromResponse(body)
 	if err != nil {
+		s.lggr.Warnw("Failed to parse attestation from the response", "err", err, "body", body)


mateusz-sekara · 2025-07-29T08:00:00Z

pkg/reader/usdc_reader.go

@@ -20,6 +18,9 @@ import (
 	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
 )

+// USDCMessageReader retrieves each of the CCTPv1 MessageSent event created
+// during the Commit phase of the USDC token transfer. The events are created


nit, but MessageSent events are created when a message is sent via Router - as a part of that transaction OnRamp interacts with USDCTokenPool, which interacts with Circle contracts. Technically, it's before Commit (assuming Sol works similar to EVM)

mateusz-sekara · 2025-07-29T08:01:33Z

pkg/reader/usdc_reader.go

+			}
+		case sel.FamilySolana:
+			// Bind the TokenPool contract, the contract re-emits the USDC MessageSent event along with other metadata.
+			bytesAddress, err := addrCodec.AddressStringToBytes(token.SourceMessageTransmitterAddr, chainSelector)


Not sure if it's set for both families, but we will need to have time retention set for these events just to make sure we don't store them forever

https://github.com/smartcontractkit/chainlink/blob/e6d7c15c29751ccd83e3ffaddce420471fd9bbe4/core/capabilities/ccip/configs/evm/contract_reader.go#L406

mateusz-sekara · 2025-07-29T08:06:48Z

pkg/reader/usdc_reader_solana.go

+	keyFilter, err := query.Where(
+		// Using same as EVM for consistency. Only used by off-chain components so name does not have to align with on-chain
+		consts.EventNameCCTPMessageSent,
+		query.Confidence(primitives.Finalized),


nit, not sure how adding finalization check impacts db query performance for Solana, but it might be redundant. By the time we reach this place message is already committed so it's already finalized - at least this is how it works for EVM

mateusz-sekara · 2025-07-29T08:11:38Z

pkg/reader/usdc_reader.go

@@ -212,6 +230,12 @@ func AllAvailableDomains() map[uint64]uint32 {
 	return destDomains
 }

+type evmUSDCMessageReader struct {


minor, but if you extracted Solana to a separate file then I would extract evm implementation to usd_reader_evm.go and keep only the factory/interfaces in usdc_reader.go

mateusz-sekara · 2025-07-29T08:12:40Z

pkg/reader/usdc_reader_solana.go

@@ -0,0 +1,157 @@
+package reader


Any tests for Solana? Or would that be covered/tested in Chainlink repository with e2e tests?

winder changed the title ~~WIP - Solana USDC Reader~~ Solana USDC Reader Jun 17, 2025

winder added 10 commits June 24, 2025 08:36

Solana USDC reader boilerplate.

d927726

WIP

625e31f

Add Solana USDC event reader.

68bb867

Random unrelated cleanup.

5a0dbba

Lint warning.

4d4a033

Add log messages.

5f72cf4

Add token ID

a4e0737

Fix solana token pool binding name.

09a6d4b

Fix lint warning.

3aed937

rebase

24926a3

winder force-pushed the will/solana-usdc-reader branch from f6c2bda to 24926a3 Compare June 24, 2025 12:37

winder and others added 15 commits June 24, 2025 16:08

Fix unit tests.

c4819a4

Merge branch 'main' into will/solana-usdc-reader

5e1b5dc

Fixed log

572803d

Add more debug logs.

818ae84

Added more debug logs

949607c

Added debug logs

539b8e1

Updated CCTP event query to search on the CCTP nonce

5a705cb

Add attestation logs.

d3a3073

fmt

6bfd7d9

Fix test.

1f23d91

Fix test.

3011aad

Fix lint.

b239789

Merge branch 'main' into will/solana-usdc-reader

b50b9a6

Misc cleanup.

863453d

winder marked this pull request as ready for review July 7, 2025 19:51

winder requested a review from a team as a code owner July 7, 2025 19:51

winder requested a review from asoliman92 July 7, 2025 19:51

winder requested review from matYang, makramkd, AmrMohamedRezk, dimkouv, 0xAustinWang and b-gopalswami July 7, 2025 19:51

amit-momin reviewed Jul 14, 2025

View reviewed changes

mateusz-sekara reviewed Jul 14, 2025

View reviewed changes

amit-momin and others added 9 commits July 16, 2025 10:35

Added Solana to EVM USDC reader dest domains

34a4485

Moved Solana USDC domains to map

d981924

Added debug log

ad10be6

Merge branch 'main' into will/solana-usdc-reader

059621b

gofmt

e9b3e54

query.Or

bf7322f

Fix import order.

9486358

Split out solana usdc reader.

430b75a

Move down confidence level expression.

ced6e70

mateusz-sekara reviewed Jul 29, 2025

View reviewed changes

mateusz-sekara approved these changes Jul 29, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Solana USDC Reader #1022

Solana USDC Reader #1022

Uh oh!

winder commented Jun 16, 2025

Uh oh!

amit-momin Jul 14, 2025

Uh oh!

amit-momin Jul 14, 2025

Uh oh!

amit-momin Jul 28, 2025

Uh oh!

mateusz-sekara left a comment

Uh oh!

Uh oh!

mateusz-sekara Jul 14, 2025

Uh oh!

github-actions bot commented Jul 28, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

mateusz-sekara Jul 29, 2025

Uh oh!

Uh oh!

	expressions...,
	query.Confidence(primitives.Finalized),
	expressions...,

Solana USDC Reader #1022

Are you sure you want to change the base?

Solana USDC Reader #1022

Uh oh!

Conversation

winder commented Jun 16, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mateusz-sekara left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 28, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!