feat(taiko-client): introduce TaikoL2.GetBasefeeV2

packages/protocol/contracts/layer2/based/TaikoL2Deprecated.sol

@@ -16,45 +16,45 @@ abstract contract TaikoL2Deprecated {
     }
 
     function anchor(
-        bytes32, /*_l1BlockHash*/
-        bytes32, /*_l1StateRoot*/
-        uint64, /*_l1BlockId*/
-        uint32 /*_parentGasUsed */
+        bytes32 _l1BlockHash,
+        bytes32 _l1StateRoot,
+        uint64 _l1BlockId,
+        uint32 _parentGasUsed
     )
         external
         deprecated
     { }
 
     function getBasefee(
-        uint64, /*_anchorBlockId*/
-        uint32 /*_parentGasUsed*/
+        uint64 _anchorBlockId,
+        uint32 _parentGasUsed
     )
         public
         pure
         deprecated
-        returns (uint256, /*basefee_*/ uint64 /*parentGasExcess_*/ )
+        returns (uint256 basefee_, uint64 parentGasExcess_)
     { }
 
     function adjustExcess(
-        uint64, /*_currGasExcess*/
-        uint64, /*_currGasTarget*/
-        uint64 /*_newGasTarget*/
+        uint64 _currGasExcess,
+        uint64 _currGasTarget,
+        uint64 _newGasTarget
     )
         public
         pure
         deprecated
-        returns (uint64 /*newGasExcess_*/ )
+        returns (uint64 newGasExcess_)
     { }
 
     function calculateBaseFee(
-        LibSharedData.BaseFeeConfig calldata, /*_baseFeeConfig*/
-        uint64, /*_blocktime*/
-        uint64, /*_parentGasExcess*/
-        uint32 /*_parentGasUsed*/
+        LibSharedData.BaseFeeConfig calldata _baseFeeConfig,
+        uint64 _blocktime,
+        uint64 _parentGasExcess,
+        uint32 _parentGasUsed
     )
         public
         pure
         deprecated
-        returns (uint256, /*basefee_*/ uint64 /*parentGasExcess_*/ )
+        returns (uint256 basefee_, uint64 parentGasExcess_)
     { }
 }

packages/taiko-client/bindings/.githead

@@ -1 +1 @@
-ab50d406172e879e7436c70a41bda674bfc6e441
+8d2cca11180bd615420e9bb3287f31a9ddf18df8

