Fix differentiate between objects and IDs for lachesis

Fantom-foundation · Dec 4, 2024 · da53523 · da53523
1 parent 6d66ff5
commit da53523
Show file tree

Hide file tree

Showing 87 changed files with 334 additions and 334 deletions.
diff --git a/cmd/sonictool/app/chain.go b/cmd/sonictool/app/chain.go
@@ -41,21 +41,21 @@ func exportEvents(ctx *cli.Context) error {
 		defer writer.(*gzip.Writer).Close()
 	}
 
-	from := idx.Epoch(1)
+	from := idx.EpochID(1)
 	if len(ctx.Args()) > 1 {
 		n, err := strconv.ParseUint(ctx.Args().Get(1), 10, 32)
 		if err != nil {
 			return err
 		}
-		from = idx.Epoch(n)
+		from = idx.EpochID(n)
 	}
-	to := idx.Epoch(0)
+	to := idx.EpochID(0)
 	if len(ctx.Args()) > 2 {
 		n, err := strconv.ParseUint(ctx.Args().Get(2), 10, 32)
 		if err != nil {
 			return err
 		}
-		to = idx.Epoch(n)
+		to = idx.EpochID(n)
 	}
 
 	gdbParams := db.GossipDbParameters{

diff --git a/cmd/sonictool/app/heal.go b/cmd/sonictool/app/heal.go
@@ -74,7 +74,7 @@ func heal(ctx *cli.Context) error {
 	cancelCtx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer stop()
 
-	recoveredBlock, err := db.HealChaindata(chaindataDir, cacheRatio, cfg, idx.Block(archiveCheckpointBlock))
+	recoveredBlock, err := db.HealChaindata(chaindataDir, cacheRatio, cfg, idx.BlockID(archiveCheckpointBlock))
 	if err != nil {
 		return err
 	}
@@ -93,7 +93,7 @@ func heal(ctx *cli.Context) error {
 	return nil
 }
 
-func healLiveFromArchive(ctx context.Context, carmenLiveDir, carmenArchiveDir string, recoveredBlock idx.Block) error {
+func healLiveFromArchive(ctx context.Context, carmenLiveDir, carmenArchiveDir string, recoveredBlock idx.BlockID) error {
 	if err := os.RemoveAll(carmenLiveDir); err != nil {
 		return fmt.Errorf("failed to remove broken live state: %w", err)
 	}

diff --git a/cmd/sonictool/chain/export_events.go b/cmd/sonictool/chain/export_events.go
@@ -24,7 +24,7 @@ var (
 // always print out progress. This avoids the user wondering what's going on.
 const statsReportLimit = 8 * time.Second
 
-func ExportEvents(gdbParams db.GossipDbParameters, w io.Writer, from, to idx.Epoch) (err error) {
+func ExportEvents(gdbParams db.GossipDbParameters, w io.Writer, from, to idx.EpochID) (err error) {
 	chaindataDir := filepath.Join(gdbParams.DataDir, "chaindata")
 	dbs, err := db.MakeDbProducer(chaindataDir, cachescale.Identity)
 	if err != nil {

diff --git a/cmd/sonictool/chain/import_events.go b/cmd/sonictool/chain/import_events.go
@@ -120,7 +120,7 @@ func importEventsFile(srv *gossip.Service, fn string) error {
 	batch := make(inter.EventPayloads, 0, 8*1024)
 	batchSize := 0
 	maxBatchSize := 8 * 1024 * 1024
-	epoch := idx.Epoch(0)
+	epoch := idx.EpochID(0)
 	txs := 0
 	events := 0
 

diff --git a/cmd/sonictool/check/archive.go b/cmd/sonictool/check/archive.go
@@ -43,7 +43,7 @@ func checkArchiveBlockRoots(dataDir string, cacheRatio cachescale.Func) error {
 
 	invalidBlocks := 0
 	lastBlockIdx := gdb.GetLatestBlockIndex()
-	for i := idx.Block(1); i <= lastBlockIdx; i++ {
+	for i := idx.BlockID(1); i <= lastBlockIdx; i++ {
 		block := gdb.GetBlock(i)
 		if block == nil {
 			return fmt.Errorf("verification failed - unable to get block %d from gdb", i)

diff --git a/cmd/sonictool/db/heal.go b/cmd/sonictool/db/heal.go
@@ -20,7 +20,7 @@ import (
 	"time"
 )
 
-func HealChaindata(chaindataDir string, cacheRatio cachescale.Func, cfg *config.Config, lastCarmenBlock idx.Block) (idx.Block, error) {
+func HealChaindata(chaindataDir string, cacheRatio cachescale.Func, cfg *config.Config, lastCarmenBlock idx.BlockID) (idx.BlockID, error) {
 	producer := &DummyScopedProducer{integration.GetRawDbProducer(chaindataDir, integration.DBCacheConfig{
 		Cache:   cacheRatio.U64(480 * opt.MiB),
 		Fdlimit: makeDatabaseHandles(),
@@ -43,7 +43,7 @@ func HealChaindata(chaindataDir string, cacheRatio cachescale.Func, cfg *config.
 	if err != nil {
 		return 0, fmt.Errorf("failed to open 'lachesis' database: %w", err)
 	}
-	cGetEpochDB := func(epoch idx.Epoch) kvdb.Store {
+	cGetEpochDB := func(epoch idx.EpochID) kvdb.Store {
 		name := fmt.Sprintf("lachesis-%d", epoch)
 		cEpochDB, err := producer.OpenDB(name)
 		if err != nil {
@@ -71,8 +71,8 @@ func HealChaindata(chaindataDir string, cacheRatio cachescale.Func, cfg *config.
 }
 
 // healGossipDb reverts the gossip database into state, into which can be reverted carmen
-func healGossipDb(producer kvdb.FlushableDBProducer, cfg gossip.StoreConfig, lastCarmenBlock idx.Block) (
-	epochState *iblockproc.EpochState, lastBlock idx.Block, err error) {
+func healGossipDb(producer kvdb.FlushableDBProducer, cfg gossip.StoreConfig, lastCarmenBlock idx.BlockID) (
+	epochState *iblockproc.EpochState, lastBlock idx.BlockID, err error) {
 
 	gdb, err := gossip.NewStore(producer, cfg) // requires FlushIDKey present (not clean) in all dbs
 	if err != nil {
@@ -106,10 +106,10 @@ func healGossipDb(producer kvdb.FlushableDBProducer, cfg gossip.StoreConfig, las
 }
 
 // getLastEpochWithState finds the last closed epoch with the state available
-func getLastEpochWithState(gdb *gossip.Store, lastCarmenBlock idx.Block) (epochIdx idx.Epoch, blockState *iblockproc.BlockState, epochState *iblockproc.EpochState) {
+func getLastEpochWithState(gdb *gossip.Store, lastCarmenBlock idx.BlockID) (epochIdx idx.EpochID, blockState *iblockproc.BlockState, epochState *iblockproc.EpochState) {
 	currentEpoch := gdb.GetEpoch()
-	epochsToTry := idx.Epoch(10000)
-	endEpoch := idx.Epoch(1)
+	epochsToTry := idx.EpochID(10000)
+	endEpoch := idx.EpochID(1)
 	if currentEpoch > epochsToTry {
 		endEpoch = currentEpoch - epochsToTry
 	}

diff --git a/cmd/sonictool/genesis/export.go b/cmd/sonictool/genesis/export.go
@@ -82,7 +82,7 @@ func ExportGenesis(ctx context.Context, gdb *gossip.Store, includeArchive bool,
 	return nil
 }
 
-func exportEpochsSection(ctx context.Context, gdb *gossip.Store, writer *unitWriter, from, to idx.Epoch) error {
+func exportEpochsSection(ctx context.Context, gdb *gossip.Store, writer *unitWriter, from, to idx.EpochID) error {
 	log.Info("Exporting epochs", "from", from, "to", to)
 	for i := to; i >= from; i-- {
 		er := gdb.GetFullEpochRecord(i)
@@ -111,15 +111,15 @@ func exportEpochsSection(ctx context.Context, gdb *gossip.Store, writer *unitWri
 	return nil
 }
 
-func exportBlocksSection(ctx context.Context, gdb *gossip.Store, writer *unitWriter, to idx.Block, maxBlocks int64) error {
+func exportBlocksSection(ctx context.Context, gdb *gossip.Store, writer *unitWriter, to idx.BlockID, maxBlocks int64) error {
 	toBlock := int64(to)
 	fromBlock := int64(0)
 	if maxBlocks != 0 && toBlock > 1+maxBlocks {
 		fromBlock = toBlock - maxBlocks
 	}
 	log.Info("Exporting blocks", "from", fromBlock, "to", toBlock)
 	for i := toBlock; i >= fromBlock; i-- {
-		i := idx.Block(i)
+		i := idx.BlockID(i)
 		br := gdb.GetFullBlockRecord(i)
 		if br == nil {
 			return fmt.Errorf("the block record for block %d is missing in gdb", i)
@@ -177,7 +177,7 @@ func exportFwaSection(ctx context.Context, gdb *gossip.Store, writer *unitWriter
 	return nil
 }
 
-func getEpochBlock(epoch idx.Epoch, store *gossip.Store) idx.Block {
+func getEpochBlock(epoch idx.EpochID, store *gossip.Store) idx.BlockID {
 	bs, _ := store.GetHistoryBlockEpochState(epoch)
 	if bs == nil {
 		return 0

diff --git a/cmd/sonictool/genesis/import.go b/cmd/sonictool/genesis/import.go
@@ -60,7 +60,7 @@ func ImportGenesisStore(params ImportParams) error {
 	if err != nil {
 		return err
 	}
-	cGetEpochDB := func(epoch idx.Epoch) kvdb.Store {
+	cGetEpochDB := func(epoch idx.EpochID) kvdb.Store {
 		db, err := dbs.OpenDB(fmt.Sprintf("lachesis-%d", epoch))
 		if err != nil {
 			panic(fmt.Errorf("failed to open epoch db: %w", err))

diff --git a/config/make_node.go b/config/make_node.go
@@ -118,9 +118,9 @@ func MakeNode(ctx *cli.Context, cfg *Config) (*node.Node, *gossip.Service, func(
 		}
 		return evmcore.NewTxPool(cfg.TxPool, reader.Config(), reader)
 	}
-	haltCheck := func(oldEpoch, newEpoch idx.Epoch, age time.Time) bool {
+	haltCheck := func(oldEpoch, newEpoch idx.EpochID, age time.Time) bool {
 		stop := ctx.GlobalIsSet(flags.ExitWhenAgeFlag.Name) && ctx.GlobalDuration(flags.ExitWhenAgeFlag.Name) >= time.Since(age)
-		stop = stop || ctx.GlobalIsSet(flags.ExitWhenEpochFlag.Name) && idx.Epoch(ctx.GlobalUint64(flags.ExitWhenEpochFlag.Name)) <= newEpoch
+		stop = stop || ctx.GlobalIsSet(flags.ExitWhenEpochFlag.Name) && idx.EpochID(ctx.GlobalUint64(flags.ExitWhenEpochFlag.Name)) <= newEpoch
 		if stop {
 			go func() {
 				// do it in a separate thread to avoid deadlock

diff --git a/ethapi/api.go b/ethapi/api.go
@@ -133,8 +133,8 @@ func (s *PublicEthereumAPI) FeeHistory(ctx context.Context, blockCount math.HexO
 		return nil, err
 	}
 	oldest := last
-	if oldest > idx.Block(blockCount) {
-		oldest -= idx.Block(blockCount - 1)
+	if oldest > idx.BlockID(blockCount) {
+		oldest -= idx.BlockID(blockCount - 1)
 	} else {
 		oldest = 0
 	}

diff --git a/ethapi/backend.go b/ethapi/backend.go
@@ -41,12 +41,12 @@ import (
 
 // PeerProgress is synchronization status of a peer
 type PeerProgress struct {
-	CurrentEpoch     idx.Epoch
-	CurrentBlock     idx.Block
+	CurrentEpoch     idx.EpochID
+	CurrentBlock     idx.BlockID
 	CurrentBlockHash hash.Event
 	CurrentBlockTime inter.Timestamp
-	HighestBlock     idx.Block
-	HighestEpoch     idx.Epoch
+	HighestBlock     idx.BlockID
+	HighestEpoch     idx.EpochID
 }
 
 // Backend interface provides the common API services (that are provided by
@@ -70,7 +70,7 @@ type Backend interface {
 	HeaderByHash(ctx context.Context, hash common.Hash) (*evmcore.EvmHeader, error)
 	BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*evmcore.EvmBlock, error)
 	StateAndHeaderByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (state.StateDB, *evmcore.EvmHeader, error)
-	ResolveRpcBlockNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (idx.Block, error)
+	ResolveRpcBlockNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (idx.BlockID, error)
 	BlockByHash(ctx context.Context, hash common.Hash) (*evmcore.EvmBlock, error)
 	GetReceiptsByNumber(ctx context.Context, number rpc.BlockNumber) (types.Receipts, error)
 	GetEVM(ctx context.Context, msg *core.Message, state vm.StateDB, header *evmcore.EvmHeader, vmConfig *vm.Config) (*vm.EVM, func() error, error)
@@ -95,12 +95,12 @@ type Backend interface {
 	GetEventPayload(ctx context.Context, shortEventID string) (*inter.EventPayload, error)
 	GetEvent(ctx context.Context, shortEventID string) (*inter.Event, error)
 	GetHeads(ctx context.Context, epoch rpc.BlockNumber) (hash.Events, error)
-	CurrentEpoch(ctx context.Context) idx.Epoch
+	CurrentEpoch(ctx context.Context) idx.EpochID
 	SealedEpochTiming(ctx context.Context) (start inter.Timestamp, end inter.Timestamp)
 
 	// Lachesis aBFT API
 	GetEpochBlockState(ctx context.Context, epoch rpc.BlockNumber) (*iblockproc.BlockState, *iblockproc.EpochState, error)
-	GetDowntime(ctx context.Context, vid idx.ValidatorID) (idx.Block, inter.Timestamp, error)
+	GetDowntime(ctx context.Context, vid idx.ValidatorID) (idx.BlockID, inter.Timestamp, error)
 	GetUptime(ctx context.Context, vid idx.ValidatorID) (*big.Int, error)
 	GetOriginatedFee(ctx context.Context, vid idx.ValidatorID) (*big.Int, error)
 }

diff --git a/ethapi/mock_backend.go b/ethapi/mock_backend.go
diff --git a/eventcheck/epochcheck/epoch_check.go b/eventcheck/epochcheck/epoch_check.go
@@ -26,7 +26,7 @@ var (
 // Reader returns currents epoch and its validators group.
 type Reader interface {
 	base.Reader
-	GetEpochRules() (opera.Rules, idx.Epoch)
+	GetEpochRules() (opera.Rules, idx.EpochID)
 }
 
 // Checker which require only current epoch info
@@ -51,8 +51,8 @@ func CalcGasPowerUsed(e inter.EventPayloadI, rules opera.Rules) uint64 {
 	gasCfg := rules.Economy.Gas
 
 	parentsGas := uint64(0)
-	if idx.Event(len(e.Parents())) > rules.Dag.MaxFreeParents {
-		parentsGas = uint64(idx.Event(len(e.Parents()))-rules.Dag.MaxFreeParents) * gasCfg.ParentGas
+	if idx.EventID(len(e.Parents())) > rules.Dag.MaxFreeParents {
+		parentsGas = uint64(idx.EventID(len(e.Parents()))-rules.Dag.MaxFreeParents) * gasCfg.ParentGas
 	}
 	extraGas := uint64(len(e.Extra())) * gasCfg.ExtraDataGas
 
@@ -110,7 +110,7 @@ func (v *Checker) Validate(e inter.EventPayloadI) error {
 	if e.Epoch() != epoch {
 		return base.ErrNotRelevant
 	}
-	if idx.Event(len(e.Parents())) > rules.Dag.MaxParents {
+	if idx.EventID(len(e.Parents())) > rules.Dag.MaxParents {
 		return ErrTooManyParents
 	}
 	if uint32(len(e.Extra())) > rules.Dag.MaxExtraData {

diff --git a/eventcheck/gaspowercheck/gas_power_check.go b/eventcheck/gaspowercheck/gas_power_check.go
@@ -26,7 +26,7 @@ type ValidatorState struct {
 
 // ValidationContext for gaspower checking
 type ValidationContext struct {
-	Epoch           idx.Epoch
+	Epoch           idx.EpochID
 	Configs         [inter.GasPowerConfigs]Config
 	EpochStart      inter.Timestamp
 	Validators      *ltypes.Validators

diff --git a/eventcheck/heavycheck/heavy_check.go b/eventcheck/heavycheck/heavy_check.go
@@ -26,9 +26,9 @@ var (
 
 // Reader is accessed by the validator to get the current state.
 type Reader interface {
-	GetEpochPubKeys() (map[idx.ValidatorID]validatorpk.PubKey, idx.Epoch)
-	GetEpochPubKeysOf(idx.Epoch) map[idx.ValidatorID]validatorpk.PubKey
-	GetEpochBlockStart(idx.Epoch) idx.Block
+	GetEpochPubKeys() (map[idx.ValidatorID]validatorpk.PubKey, idx.EpochID)
+	GetEpochPubKeysOf(idx.EpochID) map[idx.ValidatorID]validatorpk.PubKey
+	GetEpochBlockStart(idx.EpochID) idx.BlockID
 }
 
 // Checker which requires only parents list + current epoch info
@@ -105,7 +105,7 @@ func verifySignature(signedHash hash.Hash, sig inter.Signature, pubkey validator
 	return crypto.VerifySignature(pubkey.Raw, signedHash.Bytes(), sig.Bytes())
 }
 
-func (v *Checker) ValidateEventLocator(e inter.SignedEventLocator, authEpoch idx.Epoch, authErr error, checkPayload func() bool) error {
+func (v *Checker) ValidateEventLocator(e inter.SignedEventLocator, authEpoch idx.EpochID, authErr error, checkPayload func() bool) error {
 	pubkeys := v.reader.GetEpochPubKeysOf(authEpoch)
 	if len(pubkeys) == 0 {
 		return authErr

diff --git a/evmcore/dummy_block.go b/evmcore/dummy_block.go
@@ -52,7 +52,7 @@ type (
 
 		PrevRandao common.Hash // == mixHash/mixDigest
 
-		Epoch idx.Epoch
+		Epoch idx.EpochID
 	}
 
 	EvmBlock struct {