fix merge conflict

Author: zerosnacks

Cargo.lock

@@ -30,7 +30,6 @@ alloy-rlp.workspace = true
 alloy-eips.workspace = true
 alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
 alloy-dyn-abi = { workspace = true, features = ["std", "eip712"] }
-alloy-trie.workspace = true
 op-alloy-consensus = { workspace = true, features = ["serde"] }
 alloy-network.workspace = true
 serde.workspace = true

crates/anvil/core/Cargo.toml

@@ -18,7 +18,6 @@ use foundry_common::serde_helpers::{
 };
 
 pub mod block;
-pub mod proof;
 pub mod subscription;
 pub mod transaction;
 pub mod wallet;

crates/anvil/core/src/eth/mod.rs

@@ -1,25 +0,0 @@
-//! Return types for `eth_getProof`
-
-//use crate::eth::trie::KECCAK_NULL_RLP;
-use alloy_primitives::{B256, U256};
-use alloy_trie::EMPTY_ROOT_HASH;
-use revm::primitives::KECCAK_EMPTY;
-
-#[derive(Clone, Debug, PartialEq, Eq, alloy_rlp::RlpEncodable, alloy_rlp::RlpDecodable)]
-pub struct BasicAccount {
-    pub nonce: U256,
-    pub balance: U256,
-    pub storage_root: B256,
-    pub code_hash: B256,
-}
-
-impl Default for BasicAccount {
-    fn default() -> Self {
-        Self {
-            balance: U256::ZERO,
-            nonce: U256::ZERO,
-            code_hash: KECCAK_EMPTY,
-            storage_root: EMPTY_ROOT_HASH,
-        }
-    }
-}

crates/anvil/core/src/eth/proof.rs

@@ -1,30 +1,6 @@
-use alloy_primitives::{Bytes, B256, U256};
+use alloy_primitives::Bytes;
 use alloy_rpc_types::TransactionRequest;
-use serde::{Deserialize, Serialize, Serializer};
-
-/// Represents the result of `eth_getWork`.
-///
-/// This may or may not include the block number.
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct Work {
-    pub pow_hash: B256,
-    pub seed_hash: B256,
-    pub target: B256,
-    pub number: Option<u64>,
-}
-
-impl Serialize for Work {
-    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        if let Some(num) = self.number {
-            (&self.pow_hash, &self.seed_hash, &self.target, U256::from(num)).serialize(s)
-        } else {
-            (&self.pow_hash, &self.seed_hash, &self.target).serialize(s)
-        }
-    }
-}
+use serde::Deserialize;
 
 /// Represents the options used in `anvil_reorg`
 #[derive(Debug, Clone, Deserialize)]

crates/anvil/core/src/types.rs

@@ -61,7 +61,7 @@ use alloy_rpc_types::{
     },
     txpool::{TxpoolContent, TxpoolInspect, TxpoolInspectSummary, TxpoolStatus},
     AccessList, AccessListResult, BlockId, BlockNumberOrTag as BlockNumber, BlockTransactions,
-    EIP1186AccountProofResponse, FeeHistory, Filter, FilteredParams, Index, Log,
+    EIP1186AccountProofResponse, FeeHistory, Filter, FilteredParams, Index, Log, Work,
 };
 use alloy_serde::WithOtherFields;
 use alloy_transport::TransportErrorKind;
@@ -75,7 +75,7 @@ use anvil_core::{
         wallet::{WalletCapabilities, WalletError},
         EthRequest,
     },
-    types::{ReorgOptions, TransactionData, Work},
+    types::{ReorgOptions, TransactionData},
 };
 use anvil_rpc::{error::RpcError, response::ResponseResult};
 use foundry_common::provider::ProviderBuilder;

crates/anvil/src/eth/api.rs

@@ -10,8 +10,10 @@ use alloy_sol_types::SolValue;
 use foundry_wallets::{multi_wallet::MultiWallet, WalletSigner};
 use parking_lot::Mutex;
 use revm::{
-    bytecode::Bytecode, context::JournalTr, context_interface::transaction::SignedAuthorization,
-    primitives::hardfork::SpecId,
+    bytecode::Bytecode,
+    context::JournalTr,
+    context_interface::transaction::SignedAuthorization,
+    primitives::{hardfork::SpecId, KECCAK_EMPTY},
 };
 use std::sync::Arc;
 
@@ -131,8 +133,13 @@ fn write_delegation(ccx: &mut CheatsCtxt, auth: SignedAuthorization) -> Result<(
         return Err("invalid nonce".into());
     }
     authority_acc.data.info.nonce += 1;
-    let bytecode = Bytecode::new_eip7702(*auth.address());
-    ccx.ecx.journaled_state.set_code(authority, bytecode);
+    if auth.address.is_zero() {
+        // Set empty code if the delegation address of authority is 0x.
+        ccx.ecx.journaled_state.set_code_with_hash(authority, Bytecode::default(), KECCAK_EMPTY);
+    } else {
+        let bytecode = Bytecode::new_eip7702(*auth.address());
+        ccx.ecx.journaled_state.set_code(authority, bytecode);
+    }
     Ok(())
 }
 

crates/cheatcodes/src/script.rs

@@ -401,3 +401,6 @@ test_repro!(7238);
 
 // https://github.com/foundry-rs/foundry/issues/10302
 test_repro!(10302);
+
+// https://github.com/foundry-rs/foundry/issues/10477
+test_repro!(10477);

crates/forge/tests/it/repros.rs

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity ^0.8.18;
+
+import "ds-test/test.sol";
+import "cheats/Vm.sol";
+
+contract SimpleDelegate {
+    function call(address target, bytes memory data) external returns (bool callResult, bytes memory callData) {
+        (callResult, callData) = target.call(data);
+    }
+}
+
+contract Counter {
+    uint256 public value = 0;
+
+    function increment() external {
+        value++;
+    }
+}
+
+contract Issue10477Test is DSTest {
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    address payable ALICE_ADDRESS = payable(0x70997970C51812dc3A010C7d01b50e0d17dc79C8);
+    uint256 constant ALICE_PK = 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d;
+
+    function test_reset_delegate_indicator() public {
+        SimpleDelegate delegate = new SimpleDelegate();
+        Counter counter = new Counter();
+
+        vm.startBroadcast(ALICE_PK);
+        vm.signAndAttachDelegation(address(delegate), ALICE_PK);
+        assertTrue(ALICE_ADDRESS.code.length > 0);
+
+        (bool callResult, bytes memory callData) =
+            SimpleDelegate(ALICE_ADDRESS).call(address(counter), abi.encodeCall(Counter.increment, ()));
+
+        assertTrue(callResult);
+        assertTrue(callData.length == 0);
+
+        vm.signAndAttachDelegation(address(0), ALICE_PK);
+
+        // Expected to succeed here
+        assertTrue(ALICE_ADDRESS.code.length == 0);
+        assertTrue(ALICE_ADDRESS.codehash == 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470);
+
+        vm.stopBroadcast();
+    }
+}