fix(relayer): remove RPC dependency on CCIPProvider creation#658
Merged
jadepark-dev merged 5 commits intomainfrom Mar 18, 2026
Merged
fix(relayer): remove RPC dependency on CCIPProvider creation#658jadepark-dev merged 5 commits intomainfrom
jadepark-dev merged 5 commits intomainfrom
Conversation
ogtownsend
approved these changes
Mar 18, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates TON CCIP provider construction so it no longer requires an RPC client to be created/fetched at provider creation time, and instead defers client acquisition via a callback.
Changes:
- Change CCIP provider/TON accessor construction to accept a
clientProvider(ctx)function rather than a concreteton.APIClientWrapped. - Update TON accessor read paths to call
clientProvider(ctx)at time of use. - Update integration tests to pass the new
clientProviderintoNewTONAccessor.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/relay/relay.go | Switch relayer’s CCIP provider creation to pass a clientProvider callback. |
| pkg/ccip/provider/provider.go | Update NewCCIPProvider signature to accept clientProvider and forward it to the chain accessor. |
| pkg/ccip/chainaccessor/ton_accessor.go | Replace stored client with clientProvider and fetch client on-demand in several accessor methods. |
| pkg/ccip/chainaccessor/config.go | Update config getter paths to fetch client via clientProvider. |
| integration-tests/deployment/ccip/cs_test.go | Update accessor construction to use clientProvider. |
| integration-tests/deployment/ccip/cs_deployer_test.go | Update accessor construction to use clientProvider. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
100
to
+105
| func (a *TONAccessor) getCurrentMasterchainBlock(ctx context.Context) (*ton.BlockIDExt, error) { | ||
| block, err := a.client.CurrentMasterchainInfo(ctx) | ||
| client, err := a.clientProvider(ctx) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get TON client: %w", err) | ||
| } | ||
| block, err := client.CurrentMasterchainInfo(ctx) |
Collaborator
There was a problem hiding this comment.
Currently only one connection at a time, and should be low priority for now.
Collaborator
Author
There was a problem hiding this comment.
currently func (c *chain) GetClient(ctx context.Context) (ton.APIClientWrapped, error) { doesn't create multiple connection in liteclient.ConnectionPool, but once we introduce multi node management using connection pool, we should be using tonutils-go.client.StickyContext
Comment on lines
78
to
94
| func NewTONAccessor( | ||
| lggr logger.Logger, | ||
| chainSelector ccipocr3.ChainSelector, | ||
| client ton.APIClientWrapped, | ||
| clientProvider func(context.Context) (ton.APIClientWrapped, error), | ||
| logPoller logpoller.Service, | ||
| addrCodec ccipocr3.ChainSpecificAddressCodec, | ||
| ) (ccipocr3.ChainAccessor, error) { | ||
| sLggr := logger.Sugared(lggr).Named("TONAccessor").Named(chainSelector.String()) | ||
| return &TONAccessor{ | ||
| lggr: sLggr, | ||
| chainSelector: chainSelector, | ||
| client: client, | ||
| logPoller: logPoller, | ||
| bindings: make(map[string]*address.Address), | ||
| bindingsMu: sync.RWMutex{}, | ||
| addrCodec: addrCodec, | ||
| lggr: sLggr, | ||
| chainSelector: chainSelector, | ||
| clientProvider: clientProvider, | ||
| logPoller: logPoller, | ||
| bindings: make(map[string]*address.Address), | ||
| bindingsMu: sync.RWMutex{}, | ||
| addrCodec: addrCodec, | ||
| }, nil |
Comment on lines
108
to
+116
| addr, err := a.getBinding(consts.ContractNameOffRamp) | ||
| if err != nil { | ||
| return ccipocr3.OfframpConfig{}, err | ||
| } | ||
| config, err := tvm.CallGetter(ctx, a.client, block, addr, offramp.GetConfig) | ||
| client, err := a.clientProvider(ctx) | ||
| if err != nil { | ||
| return ccipocr3.OfframpConfig{}, fmt.Errorf("failed to get TON client: %w", err) | ||
| } | ||
| config, err := tvm.CallGetter(ctx, client, block, addr, offramp.GetConfig) |
Collaborator
There was a problem hiding this comment.
Currently only one connection at a time, and should be low priority for now.
krebernisak
approved these changes
Mar 18, 2026
ogtownsend
pushed a commit
that referenced
this pull request
Mar 18, 2026
* chore: test * fix: clientProvider for CCIPProvider * chore: test * fix: remove failure * fix: NewTONAccessor param
krebernisak
added a commit
that referenced
this pull request
Mar 19, 2026
fix(relayer): remove RPC dependency on CCIPProvider creation (#658)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.