diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-18 20:19:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-18 20:19:41 +0800 |
| commit | 721e8ae93f9b8918ff4bc74af86c530bacacea00 (patch) | |
| tree | ee33bd346e396f56d6462f99de9ca7b5dac9c586 /xeth | |
| parent | e6fdf0c9f7564b8b08cf428e03af66fc423adcc1 (diff) | |
| parent | 2d09e67713757e2a80eb614562c97f962af36cf7 (diff) | |
| download | dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.gz dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.bz2 dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.lz dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.xz dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.zst dexon-721e8ae93f9b8918ff4bc74af86c530bacacea00.zip | |
Merged develop
Diffstat (limited to 'xeth')
| -rw-r--r-- | xeth/hexface.go | 2 | ||||
| -rw-r--r-- | xeth/pipe.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xeth/hexface.go b/xeth/hexface.go index 524b68210..dfb0a9fd8 100644 --- a/xeth/hexface.go +++ b/xeth/hexface.go @@ -28,7 +28,7 @@ func (self *JSXEth) BlockByHash(strHash string) *JSBlock { func (self *JSXEth) BlockByNumber(num int32) *JSBlock { if num == -1 { - return NewJSBlock(self.obj.ChainManager().CurrentBlock) + return NewJSBlock(self.obj.ChainManager().CurrentBlock()) } return NewJSBlock(self.obj.ChainManager().GetBlockByNumber(uint64(num))) diff --git a/xeth/pipe.go b/xeth/pipe.go index a8d8ed999..1e4d0ec60 100644 --- a/xeth/pipe.go +++ b/xeth/pipe.go @@ -82,7 +82,7 @@ func (self *XEth) Execute(addr []byte, data []byte, value, gas, price *ethutil.V func (self *XEth) ExecuteObject(object *Object, data []byte, value, gas, price *ethutil.Value) ([]byte, error) { var ( initiator = state.NewStateObject(self.obj.KeyManager().KeyPair().Address()) - block = self.chainManager.CurrentBlock + block = self.chainManager.CurrentBlock() ) self.Vm.State = self.World().State().Copy() |