@intent-engine/cli 0.1.23 → 0.1.27

package/dist/src/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.23";
+export declare const VERSION = "0.1.27";

package/dist/src/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "0.1.23";
+export const VERSION = "0.1.27";
 //# sourceMappingURL=version.js.map

package/dist/src/viper.d.ts

@@ -0,0 +1,66 @@
+export declare const VIPER_WASM_SHA256 = "c039ca2a8d2eb26701ccd704e4b0d26bef9cefa13a90a951d51d776867de7c7d";
+export declare const VIPER_ENGINE_COMMIT = "d2bccdb8f77f78bddf07fad22ec76bfedbfbbf0f";
+export declare const CASES_FENCE = "judge-cases";
+export declare const DEFAULT_STEPS = 10000000;
+export declare const DEFAULT_HEAP: number;
+export declare const MAX_STEPS = 1000000000;
+export declare const MAX_HEAP: number;
+export declare const MAX_CASES = 10000;
+export declare const MAX_ARGUMENTS = 64;
+export declare const OUTPUT_BYTES: number;
+export declare const DIAGNOSTIC_BYTES: number;
+export declare const REPORTED_FAILURES = 20;
+export declare const CLOCK_FROM: number;
+export declare const CLOCK_TO: number;
+export declare const SEED_LIMIT: number;
+export type Primitive = null | boolean | number | string;
+export type Case = {
+    args: Primitive[];
+    expected: Primitive;
+};
+export type Cases = {
+    steps: number;
+    heap: number;
+    seed: number | undefined;
+    clock: number | undefined;
+    cases: Case[];
+};
+export type Run = {
+    seed: number;
+    clock: number;
+};
+export type CaseVerdict = "pass" | "wrong" | "not-primitive" | "threw" | "stopped" | "no-module" | "engine" | "crashed";
+export type CaseResult = {
+    verdict: CaseVerdict;
+    detail?: Primitive;
+};
+export type Failure = {
+    case: number;
+    verdict: CaseVerdict;
+    detail?: Primitive;
+};
+export type Judged = {
+    total: number;
+    passed: number;
+    failures: Failure[];
+    seed: number;
+    clock: number;
+};
+export declare const casesMissing: (count: number) => string;
+export declare function casesOf(spec: Uint8Array): Cases;
+export declare const runOf: (cases: Cases) => Run;
+export declare function encodeInput(source: string, cases: Cases, run: Run): Buffer;
+export declare function decodeOutput(bytes: Buffer, expected: number): CaseResult[];
+export declare function summarize(results: CaseResult[], run: Run): Judged;
+export declare function wasmPath(): string;
+export declare function pinnedWasm(path?: string): Promise<Buffer>;
+export declare const RUNNER = "\nconst chunks = [];\nfor await (const chunk of process.stdin) chunks.push(chunk);\nconst all = Buffer.concat(chunks);\nconst length = all.readUInt32LE(0);\nconst module = await WebAssembly.compile(all.subarray(4, 4 + length));\nif (WebAssembly.Module.imports(module).length !== 0) process.exit(3);\nconst { exports } = await WebAssembly.instantiate(module, {});\nconst input = all.subarray(4 + length);\nconst at = exports.input(input.length);\nnew Uint8Array(exports.memory.buffer, at, input.length).set(input);\nconst produced = exports.run();\nprocess.stdout.write(Buffer.from(new Uint8Array(exports.memory.buffer, exports.output(), produced)));\n";
+export declare const permissionFlag: () => string;
+export type Ran = {
+    output: Buffer;
+    exitCode: number | null;
+    timedOut: boolean;
+    diagnostic: string;
+};
+export declare function runViper(wasm: Buffer, input: Buffer, timeoutSeconds: number): Promise<Ran>;
+export declare function judgeViper(wasm: Buffer, source: Uint8Array, cases: Cases, timeoutSeconds: number): Promise<Judged>;

package/dist/src/viper.js

