Skip to content

Commit

Permalink
Polkadot sdk migration! 🔥 (#318)
Browse files Browse the repository at this point in the history 
* Node compiling

* Compiling

* Fixing clippy (a clasic)
  • Loading branch information
@darkforest0202
darkforest0202 authored Oct 27, 2023
1 parent 661fb2b commit 752c4e9
Show file tree
Hide file tree
Showing 19 changed files with 4,339 additions and 4,075 deletions.
7,020 changes: 3,613 additions & 3,407 deletions Cargo.lock
View file

Large diffs are not rendered by default.

199 changes: 188 additions & 11 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,195 @@
[workspace]
members = ["node", "runtime/kreivo", "runtime/virto"]
exclude = ["xcm-emulator"]
resolver = "2"

[profile.release]
panic = 'unwind'
panic = "unwind"

[profile.production]
inherits = "release"
lto = true
codegen-units = 1

[workspace]
members = [
'node',
'runtime/virto',
'runtime/kreivo',
]

exclude = [
'virto-xcm-emulator'
]
[profile.test]
debug = 0

[workspace.package]
authors = ['Virto Team <[email protected]>']
license = "GPL-3.0-only"
homepage = 'https://github.com/virto-network/virto-node'
repository = 'https://github.com/virto-network/virto-node'
edition = "2021"


[workspace.dependencies]

# common
async-trait = "0.1"
clap = { version = "4.4.2" }
parity-scale-codec = { version = "3.6.4", default-features = false, features = [
"derive",
] }
futures = { version = "0.3.28" }
hex-literal = { version = "0.3.4" }
log = { version = "0.4.20" }
serde = { version = "1.0.188" }
serde_json = "1.0.104"
scale-info = { version = "2.9.0", default-features = false, features = [
"derive",
] }
smallvec = "1.11"

# Local dependencies
kreivo-runtime = { path = "runtime/kreivo" }
virto-runtime = { path = "runtime/virto" }
jsonrpsee = { version = "0.16.3" }


# Virto Pallets
pallet-asset-registry = { default-features = false, path = "pallets/asset-registry" }
pallet-burner = { default-features = false, path = "pallets/burner" }
pallet-lockdown-mode = { default-features = false, path = "pallets/lockdown-mode" }

# Virto common
virto-common = { default-features = false, path = "runtime/common" }

# Substrate std
try-runtime-cli = { version = "0.33.0" }
frame-benchmarking-cli = { version = "27.0.0" }
frame-rpc-system = { package = "substrate-frame-rpc-system", default-features = false, version = "23.0.0" }
pallet-transaction-payment-rpc = { version = "25.0.0" }
sc-basic-authorship = { version = "0.29.0" }
sc-chain-spec = { version = "22.0.0" }
sc-consensus = { version = "0.28.0" }
sc-cli = { version = "0.31.0" }
sc-client-api = { version = "23.0.0" }
sc-executor = { version = "0.27.0" }
sc-service = { version = "0.30.0" }
sc-telemetry = { version = "10.0.0" }
sc-transaction-pool = { version = "23.0.0" }
sc-network = { version = "0.29.0" }
sc-network-sync = { version = "0.28.0" }
sc-rpc = { version = "24.0.0" }
sc-tracing = { version = "23.0.0" }
sc-sysinfo = { version = "22.0.0" }
sp-blockchain = { version = "23.0.0" }
sp-consensus = { version = "0.27.0" }
sp-keyring = { version = "26.0.0" }
substrate-prometheus-endpoint = { version = "0.14.0" }
substrate-state-trie-migration-rpc = { version = "22.0.0" }

# Substrate non-std
frame-benchmarking = { default-features = false, version = "23.0.0" }
sp-io = { default-features = false, version = "25.0.0" }
sp-core = { default-features = false, version = "23.0.0" }
sp-session = { default-features = false, version = "22.0.0" }
sp-timestamp = { default-features = false, version = "21.0.0" }
sp-block-builder = { default-features = false, version = "21.0.0" }
sp-keystore = { default-features = false, version = "0.29.0" }
sp-offchain = { default-features = false, version = "21.0.0" }
sp-api = { default-features = false, version = "21.0.0" }
sp-consensus-aura = { default-features = false, version = "0.27.0" }
sp-transaction-pool = { default-features = false, version = "21.0.0" }
sc-transaction-pool-api = { default-features = false, version = "23.0.0" }


# Substrate Runtime
sp-runtime = { default-features = false, version = "26.0.0" }
sp-inherents = { default-features = false, version = "21.0.0" }
sp-arithmetic = { default-features = false, version = "18.0.0" }
sp-std = { default-features = false, version = "10.0.0" }
sp-version = { default-features = false, version = "24.0.0" }
sp-weights = { default-features = false, version = "22.0.0" }

# Build Dependencies
substrate-build-script-utils = { version = "7.0.0" }
substrate-wasm-builder = { version = "12.0.0" }

## Substrate FRAME Dependencies
frame-try-runtime = { default-features = false, version = "0.29.0" }
frame-executive = { default-features = false, version = "23.0.0" }
frame-support = { default-features = false, version = "23.0.0" }
frame-system = { default-features = false, version = "23.0.0" }
frame-system-benchmarking = { default-features = false, version = "23.0.0" }
frame-system-rpc-runtime-api = { default-features = false, version = "21.0.0" }

## Substrate Pallet Dependencies
pallet-assets = { default-features = false, version = "24.0.0" }
pallet-asset-tx-payment = { default-features = false, version = "23.0.0" }
pallet-aura = { default-features = false, version = "22.0.0" }
pallet-authorship = { default-features = false, version = "23.0.0" }
pallet-balances = { default-features = false, version = "23.0.0" }
pallet-collective = { default-features = false, version = "23.0.0" }
pallet-contracts = { default-features = false, version = "22.0.0" }
pallet-contracts-primitives = { default-features = false, version = "26.0.0" }
pallet-democracy = { default-features = false, version = "23.0.0" }
pallet-identity = { default-features = false, version = "23.0.0" }
pallet-multisig = { default-features = false, version = "23.0.0" }
pallet-proxy = { default-features = false, version = "23.0.0" }
pallet-preimage = { default-features = false, version = "23.0.0" }
pallet-insecure-randomness-collective-flip = { default-features = false, version = "11.0.0" }
pallet-session = { default-features = false, version = "23.0.0" }
pallet-scheduler = { default-features = false, version = "24.0.0" }
pallet-sudo = { default-features = false, version = "23.0.0" }
pallet-timestamp = { default-features = false, version = "22.0.0" }
pallet-transaction-payment = { default-features = false, version = "23.0.0" }
pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "23.0.0" }
pallet-uniques = { default-features = false, version = "23.0.0" }
pallet-utility = { default-features = false, version = "23.0.0" }
pallet-treasury = { default-features = false, version = "22.0.0" }

