diff --git a/Cargo.dev.toml b/Cargo.dev.toml
index 5428a6949..1b99160a3 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 = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-frame-support = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-frame-system = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-session = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sc-executor = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sc-utils = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-api = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-core = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-io = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-session = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-staking = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-std = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-storage = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-trie = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-version = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" }
+frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+frame-support = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+frame-system = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-session = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sc-executor = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sc-utils = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-api = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-core = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-io = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-session = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-staking = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-std = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-storage = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-trie = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-version = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "7a4e5163091384c4c10b6d76f5cb80dac0834f38" }
 
 [patch.'https://github.com/paritytech/cumulus']
-cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "5fc9081ff72bfe2bc2f013fc7f83208a86e6826a" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "5fc9081ff72bfe2bc2f013fc7f83208a86e6826a" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "5fc9081ff72bfe2bc2f013fc7f83208a86e6826a" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "5fc9081ff72bfe2bc2f013fc7f83208a86e6826a" }
-parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "5fc9081ff72bfe2bc2f013fc7f83208a86e6826a" }
+cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" }
+parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "a63ca3a370d0b1c2743b7d6fac4690a8a9ccff2d" }
 
 [patch.'https://github.com/paritytech/polkadot']
-pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-xcm = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
-xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "064536093f5ff70d867f4bbce8d4c41a406d317a" }
+pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+xcm = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
+xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "32dd0c9cfcd1a1bda821747f6ab334f0e3577558" }
diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml
index 27eaa1031..4970ad8d3 100644
--- a/asset-registry/Cargo.toml
+++ b/asset-registry/Cargo.toml
@@ -13,37 +13,37 @@ serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
 
 # substrate
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 # polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
 
 # orml
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
 # substrate
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 # cumulus
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
-xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
+xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
 
 # orml
 orml-tokens = { path = "../tokens" }
diff --git a/asset-registry/src/mock/mod.rs b/asset-registry/src/mock/mod.rs
index ac9caa126..a9eecb939 100644
--- a/asset-registry/src/mock/mod.rs
+++ b/asset-registry/src/mock/mod.rs
@@ -84,7 +84,7 @@ impl Convert<MultiLocation, Option<CurrencyId>> for CurrencyIdConvert {
 			},
 			_ => None,
 		};
