chore: cleanup dependencies

Signed-off-by: Gregory Hill <[email protected]>

Cargo.toml

@@ -9,38 +9,3 @@ members = [
   "service",
   "runner"
 ]
-
-[patch.crates-io]
-sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-
-[patch."https://github.com/paritytech/substrate"]
-frame-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-frame-support-procedural = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-application-crypto = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-arithmetic = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-debug-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-externalities = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-inherents = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-runtime-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-storage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-trie = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-version = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-wasm-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }
-sp-weights = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" }

bitcoin/Cargo.toml

@@ -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.42" }
+sp-core = { version = "21.0.0", default-features = false }
 
 [dev-dependencies]
 mockall = "0.8.1"

faucet/Cargo.toml

@@ -45,4 +45,4 @@ serial_test = "0.9.0"
 runtime = { path = "../runtime", features = ["testing-utils"] }
 
 # Substrate dependencies
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-keyring = "24.0.0"

oracle/Cargo.toml

@@ -23,7 +23,7 @@ backoff = { version = "0.3.0", features = ["tokio"] }
 git-version = "0.3.4"
 futures = "0.3.5"
 async-trait = "0.1.40"
-statrs = "0.15"
+statrs = "0.16"
 serde_json = "1.0"
 serde = "1.0"
 

runner/Cargo.toml

@@ -10,7 +10,6 @@ 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.42" }
 thiserror = "1.0.0"
 log = "0.4.0"
 env_logger = "0.7.1"
@@ -27,6 +26,9 @@ backoff = { version = "0.3.0", features = ["tokio"] }
 subxt = { version = "0.29.0", default_features = false,  features = ["jsonrpsee-ws"] }
 sha2 = "0.8.2"
 
+# Substrate dependencies
+sp-core = { version = "21.0.0", default-features = false }
+
 [dev-dependencies]
 sysinfo = "0.25.1"
 tempdir = "0.3.7"

runtime/Cargo.toml

@@ -9,6 +9,7 @@ default = []
 testing-utils = [
     "tempdir",
     "rand",
+    "frame-support",
 ]
 parachain-metadata-interlay = []
 parachain-metadata-kintsugi = []
@@ -28,17 +29,14 @@ url = "2"
 cfg-if = "1.0"
 prometheus = { version = "0.12.0", features = ["process"] }
 lazy_static = "1.4.0"
-base58 = { version = "0.2.0" }
-blake2 = { version = "0.10.4", default-features = false }
 scale-decode = { version = "0.7.0",  features = ["derive"] }
 scale-encode = { version = "0.3.0",  features = ["derive"] }
 
 # Substrate dependencies
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { version = "21.0.0", default-features = false }
+sp-runtime = "24.0.0"
+sp-keyring = "24.0.0"
+frame-support = { version = "21.0.0", optional = true }
 
 # Subxt dependencies
 subxt = { version = "0.29.0", default_features = false,  features = ["jsonrpsee-ws"] }
@@ -54,12 +52,17 @@ rand = { version = "0.7", optional = true }
 git = "https://github.com/interlay/interbtc"
 rev = "1b90616692dcce55749616b4c60bdab228279909"
 package = "interbtc-primitives"
+default_features = false
+# NOTE: sp-runtime still in lockfile but not used
+# https://github.com/rust-lang/cargo/issues/10801
+features = ["std"]
 
 [dependencies.module-bitcoin]
 git = "https://github.com/interlay/interbtc"
 rev = "1b90616692dcce55749616b4c60bdab228279909"
 package = "bitcoin"
-features = ["parser"]
+default_features = false
+features = ["std", "parser"]
 
 [dev-dependencies]
 runtime = { path = ".", features = ["testing-utils"] }

runtime/src/cli.rs

@@ -1,7 +1,6 @@
 use crate::{
     error::{Error, KeyLoadingError},
-    rpc::ShutdownSender,
-    InterBtcParachain, InterBtcSigner,
+    InterBtcParachain, InterBtcSigner, ShutdownSender,
 };
 use clap::Parser;
 use sp_core::{sr25519, Pair};

