fix: ownable constructor invocation

Author: prestwich

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "lib/zenith"]
 	path = lib/zenith
 	url = https://github.com/init4tech/zenith
-[submodule "lib/simple-erc20"]
-	path = lib/simple-erc20
-	url = https://github.com/init4tech/simple-erc20

lib/simple-erc20

@@ -22,12 +22,12 @@ abstract contract BridgeL2 is SignetL2, BurnMintERC20 {
 
     /// @notice Bridges assets into the rollup for a given recipient.
     function _bridgeIn(address recipient, uint256 amount, RollupOrders.Input[] memory inputs) internal virtual {
+        _mint(recipient, amount);
+
         RollupOrders.Output[] memory outputs = new RollupOrders.Output[](1);
         outputs[0] = makeHostOutput(HOST_ASSET, amount, HOST_BANK);
 
         ORDERS.initiate(block.timestamp, inputs, outputs);
-
-        _mint(recipient, amount);
     }
 
     /// @notice Bridges assets into the rollup for a given recipient.
@@ -40,21 +40,38 @@ abstract contract BridgeL2 is SignetL2, BurnMintERC20 {
     ///
     /// This transaction should be paired with some off-chain logic that fills
     /// orders from the L1 bank.
-    function _bridgeOut(address recipient, uint256 amount, RollupOrders.Input[] memory inputs) internal virtual {
+    function _bridgeOut(address sender, address recipient, uint256 amount, RollupOrders.Input[] memory inputs)
+        internal
+        virtual
+    {
+        if (_msgSender() != sender) {
+            _spendAllowance(sender, _msgSender(), amount);
+        }
+
+        _burn(msg.sender, amount);
+
         RollupOrders.Output[] memory outputs = new RollupOrders.Output[](1);
         outputs[0] = makeHostOutput(HOST_ASSET, amount, recipient);
 
         ORDERS.initiate(block.timestamp, inputs, outputs);
-
-        _burn(msg.sender, amount);
     }
 
-    /// @notice Burn asset on L2, and create an order to bridge out asset to
+    /// @notice Burn asset on L2, and create an order to bridge out assets to
     /// L1. If the order is not filled, the asset will not be burned.
     ///
     /// This transaction should be paired with some off-chain logic that fills
     /// orders from the L1 bank.
     function bridgeOut(address recipient, uint256 amount) public virtual {
-        _bridgeOut(recipient, amount, new RollupOrders.Input[](0));
+        _bridgeOut(msg.sender, recipient, amount, new RollupOrders.Input[](0));
+    }
+
+    /// @notice Burn asset on L2 from `sender`, and create an order to bridge
+    /// out assets to L1. If the order is not filled, the asset will not be
+    /// burned. Used when the caller is not the sender.
+    ///
+    /// This transaction should be paired with some off-chain logic that fills
+    /// orders from the L1 bank.
+    function bridgeOutFrom(address sender, address recipient, uint256 amount) public virtual {
+        _bridgeOut(sender, recipient, amount, new RollupOrders.Input[](0));
     }
 }

src/apps/Bridge.sol

@@ -35,8 +35,8 @@ contract LidoL2 is BridgeL2 {
 
     /// @notice Transfer WETH from `funder`, create an order to convert it to
     /// wstETH on L1 and bridge it to L2, and mint stETH to `recipient`.
-    function enter(address funder, uint256 amountIn, address recipient, uint256 amountOut) external {
-        WETH.safeTransferFrom(funder, address(this), amountIn);
+    function enter(uint256 amountIn, address recipient, uint256 amountOut) external {
+        WETH.safeTransferFrom(msg.sender, address(this), amountIn);
 
         RollupOrders.Input[] memory inputs = new RollupOrders.Input[](1);
         inputs[0] = makeWethInput(amountIn);

src/apps/Lido.sol

@@ -6,7 +6,5 @@ import {Ownable} from "openzeppelin-contracts/contracts/access/Ownable.sol";
 import {SignetL2} from "./Signet.sol";
 
 abstract contract SelfOwned is SignetL2, Ownable {
-    constructor() {
-        Ownable(aliasedSelf());
-    }
+    constructor() Ownable(aliasedSelf()) {}
 }

src/l2/SelfOwned.sol

@@ -1,26 +1,40 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.13;
 
-import {SimpleERC20} from "simple-erc20/SimpleERC20.sol";
+import {BurnMintERC20} from "../src/vendor/BurnMintERC20.sol";
 
 import {PecorinoTest} from "./Base.sol";
+
 import {SignetL2} from "../src/l2/Signet.sol";
+import {SelfOwned} from "../src/l2/SelfOwned.sol";
 import {AddressAliasHelper} from "../src/vendor/AddressAliasHelper.sol";
 
-contract SelfOwnedToken is SignetL2, SimpleERC20 {
-    constructor() SimpleERC20(aliasedSelf(), "My Token", "MTK", 18) {
+contract SelfOwnedNothing is SelfOwned {
+    constructor() {}
+}
+
+contract SelfOwnedToken is SignetL2, BurnMintERC20 {
+    constructor() BurnMintERC20("My Token", "MTK", 18, 0, 0) {
         assert(HOST_WETH != address(0));
+        s_ccipAdmin = aliasedSelf();
     }
 }
 
 contract TestSelfOwned is PecorinoTest {
     SelfOwnedToken token;
 
+    SelfOwnedNothing nothing;
+
     constructor() {
         token = new SelfOwnedToken();
+        nothing = new SelfOwnedNothing();
+    }
+
+    function test_tokenOwnerIsSelfOnL1() public view {
+        assertEq(token.getCCIPAdmin(), AddressAliasHelper.applyL1ToL2Alias(address(token)));
     }
 
-    function test_ownerIsSelfOnL1() public view {
-        assertEq(token.owner(), AddressAliasHelper.applyL1ToL2Alias(address(token)));
+    function test_nothingOwnerIsSelfOnL1() public view {
+        assertEq(nothing.owner(), AddressAliasHelper.applyL1ToL2Alias(address(nothing)));
     }
 }