More support for peer staking in GUI

Author: mikera

convex-benchmarks/src/main/java/convex/benchmarks/BigBlockBenchmark.java

@@ -12,7 +12,7 @@
 import convex.core.cpos.BlockResult;
 import convex.core.cvm.State;
 import convex.core.crypto.AKeyPair;
-import convex.core.data.AccountStatus;
+import convex.core.cvm.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Cells;
 import convex.core.data.SignedData;

convex-cli/src/test/java/convex/cli/account/AccountTest.java

@@ -13,7 +13,6 @@
 import convex.cli.CLTester;
 import convex.cli.ExitCodes;
 import convex.core.crypto.AKeyPair;
-import convex.core.data.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Keyword;
 import convex.core.data.Keywords;
@@ -42,7 +41,7 @@ public static void setupPeer() throws LaunchException, ConfigException, Interrup
 	public void testBalance() {
 		CLTester tester;;
 
-		AccountStatus as=SERVER.getPeer().getConsensusState().getAccount(Address.create(11));
+		convex.core.cvm.AccountStatus as=SERVER.getPeer().getConsensusState().getAccount(Address.create(11));
 		tester =  CLTester.run(
 				"account", 
 				"balance",

convex-core/src/main/java/convex/core/cpos/BeliefMerge.java

@@ -9,6 +9,7 @@
 import java.util.function.Function;
 
 import convex.core.crypto.AKeyPair;
+import convex.core.cvm.PeerStatus;
 import convex.core.cvm.State;
 import convex.core.data.ABlob;
 import convex.core.data.ACell;
@@ -17,7 +18,6 @@
 import convex.core.data.AccountKey;
 import convex.core.data.Index;
 import convex.core.data.MapEntry;
-import convex.core.data.PeerStatus;
 import convex.core.data.SignedData;
 import convex.core.exceptions.BadSignatureException;
 import convex.core.exceptions.InvalidDataException;

convex-core/src/main/java/convex/core/data/AccountStatus.java renamed to convex-core/src/main/java/convex/core/cvm/AccountStatus.java

@@ -1,7 +1,25 @@
-package convex.core.data;
+package convex.core.cvm;
 
 import convex.core.Coin;
 import convex.core.Constants;
+import convex.core.data.ACell;
+import convex.core.data.AHashMap;
+import convex.core.data.ARecord;
+import convex.core.data.ASet;
+import convex.core.data.AccountKey;
+import convex.core.data.Address;
+import convex.core.data.Blob;
+import convex.core.data.Cells;
+import convex.core.data.Format;
+import convex.core.data.IRefFunction;
+import convex.core.data.Index;
+import convex.core.data.Keyword;
+import convex.core.data.Keywords;
+import convex.core.data.Maps;
+import convex.core.data.Ref;
+import convex.core.data.Sets;
+import convex.core.data.Symbol;
+import convex.core.data.Tag;
 import convex.core.data.prim.CVMLong;
 import convex.core.exceptions.BadFormatException;
 import convex.core.exceptions.InvalidDataException;

convex-core/src/main/java/convex/core/cvm/Peer.java

@@ -19,13 +19,11 @@
 import convex.core.data.AMap;
 import convex.core.data.AVector;
 import convex.core.data.AccountKey;
-import convex.core.data.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Hash;
 import convex.core.data.Keyword;
 import convex.core.data.Keywords;
 import convex.core.data.Maps;
-import convex.core.data.PeerStatus;
 import convex.core.data.Ref;
 import convex.core.data.SignedData;
 import convex.core.data.Vectors;

convex-core/src/main/java/convex/core/data/PeerStatus.java renamed to convex-core/src/main/java/convex/core/cvm/PeerStatus.java

@@ -1,11 +1,28 @@
-package convex.core.data;
+package convex.core.cvm;
 
 import convex.core.cpos.CPoSConstants;
+import convex.core.data.ACell;
+import convex.core.data.AHashMap;
+import convex.core.data.ARecord;
+import convex.core.data.AString;
+import convex.core.data.Address;
+import convex.core.data.Blob;
+import convex.core.data.Cells;
+import convex.core.data.Format;
+import convex.core.data.Hash;
+import convex.core.data.IRefFunction;
+import convex.core.data.Index;
+import convex.core.data.Keyword;
+import convex.core.data.Keywords;
+import convex.core.data.Maps;
+import convex.core.data.Ref;
+import convex.core.data.Tag;
 import convex.core.data.prim.CVMLong;
 import convex.core.exceptions.BadFormatException;
 import convex.core.exceptions.InvalidDataException;
 import convex.core.lang.RT;
 import convex.core.lang.RecordFormat;
+import convex.core.util.Utils;
 
 /**
  * Class describing the on-chain state of a Peer declared on the network.
@@ -96,8 +113,10 @@ public Index<Address,CVMLong> getStakes() {
 	 * @return Own stake, excluding delegated stake
 	 */
 	public long getPeerStake() {
-		// TODO: include rewards?
-		return peerStake;
+		long totalShares=peerStake+delegatedStake;
+		if (totalShares<=0) return 0; // nobody has any stake. Negative should not be possible, just in case
+		
+		return Utils.mulDiv(balance,peerStake,totalShares);
 	}
 
 	/**
@@ -109,11 +128,12 @@ public long getPeerStake() {
 	 * @return Value of delegated stake
 	 */
 	public long getDelegatedStake(Address delegator) {
-		// TODO: include rewards?
-
+		if (delegatedStake<=0) return 0; // nobody has any delegated stake. Negative should not be possible, just in case
 		CVMLong a = stakes.get(delegator);
 		if (a == null) return 0;
-		return a.longValue();
+		
+		long delShares=a.longValue();
+		return Utils.mulDiv(balance-getPeerStake(),delShares,delegatedStake);
 	}
 
 	/**

convex-core/src/main/java/convex/core/cvm/State.java

@@ -22,7 +22,6 @@
 import convex.core.data.ARecord;
 import convex.core.data.AVector;
 import convex.core.data.AccountKey;
-import convex.core.data.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Blob;
 import convex.core.data.Cells;
@@ -33,7 +32,6 @@
 import convex.core.data.Keyword;
 import convex.core.data.Keywords;
 import convex.core.data.MapEntry;
-import convex.core.data.PeerStatus;
 import convex.core.data.Ref;
 import convex.core.data.SignedData;
 import convex.core.data.Strings;

convex-core/src/main/java/convex/core/data/Format.java

@@ -13,6 +13,8 @@
 import convex.core.cpos.Block;
 import convex.core.cpos.BlockResult;
 import convex.core.cpos.Order;
+import convex.core.cvm.AccountStatus;
+import convex.core.cvm.PeerStatus;
 import convex.core.cvm.Receipt;
 import convex.core.cvm.State;
 import convex.core.data.prim.AByteFlag;

convex-core/src/main/java/convex/core/init/Init.java

@@ -5,16 +5,16 @@
 
 import convex.core.Coin;
 import convex.core.Constants;
+import convex.core.cvm.AccountStatus;
+import convex.core.cvm.PeerStatus;
 import convex.core.cvm.State;
 import convex.core.data.ABlob;
 import convex.core.data.ACell;
 import convex.core.data.AList;
 import convex.core.data.AVector;
 import convex.core.data.AccountKey;
-import convex.core.data.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Index;
-import convex.core.data.PeerStatus;
 import convex.core.data.Symbol;
 import convex.core.data.Vectors;
 import convex.core.lang.Code;

convex-core/src/main/java/convex/core/lang/Context.java

@@ -6,6 +6,8 @@
 import convex.core.ResultContext;
 import convex.core.SourceCodes;
 import convex.core.cpos.CPoSConstants;
+import convex.core.cvm.AccountStatus;
+import convex.core.cvm.PeerStatus;
 import convex.core.cvm.State;
 import convex.core.data.ACell;
 import convex.core.data.AHashMap;
@@ -14,15 +16,13 @@
 import convex.core.data.AString;
 import convex.core.data.AVector;
 import convex.core.data.AccountKey;
-import convex.core.data.AccountStatus;
 import convex.core.data.Address;
 import convex.core.data.Hash;
 import convex.core.data.Index;
 import convex.core.data.Keyword;
 import convex.core.data.Keywords;
 import convex.core.data.MapEntry;
 import convex.core.data.Maps;
-import convex.core.data.PeerStatus;
 import convex.core.data.Strings;
 import convex.core.data.Symbol;
 import convex.core.data.Syntax;