feat: Feature/crosschain lp #456

TRSSMG · 2024-10-08T14:30:32Z

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.

codecov · 2024-10-08T14:33:11Z

Codecov Report

Attention: Patch coverage is 76.34855% with 57 lines in your changes missing coverage. Please review.

Project coverage is 73.06%. Comparing base (5a059c6) to head (74f8b0f).
Report is 25 commits behind head on main.

Files with missing lines	Patch %	Lines
...nced/score/core/dex/IRC31StandardSpokeLpToken.java	63.79%	14 Missing and 7 partials ⚠️
.../balanced/score/lib/utils/AddressBranchDictDB.java	0.00%	10 Missing ⚠️
...a/network/balanced/score/core/dex/AbstractDex.java	53.84%	6 Missing ⚠️
...twork/balanced/score/core/rewards/RewardsImpl.java	80.76%	2 Missing and 3 partials ⚠️
.../score/lib/utils/BranchedNetworkAddressDictDB.java	0.00%	5 Missing ⚠️
...twork/balanced/score/core/daofund/DAOfundImpl.java	0.00%	2 Missing ⚠️
.../java/network/balanced/score/core/dex/DexImpl.java	96.77%	1 Missing and 1 partial ⚠️
...ork/balanced/score/core/stakedlp/StakedLPImpl.java	94.11%	2 Missing ⚠️
...balanced/score/lib/utils/NetworkAddressDictDB.java	0.00%	1 Missing and 1 partial ⚠️
...rk/balanced/score/core/rewards/DataSourceImpl.java	66.66%	1 Missing ⚠️
... and 1 more

Additional details and impacted files

@@             Coverage Diff              @@
##               main     #456      +/-   ##
============================================
+ Coverage     73.05%   73.06%   +0.01%     
- Complexity     1603     1617      +14     
============================================
  Files           116      120       +4     
  Lines          7686     7752      +66     
  Branches        936      935       -1     
============================================
+ Hits           5615     5664      +49     
- Misses         1667     1681      +14     
- Partials        404      407       +3

