diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-19 07:02:55 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-19 07:02:55 +0800 |
| commit | 22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b (patch) | |
| tree | a64a8336516fd28de2c019e8c787c90950267331 /miner | |
| parent | 0dc566124aee24cf3f01b4e586bde7752da89824 (diff) | |
| parent | a7f4ade7114ee962110cb7c140e7ce7bd3f6664f (diff) | |
| download | go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.gz go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.bz2 go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.lz go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.xz go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.tar.zst go-tangerine-22d29a6d52ade3ebcd4ecb341e3f5eafddb8e17b.zip | |
merge
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/miner.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/miner/miner.go b/miner/miner.go index 6ba3b1eba..d909c228b 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -236,8 +236,8 @@ func (self *Miner) finiliseTxs() types.Transactions { key := self.eth.KeyManager() for i, ltx := range self.localTxs { tx := types.NewTransactionMessage(ltx.To, ethutil.Big(ltx.Value), ethutil.Big(ltx.Gas), ethutil.Big(ltx.GasPrice), ltx.Data) - tx.Nonce = state.GetNonce(self.Coinbase) - state.SetNonce(self.Coinbase, tx.Nonce+1) + tx.SetNonce(state.GetNonce(self.Coinbase)) + state.SetNonce(self.Coinbase, tx.Nonce()+1) tx.Sign(key.PrivateKey()) @@ -246,7 +246,7 @@ func (self *Miner) finiliseTxs() types.Transactions { // Faster than append for _, tx := range self.eth.TxPool().GetTransactions() { - if tx.GasPrice.Cmp(self.MinAcceptedGasPrice) >= 0 { + if tx.GasPrice().Cmp(self.MinAcceptedGasPrice) >= 0 { txs[actualSize] = tx actualSize++ } |