OETH DApp (Rebranded)

.github/workflows/defi.yml

@@ -156,6 +156,25 @@ jobs:
       - run: yarn prettier:check
         working-directory: ./dapp
 
+  dapp-oeth-lint:
+    name: "OETH DApp Linter"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "16.x"
+          cache: "yarn"
+          cache-dependency-path: dapp-oeth/yarn.lock
+
+      - run: yarn install --frozen-lockfile
+        working-directory: ./dapp-oeth
+
+      - run: yarn prettier:check
+        working-directory: ./dapp-oeth
+
   slither:
     name: "Slither"
     # As long as we need Python 3.6 here in the test, we can only use up to Ubuntu 20.

brownie/addresses.py

@@ -68,4 +68,17 @@
 OUSD_USDT = '0xcc01d9d54d06b6a0b6d09a9f79c3a6438e505f71'
 
 OUSD_3CRVF_POOL = '0x87650D7bbfC3A9F10587d7778206671719d9910D'
-CVX_REWARDS_POOL = '0x7D536a737C13561e0D2Decf1152a653B4e615158'
+CVX_REWARDS_POOL = '0x7D536a737C13561e0D2Decf1152a653B4e615158'
+
+#
+OETH = "0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3"
+OETH_ZAPPER = "0x9858e47BCbBe6fBAC040519B02d7cd4B2C470C66"
+
+WETH = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
+FRXETH = "0x5e8422345238f34275888049021821e8e08caa1f"
+SFRXETH = "0xac3e018457b222d93114458476f3e3416abbe38f"
+RETH = "0xae78736cd615f374d3085123a210448e74fc6393"
+STETH = "0xae7ab96520de3a18e5e111b5eaab095312d7fe84"
+
+OETH_VAULT = "0x39254033945aa2e4809cc2977e7087bee48bd7ab"
+FRAX_ETH_STRATEGY = "0x3ff8654d633d4ea0fae24c52aec73b4a20d0d0e5"

brownie/world.py

@@ -70,6 +70,16 @@ def load_contract(name, address):
 governor_five = load_contract('governor_five', GOVERNOR_FIVE)
 rewards_source = load_contract('rewards_source', REWARDS_SOURCE)
 
+
+oeth = load_contract('ERC20', OETH)
+weth = load_contract('ERC20', WETH)
+reth = load_contract('ERC20', RETH)
+steth = load_contract('ERC20', STETH)
+frxeth = load_contract('ERC20', FRXETH)
+sfrxeth = load_contract('ERC20', SFRXETH)
+oeth_vault_admin = load_contract('vault_admin', OETH_VAULT)
+oeth_vault_core = load_contract('vault_core', OETH_VAULT)
+
 CONTRACT_ADDRESSES = {}
 CONTRACT_ADDRESSES[VAULT_PROXY_ADDRESS.lower()] = {'name': 'Vault'}
 CONTRACT_ADDRESSES[HARVESTER.lower()] = {'name': 'Harvester'}
@@ -124,6 +134,14 @@ def show_transfers(tx):
 def unlock(address):
     brownie.network.web3.provider.make_request('hardhat_impersonateAccount', [address])
 
+def fund_eth(address, balance):
+    brownie.network.web3.provider.make_request('hardhat_setBalance', [address, balance])
+
+
+
+def mine_block():
+    brownie.network.web3.provider.make_request('evm_mine', [])
+
 def leading_whitespace(s, desired = 16):
     return ' ' * (desired-len(s)) + s
 

contracts/node.sh

@@ -6,8 +6,15 @@ nodeWaitTimeout=1200
 RED='\033[0;31m'
 NO_COLOR='\033[0m'
 
