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

dockertest 0.5, correct errors from prior update commit

Browse Source
This commit is contained in:
Luke Parker
2024-09-05 23:31:45 -04:00
parent 0d5756ffcf
commit c1a9256cc5
15 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
processor/Cargo.toml
View File

@@ -77,7 +77,7 @@ sp-application-crypto = { git = "https://github.com/serai-dex/substrate", defaul
ethereum-serai = { path = "../networks/ethereum", default-features = false, features = ["tests"] }
dockertest = "0.4"
dockertest = "0.5"
serai-docker-tests = { path = "../tests/docker" }
[features]

11
processor/src/networks/ethereum.rs
View File

@@ -437,8 +437,7 @@ impl<D: Db> Network for Ethereum<D> {
.map_err(|_| NetworkError::ConnectionError)?
.ok_or(NetworkError::ConnectionError)?
.header
.number
.unwrap();
.number;
// Error if there hasn't been a full epoch yet
if actual_number < 32 {
Err(NetworkError::ConnectionError)?
@@ -467,7 +466,6 @@ impl<D: Db> Network for Ethereum<D> {
.ok_or(NetworkError::ConnectionError)?
.header
.hash
.unwrap()
.into()
};
@@ -480,7 +478,7 @@ impl<D: Db> Network for Ethereum<D> {
.ok_or(NetworkError::ConnectionError)?
.header;
let end_hash = end_header.hash.unwrap().into();
let end_hash = end_header.hash.into();
let time = end_header.timestamp;
Ok(Epoch { prior_end_hash, start: start.try_into().unwrap(), end_hash, time })
@@ -813,7 +811,6 @@ impl<D: Db> Network for Ethereum<D> {
.unwrap()
.header
.number
.unwrap()
.try_into()
.unwrap()
}
@@ -921,13 +918,13 @@ impl<D: Db> Network for Ethereum<D> {
.into(),
};
use ethereum_serai::alloy::consensus::SignableTransaction;
use ethereum_serai::alloy::{primitives::Signature, consensus::SignableTransaction};
let sig = k256::ecdsa::SigningKey::from(k256::elliptic_curve::NonZeroScalar::new(key).unwrap())
.sign_prehash_recoverable(tx.signature_hash().as_ref())
.unwrap();
let mut bytes = vec![];
tx.encode_with_signature_fields(&sig.into(), &mut bytes);
tx.encode_with_signature_fields(&Signature::from(sig), &mut bytes);
let pending_tx = self.provider.send_raw_transaction(&bytes).await.ok().unwrap();
// Mine an epoch containing this TX