Skip to content

fixes #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 20, 2023
Merged

fixes #965

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions asset-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "orml-asset-registry"
description = "Registry for (foreign) assets"
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/asset-registry"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Interlay Ltd, etc"]
edition = "2021"

Expand All @@ -27,7 +27,7 @@ xcm-builder = { workspace = true }
xcm-executor = { workspace = true }

# orml
orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }

# for runtime-benchmarks
polkadot-runtime-common = { workspace = true, optional = true }
Expand Down
4 changes: 2 additions & 2 deletions auction/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "orml-auction"
description = "Auction module that implements `Auction` trait."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Acala Developers"]
edition = "2021"

Expand All @@ -17,7 +17,7 @@ frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }

[dev-dependencies]
sp-core = { workspace = true, features = ["std"] }
Expand Down
4 changes: 2 additions & 2 deletions authority/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-authority"
description = "Utility pallet to perform ROOT calls in a PoA network"
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Acala Developers"]
edition = "2021"

[dependencies]
parity-scale-codec = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { version = "1.0.145", optional = true }

frame-support = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions benchmarking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name = "orml-benchmarking"
description = "Provide macro to benchmark Substrate runtime."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/benchmarking"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
parity-scale-codec = { workspace = true }
log = { workspace = true }
paste = "1.0.7"
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-benchmarking = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion build-script-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "orml-build-script-utils"
description = "Crate with utility functions for `build.rs` scripts."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/build-script-utils"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Parity Technologies <[email protected]>", "Laminar Developers <[email protected]>"]
edition = "2021"

Expand Down
10 changes: 5 additions & 5 deletions currencies/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-currencies"
description = "Provide `MultiCurrency` implementation using `pallet-balances` and `orml-tokens` module."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/currencies"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
parity-scale-codec = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand All @@ -18,14 +18,14 @@ sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-utilities = { path = "../utilities", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }
orml-utilities = { path = "../utilities", version = "0.6.1", default-features = false }

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

orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.5.0-dev" }
orml_tokens = { package = "orml-tokens", path = "../tokens" }

[features]
default = [ "std" ]
Expand Down
4 changes: 2 additions & 2 deletions gradually-update/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-gradually-update"
description = "Provides way to adjust numeric parameter gradually over a period of time."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/gradually-update"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions nft/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-nft"
description = "Non-fungible token pallet provides basic functions to create and manager NFT"
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/nft"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Acala Developers"]
edition = "2021"

[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions oracle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-oracle"
description = "Oracle module that makes off-chain data available on-chain."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/oracle"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
parity-scale-codec = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand All @@ -19,8 +19,8 @@ sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-utilities = { path = "../utilities", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }
orml-utilities = { path = "../utilities", version = "0.6.1", default-features = false }

[dev-dependencies]
sp-core = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion oracle/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "orml-oracle-runtime-api"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
description = "Runtime API module for orml-oracle."
repository = "https://github.com/open-web3-stack/open-runtime-module-library"

[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions parameters/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "orml-parameters"
description = "Offer a centra place to store and configure parameters."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/parameters"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Acala Developers"]
edition = "2021"

Expand All @@ -18,7 +18,7 @@ sp-runtime = { workspace = true }
sp-core = { workspace = true }
sp-std = { workspace = true }

orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }

[dev-dependencies]
sp-core = { workspace = true, features = ["std"] }
Expand Down
8 changes: 4 additions & 4 deletions payments/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Virto Network <[email protected]>"]
edition = '2021'
name = "orml-payments"
version = "0.5.0-dev"
version = "0.6.1"
license = "Apache-2.0"
homepage = "https://github.com/virto-network/virto-node"
repository = "https://github.com/virto-network/virto-node"
Expand All @@ -12,22 +12,22 @@ readme = "README.md"
[dependencies]
parity-scale-codec = { workspace = true }
log = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }

frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

orml-traits = {path = "../traits", version = "0.5.0-dev", default-features = false }
orml-traits = {path = "../traits", version = "0.6.1", default-features = false }

