Merge branch 'master' into etherscan-v2-redo

Author: grandizzy

crates/anvil/tests/it/fork.rs

@@ -1329,7 +1329,7 @@ async fn test_immutable_fork_transaction_hash() {
 
     // Fork to a block with a specific transaction
     let fork_tx_hash =
-        TxHash::from_str("39d64ebf9eb3f07ede37f8681bc3b61928817276c4c4680b6ef9eac9f88b6786")
+        TxHash::from_str("2ac736ce725d628ef20569a1bb501726b42b33f9d171f60b92b69de3ce705845")
             .unwrap();
     let (api, _) = spawn(
         fork_config()
@@ -1339,7 +1339,7 @@ async fn test_immutable_fork_transaction_hash() {
     )
     .await;
 
-    let fork_block_number = 8521008;
+    let fork_block_number = 21824325;
 
     // Make sure the fork starts from previous block
     let mut block_number = api.block_number().unwrap().to::<u64>();
@@ -1356,26 +1356,26 @@ async fn test_immutable_fork_transaction_hash() {
         .await
         .unwrap()
         .unwrap();
-    assert_eq!(block.transactions.len(), 14);
+    assert_eq!(block.transactions.len(), 6);
     let block = api
         .block_by_number_full(BlockNumberOrTag::Number(fork_block_number))
         .await
         .unwrap()
         .unwrap();
-    assert_eq!(block.transactions.len(), 3);
+    assert!(!block.transactions.is_empty());
 
     // Validate the transactions preceding the target transaction exist
     let expected_transactions = [
-        TxHash::from_str("1bfe33136edc3d26bd01ce75c8f5ae14fffe8b142d30395cb4b6d3dc3043f400")
+        TxHash::from_str("c900784c993221ba192c53a3ff9996f6af83a951100ceb93e750f7ef86bd43d5")
             .unwrap(),
-        TxHash::from_str("8c0ce5fb9ec2c8e03f7fcc69c7786393c691ce43b58a06d74d6733679308fc01")
+        TxHash::from_str("f86f001bbdf69f8f64ff8a4a5fc3e684cf3a7706f204eba8439752f6f67cd2c4")
             .unwrap(),
         fork_tx_hash,
     ];
     for expected in [
-        (expected_transactions[0], address!("0x8C1aB379E7263d37049505626D2F975288F5dF12")),
-        (expected_transactions[1], address!("0xdf918d9D02d5C7Df6825a7046dBF3D10F705Aa76")),
-        (expected_transactions[2], address!("0x5Be88952ce249024613e0961eB437f5E9424A90c")),
+        (expected_transactions[0], address!("0x0a02a416f87a13626dda0ad386859497565222aa")),
+        (expected_transactions[1], address!("0x0a02a416f87a13626dda0ad386859497565222aa")),
+        (expected_transactions[2], address!("0x4f07d669d76ed9a17799fc4c04c4005196240940")),
     ] {
         let tx = api.backend.mined_transaction_by_hash(expected.0).unwrap();
         assert_eq!(tx.inner.inner.signer(), expected.1);