@liquidium/client 0.3.1 → 0.3.3

package/dist/index.d.cts

@@ -208,7 +208,7 @@ interface SendBtcTransactionRequest {
  * - `signPsbt` - reserved for PSBT-based actions when exposed
  */
 interface WalletAdapter {
-    /** Signs an SDK plaintext message and returns the wallet signature. */
+    /** Signs an SDK plaintext message and returns the wallet signature. BTC adapters may return base64 BIP-322 or hex-encoded signature bytes. */
     signMessage?: (request: SignMessageRequest) => Promise<string>;
     /** Signs an SDK-provided BTC PSBT and returns the signed PSBT as base64. */
     signPsbt?: (request: SignPsbtRequest) => Promise<string>;
@@ -219,7 +219,7 @@ interface WalletAdapter {
 }
 /** Signature payload submitted to a sign-message action. */
 interface SignatureInfo {
-    /** Wallet signature over the action message. */
+    /** Wallet signature over the action message. BTC signatures may be base64 BIP-322 or hex-encoded bytes. */
     signature: string;
     /** Chain used to produce the signature. */
     chain: Chain;

package/dist/index.d.ts

@@ -208,7 +208,7 @@ interface SendBtcTransactionRequest {
  * - `signPsbt` - reserved for PSBT-based actions when exposed
  */
 interface WalletAdapter {
-    /** Signs an SDK plaintext message and returns the wallet signature. */
+    /** Signs an SDK plaintext message and returns the wallet signature. BTC adapters may return base64 BIP-322 or hex-encoded signature bytes. */
     signMessage?: (request: SignMessageRequest) => Promise<string>;
     /** Signs an SDK-provided BTC PSBT and returns the signed PSBT as base64. */
     signPsbt?: (request: SignPsbtRequest) => Promise<string>;
@@ -219,7 +219,7 @@ interface WalletAdapter {
 }
 /** Signature payload submitted to a sign-message action. */
 interface SignatureInfo {
-    /** Wallet signature over the action message. */
+    /** Wallet signature over the action message. BTC signatures may be base64 BIP-322 or hex-encoded bytes. */
     signature: string;
     /** Chain used to produce the signature. */
     chain: Chain;

package/dist/index.js

@@ -1,10 +1,10 @@
-import { encodeFunctionData, createPublicClient, http, isAddress, getAddress } from 'viem';
+import { encodeFunctionData, createPublicClient, http, isAddress, getAddress, isHex, bytesToHex } from 'viem';
 import { mainnet } from 'viem/chains';
 import { Actor, HttpAgent } from '@icp-sdk/core/agent';
 import { Principal } from '@icp-sdk/core/principal';
+import { base64, base64nopad } from '@scure/base';
 import { idlLabelToId } from '@icp-sdk/core/candid';
-import { encodeIcrcAccount } from '@dfinity/ledger-icrc';
-import { Principal as Principal$1 } from '@dfinity/principal';
+import { encodeIcrcAccount } from '@icp-sdk/canisters/ledger/icrc';
 import { validate, Network } from 'bitcoin-address-validation';
 
 // src/client.ts
@@ -1064,17 +1064,68 @@ function executeWith(options) {
     }
   };
 }
-
-// src/core/utils/signature.ts
+var HEX_PREFIX = "0x";
+var HEX_BYTE_CHAR_LENGTH = 2;
+var BASE64_PADDING = "=";
+function normalizeWalletSignature(signature, chain) {
+  switch (chain) {
+    case Chain.BTC:
+      return normalizeBtcSignature(signature);
+    case Chain.ETH:
+      return normalizeHexSignature(signature);
+  }
+}
 function normalizeHexSignature(signature) {
-  if (!signature.startsWith("0x")) {
+  if (!isPrefixedHex(signature)) {
     return signature;
   }
-  const signatureWithoutPrefix = signature.slice(2);
-  if (!/^[0-9a-fA-F]+$/.test(signatureWithoutPrefix)) {
-    return signature;
+  return signature.slice(HEX_PREFIX.length);
+}
+function normalizeBtcSignature(signature) {
+  const signatureWithoutPrefix = signature.startsWith(HEX_PREFIX) ? signature.slice(HEX_PREFIX.length) : signature;
+  if (isHexBytes(signatureWithoutPrefix)) {
+    return signatureWithoutPrefix;
+  }
+  if (signature.startsWith(HEX_PREFIX)) {
+    throw invalidBtcSignatureFormatError();
+  }
+  return bytesToUnprefixedHex(decodeBase64Signature(signature));
+}
+function isHexBytes(signature) {
+  return signature.length > 0 && signature.length % HEX_BYTE_CHAR_LENGTH === 0 && isHex(`${HEX_PREFIX}${signature}`);
+}
+function decodeBase64Signature(signature) {
+  try {
+    const bytes = decodeBase64Bytes(signature);
+    if (bytes.length === 0) {
+      throw invalidBtcSignatureFormatError();
+    }
+    return bytes;
+  } catch (error) {
+    if (error instanceof LiquidiumError) {
+      throw error;
+    }
+    throw invalidBtcSignatureFormatError(error);
+  }
+}
+function bytesToUnprefixedHex(bytes) {
+  return normalizeHexSignature(bytesToHex(bytes));
+}
+function isPrefixedHex(signature) {
+  return signature.length > HEX_PREFIX.length && isHex(signature);
+}
+function decodeBase64Bytes(signature) {
+  if (signature.includes(BASE64_PADDING)) {
+    return base64.decode(signature);
   }
-  return signatureWithoutPrefix;
+  return base64nopad.decode(signature);
+}
+function invalidBtcSignatureFormatError(cause) {
+  return new LiquidiumError(
+    LiquidiumErrorCode.SIGNATURE_ERROR,
+    "BTC signature must be hex or base64-encoded bytes",
+    cause
+  );
 }
 
 // src/modules/accounts/mappers.ts
@@ -1092,7 +1143,10 @@ function mapCreateAccountRequestToRegisterProfileRequest(request) {
     },
     signature_info: {
       Wallet: {
-        signature: normalizeHexSignature(request.signatureInfo.signature),
+        signature: normalizeWalletSignature(
+          request.signatureInfo.signature,
+          request.signatureInfo.chain
+        ),
         chain: mapAccountChainToLendingChainVariant(
           request.signatureInfo.chain
         ),
@@ -3206,7 +3260,7 @@ function getIcrcAccountSupplyTarget(profileId, request) {
     owner: poolPrincipal.toText(),
     subaccount,
     account: encodeIcrcAccount({
-      owner: Principal$1.fromText(poolPrincipal.toText()),
+      owner: poolPrincipal,
       subaccount
     })
   };
@@ -4556,7 +4610,7 @@ function createTransferErc20Transaction(params) {
 }
 function createDepositErc20Transaction(params) {
   const expectedDestinationAccount = encodeIcrcAccount({
-    owner: Principal$1.fromText(params.poolId),
+    owner: Principal.fromText(params.poolId),
     subaccount: encodeInflowSubaccount({
       action: params.action,
       principal: Principal.fromText(params.profileId)
@@ -4868,7 +4922,10 @@ var LendingModule = class {
           },
           signature_info: {
             Wallet: {
-              signature: normalizeHexSignature(signatureInfo.signature),
+              signature: normalizeWalletSignature(
+                signatureInfo.signature,
+                signatureInfo.chain
+              ),
               chain: mapWalletChainToLendingChain(signatureInfo.chain),
               account: request.signerWalletAddress
             }
@@ -5006,7 +5063,10 @@ var LendingModule = class {
         },
         signature_info: {
           Wallet: {
-            signature: normalizeHexSignature(signatureInfo.signature),
+            signature: normalizeWalletSignature(
+              signatureInfo.signature,
+              signatureInfo.chain
+            ),
             chain: mapWalletChainToLendingChain(signatureInfo.chain),
             account: request.signerWalletAddress
           }