jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump alloy and rm EvmOverrides (#8875)

Browse Source
This commit is contained in:
Thomas Coratger
2024-06-17 11:46:42 +02:00
committed by GitHub
parent 859b96388a
commit 333a86db10
20 changed files with 138 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/e2e-test-utils/Cargo.toml
View File

@ -29,7 +29,7 @@ tokio.workspace = true
tokio-stream.workspace = true
serde_json.workspace = true
alloy-signer.workspace = true
alloy-signer-wallet = { workspace = true, features = ["mnemonic"] }
alloy-signer-local = { workspace = true, features = ["mnemonic"] }
alloy-rpc-types.workspace = true
alloy-network.workspace = true
alloy-consensus = { workspace = true, features = ["kzg"] }

26
crates/e2e-test-utils/src/transaction.rs
View File

@ -1,9 +1,9 @@
use alloy_consensus::{
BlobTransactionSidecar, SidecarBuilder, SimpleCoder, TxEip4844Variant, TxEnvelope,
};
use alloy_network::{eip2718::Encodable2718, EthereumSigner, TransactionBuilder};
use alloy_network::{eip2718::Encodable2718, EthereumWallet, TransactionBuilder};
use alloy_rpc_types::{TransactionInput, TransactionRequest};
use alloy_signer_wallet::LocalWallet;
use alloy_signer_local::PrivateKeySigner;
use eyre::Ok;
use reth_primitives::{hex, Address, Bytes, U256};
@ -13,19 +13,22 @@ pub struct TransactionTestContext;
impl TransactionTestContext {
/// Creates a static transfer and signs it, returning bytes
pub async fn transfer_tx(chain_id: u64, wallet: LocalWallet) -> TxEnvelope {
pub async fn transfer_tx(chain_id: u64, wallet: PrivateKeySigner) -> TxEnvelope {
let tx = tx(chain_id, None, 0);
Self::sign_tx(wallet, tx).await
}
/// Creates a static transfer and signs it, returning bytes
pub async fn transfer_tx_bytes(chain_id: u64, wallet: LocalWallet) -> Bytes {
pub async fn transfer_tx_bytes(chain_id: u64, wallet: PrivateKeySigner) -> Bytes {
let signed = Self::transfer_tx(chain_id, wallet).await;
signed.encoded_2718().into()
}
/// Creates a tx with blob sidecar and sign it
pub async fn tx_with_blobs(chain_id: u64, wallet: LocalWallet) -> eyre::Result<TxEnvelope> {
pub async fn tx_with_blobs(
chain_id: u64,
wallet: PrivateKeySigner,
) -> eyre::Result<TxEnvelope> {
let mut tx = tx(chain_id, None, 0);
let mut builder = SidecarBuilder::<SimpleCoder>::new();
@ -40,13 +43,16 @@ impl TransactionTestContext {
}
/// Signs an arbitrary TransactionRequest using the provided wallet
pub async fn sign_tx(wallet: LocalWallet, tx: TransactionRequest) -> TxEnvelope {
let signer = EthereumSigner::from(wallet);
pub async fn sign_tx(wallet: PrivateKeySigner, tx: TransactionRequest) -> TxEnvelope {
let signer = EthereumWallet::from(wallet);
tx.build(&signer).await.unwrap()
}
/// Creates a tx with blob sidecar and sign it, returning bytes
pub async fn tx_with_blobs_bytes(chain_id: u64, wallet: LocalWallet) -> eyre::Result<Bytes> {
pub async fn tx_with_blobs_bytes(
chain_id: u64,
wallet: PrivateKeySigner,
) -> eyre::Result<Bytes> {
let signed = Self::tx_with_blobs(chain_id, wallet).await?;
Ok(signed.encoded_2718().into())
@ -54,12 +60,12 @@ impl TransactionTestContext {
pub async fn optimism_l1_block_info_tx(
chain_id: u64,
wallet: LocalWallet,
wallet: PrivateKeySigner,
nonce: u64,
) -> Bytes {
let l1_block_info = Bytes::from_static(&hex!("7ef9015aa044bae9d41b8380d781187b426c6fe43df5fb2fb57bd4466ef6a701e1f01e015694deaddeaddeaddeaddeaddeaddeaddeaddead000194420000000000000000000000000000000000001580808408f0d18001b90104015d8eb900000000000000000000000000000000000000000000000000000000008057650000000000000000000000000000000000000000000000000000000063d96d10000000000000000000000000000000000000000000000000000000000009f35273d89754a1e0387b89520d989d3be9c37c1f32495a88faf1ea05c61121ab0d1900000000000000000000000000000000000000000000000000000000000000010000000000000000000000002d679b567db6187c0c8323fa982cfb88b74dbcc7000000000000000000000000000000000000000000000000000000000000083400000000000000000000000000000000000000000000000000000000000f4240"));
let tx = tx(chain_id, Some(l1_block_info), nonce);
let signer = EthereumSigner::from(wallet);
let signer = EthereumWallet::from(wallet);
tx.build(&signer).await.unwrap().encoded_2718().into()
}

6
crates/e2e-test-utils/src/wallet.rs
View File

@ -1,9 +1,9 @@
use alloy_signer::Signer;
use alloy_signer_wallet::{coins_bip39::English, LocalWallet, MnemonicBuilder};
use alloy_signer_local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner};
/// One of the accounts of the genesis allocations.
pub struct Wallet {
pub inner: LocalWallet,
pub inner: PrivateKeySigner,
pub inner_nonce: u64,
pub chain_id: u64,
amount: usize,
@ -27,7 +27,7 @@ impl Wallet {
self.derivation_path.as_deref().unwrap_or("m/44'/60'/0'/0/")
}
pub fn gen(&self) -> Vec<LocalWallet> {
pub fn gen(&self) -> Vec<PrivateKeySigner> {
let builder = MnemonicBuilder::<English>::default().phrase(TEST_MNEMONIC);
// use the derivation path