feat: univ3 unhedged #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

fp-crypto wants to merge 48 commits into master from fp-univ3

.github/workflows/lint.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,16 +3,15 @@ name: Lint
  
    on:

      push:

        branches:

        - master

        - develop

          - master

          - develop

      pull_request:

    jobs:

      solidity:

        runs-on: ubuntu-latest

        solidity:

          runs-on: ubuntu-latest

          steps:

        steps:

          - name: Check out github repository

            uses: actions/checkout@v2

            with:

    @@ -21,7 +20,7 @@ jobs:
  
          - name: Setup node.js

            uses: actions/setup-node@v1

            with:

              node-version: '12.x'

              node-version: "12.x"

          - name: Set yarn cache directory path

            id: yarn-cache-dir-path

    @@ -44,10 +43,10 @@ jobs:
  
          - name: Run linter on *.sol and *.json

            run: yarn lint:check

        commits:

          runs-on: ubuntu-latest

      commits:

        runs-on: ubuntu-latest

          steps:

        steps:

          - name: Check out github repository

            uses: actions/checkout@v2

            with:

    @@ -56,10 +55,10 @@ jobs:
  
          - name: Run commitlint

            uses: wagoid/commitlint-github-action@v2

        brownie:

          runs-on: ubuntu-latest

      brownie:

        runs-on: ubuntu-latest

          steps:

        steps:

          - name: Check out github repository

            uses: actions/checkout@v2

            with:

    @@ -73,7 +72,7 @@ jobs:
  
          - name: Set pip cache directory path

            id: pip-cache-dir-path

            run: |

                echo "::set-output name=dir::$(pip cache dir)"

              echo "::set-output name=dir::$(pip cache dir)"

          - name: Restore pip cache

            uses: actions/cache@v2

    @@ -91,5 +90,4 @@ jobs:
  
          - name: Run black

            run: black --check --include "(tests|scripts)" .

    # TODO: Add Slither Static Analyzer

.github/workflows/test.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,66 +3,66 @@ name: Test
  
    on:

      push:

        branches:

        - master

        - develop

          - master

          - develop

      pull_request:

    jobs:

      test:

        runs-on: ubuntu-latest

        steps:

        - uses: actions/checkout@v1

          - uses: actions/checkout@v1

        - name: Cache compiler installations

          uses: actions/cache@v2

          with:

            path: |

              ~/.solcx

              ~/.vvm

            key: ${{ runner.os }}-compiler-cache

          - name: Cache compiler installations

            uses: actions/cache@v2

            with:

              path: |

                ~/.solcx

                ~/.vvm

              key: ${{ runner.os }}-compiler-cache

        - name: Setup node.js

          uses: actions/setup-node@v1

          with:

            node-version: '12.x'

          - name: Setup node.js

            uses: actions/setup-node@v1

            with:

              node-version: "12.x"

        - name: Install ganache

          run: npm install -g ganache-cli@6.12.1

          - name: Install ganache

            run: npm install -g ganache-cli@6.12.1

        - name: Set up python 3.8

          uses: actions/setup-python@v2

          with:

            python-version: 3.8

          - name: Set up python 3.8

            uses: actions/setup-python@v2

            with:

              python-version: 3.8

        - name: Set pip cache directory path

          id: pip-cache-dir-path

          run: |

            echo "::set-output name=dir::$(pip cache dir)"

          - name: Set pip cache directory path

            id: pip-cache-dir-path

            run: |

              echo "::set-output name=dir::$(pip cache dir)"

        - name: Restore pip cache

          uses: actions/cache@v2

          id: pip-cache

          with:

            path: |

              ${{ steps.pip-cache-dir-path.outputs.dir }}

            key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}

            restore-keys: |

              ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}

              ${{ runner.os }}-pip-

          - name: Restore pip cache

            uses: actions/cache@v2

            id: pip-cache

            with:

              path: |

                ${{ steps.pip-cache-dir-path.outputs.dir }}

              key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}

              restore-keys: |

                ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}

                ${{ runner.os }}-pip-

        - name: Install python dependencies

          run: pip install -r requirements-dev.txt

          - name: Install python dependencies

            run: pip install -r requirements-dev.txt

        - name: Compile Code

          run: brownie compile --size

          - name: Compile Code

            run: brownie compile --size

        - name: Run Tests

          env:

            ETHERSCAN_TOKEN: MW5CQA6QK5YMJXP2WP3RA36HM5A7RA1IHA

            WEB3_INFURA_PROJECT_ID: b7821200399e4be2b4e5dbdf06fbe85b

          run: |

            brownie test tests/test_migration.py --network ftm-main-fork

            brownie test tests/test_operation.py --network ftm-main-fork

            brownie test tests/test_loss.py --network ftm-main-fork

            brownie test tests/test_joint_migration2.py --network ftm-main-fork

          - name: Run Tests

            env:

              ETHERSCAN_TOKEN: MW5CQA6QK5YMJXP2WP3RA36HM5A7RA1IHA

              WEB3_INFURA_PROJECT_ID: b7821200399e4be2b4e5dbdf06fbe85b

            run: |

              brownie test tests/test_migration.py --network ftm-main-fork

              brownie test tests/test_operation.py --network ftm-main-fork

              brownie test tests/test_loss.py --network ftm-main-fork

              brownie test tests/test_joint_migration2.py --network ftm-main-fork

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,10 @@ node_modules/ @@
     # Hardhat
     cache