runtime/src/lib.rs

@@ -18,44 +18,45 @@ mod tests;
 
 #[cfg(feature = "testing-utils")]
 pub mod integration;
-use subxt::config::SubstrateConfig;
+
 pub mod utils;
+
 pub use addr::PartialAddress;
 pub use assets::{AssetRegistry, LendingAssets, RuntimeCurrencyInfo, TryFromSymbol};
-use codec::{Decode, Encode};
 pub use error::{Error, SubxtError};
 pub use primitives::CurrencyInfo;
 pub use prometheus;
 pub use retry::{notify_retry, RetryPolicy};
-#[cfg(feature = "testing-utils")]
-pub use rpc::SudoPallet;
 pub use rpc::{
     BtcRelayPallet, CollateralBalancesPallet, FeePallet, FeeRateUpdateReceiver, InterBtcParachain, IssuePallet,
-    OraclePallet, RedeemPallet, ReplacePallet, SecurityPallet, TimestampPallet, UtilFuncs, VaultRegistryPallet,
-    DEFAULT_SPEC_NAME, SS58_PREFIX,
+    OraclePallet, RedeemPallet, ReplacePallet, SecurityPallet, SudoPallet, TimestampPallet, UtilFuncs,
+    VaultRegistryPallet, DEFAULT_SPEC_NAME, SS58_PREFIX,
 };
 pub use shutdown::{ShutdownReceiver, ShutdownSender};
-pub use sp_arithmetic::{traits as FixedPointTraits, FixedI128, FixedPointNumber, FixedU128};
 pub use sp_core;
+pub use sp_runtime::{traits as FixedPointTraits, FixedPointNumber, FixedU128};
 pub use std::collections::btree_set::BTreeSet;
-use std::{marker::PhantomData, time::Duration};
-use subxt::{config::polkadot::PolkadotExtrinsicParams, subxt, Config};
 pub use types::*;
+
+use std::time::Duration;
+use subxt::{
+    config::{polkadot::PolkadotExtrinsicParams, SubstrateConfig},
+    subxt, Config,
+};
+
 pub const TX_FEES: u128 = 2000000000;
 pub const MILLISECS_PER_BLOCK: u64 = 12000;
 pub const BLOCK_INTERVAL: Duration = Duration::from_millis(MILLISECS_PER_BLOCK);
 
 pub const BTC_RELAY_MODULE: &str = "BTCRelay";
 pub const ISSUE_MODULE: &str = "Issue";
-pub const SECURITY_MODULE: &str = "Security";
 pub const SYSTEM_MODULE: &str = "System";
 pub const VAULT_REGISTRY_MODULE: &str = "VaultRegistry";
 
 pub const STABLE_BITCOIN_CONFIRMATIONS: &str = "StableBitcoinConfirmations";
 pub const STABLE_PARACHAIN_CONFIRMATIONS: &str = "StableParachainConfirmations";
 pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
 
-// TODO: possibly substitute CurrencyId, VaultId, H256Le
 #[cfg_attr(
     feature = "parachain-metadata-interlay",
     subxt(
@@ -71,6 +72,11 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
         ),
         derive_for_type(path = "interbtc_primitives::VaultCurrencyPair", derive = "Eq, PartialEq"),
         derive_for_type(path = "interbtc_primitives::VaultId", derive = "Eq, PartialEq"),
+        derive_for_type(path = "sp_runtime::DispatchError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_runtime::TransactionalError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_arithmetic::ArithmeticError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_runtime::TokenError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_runtime::ModuleError", derive = "serde::Deserialize"),
         substitute_type(path = "primitive_types::H256", with = "::subxt::utils::Static<crate::H256>"),
         substitute_type(path = "primitive_types::U256", with = "::subxt::utils::Static<crate::U256>"),
         substitute_type(path = "primitive_types::H160", with = "::subxt::utils::Static<crate::H160>"),
