From 1e2f59a0f179677eca12f4019162e9352e855cb7 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 13:19:04 +0200 Subject: [PATCH 01/19] node compiling --- Cargo.toml | 69 +++++++++++++++++++++++++++++++++++++++++++++++ node/Cargo.toml | 72 ++++++++++++++++++++++++------------------------- 2 files changed, 105 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d2f8fb93..b2652425 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,3 +17,72 @@ panic = "unwind" inherits = "release" lto = true codegen-units = 1 + +[workspace.dependencies] + +# common +async-trait = "0.1.57" +clap = { version = "4.0.32" } +codec = { package = "parity-scale-codec", version = "3.0.0" } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } +futures = "0.3.25" +hex-literal = "0.3.4" +log = "0.4.17" +serde = { version = "1.0.152" } + +# Local dependencies +trappist-runtime = { path = "runtime/trappist"} +stout-runtime = { path = "runtime/stout" } +jsonrpsee = { version = "0.16.2" } + + +# Substrate std +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} + +# Substrate +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } + +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } + +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } + + +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } + + +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } + +# Substrate Runtime +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } + +# Build Dependencies +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } \ No newline at end of file diff --git a/node/Cargo.toml b/node/Cargo.toml index 79bc3041..9cbe2428 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -34,42 +34,42 @@ jsonrpsee = { version = "0.16.2", features = ["server"] } pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } # Substrate -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-benchmarking = { workspace = true, features = [ "std" ] } +frame-benchmarking-cli = { workspace = true } sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.37" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +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-common = { workspace = true } +sc-basic-authorship = { workspace = true } +sp-timestamp = { workspace = true, features = [ "std" ] } +sp-blockchain = { workspace = true } +sp-block-builder = { workspace = true, features = [ "std" ] } +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 } +sp-serializer = { workspace = true } +substrate-prometheus-endpoint = { workspace = true } +try-runtime-cli = { workspace = true, optional = true } +sc-transaction-pool-api = { workspace = true } +frame-rpc-system = { 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-v0.9.37" } @@ -91,7 +91,7 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-build-script-utils = { workspace = true } [dev-dependencies] assert_cmd = "2.0" From f422dd54296a8a8476dd3fe985a6d542f11ac7dc Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 13:20:40 +0200 Subject: [PATCH 02/19] node compiling --- Cargo.toml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2652425..b60e7e81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,29 +58,24 @@ sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkad sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} -# Substrate +# Substrate non-std frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } - sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } - sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } - - -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } - # Substrate Runtime sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } From a2f9171cec0c275edbef945a1b176599495d28a5 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 14:29:13 +0200 Subject: [PATCH 03/19] WIP and compiling --- Cargo.toml | 37 +++++++++++++++- runtime/trappist/Cargo.toml | 84 ++++++++++++++++++------------------- 2 files changed, 77 insertions(+), 44 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b60e7e81..b14f2d85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,6 +78,41 @@ sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", bra # Substrate Runtime sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } # Build Dependencies -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } \ No newline at end of file +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } + +## Substrate FRAME Dependencies +frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } + +## Substrate Pallet Dependencies +pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index e2184a07..de5a45ee 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -23,53 +23,51 @@ smallvec = "1.9.0" # Substrate Dependencies ## Substrate Primitive Dependencies -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-api = { workspace = true } +sp-block-builder = { workspace = true } +sp-consensus-aura = { workspace = true } +sp-core = { workspace = true } +sp-inherents = { workspace = true } +sp-io = { workspace = true } +sp-offchain = { workspace = true } +sp-runtime = { workspace = true } +sp-session = { workspace = true } +sp-std = { workspace = true } +sp-transaction-pool = { workspace = true } +sp-version = { workspace = true } ## Substrate FRAME Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } - - +frame-benchmarking = { workspace = true, optional = true} +frame-try-runtime = { workspace = true, optional = true} +frame-executive = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } +frame-system-benchmarking = { workspace = true, optional = true } +frame-system-rpc-runtime-api = { workspace = true } ## Substrate Pallet Dependencies -pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-assets = { workspace = true } +pallet-asset-tx-payment = { workspace = true } +pallet-aura = { workspace = true } +pallet-authorship = { workspace = true } +pallet-balances = { workspace = true } +pallet-collective = { workspace = true } +pallet-contracts = { workspace = true } +pallet-contracts-primitives = { workspace = true } +pallet-democracy = { workspace = true } +pallet-identity = { workspace = true } +pallet-multisig = { workspace = true } +pallet-preimage = { workspace = true } +pallet-randomness-collective-flip = { workspace = true } +pallet-session = { workspace = true } +pallet-scheduler = { workspace = true } +pallet-sudo = { workspace = true } +pallet-timestamp = { workspace = true } +pallet-transaction-payment = { workspace = true } +pallet-transaction-payment-rpc-runtime-api = { workspace = true } +pallet-uniques = { workspace = true } +pallet-utility = { workspace = true } +pallet-treasury = { workspace = true } # Cumulus dependencies cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } From acf09a5f2309075687487b4f9d11e5c54b99657d Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 14:39:35 +0200 Subject: [PATCH 04/19] WIP, runtime trappist progress --- Cargo.toml | 26 +++++++++++++++++++++++++- node/Cargo.toml | 20 ++++++++++---------- runtime/trappist/Cargo.toml | 26 +++++++++++++------------- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b14f2d85..de757770 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,6 @@ trappist-runtime = { path = "runtime/trappist"} stout-runtime = { path = "runtime/stout" } jsonrpsee = { version = "0.16.2" } - # Substrate std try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} @@ -116,3 +115,28 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } pallet-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } + +# Cumulus client dependencies +cumulus-client-cli ={ git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } + +# Cumulus runtime dependencies +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-ping = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false, version = "3.0.0" } diff --git a/node/Cargo.toml b/node/Cargo.toml index 9cbe2428..2895ff7f 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -78,17 +78,17 @@ polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "r xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } # Cumulus -cumulus-client-cli ={ git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-cli ={ workspace = true } +cumulus-client-consensus-aura = { workspace = true } +cumulus-client-consensus-relay-chain = { workspace = true } +cumulus-client-consensus-common = { 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 = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachains-common = { workspace = true } [build-dependencies] substrate-build-script-utils = { workspace = true } diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index de5a45ee..a92b0414 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -70,19 +70,19 @@ pallet-utility = { workspace = true } pallet-treasury = { workspace = true } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-ping = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false, version = "3.0.0" } +cumulus-pallet-aura-ext = { workspace = true } +cumulus-pallet-dmp-queue = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-xcm = { workspace = true } +cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-ping = { workspace = true } +cumulus-primitives-core = { workspace = true } +cumulus-primitives-timestamp = { workspace = true } +cumulus-primitives-utility = { workspace = true } +pallet-collator-selection = { workspace = true } +parachains-common = { workspace = true } +parachain-info = { workspace = true } +cumulus-pallet-session-benchmarking = { workspace = true } # Polkadot Dependencies kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } From 81d7099c2257779c36d6abf4288f7f8dd0c3ea2e Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 14:48:05 +0200 Subject: [PATCH 05/19] WIP Polkadot en node y trappist --- Cargo.toml | 6 ++++++ node/Cargo.toml | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index de757770..1370e2f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,3 +140,9 @@ pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", bra parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false, version = "3.0.0" } + +# Polkadot +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } diff --git a/node/Cargo.toml b/node/Cargo.toml index 2895ff7f..501e203d 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -36,7 +36,7 @@ pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/subst # Substrate frame-benchmarking = { workspace = true, features = [ "std" ] } frame-benchmarking-cli = { workspace = true } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-runtime = { workspace = true } sp-io = { workspace = true, features = [ "std" ] } sp-core = { workspace = true, features = [ "std" ] } sp-consensus = { workspace = true } @@ -72,10 +72,10 @@ pallet-transaction-payment-rpc = { workspace = true } substrate-state-trie-migration-rpc = { workspace = true } # Polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-cli = { workspace = true } +polkadot-primitives = { workspace = true } +polkadot-service = { workspace = true } +xcm = { workspace = true } # Cumulus cumulus-client-cli ={ workspace = true } From 6c7141fdac232887d113f7f42b47979395a5614b Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 15:20:06 +0200 Subject: [PATCH 06/19] WIP --- Cargo.toml | 13 ++++++++++++- node/Cargo.toml | 8 ++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1370e2f4..03241b4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,9 @@ trappist-runtime = { path = "runtime/trappist"} stout-runtime = { path = "runtime/stout" } jsonrpsee = { version = "0.16.2" } +# External Dependencies +pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } + # Substrate std try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} @@ -142,7 +145,15 @@ parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polk cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false, version = "3.0.0" } # Polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", features = ["rococo-native"], branch = "release-v0.9.37" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } + + +# Dev dependencies +assert_cmd = "2.0" +nix = "0.25" +tempfile = "3.3.0" +tokio = { version = "1.24.1", features = ["macros", "time", "parking_lot"] } +wait-timeout = "0.2" diff --git a/node/Cargo.toml b/node/Cargo.toml index 501e203d..6b877635 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -26,12 +26,12 @@ log = "0.4.17" serde = { version = "1.0.152", features = ["derive"] } # Local Dependencies -trappist-runtime = { path = "../runtime/trappist"} -stout-runtime = { path = "../runtime/stout" } -jsonrpsee = { version = "0.16.2", features = ["server"] } +trappist-runtime = { workspace = true } +stout-runtime = { workspace = true } +jsonrpsee = { workspace = true, features = ["server"] } # External Dependencies -pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-dex-rpc = { workspace = true } # Substrate frame-benchmarking = { workspace = true, features = [ "std" ] } From b6ff438cec291692a9240e2dc9858a414f60bfd9 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 15:35:22 +0200 Subject: [PATCH 07/19] WIP --- Cargo.toml | 9 +++++---- node/Cargo.toml | 22 +++++++++++----------- runtime/trappist/Cargo.toml | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 03241b4d..5a24a70e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,11 +24,12 @@ codegen-units = 1 async-trait = "0.1.57" clap = { version = "4.0.32" } codec = { package = "parity-scale-codec", version = "3.0.0" } -parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } -futures = "0.3.25" -hex-literal = "0.3.4" -log = "0.4.17" +futures = { version = "0.3.25"} +hex-literal = { version = "0.3.4"} +log = { version = "0.4.17"} serde = { version = "1.0.152" } +scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } +smallvec = "1.9.0" # Local dependencies trappist-runtime = { path = "runtime/trappist"} diff --git a/node/Cargo.toml b/node/Cargo.toml index 6b877635..a5175c81 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -17,13 +17,13 @@ name = "trappist-node" path = "src/main.rs" [dependencies] -async-trait = "0.1.57" -clap = { version = "4.0.32", features = ["derive"] } +async-trait = { workspace = true } +clap = { workspace = true } codec = { package = "parity-scale-codec", version = "3.0.0" } -futures = "0.3.25" -hex-literal = "0.3.4" -log = "0.4.17" -serde = { version = "1.0.152", features = ["derive"] } +futures = { workspace = true } +hex-literal = { workspace = true } +log = { workspace = true } +serde = { workspace = true } # Local Dependencies trappist-runtime = { workspace = true } @@ -94,13 +94,13 @@ parachains-common = { workspace = true } substrate-build-script-utils = { workspace = true } [dev-dependencies] -assert_cmd = "2.0" -nix = "0.25" +assert_cmd = { workspace = true } +nix = { workspace = true } tempfile = "3.3.0" -tokio = { version = "1.24.1", features = ["macros", "time", "parking_lot"] } -wait-timeout = "0.2" +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", features = ["rococo-native"] , branch = "release-v0.9.37" } +polkadot-cli = { workspace = true } [features] default = [] diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index a92b0414..9860a410 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -18,7 +18,7 @@ hex-literal = { version = "0.3.4", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } -serde = { version = "1.0.140", optional = true, features = ["derive"] } +serde = { workspace = true, optional = true } smallvec = "1.9.0" # Substrate Dependencies From 4772d02e5d3c9de6838edacb1902aa951c2e998c Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 15:37:48 +0200 Subject: [PATCH 08/19] node ready --- node/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/Cargo.toml b/node/Cargo.toml index a5175c81..b826a1fc 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -19,7 +19,7 @@ path = "src/main.rs" [dependencies] async-trait = { workspace = true } clap = { workspace = true } -codec = { package = "parity-scale-codec", version = "3.0.0" } +codec = { workspace = true } futures = { workspace = true } hex-literal = { workspace = true } log = { workspace = true } From 014ee6a8c47a3405f8be0794b434287b6ea11871 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 15:41:02 +0200 Subject: [PATCH 09/19] wip on runtime --- runtime/trappist/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index 9860a410..3e5a47a4 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [dependencies] -hex-literal = { version = "0.3.4", optional = true } +hex-literal = { workspace = true, optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.17", default-features = false } -scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } +log = { workspace = true, default-features = false } +scale-info = { workspace = true } serde = { workspace = true, optional = true } -smallvec = "1.9.0" +smallvec = { workspace = true } # Substrate Dependencies ## Substrate Primitive Dependencies From 5fc301aea56987713a63eceaf8971bc13b8e5137 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 15:45:41 +0200 Subject: [PATCH 10/19] Making codec to work --- Cargo.toml | 1 + runtime/trappist/Cargo.toml | 4 ++-- runtime/trappist/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5a24a70e..9bc1fbaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,7 @@ codegen-units = 1 async-trait = "0.1.57" clap = { version = "4.0.32" } codec = { package = "parity-scale-codec", version = "3.0.0" } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } futures = { version = "0.3.25"} hex-literal = { version = "0.3.4"} log = { version = "0.4.17"} diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index 3e5a47a4..131bed38 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -15,7 +15,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [dependencies] hex-literal = { workspace = true, optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +parity-scale-codec = { workspace = true } log = { workspace = true, default-features = false } scale-info = { workspace = true } serde = { workspace = true, optional = true } @@ -109,7 +109,7 @@ pallet-lockdown-mode = { version = "0.1.0", default-features = false, path = ".. [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "serde", "scale-info/std", "log/std", diff --git a/runtime/trappist/src/lib.rs b/runtime/trappist/src/lib.rs index 0abdbf2f..c41e8c6f 100644 --- a/runtime/trappist/src/lib.rs +++ b/runtime/trappist/src/lib.rs @@ -363,7 +363,7 @@ impl pallet_assets::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Balance = AssetBalance; type AssetId = AssetId; - type AssetIdParameter = codec::Compact; + type AssetIdParameter = parity_scale_codec::Compact; type Currency = Balances; type CreateOrigin = AsEnsureOriginWithArg>; type ForceOrigin = AssetsForceOrigin; From 6369b397beab0192c2b427a75c6e156e292276c5 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 15:53:23 +0200 Subject: [PATCH 11/19] parity-scale-encode working --- Cargo.toml | 1 - node/Cargo.toml | 2 +- node/src/command.rs | 2 +- node/src/service.rs | 2 +- runtime/trappist/Cargo.toml | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9bc1fbaf..e4b4d090 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,6 @@ codegen-units = 1 # common async-trait = "0.1.57" clap = { version = "4.0.32" } -codec = { package = "parity-scale-codec", version = "3.0.0" } parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } futures = { version = "0.3.25"} hex-literal = { version = "0.3.4"} diff --git a/node/Cargo.toml b/node/Cargo.toml index b826a1fc..570f6320 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -19,7 +19,7 @@ path = "src/main.rs" [dependencies] async-trait = { workspace = true } clap = { workspace = true } -codec = { workspace = true } +parity-scale-codec = { workspace = true } futures = { workspace = true } hex-literal = { workspace = true } log = { workspace = true } diff --git a/node/src/command.rs b/node/src/command.rs index 88a75176..e5d6f6c5 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -19,12 +19,12 @@ use crate::{ cli::{Cli, RelayChainCli, Subcommand}, service::{new_partial, Block, StoutRuntimeExecutor, TrappistRuntimeExecutor}, }; -use codec::Encode; use cumulus_client_cli::generate_genesis_block; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::{info, warn}; use parachains_common::AuraId; +use parity_scale_codec::Encode; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, diff --git a/node/src/service.rs b/node/src/service.rs index adf737c2..dabe31bd 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -14,7 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Cumulus. If not, see . -use codec::Codec; use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::{ @@ -30,6 +29,7 @@ use cumulus_primitives_core::{ ParaId, }; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface}; +use parity_scale_codec::Codec; use sp_core::Pair; use jsonrpsee::RpcModule; diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index 131bed38..7ddf9f82 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -15,7 +15,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [dependencies] hex-literal = { workspace = true, optional = true } -parity-scale-codec = { workspace = true } +parity-scale-codec = { workspace = true, features = [ "derive" ] } log = { workspace = true, default-features = false } scale-info = { workspace = true } serde = { workspace = true, optional = true } From 4a7bbb8710a924029287e881a888aa831f0ce1c3 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 16:03:29 +0200 Subject: [PATCH 12/19] wip trappist runtime --- Cargo.toml | 13 ++++++++++++- node/Cargo.toml | 2 +- runtime/trappist/Cargo.toml | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e4b4d090..18c831f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,7 +149,18 @@ cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cum polkadot-cli = { git = "https://github.com/paritytech/polkadot", features = ["rococo-native"], branch = "release-v0.9.37" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } + +# Polkadot Dependencies +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm-primitives = { path = "primitives/xcm", default-features = false } +pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } # Dev dependencies diff --git a/node/Cargo.toml b/node/Cargo.toml index 570f6320..4ebee51e 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -75,7 +75,7 @@ substrate-state-trie-migration-rpc = { workspace = true } polkadot-cli = { workspace = true } polkadot-primitives = { workspace = true } polkadot-service = { workspace = true } -xcm = { workspace = true } +xcm = { workspace = true, features = [ "std" ] } # Cumulus cumulus-client-cli ={ workspace = true } diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index 7ddf9f82..b830d4a7 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -85,16 +85,16 @@ parachain-info = { workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } # Polkadot Dependencies -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-primitives = { path = "../../primitives/xcm", default-features = false } -pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, optional = true , branch = "release-v0.9.37" } +kusama-runtime-constants = { workspace = true } +pallet-xcm = { workspace = true } +polkadot-core-primitives = { workspace = true } +polkadot-parachain = { workspace = true } +polkadot-runtime-common = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } +xcm-primitives = { workspace = true } +pallet-xcm-benchmarks = { workspace = true, optional = true } # External Pallets pallet-dex = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } From a8687f60b62bf13d2be7071dba2e7202b9d8ff9e Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 16:11:40 +0200 Subject: [PATCH 13/19] wip on trappist runtime --- Cargo.toml | 12 ++++++++++++ runtime/trappist/Cargo.toml | 14 +++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 18c831f4..0c80b663 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,6 +38,16 @@ jsonrpsee = { version = "0.16.2" } # External Dependencies pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-dex = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-dex-rpc-runtime-api = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-chess = { git = "https://github.com/SubstrateChess/pallet-chess.git", default-features = false, branch = "polkadot-v0.9.37" } + +# Trappist Pallets +pallet-asset-registry = { default-features = false, path = "pallets/asset-registry" } +trappist-runtime-benchmarks = { default-features = false, path = "pallets/benchmarks" } +pallet-lockdown-mode = { version = "0.1.0", default-features = false, path = "pallets/lockdown-mode" } + + # Substrate std try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } @@ -162,6 +172,8 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature xcm-primitives = { path = "primitives/xcm", default-features = false } pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +# Build dependencies +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } # Dev dependencies assert_cmd = "2.0" diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index b830d4a7..278c1af8 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-wasm-builder = { workspace = true } [dependencies] hex-literal = { workspace = true, optional = true } @@ -97,14 +97,14 @@ xcm-primitives = { workspace = true } pallet-xcm-benchmarks = { workspace = true, optional = true } # External Pallets -pallet-dex = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } -pallet-dex-rpc-runtime-api = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } -pallet-chess = { git = "https://github.com/SubstrateChess/pallet-chess.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-dex = { workspace = true } +pallet-dex-rpc-runtime-api = { workspace = true } +pallet-chess = { workspace = true } # Trappist Pallets -pallet-asset-registry = { default-features = false, path = "../../pallets/asset-registry" } -trappist-runtime-benchmarks = { default-features = false, path = "../../pallets/benchmarks" } -pallet-lockdown-mode = { version = "0.1.0", default-features = false, path = "../../pallets/lockdown-mode" } +pallet-asset-registry = {workspace = true } +trappist-runtime-benchmarks = { workspace = true } +pallet-lockdown-mode = { workspace = true } [features] default = ["std"] From ed310110f28c8cefaa8e09fd86378e9f0b31ce66 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 16:29:48 +0200 Subject: [PATCH 14/19] WIP --- Cargo.toml | 8 ++++++++ node/Cargo.toml | 10 +++++----- runtime/trappist/Cargo.toml | 10 +++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0c80b663..a2a73b65 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,14 @@ inherits = "release" lto = true codegen-units = 1 +[workspace.package] +authors = ["Trappist Network "] +homepage = "https://trappist.io" +repository = "https://github.com/TrappistNetwork/trappist" +edition = "2021" +license = "Apache License v2" + + [workspace.dependencies] # common diff --git a/node/Cargo.toml b/node/Cargo.toml index 4ebee51e..a4d7b44d 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "trappist" version = "1.0.0" -authors = ["Trappist Network "] description = "A versatile Proof-of-Authority (PoA) Blockchain network." -license = "Unlicense" -homepage = "https://trappist.io" -repository = "https://github.com/TrappistNetwork/trappist" -edition = "2021" +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +edition = { workspace = true } default-run = "trappist-node" [package.metadata.docs.rs] diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml index 278c1af8..d833adce 100644 --- a/runtime/trappist/Cargo.toml +++ b/runtime/trappist/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "trappist-runtime" version = "1.0.0" -authors = ["Trappist Network "] -license = "Unlicense" -homepage = "https://trappist.io" -repository = "https://github.com/TrappistNetwork/trappist" -edition = "2021" +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +edition = { workspace = true } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] From d4c9e5d6a7f118433032d13e7b2045021c01afbd Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 16:43:47 +0200 Subject: [PATCH 15/19] Stout 90% --- Cargo.lock | 1 + Cargo.toml | 6 +- runtime/stout/Cargo.toml | 127 ++++++++++++++++++++------------------- 3 files changed, 66 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be8ca92f..a5c6703e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11428,6 +11428,7 @@ dependencies = [ "pallet-uniques", "pallet-utility", "pallet-xcm", + "pallet-xcm-benchmarks", "parachain-info", "parachains-common", "parity-scale-codec", diff --git a/Cargo.toml b/Cargo.toml index a2a73b65..8dabc25f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,8 +55,6 @@ pallet-asset-registry = { default-features = false, path = "pallets/asset-regist trappist-runtime-benchmarks = { default-features = false, path = "pallets/benchmarks" } pallet-lockdown-mode = { version = "0.1.0", default-features = false, path = "pallets/lockdown-mode" } - - # Substrate std try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37"} @@ -105,6 +103,7 @@ sp-version = { git = "https://github.com/paritytech/substrate", default-features # Build Dependencies substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } ## Substrate FRAME Dependencies frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } @@ -180,9 +179,6 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature xcm-primitives = { path = "primitives/xcm", default-features = false } pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -# Build dependencies -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } - # Dev dependencies assert_cmd = "2.0" nix = "0.25" diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml index 6f90a479..a4fd831b 100644 --- a/runtime/stout/Cargo.toml +++ b/runtime/stout/Cargo.toml @@ -23,79 +23,80 @@ smallvec = "1.9.0" # Substrate Dependencies ## Substrate Primitive Dependencies -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-api = { workspace = true } +sp-block-builder = { workspace = true } +sp-consensus-aura = { workspace = true } +sp-core = { workspace = true } +sp-inherents = { workspace = true } +sp-io = { workspace = true } +sp-offchain = { workspace = true } +sp-runtime = { workspace = true } +sp-session = { workspace = true } +sp-std = { workspace = true } +sp-transaction-pool = { workspace = true } +sp-version = { workspace = true } ## Substrate FRAME Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-benchmarking = { workspace = true, optional = true} +frame-try-runtime = { workspace = true, optional = true} +frame-executive = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } +frame-system-benchmarking = { workspace = true, optional = true } +frame-system-rpc-runtime-api = { workspace = true } ## Substrate Pallet Dependencies -pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-identity = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-assets = { workspace = true } +pallet-asset-tx-payment = { workspace = true } +pallet-aura = { workspace = true } +pallet-authorship = { workspace = true } +pallet-balances = { workspace = true } +pallet-collective = { workspace = true } +pallet-contracts = { workspace = true } +pallet-contracts-primitives = { workspace = true } +pallet-identity = { workspace = true } +pallet-multisig = { workspace = true } +pallet-preimage = { workspace = true } +pallet-randomness-collective-flip = { workspace = true } +pallet-session = { workspace = true } +pallet-scheduler = { workspace = true } +pallet-sudo = { workspace = true } +pallet-timestamp = { workspace = true } +pallet-transaction-payment = { workspace = true } +pallet-transaction-payment-rpc-runtime-api = { workspace = true } +pallet-uniques = { workspace = true } +pallet-utility = { workspace = true } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-ping = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false, version = "3.0.0"} +cumulus-pallet-aura-ext = { workspace = true } +cumulus-pallet-dmp-queue = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-xcm = { workspace = true } +cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-ping = { workspace = true } +cumulus-primitives-core = { workspace = true } +cumulus-primitives-timestamp = { workspace = true } +cumulus-primitives-utility = { workspace = true } +pallet-collator-selection = { workspace = true } +parachains-common = { workspace = true } +parachain-info = { workspace = true } +cumulus-pallet-session-benchmarking = { workspace = true } # Polkadot Dependencies -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-primitives = { path = "../../primitives/xcm", default-features = false } +kusama-runtime-constants = { workspace = true } +pallet-xcm = { workspace = true } +polkadot-core-primitives = { workspace = true } +polkadot-parachain = { workspace = true } +polkadot-runtime-common = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } +xcm-primitives = { workspace = true } +pallet-xcm-benchmarks = { workspace = true, optional = true } # External Pallets -pallet-dex = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } -pallet-dex-rpc-runtime-api = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-dex = { workspace = true } +pallet-dex-rpc-runtime-api = { workspace = true } [features] default = ["std"] From 697f3818f3bd0d6f77c3837bee114ae68f0b5973 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 16:48:28 +0200 Subject: [PATCH 16/19] stout completed --- runtime/stout/Cargo.toml | 14 +++++++------- runtime/stout/src/lib.rs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml index a4fd831b..c38121a4 100644 --- a/runtime/stout/Cargo.toml +++ b/runtime/stout/Cargo.toml @@ -14,12 +14,12 @@ targets = ["x86_64-unknown-linux-gnu"] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [dependencies] -hex-literal = { version = "0.3.4", optional = true } -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"]} -log = { version = "0.4.17", default-features = false } -scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } -serde = { version = "1.0.152", optional = true, features = ["derive"] } -smallvec = "1.9.0" +hex-literal = { workspace = true, optional = true } +parity-scale-codec = { workspace = true, features = [ "derive" ] } +log = { workspace = true, default-features = false } +scale-info = { workspace = true } +serde = { workspace = true, optional = true } +smallvec = { workspace = true } # Substrate Dependencies ## Substrate Primitive Dependencies @@ -101,7 +101,7 @@ pallet-dex-rpc-runtime-api = { workspace = true } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "serde", "scale-info/std", "log/std", diff --git a/runtime/stout/src/lib.rs b/runtime/stout/src/lib.rs index 3e225e5e..5cf15755 100644 --- a/runtime/stout/src/lib.rs +++ b/runtime/stout/src/lib.rs @@ -354,7 +354,7 @@ impl pallet_assets::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Balance = AssetBalance; type AssetId = AssetId; - type AssetIdParameter = codec::Compact; + type AssetIdParameter = parity_scale_codec::Compact; type Currency = Balances; type CreateOrigin = AsEnsureOriginWithArg>; type ForceOrigin = AssetsForceOrigin; From ff26e2a261f8b6a18a03f55611a1bfb9700fb057 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 17:04:13 +0200 Subject: [PATCH 17/19] asset registry --- Cargo.toml | 2 + pallets/asset-registry/Cargo.toml | 64 +++++++------- rpc/Cargo.toml | 32 ------- rpc/src/lib.rs | 133 ------------------------------ runtime/stout/Cargo.toml | 10 +-- 5 files changed, 40 insertions(+), 201 deletions(-) delete mode 100644 rpc/Cargo.toml delete mode 100644 rpc/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 8dabc25f..95a5912f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -166,6 +166,7 @@ cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cum polkadot-cli = { git = "https://github.com/paritytech/polkadot", features = ["rococo-native"], branch = "release-v0.9.37" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } # Polkadot Dependencies kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } @@ -177,6 +178,7 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } xcm-primitives = { path = "primitives/xcm", default-features = false } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } # Dev dependencies diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index ad9321b9..f2d8a1c3 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -2,53 +2,55 @@ name = "pallet-asset-registry" version = "0.0.1" description = "Trappist pallet for XCM Asset Registry." -edition = "2021" -license = "Apache-2.0" -repository = "https://github.com/paritytech/trappist" +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +edition = { workspace = true } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive",] } -scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -pallet-assets = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } +parity-scale-codec = { workspace = true, features = [ "derive" ] } +scale-info = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } +frame-benchmarking = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } +pallet-assets = { workspace = true } +pallet-balances = { workspace = true } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm = { workspace = true } -xcm-primitives = { path = "../../primitives/xcm", default-features = false } +xcm-primitives = { workspace = true } [dev-dependencies] -sp-core = { version = "7.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -sp-io = { version = "7.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } +sp-core = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm = { workspace = true } +xcm-simulator = { workspace = true } +xcm-executor = { workspace = true } +xcm-builder = { workspace = true } +pallet-xcm = { workspace = true } +polkadot-core-primitives = { workspace = true } +polkadot-runtime-parachains = { workspace = true } +polkadot-parachain = { workspace = true } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachain-info = { workspace = true } +parachains-common = { workspace = true } +cumulus-pallet-dmp-queue = { workspace = true } +cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-core = { workspace = true } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "sp-runtime/std", "sp-std/std", "pallet-assets/std", diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml deleted file mode 100644 index 42a7e82c..00000000 --- a/rpc/Cargo.toml +++ /dev/null @@ -1,32 +0,0 @@ -[package] -name = "trappist-rpc" -version = "1.0.0" -authors = ["Trappist Network "] -description = "A versatile Proof-of-Authority (PoA) Blockchain network." -license = "Unlicense" -homepage = "https://trappist.io" -repository = "https://github.com/TrappistNetwork/trappist" -edition = "2021" - -[dependencies] -futures = "0.3.21" -jsonrpsee = { version = "0.16.2", features = ["server"] } -codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } - -parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } - -# External Dependencies -pallet-dex-rpc = { version = "0.0.1", git = "https://github.com/paritytech/substrate-dex.git", default-features = false, branch = "polkadot-v0.9.37" } - -trappist-runtime = { path = "../runtime/trappist" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs deleted file mode 100644 index 0e48877a..00000000 --- a/rpc/src/lib.rs +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. -// This file is part of Cumulus. - -// Cumulus is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Cumulus is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Cumulus. If not, see . - -//! Parachain-specific RPCs implementation. - -#![warn(missing_docs)] - -use std::sync::Arc; - -use parachains_common::{AccountId, Balance, Block, Index as Nonce}; -use sc_client_api::AuxStore; -pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; -use sc_transaction_pool_api::TransactionPool; -use sp_api::ProvideRuntimeApi; -use sp_block_builder::BlockBuilder; -use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; - -/// A type representing all RPC extensions. -pub type RpcExtension = jsonrpsee::RpcModule<()>; - -/// Full client dependencies -pub struct FullDeps { - /// The client instance to use. - pub client: Arc, - /// Transaction pool instance. - pub pool: Arc

