feat: add BlockGasTargetMillion

taikoxyz · Jul 29, 2024 · f2c4928 · f2c4928
1 parent 54b409c
commit f2c4928
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/packages/taiko-client/bindings/encoding/input.go b/packages/taiko-client/bindings/encoding/input.go
@@ -148,18 +148,6 @@ var (
 			Name: "blobIndex",
 			Type: "uint8",
 		},
-		{
-			Name: "basefeeAdjustmentQuotient",
-			Type: "uint8",
-		},
-		{
-			Name: "basefeeSharingPctg",
-			Type: "uint8",
-		},
-		{
-			Name: "blockGasIssuance",
-			Type: "uint32",
-		},
 	}
 	transitionComponents = []abi.ArgumentMarshaling{
 		{

diff --git a/packages/taiko-client/bindings/encoding/protocol_config.go b/packages/taiko-client/bindings/encoding/protocol_config.go
@@ -20,6 +20,7 @@ var (
 		StateRootSyncInternal: 16,
 		MaxAnchorHeightOffset: 64,
 		BasefeeSharingPctg:    75,
+		BlockGasTargetMillion: 20,
 		OntakeForkHeight:      374_400,
 	}
 	HeklaProtocolConfig = &bindings.TaikoDataConfig{
@@ -32,6 +33,7 @@ var (
 		StateRootSyncInternal: 16,
 		MaxAnchorHeightOffset: 64,
 		BasefeeSharingPctg:    75,
+		BlockGasTargetMillion: 20,
 		OntakeForkHeight:      540_000,
 	}
 	MainnetProtocolConfig = &bindings.TaikoDataConfig{
@@ -44,6 +46,7 @@ var (
 		StateRootSyncInternal: 16,
 		MaxAnchorHeightOffset: 64,
 		BasefeeSharingPctg:    75,
+		BlockGasTargetMillion: 20,
 		OntakeForkHeight:      374_400,
 	}
 )

diff --git a/packages/taiko-client/driver/chain_syncer/blob/syncer.go b/packages/taiko-client/driver/chain_syncer/blob/syncer.go
@@ -455,13 +455,12 @@ func (s *Syncer) createExecutionPayloads(
 		SuggestedFeeRecipient: meta.GetCoinbase(),
 		Withdrawals:           withdrawals,
 		BlockMetadata: &engine.BlockMetadata{
-			Beneficiary:        meta.GetCoinbase(),
-			GasLimit:           uint64(meta.GetGasLimit()) + consensus.AnchorGasLimit,
-			Timestamp:          meta.GetTimestamp(),
-			TxList:             txListBytes,
-			MixHash:            meta.GetDifficulty(),
-			ExtraData:          meta.GetExtraData(),
-			BasefeeSharingPctg: 0, // TODO: remove this
+			Beneficiary: meta.GetCoinbase(),
+			GasLimit:    uint64(meta.GetGasLimit()) + consensus.AnchorGasLimit,
+			Timestamp:   meta.GetTimestamp(),
+			TxList:      txListBytes,
+			MixHash:     meta.GetDifficulty(),
+			ExtraData:   meta.GetExtraData(),
 		},
 		BaseFeePerGas: baseFee,
 		L1Origin:      l1Origin,
@@ -474,7 +473,6 @@ func (s *Syncer) createExecutionPayloads(
 		"random", attributes.Random,
 		"suggestedFeeRecipient", attributes.SuggestedFeeRecipient,
 		"withdrawals", len(attributes.Withdrawals),
-		"basefeeSharingPctg", attributes.BlockMetadata.BasefeeSharingPctg,
 		"gasLimit", attributes.BlockMetadata.GasLimit,
 		"timestamp", attributes.BlockMetadata.Timestamp,
 		"mixHash", attributes.BlockMetadata.MixHash,