feat(solana): chunked header update + e2e solana->cosmos/cosmos->solana (#760)

Author: vaporif

Cargo.lock

@@ -62,6 +62,7 @@ tendermint-light-client-uc-and-membership = { path = "packages/tendermint-light-
 
 solana-ibc-constants = { path = "programs/solana/packages/solana-ibc-constants", default-features = false }
 solana-ibc-types = { path = "programs/solana/packages/solana-ibc-types", default-features = false }
+brine-ed25519 = { version = "0.2", default-features = false }
 
 serde           = { version = "1.0", default-features = false }
 serde_json      = { version = "1.0", default-features = false }

Cargo.toml

@@ -1,6 +1,6 @@
 module github.com/cosmos/solidity-ibc-eureka/e2e/v8
 
-go 1.24.3
+go 1.24.5
 
 require (
 	cosmossdk.io/api v0.9.2
@@ -16,6 +16,7 @@ require (
 	github.com/cosmos/ibc-go/v10 v10.3.0
 	github.com/cosmos/ics23/go v0.11.0
 	github.com/cosmos/interchaintest/v10 v10.0.0
+	github.com/cosmos/solidity-ibc-eureka/e2e/interchaintestv8/solana/go-anchor v0.0.0-00010101000000-000000000000
 	github.com/cosmos/solidity-ibc-eureka/packages/go-abigen v0.0.0
 	github.com/cosmos/solidity-ibc-eureka/packages/go-anchor v0.0.0
 	github.com/ethereum/go-ethereum v1.16.2
@@ -317,6 +318,8 @@ replace github.com/cosmos/solidity-ibc-eureka/packages/go-abigen => ../../packag
 
 replace github.com/cosmos/solidity-ibc-eureka/packages/go-anchor => ../../packages/go-anchor
 
+replace github.com/cosmos/solidity-ibc-eureka/e2e/interchaintestv8/solana/go-anchor => ./solana/go-anchor
+
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

e2e/interchaintestv8/go.mod

@@ -19,14 +19,14 @@ type SolanaCosmosConfigInfo struct {
 	// Solana fee payer address (for cosmos-to-solana)
 	SolanaFeePayer string
 	// Whether we use the mock client in Cosmos
-	MockWasmClient bool
+	Mock bool
 }
 
 type SolanaToCosmosModuleConfig struct {
 	// Solana chain ID
 	SolanaChainId string `json:"solana_chain_id"`
-	// Solana RPC URL
-	SolanaRpcUrl string `json:"solana_rpc_url"`
+	// Source RPC URL (Solana) - must be "src_rpc_url"
+	SrcRpcUrl string `json:"src_rpc_url"`
 	// Target tendermint RPC URL (must be "target_rpc_url" not "tm_rpc_url")
 	TargetRpcUrl string `json:"target_rpc_url"`
 	// Signer address for submitting to Cosmos
@@ -40,8 +40,8 @@ type SolanaToCosmosModuleConfig struct {
 type CosmosToSolanaModuleConfig struct {
 	// Source tendermint RPC URL (must be "source_rpc_url")
 	SourceRpcUrl string `json:"source_rpc_url"`
-	// Solana RPC URL
-	SolanaRpcUrl string `json:"solana_rpc_url"`
+	// Target RPC URL (Solana) - must be "target_rpc_url"
+	TargetRpcUrl string `json:"target_rpc_url"`
 	// Solana ICS26 router program ID (must be "solana_ics26_program_id")
 	SolanaIcs26ProgramId string `json:"solana_ics26_program_id"`
 	// Solana ICS07 Tendermint light client program ID (must be "solana_ics07_program_id")
@@ -58,11 +58,11 @@ func CreateSolanaCosmosModules(configInfo SolanaCosmosConfigInfo) []ModuleConfig
 			DstChain: configInfo.CosmosChainID,
 			Config: SolanaToCosmosModuleConfig{
 				SolanaChainId:        configInfo.SolanaChainID,
-				SolanaRpcUrl:         configInfo.SolanaRPC,
+				SrcRpcUrl:            configInfo.SolanaRPC,
 				TargetRpcUrl:         configInfo.TmRPC,
 				SignerAddress:        configInfo.CosmosSignerAddress,
 				SolanaIcs26ProgramId: configInfo.ICS26RouterProgramID,
-				Mock:                 configInfo.MockWasmClient,
+				Mock:                 configInfo.Mock,
 			},
 		},
 		{
@@ -71,7 +71,7 @@ func CreateSolanaCosmosModules(configInfo SolanaCosmosConfigInfo) []ModuleConfig
 			DstChain: configInfo.SolanaChainID,
 			Config: CosmosToSolanaModuleConfig{
 				SourceRpcUrl:         configInfo.TmRPC,
-				SolanaRpcUrl:         configInfo.SolanaRPC,
+				TargetRpcUrl:         configInfo.SolanaRPC,
 				SolanaIcs26ProgramId: configInfo.ICS26RouterProgramID,
 				SolanaIcs07ProgramId: configInfo.ICS07ProgramID,
 				SolanaFeePayer:       configInfo.SolanaFeePayer,

e2e/interchaintestv8/relayer/solana_and_cosmos_config.go

@@ -0,0 +1,154 @@
+package solana
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/cosmos/solidity-ibc-eureka/e2e/v8/testvalues"
+
+	"github.com/gagliardetto/solana-go"
+	"github.com/gagliardetto/solana-go/programs/system"
+	"github.com/gagliardetto/solana-go/rpc"
+)
+
+// WaitForClusterReady waits for the Solana cluster to be fully initialized
+func (s *Solana) WaitForClusterReady(ctx context.Context, timeout time.Duration) error {
+	deadline := time.Now().Add(timeout)
+
+	for time.Now().Before(deadline) {
+		// Check 1: Can we get the latest blockhash?
+		_, err := s.RPCClient.GetLatestBlockhash(ctx, rpc.CommitmentFinalized)
+		if err != nil {
+			time.Sleep(1 * time.Second)
+			continue
+		}
+
+		// Check 2: Can we get the slot?
+		slot, err := s.RPCClient.GetSlot(ctx, rpc.CommitmentFinalized)
+		if err != nil || slot < 5 {
+			time.Sleep(1 * time.Second)
+			continue
+		}
+
+		// Check 3: Is the faucet account funded and available?
+		if s.Faucet != nil {
+			balance, err := s.RPCClient.GetBalance(ctx, s.Faucet.PublicKey(), rpc.CommitmentFinalized)
+			if err != nil {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+
+			// Ensure faucet has at least 1000 SOL for funding operations
+			minBalance := uint64(1000_000_000_000) // 1000 SOL in lamports
+			if balance.Value < minBalance {
+				return fmt.Errorf("faucet balance too low: %d lamports (need at least %d)", balance.Value, minBalance)
+			}
+		}
+
+		// Check 4: Can we get the version? (ensures RPC is fully responsive)
+		_, err = s.RPCClient.GetVersion(ctx)
+		if err != nil {
+			time.Sleep(1 * time.Second)
+			continue
+		}
+
+		// All checks passed
+		return nil
+	}
+
+	return fmt.Errorf("cluster not ready after %v", timeout)
+}
+
+// CreateAndFundWalletWithRetry creates a wallet with retry logic
+func (s *Solana) CreateAndFundWalletWithRetry(ctx context.Context, retries int) (*solana.Wallet, error) {
+	var lastErr error
+
+	for i := range retries {
+		// Wait a bit before retry (except first attempt)
+		if i > 0 {
+			time.Sleep(time.Duration(i) * time.Second)
+		}
+
+		wallet := solana.NewWallet()
+
+		// Try to fund the wallet
+		_, err := s.FundUserWithRetry(ctx, wallet.PublicKey(), testvalues.InitialSolBalance, 3)
+		if err == nil {
+			// Verify the balance was actually credited
+			balance, err := s.RPCClient.GetBalance(ctx, wallet.PublicKey(), rpc.CommitmentConfirmed)
+			if err == nil && balance.Value > 0 {
+				return wallet, nil
+			}
+		}
+
+		lastErr = err
+	}
+
+	return nil, fmt.Errorf("failed to create and fund wallet after %d retries: %w", retries, lastErr)
+}
+
+// FundUserWithRetry funds a user with retry logic
+func (s *Solana) FundUserWithRetry(ctx context.Context, pubkey solana.PublicKey, amount uint64, retries int) (solana.Signature, error) {
+	var lastErr error
+
+	for i := range retries {
+		// Wait a bit before retry (except first attempt)
+		if i > 0 {
+			time.Sleep(time.Duration(i) * time.Second)
+		}
+
+		// Check faucet balance first
+		faucetBalance, err := s.RPCClient.GetBalance(ctx, s.Faucet.PublicKey(), rpc.CommitmentConfirmed)
+		if err != nil {
+			lastErr = fmt.Errorf("failed to get faucet balance: %w", err)
+			continue
+		}
+
+		if faucetBalance.Value < amount {
+			lastErr = fmt.Errorf("insufficient faucet balance: %d < %d", faucetBalance.Value, amount)
+			continue
+		}
+
+		// Get latest blockhash
+		recent, err := s.RPCClient.GetLatestBlockhash(ctx, rpc.CommitmentFinalized)
+		if err != nil {
+			lastErr = fmt.Errorf("failed to get blockhash: %w", err)
+			continue
+		}
+
+		// Create transfer transaction
+		tx, err := solana.NewTransaction(
+			[]solana.Instruction{
+				system.NewTransferInstruction(
+					amount,
+					s.Faucet.PublicKey(),
+					pubkey,
+				).Build(),
+			},
+			recent.Value.Blockhash,
+			solana.TransactionPayer(s.Faucet.PublicKey()),
+		)
+		if err != nil {
+			lastErr = fmt.Errorf("failed to create transaction: %w", err)
+			continue
+		}
+
+		// Sign and broadcast
+		sig, err := s.SignAndBroadcastTx(ctx, tx, s.Faucet)
+		if err == nil {
+			// Wait for confirmation
+			time.Sleep(2 * time.Second)
+
+			// Verify the transfer succeeded
+			balance, err := s.RPCClient.GetBalance(ctx, pubkey, rpc.CommitmentConfirmed)
+			if err == nil && balance.Value >= amount {
+				return sig, nil
+			}
+		}
+
+		lastErr = err
+	}
+
+	return solana.Signature{}, fmt.Errorf("failed to fund user after %d retries: %w", retries, lastErr)
+}

e2e/interchaintestv8/solana/cluster_health.go

@@ -0,0 +1,36 @@
+module github.com/cosmos/solidity-ibc-eureka/e2e/interchaintestv8/solana/go-anchor
+
+go 1.24.5
+
+require (
+	github.com/gagliardetto/anchor-go v0.3.2
+	github.com/gagliardetto/binary v0.8.0
+	github.com/gagliardetto/solana-go v1.12.0
+)
+
+require (
+	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
+	github.com/blendle/zapdriver v1.3.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/gagliardetto/treeout v0.1.4 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
+	github.com/mattn/go-colorable v0.1.4 // indirect
+	github.com/mattn/go-isatty v0.0.11 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
+	github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
+	go.mongodb.org/mongo-driver v1.12.2 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+)