-		currency_id.or_else(|| AssetRegistry::location_to_asset_id(&l).map(|id| CurrencyId::RegisteredAsset(id)))
+		currency_id.or_else(|| AssetRegistry::location_to_asset_id(&l).map(CurrencyId::RegisteredAsset))
 	}
 }
 impl Convert<MultiAsset, Option<CurrencyId>> for CurrencyIdConvert {
@@ -208,12 +208,9 @@ pub fn para_ext(para_id: u32, asset_data: Option<(Vec<(u32, Vec<u8>)>, u32)>) ->
 	.unwrap();
 
 	if let Some((assets, last_asset_id)) = asset_data {
-		GenesisConfig::<Runtime> {
-			assets: assets,
-			last_asset_id: last_asset_id,
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
+		GenesisConfig::<Runtime> { assets, last_asset_id }
+			.assimilate_storage(&mut t)
+			.unwrap();
 	}
 
 	let mut ext = TestExternalities::new(t);
diff --git a/asset-registry/src/tests.rs b/asset-registry/src/tests.rs
index a56999888..0ef593428 100644
--- a/asset-registry/src/tests.rs
+++ b/asset-registry/src/tests.rs
@@ -386,7 +386,7 @@ fn test_register_duplicate_location_returns_error() {
 			None
 		));
 		let register_asset = RuntimeCall::AssetRegistry(crate::Call::<para::Runtime>::register_asset {
-			metadata: metadata.clone(),
+			metadata,
 			asset_id: None,
 		});
 		assert_noop!(
@@ -446,7 +446,7 @@ fn test_update_metadata_works() {
 			Some(new_metadata.additional.clone())
 		));
 
-		let old_location: MultiLocation = old_metadata.location.clone().unwrap().try_into().unwrap();
+		let old_location: MultiLocation = old_metadata.location.unwrap().try_into().unwrap();
 		let new_location: MultiLocation = new_metadata.location.clone().unwrap().try_into().unwrap();
 
 		// check that the old location was removed and the new one added
@@ -463,11 +463,7 @@ fn test_update_metadata_fails_with_unknown_asset() {
 
 	ParaA::execute_with(|| {
 		let old_metadata = dummy_metadata();
-		assert_ok!(AssetRegistry::register_asset(
-			RuntimeOrigin::root(),
-			old_metadata.clone(),
-			None
-		));
+		assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), old_metadata, None));
 
 		assert_noop!(
 			AssetRegistry::update_asset(RuntimeOrigin::root(), 4, None, None, None, None, None, None,),
@@ -518,11 +514,7 @@ fn test_asset_authority() {
 		let metadata = dummy_metadata();
 
 		// Assert that root can register an asset with id 1
-		assert_ok!(AssetRegistry::register_asset(
-			RuntimeOrigin::root(),
-			metadata.clone(),
-			Some(1)
-		));
+		assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), metadata, Some(1)));
 
 		// Assert that only Account42 can register asset with id 42
 		let metadata = AssetMetadata {
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index 8ff6100ce..004c5c905 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -12,16 +12,16 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 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.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
index 6d8b44268..e0468a06b 100644
--- a/authority/Cargo.toml
+++ b/authority/Cargo.toml
@@ -9,19 +9,20 @@ edition = "2021"
 
 [dependencies]
 scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", optional = true }
+serde = { version = "1.0.145", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
@@ -31,6 +32,7 @@ std = [
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-io/std",
 	"frame-support/std",
 	"frame-system/std",
 ]
diff --git a/authority/src/lib.rs b/authority/src/lib.rs
index c895fd4ec..cc49a9074 100644
--- a/authority/src/lib.rs
+++ b/authority/src/lib.rs
@@ -25,9 +25,10 @@ use frame_support::{
 	dispatch::{DispatchClass, GetDispatchInfo, Pays},
 	pallet_prelude::*,
 	traits::{
-		schedule::{DispatchTime, Named as ScheduleNamed, Priority},
+		schedule::{v1::Named as ScheduleNamed, DispatchTime, Priority},
 		EitherOfDiverse, EnsureOrigin, Get, IsType, OriginTrait,
 	},
+	weights::OldWeight,
 };
 use frame_system::{pallet_prelude::*, EnsureRoot, EnsureSigned};
 use scale_info::TypeInfo;
@@ -413,6 +414,37 @@ pub mod module {
 			})
 		}
 
+		#[pallet::weight((
+			T::WeightInfo::trigger_call().saturating_add((*call_weight_bound).into()),
+			DispatchClass::Operational,
+		))]
+		#[allow(deprecated)]
+		#[deprecated(note = "1D weight is used in this extrinsic, please migrate to `trigger_call`")]
+		pub fn trigger_old_call(
+			origin: OriginFor<T>,
+			hash: T::Hash,
+			#[pallet::compact] call_weight_bound: OldWeight,
+		) -> DispatchResultWithPostInfo {
+			let call_weight_bound: Weight = call_weight_bound.into();
+			let who = ensure_signed(origin)?;
+			SavedCalls::<T>::try_mutate_exists(hash, |maybe_call| {
+				let (call, maybe_caller) = maybe_call.take().ok_or(Error::<T>::CallNotAuthorized)?;
+				if let Some(caller) = maybe_caller {
+					ensure!(who == caller, Error::<T>::TriggerCallNotPermitted);
+				}
+				ensure!(
+					call_weight_bound.ref_time() >= call.get_dispatch_info().weight.ref_time(),
+					Error::<T>::WrongCallWeightBound
+				);
+				let result = call.dispatch(OriginFor::<T>::root());
+				Self::deposit_event(Event::TriggeredCallBy { hash, caller: who });
+				Self::deposit_event(Event::Dispatched {
+					result: result.map(|_| ()).map_err(|e| e.error),
+				});
+				Ok(Pays::No.into())
+			})
+		}
+
 		#[pallet::weight((
 			T::WeightInfo::trigger_call().saturating_add(*call_weight_bound),
 			DispatchClass::Operational,
@@ -420,7 +452,7 @@ pub mod module {
 		pub fn trigger_call(
 			origin: OriginFor<T>,
 			hash: T::Hash,
-			#[pallet::compact] call_weight_bound: Weight,
+			call_weight_bound: Weight,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			SavedCalls::<T>::try_mutate_exists(hash, |maybe_call| {
diff --git a/authority/src/mock.rs b/authority/src/mock.rs
index 760e3ba05..1301ba0cc 100644
--- a/authority/src/mock.rs
+++ b/authority/src/mock.rs
@@ -24,7 +24,7 @@ pub type BlockNumber = u64;
 
 parameter_types! {
 	pub BlockWeights: frame_system::limits::BlockWeights =
-			frame_system::limits::BlockWeights::simple_max(Weight::from_ref_time(2_000_000_000_000));
+			frame_system::limits::BlockWeights::simple_max(Weight::from_ref_time(2_000_000_000_000).set_proof_size(u64::MAX));
 }
 
 impl frame_system::Config for Runtime {
@@ -39,7 +39,7 @@ impl frame_system::Config for Runtime {
 	type Header = Header;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
-	type BlockWeights = ();
+	type BlockWeights = BlockWeights;
 	type BlockLength = ();
 	type Version = ();
 	type PalletInfo = PalletInfo;
@@ -54,10 +54,17 @@ impl frame_system::Config for Runtime {
 	type MaxConsumers = ConstU32<16>;
 }
 
+impl pallet_preimage::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = ();
+	type Currency = ();
+	type ManagerOrigin = EnsureRoot<u128>;
+	type BaseDeposit = ();
+	type ByteDeposit = ();
+}
+
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
-	// Retry a scheduled item every 10 blocks (1 minute) until the preimage exists.
-	pub const NoPreimagePostponement: Option<u64> = Some(10);
 }
 impl pallet_scheduler::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
@@ -66,11 +73,10 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type MaximumWeight = MaximumSchedulerWeight;
 	type ScheduleOrigin = EnsureRoot<u128>;
-	type MaxScheduledPerBlock = ();
+	type MaxScheduledPerBlock = ConstU32<10>;
 	type WeightInfo = ();
 	type OriginPrivilegeCmp = EqualPrivilegeOnly;
-	type PreimageProvider = ();
-	type NoPreimagePostponement = NoPreimagePostponement;
+	type Preimages = Preimage;
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, Ord, PartialOrd, Debug, TypeInfo)]
@@ -175,6 +181,7 @@ frame_support::construct_runtime!(
 		System: frame_system::{Pallet, Call, Config, Event<T>},
 		Authority: authority::{Pallet, Call, Origin<T>, Event<T>},
 		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
+		Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>},
 	}
 );
 
diff --git a/authority/src/tests.rs b/authority/src/tests.rs
index 1cb2cb36c..f44c2a840 100644
--- a/authority/src/tests.rs
+++ b/authority/src/tests.rs
@@ -13,6 +13,7 @@ use mock::{
 	authority, run_to_block, Authority, BlockNumber, ExtBuilder, MockAsOriginId, OriginCaller, Runtime, RuntimeCall,
 	RuntimeOrigin, System,
 };
+use sp_io::hashing::blake2_256;
 use sp_runtime::{traits::BadOrigin, Perbill};
 
 #[test]
