Updates to improve juice fees

convex-core/src/main/java/convex/core/Constants.java

@@ -36,11 +36,6 @@ public class Constants {
 	 */
 	public static final long INITIAL_TIMESTAMP = Instant.parse("2020-02-02T00:20:20.0202Z").toEpochMilli();
 
-	/**
-	 * Base juice cost per top level transaction
-	 */
-	public static final long BASE_TRANSACTION_JUICE = 500L;
-
 	/**
 	 * Juice price in the initial Genesis State
 	 */

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

@@ -556,7 +556,7 @@ private Context prepareTransaction(ATransaction t, long juicePrice) {
 		long balance=account.getBalance();
 		long juiceLimit=Juice.calcAvailable(balance, juicePrice);
 		juiceLimit=Math.min(Constants.MAX_TRANSACTION_JUICE,juiceLimit);
-		long initialJuice=Constants.BASE_TRANSACTION_JUICE;
+		long initialJuice=0;
 		if (juiceLimit<=initialJuice) {
 			return Context.createFake(this,origin).withJuiceError();
 		}

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

@@ -321,7 +321,7 @@ public Context completeTransaction(State initialState, long juicePrice) {
 		long executionJuice=this.juice;
 
 		// TODO: Extra juice for transaction size??
-		long trxJuice=Juice.BASE_TRANSACTION_JUICE;
+		long trxJuice=Juice.TRANSACTION;
 
 		long totalJuice=executionJuice+trxJuice;
 		long juiceFees=Juice.addMul(0,totalJuice,juicePrice);
@@ -379,10 +379,9 @@ public Context completeTransaction(State initialState, long juicePrice) {
 		state=state.putAccount(address,account);
 
 		// maybe add used juice to miner fees
-		if (executionJuice>0L) {
-			long transactionFees = executionJuice*juicePrice;
+		if (juiceFees>0L) {
 			long oldFees=state.getGlobalFees().longValue();
-			long newFees=oldFees+transactionFees;
+			long newFees=oldFees+juiceFees;
 			state=state.withGlobalFees(CVMLong.create(newFees));
 		}
 

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

@@ -16,6 +16,17 @@
  *  
  */
 public class Juice {
+
+	/**
+	 * Base Juice cost for any top level transaction, added to consumed juice
+	 */
+	public static final long TRANSACTION = 500L;
+
+	/**
+	 * Base Juice cost for any sub transaction executed, added to consumed juice
+	 */
+	public static final long SUB_TRANSACTION = 50L;
+
 	/**
 	 * Juice required to resolve a constant value
 	 * 
@@ -486,14 +497,10 @@ private static long costNumeric(ACell a) {
 	 * @return Available juice
 	 */
 	public static long calcAvailable(long balance, long juicePrice) {
-		long limit = (balance/juicePrice)-Juice.BASE_TRANSACTION_JUICE;
+		long limit = (balance/juicePrice)-Juice.TRANSACTION;
 		return Math.max(0, limit);
 	}
 
-	/**
-	 * Base Juice cost for any transaction, added to consumed juice
-	 */
-	public static final long BASE_TRANSACTION_JUICE = 0;
 
 
 

convex-core/src/test/java/convex/core/StateTransitionsTest.java

@@ -29,7 +29,6 @@
 import convex.core.transactions.ATransaction;
 import convex.core.transactions.Invoke;
 import convex.core.transactions.Transfer;
-import convex.core.util.Utils;
 
 /**
  * Tests for State transition scenarios
@@ -77,7 +76,7 @@ public void testAccountTransfers() throws BadSignatureException {
 		assertNull(s.getBalance(ADDRESS_C));
 
 		long JPRICE=s.getJuicePrice().longValue(); // Juice price
-		long TCOST = (Constants.BASE_TRANSACTION_JUICE+ Juice.TRANSFER) * JPRICE;
+		long TCOST = (Juice.TRANSACTION + Juice.TRANSFER) * JPRICE;
 		long AMT=50; // Amount for small transfers
 
 		{ // transfer from existing to existing account A->B

convex-core/src/test/java/convex/core/TransactionTest.java

@@ -51,12 +51,16 @@ protected State apply(ATransaction t) {
 	@Test 
 	public void testTransfer() {
 		long AMT=999;
+		long IBAL=state().getAccount(HERO).getBalance();
 		Transfer t1=Transfer.create(HERO, 1, VILLAIN, AMT);
 		State s=apply(t1);
-		long expectedFees=(Constants.BASE_TRANSACTION_JUICE+Juice.TRANSFER)*JP;
-		assertEquals(AMT+expectedFees,state().getAccount(HERO).getBalance()-s.getAccount(HERO).getBalance());
+		long expectedFees=(Juice.TRANSACTION+Juice.TRANSFER)*JP;
 		assertEquals(expectedFees,s.getGlobalFees().longValue());
 
+		long NBAL=s.getAccount(HERO).getBalance();
+		long balanceDrop=IBAL-NBAL;
+		assertEquals(AMT+expectedFees,balanceDrop);
+
 		// We expect a Transfer to be completely encoded
 		assertTrue(t1.isCompletelyEncoded());
 

convex-core/src/test/java/convex/core/cpos/BeliefMergeTest.java

@@ -224,7 +224,7 @@ public void testSingleBlockConsensus() throws Exception {
 		long INITIAL_BALANCE_PROPOSER = INITIAL_STATE.getBalance(PADDRESS);
 		long INITIAL_BALANCE_RECEIVER = INITIAL_STATE.getBalance(RADDRESS);
 		long TRANSFER_AMOUNT = 100;
-		long TJUICE=Constants.BASE_TRANSACTION_JUICE+Juice.TRANSFER;
+		long TJUICE=Juice.TRANSACTION+Juice.TRANSFER;
 
 		ATransaction trans = Transfer.create(PADDRESS, 1, RADDRESS, TRANSFER_AMOUNT); // note 1 = first sequence number required
 		Peer[] bs3 = proposeTransactions(bs2, PROPOSER, trans);
@@ -309,7 +309,7 @@ public void testMultiBlockConsensus() throws Exception {
 		AccountKey RKEY = KEYS[RECEIVER];
 		Long INITIAL_BALANCE_PROPOSER = INITIAL_STATE.getBalance(PADDRESS);
 		Long INITIAL_BALANCE_RECEIVER = INITIAL_STATE.getBalance(RADDRESS);
-		long TJUICE=Constants.BASE_TRANSACTION_JUICE+Juice.TRANSFER;
+		long TJUICE=Juice.TRANSACTION+Juice.TRANSFER;
 
 		Peer[] bs3 = bs2;
 		for (int i = 0; i < NUM_PEERS; i++) {
@@ -412,7 +412,7 @@ public void testGossipConsensus() throws Exception {
 		AccountKey RKEY = KEYS[RECEIVER];
 		long INITIAL_BALANCE_PROPOSER = INITIAL_STATE.getBalance(PADDRESS);
 		long INITIAL_BALANCE_RECEIVER = INITIAL_STATE.getBalance(RADDRESS);
-		long expectedJuice=(Constants.BASE_TRANSACTION_JUICE+Juice.TRANSFER)*(NUM_INITIAL_TRANS+TX_ROUNDS);
+		long expectedJuice=(Juice.TRANSACTION+Juice.TRANSFER)*(NUM_INITIAL_TRANS+TX_ROUNDS);
 
 
 		Peer[] bs3 = bs2;