Skip to content
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.

Sign up for GitHub

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

Jump to bottom

MESH-1280: Substrate 2.0.0-rc6 => 2.0.0 #658

Merged
merged 3 commits into from
Oct 8, 2020
Merged

MESH-1280: Substrate 2.0.0-rc6 => 2.0.0 #658

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47433d0
substrate -> 2.0.0: bump in cargo
Centril Oct 1, 2020
93a0ccb
substrate -> 2.0.0: compile & tests working
Centril Oct 2, 2020
7fd029a
Merge branch 'develop' into substrate-2
adamdossa Oct 8, 2020
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
1,636 changes: 793 additions & 843 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 36 additions & 37 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ im-online = { package = "pallet-im-online", path = "pallets/im-online" }
node-rpc = { path = "rpc" }
node-rpc-runtime-api = { path = "rpc/runtime-api" }
pallet-protocol-fee-rpc-runtime-api = { path = "pallets/protocol-fee/rpc/runtime-api" }
pallet-contracts-rpc-runtime-api = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-contracts-rpc-runtime-api = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-staking-rpc-runtime-api = { path = "pallets/staking/rpc/runtime-api" }
pallet-protocol-fee-rpc = { path = "pallets/protocol-fee/rpc" }
pallet-group-rpc = { path = "pallets/group/rpc" }
pallet-group-rpc-runtime-api = { path = "pallets/group/rpc/runtime-api" }
polymesh-node-rpc = { path = "node-rpc" }
frame-system-rpc-runtime-api = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
frame-system-rpc-runtime-api = { git = "https:/paritytech/substrate", tag = "v2.0.0" }

# Runtimes
polymesh-runtime-develop = { path = "pallets/runtime/develop" }
Expand All @@ -82,53 +82,52 @@ polymesh-runtime-testnet = { path = "pallets/runtime/testnet" }
ed25519-dalek = "1.0.0"
log = "0.4.8"
futures = "0.3.4"
jsonrpc-core = "14.2.0"
jsonrpc-pubsub = "14.2.0"
jsonrpc-core = "15.0.0"
serde_json = '1.0.48'
structopt = "0.3.15"
chrono = "0.4.11"

