@kontor/kontor-sdk 1.0.0-alpha.10 → 1.0.0-alpha.13

package/dist/types/wit/wit.d.ts

@@ -0,0 +1,60 @@
+import type { ResolvedRegister } from "./register.js";
+import type { Pretty } from "./type-utils.js";
+export type MBits = 8 | 16 | 32 | 64;
+export type Address = ResolvedRegister["addressType"];
+export type WitContractAddress = "contract-address";
+export type WitInteger = "integer";
+export type WitDecimal = "decimal";
+export type WitTuple = "tuple";
+export type WitError = "error";
+export type WitUnit = "_";
+export type WitBool = "bool";
+export type WitSInt = `s${MBits}`;
+export type WitUInt = `u${MBits}`;
+export type WitString = "string";
+export type WitInt = WitSInt | WitUInt;
+type _BuildOptionTypes<T extends string> = `option<${T}>`;
+export type WitOptionWithoutTuple = _BuildOptionTypes<WitBool | WitSInt | WitUInt | WitString | WitDecimal | WitInteger | WitUnit>;
+export type WitOptionWithTuple = _BuildOptionTypes<WitTuple>;
+export type WitOptionWithList = _BuildOptionTypes<WitList>;
+export type WitOption = WitOptionWithoutTuple | WitOptionWithTuple | WitOptionWithList;
+type _BuildResultTypes<T extends string> = `result<${T}, error>`;
+export type WitResultWithoutTuple = _BuildResultTypes<WitBool | WitSInt | WitUInt | WitString | WitOption | WitInteger | WitDecimal | WitUnit>;
+export type WitResultWithTuple = _BuildResultTypes<WitTuple>;
+export type WitResultWithList = _BuildResultTypes<WitList>;
+export type WitResult = WitResultWithoutTuple | WitResultWithTuple | WitResultWithList;
+type _BuildListTypes<T extends string> = `list<${T}>`;
+export type WitListWithoutTuple = _BuildListTypes<WitBool | WitSInt | WitUInt | WitString | WitInteger | WitDecimal | WitUnit>;
+export type WitListWithTuple = _BuildListTypes<WitTuple>;
+export type WitList = WitListWithoutTuple | WitListWithTuple;
+export type WitStateMutability = "view" | "proc" | "core";
+export type WitParameterKind = "inputs" | "outputs";
+export type WitType = WitContractAddress | WitTuple | WitResult | WitError | WitBool | WitSInt | WitUInt | WitString | WitInteger | WitDecimal | WitList | WitOption;
+type ResolvedWitType = ResolvedRegister["strictWitType"] extends true ? WitType : string;
+export type WitInternalType = ResolvedWitType | `record ${string}`;
+export type WitParameter = Pretty<{
+    type: string;
+    name?: string | undefined;
+    internalType?: WitInternalType | undefined;
+    components?: readonly WitParameter[];
+}>;
+export type WitItemType = "func";
+export type WitFunction = {
+    type: "function";
+    name: string;
+    inputs: readonly WitParameter[];
+    outputs: readonly WitParameter[];
+    payable?: boolean | undefined;
+    context: WitStateMutability;
+};
+export type Wit = readonly WitFunction[];
+export type TypedDataType = Exclude<WitType, WitTuple | WitListWithTuple>;
+export type TypedDataParameter = {
+    name: string;
+    type: TypedDataType | keyof TypedData | `${keyof TypedData}[${string | ""}]`;
+};
+export type TypedData = Pretty<Record<string, readonly TypedDataParameter[]> & {
+    [_ in TypedDataType]?: never;
+}>;
+export {};
+//# sourceMappingURL=wit.d.ts.map