, - /// Whether to deny unsafe calls - pub deny_unsafe: DenyUnsafe, -} - -/// Instantiate all RPCs we want at the canvas-kusama chain. -pub fn trappist_create_full( - deps: FullDeps, -) -> Result> -where - C: ProvideRuntimeApi - + sc_client_api::BlockBackend - + HeaderBackend - + AuxStore - + HeaderMetadata - + Send - + Sync - + 'static, - C::Api: substrate_frame_rpc_system::AccountNonceApi, - C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, - C::Api: pallet_dex_rpc::DexRuntimeApi< - trappist_runtime::opaque::Block, - trappist_runtime::AssetId, - trappist_runtime::Balance, - trappist_runtime::AssetBalance, - >, - C::Api: BlockBuilder, - P: TransactionPool + Sync + Send + 'static, -{ - use pallet_dex_rpc::{Dex, DexApiServer}; - use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; - use sc_rpc::dev::{Dev, DevApiServer}; - use substrate_frame_rpc_system::{System, SystemApiServer}; - - let mut module = RpcExtension::new(()); - let FullDeps { client, pool, deny_unsafe } = deps; - - module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; - module.merge(TransactionPayment::new(client.clone()).into_rpc())?; - module.merge(Dev::new(client.clone(), deny_unsafe).into_rpc())?; - module.merge(Dex::new(client).into_rpc())?; - - // Extend this RPC with a custom API by using the following syntax. - // `YourRpcStruct` should have a reference to a client, which is needed - // to call into the runtime. - // `module.merge(YourRpcTrait::into_rpc(YourRpcStruct::new(ReferenceToClient, ...)))?;` - - Ok(module) -} - -/// This function will be removed during the node refactor. -/// Instantiate all RPCs we want at the canvas-kusama chain. -pub fn stout_create_full( - deps: FullDeps, -) -> Result> -where - C: ProvideRuntimeApi - + sc_client_api::BlockBackend - + HeaderBackend - + AuxStore - + HeaderMetadata - + Send - + Sync - + 'static, - C::Api: substrate_frame_rpc_system::AccountNonceApi, - C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, - C::Api: pallet_dex_rpc::DexRuntimeApi< - trappist_runtime::opaque::Block, - trappist_runtime::AssetId, - trappist_runtime::Balance, - trappist_runtime::AssetBalance, - >, - C::Api: BlockBuilder, - P: TransactionPool + Sync + Send + 'static, -{ - use pallet_dex_rpc::{Dex, DexApiServer}; - use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; - use sc_rpc::dev::{Dev, DevApiServer}; - use substrate_frame_rpc_system::{System, SystemApiServer}; - - let mut module = RpcExtension::new(()); - let FullDeps { client, pool, deny_unsafe } = deps; - - module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; - module.merge(TransactionPayment::new(client.clone()).into_rpc())?; - module.merge(Dev::new(client.clone(), deny_unsafe).into_rpc())?; - module.merge(Dex::new(client).into_rpc())?; - - // Extend this RPC with a custom API by using the following syntax. - // `YourRpcStruct` should have a reference to a client, which is needed - // to call into the runtime. - // `module.merge(YourRpcTrait::into_rpc(YourRpcStruct::new(ReferenceToClient, ...)))?;` - - Ok(module) -} diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml index c38121a4..78175272 100644 --- a/runtime/stout/Cargo.toml +++ b/runtime/stout/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "stout-runtime" version = "1.0.0" -authors = ["Trappist Network "] -license = "Unlicense" -homepage = "https://trappist.io" -repository = "https://github.com/TrappistNetwork/trappist" -edition = "2021" +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +edition = { workspace = true } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] From 7dd97c941c5d168907b7911b5bf70004648a1f47 Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 17:09:44 +0200 Subject: [PATCH 18/19] pallets --- pallets/benchmarks/Cargo.toml | 22 +++++++++++----------- pallets/benchmarks/src/lib.rs | 2 +- primitives/xcm/Cargo.toml | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pallets/benchmarks/Cargo.toml b/pallets/benchmarks/Cargo.toml index 09defed2..c6fceec1 100644 --- a/pallets/benchmarks/Cargo.toml +++ b/pallets/benchmarks/Cargo.toml @@ -7,24 +7,24 @@ edition = "2021" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", ] } -scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } +parity-scale-codec = { workspace = true, features = [ "derive" ] } +scale-info = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } +frame-benchmarking = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +xcm = { workspace = true } +xcm-executor= { workspace = true } [dev-dependencies] -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } +sp-core = { workspace = true } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "frame-benchmarking/std", "frame-support/std", "frame-system/std", diff --git a/pallets/benchmarks/src/lib.rs b/pallets/benchmarks/src/lib.rs index 34427034..b8cb90e1 100644 --- a/pallets/benchmarks/src/lib.rs +++ b/pallets/benchmarks/src/lib.rs @@ -2,8 +2,8 @@ #![cfg_attr(not(feature = "std"), no_std)] -use codec::Codec; use frame_support::{pallet_prelude::*, traits::tokens::AssetId}; +use parity_scale_codec::Codec; use sp_runtime::traits::AtLeast32BitUnsigned; use xcm::prelude::*; use xcm_executor::traits::DropAssets; diff --git a/primitives/xcm/Cargo.toml b/primitives/xcm/Cargo.toml index e373d10c..39fa7270 100644 --- a/primitives/xcm/Cargo.toml +++ b/primitives/xcm/Cargo.toml @@ -4,13 +4,13 @@ version = "0.0.1" edition = "2021" [dependencies] -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { workspace = true } +frame-support = { workspace = true } +sp-runtime = { workspace = true } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm = { workspace = true } +xcm-executor = { workspace = true } [features] default = [ "std" ] From 78fc77b4264217a19e663c55f93fdef0bb20f20a Mon Sep 17 00:00:00 2001 From: Hector Bulgarini Date: Fri, 2 Jun 2023 17:35:19 +0200 Subject: [PATCH 19/19] Done :) --- Cargo.toml | 1 + pallets/lockdown-mode/Cargo.toml | 71 +++++++++++++++++--------------- runtime/stout/Cargo.toml | 2 +- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 95a5912f..f4b58d86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -187,3 +187,4 @@ nix = "0.25" tempfile = "3.3.0" tokio = { version = "1.24.1", features = ["macros", "time", "parking_lot"] } wait-timeout = "0.2" +pallet-remark = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } diff --git a/pallets/lockdown-mode/Cargo.toml b/pallets/lockdown-mode/Cargo.toml index 7520e101..0edb5457 100644 --- a/pallets/lockdown-mode/Cargo.toml +++ b/pallets/lockdown-mode/Cargo.toml @@ -2,55 +2,58 @@ name = "pallet-lockdown-mode" version = "0.1.0" description = "Trappist pallet for setting lockdown mode." -edition = "2021" -license = "Apache-2.0" -repository = "https://github.com/paritytech/trappist" +authors = { workspace = true } +license = { workspace = true } +homepage = { workspace = true } +repository = { workspace = true } +edition = { workspace = true } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive",] } -scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -pallet-assets = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -log = "0.4.17" -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +parity-scale-codec = { workspace = true, features = [ "derive" ] } +scale-info = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } +frame-benchmarking = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } -xcm-primitives = { path = "../../primitives/xcm", default-features = false } +cumulus-primitives-core = { workspace = true } +pallet-assets = { workspace = true } +pallet-balances = { workspace = true } +log = { workspace = true } +xcm = { workspace = true } + +xcm-primitives = { workspace = true } [dev-dependencies] -sp-core = { version = "7.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -sp-io = { version = "7.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -sp-runtime = { version = "7.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } -pallet-remark = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.37" } +sp-core = { workspace = true } +sp-io = { workspace = true } +sp-runtime = { workspace = true } +pallet-remark = { workspace = true } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm = { workspace = true } +xcm-simulator = { workspace = true } +xcm-executor = { workspace = true } +xcm-builder = { workspace = true } +pallet-xcm = { workspace = true } +polkadot-core-primitives = { workspace = true } +polkadot-runtime-parachains = { workspace = true } +polkadot-parachain = { workspace = true } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachain-info = { workspace = true } +parachains-common = { workspace = true } +cumulus-pallet-dmp-queue = { workspace = true } +cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-core = { workspace = true } [features] default = ["std"] std = [ - "codec/std", + "parity-scale-codec/std", "sp-runtime/std", "sp-std/std", "pallet-assets/std", diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml index 78175272..11d38f23 100644 --- a/runtime/stout/Cargo.toml +++ b/runtime/stout/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-wasm-builder = { workspace = true } [dependencies] hex-literal = { workspace = true, optional = true }