Skip to content

Commit cb49544

Browse files
vovac12vovac12
authored
Allow further denomination + prepare release (#1341)
* Allow further denomination + prepare release * Fix deps * Fix clippy
1 parent aa3a74c commit cb49544

File tree

50 files changed

+1193
-951
lines changed

Some content is hidden

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

50 files changed

+1193
-951
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,11 @@ thread_local = { git = "https://github.com/sora-xor/thread_local-rs.git", branch
106106
#orml-tokens = { git = "https://github.com/KalitaAlexey/open-runtime-module-library.git", branch = "use-master" }
107107

108108
[patch."https://github.com/open-web3-stack/open-runtime-module-library.git"]
109-
orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
110-
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
111-
orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
112-
orml-utilities = { git = "https://github.com/open-web3-stack//open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
109+
orml-tokens = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
110+
orml-traits = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
111+
orml-currencies = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
112+
orml-utilities = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
113+
orml-xtokens = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38" }
113114

114115
[patch."https://github.com/paritytech/substrate.git"]
115116
frame-benchmarking = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38" }
@@ -292,5 +293,14 @@ members = [
292293

293294
resolver = "2"
294295

296+
[workspace.dependencies]
297+
currencies = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38", package = "orml-currencies", default-features = false }
298+
tokens = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38", package = "orml-tokens", default-features = false }
299+
orml-tokens = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38", package = "orml-tokens", default-features = false }
300+
traits = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38", package = "orml-traits", default-features = false }
301+
orml-traits = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38", package = "orml-traits", default-features = false }
302+
xtokens = { git = "https://github.com/sora-xor/open-runtime-module-library.git", branch = "polkadot-v0.9.38", package = "orml-xtokens", default-features = false }
303+
304+
295305
[profile.release]
296306
panic = 'unwind'

‎common/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals
1414
] }
1515
itoa = "1.0"
1616
scale-info = { version = "2", default-features = false, features = ["derive"] }
17-
currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-currencies", default-features = false }
17+
currencies = { workspace = true }
1818
# derive_more = { version = "0.99.17", default-features = false }
1919
fixnum = { git = "https://github.com/sora-xor/fixnum", branch = "sora-v2.1.0", default-features = false, features = [
2020
"i128",
@@ -29,7 +29,7 @@ secp256k1 = { version = "0.7", features = [
2929
], default-features = false, package = "libsecp256k1" }
3030
thiserror = { version = "2.0", default-features = false }
3131
num-traits = { version = "0.2.12", default-features = false }
32-
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-traits", default-features = false }
32+
orml-traits = { workspace = true }
3333
paste = "1.0.0"
3434
pallet-timestamp = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
3535
rustc-hex = { version = "2.1.0", default-features = false }

‎node/Cargo.toml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "framenode"
3-
version = "4.6.0"
3+
version = "4.7.0"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
build = "build.rs"
66
edition = "2021"
@@ -95,6 +95,23 @@ predicates-tree = "=1.0.9"
9595
predicates-core = "=1.0.6"
9696
predicates = "=3.1.0"
9797
wasm-bindgen = "=0.2.92"
98+
base64ct = "=1.6.0"
99+
cxx = "=1.0.129"
100+
cxx-build = "=1.0.129"
101+
idna = "=0.2.3"
102+
rayon = "=1.10.0"
103+
rayon-core = "=1.12.1"
104+
url = "=2.5.2"
105+
static_init = "=1.0.3"
106+
netlink-proto = "=0.10.0"
107+
if-watch = "=3.2.0"
108+
backtrace = "=0.3.74"
109+
derive_more = "=0.99.18"
110+
scale-info = "=2.11.3"
111+
home = "=0.5.9"
112+
tokio = "=1.40.0"
113+
finality-grandpa = "=0.16.2"
114+
pest = "=2.7.14"
98115

99116
[build-dependencies]
100117
substrate-build-script-utils = "3"

‎node/chain_spec/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "framenode-chain-spec"
3-
version = "4.6.0"
3+
version = "4.7.0"
44
authors = ["Parity Technologies <admin@parity.io>"]
55
edition = "2021"
66

‎pallets/apollo-platform/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ assets = { path = "../assets" }
3838
common = { path = "../../common", features = ["test"] }
3939
ceres-liquidity-locker = { path = "../ceres-liquidity-locker", default-features = false }
4040
demeter-farming-platform = { path = "../demeter-farming-platform", default-features = false }
41-
currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-currencies", default-features = false }
41+
currencies = { workspace = true }
4242
dex-manager = { path = "../dex-manager", default-features = false }
4343
apollo-platform = { path = ".", default-features = false }
4444
pallet-balances = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
4545
sp-io = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
46-
tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-tokens", default-features = false }
47-
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-traits", default-features = false }
46+
tokens = { workspace = true }
47+
orml-traits = { workspace = true }
4848
permissions = { path = "../permissions" }
4949
pool-xyk = { path = "../pool-xyk", default-features = false }
5050
pswap-distribution = { path = "../pswap-distribution" }

‎pallets/assets/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals
1515
"derive",
1616
] }
1717
scale-info = { version = "2", default-features = false, features = ["derive"] }
18-
currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-currencies", default-features = false }
18+
currencies = { workspace = true }
1919
frame-benchmarking = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false, optional = true }
2020
frame-support = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
2121
frame-system = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
@@ -24,8 +24,8 @@ sp-core = { git = "https://github.com/sora-xor/substrate.git", branch = "polkado
2424
sp-runtime = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
2525
sp-std = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
2626
tiny-keccak = { version = "2.0.2", features = ["keccak"] }
27-
tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-tokens", default-features = false }
28-
traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-traits", default-features = false }
27+
tokens = { workspace = true }
28+
traits = { workspace = true }
2929
common = { path = "../../common", default-features = false }
3030

3131
[dev-dependencies]

‎pallets/bridge-proxy/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ common = { path = "../../common", default-features = false }
2222
bridge-types = { git = "https://github.com/sora-xor/sora2-common.git", default-features = false }
2323
technical = { path = "../technical", default-features = false }
2424
permissions = { path = "../permissions", default-features = false }
25-
traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-traits", default-features = false }
25+
traits = { workspace = true }
2626

2727
# delete after migration LiberlandGenericAccount pass
2828
xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0.9.38", default-features = false }
@@ -38,9 +38,9 @@ bridge-channel = { git = "https://github.com/sora-xor/sora2-common.git" }
3838
sp-keyring = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38" }
3939
pallet-balances = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38" }
4040

41-
tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-tokens" }
42-
traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-traits" }
43-
currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-currencies" }
41+
tokens = { workspace = true }
42+
traits = { workspace = true }
43+
currencies = { workspace = true }
4444

4545
[features]
4646
default = ["std"]

‎pallets/ceres-governance-platform/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ assets = { path = "../assets" }
3434
common = { path = "../../common", features = ["test"] }
3535
ceres-liquidity-locker = { path = "../ceres-liquidity-locker", default-features = false }
3636
demeter-farming-platform = { path = "../demeter-farming-platform", default-features = false }
37-
currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-currencies", default-features = false }
37+
currencies = { workspace = true }
3838
dex-manager = { path = "../dex-manager", default-features = false }
3939
ceres-governance-platform = { path = ".", default-features = false }
4040
pallet-balances = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
4141
sp-io = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38", default-features = false }
42-
tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-tokens", default-features = false }
43-
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-traits", default-features = false }
42+
tokens = { workspace = true }
43+
orml-traits = { workspace = true }
4444
permissions = { path = "../permissions" }
4545
pool-xyk = { path = "../pool-xyk", default-features = false }
4646
pswap-distribution = { path = "../pswap-distribution" }

‎pallets/ceres-launchpad/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ hex-literal = "0.4.1"
3838
[dev-dependencies]
3939
assets = { path = "../assets" }
4040
common = { path = "../../common", features = ["test"] }
41-
currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-currencies" }
41+
currencies = { workspace = true }
4242
demeter-farming-platform = { path = "../demeter-farming-platform" }
4343
sp-io = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38" }
44-
tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", package = "orml-tokens" }
44+
tokens = { workspace = true }
4545
pallet-balances = { git = "https://github.com/sora-xor/substrate.git", branch = "polkadot-v0.9.38" }
4646
permissions = { path = "../permissions" }
4747
technical = { path = "../technical" }

0 commit comments

Comments
 (0)