Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-mock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/solana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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-

Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
108 changes: 79 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Loading
Loading