Move validator component to INX plugin

.github/workflows/feature-network-deploy.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Ansible deploy
         env:
           CUSTOM_SNAPSHOT_URL: '${{ github.event.inputs.snapshotUrl }}'
-          DEFAULT_SNAPSHOT_URL: 'https://0x0.st/HJXh.bin'
+          DEFAULT_SNAPSHOT_URL: 'https://0x0.st/HywH.bin'
           NETWORK_ENVIRONMENT: '${{ secrets.NETWORK_ENVIRONMENT }}'
           IOTA_CORE_DOCKER_IMAGE_REPO: 'iotaledger/iota-core'
           IOTA_CORE_DOCKER_IMAGE_TAG: 'feature'

.gitignore

@@ -15,8 +15,7 @@ iota-core
 # IDE related files
 .vscode/
 .idea/
-go.work
-go.work.sum
+go.work*
 
 # dist packages
 dist/

components/app/app.go

@@ -17,7 +17,6 @@ import (
 	"github.com/iotaledger/iota-core/components/protocol"
 	"github.com/iotaledger/iota-core/components/restapi"
 	coreapi "github.com/iotaledger/iota-core/components/restapi/core"
-	"github.com/iotaledger/iota-core/components/validator"
 	"github.com/iotaledger/iota-core/pkg/toolset"
 )
 
@@ -48,7 +47,6 @@ Command line flags:
 			debugapi.Component,
 			metricstracker.Component,
 			protocol.Component,
-			validator.Component,
 			dashboardmetrics.Component,
 			dashboard.Component,
 			metrics.Component,

components/dashboard/component.go

@@ -155,7 +155,7 @@ func currentNodeStatus() *nodestatus {
 
 	status.TangleTime = tangleTime{
 		Synced:             syncStatus.NodeSynced,
-		Bootstrapped:       deps.Protocol.MainEngineInstance().SyncManager.IsBootstrapped(),
+		Bootstrapped:       syncStatus.NodeBootstrapped,
 		AcceptedBlockSlot:  int64(syncStatus.LastAcceptedBlockSlot),
 		ConfirmedBlockSlot: int64(syncStatus.LastConfirmedBlockSlot),
 		CommittedSlot:      int64(syncStatus.LatestCommitment.Slot()),

components/inx/server_accounts.go

@@ -0,0 +1,53 @@
+package inx
+
+import (
+	"context"
+
+	"github.com/iotaledger/hive.go/ierrors"
+	inx "github.com/iotaledger/inx/go"
+	iotago "github.com/iotaledger/iota.go/v4"
+)
+
+func (s *Server) ReadIsValidatorAccount(_ context.Context, accountInfoRequest *inx.AccountInfoRequest) (*inx.BoolResponse, error) {
+	slot := iotago.SlotIndex(accountInfoRequest.GetAccountSlot())
+	accountID, _, err := iotago.AccountIDFromBytes(accountInfoRequest.AccountId)
+	if err != nil {
+		return nil, ierrors.Wrap(err, "error when parsing account id")
+	}
+
+	account, exists, err := deps.Protocol.MainEngineInstance().Ledger.Account(accountID, slot)
+	if err != nil {
+		return nil, ierrors.Wrapf(err, "error when retrieving account data for %s", accountID)
+	}
+
+	return inx.WrapBoolResponse(exists && account.StakeEndEpoch <= deps.Protocol.APIForSlot(slot).TimeProvider().EpochFromSlot(slot)), nil
+}
+
+func (s *Server) ReadIsCommitteeMember(_ context.Context, accountInfoRequest *inx.AccountInfoRequest) (*inx.BoolResponse, error) {
+	slot := iotago.SlotIndex(accountInfoRequest.GetAccountSlot())
+	accountID, _, err := iotago.AccountIDFromBytes(accountInfoRequest.AccountId)
+	if err != nil {
+		return nil, ierrors.Wrap(err, "error when parsing account id")
+	}
+	committee, exists := deps.Protocol.MainEngineInstance().SybilProtection.SeatManager().CommitteeInSlot(slot)
+	if !exists {
+		return nil, ierrors.Errorf("committee does not exist for slot %d", slot)
+	}
+
+	return inx.WrapBoolResponse(committee.HasAccount(accountID)), nil
+}
+
+func (s *Server) ReadIsCandidate(_ context.Context, accountInfoRequest *inx.AccountInfoRequest) (*inx.BoolResponse, error) {
+	slot := iotago.SlotIndex(accountInfoRequest.GetAccountSlot())
+	accountID, _, err := iotago.AccountIDFromBytes(accountInfoRequest.AccountId)
+	if err != nil {
+		return nil, ierrors.Wrap(err, "error when parsing account id")
+	}
+
+	isCandidateActive, err := deps.Protocol.MainEngineInstance().SybilProtection.IsCandidateActive(accountID, deps.Protocol.APIForSlot(slot).TimeProvider().EpochFromSlot(slot))
+	if err != nil {
+		return nil, ierrors.Wrap(err, "error when checking if candidate is active")
+	}
+
+	return inx.WrapBoolResponse(isCandidateActive), nil
+}

components/inx/server_blocks.go

@@ -16,6 +16,12 @@ import (
 	iotago "github.com/iotaledger/iota.go/v4"
 )
 
+func (s *Server) ReadActiveRootBlocks(_ context.Context, _ *inx.NoParams) (*inx.RootBlocksResponse, error) {
+	activeRootBlocks := deps.Protocol.MainEngineInstance().EvictionState.ActiveRootBlocks()
+
+	return inx.WrapRootBlocks(activeRootBlocks), nil
+}
+
 func (s *Server) ReadBlock(_ context.Context, blockID *inx.BlockId) (*inx.RawBlock, error) {
 	blkID := blockID.Unwrap()
 	block, exists := deps.Protocol.MainEngineInstance().Block(blkID) // block +1

components/inx/server_commitments.go

@@ -22,6 +22,14 @@ func inxCommitment(commitment *model.Commitment) *inx.Commitment {
 	}
 }
 
+func (s *Server) ForceCommitUntil(_ context.Context, slot *inx.SlotIndex) (*inx.NoParams, error) {
+	err := deps.Protocol.MainEngineInstance().Notarization.ForceCommitUntil(slot.Unwrap())
+	if err != nil {
+		return nil, ierrors.Wrapf(err, "error while performing force commit until %d", slot.Index)
+	}
+
+	return &inx.NoParams{}, nil
+}
 func (s *Server) ReadCommitment(_ context.Context, req *inx.CommitmentRequest) (*inx.Commitment, error) {
 	commitmentSlot := iotago.SlotIndex(req.GetCommitmentSlot())
 

components/inx/server_node.go

@@ -25,6 +25,7 @@ func inxNodeStatus(status *syncmanager.SyncStatus) *inx.NodeStatus {
 
 	return &inx.NodeStatus{
 		IsHealthy:                   status.NodeSynced,
+		IsBootstrapped:              status.NodeBootstrapped,
 		LastAcceptedBlockSlot:       uint32(status.LastAcceptedBlockSlot),
 		LastConfirmedBlockSlot:      uint32(status.LastConfirmedBlockSlot),
 		LatestCommitment:            inxCommitment(status.LatestCommitment),