feat(solana): implement access-manager

Author: mariuszzak

.github/workflows/e2e-full.yml

@@ -34,7 +34,7 @@ env:
   E2E_PRIVATE_CLUSTER: true
   E2E_WASM_LIGHT_CLIENT_TAG: ${{ inputs.wasm-eth-light-client-tag }}
   SOLANA_VERSION: "2.1.17"
-  ANCHOR_VERSION: "0.31.1"
+  ANCHOR_VERSION: "0.32.1"
 permissions:
   contents: read
 

.github/workflows/e2e-minimal.yml

@@ -35,7 +35,7 @@ env:
   E2E_PRIVATE_CLUSTER: true
   E2E_WASM_LIGHT_CLIENT_TAG: ${{ inputs.wasm-eth-light-client-tag }}
   SOLANA_VERSION: "2.1.17"
-  ANCHOR_VERSION: "0.31.1"
+  ANCHOR_VERSION: "0.32.1"
 permissions:
   contents: read
 

.github/workflows/e2e-mock.yml

@@ -23,7 +23,7 @@ env:
   SP1_PROVER: mock
   E2E_PROOF_TYPE: groth16
   SOLANA_VERSION: "2.1.17"
-  ANCHOR_VERSION: "0.31.1"
+  ANCHOR_VERSION: "0.32.1"
 
 permissions:
   contents: read

.github/workflows/solana.yml

@@ -16,7 +16,7 @@ concurrency:
 
 env:
   SOLANA_VERSION: "2.1.17"
-  ANCHOR_VERSION: "0.31.1"
+  ANCHOR_VERSION: "0.32.1"
 
 jobs:
   build-and-test:
@@ -41,7 +41,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-solana-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-solana-${{ hashFiles('**/Cargo.lock') }}-anchor-${{ env.ANCHOR_VERSION }}
           restore-keys: |
             ${{ runner.os }}-cargo-solana-
 

.gitignore

@@ -43,3 +43,9 @@ programs/relayer/config.json
 scripts/genesis.json
 network_params.yaml
 test-ledger
+
+# Solana keypairs - only localnet is tracked for E2E tests
+solana-keypairs/**/*
+!solana-keypairs/localnet/
+!solana-keypairs/localnet/**
+!solana-keypairs/**/.gitkeep

Cargo.lock

@@ -160,13 +160,14 @@ cw-ics08-wasm-eth-v1_2_0 = { package = "cw-ics08-wasm-eth", git = "https://githu
 ethereum-light-client-v1_2_0 = { package = "ethereum-light-client", git = "https://github.com/cosmos/solidity-ibc-eureka", tag = "cw-ics08-wasm-eth-v1.2.0", default-features = false }
 
 # Solana dependencies
+solana-program            = { version = "2.0" }
 solana-client             = { version = "2.0" }
 solana-sdk                = { version = "2.0" }
 solana-transaction-status = { version = "2.0" }
 borsh                     = { version = "1.3" }
 bincode                   = { version = "1.3" }
-anchor-lang               = { version = "0.31.1" }
-anchor-client             = { version = "0.31.1" }
+anchor-lang               = { version = "0.32.1" }
+anchor-client             = { version = "0.32.1" }
 
 # TODO: Remove these dependencies once ethereum wasm client v1.2.0 backwards compatibility is not needed
 ibc-eureka-relayer-eth-to-cosmos-v1_2 = { package = "ibc-eureka-relayer-eth-to-cosmos", git = "https://github.com/cosmos/solidity-ibc-eureka", rev = "d9f58589bee5881561cd8c769750a35448e5ebc8", default-features = false }

Cargo.toml

@@ -138,14 +138,18 @@ anchor deploy
 > ```
 >
 > Then navigate to the Solana programs directory and use anchor-nix commands:
-> 
+>
 > ```sh
 > cd programs/solana
 > anchor-nix build
 > anchor-nix test
 > anchor-nix deploy
 > ```
 
+### Solana Programs
+
+For detailed information about Solana IBC programs including deployment, key generation, access control, and upgradability, see the **[Solana Programs README](programs/solana/README.md)**.
+
 ## Unit Testing
 
 There are multiple unit tests for the solidity contracts located in the `test/` directory. The tests are written in Solidity using [foundry/forge](https://book.getfoundry.sh/forge/writing-tests).

README.md

@@ -14,6 +14,8 @@ type SolanaCosmosConfigInfo struct {
 	ICS07ProgramID string
 	// ICS26 Router program ID on Solana
 	ICS26RouterProgramID string
+	// Access Manager program ID on Solana
+	AccessManagerProgramID string
 	// IBC app program ID on Solana
 	IBCAppProgramID string
 	// Signer address for Cosmos transactions
@@ -50,6 +52,8 @@ type CosmosToSolanaModuleConfig struct {
 	SolanaIcs26ProgramId string `json:"solana_ics26_program_id"`
 	// Solana ICS07 Tendermint light client program ID (must be "solana_ics07_program_id")
 	SolanaIcs07ProgramId string `json:"solana_ics07_program_id"`
+	// Solana access manager program ID (must be "solana_access_manager_program_id")
+	SolanaAccessManagerProgramId string `json:"solana_access_manager_program_id"`
 	// Solana fee payer address for unsigned transactions
 	SolanaFeePayer string `json:"solana_fee_payer"`
 	// Address Lookup Table address for reducing transaction size (optional)
@@ -84,13 +88,14 @@ func CreateSolanaCosmosModules(configInfo SolanaCosmosConfigInfo) []ModuleConfig
 			SrcChain: configInfo.CosmosChainID,
 			DstChain: configInfo.SolanaChainID,
 			Config: CosmosToSolanaModuleConfig{
-				SourceRpcUrl:         configInfo.TmRPC,
-				TargetRpcUrl:         configInfo.SolanaRPC,
-				SolanaIcs26ProgramId: configInfo.ICS26RouterProgramID,
-				SolanaIcs07ProgramId: configInfo.ICS07ProgramID,
-				SolanaFeePayer:       configInfo.SolanaFeePayer,
-				SolanaAltAddress:     altAddress,
-				MockWasmClient:       configInfo.MockWasmClient,
+				SourceRpcUrl:                 configInfo.TmRPC,
+				TargetRpcUrl:                 configInfo.SolanaRPC,
+				SolanaIcs26ProgramId:         configInfo.ICS26RouterProgramID,
+				SolanaIcs07ProgramId:         configInfo.ICS07ProgramID,
+				SolanaAccessManagerProgramId: configInfo.AccessManagerProgramID,
+				SolanaFeePayer:               configInfo.SolanaFeePayer,
+				SolanaAltAddress:             altAddress,
+				MockWasmClient:               configInfo.MockWasmClient,
 			},
 		},
 	}