@effectstream/sm 0.103.3 → 0.104.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectstream/sm",
-  "version": "0.103.3",
+  "version": "0.104.1",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://effectstream.github.io/docs/",
   "repository": {
@@ -17,14 +17,15 @@
     "./grammar": "./primitives/src/grammar.ts"
   },
   "dependencies": {
-    "@effectstream/concise": "0.103.3",
-    "@effectstream/config": "0.103.3",
-    "@effectstream/coroutine": "0.103.3",
-    "@effectstream/crypto": "0.103.3",
-    "@effectstream/db": "0.103.3",
-    "@effectstream/event-client": "0.103.3",
-    "@effectstream/log": "0.103.3",
-    "@effectstream/utils": "0.103.3",
+    "@effectstream/concise": "0.104.1",
+    "@effectstream/config": "0.104.1",
+    "@effectstream/coroutine": "0.104.1",
+    "@effectstream/crypto": "0.104.1",
+    "@effectstream/db": "0.104.1",
+    "@effectstream/event-client": "0.104.1",
+    "@effectstream/log": "0.104.1",
+    "@effectstream/utils": "0.104.1",
+    "@noble/hashes": "^2.2.0",
     "pg": "8.21.0",
     "pg-tx": "^1.0.1",
     "@sinclair/typebox": "0.34.41",

package/primitives/src/avail-generic/avail-primitive.ts

@@ -1,4 +1,5 @@
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import type { StaticDecode } from "@sinclair/typebox";
 import { type CommandTuple, generateRawStmInput } from "@effectstream/concise";
 import type {

package/primitives/src/bitcoin-address/bitcoin-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   type ParamToData,
@@ -110,4 +111,3 @@ export class BitcoinAddressPrimitive extends Primitive<
     } as const;
   }
 }
-

package/primitives/src/cardano-delayed-asset/delayed-asset-primitive.ts

@@ -35,7 +35,8 @@ import type {
   UtxorpcTxPredicate,
 } from "@effectstream/config";
 import type { StateUpdateStream } from "@effectstream/coroutine";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/cardano-mint-burn/mint-burn-primitive.ts

@@ -29,7 +29,8 @@ import type {
   UtxorpcTxPredicate,
 } from "@effectstream/config";
 import type { StateUpdateStream } from "@effectstream/coroutine";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/cardano-pool-delegation/pool-delegation-primitive.ts

@@ -32,7 +32,8 @@ import type {
   ProtocolPrimitiveMap,
 } from "@effectstream/config";
 import type { StateUpdateStream } from "@effectstream/coroutine";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/cardano-projected-nft/projected-nft-primitive.ts

@@ -43,7 +43,8 @@ import type {
   ProtocolPrimitiveMap,
 } from "@effectstream/config";
 import type { StateUpdateStream } from "@effectstream/coroutine";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/cardano-transfer/transfer-grammar.ts

@@ -3,6 +3,21 @@ import { Type } from "@sinclair/typebox";
 export const transferGrammar = [
   ["txId", Type.String()],
   ["metadata", Type.String()],
-  ["inputCredentials", Type.String()],
+  [
+    "inputCredentials",
+    Type.String({
+      deprecated: true,
+      description:
+        "Deprecated: JSON array of raw verification keys. Use signerKeyHashes.",
+    }),
+  ],
   ["outputs", Type.String()],
+  // The default lets state machines parse historical four-field tuples.
+  [
+    "signerKeyHashes",
+    Type.String({
+      default: "[]",
+      description: "JSON array of Cardano verification key hashes.",
+    }),
+  ],
 ] as const;

package/primitives/src/cardano-transfer/transfer-primitive.test.ts

