Merge pull request #10 from SiaFoundation/nate/default-to-v0

Default to v0 CIDs

http/unixfs.go

@@ -55,7 +55,7 @@ func (as *apiServer) handleUnixFSUpload(jc jape.Context) {
 }
 
 func parseUnixFSOptions(jc jape.Context) (sia.UnixFSOptions, bool) {
- cidVersion := 1
+ var cidVersion int
  if err := jc.DecodeForm("version", &cidVersion); err != nil {
  return sia.UnixFSOptions{}, false
  }

sia/sia.go

@@ -12,6 +12,7 @@ import (
  "sync"
 
  chunker "github.com/ipfs/boxo/chunker"
+ "github.com/ipfs/boxo/ipld/merkledag"
  "github.com/ipfs/boxo/ipld/unixfs/importer/balanced"
  ihelpers "github.com/ipfs/boxo/ipld/unixfs/importer/helpers"
  blocks "github.com/ipfs/go-block-format"
@@ -237,13 +238,29 @@ func (n *Node) CalculateBlocks(ctx context.Context, r io.Reader, opts UnixFSOpti
 func (n *Node) VerifyCID(ctx context.Context, c cid.Cid) error {
  rbs := NewBlockStore(n.store, n.renterd, n.log.Named("verify"))
 
- block, err := rbs.Get(ctx, c)
- if err != nil {
- return fmt.Errorf("failed to get block: %w", err)
- } else if block.Cid().Hash().String() != c.Hash().String() {
- return fmt.Errorf("unexpected root cid: %s", block.Cid().String())
+ var recursiveVerifyCid func(ctx context.Context, c cid.Cid) error
+ recursiveVerifyCid = func(ctx context.Context, c cid.Cid) error {
+ block, err := rbs.Get(ctx, c)
+ if err != nil {
+ return fmt.Errorf("failed to get block: %w", err)
+ } else if block.Cid().Hash().String() != c.Hash().String() {
+ return fmt.Errorf("unexpected multihash: %s != %s", block.Cid(), c)
+ }
+
+ switch node := block.(type) {
+ case *merkledag.ProtoNode:
+ links := node.Links()
+ for _, link := range links {
+ if err := recursiveVerifyCid(ctx, link.Cid); err != nil {
+ return err
+ }
+ }
+ }
+
+ return nil
  }
- return nil
+
+ return recursiveVerifyCid(ctx, c)
 }
 
 // New creates a new Sia IPFS store

sia/store.go

@@ -4,6 +4,7 @@ import (
  "context"
  "errors"
  "fmt"
+ "time"
 
  "github.com/gogo/protobuf/proto"
  "github.com/ipfs/boxo/ipld/merkledag"
@@ -102,10 +103,12 @@ func (bs *RenterdBlockStore) Get(ctx context.Context, c cid.Cid) (blocks.Block,
  log := bs.log.With(zap.Stringer("cid", c), zap.String("dataBucket", cm.Data.Bucket), zap.String("dataKey", cm.Data.Key), zap.String("metaBucket", cm.Metadata.Bucket), zap.String("metaKey", cm.Metadata.Key), zap.Uint64("blockSize", cm.Data.BlockSize), zap.Uint64("blockOffset", cm.Data.Offset), zap.Uint64("metadataSize", cm.Metadata.Length), zap.Uint64("metadataOffset", cm.Metadata.Offset))
  log.Debug("downloading block")
 
+ start := time.Now()
  block, err := bs.downloadBlock(ctx, cm)
  if err != nil {
  log.Error("failed to download block", zap.Error(err))
  }
+ log.Debug("block downloaded", zap.Duration("elapsed", time.Since(start)))
  return block, err
 }