core: optimize IntrinsicGas

0b22ad99 · Felix Lange · Jeffrey Wilcke · a8889b09 · 0b22ad99
Commit 0b22ad99 authored Jun 25, 2015 by Felix Lange Committed by Jeffrey Wilcke Jun 29, 2015
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

state_transition.go core/state_transition.go +12 -5

No files found.
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -77,12 +77,19 @@ func MessageGasValue(msg Message) *big.Int {
 // with the given data.
 func IntrinsicGas(data []byte) *big.Int {
 	igas := new(big.Int).Set(params.TxGas)
+	if len(data) > 0 {
+		var nz int64
 		for _, byt := range data {
 			if byt != 0 {
-			igas.Add(igas, params.TxDataNonZeroGas)
+				nz++
-		} else {
+			}
-			igas.Add(igas, params.TxDataZeroGas)
 		}
+		m := big.NewInt(nz)
+		m.Mul(m, params.TxDataNonZeroGas)
+		igas.Add(igas, m)
+		m.SetInt64(int64(len(data)) - nz)
+		m.Mul(m, params.TxDataZeroGas)
+		igas.Add(igas, m)
 	}
 	return igas
 }