@@ -0,0 +1,106 @@
+import { expect, test } from "bun:test";
+import { parseRawStmInput, toKeyedJsonGrammar } from "@effectstream/concise";
+import { CardanoTransferPrimitive } from "../mod.ts";
+import { PrimitiveRegistry } from "../../PrimitiveRegistry.ts";
+import { transferGrammar } from "./transfer-grammar.ts";
+
+const VERIFICATION_KEY = Uint8Array.from({ length: 32 }, (_, index) => index);
+const VERIFICATION_KEY_HEX =
+  "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f";
+const CREDENTIAL_HASH =
+  "491112dd01155c07dab485f71b572e0cae759e2cd38b1c0e97554297";
+
+function makePrimitive(stateMachinePrefix?: string) {
+  PrimitiveRegistry.primitives = {};
+  return new CardanoTransferPrimitive({
+    instanceName: "CardanoTransfer",
+    startBlockHeight: 0,
+    stateMachinePrefix,
+    predicate: { match: { cardano: {} } },
+  } as any);
+}
+
+function payloadFor(
+  vkeys: Uint8Array[] | undefined,
+  stateMachinePrefix?: string,
+) {
+  const witnesses =
+    vkeys === undefined
+      ? undefined
+      : { vkeywitness: vkeys.map((vkey) => ({ vkey })) };
+  const tx = {
+    hash: new Uint8Array(32),
+    outputs: [],
+    witnesses,
+  };
+  const iterator = makePrimitive(stateMachinePrefix).getPayload(
+    0 as any,
+    {
+      output: { payload: { tx } },
+    } as any,
+  );
+  const result = iterator.next().value as any;
+  return result.data[0];
+}
+
+test("keeps deprecated inputCredentials as raw verification keys", () => {
+  const { accountingPayload } = payloadFor([VERIFICATION_KEY]);
+
+  expect(accountingPayload.inputCredentials).toEqual([VERIFICATION_KEY_HEX]);
+  expect(accountingPayload.inputCredentials[0]).toMatch(/^[0-9a-f]{64}$/);
+});
+
+test("emits Cardano credential hashes as signerKeyHashes", () => {
+  const { accountingPayload } = payloadFor([VERIFICATION_KEY]);
+
+  expect(accountingPayload.signerKeyHashes).toEqual([CREDENTIAL_HASH]);
+  expect(accountingPayload.signerKeyHashes[0]).toMatch(/^[0-9a-f]{56}$/);
+});
+
+test("deduplicates legacy keys and signer hashes in first-seen order", () => {
+  const secondVkey = new Uint8Array(32).fill(0xff);
+  const { accountingPayload } = payloadFor([
+    VERIFICATION_KEY,
+    secondVkey,
+    VERIFICATION_KEY,
+  ]);
+
+  expect(accountingPayload.inputCredentials).toHaveLength(2);
+  expect(accountingPayload.inputCredentials[0]).toBe(VERIFICATION_KEY_HEX);
+  expect(accountingPayload.signerKeyHashes).toHaveLength(2);
+  expect(accountingPayload.signerKeyHashes[0]).toBe(CREDENTIAL_HASH);
+  expect(accountingPayload.signerKeyHashes[1]).toMatch(/^[0-9a-f]{56}$/);
+});
+
+test("emits empty legacy and signer lists when witnesses are absent", () => {
+  const { accountingPayload } = payloadFor(undefined);
+
+  expect(accountingPayload.inputCredentials).toEqual([]);
+  expect(accountingPayload.signerKeyHashes).toEqual([]);
+});
+
+test("appends signerKeyHashes without shifting legacy STM fields", () => {
+  const { stateMachinePayload } = payloadFor(
+    [VERIFICATION_KEY],
+    "cardano-transfer",
+  );
+
+  expect(stateMachinePayload.slice(3, 5)).toEqual([
+    JSON.stringify([VERIFICATION_KEY_HEX]),
+    "[]",
+  ]);
+  expect(JSON.parse(stateMachinePayload[5])).toEqual([CREDENTIAL_HASH]);
+});
+
+test("defaults signerKeyHashes when parsing historical STM tuples", () => {
+  const grammar = { "cardano-transfer": transferGrammar } as const;
+  const parsed = parseRawStmInput(
+    ["cardano-transfer", "tx-id", "", "[]", "[]"],
+    grammar,
+    toKeyedJsonGrammar(grammar),
+  );
+
+  expect(parsed.data.inputCredentials).toBe("[]");
+  expect(parsed.data.outputs).toBe("[]");
+  expect(parsed.data.signerKeyHashes).toBe("[]");
+});

