From 0c74334d129872868c7f052cfc0a18ca84a8c1c3 Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Wed, 13 Dec 2023 01:19:06 +0400 Subject: [PATCH 1/2] Fix sender_nonce shadowing --- crates/forge/src/runner.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/forge/src/runner.rs b/crates/forge/src/runner.rs index 4417c2309545..389d22913e4f 100644 --- a/crates/forge/src/runner.rs +++ b/crates/forge/src/runner.rs @@ -115,8 +115,7 @@ impl<'a> ContractRunner<'a> { } } - let sender_nonce = self.executor.get_nonce(self.sender)?; - let address = self.sender.create(sender_nonce); + let address = self.sender.create(self.executor.get_nonce(self.sender)?); // Set the contracts initial balance before deployment, so it is available during // construction From 0091a3fd114e9468d31e1ffc6977af5670fdbbdf Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Thu, 14 Dec 2023 00:38:04 +0400 Subject: [PATCH 2/2] Fix sender_nonce --- crates/forge/bin/cmd/script/runner.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/forge/bin/cmd/script/runner.rs b/crates/forge/bin/cmd/script/runner.rs index ca5de4b28b47..4dc2857db883 100644 --- a/crates/forge/bin/cmd/script/runner.rs +++ b/crates/forge/bin/cmd/script/runner.rs @@ -70,8 +70,7 @@ impl ScriptRunner { .map(|traces| (TraceKind::Deployment, traces)) .collect(); - let sender_nonce = self.executor.get_nonce(CALLER)?; - let address = CALLER.create(sender_nonce); + let address = CALLER.create(self.executor.get_nonce(CALLER)?); // Set the contracts initial balance before deployment, so it is available during the // construction