diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-24 20:16:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-24 20:16:25 +0800 |
| commit | 0ca776a6b80097e34006f26fd934ed5f388e68f8 (patch) | |
| tree | 1141beffce619b3fb11676019385312d92b27c00 /ethereum | |
| parent | e7a80ec68165755678647f2d3e9b475d492a70dd (diff) | |
| parent | 2e39efbe7c487fd605de0f6915bcae789138fb7e (diff) | |
| download | dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.tar dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.tar.gz dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.tar.bz2 dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.tar.lz dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.tar.xz dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.tar.zst dexon-0ca776a6b80097e34006f26fd934ed5f388e68f8.zip | |
Merge branch 'feature/new_vm' into develop
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/main.go | 2 | ||||
| -rw-r--r-- | ethereum/repl/javascript_runtime.go | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ethereum/main.go b/ethereum/main.go index b670cb495..217991074 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -9,7 +9,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.5.17" + Version = "0.6.0" ) var logger = ethlog.NewLogger("CLI") diff --git a/ethereum/repl/javascript_runtime.go b/ethereum/repl/javascript_runtime.go index cd87f9868..41b6216d4 100644 --- a/ethereum/repl/javascript_runtime.go +++ b/ethereum/repl/javascript_runtime.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethpub" + "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/utils" "github.com/obscuren/otto" @@ -121,12 +122,12 @@ out: if _, ok := block.Resource.(*ethchain.Block); ok { } case object := <-self.changeChan: - if stateObject, ok := object.Resource.(*ethchain.StateObject); ok { + if stateObject, ok := object.Resource.(*ethstate.StateObject); ok { for _, cb := range self.objectCb[ethutil.Bytes2Hex(stateObject.Address())] { val, _ := self.vm.ToValue(ethpub.NewPStateObject(stateObject)) cb.Call(cb, val) } - } else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok { + } else if storageObject, ok := object.Resource.(*ethstate.StorageState); ok { for _, cb := range self.objectCb[ethutil.Bytes2Hex(storageObject.StateAddress)+ethutil.Bytes2Hex(storageObject.Address)] { val, _ := self.vm.ToValue(ethpub.NewPStorageState(storageObject)) cb.Call(cb, val) |