@1sat/connect 0.0.22 → 0.0.24

package/dist/auth.d.ts

@@ -1,19 +1,20 @@
 /**
- * BRC-77 request signing using WalletInterface directly.
+ * BRC-77 request signing using WalletInterface.
  *
- * Same logic as getAuthToken action but without OneSatContext —
- * takes a WalletInterface so any connected wallet can sign.
+ * Produces a proper BRC-77 message envelope (version + sender pubkey +
+ * recipient indicator + keyID + DER signature) that go-bitcoin-auth and
+ * @bsv/sdk SignedMessage.verify can both verify.
  */
 import type { WalletInterface } from '@bsv/sdk';
 /**
  * Sign an HTTP request with BRC-77 auth, returning the auth token string.
  *
- * The token format is: `pubkey|scheme|timestamp|requestPath|signature`
+ * The token format is: `pubkey|brc77|timestamp|requestPath|signature`
+ * where signature is a base64-encoded BRC-77 message envelope.
  *
  * @param wallet - Any BRC-100 WalletInterface (Sigma CWI, OneSat, extension, etc.)
  * @param requestPath - API endpoint path including query params
  * @param body - Optional request body to include in signature
- * @param scheme - Signature scheme: 'brc77' (default) or 'bsm'
  */
-export declare function signRequest(wallet: WalletInterface, requestPath: string, body?: string, scheme?: 'brc77' | 'bsm'): Promise<string>;
+export declare function signRequest(wallet: WalletInterface, requestPath: string, body?: string): Promise<string>;
 //# sourceMappingURL=auth.d.ts.map

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAkB/C;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAChC,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,GAAE,OAAO,GAAG,KAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,CA0BjB"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAO/C;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAChC,MAAM,EAAE,eAAe,EACvB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,CAsCjB"}

package/dist/index.js

@@ -34768,39 +34768,6 @@ class Transaction {
     });
   }
 }
