diff --git a/proposer/op/proposer/db/db.go b/proposer/op/proposer/db/db.go index 8a91d032..ff18ae92 100644 --- a/proposer/op/proposer/db/db.go +++ b/proposer/op/proposer/db/db.go @@ -319,7 +319,7 @@ func (db *ProofDB) GetNextUnrequestedProof() (*ent.ProofRequest, error) { spanProof, err := db.client.ProofRequest.Query(). Where( proofrequest.StatusEQ(proofrequest.StatusUNREQ), - proofrequest.TypeEQ(proofrequest.TypeSPAN), + proofrequest.TypeEQ(proofrequest.TypeRANGE), ). Order(ent.Asc(proofrequest.FieldStartBlock)). First(context.Background()) @@ -402,7 +402,7 @@ func (db *ProofDB) GetMaxContiguousSpanProofRange(start uint64) (uint64, error) query := client.ProofRequest.Query(). Where( - proofrequest.TypeEQ(proofrequest.TypeSPAN), + proofrequest.TypeEQ(proofrequest.TypeRANGE), proofrequest.StatusEQ(proofrequest.StatusCOMPLETE), proofrequest.StartBlockGTE(start), ). @@ -435,7 +435,7 @@ func (db *ProofDB) GetConsecutiveSpanProofs(start, end uint64) ([][]byte, error) // Query the DB for the span proofs that cover the range [start, end]. query := client.ProofRequest.Query(). Where( - proofrequest.TypeEQ(proofrequest.TypeSPAN), + proofrequest.TypeEQ(proofrequest.TypeRANGE), proofrequest.StatusEQ(proofrequest.StatusCOMPLETE), proofrequest.StartBlockGTE(start), proofrequest.EndBlockLTE(end), diff --git a/proposer/op/proposer/db/ent/migrate/schema.go b/proposer/op/proposer/db/ent/migrate/schema.go index 20062a6f..369324d4 100644 --- a/proposer/op/proposer/db/ent/migrate/schema.go +++ b/proposer/op/proposer/db/ent/migrate/schema.go @@ -11,7 +11,7 @@ var ( // ProofRequestsColumns holds the columns for the "proof_requests" table. ProofRequestsColumns = []*schema.Column{ {Name: "id", Type: field.TypeInt, Increment: true}, - {Name: "type", Type: field.TypeEnum, Enums: []string{"SPAN", "AGG"}}, + {Name: "type", Type: field.TypeEnum, Enums: []string{"RANGE", "AGG"}}, {Name: "start_block", Type: field.TypeUint64}, {Name: "end_block", Type: field.TypeUint64}, {Name: "status", Type: field.TypeEnum, Enums: []string{"UNREQ", "WITNESSGEN", "PROVING", "FAILED", "COMPLETE"}}, diff --git a/proposer/op/proposer/db/ent/proofrequest/proofrequest.go b/proposer/op/proposer/db/ent/proofrequest/proofrequest.go index 70c59ec2..ca27a9aa 100644 --- a/proposer/op/proposer/db/ent/proofrequest/proofrequest.go +++ b/proposer/op/proposer/db/ent/proofrequest/proofrequest.go @@ -70,8 +70,8 @@ type Type string // Type values. const ( - TypeSPAN Type = "SPAN" - TypeAGG Type = "AGG" + TypeRANGE Type = "RANGE" + TypeAGG Type = "AGG" ) func (_type Type) String() string { @@ -81,7 +81,7 @@ func (_type Type) String() string { // TypeValidator is a validator for the "type" field enum values. It is called by the builders before save. func TypeValidator(_type Type) error { switch _type { - case TypeSPAN, TypeAGG: + case TypeRANGE, TypeAGG: return nil default: return fmt.Errorf("proofrequest: invalid enum value for type field: %q", _type) diff --git a/proposer/op/proposer/db/ent/schema/proofrequest.go b/proposer/op/proposer/db/ent/schema/proofrequest.go index a4718e74..894f27ab 100644 --- a/proposer/op/proposer/db/ent/schema/proofrequest.go +++ b/proposer/op/proposer/db/ent/schema/proofrequest.go @@ -13,7 +13,7 @@ type ProofRequest struct { // Fields of the ProofRequest. func (ProofRequest) Fields() []ent.Field { return []ent.Field{ - field.Enum("type").Values("SPAN", "AGG"), + field.Enum("type").Values("RANGE", "AGG"), field.Uint64("start_block"), field.Uint64("end_block"), field.Enum("status").Values("UNREQ", "WITNESSGEN", "PROVING", "FAILED", "COMPLETE"), diff --git a/proposer/op/proposer/prove.go b/proposer/op/proposer/prove.go index d7f82a03..f18339d7 100644 --- a/proposer/op/proposer/prove.go +++ b/proposer/op/proposer/prove.go @@ -213,7 +213,7 @@ func (l *L2OutputSubmitter) RequestOPSuccinctProof(p ent.ProofRequest) error { if err != nil { return fmt.Errorf("failed to request AGG proof: %w", err) } - } else if p.Type == proofrequest.TypeSPAN { + } else if p.Type == proofrequest.TypeRANGE { proofId, err = l.RequestSpanProof(p.StartBlock, p.EndBlock) if err != nil { return fmt.Errorf("failed to request SPAN proof: %w", err) diff --git a/proposer/op/proposer/span_batches.go b/proposer/op/proposer/span_batches.go index 8f7644b0..2f8f2287 100644 --- a/proposer/op/proposer/span_batches.go +++ b/proposer/op/proposer/span_batches.go @@ -61,7 +61,7 @@ func (l *L2OutputSubmitter) DeriveNewSpanBatches(ctx context.Context) error { spans := l.CreateSpans(newL2StartBlock, newL2EndBlock) // Add each span to the DB. If there are no spans, we will not create any proofs. for _, span := range spans { - err := l.db.NewEntry(proofrequest.TypeSPAN, span.Start, span.End) + err := l.db.NewEntry(proofrequest.TypeRANGE, span.Start, span.End) l.Log.Info("New range proof request.", "start", span.Start, "end", span.End) if err != nil { l.Log.Error("failed to add span to db", "err", err)