aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-18 20:19:41 +0800
committerobscuren <geffobscura@gmail.com>2014-12-18 20:19:41 +0800
commit721e8ae93f9b8918ff4bc74af86c530bacacea00 (patch)
treeee33bd346e396f56d6462f99de9ca7b5dac9c586 /xeth
parente6fdf0c9f7564b8b08cf428e03af66fc423adcc1 (diff)
parent2d09e67713757e2a80eb614562c97f962af36cf7 (diff)
downloadgo-tangerine-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.gz
go-tangerine-721e8ae93f9b8918ff4bc74af86c530bacacea00.tar.zst
go-tangerine-721e8ae93f9b8918ff4bc74af86c530bacacea00.zip
Merged develop
Diffstat (limited to 'xeth')
-rw-r--r--xeth/hexface.go2
-rw-r--r--xeth/pipe.go2
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()