Skip to content

refactor(script): remove dead tx input normalization #13902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edgarr1986 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −13
Open

refactor(script): remove dead tx input normalization #13902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions crates/script/src/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use alloy_primitives::{
map::{HashMap, HashSet},
};
use alloy_provider::Provider;
use alloy_rpc_types::TransactionInput;
use eyre::{OptionExt, Result};
use foundry_cheatcodes::Wallets;
use foundry_cli::utils::{ensure_clean_constructor, needs_setup};
Expand Down Expand Up @@ -295,18 +294,9 @@ impl ExecutedState {

let decoder = self.build_trace_decoder(&self.build_data.known_contracts).await?;

let mut txs: BroadcastableTransactions<Ethereum> =
self.execution_result.transactions.clone().unwrap_or_default();

// Ensure that unsigned transactions have both `data` and `input` populated to avoid
// issues with eth_estimateGas and eth_sendTransaction requests.
for tx in &mut txs {
if let Some(req) = tx.transaction.as_unsigned_mut() {
req.input =
TransactionInput::maybe_both(std::mem::take(&mut req.input).into_input());
}
}
let rpc_data = RpcData::from_transactions(&txs);
let empty_txs = BroadcastableTransactions::<Ethereum>::default();
let txs = self.execution_result.transactions.as_ref().unwrap_or(&empty_txs);
let rpc_data = RpcData::from_transactions(txs);

if rpc_data.is_multi_chain() {
sh_warn!("Multi chain deployment is still under development. Use with caution.")?;
Expand Down
Loading