bump firehose-core to v1.2.1 (#122)

* bump firehose-core to v1.2.1

* fix sanitizeBlockForCompare, remove block poller

* run go mod tidy

cmd/fireantelope/main.go

@@ -33,15 +33,6 @@ func Chain() *firecore.Chain[*pbantelope.Block] {
 
 		BlockFactory: func() firecore.Block { return new(pbantelope.Block) },
 
-		//BlockIndexerFactories: map[string]firecore.BlockIndexerFactory[*pbantelope.Block]{
-		//	transform.ReceiptAddressIndexShortName: transform.NewNearBlockIndexer,
-		//},
-		//
-		//BlockTransformerFactories: map[protoreflect.FullName]firecore.BlockTransformerFactory{
-		//	transform.HeaderOnlyMessageName:    transform.NewHeaderOnlyTransformFactory,
-		//	transform.ReceiptFilterMessageName: transform.BasicReceiptFilterFactory,
-		//},
-
 		ConsoleReaderFactory: codec.NewConsoleReader,
 
 		RegisterExtraStartFlags: func(flags *pflag.FlagSet) {
@@ -51,28 +42,15 @@ func Chain() *firecore.Chain[*pbantelope.Block] {
 			flags.Bool("reader-node-overwrite-node-files", false, "Force download of node-key and config files even if they already exist on the machine.")
 		},
 
-		// ReaderNodeBootstrapperFactory: newReaderNodeBootstrapper,
-
 		Tools: &firecore.ToolsConfig[*pbantelope.Block]{
 
 			RegisterExtraCmd: func(chain *firecore.Chain[*pbantelope.Block], parent *cobra.Command, zlog *zap.Logger, tracer logging.Tracer) error {
-				//toolsCmd.AddCommand(newToolsGenerateNodeKeyCmd(chain))
-				//toolsCmd.AddCommand(newToolsBackfillCmd(zlog))
-				parent.AddCommand(newPollerCmd(zlog, tracer))
-				parent.AddCommand(newSilkwormPollerCmd(zlog, tracer))
 				parent.AddCommand(newCheckBlocksCmd(zlog))
 
 				return nil
 			},
 
 			SanitizeBlockForCompare: sanitizeBlockForCompare,
-
-			//TransformFlags: map[string]*firecore.TransformFlag{
-			//	"receipt-account-filters": {
-			//		Description: "Comma-separated accounts to use as filter/index. If it contains a colon (:), it will be interpreted as <prefix>:<suffix> (each of which can be empty, ex: 'hello:' or ':world')",
-			//		Parser:      parseReceiptAccountFilters,
-			//	},
-			//},
 		},
 	}
 

cmd/fireantelope/util.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	pbantelope "github.com/pinax-network/firehose-antelope/types/pb/sf/antelope/type/v1"
+	pbbstream "github.com/streamingfast/bstream/pb/sf/bstream/v1"
+	firecore "github.com/streamingfast/firehose-core"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"strconv"
 	"time"
@@ -19,7 +21,13 @@ func mustParseUint64(in string) uint64 {
 	return out
 }
 
-func sanitizeBlockForCompare(block *pbantelope.Block) *pbantelope.Block {
+func sanitizeBlockForCompare(block *pbbstream.Block) *pbbstream.Block {
+
+	var antelopeBlock pbantelope.Block
+	err := block.Payload.UnmarshalTo(&antelopeBlock)
+	if err != nil {
+		panic(fmt.Errorf("unable to unmarshal block payload into Antelope block: %w", err))
+	}
 
 	var sanitizeContext func(logContext *pbantelope.Exception_LogContext)
 	sanitizeContext = func(logContext *pbantelope.Exception_LogContext) {
@@ -50,11 +58,11 @@ func sanitizeBlockForCompare(block *pbantelope.Block) *pbantelope.Block {
 		}
 	}
 
-	for _, rlimitOp := range block.RlimitOps {
+	for _, rlimitOp := range antelopeBlock.RlimitOps {
 		sanitizeRLimitOp(rlimitOp)
 	}
 
-	for _, trxTrace := range block.UnfilteredTransactionTraces {
+	for _, trxTrace := range antelopeBlock.UnfilteredTransactionTraces {
 		trxTrace.Elapsed = 888
 		sanitizeException(trxTrace.Exception)
 
@@ -87,5 +95,10 @@ func sanitizeBlockForCompare(block *pbantelope.Block) *pbantelope.Block {
 		}
 	}
 
-	return block
+	res, err := firecore.EncodeBlock(&antelopeBlock)
+	if err != nil {
+		panic(fmt.Errorf("failed to encode Antelope block: %w", err))
+	}
+
+	return res
 }