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

fix(EVM): Simplify set constructing bytecode hash (N-07) #1173

Merged
merged 1 commit into from
Dec 30, 2024
Merged

fix(EVM): Simplify set constructing bytecode hash (N-07) #1173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion system-contracts/contracts/ContractDeployer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
function createEVM(bytes calldata _initCode) external payable override onlySystemCall returns (uint256, address) {
uint256 senderNonce;
// If the account is an EOA, use the min nonce. If it's a contract, use deployment nonce
if (msg.sender == tx.origin) {

Check warning on line 184 in system-contracts/contracts/ContractDeployer.sol

View workflow job for this annotation

GitHub Actions / lint 

Avoid to use tx.origin

Check warning on line 184 in system-contracts/contracts/ContractDeployer.sol

View workflow job for this annotation

GitHub Actions / lint 

Avoid to use tx.origin

Check warning on line 184 in system-contracts/contracts/ContractDeployer.sol

View workflow job for this annotation

GitHub Actions / lint 

Avoid to use tx.origin
// Subtract 1 for EOA since the nonce has already been incremented for this transaction
senderNonce = NONCE_HOLDER_SYSTEM_CONTRACT.getMinNonce(msg.sender) - 1;
} else {
Expand Down Expand Up @@ -567,7 +567,7 @@
}

// 2. Set the constructed code hash on the account
_storeConstructingByteCodeHashOnAddress(
ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.storeAccountConstructingCodeHash(
_newAddress,
// Dummy EVM bytecode hash just to call emulator.
// The second byte is `0x01` to indicate that it is being constructed.
Expand Down
Loading