diff --git a/Cargo.lock b/Cargo.lock
index 1c9a691ee0..9ec5a981dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -57,7 +57,7 @@ dependencies = [
  "aes",
  "block-cipher",
  "ghash",
- "subtle 2.4.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -87,6 +87,17 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
 
+[[package]]
+name = "ahash"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+dependencies = [
+ "getrandom 0.2.3",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -122,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61"
+checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486"
 
 [[package]]
 name = "approx"
@@ -893,9 +904,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 dependencies = [
  "jobserver",
 ]
@@ -1082,12 +1093,11 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "cpp_demangle"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390"
+checksum = "8ea47428dc9d2237f3c6bc134472edfd63ebba0af932e783506dcfd66f10d18a"
 dependencies = [
  "cfg-if 1.0.0",
- "glob",
 ]
 
 [[package]]
@@ -1323,7 +1333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.4",
- "subtle 2.4.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -1473,7 +1483,7 @@ name = "cumulus-client-network"
 version = "0.1.0"
 source = "git+https://github.com/paritytech//cumulus?rev=4e51d32fdc4636f2d207204a25534e01d5fddf75#4e51d32fdc4636f2d207204a25534e01d5fddf75"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "futures-timer 3.0.2",
  "parity-scale-codec",
@@ -1735,14 +1745,14 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434e1720189a637d44fe464f4df1e6eb900b4835255b14354497c78af37d9bb8"
+checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216"
 dependencies = [
  "byteorder",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle 2.4.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -1755,7 +1765,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.4.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -1815,19 +1825,20 @@ dependencies = [
  "proc-macro2 0.4.30",
  "quote 0.6.13",
  "regex",
- "rustc_version",
+ "rustc_version 0.2.3",
  "syn 0.15.44",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.14"
+version = "0.99.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320"
+checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df"
 dependencies = [
  "convert_case",
  "proc-macro2 1.0.27",
  "quote 1.0.9",
+ "rustc_version 0.3.3",
  "syn 1.0.73",
 ]
 
@@ -2173,9 +2184,9 @@ dependencies = [
 
 [[package]]
 name = "finality-grandpa"
-version = "0.14.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c29b0f7ece4ac0afa32edd8ab1c1c8fec9f0ea1d8c92107e829150ae156854e"
+checksum = "74a1bfdcc776e63e49f741c7ce6116fa1b887e8ac2e3ccb14dd4aa113e54feb9"
 dependencies = [
  "either",
  "futures 0.3.15",
@@ -2814,7 +2825,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
 dependencies = [
- "ahash",
+ "ahash 0.4.7",
 ]
 
 [[package]]
@@ -2822,6 +2833,9 @@ name = "hashbrown"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash 0.7.4",
+]
 
 [[package]]
 name = "heck"
@@ -2859,9 +2873,9 @@ dependencies = [
 
 [[package]]
 name = "hex-literal"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76505e26b6ca3bbdbbb360b68472abbb80998c5fa5dc43672eca34f28258e138"
+checksum = "21e4590e13640f19f249fe3e4eca5113bc4289f2497710378190e7f4bd96f45b"
 
 [[package]]
 name = "hex-literal-impl"
@@ -3025,7 +3039,7 @@ dependencies = [
  "itoa",
  "log",
  "net2",
- "rustc_version",
+ "rustc_version 0.2.3",
  "time",
  "tokio 0.1.22",
  "tokio-buf",
@@ -3064,9 +3078,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.9"
+version = "0.14.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83"
+checksum = "7728a72c4c7d72665fde02204bcbd93b247721025b222ef78606f14513e0fd03"
 dependencies = [
  "bytes 1.0.1",
  "futures-channel",
@@ -3078,7 +3092,7 @@ dependencies = [
  "httpdate 1.0.1",
  "itoa",
  "pin-project-lite 0.2.7",
- "tokio 1.7.1",
+ "tokio 1.8.1",
  "tower-service",
  "tracing",
  "want 0.3.0",
@@ -3163,9 +3177,9 @@ dependencies = [
 
 [[package]]
 name = "impl-codec"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df170efa359aebdd5cb7fe78edcc67107748e4737bdca8a8fb40d15ea7a877ed"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -3212,9 +3226,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -3464,7 +3478,7 @@ dependencies = [
  "beef",
  "futures-channel",
  "futures-util",
- "hyper 0.14.9",
+ "hyper 0.14.10",
  "log",
  "serde",
  "serde_json",
@@ -3527,7 +3541,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "log",
  "max-encoded-len",
  "pallet-authority-discovery",
@@ -3665,9 +3679,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.97"
+version = "0.2.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
 
 [[package]]
 name = "libloading"
@@ -4153,7 +4167,7 @@ dependencies = [
  "hmac-drbg",
  "rand 0.7.3",
  "sha2 0.8.2",
- "subtle 2.4.0",
+ "subtle 2.4.1",
  "typenum",
 ]
 
@@ -4388,7 +4402,7 @@ name = "metered-channel"
 version = "0.1.0"
 source = "git+https://github.com/paritytech//polkadot?rev=3a10ee63c0b5703a1c802db3438ab7e01344a8ce#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "futures-timer 3.0.2",
 ]
@@ -4827,7 +4841,7 @@ dependencies = [
 [[package]]
 name = "orml-unknown-tokens"
 version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#443ee91bc2ca5f1fc155c0378eef6e89b67e2e97"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=master#8f0d824fb33e6430282453e45c4a64b89dc5a44a"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5830,7 +5844,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "hex",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "log",
  "orml-currencies",
  "orml-tokens",
@@ -6013,9 +6027,9 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
 
 [[package]]
 name = "parity-ws"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61"
+checksum = "322d72dfe461b8b9e367d057ceace105379d64d5b03907d23c481ccf3fbf8aa4"
 dependencies = [
  "byteorder",
  "bytes 0.4.12",
@@ -6043,7 +6057,7 @@ checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
  "lock_api 0.3.4",
  "parking_lot_core 0.6.2",
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -6077,7 +6091,7 @@ dependencies = [
  "cloudabi",
  "libc",
  "redox_syscall 0.1.57",
- "rustc_version",
+ "rustc_version 0.2.3",
  "smallvec 0.6.14",
  "winapi 0.3.9",
 ]
@@ -6573,7 +6587,7 @@ version = "0.1.0"
 source = "git+https://github.com/paritytech//polkadot?rev=3a10ee63c0b5703a1c802db3438ab7e01344a8ce#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
 dependencies = [
  "bitvec",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "futures-timer 3.0.2",
  "kvdb",
@@ -6826,7 +6840,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=3a10ee63c0b5703a1c802d
 dependencies = [
  "async-std",
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "futures-timer 3.0.2",
  "lazy_static",
@@ -6901,7 +6915,7 @@ name = "polkadot-parachain"
 version = "0.9.8"
 source = "git+https://github.com/paritytech//polkadot?rev=3a10ee63c0b5703a1c802db3438ab7e01344a8ce#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "parity-scale-codec",
  "parity-util-mem",
  "polkadot-core-primitives",
@@ -6918,7 +6932,7 @@ source = "git+https://github.com/paritytech//polkadot?rev=3a10ee63c0b5703a1c802d
 dependencies = [
  "bitvec",
  "frame-system",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "parity-scale-codec",
  "parity-util-mem",
  "polkadot-core-primitives",
@@ -7011,7 +7025,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "log",
  "max-encoded-len",
  "pallet-authority-discovery",
@@ -7123,7 +7137,7 @@ version = "0.9.8"
 source = "git+https://github.com/paritytech//polkadot?rev=3a10ee63c0b5703a1c802db3438ab7e01344a8ce#3a10ee63c0b5703a1c802db3438ab7e01344a8ce"
 dependencies = [
  "bitvec",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7166,7 +7180,7 @@ dependencies = [
  "beefy-primitives",
  "frame-system-rpc-runtime-api",
  "futures 0.3.15",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "kusama-runtime",
  "kvdb",
  "kvdb-rocksdb",
@@ -7429,9 +7443,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
 
 [[package]]
 name = "primitive-types"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace"
+checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -7866,7 +7880,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "fs-err",
  "itertools 0.10.1",
  "static_init",
@@ -8033,7 +8047,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "log",
  "max-encoded-len",
  "pallet-authority-discovery",
@@ -8125,6 +8139,15 @@ dependencies = [
  "semver 0.9.0",
 ]
 
+[[package]]
+name = "rustc_version"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+dependencies = [
+ "semver 0.11.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.18.1"
@@ -8208,7 +8231,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
 [[package]]
@@ -8247,7 +8270,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "either",
  "futures 0.3.15",
  "futures-timer 3.0.2",
@@ -8383,7 +8406,7 @@ name = "sc-client-api"
 version = "3.0.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "fnv",
  "futures 0.3.15",
  "hash-db",
@@ -8461,7 +8484,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "futures-timer 3.0.2",
  "log",
@@ -8492,7 +8515,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "fork-tree",
  "futures 0.3.15",
  "futures-timer 3.0.2",
@@ -8537,7 +8560,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8624,7 +8647,7 @@ name = "sc-executor"
 version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "lazy_static",
  "libsecp256k1",
  "log",
@@ -8653,7 +8676,7 @@ name = "sc-executor-common"
 version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "parity-scale-codec",
  "pwasm-utils",
  "sc-allocator",
@@ -8705,7 +8728,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "dyn-clone",
  "finality-grandpa",
  "fork-tree",
@@ -8745,7 +8768,7 @@ name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "finality-grandpa",
  "futures 0.3.15",
  "jsonrpc-core",
@@ -8769,7 +8792,7 @@ name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "log",
  "num-traits",
@@ -8809,7 +8832,7 @@ version = "3.0.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "futures-util",
  "hex",
@@ -8820,7 +8843,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "subtle 2.4.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -8873,7 +8896,7 @@ dependencies = [
  "bs58",
  "bytes 1.0.1",
  "cid",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "either",
  "erased-serde",
  "fnv",
@@ -9021,7 +9044,7 @@ name = "sc-rpc-api"
 version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -9233,7 +9256,7 @@ name = "sc-transaction-graph"
 version = "3.0.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "linked-hash-map",
  "log",
@@ -9293,13 +9316,13 @@ checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
 dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
- "curve25519-dalek 2.1.2",
+ "curve25519-dalek 2.1.3",
  "getrandom 0.1.16",
  "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
- "subtle 2.4.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -9617,9 +9640,9 @@ dependencies = [
 
 [[package]]
 name = "slotmap"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed667ea1f11160850af698a8894c2a18829d8c886d3d3778ed671fc1448356f"
+checksum = "a952280edbecfb1d4bd3cf2dbc309dc6ab523e53487c438ae21a6df09fe84bc4"
 dependencies = [
  "version_check",
 ]
@@ -9651,9 +9674,9 @@ dependencies = [
  "rand 0.7.3",
  "rand_core 0.5.1",
  "ring",
- "rustc_version",
+ "rustc_version 0.2.3",
  "sha2 0.9.5",
- "subtle 2.4.0",
+ "subtle 2.4.1",
  "x25519-dalek",
 ]
 
@@ -10078,7 +10101,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-trait",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "merlin",
  "parity-scale-codec",
@@ -10101,7 +10124,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#fe663ed0e982e9a767a15d548f663dc0df294ca7"
+source = "git+https://github.com/paritytech/substrate?branch=master#02fe835151b5dd04939df9a7d396cb762fc6eabd"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -10337,7 +10360,7 @@ name = "sp-transaction-pool"
 version = "3.0.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures 0.3.15",
  "log",
  "parity-scale-codec",
@@ -10508,9 +10531,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "structopt"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
+checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71"
 dependencies = [
  "clap",
  "lazy_static",
@@ -10519,9 +10542,9 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
+checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -10601,7 +10624,7 @@ version = "0.9.0"
 source = "git+https://github.com/paritytech//substrate?rev=1b758b2a8d151d97d2242260c465b6df9cb8a7a4#1b758b2a8d151d97d2242260c465b6df9cb8a7a4"
 dependencies = [
  "async-std",
- "derive_more 0.99.14",
+ "derive_more 0.99.16",
  "futures-util",
  "hyper 0.13.10",
  "log",
@@ -10657,7 +10680,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#fe663ed0e982e9a767a15d548f663dc0df294ca7"
+source = "git+https://github.com/paritytech/substrate?branch=master#02fe835151b5dd04939df9a7d396cb762fc6eabd"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -10678,9 +10701,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
@@ -10706,9 +10729,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
+checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
 dependencies = [
  "proc-macro2 1.0.27",
  "quote 1.0.9",
@@ -10730,9 +10753,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ae3b39281e4b14b8123bdbaddd472b7dfe215e444181f2f9d2443c2444f834"
+checksum = "b0652da4c4121005e9ed22b79f6c5f2d9e2752906b53a33e9490489ba421a6fb"
 
 [[package]]
 name = "tempfile"
@@ -10768,18 +10791,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
+checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
+checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
 dependencies = [
  "proc-macro2 1.0.27",
  "quote 1.0.9",
@@ -10918,9 +10941,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.7.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2"
+checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985"
 dependencies = [
  "autocfg",
  "pin-project-lite 0.2.7",
@@ -11259,12 +11282,12 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd81fe0c8bc2b528a51c9d2c31dae4483367a26a723a3c9a4a8120311d7774e3"
+checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa"
 dependencies = [
  "hash-db",
- "hashbrown 0.9.1",
+ "hashbrown 0.11.2",
  "log",
  "rustc-hex",
  "smallvec 1.6.1",
@@ -11361,7 +11384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.3.23",
+ "rand 0.7.3",
  "static_assertions",
 ]
 
@@ -11447,7 +11470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
 dependencies = [
  "generic-array 0.14.4",
- "subtle 2.4.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -11992,7 +12015,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.3.2",
+ "hex-literal 0.3.3",
  "log",
  "max-encoded-len",
  "pallet-authority-discovery",
@@ -12227,7 +12250,7 @@ dependencies = [
 [[package]]
 name = "xcm-simulator"
 version = "0.1.0"
-source = "git+https://github.com/shaunxw/xcm-simulator?branch=master#fcebc2a0308aad3d8cab0081881530cd0a0a3d69"
+source = "git+https://github.com/shaunxw/xcm-simulator?branch=master#8115d193a44f3cbf433f7e7108102ab7816b234f"
 dependencies = [
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-xcmp-queue",
diff --git a/Cargo.toml b/Cargo.toml
index 52db408cd5..0d2cf4dbc0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -192,7 +192,6 @@ beefy-primitives = { git = "https://github.com/paritytech//grandpa-bridge-gadget
 beefy-gadget = { git = "https://github.com/paritytech//grandpa-bridge-gadget", rev = "55ae3329847e0bbde51c9d45991d99f444777555" }
 beefy-gadget-rpc = { git = "https://github.com/paritytech//grandpa-bridge-gadget", rev = "55ae3329847e0bbde51c9d45991d99f444777555" }
 
-
 [patch."https://github.com/open-web3-stack/open-runtime-module-library"]
 orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca054d3" }
 orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca054d3" }
diff --git a/js/e2e/index.ts b/js/e2e/index.ts
index 3ea10abe08..c8fc4a58df 100644
--- a/js/e2e/index.ts
+++ b/js/e2e/index.ts
@@ -16,11 +16,16 @@ const VOTING_PERIOD: number = 10;
 
 const TESTS = (api: ApiPromise, config: ExtrinsicConfig): Extrinsic[] => {
     const PINT: Balance = api.createType("Balance", Math.pow(10, 12));
-    const ROCOCO = api.createType("MultiLocation", {
-        // NOTE:
-        //
-        // The current XCMRouter in PINT only supports X1
-        X1: api.createType("Junction", { Parent: null }),
+    const PARENT_LOCATION = api.createType("MultiLocation", {
+        X2: [
+            api.createType("Junction", { Parent: null }),
+            api.createType("Junction", {
+                AccountId32: {
+                    network: "Any",
+                    id: config.alice.address,
+                },
+            }),
+        ],
     });
 
     return [
@@ -71,7 +76,12 @@ const TESTS = (api: ApiPromise, config: ExtrinsicConfig): Extrinsic[] => {
             signed: config.alice,
             pallet: "assetIndex",
             call: "addAsset",
-            args: [ASSET_ID_A, ASSET_ID_A_UNITS, ROCOCO, ASSET_ID_A_VALUE],
+            args: [
+                ASSET_ID_A,
+                ASSET_ID_A_UNITS,
+                PARENT_LOCATION,
+                ASSET_ID_A_VALUE,
+            ],
             verify: async () => {
                 assert(
                     ((await api.query.assetIndex.assets(ASSET_ID_A)) as any)
@@ -132,14 +142,6 @@ const TESTS = (api: ApiPromise, config: ExtrinsicConfig): Extrinsic[] => {
                 );
             },
         },
-        // TODO: blocked by https://github.com/ChainSafe/PINT/pull/161
-        //
-        // {
-        //     signed: config.alice,
-        //     pallet: "assetIndex",
-        //     call: "removeAsset",
-        //     args: [ASSET_ID_A, BALANCE_THOUSAND, null],
-        // },
         /* remote-asset-manager*/
         {
             signed: config.alice,
@@ -421,6 +423,20 @@ const TESTS = (api: ApiPromise, config: ExtrinsicConfig): Extrinsic[] => {
                 );
             },
         },
+        /* asset-index */
+        {
+            signed: config.alice,
+            pallet: "assetIndex",
+            call: "removeAsset",
+            args: [ASSET_ID_A, BALANCE_THOUSAND, null],
+            verify: async () => {
+                assert(
+                    ((await api.query.assetIndex.assets(ASSET_ID_A)) as any)
+                        .isNone,
+                    "assetIndex.addAsset failed"
+                );
+            },
+        },
     ];
 };
 // main
diff --git a/js/pint-types-bundle/index.ts b/js/pint-types-bundle/index.ts
index 427d77207c..8a1192407a 100644
--- a/js/pint-types-bundle/index.ts
+++ b/js/pint-types-bundle/index.ts
@@ -44,6 +44,10 @@ export const definitions = {
                 },
                 CurrencyId: "AssetId",
                 CurrencyIdOf: "CurrencyId",
+                FeeRate: {
+                    numerator: "u32",
+                    denominator: "u32",
+                },
                 FeedId: "u64",
                 FeedIdFor: "FeedId",
                 HashFor: "Hash",
diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs
index b485240cb8..ff6ae1170e 100644
--- a/pallets/remote-asset-manager/src/lib.rs
+++ b/pallets/remote-asset-manager/src/lib.rs
@@ -32,7 +32,7 @@ pub mod pallet {
         traits::Get,
     };
     use frame_system::pallet_prelude::*;
-    use orml_traits::{GetByKey, MultiCurrency, XcmTransfer};
+    use orml_traits::{location::Parse, GetByKey, MultiCurrency, XcmTransfer};
     use primitives::traits::{MultiAssetRegistry, RemoteAssetManager};
     use xcm::v0::Outcome;
     use xcm::{
@@ -287,6 +287,8 @@ pub mod pallet {
         InsufficientBond,
         /// Thrown if the balance of the PINT parachain account would fall below the `MinimumRemoteStashBalance`
         InusufficientStash,
+        /// Thrown if liquid asset has invalid chain location
+        InvalidChainLocation,
         /// Currency is not cross-chain transferable.
         NotCrossChainTransferableCurrency,
     }
@@ -314,8 +316,10 @@ pub mod pallet {
             let _ = ensure_signed(origin.clone())?;
             T::AdminOrigin::ensure_origin(origin)?;
 
-            let dest =
-                T::AssetRegistry::native_asset_location(&asset).ok_or(Error::<T>::UnknownAsset)?;
+            let dest = T::AssetRegistry::native_asset_location(&asset)
+                .ok_or(Error::<T>::UnknownAsset)?
+                .chain_part()
+                .ok_or(Error::<T>::InvalidChainLocation)?;
             log::info!(target: "pint_xcm", "Attempting bond on: {:?} with controller {:?}", dest, controller, );
 
             // ensures that the call is encodable for the destination
@@ -383,8 +387,10 @@ pub mod pallet {
             T::AdminOrigin::ensure_origin(origin)?;
             let delegate = delegate.unwrap_or(who);
 
-            let dest =
-                T::AssetRegistry::native_asset_location(&asset).ok_or(Error::<T>::UnknownAsset)?;
+            let dest = T::AssetRegistry::native_asset_location(&asset)
+                .ok_or(Error::<T>::UnknownAsset)?
+                .chain_part()
+                .ok_or(Error::<T>::InvalidChainLocation)?;
             log::info!(target: "pint_xcm", "Attempting add_proxy {:?} on: {:?} with delegate {:?}", proxy_type, dest,  delegate);
 
             // ensures that the call is encodable for the destination
@@ -513,8 +519,10 @@ pub mod pallet {
                 return Ok(());
             }
 
-            let dest =
-                T::AssetRegistry::native_asset_location(&asset).ok_or(Error::<T>::UnknownAsset)?;
+            let dest = T::AssetRegistry::native_asset_location(&asset)
+                .ok_or(Error::<T>::UnknownAsset)?
+                .chain_part()
+                .ok_or(Error::<T>::InvalidChainLocation)?;
             // ensures that the call is encodable for the destination
             ensure!(
                 T::PalletProxyCallEncoder::can_encode(&asset),
@@ -561,8 +569,10 @@ pub mod pallet {
                 return Ok(());
             }
 
-            let dest =
-                T::AssetRegistry::native_asset_location(&asset).ok_or(Error::<T>::UnknownAsset)?;
+            let dest = T::AssetRegistry::native_asset_location(&asset)
+                .ok_or(Error::<T>::UnknownAsset)?
+                .chain_part()
+                .ok_or(Error::<T>::InvalidChainLocation)?;
             // ensures that the call is encodable for the destination
             ensure!(
                 T::PalletProxyCallEncoder::can_encode(&asset),
@@ -626,8 +636,10 @@ pub mod pallet {
         /// Remove any unlocked chunks from the `unlocking` queue.
         /// An `withdraw_unbonded` call must be signed by the controller account.
         pub fn do_send_withdraw_unbonded(asset: T::AssetId) -> DispatchResult {
-            let dest =
-                T::AssetRegistry::native_asset_location(&asset).ok_or(Error::<T>::UnknownAsset)?;
+            let dest = T::AssetRegistry::native_asset_location(&asset)
+                .ok_or(Error::<T>::UnknownAsset)?
+                .chain_part()
+                .ok_or(Error::<T>::InvalidChainLocation)?;
             // ensures that the call is encodable for the destination
             ensure!(
                 T::PalletProxyCallEncoder::can_encode(&asset),