@intent-engine/cli 0.1.42 → 0.1.44

package/dist/src/migrate-commands.js

@@ -0,0 +1,127 @@
+import { createNoopSigner, getAddressDecoder } from "@solana/kit";
+import { boardTerms, buildMigrate, findConfigPda, INTENT_ENGINE_PROGRAM_ADDRESS, isConfigAccount, isCurrentAccount, migrationOf, storedVersion } from "@intent-engine/core";
+import { rentExemptFor, rentSysvar } from "@intent-engine/client";
+import { AUTHORITY_NEXT, previewed, unsignedFor } from "./admin-commands.js";
+import { transactionSigner } from "./ledger-keys.js";
+import { NOT_SENT } from "./flows.js";
+export const MIGRATE_BATCH = 8;
+const ADMIN_AT = 8;
+export const NOTHING_TO_MIGRATE = "nothing to migrate: every engine account is current or needs close-legacy";
+const adminOf = (data) => getAddressDecoder().decode(data, ADMIN_AT);
+async function listed(command, transport) {
+    if (command.address !== null) {
+        const view = await transport.getAccount(command.address);
+        if (view === null) {
+            throw new Error(`${command.address} does not exist`);
+        }
+        if (view.owner !== INTENT_ENGINE_PROGRAM_ADDRESS) {
+            throw new Error(`${command.address} is not an engine account; migrate rewrites only accounts the engine program owns`);
+        }
+        return [{ address: command.address, data: view.data, lamports: view.lamports }];
+    }
+    if (transport.engineAccounts === undefined) {
+        throw new Error("this connection cannot list program accounts; migrate them one by one with --address");
+    }
+    return transport.engineAccounts();
+}
+function unread(entry) {
+    const stored = storedVersion(entry.data);
+    return stored === null
+        ? `engine account of ${entry.data.length} bytes that matches no account type; close it with intent-engine close-legacy`
+        : `${stored.layout.name} account in a layout no program version wrote: version ${stored.version}, ${entry.data.length} bytes; close it with intent-engine close-legacy`;
+}
+const countBy = (names) => Object.fromEntries([...new Set(names)].sort().map((name) => [name, names.filter((n) => n === name).length]));
+const batchesOf = (items) => Array.from({ length: Math.ceil(items.length / MIGRATE_BATCH) }, (_, i) => items.slice(i * MIGRATE_BATCH, (i + 1) * MIGRATE_BATCH));
+const topUpFor = (rent, entry, from, to) => {
+    const newMin = rentExemptFor(rent, to);
+    const grown = entry.lamports + newMin - rentExemptFor(rent, from);
+    const floor = newMin + (boardTerms(entry.data)?.held ?? 0n);
+    const [target = floor] = [grown, floor].sort((a, b) => Number(b - a));
+    return target - entry.lamports;
+};
+const errorText = (error) => (error instanceof Error ? error.message : String(error));
+export async function migrate(command, runtime, transport) {
+    const payer = await transactionSigner(runtime, command.keypair);
+    const [config] = await findConfigPda();
+    const found = await listed(command, transport);
+    const current = found.filter((entry) => isCurrentAccount(entry.data));
+    const outdated = found.filter((entry) => !isCurrentAccount(entry.data));
+    const unmigrated = outdated.filter((entry) => migrationOf(entry.data) === null).map((entry) => ({ address: entry.address, reason: unread(entry) }));
+    const one = command.address === null ? null : (found[0] ?? null);
+    if (one !== null && current.length > 0) {
+        throw new Error(`${one.address} is a current ${storedVersion(one.data)?.layout.name ?? "engine"} account; there is nothing to migrate`);
+    }
+    if (one !== null && unmigrated.length > 0) {
+        throw new Error(`${one.address} cannot migrate: ${unread(one)}`);
+    }
+    const rent = await rentSysvar(transport);
+    const planned = outdated.flatMap((entry) => {
+        const migration = migrationOf(entry.data);
+        if (migration === null) {
+            return [];
+        }
+        const { layout, from } = migration;
+        const topUp = from.space < layout.space ? topUpFor(rent, entry, from.space, layout.space) : 0n;
+        const view = `${layout.name} account: version ${from.version}, ${from.space} bytes -> version ${layout.version}, ${layout.space} bytes`;
+        return [{ ...entry, name: layout.name, from: view, topUp }];
+    });
+    const configEntry = planned.find((entry) => isConfigAccount(entry.data));
+    const admin = configEntry === undefined ? null : adminOf(configEntry.data);
+    const byPayer = planned.filter((entry) => entry !== configEntry || admin === payer.address);
+    const proposal = admin === null || admin === payer.address
+        ? null
+        : await unsignedFor(transport, admin, [await buildMigrate({ payer: createNoopSigner(admin), account: config })]);
+    const instructions = await Promise.all(byPayer.map((entry) => buildMigrate({ payer, account: entry.address, ...(isConfigAccount(entry.data) ? {} : { config }) })));
+    const batches = batchesOf(instructions);
+    const topUp = byPayer.reduce((sum, entry) => sum + entry.topUp, 0n);
+    const configTopUp = configEntry?.topUp ?? 0n;
+    const adminTopUp = proposal === null ? 0n : configTopUp;
+    const counts = countBy(byPayer.map((entry) => entry.name));
+    const summary = [
+        one === null
+            ? `Migrates ${byPayer.length} outdated engine accounts in ${batches.length} transactions: ${Object.entries(counts).map(([name, n]) => `${n} ${name}`).join(", ") || "none"}`
+            : `Migrates ${one.address}, an outdated ${planned[0]?.from ?? "engine account"}`,
+        ...(topUp === 0n ? [] : [`Pays ${topUp} lamports of rent from ${payer.address} for the accounts that grow; no account loses lamports`]),
+        ...(one === null ? [`Skips ${current.length} accounts that are already current`] : []),
+        ...(unmigrated.length === 0 ? [] : [`Cannot migrate ${unmigrated.length} accounts of a layout no program version wrote; close them with intent-engine close-legacy`]),
+        ...(proposal === null
+            ? []
+            : [
+                `Only the admin ${admin} migrates the config: import config_proposal.transaction_base58 into the multisig as a proposal`,
+                ...(adminTopUp === 0n ? [] : [`The admin ${admin} pays ${adminTopUp} lamports of rent for the config and must hold them before the proposal executes`]),
+            ]),
+    ];
+    const shown = {
+        payer: payer.address,
+        migrate: counts,
+        current: current.length,
+        unmigrated,
+        top_up_lamports: topUp + adminTopUp,
+        ...(configEntry === undefined ? {} : { config: { address: configEntry.address, admin, top_up_lamports: configTopUp } }),
+        transactions: batches.length,
+        ...(proposal === null ? {} : { config_proposal: proposal }),
+        summary,
+    };
+    if (instructions.length === 0) {
+        return { ...shown, sent: false, next: proposal === null ? NOTHING_TO_MIGRATE : AUTHORITY_NEXT };
+    }
+    if (one !== null) {
+        return previewed(transport, instructions, payer, shown, command.yes);
+    }
+    if (!command.yes) {
+        return { ...shown, sent: false, next: NOT_SENT };
+    }
+    const signatures = [];
+    const failed = [];
+    for (const [at, batch] of batches.entries()) {
+        const accounts = byPayer.slice(at * MIGRATE_BATCH, at * MIGRATE_BATCH + batch.length).map((entry) => entry.address);
+        try {
+            signatures.push(await transport.send(batch, payer));
+        }
+        catch (error) {
+            failed.push({ accounts, error: errorText(error) });
+        }
+    }
+    return { ...shown, sent: true, signatures, failed };
+}
+//# sourceMappingURL=migrate-commands.js.map

