Improved inactivity claim submission process

pkg/tbtc/heartbeat.go

@@ -138,7 +138,7 @@ func (ha *heartbeatAction) execute() error {
 	)
 	defer cancelHeartbeatCtx()
 
-	signature, activeOperatorsCount, _, err := ha.signingExecutor.sign(
+	signature, activeOperatorsCount, signingEndBlock, err := ha.signingExecutor.sign(
 		heartbeatCtx,
 		messageToSign,
 		ha.startBlock,
@@ -189,12 +189,14 @@ func (ha *heartbeatAction) execute() error {
 	// The value of consecutive heartbeat failures exceeds the threshold.
 	// Proceed with operator inactivity notification.
 	err = ha.inactivityClaimExecutor.publishClaim(
-		// Leave the list empty. Some operators were inactive during the
-		// heartbeat because they were simply unstaking and therefore should not
-		// be punished.
+		// Leave the list of inactive operators empty even if some operators
+		// were inactive during signing heartbeat. The inactive operators could
+		// simply be in the process of unstaking and therefore should not be
+		// punished.
 		[]group.MemberIndex{},
 		true,
 		messageToSign,
+		signingEndBlock,
 	)
 	if err != nil {
 		return fmt.Errorf(

pkg/tbtc/inactivity.go

@@ -24,6 +24,9 @@ const (
 	// by the given member to avoid all members submitting the same inactivity claim
 	// at the same time.
 	inactivityClaimSubmissionDelayStepBlocks = 3
+	// inactivityClaimMaximumSubmissionBlocks determines the maximum block
+	// duration of inactivity claim submission procedure.
+	inactivityClaimMaximumSubmissionBlocks = 60
 )
 
 // errInactivityClaimExecutorBusy is an error returned when the inactivity claim
@@ -70,6 +73,7 @@ func (ice *inactivityClaimExecutor) publishClaim(
 	inactiveMembersIndexes []group.MemberIndex,
 	heartbeatFailed bool,
 	message *big.Int,
+	startBlock uint64,
 ) error {
 	if lockAcquired := ice.lock.TryAcquire(1); !lockAcquired {
 		return errInactivityClaimExecutorBusy
@@ -121,7 +125,7 @@ func (ice *inactivityClaimExecutor) publishClaim(
 
 		defer wg.Done()
 
-		inactivityClaimTimeoutBlock := uint64(0) // TODO: Set the value of timeout block
+		inactivityClaimTimeoutBlock := startBlock + inactivityClaimMaximumSubmissionBlocks
 
 		go func(signer *signer) {
 			ctx, cancelCtx := withCancelOnBlock(

pkg/tbtc/node.go

@@ -18,6 +18,7 @@ import (
 	"github.com/keep-network/keep-core/pkg/net"
 	"github.com/keep-network/keep-core/pkg/protocol/announcer"
 	"github.com/keep-network/keep-core/pkg/protocol/group"
+	"github.com/keep-network/keep-core/pkg/tecdsa/inactivity"
 	"github.com/keep-network/keep-core/pkg/tecdsa/signing"
 )
 
@@ -493,13 +494,7 @@ func (n *node) getInactivityClaimExecutor(
 		return nil, false, fmt.Errorf("failed to get broadcast channel: [%v]", err)
 	}
 
-	// TODO: Handle unmarshallers
-
-	// signing.RegisterUnmarshallers(broadcastChannel)
-	// announcer.RegisterUnmarshaller(broadcastChannel)
-	// broadcastChannel.SetUnmarshaler(func() net.TaggedUnmarshaler {
-	// 	return &signingDoneMessage{}
-	// })
+	inactivity.RegisterUnmarshallers(broadcastChannel)
 
 	membershipValidator := group.NewMembershipValidator(
 		executorLogger,

pkg/tecdsa/inactivity/inactivity.go

@@ -77,3 +77,12 @@ func Publish(
 
 	return nil
 }
+
+// RegisterUnmarshallers initializes the given broadcast channel to be able to
+// perform inactivity claim interactions by registering all the required
+// protocol message unmarshallers.
+func RegisterUnmarshallers(channel net.BroadcastChannel) {
+	channel.SetUnmarshaler(func() net.TaggedUnmarshaler {
+		return &claimSignatureMessage{}
+	})
+}