Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
b165ff3
feat: minichef
Jun 2, 2021
e5bd4a5
feat: extra rewards helpers
Jun 3, 2021
b9b71af
fix: approve spend of extraRewardTokens
Jun 11, 2021
0749503
feat: beginning of refactor
Jul 21, 2021
cd147d1
feat: progress
Jul 21, 2021
f3c4a25
feat: moar work
Jul 26, 2021
339f887
feat: making it work?
Jul 31, 2021
9bc5631
feat: wrangled
Jul 31, 2021
68d81df
feat: mostly working
Aug 1, 2021
21908fc
feat: moar working
Aug 2, 2021
2ff3f7a
feat: wip
Aug 4, 2021
21b35c5
chore: comment part you need to finish later
Aug 4, 2021
5a3cbe7
feat: cleanup
Aug 4, 2021
4fad786
feat: estimations
Aug 5, 2021
6016a3d
fix: remove unused modifier
Aug 5, 2021
dd2a3ec
fix: more safu
Aug 5, 2021
897e8b8
feat: some emergency powers
Aug 5, 2021
e60c646
feat: use abstract base pattern
Aug 7, 2021
73c54d5
feat: reward token can be a LP token
Aug 8, 2021
4d384fe
fix: some cleanup
Aug 8, 2021
ccaa74c
chore: cleanup
Aug 9, 2021
f076922
chore: cleanup more
Aug 9, 2021
6bc5519
chore: mark require network
Aug 10, 2021
c54d85a
fix(tests): joint migration
Aug 11, 2021
55d67f6
fix: add require
Aug 11, 2021
cde787f
fix: clone argument order bug
Aug 11, 2021
3e693d3
fix(test): eth tests pass
Aug 12, 2021
ef980ce
feat: asset estimation via joint
Aug 14, 2021
16a2318
feat: remove `Joint.setReinvest`
Aug 14, 2021
182d77e
fix: adjustPosition doesn't need investWant
Aug 16, 2021
fc8583f
feat: return excess loose on adjustPosition
Aug 16, 2021
13c1cb0
fix: store pair decimals in stack
Aug 16, 2021
b778bff
fix: remove require from view
Aug 16, 2021
4afd783
fix: tests
Aug 16, 2021
5750ff2
feat: handle slippage
Aug 16, 2021
ac6ed0e
chore: add safety warnings
Aug 16, 2021
c9d35d4
feat: starting cleanup
Aug 17, 2021
b3daf26
feat: cleanup of balance function
Aug 17, 2021
14f9f3e
chore: moar cleanup
Aug 17, 2021
5d43f70
chore: minor
Aug 17, 2021
8fea27c
chore: fix boo tests
Aug 17, 2021
2f37fa2
feat: test sweep
Aug 17, 2021
10f0973
fix: handle liquidateAll
Aug 17, 2021
3784ef9
chore: test emergency
Aug 17, 2021
1630458
chore: cleanup
Aug 17, 2021
bffa785
fix: simpler handling of loose funds
Aug 17, 2021
908bce6
feat: donations testing
Aug 17, 2021
20ccbc8
chore: joint is abstract
Aug 20, 2021
6980dbd
fix: test
Aug 22, 2021
5e0e47e
chore: fix comment
Aug 22, 2021
a7738d2
feat: added LP hedging v0.1
jmonteer Aug 23, 2021
b3af4d9
feat: lpHedging
jmonteer Aug 23, 2021
e7d5256
fix: order
jmonteer Aug 23, 2021
e3ca98f
fix: add library file
jmonteer Aug 23, 2021
ec82be5
fix: name of SushiJoint
Aug 24, 2021
034ae0b
feat: test working. solving rebalances
jmonteer Aug 25, 2021
a83a44a
feat: add test files
jmonteer Aug 25, 2021
2b55677
fix: add missing interface
jmonteer Aug 29, 2021
c21efea
fix: tests
jmonteer Aug 30, 2021
d0642a4
feat: add tests jm/lp-hedging
jmonteer Sep 1, 2021
58c8c01
feat: deploy ape.tax
jmonteer Sep 2, 2021
79cee41
fix: comments & test
jmonteer Sep 12, 2021
8fcffed
feat: spirit Joint
Sep 13, 2021
165774a
feat: missing SpiritJoint
Sep 14, 2021
266cd32
feat: add script for printing status
jmonteer Sep 20, 2021
2a29c33
feat: manage_hedged_lp script
jmonteer Sep 21, 2021
3da5428
fix: rebalance takes into account cost of hedge
jmonteer Sep 22, 2021
d27ca18
fix: address @guillesalazar's comments
jmonteer Sep 24, 2021
ad35c89
fix: adjust accounting according to guille's comments
jmonteer Sep 24, 2021
56e97bd
feat: implement ethToWant in provider
jmonteer Sep 27, 2021
8624b9c
Merge branch 'fp/joint-on-chain' into jm/lp-hedging
Sep 28, 2021
67c1c59
Merge remote-tracking branch 'jmonteer/jm/lp-hedging'
Sep 28, 2021
fa0924a
Merge branch 'fp/spirit-joint'
Sep 28, 2021
0b41fd8
fix: tests running
jmonteer Sep 29, 2021
321e800
Merge branch 'jm/lp-hedging'
Sep 29, 2021
51fc033
Merge remote-tracking branch 'jmonteer/jm/lp-hedging'
Sep 29, 2021
07a8120
Refactor tests (#9)
jmonteer Oct 27, 2021
59518f9
Revert "Refactor tests (#9)" (#10)
jmonteer Oct 27, 2021
035fd2d
feat: refactor all (#6)
fp-crypto Nov 11, 2021
2e7c9b2
fix: hedgil payout
jmonteer Nov 26, 2021
3c7a56b
feat: spirit hedgil joint (#13)
fp-crypto Jan 12, 2022
a7d1d40
feat: harvest tests passing
jmonteer Jan 12, 2022
ec6731a
fix: remove debugging event
jmonteer Jan 13, 2022
7901fbe
feat: spooky hedgil (#16)
fp-crypto Jan 24, 2022
d30e549
fix: add usdc tests
jmonteer Feb 3, 2022
3d4ab9f
fix: remove close in adjust position
jmonteer Feb 4, 2022
9bf555f
feat: add daily harvest rewards
jmonteer Feb 4, 2022
50fa2e8
feat: add shouldStartEpoch flag + harvest rewards mid epoch
jmonteer Feb 22, 2022
c74e238
feat: hedgilv2 joint module
jmonteer Feb 22, 2022
eb49fcc
feat: wip
jmonteer Feb 24, 2022
74419c9
feat: no hedge module
jmonteer Feb 24, 2022
fb586f2
feat: add solidex module
jmonteer Feb 24, 2022
5b0edb4
feat: add overriding router functions
jmonteer Feb 24, 2022
64dab9f
fix: getPair accounting for stable
jmonteer Feb 24, 2022
5d873a6
fix: separate solid interfaces
jmonteer Feb 24, 2022
5db85a3
fix: set stable
jmonteer Feb 24, 2022
00d6c72
fix: getAmountsOut
jmonteer Feb 24, 2022
136feb6
feat: add method to claim rewards manually
jmonteer Feb 24, 2022
83ac031
fix: typo + approve
jmonteer Feb 24, 2022
85c0922
feat: removed unused tests and implemented test using normal peoratio…
16slim Feb 24, 2022
8e7d0b9
Fix: including sex sweep in tests (#20)
16slim Feb 24, 2022
9431d3c
feat: correctly calculate rebalance on solidly stable pairs
fp-crypto Feb 24, 2022
9bd91ed
fix: cast
fp-crypto Feb 24, 2022
3f86afa
feat: test imbalance
fp-crypto Feb 24, 2022
990568d
feat: test big swaps more
fp-crypto Feb 24, 2022
163d758
fix: another assert
fp-crypto Feb 24, 2022
45bbf02
feat: ySwaps
jmonteer Feb 25, 2022
efacb2e
feat: test ySwaps WIP
jmonteer Feb 25, 2022
90585b6
feat: test ySwaps WIP
jmonteer Feb 25, 2022
3e03951
fix: tests (wip)
fp-crypto Feb 26, 2022
b335b0c
fix: tests (wip)
fp-crypto Feb 27, 2022
d018d10
fix: missing files
jmonteer Mar 4, 2022
0c71916
Test new hedgilV2 with SpookyJoint (#21)
16slim Mar 9, 2022
9411b2f
Merge branch 'hedgilv2' into nohedge
jmonteer Mar 9, 2022
ac002fe
Merge branch 'nohedge' into hedgilv2
jmonteer Mar 9, 2022
c82e7a5
fix: conflicts
jmonteer Mar 9, 2022
820c523
fix: conflicts (WIP)
jmonteer Mar 9, 2022
7f5c1f1
fix: conflicts
jmonteer Mar 9, 2022
ea145eb
Merge solidex with rest (#22)
jmonteer Mar 9, 2022
39e0cde
feat: create folder structure
jmonteer Mar 9, 2022
2877953
fix: create folder structure
jmonteer Mar 9, 2022
937eaca
fix: conflicts
jmonteer Mar 9, 2022
b2a3bde
fix: naming of airdrop_rewards
jmonteer Mar 9, 2022
3ae8742
fix: fixed hedgilv2 spooky tests with merge
16slim Mar 9, 2022
4ec15d8
fix: merge
16slim Mar 10, 2022
77f59c4
fix: tests passing after nohedge merge
16slim Mar 10, 2022
2389867
Hedgilv2 (#23)
16slim Mar 10, 2022
55653d7
Merge branch 'fp-crypto:hedgilv2' into hedgilv2
16slim Mar 10, 2022
db0debd
Merge branch 'hedgilv2' of https://github.com/fp-crypto/joint-strateg…
16slim Mar 10, 2022
22752e6
16slim/refactor tests (#24)
16slim Mar 15, 2022
659b726
gerge branch 'hedgilv2' of https://github.com/fp-crypto/joint-strateg…
16slim Mar 15, 2022
b2741e6
Update contracts/ProviderStrategy.sol
jmonteer Mar 15, 2022
c6751ca
Update contracts/DEXes/SpiritJoint.sol
jmonteer Mar 15, 2022
e8cf562
gerge branch 'hedgilv2' of https://github.com/fp-crypto/joint-strateg…
16slim Mar 15, 2022
c751bde
feat: included new test for manual operation of the joint
16slim Mar 16, 2022
8be5943
Merge branch 'fp-crypto:hedgilv2' into hedgilv2
16slim Mar 16, 2022
6421f74
gerge branch 'hedgilv2' kf https://github.com/16slim/joint-strategy i…
16slim Mar 16, 2022
6cff424
feat: included tests cloninf the joint and the providers
16slim Mar 16, 2022
859feb5
fix: migrateProvider is not a view
16slim Mar 16, 2022
2e79248
chore: minor changes in tests
16slim Mar 16, 2022
52abdb0
fix: return spirit to hedgil v1 waiting for it to be tested
16slim Mar 16, 2022
7f3c819
feat: added test to assess the automatic epoch rolling using harvest …
16slim Mar 16, 2022
f2137f2
feat: deployment script for providers and joint
16slim Mar 16, 2022
70703ab
fix: move setMaxpercentageLoss outside of if
16slim Mar 16, 2022
8f013d8
HedgilV2 new tests (#25)
16slim Mar 16, 2022
c37c3c8
Merge branch 'fp-crypto:hedgilv2' into hedgilv2
16slim Mar 16, 2022
3d85e04
feat: addded test to unwind joint with migrated providers as per @sto…
16slim Mar 17, 2022
e777dcb
nohedge tests (#26)
16slim Mar 18, 2022
20e3e90
fix: tokenB allowance of hedgil is set to the hedge budget instead of…
16slim Mar 18, 2022
6ffdcca
feat: added asserts checking tokenB allowance of hedgil after opening…
16slim Mar 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ reports/
# Node/npm
node_modules/
.DS_Store

# Hardhat
cache
4 changes: 2 additions & 2 deletions brownie-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ autofetch_sources: True

# require OpenZepplin Contracts
dependencies:
- iearn-finance/yearn-vaults@0.3.4
- iearn-finance/yearn-vaults@0.4.3
- OpenZeppelin/openzeppelin-contracts@3.1.0

# path remapping to support imports from GitHub/NPM
compiler:
solc:
version: 0.6.12
remappings:
- "@yearnvaults=iearn-finance/yearn-vaults@0.3.4"
- "@yearnvaults=iearn-finance/yearn-vaults@0.4.3"
- "@openzeppelin=OpenZeppelin/openzeppelin-contracts@3.1.0"

reports:
Expand Down
31 changes: 31 additions & 0 deletions contracts/AggregatorMock.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
pragma solidity 0.6.12;

contract AggregatorMock {
int256 public price;

constructor(int256 _price) public {
setPrice(_price);
}

function setPrice(int256 _price) public {
price = _price;
}

function latestAnswer() external view returns (int256) {
return price;
}

function latestRoundData()
external
view
returns (
uint80 roundId,
int256 answer,
uint256 startedAt,
uint256 updatedAt,
uint80 answeredInRound
)
{
return (uint80(0), price, uint256(0), uint256(0), uint80(0));
}
}
260 changes: 0 additions & 260 deletions contracts/BooJoint.sol

This file was deleted.

Loading