aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-10 03:27:57 +0800
committerobscuren <geffobscura@gmail.com>2014-12-10 03:27:57 +0800
commitacf4b5753fd473f048176a12c42e1b8209035b57 (patch)
treeed9b73ea5a69684e40cfdb546cf729cd29f88db5 /vm
parent76842b0df8b5605682362bd57fbd6eb315bcaf1f (diff)
downloaddexon-acf4b5753fd473f048176a12c42e1b8209035b57.tar
dexon-acf4b5753fd473f048176a12c42e1b8209035b57.tar.gz
dexon-acf4b5753fd473f048176a12c42e1b8209035b57.tar.bz2
dexon-acf4b5753fd473f048176a12c42e1b8209035b57.tar.lz
dexon-acf4b5753fd473f048176a12c42e1b8209035b57.tar.xz
dexon-acf4b5753fd473f048176a12c42e1b8209035b57.tar.zst
dexon-acf4b5753fd473f048176a12c42e1b8209035b57.zip
Core changes
* Code = '' if gas < len(D) * 5 * Sha3 gas 10 + 10 * len(D), rounding up 32 bytes * Sha256 gas 50 + 50 * len(D), rounding up 32 bytes * Ripmed gas 50 + 50 * len(D), rounding up 32 bytes * Accounts and value transfers no longer reverted
Diffstat (limited to 'vm')
-rw-r--r--vm/address.go18
-rw-r--r--vm/common.go7
-rw-r--r--vm/vm_debug.go14
3 files changed, 32 insertions, 7 deletions
diff --git a/vm/address.go b/vm/address.go
index 06bd35f6b..be8921a3b 100644
--- a/vm/address.go
+++ b/vm/address.go
@@ -12,7 +12,7 @@ type Address interface {
}
type PrecompiledAddress struct {
- Gas *big.Int
+ Gas func(l int) *big.Int
fn func(in []byte) []byte
}
@@ -21,9 +21,19 @@ func (self PrecompiledAddress) Call(in []byte) []byte {
}
var Precompiled = map[uint64]*PrecompiledAddress{
- 1: &PrecompiledAddress{big.NewInt(500), ecrecoverFunc},
- 2: &PrecompiledAddress{big.NewInt(100), sha256Func},
- 3: &PrecompiledAddress{big.NewInt(100), ripemd160Func},
+ 1: &PrecompiledAddress{func(l int) *big.Int {
+ return GasEcrecover
+ }, ecrecoverFunc},
+ 2: &PrecompiledAddress{func(l int) *big.Int {
+ n := big.NewInt(int64(l+31)/32 + 1)
+ n.Mul(n, GasSha256)
+ return n
+ }, sha256Func},
+ 3: &PrecompiledAddress{func(l int) *big.Int {
+ n := big.NewInt(int64(l+31)/32 + 1)
+ n.Mul(n, GasRipemd)
+ return n
+ }, ripemd160Func},
}
func sha256Func(in []byte) []byte {
diff --git a/vm/common.go b/vm/common.go
index 9514ff6d3..5fd512687 100644
--- a/vm/common.go
+++ b/vm/common.go
@@ -27,10 +27,17 @@ var (
GasBalance = big.NewInt(20)
GasCreate = big.NewInt(100)
GasCall = big.NewInt(20)
+ GasCreateByte = big.NewInt(5)
+ GasSha3Byte = big.NewInt(10)
+ GasSha256Byte = big.NewInt(50)
+ GasRipemdByte = big.NewInt(50)
GasMemory = big.NewInt(1)
GasData = big.NewInt(5)
GasTx = big.NewInt(500)
GasLog = big.NewInt(32)
+ GasSha256 = big.NewInt(50)
+ GasRipemd = big.NewInt(50)
+ GasEcrecover = big.NewInt(100)
Pow256 = ethutil.BigPow(2, 256)
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
index be1c59339..c0a2d6d98 100644
--- a/vm/vm_debug.go
+++ b/vm/vm_debug.go
@@ -254,9 +254,12 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
newMemSize.Mul(newMemSize, u256(32))
switch op {
- // Additional gas usage on *CODPY
case CALLDATACOPY, CODECOPY, EXTCODECOPY:
addStepGasUsage(new(big.Int).Div(newMemSize, u256(32)))
+ case SHA3:
+ g := new(big.Int).Div(newMemSize, u256(32))
+ g.Mul(g, GasSha3Byte)
+ addStepGasUsage(g)
}
if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
@@ -833,8 +836,13 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
self.Printf("CREATE err %v", err)
} else {
- ref.SetCode(ret)
- msg.Output = ret
+ // gas < len(ret) * CreateDataGas == NO_CODE
+ dataGas := big.NewInt(int64(len(ret)))
+ dataGas.Mul(dataGas, GasCreateByte)
+ if closure.UseGas(dataGas) {
+ ref.SetCode(ret)
+ msg.Output = ret
+ }
stack.Push(ethutil.BigD(addr))
}