From d8c74657229a9f91d072f8b9001481d92b8acdb4 Mon Sep 17 00:00:00 2001
From: Luke Parker <lukeparker5132@gmail.com>
Date: Sun, 10 Dec 2023 21:27:51 -0500
Subject: [PATCH] Rebase to the latest develop
---
substrate/abi/Cargo.toml | 10 +++++-----
substrate/abi/src/lib.rs | 2 +-
substrate/abi/src/system.rs | 3 ++-
substrate/client/Cargo.toml | 6 +++---
substrate/primitives/Cargo.toml | 2 +-
substrate/runtime/src/lib.rs | 2 --
6 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/substrate/abi/Cargo.toml b/substrate/abi/Cargo.toml
index 04350486..1d9d687e 100644
--- a/substrate/abi/Cargo.toml
+++ b/substrate/abi/Cargo.toml
@@ -22,11 +22,11 @@ scale-info = { version = "2", features = ["derive"] }
borsh = { version = "1", features = ["derive", "de_strict_order"], optional = true }
serde = { version = "1", features = ["derive", "alloc"], optional = true }
-sp-core = { git = "https://github.com/serai-dex/substrate" }
-sp-runtime = { git = "https://github.com/serai-dex/substrate" }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
-sp-consensus-babe = { git = "https://github.com/serai-dex/substrate" }
-sp-consensus-grandpa = { git = "https://github.com/serai-dex/substrate" }
+sp-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-consensus-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
serai-primitives = { path = "../primitives", version = "0.1" }
serai-coins-primitives = { path = "../coins/primitives", version = "0.1" }
@@ -34,7 +34,7 @@ serai-validator-sets-primitives = { path = "../validator-sets/primitives", versi
serai-in-instructions-primitives = { path = "../in-instructions/primitives", version = "0.1" }
serai-signals-primitives = { path = "../signals/primitives", version = "0.1" }
-frame-support = { git = "https://github.com/serai-dex/substrate" }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
[features]
borsh = [
diff --git a/substrate/abi/src/lib.rs b/substrate/abi/src/lib.rs
index 8a5255f3..6adfcffa 100644
--- a/substrate/abi/src/lib.rs
+++ b/substrate/abi/src/lib.rs
@@ -41,7 +41,7 @@ pub enum TransactionPaymentEvent {
pub enum Event {
System(system::Event),
Timestamp,
- TransactionPayment(TransactionPaymentEvent),
+ TransactionPayment,
Coins(coins::Event),
LiquidityTokens(coins::Event),
Dex(dex::Event),
diff --git a/substrate/abi/src/system.rs b/substrate/abi/src/system.rs
index bb67c91c..78f16b40 100644
--- a/substrate/abi/src/system.rs
+++ b/substrate/abi/src/system.rs
@@ -1,4 +1,5 @@
-use frame_support::dispatch::{DispatchInfo, DispatchError};
+use sp_runtime::DispatchError;
+use frame_support::dispatch::DispatchInfo;
use serai_primitives::SeraiAddress;
diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml
index e73b8ddc..97f618a5 100644
--- a/substrate/client/Cargo.toml
+++ b/substrate/client/Cargo.toml
@@ -27,9 +27,9 @@ serde_json = { version = "1", optional = true }
serai-abi = { path = "../abi", version = "0.1" }
-sp-core = { git = "https://github.com/serai-dex/substrate", optional = true }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", optional = true }
-frame-system = { git = "https://github.com/serai-dex/substrate", optional = true }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
async-lock = "3"
diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml
index a0b42220..c10c0ace 100644
--- a/substrate/primitives/Cargo.toml
+++ b/substrate/primitives/Cargo.toml
@@ -28,7 +28,7 @@ sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", bra
sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
[features]
std = ["zeroize", "scale/std", "borsh?/std", "serde?/std", "scale-info/std", "sp-core/std", "sp-runtime/std", "frame-support/std"]
diff --git a/substrate/runtime/src/lib.rs b/substrate/runtime/src/lib.rs
index a4e10ccb..ab5f1baa 100644
--- a/substrate/runtime/src/lib.rs
+++ b/substrate/runtime/src/lib.rs
@@ -70,7 +70,6 @@ pub type Hash = sp_core::H256;
pub type SignedExtra = (
system::CheckNonZeroSender<Runtime>,
system::CheckSpecVersion<Runtime>,
- system::CheckTxVersion<Runtime>,
system::CheckGenesis<Runtime>,
system::CheckEra<Runtime>,
system::CheckNonce<Runtime>,
@@ -205,7 +204,6 @@ impl timestamp::Config for Runtime {
}
impl transaction_payment::Config for Runtime {
- type RuntimeEvent = RuntimeEvent;
type OnChargeTransaction = Coins;
type OperationalFeeMultiplier = ConstU8<5>;
type WeightToFee = IdentityFee<SubstrateAmount>;