Code

Convex frxETH/WETH strategy#1846

Code

Closed

naddison36 wants to merge 159 commits intomasterOriginProtocol/origin-dollar:masterfrom nicka/convex-frxeth-weth-libsOriginProtocol/origin-dollar:nicka/convex-frxeth-weth-libsCopy head branch name to clipboard

+3,800-791

Commits

Commits on Sep 26, 2023

• Removed external initialize function from InitializableAbstractStrategy

  Show description for c9dfea2
  naddison36

  committed
  c9dfea2

  Copy full SHA for c9dfea2

• Merge remote-tracking branch 'origin/master' into nicka/strategy-initialize

  naddison36

  committed
  9f6fc66

  Copy full SHA for 9f6fc66

Commits on Sep 27, 2023

• Deploy script to upgrade frxETH strategy

  naddison36

  committed
  79af137

  Copy full SHA for 79af137

• Added explicit _initialize calls

  naddison36

  committed
  0fb53a1

  Copy full SHA for 0fb53a1

Commits on Sep 28, 2023

• Proxy initialize gas saving by using calldata instead of memory

  naddison36

  committed
  f993691

  Copy full SHA for f993691

• BaseCurveStrategy using CURVE_BASE_ASSETS constant for the number of assets

  naddison36

  committed
  b7de7df

  Copy full SHA for b7de7df

• Added new ConvexTwoAssetStrategy contract

  naddison36

  committed
  fbd6202

  Copy full SHA for fbd6202

• Added frxETH/WETH Curve strategy

  naddison36

  committed
  c9a919e

  Copy full SHA for c9a919e

• Add more frxETH/WETH fork tests

  naddison36

  committed
  a08b894

  Copy full SHA for a08b894

• remove liquidity from Curve pool directly to the recipient

  naddison36

  committed
  0c1abf8

  Copy full SHA for 0c1abf8

• prettier

  naddison36

  committed
  c646b8e

  Copy full SHA for c646b8e

• BaseCurveStrategy make to work with Curve pools with 2 or 3 coins

  Show description for 71c2269
  naddison36

  committed
  71c2269

  Copy full SHA for 71c2269

Commits on Sep 29, 2023

• Gas improvements to BaseCurveStrategy

  naddison36

  committed
  43e36b3

  Copy full SHA for 43e36b3

• More BaseCurve and ConvexStrategy cleanup

  naddison36

  committed
  f8c1f00

  Copy full SHA for f8c1f00

Commits on Oct 3, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-minimal

  naddison36

  committed
  51f9c41

  Copy full SHA for 51f9c41

• Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-minimal' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  9acb342

  Copy full SHA for 9acb342

• convexFrxEthFixture can mint when frxETH below peg

  naddison36

  committed
  44f119c

  Copy full SHA for 44f119c

• Fix OETH AMO fork tests now there is more ETH and OETH in the pool

  naddison36

  committed
  4c909e7

  Copy full SHA for 4c909e7

• minor fix to comment

  naddison36

  committed
  fbf8af5

  Copy full SHA for fbf8af5

• Add ConvexStrategy diagrams

  naddison36

  committed
  73b4381

  Copy full SHA for 73b4381

• fix OUSD collateral swaps

  naddison36

  committed
  1eb1537

  Copy full SHA for 1eb1537

• Added governable behaviours to strategy unit tests

  naddison36

  committed
  63d119a

  Copy full SHA for 63d119a

• Merge remote-tracking branch 'origin/nicka/frax-strategy-upgrade' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  89db87f

  Copy full SHA for 89db87f

• fix OUSD AMO fork test

  naddison36

  committed
  4eca852

  Copy full SHA for 4eca852

• Added harvestable behaviour tests

  naddison36

  committed
  08614ec

  Copy full SHA for 08614ec

• wip strategy behaviour tests

  naddison36

  committed
  ad23493

  Copy full SHA for ad23493

• Add .VSCodeCounter to gitignore

  naddison36

  committed
  65d36ef

  Copy full SHA for 65d36ef

• refactor harvester behaviour

  naddison36

  committed
  ff76bed

  Copy full SHA for ff76bed

Commits on Oct 4, 2023

• Got strategy withdraw tests working with Curve and Convex mocks

  naddison36

  committed
  4cfb6de

  Copy full SHA for 4cfb6de

