support internal transactions (#437)

Author: arilotter

nix/nixosModules.nix

@@ -220,7 +220,10 @@
       };
       nixosConfigurations."psyche-http-mainnet" = persistentPsycheWebsite {
         configName = "psyche-http-mainnet";
-        hostnames = [ "mainnet-preview.psyche.network" ];
+        hostnames = [
+          "mainnet-preview.psyche.network"
+          "psyche.network"
+        ];
         backendSecret = ../secrets/mainnet/backend.age;
         miningPoolRpc = mainnetFrontendRpc;
         coordinatorCluster = "devnet";

website/backend/src/chainLoop.ts

@@ -104,7 +104,12 @@ export function startWatchChainLoop<D>(): <
 						if (cancelled.cancelled) {
 							return
 						}
-						const instr = tx.transaction.message.instructions
+						const instr = [
+							...tx.transaction.message.instructions,
+							...(data[1].meta?.innerInstructions?.flatMap(
+								(i) => i.instructions
+							) ?? []),
+						]
 						for (const i of instr) {
 							// instructions without a payload aren't useful to us.
 							if (!('data' in i)) {
@@ -120,6 +125,9 @@ export function startWatchChainLoop<D>(): <
 								)
 							}
 							if (!rawDecoded) {
+								console.warn(
+									`No data for instruction with data${i.data}. Skipping.`
+								)
 								continue
 							}
 							try {
@@ -154,7 +162,8 @@ export function startWatchChainLoop<D>(): <
 				}
 			} catch (err) {
 				console.error(
-					`[${name}] chain loop encountered an error, restarting: ${err}`
+					`[${name}] chain loop encountered an error, restarting,`,
+					err
 				)
 				onError(err)
 			} finally {

website/backend/src/coordinatorChainLoop.ts

@@ -363,8 +363,19 @@ export async function startWatchCoordinatorChainLoop(
 					}
 				}
 			},
+
 			async onDoneCatchup(store, runUpdates) {
-				const allRuns = [...runUpdates.getRuns()]
+				const allRuns = [...runUpdates.getRuns()].filter((run) => {
+					// known broken addrs
+					if (
+						run[0] === '5rHDPfLLYNxKDh86GYtx6nF94WAS2uvHp4zp7WUqsBSg' ||
+						run[0] === 'Gewx2auE9MBxNkbDevDSPBdDjDekNhhoyYyYaxEfM2gy' ||
+						run[0] === 'GWBFVhEi1nCp2J2E7paukFMZ9PE1hAa9dQcvZSeQoKAj'
+					) {
+						return false
+					}
+					return true
+				})
 				if (allRuns.length === 0) {
 					return
 				}

website/backend/src/dataStores/flatFileCoordinator.ts

@@ -38,6 +38,7 @@ const ALLOWLISTED_RUN_IDS =
 				'hermes-4-8b',
 				'hermes-4-8b-2',
 				'dm-fwedu-baseline',
+				'dm-fwedu-baseline-2',
 				'dm-dclm-baseline',
 				'dm-fwedu-dclm',
 				'dm-fwedu-dclm-fpdf',

website/backend/src/rateLimit.ts

@@ -90,6 +90,7 @@ export function makeRetryPromise<T extends (...args: any[]) => Promise<any>>(
 			try {
 				return await fn(...args)
 			} catch (err) {
+				console.warn(err)
 				if (attempts >= maxRetries) {
 					throw err
 				}

website/frontend/src/components/RunSummary.tsx

@@ -125,7 +125,7 @@ export const RunSummaryCard = memo(function RunSummaryCard({
 						pausedAt={new Date(0)}
 					/>
 				)}
-				<span>tokens trained</span>
+				<span>&nbsp;tokens trained</span>
 			</div>
 		</ShadowCard>
 	)