diff --git a/convex-core/src/main/java/convex/core/lang/Context.java b/convex-core/src/main/java/convex/core/lang/Context.java index bfb60c984..2e0328ce6 100644 --- a/convex-core/src/main/java/convex/core/lang/Context.java +++ b/convex-core/src/main/java/convex/core/lang/Context.java @@ -310,6 +310,7 @@ public static Context createInitial(State state, Address origin,long juiceLimit) *
  • Accumulates used juice fees in globals
  • *
  • Increments sequence number
  • * + * @param t * * @param initialState State before transaction execution (after prepare) * @param juicePrice Juice price of current execution @@ -320,10 +321,11 @@ public Context completeTransaction(State initialState, long juicePrice) { State state=getState(); long executionJuice=this.juice; - // TODO: Extra juice for transaction size?? + // Base fixed juice cost per transaction long trxJuice=Juice.TRANSACTION; long totalJuice=executionJuice+trxJuice; + long juiceFees=Juice.addMul(0,totalJuice,juicePrice); // compute memory delta diff --git a/convex-core/src/main/java/convex/core/lang/Juice.java b/convex-core/src/main/java/convex/core/lang/Juice.java index 422c9c401..de7ad8340 100644 --- a/convex-core/src/main/java/convex/core/lang/Juice.java +++ b/convex-core/src/main/java/convex/core/lang/Juice.java @@ -22,10 +22,17 @@ public class Juice { */ public static final long TRANSACTION = 500L; + /** + * UNDER CONSIDERATION, PROBABLY WON'T BE NEEDED + * Juice cost per byte of transaction size executed, added to consumed juice + */ + // public static final long TX_PER_BYTE = 5L; + + /** * Base Juice cost for any sub transaction executed, added to consumed juice */ - public static final long SUB_TRANSACTION = 50L; + public static final long SUB_TRANSACTION = 100L; /** * Juice required to resolve a constant value @@ -502,6 +509,4 @@ public static long calcAvailable(long balance, long juicePrice) { } - - }