Started adding better logging (ethereum#231)

* Started adding better logging * Fix issues with existing logs * logs: better logs Co-authored-by: Mark Tyneway <[email protected]>
streamingfast · Mar 2, 2021 · a923663 · a923663
1 parent bfa3007
commit a923663
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/miner/worker.go b/miner/worker.go
@@ -463,6 +463,7 @@ func (w *worker) mainLoop() {
 				continue
 			}
 			tx := ev.Txs[0]
+			log.Debug("Attempting to commit rollup transaction", "hash", tx.Hash().Hex())
 			if err := w.commitNewTx(tx); err == nil {
 				head := <-w.chainHeadCh
 				txs := head.Block.Transactions()
@@ -1064,8 +1065,12 @@ func (w *worker) commit(uncles []*types.Header, interval func(), update bool, st
 				return fmt.Errorf("Block created with not %d transactions at %d", len(txs), block.NumberU64())
 			}
 			tx := txs[0]
-			log.Info("New block", "index", block.Number().Uint64()-uint64(1), "timestamp", block.Time(), "tx-hash", tx.Hash().Hex(),
-				"gas", block.GasUsed(), "fees", feesEth, "elapsed", common.PrettyDuration(time.Since(start)))
+			bn := tx.L1BlockNumber()
+			if bn == nil {
+				bn = new(big.Int)
+			}
+			log.Info("New block", "index", block.Number().Uint64()-uint64(1), "l1-timestamp", tx.L1Timestamp(), "l1-blocknumber", bn.Uint64(), "tx-hash", tx.Hash().Hex(),
+				"queue-orign", tx.QueueOrigin(), "type", tx.SignatureHashType(), "gas", block.GasUsed(), "fees", feesEth, "elapsed", common.PrettyDuration(time.Since(start)))
 
 		case <-w.exitCh:
 			log.Info("Worker has exited")

diff --git a/rollup/sync_service.go b/rollup/sync_service.go
@@ -563,6 +563,7 @@ func (s *SyncService) SubscribeNewTxsEvent(ch chan<- core.NewTxsEvent) event.Sub
 // inspecting the local database. This is mean to prevent transactions from
 // being replayed.
 func (s *SyncService) maybeApplyTransaction(tx *types.Transaction) error {
+	log.Debug("Maybe applying transaction", "hash", tx.Hash().Hex())
 	index := tx.GetMeta().Index
 	if index == nil {
 		return fmt.Errorf("nil index in maybeApplyTransaction")
@@ -605,6 +606,7 @@ func (s *SyncService) applyTransaction(tx *types.Transaction) error {
 // queue origin sequencer transactions, as the contracts on L1 manage the same
 // validity checks that are done here.
 func (s *SyncService) ApplyTransaction(tx *types.Transaction) error {
+	log.Debug("Sending transaction to sync service", "hash", tx.Hash().Hex())
 	s.txLock.Lock()
 	defer s.txLock.Unlock()
 	if s.verifier {