missing crosschain methods added for Dividends

balancednetwork · Dec 17, 2024 · 891785b · 891785b
1 parent cd99282
commit 891785b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/core-contracts/Dex/build.gradle b/core-contracts/Dex/build.gradle
@@ -54,7 +54,6 @@ dependencies {
     testImplementation Dependencies.mockitoCore
     testImplementation Dependencies.mockitoInline
 
-
     testImplementation project(':test-lib')
     testImplementation Dependencies.junitJupiter
     testRuntimeOnly Dependencies.junitJupiterEngine

diff --git a/...ontracts/Dividends/src/main/java/network/balanced/score/core/dividends/DividendsImpl.java b/...ontracts/Dividends/src/main/java/network/balanced/score/core/dividends/DividendsImpl.java
@@ -18,19 +18,18 @@
 
 import foundation.icon.xcall.NetworkAddress;
 import network.balanced.score.lib.interfaces.Dividends;
+import network.balanced.score.lib.interfaces.DividendsXCall;
 import network.balanced.score.lib.structs.DistributionPercentage;
 import network.balanced.score.lib.structs.PrepDelegations;
-import network.balanced.score.lib.utils.Names;
-import network.balanced.score.lib.utils.NetworkAddressBranchDictDB;
-import network.balanced.score.lib.utils.TokenTransfer;
-import network.balanced.score.lib.utils.Versions;
+import network.balanced.score.lib.utils.*;
 import score.*;
 import score.annotation.EventLog;
 import score.annotation.External;
 import score.annotation.Optional;
 import scorex.util.ArrayList;
 import scorex.util.HashMap;
 
+import java.lang.Math;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
@@ -376,7 +375,18 @@ public Map<String, BigInteger> getUnclaimedDividends(Address user) {
         return totalDividends;
     }
 
-    //todo: add xClaimDividends method
+    @External
+    public void handleCallMessage(String _from, byte[] _data, @Optional String[] _protocols) {
+        Check.checkStatus();
+        only(getXCall());
+        XCallUtils.verifyXCallProtocols(_from, _protocols);
+        DividendsXCall.process(this, _from, _data);
+    }
+
+    public void xClaimDividends(String from){
+        claimDividendsInternal(from);
+    }
+
     @External
     public void claimDividends() {
         Address user = Context.getCaller();
@@ -409,7 +419,10 @@ private void claimDividendsInternal(String user){
         DividendsTracker.setBBalnTotalSupply(getBoostedTotalSupply().add(bbalnBalance).subtract(prevBalance));
     }
 
-    //todo: add xClaim method
+    public void xClaim(String from, @Optional Integer _start, @Optional Integer _end){
+        claimInternal(from, _start, _end);
+    }
+
     @External
     public void claim(@Optional int _start, @Optional int _end) {
         Address account = Context.getCaller();
@@ -455,7 +468,10 @@ private void claimInternal(String account, @Optional int _start, @Optional int _
         }
     }
 
-    //todo: add xAccumulateDividends method
+    public void xAccumulateDividends(String from, @Optional Integer _start, @Optional Integer _end){
+        accumulateDividendsInternal(from, _start, _end);
+    }
+
     @External
     public void accumulateDividends(Address user, @Optional int _start, @Optional int _end) {
         accumulateDividendsInternal(getStringNetworkAddress(user), _start, _end);

diff --git a/score-lib/src/main/java/network/balanced/score/lib/interfaces/Dividends.java b/score-lib/src/main/java/network/balanced/score/lib/interfaces/Dividends.java
@@ -18,6 +18,7 @@
 
 import foundation.icon.score.client.ScoreClient;
 import foundation.icon.score.client.ScoreInterface;
+import network.balanced.score.lib.annotations.XCall;
 import network.balanced.score.lib.interfaces.addresses.AddressManager;
 import network.balanced.score.lib.interfaces.base.Name;
 import network.balanced.score.lib.interfaces.base.TokenFallback;
@@ -110,12 +111,21 @@ public interface Dividends extends Name, TokenFallback, AddressManager, Version
     @External
     void claimDividends();
 
+    @XCall
+    void xClaimDividends(String from);
+
     @External
     void claim(@Optional int _start, @Optional int _end);
 
+    @XCall
+    void xClaim(String from, @Optional Integer _start, @Optional Integer _end);
+
     @External
     void accumulateDividends(Address user, @Optional int _start, @Optional int _end);
 
+    @XCall
+    void xAccumulateDividends(String from, @Optional Integer _start, @Optional Integer _end);
+
     @External(readonly = true)
     Map<String, BigInteger> getUserDividends(Address _account, @Optional int _start, @Optional int _end);