@@ -0,0 +1,282 @@
+import { spawn } from "node:child_process";
+import { createHash, randomInt } from "node:crypto";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+import { JudgeRefused } from "./judge-errors.js";
+export const VIPER_WASM_SHA256 = "c039ca2a8d2eb26701ccd704e4b0d26bef9cefa13a90a951d51d776867de7c7d";
+export const VIPER_ENGINE_COMMIT = "d2bccdb8f77f78bddf07fad22ec76bfedbfbbf0f";
+export const CASES_FENCE = "judge-cases";
+export const DEFAULT_STEPS = 10_000_000;
+export const DEFAULT_HEAP = 64 * 1024 * 1024;
+export const MAX_STEPS = 1_000_000_000;
+export const MAX_HEAP = 256 * 1024 * 1024;
+export const MAX_CASES = 10_000;
+export const MAX_ARGUMENTS = 64;
+export const OUTPUT_BYTES = 8 * 1024 * 1024;
+export const DIAGNOSTIC_BYTES = 64 * 1024;
+export const REPORTED_FAILURES = 20;
+export const CLOCK_FROM = Date.UTC(2020, 0, 1);
+export const CLOCK_TO = Date.UTC(2030, 0, 1);
+export const SEED_LIMIT = 2 ** 48;
+const VERDICTS = ["pass", "wrong", "not-primitive", "threw", "stopped", "no-module", "engine"];
+const WIRE_VERSION = 1;
+export const casesMissing = (count) => `--sandbox viper judges the cases in the spec, which must hold exactly one \`\`\`${CASES_FENCE} block of JSON; it holds ${count}`;
+const refuse = (why) => {
+    throw new JudgeRefused(`the spec's ${CASES_FENCE} block ${why}; nothing was run or paid`);
+};
+const isPrimitive = (value) => value === null || typeof value === "boolean" || typeof value === "string" || (typeof value === "number" && Number.isFinite(value));
+function bounded(value, name, fallback, max) {
+    if (value === undefined) {
+        return fallback;
+    }
+    if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0 || value > max) {
+        return refuse(`has ${name} ${JSON.stringify(value)}, which is not a whole number from 0 to ${max}`);
+    }
+    return value;
+}
+export function casesOf(spec) {
+    const text = new TextDecoder().decode(spec);
+    const blocks = [...text.matchAll(new RegExp(`^\`\`\`${CASES_FENCE}[ \\t]*\\r?\\n([\\s\\S]*?)^\`\`\`[ \\t]*$`, "gm"))];
+    if (blocks.length !== 1) {
+        throw new JudgeRefused(casesMissing(blocks.length));
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(blocks[0]?.[1] ?? "");
+    }
+    catch (error) {
+        return refuse(`is not JSON: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        return refuse("is not a JSON object");
+    }
+    const fields = parsed;
+    const unknown = Object.keys(fields).find((key) => !["steps", "heap", "seed", "clock", "cases"].includes(key));
+    if (unknown !== undefined) {
+        return refuse(`has a field ${JSON.stringify(unknown)} it does not know`);
+    }
+    const raw = fields["cases"];
+    if (!Array.isArray(raw) || raw.length === 0 || raw.length > MAX_CASES) {
+        return refuse(`must list from 1 to ${MAX_CASES} cases`);
+    }
+    const cases = raw.map((item, index) => {
+        const entry = typeof item === "object" && item !== null && !Array.isArray(item) ? item : undefined;
+        const args = entry?.["args"];
+        if (entry === undefined || Object.keys(entry).some((key) => key !== "args" && key !== "expected") || !("expected" in entry)) {
+            return refuse(`has case ${index}, which is not an object of args and expected`);
+        }
+        if (!Array.isArray(args) || args.length > MAX_ARGUMENTS || !args.every(isPrimitive)) {
+            return refuse(`has case ${index}, whose args are not a list of at most ${MAX_ARGUMENTS} JSON strings, numbers, booleans or nulls`);
+        }
+        if (!isPrimitive(entry["expected"])) {
+            return refuse(`has case ${index}, whose expected answer is not a JSON string, number, boolean or null`);
+        }
+        return { args, expected: entry["expected"] };
+    });
+    return {
+        steps: bounded(fields["steps"], "steps", DEFAULT_STEPS, MAX_STEPS),
+        heap: bounded(fields["heap"], "heap", DEFAULT_HEAP, MAX_HEAP),
+        seed: fields["seed"] === undefined ? undefined : bounded(fields["seed"], "seed", 1, Number.MAX_SAFE_INTEGER),
+        clock: fields["clock"] === undefined ? undefined : bounded(fields["clock"], "clock", 0, 8.64e15),
+        cases,
+    };
+}
+class Writer {
+    parts = [];
+    u32(n) {
+        const b = Buffer.alloc(4);
+        b.writeUInt32LE(n);
+        this.parts.push(b);
+        return this;
+    }
+    u64(n) {
+        const b = Buffer.alloc(8);
+        b.writeBigUInt64LE(BigInt(n));
+        this.parts.push(b);
+        return this;
+    }
+    f64(n) {
+        const b = Buffer.alloc(8);
+        b.writeDoubleLE(n);
+        this.parts.push(b);
+        return this;
+    }
+    string(text) {
+        const b = Buffer.from(text, "utf8");
+        this.u32(b.length);
+        this.parts.push(b);
+        return this;
+    }
+    byte(n) {
+        this.parts.push(Buffer.from([n]));
+        return this;
+    }
+    value(v) {
+        if (v === null)
+            return this.byte(1);
+        if (v === false)
+            return this.byte(2);
+        if (v === true)
+            return this.byte(3);
+        if (typeof v === "number")
+            return this.byte(4).f64(v);
+        return this.byte(5).string(v);
+    }
+    bytes() {
+        return Buffer.concat(this.parts);
+    }
+}
+export const runOf = (cases) => ({
+    seed: cases.seed ?? randomInt(1, SEED_LIMIT),
+    clock: cases.clock ?? randomInt(CLOCK_FROM, CLOCK_TO),
+});
+export function encodeInput(source, cases, run) {
+    const writer = new Writer().u32(WIRE_VERSION).u64(cases.steps).u64(cases.heap).u64(run.seed).f64(run.clock).string(source).u32(cases.cases.length);
+    for (const item of cases.cases) {
+        writer.u32(item.args.length);
+        item.args.forEach((arg) => writer.value(arg));
+        writer.value(item.expected);
+    }
+    return writer.bytes();
+}
+export function decodeOutput(bytes, expected) {
+    let at = 0;
+    const need = (count) => {
+        if (at + count > bytes.length)
+            throw new JudgeRefused("the viper judge answered a truncated verdict; nothing was paid");
+    };
+    const u8 = () => (need(1), bytes.readUInt8(at++));
+    const u32 = () => (need(4), (at += 4), bytes.readUInt32LE(at - 4));
+    const string = () => {
+        const length = u32();
+        need(length);
+        at += length;
+        return bytes.toString("utf8", at - length, at);
+    };
+    const value = () => {
+        const tag = u8();
+        if (tag === 4) {
+            need(8);
+            at += 8;
+            return bytes.readDoubleLE(at - 8);
+        }
+        if (tag === 5)
+            return string();
+        return [null, null, false, true][tag] ?? null;
+    };
+    if (u32() !== WIRE_VERSION || u8() !== 0) {
+        throw new JudgeRefused("the viper judge refused its own input; nothing was paid");
+    }
+    const count = u32();
+    if (count !== expected) {
+        throw new JudgeRefused(`the viper judge answered ${count} verdicts for ${expected} cases; nothing was paid`);
+    }
+    const results = [];
+    for (let n = 0; n < count; n += 1) {
+        const verdict = VERDICTS[u8()];
+        if (verdict === undefined)
+            throw new JudgeRefused("the viper judge answered a verdict it does not have; nothing was paid");
+        const detail = verdict === "wrong" ? value() : verdict === "threw" || verdict === "no-module" ? string() : undefined;
+        results.push(detail === undefined ? { verdict } : { verdict, detail });
+    }
+    if (at !== bytes.length) {
+        throw new JudgeRefused("the viper judge answered more than its verdicts; nothing was paid");
+    }
+    return results;
+}
+export function summarize(results, run) {
+    const failures = results.flatMap((result, index) => (result.verdict === "pass" ? [] : [{ case: index, ...result }]));
+    return { total: results.length, passed: results.length - failures.length, failures: failures.slice(0, REPORTED_FAILURES), ...run };
+}
+export function wasmPath() {
+    const candidates = ["../assets/viperjs-judge.wasm", "../../assets/viperjs-judge.wasm"].map((relative) => fileURLToPath(new URL(relative, import.meta.url)));
+    return candidates.find((path) => existsSync(path)) ?? candidates[0];
+}
+export async function pinnedWasm(path = wasmPath()) {
+    let bytes;
+    try {
+        bytes = await readFile(path);
+    }
+    catch {
+        throw new JudgeRefused(`the viper judge module ${path} is missing; reinstall the CLI. Nothing was run or paid`);
+    }
+    const sha256 = createHash("sha256").update(bytes).digest("hex");
+    if (sha256 !== VIPER_WASM_SHA256) {
+        throw new JudgeRefused(`the viper judge module ${path} has sha256 ${sha256}, not the pinned ${VIPER_WASM_SHA256}; nothing was run or paid`);
+    }
+    return bytes;
+}
+export const RUNNER = `
+const chunks = [];
+for await (const chunk of process.stdin) chunks.push(chunk);
+const all = Buffer.concat(chunks);
+const length = all.readUInt32LE(0);
+const module = await WebAssembly.compile(all.subarray(4, 4 + length));
+if (WebAssembly.Module.imports(module).length !== 0) process.exit(3);
+const { exports } = await WebAssembly.instantiate(module, {});
+const input = all.subarray(4 + length);
+const at = exports.input(input.length);
+new Uint8Array(exports.memory.buffer, at, input.length).set(input);
+const produced = exports.run();
+process.stdout.write(Buffer.from(new Uint8Array(exports.memory.buffer, exports.output(), produced)));
+`;
+export const permissionFlag = () => (process.allowedNodeEnvironmentFlags.has("--permission") ? "--permission" : "--experimental-permission");
+export function runViper(wasm, input, timeoutSeconds) {
+    return new Promise((done) => {
+        const child = spawn(process.execPath, [permissionFlag(), "--input-type=module", "-e", RUNNER], { env: {}, stdio: ["pipe", "pipe", "pipe"], windowsHide: true });
+        const out = [];
+        let outBytes = 0;
+        let diagnostic = "";
+        let timedOut = false;
+        let over = false;
+        const timer = setTimeout(() => {
+            timedOut = true;
+            child.kill("SIGKILL");
+        }, timeoutSeconds * 1000);
+        child.stdout.on("data", (chunk) => {
+            outBytes += chunk.length;
+            if (outBytes > OUTPUT_BYTES) {
+                over = true;
+                child.kill("SIGKILL");
+                return;
+            }
+            out.push(chunk);
+        });
+        child.stderr.on("data", (chunk) => {
+            if (diagnostic.length < DIAGNOSTIC_BYTES)
+                diagnostic += chunk.toString("utf8").slice(0, DIAGNOSTIC_BYTES - diagnostic.length);
+        });
+        child.stdin.on("error", () => undefined);
+        const length = Buffer.alloc(4);
+        length.writeUInt32LE(wasm.length);
+        child.stdin.end(Buffer.concat([length, wasm, input]));
+        child.once("error", (error) => {
+            clearTimeout(timer);
+            done({ output: Buffer.alloc(0), exitCode: null, timedOut, diagnostic: error.message });
+        });
+        child.once("close", (code) => {
+            clearTimeout(timer);
+            done({ output: over ? Buffer.alloc(0) : Buffer.concat(out), exitCode: over ? null : code, timedOut, diagnostic });
+        });
+    });
+}
+export async function judgeViper(wasm, source, cases, timeoutSeconds) {
+    let text;
+    try {
+        text = new TextDecoder("utf-8", { fatal: true }).decode(source);
+    }
+    catch {
+        throw new JudgeRefused("--artifact is not UTF-8 text, so it is not a module the viper judge can run; nothing was paid");
+    }
+    const run = runOf(cases);
+    const ran = await runViper(wasm, encodeInput(text, cases, run), timeoutSeconds);
+    if (ran.timedOut) {
+        return { total: cases.cases.length, passed: 0, failures: [{ case: 0, verdict: "stopped", detail: `the judge did not finish within ${timeoutSeconds} s` }], ...run };
+    }
+    if (ran.exitCode !== 0) {
+        return { total: cases.cases.length, passed: 0, failures: [{ case: 0, verdict: "crashed", detail: `the judge process ended with exit code ${ran.exitCode}: ${ran.diagnostic.trim().slice(0, 256)}` }], ...run };
+    }
+    return summarize(decodeOutput(ran.output, cases.cases.length), run);
+}
+//# sourceMappingURL=viper.js.map

package/dist/src/viper.js.map

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

package/dist/src/wallet.d.ts

@@ -17,7 +17,10 @@ export declare const FAUCET = "https://github.com/MerlijnW70/solive/issues/new?t
 export declare const FUNDED = "your wallet is ready; try offering 0.05 SOL for at least 5 TEST";
 export declare const AIRDROP_REFUSED = "the airdrop was refused; request devnet SOL for this address at https://github.com/MerlijnW70/solive/issues/new?template=faucet.yml or https://faucet.solana.com, then set up again";
 export declare const SEND_SOL = "send SOL to this address, then run setup again";
+export declare function expandHome(path: string, home: string): string;
 export declare function withSettings(files: Files, given: Env): Promise<Env>;
-export declare function setup(transport: Transport, files: Files, url: string, keypair: string | undefined): Promise<object>;
+export declare const savedDefault: (url: string) => string;
+export declare const keptDefault: (saved: string) => string;
+export declare function setup(transport: Transport, files: Files, url: string, keypair: string | undefined, keepSavedUrl?: boolean): Promise<object>;
 export declare function defaultMints(url: string): Address[];
 export declare function balances(transport: Transport, owner: Address, mints: readonly Address[]): Promise<object>;

package/dist/src/wallet.js

@@ -4,6 +4,7 @@ import { DEVNET_TEST_MINT, findAssociatedTokenAddress, formatAmount, NATIVE_MINT
 import { createdAccount, mintOf } from "@intent-engine/client";
 import { CLUSTERS, ENV_KEYPAIR, ENV_URL, UsageError } from "./args.js";
 import { SOL_DECIMALS } from "./agent/read.js";
+import { redactUrl } from "./render.js";
 import { DEVNET_URL } from "./tokens.js";
 export const LAMPORTS_PER_SOL = 1000000000n;
 const FUND_BELOW = LAMPORTS_PER_SOL / 2n;
@@ -17,6 +18,12 @@ export const FAUCET = `${PRODUCT_REPOSITORY}/issues/new?template=faucet.yml`;
 export const FUNDED = "your wallet is ready; try offering 0.05 SOL for at least 5 TEST";
 export const AIRDROP_REFUSED = `the airdrop was refused; request devnet SOL for this address at ${FAUCET} or ${PUBLIC_FAUCET}, then set up again`;
 export const SEND_SOL = "send SOL to this address, then run setup again";
+export function expandHome(path, home) {
+    if (path === "~") {
+        return home;
+    }
+    return /^~[\\/]/.test(path) ? `${home}${path.slice(1)}` : path;
+}
 const set = (value) => (value === "" ? undefined : value);
 export async function withSettings(files, given) {
     const env = { ...given, [ENV_URL]: set(given[ENV_URL]), [ENV_KEYPAIR]: set(given[ENV_KEYPAIR]) };
@@ -44,6 +51,7 @@ export async function withSettings(files, given) {
     const { url, keypair } = saved;
     return { ...env, [ENV_URL]: env[ENV_URL] ?? url, [ENV_KEYPAIR]: env[ENV_KEYPAIR] ?? keypair };
 }
+const alreadyExists = (error) => error !== null && typeof error === "object" && "code" in error && error.code === "EEXIST";
 async function walletAt(files, path) {
     try {
         await files.readText(path);
@@ -51,16 +59,27 @@ async function walletAt(files, path) {
     catch {
         const seed = crypto.getRandomValues(new Uint8Array(32));
         const signer = await createKeyPairSignerFromPrivateKeyBytes(seed);
-        await files.saveText(path, JSON.stringify([...seed, ...getAddressEncoder().encode(signer.address)]), true);
+        try {
+            await files.saveText(path, JSON.stringify([...seed, ...getAddressEncoder().encode(signer.address)]), true);
+        }
+        catch (error) {
+            if (!alreadyExists(error)) {
+                throw error;
+            }
+            return { signer: await files.loadSigner(path), created: false };
+        }
         return { signer: await files.loadSigner(path), created: true };
     }
     return { signer: await files.loadSigner(path), created: false };
 }
 const lamportsOf = async (transport, owner) => (await transport.getAccount(owner))?.lamports ?? 0n;
-export async function setup(transport, files, url, keypair) {
-    const path = keypair ?? defaultWallet(files.home);
+export const savedDefault = (url) => `saved ${redactUrl(url)} as the default RPC for later CLI commands`;
+export const keptDefault = (saved) => `left the saved default RPC ${redactUrl(saved)} unchanged`;
+export async function setup(transport, files, url, keypair, keepSavedUrl = false) {
+    const path = expandHome(keypair ?? defaultWallet(files.home), files.home);
     const { signer, created } = await walletAt(files, path);
-    await files.saveText(settingsPath(files.home), `${JSON.stringify({ url, keypair: path }, null, 2)}\n`, false);
+    const saved = keepSavedUrl ? (await withSettings(files, {}))[ENV_URL] : undefined;
+    await files.saveText(settingsPath(files.home), `${JSON.stringify({ url: saved ?? url, keypair: path }, null, 2)}\n`, false);
     let held = await lamportsOf(transport, signer.address);
     let next = FUNDED;
     if (held < FUND_BELOW) {
@@ -81,7 +100,8 @@ export async function setup(transport, files, url, keypair) {
         address: signer.address,
         keypair: path,
         created,
-        url,
+        url: redactUrl(url),
+        settings: saved === undefined ? savedDefault(url) : keptDefault(saved),
         sol: formatAmount(held, SOL_DECIMALS),
         next,
     };

package/dist/src/wallet.js.map

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

package/package.json

@@ -1,11 +1,22 @@
 {
   "name": "@intent-engine/cli",
-  "version": "0.1.23",
+  "version": "0.1.27",
   "description": "Command line and MCP server for the intent engine on Solana",
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MerlijnW70/solive.git",
+    "directory": "packages/cli"
+  },
+  "homepage": "https://github.com/MerlijnW70/solive#readme",
+  "bugs": {
+    "url": "https://github.com/MerlijnW70/solive/issues"
+  },
   "type": "module",
   "files": [
-    "dist/src"
+    "dist/src",
+    "assets/viperjs-judge.wasm",
+    "assets/viperjs-judge.sha256"
   ],
   "engines": {
     "node": ">=22.12.0"
@@ -21,9 +32,9 @@
     "@solana-program/system": "0.14.1",
     "@solana-program/token": "0.16.1",
     "@solana/kit": "8.4.0",
-    "@intent-engine/core": "0.1.23",
-    "@intent-engine/client": "0.1.23",
-    "@intent-engine/solver": "0.1.23"
+    "@intent-engine/client": "0.1.27",
+    "@intent-engine/core": "0.1.27",
+    "@intent-engine/solver": "0.1.27"
   },
   "devDependencies": {
     "@modelcontextprotocol/client": "2.3.1",
@@ -34,8 +45,8 @@
     "vitest": "5.0.3"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json",
+    "build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.build.json",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run --fsModuleCache"
+    "test": "vitest run --fsModuleCache --config ./vitest.setup.ts"
   }
 }

package/dist/src/events.d.ts

@@ -1,8 +0,0 @@
-export declare const EVENT_IX_TAG: Uint8Array<ArrayBuffer>;
-export declare const NOTABLE: Set<string>;
-export type DecodedEvent = {
-    name: string;
-    notable: boolean;
-    fields: object;
-};
-export declare function decodeEvent(data: Uint8Array): DecodedEvent | null;

package/dist/src/events.js

@@ -1,43 +0,0 @@
-import { IntentEngineEvent, identifyIntentEngineEvent, parseAdminAcceptedEvent, parseAdminProposedEvent, parseConfigInitializedEvent, parseConfigUpdatedEvent, parseFillBegunEvent, parseFillEndedEvent, parseIntentAttestedEvent, parseIntentCancelledEvent, parseIntentClosedEvent, parseIntentCreatedEvent, parseIntentExpiredEvent, parseIntentFilledEvent, parseNonceAdvancedEvent, parsePauseLoweredEvent, parsePauseRaisedEvent, parseUserInitializedEvent, } from "@intent-engine/core";
-export const EVENT_IX_TAG = new Uint8Array([0xe4, 0xa5, 0x45, 0xea, 0x51, 0xcb, 0x9a, 0x1d]);
-const PARSERS = {
-    AdminAccepted: parseAdminAcceptedEvent,
-    AdminProposed: parseAdminProposedEvent,
-    ConfigInitialized: parseConfigInitializedEvent,
-    ConfigUpdated: parseConfigUpdatedEvent,
-    FillBegun: parseFillBegunEvent,
-    FillEnded: parseFillEndedEvent,
-    IntentAttested: parseIntentAttestedEvent,
-    IntentCancelled: parseIntentCancelledEvent,
-    IntentClosed: parseIntentClosedEvent,
-    IntentCreated: parseIntentCreatedEvent,
-    IntentExpired: parseIntentExpiredEvent,
-    IntentFilled: parseIntentFilledEvent,
-    NonceAdvanced: parseNonceAdvancedEvent,
-    PauseLowered: parsePauseLoweredEvent,
-    PauseRaised: parsePauseRaisedEvent,
-    UserInitialized: parseUserInitializedEvent,
-};
-export const NOTABLE = new Set([
-    "AdminAccepted",
-    "AdminProposed",
-    "ConfigInitialized",
-    "ConfigUpdated",
-    "PauseLowered",
-    "PauseRaised",
-]);
-export function decodeEvent(data) {
-    if (data.length < EVENT_IX_TAG.length || !EVENT_IX_TAG.every((b, i) => data[i] === b)) {
-        return null;
-    }
-    const body = data.subarray(EVENT_IX_TAG.length);
-    let name;
-    try {
-        name = IntentEngineEvent[identifyIntentEngineEvent(body)];
-    }
-    catch {
-        return null;
-    }
-    return { name, notable: NOTABLE.has(name), fields: PARSERS[name](body) };
-}
-//# sourceMappingURL=events.js.map

package/dist/src/events.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,uBAAuB,EACvB,uBAAuB,EACvB,2BAA2B,EAC3B,uBAAuB,EACvB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAE7B,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAI7F,MAAM,OAAO,GAAoD;IAC/D,aAAa,EAAE,uBAAuB;IACtC,aAAa,EAAE,uBAAuB;IACtC,iBAAiB,EAAE,2BAA2B;IAC9C,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,mBAAmB;IAC9B,SAAS,EAAE,mBAAmB;IAC9B,cAAc,EAAE,wBAAwB;IACxC,eAAe,EAAE,yBAAyB;IAC1C,YAAY,EAAE,sBAAsB;IACpC,aAAa,EAAE,uBAAuB;IACtC,aAAa,EAAE,uBAAuB;IACtC,YAAY,EAAE,sBAAsB;IACpC,aAAa,EAAE,uBAAuB;IACtC,YAAY,EAAE,sBAAsB;IACpC,WAAW,EAAE,qBAAqB;IAClC,eAAe,EAAE,yBAAyB;CAC3C,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;IAC7B,eAAe;IACf,eAAe;IACf,mBAAmB;IACnB,eAAe;IACf,cAAc;IACd,aAAa;CACd,CAAC,CAAC;AAIH,MAAM,UAAU,WAAW,CAAC,IAAgB;IAC1C,IAAI,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACtF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,IAAe,CAAC;IACpB,IAAI,CAAC;QACH,IAAI,GAAG,iBAAiB,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;AAC3E,CAAC"}