package/dist/src/migrate-commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-commands.js","sourceRoot":"","sources":["../../src/migrate-commands.ts"],"names":[],"mappings":"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"}

package/dist/src/monitor-args.d.ts

@@ -5,7 +5,9 @@ export declare const MONITOR_INTERVAL = 30;
 export declare const MIN_MONITOR_INTERVAL = 5;
 export declare const MAX_MONITOR_INTERVAL = 3600;
 export declare const MAX_MONITOR_FILLS = 999;
+export declare const MAX_MONITOR_SINCE = 86400;
 export declare const MONITOR_NEEDS_BASELINE = "monitor needs --expect <baseline file>; write one first with monitor --write-baseline <file> after checking the current config and program are the ones you intend";
 export declare const BASELINE_ALONE = "--write-baseline writes the current values and exits, so it takes no other monitor option but --url";
+export declare const SINCE_NEEDS_ONCE = "--since sets how far back --once reads fills, so it needs --once";
 export declare const MAX_FILL_FORMAT = "--max-fill takes <mint>=<raw amount>, once per input mint";
 export declare function monitorOf(remote: Remote, values: Values): Command;

package/dist/src/monitor-args.js

@@ -5,8 +5,10 @@ export const MONITOR_INTERVAL = 30;
 export const MIN_MONITOR_INTERVAL = 5;
 export const MAX_MONITOR_INTERVAL = 3_600;
 export const MAX_MONITOR_FILLS = 999;
