reduce mpc retry interval (#21)

Author: hundredark

solana/mvm.go

@@ -8,7 +8,6 @@ import (
 	"math/big"
 	"slices"
 	"strings"
-	"time"
 
 	"github.com/MixinNetwork/bot-api-go-client/v3"
 	solanaApp "github.com/MixinNetwork/computer/apps/solana"
@@ -588,7 +587,7 @@ func (node *Node) processObserverRequestSign(ctx context.Context, req *store.Req
 	if call == nil || call.Signature.Valid || call.State == common.RequestStateFailed {
 		return node.failRequest(ctx, req, "")
 	}
-	if call.RequestSignerAt.Valid && call.RequestSignerAt.Time.Add(20*time.Minute).After(req.CreatedAt) {
+	if call.RequestSignerAt.Valid && call.RequestSignerAt.Time.Add(mpcRetryInterval).After(req.CreatedAt) {
 		return node.failRequest(ctx, req, "")
 	}
 

solana/observer.go

@@ -24,8 +24,9 @@ import (
 )
 
 const (
-	loopInterval = time.Second * 5
-	BalanceLimit = 500000000
+	loopInterval     = time.Second * 5
+	mpcRetryInterval = time.Minute * 5
+	BalanceLimit     = 500000000
 )
 
 func (node *Node) bootObserver(ctx context.Context, version string) {
@@ -662,7 +663,7 @@ func (node *Node) processUnsignedCalls(ctx context.Context) error {
 	}
 	for _, call := range calls {
 		now := time.Now().UTC()
-		if call.RequestSignerAt.Valid && call.RequestSignerAt.Time.Add(20*time.Minute).After(now) {
+		if call.RequestSignerAt.Valid && call.RequestSignerAt.Time.Add(mpcRetryInterval).After(now) {
 			continue
 		}
 		logger.Printf("observer.processUnsignedCalls(%s %d)", call.RequestId, len(calls))

solana/signer.go

@@ -164,8 +164,8 @@ func (node *Node) loopPendingSessions(ctx context.Context) {
 					panic(fmt.Errorf("store.ReadSystemCallByRequestId(%s) => %v %v", s.RequestId, call, err))
 				}
 				if call.Signature.Valid || call.State != common.RequestStatePending {
-					err = node.store.MarkSessionDone(ctx, s.Id)
-					logger.Printf("node.MarkSessionDone(%v) => %v", s, err)
+					err = node.store.MarkSessionDone(ctx, s.Id, call.RequestId)
+					logger.Printf("node.MarkSessionDone(%v %s) => %v", s, call.RequestId, err)
 					if err != nil {
 						panic(err)
 					}
@@ -192,7 +192,7 @@ func (node *Node) loopPendingSessions(ctx context.Context) {
 			if err != nil {
 				break
 			}
-			err = node.store.MarkSessionDone(ctx, op.Id)
+			err = node.store.MarkSessionDone(ctx, op.Id, "")
 			logger.Printf("node.MarkSessionDone(%v) => %v", op, err)
 			if err != nil {
 				break

store/session.go

@@ -192,7 +192,7 @@ func (s *SQLite3Store) MarkSessionPreparedWithRequest(ctx context.Context, req *
 	return tx.Commit()
 }
 
-func (s *SQLite3Store) MarkSessionDone(ctx context.Context, sessionId string) error {
+func (s *SQLite3Store) MarkSessionDone(ctx context.Context, sessionId string, callId string) error {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 
@@ -202,12 +202,21 @@ func (s *SQLite3Store) MarkSessionDone(ctx context.Context, sessionId string) er
 	}
 	defer common.Rollback(tx)
 
+	now := time.Now().UTC()
 	err = s.execOne(ctx, tx, "UPDATE sessions SET state=?, updated_at=? WHERE session_id=? AND state=?",
-		common.RequestStateDone, time.Now().UTC(), sessionId, common.RequestStatePending)
+		common.RequestStateDone, now, sessionId, common.RequestStatePending)
 	if err != nil {
 		return fmt.Errorf("SQLite3Store UPDATE sessions %v", err)
 	}
 
+	if callId != "" {
+		_, err = tx.ExecContext(ctx, "UPDATE sessions SET state=?, updated_at=? WHERE session_id!=? AND state=? AND request_id=?",
+			common.RequestStateFailed, now, sessionId, common.RequestStatePending, callId)
+		if err != nil {
+			return fmt.Errorf("SQLite3Store UPDATE sessions %v", err)
+		}
+	}
+
 	return tx.Commit()
 }