Skip to content
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

Jump to bottom

fix: set script evm sender from all wallet signers #7538

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: set script evm sender from all wallet signers #7538

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ab4c18
fix: set script evm sender from all wallet signers
tchardin Apr 1, 2024
425e224
feat: set evm sender from single signer when none is provided
tchardin Apr 2, 2024
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
40 changes: 20 additions & 20 deletions crates/script/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use broadcast::next_nonce;
use build::PreprocessedState;
use clap::{Parser, ValueHint};
use dialoguer::Confirm;
use ethers_signers::Signer;
use eyre::{ContextCompat, Result};
use forge_verify::RetryArgs;
use foundry_cli::{opts::CoreBuildArgs, utils::LoadConfig};
Expand All @@ -21,9 +20,7 @@ use foundry_common::{
errors::UnlinkedByteCode,
evm::{Breakpoints, EvmArgs},
provider::ethers::RpcUrl,
shell,
types::ToAlloy,
CONTRACT_MAX_SIZE, SELECTOR_LEN,
shell, CONTRACT_MAX_SIZE, SELECTOR_LEN,
};
use foundry_compilers::{artifacts::ContractBytecodeSome, ArtifactId};
use foundry_config::{
Expand Down Expand Up @@ -203,11 +200,7 @@ impl ScriptArgs {
let script_wallets =
ScriptWallets::new(self.wallets.get_multi_wallet().await?, self.evm_opts.sender);

let (config, mut evm_opts) = self.load_config_and_evm_opts_emit_warnings()?;

if let Some(sender) = self.maybe_load_private_key()? {
evm_opts.sender = sender;
}
let (config, evm_opts) = self.load_config_and_evm_opts_emit_warnings()?;

let script_config = ScriptConfig::new(config, evm_opts).await?;

Expand Down Expand Up @@ -292,17 +285,6 @@ impl ScriptArgs {
Ok(())
}

/// In case the user has loaded *only* one private-key, we can assume that he's using it as the
/// `--sender`
fn maybe_load_private_key(&self) -> Result<Option<Address>> {
let maybe_sender = self
.wallets
.private_keys()?
.filter(|pks| pks.len() == 1)
.map(|pks| pks.first().unwrap().address().to_alloy());
Ok(maybe_sender)
}

/// Returns the Function and calldata based on the signature
///
/// If the `sig` is a valid human-readable function we find the corresponding function in the
Expand Down Expand Up @@ -588,6 +570,24 @@ impl ScriptConfig {
.gas_limit(self.evm_opts.gas_limit());

if let Some(script_wallets) = script_wallets {
let mut inner = script_wallets.inner.lock();
// if a sender is provided it will be set on evm_opts already
// otherwise if we have exactly one signer we can assume it is the sender
// else we throw an error to avoid landing on the DEFAULT_SENDER.
if inner.provided_sender.is_none() {
// may unlock some pending keystores
let signers = inner.multi_wallet.signers()?;
if signers.len() == 1 {
let address = signers.keys().next().unwrap();
self.evm_opts.sender = *address;
}
if signers.len() > 1 {
eyre::bail!("multiple signers found, please provide a --sender address.");
}
}
// we can drop the inner wallet now that we have the sender
// and release the lock for the runner.
drop(inner);
builder = builder.inspectors(|stack| {
stack
.debug(debug)
Expand Down
Loading