# Cumulus client dependencies
cumulus-client-cli = { version = "0.2.0" }
cumulus-client-collator = { version = "0.2.0" }
cumulus-client-consensus-aura = { version = "0.2.0" }
cumulus-client-consensus-relay-chain = { version = "0.2.0" }
cumulus-client-consensus-common = { version = "0.2.0" }
cumulus-client-consensus-proposer = { version = "0.2.0" }
cumulus-client-service = { version = "0.2.0" }
cumulus-client-network = { version = "0.2.0" }
cumulus-primitives-parachain-inherent = { version = "0.2.0" }
cumulus-relay-chain-interface = { version = "0.2.0" }

# Cumulus runtime dependencies
assets-common = { default-features = false, version = "0.2.0" }
cumulus-pallet-aura-ext = { default-features = false, version = "0.2.0" }
cumulus-pallet-dmp-queue = { default-features = false, version = "0.2.0" }
cumulus-pallet-parachain-system = { default-features = false, version = "0.2.0" }
cumulus-pallet-xcm = { default-features = false, version = "0.2.0" }
cumulus-pallet-xcmp-queue = { default-features = false, version = "0.2.0" }
cumulus-ping = { default-features = false, version = "0.2.0" }
cumulus-primitives-core = { default-features = false, version = "0.2.0" }
cumulus-primitives-timestamp = { default-features = false, version = "0.2.0" }
cumulus-primitives-utility = { default-features = false, version = "0.2.0" }
pallet-collator-selection = { default-features = false, version = "4.0.0" }
parachains-common = { default-features = false, version = "2.0.0" }
parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.2.0" }
cumulus-pallet-session-benchmarking = { default-features = false, version = "4.0.0" }

# Polkadot
polkadot-cli = { features = ["rococo-native"], version = "2.0.0" }
polkadot-primitives = { version = "2.0.0" }
polkadot-service = { version = "2.0.0" }
polkadot-runtime-parachains = { default-features = false, version = "2.0.0" }

# Polkadot Dependencies
kusama-runtime-constants = { default-features = false, version = "2.0.0" }
pallet-xcm = { default-features = false, version = "2.0.0" }
polkadot-core-primitives = { default-features = false, version = "2.0.0" }
polkadot-parachain-primitives = { default-features = false, version = "1.0.0" }
polkadot-runtime-common = { default-features = false, version = "2.0.0" }
xcm = { package = "staging-xcm", default-features = false, version = "2.0.0" }
xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "2.0.1" }
xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "2.0.0" }
xcm-primitives = { path = "primitives/xcm", default-features = false }
xcm-simulator = { default-features = false, version = "2.0.0" }
pallet-xcm-benchmarks = { default-features = false, version = "2.0.0" }

