Merge remote-tracking branch 'origin/next' into feat/cid-builder

node/impl/full/state.go

@@ -952,8 +952,12 @@ func (a *StateAPI) StateMinerInitialPledgeCollateral(ctx context.Context, maddr
 		return types.EmptyInt, err
 	}
 
-	var dealWeights market.VerifyDealsForActivationReturn
-	{
+	dealWeights := market.VerifyDealsForActivationReturn{
+		DealWeight:         big.Zero(),
+		VerifiedDealWeight: big.Zero(),
+	}
+
+	if len(pci.DealIDs) != 0 {
 		var err error
 		params, err := actors.SerializeParams(&market.VerifyDealsForActivationParams{
 			DealIDs:      pci.DealIDs,
@@ -980,11 +984,13 @@ func (a *StateAPI) StateMinerInitialPledgeCollateral(ctx context.Context, maddr
 		}
 	}
 
-	ssize, err := pci.SealProof.SectorSize()
+	mi, err := a.StateMinerInfo(ctx, maddr, tsk)
 	if err != nil {
 		return types.EmptyInt, err
 	}
 
+	ssize := mi.SectorSize
+
 	duration := pci.Expiration - ts.Height() // NB: not exactly accurate, but should always lead us to *over* estimate, not under
 
 	circSupply, err := a.StateManager.CirculatingSupply(ctx, ts)