Merge branch 'master' into DanielVF/ousd-rebasing-migration-tidy

Author: DanielVF

.github/workflows/ousd.yml

@@ -147,68 +147,3 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
           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

Dockerfile

@@ -0,0 +1 @@
+web: yarn run start

Procfile

@@ -27,7 +27,7 @@
 HARVESTER = '0x21fb5812d70b3396880d30e90d9e5c1202266c89'
 DRIPPER = '0x80c898ae5e56f888365e235ceb8cea3eb726cb58'
 VAULT_PROXY_ADDRESS = '0xE75D77B1865Ae93c7eaa3040B038D7aA7BC02F70'
-VAULT_ADMIN_IMPL = '0x8e55b527901bc88206a1ce5c292b2404bcb8f76d'
+VAULT_ADMIN_IMPL = '0x1eF0553FEb80e6f133cAe3092e38F0b23dA6452b'
 VAULT_CORE_IMPL = '0xf00d4b19458c594d4ea9d0b9861edfd2c444fa9a'
 VAULT_VALUE_CHECKER = '0xEEcD72c99749A1FC977704AB900a05e8300F4318'
 OUSD_METASTRAT = '0x89eb88fedc50fc77ae8a18aad1ca0ac27f777a90'

brownie/addresses.py

@@ -0,0 +1 @@
+[{"inputs": [{"internalType": "address[]","name": "proposers","type": "address[]"},{"internalType": "address[]","name": "executors","type": "address[]"}],"stateMutability": "nonpayable","type": "constructor","name": "constructor"},{"anonymous": false,"inputs": [{"indexed": true,"internalType": "bytes32","name": "id","type": "bytes32"},{"indexed": true,"internalType": "uint256","name": "index","type": "uint256"},{"indexed": false,"internalType": "address","name": "target","type": "address"},{"indexed": false,"internalType": "uint256","name": "value","type": "uint256"},{"indexed": false,"internalType": "bytes","name": "data","type": "bytes"}],"name": "CallExecuted","type": "event"},{"anonymous": false,"inputs": [{"indexed": true,"internalType": "bytes32","name": "id","type": "bytes32"},{"indexed": true,"internalType": "uint256","name": "index","type": "uint256"},{"indexed": false,"internalType": "address","name": "target","type": "address"},{"indexed": false,"internalType": "uint256","name": "value","type": "uint256"},{"indexed": false,"internalType": "bytes","name": "data","type": "bytes"},{"indexed": false,"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"indexed": false,"internalType": "uint256","name": "delay","type": "uint256"}],"name": "CallScheduled","type": "event"},{"anonymous": false,"inputs": [{"indexed": true,"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "Cancelled","type": "event"},{"anonymous": false,"inputs": [{"indexed": false,"internalType": "uint256","name": "oldDuration","type": "uint256"},{"indexed": false,"internalType": "uint256","name": "newDuration","type": "uint256"}],"name": "MinDelayChange","type": "event"},{"anonymous": false,"inputs": [{"indexed": true,"internalType": "bytes32","name": "role","type": "bytes32"},{"indexed": true,"internalType": "bytes32","name": "previousAdminRole","type": "bytes32"},{"indexed": true,"internalType": "bytes32","name": "newAdminRole","type": "bytes32"}],"name": "RoleAdminChanged","type": "event"},{"anonymous": false,"inputs": [{"indexed": true,"internalType": "bytes32","name": "role","type": "bytes32"},{"indexed": true,"internalType": "address","name": "account","type": "address"},{"indexed": true,"internalType": "address","name": "sender","type": "address"}],"name": "RoleGranted","type": "event"},{"anonymous": false,"inputs": [{"indexed": true,"internalType": "bytes32","name": "role","type": "bytes32"},{"indexed": true,"internalType": "address","name": "account","type": "address"},{"indexed": true,"internalType": "address","name": "sender","type": "address"}],"name": "RoleRevoked","type": "event"},{"inputs": [],"name": "CANCELLER_ROLE","outputs": [{"internalType": "bytes32","name": "","type": "bytes32"}],"stateMutability": "view","type": "function"},{"inputs": [],"name": "DEFAULT_ADMIN_ROLE","outputs": [{"internalType": "bytes32","name": "","type": "bytes32"}],"stateMutability": "view","type": "function"},{"inputs": [],"name": "EXECUTOR_ROLE","outputs": [{"internalType": "bytes32","name": "","type": "bytes32"}],"stateMutability": "view","type": "function"},{"inputs": [],"name": "PROPOSER_ROLE","outputs": [{"internalType": "bytes32","name": "","type": "bytes32"}],"stateMutability": "view","type": "function"},{"inputs": [],"name": "TIMELOCK_ADMIN_ROLE","outputs": [{"internalType": "bytes32","name": "","type": "bytes32"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "cancel","outputs": [],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "address","name": "target","type": "address"},{"internalType": "uint256","name": "value","type": "uint256"},{"internalType": "bytes","name": "data","type": "bytes"},{"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"internalType": "bytes32","name": "salt","type": "bytes32"}],"name": "execute","outputs": [],"stateMutability": "payable","type": "function"},{"inputs": [{"internalType": "address[]","name": "targets","type": "address[]"},{"internalType": "uint256[]","name": "values","type": "uint256[]"},{"internalType": "bytes[]","name": "payloads","type": "bytes[]"},{"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"internalType": "bytes32","name": "salt","type": "bytes32"}],"name": "executeBatch","outputs": [],"stateMutability": "payable","type": "function"},{"inputs": [],"name": "getMinDelay","outputs": [{"internalType": "uint256","name": "duration","type": "uint256"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "role","type": "bytes32"}],"name": "getRoleAdmin","outputs": [{"internalType": "bytes32","name": "","type": "bytes32"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "getTimestamp","outputs": [{"internalType": "uint256","name": "timestamp","type": "uint256"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "role","type": "bytes32"},{"internalType": "address","name": "account","type": "address"}],"name": "grantRole","outputs": [],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "bytes32","name": "role","type": "bytes32"},{"internalType": "address","name": "account","type": "address"}],"name": "hasRole","outputs": [{"internalType": "bool","name": "","type": "bool"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "address","name": "target","type": "address"},{"internalType": "uint256","name": "value","type": "uint256"},{"internalType": "bytes","name": "data","type": "bytes"},{"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"internalType": "bytes32","name": "salt","type": "bytes32"}],"name": "hashOperation","outputs": [{"internalType": "bytes32","name": "hash","type": "bytes32"}],"stateMutability": "pure","type": "function"},{"inputs": [{"internalType": "address[]","name": "targets","type": "address[]"},{"internalType": "uint256[]","name": "values","type": "uint256[]"},{"internalType": "bytes[]","name": "payloads","type": "bytes[]"},{"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"internalType": "bytes32","name": "salt","type": "bytes32"}],"name": "hashOperationBatch","outputs": [{"internalType": "bytes32","name": "hash","type": "bytes32"}],"stateMutability": "pure","type": "function"},{"inputs": [{"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "isOperation","outputs": [{"internalType": "bool","name": "pending","type": "bool"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "isOperationDone","outputs": [{"internalType": "bool","name": "done","type": "bool"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "isOperationPending","outputs": [{"internalType": "bool","name": "pending","type": "bool"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "bytes32","name": "id","type": "bytes32"}],"name": "isOperationReady","outputs": [{"internalType": "bool","name": "ready","type": "bool"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "address","name": "","type": "address"},{"internalType": "address","name": "","type": "address"},{"internalType": "uint256[]","name": "","type": "uint256[]"},{"internalType": "uint256[]","name": "","type": "uint256[]"},{"internalType": "bytes","name": "","type": "bytes"}],"name": "onERC1155BatchReceived","outputs": [{"internalType": "bytes4","name": "","type": "bytes4"}],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "address","name": "","type": "address"},{"internalType": "address","name": "","type": "address"},{"internalType": "uint256","name": "","type": "uint256"},{"internalType": "uint256","name": "","type": "uint256"},{"internalType": "bytes","name": "","type": "bytes"}],"name": "onERC1155Received","outputs": [{"internalType": "bytes4","name": "","type": "bytes4"}],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "address","name": "","type": "address"},{"internalType": "address","name": "","type": "address"},{"internalType": "uint256","name": "","type": "uint256"},{"internalType": "bytes","name": "","type": "bytes"}],"name": "onERC721Received","outputs": [{"internalType": "bytes4","name": "","type": "bytes4"}],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "bytes32","name": "role","type": "bytes32"},{"internalType": "address","name": "account","type": "address"}],"name": "renounceRole","outputs": [],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "bytes32","name": "role","type": "bytes32"},{"internalType": "address","name": "account","type": "address"}],"name": "revokeRole","outputs": [],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "address","name": "target","type": "address"},{"internalType": "uint256","name": "value","type": "uint256"},{"internalType": "bytes","name": "data","type": "bytes"},{"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"internalType": "bytes32","name": "salt","type": "bytes32"},{"internalType": "uint256","name": "delay","type": "uint256"}],"name": "schedule","outputs": [],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "address[]","name": "targets","type": "address[]"},{"internalType": "uint256[]","name": "values","type": "uint256[]"},{"internalType": "bytes[]","name": "payloads","type": "bytes[]"},{"internalType": "bytes32","name": "predecessor","type": "bytes32"},{"internalType": "bytes32","name": "salt","type": "bytes32"},{"internalType": "uint256","name": "delay","type": "uint256"}],"name": "scheduleBatch","outputs": [],"stateMutability": "nonpayable","type": "function"},{"inputs": [{"internalType": "bytes4","name": "interfaceId","type": "bytes4"}],"name": "supportsInterface","outputs": [{"internalType": "bool","name": "","type": "bool"}],"stateMutability": "view","type": "function"},{"inputs": [{"internalType": "uint256","name": "newDelay","type": "uint256"}],"name": "updateDelay","outputs": [],"stateMutability": "nonpayable","type": "function"},{"stateMutability": "payable","type": "receive"}]

