Merge pull request #524 from matter-labs/main-with-foundry-commits

chore: pull in merged commits from upstream

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

@@ -147,7 +147,7 @@ pub enum EthRequest {
     EthGetProof(Address, Vec<B256>, Option<BlockId>),
 
     /// The sign method calculates an Ethereum specific signature with:
-    #[cfg_attr(feature = "serde", serde(rename = "eth_sign", alias = "personal_sign"))]
+    #[cfg_attr(feature = "serde", serde(rename = "eth_sign"))]
     EthSign(Address, Bytes),
 
     /// The sign method calculates an Ethereum specific signature, equivalent to eth_sign:

crates/anvil/src/eth/backend/mem/mod.rs

@@ -942,7 +942,6 @@ impl Backend {
             env.block.number = env.block.number.saturating_add(U256::from(1));
             env.block.basefee = U256::from(current_base_fee);
             env.block.blob_excess_gas_and_price = current_excess_blob_gas_and_price;
-            env.block.timestamp = U256::from(self.time.next_timestamp());
 
             // pick a random value for prevrandao
             env.block.prevrandao = Some(B256::random());

crates/anvil/tests/it/main.rs

@@ -1,4 +1,3 @@
-#![allow(clippy::octal_escapes)]
 mod abi;
 mod anvil;
 mod anvil_api;

crates/forge/tests/it/invariant.rs

@@ -165,142 +165,6 @@ async fn test_invariant_filters() {
                     None,
                 )],
             ),
-            (
-                "default/fuzz/invariant/common/InvariantShrinkWithAssert.t.sol:InvariantShrinkWithAssert",
-                vec![(
-                    "invariant_with_assert()",
-                    false,
-                    Some("<empty revert data>".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantShrinkWithAssert.t.sol:InvariantShrinkWithRequire",
-                vec![(
-                    "invariant_with_require()",
-                    false,
-                    Some("revert: wrong counter".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantPreserveState.t.sol:InvariantPreserveState",
-                vec![("invariant_preserve_state()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantCalldataDictionary.t.sol:InvariantCalldataDictionary",
-                vec![(
-                    "invariant_owner_never_changes()",
-                    false,
-                    Some("<empty revert data>".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantAssume.t.sol:InvariantAssume",
-                vec![("invariant_dummy()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantCustomError.t.sol:InvariantCustomError",
-                vec![("invariant_decode_error()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/target/FuzzedTargetContracts.t.sol:ExplicitTargetContract",
-                vec![("invariant_explicit_target()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/target/FuzzedTargetContracts.t.sol:DynamicTargetContract",
-                vec![("invariant_dynamic_targets()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantFixtures.t.sol:InvariantFixtures",
-                vec![(
-                    "invariant_target_not_compromised()",
-                    false,
-                    Some("<empty revert data>".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantShrinkBigSequence.t.sol:ShrinkBigSequenceTest",
-                vec![("invariant_shrink_big_sequence()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantShrinkFailOnRevert.t.sol:ShrinkFailOnRevertTest",
-                vec![("invariant_shrink_fail_on_revert()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantScrapeValues.t.sol:FindFromReturnValueTest",
-                vec![(
-                    "invariant_value_not_found()",
-                    false,
-                    Some("revert: value from return found".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantScrapeValues.t.sol:FindFromLogValueTest",
-                vec![(
-                    "invariant_value_not_found()",
-                    false,
-                    Some("revert: value from logs found".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantRollFork.t.sol:InvariantRollForkBlockTest",
-                vec![(
-                    "invariant_fork_handler_block()",
-                    false,
-                    Some("revert: too many blocks mined".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantRollFork.t.sol:InvariantRollForkStateTest",
-                vec![(
-                    "invariant_fork_handler_state()",
-                    false,
-                    Some("revert: wrong supply".into()),
-                    None,
-                    None,
-                )],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantExcludedSenders.t.sol:InvariantExcludedSendersTest",
-                vec![("invariant_check_sender()", true, None, None, None)],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantAfterInvariant.t.sol:InvariantAfterInvariantTest",
-                vec![
-                    (
-                        "invariant_after_invariant_failure()",
-                        false,
-                        Some("revert: afterInvariant failure".into()),
-                        None,
-                        None,
-                    ),
-                    (
-                        "invariant_failure()",
-                        false,
-                        Some("revert: invariant failure".into()),
-                        None,
-                        None,
-                    ),
-                    ("invariant_success()", true, None, None, None),
-                ],
-            ),
-            (
-                "default/fuzz/invariant/common/InvariantSelectorsWeight.t.sol:InvariantSelectorsWeightTest",
-                vec![("invariant_selectors_weight()", true, None, None, None)],
-            )
         ]),
     );
 }