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

[EVM-Equivalence-YUL] Restrict functions to only be called from interpreter #27

Closed
wants to merge 9 commits into from
Closed

[EVM-Equivalence-YUL] Restrict functions to only be called from interpreter #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
501c807
Add sys call to incremente nonce in interpreter
IAvecilla Aug 23, 2024
81fd48d
Add modifier for incremente nonce to only be called by system contracts
IAvecilla Aug 23, 2024
f16dc4d
Merge branch 'evm-equivalence-yul' into interpreter-system-calls
IAvecilla Aug 23, 2024
e31bfa8
Make EVM push frame function only callable from system contract
IAvecilla Aug 23, 2024
ca605d2
Delete print calls
IAvecilla Aug 23, 2024
4090937
Add evm call checks
gianbelinche Aug 26, 2024
0d47c89
Add system call with return value
gianbelinche Aug 26, 2024
61d1b13
Add modifier to remaining functions
gianbelinche Aug 26, 2024
7720d44
Fix createEvmInternal system call
gianbelinche Aug 27, 2024
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
10 changes: 7 additions & 3 deletions system-contracts/contracts/ContractDeployer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ contract ContractDeployer is IContractDeployer, ISystemContract {

uint256 public constructorReturnGas;

function setDeployedCode(uint256 constructorGasLeft, bytes calldata paddedNewDeployedCode) external {
modifier onlySystemEvm() {
require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender), "only system evm");
_;
}

function setDeployedCode(uint256 constructorGasLeft, bytes calldata paddedNewDeployedCode) onlySystemCall onlySystemEvm external {
require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender));

uint256 bytecodeLen = uint256(bytes32(paddedNewDeployedCode[:32]));
Expand Down Expand Up @@ -209,8 +214,7 @@ contract ContractDeployer is IContractDeployer, ISystemContract {
return newAddress;
}

