diff --git a/cmd/radiance/car/create/create.go b/cmd/radiance/car/create/create.go index 148a0ba..51d9446 100644 --- a/cmd/radiance/car/create/create.go +++ b/cmd/radiance/car/create/create.go @@ -62,7 +62,7 @@ func run(c *cobra.Command, args []string) { } // Create new walker object - walker, err := blockstore.NewBlockWalk(handles) + walker, err := blockstore.NewBlockWalk(handles, 2 /*TODO*/) if err != nil { klog.Exitf("Failed to create multi-DB iterator: %s", err) } diff --git a/cmd/radiance/car/dump/BUILD b/cmd/radiance/car/dump/BUILD index 1e53df3..3ce187e 100644 --- a/cmd/radiance/car/dump/BUILD +++ b/cmd/radiance/car/dump/BUILD @@ -10,6 +10,7 @@ go_library( "@com_github_gagliardetto_binary//:binary", "@com_github_gagliardetto_solana_go//:solana-go", "@com_github_ipld_go_car//:go-car", + "@com_github_multiformats_go_multicodec//:go-multicodec", "@com_github_spf13_cobra//:cobra", "@io_k8s_klog_v2//:klog", ], diff --git a/cmd/radiance/car/dump/dump.go b/cmd/radiance/car/dump/dump.go index 9a51aaf..4e31f50 100644 --- a/cmd/radiance/car/dump/dump.go +++ b/cmd/radiance/car/dump/dump.go @@ -9,8 +9,8 @@ import ( bin "github.com/gagliardetto/binary" "github.com/gagliardetto/solana-go" "github.com/ipld/go-car" + "github.com/multiformats/go-multicodec" "github.com/spf13/cobra" - "go.firedancer.io/radiance/pkg/ipld/ipldgen" "k8s.io/klog/v2" ) @@ -42,7 +42,7 @@ func run(_ *cobra.Command, args []string) { } else if err != nil { klog.Exitf("Failed to read block: %s", err) } - if block.Cid().Type() == ipldgen.SolanaTx { + if multicodec.Code(block.Cid().Type()) == multicodec.Raw { var tx solana.Transaction if err := bin.UnmarshalBin(&tx, block.RawData()); err != nil { klog.Errorf("Invalid CID %s: %s", block.Cid(), err) diff --git a/cmd/radiance/replay/replay.go b/cmd/radiance/replay/replay.go index 46af464..916bf02 100644 --- a/cmd/radiance/replay/replay.go +++ b/cmd/radiance/replay/replay.go @@ -62,7 +62,7 @@ func run(c *cobra.Command, _ []string) { } // Open block iterator. - walker, err := blockstore.NewBlockWalk([]blockstore.WalkHandle{{DB: db}}) + walker, err := blockstore.NewBlockWalk([]blockstore.WalkHandle{{DB: db}}, 2) if err != nil { klog.Fatal(err) }