no more acme, more fields

ChainSafe · Nov 6, 2024 · c272eab · c272eab
1 parent 3910e98
commit c272eab
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 271 deletions.
diff --git a/cmd/fireacme/main.go b/cmd/fireacme/main.go
diff --git a/cmd/firefil/main.go b/cmd/firefil/main.go
@@ -7,19 +7,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: firecore.NewConsoleReader,
 
-		Tools: &firecore.ToolsConfig[*pbfilecoin.Block]{},
+		Tools: &firecore.ToolsConfig[*pbfilecoin.Tipset]{},
 	})
 }
 

diff --git a/devel/stdin/start.sh b/devel/stdin/start.sh
@@ -3,7 +3,7 @@
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 clean=
-fireacme="$ROOT/../fireacme"
+firefil="$ROOT/../firefil"
 
 main() {
   pushd "$ROOT" &> /dev/null
@@ -33,7 +33,6 @@ 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/[email protected] start --tracer=firehose --block-rate=60 --store-dir "$chain_data" | $fireacme -c $(basename $ROOT).yaml start "$@"
   forest --chain calibnet --encrypt-keystore=false | $firefil -c $(basename $ROOT).yaml start "$@"
 }
 

diff --git a/pb/last_generate.txt b/pb/last_generate.txt
@@ -1,2 +1,2 @@
-generate.sh - Wed Nov  6 15:20:13 +07 2024 - rumcajs
-streamingfast/firehose-filecoin/proto revision: edddbaf
+generate.sh - Wed Nov  6 15:46:22 +07 2024 - rumcajs
+streamingfast/firehose-filecoin/proto revision: 3910e98
diff --git a/pb/sf/acme/type/v1/type.go b/pb/sf/acme/type/v1/type.go
diff --git a/pb/sf/acme/type/v1/type.pb.go b/pb/sf/acme/type/v1/type.pb.go
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;
 }