• Fix lint errors in mock

  naddison36

  committed
  c80fa80

  Copy full SHA for c80fa80

• fix collateral swap fork tests

  naddison36

  committed
  0581e42

  Copy full SHA for 0581e42

• Updated strategy behaviour tests

  naddison36

  committed
  05fc952

  Copy full SHA for 05fc952

• Added Withdrawal event to AaveStrategy in withdrawAll

  naddison36

  committed
  d982f8a

  Copy full SHA for d982f8a

• added mint and burn of shares to MocksfrxETH

  Show description for d27ce2a
  naddison36

  committed
  d27ce2a

  Copy full SHA for d27ce2a

• remove Balancer MEV tests for now

  naddison36

  committed
  c940048

  Copy full SHA for c940048

Commits on Oct 5, 2023

• Added Convex frxETH/WETH strategy unit tests

  Show description for d4321cd
  naddison36

  committed
  d4321cd

  Copy full SHA for d4321cd

• Removed unused imports from Harvester contracts

  naddison36

  committed
  7f0f22e

  Copy full SHA for 7f0f22e

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  e9178d7

  Copy full SHA for e9178d7

• Test removePToken can't be called on convexFrxEthWethStrategy

  naddison36

  committed
  0d673d0

  Copy full SHA for 0d673d0

• Restored the Balancer MEV test after merge from master

  naddison36

  committed
  3b9267b

  Copy full SHA for 3b9267b

• fix HarvesterAddressesUpdated event

  Show description for 6733fb3
  naddison36

  committed
  6733fb3

  Copy full SHA for 6733fb3

• Fix convexFrxEthFixture

  naddison36

  committed
  8f221dc

  Copy full SHA for 8f221dc

• avoid zero transfers on BaseCurveStrategy.withdrawAll

  Show description for 5d30578
  naddison36

  committed
  5d30578

  Copy full SHA for 5d30578

• Merge branch 'master' into nicka/convex-frxeth-weth-libs

  shahthepro

  committed
  d2825df

  Copy full SHA for d2825df

• Fix withdraw on MocksfrxETH

  naddison36

  committed
  7f5c5c6

  Copy full SHA for 7f5c5c6

• Merge remote-tracking branch 'origin/nicka/convex-frxeth-weth-libs' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  4b64655

  Copy full SHA for 4b64655

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  602135d

  Copy full SHA for 602135d

• Update MocksfrxETH to match master

  naddison36

  committed
  ff970d0

  Copy full SHA for ff970d0

Commits on Oct 6, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  d84b34a

  Copy full SHA for d84b34a

• Updated OETH contract diagram

  naddison36

  committed
  8388190

  Copy full SHA for 8388190

• Added frxETH and WETH deposits to frxETH/WETH strategy to value flow diagram

  naddison36

  committed
  9dd4483

  Copy full SHA for 9dd4483

• Added more access tests to strategy behaviour tests

  naddison36

  committed
  6ee16f1

  Copy full SHA for 6ee16f1

• initialize contracts via proxy directly to governor instead of transferring governance

  naddison36

  committed
  0bf6118

  Copy full SHA for 0bf6118

• fix js linter

  naddison36

  committed
  73d6720

  Copy full SHA for 73d6720

• Prevent setPTokenAddress being called for Curve strategies

  naddison36

  committed
  480a974

  Copy full SHA for 480a974

• Fix assignment of 3rd coin's decimals in BaseCurveStrategy

  naddison36

  committed
  1d9defe

  Copy full SHA for 1d9defe

• Updated ConvexStrategy document

  naddison36

  committed
  ec36684

  Copy full SHA for ec36684

Commits on Oct 7, 2023

• Fix maths execution order in Matapool mock

  naddison36

  committed
  10b72ef

  Copy full SHA for 10b72ef

• Simplify the virtual price in the Curve mocks

  naddison36

  committed
  7543067

  Copy full SHA for 7543067

Commits on Oct 11, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  bb37a8c

  Copy full SHA for bb37a8c

Commits on Oct 16, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  dd0d1ec

  Copy full SHA for dd0d1ec

• Fix OETH AMO fork tests now there is less invested

  naddison36

  committed
  21e850c

  Copy full SHA for 21e850c

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  1e9a1cb

  Copy full SHA for 1e9a1cb

