ts: track coordinator versions

Author: dsocolobsky

architectures/decentralized/solana-authorizer/programs/solana-authorizer/src/lib.rs

@@ -4,7 +4,7 @@ pub mod state;
 use anchor_lang::prelude::*;
 use logic::*;
 
-declare_id!("PsyAUmhpmiUouWsnJdNGFSX8vZ6rWjXjgDPHsgqPGyw");
+declare_id!("9Fama3hhPJWnW2my835ptNR8kQmDH4EdK1hYZ7sGqtbS");
 
 pub fn find_authorization(
     grantor: &Pubkey,

architectures/decentralized/solana-authorizer/target/deploy/psyche_solana_authorizer-keypair.json

@@ -1,6 +1 @@
-[
-  133, 168, 22, 30, 172, 129, 250, 222, 16, 179, 41, 22, 161, 2, 171, 87, 19,
-  134, 196, 81, 67, 2, 234, 210, 48, 19, 234, 27, 192, 50, 161, 118, 5, 220,
-  104, 106, 206, 33, 252, 167, 179, 12, 115, 187, 217, 59, 144, 210, 71, 193,
-  163, 175, 67, 155, 20, 145, 152, 109, 251, 190, 151, 5, 10, 82
-]
+[235, 60, 229, 84, 186, 162, 20, 27, 214, 150, 28, 48, 91, 197, 33, 223, 121, 140, 79, 184, 91, 93, 221, 176, 247, 8, 82, 169, 31, 209, 249, 52, 122, 153, 207, 16, 27, 219, 117, 113, 251, 151, 62, 246, 116, 148, 194, 167, 145, 74, 57, 223, 242, 70, 130, 234, 165, 194, 152, 63, 144, 81, 223, 41]

architectures/decentralized/solana-coordinator/programs/solana-coordinator/src/lib.rs

@@ -29,7 +29,7 @@ use ts_rs::TS;
 
 pub use crate::instance_state::RunMetadata;
 
-declare_id!("HR8RN2TP9E9zsi2kjhvPbirJWA1R6L6ruf4xNNGpjU5Y");
+declare_id!("85sDrgwxZSKTuXh28rjUUdkBdKQoYSsw67j8hauiq4Xm");
 
 pub const SOLANA_MAX_NUM_PENDING_CLIENTS: usize = SOLANA_MAX_NUM_CLIENTS;
 

architectures/decentralized/solana-coordinator/target/deploy/psyche_solana_coordinator-keypair.json

@@ -1 +1 @@
-[252,0,151,112,226,72,111,48,53,164,217,219,148,181,182,221,30,194,108,107,85,66,193,59,48,103,234,83,198,43,22,202,243,233,81,242,169,6,28,67,34,77,89,164,7,220,33,110,247,29,109,237,215,212,247,134,160,42,48,195,27,19,101,115]
+[233, 47, 9, 253, 202, 44, 16, 222, 93, 154, 129, 220, 63, 149, 238, 14, 0, 218, 213, 151, 2, 186, 142, 156, 247, 225, 114, 184, 167, 124, 40, 126, 105, 64, 234, 227, 247, 154, 186, 102, 186, 152, 166, 71, 114, 203, 94, 106, 98, 190, 21, 203, 104, 88, 156, 192, 121, 146, 24, 141, 90, 163, 175, 52]

website/backend/src/coordinator.ts

@@ -1,14 +1,26 @@
-export type UniqueRunKey = `${string}-${string}` & { __uniqueRunKey: true }
+export type UniqueRunKey = `${string}-${string}-${string}` & { __uniqueRunKey: true }
 
-export function runKey(runId: string, index: number): UniqueRunKey {
-	return `${runId}-${index}` as UniqueRunKey
+export function runKey(programId: string, runId: string, index: number): UniqueRunKey {
+	return `${programId}-${runId}-${index}` as UniqueRunKey
 }
 
 export function getRunFromKey(
 	runKey: UniqueRunKey
-): [runId: string, index: number] {
-	const [runId, index] = splitAtLastInstance(runKey, '-')
-	return [runId, Number.parseInt(index, 10)]
+): [programId: string, runId: string, index: number] {
+	const parts = runKey.split('-')
+	if (parts.length < 3) {
+		// Backward compatibility: assume old format runId-index without programId
+		const [runId, index] = splitAtLastInstance(runKey, '-')
+		return ['', runId, Number.parseInt(index, 10)]
+	}
+	
+	// New format: programId-runId-index
+	// Handle case where runId might contain dashes by joining middle parts
+	const programId = parts[0]
+	const index = parts[parts.length - 1]
+	const runId = parts.slice(1, -1).join('-')
+	
+	return [programId, runId, Number.parseInt(index, 10)]
 }
 
 function splitAtLastInstance(text: string, splitAt: string): [string, string] {

website/backend/src/dataStore.ts

@@ -3,6 +3,7 @@ import { RunSummary, RunData, ContributionInfo, ChainTimestamp } from 'shared'
 import { PsycheMiningPoolAccount, WitnessMetadata } from './idlTypes.js'
 import EventEmitter from 'node:events'
 import { UniqueRunKey } from './coordinator.js'
+import { PublicKey } from '@solana/web3.js'
 
 export interface IndexedSignature {
 	signature: string
@@ -22,6 +23,8 @@ export interface ChainDataStore {
 
 export interface CoordinatorDataStore extends ChainDataStore {
 	eventEmitter: EventEmitter<{ update: [UniqueRunKey] }>
+	
+	readonly programId: PublicKey
 
 	createRun(
 		pubkey: string,

website/backend/src/dataStores/flatFileCoordinator.ts

@@ -192,7 +192,7 @@ export class FlatFileCoordinatorDataStore implements CoordinatorDataStore {
 		})
 
 		this.#runsMutatedSinceLastSync.add(
-			runKey(runId, runsAtThisAddress.length - 1)
+			runKey(this.#programId.toString(), runId, runsAtThisAddress.length - 1)
 		)
 	}
 
@@ -263,7 +263,7 @@ export class FlatFileCoordinatorDataStore implements CoordinatorDataStore {
 			})
 		}
 
-		this.#runsMutatedSinceLastSync.add(runKey(lastRun.runId, index))
+		this.#runsMutatedSinceLastSync.add(runKey(this.#programId.toString(), lastRun.runId, index))
 	}
 
 	setRunPaused(pubkey: string, paused: boolean, timestamp: ChainTimestamp) {
@@ -278,7 +278,7 @@ export class FlatFileCoordinatorDataStore implements CoordinatorDataStore {
 		lastRun.lastUpdated = timestamp
 		lastRun.pauseTimestamps.push([newPauseState, timestamp])
 
-		this.#runsMutatedSinceLastSync.add(runKey(lastRun.runId, index))
+		this.#runsMutatedSinceLastSync.add(runKey(this.#programId.toString(), lastRun.runId, index))
 	}
 
 	witnessRun(
@@ -427,8 +427,12 @@ export class FlatFileCoordinatorDataStore implements CoordinatorDataStore {
 		)
 	}
 
+	get programId(): PublicKey {
+		return this.#programId
+	}
+
 	getRunDataById(runId: string, index: number): RunData | null {
-		const cachedRun = this.#runCache.get(runKey(runId, index))
+		const cachedRun = this.#runCache.get(runKey(this.#programId.toString(), runId, index))
 		if (cachedRun) {
 			return cachedRun
 		}
@@ -580,7 +584,7 @@ export class FlatFileCoordinatorDataStore implements CoordinatorDataStore {
 				history,
 			},
 		}
-		this.#runCache.set(runKey(runId, index), runData)
+		this.#runCache.set(runKey(this.#programId.toString(), runId, index), runData)
 		return runData
 	}
 }

website/backend/src/index.ts

@@ -86,7 +86,7 @@ async function main() {
 	coordinator.dataStore.eventEmitter.addListener('update', (key) => {
 		const listeners = liveRunListeners.get(key)
 		if (listeners) {
-			const [runId, index] = getRunFromKey(key)
+			const [programId, runId, index] = getRunFromKey(key)
 			const runData = coordinator.dataStore.getRunDataById(runId, index)
 			if (!runData) {
 				console.warn(
@@ -262,7 +262,7 @@ async function main() {
 				return
 			}
 
-			const key = runKey(matchingRun.info.id, matchingRun.info.index)
+			const key = runKey(coordinator.dataStore.programId.toString(), matchingRun.info.id, matchingRun.info.index)
 			let listeners = liveRunListeners.get(key)
 			if (!listeners) {
 				listeners = new Set()