Skip to content

Commit

Permalink
Dusty release 1.1.0 (#174)
Browse files Browse the repository at this point in the history 
* Bump version, fix chain specs

* Added legacy storage runtime interface

* Using default child for legacy calls

* Fix compilation & format

* Bump subkey version
  • Loading branch information
@akru
akru authored Jun 11, 2020
1 parent 2fdcf2d commit 38e222a
Show file tree
Hide file tree
Showing 25 changed files with 887 additions and 928 deletions.
1,189 changes: 524 additions & 665 deletions Cargo.lock
View file

Large diffs are not rendered by default.

69 changes: 33 additions & 36 deletions bin/node/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "plasm-cli"
version = "1.0.1"
authors = [
"Takumi Yamashita <[email protected]>",
"Aleksandr Krupenkin <[email protected]>",
]
version = "1.1.0"
authors = ["Stake Technologies <[email protected]>"]
description = "Plasm node implementation in Rust."
build = "build.rs"
edition = "2018"
Expand Down Expand Up @@ -34,52 +31,52 @@ log = "0.4.8"
hex = "0.4"

# primitives
sp-core = "2.0.0-rc2"
sp-runtime = "2.0.0-rc2"
sp-inherents = "2.0.0-rc2"
sp-consensus = "0.8.0-rc2"
sp-consensus-babe = "0.8.0-rc2"
sp-finality-grandpa = "2.0.0-rc2"
sp-transaction-pool = "2.0.0-rc2"
sp-core = "2.0.0-rc3"
sp-runtime = "2.0.0-rc3"
sp-inherents = "2.0.0-rc3"
sp-consensus = "0.8.0-rc3"
sp-consensus-babe = "0.8.0-rc3"
sp-finality-grandpa = "2.0.0-rc3"
sp-transaction-pool = "2.0.0-rc3"

# client dependencies
sc-client-api = "2.0.0-rc2"
sc-chain-spec = "2.0.0-rc2"
sc-consensus = "0.8.0-rc2"
sc-executor = "0.8.0-rc2"
sc-transaction-pool = "2.0.0-rc2"
sc-network = "0.8.0-rc2"
sc-finality-grandpa = "0.8.0-rc2"
sc-offchain = "2.0.0-rc2"
sc-client-db = { version = "0.8.0-rc2", default-features = false }
sc-rpc = "2.0.0-rc2"
sc-basic-authorship = "0.8.0-rc2"
sc-service = "0.8.0-rc2"
sc-telemetry = "2.0.0-rc2"
sc-consensus-babe = "0.8.0-rc2"
sc-client-api = "2.0.0-rc3"
sc-chain-spec = "2.0.0-rc3"
sc-consensus = "0.8.0-rc3"
sc-executor = "0.8.0-rc3"
sc-transaction-pool = "2.0.0-rc3"
sc-network = "0.8.0-rc3"
sc-finality-grandpa = "0.8.0-rc3"
sc-offchain = "2.0.0-rc3"
sc-client-db = { version = "0.8.0-rc3", default-features = false }
sc-rpc = "2.0.0-rc3"
sc-basic-authorship = "0.8.0-rc3"
sc-service = "0.8.0-rc3"
sc-telemetry = "2.0.0-rc3"
sc-consensus-babe = "0.8.0-rc3"

# plasm-specific dependencies
plasm-primitives = { path = "../primitives" }
plasm-runtime = { path = "../runtime" }
plasm-rpc = { path = "../rpc" }

# frame dependencies
frame-system = "2.0.0-rc2"
pallet-timestamp = "2.0.0-rc2"
pallet-contracts = { version = "2.0.0-rc2", default-features = false }
pallet-transaction-payment = "2.0.0-rc2"
pallet-finality-tracker = "2.0.0-rc2"
frame-system = "2.0.0-rc3"
pallet-timestamp = "2.0.0-rc3"
pallet-contracts = { version = "2.0.0-rc3", default-features = false }
pallet-transaction-payment = "2.0.0-rc3"
pallet-finality-tracker = "2.0.0-rc3"
pallet-dapps-staking = { path = "../../../frame/dapps-staking" }
pallet-plasm-lockdrop = { path = "../../../frame/plasm-lockdrop" }

# CLI-specific dependencies
sc-cli = { version = "0.8.0-rc2", optional = true }
frame-benchmarking-cli = { version = "2.0.0-rc2", optional = true }
sc-cli = { version = "0.8.0-rc3", optional = true }
frame-benchmarking-cli = { version = "2.0.0-rc3", optional = true }

[build-dependencies]
sc-cli = "0.8.0-rc2"
frame-benchmarking-cli = { version = "2.0.0-rc2", optional = true }
build-script-utils = { package = "substrate-build-script-utils", version = "2.0.0-rc2" }
sc-cli = "0.8.0-rc3"
frame-benchmarking-cli = { version = "2.0.0-rc3", optional = true }
build-script-utils = { package = "substrate-build-script-utils", version = "2.0.0-rc3" }
structopt = { version = "0.3.8", optional = true }
vergen = { version = "3.0.4", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion bin/node/cli/res/dusty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
"0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da95c3f3c48da9d0aa0a917b7eaabc2823b02d8afbd3a0cd892deebaac4db9aec1d99d6a909de745956da334e0837ac293a": "0x00000000011938f94591ebdb060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa19509a97ab0a8cbc48526261626580f0fb6d0c7e69642eff3e3299b04278300d7f3fe8a126a6a163183860bbd5a233": "0xde03a8a4f772c7d02f2491f95a8dd5cc2fc293fe07758164fcb7884e225fff14"
},
"children": {}
"childrenDefault": {}
}
}
}
2 changes: 1 addition & 1 deletion bin/node/cli/res/plasm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
"0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9b7f8ef5e760d142f647c34611e331cde738db85cb7207d722073ae3825881304cfb785599c65c56668e5a570990fbddc": "0x00000000008994b501bc922435bf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da90e1b0c5a1a693e4a209b24545e61d55783d390f8fedb2c04119013ec7553a63704e500890b17c49ef6fe76e21301822d": "0x0000000000584d54765078abb80100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
},
"children": {}
"childrenDefault": {}
}
}
}
2 changes: 1 addition & 1 deletion bin/node/cli/src/chain_spec.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Chain specification.
use plasm_primitives::{AccountId, Balance, Signature};
use plasm_runtime::constants::currency::*;
use plasm_runtime::Block;
use plasm_runtime::{
BabeConfig, BalancesConfig, ContractsConfig, GenesisConfig, GrandpaConfig, IndicesConfig,
Expand All @@ -21,6 +20,7 @@ type AccountPublic = <Signature as Verify>::Signer;
/*
use hex_literal::hex;
use sp_core::crypto::UncheckedInto;
use plasm_runtime::constants::currency::*;
const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
const PLASM_PROPERTIES: &str = r#"
Expand Down
25 changes: 15 additions & 10 deletions bin/node/cli/src/service.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ use sp_inherents::InherentDataProviders;
sc_executor::native_executor_instance!(
pub Executor,
plasm_runtime::api::dispatch,
plasm_runtime::native_version
plasm_runtime::native_version,
plasm_runtime::legacy::storage::HostFunctions,
);

/// Starts a `ServiceBuilder` for a full service.
Expand All @@ -40,12 +41,14 @@ macro_rules! new_full_start {
crate::service::Executor,
>($config)?
.with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
.with_transaction_pool(|builder| {
let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone());
let config = builder.config();

Ok(sc_transaction_pool::BasicPool::new(
config,
config.transaction_pool.clone(),
std::sync::Arc::new(pool_api),
prometheus_registry,
builder.prometheus_registry(),
))
})?
.with_import_queue(
Expand Down Expand Up @@ -278,14 +281,16 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE

let service = ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)?
.with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, fetcher, prometheus_registry| {
let fetcher = fetcher
.with_transaction_pool(|builder| {
let fetcher = builder
.fetcher()
.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone());
let pool_api =
sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher);
let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
config,
builder.config().transaction_pool.clone(),
Arc::new(pool_api),
prometheus_registry,
builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light,
);
Ok(pool)
Expand Down
15 changes: 6 additions & 9 deletions bin/node/primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
[package]
name = "plasm-primitives"
version = "1.0.1"
authors = [
"Takumi Yamashita <[email protected]>",
"Aleksandr Krupenkin <[email protected]>"
]
version = "1.1.0"
authors = ["Stake Technologies <[email protected]>"]
edition = "2018"

[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
sp-core = { version = "2.0.0-rc2", default-features = false }
sp-runtime = { version = "2.0.0-rc2", default-features = false }
sp-application-crypto = { version = "2.0.0-rc2", default-features = false }
frame-system = { version = "2.0.0-rc2", default-features = false }
sp-core = { version = "2.0.0-rc3", default-features = false }
sp-runtime = { version = "2.0.0-rc3", default-features = false }
sp-application-crypto = { version = "2.0.0-rc3", default-features = false }
frame-system = { version = "2.0.0-rc3", default-features = false }

[features]
default = ["std"]
Expand Down
41 changes: 19 additions & 22 deletions bin/node/rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
[package]
name = "plasm-rpc"
version = "1.0.1"
authors = [
"Takumi Yamashita <[email protected]>",
"Aleksandr Krupenkin <[email protected]>"
]
version = "1.1.0"
authors = ["Stake Technologies <[email protected]>"]
edition = "2018"

[dependencies]
plasm-runtime = { path = "../runtime" }
plasm-primitives = { path = "../primitives" }
jsonrpc-core = "14.0.3"
sp-api = "2.0.0-rc2"
sp-runtime = "2.0.0-rc2"
sp-blockchain = "2.0.0-rc2"
sp-consensus = "0.8.0-rc2"
sp-consensus-babe = "0.8.0-rc2"
sp-transaction-pool = "2.0.0-rc2"
sc-rpc-api = "0.8.0-rc2"
sc-keystore = "2.0.0-rc2"
sc-client-api = "2.0.0-rc2"
sc-consensus-babe = "0.8.0-rc2"
sc-consensus-babe-rpc = "0.8.0-rc2"
sc-consensus-epochs = "0.8.0-rc2"
sc-finality-grandpa = "0.8.0-rc2"
sc-finality-grandpa-rpc = "0.8.0-rc2"
pallet-contracts-rpc = "0.8.0-rc2"
pallet-transaction-payment-rpc = "2.0.0-rc2"
substrate-frame-rpc-system = "2.0.0-rc2"
sp-api = "2.0.0-rc3"
sp-runtime = "2.0.0-rc3"
sp-blockchain = "2.0.0-rc3"
sp-consensus = "0.8.0-rc3"
sp-consensus-babe = "0.8.0-rc3"
sp-transaction-pool = "2.0.0-rc3"
sc-rpc-api = "0.8.0-rc3"
sc-keystore = "2.0.0-rc3"
sc-client-api = "2.0.0-rc3"
sc-consensus-babe = "0.8.0-rc3"
sc-consensus-babe-rpc = "0.8.0-rc3"
sc-consensus-epochs = "0.8.0-rc3"
sc-finality-grandpa = "0.8.0-rc3"
sc-finality-grandpa-rpc = "0.8.0-rc3"
pallet-contracts-rpc = "0.8.0-rc3"
pallet-transaction-payment-rpc = "2.0.0-rc3"
substrate-frame-rpc-system = "2.0.0-rc3"
71 changes: 36 additions & 35 deletions bin/node/runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[package]
name = "plasm-runtime"
version = "1.0.1"
authors = [
"Takumi Yamashita <[email protected]>",
"Aleksandr Krupenkin <[email protected]>"
]
version = "1.1.0"
authors = ["Stake Technologies <[email protected]>"]
edition = "2018"
build = "build.rs"

Expand All @@ -17,45 +14,47 @@ hex-literal = { version = "0.2", optional = true }

# primitives
plasm-primitives = { path = "../primitives", default-features = false }
sp-core = { version = "2.0.0-rc2", default-features = false }
sp-runtime = { version = "2.0.0-rc2", default-features = false }
sp-consensus-babe = { version = "0.8.0-rc2", default-features = false }
sp-offchain = { version = "2.0.0-rc2", default-features = false }
sp-api = { version = "2.0.0-rc2", default-features = false }
sp-inherents = { version = "2.0.0-rc2", default-features = false }
sp-block-builder = { version = "2.0.0-rc2", default-features = false }
sp-transaction-pool = { version = "2.0.0-rc2", default-features = false }
sp-std = { version = "2.0.0-rc2", default-features = false }
sp-version = { version = "2.0.0-rc2", default-features = false }
sp-session = { version = "2.0.0-rc2", default-features = false }
sp-core = { version = "2.0.0-rc3", default-features = false }
sp-runtime = { version = "2.0.0-rc3", default-features = false }
sp-runtime-interface = { version = "2.0.0-rc3", default-features = false }
sp-consensus-babe = { version = "0.8.0-rc3", default-features = false }
sp-offchain = { version = "2.0.0-rc3", default-features = false }
sp-api = { version = "2.0.0-rc3", default-features = false }
sp-inherents = { version = "2.0.0-rc3", default-features = false }
sp-io = { version = "2.0.0-rc3", default-features = false }
sp-block-builder = { version = "2.0.0-rc3", default-features = false }
sp-transaction-pool = { version = "2.0.0-rc3", default-features = false }
sp-std = { version = "2.0.0-rc3", default-features = false }
sp-version = { version = "2.0.0-rc3", default-features = false }
sp-session = { version = "2.0.0-rc3", default-features = false }

# frame dependencies
pallet-contract-operator = { path = "../../../frame/operator", default-features = false }
pallet-operator-trading = { path = "../../../frame/trading", default-features = false }
pallet-dapps-staking = { path = "../../../frame/dapps-staking", default-features = false }
pallet-plasm-rewards = { path = "../../../frame/plasm-rewards", default-features = false }
pallet-plasm-validator = { path = "../../../frame/plasm-validator", default-features = false }
frame-executive = { version = "2.0.0-rc2", default-features = false }
pallet-babe = { version = "2.0.0-rc2", default-features = false }
pallet-balances = { version = "2.0.0-rc2", default-features = false }
pallet-contracts = { version = "2.0.0-rc2", default-features = false }
pallet-contracts-primitives = { version = "2.0.0-rc2", default-features = false }
pallet-contracts-rpc-runtime-api = { version = "0.8.0-rc2", default-features = false }
pallet-finality-tracker = { version = "2.0.0-rc2", default-features = false }
pallet-grandpa = { version = "2.0.0-rc2", default-features = false }
pallet-indices = { version = "2.0.0-rc2", default-features = false }
pallet-randomness-collective-flip = { version = "2.0.0-rc2", default-features = false }
pallet-session = { version = "2.0.0-rc2", default-features = false, features = ["historical"] }
pallet-sudo = { version = "2.0.0-rc2", default-features = false }
frame-support = { version = "2.0.0-rc2", default-features = false }
frame-system = { version = "2.0.0-rc2", default-features = false }
frame-system-rpc-runtime-api = { version = "2.0.0-rc2", default-features = false }
pallet-timestamp = { version = "2.0.0-rc2", default-features = false }
pallet-transaction-payment = { version = "2.0.0-rc2", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-rc2", default-features = false }
frame-executive = { version = "2.0.0-rc3", default-features = false }
pallet-babe = { version = "2.0.0-rc3", default-features = false }
pallet-balances = { version = "2.0.0-rc3", default-features = false }
pallet-contracts = { version = "2.0.0-rc3", default-features = false }
pallet-contracts-primitives = { version = "2.0.0-rc3", default-features = false }
pallet-contracts-rpc-runtime-api = { version = "0.8.0-rc3", default-features = false }
pallet-finality-tracker = { version = "2.0.0-rc3", default-features = false }
pallet-grandpa = { version = "2.0.0-rc3", default-features = false }
pallet-indices = { version = "2.0.0-rc3", default-features = false }
pallet-randomness-collective-flip = { version = "2.0.0-rc3", default-features = false }
pallet-session = { version = "2.0.0-rc3", default-features = false, features = ["historical"] }
pallet-sudo = { version = "2.0.0-rc3", default-features = false }
frame-support = { version = "2.0.0-rc3", default-features = false }
frame-system = { version = "2.0.0-rc3", default-features = false }
frame-system-rpc-runtime-api = { version = "2.0.0-rc3", default-features = false }
pallet-timestamp = { version = "2.0.0-rc3", default-features = false }
pallet-transaction-payment = { version = "2.0.0-rc3", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0-rc3", default-features = false }

[dev-dependencies]
sp-io = "2.0.0-rc2"
sp-io = "2.0.0-rc3"

[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.5" }
Expand All @@ -72,10 +71,12 @@ std = [
"sp-core/std",
"sp-consensus-babe/std",
"sp-runtime/std",
"sp-runtime-interface/std",
"sp-session/std",
"sp-version/std",
"sp-block-builder/std",
"sp-transaction-pool/std",
"sp-io/std",
"sp-inherents/std",
"plasm-primitives/std",
"frame-support/std",
Expand Down
Loading

0 comments on commit 38e222a

Please sign in to comment.