absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 20:29:23 +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 }
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 = [

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

@@ -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),

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;