Add/catchup

common/messaging/messaging.go

@@ -9,6 +9,7 @@ import (
 
 	accountspb "github.com/JupiterMetaLabs/JMDN-FastSync/common/proto/accounts"
 	datasyncpb "github.com/JupiterMetaLabs/JMDN-FastSync/common/proto/datasync"
+	headersyncpb "github.com/JupiterMetaLabs/JMDN-FastSync/common/proto/headersync"
 	potspb "github.com/JupiterMetaLabs/JMDN-FastSync/common/proto/pots"
 	priorsyncpb "github.com/JupiterMetaLabs/JMDN-FastSync/common/proto/priorsync"
 	"github.com/JupiterMetaLabs/JMDN-FastSync/common/types/constants"
@@ -461,6 +462,44 @@ func SendDataSyncProtoDelimitedWithHeartbeat(
 	)
 }
 
+// SendHeaderSyncProtoDelimitedWithHeartbeat is a heartbeat-aware variant of SendProtoDelimited,
+// designed for the HeaderSync protocol. Fetching large header batches from the server's DB
+// can exceed the 15s stream deadline; heartbeat frames reset the read deadline on each tick.
+func SendHeaderSyncProtoDelimitedWithHeartbeat(
+	ctx context.Context,
+	version uint16,
+	host host.Host,
+	peerInfo peer.AddrInfo,
+	protocolID protocol.ID,
+	request proto.Message,
+	response *headersyncpb.HeaderSyncResponse,
+) error {
+	if response == nil {
+		return errors.New("response message is nil")
+	}
+	return sendProtoDelimitedWithHeartbeatGeneric(ctx, version, host, peerInfo, protocolID, request,
+		streamConfig[*headersyncpb.HeaderSyncStreamMessage]{
+			newEnvelope: func() *headersyncpb.HeaderSyncStreamMessage {
+				return &headersyncpb.HeaderSyncStreamMessage{}
+			},
+			isHeartbeat: func(e *headersyncpb.HeaderSyncStreamMessage) bool {
+				_, ok := e.Payload.(*headersyncpb.HeaderSyncStreamMessage_Heartbeat)
+				return ok
+			},
+			mergeResponse: func(e *headersyncpb.HeaderSyncStreamMessage) error {
+				p, ok := e.Payload.(*headersyncpb.HeaderSyncStreamMessage_Response)
+				if !ok {
+					return fmt.Errorf("unexpected HeaderSyncStreamMessage payload type: %T", e.Payload)
+				}
+				if p.Response != nil {
+					proto.Merge(response, p.Response)
+				}
+				return nil
+			},
+		},
+	)
+}
+
 // SendPoTSProtoDelimitedWithHeartbeat is a heartbeat-aware variant of SendProtoDelimited,
 // designed for the PoTS (Proof of Time Sync) protocol.
 func SendPoTSProtoDelimitedWithHeartbeat(

common/proto/availability/availability.proto

@@ -18,4 +18,5 @@ message AvailabilityResponse {
     uint32 block_merge = 3;
     auth.Auth auth = 4;
     phase.Phase phase = 5;
+    uint64 block_height = 6;
 }

common/proto/headersync/headersync.proto

@@ -21,4 +21,15 @@ message HeaderSyncResponse {
     uint32 version = 2;
     ack.Ack ack = 3;
     phase.Phase phase = 4;
+}
+
+message HeaderSyncHeartbeat {
+    int64 timestamp = 1;
+}
+
+message HeaderSyncStreamMessage {
+    oneof payload {
+        HeaderSyncHeartbeat heartbeat = 1;
+        HeaderSyncResponse  response  = 2;
+    }
 }

common/types/constants/constants.go

@@ -52,7 +52,7 @@ const (
 )
 
 const (
-	AUTH_TTL = 2 * time.Minute
+	AUTH_TTL = 48 * time.Hour
 )
 
 const (
@@ -67,7 +67,7 @@ const (
 	MAX_DATA_PER_REQUEST    = 30
 	MIN_BLOCKS              = 500 // if number of blocks in the client is less than 500 then do the full sync.
 	MAX_PARALLEL_REQUESTS   = 10
-	ATMOST_ACCOUNT_ROUTINES = 15
+	ATMOST_ACCOUNT_ROUTINES = 3
 	LRU_CACHE_CAPACITY      = 200
 )