@@ -88,10 +94,6 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
             with = "::subxt::utils::Static<crate::BtcAddress>"
         ),
         substitute_type(path = "interbtc_primitives::CurrencyId", with = "crate::CurrencyId"),
-        substitute_type(
-            path = "frame_support::traits::misc::WrapperKeepOpaque",
-            with = "::subxt::utils::Static<crate::WrapperKeepOpaque>"
-        ),
         substitute_type(
             path = "bitcoin::types::BlockHeader",
             with = "::subxt::utils::Static<::module_bitcoin::types::BlockHeader>"
@@ -125,6 +127,11 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
         ),
         derive_for_type(path = "interbtc_primitives::VaultCurrencyPair", derive = "Eq, PartialEq"),
         derive_for_type(path = "interbtc_primitives::VaultId", derive = "Eq, PartialEq"),
+        derive_for_type(path = "sp_runtime::DispatchError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_runtime::TransactionalError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_arithmetic::ArithmeticError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_runtime::TokenError", derive = "serde::Deserialize"),
+        derive_for_type(path = "sp_runtime::ModuleError", derive = "serde::Deserialize"),
         substitute_type(path = "primitive_types::H256", with = "::subxt::utils::Static<crate::H256>"),
         substitute_type(path = "primitive_types::U256", with = "::subxt::utils::Static<crate::U256>"),
         substitute_type(path = "primitive_types::H160", with = "::subxt::utils::Static<crate::H160>"),
@@ -142,10 +149,6 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
             with = "::subxt::utils::Static<crate::BtcAddress>"
         ),
         substitute_type(path = "interbtc_primitives::CurrencyId", with = "crate::CurrencyId"),
-        substitute_type(
-            path = "frame_support::traits::misc::WrapperKeepOpaque",
-            with = "::subxt::utils::Static<crate::WrapperKeepOpaque>"
-        ),
         substitute_type(
             path = "bitcoin::types::BlockHeader",
             with = "::subxt::utils::Static<::module_bitcoin::types::BlockHeader>"
@@ -164,15 +167,8 @@ pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
         ),
     )
 )]
-
 pub mod metadata {}
 
-#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Default, Clone, Decode, Encode)]
-pub struct WrapperKeepOpaque<T> {
-    data: Vec<u8>,
-    _phantom: PhantomData<T>,
-}
-
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct InterBtcRuntime;
 

runtime/src/rpc.rs

@@ -1,10 +1,10 @@
-pub use crate::ShutdownSender;
 use crate::{
     assets::LendingAssets,
     conn::{new_websocket_client, new_websocket_client_with_retry},
     metadata, notify_retry,
     types::*,
-    AccountId, AssetRegistry, CurrencyId, Error, InterBtcRuntime, InterBtcSigner, RetryPolicy, RichH256Le, SubxtError,
+    AccountId, AssetRegistry, CurrencyId, Error, FixedU128 as UnsignedFixedPoint, InterBtcRuntime, InterBtcSigner,
+    RetryPolicy, RichH256Le, ShutdownSender, SubxtError,
 };
 use async_trait::async_trait;
 use bitcoin::RawTransactionProof;
@@ -15,7 +15,7 @@ use module_bitcoin::{
     parser::{parse_block_header, parse_transaction},
     types::FullTransactionProof,
 };
-use primitives::{BalanceWrapper, UnsignedFixedPoint};
+use primitives::BalanceWrapper;
 use serde_json::Value;
 use std::{convert::TryInto, future::Future, ops::Range, sync::Arc, time::Duration};
 use subxt::{
@@ -557,8 +557,7 @@ impl InterBtcParachain {
     }
     #[cfg(test)]
     fn lending_mock_market_from_id(&self, id: u32) -> metadata::runtime_types::loans::types::Market<Balance> {
-        use primitives::{Rate, Ratio};
-        use sp_runtime::FixedPointNumber;
+        use sp_runtime::{FixedPointNumber, Rate, Ratio};
 
         metadata::runtime_types::loans::types::Market::<Balance> {
             close_factor: Static(Ratio::from_percent(50)),