Flag	Coverage Δ
java	`73.06% <76.34%> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java

core-contracts/Rewards/src/main/java/network/balanced/score/core/rewards/RewardsImpl.java

AntonAndell · 2024-10-17T07:39:42Z

What do you think creating a library like XCallLib but for token transfers? So that you can just call that in any contract. Which will query the daofund for the fee, check if token is in assetManager else use xTransfer.

core-contracts/DAOfund/src/main/java/network/balanced/score/core/daofund/DAOfundImpl.java

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/StakedLP/src/main/java/network/balanced/score/core/stakedlp/StakedLPImpl.java

score-lib/src/main/java/network/balanced/score/lib/interfaces/base/IRC31Base.java

score-lib/src/main/java/network/balanced/score/lib/utils/TokenTransfer.java

...lancedToken/src/main/java/network/balanced/score/tokens/balancedtoken/BalancedTokenImpl.java

score-lib/src/main/java/network/balanced/score/lib/interfaces/tokens/XReceiver.java

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java

AntonAndell

Can we make "to" paramerete optional id xTokenFallback deposit?

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java

core-contracts/StakedLP/src/main/java/network/balanced/score/core/stakedlp/StakedLPImpl.java

score-lib/src/main/java/network/balanced/score/lib/utils/TokenTransfer.java

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/AbstractDex.java

AntonAndell · 2024-11-21T07:25:12Z

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java

-            deposit(fromToken, to, _value);
-        } else {// If no supported method was sent, revert the transaction
+            String to = params.get("address").asString();
+            deposit(fromToken, NetworkAddress.valueOf(to), _value);


Can we do this? or any reason you thinks its a bad idea?

AntonAndell · 2024-11-21T07:27:03Z

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java

    }

    @External(readonly = true)
    public BigInteger depositOfUser(Address _owner, Address _token) {


Is there any reason this is not the case? or is there a v2 somewhere?

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/IRC31StandardSpokeLpToken.java

score-lib/src/main/java/network/balanced/score/lib/utils/TokenTransfer.java

…withdraw

…n verified on token transfer test

feat: Add option for governance to borrow from dex

AntonAndell · 2024-11-22T07:01:39Z

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java

        isValidPercent(_slippagePercentage.intValue());

-        Address user = Context.getCaller();
+        addInternal(NetworkAddress.parse(from), Address.fromString(_baseToken), Address.fromString(_quoteToken), _baseValue, _quoteValue,


Should probably be valueOf

TRSSMG requested a review from AntonAndell October 8, 2024 14:30

AntonAndell reviewed Oct 17, 2024

View reviewed changes

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java Outdated Show resolved Hide resolved

AntonAndell reviewed Oct 17, 2024

View reviewed changes

core-contracts/Rewards/src/main/java/network/balanced/score/core/rewards/RewardsImpl.java Outdated Show resolved Hide resolved

AntonAndell requested changes Oct 29, 2024

View reviewed changes

AntonAndell reviewed Oct 30, 2024

View reviewed changes

score-lib/src/main/java/network/balanced/score/lib/interfaces/tokens/XReceiver.java Outdated Show resolved Hide resolved

AntonAndell reviewed Nov 4, 2024

View reviewed changes

core-contracts/Dex/src/main/java/network/balanced/score/core/dex/DexImpl.java Outdated Show resolved Hide resolved

AntonAndell reviewed Nov 4, 2024

View reviewed changes

TRSSMG added the Development label Nov 8, 2024

TRSSMG changed the title ~~Feature/crosschain lp~~ feat: Feature/crosschain lp Nov 8, 2024

TRSSMG added the enhancement New feature or request label Nov 8, 2024

github-actions bot added the documentation Improvements or additions to documentation label Nov 15, 2024

AntonAndell requested changes Nov 20, 2024

View reviewed changes

AntonAndell requested changes Nov 21, 2024

View reviewed changes

AntonAndell reviewed Nov 22, 2024

View reviewed changes

score-lib/src/main/java/network/balanced/score/lib/utils/TokenTransfer.java Outdated Show resolved Hide resolved

sagars added 14 commits November 29, 2024 06:58

cross chain lp functionalities and unit test

92beb7c

integration test and fixes - crosschain lp feature

0bb8010

integration test issues fixed

6fb1c65

Token transfer utility implementation, crossTransfer commented out

8483ccb

test: all test pass including router update

28fb906

Fixes: review fixes

ad6dfa7

Fix: review additional fixes, cleanups, formats

1791527

to param optional on xTokenFallback deposit, xWithdraw replaced with …

e289450

…withdraw

unit tests for optional to in xTokenFallback and xWithdraw on xAdd

37fb55a

fix: Address type changed to String type on xcall annotated methods

233472b

crosschain lp feature implementation guidance doc

bc932a1

fallback method added to rewards and stakedLp, router tested

6a24adf

fallback method removed from stakedLp contract

6f58acc

unused variables, imports and commented codes removed

ad0d9a9

sagars added 8 commits November 29, 2024 06:58

unused variables, imports and commented codes removed

d051473

addressManagerMock static mock issue on TokenTransfer test is fixed

8075e59

test updates on xcall, transfer method merged in token class,exceptio…

7c963a1

…n verified on token transfer test

onIRC31Received ib lp transfer method, depositOfUser removed..

60e539c

getDeposit method params position updated in dex inttest

ba47eec

optional data on route methods - Router

e223cc7

NetworkAddress Improvements

cdb562f

NetworkAddress missed - fixed

3155575

AntonAndell force-pushed the feature/crosschain_lp branch from 1f487ca to 3155575 Compare November 29, 2024 05:58

AntonAndell added 2 commits November 29, 2024 07:08

feat: Add option for governance to borrow from dex

1aa2624

Merge pull request #464 from balancednetwork/feat/dex-borrowing

74f8b0f

feat: Add option for governance to borrow from dex

AntonAndell approved these changes Nov 29, 2024

View reviewed changes

AntonAndell merged commit 094861e into main Nov 29, 2024
8 checks passed

feat: Feature/crosschain lp #456

feat: Feature/crosschain lp #456

Uh oh!

Conversation

TRSSMG commented Oct 8, 2024

Description:

Commit Message

Changelog Entry

Checklist:

Uh oh!

codecov bot commented Oct 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

AntonAndell commented Oct 17, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AntonAndell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AntonAndell Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

AntonAndell Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

AntonAndell Nov 22, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Oct 8, 2024 •

edited

Loading