@kontor/kontor-sdk 1.0.0-alpha.1 → 1.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontor/kontor-sdk",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.4",
   "author": "Unspendable Labs <dev@unspendablelabs.com>",
   "description": "The official SDK to the Kontor Bitcoin metaprotocol",
   "repository": {
@@ -65,5 +65,9 @@
     "micro-packed": "^0.8.0",
     "sats-connect": "^4.2.1",
     "zod": "^4.1.12"
-  }
+  },
+  "workspaces": [
+    ".",
+    "demo"
+  ]
 }

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

@@ -120,15 +120,11 @@ export async function signReveal<
     signedTx.updateInput(i, {
       finalScriptWitness: [
         input.tapScriptSig![0]![1],
-        // @ts-ignore
         hex.decode(p.commit_tap_leaf_script.script),
-        // @ts-ignore
         hex.decode(p.commit_tap_leaf_script.controlBlock),
       ],
     });
   }
 
-  signedTx.finalize();
-
   return signedTx;
 }

package/src/sdk/actions/public/test-mempool-accept.ts

@@ -1,34 +1,37 @@
-// import type { Chain } from "../../types/chain.js";
-//
-// import type { RpcTransport } from "../../clients/transports/create-rpc-transport.js";
-// import type { PublicClient } from "../../clients/create-public-client.js";
-// import type { Account } from "../../accounts/types.js";
-//
-// export type TestMempoolAcceptOptions = {
-//   /** Max feerate in BTC/kvB. If omitted, Core uses default relay feerate. */
-//   maxfeerate?: string | number;
-// };
-//
-// export interface TestMempoolAcceptParams {
-//   rawtx: string | string[];
-//   options: TestMempoolAcceptOptions;
-// }
-// export type TestMempoolAcceptReturnType = any;
-//
-// export async function testMempoolAccept<
-//   chain extends Chain | undefined,
-//   account extends Account | undefined = Account | undefined,
-// >(
-//   client: PublicClient<RpcTransport, chain, account>,
-//   { rawtx, options = {} }: TestMempoolAcceptParams,
-// ): Promise<TestMempoolAcceptReturnType> {
-//   const txs = Array.isArray(rawtx) ? rawtx : [rawtx];
-//
-//   return client.request({
-//     method: "testmempoolaccept",
-//     params: [txs],
-//   });
-// }
+import type { Chain } from "../../types/chain.js";
+
+import type { RpcTransport } from "../../clients/transports/create-rpc-transport.js";
+import type { PublicClient } from "../../clients/create-public-client.js";
+import type { Account } from "../../accounts/types.js";
+
+export type TestMempoolAcceptOptions = {
+  /** Max feerate in BTC/kvB. If omitted, Core uses default relay feerate. */
+  maxfeerate?: string | number;
+};
+
+export interface TestMempoolAcceptParams {
+  rawtx: string | string[];
+  options: TestMempoolAcceptOptions;
+}
+
+export type TestMempoolAcceptReturnType = any;
+
+export async function testMempoolAccept<
+  chain extends Chain | undefined,
+  account extends Account | undefined = Account | undefined,
+>(
+  client: PublicClient<RpcTransport, chain, account>,
+  { rawtx, options = {} }: TestMempoolAcceptParams,
+): Promise<TestMempoolAcceptReturnType> {
+  const txs = Array.isArray(rawtx) ? rawtx : [rawtx];
+
+  const params = options.maxfeerate !== undefined ? [txs, options] : [txs];
+
+  return client.request({
+    method: "testmempoolaccept",
+    params: params as any,
+  });
+}
 
 // export async function testMempoolAccept(
 //   rawtx: string | string[],

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

@@ -8,6 +8,13 @@ import {
   type SendRawTransactionReturnType,
   sendRawTransaction,
 } from "../../actions/public/send-raw-transaction.js";
+
+import {
+  type TestMempoolAcceptParams,
+  type TestMempoolAcceptReturnType,
+  testMempoolAccept,
+} from "../../actions/public/test-mempool-accept.js";
+
 import type { PublicClient as PublicClient } from "../create-public-client.js";
 
 export type PublicActions<
@@ -20,6 +27,9 @@ export type PublicActions<
   sendRawTransaction: (
     parameters: SendRawTransactionParams,
   ) => Promise<SendRawTransactionReturnType>;
