feat(taiko-client): changes for meta.blobCreatedIn (#18960)

taikoxyz · Feb 19, 2025 · c0e0901 · c0e0901
1 parent 8a542cd
commit c0e0901
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 22 deletions.
diff --git a/packages/taiko-client/bindings/metadata/interface.go b/packages/taiko-client/bindings/metadata/interface.go
@@ -20,6 +20,7 @@ type TaikoProposalMetaData interface {
 	GetTxHash() common.Hash
 	GetProposer() common.Address
 	GetCoinbase() common.Address
+	GetBlobCreatedIn() *big.Int
 }
 
 type TaikoBlockMetaDataOntake interface {
@@ -40,6 +41,7 @@ type TaikoBlockMetaDataOntake interface {
 	GetLivenessBond() *big.Int
 	GetProposedAt() uint64
 	GetProposedIn() uint64
+	GetBlobCreatedIn() *big.Int
 	GetBlobTxListOffset() uint32
 	GetBlobTxListLength() uint32
 	GetBlobIndex() uint8
@@ -61,6 +63,7 @@ type TaikoBatchMetaDataPacaya interface {
 	GetProposer() common.Address
 	GetProposedAt() uint64
 	GetProposedIn() uint64
+	GetBlobCreatedIn() *big.Int
 	GetTxListOffset() uint32
 	GetTxListSize() uint32
 	GetLastBlockID() uint64

diff --git a/packages/taiko-client/bindings/metadata/metadata_ontake.go b/packages/taiko-client/bindings/metadata/metadata_ontake.go
@@ -128,6 +128,11 @@ func (m *TaikoDataBlockMetadataOntake) GetProposedIn() uint64 {
 	return m.ProposedIn
 }
 
+// GetBlobCreatedIn returns the L1 block number when the blob created.
+func (m *TaikoDataBlockMetadataOntake) GetBlobCreatedIn() *big.Int {
+	return new(big.Int).SetUint64(m.BlockNumber)
+}
+
 // GetBlobTxListOffset returns the blob tx list offset.
 func (m *TaikoDataBlockMetadataOntake) GetBlobTxListOffset() uint32 {
 	return m.BlobTxListOffset

diff --git a/packages/taiko-client/bindings/metadata/metadata_pacaya.go b/packages/taiko-client/bindings/metadata/metadata_pacaya.go
@@ -103,6 +103,11 @@ func (m *TaikoDataBlockMetadataPacaya) GetProposedIn() uint64 {
 	return m.ProposedIn
 }
 
+// GetBlobCreatedIn returns the L1 block number when the blob created.
+func (m *TaikoDataBlockMetadataPacaya) GetBlobCreatedIn() *big.Int {
+	return new(big.Int).SetUint64(m.BlobCreatedIn)
+}
+
 // GetTxListOffset returns calldata tx list offset.
 func (m *TaikoDataBlockMetadataPacaya) GetTxListOffset() uint32 {
 	return m.BlobByteOffset

diff --git a/packages/taiko-client/bindings/pacaya/.githead b/packages/taiko-client/bindings/pacaya/.githead
@@ -1 +1 @@
-2be4b799893cb2bf683d47e08f11d1f41c7da52e
+d698944ecb2fddd3a8c51e69507c8703b51a2e80
diff --git a/packages/taiko-client/bindings/pacaya/gen_prover_set.go b/packages/taiko-client/bindings/pacaya/gen_prover_set.go
diff --git a/packages/taiko-client/bindings/pacaya/gen_taiko_inbox.go b/packages/taiko-client/bindings/pacaya/gen_taiko_inbox.go
diff --git a/packages/taiko-client/driver/chain_syncer/blob/syncer.go b/packages/taiko-client/driver/chain_syncer/blob/syncer.go
@@ -74,7 +74,7 @@ func NewSyncer(
 	)
 
 	var (
-		txListFetcherBlob     = txlistFetcher.NewBlobTxListFetcher(client.L1Beacon, blobDataSource)
+		txListFetcherBlob     = txlistFetcher.NewBlobTxListFetcher(client, blobDataSource)
 		txListFetcherCalldata = txlistFetcher.NewCalldataFetch(client)
 	)
 	return &Syncer{

diff --git a/packages/taiko-client/driver/txlist_fetcher/blob.go b/packages/taiko-client/driver/txlist_fetcher/blob.go
@@ -17,13 +17,13 @@ import (
 
 // BlobFetcher is responsible for fetching the txList blob from the L1 block sidecar.
 type BlobFetcher struct {
-	l1Beacon   *rpc.BeaconClient
+	cli        *rpc.Client
 	dataSource *rpc.BlobDataSource
 }
 
 // NewBlobTxListFetcher creates a new BlobFetcher instance based on the given rpc client.
-func NewBlobTxListFetcher(l1Beacon *rpc.BeaconClient, ds *rpc.BlobDataSource) *BlobFetcher {
-	return &BlobFetcher{l1Beacon, ds}
+func NewBlobTxListFetcher(cli *rpc.Client, ds *rpc.BlobDataSource) *BlobFetcher {
+	return &BlobFetcher{cli, ds}
 }
 
 // FetchOntake implements the TxListFetcher interface.
@@ -95,11 +95,17 @@ func (d *BlobFetcher) FetchPacaya(
 		return nil, pkg.ErrBlobUnused
 	}
 
+	// Fetch the L1 block header with the given blob.
+	l1Header, err := d.cli.L1.HeaderByNumber(ctx, meta.GetBlobCreatedIn())
+	if err != nil {
+		return nil, err
+	}
+
 	var b []byte
 	// Fetch the L1 block sidecars.
 	sidecars, err := d.dataSource.GetBlobs(
 		ctx,
-		meta.GetProposedAt(),
+		l1Header.Time,
 		meta.GetBlobHashes()[0],
 	)
 	if err != nil {
@@ -108,7 +114,7 @@ func (d *BlobFetcher) FetchPacaya(
 
 	log.Info(
 		"Fetch sidecars",
-		"blockNumber", meta.GetRawBlockHeight(),
+		"blockNumber", meta.GetBlobCreatedIn(),
 		"sidecars", len(sidecars),
 	)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2be4b799893cb2bf683d47e08f11d1f41c7da52e
		d698944ecb2fddd3a8c51e69507c8703b51a2e80