# Substrate
codec = { version = "1.2.0", package = "parity-scale-codec" }
sp-core = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-runtime = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-api = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-offchain = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-block-builder = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-blockchain = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-session = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-consensus = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
grandpa-primitives = { package = "sp-finality-grandpa", git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-inherents = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-transaction-pool = { package = "sp-transaction-pool", git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-consensus-babe = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-authority-discovery = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-core = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-runtime = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-api = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-offchain = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-block-builder = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-blockchain = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-session = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-consensus = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
grandpa-primitives = { package = "sp-finality-grandpa", git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-inherents = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-transaction-pool = { package = "sp-transaction-pool", git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-consensus-babe = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-authority-discovery = { git = "https:/paritytech/substrate", tag = "v2.0.0" }

contracts = { package = "pallet-contracts", git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
contracts = { package = "pallet-contracts", git = "https:/paritytech/substrate", tag = "v2.0.0" }

sc-service = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6", features = ["wasmtime"] }
sc-chain-spec = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-client-api = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-executor = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6", features = ["wasmtime"] }
sc-network = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-cli = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6", features = ["wasmtime"] }
sc-telemetry = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-consensus-babe = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-consensus = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-rpc = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-transaction-pool = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
grandpa = { package = "sc-finality-grandpa", git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-basic-authorship = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-authority-discovery = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-service = { git = "https:/paritytech/substrate", tag = "v2.0.0", features = ["wasmtime"] }
sc-chain-spec = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-client-api = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-executor = { git = "https:/paritytech/substrate", tag = "v2.0.0", features = ["wasmtime"] }
sc-network = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-cli = { git = "https:/paritytech/substrate", tag = "v2.0.0", features = ["wasmtime"] }
sc-telemetry = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-consensus-babe = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-consensus = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-rpc = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-transaction-pool = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
grandpa = { package = "sc-finality-grandpa", git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-basic-authorship = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-authority-discovery = { git = "https:/paritytech/substrate", tag = "v2.0.0" }

sc-light = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-client-db = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-light = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-client-db = { git = "https:/paritytech/substrate", tag = "v2.0.0" }

prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https:/paritytech/substrate", tag = "v2.0.0" }

# These dependencies are used for runtime benchmarking
frame-benchmarking = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
frame-benchmarking-cli = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
frame-benchmarking = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
frame-benchmarking-cli = { git = "https:/paritytech/substrate", tag = "v2.0.0" }

# Other
serde = { version = "1.0.104", default-features = false }
Expand Down
28 changes: 14 additions & 14 deletions bin/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Substrate runtime and primitives replaced with Polymesh's runtime and primitives
[package]
name = "node-bench"
version = "0.8.0-rc6"
version = "0.8.0"
authors = ["Parity Technologies <[email protected]>"]
description = "Substrate node integration benchmarks."
edition = "2018"
Expand All @@ -13,25 +13,25 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
node-primitives = { package = "polymesh-primitives", path = "../../primitives" }
node-runtime = { package = "polymesh-runtime-testnet", path = "../../pallets/runtime/testnet" }
node-testing = { path = "../testing" }
sc-cli = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6", features = ["wasmtime"] }
sc-client-api = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-runtime = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-state-machine = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-cli = { git = "https:/paritytech/substrate", tag = "v2.0.0", features = ["wasmtime"] }
sc-client-api = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-runtime = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-state-machine = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
log = "0.4.8"
serde = "1.0.101"
serde_json = "1.0.41"
structopt = "0.3"
derive_more = "0.99.2"
kvdb = "0.7"
kvdb-rocksdb = "0.9"
sp-trie = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-core = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-consensus = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-transaction-pool = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-basic-authorship = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-inherents = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-finality-tracker = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-timestamp = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-trie = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-core = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-consensus = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-transaction-pool = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sc-basic-authorship = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-inherents = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-finality-tracker = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-timestamp = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
hash-db = "0.15.2"
tempfile = "3.1.0"
fs_extra = "1"
Expand All @@ -40,5 +40,5 @@ rand = { version = "0.7.2", features = ["small_rng"] }
lazy_static = "1.4.0"
parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.1.2" }
sc-transaction-pool = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-transaction-pool = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
futures = { version = "0.3.4", features = ["thread-pool"] }
40 changes: 20 additions & 20 deletions bin/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "node-executor"
version = "2.0.0-rc6"
version = "2.0.0"
authors = ["Parity Technologies <[email protected]>"]
description = "Substrate node implementation in Rust."
edition = "2018"
Expand All @@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "1.3.4" }
node-primitives = { package = "polymesh-primitives", path = "../../primitives" }
node-runtime = { package = "polymesh-runtime-testnet", path = "../../pallets/runtime/testnet" }
sc-executor = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6", features = ["wasmtime"] }
sp-core = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-io = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-state-machine = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-trie = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sc-executor = { git = "https:/paritytech/substrate", tag = "v2.0.0", features = ["wasmtime"] }
sp-core = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-io = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-state-machine = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-trie = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
trie-root = "0.16.0"
frame-benchmarking = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
frame-benchmarking = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-confidential = { path = "../../pallets/confidential" }

[dev-dependencies]
Expand All @@ -30,19 +30,19 @@ pallet-transaction-payment = { path = "../../pallets/transaction-payment" }
pallet-balances = { path = "../../pallets/balances" }

criterion = "0.3.0"
frame-support = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
frame-system = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-contracts = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-grandpa = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-im-online = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-indices = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-session = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-timestamp = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
pallet-treasury = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-application-crypto = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-runtime = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
sp-externalities = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
substrate-test-client = { git = "https:/paritytech/substrate", tag = "v2.0.0-rc6" }
frame-support = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
frame-system = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-contracts = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-grandpa = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-im-online = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-indices = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-session = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-timestamp = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
pallet-treasury = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-application-crypto = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-runtime = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
sp-externalities = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
substrate-test-client = { git = "https:/paritytech/substrate", tag = "v2.0.0" }
wabt = "0.10.0"

[features]
Expand Down
Loading