Skip to content

Commit 02b28d7

Browse files
SunTiebingSunTiebing
authored
Merge branch 'open-web3-stack:master' into master
2 parents 4a6dcd7 + 7d60899 commit 02b28d7

File tree

36 files changed

+100
-92
lines changed

36 files changed

+100
-92
lines changed

‎.github/workflows/coverage.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- '**/README.md'
1515

1616
env:
17-
TARPAULIN_VERSION: 0.19.1
17+
TARPAULIN_VERSION: 0.31.0
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,9 +33,11 @@ jobs:
3333
uses: dtolnay/rust-toolchain@nightly
3434
- name: Generate code coverage
3535
run: |
36-
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz
37-
tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin
36+
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
37+
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
3838
make Cargo.toml
39+
cargo update
40+
cargo update -p frame-support-procedural --precise 30.0.2
3941
cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
4042
- name: Upload to codecov.io
4143
uses: codecov/codecov-action@v3

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ jobs:
3434
- name: Install clippy
3535
run: rustup component add clippy
3636
- name: Update
37-
run: cargo update
37+
run: |
38+
cargo update
39+
cargo update -p frame-support-procedural --precise 30.0.2
3840
- name: Run clippy
3941
run: cargo clippy -- -D warnings
4042
- name: Check for Wasm

‎.github/workflows/zepter.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
- name: Install Zepter
2929
run: cargo install zepter --version 0.15.0 --locked -q -f --no-default-features && zepter --version
3030
- run: make Cargo.toml
31-
- run: cargo update
31+
- run: |
32+
cargo update
33+
cargo update -p frame-support-procedural --precise 30.0.2
3234
- name: Check Rust features
3335
run: make dev-features-check

‎Cargo.dev.toml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
3737
serde = { version = "1.0.189" }
3838
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] }
3939

40-
cumulus-pallet-xcm = { version = "0.14.0", default-features = false }
41-
cumulus-primitives-core = { version = "0.14.0", default-features = false }
42-
frame-benchmarking = { version = "35.0.0", default-features = false }
43-
frame-support = { version = "35.0.0", default-features = false }
44-
frame-system = { version = "35.0.0", default-features = false }
45-
pallet-balances = { version = "36.0.0", default-features = false }
46-
pallet-elections-phragmen = { version = "36.0.0", default-features = false }
47-
pallet-message-queue = { version = "38.0.0", default-features = false }
48-
pallet-preimage = { version = "35.0.0", default-features = false }
49-
pallet-root-testing = { version = "11.0.0", default-features = false }
50-
pallet-scheduler = { version = "36.0.0", default-features = false }
51-
pallet-timestamp = { version = "34.0.0", default-features = false }
52-
pallet-treasury = { version = "34.0.0", default-features = false }
53-
pallet-xcm = { version = "14.0.0", default-features = false }
54-
polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
55-
polkadot-runtime-common = { version = "14.0.0", default-features = false }
56-
polkadot-runtime-parachains = { version = "14.0.0", default-features = false }
57-
sp-api = { version = "33.0.0", default-features = false }
58-
sp-application-crypto = { version = "37.0.0", default-features = false }
40+
cumulus-pallet-xcm = { version = "0.16.0", default-features = false }
41+
cumulus-primitives-core = { version = "0.15.0", default-features = false }
42+
frame-benchmarking = { version = "37.0.0", default-features = false }
43+
frame-support = { version = "37.0.0", default-features = false }
44+
frame-system = { version = "37.0.0", default-features = false }
45+
pallet-balances = { version = "38.0.0", default-features = false }
46+
pallet-elections-phragmen = { version = "38.0.0", default-features = false }
47+
pallet-message-queue = { version = "40.0.0", default-features = false }
48+
pallet-preimage = { version = "37.0.0", default-features = false }
49+
pallet-root-testing = { version = "13.0.0", default-features = false }
50+
pallet-scheduler = { version = "38.0.0", default-features = false }
51+
pallet-timestamp = { version = "36.0.0", default-features = false }
52+
pallet-treasury = { version = "36.0.0", default-features = false }
53+
pallet-xcm = { version = "16.0.0", default-features = false }
54+
polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
55+
polkadot-runtime-common = { version = "16.0.0", default-features = false }
56+
polkadot-runtime-parachains = { version = "16.0.0", default-features = false }
57+
sp-api = { version = "34.0.0", default-features = false }
58+
sp-application-crypto = { version = "38.0.0", default-features = false }
5959
sp-arithmetic = { version = "26.0.0", default-features = false }
6060
sp-core = { version = "34.0.0", default-features = false }
61-
sp-io = { version = "37.0.0", default-features = false }
62-
sp-runtime = { version = "38.0.0", default-features = false }
61+
sp-io = { version = "38.0.0", default-features = false }
62+
sp-runtime = { version = "39.0.0", default-features = false }
6363
sp-runtime-interface = { version = "28.0.0", default-features = false }
64-
sp-staking = { version = "33.0.0", default-features = false }
64+
sp-staking = { version = "34.0.0", default-features = false }
6565
sp-std = { version = "14.0.0", default-features = false }
6666
sp-storage = { version = "21.0.0", default-features = false }
67-
xcm = { version = "14.0.0", package = "staging-xcm", default-features = false }
68-
xcm-builder = { version = "14.0.0", package = "staging-xcm-builder", default-features = false }
69-
xcm-executor = { version = "14.0.0", package = "staging-xcm-executor", default-features = false }
67+
xcm = { version = "14.1.0", package = "staging-xcm", default-features = false }
68+
xcm-builder = { version = "16.0.0", package = "staging-xcm-builder", default-features = false }
69+
xcm-executor = { version = "16.0.0", package = "staging-xcm-executor", default-features = false }
7070

