diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-18 22:18:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-18 22:18:13 +0800 |
| commit | db494170dc819b1eb0d267b6e1ab36c6cfb63569 (patch) | |
| tree | 8e2b374519a0ae5e20a9db0c2a4a86bf3375329e /miner/miner.go | |
| parent | 9e286e1c337319f47b2b04e9e1022ac05470a296 (diff) | |
| download | go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.gz go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.bz2 go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.lz go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.xz go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.zst go-tangerine-db494170dc819b1eb0d267b6e1ab36c6cfb63569.zip | |
Created generic message (easy for testing)
Diffstat (limited to 'miner/miner.go')
| -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 dc69dddc0..f63096b63 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -237,8 +237,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()) @@ -247,7 +247,7 @@ func (self *Miner) finiliseTxs() types.Transactions { // Faster than append for _, tx := range self.eth.TxPool().CurrentTransactions() { - if tx.GasPrice.Cmp(self.MinAcceptedGasPrice) >= 0 { + if tx.GasPrice().Cmp(self.MinAcceptedGasPrice) >= 0 { txs[actualSize] = tx actualSize++ } |