diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-21 21:51:45 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-21 21:51:45 +0800 |
| commit | ce862ee7589a0780cebc8a7bb1cf6a75193d55a0 (patch) | |
| tree | eeca42a9b105964c6229fd38e6f0616e49a39c25 | |
| parent | 4300f2a0fae793ff73ea861dfe3f90ce97f5af40 (diff) | |
| download | go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.tar go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.tar.gz go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.tar.bz2 go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.tar.lz go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.tar.xz go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.tar.zst go-tangerine-ce862ee7589a0780cebc8a7bb1cf6a75193d55a0.zip | |
Removed some comments
| -rw-r--r-- | miner/worker.go | 3 | ||||
| -rw-r--r-- | xeth/xeth.go | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/miner/worker.go b/miner/worker.go index ae6782aca..4a52a40fe 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -211,7 +211,8 @@ gasLimit: from, _ := tx.From() self.chain.TxState().RemoveNonce(from, tx.Nonce()) remove = append(remove, tx) - minerlogger.Infof("TX (%x) failed. Transaction will be removed\n", tx.Hash().Bytes()[:4]) + minerlogger.Infof("TX (%x) failed, will be removed: %v\n", tx.Hash().Bytes()[:4], err) + minerlogger.Infoln(tx) case state.IsGasLimitErr(err): minerlogger.Infof("Gas limit reached for block. %d TXs included in this block\n", i) // Break on gas limit diff --git a/xeth/xeth.go b/xeth/xeth.go index 2c324be26..9f183aa61 100644 --- a/xeth/xeth.go +++ b/xeth/xeth.go @@ -611,7 +611,7 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt } state := self.chainManager.TxState() - nonce := state.NewNonce(from) //state.GetNonce(from) + nonce := state.NewNonce(from) tx.SetNonce(nonce) if err := self.sign(tx, from, false); err != nil { @@ -620,7 +620,6 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt if err := self.eth.TxPool().Add(tx); err != nil { return "", err } - //state.IncrementNonce(from) if contractCreation { addr := core.AddressFromMessage(tx) |