Skip to content

Commit 7d79dad

Browse files
gavofyorkgavofyork
authored
Bump versions, tweak deposit costs. (paritytech#1252)
* Bump versions, tweak deposit costs. * Version * Lock * Make test work ok when numbers are not round. * Bump Substrate * Lock
1 parent 9b63471 commit 7d79dad

File tree

27 files changed

+210
-194
lines changed

27 files changed

+210
-194
lines changed

‎Cargo.lock

Lines changed: 156 additions & 156 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ path = "src/main.rs"
44

55
[package]
66
name = "polkadot"
7-
version = "0.8.7"
7+
version = "0.8.8-dev"
88
authors = ["Parity Technologies <[email protected]>"]
99
edition = "2018"
1010

‎availability-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "polkadot-availability-store"
33
description = "Persistent database for parachain data"
4-
version = "0.8.7"
4+
version = "0.8.8-dev"
55
authors = ["Parity Technologies <[email protected]>"]
66
edition = "2018"
77

‎cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-cli"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot Relay-chain Client Node"
66
edition = "2018"

‎collator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-collator"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Collator node implementation"
66
edition = "2018"

‎erasure-coding/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-erasure-coding"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎network/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-network"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot-specific networking protocol"
66
edition = "2018"

‎network/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-network-test"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
license = "GPL-3.0"
55
authors = ["Parity Technologies <[email protected]>"]
66
edition = "2018"

‎parachain/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-parachain"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Types and utilities for creating and working with parachains"
66
edition = "2018"

‎parachain/test-parachains/adder/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "test-parachain-adder"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Test parachain which adds to a number as its state transition"
66
edition = "2018"

‎parachain/test-parachains/halt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "test-parachain-halt"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Test parachain which executes forever"
66
edition = "2018"

‎primitives/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-primitives"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎rpc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-rpc"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎runtime/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-runtime-common"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎runtime/kusama/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "kusama-runtime"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66
build = "build.rs"

‎runtime/kusama/src/constants.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ pub mod currency {
1919
use primitives::Balance;
2020

2121
pub const DOTS: Balance = 1_000_000_000_000;
22-
pub const DOLLARS: Balance = DOTS;
22+
pub const DOLLARS: Balance = DOTS / 6;
2323
pub const CENTS: Balance = DOLLARS / 100;
2424
pub const MILLICENTS: Balance = CENTS / 1_000;
2525

2626
pub const fn deposit(items: u32, bytes: u32) -> Balance {
27-
items as Balance * 15 * CENTS + (bytes as Balance) * 6 * CENTS
27+
items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS
2828
}
2929
}
3030

@@ -97,21 +97,25 @@ mod tests {
9797
use frame_support::weights::WeightToFeePolynomial;
9898
use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight};
9999
use super::fee::WeightToFee;
100-
use super::currency::{CENTS, DOLLARS};
100+
use super::currency::{CENTS, DOLLARS, MILLICENTS};
101101

102102
#[test]
103103
// This function tests that the fee for `MaximumBlockWeight` of weight is correct
104104
fn full_block_fee_is_correct() {
105105
// A full block should cost 16 DOLLARS
106106
println!("Base: {}", ExtrinsicBaseWeight::get());
107-
assert_eq!(WeightToFee::calc(&MaximumBlockWeight::get()), 16 * DOLLARS)
107+
let x = WeightToFee::calc(&MaximumBlockWeight::get());
108+
let y = 16 * DOLLARS;
109+
assert!(x.max(y) - x.min(y) < MILLICENTS);
108110
}
109111

110112
#[test]
111113
// This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
112114
fn extrinsic_base_fee_is_correct() {
113115
// `ExtrinsicBaseWeight` should cost 1/10 of a CENT
114116
println!("Base: {}", ExtrinsicBaseWeight::get());
115-
assert_eq!(WeightToFee::calc(&ExtrinsicBaseWeight::get()), CENTS / 10)
117+
let x = WeightToFee::calc(&ExtrinsicBaseWeight::get());
118+
let y = CENTS / 10;
119+
assert!(x.max(y) - x.min(y) < MILLICENTS);
116120
}
117121
}

‎runtime/kusama/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
8585
spec_name: create_runtime_str!("kusama"),
8686
impl_name: create_runtime_str!("parity-kusama"),
8787
authoring_version: 2,
88-
spec_version: 2007,
88+
spec_version: 2008,
8989
impl_version: 0,
9090
apis: RUNTIME_API_VERSIONS,
9191
transaction_version: 1,

‎runtime/polkadot/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-runtime"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66
build = "build.rs"

‎runtime/polkadot/src/constants.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub mod currency {
2424
pub const MILLICENTS: Balance = CENTS / 1_000; // 100_000
2525

2626
pub const fn deposit(items: u32, bytes: u32) -> Balance {
27-
items as Balance * 15 * CENTS + (bytes as Balance) * 6 * CENTS
27+
items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS
2828
}
2929
}
3030

