@tari-project/ootle-wallet-daemon-signer 0.1.0 → 0.3.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { JrpcPermission } from '@tari-project/ootle-ts-bindings';
+import { Permission } from '@tari-project/ootle-ts-bindings';
 import { Signer } from '@tari-project/ootle';
 import { TransactionSignature } from '@tari-project/ootle-ts-bindings';
 import { UnsignedTransactionV1 } from '@tari-project/ootle-ts-bindings';
@@ -23,7 +23,7 @@ export declare function authenticate(client: WalletDaemonClient, options?: AuthO
 
 export declare interface AuthOptions {
     /** Permissions to request from the wallet daemon. Defaults to `["Admin"]`. */
-    permissions?: JrpcPermission[];
+    permissions?: Permission[];
     /** Application name used as the WebAuthn username/identifier. Defaults to `"tari-wallet-sdk"`. */
     appName?: string;
 }
@@ -76,9 +76,10 @@ export declare class WalletDaemonSigner implements Signer {
      * engine rejects the envelope.
      *
      * TODO(daemon): the `transactions.sign` JRPC's acceptance of `seal_public_key` is unverified
-     * against a running `tari_ootle_walletd`, and there is no capability/version handshake on the
-     * typed client (v1.14.0 exposes only the generic `sendRequest`) to feature-detect support, so
-     * this call cannot fail fast the way {@link getViewSecret} does. If the daemon ignores the
+     * against a running `tari_ootle_walletd`, and the daemon advertises no capability signal for
+     * it. (`walletGetInfo` returns a daemon `version` string, but nothing maps a version to
+     * "honours `seal_public_key`", so it cannot answer this question.) This call therefore cannot
+     * fail fast the way {@link getViewSecret} does. If the daemon ignores the
      * parameter and hashes with its own pk, the per-signer signatures will not verify and the
      * failure surfaces only LATE — at submit time — as the opaque engine error
      * `"Transaction has one or more invalid signature(s)"`, not here. An unconditional throw is

package/dist/index.js

@@ -2,56 +2,72 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { SignerError as e, assertByteLength as t, fromHexStr as n, toHexStr as r } from "@tari-project/ootle";
-BigInt.prototype.toJSON = function() {
-  return this > BigInt(2 ** 53 - 1) ? this.toString() : Number(this);
-};
-var i = class e2 {
-  constructor(e4) {
+function i(e4) {
+  return JSON.stringify(e4, a);
+}
+function a(e4, t2) {
+  return typeof t2 == "bigint" ? t2.toString() : t2;
+}
+var o = class e2 {
+  constructor(e4, t2) {
     __publicField(this, "url");
-    this.url = e4;
+    __publicField(this, "credentials");
+    this.url = e4, this.credentials = (t2 == null ? void 0 : t2.credentials) ?? "same-origin";
   }
-  static new(t2) {
-    return new e2(t2);
+  static new(t2, n2) {
+    return new e2(t2, n2);
   }
   async sendRequest(e4, t2) {
     let n2 = { "Content-Type": "application/json" };
     (t2 == null ? void 0 : t2.token) && (n2.Authorization = `Bearer ${t2.token}`);
-    let r2 = new AbortController(), i3 = r2.signal, a2 = (t2 == null ? void 0 : t2.timeout_millis) ? setTimeout(() => {
+    let r2 = new AbortController(), a2 = r2.signal, o2 = (t2 == null ? void 0 : t2.timeout_millis) ? setTimeout(() => {
       r2.abort("Timeout");
-    }, t2.timeout_millis) : null, o2 = await fetch(this.url, {
+    }, t2.timeout_millis) : null, s2 = await fetch(this.url, {
       method: "POST",
-      body: JSON.stringify(e4),
+      body: i(e4),
       headers: n2,
-      signal: i3
+      credentials: this.credentials,
+      signal: a2
     });
-    if (a2 && clearTimeout(a2), !o2.ok) {
-      let e5 = await o2.text();
-      throw Error(`HTTP error ${o2.status}: ${e5}`);
+    if (o2 && clearTimeout(o2), !s2.ok) {
+      let e5 = await s2.text();
+      throw Error(`HTTP error ${s2.status}: ${e5}`);
     }
-    return await o2.json();
+    return await s2.json();
   }
-}, a = class e3 {
+}, s = "tw_";
+function c(e4) {
+  return e4.startsWith(s);
+}
+var l = class e3 {
   constructor(e4) {
     __publicField(this, "token");
     __publicField(this, "transport");
     __publicField(this, "id");
     __publicField(this, "reauthEnabled", true);
+    __publicField(this, "hasWarnedApiKeyReauth", false);
     this.token = null, this.transport = e4, this.id = 0;
   }
   static new(t2) {
     return new e3(t2);
   }
-  static usingFetchTransport(t2) {
-    return e3.new(i.new(t2));
+  static usingFetchTransport(t2, n2) {
+    return e3.new(o.new(t2, n2));
   }
   setReauthenticationEnabled(e4) {
-    this.reauthEnabled = e4;
+    this.reauthEnabled = e4, this.warnIfApiKeyReauth();
   }
   isAuthenticated() {
     return !!this.token;
   }
   setToken(e4) {
-    this.token = e4;
+    this.token = e4, this.warnIfApiKeyReauth();
+  }
+  clearToken() {
+    this.token = null, this.hasWarnedApiKeyReauth = false;
+  }
+  warnIfApiKeyReauth() {
+    this.hasWarnedApiKeyReauth || !this.reauthEnabled || !this.token || !c(this.token) || (this.hasWarnedApiKeyReauth = true, console.warn("WalletDaemonClient: reauthentication is enabled but the credential is an API key. API keys cannot be refreshed; a 401 means the key is revoked, expired, or lacks the required permission."));
   }
   getToken() {
     return this.token;
@@ -78,6 +94,36 @@ var i = class e2 {
   authRefresh() {
     return this.sendRequest("auth.refresh");
   }
+  transactionRequestsCreate(e4) {
+    return this.sendRequest("transaction_requests.create", e4);
+  }
+  transactionRequestsGet(e4) {
+    return this.sendRequest("transaction_requests.get", e4);
+  }
+  transactionRequestsList(e4 = { status: null }) {
+    return this.sendRequest("transaction_requests.list", e4);
+  }
+  transactionRequestsApprove(e4) {
+    return this.sendRequest("transaction_requests.approve", e4);
+  }
+  transactionRequestsReject(e4) {
+    return this.sendRequest("transaction_requests.reject", e4);
+  }
+  transactionRequestsSubmit(e4) {
+    return this.sendRequest("transaction_requests.submit", e4);
+  }
+  authCreateApiKey(e4) {
+    return this.sendRequest("auth.create_api_key", e4);
+  }
+  authListApiKeys(e4 = { include_revoked: false }) {
+    return this.sendRequest("auth.list_api_keys", e4);
+  }
+  authRevokeApiKey(e4) {
+    return this.sendRequest("auth.revoke_api_key", e4);
+  }
+  authenticateWithApiKey(e4) {
+    this.setToken(e4);
+  }
   walletGetInfo() {
     return this.sendRequest("wallet.get_info", {});
   }
@@ -90,6 +136,9 @@ var i = class e2 {
   burnProofsList(e4) {
     return this.sendRequest("burn_proofs.list", e4);
   }
+  burnProofsGet(e4) {
+    return this.sendRequest("burn_proofs.get", e4);
+  }
   accountsClaimBurn(e4) {
     return this.sendRequest("accounts.claim_burn", e4);
   }
@@ -99,6 +148,9 @@ var i = class e2 {
   accountsGetBalances(e4) {
     return this.sendRequest("accounts.get_balances", e4);
   }
+  accountsGetBalanceChanges(e4) {
+    return this.sendRequest("accounts.get_balance_changes", e4);
+  }
   accountsList(e4) {
     return this.sendRequest("accounts.list", e4);
   }
@@ -126,6 +178,9 @@ var i = class e2 {
   submitTransactionDryRun(e4) {
     return this.sendRequest("transactions.submit_dry_run", e4);
   }
+  transactionsDetectInputs(e4) {
+    return this.sendRequest("transactions.detect_inputs", e4);
+  }
   submitTransactionManifest(e4) {
     return this.sendRequest("transactions.submit_manifest", e4);
   }
@@ -138,6 +193,12 @@ var i = class e2 {
   substatesList(e4) {
     return this.sendRequest("substates.list", e4);
   }
+  swapPoolGetExchangeRate(e4) {
+    return this.sendRequest("swap_pools.get_exchange_rate", e4);
+  }
+  swapPoolsList(e4) {
+    return this.sendRequest("swap_pools.list", e4);
+  }
   transactionsList(e4) {
     return this.sendRequest("transactions.list", e4);
   }
@@ -210,9 +271,27 @@ var i = class e2 {
   stealthUtxosList(e4) {
     return this.sendRequest("stealth_utxos.list", e4);
   }
+  confidentialListOutputs(e4) {
+    return this.sendRequest("confidential.list_outputs", e4);
+  }
   stealthUtxosDecryptValue(e4) {
     return this.sendRequest("stealth_utxos.decrypt_value", e4);
   }
+  addressBookAdd(e4) {
+    return this.sendRequest("address_book.add", e4);
+  }
+  addressBookList() {
+    return this.sendRequest("address_book.list", {});
+  }
+  addressBookGet(e4) {
+    return this.sendRequest("address_book.get", e4);
+  }
+  addressBookUpdate(e4) {
+    return this.sendRequest("address_book.update", e4);
+  }
+  addressBookDelete(e4) {
+    return this.sendRequest("address_book.delete", e4);
+  }
   async sendRequest(e4, t2 = null) {
     let n2 = this.id++, r2 = await this.transport.sendRequest({
       method: e4,
@@ -235,14 +314,15 @@ var i = class e2 {
         method: e4,
         ...r2.error
       } });
-      if (e4.startsWith("auth.")) throw console.warn("Token refresh failed"), this.token = null, n3;
+      if (e4.startsWith("auth.")) throw console.warn("Token refresh failed"), this.clearToken(), n3;
+      if (this.token && c(this.token)) throw n3;
       let i3 = this.id++, a2 = await this.transport.sendRequest({
         method: "auth.refresh",
         jsonrpc: "2.0",
         id: i3,
         params: {}
       });
-      if (a2.error) throw console.debug("Refresh resp", a2), this.token = null, n3;
+      if (a2.error) throw console.debug("Refresh resp", a2), this.clearToken(), n3;
       console.debug("Token refreshed successfully. Retrying original request."), this.token = a2.result.token, r2 = await this.transport.sendRequest({
         method: e4,
         jsonrpc: "2.0",
@@ -259,55 +339,55 @@ var i = class e2 {
     } });
     return r2.result;
   }
-}, o = "tari-wallet-sdk", s = ["Admin"];
-function c(e4) {
+}, u = "tari-wallet-sdk", d = ["Admin"];
+function f(e4) {
   let t2 = e4.replace(/-/g, "+").replace(/_/g, "/"), n2 = t2.padEnd(Math.ceil(t2.length / 4) * 4, "=");
   return Uint8Array.from(atob(n2), (e5) => e5.charCodeAt(0));
 }
-async function l(t2, n2) {
-  let r2 = (n2 == null ? void 0 : n2.permissions) ?? s, i3 = (n2 == null ? void 0 : n2.appName) ?? o, { method: a2 } = await t2.authGetMethod();
+async function p(t2, n2) {
+  let r2 = (n2 == null ? void 0 : n2.permissions) ?? d, i3 = (n2 == null ? void 0 : n2.appName) ?? u, { method: a2 } = await t2.authGetMethod();
   switch (a2) {
     case "none":
       return t2.authRequest(r2, "None");
     case "webauthn":
-      return u(t2, i3, r2);
+      return m(t2, i3, r2);
     default:
       throw new e(`Unsupported wallet daemon auth method: ${a2}. Configure the daemon for one of: "none" or "webauthn", and pass that value to WalletDaemonSigner.connect.`);
   }
 }
-async function u(t2, n2, r2) {
+async function m(t2, n2, r2) {
   if (globalThis.navigator === void 0 || !globalThis.navigator.credentials) throw new e("WebAuthn is browser-only. Run in a browser, or pass `authToken` explicitly to `WalletDaemonSigner.connect({ url, authToken })` from Node.");
   let { registered: i3 } = await t2.webauthnAlreadyRegistered({ username: n2 });
-  return i3 ? d(t2, n2, r2) : f(t2, n2, r2);
+  return i3 ? h(t2, n2, r2) : g(t2, n2, r2);
 }
-async function d(t2, n2, r2) {
+async function h(t2, n2, r2) {
   var _a;
   let i3 = await t2.webauthnAuthStart({ username: n2 });
   if (!i3.challenge) throw new e("WebAuthn auth start: missing challenge");
   let a2 = i3.challenge;
   if (!((_a = a2.publicKey) == null ? void 0 : _a.challenge)) throw new e("WebAuthn auth start: malformed challenge response");
-  let { publicKey: o2 } = a2, s2 = c(o2.challenge), l2 = (o2.allowCredentials ?? []).map((e4) => ({
-    id: c(e4.id),
+  let { publicKey: o2 } = a2, s2 = f(o2.challenge), c2 = (o2.allowCredentials ?? []).map((e4) => ({
+    id: f(e4.id),
     type: e4.type
-  })), u2 = await navigator.credentials.get({ publicKey: {
+  })), l2 = await navigator.credentials.get({ publicKey: {
     challenge: s2,
-    allowCredentials: l2,
+    allowCredentials: c2,
     timeout: 6e4,
     userVerification: "required"
   } });
-  if (!u2) throw new e("WebAuthn authentication was cancelled");
+  if (!l2) throw new e("WebAuthn authentication was cancelled");
   return t2.authRequest(r2, { WebAuthN: {
     session_id: i3.session_id,
-    credential: u2
+    credential: l2
   } });
 }
-async function f(t2, n2, r2) {
+async function g(t2, n2, r2) {
   var _a, _b, _c;
   let i3 = await t2.webauthnStartRegistration({ username: n2 });
   if (!i3.public_key) throw new e("WebAuthn registration start: missing public_key");
   let a2 = i3.public_key;
   if (!a2.challenge) throw new e("WebAuthn registration start: malformed public_key response");
-  let o2 = c(a2.challenge), s2 = await navigator.credentials.create({ publicKey: {
+  let o2 = f(a2.challenge), s2 = await navigator.credentials.create({ publicKey: {
     rp: {
       name: ((_a = a2.rp) == null ? void 0 : _a.name) ?? "Tari Wallet",
       id: ((_b = a2.rp) == null ? void 0 : _b.id) ?? ((_c = globalThis.location) == null ? void 0 : _c.hostname)
@@ -338,14 +418,14 @@ async function f(t2, n2, r2) {
     authenticatorSelection: { userVerification: "required" }
   } });
   if (!s2) throw new e("WebAuthn registration was cancelled");
-  let { token: l2 } = await t2.webauthnFinishRegistration({
+  let { token: c2 } = await t2.webauthnFinishRegistration({
     session_id: i3.session_id,
     credential: s2,
     requested_permissions: r2
   });
-  return l2;
+  return c2;
 }
-var p = class i2 {
+var _ = class i2 {
   constructor(e4) {
     __publicField(this, "client");
     __publicField(this, "_publicKey", null);
@@ -353,14 +433,14 @@ var p = class i2 {
     this.client = e4;
   }
   static new(e4) {
-    let t2 = a.usingFetchTransport(e4.url);
+    let t2 = l.usingFetchTransport(e4.url);
     return t2.setToken(e4.authToken), new i2(t2);
   }
   static async connect(e4) {
-    let t2 = a.usingFetchTransport(e4.url);
+    let t2 = l.usingFetchTransport(e4.url);
     if (e4.authToken) t2.setToken(e4.authToken);
     else {
-      let n3 = await l(t2, e4);
+      let n3 = await p(t2, e4);
       t2.setToken(n3);
     }
     t2.setReauthenticationEnabled(true);
@@ -401,7 +481,7 @@ var p = class i2 {
   }
 };
 export {
-  a as WalletDaemonClient,
-  p as WalletDaemonSigner,
-  l as authenticate
+  l as WalletDaemonClient,
+  _ as WalletDaemonSigner,
+  p as authenticate
 };

package/package.json

@@ -1,6 +1,14 @@
 {
   "name": "@tari-project/ootle-wallet-daemon-signer",
-  "version": "0.1.0",
+  "version": "0.3.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tari-project/ootle.ts.git",
+    "directory": "packages/ootle-wallet-daemon-signer"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,9 +25,9 @@
     }
   },
   "dependencies": {
-    "@tari-project/ootle-ts-bindings": "^1.30.0",
-    "@tari-project/wallet_jrpc_client": "^1.14.0",
-    "@tari-project/ootle": "0.1.0"
+    "@tari-project/ootle-ts-bindings": "^1.49.1",
+    "@tari-project/wallet_jrpc_client": "^1.22.0",
+    "@tari-project/ootle": "0.3.0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.57.7",