poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Quad mem & log changes

This commit is contained in:
obscuren 2015-03-03 11:56:43 +01:00
parent 49da6a8d80
commit ba0a758d8c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vm/common.go
View File

@ -41,13 +41,14 @@ var (
GasStorageGet = big.NewInt(50) GasStorageGet = big.NewInt(50)
GasStorageAdd = big.NewInt(20000) GasStorageAdd = big.NewInt(20000)
GasStorageMod = big.NewInt(5000) GasStorageMod = big.NewInt(5000)
GasLogBase = big.NewInt(2000) GasLogBase = big.NewInt(375)
GasLogTopic = big.NewInt(2000) GasLogTopic = big.NewInt(375)
GasLogByte = big.NewInt(8) GasLogByte = big.NewInt(8)
GasCreate = big.NewInt(32000) GasCreate = big.NewInt(32000)
GasCreateByte = big.NewInt(300) GasCreateByte = big.NewInt(300)
GasCall = big.NewInt(40) GasCall = big.NewInt(40)
GasCallValueTransfer = big.NewInt(6700) GasCallValueTransfer = big.NewInt(9000)
GasStipend = big.NewInt(2300)
GasCallNewAccount = big.NewInt(25000) GasCallNewAccount = big.NewInt(25000)
GasReturn = big.NewInt(0) GasReturn = big.NewInt(0)
GasStop = big.NewInt(0) GasStop = big.NewInt(0)

18
vm/vm.go
View File

@ -399,7 +399,7 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
stack.Push(ethutil.BigD(data)) stack.Push(ethutil.BigD(data))
self.Printf(" => %x", data) self.Printf(" => (%v) %x", size, data)
// 0x30 range // 0x30 range
case ADDRESS: case ADDRESS:
stack.Push(ethutil.BigD(context.Address())) stack.Push(ethutil.BigD(context.Address()))
@ -690,6 +690,10 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
// Get the arguments from the memory // Get the arguments from the memory
args := mem.Get(inOffset.Int64(), inSize.Int64()) args := mem.Get(inOffset.Int64(), inSize.Int64())
if len(value.Bytes()) > 0 {
gas.Add(gas, GasStipend)
}
var ( var (
ret []byte ret []byte
err error err error
@ -938,7 +942,7 @@ func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCo
gas.Add(gas, GasCallNewAccount) gas.Add(gas, GasCallNewAccount)
} }
if len(stack.data[stack.Len()-1].Bytes()) > 0 { if len(stack.data[stack.Len()-3].Bytes()) > 0 {
gas.Add(gas, GasCallValueTransfer) gas.Add(gas, GasCallValueTransfer)
} }
} }
@ -951,7 +955,8 @@ func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCo
} }
if newMemSize.Cmp(ethutil.Big0) > 0 { if newMemSize.Cmp(ethutil.Big0) > 0 {
newMemSize = toWordSize(newMemSize) newMemSizeWords := toWordSize(newMemSize)
newMemSize.Mul(newMemSizeWords, u256(32))
if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 { if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
//memGasUsage := new(big.Int).Sub(newMemSize, u256(int64(mem.Len()))) //memGasUsage := new(big.Int).Sub(newMemSize, u256(int64(mem.Len())))
@ -959,20 +964,19 @@ func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCo
//memGasUsage.Div(memGasUsage, u256(32)) //memGasUsage.Div(memGasUsage, u256(32))
//Old: full_memory_gas_cost = W + floor(W*W / 1024), W = words in memory //Old: full_memory_gas_cost = W + floor(W*W / 1024), W = words in memory
pow := new(big.Int).Exp(oldSize, ethutil.Big2, Zero)
oldSize := toWordSize(big.NewInt(int64(mem.Len()))) oldSize := toWordSize(big.NewInt(int64(mem.Len())))
pow := new(big.Int).Exp(oldSize, ethutil.Big2, Zero)
linCoef := new(big.Int).Mul(oldSize, GasMemWord) linCoef := new(big.Int).Mul(oldSize, GasMemWord)
quadCoef := new(big.Int).Div(pow, GasQuadCoeffDenom) quadCoef := new(big.Int).Div(pow, GasQuadCoeffDenom)
oldTotalFee := new(big.Int).Add(linCoef, quadCoef) oldTotalFee := new(big.Int).Add(linCoef, quadCoef)
pow.Exp(newMemSize, ethutil.Big2, Zero) pow.Exp(newMemSizeWords, ethutil.Big2, Zero)
linCoef = new(big.Int).Mul(newMemSize, GasMemWord) linCoef = new(big.Int).Mul(newMemSizeWords, GasMemWord)
quadCoef = new(big.Int).Div(pow, GasQuadCoeffDenom) quadCoef = new(big.Int).Div(pow, GasQuadCoeffDenom)
newTotalFee := new(big.Int).Add(linCoef, quadCoef) newTotalFee := new(big.Int).Add(linCoef, quadCoef)
gas.Add(gas, new(big.Int).Sub(newTotalFee, oldTotalFee)) gas.Add(gas, new(big.Int).Sub(newTotalFee, oldTotalFee))
} }
} }
return newMemSize, gas return newMemSize, gas