L1Gateway set owner by parameter on constructor to make it deployable…

… using CREATE3
BootNodeDev · May 3, 2024 · b81010a · b81010a
1 parent 016980a
commit b81010a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/L1XERC20Gateway.sol b/src/L1XERC20Gateway.sol
@@ -9,9 +9,9 @@ import { XERC20BaseGateway } from "src/XERC20BaseGateway.sol";
  * @title Gateway for xERC20 bridging functionality
  */
 contract L1XERC20Gateway is XERC20BaseGateway, L1CustomGateway {
-    constructor(address _l1Router, address _inbox) {
+    constructor(address _owner, address _l1Router, address _inbox) {
         address _l2Counterpart = address(this);
-        initialize(_l2Counterpart, _l1Router, _inbox, msg.sender);
+        initialize(_l2Counterpart, _l1Router, _inbox, _owner);
     }
 
     function outboundEscrowTransfer(

diff --git a/test/L1XERC20Gateway.t.sol b/test/L1XERC20Gateway.t.sol
@@ -18,7 +18,7 @@ contract L1XERC20GatewayTest is Test {
 
     function setUp() public {
         xerc20 = new XERC20("NonArbitrumEnabled", "NON", _owner);
-        gateway = new L1XERC20Gateway(makeAddr("router"), makeAddr("inbox"));
+        gateway = new L1XERC20Gateway(_owner, makeAddr("router"), makeAddr("inbox"));
         adapter = new L1XERC20Adapter(address(xerc20), address(gateway));
     }
 

diff --git a/test/forking/L1XERC20Gateway.t.sol b/test/forking/L1XERC20Gateway.t.sol
@@ -40,7 +40,7 @@ contract L1XERC20GatewayTest is Test {
 
         mainnetFork = vm.createSelectFork("mainnet", 19_690_420);
 
-        l1Gateway = new L1XERC20Gateway(l1GatewayRouter, l1Inbox);
+        l1Gateway = new L1XERC20Gateway(_owner, l1GatewayRouter, l1Inbox);
 
         xerc20 = new XERC20("NonArbitrumEnabled", "NON", _owner);
         vm.deal(_owner, 100 ether);