Ported all remaining tools to firehose-core framework

streamingfast · Oct 27, 2023 · f66c79d · f66c79d
1 parent 76f50ca
commit f66c79d
Show file tree

Hide file tree

Showing 18 changed files with 901 additions and 850 deletions.
diff --git a/cmd/fireeth/cli/node.go b/cmd/fireeth/cli/node.go
@@ -25,6 +25,7 @@ import (
 	"github.com/streamingfast/bstream"
 	"github.com/streamingfast/bstream/blockstream"
 	"github.com/streamingfast/dlauncher/launcher"
+	firecore "github.com/streamingfast/firehose-core"
 	"github.com/streamingfast/firehose-ethereum/codec"
 	nodemanager "github.com/streamingfast/firehose-ethereum/node-manager"
 	"github.com/streamingfast/firehose-ethereum/node-manager/dev"
@@ -203,7 +204,7 @@ func nodeFactoryFunc(isReader bool, backupModuleFactories map[string]operator.Ba
 			oneBlocksStoreURL,
 			workingDir,
 			func(lines chan string) (reader.ConsolerReader, error) {
-				return codec.NewConsoleReader(appLogger, lines)
+				return codec.NewConsoleReader(lines, firecore.NewBlockEncoder(), appLogger, appTracer)
 			},
 			batchStartBlockNum,
 			batchStopBlockNum,

diff --git a/cmd/fireeth/cli/reader-node-stdin.go b/cmd/fireeth/cli/reader-node-stdin.go
@@ -20,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/streamingfast/dlauncher/launcher"
+	firecore "github.com/streamingfast/firehose-core"
 	"github.com/streamingfast/firehose-ethereum/codec"
 	"github.com/streamingfast/logging"
 	nodeManager "github.com/streamingfast/node-manager"
@@ -41,7 +42,7 @@ func init() {
 			archiveStoreURL := MustReplaceDataDir(sfDataDir, viper.GetString("common-one-block-store-url"))
 
 			consoleReaderFactory := func(lines chan string) (mindreader.ConsolerReader, error) {
-				r, err := codec.NewConsoleReader(appLogger, lines)
+				r, err := codec.NewConsoleReader(lines, firecore.NewBlockEncoder(), appLogger, appTracer)
 				if err != nil {
 					return nil, fmt.Errorf("initiating console reader: %w", err)
 				}

diff --git a/cmd/fireeth/main.go b/cmd/fireeth/main.go
@@ -63,8 +63,10 @@ var Chain = &firecore.Chain[*pbeth.Block]{
 		BlockPrinter: printBlock,
 
 		RegisterExtraCmd: func(chain *firecore.Chain[*pbeth.Block], toolsCmd *cobra.Command, zlog *zap.Logger, tracer logging.Tracer) error {
-			// toolsCmd.AddCommand(newToolsGenerateNodeKeyCmd(chain))
-			// toolsCmd.AddCommand(newToolsBackfillCmd(zlog))
+			toolsCmd.AddCommand(compareOneblockRPCCmd)
+			toolsCmd.AddCommand(newCompareBlocksRPCCmd(zlog))
+			toolsCmd.AddCommand(newFixPolygonIndexCmd(zlog))
+			toolsCmd.AddCommand(newPollRPCBlocksCmd(zlog))
 
 			return nil
 		},

diff --git a/cmd/fireeth/main_test.go b/cmd/fireeth/main_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/streamingfast/bstream"
+	firecore "github.com/streamingfast/firehose-core"
 	pbeth "github.com/streamingfast/firehose-ethereum/types/pb/sf/ethereum/type/v2"
 	"github.com/test-go/testify/require"
 )
@@ -13,10 +14,11 @@ func Test_Encode_Decode_Block(t *testing.T) {
 	Chain.Validate()
 	Chain.Init()
 
-	original, err := Chain.BlockEncoder.Encode(&pbeth.Block{
+	original, err := Chain.BlockEncoder.Encode(firecore.BlockEnveloppe{Block: &pbeth.Block{
 		Number: 1,
 		Header: &pbeth.BlockHeader{},
-	})
+		Ver:    1,
+	}, LIBNum: 0})
 	require.NoError(t, err)
 
 	require.Equal(t, uint64(1), original.ToProtocol().(*pbeth.Block).Number)

diff --git a/cmd/fireeth/tools.go b/cmd/fireeth/tools.go
@@ -6,6 +6,7 @@ import (
 	"io"
 
 	"github.com/streamingfast/bstream"
+	"github.com/streamingfast/cli"
 	pbeth "github.com/streamingfast/firehose-ethereum/types/pb/sf/ethereum/type/v2"
 )
 
@@ -31,3 +32,7 @@ func printBlock(blk *bstream.Block, alsoPrintTransactions bool, out io.Writer) e
 
 	return nil
 }
+
+func ExamplePrefixed(prefix, examples string) string {
+	return string(cli.ExamplePrefixed(prefix, examples))
+}