Skip to content
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

Refactor chain references into enum #116

Merged
merged 6 commits into from
Nov 10, 2021
Merged

Refactor chain references into enum #116

merged 6 commits into from
Nov 10, 2021

Conversation

btcookies
Copy link
Contributor

No description provided.

scripts/rebase.py Outdated Show resolved Hide resolved
scripts/eth_earn.py Outdated Show resolved Hide resolved
scripts/earn_locked_cvx.py Outdated Show resolved Hide resolved
scripts/earn.py Outdated Show resolved Hide resolved
.deploy/base/rebalancer.yaml Show resolved Hide resolved
scripts/earn_locked_cvx.py Outdated Show resolved Hide resolved
src/general_harvester.py Show resolved Hide resolved
src/earner.py Show resolved Hide resolved
tests/test_arbitrum_earner.py Show resolved Hide resolved
tests/test_arbitrum_harvester.py Show resolved Hide resolved
@btcookies btcookies merged commit d25da32 into develop Nov 10, 2021
@btcookies btcookies deleted the revert-earn branch November 10, 2021 21:58
btcookies added a commit that referenced this pull request Jan 5, 2022
* feat: lock bvecvx every week at 23:50 UTC on Wednesday

* pause eth tender

* feat: earner keeper for ethereum network (#67)

* add bbcvx strategy to blacklist for earn (#70)

* add bbcvx strategy to blacklist for earn

* chore: use strategy addr not vault'

* chore: lock cvx before vote at 23:20 UTC (#71)

* Add harvesting script for mstable strategies (#65)

* bump web3.py version

* add voter proxy abi; add harvestMta to keeperAcl

* add mstable harvesting script

* add test for mstable harvests

* catch timeout while fetching fee history; use int for num_blocks

* remove harvest_mstable script

* move harvest_mta in conditional harvest

* revert conditional harvest

* run at 0:00 UTC

Co-authored-by: brookstaylor <[email protected]>

* pause arb harvester for swapr upgrade (#74)

* pause eth harvests til mstable ready (#75)

* Chore/pause arb earns (#76)

* pause eth tender (#64)

Co-authored-by: brookstaylor <[email protected]>

* add swapr/weth strategy to earn blacklist arb

Co-authored-by: Ayush Shukla <[email protected]>

* Make sure there's a buffer period before running harvestMta again (#72)

* reduce harvestMta frequency

* feat: conditional harvest tested for harvestMta

* feat: check is_time_to_harvest in tests for mstable strategies

Co-authored-by: brookstaylor <[email protected]>

* unpause eth harvester (#78)

* Resume arbitrum harvests (#79)

* enable arbitrum harvests

* run arbitrum harvests at 14:30

* update eth earner to earn for all vaults (#86)

* update eth earner to earn for all vaults

* chore: exclude retired strategies from earns

* take pending txs into consideration when assigning nonce (#73)

* Harvest/tend migrated convex strategies (#87)

* feat: add migrated convex strats

* enable 1 off tender run to tend new convex strats

Co-authored-by: brookstaylor <[email protected]>

* debug vault error

* take 2

* blacklist yearn vault from earn calls

* bump gas limit to 1.5m for eth earns

* add tricrypto vault to invalid earn vaults

* tend obtc at 14:30

* add badger/weth swapr lp deployer (#68)

* reduce harvest frequency to 3/5 days (#91)

* pause eth tender (#64)

Co-authored-by: brookstaylor <[email protected]>

* reduce harvest frequency to 3/5 days

* chore: suspend eth-tender bot

* add chain to error logs

* black formatting

* add keeper address to error logging

* update log string to match new frequency and gas limit

* remove unused imports, log chain on error for earner

* add keeper_address to earner

Co-authored-by: Ayush Shukla <[email protected]>

* chore: remove swapr/weth strat from earn blacklist

* feat: send chain and keeper address with failed tx logging

* chore: add ops_deployer6 in arb vault owners (#92)

* chore: run arb harvests at 18:10

* chore: run arb harvests at 18:34 (#93)

* chore: run arb harvests at 19:14

* chore: use default arb rpc

* feat: manually add bvecvx lp vault to list to earn, switch to default rpc for arb earns (#96)

* Comment out bvecvx LP strat until whitelist (#97)

* chore: start earning bvecvx lp strat

* chore: pause bvecvx lp vault earns

* chore: earn bvecvx lp

* chore: pause bvecvx lp earns

* Bug: fix eth harvest cadence so only harvesting every 4/5 days (#107)

* fix harvest cadence so harvesting every 5 days

* set min harvest time to 4 days

* fix comment accuracy

* refactor block offset into utils function, only use max_time_between_harvests

* remove unused import

* chore: fix typo, remove imports

* anotha typo

* align comments with cadence variables

* pause negative rebases and pause centralized oracle propose (#108)

* pause negative rebases and pause centralized oracle propose

* feat: real test implemented

* feat: smarter earn threshold using want eth price (#109)

* feat: smarter earn threshold using want eth price

* chore: move price func to utils, pass in chain, vault contract param

* chore: fix naming, arb test

* feat: handle polygon and arbitrum price getting

* fix comment

* chore: update return type comment

* Quick fix earn (#110)

* chore: denominate override in base 10, not wei

* chore: earn new convex vaults

* chore: reset earn sched to 10 after hour, all vaults (#112)

* chore: run test tends at 15:35

* chore: pause eth harvests for subgraph upgrade (#115)

* chore: suspend manual tends (#114)

* chore: pause eth earner until convex strats migrated (#117)

* Refactor chain references into enum (#116)

* chore: reset earn sched to 10 after hour, all vaults

* chore: refactor chain references into enum

* chore: import utils get_abi for arb earn script

* chore: get_node_url utils func, rename harvest eth

* chore: base_currencies constant, remove unused imports

* debug: check node url rebase

* chore: remove debugging log

* chore: update convex strats to new addresses (#119)

* chore: update convex strats to new addresses

* chore: unpause keepers, use flashbots rpc

* bug: fix arbitrum abi directory

* chore: revert flashbots rpc, run chainlink forwarder

* chore: run ibbtc

* chore: add ibbtc lp vault to earn list

* chore: run bvecvx earn

* chore: run ibbtc harvest

* chore: run without flashbots

* chore: turn off convex and ibbtc sushi earns

* chore: harvest ibbtc

* chore: run ibbtc harvest

* chore: pause flashbots harvester

* chore: reset harvests to regular cadence, add ibbtc

* chore: harvest ibbtc daily

* chore: update cadence"

* add logging to make sure ibbtc checking

* chore: log strategy address not contract obj

* more logging

* chore: black formatting, harvest ibbtc

* feat: only earn if base fee < 150 gwei

* chore: pause ren harvest

* chore: fix poly rpc

* chore: earn threshold 100E, don't harvest poly curve

* chore: pause all earns and harvests

* chore: pause bvecvx earner

* chore: unpause harvests and earns on eth, use flashbots

* chore: re enable ren harvest

* chore: manual harvest again

* chore: reset harvester script

* chore: enable arbitrum harvests

* chore: enable arb earns

* Update eth_bvecvx_earner.yaml

* Update eth_bvecvx_earner.yaml

Co-authored-by: Ayush Shukla <[email protected]>
Co-authored-by: Andrew Mitchell <[email protected]>
btcookies added a commit that referenced this pull request Mar 7, 2022
* feat: lock bvecvx every week at 23:50 UTC on Wednesday

* pause eth tender

* feat: earner keeper for ethereum network (#67)

* add bbcvx strategy to blacklist for earn (#70)

* add bbcvx strategy to blacklist for earn

* chore: use strategy addr not vault'

* chore: lock cvx before vote at 23:20 UTC (#71)

* Add harvesting script for mstable strategies (#65)

* bump web3.py version

* add voter proxy abi; add harvestMta to keeperAcl

* add mstable harvesting script

* add test for mstable harvests

* catch timeout while fetching fee history; use int for num_blocks

* remove harvest_mstable script

* move harvest_mta in conditional harvest

* revert conditional harvest

* run at 0:00 UTC

Co-authored-by: brookstaylor <[email protected]>

* pause arb harvester for swapr upgrade (#74)

* pause eth harvests til mstable ready (#75)

* Chore/pause arb earns (#76)

* pause eth tender (#64)

Co-authored-by: brookstaylor <[email protected]>

* add swapr/weth strategy to earn blacklist arb

Co-authored-by: Ayush Shukla <[email protected]>

* Make sure there's a buffer period before running harvestMta again (#72)

* reduce harvestMta frequency

* feat: conditional harvest tested for harvestMta

* feat: check is_time_to_harvest in tests for mstable strategies

Co-authored-by: brookstaylor <[email protected]>

* unpause eth harvester (#78)

* Resume arbitrum harvests (#79)

* enable arbitrum harvests

* run arbitrum harvests at 14:30

* update eth earner to earn for all vaults (#86)

* update eth earner to earn for all vaults

* chore: exclude retired strategies from earns

* take pending txs into consideration when assigning nonce (#73)

* Harvest/tend migrated convex strategies (#87)

* feat: add migrated convex strats

* enable 1 off tender run to tend new convex strats

Co-authored-by: brookstaylor <[email protected]>

* debug vault error

* take 2

* blacklist yearn vault from earn calls

* bump gas limit to 1.5m for eth earns

* add tricrypto vault to invalid earn vaults

* tend obtc at 14:30

* add badger/weth swapr lp deployer (#68)

* reduce harvest frequency to 3/5 days (#91)

* pause eth tender (#64)

Co-authored-by: brookstaylor <[email protected]>

* reduce harvest frequency to 3/5 days

* chore: suspend eth-tender bot

* add chain to error logs

* black formatting

* add keeper address to error logging

* update log string to match new frequency and gas limit

* remove unused imports, log chain on error for earner

* add keeper_address to earner

Co-authored-by: Ayush Shukla <[email protected]>

* chore: remove swapr/weth strat from earn blacklist

* feat: send chain and keeper address with failed tx logging

* chore: add ops_deployer6 in arb vault owners (#92)

* chore: run arb harvests at 18:10

* chore: run arb harvests at 18:34 (#93)

* chore: run arb harvests at 19:14

* chore: use default arb rpc

* feat: manually add bvecvx lp vault to list to earn, switch to default rpc for arb earns (#96)

* Comment out bvecvx LP strat until whitelist (#97)

* chore: start earning bvecvx lp strat

* chore: pause bvecvx lp vault earns

* chore: earn bvecvx lp

* chore: pause bvecvx lp earns

* Bug: fix eth harvest cadence so only harvesting every 4/5 days (#107)

* fix harvest cadence so harvesting every 5 days

* set min harvest time to 4 days

* fix comment accuracy

* refactor block offset into utils function, only use max_time_between_harvests

* remove unused import

* chore: fix typo, remove imports

* anotha typo

* align comments with cadence variables

* pause negative rebases and pause centralized oracle propose (#108)

* pause negative rebases and pause centralized oracle propose

* feat: real test implemented

* feat: smarter earn threshold using want eth price (#109)

* feat: smarter earn threshold using want eth price

* chore: move price func to utils, pass in chain, vault contract param

* chore: fix naming, arb test

* feat: handle polygon and arbitrum price getting

* fix comment

* chore: update return type comment

* Quick fix earn (#110)

* chore: denominate override in base 10, not wei

* chore: earn new convex vaults

* chore: reset earn sched to 10 after hour, all vaults (#112)

* chore: run test tends at 15:35

* chore: pause eth harvests for subgraph upgrade (#115)

* chore: suspend manual tends (#114)

* chore: pause eth earner until convex strats migrated (#117)

* Refactor chain references into enum (#116)

* chore: reset earn sched to 10 after hour, all vaults

* chore: refactor chain references into enum

* chore: import utils get_abi for arb earn script

* chore: get_node_url utils func, rename harvest eth

* chore: base_currencies constant, remove unused imports

* debug: check node url rebase

* chore: remove debugging log

* chore: update convex strats to new addresses (#119)

* chore: update convex strats to new addresses

* chore: unpause keepers, use flashbots rpc

* bug: fix arbitrum abi directory

* chore: revert flashbots rpc, run chainlink forwarder

* chore: run ibbtc

* chore: add ibbtc lp vault to earn list

* chore: run bvecvx earn

* chore: run ibbtc harvest

* chore: run without flashbots

* chore: turn off convex and ibbtc sushi earns

* chore: harvest ibbtc

* chore: run ibbtc harvest

* chore: pause flashbots harvester

* chore: reset harvests to regular cadence, add ibbtc

* chore: harvest ibbtc daily

* chore: update cadence"

* add logging to make sure ibbtc checking

* chore: log strategy address not contract obj

* more logging

* chore: black formatting, harvest ibbtc

* feat: only earn if base fee < 150 gwei

* chore: pause ren harvest

* chore: fix poly rpc

* chore: earn threshold 100E, don't harvest poly curve

* chore: pause all earns and harvests

* chore: pause bvecvx earner

* chore: unpause harvests and earns on eth, use flashbots

* chore: re enable ren harvest

* chore: manual harvest again

* chore: reset harvester script

* chore: enable arbitrum harvests

* chore: enable arb earns

* Update eth_bvecvx_earner.yaml

* Update eth_bvecvx_earner.yaml

* chore: pause p,o,sbtc harvests

* chore: pause bcvx for cvxcrv swap slippage issue

* chore: pause ren harvests

* chore: reduce ibbtc frequency to 3 days

* chore: resume ren cycles

* chore: pause bvecvx locking

* Update arb_earner.yaml

* Update arb_harvester.yaml

* chore: restart bvecvx earner, change threshold to 20 eth

* chore: add mim and frax vaults to earner keeper

* chore: resume arb harvests and earns

* chore: harvest bcvx

* chore: suspend arb earns

* chore: add container scanning

* chore: enable arb earns

* chore: check secrets on pr

* chore: disable bad performing vaults

* chore: update dockerfile to remove container vuln

* chore: add git back to container

* chore: pause bad vaults from harvest

* feat: add ftm support for earns and harvests (#125)

* feat: add ftm support for earns and harvests

* chore: pause ftm keepers for now

* chore: fix typo in kustomization.yaml

* chore: pass contract objects instead of addresses to earn/harvest

* chore: add abi to fantom dir

* chore: add fantom to abi_dirs

* chore: add ftmscan explorer name

* chore: add new vault to keeper

* chore: remove usdc/dai strat from active list

* chore: handle 0 case issue

* chore: let error log

* chore: log balances

* chore: try chainstack node for ftm

* chore: fix pricing for ftm want, use default rpc

* chore: handle harvesting ftm

* fix: ibbtc collector test passing and sending tx successfully

* fix: upgrade libsasl to remediate container vuln

* chore: run at 3:45

* fix: get correct keeper address

* chore: run at 5:07

* fix: use correct value for private key

* chore: add new vaults to ftm keepers

* Modularize repo (#134)

* chore: modularize scripts/ dir

* chore: modularize src/ and config/ files

* chore: modularize scripts run for cron jobs

* Add first units and GHA for testing (#137)

* chore: move all integration tests to integration_tests package

* chore: add gha config for tests; add tx test

* chore: add more tests

* chore: add test for hex gas

* chore: copypaste brownie config from rewards

* chore: add coverage action (#139)

* Addresses (#140)

* Create CODEOWNERS

* chore: move address refs into constants file

* chore: remove all non constant address refs

* chore: fix monkeypatch paths

* chore: move all hardcoded addresses to vars in constants file

Co-authored-by: mitche50 <[email protected]>

* fix: update tricrypto address to tricrypto2;

* chore: add dca ftm vaults and black formatting

* fix: handle case when 0 strategy 0 vault

* chore: pause bvecvx earner

* chore: add flake8 run (#141)

* chore: add flake8 run

* chore: format earners

* chore: removed redundant f strings

* chore: reformat couple files; remove f strings

* chore: reformat couple files; remove f strings vol2

* chore: more cleanups

* chore: remove trailing whitespaces

* chore: test cleanups

* chore: disable F403

* chore: more import cleanups

* chore: final flake cleanup

* chore: final imports cleanup

* Setup logging properly  (#144)

* chore: initialize all loggers properly

* chore: cleanup remove unused imports

* chore: deploy on push to main only (#143)

* chore: deploy on push to main only

* chore: update image tag to use sha for push event

Co-authored-by: brookstaylor <[email protected]>

Co-authored-by: Ayush Shukla <[email protected]>
Co-authored-by: Andrew Mitchell <[email protected]>
Co-authored-by: Andrii Kulikov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants