Skip to content

Commit 078b305

Browse files
authored
Merge pull request #148 from jurteam/develop
Develop to staging
2 parents 7ca3624 + e739afe commit 078b305

Some content is hidden

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

42 files changed

+630
-569
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ jobs:
2929
rustup update stable
3030
rustup toolchain install nightly
3131
rustup target add wasm32-unknown-unknown --toolchain nightly
32-
32+
33+
- name: Check format
34+
run: cargo fmt --all -- --check
35+
3336
- name: Build
3437
run: SKIP_WASM_BUILD= cargo check --all-targets --features runtime-benchmarks
3538

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
2+
resolver = "2"
23
members = [
34
"node",
45
"pallets/token-swap",

node/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "jur-node"
3-
version = "2.0.2"
3+
version = "2.0.3"
44
edition = "2021"
55
license = "Unlicense"
66
publish = false
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1313
name = "jur-node"
1414

1515
[dependencies]
16-
clap = { version = "4.3.23", features = ["derive"] }
16+
clap = { version = "4.4.1", features = ["derive"] }
1717
hex-literal = '0.4.1'
1818
futures = { version = "0.3.21", features = ["thread-pool"]}
1919
sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
@@ -55,7 +55,7 @@ frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/parityte
5555
frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
5656

5757
# Local Dependencies
58-
jur-node-runtime = { version = "2.0.2", path = "../runtime" }
58+
jur-node-runtime = { version = "2.0.3", path = "../runtime" }
5959
primitives = { package = 'jur-primitives', path = '../primitives' }
6060

6161
# CLI-specific dependencies

0 commit comments

Comments
 (0)