+
 main()
 {   
+    NETWORK_FILE="../dapp/network.json"
+
+    if [[ $APP_ID == "oeth-dapp" ]]; then
+      NETWORK_FILE="../dapp-oeth/network.json";
+    fi
+
     rm -rf deployments/localhost
     if  [[ $1 == "fork" ]]
     then
@@ -34,7 +41,7 @@ main()
 
         nodeOutput=$(mktemp "${TMPDIR:-/tmp/}$(basename 0).XXX")
         # the --no-install is here so npx doesn't download some package on its own if it can not find one in the repo
-        FORK=true npx --no-install hardhat node --no-reset --export '../dapp/network.json' ${params[@]} > $nodeOutput 2>&1 &
+        FORK=true npx --no-install hardhat node --no-reset --export ${NETWORK_FILE} ${params[@]} > $nodeOutput 2>&1 &
 
         tail -f $nodeOutput &
 
@@ -63,7 +70,7 @@ main()
 
 
     else
-        npx --no-install hardhat node --export '../dapp/network.json'
+        npx --no-install hardhat node --export ${NETWORK_FILE}
     fi
 }
 

contracts/package.json

@@ -6,6 +6,8 @@
   "scripts": {
     "deploy": "(npx hardhat deploy --export '../dapp/network.json') && yarn run copy-interface-artifacts",
     "deploy:mainnet": "(npx hardhat deploy --network mainnet --verbose --export '../dapp/network.mainnet.json') && yarn run copy-interface-artifacts",
+    "deploy:oeth": "(npx hardhat deploy --export '../dapp-oeth/network.json') && yarn run copy-interface-artifacts:oeth",
+    "deploy:oeth:mainnet": "(npx hardhat deploy --network mainnet --verbose --export '../dapp-oeth/network.mainnet.json') && yarn run copy-interface-artifacts",
     "node": "yarn run node:fork",
     "node:fork": "./node.sh fork",
     "lint": "yarn run lint:js && yarn run lint:sol",
@@ -19,7 +21,8 @@
     "test:fork": "./fork-test.sh",
     "test:fork:w_trace": "./fork-test.sh --trace",
     "fund": "FORK=true npx hardhat fund --network localhost",
-    "copy-interface-artifacts": "mkdir -p ../dapp/abis && cp artifacts/contracts/interfaces/IVault.sol/IVault.json ../dapp/abis/IVault.json && cp artifacts/contracts/liquidity/LiquidityReward.sol/LiquidityReward.json ../dapp/abis/LiquidityReward.json && cp artifacts/contracts/interfaces/uniswap/IUniswapV2Pair.sol/IUniswapV2Pair.json ../dapp/abis/IUniswapV2Pair.json && cp artifacts/contracts/staking/SingleAssetStaking.sol/SingleAssetStaking.json ../dapp/abis/SingleAssetStaking.json && cp artifacts/contracts/compensation/CompensationClaims.sol/CompensationClaims.json ../dapp/abis/CompensationClaims.json && cp artifacts/contracts/flipper/Flipper.sol/Flipper.json ../dapp/abis/Flipper.json && cp artifacts/contracts/flipper/Flipper.sol/Flipper.json ../dapp/abis/Flipper.json",
+    "copy-interface-artifacts": "mkdir -p ../dapp/abis && cp artifacts/contracts/interfaces/IVault.sol/IVault.json ../dapp/abis/IVault.json && cp artifacts/contracts/liquidity/LiquidityReward.sol/LiquidityReward.json ../dapp/abis/LiquidityReward.json && cp artifacts/contracts/interfaces/uniswap/IUniswapV2Pair.sol/IUniswapV2Pair.json ../dapp/abis/IUniswapV2Pair.json && cp artifacts/contracts/staking/SingleAssetStaking.sol/SingleAssetStaking.json ../dapp/abis/SingleAssetStaking.json && cp artifacts/contracts/compensation/CompensationClaims.sol/CompensationClaims.json ../dapp/abis/CompensationClaims.json && cp artifacts/contracts/flipper/Flipper.sol/Flipper.json ../dapp/abis/Flipper.json",
+    "copy-interface-artifacts:oeth": "mkdir -p ../dapp-oeth/abis && cp artifacts/contracts/interfaces/IVault.sol/IVault.json ../dapp-oeth/abis/IVault.json && cp artifacts/contracts/liquidity/LiquidityReward.sol/LiquidityReward.json ../dapp-oeth/abis/LiquidityReward.json && cp artifacts/contracts/interfaces/uniswap/IUniswapV2Pair.sol/IUniswapV2Pair.json ../dapp-oeth/abis/IUniswapV2Pair.json && cp artifacts/contracts/staking/SingleAssetStaking.sol/SingleAssetStaking.json ../dapp-oeth/abis/SingleAssetStaking.json && cp artifacts/contracts/compensation/CompensationClaims.sol/CompensationClaims.json ../dapp-oeth/abis/CompensationClaims.json && cp artifacts/contracts/vault/OETHZapper.sol/OETHZapper.json ../dapp-oeth/abis/OETHZapper.json",
     "echidna": "yarn run clean && echidna-test . --contract PropertiesOUSDTransferable --config contracts/crytic/TestOUSDTransferable.yaml",
     "compute-merkle-proofs-local": "HARDHAT_NETWORK=localhost node scripts/staking/airDrop.js reimbursements.csv scripts/staking/merkleProofedAccountsToBeCompensated.json && cp scripts/staking/merkleProofedAccountsToBeCompensated.json ../dapp/src/constants/merkleProofedAccountsToBeCompensated.json",
     "compute-merkle-proofs-mainnet": "HARDHAT_NETWORK=mainnet node scripts/staking/airDrop.js reimbursements.csv scripts/staking/merkleProofedAccountsToBeCompensated.json && cp scripts/staking/merkleProofedAccountsToBeCompensated.json ../dapp/src/constants/merkleProofedAccountsToBeCompensated.json",

contracts/utils/addresses.js

@@ -152,6 +152,9 @@ addresses.mainnet.OldTimelock = "0x72426BA137DEC62657306b12B1E869d43FeC6eC7";
 // OETH
 addresses.mainnet.OETHProxy = "0x856c4Efb76C1D1AE02e20CEB03A2A6a08b0b8dC3";
 addresses.mainnet.WOETHProxy = "0xDcEe70654261AF21C44c093C300eD3Bb97b78192";
+addresses.mainnet.OETHVaultProxy = "0x39254033945aa2e4809cc2977e7087bee48bd7ab";
+addresses.mainnet.OETHZapper = "0x9858e47BCbBe6fBAC040519B02d7cd4B2C470C66"
+addresses.mainnet.FraxETHStrategy = "0x3ff8654d633d4ea0fae24c52aec73b4a20d0d0e5"
 
 // Tokens
 addresses.mainnet.sfrxETH = "0xac3E018457B222d93114458476f3E3416Abbe38F";

dapp-oeth/.enum_manifest.json

@@ -0,0 +1 @@
+{}

dapp-oeth/.gitignore

@@ -0,0 +1,59 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+local.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+prod.env
+staging.env
+deploy.env
+
+# vercel
+.vercel
+public/fonts
+
+abis/*
+!abis/IERC20.json
+!abis/UniswapV3Pool.json
+!abis/UniswapV3NonfungiblePositionManager.json
+!abis/UniswapV3SwapRouter.json
+!abis/UniswapV3Quoter.json
+!abis/ChainlinkAggregatorV3Interface.json
+!abis/CurveAddressProvider.json
+!abis/CurveRegistry.json
+!abis/CurveRegistryExchange.json
+!abis/UniswapV2Router.json
+!abis/UniswapV3Factory.json
+!abis/WOUSD.json
+!abis/OETHZapper.json
+
+# if you use npm instead of yarn do not commit the lock file to git because it can break the Google App Engine build
+package-lock.json
+
+.env