upgrade to firehose-core v1.0.0

cmd/fireantelope/main.go

@@ -6,26 +6,29 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	firecore "github.com/streamingfast/firehose-core"
+	fhCmd "github.com/streamingfast/firehose-core/cmd"
 	"github.com/streamingfast/logging"
-	"github.com/streamingfast/node-manager/mindreader"
-	pbbstream "github.com/streamingfast/pbgo/sf/bstream/v1"
 	"go.uber.org/zap"
 )
 
-func init() {
-	firecore.UnsafePayloadKind = pbbstream.Protocol_EOS
+func main() {
+	fhCmd.Main(Chain())
 }
 
-func main() {
-	firecore.Main(&firecore.Chain[*pbantelope.Block]{
+var chain *firecore.Chain[*pbantelope.Block]
+
+func Chain() *firecore.Chain[*pbantelope.Block] {
+	if chain != nil {
+		return chain
+	}
+
+	chain = &firecore.Chain[*pbantelope.Block]{
 		ShortName:            "antelope",
 		LongName:             "Antelope",
 		ExecutableName:       "nodeos",
 		FullyQualifiedModule: "github.com/pinax-network/firehose-antelope",
 		Version:              version,
 
-		Protocol:             "EOS",
-		ProtocolVersion:      1,
 		FirstStreamableBlock: 2,
 
 		BlockFactory: func() firecore.Block { return new(pbantelope.Block) },
@@ -39,9 +42,7 @@ func main() {
 		//	transform.ReceiptFilterMessageName: transform.BasicReceiptFilterFactory,
 		//},
 
-		ConsoleReaderFactory: func(lines chan string, blockEncoder firecore.BlockEncoder, logger *zap.Logger, tracer logging.Tracer) (mindreader.ConsolerReader, error) {
-			return codec.NewConsoleReader(lines, blockEncoder, logger, tracer)
-		},
+		ConsoleReaderFactory: codec.NewConsoleReader,
 
 		RegisterExtraStartFlags: func(flags *pflag.FlagSet) {
 			flags.String("reader-node-config-file", "", "Node configuration file, the file is copied inside the {data-dir}/reader/data folder Use {hostname} label to use short hostname in path")
@@ -53,7 +54,6 @@ func main() {
 		// ReaderNodeBootstrapperFactory: newReaderNodeBootstrapper,
 
 		Tools: &firecore.ToolsConfig[*pbantelope.Block]{
-			BlockPrinter: printBlock,
 
 			RegisterExtraCmd: func(chain *firecore.Chain[*pbantelope.Block], toolsCmd *cobra.Command, zlog *zap.Logger, tracer logging.Tracer) error {
 				//toolsCmd.AddCommand(newToolsGenerateNodeKeyCmd(chain))
@@ -69,11 +69,10 @@ func main() {
 			//	},
 			//},
 		},
-	})
+	}
+
+	return chain
 }
 
 // Version value, injected via go build `ldflags` at build time
 var version = "dev"
-
-// Commit sha1 value, injected via go build `ldflags` at build time
-var commit = ""

codec/abi_cache_test.go

@@ -3,7 +3,7 @@ package codec
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"os"
 	"path"
 	"testing"
 
@@ -265,7 +265,7 @@ func TestABICache_Truncate(t *testing.T) {
 
 func readABI(t *testing.T, abiFile string) (out *eos.ABI) {
 	path := path.Join("testdata", "abi", abiFile)
-	abiJSON, err := ioutil.ReadFile(path)
+	abiJSON, err := os.ReadFile(path)
 	require.NoError(t, err)
 
 	out = new(eos.ABI)

codec/abi_decoder_test.go

@@ -385,10 +385,10 @@ func TestABIDecoder(t *testing.T) {
 		//return out
 	}
 
-	hexRegex := regexp.MustCompile("^[0-9a-fA-F]+$")
-	actionTraceRegex := regexp.MustCompile("^block (\\d+)/trace (\\d+)/action (\\d+)$")
-	dtrxOpRegex := regexp.MustCompile("^block (\\d+)/trace (\\d+)/dtrxOp (\\d+)/(action|cfaAction) (\\d+)$")
-	trxOpRegex := regexp.MustCompile("^block (\\d+)/trxOp (\\d+)/(action|cfaAction) (\\d+)$")
+	hexRegex := regexp.MustCompile(`^[0-9a-fA-F]+$`)
+	actionTraceRegex := regexp.MustCompile(`^block (\d+)/trace (\d+)/action (\d+)$`)
+	dtrxOpRegex := regexp.MustCompile(`^block (\d+)/trace (\d+)/dtrxOp (\d+)/(action|cfaAction) (\d+)$`)
+	trxOpRegex := regexp.MustCompile(`^block (\d+)/trxOp (\d+)/(action|cfaAction) (\d+)$`)
 
 	toInt := func(in string) int {
 		out, err := strconv.ParseInt(in, 10, 32)
@@ -422,7 +422,7 @@ func TestABIDecoder(t *testing.T) {
 				abiBinary, err := eos.MarshalBinary(abi)
 				require.NoError(t, err)
 
-				decoder.addInitialABI(contract, base64.RawStdEncoding.EncodeToString(abiBinary))
+				_ = decoder.addInitialABI(contract, base64.RawStdEncoding.EncodeToString(abiBinary))
 			}
 
 			for _, block := range test.blocks {

codec/antelope/eos_to_proto.go

@@ -431,21 +431,6 @@ func AuthorizationToDEOS(authorization []eos.PermissionLevel) (out []*pbantelope
 	return
 }
 
-func AccountRAMDeltasToDEOS(deltas []*eos.AccountRAMDelta) (out []*pbantelope.AccountRAMDelta) {
-	if len(deltas) <= 0 {
-		return nil
-	}
-
-	out = make([]*pbantelope.AccountRAMDelta, len(deltas))
-	for i, delta := range deltas {
-		out[i] = &pbantelope.AccountRAMDelta{
-			Account: string(delta.Account),
-			Delta:   int64(delta.Delta),
-		}
-	}
-	return
-}
-
 func ExceptionToDEOS(in *eos.Except) *pbantelope.Exception {
 	if in == nil {
 		return nil