@@ -86,22 +86,28 @@ pub mod fee {
8686

8787
#[cfg(test)]
8888
mod tests {
89+
use frame_support::weights::WeightToFeePolynomial;
8990
use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight};
9091
use super::fee::WeightToFee;
91-
use super::currency::{CENTS, DOLLARS};
92-
use frame_support::weights::WeightToFeePolynomial;
92+
use super::currency::{CENTS, DOLLARS, MILLICENTS};
9393

9494
#[test]
9595
// This function tests that the fee for `MaximumBlockWeight` of weight is correct
9696
fn full_block_fee_is_correct() {
9797
// A full block should cost 16 DOLLARS
98-
assert_eq!(WeightToFee::calc(&MaximumBlockWeight::get()), 16 * DOLLARS)
98+
println!("Base: {}", ExtrinsicBaseWeight::get());
99+
let x = WeightToFee::calc(&MaximumBlockWeight::get());
100+
let y = 16 * DOLLARS;
101+
assert!(x.max(y) - x.min(y) < MILLICENTS);
99102
}
100103

101104
#[test]
102105
// This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
103106
fn extrinsic_base_fee_is_correct() {
104107
// `ExtrinsicBaseWeight` should cost 1/10 of a CENT
105-
assert_eq!(WeightToFee::calc(&ExtrinsicBaseWeight::get()), CENTS / 10)
108+
println!("Base: {}", ExtrinsicBaseWeight::get());
109+
let x = WeightToFee::calc(&ExtrinsicBaseWeight::get());
110+
let y = CENTS / 10;
111+
assert!(x.max(y) - x.min(y) < MILLICENTS);
106112
}
107113
}

‎runtime/polkadot/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
9090
spec_name: create_runtime_str!("polkadot"),
9191
impl_name: create_runtime_str!("parity-polkadot"),
9292
authoring_version: 0,
93-
spec_version: 7,
93+
spec_version: 8,
9494
impl_version: 0,
9595
apis: RUNTIME_API_VERSIONS,
9696
transaction_version: 0,

‎runtime/test-runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-test-runtime"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66
build = "build.rs"

‎runtime/westend/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "westend-runtime"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66
build = "build.rs"

‎runtime/westend/src/constants.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub mod currency {
2424
pub const MILLICENTS: Balance = CENTS / 1_000;
2525

2626
pub const fn deposit(items: u32, bytes: u32) -> Balance {
27-
items as Balance * 15 * CENTS + (bytes as Balance) * 6 * CENTS
27+
items as Balance * 20 * DOLLARS + (bytes as Balance) * 100 * MILLICENTS
2828
}
2929
}
3030

@@ -86,22 +86,28 @@ pub mod fee {
8686

8787
#[cfg(test)]
8888
mod tests {
89+
use frame_support::weights::WeightToFeePolynomial;
8990
use runtime_common::{MaximumBlockWeight, ExtrinsicBaseWeight};
9091
use super::fee::WeightToFee;
91-
use super::currency::{CENTS, DOLLARS};
92-
use frame_support::weights::WeightToFeePolynomial;
92+
use super::currency::{CENTS, DOLLARS, MILLICENTS};
9393

9494
#[test]
9595
// This function tests that the fee for `MaximumBlockWeight` of weight is correct
9696
fn full_block_fee_is_correct() {
9797
// A full block should cost 16 DOLLARS
98-
assert_eq!(WeightToFee::calc(&MaximumBlockWeight::get()), 16 * DOLLARS)
98+
println!("Base: {}", ExtrinsicBaseWeight::get());
99+
let x = WeightToFee::calc(&MaximumBlockWeight::get());
100+
let y = 16 * DOLLARS;
101+
assert!(x.max(y) - x.min(y) < MILLICENTS);
99102
}
100103

101104
#[test]
102105
// This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
103106
fn extrinsic_base_fee_is_correct() {
104107
// `ExtrinsicBaseWeight` should cost 1/10 of a CENT
105-
assert_eq!(WeightToFee::calc(&ExtrinsicBaseWeight::get()), CENTS / 10)
108+
println!("Base: {}", ExtrinsicBaseWeight::get());
109+
let x = WeightToFee::calc(&ExtrinsicBaseWeight::get());
110+
let y = CENTS / 10;
111+
assert!(x.max(y) - x.min(y) < MILLICENTS);
106112
}
107113
}

‎runtime/westend/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
8282
spec_name: create_runtime_str!("westend"),
8383
impl_name: create_runtime_str!("parity-westend"),
8484
authoring_version: 2,
85-
spec_version: 27,
85+
spec_version: 28,
8686
impl_version: 0,
8787
apis: RUNTIME_API_VERSIONS,
8888
transaction_version: 1,

‎service/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-service"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎statement-table/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-statement-table"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎validation/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-validation"
3-
version = "0.8.7"
3+
version = "0.8.8-dev"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

0 commit comments

Comments
 (0)