Add initial FOCIL implementation

beacon/engine/errors.go

@@ -74,6 +74,10 @@ var (
 	//   - newPayloadV1: if the payload was accepted, but not processed (side chain)
 	ACCEPTED = "ACCEPTED"
 
+	// INVALID_INCLUSION_LIST is returned by the engine API in the following calls:
+	//   - newPayloadV5: if the payload failed to satisfy the inclusion list constraints
+	INVALID_INCLUSION_LIST = "INVALID_INCLUSION_LIST"
+
 	GenericServerError       = &EngineAPIError{code: -32000, msg: "Server error"}
 	UnknownPayload           = &EngineAPIError{code: -38001, msg: "Unknown payload"}
 	InvalidForkChoiceState   = &EngineAPIError{code: -38002, msg: "Invalid forkchoice state"}

beacon/engine/types.go

@@ -17,6 +17,7 @@
 package engine
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/big"
 	"slices"
@@ -350,6 +351,45 @@ type ExecutionPayloadBody struct {
 	Withdrawals     []*types.Withdrawal `json:"withdrawals"`
 }
 
+// InclusionList is a list of transactions that should be included in a payload.
+type InclusionList [][]byte
+
+func (inclusionList InclusionList) MarshalJSON() ([]byte, error) {
+	inclusionListHex := make([]hexutil.Bytes, len(inclusionList))
+	for i, tx := range inclusionList {
+		inclusionListHex[i] = tx
+	}
+
+	return json.Marshal(inclusionListHex)
+}
+
+func (inclusionList *InclusionList) UnmarshalJSON(input []byte) error {
+	var inclusionListHex []hexutil.Bytes
+	if err := json.Unmarshal(input, &inclusionListHex); err != nil {
+		return err
+	}
+
+	*inclusionList = make([][]byte, len(inclusionListHex))
+    for i, tx := range inclusionListHex {
+        (*inclusionList)[i] = tx
+    }
+
+	return nil
+}
+
+func InclusionListToTransactions(inclusionList InclusionList) ([]*types.Transaction, error) {
+	txs, err := decodeTransactions(inclusionList)
+	if err != nil {
+		return nil, err
+	}
+
+	return txs, nil
+}
+
+func TransactionsToInclusionList(txs []*types.Transaction) InclusionList {
+	return encodeTransactions(txs)
+}
+
 // Client identifiers to support ClientVersionV1.
 const (
 	ClientCode = "GE"

consensus/misc/eip4844/eip4844.go

@@ -83,6 +83,9 @@ func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTim
 func CalcBlobFee(config *params.ChainConfig, header *types.Header) *big.Int {
 	var frac uint64
 	switch config.LatestFork(header.Time) {
+	case forks.Eip7805:
+		// EIP7805 fork is a transient fork so it piggy backs on an existing canonical fork's config.
+		frac = config.BlobScheduleConfig.Prague.UpdateFraction
 	case forks.Osaka:
 		frac = config.BlobScheduleConfig.Osaka.UpdateFraction
 	case forks.Prague: