sector import: Remote Commit2

api/api_storage.go

@@ -576,6 +576,8 @@ type RemoteSectorMeta struct {
 	// todo better doc
 	RemoteCommit1Endpoint string
 
+	RemoteCommit2Endpoint string
+
 	// todo OnDone / OnStateChange
 }
 
@@ -587,3 +589,11 @@ type RemoteCommit1Params struct {
 
 	ProofType abi.RegisteredSealProof
 }
+
+type RemoteCommit2Params struct {
+	Sector    abi.SectorID
+	ProofType abi.RegisteredSealProof
+
+	// todo spec better
+	Commit1Out storiface.Commit1Out
+}

cmd/lotus-miner/info.go

@@ -545,7 +545,7 @@ var stateList = []stateMeta{
 	{col: color.FgRed, state: sealing.SealPreCommit2Failed},
 	{col: color.FgRed, state: sealing.PreCommitFailed},
 	{col: color.FgRed, state: sealing.ComputeProofFailed},
-	{col: color.FgRed, state: sealing.RemoteCommit1Failed},
+	{col: color.FgRed, state: sealing.RemoteCommitFailed},
 	{col: color.FgRed, state: sealing.CommitFailed},
 	{col: color.FgRed, state: sealing.CommitFinalizeFailed},
 	{col: color.FgRed, state: sealing.PackingFailed},

documentation/en/api-v0-methods-miner.md

@@ -3299,7 +3299,8 @@ Inputs:
         }
       ]
     },
-    "RemoteCommit1Endpoint": "string value"
+    "RemoteCommit1Endpoint": "string value",
+    "RemoteCommit2Endpoint": "string value"
   }
 ]
 ```

itests/sector_import_full_test.go

@@ -207,7 +207,7 @@ func TestSectorImport(t *testing.T) {
 			require.Len(t, ng, 1)
 			require.Equal(t, snum, ng[0])
 
-			miner.WaitSectorsProvingAllowFails(ctx, map[abi.SectorNumber]struct{}{snum: {}}, map[api.SectorState]struct{}{api.SectorState(sealing.RemoteCommit1Failed): {}})
+			miner.WaitSectorsProvingAllowFails(ctx, map[abi.SectorNumber]struct{}{snum: {}}, map[api.SectorState]struct{}{api.SectorState(sealing.RemoteCommitFailed): {}})
 		}
 	}
 

itests/sector_import_simple_test.go

@@ -128,12 +128,14 @@ func TestSectorImportAfterPC2(t *testing.T) {
 	m := mux.NewRouter()
 	m.HandleFunc("/sectors/{type}/{id}", remoteGetSector(sectorDir)).Methods("GET")
 	m.HandleFunc("/sectors/{id}/commit1", remoteCommit1(sealer)).Methods("POST")
+	m.HandleFunc("/commit2", remoteCommit2(sealer)).Methods("POST")
 	srv := httptest.NewServer(m)
 
 	unsealedURL := fmt.Sprintf("%s/sectors/unsealed/s-t0%d-%d", srv.URL, mid, snum)
 	sealedURL := fmt.Sprintf("%s/sectors/sealed/s-t0%d-%d", srv.URL, mid, snum)
 	cacheURL := fmt.Sprintf("%s/sectors/cache/s-t0%d-%d", srv.URL, mid, snum)
 	remoteC1URL := fmt.Sprintf("%s/sectors/s-t0%d-%d/commit1", srv.URL, mid, snum)
+	remoteC2URL := fmt.Sprintf("%s/commit2", srv.URL)
 
 	////////
 	// import the sector and continue sealing
@@ -172,6 +174,7 @@ func TestSectorImportAfterPC2(t *testing.T) {
 		},
 
 		RemoteCommit1Endpoint: remoteC1URL,
+		RemoteCommit2Endpoint: remoteC2URL,
 	})
 	require.NoError(t, err)
 
@@ -232,6 +235,32 @@ func remoteCommit1(s *ffiwrapper.Sealer) func(w http.ResponseWriter, r *http.Req
 	}
 }
 
+func remoteCommit2(s *ffiwrapper.Sealer) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var params api.RemoteCommit2Params
+		if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
+			w.WriteHeader(500)
+			return
+		}
+
+		sref := storiface.SectorRef{
+			ID:        params.Sector,
+			ProofType: params.ProofType,
+		}
+
+		p, err := s.SealCommit2(r.Context(), sref, params.Commit1Out)
+		if err != nil {
+			fmt.Println("c2 error: ", err)
+			w.WriteHeader(500)
+			return
+		}
+
+		if _, err := w.Write(p); err != nil {
+			fmt.Println("c2 write error")
+		}
+	}
+}
+
 func remoteGetSector(sectorRoot string) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 

storage/pipeline/cbor_gen.go

@@ -31,7 +31,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
 
 	cw := cbg.NewCborWriter(w)
 
-	if _, err := cw.Write([]byte{184, 37}); err != nil {
+	if _, err := cw.Write([]byte{184, 38}); err != nil {
 		return err
 	}
 
@@ -726,6 +726,29 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
 		return err
 	}
 
+	// t.RemoteCommit2Endpoint (string) (string)
+	if len("RemoteCommit2Endpoint") > cbg.MaxLength {
+		return xerrors.Errorf("Value in field \"RemoteCommit2Endpoint\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteCommit2Endpoint"))); err != nil {
+		return err
+	}
+	if _, err := io.WriteString(w, string("RemoteCommit2Endpoint")); err != nil {
+		return err
+	}
+
+	if len(t.RemoteCommit2Endpoint) > cbg.MaxLength {
+		return xerrors.Errorf("Value in field t.RemoteCommit2Endpoint was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteCommit2Endpoint))); err != nil {
+		return err
+	}
+	if _, err := io.WriteString(w, string(t.RemoteCommit2Endpoint)); err != nil {
+		return err
+	}
+
 	// t.RemoteDataFinalized (bool) (bool)
 	if len("RemoteDataFinalized") > cbg.MaxLength {
 		return xerrors.Errorf("Value in field \"RemoteDataFinalized\" was too long")
@@ -1513,6 +1536,17 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) (err error) {
 
 				t.RemoteCommit1Endpoint = string(sval)
 			}
+			// t.RemoteCommit2Endpoint (string) (string)
+		case "RemoteCommit2Endpoint":
+
+			{
+				sval, err := cbg.ReadString(cr)
+				if err != nil {
+					return err
+				}
+
+				t.RemoteCommit2Endpoint = string(sval)
+			}
 			// t.RemoteDataFinalized (bool) (bool)
 		case "RemoteDataFinalized":
 

storage/pipeline/fsm.go

@@ -225,7 +225,7 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
 		on(SectorRetryComputeProof{}, Committing),
 		on(SectorSealPreCommit1Failed{}, SealPreCommit1Failed),
 	),
-	RemoteCommit1Failed: planOne(
+	RemoteCommitFailed: planOne(
 		on(SectorRetryComputeProof{}, Committing),
 	),
 	CommitFinalizeFailed: planOne(
@@ -542,8 +542,8 @@ func (m *Sealing) plan(events []statemachine.Event, state *SectorInfo) (func(sta
 		return m.handlePreCommitFailed, processed, nil
 	case ComputeProofFailed:
 		return m.handleComputeProofFailed, processed, nil
-	case RemoteCommit1Failed:
+	case RemoteCommitFailed:
-		return m.handleRemoteCommit1Failed, processed, nil
+		return m.handleRemoteCommitFailed, processed, nil
 	case CommitFailed:
 		return m.handleCommitFailed, processed, nil
 	case CommitFinalizeFailed:
@@ -671,8 +671,8 @@ func planCommitting(events []statemachine.Event, state *SectorInfo) (uint64, err
 			return uint64(i + 1), nil
 		case SectorComputeProofFailed:
 			state.State = ComputeProofFailed
-		case SectorRemoteCommit1Failed:
+		case SectorRemoteCommit1Failed, SectorRemoteCommit2Failed:
-			state.State = RemoteCommit1Failed
+			state.State = RemoteCommitFailed
 		case SectorSealPreCommit1Failed:
 			state.State = SealPreCommit1Failed
 		case SectorCommitFailed:

storage/pipeline/fsm_events.go

@@ -223,6 +223,11 @@ type SectorRemoteCommit1Failed struct{ error }
 func (evt SectorRemoteCommit1Failed) FormatError(xerrors.Printer) (next error) { return evt.error }
 func (evt SectorRemoteCommit1Failed) apply(*SectorInfo)                        {}
 
+type SectorRemoteCommit2Failed struct{ error }
+
+func (evt SectorRemoteCommit2Failed) FormatError(xerrors.Printer) (next error) { return evt.error }
+func (evt SectorRemoteCommit2Failed) apply(*SectorInfo)                        {}
+
 type SectorComputeProofFailed struct{ error }
 
 func (evt SectorComputeProofFailed) FormatError(xerrors.Printer) (next error) { return evt.error }

storage/pipeline/receive.go

@@ -3,6 +3,7 @@ package sealing
 import (
 	"bytes"
 	"context"
+	"net/url"
 
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
@@ -177,7 +178,24 @@ func (m *Sealing) checkSectorMeta(ctx context.Context, meta api.RemoteSectorMeta
 		}
 		info.RemoteDataSealed = meta.DataSealed // todo make head requests to check?
 		info.RemoteDataCache = meta.DataCache
-		info.RemoteCommit1Endpoint = meta.RemoteCommit1Endpoint
+
+		if meta.RemoteCommit1Endpoint != "" {
+			// validate the url
+			if _, err := url.Parse(meta.RemoteCommit1Endpoint); err != nil {
+				return SectorInfo{}, xerrors.Errorf("parsing remote c1 endpoint url: %w", err)
+			}
+
+			info.RemoteCommit1Endpoint = meta.RemoteCommit1Endpoint
+		}
+
+		if meta.RemoteCommit2Endpoint != "" {
+			// validate the url
+			if _, err := url.Parse(meta.RemoteCommit2Endpoint); err != nil {
+				return SectorInfo{}, xerrors.Errorf("parsing remote c2 endpoint url: %w", err)
+			}
+
+			info.RemoteCommit2Endpoint = meta.RemoteCommit2Endpoint
+		}
 
 		// If we get a sector after PC2, and remote C1 endpoint is set, assume that we're getting finalized sector data
 		if info.RemoteCommit1Endpoint != "" {

storage/pipeline/sector_state.go

@@ -31,7 +31,7 @@ var ExistSectorStateList = map[SectorState]struct{}{
 	SealPreCommit2Failed:        {},
 	PreCommitFailed:             {},
 	ComputeProofFailed:          {},
-	RemoteCommit1Failed:         {},
+	RemoteCommitFailed:          {},
 	CommitFailed:                {},
 	PackingFailed:               {},
 	FinalizeFailed:              {},
@@ -125,7 +125,7 @@ const (
 	SealPreCommit2Failed SectorState = "SealPreCommit2Failed"
 	PreCommitFailed      SectorState = "PreCommitFailed"
 	ComputeProofFailed   SectorState = "ComputeProofFailed"
-	RemoteCommit1Failed  SectorState = "RemoteCommit1Failed"
+	RemoteCommitFailed   SectorState = "RemoteCommitFailed"
 	CommitFailed         SectorState = "CommitFailed"
 	PackingFailed        SectorState = "PackingFailed" // TODO: deprecated, remove
 	FinalizeFailed       SectorState = "FinalizeFailed"

storage/pipeline/states_failed.go

@@ -184,13 +184,13 @@ func (m *Sealing) handleComputeProofFailed(ctx statemachine.Context, sector Sect
 	return ctx.Send(SectorRetryComputeProof{})
 }
 
-func (m *Sealing) handleRemoteCommit1Failed(ctx statemachine.Context, sector SectorInfo) error {
+func (m *Sealing) handleRemoteCommitFailed(ctx statemachine.Context, sector SectorInfo) error {
 	if err := failedCooldown(ctx, sector); err != nil {
 		return err
 	}
 
 	if sector.InvalidProofs > 1 {
-		log.Errorw("consecutive remote commit1 fails", "sector", sector.SectorNumber, "c1url", sector.RemoteCommit1Endpoint)
+		log.Errorw("consecutive remote commit fails", "sector", sector.SectorNumber, "c1url", sector.RemoteCommit1Endpoint, "c2url", sector.RemoteCommit2Endpoint)
 	}
 
 	return ctx.Send(SectorRetryComputeProof{})

storage/pipeline/states_sealing.go

@@ -574,6 +574,7 @@ func (m *Sealing) handleCommitting(ctx statemachine.Context, sector SectorInfo)
 
 	var c2in storiface.Commit1Out
 	if sector.RemoteCommit1Endpoint == "" {
+		// Local Commit1
 		cids := storiface.SectorCids{
 			Unsealed: *sector.CommD,
 			Sealed:   *sector.CommR,
@@ -583,6 +584,8 @@ func (m *Sealing) handleCommitting(ctx statemachine.Context, sector SectorInfo)
 			return ctx.Send(SectorComputeProofFailed{xerrors.Errorf("computing seal proof failed(1): %w", err)})
 		}
 	} else {
+		// Remote Commit1
+
 		reqData := api.RemoteCommit1Params{
 			Ticket:    sector.TicketValue,
 			Seed:      sector.SeedValue,
@@ -618,9 +621,50 @@ func (m *Sealing) handleCommitting(ctx statemachine.Context, sector SectorInfo)
 		}
 	}
 
-	proof, err := m.sealer.SealCommit2(sector.sealingCtx(ctx.Context()), m.minerSector(sector.SectorType, sector.SectorNumber), c2in)
+	var porepProof storiface.Proof
-	if err != nil {
+
-		return ctx.Send(SectorComputeProofFailed{xerrors.Errorf("computing seal proof failed(2): %w", err)})
+	if sector.RemoteCommit2Endpoint == "" {
+		// Local Commit2
+
+		porepProof, err = m.sealer.SealCommit2(sector.sealingCtx(ctx.Context()), m.minerSector(sector.SectorType, sector.SectorNumber), c2in)
+		if err != nil {
+			return ctx.Send(SectorComputeProofFailed{xerrors.Errorf("computing seal proof failed(2): %w", err)})
+		}
+	} else {
+		// Remote Commit2
+
+		reqData := api.RemoteCommit2Params{
+			ProofType: sector.SectorType,
+			Sector:    m.minerSectorID(sector.SectorNumber),
+
+			Commit1Out: c2in,
+		}
+		reqBody, err := json.Marshal(&reqData)
+		if err != nil {
+			return xerrors.Errorf("marshaling remote commit2 request: %w", err)
+		}
+
+		req, err := http.NewRequest("POST", sector.RemoteCommit2Endpoint, bytes.NewReader(reqBody))
+		if err != nil {
+			return ctx.Send(SectorRemoteCommit2Failed{xerrors.Errorf("creating new remote commit2 request: %w", err)})
+		}
+		req.Header.Set("Content-Type", "application/json")
+		req = req.WithContext(ctx.Context())
+		resp, err := http.DefaultClient.Do(req)
+		if err != nil {
+			return ctx.Send(SectorRemoteCommit2Failed{xerrors.Errorf("requesting remote commit2: %w", err)})
+		}
+
+		defer resp.Body.Close()
+
+		if resp.StatusCode != http.StatusOK {
+			return ctx.Send(SectorRemoteCommit2Failed{xerrors.Errorf("remote commit2 received non-200 http response %s", resp.Status)})
+		}
+
+		porepProof, err = io.ReadAll(resp.Body) // todo some len constraint
+		if err != nil {
+			return ctx.Send(SectorRemoteCommit2Failed{xerrors.Errorf("reading commit2 response: %w", err)})
+		}
 	}
 
 	{
@@ -630,19 +674,19 @@ func (m *Sealing) handleCommitting(ctx statemachine.Context, sector SectorInfo)
 			return nil
 		}
 
-		if err := m.checkCommit(ctx.Context(), sector, proof, ts.Key()); err != nil {
+		if err := m.checkCommit(ctx.Context(), sector, porepProof, ts.Key()); err != nil {
 			return ctx.Send(SectorCommitFailed{xerrors.Errorf("commit check error: %w", err)})
 		}
 	}
 
 	if cfg.FinalizeEarly {
 		return ctx.Send(SectorProofReady{
-			Proof: proof,
+			Proof: porepProof,
 		})
 	}
 
 	return ctx.Send(SectorCommitted{
-		Proof: proof,
+		Proof: porepProof,
 	})
 }
 

storage/pipeline/types.go

@@ -98,6 +98,7 @@ type SectorInfo struct {
 	RemoteDataSealed      *storiface.SectorData
 	RemoteDataCache       *storiface.SectorData
 	RemoteCommit1Endpoint string
+	RemoteCommit2Endpoint string
 	RemoteDataFinalized   bool
 
 	// Debug