cloudbuild-staging.yaml

@@ -1,8 +1,13 @@
-const { deploymentWithProposal } = require("../utils/deploy");
+const { deploymentWithGovernanceProposal } = require("../utils/deploy");
 const addresses = require("../utils/addresses");
+const { isMainnet } = require("../test/helpers.js");
 
-module.exports = deploymentWithProposal(
-  { deployName: "048_deposit_withdraw_tooling", forceDeploy: false },
+module.exports = deploymentWithGovernanceProposal(
+  {
+    deployName: "048_deposit_withdraw_tooling",
+    forceDeploy: false,
+    //proposalId: "40434364243407050666554191388123037800510237271029051418887027936281231737485"
+  },
   async ({
     assetAddresses,
     deployWithConfirmation,
@@ -12,13 +17,17 @@ module.exports = deploymentWithProposal(
   }) => {
     const { deployerAddr, governorAddr } = await getNamedAccounts();
     const sDeployer = await ethers.provider.getSigner(deployerAddr);
+    let dVaultAdmin;
 
     // Current contracts
     const cVaultProxy = await ethers.getContract("VaultProxy");
-
-    const dVaultAdmin = await deployWithConfirmation("VaultAdmin");
     const cVault = await ethers.getContractAt("Vault", cVaultProxy.address);
 
+    // has already been ran on the mainnet and deployed to: 0x1eF0553FEb80e6f133cAe3092e38F0b23dA6452b
+    if (!isMainnet) {
+      dVaultAdmin = await deployWithConfirmation("VaultAdmin");
+    }
+
     // Governance Actions
     // ----------------
     return {
@@ -28,7 +37,12 @@ module.exports = deploymentWithProposal(
         {
           contract: cVault,
           signature: "setAdminImpl(address)",
-          args: [dVaultAdmin.address],
+          // the implementation has already been ran on the mainnet and deployed to below address
+          args: [
+            isMainnet
+              ? "0x1eF0553FEb80e6f133cAe3092e38F0b23dA6452b"
+              : dVaultAdmin.address,
+          ],
         },
       ],
     };

cloudbuild.yaml

@@ -42,5 +42,6 @@
   "044_morpho_strategy": 1668204653,
   "045_convex_lusd_meta_strategy": 1671543402,
   "046_vault_value_checker": 1669212530,
-  "047_morpho_aave_strategy": 1672817148
+  "047_morpho_aave_strategy": 1672817148,
+  "048_deposit_withdraw_tooling": 1675100084
 }