[dev-dependencies]
serde = "1.0.136"

sp-core = { workspace = true }
sp-io = { workspace = true }

orml-tokens = { path = "../tokens", version = "0.5.0-dev" }
orml-tokens = { path = "../tokens", default-features = false }

[features]
default = [ 'std' ]
Expand Down
6 changes: 3 additions & 3 deletions rewards/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-rewards"
description = "Store and manage shares and rewards"
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/rewards"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Acala Developers"]
edition = "2021"

[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand All @@ -19,7 +19,7 @@ sp-io = { workspace = true }
sp-runtime = { workspace = true, features = ["serde"] }
sp-std = { workspace = true }

orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }

[dev-dependencies]
sp-core = { workspace = true, features = ["std"] }
Expand Down
6 changes: 3 additions & 3 deletions tokens/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name = "orml-tokens"
description = "Fungible tokens module that implements `MultiCurrency` trait."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/tokens"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
log = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand All @@ -19,7 +19,7 @@ sp-arithmetic = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
orml-traits = { path = "../traits", version = "0.6.1", default-features = false }

[dev-dependencies]
pallet-elections-phragmen = { workspace = true, features = ["std"] }
Expand Down
3 changes: 2 additions & 1 deletion tokens/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name = "orml-tokens-runtime-api"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"
license = "Apache-2.0"
description = "Runtime API module for orml-tokens."
repository = "https://github.com/open-web3-stack/open-runtime-module-library"

[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
Expand Down
6 changes: 3 additions & 3 deletions traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name = "orml-traits"
description = "Shared traits including `BasicCurrency`, `MultiCurrency`, `Auction` and more."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/traits"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }
parity-scale-codec = { workspace = true }
num-traits = { version = "0.2.14", default-features = false }
Expand All @@ -23,7 +23,7 @@ frame-support = { workspace = true }

xcm = { workspace = true }

orml-utilities = { path = "../utilities", version = "0.5.0-dev", default-features = false }
orml-utilities = { path = "../utilities", version = "0.6.1", default-features = false }

[features]
default = [ "std" ]
Expand Down
10 changes: 2 additions & 8 deletions traits/src/currency.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::{arithmetic, Happened};
use frame_support::traits::tokens::Balance;
pub use frame_support::{
traits::{BalanceStatus, DefensiveSaturating, LockIdentifier},
transactional,
Expand Down Expand Up @@ -27,14 +28,7 @@ pub trait MultiCurrency<AccountId> {
+ MaxEncodedLen;

/// The balance of an account.
type Balance: AtLeast32BitUnsigned
+ FullCodec
+ Copy
+ MaybeSerializeDeserialize
+ Debug
+ Default
+ scale_info::TypeInfo
+ MaxEncodedLen;
type Balance: Balance;

// Public immutables

Expand Down
6 changes: 3 additions & 3 deletions unknown-tokens/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "orml-unknown-tokens"
description = "Unknown tokens module that implements `UnknownAsset` trait."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/unknown-tokens"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Acala Developers"]
edition = "2021"

[dependencies]
parity-scale-codec = { workspace = true }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { workspace = true, optional = true }

frame-support = { workspace = true }
Expand All @@ -18,7 +18,7 @@ sp-std = { workspace = true }

xcm = { workspace = true }

orml-xcm-support = { path = "../xcm-support", default-features = false }
orml-xcm-support = { path = "../xcm-support", version = "0.6.1", default-features = false }

[dev-dependencies]
sp-core = { workspace = true, features = ["std"] }
Expand Down
4 changes: 2 additions & 2 deletions utilities/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name = "orml-utilities"
description = "Various utilities including `FixedU128` and `LinkedList`."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/utilities"
license = "Apache-2.0"
version = "0.5.0-dev"
version = "0.6.1"
authors = ["Laminar Developers <[email protected]>"]
edition = "2021"

[dependencies]
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
scale-info = { workspace = true }
serde = { version = "1.0.136", optional = true, features = ["derive"] }
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }

Expand Down
Loading