-// ../../node_modules/.bun/@bsv+sdk@2.0.13/node_modules/@bsv/sdk/dist/esm/src/compat/BSM.js
-var exports_BSM = {};
-__export(exports_BSM, {
-  verify: () => verify2,
-  sign: () => sign2,
-  magicHash: () => magicHash
-});
-var prefix = `Bitcoin Signed Message:
-`;
-var magicHash = (messageBuf) => {
-  const bw = new Writer;
-  bw.writeVarIntNum(prefix.length);
-  bw.write(toArray2(prefix, "utf8"));
-  bw.writeVarIntNum(messageBuf.length);
-  bw.write(messageBuf);
-  const buf = bw.toArray();
-  const hashBuf = hash256(buf);
-  return hashBuf;
-};
-var sign2 = (message, privateKey, mode = "base64") => {
-  const hashBuf = magicHash(message);
-  const sig = sign(new BigNumber(hashBuf), privateKey, true);
-  if (mode === "raw") {
-    return sig;
-  }
-  const h = new BigNumber(hashBuf);
-  const r2 = sig.CalculateRecoveryFactor(privateKey.toPublicKey(), h);
-  return sig.toCompact(r2, true, "base64");
-};
-var verify2 = (message, sig, pubKey) => {
-  const hashBuf = magicHash(message);
-  return verify(new BigNumber(hashBuf), sig, pubKey);
-};
 // ../../node_modules/.bun/@bsv+sdk@2.0.13/node_modules/@bsv/sdk/dist/esm/src/compat/HD.js
 class HD {
   versionBytesNum;
@@ -41187,16 +41154,16 @@ class BigNumber2 {
       this.assert(typeof effectiveBase === "number" && effectiveBase === (effectiveBase | 0) && effectiveBase >= 2 && effectiveBase <= 36, "Base must be an integer between 2 and 36");
       const originalNumberStr = number.toString().replace(/\s+/g, "");
       let start = 0;
-      let sign3 = 0;
+      let sign2 = 0;
       if (originalNumberStr.startsWith("-")) {
         start++;
-        sign3 = 1;
+        sign2 = 1;
       } else if (originalNumberStr.startsWith("+")) {
         start++;
       }
       const numStr = originalNumberStr.substring(start);
       if (numStr.length === 0) {
-        this._initializeState(0n, sign3 === 1 && originalNumberStr.startsWith("-") ? 1 : 0);
+        this._initializeState(0n, sign2 === 1 && originalNumberStr.startsWith("-") ? 1 : 0);
         this.normSign();
         return;
       }
@@ -41215,7 +41182,7 @@ class BigNumber2 {
             bytes2.push(byteVal);
           }
           this.initArray(bytes2, "le");
-          this._sign = sign3;
+          this._sign = sign2;
           this.normSign();
           return;
         } else {
@@ -41225,12 +41192,12 @@ class BigNumber2 {
             throw new Error("Invalid character in " + numStr);
           }
         }
-        this._initializeState(tempMagnitude, sign3);
+        this._initializeState(tempMagnitude, sign2);
         this.normSign();
       } else {
         try {
           this._parseBaseString(numStr, effectiveBase);
-          this._sign = sign3;
+          this._sign = sign2;
           this.normSign();
           if (effectiveEndian === "le") {
             const currentSign = this._sign;
@@ -41320,9 +41287,9 @@ class BigNumber2 {
     }
     return r2;
   }
-  _initializeState(magnitude, sign3) {
+  _initializeState(magnitude, sign2) {
     this._magnitude = magnitude;
-    this._sign = magnitude === 0n ? 0 : sign3;
+    this._sign = magnitude === 0n ? 0 : sign2;
     this._finishInitialization();
   }
   _finishInitialization() {
@@ -42175,9 +42142,9 @@ class BigNumber2 {
     if (endian === "little") {
       beBytes.reverse();
     }
-    let sign3 = 0;
+    let sign2 = 0;
     if (beBytes.length > 0 && (beBytes[0] & 128) !== 0) {
-      sign3 = 1;
+      sign2 = 1;
       beBytes[0] &= 127;
     }
     let magnitude = 0n;
@@ -42192,7 +42159,7 @@ class BigNumber2 {
       magnitude = hex.length === 0 ? 0n : BigInt("0x" + hex);
     }
     const r2 = new BigNumber2(0n);
-    r2._initializeState(magnitude, sign3);
+    r2._initializeState(magnitude, sign2);
     return r2;
   }
   toSm(endian = "big") {
@@ -45109,16 +45076,16 @@ var toBase582 = (bin) => {
   result.reverse();
   return String.fromCharCode(...result);
 };
-var toBase58Check2 = (bin, prefix2 = [0]) => {
-  let hash = hash2562([...prefix2, ...bin]);
-  hash = [...prefix2, ...bin, ...hash.slice(0, 4)];
+var toBase58Check2 = (bin, prefix = [0]) => {
+  let hash = hash2562([...prefix, ...bin]);
+  hash = [...prefix, ...bin, ...hash.slice(0, 4)];
   return toBase582(hash);
 };
 var fromBase58Check2 = (str, enc, prefixLength = 1) => {
   const bin = fromBase582(str);
-  let prefix2 = bin.slice(0, prefixLength);
+  let prefix = bin.slice(0, prefixLength);
   let data = bin.slice(prefixLength, -4);
-  let hash = [...prefix2, ...data];
+  let hash = [...prefix, ...data];
   hash = hash2562(hash);
   bin.slice(-4).forEach((check, index) => {
     if (check !== hash[index]) {
@@ -45126,10 +45093,10 @@ var fromBase58Check2 = (str, enc, prefixLength = 1) => {
     }
   });
   if (enc === "hex") {
-    prefix2 = toHex3(prefix2);
+    prefix = toHex3(prefix);
     data = toHex3(data);
   }
-  return { prefix: prefix2, data };
+  return { prefix, data };
 };
 
 class Writer2 {
@@ -47435,8 +47402,8 @@ class Curve2 {
 // ../../node_modules/.bun/@bsv+sdk@2.0.12/node_modules/@bsv/sdk/dist/esm/src/primitives/ECDSA.js
 var exports_ECDSA2 = {};
 __export(exports_ECDSA2, {
-  verify: () => verify3,
-  sign: () => sign3
+  verify: () => verify2,
+  sign: () => sign2
 });
 
 // ../../node_modules/.bun/@bsv+sdk@2.0.12/node_modules/@bsv/sdk/dist/esm/src/primitives/Signature.js
@@ -47515,7 +47482,7 @@ class Signature2 {
   }
   verify(msg, key, enc) {
     const msgHash = new BigNumber2(sha2562(msg, enc), 16);
-    return verify3(msgHash, this, key);
+    return verify2(msgHash, this, key);
   }
   toString(enc) {
     return this.toDER(enc);
@@ -47703,7 +47670,7 @@ var curve2 = new Curve2;
 var bytes2 = curve2.n.byteLength();
 var ns12 = curve2.n.subn(1);
 var halfN2 = N_BIGINT2 >> 1n;
-var sign3 = (msg, key, forceLowS = false, customK) => {
+var sign2 = (msg, key, forceLowS = false, customK) => {
   const nBitLength = curve2.n.bitLength();
   if (msg.bitLength() > nBitLength) {
     throw new Error(`ECDSA message is too large: expected <= ${nBitLength} bits. Callers must hash messages before signing.`);
@@ -47760,7 +47727,7 @@ var sign3 = (msg, key, forceLowS = false, customK) => {
     return new Signature2(r3, s3);
   }
 };
-var verify3 = (msg, sig, key) => {
+var verify2 = (msg, sig, key) => {
   const nBitLength = curve2.n.bitLength();
   if (msg.bitLength() > nBitLength) {
     return false;
@@ -47834,7 +47801,7 @@ class PublicKey2 extends Point2 {
   }
   verify(msg, sig, enc) {
     const msgHash = new BigNumber2(sha2562(msg, enc), 16);
-    return verify3(msgHash, sig, this);
+    return verify2(msgHash, sig, this);
   }
   toDER(enc) {
     if (enc === "hex")
@@ -47848,17 +47815,17 @@ class PublicKey2 extends Point2 {
     }
     return pkh;
   }
-  toAddress(prefix2 = [0]) {
-    if (typeof prefix2 === "string") {
-      if (prefix2 === "testnet" || prefix2 === "test") {
-        prefix2 = [111];
-      } else if (prefix2 === "mainnet" || prefix2 === "main") {
-        prefix2 = [0];
+  toAddress(prefix = [0]) {
+    if (typeof prefix === "string") {
+      if (prefix === "testnet" || prefix === "test") {
+        prefix = [111];
+      } else if (prefix === "mainnet" || prefix === "main") {
+        prefix = [0];
       } else {
-        throw new Error(`Invalid prefix ${prefix2}`);
+        throw new Error(`Invalid prefix ${prefix}`);
       }
     }
-    return toBase58Check2(this.toHash(), prefix2);
+    return toBase58Check2(this.toHash(), prefix);
   }
   deriveChild(privateKey, invoiceNumber, cacheSharedSecret, retrieveCachedSharedSecret) {
     let sharedSecret;
@@ -48103,25 +48070,25 @@ class PrivateKey2 extends BigNumber2 {
   }
   sign(msg, enc, forceLowS = true, customK) {
     const msgHash = new BigNumber2(sha2562(msg, enc), 16);
-    return sign3(msgHash, this, forceLowS, customK);
+    return sign2(msgHash, this, forceLowS, customK);
   }
   verify(msg, sig, enc) {
     const msgHash = new BigNumber2(sha2562(msg, enc), 16);
-    return verify3(msgHash, sig, this.toPublicKey());
+    return verify2(msgHash, sig, this.toPublicKey());
   }
   toPublicKey() {
     const c = new Curve2;
     const p = c.g.mulCT(this);
     return new PublicKey2(p.x, p.y);
   }
-  toWif(prefix2 = [128]) {
+  toWif(prefix = [128]) {
     if (!this.isValid()) {
       throw new Error("Value is out of field");
     }
-    return toBase58Check2([...this.toArray("be", 32), 1], prefix2);
+    return toBase58Check2([...this.toArray("be", 32), 1], prefix);
   }
-  toAddress(prefix2 = [0]) {
-    return this.toPublicKey().toAddress(prefix2);
+  toAddress(prefix = [0]) {
+    return this.toPublicKey().toAddress(prefix);
   }
   toHex() {
     return super.toHex(32);
@@ -50149,7 +50116,7 @@ class Spend2 {
       cache: this.sigHashCache
     });
     const hash = new BigNumber2(hash2562(preimage));
-    return verify3(hash, sig, pubkey);
+    return verify2(hash, sig, pubkey);
   }
   step() {
     if (this.stackMem > this.memoryLimit) {
@@ -52463,10 +52430,10 @@ class Beef3 {
   toUint8ArrayAtomic(txid) {
     const { beef, writer } = this.getBeefForAtomic(txid);
     const beefUint8 = beef.getSerializedBytes();
-    const prefix2 = writer.toUint8Array();
-    const atomic = new Uint8Array(prefix2.length + beefUint8.length);
-    atomic.set(prefix2, 0);
-    atomic.set(beefUint8, prefix2.length);
+    const prefix = writer.toUint8Array();
+    const atomic = new Uint8Array(prefix.length + beefUint8.length);
+    atomic.set(prefix, 0);
+    atomic.set(beefUint8, prefix.length);
     return atomic;
   }
   toHex() {
@@ -53372,15 +53339,15 @@ class Transaction2 {
     return writer.toArray();
   }
   toAtomicBEEF(allowPartial) {
-    const prefix2 = [1, 1, 1, 1];
+    const prefix = [1, 1, 1, 1];
     const txHash = this.hash();
     const beefData = this.toBEEF(allowPartial);
-    return prefix2.concat(txHash, beefData);
+    return prefix.concat(txHash, beefData);
   }
   toAtomicBEEFUint8Array(allowPartial) {
     const writer = new WriterUint8Array2;
-    const prefix2 = [1, 1, 1, 1];
-    writer.write(prefix2);
+    const prefix = [1, 1, 1, 1];
+    writer.write(prefix);
     const txHash = this.hash();
     writer.write(txHash);
     this.writeSerializedBEEF(writer, allowPartial);
@@ -61442,14 +61409,14 @@ var getAuthHeader = async (options) => {
       }
       headers["authorization"] = `Basic ${btoa(`${username}:${password}`)}`;
     } else if (options.auth.type === "Custom") {
-      const [prefix2, value] = await Promise.all([
+      const [prefix, value] = await Promise.all([
         getValue(options.auth.prefix),
         getValue(options.auth.value)
       ]);
       if (!value) {
         return headers;
       }
-      headers["authorization"] = `${prefix2 != null ? prefix2 : ""} ${value}`;
+      headers["authorization"] = `${prefix != null ? prefix : ""} ${value}`;
     }
   }
   return headers;
@@ -63701,34 +63668,35 @@ async function connectWallet(config) {
   return null;
 }
 // src/auth.ts
-var { toArray: toArray5, toHex: toHex4 } = exports_utils;
-var AUTH_PROTOCOL_ID = [2, "bitcoin-auth"];
-var AUTH_KEY_ID = "auth-0";
-function compactSign(derSig, msgHash, pubKeyHex) {
-  const sig = Signature.fromDER(toHex4(derSig), "hex");
-  const pubKey = PublicKey.fromString(pubKeyHex);
-  const recovery = sig.CalculateRecoveryFactor(pubKey, new BigNumber(msgHash));
-  return sig.toCompact(recovery, true, "base64");
-}
-async function signRequest(wallet3, requestPath, body, scheme = "brc77") {
+var { toArray: toArray5, toBase64: toBase643, toHex: toHex4 } = exports_utils;
+var BRC77_VERSION = [66, 66, 51, 1];
+var BRC77_PROTOCOL_ID = [2, "message signing"];
+async function signRequest(wallet3, requestPath, body) {
   const timestamp2 = new Date().toISOString();
   const bodyHash = body ? toHex4(exports_Hash.sha256(toArray5(body, "utf8"))) : "";
   const message = `${requestPath}|${timestamp2}|${bodyHash}`;
   const messageBytes = toArray5(message, "utf8");
-  const msgHash = scheme === "bsm" ? exports_BSM.magicHash(messageBytes) : exports_Hash.sha256(messageBytes);
-  const { publicKey: pubKeyHex } = await wallet3.getPublicKey({
-    protocolID: AUTH_PROTOCOL_ID,
-    keyID: AUTH_KEY_ID,
-    forSelf: true
+  const keyID = Random_default(32);
+  const keyIDBase64 = toBase643(keyID);
+  const { publicKey: senderPubKeyHex } = await wallet3.getPublicKey({
+    identityKey: true
   });
   const { signature: derSig } = await wallet3.createSignature({
-    protocolID: AUTH_PROTOCOL_ID,
-    keyID: AUTH_KEY_ID,
-    counterparty: "self",
-    hashToDirectlySign: Array.from(msgHash)
+    protocolID: BRC77_PROTOCOL_ID,
+    keyID: keyIDBase64,
+    counterparty: "anyone",
+    data: Array.from(messageBytes)
   });
-  const signature = compactSign(derSig, msgHash, pubKeyHex);
-  return `${pubKeyHex}|${scheme}|${timestamp2}|${requestPath}|${signature}`;
+  const senderPubKeyBytes = toArray5(senderPubKeyHex, "hex");
+  const envelope = [
+    ...BRC77_VERSION,
+    ...senderPubKeyBytes,
+    0,
+    ...keyID,
+    ...derSig
+  ];
+  const signatureBase64 = toBase643(envelope);
+  return `${senderPubKeyHex}|brc77|${timestamp2}|${requestPath}|${signatureBase64}`;
 }
 // src/transport.ts
 var DEFAULT_WALLET_URL2 = "https://1sat.market";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@1sat/connect",
-	"version": "0.0.22",
+	"version": "0.0.24",
 	"description": "Connection layer for 1Sat wallet - popup flow, events, session management",
 	"type": "module",
 	"main": "./dist/index.js",