packages/taiko-client/pkg/rpc/methods.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strings"
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
@@ -281,66 +282,24 @@ func (c *Client) CalculateBaseFee(
 	currentTimestamp uint64,
 ) (*big.Int, error) {
 	var (
-		baseFeeInfo struct {
-			Basefee         *big.Int
-			ParentGasExcess uint64
-		}
-		err error
+		baseFee *big.Int
+		err     error
 	)
 
 	if isOntake {
-		var (
-			newGasTarget    = uint64(baseFeeConfig.GasIssuancePerSecond) * uint64(baseFeeConfig.AdjustmentQuotient)
-			parentGasExcess uint64
-		)
-		parentGasTarget, err := c.TaikoL2.ParentGasTarget(
-			&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
-		)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch parent gas target: %w", err)
-		}
-
-		if newGasTarget != parentGasTarget && parentGasTarget != 0 {
-			oldParentGasExcess, err := c.TaikoL2.ParentGasExcess(
-				&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
-			)
-			if err != nil {
-				return nil, fmt.Errorf("failed to fetch old parent gas excess: %w", err)
-			}
-			if parentGasExcess, err = c.TaikoL2.AdjustExcess(
-				&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
-				oldParentGasExcess,
-				parentGasTarget,
-				newGasTarget,
-			); err != nil {
-				return nil, fmt.Errorf("failed to adjust parent gas excess: %w", err)
-			}
-		} else {
-			if parentGasExcess, err = c.TaikoL2.ParentGasExcess(&bind.CallOpts{
-				BlockNumber: l2Head.Number, Context: ctx,
-			}); err != nil {
-				return nil, fmt.Errorf("failed to fetch parent gas excess: %w", err)
-			}
-		}
-		baseFeeInfo, err = c.TaikoL2.CalculateBaseFee(
-			&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
-			*baseFeeConfig,
-			currentTimestamp-l2Head.Time,
-			parentGasExcess,
-			uint32(l2Head.GasUsed),
-		)
-		if err != nil {
+		if baseFee, err = c.calculateBaseFeeOntake(ctx, l2Head, currentTimestamp, baseFeeConfig); err != nil {
 			return nil, err
 		}
 	} else {
-		baseFeeInfo, err = c.TaikoL2.GetBasefee(
+		baseFeeInfo, err := c.TaikoL2.GetBasefee(
 			&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
 			anchorBlockID.Uint64(),
 			uint32(l2Head.GasUsed),
 		)
 		if err != nil {
 			return nil, err
 		}
+		baseFee = baseFeeInfo.Basefee
 	}
 
 	if err != nil {
@@ -349,13 +308,13 @@ func (c *Client) CalculateBaseFee(
 
 	log.Info(
 		"Base fee information",
-		"fee", utils.WeiToGWei(baseFeeInfo.Basefee),
+		"fee", utils.WeiToGWei(baseFee),
 		"l2Head", l2Head.Number,
 		"anchorBlockID", anchorBlockID,
 		"isOntake", isOntake,
 	)
 
-	return baseFeeInfo.Basefee, nil
+	return baseFee, nil
 }
 
 // GetPoolContent fetches the transactions list from L2 execution engine's transactions pool with given
@@ -914,3 +873,68 @@ func (c *Client) WaitL1NewPendingTransaction(
 
 	return nil
 }
+
+// CalculateBaseFeeOnTake calculates the base fee after ontake fork from the L2 protocol.
+func (c *Client) calculateBaseFeeOntake(
+	ctx context.Context,
+	l2Head *types.Header,
+	currentTimestamp uint64,
+	baseFeeConfig *bindings.LibSharedDataBaseFeeConfig,
+) (*big.Int, error) {
+	var (
+		newGasTarget    = uint64(baseFeeConfig.GasIssuancePerSecond) * uint64(baseFeeConfig.AdjustmentQuotient)
+		parentGasExcess uint64
+	)
+	parentGasTarget, err := c.TaikoL2.ParentGasTarget(&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx})
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch parent gas target: %w", err)
+	}
+
+	if newGasTarget != parentGasTarget && parentGasTarget != 0 {
+		oldParentGasExcess, err := c.TaikoL2.ParentGasExcess(&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx})
+		if err != nil {
+			return nil, fmt.Errorf("failed to fetch old parent gas excess: %w", err)
+		}
+		if parentGasExcess, err = c.TaikoL2.AdjustExcess(
+			&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
+			oldParentGasExcess,
+			parentGasTarget,
+			newGasTarget,
+		); err != nil {
+			// If the `calculateBaseFee()` method is deprecated, we will use the new method `getBasefeeV2()`
+			// to calculate the base fee.
+			if strings.Contains(encoding.TryParsingCustomError(err).Error(), "L2_DEPRECATED_METHOD") {
+				baseFeeInfo, err := c.TaikoL2.GetBasefeeV2(
+					&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
+					0,
+					*baseFeeConfig,
+				)
+				if err != nil {
+					return nil, fmt.Errorf("failed to calculate base fee by GetBasefeeV2: %w", err)
+				}
+				return baseFeeInfo.Basefee, nil
+			}
+
+			return nil, fmt.Errorf("failed to adjust parent gas excess: %w", err)
+		}
+	} else {
+		if parentGasExcess, err = c.TaikoL2.ParentGasExcess(&bind.CallOpts{
+			BlockNumber: l2Head.Number, Context: ctx,
+		}); err != nil {
+			return nil, fmt.Errorf("failed to fetch parent gas excess: %w", err)
+		}
+	}
+
+	baseFeeInfo, err := c.TaikoL2.CalculateBaseFee(
+		&bind.CallOpts{BlockNumber: l2Head.Number, Context: ctx},
+		*baseFeeConfig,
+		currentTimestamp-l2Head.Time,
+		parentGasExcess,
+		uint32(l2Head.GasUsed),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return baseFeeInfo.Basefee, nil
+}