add missing activation check

joaquinlpereyra-iov · joaquinlpereyra-iov · commit 09d13073087e · 2019-12-10T12:50:02.000-03:00
diff --git a/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java b/rskj-core/src/main/java/org/ethereum/core/TransactionExecutor.java
@@ -571,7 +571,10 @@ public ProgramResult getResult() {
     }
 
     public long getGasUsed() {
-        return GasCost.subtract(GasCost.toGas(tx.getGasLimit()), mEndGas);
+        if (activations.isActive(ConsensusRule.RSKIP136)) {
+            return GasCost.subtract(GasCost.toGas(tx.getGasLimit()), mEndGas);
+        }
+        return toBI(tx.getGasLimit()).subtract(toBI(mEndGas)).longValue();
     }
 
     public Coin getPaidFees() { return paidFees; }

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,10 @@ public ProgramResult getResult() {`
`571`	`571`	`}`
`572`	`572`
`573`	`573`	`public long getGasUsed() {`
`574`		`- return GasCost.subtract(GasCost.toGas(tx.getGasLimit()), mEndGas);`
	`574`	`+ if (activations.isActive(ConsensusRule.RSKIP136)) {`
	`575`	`+ return GasCost.subtract(GasCost.toGas(tx.getGasLimit()), mEndGas);`
	`576`	`+ }`
	`577`	`+ return toBI(tx.getGasLimit()).subtract(toBI(mEndGas)).longValue();`
`575`	`578`	`}`
`576`	`579`
`577`	`580`	`public Coin getPaidFees() { return paidFees; }`