Rename OVM precompiles to predeploys (#332)

* Rename OVM precompiles to predeploys

* Appease linter
Co-authored-by: smartcontracts <kelvinfichter@gmail.com>
Co-authored-by: ben-chain <ben@pseudonym.party>

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

@@ -258,7 +258,7 @@ contract OVM_L1CrossDomainMessenger is iOVM_L1CrossDomainMessenger, Abs_BaseCros
 
         require(
             exists == true,
-            "Message passing precompile has not been initialized or invalid proof provided."
+            "Message passing predeploy has not been initialized or invalid proof provided."
         );
 
         Lib_OVMCodec.EVMAccount memory account = Lib_OVMCodec.decodeEVMAccount(

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

@@ -8,8 +8,8 @@ import { Lib_ReentrancyGuard } from "../../../libraries/utils/Lib_ReentrancyGuar
 
 /* Interface Imports */
 import { iOVM_L2CrossDomainMessenger } from "../../../iOVM/bridge/messaging/iOVM_L2CrossDomainMessenger.sol";
-import { iOVM_L1MessageSender } from "../../../iOVM/precompiles/iOVM_L1MessageSender.sol";
-import { iOVM_L2ToL1MessagePasser } from "../../../iOVM/precompiles/iOVM_L2ToL1MessagePasser.sol";
+import { iOVM_L1MessageSender } from "../../../iOVM/predeploys/iOVM_L1MessageSender.sol";
+import { iOVM_L2ToL1MessagePasser } from "../../../iOVM/predeploys/iOVM_L2ToL1MessagePasser.sol";
 
 /* Contract Imports */
 import { Abs_BaseCrossDomainMessenger } from "./Abs_BaseCrossDomainMessenger.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/tokens/OVM_L1ERC20Gateway.sol

@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
 /* Interface Imports */
 import { iOVM_L1TokenGateway } from "../../../iOVM/bridge/tokens/iOVM_L1TokenGateway.sol";
 import { Abs_L1TokenGateway } from "./Abs_L1TokenGateway.sol";
-import { iOVM_ERC20 } from "../../../iOVM/precompiles/iOVM_ERC20.sol";
+import { iOVM_ERC20 } from "../../../iOVM/predeploys/iOVM_ERC20.sol";
 
 /**
  * @title OVM_L1ERC20Gateway

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol

@@ -17,7 +17,7 @@ import { iOVM_SafetyChecker } from "../../iOVM/execution/iOVM_SafetyChecker.sol"
 /* Contract Imports */
 import { OVM_ECDSAContractAccount } from "../accounts/OVM_ECDSAContractAccount.sol";
 import { OVM_ProxyEOA } from "../accounts/OVM_ProxyEOA.sol";
-import { OVM_DeployerWhitelist } from "../precompiles/OVM_DeployerWhitelist.sol";
+import { OVM_DeployerWhitelist } from "../predeploys/OVM_DeployerWhitelist.sol";
 
 /**
  * @title OVM_ExecutionManager

packages/contracts/contracts/optimistic-ethereum/OVM/precompiles/OVM_DeployerWhitelist.sol → packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_DeployerWhitelist.sol

@@ -5,7 +5,7 @@ pragma solidity >0.5.0 <0.8.0;
 import { Lib_Bytes32Utils } from "../../libraries/utils/Lib_Bytes32Utils.sol";
 
 /* Interface Imports */
-import { iOVM_DeployerWhitelist } from "../../iOVM/precompiles/iOVM_DeployerWhitelist.sol";
+import { iOVM_DeployerWhitelist } from "../../iOVM/predeploys/iOVM_DeployerWhitelist.sol";
 import { Lib_SafeExecutionManagerWrapper } from "../../libraries/wrappers/Lib_SafeExecutionManagerWrapper.sol";
 
 /**

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

@@ -2,7 +2,7 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
-import { iOVM_L1MessageSender } from "../../iOVM/precompiles/iOVM_L1MessageSender.sol";
+import { iOVM_L1MessageSender } from "../../iOVM/predeploys/iOVM_L1MessageSender.sol";
 import { iOVM_ExecutionManager } from "../../iOVM/execution/iOVM_ExecutionManager.sol";
 
 /**

packages/contracts/contracts/optimistic-ethereum/OVM/precompiles/OVM_L2ToL1MessagePasser.sol → packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_L2ToL1MessagePasser.sol

@@ -2,7 +2,7 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
-import { iOVM_L2ToL1MessagePasser } from "../../iOVM/precompiles/iOVM_L2ToL1MessagePasser.sol";
+import { iOVM_L2ToL1MessagePasser } from "../../iOVM/predeploys/iOVM_L2ToL1MessagePasser.sol";
 
 /**
  * @title OVM_L2ToL1MessagePasser

packages/contracts/contracts/test-helpers/Helper_PrecompileCaller.sol

@@ -3,22 +3,22 @@ pragma solidity >0.5.0 <0.8.0;
 
 import { Helper_SimpleProxy } from "./Helper_SimpleProxy.sol";
 
-contract Helper_PrecompileCaller is Helper_SimpleProxy {
-    function callPrecompile(
-        address _precompile,
+contract Helper_PredeployCaller is Helper_SimpleProxy {
+    function callPredeploy(
+        address _predeploy,
         bytes memory _data
     )
         public
     {
         if (msg.sender == owner) {
-            makeExternalCall(_precompile, _data);
+            makeExternalCall(_predeploy, _data);
         } else {
             makeExternalCall(target, msg.data);
         }
     }
 
-    function callPrecompileAbi(
-        address _precompile,
+    function callPredeployAbi(
+        address _predeploy,
         bytes memory _data
     )
         public
@@ -30,16 +30,16 @@ contract Helper_PrecompileCaller is Helper_SimpleProxy {
         bool success;
         bytes memory returndata;
         if (msg.sender == owner) {
-            (success, returndata) = _precompile.call(_data);
+            (success, returndata) = _predeploy.call(_data);
         } else {
             (success, returndata) = target.call(msg.data);
         }
-        require(success, "Precompile call reverted");
+        require(success, "Predeploy call reverted");
         return returndata;
     }
 
     function getL1MessageSender(
-        address _precompile,
+        address _predeploy,
         bytes memory _data
     )
         public
@@ -47,7 +47,7 @@ contract Helper_PrecompileCaller is Helper_SimpleProxy {
             address
         )
     {
-        callPrecompile(_precompile, _data);
+        callPredeploy(_predeploy, _data);
         return address(0); // unused: silence compiler
     }
 }

packages/contracts/src/contract-dumps.ts

@@ -160,7 +160,7 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise<any> => {
 
   config = { ...config, ...cfg }
 
-  const precompiles = {
+  const predeploys = {
     OVM_L2ToL1MessagePasser: '0x4200000000000000000000000000000000000000',
     OVM_L1MessageSender: '0x4200000000000000000000000000000000000001',
     OVM_DeployerWhitelist: '0x4200000000000000000000000000000000000002',
@@ -220,7 +220,7 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise<any> => {
     }
 
     const deadAddress =
-      precompiles[name] ||
+      predeploys[name] ||
       `0xdeaddeaddeaddeaddeaddeaddeaddeaddead${i.toString(16).padStart(4, '0')}`
 
     dump.accounts[name] = {

packages/contracts/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts

@@ -16,26 +16,26 @@ import {
   decodeSolidityError,
 } from '../../../helpers'
 
-const callPrecompile = async (
-  Helper_PrecompileCaller: Contract,
-  precompile: Contract,
+const callPredeploy = async (
+  Helper_PredeployCaller: Contract,
+  predeploy: Contract,
   functionName: string,
   functionParams?: any[],
   gasLimit?: number
 ): Promise<any> => {
   if (gasLimit) {
-    return Helper_PrecompileCaller.callPrecompile(
-      precompile.address,
-      precompile.interface.encodeFunctionData(
+    return Helper_PredeployCaller.callPredeploy(
+      predeploy.address,
+      predeploy.interface.encodeFunctionData(
         functionName,
         functionParams || []
       ),
       { gasLimit }
     )
   }
-  return Helper_PrecompileCaller.callPrecompile(
-    precompile.address,
-    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  return Helper_PredeployCaller.callPredeploy(
+    predeploy.address,
+    predeploy.interface.encodeFunctionData(functionName, functionParams || [])
   )
 }
 
@@ -48,16 +48,16 @@ describe('OVM_ECDSAContractAccount', () => {
   })
 
   let Mock__OVM_ExecutionManager: MockContract
-  let Helper_PrecompileCaller: Contract
+  let Helper_PredeployCaller: Contract
   before(async () => {
     Mock__OVM_ExecutionManager = await smockit(
       await ethers.getContractFactory('OVM_ExecutionManager')
     )
 
-    Helper_PrecompileCaller = await (
-      await ethers.getContractFactory('Helper_PrecompileCaller')
+    Helper_PredeployCaller = await (
+      await ethers.getContractFactory('Helper_PredeployCaller')
     ).deploy()
-    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+    Helper_PredeployCaller.setTarget(Mock__OVM_ExecutionManager.address)
   })
 
   let Factory__OVM_ECDSAContractAccount: ContractFactory
@@ -91,8 +91,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeNativeTransaction(DEFAULT_EIP155_TX)
       const sig = await signNativeTransaction(wallet, DEFAULT_EIP155_TX)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -119,8 +119,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeEthSignTransaction(DEFAULT_EIP155_TX)
       const sig = await signEthSignMessage(wallet, DEFAULT_EIP155_TX)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -148,8 +148,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeNativeTransaction(createTx)
       const sig = await signNativeTransaction(wallet, createTx)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -170,8 +170,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeNativeTransaction(DEFAULT_EIP155_TX)
       const sig = await signNativeTransaction(badWallet, DEFAULT_EIP155_TX)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -197,8 +197,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeNativeTransaction(alteredNonceTx)
       const sig = await signNativeTransaction(wallet, alteredNonceTx)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -224,8 +224,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeNativeTransaction(alteredChainIdTx)
       const sig = await signNativeTransaction(wallet, alteredChainIdTx)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -252,8 +252,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const message = serializeNativeTransaction(alteredInsufficientGasTx)
       const sig = await signNativeTransaction(wallet, alteredInsufficientGasTx)
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [
@@ -278,8 +278,8 @@ describe('OVM_ECDSAContractAccount', () => {
       const sig = await signNativeTransaction(wallet, DEFAULT_EIP155_TX)
       Mock__OVM_ExecutionManager.smocked.ovmCALL.will.return.with([false, '0x'])
 
-      await callPrecompile(
-        Helper_PrecompileCaller,
+      await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ECDSAContractAccount,
         'execute',
         [

packages/contracts/test/contracts/OVM/accounts/OVM_ProxyEOA.spec.ts

@@ -9,25 +9,22 @@ import { remove0x } from '@eth-optimism/core-utils'
 /* Internal Imports */
 import { decodeSolidityError } from '../../../helpers'
 
-const callPrecompile = async (
-  Helper_PrecompileCaller: Contract,
-  precompile: Contract,
+const callPredeploy = async (
+  Helper_PredeployCaller: Contract,
+  predeploy: Contract,
   functionName: string,
   functionParams?: any[],
   ethCall: boolean = false
 ): Promise<any> => {
   if (ethCall) {
-    return Helper_PrecompileCaller.callStatic.callPrecompileAbi(
-      precompile.address,
-      precompile.interface.encodeFunctionData(
-        functionName,
-        functionParams || []
-      )
+    return Helper_PredeployCaller.callStatic.callPredeployAbi(
+      predeploy.address,
+      predeploy.interface.encodeFunctionData(functionName, functionParams || [])
     )
   }
-  return Helper_PrecompileCaller.callPrecompile(
-    precompile.address,
-    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  return Helper_PredeployCaller.callPredeploy(
+    predeploy.address,
+    predeploy.interface.encodeFunctionData(functionName, functionParams || [])
   )
 }
 
@@ -44,17 +41,17 @@ describe('OVM_ProxyEOA', () => {
 
   let Mock__OVM_ExecutionManager: MockContract
   let Mock__OVM_ECDSAContractAccount: MockContract
-  let Helper_PrecompileCaller: Contract
+  let Helper_PredeployCaller: Contract
   before(async () => {
     Mock__OVM_ExecutionManager = await smockit(
       await ethers.getContractFactory('OVM_ExecutionManager')
     )
 
-    Helper_PrecompileCaller = await (
-      await ethers.getContractFactory('Helper_PrecompileCaller')
+    Helper_PredeployCaller = await (
+      await ethers.getContractFactory('Helper_PredeployCaller')
     ).deploy()
 
-    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+    Helper_PredeployCaller.setTarget(Mock__OVM_ExecutionManager.address)
 
     Mock__OVM_ECDSAContractAccount = await smockit(
       await ethers.getContractFactory('OVM_ECDSAContractAccount')
@@ -79,13 +76,13 @@ describe('OVM_ProxyEOA', () => {
   })
 
   describe('getImplementation()', () => {
-    it(`should be created with implementation at precompile address`, async () => {
+    it(`should be created with implementation at predeploy address`, async () => {
       const eoaDefaultAddrBytes32 = addrToBytes32(eoaDefaultAddr)
       Mock__OVM_ExecutionManager.smocked.ovmSLOAD.will.return.with(
         eoaDefaultAddrBytes32
       )
-      const implAddrBytes32 = await callPrecompile(
-        Helper_PrecompileCaller,
+      const implAddrBytes32 = await callPredeploy(
+        Helper_PredeployCaller,
         OVM_ProxyEOA,
         'getImplementation',
         [],
@@ -100,7 +97,7 @@ describe('OVM_ProxyEOA', () => {
     it(`should upgrade the proxy implementation`, async () => {
       const newImpl = `0x${'81'.repeat(20)}`
       const newImplBytes32 = addrToBytes32(newImpl)
-      await callPrecompile(Helper_PrecompileCaller, OVM_ProxyEOA, 'upgrade', [
+      await callPredeploy(Helper_PredeployCaller, OVM_ProxyEOA, 'upgrade', [
         newImpl,
       ])
       const ovmSSTORE: any =
@@ -113,7 +110,7 @@ describe('OVM_ProxyEOA', () => {
         await wallet.getAddress()
       )
       const newImpl = `0x${'81'.repeat(20)}`
-      await callPrecompile(Helper_PrecompileCaller, OVM_ProxyEOA, 'upgrade', [
+      await callPredeploy(Helper_PredeployCaller, OVM_ProxyEOA, 'upgrade', [
         newImpl,
       ])
       const ovmREVERT: any =
@@ -133,10 +130,7 @@ describe('OVM_ProxyEOA', () => {
         '0x1234',
       ])
       const calldata = '0xdeadbeef'
-      await Helper_PrecompileCaller.callPrecompile(
-        OVM_ProxyEOA.address,
-        calldata
-      )
+      await Helper_PredeployCaller.callPredeploy(OVM_ProxyEOA.address, calldata)
 
       const ovmDELEGATECALL: any =
         Mock__OVM_ExecutionManager.smocked.ovmDELEGATECALL.calls[0]

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

@@ -6,15 +6,15 @@ import { ContractFactory, Contract } from 'ethers'
 import { MockContract, smockit } from '@eth-optimism/smock'
 import { NON_ZERO_ADDRESS } from '../../../helpers/constants'
 
-const callPrecompileStatic = async (
-  Helper_PrecompileCaller: Contract,
-  precompile: Contract,
+const callPredeployStatic = async (
+  Helper_PredeployCaller: Contract,
+  predeploy: Contract,
   functionName: string,
   functionParams?: any[]
 ): Promise<any> => {
-  return Helper_PrecompileCaller.callStatic[functionName](
-    precompile.address,
-    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  return Helper_PredeployCaller.callStatic[functionName](
+    predeploy.address,
+    predeploy.interface.encodeFunctionData(functionName, functionParams || [])
   )
 }
 
@@ -26,13 +26,13 @@ describe('OVM_L1MessageSender', () => {
     )
   })
 
-  let Helper_PrecompileCaller: Contract
+  let Helper_PredeployCaller: Contract
   before(async () => {
-    Helper_PrecompileCaller = await (
-      await ethers.getContractFactory('Helper_PrecompileCaller')
+    Helper_PredeployCaller = await (
+      await ethers.getContractFactory('Helper_PredeployCaller')
     ).deploy()
 
-    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+    Helper_PredeployCaller.setTarget(Mock__OVM_ExecutionManager.address)
   })
 
   let Factory__OVM_L1MessageSender: ContractFactory
@@ -56,8 +56,8 @@ describe('OVM_L1MessageSender', () => {
 
     it('should return the L1 message sender', async () => {
       expect(
-        await callPrecompileStatic(
-          Helper_PrecompileCaller,
+        await callPredeployStatic(
+          Helper_PredeployCaller,
           OVM_L1MessageSender,
           'getL1MessageSender'
         )

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

@@ -12,15 +12,15 @@ import { NON_ZERO_ADDRESS } from '../../../helpers/constants'
 
 const ELEMENT_TEST_SIZES = [1, 2, 4, 8, 16]
 
-const callPrecompile = async (
-  Helper_PrecompileCaller: Contract,
-  precompile: Contract,
+const callPredeploy = async (
+  Helper_PredeployCaller: Contract,
+  predeploy: Contract,
   functionName: string,
   functionParams?: any[]
 ): Promise<any> => {
-  return Helper_PrecompileCaller.callPrecompile(
-    precompile.address,
-    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  return Helper_PredeployCaller.callPredeploy(
+    predeploy.address,
+    predeploy.interface.encodeFunctionData(functionName, functionParams || [])
   )
 }
 
@@ -32,13 +32,13 @@ describe('OVM_L2ToL1MessagePasser', () => {
     )
   })
 
-  let Helper_PrecompileCaller: Contract
+  let Helper_PredeployCaller: Contract
   before(async () => {
-    Helper_PrecompileCaller = await (
-      await ethers.getContractFactory('Helper_PrecompileCaller')
+    Helper_PredeployCaller = await (
+      await ethers.getContractFactory('Helper_PredeployCaller')
     ).deploy()
 
-    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+    Helper_PredeployCaller.setTarget(Mock__OVM_ExecutionManager.address)
   })
 
   let Factory__OVM_L2ToL1MessagePasser: ContractFactory
@@ -65,8 +65,8 @@ describe('OVM_L2ToL1MessagePasser', () => {
         for (let i = 0; i < size; i++) {
           const message = '0x' + '12' + '34'.repeat(i)
 
-          await callPrecompile(
-            Helper_PrecompileCaller,
+          await callPredeploy(
+            Helper_PredeployCaller,
             OVM_L2ToL1MessagePasser,
             'passMessageToL1',
             [message]
@@ -74,7 +74,7 @@ describe('OVM_L2ToL1MessagePasser', () => {
 
           expect(
             await OVM_L2ToL1MessagePasser.sentMessages(
-              keccak256(message + remove0x(Helper_PrecompileCaller.address))
+              keccak256(message + remove0x(Helper_PredeployCaller.address))
             )
           ).to.equal(true)
         }

packages/contracts/test/contracts/OVM/precompiles/OVM_ProxySequencerEntrypoint.spec.ts

@@ -9,15 +9,15 @@ import { remove0x } from '@eth-optimism/core-utils'
 /* Internal Imports */
 import { decodeSolidityError } from '../../../helpers'
 
-const callPrecompile = async (
-  Helper_PrecompileCaller: Contract,
-  precompile: Contract,
+const callPredeploy = async (
+  Helper_PredeployCaller: Contract,
+  predeploy: Contract,
   functionName: string,
   functionParams?: any[]
 ): Promise<any> => {
-  return Helper_PrecompileCaller.callPrecompile(
-    precompile.address,
-    precompile.interface.encodeFunctionData(functionName, functionParams || [])
+  return Helper_PredeployCaller.callPredeploy(
+    predeploy.address,
+    predeploy.interface.encodeFunctionData(functionName, functionParams || [])
   )
 }
 
@@ -39,7 +39,7 @@ describe('OVM_ProxySequencerEntrypoint', () => {
   })
 
   let Mock__OVM_ExecutionManager: MockContract
-  let Helper_PrecompileCaller: Contract
+  let Helper_PredeployCaller: Contract
   let OVM_SequencerEntrypoint: Contract
   before(async () => {
     Mock__OVM_ExecutionManager = await smockit(
@@ -53,11 +53,11 @@ describe('OVM_ProxySequencerEntrypoint', () => {
     Mock__OVM_ExecutionManager.smocked.ovmEXTCODESIZE.will.return.with(0)
     Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(420)
 
-    Helper_PrecompileCaller = await (
-      await ethers.getContractFactory('Helper_PrecompileCaller')
+    Helper_PredeployCaller = await (
+      await ethers.getContractFactory('Helper_PredeployCaller')
     ).deploy()
 
-    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+    Helper_PredeployCaller.setTarget(Mock__OVM_ExecutionManager.address)
 
     OVM_SequencerEntrypoint = await (
       await ethers.getContractFactory('OVM_SequencerEntrypoint')
@@ -72,8 +72,8 @@ describe('OVM_ProxySequencerEntrypoint', () => {
     Mock__OVM_ExecutionManager.smocked.ovmSLOAD.will.return.with(
       `0x${'00'.repeat(32)}`
     )
-    await callPrecompile(
-      Helper_PrecompileCaller,
+    await callPredeploy(
+      Helper_PredeployCaller,
       OVM_ProxySequencerEntrypoint,
       'init',
       [OVM_SequencerEntrypoint.address, await wallet.getAddress()]
@@ -98,8 +98,8 @@ describe('OVM_ProxySequencerEntrypoint', () => {
     Mock__OVM_ExecutionManager.smocked.ovmSLOAD.will.return.with(
       addrToBytes32(await wallet.getAddress())
     )
-    await callPrecompile(
-      Helper_PrecompileCaller,
+    await callPredeploy(
+      Helper_PredeployCaller,
       OVM_ProxySequencerEntrypoint,
       'init',
       [constants.AddressZero, constants.AddressZero]
@@ -115,8 +115,8 @@ describe('OVM_ProxySequencerEntrypoint', () => {
     Mock__OVM_ExecutionManager.smocked.ovmSLOAD.will.return.with(
       addrToBytes32(await wallet.getAddress())
     )
-    await callPrecompile(
-      Helper_PrecompileCaller,
+    await callPredeploy(
+      Helper_PredeployCaller,
       OVM_ProxySequencerEntrypoint,
       'upgrade',
       [`0x${'12'.repeat(20)}`]
@@ -131,8 +131,8 @@ describe('OVM_ProxySequencerEntrypoint', () => {
     Mock__OVM_ExecutionManager.smocked.ovmSLOAD.will.return.with(
       `0x${'00'.repeat(32)}`
     )
-    await callPrecompile(
-      Helper_PrecompileCaller,
+    await callPredeploy(
+      Helper_PredeployCaller,
       OVM_ProxySequencerEntrypoint,
       'upgrade',
       [`0x${'12'.repeat(20)}`]
@@ -152,7 +152,7 @@ describe('OVM_ProxySequencerEntrypoint', () => {
       '0x',
     ])
     const calldata = '0xdeadbeef'
-    await Helper_PrecompileCaller.callPrecompile(
+    await Helper_PredeployCaller.callPredeploy(
       OVM_ProxySequencerEntrypoint.address,
       calldata
     )

packages/contracts/test/contracts/OVM/precompiles/OVM_SequencerEntrypoint.spec.ts

@@ -24,7 +24,7 @@ describe('OVM_SequencerEntrypoint', () => {
   })
 
   let Mock__OVM_ExecutionManager: MockContract
-  let Helper_PrecompileCaller: Contract
+  let Helper_PredeployCaller: Contract
   before(async () => {
     Mock__OVM_ExecutionManager = await smockit(
       await ethers.getContractFactory('OVM_ExecutionManager')
@@ -33,11 +33,11 @@ describe('OVM_SequencerEntrypoint', () => {
     Mock__OVM_ExecutionManager.smocked.ovmCHAINID.will.return.with(420)
     Mock__OVM_ExecutionManager.smocked.ovmCALL.will.return.with([true, '0x'])
 
-    Helper_PrecompileCaller = await (
-      await ethers.getContractFactory('Helper_PrecompileCaller')
+    Helper_PredeployCaller = await (
+      await ethers.getContractFactory('Helper_PredeployCaller')
     ).deploy()
 
-    Helper_PrecompileCaller.setTarget(Mock__OVM_ExecutionManager.address)
+    Helper_PredeployCaller.setTarget(Mock__OVM_ExecutionManager.address)
   })
 
   let OVM_SequencerEntrypointFactory: ContractFactory
@@ -61,7 +61,7 @@ describe('OVM_SequencerEntrypoint', () => {
         DEFAULT_EIP155_TX,
         0
       )
-      await Helper_PrecompileCaller.callPrecompile(
+      await Helper_PredeployCaller.callPredeploy(
         OVM_SequencerEntrypoint.address,
         calldata
       )
@@ -86,7 +86,7 @@ describe('OVM_SequencerEntrypoint', () => {
     it('should send correct calldata if tx is a create and the transaction type is 0', async () => {
       const createTx = { ...DEFAULT_EIP155_TX, to: '' }
       const calldata = await encodeSequencerCalldata(wallet, createTx, 0)
-      await Helper_PrecompileCaller.callPrecompile(
+      await Helper_PredeployCaller.callPredeploy(
         OVM_SequencerEntrypoint.address,
         calldata
       )
@@ -116,7 +116,7 @@ describe('OVM_SequencerEntrypoint', () => {
           DEFAULT_EIP155_TX,
           i
         )
-        await Helper_PrecompileCaller.callPrecompile(
+        await Helper_PredeployCaller.callPredeploy(
           OVM_SequencerEntrypoint.address,
           calldata
         )
@@ -137,7 +137,7 @@ describe('OVM_SequencerEntrypoint', () => {
         DEFAULT_EIP155_TX,
         2
       )
-      await Helper_PrecompileCaller.callPrecompile(
+      await Helper_PredeployCaller.callPredeploy(
         OVM_SequencerEntrypoint.address,
         calldata
       )
@@ -162,7 +162,7 @@ describe('OVM_SequencerEntrypoint', () => {
     it('should revert if TransactionType is >2', async () => {
       const calldata = '0x03'
       await expect(
-        Helper_PrecompileCaller.callPrecompile(
+        Helper_PredeployCaller.callPredeploy(
           OVM_SequencerEntrypoint.address,
           calldata
         )
@@ -172,7 +172,7 @@ describe('OVM_SequencerEntrypoint', () => {
     it('should revert if TransactionType is 1', async () => {
       const calldata = '0x01'
       await expect(
-        Helper_PrecompileCaller.callPrecompile(
+        Helper_PredeployCaller.callPredeploy(
           OVM_SequencerEntrypoint.address,
           calldata
         )