Merge branch 'master' into testnet/3

node/builder.go

@@ -37,6 +37,8 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/vm"
 	"github.com/filecoin-project/lotus/chain/wallet"
+	_ "github.com/filecoin-project/lotus/lib/sigs/bls"
+	_ "github.com/filecoin-project/lotus/lib/sigs/secp"
 	"github.com/filecoin-project/lotus/markets/storageadapter"
 	"github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node/config"

node/impl/storminer.go

@@ -109,11 +109,21 @@ func (sm *StorageMinerAPI) remotePutSector(w http.ResponseWriter, r *http.Reques
 	}
 
 	// This is going to get better with worker-to-worker transfers
-	path, err := sm.SectorBuilder.AllocSectorPath(fs.DataType(vars["type"]), id, true)
+
+	path, err := sm.SectorBuilder.SectorPath(fs.DataType(vars["type"]), id)
 	if err != nil {
-		log.Error(err)
-		w.WriteHeader(500)
-		return
+		if err != fs.ErrNotFound {
+			log.Error(err)
+			w.WriteHeader(500)
+			return
+		}
+
+		path, err = sm.SectorBuilder.AllocSectorPath(fs.DataType(vars["type"]), id, true)
+		if err != nil {
+			log.Error(err)
+			w.WriteHeader(500)
+			return
+		}
 	}
 
 	mediatype, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))