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

Merge branch 'next' into next-polkadot-sdk

Browse Source
This commit is contained in:
Luke Parker
2025-09-03 16:44:26 -04:00
parent a2209dd6ff 5265cc69de
commit 3541197aa5
130 changed files with 1102 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
substrate/node/Cargo.toml
View File

@@ -82,7 +82,7 @@ serai-env = { path = "../../common/env" }
curve25519-dalek = { version = "4", default-features = false, features = ["alloc", "zeroize"] }
bitcoin-serai = { path = "../../networks/bitcoin", default-features = false, features = ["std", "hazmat"] }
monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", default-features = false, features = ["std"] }
monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", default-features = false, features = ["std"] }
[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "ece373ca1e8aaee67844eebcca28b5e016136dba" }

15
substrate/node/src/rpc.rs
View File

@@ -50,7 +50,7 @@ where
{
use substrate_frame_rpc_system::{System, SystemApiServer};
use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
use ciphersuite::Ciphersuite;
use ciphersuite::{GroupIo, WithPreferredHash};
use ciphersuite_kp256::{k256::elliptic_curve::point::AffineCoordinates, Secp256k1};
use dalek_ff_group::Ed25519;
use bitcoin_serai::bitcoin;
@@ -126,7 +126,7 @@ where
match network {
ExternalNetworkId::Bitcoin => {
let key = <Secp256k1 as Ciphersuite>::read_G::<&[u8]>(&mut external_key.as_slice())
let key = <Secp256k1 as GroupIo>::read_G::<&[u8]>(&mut external_key.as_slice())
.map_err(|_| Error::Custom("invalid key stored in db".to_string()))?;
let addr = bitcoin::Address::p2tr_tweaked(
@@ -144,14 +144,11 @@ where
ExternalNetworkId::Ethereum => Ok(String::new()),
ExternalNetworkId::Monero => {
// TODO: Serai view-key crate
let view_private = zeroize::Zeroizing::new(
<Ed25519 as Ciphersuite>::hash_to_F(
&["Monero".as_bytes(), &0u64.to_le_bytes()].concat(),
)
.0,
);
let view_private = zeroize::Zeroizing::new(<Ed25519 as WithPreferredHash>::hash_to_F(
&["Monero".as_bytes(), &0u64.to_le_bytes()].concat(),
));
let spend = <Ed25519 as Ciphersuite>::read_G::<&[u8]>(&mut external_key.as_slice())
let spend = <Ed25519 as GroupIo>::read_G::<&[u8]>(&mut external_key.as_slice())
.map_err(|_| Error::Custom("invalid key stored in db".to_string()))?;
let addr = monero_address::MoneroAddress::new(