+  testMempoolAccept: (
+    parameters: TestMempoolAcceptParams,
+  ) => Promise<TestMempoolAcceptReturnType>;
 };
 
 export function publicActions<
@@ -31,5 +41,6 @@ export function publicActions<
 ): PublicActions<chain, account> {
   return {
     sendRawTransaction: (args) => sendRawTransaction(client, args),
+    testMempoolAccept: (args) => testMempoolAccept(client, args),
   };
 }

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

@@ -5,6 +5,7 @@ import { createPublicClient as createKontorPublicClient } from "../clients/konto
 import { http } from "../clients/transports/http.js";
 import { mnemonicToAccount } from "../accounts/mnemonic-to-account.js";
 import { createWalletClient as createKontorWalletClient } from "../clients/kontor/create-wallet-client.js";
+
 import { custom } from "../clients/transports/custom.js";
 import { Transaction } from "@scure/btc-signer";
 import { hex } from "@scure/base";
@@ -38,6 +39,7 @@ test("e2e kontor wallet client", async () => {
   const kontorPublicClient = createKontorPublicClient({
     transport: http("https://signet-staging.kontor.network:35000/api"),
     account,
+    chain: signet,
   });
 
   const kontorWalletClient = createKontorWalletClient({
@@ -57,13 +59,12 @@ test("e2e kontor wallet client", async () => {
     args: [[7n, 18]],
     satsPerVByte: 1,
     utxos: [
-      "57f1f46857ab12e20f32ecaac780b4096b0951458e15ab08e2ce0992f0521323:0",
+      "641c40edf4cf0f1cdaea5c259bf50267bd8743dbade84c98bb9e360c2d0e2a33:1",
     ],
     gas: 10n,
   });
 
-  // @ts-ignore
-  const commit_: Transaction = await kontorWalletClient.signCommit({
+  const commit: Transaction = await kontorWalletClient.signCommit({
     account: account,
     chain: signet,
     psbt: res.result.commit_psbt_hex,
@@ -76,12 +77,36 @@ test("e2e kontor wallet client", async () => {
     parcipantScripts: res.result.per_participant,
   });
 
+  const commitExtracted = commit.extract();
   const revealExtracted = reveal.extract();
 
-  const op = await kontorPublicClient.inspect({
-    hex: hex.encode(revealExtracted),
+  // 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: {
+      "Content-Type": "application/json",
+      Authorization: `Basic ${Buffer.from("rpc:rpc").toString("base64")}`,
+    },
+    body: JSON.stringify({
+      method: "testmempoolaccept",
+      params: [[hex.encode(commitExtracted), hex.encode(revealExtracted)]],
+    }),
   });
+  console.log({ r, reveal: hex.encode(revealExtracted) });
+
+  const j = await r.json();
+
+  console.log(j);
+  //
+  // const op = await kontorPublicClient.inspect({
+  //   hex: hex.encode(revealExtracted),
+  // });
 
-  console.log(JSON.stringify(op.result[0]!.op));
+  // console.log(JSON.stringify(op.result[0]!.op));
   //
 });

package/src/sdk/types/btc-rpc.ts

@@ -1,10 +1,5 @@
 import type { Prettify } from "../../wit/type-utils.js";
 
-// import type {
-//   TestMempoolAcceptParams,
-//   TestMempoolAcceptReturnType,
-// } from "../actions/public/test-mempool-accept.js";
-
 import type { RpcRequestFn, RpcSchema, RpcSchemaEntry } from "./rpc-schema.js";
 
 export type SendRawTransactionParams = [
@@ -16,18 +11,24 @@ export interface SendRawTransactionReturnType {
   txid: string;
 }
 
+export type TestMempoolAcceptParams = [
+  txs: string[],
+  opts?: { maxFeeRate: number | string },
+];
+
+export type TestMempoolAcceptReturnType = any;
+
 export type BtcRpcSchema = readonly [
   RpcSchemaEntry<
     "sendrawtransaction",
     SendRawTransactionParams,
     SendRawTransactionReturnType
   >,
-  // RpcSchemaEntry<
-  //   "testmempoolaccept",
-  //   // todo add options
-  //   [TestMempoolAcceptParams["rawtx"]],
-  //   string[][]
-  // >,
+  RpcSchemaEntry<
+    "testmempoolaccept",
+    TestMempoolAcceptParams,
+    TestMempoolAcceptReturnType
+  >,
 ];
 
 export type BtcNodeRequestFn<