Refactored ChainWriter to use MultiNode client

integration-tests/relayinterface/chain_components_test.go

@@ -307,7 +307,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
-	SolanaClient() *client.Client
+	MultiClient() *client.MultiClient
 }
 
 type WrappedTestingT[T any] interface {
@@ -379,7 +379,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)
@@ -485,8 +485,10 @@ func (h *helper) TXM() *txm.TxManager {
 	return &h.txm
 }
 
-func (h *helper) SolanaClient() *client.Client {
-	return h.sc
+func (h *helper) MultiClient() *client.MultiClient {
+	return client.NewMultiClient(func(context.Context) (client.ReaderWriter, error) {
+		return h.sc, nil
+	})
 }
 
 func (h *helper) Context(t *testing.T) context.Context {

integration-tests/relayinterface/lookups_test.go

@@ -1,6 +1,7 @@
 package relayinterface
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -49,7 +50,7 @@ func TestAccountContant(t *testing.T) {
 			IsSigner:   true,
 			IsWritable: true,
 		}
-		result, err := constantConfig.Resolve(tests.Context(t), nil, nil, nil)
+		result, err := constantConfig.Resolve(tests.Context(t), nil, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -77,7 +78,7 @@ func TestAccountLookups(t *testing.T) {
 			IsSigner:   chainwriter.MetaBool{Value: true},
 			IsWritable: chainwriter.MetaBool{Value: true},
 		}
-		result, err := lookupConfig.Resolve(ctx, testArgs, nil, nil)
+		result, err := lookupConfig.Resolve(ctx, testArgs, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -111,7 +112,7 @@ func TestAccountLookups(t *testing.T) {
 			IsSigner:   chainwriter.MetaBool{Value: true},
 			IsWritable: chainwriter.MetaBool{Value: true},
 		}
-		result, err := lookupConfig.Resolve(ctx, testArgs, nil, nil)
+		result, err := lookupConfig.Resolve(ctx, testArgs, nil, client.MultiClient{})
 		require.NoError(t, err)
 		for i, meta := range result {
 			require.Equal(t, expectedMeta[i], meta)
@@ -132,7 +133,7 @@ func TestAccountLookups(t *testing.T) {
 			IsSigner:   chainwriter.MetaBool{Value: true},
 			IsWritable: chainwriter.MetaBool{Value: true},
 		}
-		_, err := lookupConfig.Resolve(ctx, testArgs, nil, nil)
+		_, err := lookupConfig.Resolve(ctx, testArgs, nil, client.MultiClient{})
 		require.Error(t, err)
 	})
 
@@ -162,7 +163,7 @@ func TestAccountLookups(t *testing.T) {
 			},
 		}
 
-		result, err := lookupConfig.Resolve(ctx, args, nil, nil)
+		result, err := lookupConfig.Resolve(ctx, args, nil, client.MultiClient{})
 		require.NoError(t, err)
 
 		for i, meta := range result {
@@ -200,7 +201,7 @@ func TestAccountLookups(t *testing.T) {
 			Bitmaps: []uint64{5, 3},
 		}
 
-		_, err := lookupConfig.Resolve(ctx, args, nil, nil)
+		_, err := lookupConfig.Resolve(ctx, args, nil, client.MultiClient{})
 		require.Contains(t, err.Error(), "bitmap value is not a single value")
 	})
 
@@ -227,7 +228,7 @@ func TestAccountLookups(t *testing.T) {
 			},
 		}
 
-		_, err := lookupConfig.Resolve(ctx, args, nil, nil)
+		_, err := lookupConfig.Resolve(ctx, args, nil, client.MultiClient{})
 		require.Contains(t, err.Error(), "error reading bitmap from location")
 	})
 
@@ -254,7 +255,7 @@ func TestAccountLookups(t *testing.T) {
 			},
 		}
 
-		_, err := lookupConfig.Resolve(ctx, args, nil, nil)
+		_, err := lookupConfig.Resolve(ctx, args, nil, client.MultiClient{})
 		require.Contains(t, err.Error(), "invalid value format at path")
 	})
 }
@@ -287,7 +288,7 @@ func TestPDALookups(t *testing.T) {
 			IsWritable: true,
 		}
 
-		result, err := pdaLookup.Resolve(ctx, nil, nil, nil)
+		result, err := pdaLookup.Resolve(ctx, nil, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -322,7 +323,7 @@ func TestPDALookups(t *testing.T) {
 			"another_seed": seed2,
 		}
 
-		result, err := pdaLookup.Resolve(ctx, args, nil, nil)
+		result, err := pdaLookup.Resolve(ctx, args, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -342,7 +343,7 @@ func TestPDALookups(t *testing.T) {
 			"test_seed": []byte("data"),
 		}
 
-		_, err := pdaLookup.Resolve(ctx, args, nil, nil)
+		_, err := pdaLookup.Resolve(ctx, args, nil, client.MultiClient{})
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "key not found")
 	})
@@ -378,7 +379,7 @@ func TestPDALookups(t *testing.T) {
 			"another_seed": seed2,
 		}
 
-		result, err := pdaLookup.Resolve(ctx, args, nil, nil)
+		result, err := pdaLookup.Resolve(ctx, args, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -416,7 +417,7 @@ func TestPDALookups(t *testing.T) {
 			"array_seed":  arraySeed,
 		}
 
-		result, err := pdaLookup.Resolve(ctx, args, nil, nil)
+		result, err := pdaLookup.Resolve(ctx, args, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -456,7 +457,7 @@ func TestPDALookups(t *testing.T) {
 			"seed2": arraySeed2,
 		}
 
-		result, err := pdaLookup.Resolve(ctx, args, nil, nil)
+		result, err := pdaLookup.Resolve(ctx, args, nil, client.MultiClient{})
 		require.NoError(t, err)
 		require.Equal(t, expectedMeta, result)
 	})
