diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-22 20:26:18 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-22 20:26:18 +0800 |
| commit | 8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a (patch) | |
| tree | 041b8f74bdcd290268a6b800e5fced2c20c98d88 /xeth/xeth.go | |
| parent | 5912f0a849f64f8a4d7b681df8d101f3f4080e17 (diff) | |
| parent | 321dce1f47135f673730cb86fdf1faf03dc6cbd4 (diff) | |
| download | dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.tar dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.tar.gz dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.tar.bz2 dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.tar.lz dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.tar.xz dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.tar.zst dexon-8cc6647ebfd3e76a7d75e1d6961a8451fa5d702a.zip | |
Merge branch 'release/0.8.5'
Diffstat (limited to 'xeth/xeth.go')
| -rw-r--r-- | xeth/xeth.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go index f3569e454..5907a8329 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -288,13 +288,11 @@ func (self *XEth) Transact(toStr, valueStr, gasStr, gasPriceStr, codeStr string) //fmt.Printf("create tx: %x %v\n", tx.Hash()[:4], tx.Nonce()) - /* - // Do some pre processing for our "pre" events and hooks - block := self.chainManager.NewBlock(key.Address()) - coinbase := state.GetOrNewStateObject(key.Address()) - coinbase.SetGasPool(block.GasLimit()) - self.blockProcessor.ApplyTransactions(coinbase, state, block, types.Transactions{tx}, true) - */ + // Do some pre processing for our "pre" events and hooks + block := self.chainManager.NewBlock(key.Address()) + coinbase := state.GetOrNewStateObject(key.Address()) + coinbase.SetGasPool(block.GasLimit()) + self.blockProcessor.ApplyTransactions(coinbase, state, block, types.Transactions{tx}, true) err = self.eth.TxPool().Add(tx) if err != nil { |