make WOUSD inherit from WOETH

Author: sparrowDom

contracts/contracts/mocks/MockLimitedWrappedOusd.sol

@@ -5,11 +5,7 @@ import { WrappedOusd } from "../token/WrappedOusd.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract MockLimitedWrappedOusd is WrappedOusd {
-    constructor(
-        ERC20 underlying_,
-        string memory name_,
-        string memory symbol_
-    ) WrappedOusd(underlying_, name_, symbol_) {}
+    constructor(ERC20 underlying_) WrappedOusd(underlying_) {}
 
     function maxDeposit(address)
         public

contracts/contracts/token/WOETHBase.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
 import { WOETH } from "./WOETH.sol";

contracts/contracts/token/WOSonic.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

contracts/contracts/token/WrappedOusd.sol

@@ -1,36 +1,23 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import { ERC4626 } from "../../lib/openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import { Governable } from "../governance/Governable.sol";
-import { Initializable } from "../utils/Initializable.sol";
-import { OUSD } from "./OUSD.sol";
+import { WOETH } from "./WOETH.sol";
 
-contract WrappedOusd is ERC4626, Governable, Initializable {
-    using SafeERC20 for IERC20;
-
-    constructor(
-        ERC20 underlying_,
-        string memory name_,
-        string memory symbol_
-    ) ERC20(name_, symbol_) ERC4626(underlying_) Governable() {}
-
-    /**
-     * @notice Enable OUSD rebasing for this contract
-     */
-    function initialize() external onlyGovernor initializer {
-        OUSD(address(asset())).rebaseOptIn();
-    }
+/**
+ * @title Wrapped OUSD Token Contract
+ * @author Origin Protocol Inc
+ */
+contract WrappedOusd is WOETH {
+    constructor(ERC20 underlying_) WOETH(underlying_) {}
 
     function name()
         public
         view
-        override(ERC20, IERC20Metadata)
+        virtual
+        override(WOETH)
         returns (string memory)
     {
         return "Wrapped OUSD";
@@ -39,23 +26,10 @@ contract WrappedOusd is ERC4626, Governable, Initializable {
     function symbol()
         public
         view
-        override(ERC20, IERC20Metadata)
+        virtual
+        override(WOETH)
         returns (string memory)
     {
         return "WOUSD";
     }
-
-    /**
-     * @notice Transfer token to governor. Intended for recovering tokens stuck in
-     *      contract, i.e. mistaken sends. Cannot transfer OUSD
-     * @param asset_ Address for the asset
-     * @param amount_ Amount of the asset to transfer
-     */
-    function transferToken(address asset_, uint256 amount_)
-        external
-        onlyGovernor
-    {
-        require(asset_ != address(asset()), "Cannot collect OUSD");
-        IERC20(asset_).safeTransfer(governor(), amount_);
-    }
 }

contracts/deploy/deployActions.js

@@ -1222,8 +1222,6 @@ const deployWOusd = async () => {
   const ousd = await ethers.getContract("OUSDProxy");
   const dWrappedOusdImpl = await deployWithConfirmation("WrappedOusd", [
     ousd.address,
-    "Wrapped OUSD IMPL",
-    "WOUSD IMPL",
   ]);
   await deployWithConfirmation("WrappedOUSDProxy");
   const wousdProxy = await ethers.getContract("WrappedOUSDProxy");

contracts/test/token/woeth.js

@@ -40,7 +40,7 @@ describe("WOETH", function () {
   const increaseOETHSupplyAndRebase = async (wethAmount) => {
     await weth.connect(josh).deposit({ value: wethAmount });
     await weth.connect(josh).transfer(oethVault.address, wethAmount);
-    await oethVault.connect(josh).rebase();
+    await oethVault.rebase();
   };
 
   describe("General functionality", async () => {

contracts/test/token/wousd.js

@@ -7,7 +7,6 @@ describe("WOUSD", function () {
   if (isFork) {
     this.timeout(0);
   }
-
   let ousd, wousd, vault, usds, matt, josh, governor;
 
   beforeEach(async () => {
@@ -20,46 +19,54 @@ describe("WOUSD", function () {
     josh = fixture.josh;
     governor = fixture.governor;
 
-    // Josh wraps 50
+    /* Matt and Josh start out with 100 OUSD
+     * Josh wraps 50 OUSD to WOETH
+     */
     await ousd.connect(josh).approve(wousd.address, ousdUnits("1000"));
     await wousd.connect(josh).deposit(ousdUnits("50"), josh.address);
     // Matt gives money to wOUSD, which counts as yield and changes the effective price of WOUSD
+
     // 1 WOUSD will be worth 2 OUSD
-    await ousd.connect(matt).transfer(wousd.address, ousdUnits("50"));
+    await increaseOUSDSupplyAndRebase(await ousd.totalSupply());
   });
 
+  const increaseOUSDSupplyAndRebase = async (usdsAmount) => {
+    await usds.connect(matt).transfer(vault.address, usdsAmount);
+    await vault.rebase();
+  };
+
   describe("Funds in, Funds out", async () => {
     it("should deposit at the correct ratio", async () => {
       await wousd.connect(josh).deposit(ousdUnits("50"), josh.address);
       await expect(josh).to.have.a.balanceOf("75", wousd);
-      await expect(josh).to.have.a.balanceOf("0", ousd);
+      await expect(josh).to.have.a.balanceOf("50", ousd);
     });
     it("should withdraw at the correct ratio", async () => {
       await wousd
         .connect(josh)
         .withdraw(ousdUnits("50"), josh.address, josh.address);
       await expect(josh).to.have.a.balanceOf("25", wousd);
-      await expect(josh).to.have.a.balanceOf("100", ousd);
+      await expect(josh).to.have.a.balanceOf("150", ousd);
     });
     it("should mint at the correct ratio", async () => {
       await wousd.connect(josh).mint(ousdUnits("25"), josh.address);
       await expect(josh).to.have.a.balanceOf("75", wousd);
-      await expect(josh).to.have.a.balanceOf("0", ousd);
+      await expect(josh).to.have.a.balanceOf("50", ousd);
     });
     it("should redeem at the correct ratio", async () => {
       await expect(josh).to.have.a.balanceOf("50", wousd);
       await wousd
         .connect(josh)
         .redeem(ousdUnits("50"), josh.address, josh.address);
       await expect(josh).to.have.a.balanceOf("0", wousd);
-      await expect(josh).to.have.a.balanceOf("150", ousd);
+      await expect(josh).to.have.a.balanceOf("200", ousd);
     });
   });
 
   describe("Collects Rebase", async () => {
     it("should increase with an OUSD rebase", async () => {
       await expect(wousd).to.have.approxBalanceOf("100", ousd);
-      await usds.connect(josh).transfer(vault.address, usdsUnits("100"));
+      await usds.connect(josh).transfer(vault.address, usdsUnits("200"));
       await vault.rebase();
       await expect(wousd).to.have.approxBalanceOf("150", ousd);
     });
@@ -85,7 +92,7 @@ describe("WOUSD", function () {
     it("should not allow a governor to collect OUSD", async () => {
       await expect(
         wousd.connect(governor).transferToken(ousd.address, ousdUnits("2"))
-      ).to.be.revertedWith("Cannot collect OUSD");
+      ).to.be.revertedWith("Cannot collect core asset");
     });
     it("should not allow a non governor to recover tokens ", async () => {
       await expect(
@@ -99,11 +106,7 @@ describe("WOUSD", function () {
       // Do upgrade
       const cWrappedOUSDProxy = await ethers.getContract("WrappedOUSDProxy");
       const factory = await ethers.getContractFactory("MockLimitedWrappedOusd");
-      const dNewImpl = await factory.deploy(
-        ousd.address,
-        "WOUSD",
-        "Wrapped OUSD"
-      );
+      const dNewImpl = await factory.deploy(ousd.address);
       await cWrappedOUSDProxy.connect(governor).upgradeTo(dNewImpl.address);
 
       // Test basics