feat(prt): modify database and models to support PRT data

Author: vfusco

Makefile

@@ -218,6 +218,10 @@ deploy-echo-dapp: applications/echo-dapp ## Deploy echo-dapp test application
 	@echo "Deploying echo-dapp test application"
 	@./cartesi-rollups-cli deploy application echo-dapp applications/echo-dapp/
 
+deploy-prt-echo-dapp: applications/echo-dapp ## Deploy echo-dapp test application
+	@echo "Deploying echo-dapp test application"
+	@./cartesi-rollups-cli deploy application prt-echo-dapp applications/echo-dapp/ --prt
+
 # Temporary test dependencies target while we are not using distribution packages
 DOWNLOADS_DIR = test/downloads
 CARTESI_TEST_MACHINE_IMAGES = $(DOWNLOADS_DIR)/linux.bin

cmd/cartesi-rollups-cli/root/app/register/register.go

@@ -52,6 +52,7 @@ var (
 	inputBoxAddressFromEnv       bool
 	dataAvailability             string
 	enableMachineHashCheck       bool
+	applicationTypePRT           bool
 	disabled                     bool
 	printAsJSON                  bool
 	executionParametersFileParam string
@@ -75,7 +76,7 @@ func init() {
 		"Application template hash. (DO NOT USE IN PRODUCTION)\nThis value is retrieved from the application contract",
 	)
 
-	Cmd.Flags().Uint64VarP(&epochLength, "epoch-length", "e", 10, // nolint: mnd
+	Cmd.Flags().Uint64VarP(&epochLength, "epoch-length", "e", 0, // nolint: mnd
 		"Consensus Epoch length. (DO NOT USE IN PRODUCTION)\nThis value is retrieved from the consensus contract",
 	)
 
@@ -97,6 +98,8 @@ func init() {
 		"Enable or disable machine hash check (DO NOT DISABLE IN PRODUCTION)")
 	cobra.CheckErr(viper.BindPFlag(config.FEATURE_MACHINE_HASH_CHECK_ENABLED, Cmd.Flags().Lookup("machine-hash-check")))
 
+	Cmd.Flags().BoolVarP(&applicationTypePRT, "prt", "", false, "Register as PRT application.")
+
 	origHelpFunc := Cmd.HelpFunc()
 	Cmd.SetHelpFunc(func(command *cobra.Command, strings []string) {
 		command.Flags().Lookup("verbose").Hidden = false
@@ -181,7 +184,7 @@ func run(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	if !cmd.Flags().Changed("epoch-length") {
+	if !cmd.Flags().Changed("epoch-length") && !applicationTypePRT {
 		epochLength, err = getEpochLength(ctx, consensus)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Failed to get epoch length from consensus: %v\n", err)
@@ -226,6 +229,7 @@ func run(cmd *cobra.Command, args []string) {
 		TemplateHash:         parsedTemplateHash,
 		EpochLength:          epochLength,
 		DataAvailability:     encodedDA,
+		DaveConsensus:        applicationTypePRT,
 		State:                applicationState,
 		IInputBoxBlock:       inputBoxBlockNumber,
 		LastInputCheckBlock:  0,

cmd/cartesi-rollups-cli/root/deploy/application.go

@@ -256,6 +256,7 @@ func runDeployApplication(cmd *cobra.Command, args []string) {
 		application.EpochLength = res.ApplicationResult.Deployment.EpochLength
 		application.DataAvailability = res.ApplicationResult.Deployment.DataAvailability
 		application.IInputBoxBlock = res.ApplicationResult.Deployment.IInputBoxBlock
+		application.DaveConsensus = true
 	default:
 		panic("unimplemented deployment type\n")
 	}

internal/claimer/claimer.go

@@ -45,7 +45,6 @@ import (
 	"time"
 
 	"github.com/cartesi/rollups-node/internal/model"
-	"github.com/cartesi/rollups-node/internal/repository"
 	"github.com/cartesi/rollups-node/pkg/contracts/iconsensus"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -58,8 +57,6 @@ var (
 )
 
 type iclaimerRepository interface {
-	ListApplications(ctx context.Context, f repository.ApplicationFilter, p repository.Pagination, descending bool) ([]*model.Application, uint64, error)
-
 	// key is model.Application.ID
 	SelectSubmittedClaimPairsPerApp(ctx context.Context) (
 		map[int64]*model.Epoch,

internal/claimer/claimer_test.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/cartesi/rollups-node/internal/model"
-	"github.com/cartesi/rollups-node/internal/repository"
 	"github.com/cartesi/rollups-node/pkg/contracts/iconsensus"
 	"github.com/cartesi/rollups-node/pkg/service"
 	"github.com/lmittmann/tint"
@@ -29,16 +28,6 @@ type claimerRepositoryMock struct {
 	mock.Mock
 }
 
-func (m *claimerRepositoryMock) ListApplications(
-	ctx context.Context,
-	f repository.ApplicationFilter,
-	pagination repository.Pagination,
-	descending bool,
-) ([]*model.Application, uint64, error) {
-	args := m.Called(ctx, f, pagination, descending)
-	return args.Get(0).([]*model.Application), args.Get(1).(uint64), args.Error(2)
-}
-
 func (m *claimerRepositoryMock) SelectSubmittedClaimPairsPerApp(ctx context.Context) (
 	map[int64]*model.Epoch,
 	map[int64]*model.Epoch,

internal/evmreader/input.go

@@ -275,9 +275,11 @@ func (r *Service) readAndStoreInputs(
 						}
 						return errors.New(reason)
 					}
+					currentEpoch.InputIndexUpperBound = input.Index + 1
 				} else {
 					if currentEpoch.Status == EpochStatus_Open {
 						currentEpoch.Status = EpochStatus_Closed
+						currentEpoch.InputIndexUpperBound = input.Index
 						r.Logger.Info("Closing epoch",
 							"application", app.application.Name,
 							"address", address,
@@ -294,10 +296,12 @@ func (r *Service) readAndStoreInputs(
 			}
 			if currentEpoch == nil {
 				currentEpoch = &Epoch{
-					Index:      inputEpochIndex,
-					FirstBlock: inputEpochIndex * epochLength,
-					LastBlock:  (inputEpochIndex * epochLength) + epochLength - 1,
-					Status:     EpochStatus_Open,
+					Index:                inputEpochIndex,
+					FirstBlock:           inputEpochIndex * epochLength,
+					LastBlock:            (inputEpochIndex * epochLength) + epochLength - 1,
+					InputIndexLowerBound: input.Index,
+					InputIndexUpperBound: input.Index + 1,
+					Status:               EpochStatus_Open,
 				}
 				epochInputMap[currentEpoch] = []*Input{}
 			}

internal/jsonrpc/jsonrpc-discover.json

@@ -562,6 +562,9 @@
 					"data_availability": {
 						"$ref": "#/components/schemas/ByteArray"
 					},
+					"dave_consensus": {
+						"type": "boolean"
+					},
 					"state": {
 						"$ref": "#/components/schemas/ApplicationState"
 					},
@@ -639,6 +642,16 @@
 					"last_block": {
 						"$ref": "#/components/schemas/UnsignedInteger"
 					},
+					"input_index_lower_bound": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"input_index_upper_bound": {
+						"$ref": "#/components/schemas/UnsignedInteger"
+					},
+					"machine_hash": {
+						"$ref": "#/components/schemas/Hash",
+						"nullable": true
+					},
 					"claim_hash": {
 						"$ref": "#/components/schemas/Hash",
 						"nullable": true

internal/model/models.go

@@ -25,6 +25,7 @@ type Application struct {
 	TemplateURI          string              `json:"-"`
 	EpochLength          uint64              `json:"epoch_length"`
 	DataAvailability     []byte              `json:"data_availability"`
+	DaveConsensus        bool                `json:"dave_consensus"`
 	State                ApplicationState    `json:"state"`
 	Reason               *string             `json:"reason"`
 	IInputBoxBlock       uint64              `json:"iinputbox_block"`
@@ -439,6 +440,9 @@ type Epoch struct {
 	Index                uint64       `sql:"primary_key" json:"index"`
 	FirstBlock           uint64       `json:"first_block"`
 	LastBlock            uint64       `json:"last_block"`
+	InputIndexLowerBound uint64       `json:"input_index_lower_bound"`
+	InputIndexUpperBound uint64       `json:"input_index_upper_bound"`
+	MachineHash          *common.Hash `json:"machine_hash"`
 	ClaimHash            *common.Hash `json:"claim_hash"`
 	ClaimTransactionHash *common.Hash `json:"claim_transaction_hash"`
 	Status               EpochStatus  `json:"status"`
@@ -452,17 +456,21 @@ func (e *Epoch) MarshalJSON() ([]byte, error) {
 	type Alias Epoch
 	// Define a new structure that embeds the alias but overrides the hex fields.
 	aux := &struct {
-		Index        string `json:"index"`
-		FirstBlock   string `json:"first_block"`
-		LastBlock    string `json:"last_block"`
-		VirtualIndex string `json:"virtual_index"`
+		Index                string `json:"index"`
+		FirstBlock           string `json:"first_block"`
+		LastBlock            string `json:"last_block"`
+		InputIndexLowerBound string `json:"input_index_lower_bound"`
+		InputIndexUpperBound string `json:"input_index_upper_bound"`
+		VirtualIndex         string `json:"virtual_index"`
 		*Alias
 	}{
-		Index:        fmt.Sprintf("0x%x", e.Index),
-		FirstBlock:   fmt.Sprintf("0x%x", e.FirstBlock),
-		LastBlock:    fmt.Sprintf("0x%x", e.LastBlock),
-		VirtualIndex: fmt.Sprintf("0x%x", e.VirtualIndex),
-		Alias:        (*Alias)(e),
+		Index:                fmt.Sprintf("0x%x", e.Index),
+		FirstBlock:           fmt.Sprintf("0x%x", e.FirstBlock),
+		LastBlock:            fmt.Sprintf("0x%x", e.LastBlock),
+		InputIndexLowerBound: fmt.Sprintf("0x%x", e.InputIndexLowerBound),
+		InputIndexUpperBound: fmt.Sprintf("0x%x", e.InputIndexUpperBound),
+		VirtualIndex:         fmt.Sprintf("0x%x", e.VirtualIndex),
+		Alias:                (*Alias)(e),
 	}
 	return json.Marshal(aux)
 }

internal/repository/postgres/application.go

@@ -33,6 +33,7 @@ func (r *PostgresRepository) CreateApplication(
 			table.Application.TemplateURI,
 			table.Application.EpochLength,
 			table.Application.DataAvailability,
+			table.Application.DaveConsensus,
 			table.Application.State,
 			table.Application.IinputboxBlock,
 			table.Application.LastInputCheckBlock,
@@ -48,6 +49,7 @@ func (r *PostgresRepository) CreateApplication(
 			app.TemplateURI,
 			app.EpochLength,
 			app.DataAvailability[:],
+			app.DaveConsensus,
 			app.State,
 			app.IInputBoxBlock,
 			app.LastInputCheckBlock,
@@ -110,6 +112,7 @@ func (r *PostgresRepository) GetApplication(
 			table.Application.TemplateURI,
 			table.Application.EpochLength,
 			table.Application.DataAvailability,
+			table.Application.DaveConsensus,
 			table.Application.State,
 			table.Application.Reason,
 			table.Application.IinputboxBlock,
@@ -157,6 +160,7 @@ func (r *PostgresRepository) GetApplication(
 		&app.TemplateURI,
 		&app.EpochLength,
 		&app.DataAvailability,
+		&app.DaveConsensus,
 		&app.State,
 		&app.Reason,
 		&app.IInputBoxBlock,
@@ -240,6 +244,7 @@ func (r *PostgresRepository) UpdateApplication(
 			table.Application.TemplateURI,
 			table.Application.EpochLength,
 			table.Application.DataAvailability,
+			table.Application.DaveConsensus,
 			table.Application.State,
 			table.Application.Reason,
 			table.Application.IinputboxBlock,
@@ -256,6 +261,7 @@ func (r *PostgresRepository) UpdateApplication(
 			app.TemplateURI,
 			app.EpochLength,
 			app.DataAvailability[:],
+			app.DaveConsensus,
 			app.State,
 			app.Reason,
 			app.IInputBoxBlock,
@@ -437,6 +443,7 @@ func (r *PostgresRepository) ListApplications(
 			table.Application.TemplateURI,
 			table.Application.EpochLength,
 			table.Application.DataAvailability,
+			table.Application.DaveConsensus,
 			table.Application.State,
 			table.Application.Reason,
 			table.Application.IinputboxBlock,
@@ -520,6 +527,7 @@ func (r *PostgresRepository) ListApplications(
 			&app.TemplateURI,
 			&app.EpochLength,
 			&app.DataAvailability,
+			&app.DaveConsensus,
 			&app.State,
 			&app.Reason,
 			&app.IInputBoxBlock,

internal/repository/postgres/bulk.go

@@ -291,10 +291,12 @@ func updateEpochClaim(
 
 	updStmt := table.Epoch.
 		UPDATE(
+			table.Epoch.MachineHash,
 			table.Epoch.ClaimHash,
 			table.Epoch.Status,
 		).
 		SET(
+			e.MachineHash,
 			e.ClaimHash,
 			postgres.NewEnumValue(model.EpochStatus_ClaimComputed.String()),
 		).