Skip to content

Commit 57f47f2

Browse files
feat: re-structure basecoin-rs (#156)
* 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]>
1 parent 8a266ae commit 57f47f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+782
-729
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Restructure repository with the focus on `ibc-testkit` integration
2+
([#155](https://github.com/informalsystems/basecoin-rs/issues/155))

.github/workflows/integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
- uses: rokroskar/workflow-run-cleanup-action@master
1313
env:
1414
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
15-
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
15+
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' }}
1616

1717
ibc-integration:
1818
runs-on: ubuntu-latest
1919
env:
2020
COMETBFT_VERSION: 0.37.1
21-
GAIA_VERSION: 6.0.0
22-
HERMES_VERSION: 1.4.0
21+
GAIA_VERSION: 7.1.1
22+
HERMES_VERSION: 1.8.0
2323
GRPCURL_VERSION: 1.8.7
2424
RUST_VERSION: 1.65
2525
IBC_COMMITISH: master

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: rokroskar/workflow-run-cleanup-action@master
1313
env:
1414
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
15-
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
15+
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' }}
1616

1717
fmt:
1818
runs-on: ubuntu-latest

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: rokroskar/workflow-run-cleanup-action@master
1313
env:
1414
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
15-
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
15+
if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master' }}
1616

1717
test:
1818
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 77 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,47 @@
33
resolver = "2"
44

55
members = [
6-
"crates/app",
7-
"crates/store",
6+
"basecoin",
7+
"basecoin/app",
8+
"basecoin/modules",
9+
"basecoin/store",
810
]
911

12+
[workspace.package]
13+
version = "0.1.0"
14+
license = "Apache-2.0"
15+
edition = "2021"
16+
rust-version = "1.64"
17+
readme = "README.md"
18+
repository = "https://github.com/informalsystems/basecoin-rs"
19+
authors = ["Informal Systems <[email protected]>"]
20+
1021
[workspace.dependencies]
11-
base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
12-
displaydoc = { version = "0.2", default-features = false }
13-
derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
14-
ed25519 = { version = "2.1.0", default-features = false }
15-
ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] }
16-
ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false }
17-
ibc-proto = { version = "0.41.0", default-features = false }
18-
ics23 = { version = "0.11", default-features = false }
19-
prost = { version = "0.12", default-features = false }
20-
serde = "1.0"
21-
serde_json = "1.0"
22-
sha2 = "0.10.2"
23-
tendermint = "0.34"
24-
tendermint-abci = "0.34"
25-
tendermint-proto = "0.34"
26-
tendermint-rpc = "0.34"
27-
tracing = "0.1.26"
22+
# external dependencies
23+
base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
24+
cosmrs = { version = "0.15.0" }
25+
displaydoc = { version = "0.2", default-features = false }
26+
derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
27+
ed25519 = { version = "2.1.0", default-features = false }
28+
prost = { version = "0.12", default-features = false }
29+
serde = "1.0"
30+
serde_json = "1.0"
31+
sha2 = "0.10.2"
32+
tonic = "0.10"
33+
tonic-reflection = "0.10"
34+
tracing = "0.1.26"
35+
tracing-subscriber = "0.3.16"
36+
37+
# ibc dependencies
38+
ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] }
39+
ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false }
40+
ibc-proto = { version = "0.41.0", default-features = false }
41+
ics23 = { version = "0.11", default-features = false }
42+
43+
# tendermint dependencies
44+
tendermint = { version = "0.34", default-features = false }
45+
tendermint-abci = { version = "0.34", default-features = false }
46+
tendermint-proto = { version = "0.34", default-features = false }
47+
tendermint-rpc = { version = "0.34", default-features = false }
2848

2949

0 commit comments

Comments
 (0)