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

package/package.json

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

@@ -7,7 +7,11 @@ import type { GetAccountParameter } from "../../../types/account.js";
 import type { Chain, GetChainParameter } from "../../../types/chain.js";
 import { getAction } from "../../../utils/get-action.js";
 import { signPsbt } from "../../wallet/sign-psbt.js";
-import { p2tr, taprootListToTree, Transaction } from "@scure/btc-signer";
+import {
+  TaprootControlBlock,
+  Transaction,
+  utils as u,
+} from "@scure/btc-signer";
 import { hex } from "@scure/base";
 import type { ParticipantScripts } from "@kontor/kontor-ts";
 
@@ -51,30 +55,21 @@ export async function signReveal<
   for (let i = 0; i < params.parcipantScripts.length; i++) {
     const { commit_tap_leaf_script } = params.parcipantScripts[i]!;
 
-    const tree = taprootListToTree([
-      {
-        // TODO: fix this type error
-        // @ts-ignore
-        script: hex.decode(commit_tap_leaf_script.script),
-        leafVersion: commit_tap_leaf_script.leafVersion,
-      },
-    ]);
-
-    const payment = p2tr(
-      // @ts-ignore
-      undefined,
-      tree,
-      // TODO: must assert chain or default to mainnet
-      chain!.networkConfig,
-      true,
+    const scriptBytes = hex.decode(commit_tap_leaf_script.script);
+    const controlBlockBytes = hex.decode(commit_tap_leaf_script.controlBlock);
+    const leafVersion = commit_tap_leaf_script.leafVersion;
+
+    const scriptWithVersion = u.concatBytes(
+      scriptBytes,
+      new Uint8Array([leafVersion]),
     );
 
+    const controlBlockStruct = TaprootControlBlock.decode(controlBlockBytes);
+
     tx.updateInput(
       i,
       {
-        tapLeafScript: payment.tapLeafScript!,
-        tapInternalKey: payment.tapInternalKey,
-        tapMerkleRoot: payment.tapMerkleRoot,
+        tapLeafScript: [[controlBlockStruct, scriptWithVersion]],
       },
       true,
     );
@@ -113,20 +108,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";
@@ -32,12 +33,168 @@ export const nativeTokenRaw = [
 
 export const wit = parseWit(nativeTokenRaw);
 
+// test("e2e kontor wallet client", async () => {
+//   const account = mnemonicToAccount(process.env.TEST_MNEMONIC!);
+//
+//   const kontorPublicClient = createKontorPublicClient({
+//     transport: http("https://signet-staging.kontor.network:35000/api"),
+//     account,
+//     chain: signet,
+//   });
+//
+//   const kontorWalletClient = createKontorWalletClient({
+//     account,
+//     // TODO: transport is not used for local account.
+//     transport: custom({
+//       request: async (_args: any) => null,
+//     }),
+//   });
+//
+//   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,
+//     psbt: res.result.commit_psbt_hex,
+//   });
+//
+//   const reveal: Transaction = await kontorWalletClient.signReveal({
+//     account: account,
+//     chain: signet,
+//     psbt: res.result.reveal_psbt_hex,
+//     parcipantScripts: res.result.per_participant,
+//   });
+//
+//   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: {
+//       "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(commitExtracted), 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));
+//   //
+// });
+
 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 kontorWalletClient = createKontorWalletClient({
@@ -48,22 +205,21 @@ 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: [
-      "57f1f46857ab12e20f32ecaac780b4096b0951458e15ab08e2ce0992f0521323:0",
-    ],
-    gas: 10n,
-  });
+  // 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,
+  // });
 
-  // @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,8 +232,30 @@ test("e2e kontor wallet client", async () => {
     parcipantScripts: res.result.per_participant,
   });
 
+  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: {
+      "Content-Type": "application/json",
+      Authorization: `Basic ${Buffer.from("rpc:rpc").toString("base64")}`,
+    },
+    body: JSON.stringify({
+      method: "testmempoolaccept",
+      params: [[hex.encode(commitExtracted), hex.encode(revealExtracted)]],
+    }),
+  });
+
+  const mempoolAccept = await r.json();
+
+  console.log({ mempoolAccept: mempoolAccept.result });
+  //
   const op = await kontorPublicClient.inspect({
     hex: hex.encode(revealExtracted),
   });

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;