Mainly corrects for https://github.com/alloy-rs/alloy/issues/1510 yet also
corrects a missing machete ignore.
This commit is contained in:
Luke Parker 2024-10-17 18:02:57 -04:00
parent bbe014c3a7
commit 28619fbee1
No known key found for this signature in database
3 changed files with 12 additions and 7 deletions

View file

@ -13,6 +13,9 @@ rust-version = "1.70"
all-features = true all-features = true
rustdoc-args = ["--cfg", "docsrs"] rustdoc-args = ["--cfg", "docsrs"]
[package.metadata.cargo-machete]
ignored = ["tiny-bip39"]
[lib] [lib]
name = "bip39" name = "bip39"
path = "src/lib.rs" path = "src/lib.rs"

View file

@ -918,16 +918,17 @@ impl<D: Db> Network for Ethereum<D> {
.into(), .into(),
}; };
use ethereum_serai::alloy::{primitives::Signature, consensus::SignableTransaction}; use ethereum_serai::alloy::{
primitives::{Parity, Signature},
consensus::SignableTransaction,
};
let sig = k256::ecdsa::SigningKey::from(k256::elliptic_curve::NonZeroScalar::new(key).unwrap()) let sig = k256::ecdsa::SigningKey::from(k256::elliptic_curve::NonZeroScalar::new(key).unwrap())
.sign_prehash_recoverable(tx.signature_hash().as_ref()) .sign_prehash_recoverable(tx.signature_hash().as_ref())
.unwrap(); .unwrap();
let mut bytes = vec![]; let mut bytes = vec![];
tx.encode_with_signature_fields( let parity = Parity::NonEip155(Parity::from(sig.1).y_parity());
&Signature::from(sig).with_chain_id(self.provider.get_chain_id().await.unwrap()), tx.encode_with_signature_fields(&Signature::from(sig).with_parity(parity), &mut bytes);
&mut bytes,
);
let pending_tx = self.provider.send_raw_transaction(&bytes).await.ok().unwrap(); let pending_tx = self.provider.send_raw_transaction(&bytes).await.ok().unwrap();
// Mine an epoch containing this TX // Mine an epoch containing this TX

View file

@ -299,7 +299,7 @@ impl Wallet {
use std::sync::Arc; use std::sync::Arc;
use ethereum_serai::{ use ethereum_serai::{
alloy::{ alloy::{
primitives::{U256, Signature, TxKind}, primitives::{U256, Parity, Signature, TxKind},
sol_types::SolCall, sol_types::SolCall,
simple_request_transport::SimpleRequest, simple_request_transport::SimpleRequest,
consensus::{TxLegacy, SignableTransaction}, consensus::{TxLegacy, SignableTransaction},
@ -389,7 +389,8 @@ impl Wallet {
.unwrap(); .unwrap();
let mut bytes = vec![]; let mut bytes = vec![];
tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes); let parity = Parity::NonEip155(Parity::from(sig.1).y_parity());
tx.encode_with_signature_fields(&Signature::from(sig).with_parity(parity), &mut bytes);
// We drop the bottom 10 decimals // We drop the bottom 10 decimals
( (