@@ -477,13 +478,17 @@ func TestLookupTables(t *testing.T) {
 	solanaClient, err := client.NewClient(url, cfg, 5*time.Second, nil)
 	require.NoError(t, err)
 
+	multiClient := *client.NewMultiClient(func(context.Context) (client.ReaderWriter, error) {
+		return solanaClient, nil
+	})
+
 	loader := solanautils.NewStaticLoader[client.ReaderWriter](solanaClient)
 	mkey := keyMocks.NewSimpleKeystore(t)
 	lggr := logger.Test(t)
 
 	txm := txm.NewTxm("localnet", loader, nil, cfg, mkey, lggr)
 
-	cw, err := chainwriter.NewSolanaChainWriterService(nil, solanaClient, txm, nil, chainwriter.ChainWriterConfig{})
+	cw, err := chainwriter.NewSolanaChainWriterService(nil, multiClient, txm, nil, chainwriter.ChainWriterConfig{})
 	require.NoError(t, err)
 
 	t.Run("StaticLookup table resolves properly", func(t *testing.T) {
@@ -657,6 +662,10 @@ func TestCreateATAs(t *testing.T) {
 	solanaClient, err := client.NewClient(url, cfg, 5*time.Second, nil)
 	require.NoError(t, err)
 
+	multiClient := *client.NewMultiClient(func(context.Context) (client.ReaderWriter, error) {
+		return solanaClient, nil
+	})
+
 	t.Run("returns no instructions when no ATA location is found", func(t *testing.T) {
 		lookups := []chainwriter.ATALookup{
 			{
@@ -679,7 +688,7 @@ func TestCreateATAs(t *testing.T) {
 			},
 		}
 
-		ataInstructions, err := chainwriter.CreateATAs(ctx, args, lookups, nil, solanaClient, testContractIDL, feePayer)
+		ataInstructions, err := chainwriter.CreateATAs(ctx, args, lookups, nil, multiClient, testContractIDL, feePayer)
 		require.NoError(t, err)
 		require.Empty(t, ataInstructions)
 	})
@@ -704,7 +713,7 @@ func TestCreateATAs(t *testing.T) {
 			"Addresses": {chainwriter.GetRandomPubKey(t), chainwriter.GetRandomPubKey(t)},
 		}
 
-		_, err := chainwriter.CreateATAs(ctx, args, lookups, nil, solanaClient, testContractIDL, feePayer)
+		_, err := chainwriter.CreateATAs(ctx, args, lookups, nil, multiClient, testContractIDL, feePayer)
 		require.Contains(t, err.Error(), "expected exactly one wallet address, got 2")
 	})
 
@@ -728,7 +737,7 @@ func TestCreateATAs(t *testing.T) {
 			"Addresses": {chainwriter.GetRandomPubKey(t), chainwriter.GetRandomPubKey(t)},
 		}
 
-		_, err := chainwriter.CreateATAs(ctx, args, lookups, nil, solanaClient, testContractIDL, feePayer)
+		_, err := chainwriter.CreateATAs(ctx, args, lookups, nil, multiClient, testContractIDL, feePayer)
 		require.Contains(t, err.Error(), "expected equal number of token programs and mints, got 1 tokenPrograms and 2 mints")
 	})
 
@@ -760,7 +769,7 @@ func TestCreateATAs(t *testing.T) {
 			},
 		}
 
-		ataInstructions, err := chainwriter.CreateATAs(ctx, args, lookups, nil, solanaClient, testContractIDL, feePayer)
+		ataInstructions, err := chainwriter.CreateATAs(ctx, args, lookups, nil, multiClient, testContractIDL, feePayer)
 		require.NoError(t, err)
 
 		tx := solanautils.CreateTx(ctx, t, rpcClient, ataInstructions, sender, rpc.CommitmentFinalized)
@@ -797,14 +806,14 @@ func TestCreateATAs(t *testing.T) {
 			},
 		}
 
-		ataInstructions, err := chainwriter.CreateATAs(ctx, args, lookups, nil, solanaClient, testContractIDL, feePayer)
+		ataInstructions, err := chainwriter.CreateATAs(ctx, args, lookups, nil, multiClient, testContractIDL, feePayer)
 		require.NoError(t, err)
 
 		solanautils.SendAndConfirm(ctx, t, rpcClient, ataInstructions, sender, rpc.CommitmentFinalized)
 		require.True(t, checkIfATAExists(t, rpcClient, ataAddress))
 
 		// now, if we try to create the same ATA again, it should return no instructions
-		ataInstructions, err = chainwriter.CreateATAs(ctx, args, lookups, nil, solanaClient, testContractIDL, feePayer)
+		ataInstructions, err = chainwriter.CreateATAs(ctx, args, lookups, nil, multiClient, testContractIDL, feePayer)
 		require.NoError(t, err)
 		require.Empty(t, ataInstructions)
 	})

pkg/solana/chain.go

@@ -54,6 +54,7 @@ type Chain interface {
 	FeeEstimator() fees.Estimator
 	// Reader returns a new Reader from the available list of nodes (if there are multiple, it will randomly select one)
 	Reader() (client.Reader, error)
+	MultiClient() *client.MultiClient
 }
 
 // DefaultRequestTimeout is the default Solana client timeout.
@@ -437,6 +438,10 @@ func (c *chain) Reader() (client.Reader, error) {
 	return c.getClient(ctx)
 }
 
+func (c *chain) MultiClient() *client.MultiClient {
+	return c.multiClient
+}
+
 func (c *chain) ChainID() string {
 	return c.id
 }