function createEVMInternal(address _newAddress, bytes calldata _initCode) external payable {
require(ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT.isAccountEVM(msg.sender));
function createEVMInternal(address _newAddress, bytes calldata _initCode) onlySystemCall onlySystemEvm external payable {
_evmDeployOnAddress(_newAddress, _initCode);
}

Expand Down
9 changes: 5 additions & 4 deletions system-contracts/contracts/EvmGasManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ pragma solidity ^0.8.0;
import "./EvmConstants.sol";

import {ACCOUNT_CODE_STORAGE_SYSTEM_CONTRACT} from "./Constants.sol";
import {ISystemContract} from "./interfaces/ISystemContract.sol";

// We consider all the contracts (including system ones) as warm.
uint160 constant PRECOMPILES_END = 0xffff;

// Denotes that passGas has been consumed
uint256 constant INF_PASS_GAS = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;

contract EvmGasManager {
contract EvmGasManager is ISystemContract {
// We need strust to use `storage` pointers
struct WarmAccountInfo {
bool isWarm;
Expand Down Expand Up @@ -123,13 +124,13 @@ contract EvmGasManager {

*/

function pushEVMFrame(uint256 _passGas, bool _isStatic) external {
function pushEVMFrame(uint256 _passGas, bool _isStatic) onlySystemCall onlySystemEvm external {
EVMStackFrameInfo memory frame = EVMStackFrameInfo({passGas: _passGas, isStatic: _isStatic});

evmStackFrames.push(frame);
}

function consumeEvmFrame() external returns (uint256 passGas, bool isStatic) {
function consumeEvmFrame() onlySystemCall onlySystemEvm external returns (uint256 passGas, bool isStatic) {
if (evmStackFrames.length == 0) return (INF_PASS_GAS, false);

EVMStackFrameInfo memory frameInfo = evmStackFrames[evmStackFrames.length - 1];
Expand All @@ -141,7 +142,7 @@ contract EvmGasManager {
evmStackFrames[evmStackFrames.length - 1].passGas = INF_PASS_GAS;
}

function popEVMFrame() external {
function popEVMFrame() onlySystemCall onlySystemEvm external {
evmStackFrames.pop();
}
}
15 changes: 14 additions & 1 deletion system-contracts/contracts/EvmInterpreter.template.yul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,20 @@ object "EVMInterpreter" {
mstore(sub(offset, 64), 0x40)
mstore(sub(offset, 32), len)

let success := call(gas(), DEPLOYER_SYSTEM_CONTRACT(), 0, sub(offset, 100), add(len, 100), 0, 0)
let farCallAbi := getFarCallABI(
0,
0,
sub(offset, 100),
add(len, 100),
gas(),
// Only rollup is supported for now
0,
0,
0,
1
)
let to := DEPLOYER_SYSTEM_CONTRACT()
let success := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)

if iszero(success) {
// This error should never happen
Expand Down
122 changes: 115 additions & 7 deletions system-contracts/contracts/EvmInterpreterFunctions.template.yul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,28 @@ function consumeEvmFrame() -> passGas, isStatic, callerEVM {
// function consumeEvmFrame() external returns (uint256 passGas, bool isStatic)
mstore(0, 0x04C14E9E00000000000000000000000000000000000000000000000000000000)

let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 4, 0, 64)
let farCallAbi := getFarCallABI(
0,
0,
0,
4,
gas(),
// Only rollup is supported for now
0,
0,
0,
1
)
let to := EVM_GAS_MANAGER_CONTRACT()
let success := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)

if iszero(success) {
// Should never happen
revert(0, 0)
}

returndatacopy(0,0,64)

passGas := mload(0)
isStatic := mload(32)

Expand Down Expand Up @@ -663,11 +678,59 @@ function incrementNonce(addr) {
mstore(0, 0x306395C600000000000000000000000000000000000000000000000000000000)
mstore(4, addr)

let result := call(gas(), NONCE_HOLDER_SYSTEM_CONTRACT(), 0, 0, 36, 0, 0)
let farCallAbi := getFarCallABI(
0,
0,
0,
36,
gas(),
// Only rollup is supported for now
0,
0,
0,
1
)
let to := NONCE_HOLDER_SYSTEM_CONTRACT()
let result := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)

if iszero(result) {
revert(0, 0)
}
}

function getFarCallABI(
dataOffset,
memoryPage,
dataStart,
dataLength,
gasPassed,
shardId,
forwardingMode,
isConstructorCall,
isSystemCall
) -> ret {
let farCallAbi := 0
farCallAbi := or(farCallAbi, dataOffset)
farCallAbi := or(farCallAbi, shl(64, dataStart))
farCallAbi := or(farCallAbi, shl(96, dataLength))
farCallAbi := or(farCallAbi, shl(192, gasPassed))
farCallAbi := or(farCallAbi, shl(224, shardId))
farCallAbi := or(farCallAbi, shl(232, forwardingMode))
farCallAbi := or(farCallAbi, shl(248, 1))
ret := farCallAbi
// farCallAbi |= dataOffset;
// farCallAbi |= (uint256(memoryPage) << 32);
// farCallAbi |= (uint256(dataStart) << 64);
// farCallAbi |= (uint256(dataLength) << 96);
// farCallAbi |= (uint256(gasPassed) << 192);
// farCallAbi |= (uint256(shardId) << 224);
// farCallAbi |= (uint256(forwardingMode) << 232);
// if (isConstructorCall) {
// farCallAbi |= (1 << 240);
// }
// if (isSystemCall) {
// farCallAbi |= (1 << 248);
// }
}

function ensureAcceptableMemLocation(location) {
Expand Down Expand Up @@ -758,7 +821,23 @@ function _pushEVMFrame(_passGas, _isStatic) {
mstore(4, _passGas)
mstore(36, _isStatic)

let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 68, 0, 0)
let farCallAbi := getFarCallABI(
0,
0,
0,
68,
gas(),
// Only rollup is supported for now
0,
0,
0,
1
)

let to := EVM_GAS_MANAGER_CONTRACT()
let success := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)

// let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 68, 0, 0)
if iszero(success) {
// This error should never happen
revert(0, 0)
Expand All @@ -768,9 +847,24 @@ function _pushEVMFrame(_passGas, _isStatic) {
function _popEVMFrame() {
// function popEVMFrame() external

let farCallAbi := getFarCallABI(
0,
0,
0,
4,
gas(),
// Only rollup is supported for now
0,
0,
0,
1
)

let to := EVM_GAS_MANAGER_CONTRACT()

mstore(0, 0xE467D2F000000000000000000000000000000000000000000000000000000000)

let success := call(gas(), EVM_GAS_MANAGER_CONTRACT(), 0, 0, 4, 0, 0)
let success := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)
if iszero(success) {
// This error should never happen
revert(0, 0)
Expand Down Expand Up @@ -1237,6 +1331,8 @@ function $llvm_NoInline_llvm$_genericCreate(addr, offset, size, sp, value, evmGa
sp := pushStackItemWithoutCheck(sp, mload(sub(offset, 0x40)))
sp := pushStackItemWithoutCheck(sp, mload(sub(offset, 0x20)))

_pushEVMFrame(gasForTheCall, false)

// Selector
mstore(sub(offset, 0x80), 0x5b16a23c)
// Arg1: address
Expand All @@ -1247,9 +1343,21 @@ function $llvm_NoInline_llvm$_genericCreate(addr, offset, size, sp, value, evmGa
// Length of the init code
mstore(sub(offset, 0x20), size)

_pushEVMFrame(gasForTheCall, false)
let farCallAbi := getFarCallABI(
0,
0,
sub(offset, 0x64),
add(size, 0x64),
INF_PASS_GAS(),
// Only rollup is supported for now
0,
0,
0,
1
)

result := call(INF_PASS_GAS(), DEPLOYER_SYSTEM_CONTRACT(), value, sub(offset, 0x64), add(size, 0x64), 0, 0)
let to := DEPLOYER_SYSTEM_CONTRACT()
result := verbatim_6i_1o("system_call", to, farCallAbi, 0, 0, 0, 0)

let gasLeft
switch result
Expand All @@ -1259,7 +1367,7 @@ function $llvm_NoInline_llvm$_genericCreate(addr, offset, size, sp, value, evmGa
default {
gasLeft := _fetchConstructorReturnGas()
}

let gasUsed := sub(gasForTheCall, gasLeft)
evmGasLeft := chargeGas(evmGasLeftOld, gasUsed)

Expand Down
Loading
Loading