Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions AllContractsHashes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@
{
"contractName": "Bootloader",
"zkBytecodePath": "/system-contracts/zkout/fee_estimate.yul/Bootloader.json",
"zkBytecodeHash": "0x01000a17fd11b0c9e6bf15535008bc9c3e6c58e74a7f19979476773059654519",
"zkBytecodeHash": "0x01000a197af745edfc4288afc5d64e55d57c6bdddb2fd0ebdfc693e5ee5b4b77",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
Expand All @@ -1794,7 +1794,7 @@
{
"contractName": "Bootloader",
"zkBytecodePath": "/system-contracts/zkout/playground_batch.yul/Bootloader.json",
"zkBytecodeHash": "0x01000a1de0968a951a71effd9333d901eed2dd177c79a2603081d0624f56294d",
"zkBytecodeHash": "0x01000a1fd7408a6b556df1642ff12c87ca72f4c4b43fbf3354879f4e6e95660e",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
Expand Down
4 changes: 3 additions & 1 deletion system-contracts/bootloader/bootloader.yul
Original file line number Diff line number Diff line change
Expand Up @@ -2209,7 +2209,9 @@ object "Bootloader" {
isEvmDeployment := isEvmDeploymentEthCall(to, innerTxDataOffset)

if isEvmDeployment {
if isEOA(from) {
// `from` can be 0x0 if `from` isn't provided in eth_call (it is an optional field)
// and in this case txOrigin also will be 0x0
if or(isEOA(from), eq(from, 0x0)) {
// If the `from` is EOA, we need to bump the nonce before the deployment
bumpNonceForEvmDeployment(from, innerTxDataOffset)
}
Expand Down
Loading