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.

Sign up for GitHub

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

Jump to bottom

Resolve V2 merge conflicts #161

Merged
merged 40 commits into from
Mar 14, 2024
Merged

Resolve V2 merge conflicts #161

merged 40 commits into from
Mar 14, 2024

Conversation

mliu
Copy link
Collaborator

@mliu mliu commented Mar 13, 2024

No description provided.

mliu and others added 30 commits November 10, 2023 11:32
@mliu
Take min of pool balance or lender position for withdraw
be89942
@mliu
Merge pull request #81 from 00labs/withdraw-lp-check
fa13511 
Take min of pool balance or lender position for withdraw
@mliu
Cherry pick subgraph service pool stats logic
db63d6b
@mliu
Fix upScale for BigNumber
1a8e32d
@mliu
Fix test
a3d1570
@shan-57blocks @shan57blocks
Superfluid polygon supports (#68)
347bf1c 
* add superfluid pool info

* update HDT address

* transform payer address to checksum address

* update superfluid polygon subgraph

* update superfluid drawdown for polygon

* fix tests issue

* fix superToken decimals issue

* fix approve allowance issue

---------

Co-authored-by: shan <[email protected]>
@mliu
Add totalPoolAssets
a4c68cc
@mliu
Merge branch 'develop' into subgraph-poolstats
ff56ca0
@mliu
Merge pull request #83 from 00labs/subgraph-poolstats
a6fe4a6 
Load in pool stats from Subgraph instead of calculating manually
@mliu
Fix upscale for overflow
50e88d1
@mliu
Add test
8485c51
@mliu
Merge pull request #85 from 00labs/fix-upscale
89c34c5 
Fix upscale to handle overflow
@mliu
Add raincards test pool
13746d4
@mliu
Merge pull request #90 from 00labs/raincards-test-poll
bf4c73d 
Add raincards test pool
@mliu
Fix dep conflict
4bf85a2
@mliu
Merge pull request #96 from 00labs/fix-dep-conflict
b9c113c 
Fix dep conflict
@mliu
Merge pull request #84 from 00labs/develop
67f1d3a 
Prod deploy
v0.0.48
bc18266
Auto-merge master back to develop
f820228
@mliu
Raincards pool
5371f00
@mliu
Merge pull request #100 from 00labs/raincards
ed7dcfa 
Raincards pool
@mliu
Jia Celo
9afd91c
@mliu
Merge pull request #102 from 00labs/jia-celo
6d31246 
Jia Celo
@mliu
Quipu Pool
9efd6f7
@mliu
Merge pull request #127 from 00labs/quipu
52f152c 
Quipu Pool
@mliu
Merge pull request #128 from 00labs/develop
c20a837 
Prod deploy
v0.0.49
1f0db95
Auto-merge master back to develop
22bf05f
@PlayJok3r
added Arf and Jia USDC pools in SDK
c507db2
@PlayJok3r
added description change
c0e3cde
@height Height
Copy link

height bot commented Mar 13, 2024

Link Height tasks by mentioning a task ID in the pull request title or commit messages, or description and comments with the keyword link (e.g. "Link T-123").

💡Tip: You can also use "Close T-X" to automatically close a task when the pull request is merged.

@mliu mliu requested a review from shan-57blocks March 14, 2024 15:25
@mliu mliu merged commit a615382 into v2 Mar 14, 2024
@mliu mliu deleted the v2-merge branch March 14, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PlayJok3r PlayJok3r PlayJok3r approved these changes

@shan-57blocks shan-57blocks Awaiting requested review from shan-57blocks

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mliu @PlayJok3r @shan-57blocks