From 4eaf414c0a9eeea9860c02cd7fdab3bde77e4c41 Mon Sep 17 00:00:00 2001 From: Pranay Valson Date: Thu, 28 Mar 2024 12:42:02 -0700 Subject: [PATCH] format info and optimize channel buffers Signed-off-by: Pranay Valson --- core/block_replica.go | 18 ++++++++---------- core/types/block_export.go | 2 +- miner/worker.go | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/core/block_replica.go b/core/block_replica.go index 93b6a7d6f..0cee9236f 100644 --- a/core/block_replica.go +++ b/core/block_replica.go @@ -22,25 +22,23 @@ type BlockReplicationEvent struct { func (bc *BlockChain) createBlockReplica(block *types.Block, replicaConfig *ReplicaConfig, chainConfig *params.ChainConfig, stateSpecimen *types.StateSpecimen) error { + // blobs var blobTxSidecars []*types.BlobTxSidecar for sidecarData := range types.BlobTxSidecarChan { if sidecarData.BlockNumber.Uint64() == block.NumberU64() { - log.Info("Consuming Sidecar From Miner Side Channel: ", sidecarData.BlockNumber) + log.Info("Consuming BlobTxSidecar Match From Chain Sync Channel", "Block Number:", sidecarData.BlockNumber.Uint64()) blobTxSidecars = append(blobTxSidecars, sidecarData.Blobs) } else { - log.Info("Blob Sidecar did not match block number from Miner Side Channel: ", sidecarData.BlockNumber.Uint64()) + log.Info("Failing BlobTxSidecar Match from Chain Sync Channel", "Block Number:", sidecarData.BlockNumber.Uint64()) } - fmt.Println("side car header block number:", sidecarData.BlockNumber) - fmt.Println("length of sidecar channel:", len(types.BlobTxSidecarChan)) - // blobTxSidecars = append(blobTxSidecars, sidecarData.Blobs) - } + log.Info("BlobTxSidecar Header", "Block Number:", sidecarData.BlockNumber.Uint64()) + + log.Info("Chain Sync Sidecar Channel", "Length:", len(types.BlobTxSidecarChan)) - // for _, sidecarData := range blobTxSidecars { - // fmt.Println(*sidecarData, "full side car") - // } + } - //block replica + //block replica with blobs exportBlockReplica, err := bc.createReplica(block, replicaConfig, chainConfig, stateSpecimen, blobTxSidecars) if err != nil { return err diff --git a/core/types/block_export.go b/core/types/block_export.go index 483cada73..06e90a9ca 100644 --- a/core/types/block_export.go +++ b/core/types/block_export.go @@ -82,7 +82,7 @@ type BlobTxSidecarData struct { BlockNumber *big.Int } -var BlobTxSidecarChan = make(chan *BlobTxSidecarData, 1000) +var BlobTxSidecarChan = make(chan *BlobTxSidecarData, 100) func (r *ReceiptForExport) ExportReceipt() *ReceiptExportRLP { enc := &ReceiptExportRLP{ diff --git a/miner/worker.go b/miner/worker.go index 8c391f611..b9ab71675 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -118,7 +118,7 @@ func (env *environment) copy() *environment { cpy.sidecars = make([]*types.BlobTxSidecar, len(env.sidecars)) copy(cpy.sidecars, env.sidecars) - types.BlobTxSidecarChan = make(chan *types.BlobTxSidecarData, 1000) + types.BlobTxSidecarChan = make(chan *types.BlobTxSidecarData, 100) go func() { for sidecar := range env.sidecars { @@ -127,7 +127,7 @@ func (env *environment) copy() *environment { BlockNumber: env.header.Number, } } - fmt.Println("closed sidecar channel in miner") + log.Info("Closing Chain Sync BlobTxSidecar Channel For", "Block Number:", env.header.Number.Uint64(), "Length:", len(types.BlobTxSidecarChan)) close(types.BlobTxSidecarChan) }()