Merge branch 'main' into txmgr-ifaces

Author: jmank88

chains/txmgr/broadcaster.go

@@ -472,8 +472,7 @@ func (eb *Broadcaster[CID, HEAD, ADDR, THASH, BHASH, SEQ, FEE]) handleInProgress
 
 	lgr := etx.GetLogger(logger.With(eb.lggr, "fee", attempt.TxFee))
 	errType, err := eb.client.SendTransactionReturnCode(ctx, etx, attempt, lgr)
-	lgr.Infow("Broadcasted transaction", "txAttemptID", attempt.ID, "txHash", attempt.Hash, "tracingID", etx.GetTracingID(lgr), "meta", etx.Meta, "feeLimit",
-		attempt.ChainSpecificFeeLimit, "callerProvidedFeeLimit", etx.FeeLimit, "attempt", attempt, "etxID", etx.ID, "etx", etx, "errType", errType, "err", err)
+	eb.lggr.Infow("Broadcasted transaction", "txHash", attempt.Hash, "tracingID", etx.GetTracingID(lgr), "attempt", attempt, "etxID", etx.ID, "etx", etx, "errType", errType, "err", err)
 
 	// The validation below is only applicable to Hedera because it has instant finality and a unique sequence behavior
 	if eb.chainType == hederaChainType {

chains/txmgr/confirmer.go

@@ -811,11 +811,9 @@ func (ec *Confirmer[CID, HEAD, ADDR, THASH, BHASH, R, SEQ, FEE]) ForceRebroadcas
 			attempt.Tx = *etx // for logging
 			errType, err := ec.client.SendTransactionReturnCode(ctx, *etx, attempt, ec.lggr)
 			if errType == multinode.Successful || errType == multinode.TransactionAlreadyKnown {
-				ec.lggr.Infow("ForceRebroadcast: Broadcasted transaction", "txAttemptID", attempt.ID, "txHash", attempt.Hash, "tracingID", etx.GetTracingID(ec.lggr), "meta", etx.Meta, "feeLimit",
-					attempt.ChainSpecificFeeLimit, "callerProvidedFeeLimit", etx.FeeLimit, "attempt", attempt, "etxID", etx.ID, "etx", etx, "errType", errType, "err", err)
+				ec.lggr.Infow("ForceRebroadcast: Broadcasted transaction", "txHash", attempt.Hash, "tracingID", etx.GetTracingID(ec.lggr), "attempt", attempt, "etxID", etx.ID, "etx", etx, "errType", errType, "err", err)
 			} else {
-				ec.lggr.Errorw("ForceRebroadcast: Broadcasted transaction", "txAttemptID", attempt.ID, "txHash", attempt.Hash, "tracingID", etx.GetTracingID(ec.lggr), "meta", etx.Meta, "feeLimit",
-					attempt.ChainSpecificFeeLimit, "callerProvidedFeeLimit", etx.FeeLimit, "attempt", attempt, "etxID", etx.ID, "etx", etx, "errType", errType, "err", err)
+				ec.lggr.Errorw("ForceRebroadcast: Broadcasted transaction", "txHash", attempt.Hash, "tracingID", etx.GetTracingID(ec.lggr), "attempt", attempt, "etxID", etx.ID, "etx", etx, "errType", errType, "err", err)
 			}
 		}
 	}

chains/txmgr/txmgr.go

@@ -966,11 +966,12 @@ func (b *Txm[CID, HEAD, ADDR, THASH, BHASH, R, SEQ, FEE]) pruneQueueAndCreateTxn
 	if err != nil {
 		return tx, err
 	}
-	b.logger.Debugw("Created transaction",
+	b.logger.Infow("Created transaction",
 		"fromAddress", txRequest.FromAddress,
 		"toAddress", txRequest.ToAddress,
 		"meta", txRequest.Meta,
 		"transactionID", tx.ID,
+		"tracingID", tx.GetTracingID(b.logger),
 	)
 
 	return tx, nil