Skip to content

Commit 08fc732

Browse files
committed
WIP
1 parent 094861e commit 08fc732

4 files changed

Lines changed: 42 additions & 608 deletions

File tree

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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,24 @@ public class Balanced {
8888

8989
public Balanced() throws Exception {
9090
balancedClients = new HashMap<>();
91-
owner = createWalletWithBalance(BigInteger.TEN.pow(25));
91+
// owner = createWalletWithBalance(BigInteger.TEN.pow(25));
9292
}
9393

94+
private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
95+
public static String bytesToHex(byte[] bytes) {
96+
char[] hexChars = new char[bytes.length * 2];
97+
for (int j = 0; j < bytes.length; j++) {
98+
int v = bytes[j] & 0xFF;
99+
hexChars[j * 2] = HEX_ARRAY[v >>> 4];
100+
hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
101+
}
102+
return new String(hexChars);
103+
}
104+
105+
94106
public void setupBalanced() throws Exception {
107+
System.out.println(bytesToHex(getContractData("BalancedToken")));
108+
int i = 1/0;
95109
registerPreps();
96110
deployContracts();
97111
setupAddresses();

0 commit comments

Comments
 (0)