update fireinjective

injective/cmd/extract-from-chain-storage/main.go

@@ -10,7 +10,7 @@ import (
 	txindexkv "github.com/cometbft/cometbft/state/txindex/kv"
 	"github.com/cometbft/cometbft/store"
 	"github.com/streamingfast/dstore"
-	"github.com/streamingfast/firehose-cosmos/injective"
+	v03810 "github.com/streamingfast/firehose-cosmos/cometbft/03810"
 	"github.com/streamingfast/logging"
 	"go.uber.org/zap"
 )
@@ -67,8 +67,8 @@ func Main() error {
 	}
 	txIndexStore := txindexkv.NewTxIndex(txIndexDB)
 
-	loader := injective.NewLoader(blockStore, stateStore, txIndexStore, logger)
-	merger := injective.NewSimpleMerger(loader, logger)
+	loader := v03810.NewLoader(blockStore, stateStore, txIndexStore, logger)
+	merger := v03810.NewSimpleMerger(loader, logger)
 
 	err = merger.GenerateMergeBlock(int64(startBlock), int64(endBlock), destStore)
 	if err != nil {

injective/cmd/fireinjective/main.go

@@ -5,21 +5,22 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	v03810 "github.com/streamingfast/firehose-cosmos/cometbft/03810"
 	"github.com/streamingfast/logging"
 	"go.uber.org/zap"
 )
 
 var logger, tracer = logging.PackageLogger("firecosmos", "github.com/streamingfast/firehose-cosmos")
 var rootCmd = &cobra.Command{
-	Use:   "firecosmos",
-	Short: "firecosmos fetching and tooling",
+	Use:   "fireinjective",
+	Short: "Fireinjective block fetching and tooling",
 	Args:  cobra.ExactArgs(1),
 }
 
 func init() {
 	logging.InstantiateLoggers(logging.WithDefaultLevel(zap.InfoLevel))
 
-	rootCmd.AddCommand(newInjectiveCmd(logger, tracer))
+	rootCmd.AddCommand(newFetchCmd(logger, tracer))
 	rootCmd.AddCommand(NewToolsFixUnknownTypeBlocks(logger, tracer))
 }
 
@@ -30,21 +31,12 @@ func main() {
 	}
 }
 
-func newInjectiveCmd(logger *zap.Logger, tracer logging.Tracer) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "injective",
-		Short: "firecosmos for injective chain",
-	}
-	cmd.AddCommand(newFetchCmd(logger, tracer, "injective"))
-	return cmd
-}
-
-func newFetchCmd(logger *zap.Logger, tracer logging.Tracer, cosmosChain string) *cobra.Command {
+func newFetchCmd(logger *zap.Logger, tracer logging.Tracer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "fetch",
 		Short: "fetch blocks from different sources",
 		Args:  cobra.ExactArgs(2),
 	}
-	cmd.AddCommand(NewFetchCmd(logger, tracer, cosmosChain))
+	cmd.AddCommand(v03810.NewFetchCmd(logger, tracer))
 	return cmd
 }

injective/cmd/fireinjective/tools_fix_unknown_type_blocks.go

@@ -14,8 +14,8 @@ import (
 	"github.com/streamingfast/cli"
 	"github.com/streamingfast/dstore"
 	firecore "github.com/streamingfast/firehose-core"
+	v03810 "github.com/streamingfast/firehose-cosmos/cometbft/03810"
 	pbcosmos "github.com/streamingfast/firehose-cosmos/cosmos/pb/sf/cosmos/type/v2"
-	"github.com/streamingfast/firehose-cosmos/injective"
 	"github.com/streamingfast/logging"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/known/anypb"
@@ -24,9 +24,9 @@ import (
 func NewToolsFixUnknownTypeBlocks(logger *zap.Logger, tracer logging.Tracer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "fix-unknown-type-blocks <first-streamable-block> <stop-block> <src-blocks-store> <dst-blocks-store>",
-		Short: "injective firecosmos tool to fix unknown type blocks",
+		Short: "firecosmos tool to fix unknown type blocks",
 		Long: cli.Dedent(`
-			Injective firecosmos tool to fix unknown type blocks. This tool will read blocks from a source
+			Firecosmos tool to fix unknown type blocks. This tool will read blocks from a source
 			and write the fixed block to a destination.
 		`),
 		Args: cobra.ExactArgs(4),
@@ -105,7 +105,7 @@ func fixUnknownTypeBlocksRunE(zlog *zap.Logger, tracer logging.Tracer) firecore.
 				blockCount++
 
 				injectiveBlock := &pbcosmos.Block{}
-				err = injective.UnmarshallerDiscardUnknown.Unmarshal(currentBlock.Payload.Value, injectiveBlock)
+				err = v03810.UnmarshallerDiscardUnknown.Unmarshal(currentBlock.Payload.Value, injectiveBlock)
 				if err != nil {
 					return fmt.Errorf("unmarshaling block: %w", err)
 				}