Core: fix available balance check

semuxproject · Jan 17, 2019 · 454f0f9 · 454f0f9
1 parent 14a97ec
commit 454f0f9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/org/semux/core/TransactionExecutor.java b/src/main/java/org/semux/core/TransactionExecutor.java
@@ -206,14 +206,16 @@ public List<TransactionResult> execute(List<Transaction> txs, AccountState as, D
             case CALL:
             case CREATE:
                 long maxGasFee = tx.getGas() * tx.getGasPrice();
-                Amount maxCost = sum(value, Unit.NANO_SEM.of(maxGasFee));
-                if (available.equals(maxCost)) {
+
+                Amount maxCost = sum(sum(value, fee), Unit.NANO_SEM.of(maxGasFee));
+
+                if (available.lt(maxCost)) {
                     result.setCode(Code.INSUFFICIENT_AVAILABLE);
                     break;
                 }
 
-                // VM calls can still take values
-                as.adjustAvailable(from, neg(value));
+                // VM calls can have fees/values set.
+                as.adjustAvailable(from, neg(sum(value, fee)));
 
                 if (tx.getGas() > config.vmMaxBlockGasLimit()) {
                     result.setCode(Code.INVALID_GAS);