Skip to content

Add consistent reporting and a kick method removing icon addresses #475

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

Open
AntonAndell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add consistent reporting and a kick method removing icon addresses #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions core-contracts/StakedLP/src/main/java/network/balanced/score/core/stakedlp/StakedLPImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,11 @@

Unstake(user.toString(), id, value);

Context.call(rewards.get(), "updateBalanceAndSupply", poolName, newTotal, user.toString(), newBalance);
if (user.net().equals(NATIVE_NID)) {
Context.call(rewards.get(), "updateBalanceAndSupply", poolName, newTotal, user.account(), newBalance);
} else {
Context.call(rewards.get(), "updateBalanceAndSupply", poolName, newTotal, user.toString(), newBalance);
}

try {
Context.call(dex.get(), "hubTransfer", user.toString(), value, id, new byte[0]);
Expand Down Expand Up @@ -209,11 +213,21 @@
dataSourceNames.set(id, name);
}

@External
public void kick(String _name, Address _owner) {
BigInteger poolId = dataSourceIds.get(_name);
BigInteger totalSupply = totalStaked(poolId);
BigInteger balance = balanceOf(_owner, poolId);

Check warning on line 220 in core-contracts/StakedLP/src/main/java/network/balanced/score/core/stakedlp/StakedLPImpl.java

View check run for this annotation

Codecov / codecov/patch

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

Added lines #L218 - L220 were not covered by tests

Context.call(rewards.get(), "updateBalanceAndSupply", _name, totalSupply, _owner.toString(), balance);
Context.call(rewards.get(), "updateBalanceAndSupply", _name, totalSupply, new NetworkAddress(NATIVE_NID, _owner).toString(), 0);
}

Check warning on line 224 in core-contracts/StakedLP/src/main/java/network/balanced/score/core/stakedlp/StakedLPImpl.java

View check run for this annotation

Codecov / codecov/patch

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

Added lines #L222 - L224 were not covered by tests

@External(readonly = true)
public Map<String, BigInteger> getBalanceAndSupply(String _name, String _owner) {
BigInteger poolId = dataSourceIds.get(_name);
BigInteger totalSupply = totalStaked(poolId);
BigInteger balance = balanceOf(Address.fromString(_owner), poolId);
BigInteger balance = xBalanceOf(_owner, poolId);

Map<String, BigInteger> rewardsData = new HashMap<>();
rewardsData.put("_balance", balance);
Expand Down
4 changes: 2 additions & 2 deletions core-contracts/StakedLP/src/test/java/network/balanced/score/core/stakedlp/StakedLPTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ void testUnstake() {
assertEquals(totalStakedBalanceBeforeUnstake, stakedLpScore.call("totalStaked",
BigInteger.ONE));
verify(dex.mock).hubTransfer(NetworkAddress.valueOf(alice.getAddress().toString(), NATIVE_NID).toString(), aliceUnstakeAmount, BigInteger.ONE, new byte[0]);
verify(rewards.mock).updateBalanceAndSupply(poolOneName, totalStakedBalanceBeforeUnstake, NetworkAddress.valueOf(alice.getAddress().toString(), NATIVE_NID).toString(),
verify(rewards.mock).updateBalanceAndSupply(poolOneName, totalStakedBalanceBeforeUnstake, alice.getAddress().toString(),
aliceStakedBalance);

// Adjust the values after first unstake
Expand Down Expand Up @@ -389,6 +389,6 @@ void testStakeUnstake_unnamedPool() {
balanceAndSupply = (Map<String, BigInteger>) stakedLpScore.call("getBalanceAndSupply", name, alice.getAddress().toString());
assertEquals(BigInteger.valueOf(8), balanceAndSupply.get("_balance"));
assertEquals(BigInteger.valueOf(8), balanceAndSupply.get("_totalSupply"));
verify(rewards.mock).updateBalanceAndSupply(name, balanceAndSupply.get("_totalSupply"), NetworkAddress.valueOf(alice.getAddress().toString(), NATIVE_NID).toString(), balanceAndSupply.get("_balance"));
verify(rewards.mock).updateBalanceAndSupply(name, balanceAndSupply.get("_totalSupply"), alice.getAddress().toString(), balanceAndSupply.get("_balance"));
}
}
4 changes: 2 additions & 2 deletions score-lib/src/main/java/network/balanced/score/lib/utils/Versions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public class Versions {
public final static String WORKERTOKEN = "v1.0.0";
public final static String BNUSD = "v1.1.1";
public final static String FEEHANDLER = "v1.0.1";
public final static String REWARDS = "v1.2.4";
public final static String REWARDS = "v1.2.5";
public final static String STABILITY = "v1.1.1";
public final static String BALANCEDORACLE = "v1.2.0";
public final static String DAOFUND = "v1.1.4";
public final static String DEX = "v1.1.8";
public final static String GOVERNANCE = "v1.0.2";
public final static String REBALANCING = "v1.0.0";
public final static String ROUTER = "v1.2.4";
public final static String STAKEDLP = "v1.0.9";
public final static String STAKEDLP = "v1.1.0";
public final static String BOOSTED_BALN = "v1.1.0";
public final static String BRIBING = "v1.0.1";
public final static String BALANCED_OTC = "v1.0.0";
Expand Down
Loading