forked from cerc-io/plugeth
Merge branch 'develop' into poc8
This commit is contained in:
commit
a9068aa8ff
@ -95,11 +95,16 @@ func RunVmTest(js string) (failed int) {
|
|||||||
failed = 1
|
failed = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(test.Gas) == 0 && err == nil {
|
||||||
|
log.Printf("0 gas indicates error but no error given by VM")
|
||||||
|
failed = 1
|
||||||
|
} else {
|
||||||
gexp := ethutil.Big(test.Gas)
|
gexp := ethutil.Big(test.Gas)
|
||||||
if gexp.Cmp(gas) != 0 {
|
if gexp.Cmp(gas) != 0 {
|
||||||
log.Printf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
|
log.Printf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
|
||||||
failed = 1
|
failed = 1
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for addr, account := range test.Post {
|
for addr, account := range test.Post {
|
||||||
obj := state.GetStateObject(helper.FromHex(addr))
|
obj := state.GetStateObject(helper.FromHex(addr))
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
{
|
|
||||||
"randomVMtest" : {
|
|
||||||
"callcreates" : [
|
|
||||||
],
|
|
||||||
"env" : {
|
|
||||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
|
||||||
"currentDifficulty" : "256",
|
|
||||||
"currentGasLimit" : "1000000",
|
|
||||||
"currentNumber" : "0",
|
|
||||||
"currentTimestamp" : "1",
|
|
||||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
|
||||||
},
|
|
||||||
"exec" : {
|
|
||||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
|
||||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
|
||||||
"code" : "0x675545",
|
|
||||||
"data" : "0x",
|
|
||||||
"gas" : "10000",
|
|
||||||
"gasPrice" : "100000000000000",
|
|
||||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
|
||||||
"value" : "1000000000000000000"
|
|
||||||
},
|
|
||||||
"gas" : "9999",
|
|
||||||
"logs" : [
|
|
||||||
],
|
|
||||||
"out" : "0x",
|
|
||||||
"post" : {
|
|
||||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
|
||||||
"balance" : "1000000000000000000",
|
|
||||||
"code" : "0x675545",
|
|
||||||
"nonce" : "0",
|
|
||||||
"storage" : {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pre" : {
|
|
||||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
|
||||||
"balance" : "1000000000000000000",
|
|
||||||
"code" : "0x675545",
|
|
||||||
"nonce" : "0",
|
|
||||||
"storage" : {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -140,7 +140,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
|
|||||||
// Stack checks only
|
// Stack checks only
|
||||||
case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1
|
case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1
|
||||||
require(1)
|
require(1)
|
||||||
case ADD, SUB, DIV, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE: // 2
|
case ADD, SUB, DIV, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE, SIGNEXTEND: // 2
|
||||||
require(2)
|
require(2)
|
||||||
case ADDMOD, MULMOD: // 3
|
case ADDMOD, MULMOD: // 3
|
||||||
require(3)
|
require(3)
|
||||||
|
Loading…
Reference in New Issue
Block a user