Merge branch 'develop'

CyberMiles · May 26, 2019 · be66da7 · be66da7
2 parents 656395b + c6eceef
commit be66da7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/ethereum.go b/app/ethereum.go
@@ -331,7 +331,7 @@ func (app *EthermintApplication) lowPriceTxCheck(from common.Address, tx *ethTyp
 			return errors.CodeLowGasPriceErr, "The gas price is too low for transaction"
 		}
 		// Bypass if the gasprice == 0 and gaslimit > lowPriceCap
-		if tx.GasPrice().Int64() > 0 && tx.Gas() > utils.GetParams().LowPriceTxGasLimit {
+		if (tx.GasPrice().Int64() > 0 || tx.To() == nil) && tx.Gas() > utils.GetParams().LowPriceTxGasLimit {
 			return errors.CodeHighGasLimitErr, "The gas limit is too high for low price transaction"
 		}
 		if len(lowPriceTxs) > utils.GetParams().LowPriceTxSlotsCap {

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -34,7 +34,7 @@ import:
   - types
 - package: github.com/ethereum/go-ethereum
   repo: https://github.com/second-state/lityvm.git
-  version: 1f89df98b3a4e9d0867341676ae8578b02c6b655
+  version: 557cc4935d94d6e1d6b947143788838ca98908f9
 - package: gopkg.in/urfave/cli.v1
   version: 1.x
 - package: github.com/mattn/go-sqlite3