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

PUSH gas fix

This commit is contained in:
obscuren 2015-03-27 16:53:05 +01:00
parent df648cbc60
commit 3ea8c7301e
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/vm/gas.go
View File

@ -61,8 +61,8 @@ func baseCheck(op OpCode, stack *stack, gas *big.Int) error {
if op >= PUSH1 && op <= PUSH32 { if op >= PUSH1 && op <= PUSH32 {
op = PUSH1 op = PUSH1
} }
if op >= SWAP1 && op <= SWAP16 { if op >= DUP1 && op <= DUP16 {
op = SWAP1 op = DUP1
} }
if r, ok := _baseCheck[op]; ok { if r, ok := _baseCheck[op]; ok {
@ -71,7 +71,7 @@ func baseCheck(op OpCode, stack *stack, gas *big.Int) error {
return err return err
} }
if r.stackPush && len(stack.data)-r.stackPop == 1024 { if r.stackPush && len(stack.data)-r.stackPop+1 > 1024 {
return fmt.Errorf("stack limit reached (%d)", maxStack) return fmt.Errorf("stack limit reached (%d)", maxStack)
} }
@ -154,6 +154,6 @@ var _baseCheck = map[OpCode]req{
JUMPDEST: {0, GasJumpDest, false}, JUMPDEST: {0, GasJumpDest, false},
SUICIDE: {1, Zero, false}, SUICIDE: {1, Zero, false},
RETURN: {2, Zero, false}, RETURN: {2, Zero, false},
PUSH1: {0, GasFastStep, true}, PUSH1: {0, GasFastestStep, true},
DUP1: {0, Zero, true}, DUP1: {0, Zero, true},
} }

18
core/vm/vm.go
View File

@ -45,23 +45,7 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
self.Printf("(%d) (%x) %x (code=%d) gas: %v (d) %x", self.env.Depth(), caller.Address().Bytes()[:4], context.Address(), len(code), context.Gas, callData).Endl() self.Printf("(%d) (%x) %x (code=%d) gas: %v (d) %x", self.env.Depth(), caller.Address().Bytes()[:4], context.Address(), len(code), context.Gas, callData).Endl()
/* // User defer pattern to check for an error and, based on the error being nil or not, use all gas and return.
if self.Recoverable {
// Recover from any require exception
defer func() {
if r := recover(); r != nil {
self.Printf(" %v", r).Endl()
context.UseGas(context.Gas)
ret = context.Return(nil)
err = fmt.Errorf("%v", r)
}
}()
}
*/
defer func() { defer func() {
if err != nil { if err != nil {
self.Printf(" %v", err).Endl() self.Printf(" %v", err).Endl()