package/primitives/src/cardano-transfer/transfer-primitive.ts

@@ -10,8 +10,10 @@
  * Extraction: for each matched transaction, `getPayload()` maps `tx.outputs` into
  * structured objects with `{index, address, coin, assets[]}`. Coin values are extracted
  * from the protobuf BigInt (either `int` for small values or `bigUInt` for large).
- * Input credentials are extracted from `tx.witnesses.vkeywitness[].vkey` — these are
- * the public key hashes that signed the transaction, identifying who authorized the spend.
+ * `inputCredentials` retains the raw `tx.witnesses.vkeywitness[].vkey` values for
+ * backward compatibility, but is deprecated because those values are not credentials.
+ * `signerKeyHashes` hashes each verification key with BLAKE2b-224, yielding the
+ * Cardano key hashes that identify who authorized the transaction.
  * Transaction metadata is extracted from `tx.auxiliary.metadata`.
  *
  * Predicate: user-provided (typically `has_address` to watch specific addresses).
@@ -29,7 +31,8 @@ import type {
   UtxorpcTxPredicate,
 } from "@effectstream/config";
 import type { StateUpdateStream } from "@effectstream/coroutine";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type AddressAndType,
   AddressType,
@@ -42,6 +45,7 @@ import {
   addressToHex,
   assetQuantityToString,
   metadataToJson,
+  verificationKeyToCredentialHex,
 } from "../cardano-utils/cardano-helpers.ts";
 
 export class CardanoTransferPrimitive extends Primitive<
@@ -111,10 +115,18 @@ export class CardanoTransferPrimitive extends Primitive<
     });
 
     const inputCredentials: string[] = [];
+    const signerKeyHashes: string[] = [];
     if (tx.witnesses) {
       for (const w of tx.witnesses.vkeywitness) {
-        const hash = uint8ArrayToHexString(w.vkey);
-        if (!inputCredentials.includes(hash)) inputCredentials.push(hash);
+        const verificationKey = uint8ArrayToHexString(w.vkey);
+        if (!inputCredentials.includes(verificationKey)) {
+          inputCredentials.push(verificationKey);
+        }
+
+        const signerKeyHash = verificationKeyToCredentialHex(w.vkey);
+        if (!signerKeyHashes.includes(signerKeyHash)) {
+          signerKeyHashes.push(signerKeyHash);
+        }
       }
     }
 
@@ -125,6 +137,7 @@ export class CardanoTransferPrimitive extends Primitive<
       metadata: metadata ? JSON.stringify(metadata) : null,
       inputCredentials,
       outputs,
+      signerKeyHashes,
     };
 
     const stateMachinePayload: any = this.stateMachinePrefix
@@ -133,6 +146,7 @@ export class CardanoTransferPrimitive extends Primitive<
           metadata: metadata ? JSON.stringify(metadata) : "",
           inputCredentials: JSON.stringify(inputCredentials),
           outputs: JSON.stringify(outputs),
+          signerKeyHashes: JSON.stringify(signerKeyHashes),
         })
       : null;
 

package/primitives/src/cardano-utils/cardano-helpers.ts

@@ -1,3 +1,4 @@
+import { blake2b } from "@noble/hashes/blake2.js";
 import { uint8ArrayToHexString } from "@effectstream/utils";
 import type { cardano } from "@utxorpc/spec";
 
@@ -31,6 +32,10 @@ export function addressToHex(address: Uint8Array): string {
   return uint8ArrayToHexString(address);
 }
 
