diff options
| -rw-r--r-- | tests/helper/vm.go | 15 | ||||
| -rw-r--r-- | tests/vm/gh_test.go | 69 | ||||
| -rw-r--r-- | vm/address.go | 8 | ||||
| -rw-r--r-- | vm/execution.go | 1 |
4 files changed, 86 insertions, 7 deletions
diff --git a/tests/helper/vm.go b/tests/helper/vm.go index 270fe5470..b4ad93193 100644 --- a/tests/helper/vm.go +++ b/tests/helper/vm.go @@ -3,6 +3,7 @@ package helper import ( "math/big" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/vm" @@ -66,3 +67,17 @@ func RunVm(state *state.State, env, exec map[string]string) ([]byte, *big.Int, e return ret, execution.Gas, err } + +func RunState(state *state.State, env, tx map[string]string) ([]byte, *big.Int, error) { + address := FromHex(tx["to"]) + keyPair, _ := crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(tx["secretKey"]))) + caller := state.GetOrNewStateObject(keyPair.Address()) + + vmenv := NewEnvFromMap(state, env, tx) + vmenv.origin = caller.Address() + evm := vm.New(vmenv, vm.DebugVmTy) + execution := vm.NewExecution(evm, address, FromHex(tx["data"]), ethutil.Big(tx["gasLimit"]), ethutil.Big(tx["gasPrice"]), ethutil.Big(tx["value"])) + ret, err := execution.Exec(address, caller) + + return ret, execution.Gas, err +} diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index eb641b034..7e6160860 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -2,6 +2,8 @@ package vm import ( "bytes" + "math/big" + "strconv" "testing" "github.com/ethereum/go-ethereum/ethutil" @@ -29,10 +31,21 @@ func StateObjectFromAccount(addr string, account Account) *state.StateObject { return obj } +type Env struct { + CurrentCoinbase string + CurrentDifficulty string + CurrentGasLimit string + CurrentNumber string + CurrentTimestamp interface{} + PreviousHash string +} + type VmTest struct { Callcreates interface{} - Env map[string]string + //Env map[string]string + Env Env Exec map[string]string + Transaction map[string]string Gas string Out string Post map[string]Account @@ -50,7 +63,31 @@ func RunVmTest(p string, t *testing.T) { state.SetStateObject(obj) } - ret, gas, err := helper.RunVm(state, test.Env, test.Exec) + // XXX Yeah, yeah... + env := make(map[string]string) + env["currentCoinbase"] = test.Env.CurrentCoinbase + env["currentDifficulty"] = test.Env.CurrentDifficulty + env["currentGasLimit"] = test.Env.CurrentGasLimit + env["currentNumber"] = test.Env.CurrentNumber + env["previousHash"] = test.Env.PreviousHash + if n, ok := test.Env.CurrentTimestamp.(float64); ok { + env["currentTimestamp"] = strconv.Itoa(int(n)) + } else { + env["currentTimestamp"] = test.Env.CurrentTimestamp.(string) + } + + var ( + ret []byte + gas *big.Int + err error + ) + + if len(test.Exec) > 0 { + ret, gas, err = helper.RunVm(state, env, test.Exec) + } else { + ret, gas, err = helper.RunState(state, env, test.Transaction) + } + // When an error is returned it doesn't always mean the tests fails. // Have to come up with some conditional failing mechanism. if err != nil { @@ -62,9 +99,11 @@ func RunVmTest(p string, t *testing.T) { t.Errorf("%s's return failed. Expected %x, got %x\n", name, rexp, ret) } - gexp := ethutil.Big(test.Gas) - if gexp.Cmp(gas) != 0 { - t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas) + if len(test.Gas) > 0 { + gexp := ethutil.Big(test.Gas) + if gexp.Cmp(gas) != 0 { + t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas) + } } for addr, account := range test.Post { @@ -123,3 +162,23 @@ func TestVm(t *testing.T) { const fn = "../files/vmtests/vmtests.json" RunVmTest(fn, t) } + +func TestStateSystemOperations(t *testing.T) { + const fn = "../files/StateTests/stSystemOperationsTest.json" + RunVmTest(fn, t) +} + +func TestStatePreCompiledContracts(t *testing.T) { + const fn = "../files/StateTests/stPreCompiledContracts.json" + RunVmTest(fn, t) +} + +func TestStateRecursiveCreate(t *testing.T) { + const fn = "../files/StateTests/stRecursiveCreate.json" + RunVmTest(fn, t) +} + +func TestStateSpecialTest(t *testing.T) { + const fn = "../files/StateTests/stSpecialTest.json" + RunVmTest(fn, t) +} diff --git a/vm/address.go b/vm/address.go index 235143b34..86ae705bc 100644 --- a/vm/address.go +++ b/vm/address.go @@ -31,12 +31,16 @@ func sha256Func(in []byte) []byte { } func ripemd160Func(in []byte) []byte { - return ethutil.RightPadBytes(crypto.Ripemd160(in), 32) + return ethutil.LeftPadBytes(crypto.Ripemd160(in), 32) } func ecrecoverFunc(in []byte) []byte { // In case of an invalid sig. Defaults to return nil defer func() { recover() }() - return crypto.Ecrecover(in) + hash := in[:32] + v := ethutil.BigD(in[32:64]).Bytes()[0] - 27 + sig := append(in[64:], v) + + return crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:]) } diff --git a/vm/execution.go b/vm/execution.go index c23164f82..8c04cf536 100644 --- a/vm/execution.go +++ b/vm/execution.go @@ -69,6 +69,7 @@ func (self *Execution) exec(code, caddr []byte, caller ClosureRef) (ret []byte, if self.Gas.Cmp(p.Gas) >= 0 { ret = p.Call(self.input) self.vm.Printf("NATIVE_FUNC(%x) => %x", naddr, ret) + self.vm.Endl() } } else { // Create a new callable closure |