Commits on Oct 17, 2023

• Removed unused imports from Harvester contracts

  naddison36

  committed
  491db5c

  Copy full SHA for 491db5c

• Fixes to Convex mock contracts

  naddison36

  committed
  3170b25

  Copy full SHA for 3170b25

• Fix withdraw on sfrxETH mock contract

  naddison36

  committed
  a24477d

  Copy full SHA for a24477d

• Fixes to Curve mock contracts

  naddison36

  committed
  1a8e0bc

  Copy full SHA for 1a8e0bc

• Added Withdrawal event to Aave and Compound withdrawAll

  naddison36

  committed
  95e9529

  Copy full SHA for 95e9529

• Generalized4626Strategy to not emit Withdrawal event when no assets withdrawn

  naddison36

  committed
  a7ef9da

  Copy full SHA for a7ef9da

• Fix HarvesterAddressesUpdated event in setHarvesterAddress

  naddison36

  committed
  6e62bef

  Copy full SHA for 6e62bef

• Added IERC20Metadata which is used by the resolveAsset function

  naddison36

  committed
  c2874bb

  Copy full SHA for c2874bb

• Moved replacing of WETH contract to 000_mock

  Show description for d6391ca
  naddison36

  committed
  d6391ca

  Copy full SHA for d6391ca

• Minor layout and comment changes

  naddison36

  committed
  1747aa7

  Copy full SHA for 1747aa7

• Added behaviour tests

  naddison36

  committed
  0d1d545

  Copy full SHA for 0d1d545

• fix linter

  naddison36

  committed
  bb65e29

  Copy full SHA for bb65e29

• Fix collateral swap fork tests

  naddison36

  committed
  a03c762

  Copy full SHA for a03c762

• Updated code comments

  naddison36

  committed
  7c6bfee

  Copy full SHA for 7c6bfee

• Fix collateral swap fork tests

  naddison36

  committed
  034be4b

  Copy full SHA for 034be4b

• Updated behaviour tests

  naddison36

  committed
  a104dfa

  Copy full SHA for a104dfa

• fix collateral swaps to USDT

  naddison36

  committed
  e10e0d4

  Copy full SHA for e10e0d4

• frxETH strategy behaviour tests now includes weth

  naddison36

  committed
  104c707

  Copy full SHA for 104c707

Commits on Oct 18, 2023

• Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

  naddison36

  committed
  c29556d

  Copy full SHA for c29556d

• Fixed merge issues

  Show description for 9d5c77c
  naddison36

  committed
  9d5c77c

  Copy full SHA for 9d5c77c

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  e0f4d1a

  Copy full SHA for e0f4d1a