+export function verificationKeyToCredentialHex(vkey: Uint8Array): string {
+  return uint8ArrayToHexString(blake2b(vkey, { dkLen: 28 }));
+}
+
 export function metadataToJson(metadata: cardano.Metadata[]): Record<string, unknown> | null {
   if (!metadata || metadata.length === 0) return null;
   const result: Record<string, unknown> = {};

package/primitives/src/celestia-generic/celestia-primitive.ts

@@ -1,4 +1,5 @@
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import type { StaticDecode } from "@sinclair/typebox";
 import { type CommandTuple, generateRawStmInput } from "@effectstream/concise";
 import type {

package/primitives/src/evm-effectstream-l2/effectstream-l2-primitive.ts

@@ -38,12 +38,13 @@ import {
   account_createAccount,
   account_linkAddress,
   account_unlinkAddress,
-} from "@effectstream/sm";
+} from "../../../delegate-wallet.ts";
 import { BuiltinGrammarPrefix } from "@effectstream/concise";
 
 import { effectstreamL2 } from "./effectstream-l2-abi.ts";
 import { type StaticDecode, type TSchema, Type } from "@sinclair/typebox";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import { Value } from "@sinclair/typebox/value";
 import type { CommandTuple } from "@effectstream/concise";
 import { PrimitiveTypeEVMEffectstreamL2 } from "../builtin.ts";

package/primitives/src/evm-erc1155/erc1155-primitive.ts

@@ -13,7 +13,8 @@ import {
   type EffectstreamBlockNumber,
   TypeboxHelpers,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/evm-erc20/erc20-primitive.ts

@@ -12,7 +12,8 @@ import {
   type EffectstreamBlockNumber,
   TypeboxHelpers,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import { Value } from "@sinclair/typebox/value";
 import {
   type CommandTuple,

package/primitives/src/evm-erc721/erc721-primitive.ts

@@ -13,7 +13,8 @@ import {
   type EffectstreamBlockNumber,
   TypeboxHelpers,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/evm-generic/evm-generic-primitive.ts

@@ -12,7 +12,8 @@ import {
   type EffectstreamBlockNumber,
   TypeboxHelpers,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import { Value } from "@sinclair/typebox/value";
 import {
   type CommandTuple,

package/primitives/src/midnight-generic/midnight-generic.test.ts

@@ -0,0 +1,93 @@
+import { describe, expect, test } from "bun:test";
+import type { StateValue } from "@effectstream/config";
+import { MidnightGenericPrimitive } from "./midnight-genetic.ts";
+
+function cell(...bytes: number[]): StateValue {
+  return {
+    type: () => "cell",
+    asCell: () => ({ value: [Uint8Array.from(bytes)] }),
+  } as unknown as StateValue;
+}
+
+function array(...values: StateValue[]): StateValue {
+  return {
+    type: () => "array",
+    asArray: () => values,
+  } as unknown as StateValue;
+}
+
+function nullValue(): StateValue {
+  return { type: () => "null" } as unknown as StateValue;
+}
+
+function map(entries: [number[], StateValue][]): StateValue {
+  const value = new Map(
+    entries.map(([key, item]) => [
+      { value: [Uint8Array.from(key)] },
+      item,
+    ]),
+  );
+  return {
+    type: () => "map",
+    asMap: () => value,
+  } as unknown as StateValue;
+}
+
+function primitive(name: string, ledgerSchema?: Record<string, any>) {
+  return new MidnightGenericPrimitive({
+    instanceName: name,
+    startBlockHeight: 1,
+    contractAddress: "0".repeat(64) as any,
+    stateMachinePrefix: name,
+    ledgerSchema,
+  });
+}
+
+describe("MidnightGenericPrimitive ledger schema", () => {
+  test("decodes simple, optional, and map fields in declaration order", () => {
+    const decoder = primitive("schema-values", {
+      round: "uint128",
+      bytes: "bytes",
+      enabled: "boolean",
+      missing: { type: "option", value: "uint64" },
+      entries: { type: "map", value: "uint16" },
+    });
+
+    expect(decoder.parseAdditionalLedgerFields(array(
+      cell(0x01, 0x02),
+      cell(0xab, 0xcd),
+      cell(0x01),
+      nullValue(),
+      map([[[0x0a], cell(0x03)]]),
+    ))).toEqual({
+      round: "513",
+      bytes: "0xabcd",
+      enabled: true,
+      missing: null,
+      entries: { "0x0a": "3" },
+    });
+  });
+
+  test("requires either generated contract code or a non-empty schema", () => {
+    expect(() => primitive("missing-decoder")).toThrow(/requires either/);
+    expect(() => primitive("empty-schema", {})).toThrow(/empty ledger schema/);
+  });
+
+  test("reports declaration-order and field-type mismatches", () => {
+    const decoder = primitive("schema-order", {
+      entries: { type: "map", value: "uint16" },
+      round: "uint128",
+    });
+    expect(() => decoder.parseAdditionalLedgerFields(array(
+      cell(0x01),
+      map([]),
+    ))).toThrow(/field "entries" expects a map/);
+  });
+
+  test("rejects an incompatible ledger root", () => {
+    const decoder = primitive("schema-root", { round: "uint128" });
+    expect(() => decoder.parseAdditionalLedgerFields(cell(0x01))).toThrow(
+      /Ledger root must be an array/,
+    );
+  });
+});

package/primitives/src/midnight-generic/midnight-genetic.ts

@@ -1,4 +1,4 @@
-import { Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
 import {
   type AddressAndType,
   AddressType,
@@ -33,7 +33,7 @@ export class MidnightGenericPrimitive extends Primitive<
   readonly internalTypeName = PrimitiveTypeMidnightGeneric;
   override readonly grammar = midnightGenericGrammar;
   readonly contractAddress: string;
-  readonly contract: {
+  readonly contract?: {
     ledger: (data: StateValue) => any;
   };
   readonly ledgerSchema?: LedgerSchema;
@@ -53,7 +53,7 @@ export class MidnightGenericPrimitive extends Primitive<
     startBlockHeight: number;
     contractAddress: MidnightAddress;
     stateMachinePrefix: string;
-    contract: {
+    contract?: {
       ledger: (data: StateValue) => any;
     };
     ledgerSchema?: LedgerSchema;
@@ -61,6 +61,16 @@ export class MidnightGenericPrimitive extends Primitive<
     genesisHash?: string;
   }) {
     super(config);
+    if (!config.contract && !config.ledgerSchema) {
+      throw new Error(
+        `Midnight primitive "${config.instanceName}" requires either a generated contract decoder or a ledger schema.`,
+      );
+    }
+    if (config.ledgerSchema && Object.keys(config.ledgerSchema).length === 0) {
+      throw new Error(
+        `Midnight primitive "${config.instanceName}" received an empty ledger schema.`,
+      );
+    }
     this.contractAddress = config.contractAddress;
     this.contract = config.contract;
     this.ledgerSchema = config.ledgerSchema;
@@ -76,13 +86,24 @@ export class MidnightGenericPrimitive extends Primitive<
   parseAdditionalLedgerFields(stateValue: StateValue): Record<string, any> {
     if (!this.ledgerSchema) return {};
 
-    const stateArray: StateValue[] = stateValue.asArray?.() ?? [];
+    const stateArray: StateValue[] | undefined = stateValue.asArray?.();
     const result: Record<string, any> = {};
     const schemaEntries = Object.entries(this.ledgerSchema);
 
-    for (let i = 0; i < schemaEntries.length && i < stateArray.length; i++) {
+    if (!stateArray) {
+      throw new Error(
+        `Ledger root must be an array; received ${stateValue.type()}.`,
+      );
+    }
+    if (stateArray.length < schemaEntries.length) {
+      throw new Error(
+        `Ledger schema declares ${schemaEntries.length} field(s), but the ledger contains only ${stateArray.length}.`,
+      );
+    }
+
+    for (let i = 0; i < schemaEntries.length; i++) {
       const [fieldName, fieldType] = schemaEntries[i];
-      result[fieldName] = parseLedgerField(stateArray[i], fieldType);
+      result[fieldName] = parseLedgerField(stateArray[i], fieldType, fieldName);
     }
 
     return result;
@@ -156,6 +177,7 @@ export class MidnightGenericPrimitive extends Primitive<
       // TODO This should be optional
       scheduledPrefix: this.stateMachinePrefix ?? "",
       contract: this.contract,
+      ledgerSchema: this.ledgerSchema,
       parseAdditionalLedgerFields: this.ledgerSchema
         ? this.parseAdditionalLedgerFields.bind(this)
         : undefined,
@@ -193,30 +215,44 @@ function parseUintCellLittleEndian(chunks: Uint8Array[]): string {
   return result.toString();
 }
 
-function parseLedgerField(sv: StateValue, type: LedgerFieldType): any {
+function parseLedgerField(
+  sv: StateValue,
+  type: LedgerFieldType,
+  path: string,
+): any {
   if (typeof type === "object" && type.type === "option") {
     if (sv.type() === "null") return null;
-    return parseLedgerField(sv, type.value);
+    return parseLedgerField(sv, type.value, path);
   }
 
   if (typeof type === "object" && type.type === "map") {
-    const map = sv.asMap();
-    if (!map) return {};
+    const map = sv.asMap?.();
+    if (!map) {
+      throw new Error(
+        `Ledger field "${path}" expects a map; received ${sv.type()}.`,
+      );
+    }
 
     const result: Record<string, any> = {};
     for (const key of map.keys()) {
       const val = map.get(key);
       if (val !== undefined) {
-        result[alignedValueToHex(key as { value: Uint8Array[] })] = parseLedgerField(
+        const mapKey = alignedValueToHex(key as { value: Uint8Array[] });
+        result[mapKey] = parseLedgerField(
           val,
           type.value,
+          `${path}[${mapKey}]`,
         );
       }
     }
     return result;
   }
 
-  if (sv.type() !== "cell") return null;
+  if (sv.type() !== "cell") {
+    throw new Error(
+      `Ledger field "${path}" expects ${String(type)}; received ${sv.type()}.`,
+    );
+  }
   const cell = sv.asCell();
 
   if (
@@ -239,7 +275,7 @@ function parseLedgerField(sv: StateValue, type: LedgerFieldType): any {
     );
   }
 
-  return null;
+  throw new Error(`Unsupported ledger type for field "${path}": ${String(type)}.`);
 }
 
 function isCompactMap(data: object): data is Iterable<[unknown, unknown]> {

package/primitives/src/midnight-nullifier-and-commitment/midnight-nullifier-and-commitment.ts

@@ -1,4 +1,4 @@
-import { Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/midnight-token-mint/midnight-token-mint.ts

@@ -1,4 +1,4 @@
-import { Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/midnight-unshielded-create/midnight-unshielded-create.ts

@@ -1,4 +1,4 @@
-import { Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/midnight-unshielded-spend/midnight-unshielded-spend.ts

@@ -1,4 +1,4 @@
-import { Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/midnight-zswap-root/midnight-zswap-root.ts

@@ -1,4 +1,4 @@
-import { Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
 import {
   type AddressAndType,
   AddressType,

package/primitives/src/near-account-watch/near-account-watch-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/near-generic/near-generic-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/near-intent/near-intent-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/near-nep141/nep141-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/near-nep171/nep171-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/near-nep245/nep245-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/solana-account-balance/solana-account-balance-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/solana-program-log/solana-program-log-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/solana-token-account/solana-token-account-primitive.ts

@@ -9,7 +9,8 @@ import {
   AddressType,
   type EffectstreamBlockNumber,
 } from "@effectstream/utils";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import {
   type CommandTuple,
   generateRawStmInput,

package/primitives/src/utxorpc-generic/utxorpc-generic.ts

@@ -6,7 +6,8 @@ import {
 } from "@effectstream/concise";
 import type { ConfigSyncProtocolType, FlattenSyncProtocolIOFor, ProtocolPrimitiveMap, UtxorpcTxPredicate } from '@effectstream/config';
 import type { StateUpdateStream } from "@effectstream/coroutine";
-import { type JsonObject, Primitive } from "@effectstream/sm";
+import { Primitive } from "../../Primitive.ts";
+import type { JsonObject } from "../../types.ts";
 import { type AddressAndType, AddressType, type EffectstreamBlockNumber, uint8ArrayToHexString } from '@effectstream/utils';
 import { utxorpcGenericGrammar } from './utxorpc-generic-grammar.ts';
 import { PrimitiveTypeUtxorpcGeneric } from '../builtin.ts';