diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-22 20:27:03 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-22 20:27:03 +0800 |
| commit | 1be7e5048c7fd129ef176f38b0c372a178efadbe (patch) | |
| tree | 041b8f74bdcd290268a6b800e5fced2c20c98d88 /xeth | |
| parent | bba7ccb07f08e0c6ad404abfb363deaec1db5fab (diff) | |
| parent | 321dce1f47135f673730cb86fdf1faf03dc6cbd4 (diff) | |
| download | dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.tar dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.tar.gz dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.tar.bz2 dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.tar.lz dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.tar.xz dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.tar.zst dexon-1be7e5048c7fd129ef176f38b0c372a178efadbe.zip | |
Merge branch 'release/0.8.5' into develop
Diffstat (limited to 'xeth')
| -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 { |