Merge pull request #1138 from gregdhill/chore/primitives-dep

chore: feature gate sp-runtime in primitives
interlay · Jul 24, 2023 · aec6c3e · aec6c3e
2 parents 66ef87c + 313132a
commit aec6c3e
Show file tree

Hide file tree

Showing 20 changed files with 139 additions and 151 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/annuity/Cargo.toml b/crates/annuity/Cargo.toml
@@ -31,7 +31,6 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch =
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
 reward = { path = "../reward", default-features = false }
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
 
 [features]
 default = ["std"]

diff --git a/crates/currency/src/mock.rs b/crates/currency/src/mock.rs
@@ -88,7 +88,7 @@ parameter_type_with_key! {
 impl orml_tokens::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
-    type Amount = primitives::Amount;
+    type Amount = primitives::SignedBalance;
     type CurrencyId = CurrencyId;
     type WeightInfo = ();
     type ExistentialDeposits = ExistentialDeposits;

diff --git a/crates/escrow/Cargo.toml b/crates/escrow/Cargo.toml
@@ -31,8 +31,6 @@ rand = "0.8.3"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
-
 [features]
 default = ["std"]
 std = [

diff --git a/crates/farming/Cargo.toml b/crates/farming/Cargo.toml
@@ -35,8 +35,6 @@ rand = "0.8.3"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
-
 [features]
 default = ["std"]
 std = [

diff --git a/crates/farming/src/mock.rs b/crates/farming/src/mock.rs
@@ -83,7 +83,7 @@ parameter_type_with_key! {
 impl orml_tokens::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
-    type Amount = primitives::Amount;
+    type Amount = primitives::SignedBalance;
     type CurrencyId = CurrencyId;
     type WeightInfo = ();
     type ExistentialDeposits = ExistentialDeposits;

diff --git a/crates/fee/Cargo.toml b/crates/fee/Cargo.toml
@@ -44,9 +44,6 @@ currency = { path = "../currency", features = ["testing-utils"] }
 orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc39cfddefb10ef0de23655e2c3dcdab66a19404", default-features = false }
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "dc39cfddefb10ef0de23655e2c3dcdab66a19404", default-features = false }
 
-# Parachain dependencies
-primitives = { package = "interbtc-primitives", path = "../../primitives"}
-
 [features]
 default = ["std"]
 std = [

diff --git a/crates/multi-transaction-payment/Cargo.toml b/crates/multi-transaction-payment/Cargo.toml
@@ -35,7 +35,6 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
 
 [features]
 default = ["std"]

diff --git a/crates/oracle/rpc/runtime-api/Cargo.toml b/crates/oracle/rpc/runtime-api/Cargo.toml
@@ -5,19 +5,20 @@ authors = ["Interlay Ltd"]
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.130", default-features = false, optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
-scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
+
+primitives = { package = "interbtc-primitives", path = "../../../../primitives", default-features = false }
 
 [features]
 default = ["std"]
 std = [
-  "serde",
   "codec/std",
   "frame-support/std",
   "sp-api/std",
   "sp-std/std",
+
+  "primitives/std",
 ]
diff --git a/crates/oracle/rpc/runtime-api/src/lib.rs b/crates/oracle/rpc/runtime-api/src/lib.rs
@@ -2,36 +2,10 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use codec::{Codec, Decode, Encode};
+use codec::Codec;
 use frame_support::dispatch::DispatchError;
-use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-#[derive(Eq, PartialEq, Encode, Decode, Default, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
-/// a wrapper around a balance, used in RPC to workaround a bug where using u128
-/// in runtime-apis fails. See <https://github.com/paritytech/substrate/issues/4641>
-pub struct BalanceWrapper<T> {
-    #[cfg_attr(feature = "std", serde(bound(serialize = "T: std::fmt::Display")))]
-    #[cfg_attr(feature = "std", serde(serialize_with = "serialize_as_string"))]
-    #[cfg_attr(feature = "std", serde(bound(deserialize = "T: std::str::FromStr")))]
-    #[cfg_attr(feature = "std", serde(deserialize_with = "deserialize_from_string"))]
-    pub amount: T,
-}
-
-#[cfg(feature = "std")]
-fn serialize_as_string<S: Serializer, T: std::fmt::Display>(t: &T, serializer: S) -> Result<S::Ok, S::Error> {
-    serializer.serialize_str(&t.to_string())
-}
-
-#[cfg(feature = "std")]
-fn deserialize_from_string<'de, D: Deserializer<'de>, T: std::str::FromStr>(deserializer: D) -> Result<T, D::Error> {
-    let s = String::deserialize(deserializer)?;
-    s.parse::<T>()
-        .map_err(|_| serde::de::Error::custom("Parse from string failed"))
-}
+pub use primitives::BalanceWrapper;
 
 sp_api::decl_runtime_apis! {
     pub trait OracleApi<Balance, CurrencyId> where

diff --git a/crates/oracle/src/mock.rs b/crates/oracle/src/mock.rs
@@ -100,7 +100,7 @@ parameter_type_with_key! {
 impl orml_tokens::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
-    type Amount = primitives::Amount;
+    type Amount = primitives::SignedBalance;
     type CurrencyId = CurrencyId;
     type WeightInfo = ();
     type ExistentialDeposits = ExistentialDeposits;

diff --git a/crates/reward/Cargo.toml b/crates/reward/Cargo.toml
@@ -12,7 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.1.5", default-features =
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
 
 # Parachain dependencies
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
+primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false, features = ["substrate-compat"] }
 
 # Substrate dependencies
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
@@ -31,8 +31,6 @@ rand = "0.8.3"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
-
 [features]
 default = ["std"]
 std = [

diff --git a/crates/staking/Cargo.toml b/crates/staking/Cargo.toml
@@ -35,8 +35,6 @@ rand = "0.8.3"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
-
 [features]
 default = ["std"]
 std = [

diff --git a/crates/supply/Cargo.toml b/crates/supply/Cargo.toml
@@ -30,8 +30,6 @@ rand = "0.8.3"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
 
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
-
 [features]
 default = ["std"]
 std = [

diff --git a/crates/traits/Cargo.toml b/crates/traits/Cargo.toml
@@ -30,7 +30,7 @@ frame-support = { git = "https://github.com/paritytech/substrate.git", branch =
 frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.31", default-features = false }
 
 # Parachain dependencies
-primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false }
+primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false, features = ["substrate-compat"] }
 
 [dev-dependencies]
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.31" }

diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs
@@ -212,7 +212,7 @@ impl frame_system::Config for Runtime {
     /// The hashing algorithm used.
     type Hashing = BlakeTwo256;
     /// The header type.
-    type Header = generic::Header<BlockNumber, BlakeTwo256>;
+    type Header = Header;
     /// The ubiquitous event type.
     type RuntimeEvent = RuntimeEvent;
     /// The ubiquitous origin type.
@@ -692,7 +692,7 @@ where
 impl orml_tokens::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
-    type Amount = primitives::Amount;
+    type Amount = primitives::SignedBalance;
     type CurrencyId = CurrencyId;
     type WeightInfo = weights::orml_tokens::WeightInfo<Runtime>;
     type ExistentialDeposits = ExistentialDeposits;
@@ -1269,8 +1269,6 @@ construct_runtime! {
     }
 }
 
-/// The address format for describing accounts.
-pub type Address = AccountId;
 /// Block header type as expected by this runtime.
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 /// Block type as expected by this runtime.
@@ -1290,7 +1288,7 @@ pub type SignedExtra = (
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<AccountId, RuntimeCall, Signature, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 /// Executive: handles dispatch to the various modules.

diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs
@@ -210,7 +210,7 @@ impl frame_system::Config for Runtime {
     /// The hashing algorithm used.
     type Hashing = BlakeTwo256;
     /// The header type.
-    type Header = generic::Header<BlockNumber, BlakeTwo256>;
+    type Header = Header;
     /// The ubiquitous event type.
     type RuntimeEvent = RuntimeEvent;
     /// The ubiquitous origin type.
@@ -691,7 +691,7 @@ where
 impl orml_tokens::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
-    type Amount = primitives::Amount;
+    type Amount = primitives::SignedBalance;
     type CurrencyId = CurrencyId;
     type WeightInfo = weights::orml_tokens::WeightInfo<Runtime>;
     type ExistentialDeposits = ExistentialDeposits;
@@ -1269,8 +1269,6 @@ construct_runtime! {
     }
 }
 
-/// The address format for describing accounts.
-pub type Address = AccountId;
 /// Block header type as expected by this runtime.
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 /// Block type as expected by this runtime.
@@ -1290,7 +1288,7 @@ pub type SignedExtra = (
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
+pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<AccountId, RuntimeCall, Signature, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 /// Executive: handles dispatch to the various modules.

diff --git a/parachain/src/service.rs b/parachain/src/service.rs
@@ -25,6 +25,7 @@ use sp_consensus_aura::{
     sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair},
     SlotDuration,
 };
+use sp_core::H256;
 use sp_keystore::KeystorePtr;
 use sp_runtime::traits::BlakeTwo256;
 use std::{sync::Arc, time::Duration};

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -8,30 +8,30 @@ version = "1.2.0"
 bstringify = "0.1.2"
 serde = { version = "1.0.130", optional = true }
 codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
+primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info"] }
 scale-info = { version = "2.2.0", default-features = false, features = ["derive"] }
-
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31", default-features = false }
 scale-decode = { version = "0.7.0", default-features = false, features = ["derive"], optional = true }
 scale-encode = { version = "0.3.0", default-features = false, features = ["derive"], optional = true }
 
+# Substrate dependencies
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false, optional = true }
+
 # Parachain dependencies
 bitcoin = { path = "../crates/bitcoin", default-features = false }
 
 [features]
-default = ["std"]
+default = ["std", "substrate-compat"]
 std = [
     "serde",
     "codec/std",
+	"primitive-types/std",
+	"primitive-types/serde",
     "scale-decode",
     "scale-encode",
 
-    "sp-core/std",
-    "sp-std/std",
-    "sp-runtime/std",
+    "sp-runtime?/std",
 
     "bitcoin/std",
 ]
 runtime-benchmarks = []
+substrate-compat = ["sp-runtime"]