Skip to content

Commit a339922

Browse files
talhadaartalhadaar
authored
Merge branch 'master' into polkadot-stable2503
2 parents d010dce + 9869331 commit a339922

File tree

47 files changed

+119
-80
lines changed

Some content is hidden

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

47 files changed

+119
-80
lines changed

‎.codespell/codespellrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[codespell]
2+
skip = .git,Cargo.lock
3+
count =
4+
quiet-level = 3
5+
ignore-words = ./.codespell/ignore.txt

‎.codespell/ignore.txt

Whitespace-only changes.

‎.codespell/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
codespell==2.4.1

‎.github/workflows/codespell.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# A Github action that using codespell to check spelling.
2+
# see .codespell/* for configs
3+
# https://github.com/codespell-project/codespell
4+
5+
name: codespell
6+
7+
on:
8+
# Triggers the workflow on push or pull request against main
9+
push:
10+
branches: [master]
11+
pull_request:
12+
branches: [master]
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
jobs:
17+
codespell:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout the repository
22+
uses: actions/checkout@v4
23+
24+
- name: Setup python
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: '3.x'
28+
29+
- name: Install codespell requirements
30+
run: pip install -r ./.codespell/requirements.txt
31+
32+
- name: Spell check
33+
run: codespell --config=./.codespell/codespellrc

‎.github/workflows/coverage.yml

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ jobs:
3737
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
3838
make Cargo.toml
3939
cargo update
40-
cargo update [email protected] --precise 3.6.12
41-
cargo update [email protected] --precise 3.6.12
4240
cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
4341
- name: Upload to codecov.io
4442
uses: codecov/codecov-action@v3

‎.github/workflows/test.yml

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
- name: Update
3737
run: |
3838
cargo update
39-
cargo update [email protected] --precise 3.6.12
40-
cargo update [email protected] --precise 3.6.12
4139
- name: Run clippy
4240
run: cargo clippy -- -D warnings
4341
- name: Check for Wasm

‎Cargo.dev.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ xcm = { version = "16.1.0", package = "staging-xcm", default-features = false }
6868
xcm-builder = { version = "20.0.0", package = "staging-xcm-builder", default-features = false }
6969
xcm-executor = { version = "19.1.0", package = "staging-xcm-executor", default-features = false }
7070

71-
xcm-simulator = { version = "20.0.0" }
71+
xcm-simulator = { version = "20.0.0" }

‎asset-registry/Cargo.toml

+2-2
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 = "1.2.1"
6+
version = "1.3.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 = "1.2.1", default-features = false }
30+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
3131

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

‎auction/Cargo.toml

+2-2
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 = "1.2.1"
6+
version = "1.3.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 = "1.2.1", default-features = false }
20+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
2121

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

‎authority/Cargo.toml

+1-1
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 = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

‎authority/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
### Overview
44

5-
Authority module to provide features for governance including dispatch method on behalf other accounts and schdule dispatchables.
5+
Authority module to provide features for governance including dispatch method on behalf other accounts and schedule dispatchables.
66

77
- `dispatch_as` can dispatch a dispatchable on behalf of other origin.
8-
- `schedule_dispatch` can schdule a dispatchable to be dispatched at later block.
8+
- `schedule_dispatch` can schedule a dispatchable to be dispatched at later block.
99
- `fast_track_scheduled_dispatch` can fast track a scheduled dispatchable.
1010
- `delay_scheduled_dispatch` can delay a scheduled dispatchable.
1111
- `cancel_scheduled_dispatch` can cancel a scheduled dispatchable.

‎benchmarking/Cargo.toml

+1-1
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 = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Laminar Developers <[email protected]>"]
88
edition = "2021"
99

