Skip to content

Commit

Permalink
feat: re-structure basecoin-rs (#156)
Browse files Browse the repository at this point in the history
* feat: split out modules

* feat: re-organize repo with focus on ibc-testkit integration

* fix: make clippy happy + rename main.rs to basecoin.rs

* fix: allow unused imports

* fix: use rpc_addr for querying ugprade plan

* chore: bump Hermes to v1.8.0

* fix: update hermes-config.toml

* fix: introduce cometbft version info

* fix issue with upgrade-client test

* fix: apply review comments

* fix: adding checksums

* fix: keep upgrade-client script as is

* use gaia 7.1.1 on ci

* code optimization

---------

Co-authored-by: Rano | Ranadeep <[email protected]>
  • Loading branch information
Farhad-Shabani and rnbguy authored Feb 21, 2024
1 parent 8a266ae commit 57f47f2
Show file tree
Hide file tree
Showing 94 changed files with 782 additions and 729 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Restructure repository with the focus on `ibc-testkit` integration
([#155](https://github.com/informalsystems/basecoin-rs/issues/155))
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' }}

ibc-integration:
runs-on: ubuntu-latest
env:
COMETBFT_VERSION: 0.37.1
GAIA_VERSION: 6.0.0
HERMES_VERSION: 1.4.0
GAIA_VERSION: 7.1.1
HERMES_VERSION: 1.8.0
GRPCURL_VERSION: 1.8.7
RUST_VERSION: 1.65
IBC_COMMITISH: master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' }}

fmt:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' }}

test:
runs-on: ubuntu-latest
Expand Down
122 changes: 77 additions & 45 deletions Cargo.lock

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

58 changes: 39 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,47 @@
resolver = "2"

members = [
"crates/app",
"crates/store",
"basecoin",
"basecoin/app",
"basecoin/modules",
"basecoin/store",
]

[workspace.package]
version = "0.1.0"
license = "Apache-2.0"
edition = "2021"
rust-version = "1.64"
readme = "README.md"
repository = "https://github.com/informalsystems/basecoin-rs"
authors = ["Informal Systems <[email protected]>"]

[workspace.dependencies]
base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
displaydoc = { version = "0.2", default-features = false }
derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
ed25519 = { version = "2.1.0", default-features = false }
ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] }
ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false }
ibc-proto = { version = "0.41.0", default-features = false }
ics23 = { version = "0.11", default-features = false }
prost = { version = "0.12", default-features = false }
serde = "1.0"
serde_json = "1.0"
sha2 = "0.10.2"
tendermint = "0.34"
tendermint-abci = "0.34"
tendermint-proto = "0.34"
tendermint-rpc = "0.34"
tracing = "0.1.26"
# external dependencies
base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
cosmrs = { version = "0.15.0" }
displaydoc = { version = "0.2", default-features = false }
derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
ed25519 = { version = "2.1.0", default-features = false }
prost = { version = "0.12", default-features = false }
serde = "1.0"
serde_json = "1.0"
sha2 = "0.10.2"
tonic = "0.10"
tonic-reflection = "0.10"
tracing = "0.1.26"
tracing-subscriber = "0.3.16"

# ibc dependencies
ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] }
ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false }
ibc-proto = { version = "0.41.0", default-features = false }
ics23 = { version = "0.11", default-features = false }

# tendermint dependencies
tendermint = { version = "0.34", default-features = false }
tendermint-abci = { version = "0.34", default-features = false }
tendermint-proto = { version = "0.34", default-features = false }
tendermint-rpc = { version = "0.34", default-features = false }


Loading

0 comments on commit 57f47f2

Please sign in to comment.