Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into rano/fix/sov-host-client-state
Browse files Browse the repository at this point in the history
  • Loading branch information
rnbguy committed May 23, 2024
2 parents f1c8b2c + 5af99c7 commit b936293
Show file tree
Hide file tree
Showing 74 changed files with 1,325 additions and 814 deletions.
69 changes: 32 additions & 37 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[patch.crates-io]

sov-ibc = { path = "modules/sov-ibc" }
sov-ibc-transfer = { path = "modules/sov-ibc-transfer" }
sov-consensus-state-tracker = { path = "modules/sov-consensus-state-tracker" }
sov-celestia-client = { path = "clients/sov-celestia" }

ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core-client = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core-host-cosmos = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-tendermint = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-wasm-types = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-cw = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-app-transfer = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }

basecoin = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "61256f9" }
jmt = { git = "https://github.com/penumbra-zone/jmt.git", rev = "1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" }
sov-ibc = { path = "modules/sov-ibc" }
sov-ibc-transfer = { path = "modules/sov-ibc-transfer" }
sov-consensus-state-tracker = { path = "modules/sov-consensus-state-tracker" }
sov-celestia-client = { path = "clients/sov-celestia" }

ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core-client = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-core-host-cosmos = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-tendermint = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-wasm-types = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-client-cw = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-app-transfer = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-primitives = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }
ibc-testkit = { git = "https://github.com/cosmos/ibc-rs.git", rev = "d5e3887770" }

basecoin = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "61256f9" }
jmt = { git = "https://github.com/penumbra-zone/jmt.git", rev = "1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" }


# The sovereign-sdk patches are specified in two modes.
Expand All @@ -30,69 +30,64 @@ jmt = { git = "https://github.com/penumbra-zone/jmt.
[patch.crates-io.sov-modules-api]
# path = "vendor/sovereign-sdk/module-system/sov-modules-api"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-state]
# path = "vendor/sovereign-sdk/module-system/sov-state"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-bank]
# path = "vendor/sovereign-sdk/module-system/module-implementations/sov-bank"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-sequencer-registry]
# path = "vendor/sovereign-sdk/module-system/module-implementations/sov-sequencer-registry"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-db]
# path = "vendor/sovereign-sdk/full-node/sov-db"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-rollup-interface]
# path = "vendor/sovereign-sdk/rollup-interface"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-mock-zkvm]
# path = "vendor/sovereign-sdk/adapters/mock-zkvm"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-prover-storage-manager]
# path = "vendor/sovereign-sdk/full-node/sov-prover-storage-manager"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-kernels]
# path = "vendor/sovereign-sdk/module-system/sov-kernels"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"

[patch.crates-io.sov-modules-core]
# path = "vendor/sovereign-sdk/module-system/sov-modules-core"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-celestia-adapter]
# path = "vendor/sovereign-sdk/adapters/celestia"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-mock-da]
# path = "vendor/sovereign-sdk/adapters/mock-da"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.const-rollup-config]
# path = "vendor/sovereign-sdk/examples/const-rollup-config"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"

[patch.crates-io.sov-chain-state]
# path = "vendor/sovereign-sdk/module-system/module-implementations/sov-chain-state"
git = "ssh://[email protected]/informalsystems/sovereign-sdk-wip.git"
rev = "63fa5f11"
rev = "fc1552b44acddc2674a783cd11f301a8b79cc4f3"
2 changes: 1 addition & 1 deletion .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ ignore:
# Make comments less noisy
comment:
layout: "files"
require_changes: true
require_changes: true
20 changes: 12 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: weekly
day: monday
time: "15:00"
timezone: "Europe/Warsaw"
open-pull-requests-limit: 0
- package-ecosystem: cargo
directory: "/"
schedule:
interval: weekly
day: monday
time: "15:00"
timezone: "Europe/Warsaw"
open-pull-requests-limit: 0
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ Closes: #XXX
are the most critical to review.
-->

______
---

### PR author checklist

- [ ] Linked to GitHub issue.
- [ ] Added tests.
- [ ] Updated code comments and documentation (e.g., `docs/`).
- [ ] Tagged *one* reviewer who will be the one responsible for shepherding this PR.
- [ ] Tagged _one_ reviewer who will be the one responsible for shepherding this PR.
9 changes: 9 additions & 0 deletions .github/typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[default.extend-words]
# for serde serialization
ser = "ser"

[files]
extend-exclude = [ "**/*.bin" ]

[default]
extend-ignore-re = [ "cosmos1[0-9A-Za-z+/]{10,}", "ch[ABC][ABC]" ]
9 changes: 4 additions & 5 deletions .github/workflows/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
---
name: Bug Report
name: Bug Report
about: Create a report to help us squash bugs!

---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
v Before smashing the submit button please review the template.
v Please also ensure that this is not a duplicate issue :)
v Please also ensure that this is not a duplicate issue :)
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

## Bug Summary
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
name: Feature Request
about: Create a proposal to request a feature!

---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
v Before smashing the submit button please review the template.
v Word of caution: poorly thought-out proposals may be rejected
v without deliberation
v Word of caution: poorly thought-out proposals may be rejected
v without deliberation
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->

## Feature Summary
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ISSUE_TEMPLATE/process-improvement.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
name: Process Improvement
about: Create a proposal to suggest an improvement!

---

<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
v ✰ Thanks for opening an issue! ✰
v ✰ Thanks for opening an issue! ✰
v Before smashing the submit button please review the template.
v Please also ensure that this is not a duplicate issue :)
☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -->
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Code Quality Checks
on:
pull_request:

jobs:
code-quality:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Spell Check with Typos
uses: crate-ci/[email protected]
with:
config: ./.github/typos.toml

- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: baptiste0928/cargo-install@v3
with:
crate: taplo-cli
- run: taplo fmt --check
15 changes: 3 additions & 12 deletions .github/workflows/cw-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,19 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Git credentials for private repo
run: |
git config --global --replace-all \
"url.https://${{ secrets.AUTH_TOKEN }}@github.com.insteadOf" \
ssh://[email protected]
- uses: cachix/install-nix-action@v26
- uses: cachix/install-nix-action@V27
with:
extra_nix_config: |
experimental-features = nix-command flakes
- uses: cachix/cachix-action@v14
- uses: cachix/cachix-action@v15
with:
name: hermes-sdk
extraPullNames: informal-sovereign
- name: Install Rust
uses: actions-rs/toolchain@v1
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown
profile: minimal
override: true
- name: Cache Cargo registry
uses: Swatinem/rust-cache@v2
- name: Set up Git credentials for private repo
run: |
git config --global --replace-all \
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dependency_review.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Dependency Review'
name: "Dependency Review"
on: [pull_request]

permissions:
Expand All @@ -8,9 +8,9 @@ jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
- name: "Checkout Repository"
uses: actions/checkout@v4
- name: "Dependency Review"
uses: actions/dependency-review-action@v4
with:
fail-on-severity: critical
14 changes: 6 additions & 8 deletions .github/workflows/risc0-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
paths:
- .github/workflows/risc0-check.yml
- ci/risc0-check/**
- '**/Cargo.toml'
- '**/Cargo.lock'
- "**/Cargo.toml"
- "**/Cargo.lock"
push:
branches: main
paths:
- .github/workflows/risc0-check.yml
- ci/risc0-check/**
- '**/Cargo.toml'
- '**/Cargo.lock'
- "**/Cargo.toml"
- "**/Cargo.lock"

env:
CARGO_INCREMENTAL: 0
Expand All @@ -31,15 +31,13 @@ jobs:
git config --global --replace-all \
"url.https://${{ secrets.AUTH_TOKEN }}@github.com.insteadOf" \
ssh://[email protected]
- name: Cache dependencies
uses: Swatinem/rust-cache@v2
- name: Install cargo-risczero
uses: taiki-e/install-action@v2
with:
tool: [email protected]
- name: Install risc0-zkvm toolchain
run: cargo risczero install --version v2024-02-08.1
run: cargo risczero install --version v2024-04-22.0 # for rust 1.77
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Check Risc0 compatibility
run: make check-risc0
run: make check-risc0
Loading

0 comments on commit b936293

Please sign in to comment.