fix!: close epochs based on block numbers

- Fixes the ClaimMismatch bug on v.1x.
- BREAKING CHANGE: replaces the CARTESI_EPOCH_DURATION environment
  variable with CARTESI_EPOCH_LENGTH_IN_BLOCKS.

CHANGELOG.md

@@ -6,12 +6,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
 ## [Unreleased]
 
 ### Added
 
 - Added Rollups end-to-end test using Echo Dapp
 
+### Fixed
+
+- Fixed a bug that caused a `authority_claimer::ClaimMismatch` error when reprocessing inputs after a reboot.
+
+### Changed
+
+- Changed the dispatcher to close epochs based on block numbers instead of block timestamps.
+- **BREAKING**: replaced `CARTESI_EPOCH_DURATION` with `CARTESI_EPOCH_LENGTH_IN_BLOCKS` to match the new epoch algorithm, and set its default value to 7200 (1 day worth of blocks, in average, considering one block is mined every 12 seconds).
+
 ## [1.4.0] 2024-04-09
 
 ### Added

docs/config.md

@@ -236,14 +236,14 @@ for more information.
 * **Type:** `string`
 * **Default:** `""`
 
-## `CARTESI_EPOCH_DURATION`
+## `CARTESI_EPOCH_LENGTH_IN_BLOCKS`
 
-Duration of a rollups epoch in seconds.
+Length of a rollups epoch in blocks.
 
 At the end of each epoch, the node will send claims to the blockchain.
 
-* **Type:** `Duration`
-* **Default:** `"86400"`
+* **Type:** `uint64`
+* **Default:** `"7200"`
 
 ## `CARTESI_SNAPSHOT_DIR`
 

internal/node/config/config.go

@@ -15,7 +15,7 @@ import (
 type NodeConfig struct {
 	LogLevel                                  LogLevel
 	LogPretty                                 bool
-	RollupsEpochDuration                      Duration
+	RollupsEpochLengthInBlocks                uint64
 	BlockchainID                              uint64
 	BlockchainHttpEndpoint                    Redacted[string]
 	BlockchainWsEndpoint                      Redacted[string]
@@ -75,7 +75,7 @@ func FromEnv() NodeConfig {
 	var config NodeConfig
 	config.LogLevel = getLogLevel()
 	config.LogPretty = getLogPretty()
-	config.RollupsEpochDuration = getEpochDuration()
+	config.RollupsEpochLengthInBlocks = getEpochLengthInBlocks()
 	config.BlockchainID = getBlockchainId()
 	config.BlockchainHttpEndpoint = Redacted[string]{getBlockchainHttpEndpoint()}
 	config.BlockchainWsEndpoint = Redacted[string]{getBlockchainWsEndpoint()}

internal/node/config/generate/Config.toml

@@ -45,11 +45,11 @@ the snapshot matches the hash in the Application contract."""
 # Rollups
 #
 
-[rollups.CARTESI_EPOCH_DURATION]
-default = "86400" # 1 day in seconds
-go-type = "Duration"
+[rollups.CARTESI_EPOCH_LENGTH_IN_BLOCKS]
+default = "7200" # 1 day (average) in blocks (considering one block is mined every 12 seconds)
+go-type = "uint64"
 description = """
-Duration of a rollups epoch in seconds.
+Length of a rollups epoch in blocks.
 
 At the end of each epoch, the node will send claims to the blockchain."""
 

internal/node/services.go

@@ -160,8 +160,7 @@ func newDispatcher(c config.NodeConfig, workDir string) services.CommandService
 	s.Env = append(s.Env, fmt.Sprintf("HISTORY_ADDRESS=%v", c.ContractsHistoryAddress))
 	s.Env = append(s.Env, fmt.Sprintf("AUTHORITY_ADDRESS=%v", c.ContractsAuthorityAddress))
 	s.Env = append(s.Env, fmt.Sprintf("INPUT_BOX_ADDRESS=%v", c.ContractsInputBoxAddress))
-	s.Env = append(s.Env, fmt.Sprintf("RD_EPOCH_DURATION=%v",
-		int(c.RollupsEpochDuration.Seconds())))
+	s.Env = append(s.Env, fmt.Sprintf("RD_EPOCH_DURATION=%v", c.RollupsEpochLengthInBlocks))
 	s.Env = append(s.Env, fmt.Sprintf("CHAIN_ID=%v", c.BlockchainID))
 	s.Env = append(s.Env, fmt.Sprintf("DISPATCHER_HTTP_SERVER_PORT=%v",
 		getPort(c, portOffsetDispatcher)))

offchain/dispatcher/src/config.rs

@@ -30,8 +30,8 @@ pub struct DispatcherEnvCLIConfig {
     #[command(flatten)]
     pub blockchain_config: BlockchainCLIConfig,
 
-    /// Duration of rollups epoch in seconds, for which dispatcher will make claims.
-    #[arg(long, env, default_value = "604800")]
+    /// Duration of rollups epoch in blocks, for which dispatcher will make claims.
+    #[arg(long, env, default_value = "7200")]
     pub rd_epoch_duration: u64,
 
     /// Chain ID