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

feat: Feat/usdc staking #466

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

feat: Feat/usdc staking #466

wants to merge 28 commits into from

Conversation

TRSSMG
Copy link
Collaborator

@TRSSMG TRSSMG commented Nov 29, 2024

Description:

Commit Message

type: commit message

see the guidelines for commit messages.

Changelog Entry

version: <log entry>

Checklist:

  • I have performed a self-review of my own code
  • I have documented my code in accordance with the documentation guidelines
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • I have run the unit tests
  • I only have one commit (if not, squash them into one commit).
  • I have a descriptive commit message that adheres to the commit message guidelines

Please review the CONTRIBUTING.md file for detailed contributing guidelines.

sagars added 28 commits October 2, 2024 11:33
@sagars
cross chain lp functionalities and unit test
a832ca7
@sagars
Merge branch 'main' into feature/crosschain_lp
3d20a79
@sagars
integration test and fixes - crosschain lp feature
24eed8e
@sagars
integration test issues fixed
39aaec5
@sagars
Token transfer utility implementation, crossTransfer commented out
ad6b8ac
@sagars
Merge remote-tracking branch 'origin/feat/sicx-baln' into feat/crossc…
1079d2f 
…hain-lp-sicx-baln
@sagars
test: all test pass including router update
558117e
@sagars
Merge branch 'main' into feature/crosschain_lp
ea47433
@sagars
Fixes: review fixes
eaa39ef
@sagars
Fix: review additional fixes, cleanups, formats
dbcb461
@sagars
to param optional on xTokenFallback deposit, xWithdraw replaced with …
1b20143 
…withdraw
@sagars
unit tests for optional to in xTokenFallback and xWithdraw on xAdd
fd54215
@sagars
fix: Address type changed to String type on xcall annotated methods
73adf70
@sagars
crosschain lp feature implementation guidance doc
3be7c9b
@sagars
fallback method added to rewards and stakedLp, router tested
465d286
@sagars
fallback method removed from stakedLp contract
102174f
@sagars
unused variables, imports and commented codes removed
14ad807
@sagars
unused variables, imports and commented codes removed
f792a5e
@sagars
addressManagerMock static mock issue on TokenTransfer test is fixed
0973021
@sagars
test updates on xcall, transfer method merged in token class,exceptio…
e218850 
…n verified on token transfer test
@sagars
onIRC31Received ib lp transfer method, depositOfUser removed..
911856f
@sagars
getDeposit method params position updated in dex inttest
68d6cbf
@sagars
optional data on route methods - Router
a00b28c
@sagars
NetworkAddress Improvements
7a326cf
@sagars
NetworkAddress missed - fixed
1f487ca
@sagars
RouteData update to add data property, unit tests added for usdc staking
db53648
@sagars
Merge branch 'main' into feat/usdc_staking
4c2f87a 
# Conflicts:
#	core-contracts/Dex/src/main/java/network/balanced/score/core/dex/AbstractDex.java
#	core-contracts/Router/src/main/java/network/balanced/score/core/router/RouterImpl.java
#	core-contracts/Router/src/test/java/network/balanced/score/core/router/RouterTest.java
#	score-lib/src/main/java/network/balanced/score/lib/interfaces/Dex.java
#	score-lib/src/main/java/network/balanced/score/lib/utils/Versions.java
@sagars
re-fix the previous update
c970764
@TRSSMG TRSSMG self-assigned this Nov 29, 2024
@TRSSMG TRSSMG requested a review from AntonAndell November 29, 2024 09:16
@TRSSMG TRSSMG changed the title Feat/usdc staking feat: Feat/usdc staking Nov 29, 2024
@TRSSMG TRSSMG added the enhancement New feature or request label Nov 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AntonAndell AntonAndell Awaiting requested review from AntonAndell

At least 1 approving review is required to merge this pull request.

Assignees

@TRSSMG TRSSMG

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TRSSMG @sagars