diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-28 18:15:46 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-28 18:15:46 +0800 |
| commit | 2fec1af27509ce26007224b3665d988ac211d023 (patch) | |
| tree | 19356bd3941a138bf81e5fdc81a95748a0398dc5 /ethminer | |
| parent | cfb979b5e3274a14319bce14ee0481a4cfaa5f41 (diff) | |
| parent | 9988b1a04710e03ce7ed4b23393e2e90f06889f9 (diff) | |
| download | dexon-2fec1af27509ce26007224b3665d988ac211d023.tar dexon-2fec1af27509ce26007224b3665d988ac211d023.tar.gz dexon-2fec1af27509ce26007224b3665d988ac211d023.tar.bz2 dexon-2fec1af27509ce26007224b3665d988ac211d023.tar.lz dexon-2fec1af27509ce26007224b3665d988ac211d023.tar.xz dexon-2fec1af27509ce26007224b3665d988ac211d023.tar.zst dexon-2fec1af27509ce26007224b3665d988ac211d023.zip | |
Merge branch 'develop' of github.com:ethereum/eth-go into develop
Diffstat (limited to 'ethminer')
| -rw-r--r-- | ethminer/miner.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go index 00e04cde2..9396d33f9 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -5,6 +5,7 @@ import ( "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethwire" + "sort" ) type Miner struct { @@ -12,7 +13,7 @@ type Miner struct { ethereum ethchain.EthManager coinbase []byte reactChan chan ethutil.React - txs []*ethchain.Transaction + txs ethchain.Transactions uncles []*ethchain.Block block *ethchain.Block powChan chan []byte @@ -132,6 +133,8 @@ func (self *Miner) mineNewBlock() { self.block.SetUncles(self.uncles) } + // Sort the transactions by nonce in case of odd network propagation + sort.Sort(ethchain.TxByNonce{self.txs}) // Accumulate all valid transaction and apply them to the new state receipts, txs := stateManager.ApplyTransactions(self.block.State(), self.block, self.txs) self.txs = txs |