Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fix up session phase backport #452

Merged
gavofyork merged 7 commits into from
Jul 31, 2018
Merged

Fix up session phase backport #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92c14d8
Fix up session phase.
gavofyork Jul 29, 2018
1f92b47
Version bump.
gavofyork Jul 29, 2018
977b714
Version fix
gavofyork Jul 29, 2018
87c8798
Fix session rotation properly and add test
gavofyork Jul 30, 2018
37ce35d
Make contract a separate runtime module (#345)
pepyakin Jul 29, 2018
4ed83bb
Merge branch 'v0.2' into gav-fsee-v0.2
gavofyork Jul 31, 2018
daa1cc0
Docs
gavofyork Jul 31, 2018
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
11 changes: 10 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion demo/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
transaction_byte_fee: 1,
transfer_fee: 0,
creation_fee: 0,
contract_fee: 0,
reclaim_rebate: 0,
existential_deposit: 500,
balances: vec![(god_key.clone().into(), 1u64 << 63)].into_iter().collect(),
Expand Down
7 changes: 3 additions & 4 deletions demo/executor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ mod tests {
existential_deposit: 0,
transfer_fee: 0,
creation_fee: 0,
contract_fee: 0,
reclaim_rebate: 0,
early_era_slash: 0,
session_reward: 0,
Expand Down Expand Up @@ -248,7 +247,7 @@ mod tests {
construct_block(
1,
[69u8; 32].into(),
hex!("786071057714fdd6ea4595eecd4a0f327908d65f462ff5bca0f700fafce588c9").into(),
hex!("b97d52254fc967bb94bed485de6a738e9fad05decfda3453711677b8becf6d0a").into(),
vec![BareExtrinsic {
signed: alice(),
index: 0,
Expand All @@ -261,7 +260,7 @@ mod tests {
construct_block(
2,
block1().1,
hex!("a7f1259cc6b2fa758542f2996e737f8f0de9dec3a9d32641da348178f48b9fc2").into(),
hex!("a1f018d2faa339f72f5ee29050b4670d971e2e271cc06c41ee9cbe1f4c6feec9").into(),
vec![
BareExtrinsic {
signed: bob(),
Expand All @@ -281,7 +280,7 @@ mod tests {
construct_block(
1,
[69u8; 32].into(),
hex!("d95fc2cf4541b97ed2cd381fe7a486af8aebad9ed0480c30e9cca184bb207e95").into(),
hex!("41d07010f49aa29b2c9aca542cbaa6f59aafd3dda53cdf711c51ddb7d386912e").into(),
vec![BareExtrinsic {
signed: alice(),
index: 0,
Expand Down
2 changes: 1 addition & 1 deletion demo/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ pub type Session = session::Module<Concrete>;

impl staking::Trait for Concrete {
type Balance = Balance;
type DetermineContractAddress = BlakeTwo256;
type AccountIndex = AccountIndex;
type OnAccountKill = ();
}

/// Staking module for this concrete runtime.
Expand Down
23 changes: 0 additions & 23 deletions demo/runtime/wasm/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions polkadot/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: ver_str!("polkadot"),
impl_name: ver_str!("parity-polkadot"),
authoring_version: 1,
spec_version: 1,
spec_version: 2,
impl_version: 0,
};

Expand Down Expand Up @@ -168,8 +168,8 @@ pub type Session = session::Module<Concrete>;

impl staking::Trait for Concrete {
type Balance = Balance;
type DetermineContractAddress = BlakeTwo256;
type AccountIndex = AccountIndex;
type OnAccountKill = ();
}
/// Staking module for this concrete runtime.
pub type Staking = staking::Module<Concrete>;
Expand Down
23 changes: 0 additions & 23 deletions polkadot/runtime/wasm/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions polkadot/service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
existential_deposit: 500,
transfer_fee: 0,
creation_fee: 0,
contract_fee: 0,
reclaim_rebate: 0,
early_era_slash: 10000,
session_reward: 100,
Expand Down Expand Up @@ -133,7 +132,6 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
existential_deposit: 500,
transfer_fee: 0,
creation_fee: 0,
contract_fee: 0,
reclaim_rebate: 0,
balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(),
validator_count: 2,
Expand Down
Binary file modified substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm
View file
Open in desktop
Binary file not shown.
20 changes: 20 additions & 0 deletions substrate/runtime/contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ version = "0.1.0"
authors = ["Parity Technologies <[email protected]>"]

[dependencies]
serde = { version = "1.0", default_features = false }
serde_derive = { version = "1.0", optional = true }
substrate-codec = { path = "../../codec", default_features = false }
substrate-runtime-consensus = { path = "../../runtime/consensus", default_features = false }
substrate-runtime-primitives = { path = "../../runtime/primitives" }
substrate-runtime-io = { path = "../../runtime-io", default_features = false }
substrate-runtime-std = { path = "../../runtime-std", default_features = false }
substrate-runtime-sandbox = { path = "../../runtime-sandbox", default_features = false }
substrate-runtime-staking = { path = "../../runtime/staking", default_features = false }
substrate-runtime-support = { path = "../../runtime-support", default_features = false }
substrate-runtime-system = { path = "../../runtime/system", default_features = false }
substrate-runtime-session = { path = "../session", default_features = false }
substrate-runtime-timestamp = { path = "../timestamp", default_features = false }
parity-wasm = { version = "0.31", default_features = false }
pwasm-utils = { version = "0.3", default_features = false }

Expand All @@ -17,9 +27,19 @@ assert_matches = "1.1"
[features]
default = ["std"]
std = [
"serde_derive",
"serde/std",
"substrate-codec/std",
"substrate-runtime-primitives/std",
"substrate-runtime-consensus/std",
"substrate-runtime-io/std",
"substrate-runtime-std/std",
"substrate-runtime-sandbox/std",
"substrate-runtime-staking/std",
"substrate-runtime-support/std",
"substrate-runtime-system/std",
"substrate-runtime-timestamp/std",
"substrate-runtime-session/std",
"parity-wasm/std",
"pwasm-utils/std",
]
Loading