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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontor/kontor-sdk",
-  "version": "1.0.0-alpha.11",
+  "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/proc-contract.ts

@@ -87,7 +87,7 @@ export async function procContract<
     const response = await getKontorAction(
       client,
       callCompose,
-      "callProc",
+      "callCompose",
     )({
       utxos,
       satsPerVByte,

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

@@ -83,7 +83,7 @@ export type KontorPublicActions<
     args: BuildComposeQueryParameters<chain>,
   ) => Promise<BuildComposeQueryReturnType>;
 
-  callProc: <chain extends Chain | undefined>(
+  callCompose: <chain extends Chain | undefined>(
     args: CallComposeParameters<chain>,
   ) => Promise<CallComposeReturnType>;
   inspect: <_chain extends Chain | undefined>(
@@ -102,7 +102,7 @@ export function kontorPublicActions<
     viewContract: (args) => viewContract(client, args),
     procContract: (args) => procContract(client, args),
     callView: (args) => callView(client, args),
-    callProc: (args) => callCompose(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",

package/src/sdk/test/e2e.test.ts

@@ -10,6 +10,7 @@ import { custom } from "../clients/transports/custom.js";
 import { Transaction } from "@scure/btc-signer";
 import { hex } from "@scure/base";
 import { signet } from "../chains/definitions/signet.js";
+import { Instruction } from "../types/kontor.js";
 
 export const nativeTokenRaw = [
   "record balance { acc: string, amt: decimal }",
@@ -117,86 +118,20 @@ export const wit = parseWit(nativeTokenRaw);
 test("e2e kontor wallet client", async () => {
   const account = mnemonicToAccount(process.env.TEST_MNEMONIC!);
 
-  const res = {
-    result: {
-      commit_transaction: {
-        version: 2,
-        lock_time: 0,
-        input: [
-          {
-            previous_output:
-              "641c40edf4cf0f1cdaea5c259bf50267bd8743dbade84c98bb9e360c2d0e2a33:1",
-            script_sig: "",
-            sequence: 4294967295,
-            witness: [],
-          },
-        ],
-        output: [
-          {
-            value: 570,
-            script_pubkey:
-              "51207fe892a65813b770346d37f8fbbdf5c1e6bee0bc34b0c625e8f4ca5ff3ad144f",
-          },
-          {
-            value: 8502,
-            script_pubkey:
-              "5120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f",
-          },
-        ],
-      },
-      commit_transaction_hex:
-        "0200000001332a0e2d0c369ebb984ce8addb4387bd6702f59b255ceada1c0fcff4ed401c640100000000ffffffff023a020000000000002251207fe892a65813b770346d37f8fbbdf5c1e6bee0bc34b0c625e8f4ca5ff3ad144f3621000000000000225120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f00000000",
-      commit_psbt_hex:
-        "70736274ff0100890200000001332a0e2d0c369ebb984ce8addb4387bd6702f59b255ceada1c0fcff4ed401c640100000000ffffffff023a020000000000002251207fe892a65813b770346d37f8fbbdf5c1e6bee0bc34b0c625e8f4ca5ff3ad144f3621000000000000225120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f000000000001012b8e24000000000000225120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f0117202c7b730daa0036e8276cdd8fabe844b2dd324a6d227dd209663805189d03e51f000000",
-      reveal_transaction: {
-        version: 2,
-        lock_time: 0,
-        input: [
-          {
-            previous_output:
-              "4b195fabb3bd5360de2e2db6821df9d8909f0dbd5f1ba50ae1ca71a841080c3d:0",
-            script_sig: "",
-            sequence: 4294967295,
-            witness: [],
-          },
-        ],
-        output: [
-          {
-            value: 330,
-            script_pubkey:
-              "5120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f",
-          },
-        ],
-      },
-      reveal_transaction_hex:
-        "02000000013d0c0841a871cae10aa51b5fbd0d9f90d8f91d82b62d2ede6053bdb3ab5f194b0000000000ffffffff014a01000000000000225120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f00000000",
-      reveal_psbt_hex:
-        "70736274ff01005e02000000013d0c0841a871cae10aa51b5fbd0d9f90d8f91d82b62d2ede6053bdb3ab5f194b0000000000ffffffff014a01000000000000225120929c39410fb437b4ff387ec898cbc098365d91965073004fc43e013d410d417f000000000001012b3a020000000000002251207fe892a65813b770346d37f8fbbdf5c1e6bee0bc34b0c625e8f4ca5ff3ad144f0117202c7b730daa0036e8276cdd8fabe844b2dd324a6d227dd209663805189d03e51f0000",
-      per_participant: [
-        {
-          address:
-            "tb1pj2wrjsg0ksmmflec0myf3j7qnqm9myvk2pesqn7y8cqn6sgdg9ls9u6tar",
-          x_only_public_key:
-            "2c7b730daa0036e8276cdd8fabe844b2dd324a6d227dd209663805189d03e51f",
-          commit_tap_leaf_script: {
-            leafVersion: 192,
-            script:
-              "202c7b730daa0036e8276cdd8fabe844b2dd324a6d227dd209663805189d03e51fac0063036b6f6e00010268",
-            controlBlock:
-              "c12c7b730daa0036e8276cdd8fabe844b2dd324a6d227dd209663805189d03e51f",
-          },
-          chained_tap_leaf_script: null,
-        },
-      ],
-    },
-  };
-
   const kontorPublicClient = createKontorPublicClient({
     transport: http("https://signet-staging.kontor.network:35000/api"),
     account,
     chain: signet,
   });
 
+  const res = await kontorPublicClient.callCompose({
+    utxos: [
+      "641c40edf4cf0f1cdaea5c259bf50267bd8743dbade84c98bb9e360c2d0e2a33:1",
+    ],
+    instruction: Instruction.issuance(),
+    satsPerVByte: 1,
+  });
+
   const kontorWalletClient = createKontorWalletClient({
     account,
     // TODO: transport is not used for local account.
@@ -205,20 +140,6 @@ test("e2e kontor wallet client", async () => {
     }),
   });
 
-  // const res = await kontorPublicClient.procContract({
-  //   wit: wit,
-  //   // TODO: add optional account override
-  //
-  //   functionName: "mint", // functin name is only valid if it's got a proc-context
-  //   contractAddress: "token_0_0",
-  //   args: [[7n, 18]],
-  //   satsPerVByte: 1,
-  //   utxos: [
-  //     "641c40edf4cf0f1cdaea5c259bf50267bd8743dbade84c98bb9e360c2d0e2a33:1",
-  //   ],
-  //   gas: 10n,
-  // });
-
   const commit: Transaction = await kontorWalletClient.signCommit({
     account: account,
     chain: signet,
@@ -235,11 +156,6 @@ test("e2e kontor wallet client", async () => {
   const commitExtracted = commit.extract();
   const revealExtracted = reveal.extract();
 
-  // const m = await btcPublicClient.testMempoolAccept({
-  //   rawtx: [hex.encode(commitExtracted), hex.encode(revealExtracted)],
-  //   options: {},
-  // });
-
   const r = await fetch("https://signet.kontor.network:38332", {
     method: "POST",
     headers: {