diff --git a/Cargo.dev.toml b/Cargo.dev.toml index b9a96ed22..76b994173 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -32,72 +32,72 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "563f4820d8f36d256ada7ea3fef46b2e94c4cd5a" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "616d33ea23bab86cafffaf116fc607b6790fb4eb" } [patch.'https://github.com/paritytech/cumulus'] -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "4bbedb30b1478494b410477498bd0a2221177a11" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "4bbedb30b1478494b410477498bd0a2221177a11" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "4bbedb30b1478494b410477498bd0a2221177a11" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "4bbedb30b1478494b410477498bd0a2221177a11" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "4bbedb30b1478494b410477498bd0a2221177a11" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "7ffdccab93bbf011f00f61b12ff2e487ebe6294c" } [patch.'https://github.com/paritytech/polkadot'] -xcm = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "568169b41aea59a54ab8cfa23c31e84a26708280" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "17c7b9594aedbfc644d7e6e26f7bd244e68ccf4d" } diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml index 4f3f1661a..c9e0d3e03 100644 --- a/asset-registry/Cargo.toml +++ b/asset-registry/Cargo.toml @@ -11,35 +11,35 @@ edition = "2021" scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20"} +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} orml-tokens = { path = "../tokens" } orml-xtokens = { path = "../xtokens" } diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 1c87663e4..67c8247e6 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/authority/Cargo.toml b/authority/Cargo.toml index 1d87f4403..3d74e1381 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index 3fa25d765..e8034f9c3 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -24,18 +24,18 @@ serde_json = {version = "1.0.68", optional = true } hash-db = { version = "0.15.2", default-features = false, optional = true } bencher-procedural = { path = "bencher-procedural", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, optional = true } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, features = ["wasmtime"], optional = true } -sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", optional = true } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["wasmtime"], optional = true } +sc-executor-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", optional = true } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, features = ["with-kvdb-rocksdb"], optional = true } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false, optional = true } [features] default = ["std"] diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml index b631d09ed..418be8da5 100644 --- a/bencher/test/Cargo.toml +++ b/bencher/test/Cargo.toml @@ -15,16 +15,16 @@ required-features = ["bench"] serde = { version = "1.0.136", optional = true } scale-info = { version = "2.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-bencher = { path = "..", default-features = false } orml-weight-meter = { path = "../../weight-meter", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 58e010cd6..61b9fdcfb 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -12,18 +12,18 @@ serde = { version = "1.0.136", optional = true } paste = "1.0.7" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -log = { version = "0.4.14", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +log = { version = "0.4.17", default-features = false } [dev-dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } hex-literal = "0.3.4" [features] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 2afdadb20..1d8746b8b 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -11,19 +11,19 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" } [features] diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 1ea83aee5..cb2844d75 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -11,12 +11,12 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [features] default = ["std"] diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 277d1d4ba..6cbf5d703 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -11,15 +11,15 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 92b3fdf4c..982a9a22f 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -11,19 +11,19 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [features] default = ["std"] diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index a6248e069..ce065b9bd 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -8,11 +8,10 @@ description = "RPC module for orml-oracle." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } -jsonrpc-core = "18.0.0" -jsonrpc-core-client = "18.0.0" -jsonrpc-derive = "18.0.0" -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } + +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } orml-oracle-rpc-runtime-api = { path = "runtime-api", version = "0.4.1-dev" } diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index f0d4b65fc..2018e1ddd 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -8,8 +8,8 @@ description = "Runtime API module for orml-oracle-rpc." [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [features] default = ["std"] diff --git a/oracle/rpc/src/lib.rs b/oracle/rpc/src/lib.rs index 6d86b8ba5..acf65fb18 100644 --- a/oracle/rpc/src/lib.rs +++ b/oracle/rpc/src/lib.rs @@ -1,33 +1,36 @@ use std::sync::Arc; use codec::Codec; -use jsonrpc_core::{Error as RpcError, ErrorCode, Result}; -use jsonrpc_derive::rpc; +use jsonrpsee::{ + core::{async_trait, RpcResult}, + proc_macros::rpc, + types::error::{CallError, ErrorObject}, +}; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; use sp_runtime::{generic::BlockId, traits::Block as BlockT}; -pub use self::gen_client::Client as OracleClient; pub use orml_oracle_rpc_runtime_api::OracleApi as OracleRuntimeApi; -#[rpc] +#[rpc(client, server)] pub trait OracleApi { - #[rpc(name = "oracle_getValue")] - fn get_value(&self, provider_id: ProviderId, key: Key, at: Option) -> Result>; - #[rpc(name = "oracle_getAllValues")] - fn get_all_values(&self, provider_id: ProviderId, at: Option) -> Result)>>; + #[method(name = "oracle_getValue")] + fn get_value(&self, provider_id: ProviderId, key: Key, at: Option) -> RpcResult>; + #[method(name = "oracle_getAllValues")] + fn get_all_values(&self, provider_id: ProviderId, at: Option) -> RpcResult)>>; } -/// A struct that implements the [`OracleApi`]. +/// Provides RPC methods to query oracle value. pub struct Oracle { + /// Shared reference to the client. client: Arc, _marker: std::marker::PhantomData, } impl Oracle { - /// Create new `Oracle` with the given reference to the client. + /// Creates a new instance of the `Oracle` helper. pub fn new(client: Arc) -> Self { - Oracle { + Self { client, _marker: Default::default(), } @@ -38,18 +41,20 @@ pub enum Error { RuntimeError, } -impl From for i64 { - fn from(e: Error) -> i64 { +impl From for i32 { + fn from(e: Error) -> i32 { match e { Error::RuntimeError => 1, } } } -impl OracleApi<::Hash, ProviderId, Key, Value> for Oracle +#[async_trait] +impl OracleApiServer<::Hash, ProviderId, Key, Value> + for Oracle where Block: BlockT, - C: Send + Sync + 'static + ProvideRuntimeApi + HeaderBackend, + C: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, C::Api: OracleRuntimeApi, ProviderId: Codec, Key: Codec, @@ -60,16 +65,17 @@ where provider_id: ProviderId, key: Key, at: Option<::Hash>, - ) -> Result> { + ) -> RpcResult> { let api = self.client.runtime_api(); - let at = BlockId::hash(at.unwrap_or( - // If the block hash is not supplied assume the best block. - self.client.info().best_hash, - )); - api.get_value(&at, provider_id, key).map_err(|e| RpcError { - code: ErrorCode::ServerError(Error::RuntimeError.into()), - message: "Unable to get value.".into(), - data: Some(format!("{:?}", e).into()), + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); + + api.get_value(&at, provider_id, key).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::RuntimeError.into(), + "Unable to get value.", + Some(e.to_string()), + )) + .into() }) } @@ -77,16 +83,17 @@ where &self, provider_id: ProviderId, at: Option<::Hash>, - ) -> Result)>> { + ) -> RpcResult)>> { let api = self.client.runtime_api(); - let at = BlockId::hash(at.unwrap_or( - // If the block hash is not supplied assume the best block. - self.client.info().best_hash, - )); - api.get_all_values(&at, provider_id).map_err(|e| RpcError { - code: ErrorCode::ServerError(Error::RuntimeError.into()), - message: "Unable to get all values.".into(), - data: Some(format!("{:?}", e).into()), + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); + + api.get_all_values(&at, provider_id).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::RuntimeError.into(), + "Unable to get all values.", + Some(e.to_string()), + )) + .into() }) } } diff --git a/payments/Cargo.toml b/payments/Cargo.toml index bc84d99f5..23530ae41 100644 --- a/payments/Cargo.toml +++ b/payments/Cargo.toml @@ -11,18 +11,18 @@ readme = "README.md" [dependencies] parity-scale-codec = { version = "3.1.2", default-features = false, features = ["max-encoded-len"] } -log = { version = "0.4.14", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +log = { version = "0.4.17", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [dev-dependencies] serde = { version = "1.0.136" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false } [features] diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index 71edc6735..8874d7d4a 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 6991661df..7efab9b68 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml index 3e75689b9..096095dcf 100644 --- a/tokens/rpc/Cargo.toml +++ b/tokens/rpc/Cargo.toml @@ -8,14 +8,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } -jsonrpc-core = "18.0.0" -jsonrpc-core-client = "18.0.0" -jsonrpc-derive = "18.0.0" +jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } + +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } orml-tokens-rpc-runtime-api = { version = "0.4.1-dev", path = "./runtime-api" } diff --git a/tokens/rpc/runtime-api/Cargo.toml b/tokens/rpc/runtime-api/Cargo.toml index 44b8d0b17..4fc1b3ef9 100644 --- a/tokens/rpc/runtime-api/Cargo.toml +++ b/tokens/rpc/runtime-api/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-tokens = { default-features = false, path = "../../../tokens" } [features] diff --git a/tokens/rpc/src/lib.rs b/tokens/rpc/src/lib.rs index ff08b6e4a..81efda106 100644 --- a/tokens/rpc/src/lib.rs +++ b/tokens/rpc/src/lib.rs @@ -2,8 +2,11 @@ use std::sync::Arc; use codec::Codec; -use jsonrpc_core::{Error as RpcError, ErrorCode, Result}; -use jsonrpc_derive::rpc; +use jsonrpsee::{ + core::{async_trait, Error as JsonRpseeError, RpcResult}, + proc_macros::rpc, + types::error::{CallError, ErrorCode, ErrorObject}, +}; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; use sp_rpc::number::NumberOrHex; @@ -12,23 +15,23 @@ use sp_runtime::{ traits::{Block as BlockT, MaybeDisplay}, }; -pub use self::gen_client::Client as TokensClient; pub use orml_tokens_rpc_runtime_api::TokensApi as TokensRuntimeApi; -#[rpc] +#[rpc(client, server)] pub trait TokensApi { - #[rpc(name = "tokens_queryExistentialDeposit")] - fn query_existential_deposit(&self, currency_id: CurrencyId, at: Option) -> Result; + #[method(name = "tokens_queryExistentialDeposit")] + fn query_existential_deposit(&self, currency_id: CurrencyId, at: Option) -> RpcResult; } -/// A struct that implements the [`TokensApi`]. +/// Provides RPC methods to query existential deposit of currency. pub struct Tokens { + /// Shared reference to the client. client: Arc, _marker: std::marker::PhantomData

, } impl Tokens { - /// Create new `Tokens` with the given reference to the client. + /// Creates a new instance of the `Tokens` helper. pub fn new(client: Arc) -> Self { Self { client, @@ -43,43 +46,46 @@ pub enum Error { RuntimeError, } -impl From for i64 { - fn from(e: Error) -> i64 { +impl From for i32 { + fn from(e: Error) -> i32 { match e { Error::RuntimeError => 1, } } } -impl TokensApi<::Hash, CurrencyId, Balance> for Tokens +#[async_trait] +impl TokensApiServer<::Hash, CurrencyId, Balance> for Tokens where Block: BlockT, - C: Send + Sync + 'static + ProvideRuntimeApi + HeaderBackend, + C: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, C::Api: TokensRuntimeApi, - Balance: Codec + MaybeDisplay + Copy + TryInto + std::fmt::Debug, + Balance: Codec + MaybeDisplay + Copy + TryInto + Send + Sync + 'static, CurrencyId: Codec, { fn query_existential_deposit( &self, currency_id: CurrencyId, at: Option<::Hash>, - ) -> Result { + ) -> RpcResult { let api = self.client.runtime_api(); - let at = BlockId::hash(at.unwrap_or_else(|| - // If the block hash is not supplied assume the best block. - self.client.info().best_hash)); + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); - let balance = api.query_existential_deposit(&at, currency_id).map_err(|e| RpcError { - code: ErrorCode::ServerError(Error::RuntimeError.into()), - message: "Unable to query existential_deposit.".into(), - data: Some(format!("{:?}", e).into()), + let balance = api.query_existential_deposit(&at, currency_id).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::RuntimeError.into(), + "Unable to query existential deposit.", + Some(e.to_string()), + )) }); let try_into_rpc_balance = |value: Balance| { - value.try_into().map_err(|_| RpcError { - code: ErrorCode::InvalidParams, - message: format!("{} doesn't fit in NumberOrHex representation", value), - data: None, + value.try_into().map_err(|_| { + JsonRpseeError::Call(CallError::Custom(ErrorObject::owned( + ErrorCode::InvalidParams.code(), + format!("{} doesn't fit in NumberOrHex representation", value), + None::<()>, + ))) }) }; diff --git a/tokens/src/impls.rs b/tokens/src/impls.rs index 4c1b00dd8..f5a53d52e 100644 --- a/tokens/src/impls.rs +++ b/tokens/src/impls.rs @@ -48,11 +48,11 @@ where } } - fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance) -> DepositConsequence { + fn can_deposit(asset: Self::AssetId, who: &AccountId, amount: Self::Balance, mint: bool) -> DepositConsequence { if TestKey::contains(&asset) { - A::can_deposit(who, amount) + A::can_deposit(who, amount, mint) } else { - B::can_deposit(asset, who, amount) + B::can_deposit(asset, who, amount, mint) } } @@ -156,11 +156,12 @@ where ) } - fn can_deposit(who: &AccountId, amount: Self::Balance) -> DepositConsequence { + fn can_deposit(who: &AccountId, amount: Self::Balance, mint: bool) -> DepositConsequence { T::can_deposit( GetCurrencyId::get(), who, C::convert_balance_back(amount, GetCurrencyId::get()), + mint, ) } diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs index 30dae20c6..c7d73d7dc 100644 --- a/tokens/src/lib.rs +++ b/tokens/src/lib.rs @@ -1665,7 +1665,12 @@ impl fungibles::Inspect for Pallet { } } - fn can_deposit(asset_id: Self::AssetId, who: &T::AccountId, amount: Self::Balance) -> DepositConsequence { + fn can_deposit( + asset_id: Self::AssetId, + who: &T::AccountId, + amount: Self::Balance, + _mint: bool, + ) -> DepositConsequence { Self::deposit_consequence(who, asset_id, amount, &Self::accounts(who, asset_id)) } @@ -2156,8 +2161,8 @@ where fn reducible_balance(who: &T::AccountId, keep_alive: bool) -> Self::Balance { as fungibles::Inspect<_>>::reducible_balance(GetCurrencyId::get(), who, keep_alive) } - fn can_deposit(who: &T::AccountId, amount: Self::Balance) -> DepositConsequence { - as fungibles::Inspect<_>>::can_deposit(GetCurrencyId::get(), who, amount) + fn can_deposit(who: &T::AccountId, amount: Self::Balance, mint: bool) -> DepositConsequence { + as fungibles::Inspect<_>>::can_deposit(GetCurrencyId::get(), who, amount, mint) } fn can_withdraw(who: &T::AccountId, amount: Self::Balance) -> WithdrawConsequence { as fungibles::Inspect<_>>::can_withdraw(GetCurrencyId::get(), who, amount) diff --git a/tokens/src/tests_fungibles.rs b/tokens/src/tests_fungibles.rs index 2103ce1c6..69b862165 100644 --- a/tokens/src/tests_fungibles.rs +++ b/tokens/src/tests_fungibles.rs @@ -19,7 +19,7 @@ fn fungibles_inspect_trait_should_work() { >::reducible_balance(DOT, &ALICE, true), 98 ); - assert_ok!(>::can_deposit(DOT, &ALICE, 1).into_result()); + assert_ok!(>::can_deposit(DOT, &ALICE, 1, false).into_result()); assert_ok!(>::can_withdraw(DOT, &ALICE, 1).into_result()); }); } diff --git a/traits/Cargo.toml b/traits/Cargo.toml index b5c8d4681..33614dbbc 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } num-traits = { version = "0.2.14", default-features = false } impl-trait-for-tuples = "0.2.2" -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } [features] default = ["std"] diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 426139dbd..c1a933042 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -11,18 +11,18 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } orml-xcm-support = { path = "../xcm-support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index 2c386d808..f2b7f1e97 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -11,14 +11,14 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [dev-dependencies] serde_json = "1.0.64" -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index 67ac3db45..3f12d2d12 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -11,16 +11,16 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 3644585d2..3f01a7f9d 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -10,19 +10,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } weight-meter-procedural = { path = "weight-meter-procedural", default-features = false } [dev-dependencies] serde = { version = "1.0.136" } codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20"} -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22"} +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } [features] default = ["std"] diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index c7da8c6df..074c6d2e9 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -10,13 +10,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 787a955fd..7ea8dac72 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -10,16 +10,16 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } [dev-dependencies] -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } [features] default = ["std"] diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index 6bad714c6..5214ea674 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -11,40 +11,40 @@ edition = "2021" scale-info = { version = "2.1", default-features = false, features = ["derive"] } serde = { version = "1.0.136", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22", default-features = false } orml-xcm-support = { path = "../xcm-support", default-features = false } orml-traits = { path = "../traits", default-features = false} [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.20" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.20" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.22" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.20"} +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.22"} orml-tokens = { path = "../tokens" } orml-xcm = { path = "../xcm" }