diff options
author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-01-20 06:50:00 +0800 |
---|---|---|
committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-02-24 20:46:30 +0800 |
commit | 587bafaa9faba2d5b0b19c1a0e3e709218e25912 (patch) | |
tree | 955baa2c4bc6f302fc60391d61cfc8c2505d9eba /miner | |
parent | 7bb496f73768c073613be6af9ba7ed9a7341180c (diff) | |
download | go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.tar go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.tar.gz go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.tar.bz2 go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.tar.lz go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.tar.xz go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.tar.zst go-tangerine-587bafaa9faba2d5b0b19c1a0e3e709218e25912.zip |
[release/1.3.4] core, core/vm, crypto: fixes for homestead
* Removed some strange code that didn't apply state reverting properly
* Refactored code setting from vm & state transition to the executioner
* Updated tests
Conflicts:
common/registrar/ethreg/api.go
core/tx_pool.go
core/vm/jit_test.go
Diffstat (limited to 'miner')
-rw-r--r-- | miner/worker.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index 7f24da8ac..30f4ff434 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -590,7 +590,8 @@ func (self *worker) commitUncle(work *Work, uncle *types.Header) error { func (env *Work) commitTransactions(transactions types.Transactions, gasPrice *big.Int, bc *core.BlockChain) { gp := new(core.GasPool).AddGas(env.header.GasLimit) for _, tx := range transactions { - // We can skip err. It has already been validated in the tx pool + // Error may be ignored here. The error has already been checked + // during transaction acceptance is the transaction pool. from, _ := tx.From() // Check if it falls within margin. Txs from owned accounts are always processed. |