‎benchmarking/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ macro_rules! impl_benchmark_test_suite {
11721172
$crate::BenchmarkError::Override(_) => {
11731173
// This is still considered a success condition.
11741174
$crate::log::error!(
1175-
"WARNING: benchmark error overrided - {}",
1175+
"WARNING: benchmark error overridden - {}",
11761176
$crate::str::from_utf8(benchmark_name)
11771177
.expect("benchmark name is always a valid string!"),
11781178
);
@@ -1300,7 +1300,7 @@ macro_rules! add_benchmark {
13001300
Err($crate::BenchmarkError::Override(mut result)) => {
13011301
// Insert override warning as the first storage key.
13021302
$crate::log::error!(
1303-
"WARNING: benchmark error overrided - {}",
1303+
"WARNING: benchmark error overridden - {}",
13041304
$crate::str::from_utf8(benchmark)
13051305
.expect("benchmark name is always a valid string!")
13061306
);

‎build-script-utils/Cargo.toml

+1-1
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 = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Parity Technologies <[email protected]>", "Laminar Developers <[email protected]>"]
88
edition = "2021"
99

‎currencies/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-currencies"
33
description = "Provide `MultiCurrency` implementation using `pallet-balances` and `orml-tokens` module."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/currencies"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Laminar Developers <[email protected]>"]
88
edition = "2021"
99

@@ -18,8 +18,8 @@ sp-io = { workspace = true }
1818
sp-runtime = { workspace = true }
1919
sp-std = { workspace = true }
2020

21-
orml-traits = { path = "../traits", version = "1.2.1", default-features = false }
22-
orml-utilities = { path = "../utilities", version = "1.2.1", default-features = false }
21+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
22+
orml-utilities = { path = "../utilities", version = "1.3.0", default-features = false }
2323

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

‎gradually-update/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-gradually-update"
33
description = "Provides way to adjust numeric parameter gradually over a period of time."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/gradually-update"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Laminar Developers <[email protected]>"]
88
edition = "2021"
99

‎nft/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-nft"
33
description = "Non-fungible token pallet provides basic functions to create and manager NFT"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/nft"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

‎oracle/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-oracle"
33
description = "Oracle module that makes off-chain data available on-chain."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/oracle"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Laminar Developers <[email protected]>"]
88
edition = "2021"
99

@@ -20,8 +20,8 @@ sp-runtime = { workspace = true }
2020
sp-std = { workspace = true }
2121
frame-benchmarking = { workspace = true, optional = true }
2222

23-
orml-traits = { path = "../traits", version = "1.2.1", default-features = false }
24-
orml-utilities = { path = "../utilities", version = "1.2.1", default-features = false }
23+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
24+
orml-utilities = { path = "../utilities", version = "1.3.0", default-features = false }
2525

2626
[dev-dependencies]
2727
sp-core = { workspace = true }

‎oracle/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
This module exposes capabilities for oracle operators to feed external offchain data.
66
The raw values can be combined to provide an aggregated value.
77

8-
The data is valid only if feeded by an authorized operator. This module implements `frame_support::traits::InitializeMembers` and `frame_support::traits::ChangeMembers`, to provide a way to manage operators membership. Typically it could be leveraged to `pallet_membership` in FRAME.
8+
The data is valid only if fed by an authorized operator. This module implements `frame_support::traits::InitializeMembers` and `frame_support::traits::ChangeMembers`, to provide a way to manage operators membership. Typically it could be leveraged to `pallet_membership` in FRAME.

‎oracle/runtime-api/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "orml-oracle-runtime-api"
3-
version = "1.2.1"
3+
version = "1.3.0"
44
authors = ["Laminar Developers <[email protected]>"]
55
edition = "2021"
66
license = "Apache-2.0"

‎oracle/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! offchain data. The raw values can be combined to provide an aggregated
1212
//! value.
1313
//!
14-
//! The data is valid only if feeded by an authorized operator.
14+
//! The data is valid only if fed by an authorized operator.
1515
//! `pallet_membership` in FRAME can be used to as source of `T::Members`.
1616
1717
#![cfg_attr(not(feature = "std"), no_std)]
@@ -130,7 +130,7 @@ pub mod module {
130130
pub enum Error<T, I = ()> {
131131
/// Sender does not have permission
132132
NoPermission,
133-
/// Feeder has already feeded at this block
133+
/// Feeder has already fed at this block
134134
AlreadyFeeded,
135135
}
136136

‎parameters/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-parameters"
33
description = "Offer a centra place to store and configure parameters."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/parameters"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

@@ -18,7 +18,7 @@ sp-runtime = { workspace = true }
1818
sp-core = { workspace = true }
1919
sp-std = { workspace = true }
2020

21-
orml-traits = { path = "../traits", version = "1.2.1", default-features = false }
21+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
2222

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

‎payments/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["Virto Network <[email protected]>"]
33
edition = '2021'
44
name = "orml-payments"
5-
version = "1.2.1"
5+
version = "1.3.0"
66
license = "Apache-2.0"
77
homepage = "https://github.com/virto-network/virto-node"
88
repository = "https://github.com/virto-network/virto-node"
@@ -20,7 +20,7 @@ frame-system = { workspace = true }
2020
sp-runtime = { workspace = true }
2121
sp-std = { workspace = true }
2222

23-
orml-traits = {path = "../traits", version = "1.2.1", default-features = false }
23+
orml-traits = {path = "../traits", version = "1.3.0", default-features = false }
2424

2525
[dev-dependencies]
2626
sp-core = { workspace = true }

‎payments/README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Payments Pallet
22

3+
⚠️ **Disclaimer**: This pallet is experimental and has not been audited. It is not suitable for production use.
4+
35
This pallet allows users to create secure reversible payments that keep funds locked in a merchant's account until the off-chain goods are confirmed to be received. Each payment gets assigned its own *judge* that can help resolve any disputes between the two parties.
46

57
## Terminology
@@ -27,7 +29,7 @@ This pallet allows users to create secure reversible payments that keep funds lo
2729

2830
- `pay` - Create an payment for the given currencyid/amount
2931
- `pay_with_remark` - Create a payment with a remark, can be used to tag payments
30-
- `release` - Release the payment amount to recipent
32+
- `release` - Release the payment amount to recipient
3133
- `cancel` - Allows the recipient to cancel the payment and release the payment amount to creator
3234
- `resolve_release_payment` - Allows assigned judge to release a payment
3335
- `resolve_cancel_payment` - Allows assigned judge to cancel a payment

‎payments/src/lib.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//! **Disclaimer**: This pallet is experimental and has not been audited. It is
2+
//! not suitable for production use.
3+
14
//!This pallet allows users to create secure reversible payments that keep
25
//! funds locked in a merchant's account until the off-chain goods are confirmed
36
//! to be received. Each payment gets assigned its own *judge* that can help
@@ -27,7 +30,7 @@
2730
//! - `pay` - Create an payment for the given currencyid/amount
2831
//! - `pay_with_remark` - Create a payment with a remark, can be used to tag
2932
//! payments
30-
//! - `release` - Release the payment amount to recipent
33+
//! - `release` - Release the payment amount to recipient
3134
//! - `cancel` - Allows the recipient to cancel the payment and release the
3235
//! payment amount to creator
3336
//! - `resolve_release_payment` - Allows assigned judge to release a payment
@@ -204,13 +207,13 @@ pub mod pallet {
204207
InvalidAction,
205208
/// Payment is in review state and cannot be modified
206209
PaymentNeedsReview,
207-
/// Unexpeted math error
210+
/// Unexpected math error
208211
MathError,
209212
/// Payment request has not been created
210213
RefundNotRequested,
211214
/// Dispute period has not passed
212215
DisputePeriodNotPassed,
213-
/// The automatic cancelation queue cannot accept
216+
/// The automatic cancellation queue cannot accept
214217
RefundQueueFull,
215218
}
216219

@@ -397,7 +400,7 @@ pub mod pallet {
397400
}
398401

399402
/// Allow the creator of a payment to initiate a refund that will return
400-
/// the funds after a configured amount of time that the reveiver has to
403+
/// the funds after a configured amount of time that the receiver has to
401404
/// react and oppose the request
402405
#[pallet::call_index(4)]
403406
#[pallet::weight(T::WeightInfo::request_refund())]

‎payments/src/tests.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn test_pay_works() {
7070
creator_initial_balance - payment_amount
7171
);
7272
assert_eq!(Tokens::free_balance(CURRENCY_ID, &PAYMENT_RECIPENT), 0);
73-
// the transferred amount should be reserved in the recipent account
73+
// the transferred amount should be reserved in the recipient account
7474
assert_eq!(Tokens::total_balance(CURRENCY_ID, &PAYMENT_RECIPENT), payment_amount);
7575

7676
// the payment should not be overwritten
@@ -133,7 +133,7 @@ fn test_cancel_works() {
133133
);
134134
assert_eq!(Tokens::free_balance(CURRENCY_ID, &PAYMENT_RECIPENT), 0);
135135

136-
// cancel should succeed when caller is the recipent
136+
// cancel should succeed when caller is the recipient
137137
assert_ok!(Payment::cancel(
138138
RuntimeOrigin::signed(PAYMENT_RECIPENT),
139139
PAYMENT_CREATOR
@@ -468,7 +468,7 @@ fn test_pay_with_remark_works() {
468468
creator_initial_balance - payment_amount
469469
);
470470
assert_eq!(Tokens::free_balance(CURRENCY_ID, &PAYMENT_RECIPENT), 0);
471-
// the transferred amount should be reserved in the recipent account
471+
// the transferred amount should be reserved in the recipient account
472472
assert_eq!(Tokens::total_balance(CURRENCY_ID, &PAYMENT_RECIPENT), payment_amount);
473473

474474
// the payment should not be overwritten
@@ -1019,7 +1019,7 @@ fn test_reserve_payment_amount_works() {
10191019
creator_initial_balance - payment_amount
10201020
);
10211021
assert_eq!(Tokens::free_balance(CURRENCY_ID, &PAYMENT_RECIPENT), 0);
1022-
// the transferred amount should be reserved in the recipent account
1022+
// the transferred amount should be reserved in the recipient account
10231023
assert_eq!(Tokens::total_balance(CURRENCY_ID, &PAYMENT_RECIPENT), payment_amount);
10241024

10251025
// the payment should not be overwritten

0 commit comments

Comments
 (0)