Merge branch 'main' into upgrade_state

bindings/.githead

@@ -1 +1 @@
-1f6a8afc472b5cbee45ee3cbf6635f140d329673
+71553ac94b7a99a1ec090bda1e156ffaea2b4ce4

bindings/encoding/input.go

@@ -74,6 +74,10 @@ var (
 			Name: "parentMetaHash",
 			Type: "bytes32",
 		},
+		{
+			Name: "sender",
+			Type: "address",
+		},
 	}
 	transitionComponents = []abi.ArgumentMarshaling{
 		{

driver/chain_syncer/calldata/syncer.go

@@ -28,8 +28,8 @@ import (
 )
 
 var (
-	// Brecht recommends to hardcore 79, may be unrequired as proof system changes
-	defaultMaxTxPerBlock = uint64(79)
+	// Brecht recommends to hardcore 149, may be unrequired as proof system changes
+	defaultMaxTxPerBlock = uint64(149)
 )
 
 // Syncer responsible for letting the L2 execution engine catching up with protocol's latest

internal/sender/sender.go

@@ -223,7 +223,12 @@ func (s *Sender) SendTransaction(tx *types.Transaction) (string, error) {
 	}
 
 	if err := s.send(txToConfirm); err != nil && !strings.Contains(err.Error(), "replacement transaction") {
-		log.Error("Failed to send transaction", "id", txID, "hash", tx.Hash(), "err", err)
+		log.Error("Failed to send transaction",
+			"tx_id", txID,
+			"nonce", txToConfirm.CurrentTx.Nonce(),
+			"hash", tx.Hash(),
+			"err", err,
+		)
 		return "", err
 	}
 
@@ -254,20 +259,35 @@ func (s *Sender) send(tx *TxToConfirm) error {
 		if err != nil {
 			if strings.Contains(err.Error(), "nonce too low") {
 				s.AdjustNonce(originalTx)
-				log.Warn("Nonce is incorrect, retry sending the transaction with new nonce", "hash", rawTx.Hash(), "err", err)
+				log.Warn("Nonce is incorrect, retry sending the transaction with new nonce",
+					"tx_id", tx.ID,
+					"nonce", tx.CurrentTx.Nonce(),
+					"hash", rawTx.Hash(),
+					"err", err,
+				)
 				continue
 			}
-			if err.Error() == "replacement transaction underpriced" {
+			if strings.Contains(err.Error(), "replacement transaction underpriced") {
 				s.adjustGas(originalTx)
-				log.Warn("Replacement transaction underpriced", "hash", rawTx.Hash(), "err", err)
+				log.Warn("Replacement transaction underpriced",
+					"tx_id", tx.ID,
+					"nonce", tx.CurrentTx.Nonce(),
+					"hash", rawTx.Hash(),
+					"err", err,
+				)
 				continue
 			}
-			log.Error("Failed to send transaction", "hash", rawTx.Hash(), "err", err)
+			log.Error("Failed to send transaction",
+				"tx_id", tx.ID,
+				"nonce", tx.CurrentTx.Nonce(),
+				"hash", rawTx.Hash(),
+				"err", err,
+			)
 			return err
 		}
-		s.Opts.Nonce = new(big.Int).Add(s.Opts.Nonce, common.Big1)
 		break
 	}
+	s.Opts.Nonce = new(big.Int).Add(s.Opts.Nonce, common.Big1)
 	return nil
 }
 
@@ -323,7 +343,9 @@ func (s *Sender) resendUnconfirmedTxs() {
 		if err := s.send(unconfirmedTx); err != nil {
 			log.Warn(
 				"Failed to resend the transaction",
-				"id", id,
+				"tx_id", id,
+				"nonce", unconfirmedTx.CurrentTx.Nonce(),
+				"hash", unconfirmedTx.CurrentTx.Hash(),
 				"retrys", unconfirmedTx.Retrys,
 				"err", err,
 			)
@@ -341,7 +363,12 @@ func (s *Sender) checkPendingTransactionsConfirmation() {
 			// Ignore the transaction if it is pending.
 			tx, isPending, err := s.client.TransactionByHash(s.ctx, pendingTx.CurrentTx.Hash())
 			if err != nil {
-				log.Warn("Failed to fetch transaction", "hash", pendingTx.CurrentTx.Hash(), "err", err)
+				log.Warn("Failed to fetch transaction",
+					"tx_id", pendingTx.ID,
+					"nonce", pendingTx.CurrentTx.Nonce(),
+					"hash", pendingTx.CurrentTx.Hash(),
+					"err", err,
+				)
 				continue
 			}
 			if isPending {

pkg/rpc/methods.go

@@ -34,7 +34,7 @@ var (
 	defaultWaitL1OriginTimeout     = 3 * time.Minute
 	defaultMaxTransactionsPerBlock = uint64(149)
 
-	// Requset urls.
+	// Request urls.
 	sidecarsRequestURL = "eth/v1/beacon/blob_sidecars/%d"
 )