• Move calc of Curve LP tokens to Curve library (#1863)

  Show description for 2eeb240
  naddison36

  authored
  2eeb240

  Copy full SHA for 2eeb240

Commits on Oct 23, 2023

• Convex frxETH/WETH Strategy - Hot Fix 01 (#1878)

  Show description for 9111479
  

  3 peopleauthored
  9111479

  Copy full SHA for 9111479

• Convex frxETH/WETH Strategy - OZ L-01 (#1880)

  Show description for 57c7a9d
  naddison36

  authored
  57c7a9d

  Copy full SHA for 57c7a9d

• Convex frxETH/WETH Strategy - OZ L-02 (#1881)

  Show description for 11958ac
  naddison36

  authored
  11958ac

  Copy full SHA for 11958ac

• Update BaseCurveStrategy._getAsset Natspec

  naddison36

  committed
  ab23368

  Copy full SHA for ab23368

• Update ConvexStrategy Natspec

  naddison36

  committed
  93e1711

  Copy full SHA for 93e1711

• Convex frxETH/WETH Strategy - OZ L-03 (#1882)

  Show description for f154127
  naddison36

  authored
  f154127

  Copy full SHA for f154127

• Improved gas and precision of BaseCurveStrategy.depositAll (#1883)

  naddison36

  authored
  b338bc6

  Copy full SHA for b338bc6

• Convex frxETH/WETH Strategy - OZ N-02 (#1884)

  Show description for f7f0cf8
  naddison36

  authored
  f7f0cf8

  Copy full SHA for f7f0cf8

• Improve documentation (#1885)

  naddison36

  authored
  2857498

  Copy full SHA for 2857498

• Added Natspec for CURVE_POOL and CURVE_LP_TOKEN in BaseCurveStrategy (#1886)

  naddison36

  authored
  ffad007

  Copy full SHA for ffad007

• Convex frxETH/WETH Strategy - N-03 (#1887)

  Show description for 4f8d6aa
  naddison36

  authored
  4f8d6aa

  Copy full SHA for 4f8d6aa

• Added Natspec for ConvexStrategy._approveBase() (#1888)

  naddison36

  authored
  10558c6

  Copy full SHA for 10558c6

Commits on Oct 24, 2023

• Simplified ConvexStrategy constructor by getting cvxRewardStaker from the Convex Booster (#1893)

  naddison36

  authored
  2fd1578

  Copy full SHA for 2fd1578

Commits on Oct 25, 2023

• Prevent transferring of supported assets from strategies (#1869)

  Show description for aa546e7
  

  3 peopleauthored
  aa546e7

  Copy full SHA for aa546e7

• Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

  naddison36

  committed
  c24cc5c

  Copy full SHA for c24cc5c

• Increased coverage of behaviour tests

  naddison36

  committed
  6085af2

  Copy full SHA for 6085af2

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  ed1f838

  Copy full SHA for ed1f838

• Remove forkOnlyDescribe in new fork test

  naddison36

  committed
  16c32ce

  Copy full SHA for 16c32ce

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  96e8855

  Copy full SHA for 96e8855

• Fix tests and cleanup funding

  shahthepro

  committed
  a243f39

  Copy full SHA for a243f39

• More cleanup

  shahthepro

  committed
  305dbfe

  Copy full SHA for 305dbfe

• More cleanup

  shahthepro

  committed
  4a1849d

  Copy full SHA for 4a1849d

• Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

  naddison36

  committed
  1fd478a

  Copy full SHA for 1fd478a

• Try multiple slots

  shahthepro

  committed
  f106a12

  Copy full SHA for f106a12

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  8e7bf4c

  Copy full SHA for 8e7bf4c

• Fix Vyper slots

  shahthepro

  committed
  a63bf8f

  Copy full SHA for a63bf8f

• Convex frxETH/WETH Strategy - OZ M-01 (#1879)

  Show description for e4801ab
  naddison36

  authored
  e4801ab

  Copy full SHA for e4801ab

• Minor tweaks

  shahthepro

  committed
  69f42f7

  Copy full SHA for 69f42f7

• Fix MEV tests

  shahthepro

  committed
  9d20fdd

  Copy full SHA for 9d20fdd

• Few more fixes

  shahthepro

  committed
  cd16fca

  Copy full SHA for cd16fca

• Fix fraxETH

  shahthepro

  committed
  6194dbe

  Copy full SHA for 6194dbe

• Fix 3CRV

  shahthepro

  committed
  7dbcbc7

  Copy full SHA for 7dbcbc7

• More tweaks

  shahthepro

  committed
  26667f0

  Copy full SHA for 26667f0

• Increase tolerance

  shahthepro

  committed
  894d450

  Copy full SHA for 894d450

• Increase tolerance

  shahthepro

  committed
  0fde52a

  Copy full SHA for 0fde52a

• prettify

  shahthepro

  committed
  07f2f4f

  Copy full SHA for 07f2f4f

• Merge remote-tracking branch 'origin/shah/funding-fixes' into nicka/behaviour-tests

  naddison36

  committed
  d33ceab

  Copy full SHA for d33ceab

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  2205019

  Copy full SHA for 2205019

• Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

  naddison36

  committed
  6119b8e

  Copy full SHA for 6119b8e

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  b0aff22

  Copy full SHA for b0aff22

• Most merge fixes

  naddison36

  committed
  49d75b0

  Copy full SHA for 49d75b0

• Fix MockCurvePool math order

  naddison36

  committed
  602da88

  Copy full SHA for 602da88

Commits on Oct 26, 2023

• Removed unused return from CurveTwoCoinLib.remove_liquidity

  naddison36

  committed
  40f8c4e

  Copy full SHA for 40f8c4e

Commits on Oct 30, 2023

• Updated BaseCurveStrategy Natspec (#1901)

  naddison36

  authored
  a51bf59

  Copy full SHA for a51bf59

• Fix typo in Natspec (#1902)

  naddison36

  authored
  5825efb

  Copy full SHA for 5825efb

• Removed StableMath from CurveTwoCoinLib (#1903)

  naddison36

  authored
  1ab05aa

  Copy full SHA for 1ab05aa

Commits on Oct 31, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  643f1db

  Copy full SHA for 643f1db

• Reduce queue times in 076_upgrade_fraxeth_strategy

  naddison36

  committed
  fd329f2

  Copy full SHA for fd329f2

• Convex frxETH/WETH Strategy - OZ L-04 using function types (#1899)

  Show description for db0e0ef
  naddison36

  authored
  db0e0ef

  Copy full SHA for db0e0ef

Commits on Nov 1, 2023

• Convex frxETH/WETH Strategy - OZ M-01 fork tests (#1906)

  Show description for 451e0bf
  naddison36

  authored
  451e0bf

  Copy full SHA for 451e0bf

• Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

  naddison36

  committed
  cf9cadc

  Copy full SHA for cf9cadc

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  909a6b3

  Copy full SHA for 909a6b3

• Generated latest contract diagrams

  naddison36

  committed
  13bbce6

  Copy full SHA for 13bbce6

Commits on Nov 3, 2023

• Removed unreached checkBalance function in BaseCurveStrategy as its always overridden

  naddison36

  committed
  ee324d3

  Copy full SHA for ee324d3

Commits on Nov 6, 2023

• chore: updated BaseCurveStrategy Natspec and code comments

  naddison36

  committed
  9e940d0

  Copy full SHA for 9e940d0

• Merge remote-tracking branch 'origin/master' into nicka/behaviour-tests

  naddison36

  committed
  bab03f2

  Copy full SHA for bab03f2

• Merge remote-tracking branch 'origin/nicka/behaviour-tests' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  e3bf74a

  Copy full SHA for e3bf74a

Commits on Nov 7, 2023

• Updated BaseCurveStrategy Natspec and code comments

  naddison36

  committed
  8222e0f

  Copy full SHA for 8222e0f

• Remove reference to unused library

  naddison36

  committed
  1f8b2dd

  Copy full SHA for 1f8b2dd

Commits on Nov 8, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  cf8c3e8

  Copy full SHA for cf8c3e8

Commits on Nov 9, 2023

• Do not run hot deploy for unit tests

  naddison36

  committed
  323eec8

  Copy full SHA for 323eec8

• Removed console.log

  naddison36

  committed
  2fcbfc4

  Copy full SHA for 2fcbfc4

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  e5d9234

  Copy full SHA for e5d9234

Commits on Nov 27, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  5389268

  Copy full SHA for 5389268

Commits on Nov 30, 2023

• Added harvestable behaviour for strategies

  Show description for a05ad25
  naddison36

  committed
  a05ad25

  Copy full SHA for a05ad25

• Merge remote-tracking branch 'origin/nicka/harvester-behaviour' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  56db659

  Copy full SHA for 56db659

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  fd6ea14

  Copy full SHA for fd6ea14

• Fix fork tests

  naddison36

  committed
  469818d

  Copy full SHA for 469818d

• Fix slither

  naddison36

  committed
  ff0a884

  Copy full SHA for ff0a884

Commits on Dec 1, 2023

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  a4510bb

  Copy full SHA for a4510bb

Commits on Dec 4, 2023

• Added Balancer deposit

  Show description for 35e11c3
  naddison36

  committed
  35e11c3

  Copy full SHA for 35e11c3

• Updated Convex AMO and Balancer harvests value flows

  Show description for 7de9ac3
  naddison36

  committed
  7de9ac3

  Copy full SHA for 7de9ac3

Commits on Dec 5, 2023

• Merge remote-tracking branch 'origin/nicka/value-flows' into nicka/convex-frxeth-weth-libs

  naddison36

  committed
  f98accd

  Copy full SHA for f98accd

Commits on Jan 18, 2024

• Merge remote-tracking branch 'origin/master' into nicka/convex-frxeth-weth-libs

  sparrowDom

  committed
  d65c9c5

  Copy full SHA for d65c9c5