package/dist/types/wit/wit.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontor/kontor-sdk",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.13",
   "author": "Unspendable Labs <dev@unspendablelabs.com>",
   "description": "The official SDK to the Kontor Bitcoin metaprotocol",
   "repository": {

package/src/sdk/actions/kontor/public/{build-compose-call.ts → build-compose-query.ts}

@@ -1,44 +1,35 @@
-import type { ResolvedRegister } from "../../../../wit/register.js";
+// import type { ResolvedRegister } from "../../../../wit/register.js";
 import type { KontorPublicClient } from "../../../clients/kontor/create-public-client.js";
 import type { HttpTransport } from "../../../clients/transports/create-http-transport.js";
 import type { Chain } from "../../../types/chain.js";
 import type { Address, UtxoId, XOnlyPubKey } from "../../../types/misc.js";
-import {
-  buildInstruction,
-  type BuildInstructionReturnType,
-} from "./build-instruction.js";
+import { buildInstructionQuery } from "./build-instruction-query.js";
 import { getKontorAction } from "../../../utils/get-action.js";
+import type { ComposeQuery } from "@kontor/kontor-ts";
+import type { Inst } from "src/sdk/types/kontor.js";
 
-export type BuildComposeCallParameters<
+export type BuildComposeQueryParameters<
   _chain extends Chain | undefined = Chain | undefined,
 > = {
+  instruction: Inst;
   address?: Address;
   xOnlyPubKey?: XOnlyPubKey; // TODO: maybe this should be wrapped in a single object
   utxos: UtxoId[];
-  contractAddress: ResolvedRegister["contractAddress"];
-  wave: string;
-  gas: bigint;
   satsPerVByte: number;
 };
 
-export type BuildComposeCallReturnType = {
-  instructions: BuildInstructionReturnType[];
-  // TODO: this should be changed upstream or encoded in a formatter
-  sat_per_vbyte: number;
-};
+export type BuildComposeQueryReturnType = ComposeQuery;
 
-export async function buildComposeCall<
+export async function buildComposeQuery<
   chain extends Chain | undefined = Chain | undefined,
 >(
   client: KontorPublicClient<HttpTransport, chain>,
-  params: BuildComposeCallParameters<chain>,
-): Promise<BuildComposeCallReturnType> {
+  params: BuildComposeQueryParameters<chain>,
+): Promise<BuildComposeQueryReturnType> {
   const account = client.account;
 
   const {
-    contractAddress,
-    wave,
-    gas,
+    instruction: inst,
     utxos,
     address = account?.address,
     xOnlyPubKey = account?.xOnlyPubKey,
@@ -61,12 +52,10 @@ export async function buildComposeCall<
 
   const instruction = await getKontorAction(
     client,
-    buildInstruction,
-    "buildInstruction",
+    buildInstructionQuery,
+    "buildInstructionQuery",
   )({
-    contractAddress,
-    wave,
-    gas,
+    instruction: inst,
     utxos,
     xOnlyPubKey,
     address,
@@ -75,5 +64,6 @@ export async function buildComposeCall<
   return {
     instructions: [instruction],
     sat_per_vbyte: params.satsPerVByte,
+    envelope: null,
   };
 }

package/src/sdk/actions/kontor/public/{build-instruction.ts → build-instruction-query.ts}

@@ -1,24 +1,35 @@
-import type { InstructionQuery } from "../../../types/kontor.js";
-import type { ResolvedRegister } from "../../../../wit/register.js";
+import type { Inst, InstructionQuery } from "../../../types/kontor.js";
 import type { KontorPublicClient } from "../../../clients/kontor/create-public-client.js";
 import type { HttpTransport } from "../../../clients/transports/create-http-transport.js";
 import type { Chain } from "../../../types/chain.js";
 import type { Address, UtxoId, XOnlyPubKey } from "../../../types/misc.js";
 
-export type BuildInstructionParameters<
+// If InstructionQuery already uses this Inst shape internally, you don't need to touch it.
+// Otherwise you can make InstructionQuery generic over Inst and plug this in.
+export type BuildInstructionQueryReturnType = InstructionQuery;
+
+export type BuildInstructionQueryParameters<
   _chain extends Chain | undefined = Chain | undefined,
 > = {
   address?: Address;
   xOnlyPubKey?: XOnlyPubKey; // TODO: maybe this should be wrapped in a single object
   utxos: UtxoId[];
-  contractAddress: ResolvedRegister["contractAddress"];
-  wave: string;
-  gas: bigint;
+  /**
+   * The concrete instruction to send (Publish | Call | Issuance).
+   * Example:
+   *   { Call: { gas_limit: 100000, contract: "addr", expr: "balance(...)" } }
+   *   { Publish: { gas_limit: 100000, name: "token", bytes: [0,1,2,...] } }
+   *   "Issuance"
+   */
+  instruction: Inst;
+  /**
+   * Optional chained instruction if you want to send two instructions atomically.
+   */
+  chainedInstruction?: Inst | null;
 };
 
-export type BuildInstructionReturnType = InstructionQuery;
+// ------------------ helpers ------------------
 
-// TODO: these normalize methods probably belong somewhere else
 function normalizeXOnly(pub: string): string {
   if (!/^[0-9a-fA-F]{64}$/.test(pub)) {
     throw new Error(
@@ -40,19 +51,20 @@ function normalizeUtxoIds(u: UtxoId | UtxoId[]): string[] {
   return Array.isArray(u) ? u.map(normalizeUtxoId) : [normalizeUtxoId(u)];
 }
 
-export async function buildInstruction<
+// ------------------ main builder ------------------
+
+export async function buildInstructionQuery<
   chain extends Chain | undefined = Chain | undefined,
 >(
   client: KontorPublicClient<HttpTransport, chain>,
-  params: BuildInstructionParameters<chain>,
-): Promise<BuildInstructionReturnType> {
+  params: BuildInstructionQueryParameters<chain>,
+): Promise<BuildInstructionQueryReturnType> {
   const account = client.account;
 
   const {
-    contractAddress,
-    wave,
-    gas,
     utxos,
+    instruction,
+    chainedInstruction = null,
     address = account?.address,
     xOnlyPubKey = account?.xOnlyPubKey,
   } = params;
@@ -62,6 +74,11 @@ export async function buildInstruction<
     throw new Error("x_only_public_key is required");
   }
 
+  if (!address) {
+    // TODO: add custom error
+    throw new Error("address is required");
+  }
+
   if (utxos.length === 0) {
     // TODO: add custom error
     throw new Error("at least one funding UTXO is required");
@@ -70,22 +87,11 @@ export async function buildInstruction<
   const xOnly = normalizeXOnly(xOnlyPubKey);
   const fundingIds = normalizeUtxoIds(utxos);
 
-  // const sciptData = buildCallScriptDataBytes(contractAddress, wave, gas);
-
   return {
-    address: address!,
+    address,
     x_only_public_key: xOnly,
-    funding_utxo_ids:
-      fundingIds.length === 1
-        ? (fundingIds[0] as string)
-        : fundingIds.join(","),
-    instruction: {
-      Call: {
-        gas_limit: Number(gas), // TODO: refine type
-        contract: contractAddress,
-        expr: wave,
-      },
-    },
-    chained_instruction: null,
+    funding_utxo_ids: fundingIds.join(","),
+    instruction,
+    chained_instruction: chainedInstruction ?? null,
   };
 }

package/src/sdk/actions/kontor/public/{call-proc.ts → call-compose.ts}

@@ -1,4 +1,3 @@
-import type { ResolvedRegister } from "../../../../wit/register.js";
 import type { KontorPublicClient } from "../../../clients/kontor/create-public-client.js";
 import type { HttpTransport } from "../../../clients/transports/create-http-transport.js";
 import type { Chain } from "../../../types/chain.js";
@@ -9,20 +8,22 @@ import type {
   XOnlyPubKey,
 } from "../../../types/misc.js";
 
-import { buildComposeCall } from "./build-compose-call.js";
+import { buildComposeQuery } from "./build-compose-query.js";
 import { getKontorAction } from "../../../utils/get-action.js";
-import type { ComposeOutputs, ResultResponse } from "../../../types/kontor.js";
+import {
+  type ComposeOutputs,
+  type Inst,
+  type ResultResponse,
+} from "../../../types/kontor.js";
 
-export type CallProcParameters<
+export type CallComposeParameters<
   _chain extends Chain | undefined = Chain | undefined,
 > = {
   address?: Address;
   xOnlyPubKey?: XOnlyPubKey; // TODO: maybe this should be wrapped in a single object
   utxos: UtxoId[];
-  contractAddress: ResolvedRegister["contractAddress"];
-  wave: string;
-  gas: bigint;
   satsPerVByte: number;
+  instruction: Inst;
 };
 
 // TODO: organize these types or just refernece direc
@@ -32,24 +33,22 @@ export interface TapLeafScript {
   controlBlock: number[];
 }
 
-export type CallProcReturnType = ResultResponse<ComposeOutputs>;
+export type CallComposeReturnType = ResultResponse<ComposeOutputs>;
 
-export async function callProc<
+export async function callCompose<
   chain extends Chain | undefined = Chain | undefined,
 >(
   client: KontorPublicClient<HttpTransport, chain>,
-  params: CallProcParameters<chain>,
-): Promise<CallProcReturnType> {
+  params: CallComposeParameters<chain>,
+): Promise<CallComposeReturnType> {
   const account = client.account;
 
   const {
-    contractAddress,
-    wave,
-    gas,
     utxos,
     address = account?.address,
     xOnlyPubKey = account?.xOnlyPubKey,
     satsPerVByte,
+    instruction,
   } = params;
 
   if (!xOnlyPubKey) {
@@ -70,12 +69,10 @@ export async function callProc<
 
   const composeCall = await getKontorAction(
     client,
-    buildComposeCall,
-    "buildComposeCall",
+    buildComposeQuery,
+    "buildComposeQuery",
   )({
-    contractAddress,
-    wave,
-    gas,
+    instruction,
     utxos,
     xOnlyPubKey,
     address,

package/src/sdk/actions/kontor/public/proc-contract.ts

@@ -1,3 +1,4 @@
+import { Instruction } from "../../../../sdk/types/kontor.js";
 import type { Wit } from "../../../../wit/wit.js";
 import type { KontorPublicClient } from "../../../clients/kontor/create-public-client.js";
 import type { HttpTransport } from "../../../clients/transports/create-http-transport.js";
@@ -13,7 +14,7 @@ import {
   encodeFunctionData,
   type EncodeFunctionDataParameters,
 } from "../../../utils/wit/encode-function-data.js";
-import { callProc, type CallProcReturnType } from "./call-proc.js";
+import { callCompose, type CallComposeReturnType } from "./call-compose.js";
 
 export type ProcContractParameters<
   wit extends Wit | readonly unknown[] = Wit,
@@ -34,7 +35,7 @@ export type ProcContractParameters<
   satsPerVByte: number;
 };
 
-export type ProcContractReturnType = CallProcReturnType;
+export type ProcContractReturnType = CallComposeReturnType;
 
 export async function procContract<
   // chain exhttps://viem.sh/tends Chain | undefined,
@@ -85,16 +86,18 @@ export async function procContract<
   try {
     const response = await getKontorAction(
       client,
-      callProc,
-      "callProc",
+      callCompose,
+      "callCompose",
     )({
-      contractAddress: contractAddress,
-      wave: wave,
       utxos,
       satsPerVByte,
       address,
       xOnlyPubKey,
-      gas,
+      instruction: Instruction.call({
+        contract: contractAddress,
+        gasLimit: gas,
+        expr: wave,
+      }),
     });
 
     return response;

package/src/sdk/actions/kontor/wallet/sign-reveal.ts

@@ -62,7 +62,7 @@ export async function signReveal<
     // scure expects script || leafVersion as one buffer
     const scriptWithVersion = u.concatBytes(
       scriptBytes,
-      new Uint8Array([leafVersion ?? 0xc0]), // default 0xc0 if needed
+      new Uint8Array([leafVersion]),
     );
 
     const controlBlockStruct = TaprootControlBlock.decode(controlBlockBytes);
@@ -107,19 +107,21 @@ export async function signReveal<
     allowUnknownInputs: true,
   });
 
-  for (let i = 0; i < signedTx.inputsLength; i++) {
-    const input = signedTx.getInput(i);
-    if (input.tapLeafScript && input.tapLeafScript.length > 0) {
-      const [cbStruct, scriptWithVersion] = input.tapLeafScript[0]!;
-      console.log("SIGNED TAPLEAF", i, {
-        cbStruct,
-        cbEncoded: hex.encode(TaprootControlBlock.encode(cbStruct)),
-        scriptWithVersion: hex.encode(scriptWithVersion),
-      });
-    }
-  }
-  // this is technically unnecessary as scure/btc-signer
-  // will product this witness by default
+  // for (let i = 0; i < signedTx.inputsLength; i++) {
+  //   const input = signedTx.getInput(i);
+  //   if (input.tapLeafScript && input.tapLeafScript.length > 0) {
+  //     const [cbStruct, scriptWithVersion] = input.tapLeafScript[0]!;
+  //     console.log("SIGNED TAPLEAF", i, {
+  //       cbStruct,
+  //       cbEncoded: hex.encode(TaprootControlBlock.encode(cbStruct)),
+  //       scriptWithVersion: hex.encode(scriptWithVersion),
+  //     });
+  //   }
+  // }
+  //
+  //
+
+  // finalize
   for (let i = 0; i < params.parcipantScripts.length; i++) {
     const input = signedTx.getInput(i);
     const p = params.parcipantScripts[i]!;
@@ -127,11 +129,11 @@ export async function signReveal<
     const scriptHex = p.commit_tap_leaf_script.script;
     const cbHex = p.commit_tap_leaf_script.controlBlock;
 
-    console.log("USING SCRIPT/CB", {
-      scriptHex,
-      cbHex,
-      cbDecodedRoundtrip: hex.encode(hex.decode(cbHex)),
-    });
+    // console.log("USING SCRIPT/CB", {
+    //   scriptHex,
+    //   cbHex,
+    //   cbDecodedRoundtrip: hex.encode(hex.decode(cbHex)),
+    // });
 
     signedTx.updateInput(i, {
       finalScriptWitness: [
@@ -140,18 +142,14 @@ export async function signReveal<
         hex.decode(cbHex),
       ],
     });
-
-    delete input.tapScriptSig;
-    delete input.tapKeySig;
-    delete input.tapLeafScript;
   }
 
-  for (let i = 0; i < signedTx.inputsLength; i++) {
-    const input = signedTx.getInput(i);
-    console.log("FINAL INPUT", i, {
-      finalScriptWitness: input.finalScriptWitness?.map((w) => hex.encode(w)),
-    });
-  }
+  // for (let i = 0; i < signedTx.inputsLength; i++) {
+  //   const input = signedTx.getInput(i);
+  //   console.log("FINAL INPUT", i, {
+  //     finalScriptWitness: input.finalScriptWitness?.map((w) => hex.encode(w)),
+  //   });
+  // }
 
   return signedTx;
 }

package/src/sdk/clients/decorators/kontor/public.ts

@@ -19,22 +19,22 @@ import {
 } from "../../../actions/kontor/public/call-view.js";
 
 import {
-  callProc,
-  type CallProcParameters,
-  type CallProcReturnType,
-} from "../../../actions/kontor/public/call-proc.js";
+  callCompose,
+  type CallComposeParameters,
+  type CallComposeReturnType,
+} from "../../../actions/kontor/public/call-compose.js";
 
 import {
-  buildInstruction,
-  type BuildInstructionParameters,
-  type BuildInstructionReturnType,
-} from "../../../actions/kontor/public/build-instruction.js";
+  buildInstructionQuery,
+  type BuildInstructionQueryParameters,
+  type BuildInstructionQueryReturnType,
+} from "../../../actions/kontor/public/build-instruction-query.js";
 
 import {
-  buildComposeCall,
-  type BuildComposeCallParameters,
-  type BuildComposeCallReturnType,
-} from "../../../actions/kontor/public/build-compose-call.js";
+  buildComposeQuery,
+  type BuildComposeQueryParameters,
+  type BuildComposeQueryReturnType,
+} from "../../../actions/kontor/public/build-compose-query.js";
 
 import {
   inspect,
@@ -75,17 +75,17 @@ export type KontorPublicActions<
     args: CallViewParameters<chain>,
   ) => Promise<CallViewReturnType>;
 
-  buildInstruction: <chain extends Chain | undefined>(
-    args: BuildInstructionParameters<chain>,
-  ) => Promise<BuildInstructionReturnType>;
+  buildInstructionQuery: <chain extends Chain | undefined>(
+    args: BuildInstructionQueryParameters<chain>,
+  ) => Promise<BuildInstructionQueryReturnType>;
 
-  buildComposeCall: <chain extends Chain | undefined>(
-    args: BuildComposeCallParameters<chain>,
-  ) => Promise<BuildComposeCallReturnType>;
+  buildComposeQuery: <chain extends Chain | undefined>(
+    args: BuildComposeQueryParameters<chain>,
+  ) => Promise<BuildComposeQueryReturnType>;
 
-  callProc: <chain extends Chain | undefined>(
-    args: CallProcParameters<chain>,
-  ) => Promise<CallProcReturnType>;
+  callCompose: <chain extends Chain | undefined>(
+    args: CallComposeParameters<chain>,
+  ) => Promise<CallComposeReturnType>;
   inspect: <_chain extends Chain | undefined>(
     args: InspectParameters,
   ) => Promise<InspectReturnType>;
@@ -102,9 +102,9 @@ export function kontorPublicActions<
     viewContract: (args) => viewContract(client, args),
     procContract: (args) => procContract(client, args),
     callView: (args) => callView(client, args),
-    callProc: (args) => callProc(client, args),
-    buildInstruction: (args) => buildInstruction(client, args),
-    buildComposeCall: (args) => buildComposeCall(client, args),
+    callCompose: (args) => callCompose(client, args),
+    buildInstructionQuery: (args) => buildInstructionQuery(client, args),
+    buildComposeQuery: (args) => buildComposeQuery(client, args),
     inspect: (args) => inspect(client, args),
   };
 }

package/src/sdk/contracts/wits.ts

@@ -1,9 +1,9 @@
 import type { ResolvedRegister } from "../../wit/register.js";
-import { parseWit } from "../../wit/wit-parser/parse-wit.js";
+import { parseWit, type ParseWit } from "../../wit/wit-parser/parse-wit.js";
 
-type ContractExport = {
-  raw: readonly string[];
-  wit: ReturnType<typeof parseWit>;
+type ContractExport<signatures extends readonly string[]> = {
+  raw: signatures;
+  wit: ParseWit<signatures>;
   address: ResolvedRegister["contractAddress"];
 };
 
@@ -29,7 +29,7 @@ const nativeTokenRaw = [
 
 const nativeTokenWit = parseWit(nativeTokenRaw);
 
-export const nativeToken: ContractExport = {
+export const nativeToken: ContractExport<typeof nativeTokenRaw> = {
   raw: nativeTokenRaw,
   wit: nativeTokenWit,
   address: "token_0_0",