Merge remote-tracking branch 'origin/main' into ansermino/console_reader

# Conflicts: # cmd/firefil/main.go
ChainSafe · Nov 6, 2024 · d7cec85 · d7cec85
2 parents 01c8563 + 57bda4e
commit d7cec85
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 561 deletions.
diff --git a/cmd/firefil/main.go b/cmd/firefil/main.go
@@ -8,19 +8,19 @@ import (
 )
 
 func main() {
-	fhCmd.Main(&firecore.Chain[*pbfilecoin.Block]{
+	fhCmd.Main(&firecore.Chain[*pbfilecoin.Tipset]{
 		ShortName:            "filecoin",
 		LongName:             "Filecoin",
-		ExecutableName:       "dummy-blockchain",
-		FullyQualifiedModule: "github.com/chainsafe/firehose-filecoin",
+		ExecutableName:       "forest",
+    FullyQualifiedModule: "github.com/chainsafe/firehose-filecoin",
 		Version:              version,
 
 		FirstStreamableBlock: 1,
 
-		BlockFactory:         func() firecore.Block { return new(pbfilecoin.Block) },
+		BlockFactory:         func() firecore.Block { return new(pbfilecoin.Tipset) },
 		ConsoleReaderFactory: console_reader.NewConsoleReader,
 
-		Tools: &firecore.ToolsConfig[*pbfilecoin.Block]{},
+		Tools: &firecore.ToolsConfig[*pbfilecoin.Tipset]{},
 	})
 }
 

diff --git a/devel/standard/standard.yaml b/devel/standard/standard.yaml
@@ -11,12 +11,10 @@ start:
     # Specifies the path to the binary, we assume you did
     # `go install github.com/streamingfast/dummy-blockchain@latest` (and that you have value
     # of `go env GOPATH` in your environment).
-    reader-node-path: "dummy-blockchain"
+    reader-node-path: "forest"
     reader-node-data-dir: "{data-dir}/reader-node"
 
     # Flags that will be added to the dummy chain process command
     reader-node-arguments:
-      start
-      --tracer=firehose
-      --store-dir={node-data-dir}
-      --block-rate=60
+      --chain calibnet
+      --encrypt-keystore false
diff --git a/devel/stdin/start.sh b/devel/stdin/start.sh
@@ -33,7 +33,7 @@ main() {
   #   usage_error "The 'dummy-blockchain' executable must be found within your PATH, install it from source of 'https://github.com/streamingfast/dummy-blockchain'"
   # fi
 
-  exec go run github.com/streamingfast/dummy-blockchain@v1.2.0 start --tracer=firehose --block-rate=60 --store-dir "$chain_data" | $firefil -c $(basename $ROOT).yaml start "$@"
+  forest --chain calibnet --encrypt-keystore=false | $firefil -c $(basename $ROOT).yaml start "$@"
 }
 
 usage_error() {
@@ -55,4 +55,4 @@ usage() {
   echo "    -c             Clean actual data directory first"
 }
 
-main "$@"
+main "$@"
diff --git a/devel/stdin/stdin.yaml b/devel/stdin/stdin.yaml
@@ -1,6 +1,6 @@
 # Invoked using:
 #
-#   dummy-blockchain start --tracer=firehose --store-dir=./devel/stdin/firehose-data/reader-node --block-rate=60 | ./devel/stdin/start.sh
+#   forest --chain calibnet --encrypt-keystore=false | ./devel/stdin/start.sh
 #
 # The `./devel/stdin/start.sh` does the above invocation and pipes the output to the `stdin` process.
 start:

diff --git a/pb/last_generate.txt b/pb/last_generate.txt
@@ -1,2 +1,2 @@
-generate.sh - Wed Nov  6 00:50:26 EST 2024 - d
-streamingfast/firehose-filecoin/proto revision: ada6ee7
+generate.sh - Wed Nov  6 15:46:22 +07 2024 - rumcajs
+streamingfast/firehose-filecoin/proto revision: 3910e98
diff --git a/pb/sf/filecoin/type/v1/type.go b/pb/sf/filecoin/type/v1/type.go
@@ -6,36 +6,36 @@ import (
 	firecore "github.com/streamingfast/firehose-core"
 )
 
-var _ firecore.Block = (*Block)(nil)
+var _ firecore.Block = (*Tipset)(nil)
 
-func (b *Block) GetFirehoseBlockID() string {
-	return b.Header.Hash
+func (b *Tipset) GetFirehoseBlockID() string {
+	return b.TipsetKey
 }
 
-func (b *Block) GetFirehoseBlockNumber() uint64 {
-	return b.Header.Height
+func (b *Tipset) GetFirehoseBlockNumber() uint64 {
+	return b.Height
 }
 
-func (b *Block) GetFirehoseBlockParentID() string {
-	if b.Header.PreviousHash == nil {
+func (b *Tipset) GetFirehoseBlockParentID() string {
+	if b.ParentTipsetKey == nil {
 		return ""
 	}
 
-	return *b.Header.PreviousHash
+	return *b.ParentTipsetKey
 }
 
-func (b *Block) GetFirehoseBlockParentNumber() uint64 {
-	if b.Header.PreviousNum == nil {
+func (b *Tipset) GetFirehoseBlockParentNumber() uint64 {
+	if b.Height == 0 {
 		return 0
 	}
 
-	return *b.Header.PreviousNum
+  return b.Height - 1
 }
 
-func (b *Block) GetFirehoseBlockTime() time.Time {
-	return time.Unix(0, int64(b.Header.Timestamp)).UTC()
+func (b *Tipset) GetFirehoseBlockTime() time.Time {
+	return time.Unix(0, int64(b.Timestamp)).UTC()
 }
 
-func (b *Block) GetFirehoseBlockLIBNum() uint64 {
-	return b.Header.FinalNum
+func (b *Tipset) GetFirehoseBlockLIBNum() uint64 {
+	return 1;
 }