absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase to the latest develop

Browse Source
This commit is contained in:
Luke Parker
2023-12-10 21:27:51 -05:00
parent 0983a49b29
commit d8c7465722
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
substrate/abi/Cargo.toml
View File

@@ -22,11 +22,11 @@ scale-info = { version = "2", features = ["derive"] }
borsh = { version = "1", features = ["derive", "de_strict_order"], optional = true } borsh = { version = "1", features = ["derive", "de_strict_order"], optional = true }
serde = { version = "1", features = ["derive", "alloc"], optional = true } serde = { version = "1", features = ["derive", "alloc"], optional = true }
sp-core = { 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/substrate" } sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
sp-consensus-babe = { 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/substrate" } sp-consensus-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
serai-primitives = { path = "../primitives", version = "0.1" } serai-primitives = { path = "../primitives", version = "0.1" }
serai-coins-primitives = { path = "../coins/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-in-instructions-primitives = { path = "../in-instructions/primitives", version = "0.1" }
serai-signals-primitives = { path = "../signals/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] [features]
borsh = [ borsh = [

2
substrate/abi/src/lib.rs
View File

@@ -41,7 +41,7 @@ pub enum TransactionPaymentEvent {
pub enum Event { pub enum Event {
System(system::Event), System(system::Event),
Timestamp, Timestamp,
TransactionPayment(TransactionPaymentEvent), TransactionPayment,
Coins(coins::Event), Coins(coins::Event),
LiquidityTokens(coins::Event), LiquidityTokens(coins::Event),
Dex(dex::Event), Dex(dex::Event),

3
substrate/abi/src/system.rs
View File

@@ -1,4 +1,5 @@
use frame_support::dispatch::{DispatchInfo, DispatchError}; use sp_runtime::DispatchError;
use frame_support::dispatch::DispatchInfo;
use serai_primitives::SeraiAddress; use serai_primitives::SeraiAddress;

6
substrate/client/Cargo.toml
View File

@@ -27,9 +27,9 @@ serde_json = { version = "1", optional = true }
serai-abi = { path = "../abi", version = "0.1" } serai-abi = { path = "../abi", version = "0.1" }
sp-core = { 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/substrate", optional = true } sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
frame-system = { git = "https://github.com/serai-dex/substrate", optional = true } frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
async-lock = "3" async-lock = "3"

2
substrate/primitives/Cargo.toml
View File

@@ -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-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 } 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] [features]
std = ["zeroize", "scale/std", "borsh?/std", "serde?/std", "scale-info/std", "sp-core/std", "sp-runtime/std", "frame-support/std"] std = ["zeroize", "scale/std", "borsh?/std", "serde?/std", "scale-info/std", "sp-core/std", "sp-runtime/std", "frame-support/std"]

2
substrate/runtime/src/lib.rs
View File

@@ -70,7 +70,6 @@ pub type Hash = sp_core::H256;
pub type SignedExtra = ( pub type SignedExtra = (
system::CheckNonZeroSender<Runtime>, system::CheckNonZeroSender<Runtime>,
system::CheckSpecVersion<Runtime>, system::CheckSpecVersion<Runtime>,
system::CheckTxVersion<Runtime>,
system::CheckGenesis<Runtime>, system::CheckGenesis<Runtime>,
system::CheckEra<Runtime>, system::CheckEra<Runtime>,
system::CheckNonce<Runtime>, system::CheckNonce<Runtime>,
@@ -205,7 +204,6 @@ impl timestamp::Config for Runtime {
} }
impl transaction_payment::Config for Runtime { impl transaction_payment::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type OnChargeTransaction = Coins; type OnChargeTransaction = Coins;
type OperationalFeeMultiplier = ConstU8<5>; type OperationalFeeMultiplier = ConstU8<5>;
type WeightToFee = IdentityFee<SubstrateAmount>; type WeightToFee = IdentityFee<SubstrateAmount>;