pezkuwichain/pezkuwi-runtime-templates
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-runtime-templates.git synced 2026-04-22 03:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade generic-template to polkadot-stable2412 (#401)

Browse Source
This commit is contained in:
Amar Singh
2025-03-02 13:02:30 -05:00
committed by GitHub
parent d953d959e6
commit 18f4807668
19 changed files with 3103 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic-template/Cargo.lock
Generated
+2762 -1845
View File
File diff suppressed because it is too large Load Diff
generic-template/Cargo.toml
+120 -122
View File
@@ -14,7 +14,7 @@ clap = { version = "4.5.3", features = [ "derive" ] }
color-print = "0.3.4" color-print = "0.3.4"
futures = "0.3.30" futures = "0.3.30"
hex-literal = "0.4.1" hex-literal = "0.4.1"
jsonrpsee = { version = "0.23.2", features = [ "server" ] } jsonrpsee = { version = "0.24.3", features = [ "server" ] }
log = { version = "0.4.21", default-features = false } log = { version = "0.4.21", default-features = false }
parity-scale-codec = { version = "3.6.12", default-features = false, features = [ parity-scale-codec = { version = "3.6.12", default-features = false, features = [
"derive", "derive",
@@ -26,142 +26,140 @@ serde_json = "1.0.121"
smallvec = "1.11.0" smallvec = "1.11.0"
# TODO: update to release # TODO: update to release
openzeppelin-pallet-abstractions = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "dot-as-a-fee-fixes", default-features = false } openzeppelin-pallet-abstractions = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "amar-upgrade-polkadot2412", default-features = false }
openzeppelin-pallet-abstractions-proc = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "dot-as-a-fee-fixes", default-features = false } openzeppelin-pallet-abstractions-proc = { git = "https://github.com/OpenZeppelin/openzeppelin-pallet-abstractions", branch = "amar-upgrade-polkadot2412", default-features = false }
# Substrate # Substrate
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-asset-tx-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-asset-tx-payment = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-conviction-voting = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-conviction-voting = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-network = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-network = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-service = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2407-1" } sp-io = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-session = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-std = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
sp-version = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } sp-version = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2407-1" } substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2407-1" } substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
# Polkadot # Polkadot
pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", features = [ polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
"rococo-native", polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
], tag = "polkadot-stable2407-1" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" }
xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2407-1" }
# Cumulus # Cumulus
assets-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } assets-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-primitives-storage-weight-reclaim = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-primitives-storage-weight-reclaim = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, tag = "polkadot-stable2407-1" } parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "54a4ec0a11558fb82ea17575c9bbff5fb785e394", default-features = false }
# Moonbeam # Moonbeam
pallet-asset-manager = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2407-1", default-features = false } pallet-asset-manager = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2417", default-features = false }
pallet-xcm-transactor = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2407-1", default-features = false } pallet-xcm-transactor = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2417", default-features = false }
pallet-xcm-weight-trader = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2407-1", default-features = false } pallet-xcm-weight-trader = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2417", default-features = false }
xcm-primitives = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2407-1", default-features = false } xcm-primitives = { git = "https://github.com/OpenZeppelin/moonbeam.git", branch = "polkadot-stable2417", default-features = false }
# ORML # ORML
orml-oracle = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2407-1", default-features = false } orml-oracle = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2412", default-features = false }
orml-oracle-runtime-api = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2407-1", default-features = false } orml-oracle-runtime-api = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2412", default-features = false }
orml-traits = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2407-1", default-features = false } orml-traits = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2412", default-features = false }
orml-xcm-support = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2407-1", default-features = false } orml-xcm-support = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2412", default-features = false }
orml-xtokens = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2407-1", default-features = false } orml-xtokens = { git = "https://github.com/OpenZeppelin/open-runtime-module-library", branch = "polkadot-stable2412", default-features = false }
# Fuzzer # Fuzzer
ziggy = { version = "1.0.2", default-features = false } ziggy = { version = "1.0.2", default-features = false }
# Tanssi # Tanssi
dp-consensus = { git = "https://github.com/OpenZeppelin/dancekit", default-features = false, tag = "polkadot-stable2407-1" } dp-consensus = { git = "https://github.com/OpenZeppelin/dancekit", branch = "polkadot-stable2412", default-features = false }
nimbus-consensus = { git = "https://github.com/OpenZeppelin/moonkit", default-features = false, tag = "polkadot-stable2407-1" } nimbus-consensus = { git = "https://github.com/OpenZeppelin/moonkit", branch = "polkadot-stable2412", default-features = false }
nimbus-primitives = { git = "https://github.com/OpenZeppelin/moonkit", default-features = false, tag = "polkadot-stable2407-1" } nimbus-primitives = { git = "https://github.com/OpenZeppelin/moonkit", branch = "polkadot-stable2412", default-features = false }
pallet-author-inherent = { git = "https://github.com/OpenZeppelin/moonkit", default-features = false, tag = "polkadot-stable2407-1" } pallet-author-inherent = { git = "https://github.com/OpenZeppelin/moonkit", branch = "polkadot-stable2412", default-features = false }
pallet-cc-authorities-noting = { git = "https://github.com/OpenZeppelin/dancekit", default-features = false, tag = "polkadot-stable2407-1" } pallet-cc-authorities-noting = { git = "https://github.com/OpenZeppelin/dancekit", branch = "polkadot-stable2412", default-features = false }
[workspace.lints.clippy] [workspace.lints.clippy]
large_enum_variant = "allow" large_enum_variant = "allow"
generic-template/node/src/command.rs
+5 -13
View File
@@ -1,5 +1,3 @@
use std::net::SocketAddr;
use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions; use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
use cumulus_primitives_core::ParaId; use cumulus_primitives_core::ParaId;
use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
@@ -7,7 +5,7 @@ use generic_runtime_template::Block;
use log::info; use log::info;
use sc_cli::{ use sc_cli::{
ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
NetworkParams, Result, SharedParams, SubstrateCli, NetworkParams, Result, RpcEndpoint, SharedParams, SubstrateCli,
}; };
use sc_service::config::{BasePath, PrometheusConfig}; use sc_service::config::{BasePath, PrometheusConfig};
use sp_runtime::traits::AccountIdConversion; use sp_runtime::traits::AccountIdConversion;
@@ -226,7 +224,7 @@ pub fn run() -> Result<()> {
let hwbench = (!cli.no_hardware_benchmarks) let hwbench = (!cli.no_hardware_benchmarks)
.then_some(config.database.path().map(|database_path| { .then_some(config.database.path().map(|database_path| {
let _ = std::fs::create_dir_all(database_path); let _ = std::fs::create_dir_all(database_path);
sc_sysinfo::gather_hwbench(Some(database_path)) sc_sysinfo::gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE)
})) }))
.flatten(); .flatten();
@@ -304,7 +302,7 @@ impl CliConfiguration<Self> for RelayChainCli {
Ok(self.shared_params().base_path()?.or_else(|| self.base_path.clone().map(Into::into))) Ok(self.shared_params().base_path()?.or_else(|| self.base_path.clone().map(Into::into)))
} }
fn rpc_addr(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> { fn rpc_addr(&self, default_listen_port: u16) -> sc_cli::Result<Option<Vec<RpcEndpoint>>> {
self.base.base.rpc_addr(default_listen_port) self.base.base.rpc_addr(default_listen_port)
} }
@@ -316,15 +314,9 @@ impl CliConfiguration<Self> for RelayChainCli {
self.base.base.prometheus_config(default_listen_port, chain_spec) self.base.base.prometheus_config(default_listen_port, chain_spec)
} }
fn init<F>( fn init<F>(&self, _support_url: &String, _impl_version: &String, _logger_hook: F) -> Result<()>
&self,
_support_url: &String,
_impl_version: &String,
_logger_hook: F,
_config: &sc_service::Configuration,
) -> Result<()>
where where
F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration), F: FnOnce(&mut sc_cli::LoggerBuilder),
{ {
unreachable!("PolkadotCli is never initialized; qed"); unreachable!("PolkadotCli is never initialized; qed");
} }
generic-template/node/src/rpc.rs
+2 -5
View File
@@ -9,7 +9,6 @@ use std::sync::Arc;
use generic_runtime_template::{opaque::Block, AccountId, Balance, Nonce}; use generic_runtime_template::{opaque::Block, AccountId, Balance, Nonce};
use sc_client_api::AuxStore; use sc_client_api::AuxStore;
pub use sc_rpc::DenyUnsafe;
use sc_transaction_pool_api::TransactionPool; use sc_transaction_pool_api::TransactionPool;
use sp_api::ProvideRuntimeApi; use sp_api::ProvideRuntimeApi;
use sp_block_builder::BlockBuilder; use sp_block_builder::BlockBuilder;
@@ -24,8 +23,6 @@ pub struct FullDeps<C, P> {
pub client: Arc<C>, pub client: Arc<C>,
/// Transaction pool instance. /// Transaction pool instance.
pub pool: Arc<P>, pub pool: Arc<P>,
/// Whether to deny unsafe calls
pub deny_unsafe: DenyUnsafe,
} }
/// Instantiate all RPC extensions. /// Instantiate all RPC extensions.
@@ -49,9 +46,9 @@ where
use substrate_frame_rpc_system::{System, SystemApiServer}; use substrate_frame_rpc_system::{System, SystemApiServer};
let mut module = RpcExtension::new(()); let mut module = RpcExtension::new(());
let FullDeps { client, pool, deny_unsafe } = deps; let FullDeps { client, pool } = deps;
module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; module.merge(System::new(client.clone(), pool).into_rpc())?;
module.merge(TransactionPayment::new(client).into_rpc())?; module.merge(TransactionPayment::new(client).into_rpc())?;
Ok(module) Ok(module)
} }
generic-template/node/src/service.rs
+32 -28
View File
@@ -58,7 +58,7 @@ pub type Service = PartialComponents<
ParachainBackend, ParachainBackend,
(), (),
sc_consensus::DefaultImportQueue<Block>, sc_consensus::DefaultImportQueue<Block>,
sc_transaction_pool::FullPool<Block, ParachainClient>, sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient>,
(ParachainBlockImport, Option<Telemetry>, Option<TelemetryWorkerHandle>), (ParachainBlockImport, Option<Telemetry>, Option<TelemetryWorkerHandle>),
>; >;
@@ -79,15 +79,16 @@ pub fn new_partial(config: &Configuration) -> Result<Service, sc_service::Error>
.transpose()?; .transpose()?;
let heap_pages = config let heap_pages = config
.executor
.default_heap_pages .default_heap_pages
.map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _ }); .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _ });
let executor = ParachainExecutor::builder() let executor = ParachainExecutor::builder()
.with_execution_method(config.wasm_method) .with_execution_method(config.executor.wasm_method)
.with_onchain_heap_alloc_strategy(heap_pages) .with_onchain_heap_alloc_strategy(heap_pages)
.with_offchain_heap_alloc_strategy(heap_pages) .with_offchain_heap_alloc_strategy(heap_pages)
.with_max_runtime_instances(config.max_runtime_instances) .with_max_runtime_instances(config.executor.max_runtime_instances)
.with_runtime_cache_size(config.runtime_cache_size) .with_runtime_cache_size(config.executor.runtime_cache_size)
.build(); .build();
let (client, backend, keystore_container, task_manager) = let (client, backend, keystore_container, task_manager) =
@@ -106,12 +107,15 @@ pub fn new_partial(config: &Configuration) -> Result<Service, sc_service::Error>
telemetry telemetry
}); });
let transaction_pool = sc_transaction_pool::BasicPool::new_full( let transaction_pool = Arc::from(
config.transaction_pool.clone(), sc_transaction_pool::Builder::new(
config.role.is_authority().into(), task_manager.spawn_essential_handle(),
config.prometheus_registry(), client.clone(),
task_manager.spawn_essential_handle(), config.role.is_authority().into(),
client.clone(), )
.with_options(config.transaction_pool.clone())
.with_prometheus(config.prometheus_registry())
.build(),
); );
#[cfg(feature = "tanssi")] #[cfg(feature = "tanssi")]
@@ -166,7 +170,10 @@ async fn start_node_impl(
_, _,
_, _,
sc_network::NetworkWorker<Block, Hash>, sc_network::NetworkWorker<Block, Hash>,
>::new(&parachain_config.network); >::new(
&parachain_config.network,
parachain_config.prometheus_config.as_ref().map(|cfg| cfg.registry.clone()),
);
let client = params.client.clone(); let client = params.client.clone();
let backend = params.backend.clone(); let backend = params.backend.clone();
@@ -210,24 +217,24 @@ async fn start_node_impl(
if parachain_config.offchain_worker.enabled { if parachain_config.offchain_worker.enabled {
use futures::FutureExt; use futures::FutureExt;
let offchain_workers =
task_manager.spawn_handle().spawn(
"offchain-workers-runner",
"offchain-work",
sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
runtime_api_provider: client.clone(), runtime_api_provider: client.clone(),
is_validator: parachain_config.role.is_authority(),
keystore: Some(params.keystore_container.keystore()), keystore: Some(params.keystore_container.keystore()),
offchain_db: backend.offchain_storage(), offchain_db: backend.offchain_storage(),
transaction_pool: Some(OffchainTransactionPoolFactory::new( transaction_pool: Some(OffchainTransactionPoolFactory::new(
transaction_pool.clone(), transaction_pool.clone(),
)), )),
network_provider: Arc::new(network.clone()), network_provider: Arc::new(network.clone()),
is_validator: parachain_config.role.is_authority(),
enable_http_requests: false, enable_http_requests: false,
custom_extensions: move |_| vec![], custom_extensions: |_| vec![],
}) })?;
.run(client.clone(), task_manager.spawn_handle())
.boxed(), task_manager.spawn_handle().spawn(
"offchain-workers-runner",
"offchain-work",
offchain_workers.run(client.clone(), task_manager.spawn_handle()).boxed(),
); );
} }
@@ -235,12 +242,9 @@ async fn start_node_impl(
let client = client.clone(); let client = client.clone();
let transaction_pool = transaction_pool.clone(); let transaction_pool = transaction_pool.clone();
Box::new(move |deny_unsafe, _| { Box::new(move |_| {
let deps = crate::rpc::FullDeps { let deps =
client: client.clone(), crate::rpc::FullDeps { client: client.clone(), pool: transaction_pool.clone() };
pool: transaction_pool.clone(),
deny_unsafe,
};
crate::rpc::create_full(deps).map_err(Into::into) crate::rpc::create_full(deps).map_err(Into::into)
}) })
@@ -269,7 +273,7 @@ async fn start_node_impl(
// Here you can check whether the hardware meets your chains' requirements. Putting a link // Here you can check whether the hardware meets your chains' requirements. Putting a link
// in there and swapping out the requirements for your own are probably a good idea. The // in there and swapping out the requirements for your own are probably a good idea. The
// requirements for a para-chain are dictated by its relay-chain. // requirements for a para-chain are dictated by its relay-chain.
match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) { match SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench, false) {
Err(err) if validator => { Err(err) if validator => {
log::warn!( log::warn!(
"⚠️ The hardware does not meet the minimal requirements {} for role \ "⚠️ The hardware does not meet the minimal requirements {} for role \
@@ -410,7 +414,7 @@ fn start_consensus(
telemetry: Option<TelemetryHandle>, telemetry: Option<TelemetryHandle>,
task_manager: &TaskManager, task_manager: &TaskManager,
relay_chain_interface: Arc<dyn RelayChainInterface>, relay_chain_interface: Arc<dyn RelayChainInterface>,
transaction_pool: Arc<sc_transaction_pool::FullPool<Block, ParachainClient>>, transaction_pool: Arc<sc_transaction_pool::TransactionPoolHandle<Block, ParachainClient>>,
keystore: KeystorePtr, keystore: KeystorePtr,
relay_chain_slot_duration: Duration, relay_chain_slot_duration: Duration,
para_id: ParaId, para_id: ParaId,
generic-template/runtime/src/configs/asset_config.rs
+36 -17
View File
@@ -8,6 +8,8 @@ use sp_std::{
prelude::*, prelude::*,
}; };
use xcm::latest::Location; use xcm::latest::Location;
#[cfg(feature = "runtime-benchmarks")]
use xcm::v3::MultiLocation;
use crate::{ use crate::{
types::{AccountId, AssetId, Balance}, types::{AccountId, AssetId, Balance},
@@ -17,16 +19,31 @@ use crate::{
// Our AssetType. For now we only handle Xcm Assets // Our AssetType. For now we only handle Xcm Assets
#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
pub enum AssetType { pub enum AssetType {
Xcm(xcm::v3::Location), Xcm(xcm::v4::Location),
} }
impl Default for AssetType { impl Default for AssetType {
fn default() -> Self { fn default() -> Self {
Self::Xcm(xcm::v3::Location::here()) Self::Xcm(xcm::v4::Location::here())
} }
} }
impl From<xcm::v3::Location> for AssetType { #[cfg(feature = "runtime-benchmarks")]
fn from(location: xcm::v3::Location) -> Self { fn convert_v3_to_v4(v3: MultiLocation) -> Option<xcm::v4::Location> {
Some(xcm::v4::Location {
parents: v3.parents,
interior: xcm::v4::Junctions::try_from(v3.interior).ok()?, // Returns None if conversion fails
})
}
#[cfg(feature = "runtime-benchmarks")]
impl From<MultiLocation> for AssetType {
fn from(value: MultiLocation) -> Self {
Self::Xcm(convert_v3_to_v4(value).unwrap_or(xcm::v4::Location::default()))
}
}
impl From<xcm::v4::Location> for AssetType {
fn from(location: xcm::v4::Location) -> Self {
Self::Xcm(location) Self::Xcm(location)
} }
} }
@@ -40,7 +57,7 @@ impl TryFrom<Location> for AssetType {
} }
} }
impl From<AssetType> for Option<xcm::v3::Location> { impl From<AssetType> for Option<xcm::v4::Location> {
fn from(val: AssetType) -> Self { fn from(val: AssetType) -> Self {
match val { match val {
AssetType::Xcm(location) => Some(location), AssetType::Xcm(location) => Some(location),
@@ -155,7 +172,7 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
// This is the dispatch info of destroy // This is the dispatch info of destroy
RuntimeCall::Assets(pallet_assets::Call::<Runtime>::start_destroy { id: asset.into() }) RuntimeCall::Assets(pallet_assets::Call::<Runtime>::start_destroy { id: asset.into() })
.get_dispatch_info() .get_dispatch_info()
.weight .call_weight
} }
} }
@@ -265,6 +282,8 @@ mod tests {
} }
mod asset_type { mod asset_type {
use std::sync::Arc;
use crate::{configs::AssetType, types::AssetId}; use crate::{configs::AssetType, types::AssetId};
#[test] #[test]
@@ -272,20 +291,20 @@ mod tests {
let default_asset_type = AssetType::default(); let default_asset_type = AssetType::default();
assert_eq!( assert_eq!(
default_asset_type, default_asset_type,
AssetType::Xcm(xcm::v3::Location { AssetType::Xcm(xcm::v4::Location {
parents: 0, parents: 0,
interior: xcm::v3::Junctions::Here interior: xcm::v4::Junctions::Here
}) })
); );
} }
#[test] #[test]
fn test_asset_type_from_location_v3() { fn test_asset_type_from_location_v3() {
let location = xcm::v3::Location { let location = xcm::v4::Location {
parents: 0, parents: 0,
interior: xcm::v3::Junctions::X1(xcm::v3::Junction::OnlyChild), interior: xcm::v4::Junctions::X1(Arc::new([xcm::v4::Junction::OnlyChild])),
}; };
let asset_type = AssetType::from(location); let asset_type = AssetType::from(location.clone());
assert_eq!(asset_type, AssetType::Xcm(location)); assert_eq!(asset_type, AssetType::Xcm(location));
} }
@@ -294,8 +313,8 @@ mod tests {
fn test_asset_type_try_from_location_v4() { fn test_asset_type_try_from_location_v4() {
let location = let location =
xcm::latest::Location { parents: 0, interior: xcm::latest::Junctions::Here }; xcm::latest::Location { parents: 0, interior: xcm::latest::Junctions::Here };
let old_location: xcm::v3::Location = let old_location: xcm::v4::Location =
xcm::v3::Location { parents: 0, interior: xcm::v3::Junctions::Here }; xcm::v4::Location { parents: 0, interior: xcm::v4::Junctions::Here };
let asset_type = AssetType::try_from(location) let asset_type = AssetType::try_from(location)
.expect("AssetType conversion from location v4 failed"); .expect("AssetType conversion from location v4 failed");
@@ -304,15 +323,15 @@ mod tests {
#[test] #[test]
fn test_asset_type_into_location() { fn test_asset_type_into_location() {
let location = xcm::v3::Location { parents: 0, interior: xcm::v3::Junctions::Here }; let location = xcm::v4::Location { parents: 0, interior: xcm::v4::Junctions::Here };
let asset_type = AssetType::Xcm(location); let asset_type = AssetType::Xcm(location.clone());
let converted: Option<xcm::v3::Location> = asset_type.into(); let converted: Option<xcm::v4::Location> = asset_type.into();
assert_eq!(converted, Some(location)); assert_eq!(converted, Some(location));
} }
#[test] #[test]
fn test_asset_type_into_asset_id() { fn test_asset_type_into_asset_id() {
let location = xcm::v3::Location { parents: 0, interior: xcm::v3::Junctions::Here }; let location = xcm::v4::Location { parents: 0, interior: xcm::v4::Junctions::Here };
let expected_asset_id: u32 = 3068126878; let expected_asset_id: u32 = 3068126878;
let asset_type = AssetType::Xcm(location); let asset_type = AssetType::Xcm(location);
generic-template/runtime/src/configs/mod.rs
+3 -2
View File
@@ -60,7 +60,7 @@ use xcm_builder::{
}; };
use xcm_config::*; use xcm_config::*;
use xcm_executor::XcmExecutor; use xcm_executor::XcmExecutor;
use xcm_primitives::{AbsoluteAndRelativeReserve, AsAssetType}; use xcm_primitives::AsAssetType;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
use crate::benchmark::{OpenHrmpChannel, PayWithEnsure}; use crate::benchmark::{OpenHrmpChannel, PayWithEnsure};
@@ -163,7 +163,8 @@ impl XcmConfig for OpenZeppelinRuntime {
type SelfReserve = SelfReserve; type SelfReserve = SelfReserve;
type SovereignAccountDispatcherOrigin = EnsureRoot<AccountId>; type SovereignAccountDispatcherOrigin = EnsureRoot<AccountId>;
type Trader = pallet_xcm_weight_trader::Trader<Runtime>; type Trader = pallet_xcm_weight_trader::Trader<Runtime>;
type TransactorReserveProvider = AbsoluteAndRelativeReserve<SelfLocationAbsolute>; type TransactorReserveProvider =
xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
type Transactors = Transactors; type Transactors = Transactors;
type UniversalLocation = UniversalLocation; type UniversalLocation = UniversalLocation;
type WeightToFee = WeightToFee; type WeightToFee = WeightToFee;
generic-template/runtime/src/configs/weight.rs
+5 -1
View File
@@ -30,10 +30,14 @@ impl ConsensusWeight for OpenZeppelinRuntime {
impl AssetsWeight for OpenZeppelinRuntime { impl AssetsWeight for OpenZeppelinRuntime {
type AssetManager = weights::pallet_asset_manager::WeightInfo<Runtime>; type AssetManager = weights::pallet_asset_manager::WeightInfo<Runtime>;
//TODO: fix weight
type AssetTxPayment = ();
type Assets = weights::pallet_assets::WeightInfo<Runtime>; type Assets = weights::pallet_assets::WeightInfo<Runtime>;
// TODO: fix weight on release // TODO: fix weight on release
type OracleMembership = (); type OracleMembership = ();
type OrmlOracle = (); // TODO: fix weight type OrmlOracle = ();
// TODO: fix weight
type TransactionPayment = weights::pallet_transaction_payment::WeightInfo<Runtime>;
} }
impl GovernanceWeight for OpenZeppelinRuntime { impl GovernanceWeight for OpenZeppelinRuntime {
generic-template/runtime/src/configs/xcm_config.rs
+55 -11
View File
@@ -16,13 +16,11 @@ use xcm::latest::{prelude::*, Junction::PalletInstance};
use xcm_builder::{ use xcm_builder::{
AccountId32Aliases, Case, FixedWeightBounds, FungibleAdapter, FungiblesAdapter, AccountId32Aliases, Case, FixedWeightBounds, FungibleAdapter, FungiblesAdapter,
IsChildSystemParachain, IsConcrete, NoChecking, ParentIsPreset, RelayChainAsNative, IsChildSystemParachain, IsConcrete, NoChecking, ParentIsPreset, RelayChainAsNative,
SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SendXcmFeeToAccount, SiblingParachainAsNative, SiblingParachainConvertsVia,
SignedToAccountId32, SovereignSignedViaLocation, WithUniqueTopic, XcmFeeManagerFromComponents, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, WithUniqueTopic,
XcmFeeToAccount, XcmFeeManagerFromComponents,
};
use xcm_primitives::{
AbsoluteAndRelativeReserve, UtilityAvailableCalls, UtilityEncodeCall, XcmTransact,
}; };
use xcm_primitives::{UtilityAvailableCalls, UtilityEncodeCall, XcmTransact};
use crate::{ use crate::{
configs::{MaxInstructions, ParachainSystem, Runtime, RuntimeCall, UnitWeightCost, XcmpQueue}, configs::{MaxInstructions, ParachainSystem, Runtime, RuntimeCall, UnitWeightCost, XcmpQueue},
@@ -49,8 +47,9 @@ parameter_types! {
}; };
} }
/// Type for specifying how a `Location` can be converted into an /// Type for specifying how a `Location` can be converted into an `AccountId`.
/// `AccountId`. This is used when determining ownership of accounts for asset ///
/// This is used when determining ownership of accounts for asset
/// transacting and when attempting to use XCM `Transact` in order to determine /// transacting and when attempting to use XCM `Transact` in order to determine
/// the dispatch Origin. /// the dispatch Origin.
pub type LocationToAccountId = ( pub type LocationToAccountId = (
@@ -100,8 +99,9 @@ pub type LocalFungiblesTransactor = FungiblesAdapter<
/// Means for transacting assets on this chain. /// Means for transacting assets on this chain.
pub type AssetTransactors = (LocalAssetTransactor, LocalFungiblesTransactor); pub type AssetTransactors = (LocalAssetTransactor, LocalFungiblesTransactor);
/// This is the type we use to convert an (incoming) XCM origin into a local /// Type used to convert an (incoming) XCM origin into a local `Origin` instance
/// `Origin` instance, ready for dispatching a transaction with Xcm's ///
/// Local `Origin` instance is ready for dispatching a transaction with Xcm's
/// `Transact`. There is an `OriginKind` which can biases the kind of local /// `Transact`. There is an `OriginKind` which can biases the kind of local
/// `Origin` it will become. /// `Origin` it will become.
pub type XcmOriginToTransactDispatchOrigin = ( pub type XcmOriginToTransactDispatchOrigin = (
@@ -124,7 +124,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
pub type FeeManager = XcmFeeManagerFromComponents< pub type FeeManager = XcmFeeManagerFromComponents<
IsChildSystemParachain<primitives::Id>, IsChildSystemParachain<primitives::Id>,
XcmFeeToAccount<AssetTransactors, AccountId, TreasuryAccount>, SendXcmFeeToAccount<AssetTransactors, TreasuryAccount>,
>; >;
/// Matches foreign assets from a given origin. /// Matches foreign assets from a given origin.
@@ -314,6 +314,50 @@ impl Reserve for BridgedAssetReserveProvider {
} }
} }
// Provide reserve in relative path view
// Self tokens are represeneted as Here
// Moved from Moonbeam to implement orml_traits::location::Reserve after Moonbeam
// removed ORML dependencies
pub struct RelativeReserveProvider;
impl Reserve for RelativeReserveProvider {
fn reserve(asset: &Asset) -> Option<Location> {
let AssetId(location) = &asset.id;
if location.parents == 0
&& !matches!(location.first_interior(), Some(Junction::Parachain(_)))
{
Some(Location::here())
} else {
Some(location.chain_location())
}
}
}
/// Struct that uses RelativeReserveProvider to output relative views of multilocations
///
/// Additionally accepts a Location that aims at representing the chain part
/// (parent: 1, Parachain(paraId)) of the absolute representation of our chain.
/// If a token reserve matches against this absolute view, we return Some(Location::here())
/// This helps users by preventing errors when they try to transfer a token through xtokens
/// to our chain (either inserting the relative or the absolute value).
// Moved from Moonbeam to implement orml_traits::location::Reserve after Moonbeam
// removed ORML dependencies
pub struct AbsoluteAndRelativeReserve<AbsoluteMultiLocation>(PhantomData<AbsoluteMultiLocation>);
impl<AbsoluteMultiLocation> Reserve for AbsoluteAndRelativeReserve<AbsoluteMultiLocation>
where
AbsoluteMultiLocation: Get<Location>,
{
fn reserve(asset: &Asset) -> Option<Location> {
RelativeReserveProvider::reserve(asset).map(|relative_reserve| {
if relative_reserve == AbsoluteMultiLocation::get() {
Location::here()
} else {
relative_reserve
}
})
}
}
pub struct ReserveProviders; pub struct ReserveProviders;
impl Reserve for ReserveProviders { impl Reserve for ReserveProviders {
generic-template/runtime/src/constants.rs
+6 -4
View File
@@ -1,5 +1,7 @@
extern crate alloc;
use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}; use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
use sp_runtime::{create_runtime_str, Perbill}; use sp_runtime::Perbill;
use sp_version::RuntimeVersion; use sp_version::RuntimeVersion;
use crate::{apis, types::BlockNumber}; use crate::{apis, types::BlockNumber};
@@ -26,14 +28,14 @@ pub const POLY_DEGREE: u8 = 1;
#[sp_version::runtime_version] #[sp_version::runtime_version]
pub const VERSION: RuntimeVersion = RuntimeVersion { pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("template-parachain"), spec_name: alloc::borrow::Cow::Borrowed("template-parachain"),
impl_name: create_runtime_str!("template-parachain"), impl_name: alloc::borrow::Cow::Borrowed("template-parachain"),
authoring_version: 1, authoring_version: 1,
spec_version: 1, spec_version: 1,
impl_version: 0, impl_version: 0,
apis: apis::RUNTIME_API_VERSIONS, apis: apis::RUNTIME_API_VERSIONS,
transaction_version: 1, transaction_version: 1,
state_version: 1, system_version: 1,
}; };
/// This determines the average expected block time that we are targeting. /// This determines the average expected block time that we are targeting.
generic-template/runtime/src/lib.rs
+3 -1
View File
@@ -67,7 +67,9 @@ impl WeightToFeePolynomial for WeightToFee {
} }
} }
/// Opaque types. These are used by the CLI to instantiate machinery that don't /// Opaque types
///
/// These are used by the CLI to instantiate machinery that don't
/// need to know the specifics of the runtime. They can then be made to be /// need to know the specifics of the runtime. They can then be made to be
/// agnostic over specific formats of data like extrinsics, allowing for them to /// agnostic over specific formats of data like extrinsics, allowing for them to
/// continue syncing the network through upgrades to even the core data /// continue syncing the network through upgrades to even the core data
generic-template/runtime/src/weights/mod.rs
+1
View File
@@ -37,6 +37,7 @@ pub mod pallet_scheduler;
pub mod pallet_session; pub mod pallet_session;
pub mod pallet_sudo; pub mod pallet_sudo;
pub mod pallet_timestamp; pub mod pallet_timestamp;
pub mod pallet_transaction_payment;
pub mod pallet_treasury; pub mod pallet_treasury;
pub mod pallet_utility; pub mod pallet_utility;
pub mod pallet_whitelist; pub mod pallet_whitelist;
generic-template/runtime/src/weights/pallet_assets.rs
+6
View File
@@ -510,4 +510,10 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1)) .saturating_add(T::DbWeight::get().writes(1))
} }
fn transfer_all() -> Weight {
Weight::from_parts(19_482_000, 0)
.saturating_add(Weight::from_parts(0, 3675))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
}
} }
generic-template/runtime/src/weights/pallet_sudo.rs
+10
View File
@@ -78,4 +78,14 @@ impl<T: frame_system::Config> pallet_sudo::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1)) .saturating_add(T::DbWeight::get().writes(1))
} }
fn check_only_sudo_account() -> Weight {
// Proof Size summary in bytes:
// Measured: `98`
// Estimated: `1517`
// Minimum execution time: 11_126_000 picoseconds.
Weight::from_parts(11_411_000, 0)
.saturating_add(Weight::from_parts(0, 1517))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
} }
generic-template/runtime/src/weights/pallet_transaction_payment.rs
+43
View File
@@ -0,0 +1,43 @@
//! Autogenerated weights for `pallet_transaction_payment`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 42.0.0
//! DATE: 2024-11-03, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-172-31-15-118`, CPU: `Intel(R) Xeon(R) Platinum 8375C CPU @ 2.90GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
// Executed Command:
// target/release/generic-template-node
// benchmark
// pallet
// --steps=50
// --repeat=20
// --extrinsic=*
// --wasm-execution=compiled
// --heap-pages=4096
// --json-file=benchmarking/results/results-pallet_transaction_payment.json
// --pallet=pallet_transaction_payment
// --chain=dev
// --output=benchmarking/new-benchmarks/pallet_transaction_payment.rs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]
#![allow(missing_docs)]
use frame_support::{traits::Get, weights::Weight};
use core::marker::PhantomData;
/// Weight functions for `pallet_transaction_payment`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_transaction_payment::WeightInfo for WeightInfo<T> {
fn charge_transaction_payment() -> Weight {
// Proof Size summary in bytes:
// Measured: `94`
// Estimated: `0`
// Minimum execution time: 3_838_000 picoseconds.
Weight::from_parts(3_942_000, 0)
.saturating_add(Weight::from_parts(0, 0))
}
}
generic-template/runtime/tests/constants_test.rs
+4 -4
View File
@@ -25,7 +25,7 @@ mod runtime_tests {
constants::{currency::*, *}, constants::{currency::*, *},
BlockNumber, Runtime, BlockNumber, Runtime,
}; };
use sp_runtime::{create_runtime_str, Perbill}; use sp_runtime::Perbill;
use sp_version::RuntimeVersion; use sp_version::RuntimeVersion;
use xcm::latest::prelude::BodyId; use xcm::latest::prelude::BodyId;
@@ -34,14 +34,14 @@ mod runtime_tests {
assert_eq!( assert_eq!(
VERSION, VERSION,
RuntimeVersion { RuntimeVersion {
spec_name: create_runtime_str!("template-parachain"), spec_name: std::borrow::Cow::Borrowed("template-parachain"),
impl_name: create_runtime_str!("template-parachain"), impl_name: std::borrow::Cow::Borrowed("template-parachain"),
authoring_version: 1, authoring_version: 1,
spec_version: 1, spec_version: 1,
impl_version: 0, impl_version: 0,
apis: generic_runtime_template::apis::RUNTIME_API_VERSIONS, apis: generic_runtime_template::apis::RUNTIME_API_VERSIONS,
transaction_version: 1, transaction_version: 1,
state_version: 1, system_version: 1,
} }
); );
} }
generic-template/runtime/tests/xcm_tests.rs
+5 -5
View File
@@ -30,7 +30,7 @@ fn dmp() {
Parachain(1), Parachain(1),
Xcm(vec![Transact { Xcm(vec![Transact {
origin_kind: OriginKind::SovereignAccount, origin_kind: OriginKind::SovereignAccount,
require_weight_at_most: Weight::from_parts(INITIAL_BALANCE as u64, 1024 * 1024), fallback_max_weight: Some(Weight::from_parts(INITIAL_BALANCE as u64, 1024 * 1024)),
call: remark.encode().into(), call: remark.encode().into(),
}]), }]),
)); ));
@@ -58,7 +58,7 @@ fn ump() {
Parent, Parent,
Xcm(vec![Transact { Xcm(vec![Transact {
origin_kind: OriginKind::SovereignAccount, origin_kind: OriginKind::SovereignAccount,
require_weight_at_most: Weight::from_parts(INITIAL_BALANCE as u64, 1024 * 1024), fallback_max_weight: Some(Weight::from_parts(INITIAL_BALANCE as u64, 1024 * 1024)),
call: remark.encode().into(), call: remark.encode().into(),
}]), }]),
)); ));
@@ -86,7 +86,7 @@ fn xcmp() {
(Parent, Parachain(2)), (Parent, Parachain(2)),
Xcm(vec![Transact { Xcm(vec![Transact {
origin_kind: OriginKind::SovereignAccount, origin_kind: OriginKind::SovereignAccount,
require_weight_at_most: Weight::from_parts(INITIAL_BALANCE as u64, 1024 * 1024), fallback_max_weight: Some(Weight::from_parts(INITIAL_BALANCE as u64, 1024 * 1024)),
call: remark.encode().into(), call: remark.encode().into(),
}]), }]),
)); ));
@@ -118,7 +118,7 @@ fn remote_locking_and_unlocking() {
Relay::execute_with(|| { Relay::execute_with(|| {
use pallet_balances::{BalanceLock, Reasons}; use pallet_balances::{BalanceLock, Reasons};
assert_eq!( assert_eq!(
relay_chain::Balances::locks(child_account_id(2)), relay_chain::Balances::locks(&child_account_id(2)),
vec![BalanceLock { id: *b"py/xcmlk", amount: locked_amount, reasons: Reasons::All }] vec![BalanceLock { id: *b"py/xcmlk", amount: locked_amount, reasons: Reasons::All }]
); );
}); });
@@ -146,7 +146,7 @@ fn remote_locking_and_unlocking() {
use pallet_balances::{BalanceLock, Reasons}; use pallet_balances::{BalanceLock, Reasons};
// Lock is reduced // Lock is reduced
assert_eq!( assert_eq!(
relay_chain::Balances::locks(child_account_id(2)), relay_chain::Balances::locks(&child_account_id(2)),
vec![BalanceLock { vec![BalanceLock {
id: *b"py/xcmlk", id: *b"py/xcmlk",
amount: locked_amount - 50, amount: locked_amount - 50,
generic-template/rust-toolchain.toml
+1 -1
View File
@@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "nightly-2024-06-12" channel = "nightly-2024-10-17"
targets = ["wasm32-unknown-unknown"] targets = ["wasm32-unknown-unknown"]
components = ["rustfmt", "clippy", "rust-src"] components = ["rustfmt", "clippy", "rust-src"]
generic-template/template-fuzzer/src/main.rs
+4 -4
View File
@@ -54,7 +54,7 @@ fn generate_genesis(accounts: &[AccountId]) -> Storage {
system: Default::default(), system: Default::default(),
balances: BalancesConfig { balances }, balances: BalancesConfig { balances },
#[cfg(not(feature = "tanssi"))] #[cfg(not(feature = "tanssi"))]
session: SessionConfig { keys: session_keys }, session: SessionConfig { keys: session_keys, non_authority_keys: vec![] },
#[cfg(not(feature = "tanssi"))] #[cfg(not(feature = "tanssi"))]
collator_selection: CollatorSelectionConfig { collator_selection: CollatorSelectionConfig {
invulnerables, invulnerables,
@@ -113,7 +113,7 @@ fn process_input(accounts: &[AccountId], genesis: &Storage, data: &[u8]) {
initialize_block(block); initialize_block(block);
} }
weight.saturating_accrue(extrinsic.get_dispatch_info().weight); weight.saturating_accrue(extrinsic.get_dispatch_info().call_weight);
if weight.ref_time() >= 2 * WEIGHT_REF_TIME_PER_SECOND { if weight.ref_time() >= 2 * WEIGHT_REF_TIME_PER_SECOND {
println!("Extrinsic would exhaust block weight, skipping"); println!("Extrinsic would exhaust block weight, skipping");
continue; continue;
@@ -164,7 +164,7 @@ fn initialize_block(block: u32) {
Executive::initialize_block(parent_header); Executive::initialize_block(parent_header);
// We apply the timestamp extrinsic for the current block. // We apply the timestamp extrinsic for the current block.
Executive::apply_extrinsic(UncheckedExtrinsic::new_unsigned(RuntimeCall::Timestamp( Executive::apply_extrinsic(UncheckedExtrinsic::new_bare(RuntimeCall::Timestamp(
pallet_timestamp::Call::set { now: current_timestamp }, pallet_timestamp::Call::set { now: current_timestamp },
))) )))
.unwrap() .unwrap()
@@ -199,7 +199,7 @@ fn initialize_block(block: u32) {
cumulus_pallet_parachain_system::Call::set_validation_data { data } cumulus_pallet_parachain_system::Call::set_validation_data { data }
}; };
Executive::apply_extrinsic(UncheckedExtrinsic::new_unsigned(RuntimeCall::ParachainSystem( Executive::apply_extrinsic(UncheckedExtrinsic::new_bare(RuntimeCall::ParachainSystem(
parachain_validation_data, parachain_validation_data,
))) )))
.unwrap() .unwrap()