Merge branch 'develop' into feat-tx-pool-migrate-setcode-tx-upstream-changes

Author: Thegaram

core/blockchain.go

@@ -53,6 +53,7 @@ var (
 	headHeaderGauge    = metrics.NewRegisteredGauge("chain/head/header", nil)
 	headFastBlockGauge = metrics.NewRegisteredGauge("chain/head/receipt", nil)
 	headTimeGapGauge   = metrics.NewRegisteredGauge("chain/head/timegap", nil)
+	headL1MessageGauge = metrics.NewRegisteredGauge("chain/head/l1msg", nil)
 
 	l2BaseFeeGauge = metrics.NewRegisteredGauge("chain/fees/l2basefee", nil)
 
@@ -1253,6 +1254,17 @@ func (bc *BlockChain) writeBlockWithState(block *types.Block, receipts []*types.
 		l2BaseFeeGauge.Update(0)
 	}
 
+	// Note the latest relayed L1 message queue index (if any)
+	for _, tx := range block.Transactions() {
+		if msg := tx.AsL1MessageTx(); msg != nil {
+			// Queue index is guaranteed to fit into int64.
+			headL1MessageGauge.Update(int64(msg.QueueIndex))
+		} else {
+			// No more L1 messages in this block.
+			break
+		}
+	}
+
 	parent := bc.GetHeaderByHash(block.ParentHash())
 	// block.Time is guaranteed to be larger than parent.Time,
 	// and the time gap should fit into int64.

core/state_transition.go

@@ -269,8 +269,21 @@ func (st *StateTransition) buyGas() error {
 }
 
 func (st *StateTransition) preCheck() error {
+	// Only check transactions that are not fake
+	if !st.msg.IsFake() {
+		// Make sure the sender is an EOA
+		code := st.state.GetCode(st.msg.From())
+		_, delegated := types.ParseDelegation(code)
+		if len(code) > 0 && !delegated {
+			// If the sender on L1 is a (delegated) EOA, then it must be a (delegated) EOA on L2, too.
+			// If the sender on L1 is a contract, then we apply address aliasing.
+			// The probability that the aliased address happens to be a smart contract on L2 is negligible.
+			return fmt.Errorf("%w: address %v, len(code): %d", ErrSenderNoEOA, st.msg.From().Hex(), len(code))
+		}
+	}
+
 	if st.msg.IsL1MessageTx() {
-		// No fee fields to check, no nonce to check, and no need to check if EOA (L1 already verified it for us)
+		// No fee fields to check, no nonce to check
 		// Gas is free, but no refunds!
 		st.gas += st.msg.Gas()
 		st.initialGas = st.msg.Gas()
@@ -291,12 +304,6 @@ func (st *StateTransition) preCheck() error {
 			return fmt.Errorf("%w: address %v, nonce: %d", ErrNonceMax,
 				st.msg.From().Hex(), stNonce)
 		}
-		// Make sure the sender is an EOA
-		code := st.state.GetCode(st.msg.From())
-		_, delegated := types.ParseDelegation(code)
-		if len(code) > 0 && !delegated {
-			return fmt.Errorf("%w: address %v, len(code): %d", ErrSenderNoEOA, st.msg.From().Hex(), len(code))
-		}
 	}
 	// Make sure that transaction gasFeeCap is greater than the baseFee (post london)
 	// Note: Logically, this should be `IsCurie`, but we keep `IsLondon` to ensure backward compatibility.

params/version.go

@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major version component of the current release
 	VersionMinor = 8         // Minor version component of the current release
-	VersionPatch = 26        // Patch version component of the current release
+	VersionPatch = 28        // Patch version component of the current release
 	VersionMeta  = "mainnet" // Version metadata to append to the version string
 )