fix: use predeploy constant lib for em wrapper (#1075)

* fix: use predeploy constant lib for em wrapper * chore: add changeset
ethereum-optimism · Jun 14, 2021 · 3c2c32e · 3c2c32e
1 parent 5fc728d
commit 3c2c32e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.changeset/lovely-suns-learn.md b/.changeset/lovely-suns-learn.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts': patch
+---
+
+Use predeploy constants lib for EM wrapper
diff --git a/...es/contracts/contracts/optimistic-ethereum/libraries/constants/Lib_PredeployAddresses.sol b/...es/contracts/contracts/optimistic-ethereum/libraries/constants/Lib_PredeployAddresses.sol
@@ -14,6 +14,7 @@ library Lib_PredeployAddresses {
     address internal constant L2_CROSS_DOMAIN_MESSENGER = 0x4200000000000000000000000000000000000007;
     address internal constant LIB_ADDRESS_MANAGER = 0x4200000000000000000000000000000000000008;
     address internal constant PROXY_EOA = 0x4200000000000000000000000000000000000009;
+    address internal constant EXECUTION_MANAGER_WRAPPER = 0x420000000000000000000000000000000000000B;
     address internal constant SEQUENCER_FEE_WALLET = 0x4200000000000000000000000000000000000011;
     address internal constant ERC1820_REGISTRY = 0x1820a4B7618BdE71Dce8cdc73aAB6C95905faD24;
     address internal constant L2_STANDARD_BRIDGE = 0x4200000000000000000000000000000000000010;

diff --git a/...ontracts/contracts/optimistic-ethereum/libraries/wrappers/Lib_ExecutionManagerWrapper.sol b/...ontracts/contracts/optimistic-ethereum/libraries/wrappers/Lib_ExecutionManagerWrapper.sol
@@ -3,6 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_ErrorUtils } from "../utils/Lib_ErrorUtils.sol";
+import { Lib_PredeployAddresses } from "../constants/Lib_PredeployAddresses.sol";
 
 /**
  * @title Lib_ExecutionManagerWrapper
@@ -252,7 +253,7 @@ library Lib_ExecutionManagerWrapper {
             bytes memory
         )
     {
-        (bool success, bytes memory returndata) = 0x420000000000000000000000000000000000000B.delegatecall(_calldata);
+        (bool success, bytes memory returndata) = Lib_PredeployAddresses.EXECUTION_MANAGER_WRAPPER.delegatecall(_calldata);
 
         if (success == true) {
             return returndata;