chore: upgrade to polkadot-v0.9.18 and pull subxt upstream

Cargo.toml

@@ -2,6 +2,7 @@
 members = [
   "oracle",
   "runtime",
+  "runtime/client",
   "vault",
   "bitcoin",
   "faucet",

bitcoin/Cargo.toml

@@ -30,11 +30,11 @@ hyper = "0.10"
 esplora-btc-api = "1.0.3"
 
 # Substrate dependencies
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
 
 [dependencies.interbtc-bitcoin]
 git = "https://github.com/interlay/interbtc"
-rev = "e7a6b41abe69de294abf32a5d350c0c5b719cce3"
+rev = "92278904c8f35b5f3ef3b3393065831df7dd05b7"
 package = "bitcoin"
 optional = true
 

faucet/Cargo.toml

@@ -18,7 +18,7 @@ chrono = "0.4.19"
 tokio = { version = "1.0", features = ["full"] }
 thiserror = "1.0"
 jsonrpc-http-server = "18.0.0"
-parity-scale-codec = "2.0.0"
+parity-scale-codec = "3.0.0"
 serde_json = "1.0.71"
 serde = "1.0.136"
 hex = "0.4.2"
@@ -37,4 +37,4 @@ service = { path = "../service" }
 runtime = { path = "../runtime", features = ["testing-utils"] }
 
 # Substrate dependencies
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }

faucet/src/http.rs

@@ -313,11 +313,11 @@ pub async fn start_http(
 #[cfg(all(test, feature = "standalone-metadata"))]
 mod tests {
     use crate::error::Error;
-    use runtime::{CurrencyId, CurrencyIdExt, OracleKey, Token, VaultId, DOT, INTERBTC, KBTC, KSM};
+    use runtime::{CurrencyId, CurrencyIdExt, OracleKey, Token, VaultId, DOT, IBTC, KBTC, KSM};
     use std::{collections::HashMap, sync::Arc};
 
     const DEFAULT_TESTING_CURRENCY: CurrencyId = Token(DOT);
-    const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
+    const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);
 
     use super::{
         fund_account, open_kv_store, CollateralBalancesPallet, FundAccountJsonRpcRequest, FundingRequestAccountType,

runtime/Cargo.toml

@@ -7,19 +7,18 @@ edition = "2018"
 [features]
 default = []
 testing-utils = [
-    # "substrate-subxt/client",
-    # "substrate-subxt-client",
     "tempdir",
     "interbtc",
     "rand",
+    "subxt-client",
 ]
 standalone-metadata = []
 parachain-metadata-kintsugi = []
 parachain-metadata-testnet = []
 
 [dependencies]
 serde = { version = "1.0.136", features = ["derive"] }
-codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive", "full"] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] }
 async-trait = "0.1.40"
 thiserror = "1.0"
 serde_json = "1.0.71"
@@ -33,49 +32,49 @@ cfg-if = "1.0"
 prometheus = { version = "0.12.0", features = ["process"] }
 
 # Substrate dependencies
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
-sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
 
 # Subxt dependencies
-# https://github.com/interlay/subxt/tree/polkadot-v0.9.17
-subxt = { package = "subxt", git = "https://github.com/interlay/subxt", rev = "1193d94206a669c59cc5dd89486fecfa82ca584a" }
-subxt-client = { package = "subxt-client", git = "https://github.com/interlay/subxt", rev = "1193d94206a669c59cc5dd89486fecfa82ca584a" }
+# https://github.com/interlay/subxt/tree/polkadot-v0.9.18
+subxt = { package = "subxt", git = "https://github.com/interlay/subxt", rev = "344e44c3729adcb945b937d6703212e7ae41da50" }
+subxt-client = { package = "subxt-client", path = "./client", optional = true }
 
-jsonrpsee = { version = "0.8.0", features = ["macros", "jsonrpsee-types", "client", "jsonrpsee-ws-client", "jsonrpsee-client-transport"] }
+jsonrpsee = { version = "0.10.1", features = ["macros", "jsonrpsee-types", "client", "jsonrpsee-ws-client", "jsonrpsee-client-transport"] }
 
 # Polkadot dependencies
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
-polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17" }
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
+polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.18" }
 
 bitcoin = { path = "../bitcoin"}
 
 # Dependencies for the testing utils for integration tests
 tempdir = { version = "0.3.7", optional = true }
-interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "e7a6b41abe69de294abf32a5d350c0c5b719cce3", optional = true }
+interbtc = { package = "interbtc-standalone", git = "https://github.com/interlay/interbtc", rev = "92278904c8f35b5f3ef3b3393065831df7dd05b7", optional = true }
 rand = { version = "0.7", optional = true }
 
 [dependencies.primitives]
 git = "https://github.com/interlay/interbtc"
-rev = "e7a6b41abe69de294abf32a5d350c0c5b719cce3"
+rev = "92278904c8f35b5f3ef3b3393065831df7dd05b7"
 package = "interbtc-primitives"
 
 [dependencies.module-bitcoin]
 git = "https://github.com/interlay/interbtc"
-rev = "e7a6b41abe69de294abf32a5d350c0c5b719cce3"
+rev = "92278904c8f35b5f3ef3b3393065831df7dd05b7"
 package = "bitcoin"
 
 [dependencies.module-btc-relay]
 git = "https://github.com/interlay/interbtc"
-rev = "e7a6b41abe69de294abf32a5d350c0c5b719cce3"
+rev = "92278904c8f35b5f3ef3b3393065831df7dd05b7"
 package = "btc-relay"
 
 [dependencies.module-oracle-rpc-runtime-api]
 git = "https://github.com/interlay/interbtc"
-rev = "e7a6b41abe69de294abf32a5d350c0c5b719cce3"
+rev = "92278904c8f35b5f3ef3b3393065831df7dd05b7"
 package = "module-oracle-rpc-runtime-api"
 
 [dev-dependencies]

runtime/client/Cargo.toml

@@ -0,0 +1,34 @@
+[package]
+name = "subxt-client"
+version = "0.1.0"
+authors = []
+edition = "2018"
+
+license = "GPL-3.0"
+repository = "https://github.com/paritytech/substrate-subxt"
+documentation = "https://docs.rs/substrate-subxt-client"
+homepage = "https://www.parity.io/"
+description = "Embed a substrate node into your subxt application."
+keywords = ["parity", "substrate", "blockchain"]
+
+[dependencies]
+tokio = { version = "1.10", features = ["time", "rt-multi-thread"] }
+futures = { version = "0.3.9", features = ["compat"], package = "futures" }
+futures01 = { package = "futures", version = "0.1.29" }
+jsonrpsee = "0.10.1"
+jsonrpsee-types = "0.10.1"
+jsonrpsee-core = { version = "0.10.1", features = ["async-client"] }
+
+log = "0.4.13"
+serde_json = "1.0.61"
+thiserror = "1.0.23"
+
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false }
+
+[target.'cfg(target_arch="x86_64")'.dependencies]
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.18", default-features = false, features = [
+    "wasmtime",
+] }