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

package/package.json

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

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

@@ -113,20 +113,18 @@ export async function signReveal<
 
   // this is technically unnecessary as scure/btc-signer
   // will product this witness by default
-  // for (let i = 0; i < params.parcipantScripts.length; i++) {
-  //   const input = signedTx.getInput(i);
-  //   const p = params.parcipantScripts[i]!;
-  //   console.log({ input, tapscriptsig: input.tapScriptSig });
-  //   signedTx.updateInput(i, {
-  //     finalScriptWitness: [
-  //       input.tapScriptSig![0]![1],
-  //       hex.decode(p.commit_tap_leaf_script.script),
-  //       hex.decode(p.commit_tap_leaf_script.controlBlock),
-  //     ],
-  //   });
-  // }
-
-  signedTx.finalize();
+  for (let i = 0; i < params.parcipantScripts.length; i++) {
+    const input = signedTx.getInput(i);
+    const p = params.parcipantScripts[i]!;
+    console.log({ input, tapscriptsig: input.tapScriptSig });
+    signedTx.updateInput(i, {
+      finalScriptWitness: [
+        input.tapScriptSig![0]![1],
+        hex.decode(p.commit_tap_leaf_script.script),
+        hex.decode(p.commit_tap_leaf_script.controlBlock),
+      ],
+    });
+  }
 
   return signedTx;
 }

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

@@ -25,12 +25,11 @@ export async function testMempoolAccept<
 ): Promise<TestMempoolAcceptReturnType> {
   const txs = Array.isArray(rawtx) ? rawtx : [rawtx];
 
-  const params =
-    options.maxfeerate !== undefined ? [txs, options.maxfeerate] : [txs];
+  const params = options.maxfeerate !== undefined ? [txs, options] : [txs];
 
   return client.request({
     method: "testmempoolaccept",
-    params: params,
+    params: params as any,
   });
 }
 

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

@@ -13,7 +13,7 @@ export interface SendRawTransactionReturnType {
 
 export type TestMempoolAcceptParams = [
   txs: string[],
-  maxFeeRate?: number | string,
+  opts?: { maxFeeRate: number | string },
 ];
 
 export type TestMempoolAcceptReturnType = any;