# Dev dependencies
assert_cmd = "2.0"
nix = "0.26"
tempfile = "3.7"
tokio = { version = "1.32.0", features = ["macros", "time", "parking_lot"] }
wait-timeout = "0.2"
pallet-remark = { default-features = false, version = "23.0.0" }
144 changes: 74 additions & 70 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,89 +12,93 @@ name = "virto-node"
path = "src/main.rs"

[dependencies]
async-trait = "0.1.68"
clap = { version = "4.2.7", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
futures = "0.3.28"
hex-literal = "0.4.1"
log = "0.4.17"
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96"
async-trait = { workspace = true }
clap = { workspace = true }
parity-scale-codec = { workspace = true }
futures = { workspace = true }
hex-literal = { workspace = true }
log = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }

# Local
virto-runtime = { path = "../runtime/virto", optional = true}
kreivo-runtime = { path = "../runtime/kreivo", optional = true}
jsonrpsee = { version = "0.16.2", features = ["server"] }
virto-runtime = { workspace = true, optional = true }
kreivo-runtime = { workspace = true, optional = true }
jsonrpsee = { workspace = true, features = ["server"] }

# Substrate
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v1.0.0" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
frame-benchmarking = { workspace = true, features = ["std"] }
frame-benchmarking-cli = { workspace = true }
sp-runtime = { workspace = true }
sp-io = { workspace = true, features = ["std"] }
sp-core = { workspace = true, features = ["std"] }
sp-consensus = { workspace = true }
sp-session = { workspace = true, features = ["std"] }
sc-consensus = { workspace = true }
sc-cli = { workspace = true }
sc-client-api = { workspace = true }
sc-executor = { workspace = true }
sc-service = { workspace = true }
sc-telemetry = { workspace = true }
sc-transaction-pool = { workspace = true }
sp-transaction-pool = { workspace = true, features = ["std"] }
sc-network = { workspace = true }
sc-network-sync = { workspace = true }
sc-basic-authorship = { workspace = true }
sp-timestamp = { workspace = true, features = ["std"] }
sp-inherents = { workspace = true }
sp-blockchain = { workspace = true }
sp-block-builder = { workspace = true, features = ["std"] }
sp-keyring = { workspace = true }
sp-keystore = { workspace = true, features = ["std"] }
sc-chain-spec = { workspace = true }
sc-rpc = { workspace = true }
sc-tracing = { workspace = true }
sp-offchain = { workspace = true, features = ["std"] }
sp-api = { workspace = true, features = ["std"] }
sp-consensus-aura = { workspace = true, features = ["std"] }
sc-sysinfo = { workspace = true }
substrate-prometheus-endpoint = { workspace = true }
try-runtime-cli = { workspace = true, optional = true }
sc-transaction-pool-api = { workspace = true }
frame-system = { workspace = true }
frame-rpc-system = { workspace = true }
pallet-asset-tx-payment = { workspace = true }
pallet-transaction-payment-rpc = { workspace = true }
substrate-state-trie-migration-rpc = { workspace = true }

# Polkadot
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-cli = { workspace = true }
polkadot-primitives = { workspace = true }
polkadot-service = { workspace = true }
xcm = { workspace = true, features = ["std"] }

# Cumulus
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" }
parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0", default-features = false }
cumulus-client-cli = { workspace = true }
cumulus-client-collator = { workspace = true }
cumulus-client-consensus-aura = { workspace = true }
cumulus-client-consensus-relay-chain = { workspace = true }
cumulus-client-consensus-common = { workspace = true }
cumulus-client-consensus-proposer = { workspace = true }
cumulus-client-service = { workspace = true }
cumulus-client-network = { workspace = true }
cumulus-primitives-core = { workspace = true, features = ["std"] }
cumulus-primitives-parachain-inherent = { workspace = true }
cumulus-relay-chain-interface = { workspace = true }

parachains-common = { workspace = true }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-build-script-utils = { workspace = true }

[dev-dependencies]
assert_cmd = "2.0"
nix = { version = "0.26.1", features = ["signal"] }
tempfile = "3.4.0"
tokio = { version = "1.26.0", features = ["macros", "time", "parking_lot"] }
wait-timeout = "0.2"
assert_cmd = { workspace = true }
nix = { workspace = true }
tempfile = "3.3.0"
tokio = { workspace = true }
wait-timeout = { workspace = true }
# purge_chain_works works with rococo-local and needs to allow this
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" }
polkadot-cli = { workspace = true }

[features]
default = ["virto-runtime", "kreivo-runtime"]
Expand Down
2 changes: 1 addition & 1 deletion node/src/benchmarking.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{sync::Arc, time::Duration};

use codec::Encode;
use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider;
use parity_scale_codec::Encode;
use sc_client_api::BlockBackend;
use sp_core::Pair;
use sp_inherents::{InherentData, InherentDataProvider};
Expand Down
Loading

0 comments on commit 752c4e9

Please sign in to comment.