Merge

Author: DanielVF

.github/workflows/node.js.yml

@@ -146,4 +146,69 @@ jobs:
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
-          args: --severity-threshold=high  --all-projects
+          args: --severity-threshold=high  --all-projects
+
+  build-image:
+    name: "Deploy App"
+    runs-on: ubuntu-latest
+    needs: [contracts-lint, dapp-lint]
+    environment:
+      name: ${{ github.ref_name }}
+    env:
+      HEROKU_TOKEN: ${{ secrets.HEROKU_TOKEN }}
+      CURR_BRANCH: ${{ github.ref_name }}
+    if: ${{ contains(fromJSON('["master", "staging", "stable"]'), github.ref_name) }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Identify Heroku App Name
+        shell: bash
+        run:
+          if [[ $CURR_BRANCH == "stable" ]]; then 
+            echo "HEROKU_APP_NAME=ousd-dapp" >> $GITHUB_ENV;
+          else 
+            echo "HEROKU_APP_NAME=ousd-dapp-staging" >> $GITHUB_ENV; 
+          fi;
+        id: heroku_app
+
+      - name: Heroku Login
+        uses: akhileshns/[email protected]
+        if: ${{ contains(fromJSON('["staging", "stable"]'), github.ref_name) }}
+        with:
+          justlogin: true
+          heroku_api_key: ${{secrets.HEROKU_TOKEN}}
+          heroku_app_name: ${{env.HEROKU_APP_NAME}}
+          heroku_email: ${{secrets.HEROKU_EMAIL}}
+
+      - name: Run Docker Login
+        if: ${{ contains(fromJSON('["staging", "stable"]'), github.ref_name) }}
+        run: docker login --username=_ --password=$HEROKU_TOKEN registry.heroku.com
+
+      - name: Extract Deployment Env
+        env:
+          HEROKU_APP_NAME: ${{env.HEROKU_APP_NAME}}
+        working-directory: dapp
+        run: heroku config -s -a $HEROKU_APP_NAME > deploy.env
+
+      - name: Build and Push
+        uses: docker/build-push-action@v3
+        if: ${{ contains(fromJSON('["staging", "stable"]'), github.ref_name) }}
+        env:
+          NODE_ENV: production
+        with:
+          context: .
+          push: true
+          tags: registry.heroku.com/${{env.HEROKU_APP_NAME}}/web
+          provenance: false
+
+      - name: Deploy to Heroku
+        if: ${{ contains(fromJSON('["staging", "stable"]'), github.ref_name) }}
+        env:
+          HEROKU_APP_NAME: ${{env.HEROKU_APP_NAME}}
+        run: heroku container:release web -a $HEROKU_APP_NAME

.github/workflows/ousd.yml

@@ -0,0 +1,22 @@
+FROM node:16-alpine
+
+# Install Git
+RUN apk update
+RUN apk add git
+
+# Copy files over
+WORKDIR /app
+COPY contracts ./contracts
+COPY dapp ./dapp
+
+# Build contract files
+WORKDIR /app/contracts
+RUN yarn install
+RUN yarn deploy
+
+# Build DApp
+WORKDIR /app/dapp
+RUN yarn install
+RUN NODE_ENV=production yarn build
+
+CMD ["yarn", "start"]

Dockerfile

@@ -3,6 +3,12 @@
 OUSD is a new kind of stablecoin that passively accrues yield while you are holding it.
 Checkout our [docs](https://docs.ousd.com) for more details about the product.
 
+| Branch  | CI/CD Status |
+| ------------- | ------------- |
+| `master` | [![OUSD](https://github.com/OriginProtocol/origin-dollar/actions/workflows/ousd.yml/badge.svg)](https://github.com/OriginProtocol/origin-dollar/actions/workflows/ousd.yml) |
+| `staging` | [![OUSD](https://github.com/OriginProtocol/origin-dollar/actions/workflows/ousd.yml/badge.svg?branch=staging)](https://github.com/OriginProtocol/origin-dollar/actions/workflows/ousd.yml?query=branch%3Astaging) |
+| `stable` | [![OUSD](https://github.com/OriginProtocol/origin-dollar/actions/workflows/ousd.yml/badge.svg?branch=stable)](https://github.com/OriginProtocol/origin-dollar/actions/workflows/ousd.yml?query=branch%3Astable) |
+
 ## Requirements
 - Node Version
   - `^8.11.2 >= node <=^14.0.0`

README.md

@@ -2,14 +2,6 @@
 import world
 import math
 
-#CONFIGURATION - unfortunately this address changes until we deploy it to mainnet
-OUSD_META_STRATEGY = '0xb12C3410C44854054c217fbF79dFf38ffD1C0676'
-BUSD_STRATEGY = '0x6996352570817113965b0325005f868B1Fe2f2e9'
-# Define which meta strategy should be set as default USDT asset strategy. Important for
-# supplying liquidity when minting using USDT
-USDT_DEFAULT_META_STRATEGY = OUSD_META_STRATEGY
-#USDT_DEFAULT_META_STRATEGY = BUSD_STRATEGY
-#END COFIGURATION
 
 me = ORIGINTEAM
 some_gas_price = 100
@@ -30,6 +22,8 @@
 DAI_BAGS = '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' #polygon bridge
 DAI_BAGS_2 = '0x5d3a536e4d6dbd6114cc1ead35777bab948e3643' #this is compound cDai. Don't touch this!
 CURVE_FACTORY = '0xB9fC157394Af804a3578134A6585C0dc9cc990d4'
+OUSD_META_STRATEGY = '0x89Eb88fEdc50FC77ae8a18aAD1cA0ac27f777a90'
+USDT_DEFAULT_META_STRATEGY = OUSD_META_STRATEGY
 
 threepool_lp = load_contract('threepool_lp', THREEPOOL_LP)
 ousd_metapool = load_contract('ousd_metapool', OUSD_METAPOOL)
@@ -52,7 +46,6 @@
 frax.transfer(me, frax.balanceOf(FRAX_BAGS), {'from': FRAX_BAGS})
 busd.transfer(me, busd.balanceOf(BUSD_BAGS), {'from': BUSD_BAGS})
 meta_strat = load_contract('convex_strat', OUSD_META_STRATEGY)
-busd_strat = load_contract('convex_strat', BUSD_STRATEGY)
 
 # approve ousd and 3poolLp to be used by ousd_metapool
 threepool_lp.approve(ousd_metapool, int(0), OPTS)

brownie/abi/vault_admin.json

@@ -113,6 +113,18 @@ interface IVault {
         uint256[] calldata _amounts
     ) external;
 
+    function withdrawFromStrategy(
+        address _strategyFromAddress,
+        address[] calldata _assets,
+        uint256[] calldata _amounts
+    ) external;
+
+    function depositToStrategy(
+        address _strategyToAddress,
+        address[] calldata _assets,
+        uint256[] calldata _amounts
+    ) external;
+
     // VaultCore.sol
     function mint(
         address _asset,

brownie/metastrategy.py

@@ -233,7 +233,7 @@ contract VaultAdmin is VaultStorage {
     }
 
     /**
-     * @notice Move assets from one Strategy to another
+     * @dev Move assets from one Strategy to another
      * @param _strategyFromAddress Address of Strategy to move assets from.
      * @param _strategyToAddress Address of Strategy to move assets to.
      * @param _assets Array of asset address that will be moved
@@ -246,27 +246,103 @@ contract VaultAdmin is VaultStorage {
         uint256[] calldata _amounts
     ) external onlyGovernorOrStrategist {
         require(
-            strategies[_strategyFromAddress].isSupported,
-            "Invalid from Strategy"
+            strategies[_strategyToAddress].isSupported,
+            "Invalid to Strategy"
         );
+        require(_assets.length == _amounts.length, "Parameter length mismatch");
+        _withdrawFromStrategy(
+            _strategyToAddress,
+            _strategyFromAddress,
+            _assets,
+            _amounts
+        );
+
+        IStrategy strategyTo = IStrategy(_strategyToAddress);
+        for (uint256 i = 0; i < _assets.length; i++) {
+            require(strategyTo.supportsAsset(_assets[i]), "Asset unsupported");
+        }
+        // Tell new Strategy to deposit into protocol
+        strategyTo.depositAll();
+    }
+
+    /**
+     * @dev Deposit multiple assets from the vault into the strategy.
+     * @param _strategyToAddress Address of the Strategy to deposit assets into.
+     * @param _assets Array of asset address that will be deposited into the strategy.
+     * @param _amounts Array of amounts of each corresponding asset to deposit.
+     */
+    function depositToStrategy(
+        address _strategyToAddress,
+        address[] calldata _assets,
+        uint256[] calldata _amounts
+    ) external onlyGovernorOrStrategist {
+        _depositToStrategy(_strategyToAddress, _assets, _amounts);
+    }
+
+    function _depositToStrategy(
+        address _strategyToAddress,
+        address[] calldata _assets,
+        uint256[] calldata _amounts
+    ) internal {
         require(
             strategies[_strategyToAddress].isSupported,
             "Invalid to Strategy"
         );
         require(_assets.length == _amounts.length, "Parameter length mismatch");
 
-        IStrategy strategyFrom = IStrategy(_strategyFromAddress);
         IStrategy strategyTo = IStrategy(_strategyToAddress);
 
         for (uint256 i = 0; i < _assets.length; i++) {
             require(strategyTo.supportsAsset(_assets[i]), "Asset unsupported");
-            // Withdraw from Strategy and pass other Strategy as recipient
-            strategyFrom.withdraw(address(strategyTo), _assets[i], _amounts[i]);
+            // Send required amount of funds to the strategy
+            IERC20(_assets[i]).safeTransfer(_strategyToAddress, _amounts[i]);
         }
-        // Tell new Strategy to deposit into protocol
+
+        // Deposit all the funds that have been sent to the strategy
         strategyTo.depositAll();
     }
 
+    /**
+     * @dev Withdraw multiple assets from the strategy to the vault.
+     * @param _strategyFromAddress Address of the Strategy to withdraw assets from.
+     * @param _assets Array of asset address that will be withdrawn from the strategy.
+     * @param _amounts Array of amounts of each corresponding asset to withdraw.
+     */
+    function withdrawFromStrategy(
+        address _strategyFromAddress,
+        address[] calldata _assets,
+        uint256[] calldata _amounts
+    ) external onlyGovernorOrStrategist {
+        _withdrawFromStrategy(
+            address(this),
+            _strategyFromAddress,
+            _assets,
+            _amounts
+        );
+    }
+
+    /**
+     * @param _recipient can either be a strategy or the Vault
+     */
+    function _withdrawFromStrategy(
+        address _recipient,
+        address _strategyFromAddress,
+        address[] calldata _assets,
+        uint256[] calldata _amounts
+    ) internal {
+        require(
+            strategies[_strategyFromAddress].isSupported,
+            "Invalid from Strategy"
+        );
+        require(_assets.length == _amounts.length, "Parameter length mismatch");
+
+        IStrategy strategyFrom = IStrategy(_strategyFromAddress);
+        for (uint256 i = 0; i < _assets.length; i++) {
+            // Withdraw from Strategy to the recipient
+            strategyFrom.withdraw(_recipient, _assets[i], _amounts[i]);
+        }
+    }
+
     /**
      * @dev Sets the maximum allowable difference between
      * total supply and backing assets' value.

contracts/contracts/interfaces/IVault.sol

@@ -0,0 +1,36 @@
+const { deploymentWithProposal } = require("../utils/deploy");
+const addresses = require("../utils/addresses");
+
+module.exports = deploymentWithProposal(
+  { deployName: "048_deposit_withdraw_tooling", forceDeploy: false },
+  async ({
+    assetAddresses,
+    deployWithConfirmation,
+    ethers,
+    getTxOpts,
+    withConfirmation,
+  }) => {
+    const { deployerAddr, governorAddr } = await getNamedAccounts();
+    const sDeployer = await ethers.provider.getSigner(deployerAddr);
+
+    // Current contracts
+    const cVaultProxy = await ethers.getContract("VaultProxy");
+
+    const dVaultAdmin = await deployWithConfirmation("VaultAdmin");
+    const cVault = await ethers.getContractAt("Vault", cVaultProxy.address);
+
+    // Governance Actions
+    // ----------------
+    return {
+      name: "Deploy new withdrawal utils",
+      actions: [
+        // 1. Set VaultAdmin implementation
+        {
+          contract: cVault,
+          signature: "setAdminImpl(address)",
+          args: [dVaultAdmin.address],
+        },
+      ],
+    };
+  }
+);

contracts/contracts/vault/VaultAdmin.sol

@@ -167,6 +167,7 @@ async function defaultFixture() {
     tusd = await ethers.getContractAt(erc20Abi, addresses.mainnet.TUSD);
     usdc = await ethers.getContractAt(erc20Abi, addresses.mainnet.USDC);
     cusdt = await ethers.getContractAt(erc20Abi, addresses.mainnet.cUSDT);
+    cdai = await ethers.getContractAt(erc20Abi, addresses.mainnet.cDAI);
     cusdc = await ethers.getContractAt(erc20Abi, addresses.mainnet.cUSDC);
     comp = await ethers.getContractAt(erc20Abi, addresses.mainnet.COMP);
     crv = await ethers.getContractAt(erc20Abi, addresses.mainnet.CRV);