+    scripts/live_tc.py
+    scripts/find_pid.py
+    bin/
+    lib/
+    flattened*
+    pyvenv*

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,6 @@
  
    Read more at

    https://hackmd.io/rbPUCp47Sl2dSht6VTaiLg?both

    ## What you'll find here

    - Basic Solidity Smart Contract for creating your own Yearn Strategy ([`contracts/Strategy.sol`](contracts/Strategy.sol))

    @@ -96,14 +95,14 @@ Transaction sent: 0xa70b90eb9a9899e8f6e709c53a436976315b4279c4b6797d0a293e169f94
  
    [`contracts/Strategy.sol`](contracts/Strategy.sol) is where you implement your own logic for your strategy. In particular:

    * Create a descriptive name for your strategy via `Strategy.name()`.

    * Invest your want tokens via `Strategy.adjustPosition()`.

    * Take profits and report losses via `Strategy.prepareReturn()`.

    * Unwind enough of your position to payback withdrawals via `Strategy.liquidatePosition()`.

    * Unwind all of your positions via `Strategy.exitPosition()`.

    * Fill in a way to estimate the total `want` tokens managed by the strategy via `Strategy.estimatedTotalAssets()`.

    * Migrate all the positions managed by your strategy via `Strategy.prepareMigration()`.

    * Make a list of all position tokens that should be protected against movements via `Strategy.protectedTokens()`.

    - Create a descriptive name for your strategy via `Strategy.name()`.

    - Invest your want tokens via `Strategy.adjustPosition()`.

    - Take profits and report losses via `Strategy.prepareReturn()`.

    - Unwind enough of your position to payback withdrawals via `Strategy.liquidatePosition()`.

    - Unwind all of your positions via `Strategy.exitPosition()`.

    - Fill in a way to estimate the total `want` tokens managed by the strategy via `Strategy.estimatedTotalAssets()`.

    - Migrate all the positions managed by your strategy via `Strategy.prepareMigration()`.

    - Make a list of all position tokens that should be protected against movements via `Strategy.protectedTokens()`.

    ## Testing

brownie-config.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,16 +8,18 @@ autofetch_sources: True @@
     # require OpenZepplin Contracts
     dependencies:
-      - iearn-finance/yearn-vaults@0.4.3
-      - OpenZeppelin/openzeppelin-contracts@3.1.0
+      - storming0x/yearn-vaults@0.4.3-sol8
+      - OpenZeppelin/openzeppelin-contracts@4.4.1
+      - 16slim/v3-core@1.0.2-solc-0.8-simulate
     # path remapping to support imports from GitHub/NPM
     compiler:
       solc:
-        version: 0.6.12
+        version: 0.8.12
         remappings:
-          - "@yearnvaults=iearn-finance/yearn-vaults@0.4.3"
-          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@3.1.0"
+          - "@yearnvaults=storming0x/yearn-vaults@0.4.3-sol8"
+          - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.4.1"
+          - "@uniswap=16slim/v3-core@1.0.2-solc-0.8-simulate"
     reports:
       exclude_contracts:
@@ Expand Down @@

commitlint.config.js

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = {extends: ["@commitlint/config-conventional"]};
		module.exports = { extends: ["@commitlint/config-conventional"] };

contracts/AggregatorMock.sol

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    pragma solidity 0.6.12;
+    pragma solidity 0.8.12;
     contract AggregatorMock {
         int256 public price;
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: univ3 unhedged #28

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

feat: univ3 unhedged #28

Are you sure you want to change the base?

Uh oh!

feat: univ3 unhedged #28

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!