Skip to content

Commit b3cf4d2

Browse files
AntonAndellAntonAndell
committed
Remove staking from the Balanced token
1 parent 094861e commit b3cf4d2

10 files changed

Lines changed: 57 additions & 1233 deletions

File tree

‎core-contracts/Dividends/src/intTest/java/network/balanced/score/core/dividends/DividendsIntegrationTest.java‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ void testBBaln_lock() {
169169
Map<String, BigInteger> unclaimedDividendsBeforeBob = reader.dividends.getUnclaimedDividends(addressBob);
170170

171171
// user unstakes all the baln token
172-
alice.baln.stake(BigInteger.ZERO);
173172
BigInteger availableBalnBalance = alice.baln.availableBalanceOf(addressAlice);
174173

175174
long unlockTime =
@@ -257,35 +256,7 @@ void testBBaln_claimOnly() {
257256
assertEquals(unclaimedDividendsAfterEve, BigInteger.ZERO);
258257
}
259258

260-
@Test
261-
@Order(6)
262-
void testBBaln_claimAfterUnstake() {
263-
/* Ferry claims the dividends after unstaking baln token. */
264-
Address addressFerry = Ferry.getAddress();
265-
BigInteger unclaimedDividendsBeforeFerry =
266-
owner.dividends.getUnclaimedDividends(addressFerry).get(balanced.bnusd._address().toString());
267-
BigInteger bnusdBeforeFerry = Ferry.bnUSD.balanceOf(addressFerry);
268-
// Ferry unstakes baln token
269-
Ferry.baln.stake(BigInteger.ZERO);
270-
Ferry.dividends.claimDividends();
271-
BigInteger unclaimedDividendsAfterFerry =
272-
owner.dividends.getUnclaimedDividends(addressFerry).get(balanced.bnusd._address().toString());
273-
BigInteger bnusdAfterFerry = Eve.bnUSD.balanceOf(addressFerry);
274-
// unclaimed dividends become 0 after claiming
275-
assertEquals(unclaimedDividendsAfterFerry, BigInteger.ZERO);
276-
// unclaimed dividends should go to Eve's wallet after claiming
277-
assertEquals(bnusdBeforeFerry.add(unclaimedDividendsBeforeFerry), bnusdAfterFerry);
278259

279-
BigInteger collateral = BigInteger.valueOf(500).multiply(BigInteger.TEN.pow(18));
280-
BigInteger loanAmount = BigInteger.valueOf(100).multiply(BigInteger.TEN.pow(18));
281-
owner.stakeDepositAndBorrow(collateral, loanAmount);
282-
unclaimedDividendsAfterFerry =
283-
owner.dividends.getUnclaimedDividends(addressFerry).get(balanced.bnusd._address().toString());
284-
285-
// unclaimed dividends remains 0 for that user
286-
assertEquals(unclaimedDividendsAfterFerry, BigInteger.ZERO);
287-
288-
}
289260

290261
@Test
291262
@Order(7)
@@ -520,13 +491,6 @@ void createNewUserForBBaln() {
520491
owner.baln.transfer(addressEve, collateral, new byte[0]);
521492
owner.baln.transfer(addressFerry, collateral, new byte[0]);
522493

523-
// staking baln token with multiple different users.
524-
BigInteger stakedAmount = BigInteger.valueOf(50).multiply(BigInteger.TEN.pow(18));
525-
alice.baln.stake(stakedAmount);
526-
bob.baln.stake(stakedAmount);
527-
Eve.baln.stake(stakedAmount);
528-
Ferry.baln.stake(stakedAmount);
529-
530494
// loan taken to send some dividends to contract
531495
owner.stakeDepositAndBorrow(collateral, loanAmount);
532496
}

‎core-contracts/Governance/src/main/java/network/balanced/score/core/governance/utils/GovernanceConstants.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,11 @@ public class GovernanceConstants extends Constants {
5656
public static Map<String, List<String>> ADDRESSES = Map.ofEntries(
5757
entry("rewards", List.of("reserve", "baln", "bwt", "daofund", "stakedLp", "bBaln")),
5858
entry("bnUSD", List.of("oracle")),
59-
entry("baln", List.of("dividends", "oracle", "dex", "bnUSD")),
6059
entry("bwt", List.of("baln")),
6160
entry("stakedLp", List.of("dex", "rewards"))
6261
);
6362

6463
public static Map<String, String> ADMIN_ADDRESSES = Map.ofEntries(
65-
entry("baln", "rewards"),
6664
entry("bwt", "governance")
6765
);
6866

‎score-lib/src/main/java/network/balanced/score/lib/interfaces/BalancedToken.java‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,11 @@
3333

3434
@ScoreClient
3535
@ScoreInterface
36-
public interface BalancedToken extends HubToken, IRC2BurnableInterface, GovernanceAddress, AdminAddress,
37-
BnusdAddress, OracleAddress, DexAddress, DividendsAddress, Version {
38-
39-
@External
40-
void setOracleName(String _name);
41-
42-
@External(readonly = true)
43-
String getOracleName();
36+
public interface BalancedToken extends HubToken, IRC2BurnableInterface, Version {
4437

4538
@External(readonly = true)
4639
String getPeg();
4740

48-
@External
49-
void setMinInterval(BigInteger _interval);
50-
51-
@External(readonly = true)
52-
BigInteger getMinInterval();
53-
54-
@External(readonly = true)
55-
BigInteger getPriceUpdateTime();
56-
57-
@External
58-
BigInteger priceInLoop();
59-
60-
@External(readonly = true)
61-
BigInteger lastPriceInLoop();
62-
63-
@External(readonly = true)
64-
Map<String, BigInteger> detailsBalanceOf(Address _owner);
65-
6641
@External(readonly = true)
6742
BigInteger unstakedBalanceOf(Address _owner);
6843

@@ -72,54 +47,9 @@ public interface BalancedToken extends HubToken, IRC2BurnableInterface, Governan
7247
@External(readonly = true)
7348
BigInteger availableBalanceOf(Address _owner);
7449

75-
@External(readonly = true)
76-
boolean getStakingEnabled();
77-
7850
@External(readonly = true)
7951
BigInteger totalStakedBalance();
8052

81-
@External(readonly = true)
82-
BigInteger getMinimumStake();
83-
84-
@External(readonly = true)
85-
BigInteger getUnstakingPeriod();
86-
87-
@External
88-
void toggleEnableSnapshot();
89-
90-
@External(readonly = true)
91-
boolean getSnapshotEnabled();
92-
93-
@External
94-
void toggleStakingEnabled();
95-
96-
@External
97-
void stake(BigInteger _value);
98-
99-
@External
100-
void setMinimumStake(BigInteger _amount);
101-
102-
@External
103-
void setUnstakingPeriod(BigInteger _time);
104-
105-
@External
106-
void setTimeOffset();
107-
108-
@External(readonly = true)
109-
BigInteger getTimeOffset();
110-
111-
@External(readonly = true)
112-
BigInteger getDay();
113-
114-
@External(readonly = true)
115-
BigInteger stakedBalanceOfAt(Address _account, BigInteger _day);
116-
117-
@External(readonly = true)
118-
BigInteger totalStakedBalanceOfAt(BigInteger _day);
119-
120-
@EventLog(indexed = 3)
121-
void OraclePrice(String market, String oracle_name, Address oracle_address, BigInteger price);
122-
12353
@External
12454
void setMinter(Address _address);
12555

‎score-lib/src/main/java/network/balanced/score/lib/utils/Versions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package network.balanced.score.lib.utils;
1818

1919
public class Versions {
20-
public final static String BALN = "v1.1.0";
20+
public final static String BALN = "v1.1.2";
2121
public final static String DIVIDENDS = "v1.0.0";
2222
public final static String LOANS = "v1.2.3";
2323
public final static String RESERVE = "v1.0.0";

‎test-lib/src/main/java/network/balanced/score/lib/test/integration/Balanced.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,5 @@ public void syncDistributions() {
297297

298298
public void increaseDay(int nrOfDays) {
299299
ownerClient.governance.setTimeOffset(ownerClient.governance.getTimeOffset().subtract(MICRO_SECONDS_IN_A_DAY.multiply(BigInteger.valueOf(nrOfDays))));
300-
JsonArray setTimeOffset = createSingleTransaction(baln._address(), "setTimeOffset", new JsonArray());
301-
302-
ownerClient.governance.execute(setTimeOffset.toString());
303300
}
304301
}

‎token-contracts/BalancedToken/src/intTest/java/network/balanced/score/tokens/balancedtoken/BalancedTokenImplIntTest.java‎

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -59,77 +59,6 @@ void testName() {
5959
assertEquals("Balance Token", balnScore.name());
6060
}
6161

62-
@Test
63-
@Order(2)
64-
void ShouldAUserMintAndTransferAndMakeStake() {
65-
BigInteger loanAmount = BigInteger.valueOf(50).multiply(BigInteger.TEN.pow(18));
66-
// take loans
67-
BigInteger collateral = BigInteger.valueOf(500).multiply(BigInteger.TEN.pow(18));
68-
balanced.ownerClient.stakeDepositAndBorrow(collateral, loanAmount);
69-
balanced.increaseDay(1);
70-
balanced.syncDistributions();
71-
72-
// balance token is minted in owner address
73-
balanced.ownerClient.rewards.claimRewards(null);
74-
BigInteger amountToMint = balnScore.balanceOf(Address.fromString(owner.getAddress().toString()));
75-
76-
//transfer some tokens to another user
77-
BigInteger amountToTransferToReceiver = amountToMint.divide(BigInteger.TWO);
78-
BigInteger amountRemaining = amountToMint.subtract(amountToTransferToReceiver);
79-
80-
balnScore.transfer(Address.fromString(tester.getAddress().toString()), amountToTransferToReceiver,
81-
"mole".getBytes());
82-
assertEquals(amountRemaining,
83-
balnScore.balanceOf(Address.fromString(owner.getAddress().toString())));
84-
assertEquals(amountToTransferToReceiver,
85-
balnScore.balanceOf(Address.fromString(tester.getAddress().toString())));
86-
87-
BigInteger amountToStake = amountRemaining.divide(BigInteger.TWO);
88-
BigInteger unstakedBalance = amountRemaining.subtract(amountToStake);
89-
90-
// stake some token
91-
balnScore.stake(amountToStake);
92-
93-
Map<String, BigInteger> detailsBalanceOf =
94-
balnScore.detailsBalanceOf(Address.fromString(owner.getAddress().toString()));
95-
96-
// assert if balance is staked or not.
97-
assertEquals(detailsBalanceOf.get("Staked balance"), amountToStake);
98-
assertEquals(detailsBalanceOf.get("Available balance"), unstakedBalance);
99-
assertEquals(detailsBalanceOf.get("Unstaking balance"), BigInteger.ZERO);
100-
101-
//unstake some tokens
102-
BigInteger remainingStake = amountToStake.divide(BigInteger.TWO);
103-
BigInteger unstakeAmount = amountToStake.subtract(remainingStake);
104-
balnScore.stake(remainingStake);
105-
106-
detailsBalanceOf = balnScore.detailsBalanceOf(Address.fromString(owner.getAddress().toString()));
107-
108-
// assert if balance is unstaked or not.
109-
assertEquals(detailsBalanceOf.get("Staked balance"), remainingStake);
110-
assertEquals(detailsBalanceOf.get("Available balance"), unstakedBalance);
111-
assertEquals(detailsBalanceOf.get("Unstaking balance"), unstakeAmount);
112-
113-
BigInteger totalBalance = balnScore.totalStakedBalance();
114-
// assert totalStakedBalance
115-
assertEquals(amountToStake.divide(BigInteger.TWO), totalBalance);
116-
117-
// unstake completely
118-
119-
// wait for few days
120-
balanced.increaseDay(4);
121-
balanced.syncDistributions();
122-
123-
// unstake completely
124-
balnScore.stake(BigInteger.ZERO);
125-
126-
detailsBalanceOf = balnScore.detailsBalanceOf(Address.fromString(owner.getAddress().toString()));
127-
128-
// assert if balance is unstaked or not.
129-
assertEquals(detailsBalanceOf.get("Staked balance"), BigInteger.ZERO);
130-
assertEquals(detailsBalanceOf.get("Unstaking balance"), amountToStake);
131-
}
132-
13362
@Test
13463
@Order(3)
13564
void mint() {

0 commit comments

Comments
 (0)