aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--miner/worker.go3
-rw-r--r--xeth/xeth.go4
2 files changed, 4 insertions, 3 deletions
diff --git a/miner/worker.go b/miner/worker.go
index dc1f04d87..9a655831e 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -258,7 +258,7 @@ func (self *worker) commitNewWork() {
tcount = 0
ignoredTransactors = set.New()
)
- //gasLimit:
+
for _, tx := range transactions {
// We can skip err. It has already been validated in the tx pool
from, _ := tx.From()
@@ -296,7 +296,6 @@ func (self *worker) commitNewWork() {
tcount++
}
}
- //self.eth.TxPool().InvalidateSet(remove)
var (
uncles []*types.Header
diff --git a/xeth/xeth.go b/xeth/xeth.go
index afcb33e4c..251b070e4 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -682,9 +682,11 @@ func (self *XEth) Transact(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeSt
if contractCreation {
addr := core.AddressFromMessage(tx)
- glog.V(logger.Info).Infof("Contract addr %x\n", addr)
+ glog.V(logger.Info).Infof("Tx(%x) created: %x\n", tx.Hash(), addr)
return core.AddressFromMessage(tx).Hex(), nil
+ } else {
+ glog.V(logger.Info).Infof("Tx(%x) to: %x\n", tx.Hash(), tx.To())
}
return tx.Hash().Hex(), nil
}