Skip to content

Skip counting delegatecalls in expectCall tracker #491

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

Closed
filip-parity wants to merge 2 commits into from
+19 −1
Closed

Skip counting delegatecalls in expectCall tracker #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4198c4
Skip counting delegatecalls in expectCall tracker
filip-parity Jan 15, 2026
2e3e995
Add delegateCall test
filip-parity Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/revive-strategy/src/tracing/call_tracer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@ impl Tracing for ExpectedCallTracer {
&mut self,
_from: H160,
to: H160,
_is_delegate_call: bool,
is_delegate_call: bool,
_is_read_only: bool,
value: U256,
input: &[u8],
_gas: Weight,
) {
if is_delegate_call {
Copy link
Copy Markdown

@pkhry pkhry Jan 15, 2026

Choose a reason for hiding this comment

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

did you run ExpectCallRevive tests?

Copy link
Copy Markdown
Author

@filip-parity filip-parity Jan 16, 2026

Choose a reason for hiding this comment

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

Checking now with the updated polkadot-sdk

return;
}

if !self.is_create
&& let Some(expected_calls_for_target) = self.data.get_mut(&Address::from(to.0))
{
Expand Down
14 changes: 14 additions & 0 deletions testdata/default/cheats/ExpectCallRevive.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,3 +347,17 @@ contract ExpectCallMixedTest is DSTest {
target.add(1, 2);
}
}

contract ExpectCallDelegateSkipTest is DSTest {
Vm constant vm = Vm(HEVM_ADDRESS);

function testExpectCallSkipsDelegateCalls() public {
ProxyWithDelegateCall proxy = new ProxyWithDelegateCall();
SimpleCall target = new SimpleCall();

vm.expectCall(address(target), abi.encodeWithSignature("call()"), 1);

target.call();
proxy.delegateCall(target);
}
}