71-
xcm-simulator = { version = "14.0.0" }
71+
xcm-simulator = { version = "16.0.0" }

‎asset-registry/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-asset-registry"
33
description = "Registry for (foreign) assets"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/asset-registry"
55
license = "Apache-2.0"
6-
version = "0.13.0"
6+
version = "1.0.0"
77
authors = ["Interlay Ltd, etc"]
88
edition = "2021"
99

@@ -27,7 +27,7 @@ xcm-builder = { workspace = true }
2727
xcm-executor = { workspace = true }
2828

2929
# orml
30-
orml-traits = { path = "../traits", version = "0.13.0", default-features = false }
30+
orml-traits = { path = "../traits", version = "1.0.0", default-features = false }
3131

3232
# for runtime-benchmarks
3333
polkadot-runtime-common = { workspace = true, optional = true }

‎auction/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-auction"
33
description = "Auction module that implements `Auction` trait."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
55
license = "Apache-2.0"
6-
version = "0.13.0"
6+
version = "1.0.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

@@ -17,7 +17,7 @@ frame-system = { workspace = true }
1717
sp-runtime = { workspace = true }
1818
sp-std = { workspace = true }
1919

20-
orml-traits = { path = "../traits", version = "0.13.0", default-features = false }
20+
orml-traits = { path = "../traits", version = "1.0.0", default-features = false }
2121

2222
[dev-dependencies]
2323
sp-core = { workspace = true, features = ["std"] }

‎authority/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-authority"
33
description = "Utility pallet to perform ROOT calls in a PoA network"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
55
license = "Apache-2.0"
6-
version = "0.13.0"
6+
version = "1.0.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

‎benchmarking/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-benchmarking"
33
description = "Provide macro to benchmark Substrate runtime."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/benchmarking"
55
license = "Apache-2.0"
6-
version = "0.13.0"
6+
version = "1.0.0"
77
authors = ["Laminar Developers <[email protected]>"]
88
edition = "2021"
99

‎benchmarking/src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ pub use frame_benchmarking::{
1111
Recording,
1212
};
1313

14+
#[cfg(not(feature = "std"))]
15+
extern crate alloc;
1416
#[cfg(feature = "std")]
1517
pub use frame_benchmarking::{Analysis, BenchmarkSelector};
1618
#[doc(hidden)]

‎build-script-utils/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-build-script-utils"
33
description = "Crate with utility functions for `build.rs` scripts."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/build-script-utils"
55
license = "Apache-2.0"
6-
version = "0.13.0"
6+
version = "1.0.0"
77
authors = ["Parity Technologies <[email protected]>", "Laminar Developers <[email protected]>"]
88
edition = "2021"
99

0 commit comments

Comments
 (0)