diff options
author | obscuren <geffobscura@gmail.com> | 2015-02-18 05:20:47 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-02-18 05:20:47 +0800 |
commit | 7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048 (patch) | |
tree | 764d7ebd57cafbae0a12d046aeafd1b823a0f0bb /xeth | |
parent | 11e12680ebe4f4679083317ee0f2c27b219d44b3 (diff) | |
download | dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.gz dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.bz2 dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.lz dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.xz dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.zst dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.zip |
Changed to ChainEvent and fixed a nil pointer in transact
Diffstat (limited to 'xeth')
-rw-r--r-- | xeth/xeth.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index 27435b956..f005105bb 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -16,7 +16,6 @@ import ( "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/whisper" ) @@ -220,7 +219,7 @@ func (self *XEth) Call(toStr, valueStr, gasStr, gasPriceStr, dataStr string) (st var ( statedb = self.chainManager.TransState() key = self.eth.KeyManager().KeyPair() - from = state.NewStateObject(key.Address(), self.eth.Db()) + from = statedb.GetOrNewStateObject(key.Address()) block = self.chainManager.CurrentBlock() to = statedb.GetOrNewStateObject(fromHex(toStr)) data = fromHex(dataStr) |