Merge pull request #474 from sander2/chore/upgrade-parachain

chore: upgrade to latest parachain

Author: sander2

Cargo.lock

@@ -35,7 +35,7 @@ serde = "1.0.139"
 serde_json = "1.0.82"
 
 # Substrate dependencies
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 
 [dev-dependencies]
 mockall = "0.8.1"

Cargo.toml

@@ -10,7 +10,7 @@ clap = { version = "4.0.17", features = ["derive"]}
 hex = "0.4.3"
 tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 thiserror = "1.0.0"
 log = "0.4.0"
 env_logger = "0.7.1"

bitcoin/Cargo.toml

@@ -35,11 +35,11 @@ prometheus = { version = "0.12.0", features = ["process"] }
 lazy_static = "1.4.0"
 
 # Substrate dependencies
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 # needs to agree with subxt's version
 sp-keyring = { version = "7.0.0", default_features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
 
 # Subxt dependencies
 subxt = "0.25.0"
@@ -50,28 +50,28 @@ bitcoin = { path = "../bitcoin" }
 
 # Dependencies for the testing utils for integration tests
 tempdir = { version = "0.3.7", optional = true }
-interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "f0772a08db719ab8841f6fd23dfef1f227d3b348", optional = true }
-interbtc-runtime = { package = "testnet-kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "f0772a08db719ab8841f6fd23dfef1f227d3b348", optional = true }
+interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9", optional = true }
+interbtc-runtime = { package = "testnet-kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9", optional = true }
 rand = { version = "0.7", optional = true }
 
 [dependencies.primitives]
 git = "https://github.com/interlay/interbtc"
-rev = "f0772a08db719ab8841f6fd23dfef1f227d3b348"
+rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
 package = "interbtc-primitives"
 
 [dependencies.module-bitcoin]
 git = "https://github.com/interlay/interbtc"
-rev = "f0772a08db719ab8841f6fd23dfef1f227d3b348"
+rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
 package = "bitcoin"
 
 [dependencies.module-btc-relay]
 git = "https://github.com/interlay/interbtc"
-rev = "f0772a08db719ab8841f6fd23dfef1f227d3b348"
+rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
 package = "btc-relay"
 
 [dependencies.module-oracle-rpc-runtime-api]
 git = "https://github.com/interlay/interbtc"
-rev = "f0772a08db719ab8841f6fd23dfef1f227d3b348"
+rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
 package = "oracle-rpc-runtime-api"
 
 [dev-dependencies]

runner/Cargo.toml

@@ -23,10 +23,10 @@ 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.38" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
-sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
-sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
+sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40", default-features = false }
 # needs to agree with subxt's version
 sp-keyring = { version = "7.0.0" }
 

runtime/Cargo.toml

@@ -10,13 +10,12 @@ use jsonrpsee_core::{
     client::{ClientBuilder, ReceivedMessage, TransportReceiverT, TransportSenderT},
 };
 
-use sc_network_common::config::TransportConfig;
 pub use sc_service::{
     config::{DatabaseSource, KeystoreConfig, WasmExecutionMethod, WasmtimeInstantiationStrategy},
     Error as ServiceError,
 };
 use sc_service::{
-    config::{NetworkConfiguration, TelemetryEndpoints},
+    config::{NetworkConfiguration, TelemetryEndpoints, TransportConfig},
     ChainSpec, Configuration, RpcHandlers, TaskManager,
 };