refactor: add support for message passing again

integration-tests/test/basic-l1-l2-communication.spec.ts

@@ -10,8 +10,7 @@ import l2ReverterJson from '../artifacts/contracts/Reverter.sol/Reverter.json'
 import { Direction } from './shared/watcher-utils'
 import { OptimismEnv, useDynamicTimeoutForWithdrawals } from './shared/env'
 
-// SKIP: needs message passing PR
-describe.skip('Basic L1<>L2 Communication', async () => {
+describe('Basic L1<>L2 Communication', async () => {
   let Factory__L1SimpleStorage: ContractFactory
   let Factory__L2SimpleStorage: ContractFactory
   let Factory__L2Reverter: ContractFactory
@@ -116,7 +115,8 @@ describe.skip('Basic L1<>L2 Communication', async () => {
       expect(remoteReceipt.status).to.equal(1)
     })
 
-    it('should have a receipt with a status of 0 for a failed message', async () => {
+    // SKIP: until we decide what should be done in this case
+    it.skip('should have a receipt with a status of 0 for a failed message', async () => {
       // Send L1 -> L2 message.
       const transaction = await env.l1Messenger.sendMessage(
         L2Reverter.address,
@@ -131,39 +131,5 @@ describe.skip('Basic L1<>L2 Communication', async () => {
 
       expect(remoteReceipt.status).to.equal(0)
     })
-
-    it('should have a receipt with a status of 0 for messages sent to 0x42... addresses', async () => {
-      // This call is fine but will give a status of 0.
-      const transaction = await env.l1Messenger.sendMessage(
-        predeploys.Lib_AddressManager,
-        getContractInterface('Lib_AddressManager').encodeFunctionData(
-          'getAddress',
-          ['whatever']
-        ),
-        5000000
-      )
-
-      const { remoteReceipt } = await env.waitForXDomainTransaction(
-        transaction,
-        Direction.L1ToL2
-      )
-
-      expect(remoteReceipt.status).to.equal(0)
-    })
-
-    it('should have a receipt with a status of 0 for messages sent to 0xdead... addresses', async () => {
-      const transaction = await env.l1Messenger.sendMessage(
-        '0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000',
-        '0x',
-        5000000
-      )
-
-      const { remoteReceipt } = await env.waitForXDomainTransaction(
-        transaction,
-        Direction.L1ToL2
-      )
-
-      expect(remoteReceipt.status).to.equal(0)
-    })
   })
 })

integration-tests/test/fee-payment.spec.ts

@@ -12,7 +12,7 @@ import { IS_LIVE_NETWORK } from './shared/utils'
 import { OptimismEnv } from './shared/env'
 import { Direction } from './shared/watcher-utils'
 
-// SKIP: needs message passing PR
+// SKIP: ETH value PR
 describe.skip('Fee Payment Integration Tests', async () => {
   let env: OptimismEnv
   before(async () => {

integration-tests/test/native-eth-ovm-calls.spec.ts

@@ -13,7 +13,7 @@ import { Interface } from 'ethers/lib/utils'
 
 chai.use(solidity)
 
-// SKIP: needs message passing PR
+// SKIP: ETH value PR
 describe.skip('Native ETH value integration tests', () => {
   let env: OptimismEnv
   let wallet: Wallet

integration-tests/test/native-eth.spec.ts

@@ -19,7 +19,7 @@ const DEFAULT_TEST_GAS_L2 = 1_300_000
 // TX size enforced by CTC:
 const MAX_ROLLUP_TX_SIZE = 50_000
 
-// SKIP: needs message passing PR
+// SKIP: ETH value PR
 describe.skip('Native ETH Integration Tests', async () => {
   let env: OptimismEnv
   let l1Bob: Wallet

integration-tests/test/ovmcontext.spec.ts

@@ -15,8 +15,7 @@ import { Direction } from './shared/watcher-utils'
  * of a L1 to L2 transaction, both `block.number` and `block.timestamp`
  * must be equal to the blocknumber/timestamp of the L1 transaction.
  */
-// SKIP: needs message passing PR
-describe.skip('OVM Context: Layer 2 EVM Context', () => {
+describe('OVM Context: Layer 2 EVM Context', () => {
   const L2Provider = injectL2Context(l2Provider)
   let env: OptimismEnv
   before(async () => {

integration-tests/test/queue-ingestion.spec.ts

@@ -8,8 +8,7 @@ import { injectL2Context } from '@eth-optimism/core-utils'
 import { OptimismEnv } from './shared/env'
 import { Direction } from './shared/watcher-utils'
 
-// SKIP: needs message passing PR
-describe.skip('Queue Ingestion', () => {
+describe('Queue Ingestion', () => {
   let env: OptimismEnv
   let l2Provider: providers.JsonRpcProvider
   before(async () => {

l2geth/accounts/abi/bind/backends/simulated.go

@@ -603,8 +603,9 @@ func (m callmsg) Data() []byte         { return m.CallMsg.Data }
 
 // UsingOVM
 // These getters return OVM specific fields
-func (m callmsg) L1MessageSender() *common.Address { return m.CallMsg.L1MessageSender }
+func (m callmsg) L1Timestamp() uint64              { return m.CallMsg.L1Timestamp }
 func (m callmsg) L1BlockNumber() *big.Int          { return m.CallMsg.L1BlockNumber }
+func (m callmsg) L1MessageSender() *common.Address { return m.CallMsg.L1MessageSender }
 func (m callmsg) QueueOrigin() types.QueueOrigin   { return m.CallMsg.QueueOrigin }
 
 // filterBackend implements filters.Backend to support filtering for logs without

l2geth/core/evm.go

@@ -25,6 +25,10 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 )
 
+// DefaultL1MessageSender is the default L1MessageSender value attached to a transaction that is
+// not an L1 to L2 message.
+var DefaultL1MessageSender = common.HexToAddress("0x00000000000000000000000000000000000beef")
+
 // ChainContext supports retrieving headers and consensus parameters from the
 // current blockchain to be used during transaction processing.
 type ChainContext interface {
@@ -44,17 +48,43 @@ func NewEVMContext(msg Message, header *types.Header, chain ChainContext, author
 	} else {
 		beneficiary = *author
 	}
-	return vm.Context{
-		CanTransfer: CanTransfer,
-		Transfer:    Transfer,
-		GetHash:     GetHashFn(header, chain),
-		Origin:      msg.From(),
-		Coinbase:    beneficiary,
-		BlockNumber: new(big.Int).Set(header.Number),
-		Time:        new(big.Int).SetUint64(header.Time),
-		Difficulty:  new(big.Int).Set(header.Difficulty),
-		GasLimit:    header.GasLimit,
-		GasPrice:    new(big.Int).Set(msg.GasPrice()),
+	if vm.UsingOVM {
+		// When using the OVM, we must:
+		// (1) Attach the L1MessageSender context value and
+		// (2) Set the BlockNumber to be the msg.L1BlockNumber
+		// (3) Set the Time to be the msg.L1Timestamp
+		var l1MessageSender common.Address
+		if msg.L1MessageSender() == nil {
+			l1MessageSender = DefaultL1MessageSender
+		} else {
+			l1MessageSender = *msg.L1MessageSender()
+		}
+		return vm.Context{
+			CanTransfer:     CanTransfer,
+			Transfer:        Transfer,
+			GetHash:         GetHashFn(header, chain),
+			Origin:          msg.From(),
+			Coinbase:        beneficiary,
+			BlockNumber:     msg.L1BlockNumber(),
+			Time:            new(big.Int).SetUint64(msg.L1Timestamp()),
+			Difficulty:      new(big.Int).Set(header.Difficulty),
+			GasLimit:        header.GasLimit,
+			GasPrice:        new(big.Int).Set(msg.GasPrice()),
+			L1MessageSender: l1MessageSender,
+		}
+	} else {
+		return vm.Context{
+			CanTransfer: CanTransfer,
+			Transfer:    Transfer,
+			GetHash:     GetHashFn(header, chain),
+			Origin:      msg.From(),
+			Coinbase:    beneficiary,
+			BlockNumber: new(big.Int).Set(header.Number),
+			Time:        new(big.Int).SetUint64(header.Time),
+			Difficulty:  new(big.Int).Set(header.Difficulty),
+			GasLimit:    header.GasLimit,
+			GasPrice:    new(big.Int).Set(msg.GasPrice()),
+		}
 	}
 }
 

l2geth/core/state_processor.go

@@ -103,15 +103,6 @@ func ApplyTransaction(config *params.ChainConfig, bc ChainContext, author *commo
 	}
 	// Create a new context to be used in the EVM environment
 	context := NewEVMContext(msg, header, bc, author)
-	if vm.UsingOVM {
-		// The `NUMBER` opcode returns the L1 blocknumber instead of the L2
-		// blocknumber, so set that here. In the future, this should be
-		// implemented by adding a new property to the EVM struct
-		// `L1BlockNumber` and updating `opNumber` to return that. This
-		// will help with keeping the difference in behavior maintainable over
-		// time
-		context.BlockNumber = msg.L1BlockNumber()
-	}
 	// Create a new environment which holds all relevant information
 	// about the transaction and calling mechanisms.
 	vmenv := vm.NewEVM(context, statedb, config, cfg)

l2geth/core/state_transition.go

@@ -75,8 +75,10 @@ type Message interface {
 	Nonce() uint64
 	CheckNonce() bool
 	Data() []byte
-	L1MessageSender() *common.Address
+
+	L1Timestamp() uint64
 	L1BlockNumber() *big.Int
+	L1MessageSender() *common.Address
 	QueueOrigin() types.QueueOrigin
 }
 

l2geth/core/types/transaction.go

@@ -298,8 +298,9 @@ func (tx *Transaction) AsMessage(s Signer) (Message, error) {
 		data:       tx.data.Payload,
 		checkNonce: true,
 
-		l1MessageSender: tx.meta.L1MessageSender,
+		l1Timestamp:     tx.meta.L1Timestamp,
 		l1BlockNumber:   tx.meta.L1BlockNumber,
+		l1MessageSender: tx.meta.L1MessageSender,
 		queueOrigin:     tx.meta.QueueOrigin,
 	}
 
@@ -481,12 +482,13 @@ type Message struct {
 	data       []byte
 	checkNonce bool
 
-	l1MessageSender *common.Address
+	l1Timestamp     uint64
 	l1BlockNumber   *big.Int
+	l1MessageSender *common.Address
 	queueOrigin     QueueOrigin
 }
 
-func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte, checkNonce bool, l1MessageSender *common.Address, l1BlockNumber *big.Int, queueOrigin QueueOrigin) Message {
+func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *big.Int, gasLimit uint64, gasPrice *big.Int, data []byte, checkNonce bool, l1MessageSender *common.Address, l1BlockNumber *big.Int, l1Timestamp uint64, queueOrigin QueueOrigin) Message {
 	return Message{
 		from:       from,
 		to:         to,
@@ -497,6 +499,7 @@ func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *b
 		data:       data,
 		checkNonce: checkNonce,
 
+		l1Timestamp:     l1Timestamp,
 		l1BlockNumber:   l1BlockNumber,
 		l1MessageSender: l1MessageSender,
 		queueOrigin:     queueOrigin,
@@ -512,6 +515,7 @@ func (m Message) Nonce() uint64        { return m.nonce }
 func (m Message) Data() []byte         { return m.data }
 func (m Message) CheckNonce() bool     { return m.checkNonce }
 
-func (m Message) L1MessageSender() *common.Address { return m.l1MessageSender }
+func (m Message) L1Timestamp() uint64              { return m.l1Timestamp }
 func (m Message) L1BlockNumber() *big.Int          { return m.l1BlockNumber }
+func (m Message) L1MessageSender() *common.Address { return m.l1MessageSender }
 func (m Message) QueueOrigin() QueueOrigin         { return m.queueOrigin }

l2geth/core/vm/evm.go

@@ -112,6 +112,9 @@ type Context struct {
 	BlockNumber *big.Int       // Provides information for NUMBER
 	Time        *big.Int       // Provides information for TIME
 	Difficulty  *big.Int       // Provides information for DIFFICULTY
+
+	// OVM information
+	L1MessageSender common.Address // Provides information for L1MESSAGESENDER
 }
 
 // EVM is the Ethereum Virtual Machine base object and provides

l2geth/core/vm/instructions.go

@@ -967,3 +967,9 @@ func makeSwap(size int64) executionFunc {
 		return nil, nil
 	}
 }
+
+// OVM opcodes
+func opL1MessageSender(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
+	stack.push(interpreter.intPool.get().SetBytes(interpreter.evm.L1MessageSender.Bytes()))
+	return nil, nil
+}

l2geth/core/vm/jump_table.go

@@ -1155,5 +1155,12 @@ func newFrontierInstructionSet() JumpTable {
 			valid:      true,
 			writes:     true,
 		},
+		L1MESSAGESENDER: {
+			execute:     opL1MessageSender,
+			constantGas: GasQuickStep,
+			minStack:    minStack(0, 1),
+			maxStack:    maxStack(0, 1),
+			valid:       true,
+		},
 	}
 }

l2geth/core/vm/opcodes.go

@@ -103,6 +103,8 @@ const (
 	GASLIMIT
 	CHAINID     = 0x46
 	SELFBALANCE = 0x47
+
+	L1MESSAGESENDER = 0x4A
 )
 
 // 0x50 range - 'storage' and execution.
@@ -282,6 +284,10 @@ var opCodeToString = map[OpCode]string{
 	CHAINID:     "CHAINID",
 	SELFBALANCE: "SELFBALANCE",
 
+	// OVM opcodes
+	// 0x4A
+	L1MESSAGESENDER: "L1MESSAGESENDER",
+
 	// 0x50 range - 'storage' and execution.
 	POP: "POP",
 	//DUP:     "DUP",
@@ -538,6 +544,9 @@ var stringToOp = map[string]OpCode{
 	"CALLCODE":       CALLCODE,
 	"REVERT":         REVERT,
 	"SELFDESTRUCT":   SELFDESTRUCT,
+
+	// OVM opcodes
+	"L1MESSAGESENDER": L1MESSAGESENDER,
 }
 
 // StringToOp finds the opcode whose name is stored in `str`.

l2geth/interfaces.go

@@ -120,8 +120,9 @@ type CallMsg struct {
 	Value    *big.Int        // amount of wei sent along with the call
 	Data     []byte          // input data, usually an ABI-encoded contract method invocation
 
-	L1MessageSender *common.Address
+	L1Timestamp     uint64
 	L1BlockNumber   *big.Int
+	L1MessageSender *common.Address
 	QueueOrigin     types.QueueOrigin
 }
 

l2geth/internal/ethapi/api.go

@@ -867,7 +867,7 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
 	// attached to each transaction. We need to modify the blocknumber and timestamp to reflect this,
 	// or else the result of `eth_call` will not be correct.
 	blockNumber := header.Number
-	timestamp := new(big.Int).SetUint64(header.Time)
+	timestamp := header.Time
 	if vm.UsingOVM {
 		block, err := b.BlockByNumber(ctx, rpc.BlockNumber(header.Number.Uint64()))
 		if err != nil {
@@ -881,13 +881,13 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
 				}
 				tx := txs[0]
 				blockNumber = tx.L1BlockNumber()
-				timestamp = new(big.Int).SetUint64(tx.L1Timestamp())
+				timestamp = tx.L1Timestamp()
 			}
 		}
 	}
 
 	// Create new call message
-	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, data, false, &addr, nil, types.QueueOriginSequencer)
+	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, data, false, &addr, blockNumber, timestamp, types.QueueOriginSequencer)
 
 	// Setup context so it may be cancelled the call has completed
 	// or, in case of unmetered gas, setup a context with a timeout.
@@ -916,11 +916,6 @@ func DoCall(ctx context.Context, b Backend, args CallArgs, blockNrOrHash rpc.Blo
 	// Setup the gas pool (also for unmetered requests)
 	// and apply the message.
 	gp := new(core.GasPool).AddGas(math.MaxUint64)
-	// Modify the blocknumber and timestamp based on the L1BlockNumber and L1Timestamp from above.
-	if vm.UsingOVM {
-		evm.Context.BlockNumber = blockNumber
-		evm.Context.Time = timestamp
-	}
 	res, gas, failed, err := core.ApplyMessage(evm, msg, gp)
 	if err := vmError(); err != nil {
 		return nil, 0, false, err

l2geth/les/odr_test.go

@@ -128,7 +128,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, config *params.Chai
 				from := statedb.GetOrNewStateObject(bankAddr)
 				from.SetBalance(math.MaxBig256)
 
-				msg := callmsg{types.NewMessage(from.Address(), &testContractAddr, 0, new(big.Int), 100000, new(big.Int), data, false, nil, nil, types.QueueOriginSequencer)}
+				msg := callmsg{types.NewMessage(from.Address(), &testContractAddr, 0, new(big.Int), 100000, new(big.Int), data, false, nil, nil, 0, types.QueueOriginSequencer)}
 
 				context := core.NewEVMContext(msg, header, bc, nil)
 				vmenv := vm.NewEVM(context, statedb, config, vm.Config{})
@@ -142,7 +142,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, config *params.Chai
 			header := lc.GetHeaderByHash(bhash)
 			state := light.NewState(ctx, header, lc.Odr())
 			state.SetBalance(bankAddr, math.MaxBig256)
-			msg := callmsg{types.NewMessage(bankAddr, &testContractAddr, 0, new(big.Int), 100000, new(big.Int), data, false, nil, nil, types.QueueOriginSequencer)}
+			msg := callmsg{types.NewMessage(bankAddr, &testContractAddr, 0, new(big.Int), 100000, new(big.Int), data, false, nil, nil, 0, types.QueueOriginSequencer)}
 			context := core.NewEVMContext(msg, header, lc, nil)
 			vmenv := vm.NewEVM(context, state, config, vm.Config{})
 			gp := new(core.GasPool).AddGas(math.MaxUint64)

l2geth/light/odr_test.go

@@ -194,7 +194,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, bc *core.BlockChain
 
 		// Perform read-only call.
 		st.SetBalance(testBankAddress, math.MaxBig256)
-		msg := callmsg{types.NewMessage(testBankAddress, &testContractAddr, 0, new(big.Int), 1000000, new(big.Int), data, false, nil, nil, types.QueueOriginSequencer)}
+		msg := callmsg{types.NewMessage(testBankAddress, &testContractAddr, 0, new(big.Int), 1000000, new(big.Int), data, false, nil, nil, 0, types.QueueOriginSequencer)}
 		context := core.NewEVMContext(msg, header, chain, nil)
 		vmenv := vm.NewEVM(context, st, config, vm.Config{})
 		gp := new(core.GasPool).AddGas(math.MaxUint64)

l2geth/tests/state_test_util.go

@@ -279,7 +279,7 @@ func (tx *stTransaction) toMessage(ps stPostState) (core.Message, error) {
 		return nil, fmt.Errorf("invalid tx data %q", dataHex)
 	}
 
-	msg := types.NewMessage(from, to, tx.Nonce, value, gasLimit, tx.GasPrice, data, true, nil, nil, types.QueueOriginSequencer)
+	msg := types.NewMessage(from, to, tx.Nonce, value, gasLimit, tx.GasPrice, data, true, nil, nil, 0, types.QueueOriginSequencer)
 	return msg, nil
 }
 

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L2CrossDomainMessenger.sol

@@ -185,8 +185,8 @@ contract OVM_L2CrossDomainMessenger is
      * @return _valid Whether or not the message is valid.
      */
     function _verifyXDomainMessage()
-        view
         internal
+        view
         returns (
             bool _valid
         )

packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_ExecutionManagerWrapper.sol

 // SPDX-License-Identifier: MIT
-// @unsupported: evm
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
@@ -24,22 +23,6 @@ contract OVM_ExecutionManagerWrapper {
         external
         payable
     {
-        bytes memory data = msg.data;
-        assembly {
-            // kall is a custom yul builtin within optimistic-solc that allows us to directly call
-            // the execution manager (since `call` would be compiled).
-            kall(add(data, 0x20), mload(data), 0x0, 0x0)
-
-            // Standard returndata loading code.
-            let size := returndatasize()
-            let returndata := mload(0x40)
-            mstore(0x40, add(returndata, and(add(add(size, 0x20), 0x1f), not(0x1f))))
-            mstore(returndata, size)
-            returndatacopy(add(returndata, 0x20), 0x0, size)
-
-            // kall automatically reverts if the underlying call fails, so we only need to handle
-            // the success case.
-            return(add(returndata, 0x20), mload(returndata))
-        }
+        // DO NOTHING FOR NOW
     }
 }

packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_L1MessageSender.sol

 // SPDX-License-Identifier: MIT
+// @unsupported: ovm
 pragma solidity >0.5.0 <0.8.0;
 
-/* Interface Imports */
-import { iOVM_L1MessageSender } from "../../iOVM/predeploys/iOVM_L1MessageSender.sol";
-import { iOVM_ExecutionManager } from "../../iOVM/execution/iOVM_ExecutionManager.sol";
-
 /**
  * @title OVM_L1MessageSender
  * @dev The L1MessageSender is a predeploy contract running on L2. During the execution of cross
@@ -20,24 +17,23 @@ import { iOVM_ExecutionManager } from "../../iOVM/execution/iOVM_ExecutionManage
  * Compiler used: solc
  * Runtime target: OVM
  */
-contract OVM_L1MessageSender is iOVM_L1MessageSender {
-
-    /********************
-     * Public Functions *
-     ********************/
-
-    /**
-     * @return _l1MessageSender L1 message sender address (msg.sender).
-     */
-    function getL1MessageSender()
-        override
-        public
-        view
-        returns (
-            address _l1MessageSender
-        )
-    {
-        // Note that on L2 msg.sender (ie. evmCALLER) will always be the Execution Manager
-        return iOVM_ExecutionManager(msg.sender).ovmL1TXORIGIN();
+contract OVM_L1MessageSender {
+    constructor() {
+        // By using the low-level assembly `return` we can dictate the final code of this contract
+        // directly. Any call to this contract will simply return the L1MessageSender address.
+        // Code of this contract will be:
+        // 4A - L1MESSAGESENDER
+        // 60 - PUSH1
+        // 00
+        // 52 - MSTORE (store L1MESSAGESENDER at memory location 0x00)
+        // 60 - PUSH1
+        // 20
+        // 60 - PUSH1
+        // 00
+        // F3 - RETURN (return memory at 0x00...0x20)
+        bytes memory code = hex"4A60005260206000F3";
+        assembly {
+            return(add(code, 0x20), mload(code))
+        }
     }
 }

packages/contracts/contracts/optimistic-ethereum/iOVM/predeploys/iOVM_L1MessageSender.sol

@@ -10,5 +10,5 @@ interface iOVM_L1MessageSender {
      * Public Functions *
      ********************/
 
-    function getL1MessageSender() external view returns (address _l1MessageSender);
+    function getL1MessageSender() external view returns (address);
 }

packages/contracts/src/contract-data.ts

@@ -115,7 +115,7 @@ export const getL1ContractData = (network: Network) => {
 const OVM_ETH = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/predeploys/OVM_ETH.sol/OVM_ETH.json')
 const OVM_L2CrossDomainMessenger = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L2CrossDomainMessenger.sol/OVM_L2CrossDomainMessenger.json')
 const OVM_L2ToL1MessagePasser = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/predeploys/OVM_L2ToL1MessagePasser.sol/OVM_L2ToL1MessagePasser.json')
-const OVM_L1MessageSender = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/predeploys/OVM_L1MessageSender.sol/OVM_L1MessageSender.json')
+const OVM_L1MessageSender = require('../artifacts/contracts/optimistic-ethereum/OVM/predeploys/OVM_L1MessageSender.sol/OVM_L1MessageSender.json')
 const OVM_DeployerWhitelist = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/predeploys/OVM_DeployerWhitelist.sol/OVM_DeployerWhitelist.json')
 const OVM_ECDSAContractAccount = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/predeploys/OVM_ECDSAContractAccount.sol/OVM_ECDSAContractAccount.json')
 const OVM_SequencerEntrypoint = require('../artifacts-ovm/contracts/optimistic-ethereum/OVM/predeploys/OVM_SequencerEntrypoint.sol/OVM_SequencerEntrypoint.json')

packages/contracts/src/contract-deployment/config.ts

@@ -82,7 +82,7 @@ export const makeContractDeployConfig = async (
       ],
     },
     OVM_DeployerWhitelist: {
-      factory: getContractFactory('OVM_DeployerWhitelist', undefined, true),
+      factory: getContractFactory('OVM_DeployerWhitelist'),
       params: [],
     },
     OVM_L1MessageSender: {
@@ -118,24 +118,20 @@ export const makeContractDeployConfig = async (
       },
     },
     OVM_ECDSAContractAccount: {
-      factory: getContractFactory('OVM_ECDSAContractAccount', undefined, true),
+      factory: getContractFactory('OVM_ECDSAContractAccount'),
     },
     OVM_SequencerEntrypoint: {
-      factory: getContractFactory('OVM_SequencerEntrypoint', undefined, true),
+      factory: getContractFactory('OVM_SequencerEntrypoint'),
     },
     OVM_ETH: {
       factory: getContractFactory('OVM_ETH'),
       params: [],
     },
     OVM_ProxyEOA: {
-      factory: getContractFactory('OVM_ProxyEOA', undefined, true),
+      factory: getContractFactory('OVM_ProxyEOA'),
     },
     OVM_ExecutionManagerWrapper: {
-      factory: getContractFactory(
-        'OVM_ExecutionManagerWrapper',
-        undefined,
-        true
-      ),
+      factory: getContractFactory('OVM_ExecutionManagerWrapper'),
     },
     OVM_GasPriceOracle: {
       factory: getContractFactory('OVM_GasPriceOracle'),

packages/contracts/src/state-dump/make-dump.ts

@@ -152,21 +152,6 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise<any> => {
 
   config = { ...config, ...cfg }
 
-  const ovmCompiled = [
-    'OVM_L2ToL1MessagePasser',
-    'OVM_L2CrossDomainMessenger',
-    'OVM_SequencerEntrypoint',
-    'Lib_AddressManager',
-    'OVM_DeployerWhitelist',
-    'OVM_ETH',
-    'OVM_ECDSAContractAccount',
-    'OVM_ProxyEOA',
-    'OVM_ExecutionManagerWrapper',
-    'OVM_GasPriceOracle',
-    'OVM_SequencerFeeVault',
-    'OVM_L2StandardBridge',
-  ]
-
   const deploymentResult = await deploy(config)
   deploymentResult.contracts['Lib_AddressManager'] =
     deploymentResult.AddressManager
@@ -187,37 +172,16 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise<any> => {
   for (let i = 0; i < Object.keys(deploymentResult.contracts).length; i++) {
     const name = Object.keys(deploymentResult.contracts)[i]
     const contract = deploymentResult.contracts[name]
-    let code: string
-    if (ovmCompiled.includes(name)) {
-      const ovmDeployedBytecode = getContractDefinition(
-        name,
-        true
-      ).deployedBytecode
-      // TODO remove: deployedBytecode is missing the find and replace in solidity
-      code = ovmDeployedBytecode
-        .split(
-          '336000905af158601d01573d60011458600c01573d6000803e3d621234565260ea61109c52'
-        )
-        .join(
-          '336000905af158600e01573d6000803e3d6000fd5b3d6001141558600a015760016000f35b'
-        )
-    } else {
-      const codeBuf = await pStateManager.getContractCode(
-        fromHexString(contract.address)
-      )
-      code = toHexString(codeBuf)
-    }
+    const codeBuf = await pStateManager.getContractCode(
+      fromHexString(contract.address)
+    )
+    const code = toHexString(codeBuf)
 
     const deadAddress =
       predeploys[name] ||
       `0xdeaddeaddeaddeaddeaddeaddeaddeaddead${i.toString(16).padStart(4, '0')}`
 
-    let def: any
-    try {
-      def = getContractDefinition(name.replace('Proxy__', ''))
-    } catch (err) {
-      def = getContractDefinition(name.replace('Proxy__', ''), true)
-    }
+    const def = getContractDefinition(name.replace('Proxy__', ''))
 
     dump.accounts[name] = {
       address: deadAddress,

packages/contracts/test/contracts/OVM/bridge/base/OVM_L2CrossDomainMessenger.spec.ts

@@ -4,6 +4,7 @@ import { expect } from '../../../../setup'
 import { ethers } from 'hardhat'
 import { Signer, ContractFactory, Contract, constants } from 'ethers'
 import { smockit, MockContract } from '@eth-optimism/smock'
+import { solidityKeccak256 } from 'ethers/lib/utils'
 
 /* Internal Imports */
 import {
@@ -14,7 +15,7 @@ import {
   encodeXDomainCalldata,
   getNextBlockNumber,
 } from '../../../../helpers'
-import { solidityKeccak256 } from 'ethers/lib/utils'
+import { getContractInterface } from '../../../../../src'
 
 describe('OVM_L2CrossDomainMessenger', () => {
   let signer: Signer
@@ -39,7 +40,7 @@ describe('OVM_L2CrossDomainMessenger', () => {
       await ethers.getContractFactory('OVM_L1CrossDomainMessenger')
     )
     Mock__OVM_L1MessageSender = await smockit(
-      await ethers.getContractFactory('OVM_L1MessageSender')
+      getContractInterface('iOVM_L1MessageSender')
     )
     Mock__OVM_L2ToL1MessagePasser = await smockit(
       await ethers.getContractFactory('OVM_L2ToL1MessagePasser')

packages/contracts/test/contracts/OVM/predeploys/OVM_L1MessageSender.spec.ts

@@ -18,7 +18,8 @@ const callPredeployStatic = async (
   )
 }
 
-describe('OVM_L1MessageSender', () => {
+// TODO: rewrite this test to bypass the execution manager
+describe.skip('OVM_L1MessageSender', () => {
   let Mock__OVM_ExecutionManager: MockContract
   before(async () => {
     Mock__OVM_ExecutionManager = await smockit(

packages/contracts/test/contracts/OVM/predeploys/OVM_L2ToL1MessagePasser.spec.ts

@@ -24,7 +24,8 @@ const callPredeploy = async (
   )
 }
 
-describe('OVM_L2ToL1MessagePasser', () => {
+// TODO: rewrite this test to bypass the execution manager
+describe.skip('OVM_L2ToL1MessagePasser', () => {
   let Mock__OVM_ExecutionManager: MockContract
   before(async () => {
     Mock__OVM_ExecutionManager = await smockit(