Skip to content

Commit

Permalink
fix: blob cheats shadowing (#7787)
Browse files Browse the repository at this point in the history
* fix: blob cheats shadowing

* fix: cargo cheats
  • Loading branch information
yash-atreya committed Apr 26, 2024
1 parent 19d69f2 commit d21c3e7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions crates/cheatcodes/assets/cheatcodes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/cheatcodes/spec/src/vm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,13 @@ interface Vm {
/// Not available on EVM versions before Cancun.
/// If used on unsupported EVM versions it will revert.
#[cheatcode(group = Evm, safety = Unsafe)]
function blobhashes(bytes32[] calldata blobhashes) external;
function blobhashes(bytes32[] calldata hashes) external;

/// Gets the blockhashes from the current transaction.
/// Not available on EVM versions before Cancun.
/// If used on unsupported EVM versions it will revert.
#[cheatcode(group = Evm, safety = Unsafe)]
function getBlobhashes() external view returns (bytes32[] memory blobhashes);
function getBlobhashes() external view returns (bytes32[] memory hashes);

/// Sets `block.height`.
#[cheatcode(group = Evm, safety = Unsafe)]
Expand Down
4 changes: 2 additions & 2 deletions crates/cheatcodes/src/evm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,13 @@ impl Cheatcode for prevrandao_1Call {

impl Cheatcode for blobhashesCall {
fn apply_full<DB: DatabaseExt>(&self, ccx: &mut CheatsCtxt<DB>) -> Result {
let Self { blobhashes } = self;
let Self { hashes } = self;
ensure!(
ccx.ecx.spec_id() >= SpecId::CANCUN,
"`blobhash` is not supported before the Cancun hard fork; \
see EIP-4844: https://eips.ethereum.org/EIPS/eip-4844"
);
ccx.ecx.env.tx.blob_hashes.clone_from(blobhashes);
ccx.ecx.env.tx.blob_hashes.clone_from(hashes);
Ok(Default::default())
}
}
Expand Down
4 changes: 2 additions & 2 deletions testdata/cheats/Vm.sol

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d21c3e7

Please sign in to comment.