fix: add back Contract CodeAddr for superinstruction #3502
Merged
+24
−13
Conversation
This file contains hidden or 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
annielz
changed the title
annielz
force-pushed
the
fix-si-v1.6.5
branch
from
bee4a3b to
5ea079c
Compare
buddh0
approved these changes
Dec 26, 2025
constwz
approved these changes
Dec 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Restore CodeAddr in Contract structure, which was removed by previously merging to upstream geth 1.6.1 here: 97b6233
Rationale
After CodeAddr was removed, superinstruction CODECOPY uses contract.address instead to resolve code. It fetches the proxy contract's code instead of the target contract's code, which returns wrong data, and eventually causes execution to diverge from expected behavior.
Therefore we still need CodeAddr for the target contract's code.
Changes
Notable changes: