feat(database): Add Epoch and Snapshot tables

cartesi · Aug 1, 2024 · 968c971 · 968c971
1 parent 511af30
commit 968c971
Show file tree

Hide file tree

Showing 13 changed files with 360 additions and 298 deletions.
diff --git a/call_get_code.sh b/call_get_code.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/bash
+
+curl http://127.0.0.1:8545 \
+  -X POST \
+  -H "Content-Type: application/json" \
+  -d '{"jsonrpc":"2.0","method":"eth_getCode","params": ["0xA1b8EB1F13d8D5Db976a653BbDF8972cfD14691C", "0x10"],"id":1}'
diff --git a/cmd/cartesi-rollups-cli/root/app/add/add.go b/cmd/cartesi-rollups-cli/root/app/add/add.go
@@ -34,7 +34,6 @@ var (
 	templateHash                  string
 	inputBoxDeploymentBlockNumber uint64
 	snapshotUri                   string
-	epochLength                   uint64
 	status                        string
 )
 
@@ -72,14 +71,6 @@ func init() {
 		"Application snapshot URI",
 	)
 
-	Cmd.Flags().Uint64VarP(
-		&epochLength,
-		"epoch-length",
-		"e",
-		1,
-		"Application epoch length in blocks",
-	)
-
 	Cmd.Flags().StringVarP(
 		&status,
 		"status",
@@ -113,8 +104,6 @@ func run(cmd *cobra.Command, args []string) {
 		ContractAddress:    common.HexToAddress(applicationAddress),
 		TemplateHash:       common.HexToHash(templateHash),
 		LastProcessedBlock: inputBoxDeploymentBlockNumber,
-		SnapshotURI:        snapshotUri,
-		EpochLength:        epochLength,
 		Status:             applicationStatus,
 	}
 

diff --git a/docs/cli/cartesi-rollups-cli_app_add.md b/docs/cli/cartesi-rollups-cli_app_add.md
@@ -17,7 +17,6 @@ cartesi-rollups-cli app add -a 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -n 10
 
 ```
   -a, --address string               Application contract address
-  -e, --epoch-length uint            Application epoch length in blocks (default 1)
   -h, --help                         help for add
   -n, --inputbox-block-number uint   InputBox deployment block number
   -u, --snapshot-uri string          Application snapshot URI

diff --git a/internal/node/model/models.go b/internal/node/model/models.go
@@ -12,9 +12,10 @@ type (
 	Hash                  = common.Hash
 	Address               = common.Address
 	InputCompletionStatus string
-	ClaimStatus           string
-	ApplicationStatus     string
-	DefaultBlock          string
+	EpochStatus           string
+	// ClaimStatus           string
+	ApplicationStatus string
+	DefaultBlock      string
 )
 
 const (
@@ -29,11 +30,21 @@ const (
 )
 
 const (
-	ClaimStatusPending   ClaimStatus = "PENDING"
-	ClaimStatusSubmitted ClaimStatus = "SUBMITTED"
-	ClaimStatusFinalized ClaimStatus = "FINALIZED"
+	EpochStatusReceivingInputs    EpochStatus = "RECEIVING_INPUTS"
+	EpochStatusReceivedLastInput  EpochStatus = "RECEIVED_LAST_INPUT"
+	EpochStatusProcessedAllInputs EpochStatus = "PROCESSED_ALL_INPUTS"
+	EpochStatusCalculatedClaim    EpochStatus = "CALCULATED_CLAIM"
+	EpochStatusSubmittedClaim     EpochStatus = "SUBMITTED_CLAIM"
+	EpochStatusAcceptedClaim      EpochStatus = "ACCEPTED_CLAIM"
+	EpochStatusRejectedClaim      EpochStatus = "REJECTED_CLAIM"
 )
 
+// const (
+// 	ClaimStatusPending   ClaimStatus = "PENDING"
+// 	ClaimStatusSubmitted ClaimStatus = "SUBMITTED"
+// 	ClaimStatusFinalized ClaimStatus = "FINALIZED"
+// )
+
 const (
 	ApplicationStatusRunning    ApplicationStatus = "RUNNING"
 	ApplicationStatusNotRunning ApplicationStatus = "NOT RUNNING"
@@ -52,18 +63,28 @@ type NodePersistentConfig struct {
 	InputBoxAddress         Address
 	ChainId                 uint64
 	IConsensusAddress       Address
+	EpochLength             uint64
 }
 
 type Application struct {
 	Id                 uint64
 	ContractAddress    Address
 	TemplateHash       Hash
-	SnapshotURI        string
 	LastProcessedBlock uint64
-	EpochLength        uint64
 	Status             ApplicationStatus
 }
 
+type Epoch struct {
+	Id              uint64
+	AppAddress      Address
+	Index           uint64
+	FirstBlock      uint64
+	LastBlock       uint64
+	ClaimHash       *Hash
+	TransactionHash *Hash
+	Status          EpochStatus
+}
+
 type Input struct {
 	Id               uint64
 	Index            uint64
@@ -73,6 +94,7 @@ type Input struct {
 	MachineHash      *Hash
 	OutputsHash      *Hash
 	AppAddress       Address
+	EpochId          uint64
 }
 
 type Output struct {
@@ -91,11 +113,11 @@ type Report struct {
 	InputId uint64
 }
 
-type Claim struct {
-	Id                   uint64
-	Index                uint64
-	Status               ClaimStatus
-	OutputMerkleRootHash Hash
-	TransactionHash      *Hash
-	AppAddress           Address
-}
+// type Claim struct {
+// 	Id                   uint64
+// 	Index                uint64
+// 	Status               ClaimStatus
+// 	OutputMerkleRootHash Hash
+// 	TransactionHash      *Hash
+// 	AppAddress           Address
+// }