Merge pull request #532 from ipfs-force-community/chore/bump-v2.12.0-rc1

chore: bump version to v2.12.0-rc1

client/client.go

@@ -1011,7 +1011,7 @@ func (a *API) ClientExportInto(ctx context.Context, exportRef types.ExportRef, c
 		retrievalBs = cbs
 	}
 
-	dserv := merkledag.NewDAGService(blockservice.New(retrievalBs, offline.Exchange(retrievalBs)))
+	dserv := merkledag.NewDAGService(blockservice.New(retrievalBs, offline.Exchange(retrievalBs))) //nolint:staticcheck
 
 	// Are we outputting a CAR?
 	if car {
@@ -1357,7 +1357,7 @@ func (a *API) ClientDealSize(ctx context.Context, root cid.Cid) (types.DataSize,
 	}
 	defer onDone()
 
-	dag := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
+	dag := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs))) //nolint:staticcheck
 
 	var w lenWriter
 	err = car.WriteCar(ctx, dag, []cid.Cid{root}, &w)
@@ -1380,7 +1380,7 @@ func (a *API) ClientDealPieceCID(ctx context.Context, root cid.Cid) (types.DataC
 	}
 	defer onDone()
 
-	dag := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
+	dag := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs))) //nolint:staticcheck
 	w := &writer.Writer{}
 	bw := bufio.NewWriterSize(w, int(writer.CommPBuf))
 

client/client_test.go

@@ -112,7 +112,7 @@ func TestImportLocal(t *testing.T) {
 	_, err = car.LoadCar(ctx, bs, dr)
 	require.NoError(t, err)
 
-	dag := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs)))
+	dag := merkledag.NewDAGService(blockservice.New(bs, offline.Exchange(bs))) //nolint:staticcheck
 
 	nd, err := dag.Get(ctx, exportedRoots[0])
 	require.NoError(t, err)

client/import.go

@@ -130,7 +130,7 @@ func buildUnixFS(ctx context.Context, reader io.Reader, into bstore.Blockstore,
 		return cid.Undef, err
 	}
 
-	bsvc := blockservice.New(into, offline.Exchange(into))
+	bsvc := blockservice.New(into, offline.Exchange(into)) //nolint:staticcheck
 	dags := merkledag.NewDAGService(bsvc)
 	bufdag := ipld.NewBufferedDAG(ctx, dags)
 

client/import_test.go

@@ -51,7 +51,7 @@ func TestRoundtripUnixFS_Dense(t *testing.T) {
 	require.NoError(t, err)
 	defer readOnly.Close() //nolint:errcheck
 
-	dags := merkledag.NewDAGService(blockservice.New(readOnly, offline.Exchange(readOnly)))
+	dags := merkledag.NewDAGService(blockservice.New(readOnly, offline.Exchange(readOnly))) //nolint:staticcheck
 
 	nd, err := dags.Get(ctx, root)
 	require.NoError(t, err)
@@ -93,7 +93,7 @@ func TestRoundtripUnixFS_Filestore(t *testing.T) {
 	require.NoError(t, err)
 	defer fs.Close() //nolint:errcheck
 
-	dags := merkledag.NewDAGService(blockservice.New(fs, offline.Exchange(fs)))
+	dags := merkledag.NewDAGService(blockservice.New(fs, offline.Exchange(fs))) //nolint:staticcheck
 
 	nd, err := dags.Get(ctx, root)
 	require.NoError(t, err)

cmd/droplet-client/storage_v2.go

@@ -492,9 +492,9 @@ var batchStorageDealInitV2 = &cli.Command{
 				m.pieceSize = paddedPieceSize.Unpadded()
 			}
 
-			dcap = big.NewInt(0).Sub(dcap, big.NewInt(int64(paddedPieceSize)).Int)
-			if dcap.Cmp(big.NewInt(0).Int) < 0 {
-				fmt.Printf("not enough datacap to create deal: %v\n", dcap)
+			remainDcap := big.NewInt(0).Sub(dcap, big.NewInt(int64(paddedPieceSize)).Int)
+			if remainDcap.Cmp(big.NewInt(0).Int) < 0 {
+				fmt.Printf("not enough datacap to create deal: %v\n", remainDcap)
 				break
 			}
 
@@ -517,6 +517,7 @@ var batchStorageDealInitV2 = &cli.Command{
 				continue
 			}
 			idx++
+			dcap = remainDcap
 			fmt.Println("created deal", dealUUID, ", piece cid", m.pieceCID)
 
 			_ = writer.Write([]string{dealUUID.String(), params.provider.String(), params.from.String(),