@@ -57,7 +58,9 @@ fn dispatch_as_work() {
 #[test]
 fn schedule_dispatch_at_work() {
 	ExtBuilder::default().build().execute_with(|| {
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -93,7 +96,7 @@ fn schedule_dispatch_at_work() {
 		System::assert_last_event(mock::RuntimeEvent::Scheduler(
 			pallet_scheduler::Event::<Runtime>::Dispatched {
 				task: (2, 0),
-				id: Some([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].to_vec()),
+				id: Some(blake2_256([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].as_ref())),
 				result: Ok(()),
 			},
 		));
@@ -115,7 +118,7 @@ fn schedule_dispatch_at_work() {
 		System::assert_last_event(mock::RuntimeEvent::Scheduler(
 			pallet_scheduler::Event::<Runtime>::Dispatched {
 				task: (3, 0),
-				id: Some([0, 0, 1, 0, 0, 0].to_vec()),
+				id: Some(blake2_256([0, 0, 1, 0, 0, 0].as_ref())),
 				result: Ok(()),
 			},
 		));
@@ -125,7 +128,9 @@ fn schedule_dispatch_at_work() {
 #[test]
 fn schedule_dispatch_after_work() {
 	ExtBuilder::default().build().execute_with(|| {
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -161,7 +166,7 @@ fn schedule_dispatch_after_work() {
 		System::assert_last_event(mock::RuntimeEvent::Scheduler(
 			pallet_scheduler::Event::<Runtime>::Dispatched {
 				task: (2, 0),
-				id: Some([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].to_vec()),
+				id: Some(blake2_256([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0].as_ref())),
 				result: Ok(()),
 			},
 		));
@@ -183,7 +188,7 @@ fn schedule_dispatch_after_work() {
 		System::assert_last_event(mock::RuntimeEvent::Scheduler(
 			pallet_scheduler::Event::<Runtime>::Dispatched {
 				task: (3, 0),
-				id: Some([0, 0, 1, 0, 0, 0].to_vec()),
+				id: Some(blake2_256([0, 0, 1, 0, 0, 0].as_ref())),
 				result: Ok(()),
 			},
 		));
@@ -194,7 +199,9 @@ fn schedule_dispatch_after_work() {
 fn fast_track_scheduled_dispatch_work() {
 	ExtBuilder::default().build().execute_with(|| {
 		System::set_block_number(1);
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -271,7 +278,9 @@ fn fast_track_scheduled_dispatch_work() {
 fn delay_scheduled_dispatch_work() {
 	ExtBuilder::default().build().execute_with(|| {
 		System::set_block_number(1);
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -347,7 +356,9 @@ fn delay_scheduled_dispatch_work() {
 #[test]
 fn cancel_scheduled_dispatch_work() {
 	ExtBuilder::default().build().execute_with(|| {
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -430,7 +441,9 @@ fn call_size_limit() {
 fn authorize_call_works() {
 	ExtBuilder::default().build().execute_with(|| {
 		run_to_block(1);
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -455,7 +468,7 @@ fn authorize_call_works() {
 			Box::new(call.clone()),
 			Some(1)
 		));
-		assert_eq!(Authority::saved_calls(&hash), Some((call.clone(), Some(1))));
+		assert_eq!(Authority::saved_calls(&hash), Some((call, Some(1))));
 		System::assert_last_event(mock::RuntimeEvent::Authority(Event::AuthorizedCall {
 			hash,
 			caller: Some(1),
@@ -467,7 +480,9 @@ fn authorize_call_works() {
 fn trigger_call_works() {
 	ExtBuilder::default().build().execute_with(|| {
 		run_to_block(1);
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -522,7 +537,7 @@ fn trigger_call_works() {
 			Authority::trigger_call(RuntimeOrigin::signed(2), hash, call_weight_bound),
 			Error::<Runtime>::TriggerCallNotPermitted
 		);
-		assert_eq!(Authority::saved_calls(&hash), Some((call.clone(), Some(1))));
+		assert_eq!(Authority::saved_calls(&hash), Some((call, Some(1))));
 
 		// caller 1 triggering the call
 		assert_ok!(Authority::trigger_call(
@@ -543,7 +558,9 @@ fn trigger_call_works() {
 fn remove_authorized_call_works() {
 	ExtBuilder::default().build().execute_with(|| {
 		run_to_block(1);
-		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let call = RuntimeCall::Authority(authority::Call::dispatch_as {
 			as_origin: MockAsOriginId::Root,
 			call: Box::new(ensure_root_call),
@@ -585,7 +602,7 @@ fn remove_authorized_call_works() {
 			Authority::remove_authorized_call(RuntimeOrigin::signed(2), hash),
 			Error::<Runtime>::CallNotAuthorized
 		);
-		assert_eq!(Authority::saved_calls(&hash), Some((call.clone(), Some(1))));
+		assert_eq!(Authority::saved_calls(&hash), Some((call, Some(1))));
 		assert_ok!(Authority::remove_authorized_call(RuntimeOrigin::signed(1), hash));
 		assert_eq!(Authority::saved_calls(&hash), None);
 	});
@@ -594,7 +611,9 @@ fn remove_authorized_call_works() {
 #[test]
 fn trigger_call_should_be_free_and_operational() {
 	ExtBuilder::default().build().execute_with(|| {
-		let call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::one() });
+		let call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
 		let hash = <Runtime as frame_system::Config>::Hashing::hash_of(&call);
 		let call_weight_bound = call.get_dispatch_info().weight;
 		let trigger_call = RuntimeCall::Authority(authority::Call::trigger_call {
@@ -622,7 +641,49 @@ fn trigger_call_should_be_free_and_operational() {
 
 		// successfull call doesn't pay fee
 		assert_eq!(
-			trigger_call.clone().dispatch(RuntimeOrigin::signed(1)),
+			trigger_call.dispatch(RuntimeOrigin::signed(1)),
+			Ok(PostDispatchInfo {
+				actual_weight: None,
+				pays_fee: Pays::No
+			})
+		);
+	});
+}
+
+#[test]
+fn trigger_old_call_should_be_free_and_operational() {
+	ExtBuilder::default().build().execute_with(|| {
+		let call = RuntimeCall::System(frame_system::Call::fill_block {
+			ratio: Perbill::from_percent(50),
+		});
+		let hash = <Runtime as frame_system::Config>::Hashing::hash_of(&call);
+		let call_weight_bound: OldWeight = OldWeight(call.get_dispatch_info().weight.ref_time());
+		let trigger_old_call = RuntimeCall::Authority(authority::Call::trigger_old_call {
+			hash,
+			call_weight_bound,
+		});
+
+		assert_ok!(Authority::authorize_call(
+			RuntimeOrigin::root(),
+			Box::new(call),
+			Some(1)
+		));
+
+		// bad caller pays fee
+		assert_eq!(
+			trigger_old_call.clone().dispatch(RuntimeOrigin::signed(2)),
+			Err(DispatchErrorWithPostInfo {
+				post_info: PostDispatchInfo {
+					actual_weight: None,
+					pays_fee: Pays::Yes
+				},
+				error: Error::<Runtime>::TriggerCallNotPermitted.into()
+			})
+		);
+
+		// successfull call doesn't pay fee
+		assert_eq!(
+			trigger_old_call.dispatch(RuntimeOrigin::signed(1)),
 			Ok(PostDispatchInfo {
 				actual_weight: None,
 				pays_fee: Pays::No
diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml
index 72e569b12..6797f18ee 100644
--- a/bencher/Cargo.toml
+++ b/bencher/Cargo.toml
@@ -26,18 +26,18 @@ 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.30" }
-sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.30" }
-sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.30" }
-sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.30" }
-sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.30" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.31" }
+sc-executor = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["wasmtime"], optional = true , branch = "polkadot-v0.9.31" }
+sc-executor-common = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.31" }
+sc-client-db = { git = "https://github.com/paritytech/substrate", default-features = false, features = ["rocksdb"], optional = true , branch = "polkadot-v0.9.31" }
+sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.31" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/bencher/test/Cargo.toml b/bencher/test/Cargo.toml
index 5b4459a63..0c0ab28e3 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.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 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.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
index a28745289..c0e50e798 100644
--- a/benchmarking/Cargo.toml
+++ b/benchmarking/Cargo.toml
@@ -14,19 +14,19 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 log = { version = "0.4.17", default-features = false }
 
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-storage = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [dev-dependencies]
 hex-literal = "0.3.4"
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = [ "std" ]
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index c2c696a0c..68cdf1ee9 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 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.30" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 orml_tokens = { package = "orml-tokens", path = "../tokens", version = "0.4.1-dev" }
 
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
index 64a398a7a..62bd4da68 100644
--- a/currencies/src/mock.rs
+++ b/currencies/src/mock.rs
@@ -131,16 +131,11 @@ pub const ID_1: LockIdentifier = *b"1       ";
 pub const RID_1: ReserveIdentifier = [1u8; 8];
 pub const RID_2: ReserveIdentifier = [2u8; 8];
 
+#[derive(Default)]
 pub struct ExtBuilder {
 	balances: Vec<(AccountId, CurrencyId, Balance)>,
 }
 
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self { balances: vec![] }
-	}
-}
-
 impl ExtBuilder {
 	pub fn balances(mut self, balances: Vec<(AccountId, CurrencyId, Balance)>) -> Self {
 		self.balances = balances;
diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml
index e36ff5d38..93591c3e8 100644
--- a/gradually-update/Cargo.toml
+++ b/gradually-update/Cargo.toml
@@ -12,12 +12,12 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/gradually-update/src/tests.rs b/gradually-update/src/tests.rs
index 6cef7bf6f..17f84b84e 100644
--- a/gradually-update/src/tests.rs
+++ b/gradually-update/src/tests.rs
@@ -8,14 +8,14 @@ use frame_support::{assert_noop, assert_ok};
 use mock::*;
 use sp_runtime::{FixedPointNumber, FixedU128, Permill};
 
-fn storage_set(key: &Vec<u8>, value: &Vec<u8>) {
+fn storage_set(key: &[u8], value: &[u8]) {
 	// let bounded_key: StorageValueBytes<Runtime> =
 	// key.to_vec().try_into().unwrap(); let bounded_value:
 	// StorageValueBytes<Runtime> = key.to_vec().try_into().unwrap();
 	frame_support::storage::unhashed::put(key, value);
 }
 
-fn storage_get(key: &Vec<u8>) -> StorageValueBytes<Runtime> {
+fn storage_get(key: &[u8]) -> StorageValueBytes<Runtime> {
 	frame_support::storage::unhashed::get::<StorageValueBytes<Runtime>>(key).unwrap_or_default()
 }
 
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
index 96cccd5db..8b408a4b6 100644
--- a/nft/Cargo.toml
+++ b/nft/Cargo.toml
@@ -12,14 +12,14 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index 255bd1992..a5c51f564 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 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", default-features = false , branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml
index 44a7f74cf..2508a5c3a 100644
--- a/oracle/rpc/Cargo.toml
+++ b/oracle/rpc/Cargo.toml
@@ -12,8 +12,8 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
 tracing = { version = "0.1.29" }
 tracing-core = { version = "0.1.28" }
 
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 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 2e1ae565f..d3d7f6a0a 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/payments/Cargo.toml b/payments/Cargo.toml
index 9cb36750e..81044bc0a 100644
--- a/payments/Cargo.toml
+++ b/payments/Cargo.toml
@@ -12,20 +12,20 @@ readme = "README.md"
 [dependencies]
 parity-scale-codec = { version = "3.1.5", default-features = false, features = ["max-encoded-len"] }
 log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 orml-traits = {path = "../traits", version = "0.4.1-dev", default-features = false }
 
 [dev-dependencies]
 serde = { version = "1.0.136" }
 
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 orml-tokens = { path = "../tokens", version = "0.4.1-dev", default-features = false }
 
diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml
index 5ce213661..27e15bb17 100644
--- a/rewards/Cargo.toml
+++ b/rewards/Cargo.toml
@@ -12,17 +12,17 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 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.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 71cc09f6c..e6573be1f 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 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.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/tokens/rpc/Cargo.toml b/tokens/rpc/Cargo.toml
index 348026496..758ccb05c 100644
--- a/tokens/rpc/Cargo.toml
+++ b/tokens/rpc/Cargo.toml
@@ -12,11 +12,11 @@ jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
 tracing = { version = "0.1.29" }
 tracing-core = { version = "0.1.28" }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 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 e9ee82f1c..5440d6b6e 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-api = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 orml-tokens = { default-features = false, path = "../../../tokens" }
 
 [features]
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
index 0a4346a27..74e962d86 100644
--- a/tokens/src/mock.rs
+++ b/tokens/src/mock.rs
@@ -282,7 +282,7 @@ impl<T: Config> OnSlash<T::AccountId, CurrencyId, Balance> for OnSlashHook<T> {
 }
 impl<T: Config> OnSlashHook<T> {
 	pub fn calls() -> u32 {
-		ON_SLASH_CALLS.with(|accounts| accounts.borrow().clone())
+		ON_SLASH_CALLS.with(|accounts| *accounts.borrow())
 	}
 }
 
@@ -295,7 +295,7 @@ impl<T: Config> OnDeposit<T::AccountId, CurrencyId, Balance> for OnDepositHook<T
 }
 impl<T: Config> OnDepositHook<T> {
 	pub fn calls() -> u32 {
-		ON_DEPOSIT_CALLS.with(|accounts| accounts.borrow().clone())
+		ON_DEPOSIT_CALLS.with(|accounts| *accounts.borrow())
 	}
 }
 
@@ -313,7 +313,7 @@ impl<T: Config> OnTransfer<T::AccountId, CurrencyId, Balance> for OnTransferHook
 }
 impl<T: Config> OnTransferHook<T> {
 	pub fn calls() -> u32 {
-		ON_TRANSFER_CALLS.with(|accounts| accounts.borrow().clone())
+		ON_TRANSFER_CALLS.with(|accounts| *accounts.borrow())
 	}
 }
 
@@ -357,20 +357,12 @@ construct_runtime!(
 	}
 );
 
+#[derive(Default)]
 pub struct ExtBuilder {
 	balances: Vec<(AccountId, CurrencyId, Balance)>,
 	treasury_genesis: bool,
 }
 
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self {
-			balances: vec![],
-			treasury_genesis: false,
-		}
-	}
-}
-
 impl ExtBuilder {
 	pub fn balances(mut self, mut balances: Vec<(AccountId, CurrencyId, Balance)>) -> Self {
 		self.balances.append(&mut balances);
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 4659413b4..6acc8c615 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -14,12 +14,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 num-traits = { version = "0.2.14", default-features = false }
 impl-trait-for-tuples = "0.2.2"
 
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
 
 orml-utilities = { path = "../utilities", version = "0.4.1-dev", default-features = false }
 
diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml
index a4c4f75f2..07c8a610e 100644
--- a/unknown-tokens/Cargo.toml
+++ b/unknown-tokens/Cargo.toml
@@ -12,18 +12,18 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
 
 orml-xcm-support = { path = "../xcm-support", default-features = false }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index bd916aebd..4f4175652 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -12,15 +12,15 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive"
 serde = { version = "1.0.136", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [dev-dependencies]
 serde_json = "1.0.64"
 
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/utilities/src/ordered_set.rs b/utilities/src/ordered_set.rs
index b137fbe37..f54151824 100644
--- a/utilities/src/ordered_set.rs
+++ b/utilities/src/ordered_set.rs
@@ -25,7 +25,7 @@ impl<T: Ord + Encode + Decode + MaxEncodedLen + Clone + Eq + PartialEq, S: Get<u
 		v.sort();
 		v.dedup();
 
-		Self::from_sorted_set(v.try_into().expect("Did not add any values"))
+		Self::from_sorted_set(v.try_into().map_err(|_| ()).expect("Did not add any values"))
 	}
 
 	/// Create a set from a `Vec`.
@@ -92,9 +92,9 @@ mod tests {
 	use sp_runtime::RuntimeDebug;
 
 	parameter_types! {
-		#[derive(PartialEq, RuntimeDebug)]
+		#[derive(PartialEq, Eq, RuntimeDebug)]
 		pub const Eight: u32 = 8;
-		#[derive(PartialEq, RuntimeDebug)]
+		#[derive(PartialEq, Eq, RuntimeDebug)]
 		pub const Five: u32 = 5;
 	}
 
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
index 2b40e7b05..f406347ee 100644
--- a/vesting/Cargo.toml
+++ b/vesting/Cargo.toml
@@ -12,15 +12,15 @@ scale-info = { version = "2.1.2", 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", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/weight-gen/Cargo.toml b/weight-gen/Cargo.toml
index bc24c6526..d2d206196 100644
--- a/weight-gen/Cargo.toml
+++ b/weight-gen/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 [dependencies]
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0"
-clap = "2.33.3"
+clap = "4.0.9"
 handlebars = { version = "4.1.0" }
 
 [features]
diff --git a/weight-gen/src/main.rs b/weight-gen/src/main.rs
index b6c61f670..7fdf90211 100644
--- a/weight-gen/src/main.rs
+++ b/weight-gen/src/main.rs
@@ -1,4 +1,4 @@
-use clap::{App, Arg};
+use clap::{Arg, Command};
 use serde::{Deserialize, Serialize};
 use std::io::Read;
 
@@ -102,45 +102,45 @@ fn parse_stdio() -> Option<Vec<BenchData>> {
 }
 
 fn main() {
-	let matches = App::new("Weight Generator")
+	let matches = Command::new("Weight Generator")
 		.version("1.0")
 		.author("Laminar Developers <hello@laminar.one>")
 		.about("Generate rust weight info source file from JSON data generated by ORML bencher")
 		.arg(
-			Arg::with_name("input")
-				.short("i")
+			Arg::new("input")
+				.short('i')
 				.long("input")
 				.value_name("PATH")
 				.help("Input JSON data file")
-				.takes_value(true),
+				.num_args(1),
 		)
 		.arg(
-			Arg::with_name("template")
-				.short("t")
+			Arg::new("template")
+				.short('t')
 				.long("template")
 				.value_name("PATH")
 				.help("Handlebars template file")
-				.takes_value(true),
+				.num_args(1),
 		)
 		.arg(
-			Arg::with_name("header")
+			Arg::new("header")
 				.long("header")
 				.value_name("PATH")
 				.help("Header file path")
-				.takes_value(true),
+				.num_args(1),
 		)
 		.arg(
-			Arg::with_name("output")
-				.short("o")
+			Arg::new("output")
+				.short('o')
 				.long("output")
 				.value_name("PATH")
 				.help("Output file path")
-				.takes_value(true),
+				.num_args(1),
 		)
 		.get_matches();
 
 	let mut benchmarks: Vec<BenchData> = {
-		if let Some(input_path) = matches.value_of("input") {
+		if let Some(input_path) = matches.get_one::<String>("input") {
 			let reader = std::fs::File::open(std::path::Path::new(&input_path.trim())).unwrap();
 			serde_json::from_reader(&reader).expect("Could not parse JSON data")
 		} else {
@@ -161,7 +161,7 @@ fn main() {
 
 	// Use empty header if a header path is not given.
 	let header = {
-		if let Some(path) = matches.value_of("header") {
+		if let Some(path) = matches.get_one::<String>("header") {
 			::std::fs::read_to_string(&path).expect("Header file not found")
 		} else {
 			String::from("")
@@ -174,7 +174,7 @@ fn main() {
 
 	// Use default template if template path is not given.
 	let template = {
-		if let Some(path) = matches.value_of("template") {
+		if let Some(path) = matches.get_one::<String>("template") {
 			::std::fs::read_to_string(&path).expect("Template file not found")
 		} else {
 			String::from(DEFAULT_TEMPLATE)
@@ -182,7 +182,7 @@ fn main() {
 	};
 
 	// Write benchmark to file or print to terminal if output path is not given.
-	if let Some(path) = matches.value_of("output") {
+	if let Some(path) = matches.get_one::<String>("output") {
 		let mut output_file = ::std::fs::File::create(&path).expect("Could not create output file");
 
 		handlebars
diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml
index 0b9c67954..922db6c53 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.2", default-features = false, features = ["derive"] }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 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.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/weight-meter/src/tests.rs b/weight-meter/src/tests.rs
index 97d08a16f..3c261ee2e 100644
--- a/weight-meter/src/tests.rs
+++ b/weight-meter/src/tests.rs
@@ -47,7 +47,7 @@ fn exceed_max_weight_works() {
 	new_test_ext().execute_with(|| {
 		let result: PostDispatchInfo = TestModule::expect_max_weight(RuntimeOrigin::signed(100)).unwrap();
 		// Check used weight is correct
-		assert_eq!(Some(Weight::MAX), result.actual_weight);
+		assert_eq!(Some(Weight::from_ref_time(u64::MAX)), result.actual_weight);
 	});
 }
 
diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml
index 2e1878fde..d3e1e0b51 100644
--- a/xcm-support/Cargo.toml
+++ b/xcm-support/Cargo.toml
@@ -10,12 +10,12 @@ edition = "2021"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
 
 orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
 
diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml
index b40c1f232..6b75f3cee 100644
--- a/xcm/Cargo.toml
+++ b/xcm/Cargo.toml
@@ -11,15 +11,15 @@ edition = "2021"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
 
 [dev-dependencies]
-xcm-executor  = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
+xcm-executor  = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
 
 [features]
 default = ["std"]
diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml
index 4b3db69db..78e660234 100644
--- a/xtokens/Cargo.toml
+++ b/xtokens/Cargo.toml
@@ -13,19 +13,19 @@ serde = { version = "1.0.136", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
 
 # substrate
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.30" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.31" }
 
 # cumulus
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.30" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false , branch = "polkadot-v0.9.31" }
 
 # polkadot
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.30" }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "release-v0.9.31" }
 
 # orml
 orml-xcm-support = { path = "../xcm-support", default-features = false }
@@ -33,21 +33,21 @@ orml-traits = { path = "../traits", default-features = false}
 
 [dev-dependencies]
 # substrate
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" }
 
 # cumulus
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
-parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
+parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" }
 
 # polkadot
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
-xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
+xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" }
 
 # orml
 orml-tokens = { path = "../tokens" }