+export const MAX_MONITOR_SINCE = 86_400;
 export const MONITOR_NEEDS_BASELINE = "monitor needs --expect <baseline file>; write one first with monitor --write-baseline <file> after checking the current config and program are the ones you intend";
 export const BASELINE_ALONE = "--write-baseline writes the current values and exits, so it takes no other monitor option but --url";
+export const SINCE_NEEDS_ONCE = "--since sets how far back --once reads fills, so it needs --once";
 export const MAX_FILL_FORMAT = "--max-fill takes <mint>=<raw amount>, once per input mint";
 function maxFills(entries, url) {
     const limits = new Map();
@@ -28,7 +30,7 @@ function maxFills(entries, url) {
     return limits;
 }
 export function monitorOf(remote, values) {
-    const watching = [values.expect, values.interval, values["max-fill"], values["max-fills"], values.webhook, values.once];
+    const watching = [values.expect, values.interval, values["max-fill"], values["max-fills"], values.webhook, values.once, values.since];
     const write = values["write-baseline"];
     if (write !== undefined) {
         if (watching.some((v) => v !== undefined)) {
@@ -42,12 +44,17 @@ export function monitorOf(remote, values) {
     if (values.webhook !== undefined) {
         https(values.webhook, "webhook");
     }
+    if (values.since !== undefined && values.once !== true) {
+        throw new UsageError(SINCE_NEEDS_ONCE);
+    }
+    const interval = parseBounded(values.interval ?? String(MONITOR_INTERVAL), "interval", MAX_MONITOR_INTERVAL, MIN_MONITOR_INTERVAL);
     return {
         name: "monitor",
         ...remote,
         baseline: values.expect,
         watch: {
-            interval: parseBounded(values.interval ?? String(MONITOR_INTERVAL), "interval", MAX_MONITOR_INTERVAL, MIN_MONITOR_INTERVAL),
+            interval,
+            since: values.since === undefined ? interval : parseBounded(values.since, "since", MAX_MONITOR_SINCE, 1),
             maxFill: maxFills(values["max-fill"] ?? [], remote.url),
             maxFills: values["max-fills"] === undefined ? null : parseBounded(values["max-fills"], "max-fills", MAX_MONITOR_FILLS),
             webhook: values.webhook ?? null,

package/dist/src/monitor-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-args.js","sourceRoot":"","sources":["../../src/monitor-args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monitor-args.js","sourceRoot":"","sources":["../../src/monitor-args.ts"],"names":[],"mappings":"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"}

package/dist/src/monitor-fills.d.ts

@@ -8,6 +8,6 @@ export type SeenFill = {
 };
 export declare function fillsIn(transactions: readonly EngineTransaction[]): {
     fills: SeenFill[];
-    created: Map<Address, Address>;
+    known: Map<Address, Address>;
 };
-export declare function inputMintsOf(transport: Transport, fills: readonly SeenFill[], created: ReadonlyMap<Address, Address>): Promise<Map<Address, Address>>;
+export declare function inputMintsOf(transport: Transport, fills: readonly SeenFill[], known: ReadonlyMap<Address, Address>): Promise<Map<Address, Address>>;

package/dist/src/monitor-fills.js

@@ -2,7 +2,7 @@ import { decodeEvent, getIntentDecoder, INTENT_ENGINE_PROGRAM_ADDRESS } from "@i
 const PAID_IN_ONE_STEP = new Set(["IntentFilled", "IntentAttested", "IntentSplit"]);
 export function fillsIn(transactions) {
     const fills = [];
-    const created = new Map();
+    const known = new Map();
     for (const tx of transactions) {
         if (tx.failed) {
             continue;
@@ -15,7 +15,7 @@ export function fillsIn(transactions) {
             const fields = event.fields;
             const intent = fields["intent"];
             if (event.name === "IntentCreated") {
-                created.set(intent, fields["inputMint"]);
+                known.set(intent, fields["inputMint"]);
             }
             if (event.name === "FillBegun") {
                 begun.set(intent, fields["amountIn"]);
@@ -27,13 +27,17 @@ export function fillsIn(transactions) {
                     : undefined;
             if (amountIn !== undefined) {
                 fills.push({ signature: tx.signature, slot: tx.slot, intent, amountIn: amountIn ?? 0n });
+                const vault = tx.tokens?.find((held) => held.owner === intent);
+                if (vault !== undefined && !known.has(intent)) {
+                    known.set(intent, vault.mint);
+                }
             }
         }
     }
-    return { fills, created };
+    return { fills, known };
 }
-export async function inputMintsOf(transport, fills, created) {
-    const mints = new Map(created);
+export async function inputMintsOf(transport, fills, known) {
+    const mints = new Map(known);
     const unknown = [...new Set(fills.map((f) => f.intent).filter((intent) => !mints.has(intent)))];
     if (unknown.length === 0) {
         return mints;

package/dist/src/monitor-fills.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitor-fills.js","sourceRoot":"","sources":["../../src/monitor-fills.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monitor-fills.js","sourceRoot":"","sources":["../../src/monitor-fills.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAKnG,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC;AAEzG,MAAM,UAAU,OAAO,CAAC,YAA0C;IAChE,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC1C,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;QAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACd,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAChD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,SAAS;YACX,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAiC,CAAC;YACvD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAY,CAAC;YAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACnC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAY,CAAC,CAAC;YACpD,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC/B,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAW,CAAC,CAAC;YAClD,CAAC;YACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC/C,CAAC,CAAE,MAAM,CAAC,UAAU,CAAY;gBAChC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW;oBAC1B,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;oBAC7B,CAAC,CAAC,SAAS,CAAC;YAChB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,KAAK,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC;gBACzF,MAAM,KAAK,GAAG,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;gBAC/D,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC9C,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,SAAoB,EACpB,KAA0B,EAC1B,KAAoC;IAEpC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACnD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,6BAA6B,EAAE,CAAC;YACxF,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;QACpE,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/src/monitor-limits.d.ts

@@ -0,0 +1,25 @@
+import { type Config } from "@intent-engine/core";
+import type { EngineAccountFilter, Transport } from "@intent-engine/client";
+export declare const CAP_LIMITS: readonly ["maxPerOrder", "windowCap", "windowSecs", "totalLimit"];
+type CapLimit = (typeof CAP_LIMITS)[number];
+export type CapLimits = Record<CapLimit, string | number>;
+export type Floors = Record<string, string>;
+export type MintCaps = Record<string, CapLimits>;
+export declare const MINT_CAP_FILTER: EngineAccountFilter;
+export declare const NO_FLOOR = "0";
+export declare const CANNOT_LIST = "this connection cannot list program accounts, so the monitor cannot read every mint cap";
+export declare function floorsOf(config: Pick<Config, "floorMints" | "floorAmounts">): Floors;
+export declare function mintCapsOf(transport: Transport): Promise<MintCaps>;
+export declare function isFloors(v: unknown): v is Floors;
+export declare function isMintCaps(v: unknown): v is MintCaps;
+export type LimitChange = {
+    key: string;
+    kind: "committee-floor" | "mint-cap-limit";
+    field: string;
+    mint: string;
+    expected: unknown;
+    observed: unknown;
+};
+export declare function floorChanges(baseline: Floors, now: Floors): LimitChange[];
+export declare function capChanges(baseline: MintCaps, now: MintCaps, missing: string): LimitChange[];
+export {};

package/dist/src/monitor-limits.js

@@ -0,0 +1,58 @@
+import { committeeFloors, decodeMintCapData, getMintCapSize, isMintCapData, MINT_CAP_DISCRIMINATOR, } from "@intent-engine/core";
+export const CAP_LIMITS = ["maxPerOrder", "windowCap", "windowSecs", "totalLimit"];
+export const MINT_CAP_FILTER = { discriminator: MINT_CAP_DISCRIMINATOR, dataSize: getMintCapSize() };
+export const NO_FLOOR = "0";
+export const CANNOT_LIST = "this connection cannot list program accounts, so the monitor cannot read every mint cap";
+const sortedKeys = (record) => Object.fromEntries(Object.entries(record).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)));
+export function floorsOf(config) {
+    return sortedKeys(Object.fromEntries(committeeFloors(config).map(({ mint, floor }) => [mint, floor.toString()])));
+}
+export async function mintCapsOf(transport) {
+    if (transport.engineAccounts === undefined) {
+        throw new Error(CANNOT_LIST);
+    }
+    const caps = {};
+    for (const account of await transport.engineAccounts(MINT_CAP_FILTER)) {
+        if (!isMintCapData(account.data)) {
+            continue;
+        }
+        const cap = decodeMintCapData(account.data);
+        caps[cap.mint] = {
+            maxPerOrder: cap.maxPerOrder.toString(),
+            windowCap: cap.windowCap.toString(),
+            windowSecs: cap.windowSecs,
+            totalLimit: cap.totalLimit.toString(),
+        };
+    }
+    return sortedKeys(caps);
+}
+const ADDRESS = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
+const RAW = /^\d+$/;
+const isRecord = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+export function isFloors(v) {
+    return isRecord(v) && Object.entries(v).every(([mint, floor]) => ADDRESS.test(mint) && typeof floor === "string" && RAW.test(floor));
+}
+export function isMintCaps(v) {
+    return (isRecord(v) &&
+        Object.entries(v).every(([mint, cap]) => ADDRESS.test(mint) &&
+            isRecord(cap) &&
+            Object.keys(cap).length === CAP_LIMITS.length &&
+            CAP_LIMITS.every((field) => (field === "windowSecs" ? Number.isInteger(cap[field]) : typeof cap[field] === "string" && RAW.test(cap[field])))));
+}
+export function floorChanges(baseline, now) {
+    const mints = Object.keys(sortedKeys({ ...baseline, ...now }));
+    return mints.flatMap((mint) => {
+        const expected = baseline[mint] ?? NO_FLOOR;
+        const observed = now[mint] ?? NO_FLOOR;
+        return expected === observed ? [] : [{ key: `committeeFloor.${mint}`, kind: "committee-floor", field: "floor", mint, expected, observed }];
+    });
+}
+export function capChanges(baseline, now, missing) {
+    const mints = Object.keys(sortedKeys({ ...baseline, ...now }));
+    return mints.flatMap((mint) => CAP_LIMITS.flatMap((field) => {
+        const expected = baseline[mint]?.[field] ?? missing;
+        const observed = now[mint]?.[field] ?? missing;
+        return expected === observed ? [] : [{ key: `mintCapLimit.${mint}.${field}`, kind: "mint-cap-limit", field, mint, expected, observed }];
+    }));
+}
+//# sourceMappingURL=monitor-limits.js.map

package/dist/src/monitor-limits.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monitor-limits.js","sourceRoot":"","sources":["../../src/monitor-limits.ts"],"names":[],"mappings":"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"}

package/dist/src/monitor.d.ts

@@ -1,6 +1,7 @@
 import { type Address } from "@solana/kit";
 import { type Transport } from "@intent-engine/client";
 import type { MonitorSpec } from "./command-types.js";
+import { type Floors, type MintCaps } from "./monitor-limits.js";
 import type { Runtime } from "./runtime.js";
 export declare const LOADER: Address;
 export declare const PROGRAM_DATA_HEADER = 45;
@@ -13,16 +14,20 @@ type ConfigValues = Record<ConfigField, Value>;
 export type Baseline = {
     program: Address;
     config: ConfigValues;
+    committeeFloors: Floors;
+    mintCaps: MintCaps;
     upgradeAuthority: string;
     programHash: string;
 };
 export type Snapshot = {
     slot: bigint;
     config: ConfigValues | null;
+    committeeFloors: Floors | null;
+    mintCaps: MintCaps;
     upgradeAuthority: string | null;
     programHash: string | null;
 };
-export type AlertKind = "config" | "upgrade-authority" | "program-hash" | "fill-amount" | "fill-rate" | "rpc";
+export type AlertKind = "config" | "upgrade-authority" | "program-hash" | "fill-amount" | "fill-rate" | "mint-cap" | "committee-floor" | "mint-cap-limit" | "rpc";
 export type Alert = {
     kind: AlertKind;
     field: string;
@@ -53,6 +58,10 @@ export type MonitorState = {
     seen: Set<string> | null;
 };
 export declare const freshState: () => MonitorState;
+export declare function capStatus(mint: Address, cap: {
+    outstanding: bigint;
+    totalLimit: bigint;
+} | null): string;
 export declare function checkOnce(transport: Transport, baseline: Baseline, spec: MonitorSpec, state: MonitorState, now: bigint, url: string): Promise<Alert[]>;
 export declare const line: (alert: Alert) => string;
 export declare function monitor(url: string, file: string, spec: MonitorSpec, runtime: Runtime, transport: Transport, io: Io): Promise<number>;

package/dist/src/monitor.js

@@ -1,9 +1,10 @@
 import { createHash } from "node:crypto";
 import { getAddressDecoder } from "@solana/kit";
 import { findConfigPda, findProgramDataAddress, getConfigDecoder, getConfigDiscriminatorBytes, INTENT_ENGINE_PROGRAM_ADDRESS, } from "@intent-engine/core";
-import { CLOCK_SYSVAR } from "@intent-engine/client";
+import { CLOCK_SYSVAR, loadMintCap } from "@intent-engine/client";
 import { UsageError } from "./arg-values.js";
 import { fillsIn, inputMintsOf } from "./monitor-fills.js";
+import { capChanges, floorChanges, floorsOf, isFloors, isMintCaps, mintCapsOf } from "./monitor-limits.js";
 import { printableLines, redactUrl, render } from "./render.js";
 export const LOADER = "BPFLoaderUpgradeab1e11111111111111111111111";
 export const PROGRAM_DATA_HEADER = 45;
@@ -33,36 +34,38 @@ export const baselineExists = (file) => `${file} already exists; --write-baselin
 export const notABaseline = (file) => `--expect ${file} is not a monitor baseline; write one with monitor --write-baseline <file>`;
 export const otherProgram = (file, program) => `--expect ${file} is a baseline for program ${program}, not ${INTENT_ENGINE_PROGRAM_ADDRESS}; write a new one with monitor --write-baseline <file>`;
 const sameBytes = (a, b) => a.length === b.length && Array.from(a).every((x, i) => x === b[i]);
-function configValues(view) {
+function decodedConfig(view) {
     const discriminator = getConfigDiscriminatorBytes();
     if (view === null || view === undefined || view.owner !== INTENT_ENGINE_PROGRAM_ADDRESS || !sameBytes(view.data.subarray(0, discriminator.length), discriminator)) {
         return null;
     }
     try {
-        const c = getConfigDecoder().decode(view.data);
-        return {
-            admin: c.admin,
-            pendingAdmin: c.pendingAdmin,
-            guardian: c.guardian,
-            feeRecipient: c.feeRecipient,
-            feeBps: c.feeBps,
-            kindFeeMask: c.kindFeeMask,
-            kindFeeBps: [...c.kindFeeBps],
-            partnerCutBps: c.partnerCutBps,
-            crankBounty: c.crankBounty,
-            createFee: c.createFee,
-            enabledKinds: c.enabledKinds.toString(),
-            fillDisabledKinds: c.fillDisabledKinds.toString(),
-            paused: c.paused,
-            capsRequired: c.capsRequired,
-            version: c.version,
-            domain: [...c.domain],
-        };
+        return getConfigDecoder().decode(view.data);
     }
     catch {
         return null;
     }
 }
+function configValues(c) {
+    return {
+        admin: c.admin,
+        pendingAdmin: c.pendingAdmin,
+        guardian: c.guardian,
+        feeRecipient: c.feeRecipient,
+        feeBps: c.feeBps,
+        kindFeeMask: c.kindFeeMask,
+        kindFeeBps: [...c.kindFeeBps],
+        partnerCutBps: c.partnerCutBps,
+        crankBounty: c.crankBounty,
+        createFee: c.createFee,
+        enabledKinds: c.enabledKinds.toString(),
+        fillDisabledKinds: c.fillDisabledKinds.toString(),
+        paused: c.paused,
+        capsRequired: c.capsRequired,
+        version: c.version,
+        domain: [...c.domain],
+    };
+}
 export function executableHash(data) {
     let end = data.length;
     while (end > PROGRAM_DATA_HEADER && data[end - 1] === 0) {
@@ -92,13 +95,27 @@ export async function snapshot(transport) {
         throw new Error("the node returned no clock, so it cannot say which slot it has reached");
     }
     const slot = new DataView(clock.data.buffer, clock.data.byteOffset, clock.data.byteLength).getBigUint64(0, true);
-    return { slot, config: configValues(config), ...programState(program, data, programData) };
+    const decoded = decodedConfig(config);
+    return {
+        slot,
+        config: decoded === null ? null : configValues(decoded),
+        committeeFloors: decoded === null ? null : floorsOf(decoded),
+        mintCaps: await mintCapsOf(transport),
+        ...programState(program, data, programData),
+    };
 }
 export function baselineOf(now) {
-    if (now.config === null || now.upgradeAuthority === null || now.programHash === null) {
+    if (now.config === null || now.committeeFloors === null || now.upgradeAuthority === null || now.programHash === null) {
         throw new Error(`cannot write a baseline: the config or the upgradeable program ${INTENT_ENGINE_PROGRAM_ADDRESS} is missing on this cluster`);
     }
-    return { program: INTENT_ENGINE_PROGRAM_ADDRESS, config: now.config, upgradeAuthority: now.upgradeAuthority, programHash: now.programHash };
+    return {
+        program: INTENT_ENGINE_PROGRAM_ADDRESS,
+        config: now.config,
+        committeeFloors: now.committeeFloors,
+        mintCaps: now.mintCaps,
+        upgradeAuthority: now.upgradeAuthority,
+        programHash: now.programHash,
+    };
 }
 const isValue = (v) => typeof v === "string" || (typeof v === "number" && Number.isInteger(v)) || (Array.isArray(v) && v.every((x) => Number.isInteger(x)));
 export function parseBaseline(text, file) {
@@ -120,7 +137,9 @@ export function parseBaseline(text, file) {
         config === null ||
         typeof config !== "object" ||
         Object.keys(config).length !== CONFIG_FIELDS.length ||
-        !CONFIG_FIELDS.every((field) => isValue(config[field]))) {
+        !CONFIG_FIELDS.every((field) => isValue(config[field])) ||
+        !isFloors(b.committeeFloors) ||
+        !isMintCaps(b.mintCaps)) {
         throw new UsageError(notABaseline(file));
     }
     if (b.program !== INTENT_ENGINE_PROGRAM_ADDRESS) {
@@ -149,6 +168,26 @@ export async function readBaseline(file, runtime) {
 }
 const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
 export const freshState = () => ({ alerted: new Map(), lastSlot: null, stalledFor: 0, failing: false, seen: null });
+export function capStatus(mint, cap) {
+    if (cap === null) {
+        return `${mint} has no mint cap`;
+    }
+    const limit = cap.totalLimit === 0n ? "no total limit" : `a total limit of ${cap.totalLimit}`;
+    return `mint cap of ${mint}: ${cap.outstanding} raw units outstanding, ${limit}`;
+}
+async function capFindings(transport, spec, slot) {
+    const found = [];
+    for (const mint of spec.maxFill.keys()) {
+        const cap = (await loadMintCap(transport, mint))?.cap;
+        if (cap !== undefined && cap.totalLimit > 0n && cap.outstanding >= cap.totalLimit) {
+            found.push({
+                key: `mintCap.${mint}`,
+                alert: { kind: "mint-cap", field: mint, expected: `below ${cap.totalLimit}`, observed: cap.outstanding.toString(), slot: Number(slot) },
+            });
+        }
+    }
+    return found;
+}
 function differences(baseline, now) {
     const slot = Number(now.slot);
     const found = [];
@@ -165,12 +204,15 @@ function differences(baseline, now) {
             compare(`config.${field}`, "config", field, baseline.config[field], now.config[field]);
         }
     }
+    const limits = [...(now.committeeFloors === null ? [] : floorChanges(baseline.committeeFloors, now.committeeFloors)), ...capChanges(baseline.mintCaps, now.mintCaps, MISSING)];
+    for (const { key, kind, field, mint, expected, observed } of limits) {
+        found.push({ key, alert: { kind, field, expected, observed, slot, mint } });
+    }
     compare("upgradeAuthority", "upgrade-authority", "upgradeAuthority", baseline.upgradeAuthority, now.upgradeAuthority ?? MISSING);
     compare("programHash", "program-hash", "programHash", baseline.programHash, now.programHash ?? MISSING);
     return found;
 }
-function stateAlerts(baseline, now, state) {
-    const found = differences(baseline, now);
+function stateAlerts(found, state) {
     const keys = new Set(found.map((f) => f.key));
     for (const key of [...state.alerted.keys()]) {
         if (!keys.has(key)) {
@@ -209,10 +251,10 @@ async function fillAlerts(transport, spec, state, since) {
     const seen = state.seen;
     const fresh = fetched.filter((tx) => (seen === null ? tx.blockTime !== null && tx.blockTime >= since : !seen.has(tx.signature)));
     state.seen = new Set([...(seen ?? []), ...fetched.map((tx) => tx.signature)].slice(-limit * 4));
-    const { fills, created } = fillsIn(fresh);
+    const { fills, known } = fillsIn(fresh);
     const alerts = [];
     if (spec.maxFill.size > 0 && fills.length > 0) {
-        const mints = await inputMintsOf(transport, fills, created);
+        const mints = await inputMintsOf(transport, fills, known);
         for (const fill of fills) {
             const mint = mints.get(fill.intent);
             const cap = mint === undefined ? undefined : spec.maxFill.get(mint);
@@ -246,9 +288,9 @@ export async function checkOnce(transport, baseline, spec, state, now, url) {
     try {
         const current = await snapshot(transport);
         alerts = [
-            ...stateAlerts(baseline, current, state),
+            ...stateAlerts([...differences(baseline, current), ...(await capFindings(transport, spec, current.slot))], state),
             ...slotAlerts(current, state),
-            ...(await fillAlerts(transport, spec, state, now - BigInt(spec.interval))),
+            ...(await fillAlerts(transport, spec, state, now - BigInt(spec.since))),
         ];
     }
     catch (error) {
@@ -282,6 +324,14 @@ export async function monitor(url, file, spec, runtime, transport, io) {
     const state = freshState();
     io.err(`watching program ${INTENT_ENGINE_PROGRAM_ADDRESS} on ${redactUrl(url)} every ${spec.interval}s` +
         (spec.webhook === null ? "" : `; alerts also go to ${redactUrl(spec.webhook)}`));
+    for (const mint of spec.maxFill.keys()) {
+        try {
+            io.err(capStatus(mint, (await loadMintCap(transport, mint))?.cap ?? null));
+        }
+        catch (error) {
+            io.err(`the mint cap of ${mint} cannot be read: ${scrubbed(error instanceof Error ? error.message : String(error), url)}`);
+        }
+    }
     let raised = 0;
     for (;;) {
         for (const alert of await checkOnce(transport, baseline, spec, state, runtime.now(), url)) {