Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Automatic ATA Creation in ChainWriter #1033

Merged
merged 15 commits into from
Feb 13, 2025
Merged

Enable Automatic ATA Creation in ChainWriter #1033

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9aeb8e6
Revert "Added location parsing for IsWritable and IsSignable on Accou…
silaslenihan Jan 17, 2025
8c286d6
Added ArgsTransform to ChainWriter (#1015)
silaslenihan Jan 17, 2025
b341b44
Cleaned up example
silaslenihan Jan 17, 2025
340a9c4
Updated chain_reader_test error from go.mod bump
silaslenihan Jan 21, 2025
554d515
Revert "Updated chain_reader_test error from go.mod bump"
silaslenihan Jan 22, 2025
d645529
Added transform registry
silaslenihan Jan 22, 2025
6661c3d
Updated PDALookup internal field to use codec
silaslenihan Jan 27, 2025
080da5f
Enabled automatic ATA creation in CW
silaslenihan Jan 29, 2025
583cbf3
Separated ataTx and main chainwriter txs
silaslenihan Feb 11, 2025
78aaa9b
Refactored ChainWriter to use MultiNode client
silaslenihan Feb 11, 2025
96d5942
Added logging to chainWriter
silaslenihan Feb 12, 2025
0843bf0
Merge branch 'develop' into ata-creation
silaslenihan Feb 12, 2025
6d677d6
merged develop
silaslenihan Feb 13, 2025
2a702c9
addressed feedback
silaslenihan Feb 13, 2025
31e02b9
Added ToSnakeCase for discriminators
silaslenihan Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ require (
github.com/lib/pq v1.10.9
github.com/pelletier/go-toml/v2 v2.2.3
github.com/rs/zerolog v1.33.0
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250206215114-fb6c3c35e8e3
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250205141137-8f50d72601bb
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213004451-65651ca8b78b
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213035259-e727e73f6181
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250211163809-1d69f4b097db
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250211163809-1d69f4b097db
github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250213004954-c684df5dc2eb
github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250213145458-8b048022c936
github.com/smartcontractkit/libocr v0.0.0-20241223215956-e5b78d8e3919
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.35.0
Expand Down Expand Up @@ -327,12 +328,11 @@ require (
github.com/smartcontractkit/chain-selectors v1.0.40 // indirect
github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250212131315-e9b53b05b02a // indirect
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250206215114-fb6c3c35e8e3 // indirect
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250128203428-08031923fbe5 // indirect
github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a // indirect
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb // indirect
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 // indirect
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211220805-23e1d9f38c6b // indirect
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 // indirect
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,8 +1114,8 @@ github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250207205350-420ccacab78a/go.mod h1:tHem58EihQh63kR2LlAOKDAs9Vbghf1dJKZRGy6LG8g=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb h1:LWijSyJ2lhppkFLN19EGsLHZXQ5wen2DEk1cyR0tV+o=
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250211162441-3d6cea220efb/go.mod h1:4JqpgFy01LaqG1yM2iFTzwX3ZgcAvW9WdstBZQgPHzU=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4 h1:CKZiyp/5U9Y+PCBknwy1KmiqZwn6T3coJXGSHmEDgRc=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211163724-89a32c016ce4/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211220805-23e1d9f38c6b h1:vRt+Q51lO9SH4kEk7HbuR0bt0mi27lO9BDUr8l/LwUo=
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250211220805-23e1d9f38c6b/go.mod h1:UAWEMU4mLuxvr86sN8XFMtFRjkuYQnr+d6iGIbNC36s=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0 h1:ZBat8EBvE2LpSQR9U1gEbRV6PfAkiFdINmQ8nVnXIAQ=
github.com/smartcontractkit/chainlink-protos/orchestrator v0.4.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo=
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 h1:L6KJ4kGv/yNNoCk8affk7Y1vAY0qglPMXC/hevV/IsA=
Expand All @@ -1130,8 +1130,8 @@ github.com/smartcontractkit/chainlink/deployment v0.0.0-20250211163809-1d69f4b09
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250211163809-1d69f4b097db/go.mod h1:ROVLwMUH+YknJQ4TXkb/vYlQjjcAfMMwlKFXfeuanIQ=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250211163809-1d69f4b097db h1:5q1/+a9buf87/O5sC/nwbmHEWv2kDxIinhT/kSP0OzA=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250211163809-1d69f4b097db/go.mod h1:H6+nxMTBx5ZnmkyvpH0ySSZ5Ztsj4YYFmozN7Brhn6g=
github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250213004954-c684df5dc2eb h1:hpI8fhgawsvuPZMywj1IWeMj91Br8tPqAYey3wmJtpM=
github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250213004954-c684df5dc2eb/go.mod h1:PR07gbnqZP2cQaqu7d2n8At621hUTPa5gvIMdTi85Nw=
github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250213145458-8b048022c936 h1:DsUnjXMP/pGHD293Pd94l8EeEKxWBhOEQJ/sxh8JHUA=
github.com/smartcontractkit/chainlink/v2 v2.19.0-ccip1.5.16-alpha.0.0.20250213145458-8b048022c936/go.mod h1:xyS38Z87STvm6mbbHjuQeD9I4cg1VY8A/qV7LYGC8/4=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20241223215956-e5b78d8e3919 h1:IpGoPTXpvllN38kT2z2j13sifJMz4nbHglidvop7mfg=
Expand Down
9 changes: 8 additions & 1 deletion integration-tests/relayinterface/chain_components_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ type SolanaChainComponentsInterfaceTesterHelper[T WrappedTestingT[T]] interface
GetSecondaryIDL(t T) []byte
CreateAccount(t T, it SolanaChainComponentsInterfaceTester[T], contractName string, value uint64, testStruct TestStruct) solana.PublicKey
TXM() *txm.TxManager
MultiClient() *client.MultiClient
SolanaClient() *client.Client
Sender() solana.PrivateKey
}
Expand Down Expand Up @@ -526,7 +527,7 @@ func (it *SolanaChainComponentsInterfaceTester[T]) GetContractReaderWithCustomCf

func (it *SolanaChainComponentsInterfaceTester[T]) GetContractWriter(t T) types.ContractWriter {
chainWriterConfig := it.buildContractWriterConfig(t)
cw, err := chainwriter.NewSolanaChainWriterService(it.Helper.Logger(t), it.Helper.SolanaClient(), *it.Helper.TXM(), nil, chainWriterConfig)
cw, err := chainwriter.NewSolanaChainWriterService(it.Helper.Logger(t), *it.Helper.MultiClient(), *it.Helper.TXM(), nil, chainWriterConfig)
require.NoError(t, err)

servicetest.Run(t, cw)
Expand Down Expand Up @@ -634,6 +635,12 @@ func (h *helper) TXM() *txm.TxManager {
return &h.txm
}

func (h *helper) MultiClient() *client.MultiClient {
return client.NewMultiClient(func(context.Context) (client.ReaderWriter, error) {
return h.sc, nil
})
}

func (h *helper) SolanaClient() *client.Client {
return h.sc
}
Expand Down
Loading
Loading