forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix trace call for inner reverts (ethereum#25971)
Inner call reverts will now return the reason similar to the top-level call. Separately, if top-level call is of type CREATE and it fails, its `to` field will now be cleared to `0x00...00` instead of being set to the created address.
- Loading branch information
1 parent
cf3375b
commit 2d19edb
Showing
8 changed files
with
132 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| { | ||
| "genesis": { | ||
| "baseFeePerGas": "1000000000", | ||
| "difficulty": "1", | ||
| "extraData": "0x00000000000000000000000000000000000000000000000000000000000000003623191d4ccfbbdf09e8ebf6382a1f8257417bc10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", | ||
| "gasLimit": "11500000", | ||
| "hash": "0x2af138b8a06e65b8dd0999df70b9e87609e9fc91ea201f08b1cc4f25ef01fcf6", | ||
| "miner": "0x0000000000000000000000000000000000000000", | ||
| "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "nonce": "0x0000000000000000", | ||
| "number": "0", | ||
| "stateRoot": "0xa775801d572e9b79585eb131d18d79f8a0f71895455ab9a5b656911428e11708", | ||
| "timestamp": "0", | ||
| "totalDifficulty": "1", | ||
| "alloc": { | ||
| "0x3623191d4ccfbbdf09e8ebf6382a1f8257417bc1": { | ||
| "balance": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7" | ||
| }, | ||
| "0xd15abca351f79181dedfb6d019e382db90f3628a": { | ||
| "balance": "0x0" | ||
| } | ||
| }, | ||
| "config": { | ||
| "chainId": 1337, | ||
| "homesteadBlock": 0, | ||
| "eip150Block": 0, | ||
| "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000", | ||
| "eip155Block": 0, | ||
| "eip158Block": 0, | ||
| "byzantiumBlock": 0, | ||
| "constantinopleBlock": 0, | ||
| "petersburgBlock": 0, | ||
| "istanbulBlock": 0, | ||
| "muirGlacierBlock": 0, | ||
| "berlinBlock": 0, | ||
| "londonBlock": 0, | ||
| "clique": { | ||
| "period": 0, | ||
| "epoch": 30000 | ||
| } | ||
| } | ||
| }, | ||
| "context": { | ||
| "number": "1", | ||
| "difficulty": "2", | ||
| "timestamp": "1665537018", | ||
| "gasLimit": "11511229", | ||
| "miner": "0x0000000000000000000000000000000000000000" | ||
| }, | ||
| "input": "0x02f9029d82053980849502f90085010c388d00832dc6c08080b90241608060405234801561001057600080fd5b50600060405161001f906100a2565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c04062266040518163ffffffff1660e01b815260040160006040518083038186803b15801561008457600080fd5b505afa158015610098573d6000803e3d6000fd5b50505050506100af565b610145806100fc83390190565b603f806100bd6000396000f3fe6080604052600080fdfea264697066735822122077f7dbd3450d6e817079cf3fe27107de5768bb3163a402b94e2206b468eb025664736f6c63430008070033608060405234801561001057600080fd5b50610125806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c040622614602d575b600080fd5b60336035565b005b60036002116076576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401606d906097565b60405180910390fd5b565b6000608360128360b5565b9150608c8260c6565b602082019050919050565b6000602082019050818103600083015260ae816078565b9050919050565b600082825260208201905092915050565b7f546869732063616c6c6564206661696c6564000000000000000000000000000060008201525056fea264697066735822122033f8d92e29d467e5ea08d0024eab0b36b86b8cdb3542c6e89dbaabeb8ffaa42064736f6c63430008070033c001a07566181071cabaf58b70fc41557eb813bfc7a24f5c58554e7fed0bf7c031f169a0420af50b5fe791a4d839e181a676db5250b415dfb35cb85d544db7a1475ae2cc", | ||
| "result": { | ||
| "from": "0x3623191d4ccfbbdf09e8ebf6382a1f8257417bc1", | ||
| "to": "0x0000000000000000000000000000000000000000", | ||
| "gas": "0x2cd774", | ||
| "gasUsed": "0x25590", | ||
| "input": "0x608060405234801561001057600080fd5b50600060405161001f906100a2565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c04062266040518163ffffffff1660e01b815260040160006040518083038186803b15801561008457600080fd5b505afa158015610098573d6000803e3d6000fd5b50505050506100af565b610145806100fc83390190565b603f806100bd6000396000f3fe6080604052600080fdfea264697066735822122077f7dbd3450d6e817079cf3fe27107de5768bb3163a402b94e2206b468eb025664736f6c63430008070033608060405234801561001057600080fd5b50610125806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c040622614602d575b600080fd5b60336035565b005b60036002116076576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401606d906097565b60405180910390fd5b565b6000608360128360b5565b9150608c8260c6565b602082019050919050565b6000602082019050818103600083015260ae816078565b9050919050565b600082825260208201905092915050565b7f546869732063616c6c6564206661696c6564000000000000000000000000000060008201525056fea264697066735822122033f8d92e29d467e5ea08d0024eab0b36b86b8cdb3542c6e89dbaabeb8ffaa42064736f6c63430008070033", | ||
| "output": "0x08c379a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000012546869732063616c6c6564206661696c65640000000000000000000000000000", | ||
| "error": "execution reverted", | ||
| "revertReason": "This called failed", | ||
| "calls": [ | ||
| { | ||
| "from": "0xdebfb4b387033eac57af7b3de5116dd60056803b", | ||
| "gas": "0x2ba851", | ||
| "gasUsed": "0xe557", | ||
| "to": "0xd15abca351f79181dedfb6d019e382db90f3628a", | ||
| "input": "0x608060405234801561001057600080fd5b50610125806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c040622614602d575b600080fd5b60336035565b005b60036002116076576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401606d906097565b60405180910390fd5b565b6000608360128360b5565b9150608c8260c6565b602082019050919050565b6000602082019050818103600083015260ae816078565b9050919050565b600082825260208201905092915050565b7f546869732063616c6c6564206661696c6564000000000000000000000000000060008201525056fea264697066735822122033f8d92e29d467e5ea08d0024eab0b36b86b8cdb3542c6e89dbaabeb8ffaa42064736f6c63430008070033", | ||
| "output": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063c040622614602d575b600080fd5b60336035565b005b60036002116076576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401606d906097565b60405180910390fd5b565b6000608360128360b5565b9150608c8260c6565b602082019050919050565b6000602082019050818103600083015260ae816078565b9050919050565b600082825260208201905092915050565b7f546869732063616c6c6564206661696c6564000000000000000000000000000060008201525056fea264697066735822122033f8d92e29d467e5ea08d0024eab0b36b86b8cdb3542c6e89dbaabeb8ffaa42064736f6c63430008070033", | ||
| "value": "0x0", | ||
| "type": "CREATE" | ||
| }, | ||
| { | ||
| "from": "0xdebfb4b387033eac57af7b3de5116dd60056803b", | ||
| "gas": "0x2ac548", | ||
| "gasUsed": "0x1b2", | ||
| "to": "0xd15abca351f79181dedfb6d019e382db90f3628a", | ||
| "input": "0xc0406226", | ||
| "output": "0x08c379a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000012546869732063616c6c6564206661696c65640000000000000000000000000000", | ||
| "error": "execution reverted", | ||
| "revertReason": "This called failed", | ||
| "type": "STATICCALL" | ||
| } | ||
| ], | ||
| "value": "0x0", | ||
| "type": "CREATE" | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| This test tests out the trace generated by the deployment of this contract: | ||
|
|
||
| ```solidity | ||
| contract Revertor { | ||
| function run() public pure { | ||
| require(2 > 3, "This called failed"); | ||
| } | ||
| } | ||
| contract Contract { | ||
| constructor() { | ||
| Revertor r = new Revertor(); | ||
| r.run(); | ||
| } | ||
| } | ||
| ``` | ||
|
|
||
| The trace should show a revert, with the revert reason for both the top-call as well | ||
| as the inner call. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters