[DO NOT MERGE]: EVM emulator #1142

0xVolosnikov · 2024-12-12T09:59:58Z

What ❔

Why ❔

Checklist

PR title corresponds to the body of PR (we generate changelog entries from PRs).
Tests for the changes have been added / updated.
Documentation comments have been added / updated.

#1097)

Signed-off-by: Vladimir Radosavljevic <[email protected]> Co-authored-by: Vladimir Radosavljevic <[email protected]>

vladbochok · 2024-12-12T10:11:43Z

system-contracts/contracts/ContractDeployer.sol

+    /// @dev Prefix for EVM contracts hashes storage slots.
+    uint256 private constant EVM_HASHES_PREFIX = 1 << 254;
+    /// @dev keccak256("ALLOWED_BYTECODE_TYPES_MODE_SLOT").
+    bytes32 private constant ALLOWED_BYTECODE_TYPES_MODE_SLOT =


IMO it is better to write to standard storage layout. Deprecation of variables isn't a concern. Bth my main concern would be making it simple and transparent with upgrades (all deprecated variables should be stored in the storage as a legacy, so no one ever will be confused and use the same storage slot for a different purpose)

vladbochok · 2024-12-12T10:39:45Z

system-contracts/contracts/ContractDeployer.sol

+        // solhint-disable-next-line reason-string, gas-custom-errors
+        require(NONCE_HOLDER_SYSTEM_CONTRACT.getRawNonce(_newAddress) == 0x0);
+        // solhint-disable-next-line reason-string, gas-custom-errors
+        require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.getCodeHash(uint256(uint160(_newAddress))) == 0x0);


Is it intended to be getCodeHash not getRawCodeHash?

getRawCodeHash would be better here indeed

vladbochok · 2024-12-13T08:46:18Z

system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul

+        mstore(mul(10, 32), mload(sub(offset, 0x80))
+        mstore(mul(11, 32), mload(sub(offset, 0x60))
+        mstore(mul(12, 32), mload(sub(offset, 0x40))
+        mstore(mul(13, 32), mload(sub(offset, 0x20))


Suggested change

mstore(mul(10, 32), mload(sub(offset, 0x80))

mstore(mul(11, 32), mload(sub(offset, 0x60))

mstore(mul(12, 32), mload(sub(offset, 0x40))

mstore(mul(13, 32), mload(sub(offset, 0x20))

mstore(mul(10, 32), mload(sub(offset, 0x80)))

mstore(mul(11, 32), mload(sub(offset, 0x60)))

mstore(mul(12, 32), mload(sub(offset, 0x40)))

mstore(mul(13, 32), mload(sub(offset, 0x20)))

Interesting, compiler allows this

vladbochok · 2024-12-13T10:18:15Z

system-contracts/contracts/libraries/Utils.sol

+
+        // Setting the version of the hash
+        hashedEVMBytecode = (hashedEVMBytecode | bytes32(uint256(EVM_BYTECODE_FLAG) << 248));
+        hashedEVMBytecode = hashedEVMBytecode | bytes32(_bytecode.length << 224);


Should it be ?

Suggested change

hashedEVMBytecode = hashedEVMBytecode | bytes32(_bytecode.length << 224);

hashedEVMBytecode = hashedEVMBytecode | bytes32(lengthInWords << 224);

Actually it should be length of unpadded EVM bytecode in bytes. This will make EXTCODESIZE implementation in Emulator a lot simpler. Right now this encoding in versioned bytecode hash (padded evm code length) actually doesn't make any sense

#1156)

…sh (updated) (#1157)

jrchatruc and others added 30 commits August 7, 2024 17:00

Add Evm Equivalence support

2ff4e59

Merge branch 'dev' into evm-equivalence-yul-new

dfadb34

fmt

aa30514

Update support for evm simulator with latest changes

04f5920

Revert solidity version update

7487de0

Update solidity contracts version

fb58ebb

Calculate evm simulator address from compiled file when deploying

90e7043

Comment out assert in bootloader to deploy evm contracts

6b78beb

Remove solhint line added by mistake

7cce99c

Update contracts to emit events on evm deployment

8eeffba

Merge remote-tracking branch 'origin/dev' into evm-equivalence-yul-new

c662106

Fix typos

be47154

Update tests and delete todos

207320e

Merge remote-tracking branch 'origin/dev' into evm-equivalence-yul-new

3ee830c

Remove evm constants contract

6a9d835

Remove asserts from bootloader (#26)

cb3ad25

Merge remote-tracking branch 'origin/dev' into evm-equivalence-yul-new

81dd19a

Remove old contracts constants not longer used

7d8300b

Fix some typos and outdated comments

e6b7a83

Add interface for evm gas manager

4ba25a3

Simplify check for warm slots in evm gas manager

668bcac

Check nonce equals zero for evm deploy

2c59ee8

Fix trivial lint checks

fbc8f8f

Disable some solidity hints for conflicting system contracts

ef1affd

Fix most of the l1 contracts foundry tests

b1c7e00

Change test hashes

e37175d

Fix hardhat tests

cd2babb

Merge branch 'dev' into evm-equivalence-yul-new

0dd4a0b

Use modifier in evm gas manager to only modify callstack by system env

2f1181f

Merge branch 'dev' into evm-equivalence-yul-new

e4e8605

0xVolosnikov and others added 19 commits December 10, 2024 17:23

fix(EVM): Wrap access to calldata to prevent out-of-bounds EraVM panic (

12efa1c

#1097)

fix(EVM): Zero out frame gas left for underpaid precompiles (#1101)

07f43d0

fix(EVM): Fix panics on insufficient balance in calls (#1108)

c74c6ec

fix(EVM): Fix DUP1 underflow check (#1110)

5869331

fix(EVM): Update LLVM options after fixes (#1112)

55367f5

Signed-off-by: Vladimir Radosavljevic <[email protected]> Co-authored-by: Vladimir Radosavljevic <[email protected]>

fix(EVM): Do not check memory boundaries if size is zero (#1114)

70d1de8

fi(EVM): Fix EXTCODECOPY zeroing offset (#1115)

37874c7

fix(EVM): Cleanup address bytes in EXTCODECOPY (#1116)

6a76d76

fix(EVM): Use raw calls to precompiles (#1118)

2bdc565

fix(EVM): Make DELEGATECALL behavior closer to EVM (3) (#1120)

3299faa

fix(EVM): Handle corner case of KECCAK with 0 size (#1121)

483b099

fix(EVM): Make fetchDeployedCode more robust (2) (#1123)

d61e38d

fix(EVM): Increase max allowed memory (2) (#1124)

47b2ddd

fix(EVM): Implement EXTCODEHASH in emulator (#1125)

c4c964b

fix(EVM): Add stipends for calls to zkVM contracts (#1126)

921b3e3

fix(EVM): Make CREATE flow equivalent to EVM (#1127)

ef80122

Handle Empty.sol as empty account

b61406b

Do not call precompiles if not enough gas provided

72bbed0

fix(EVM): Fix logs implementation (2) (#1137)

daf7022

0xVolosnikov mentioned this pull request Dec 12, 2024

feat: EVM emulator #825

Closed

vladbochok reviewed Dec 12, 2024

View reviewed changes

vladbochok reviewed Dec 13, 2024

View reviewed changes

0xVolosnikov force-pushed the evm-emulator/fixes branch from 5e4477e to 9c9233e Compare December 18, 2024 11:31

0xVolosnikov added 2 commits December 19, 2024 10:40

feat(EVM): Enable EVM emulator using service call (#1141)

fe838fc

fix(EVM): Simplify and optimize out-of-bounds truncation in CODECOPY (

e7aa3a9

#1156)

0xVolosnikov force-pushed the evm-emulator/fixes branch from bc802b1 to e7aa3a9 Compare December 19, 2024 09:40

0xVolosnikov added 3 commits December 19, 2024 10:54

fix(EVM): Store unpadded EVM bytecode length in versioned bytecode ha…

c396c03

…sh (updated) (#1157)

fix(EVM): Add overflow checks in JUMP and JUMPI opcodes (#1159)

0419d3e

fix(EVM): Handle calldata-related opcodes in constructor (#1160)

684c072

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DO NOT MERGE]: EVM emulator #1142

[DO NOT MERGE]: EVM emulator #1142

0xVolosnikov commented Dec 12, 2024

vladbochok Dec 12, 2024

vladbochok Dec 12, 2024

0xVolosnikov Dec 13, 2024

vladbochok Dec 13, 2024

0xVolosnikov Dec 13, 2024

vladbochok Dec 13, 2024

0xVolosnikov Dec 13, 2024

0xVolosnikov Dec 13, 2024

	hashedEVMBytecode = hashedEVMBytecode \| bytes32(_bytecode.length << 224);
	hashedEVMBytecode = hashedEVMBytecode \| bytes32(lengthInWords << 224);

[DO NOT MERGE]: EVM emulator #1142

Are you sure you want to change the base?

[DO NOT MERGE]: EVM emulator #1142

Conversation

0xVolosnikov commented Dec 12, 2024

What ❔

Why ❔

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment