Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump to latest alloy and revm #7934

Merged
merged 38 commits into from
May 23, 2024
Merged

chore: bump to latest alloy and revm #7934

merged 38 commits into from
May 23, 2024

Conversation

yash-atreya
Copy link
Collaborator

Motivation

Bump alloy. Fixes #7932

Solution

Redo RPC calls

@yash-atreya yash-atreya marked this pull request as ready for review May 16, 2024 14:33
@yash-atreya yash-atreya changed the title Bump alloy f415827 chore: bump alloy f415827 May 16, 2024
@yash-atreya
Copy link
Collaborator Author

Supersedes #7933

DaniPopes
DaniPopes reviewed May 16, 2024
View reviewed changes
Cargo.lock Outdated Show resolved Hide resolved
@yash-atreya yash-atreya changed the title chore: bump alloy f415827 chore: bump alloy and revm May 16, 2024
mattsse
mattsse requested changes May 16, 2024
View reviewed changes
Copy link
Member

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

early comment

crates/cast/bin/cmd/mktx.rs Outdated Show resolved Hide resolved
DaniPopes
DaniPopes requested changes May 16, 2024
View reviewed changes
crates/cast/bin/main.rs Outdated Show resolved Hide resolved
@yash-atreya yash-atreya requested a review from onbjerg as a code owner May 16, 2024 18:25
@yash-atreya
Copy link
Collaborator Author

can we use the memory range here somehow and calc this manually @DaniPopes ?

not exactly sure what this previously tracked

We need buffer.len() to calculate it manually and that's also in SharedMemory

DaniPopes
DaniPopes approved these changes May 21, 2024
View reviewed changes
Copy link
Member

@DaniPopes DaniPopes left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, nits, and as discussed we can set the lastCallGas gasMemoryUsed to 0 and soft deprecate it.

crates/evm/evm/src/inspectors/debugger.rs Outdated Show resolved Hide resolved
crates/evm/core/src/ic.rs Outdated Show resolved Hide resolved
crates/evm/evm/src/inspectors/stack.rs Outdated
@@ -551,19 +551,19 @@ impl InspectorStack {
let (result, address, output) = match res.result {
ExecutionResult::Success { reason, gas_used, gas_refunded, logs: _, output } => {
gas.set_refund(gas_refunded as i64);
gas.record_cost(gas_used);
let _record_gas = gas.record_cost(gas_used);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine because it's a new Gas instance, I added must_use for use within EVM instructions.

@mattsse
Copy link
Member

mattsse commented May 22, 2024

needs clippy

@mattsse
Copy link
Member

mattsse commented May 22, 2024

this test appears to be flaky testStorageAccessDelegateCall on multiple platforms, unsure if related to this pr

@DaniPopes
Copy link
Member

likely some incorrect address migration in cheatcodes

@yash-atreya
Copy link
Collaborator Author

likely some incorrect address migration in cheatcodes

Yeah I'll investigate

@mattsse mattsse mentioned this pull request May 22, 2024
Merged
@dancoombs dancoombs mentioned this pull request May 23, 2024
Merged
yash-atreya and others added 3 commits May 23, 2024 09:32
@yash-atreya @DaniPopes
nit
7b907a4 
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
@yash-atreya
Merge branch 'master' into alloy_f415827
4f2ee64
@yash-atreya
fix arg
d0a361e
DaniPopes
DaniPopes reviewed May 23, 2024
View reviewed changes
testdata/lib/forge-std Outdated Show resolved Hide resolved
@DaniPopes
Copy link
Member

DaniPopes commented May 23, 2024 •
edited

this test appears to be flaky testStorageAccessDelegateCall on multiple platforms, unsure if related to this pr

@mattsse it's not flaky if it actually fails :D

@yash-atreya
Copy link
Collaborator Author

Clippy failing due to docs, should be fixed by #7975

@mattsse
Copy link
Member

mattsse commented May 23, 2024

great, just resolved 1 smol conflict

@mattsse mattsse merged commit 299902e into foundry-rs:master May 23, 2024
20 checks passed
klkvr pushed a commit that referenced this pull request May 24, 2024
@yash-atreya @DaniPopes
@mattsse @klkvr
chore: bump to latest alloy and revm (#7934)
e66a77d 
* revert to alloy f415827

* revm-inspectors bump 098ab30

* deny.toml nit

* satisfy AccessListInspector trait bounds

* bump revm

* map Opcode

* nit

* fix: revm `CallInputs` for cheatcodes/inspector

* remove: `BlockId::latest()` calls

* use unwrap_or_default

* fix: evm/coverage

* fix: evm/fuzz

* fix: cheatcodes

* fix: evm executors and inspectors

* fix: anvil & verify

* fix: add `AnvilAccessListInspector` to satisfy trait bounds

* fix: anvil tests

* clippy: rm unused

* fmt

* fix: cheatcodes inspector revm `CallInputs`

* rm spec arg

* use OPCODE_INFO_JUMPTABLE

* nit

* rm wrapped inspectors

* fix: anvil test can_sign_tx

* fix: evm deser cache tests

* deprecate gas memory recording

* nits

* nit

* nits

* ci nits

* fix: use `call.bytecode_address` instead of `call.target_address`

* nit

Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>

* fix arg

* rm forge-std

---------

Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattsse mattsse mattsse approved these changes

@DaniPopes DaniPopes DaniPopes approved these changes

@klkvr klkvr Awaiting requested review from klkvr klkvr is a code owner

@Evalir Evalir Awaiting requested review from Evalir Evalir is a code owner

@onbjerg onbjerg Awaiting requested review from onbjerg onbjerg is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Eth fee estimation broken for recent clients
3 participants
@yash-atreya @mattsse @DaniPopes