chore: aggregate PRs (#11310)

This PR aggregates changes from the following PRs:

- Closes #11290 by @\prestoalvarez
- Closes #11309 by @\Eth161dm

Author: DaniPopes

crates/anvil/src/config.rs

@@ -1446,7 +1446,9 @@ async fn derive_block_and_transactions(
                 .get_transaction_by_hash(transaction_hash.0.into())
                 .await?
                 .ok_or_else(|| eyre::eyre!("failed to get fork transaction by hash"))?;
-            let transaction_block_number = transaction.block_number.unwrap();
+            let transaction_block_number = transaction.block_number.ok_or_else(|| {
+                eyre::eyre!("fork transaction is not mined yet (no block number)")
+            })?;
 
             // Get the block pertaining to the fork transaction
             let transaction_block = provider

crates/evm/core/src/constants.rs

@@ -17,7 +17,7 @@ pub const CHEATCODE_CONTRACT_HASH: B256 =
 
 /// The Hardhat console address.
 ///
-/// See: <https://github.com/nomiclabs/hardhat/blob/master/packages/hardhat-core/console.sol>
+/// See: <https://github.com/NomicFoundation/hardhat/blob/main/v-next/hardhat/console.sol>
 pub const HARDHAT_CONSOLE_ADDRESS: Address = address!("0x000000000000000000636F6e736F6c652e6c6f67");
 
 /// Stores the caller address to be used as *sender* account for: