@sats-connect/core 0.0.11-1501a20 → 0.0.11-2768523

package/dist/index.d.mts

@@ -159,6 +159,8 @@ interface RequestOptions<Payload extends RequestPayload, Response> {
     payload: Payload;
     getProvider?: () => Promise<BitcoinProvider | undefined>;
 }
+declare const RpcIdSchema: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, never>;
+type RpcId = v.InferOutput<typeof RpcIdSchema>;
 declare const rpcRequestMessageSchema: v.ObjectSchema<{
     readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
     readonly method: v.StringSchema<undefined>;
@@ -166,7 +168,6 @@ declare const rpcRequestMessageSchema: v.ObjectSchema<{
     readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, never>;
 }, undefined>;
 type RpcRequestMessage = v.InferOutput<typeof rpcRequestMessageSchema>;
-type RpcId = string | null;
 interface RpcBase {
     jsonrpc: '2.0';
     id: RpcId;
@@ -219,6 +220,25 @@ declare enum RpcErrorCode {
      */
     ACCESS_DENIED = -32002
 }
+declare const rpcSuccessResponseMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly result: v.UnknownSchema;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, never>;
+}, undefined>;
+declare const rpcErrorResponseMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly error: v.UnknownSchema;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, never>;
+}, undefined>;
+declare const rpcResponseMessageSchema: v.UnionSchema<[v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly result: v.UnknownSchema;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, never>;
+}, undefined>, v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly error: v.UnknownSchema;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, never>;
+}, undefined>], undefined>;
 interface RpcError {
     code: number | RpcErrorCode;
     message: string;
@@ -469,10 +489,18 @@ declare const getBalanceMethodName = "getBalance";
 declare const getBalanceParamsSchema: v.UndefinedSchema<undefined>;
 declare const getBalanceResultSchema: v.ObjectSchema<{
     /**
-     * The balance of the wallet in sats.
+     * The confirmed balance of the wallet in sats.
+     */
+    readonly confirmed: v.BigintSchema<undefined>;
+    /**
+     * The unconfirmed balance of the wallet in sats.
+     */
+    readonly unconfirmed: v.BigintSchema<undefined>;
+    /**
+     * The total balance (both confirmed and unconfrimed UTXOs) of the wallet in
+     * sats.
      */
-    readonly confirmedBalance: v.BigintSchema<undefined>;
-    readonly unconfirmedUtxosBalance: v.BigintSchema<undefined>;
+    readonly total: v.BigintSchema<undefined>;
 }, undefined>;
 declare const getBalanceSchema: v.ObjectSchema<{
     readonly method: v.LiteralSchema<"getBalance", undefined>;
@@ -870,4 +898,4 @@ declare class BaseAdapter extends SatsConnectAdapter {
 declare const DefaultAdaptersInfo: Record<string, Provider>;
 declare const defaultAdapters: Record<string, new () => SatsConnectAdapter>;
 
-export { type Address$1 as Address, AddressPurpose, AddressType, BaseAdapter, type BitcoinNetwork, BitcoinNetworkType, type BitcoinProvider, type BtcRequestMethod, type BtcRequests, type CallContractParams, type CallContractResult, type Capability, type Connect, type CreateInscriptionOptions, type CreateInscriptionPayload, type CreateInscriptionResponse, type CreateRepeatInscriptionsOptions, type CreateRepeatInscriptionsPayload, type CreateRepeatInscriptionsResponse, DefaultAdaptersInfo, type DeployContractParams, type DeployContractResult, type Disconnect, type GetAccounts, type GetAccountsResult, type GetAddressOptions, type GetAddressPayload, type GetAddressResponse, type GetAddresses, type GetAddressesParams, type GetAddressesResult, type GetBalance, type GetCapabilitiesOptions, type GetCapabilitiesPayload, type GetCapabilitiesResponse, type GetInfo, type InputToSign, type MethodParamsAndResult, type Params, type Provider, type PsbtPayload, type Recipient$2 as Recipient, type RequestOptions, type RequestPayload, type Requests, type Return, type RpcBase, type RpcError, RpcErrorCode, type RpcErrorResponse, type RpcId, type RpcRequest, type RpcRequestMessage, type RpcResponse, type RpcResult, type RpcSuccessResponse, type RunesRequestMethod, type RunesRequests, SatsConnectAdapter, type SendBtcTransactionOptions, type SendBtcTransactionPayload, type SendBtcTransactionResponse, type SendTransfer, type SendTransferParams, type SerializedRecipient, type SerializedSendBtcTransactionPayload, type SignMessage, type SignMessageOptions, type SignMessagePayload, type SignMessageResponse, type SignMultiplePsbtPayload, type SignMultipleTransactionOptions, type SignMultipleTransactionsPayload, type SignMultipleTransactionsResponse, type SignPsbt, type SignPsbtParams, type SignPsbtResult, type SignStructuredMessageResult, type SignStxMessageParams, type SignStxMessageResult, type SignTransactionOptions, type SignTransactionParams, type SignTransactionPayload, type SignTransactionResponse, type SignTransactionResult, type StxCallContract, type StxDeployContract, type StxGetAccounts, type StxGetAddresses, type StxRequestMethod, type StxRequests, type StxSignStructuredMessage, type StxSignStxMessage, type StxSignTransaction, type StxTransferStx, type SupportedWallet, type TransferStxParams, type TransferStxResult, type WalletMethods, addressSchema, connectMethodName, connectParamsSchema, connectResultSchema, connectSchema, createInscription, createRepeatInscriptions, defaultAdapters, disconnectMethodName, disconnectParamsSchema, disconnectResultSchema, disconnectSchema, getAccountsMethodName, getAccountsParamsSchema, getAccountsRequestMessageSchema, getAccountsResultSchema, getAddress, getAddressesMethodName, getAddressesParamsSchema, getAddressesRequestMessageSchema, getAddressesResultSchema, getBalanceMethodName, getBalanceParamsSchema, getBalanceResultSchema, getBalanceSchema, getCapabilities, getDefaultProvider, getInfoMethodName, getInfoParamsSchema, getInfoResultSchema, getInfoSchema, getProviderById, getProviderOrThrow, getProviders, getSupportedWallets, isProviderInstalled, removeDefaultProvider, request, rpcRequestMessageSchema, sendBtcTransaction, setDefaultProvider, signMessage, signMessageMethodName, signMessageParamsSchema, signMessageRequestMessageSchema, signMessageResultSchema, signMultipleTransactions, signTransaction };
+export { type Address$1 as Address, AddressPurpose, AddressType, BaseAdapter, type BitcoinNetwork, BitcoinNetworkType, type BitcoinProvider, type BtcRequestMethod, type BtcRequests, type CallContractParams, type CallContractResult, type Capability, type Connect, type CreateInscriptionOptions, type CreateInscriptionPayload, type CreateInscriptionResponse, type CreateRepeatInscriptionsOptions, type CreateRepeatInscriptionsPayload, type CreateRepeatInscriptionsResponse, DefaultAdaptersInfo, type DeployContractParams, type DeployContractResult, type Disconnect, type GetAccounts, type GetAccountsResult, type GetAddressOptions, type GetAddressPayload, type GetAddressResponse, type GetAddresses, type GetAddressesParams, type GetAddressesResult, type GetBalance, type GetCapabilitiesOptions, type GetCapabilitiesPayload, type GetCapabilitiesResponse, type GetInfo, type InputToSign, type MethodParamsAndResult, type Params, type Provider, type PsbtPayload, type Recipient$2 as Recipient, type RequestOptions, type RequestPayload, type Requests, type Return, type RpcBase, type RpcError, RpcErrorCode, type RpcErrorResponse, type RpcId, RpcIdSchema, type RpcRequest, type RpcRequestMessage, type RpcResponse, type RpcResult, type RpcSuccessResponse, type RunesRequestMethod, type RunesRequests, SatsConnectAdapter, type SendBtcTransactionOptions, type SendBtcTransactionPayload, type SendBtcTransactionResponse, type SendTransfer, type SendTransferParams, type SerializedRecipient, type SerializedSendBtcTransactionPayload, type SignMessage, type SignMessageOptions, type SignMessagePayload, type SignMessageResponse, type SignMultiplePsbtPayload, type SignMultipleTransactionOptions, type SignMultipleTransactionsPayload, type SignMultipleTransactionsResponse, type SignPsbt, type SignPsbtParams, type SignPsbtResult, type SignStructuredMessageResult, type SignStxMessageParams, type SignStxMessageResult, type SignTransactionOptions, type SignTransactionParams, type SignTransactionPayload, type SignTransactionResponse, type SignTransactionResult, type StxCallContract, type StxDeployContract, type StxGetAccounts, type StxGetAddresses, type StxRequestMethod, type StxRequests, type StxSignStructuredMessage, type StxSignStxMessage, type StxSignTransaction, type StxTransferStx, type SupportedWallet, type TransferStxParams, type TransferStxResult, type WalletMethods, addressSchema, connectMethodName, connectParamsSchema, connectResultSchema, connectSchema, createInscription, createRepeatInscriptions, defaultAdapters, disconnectMethodName, disconnectParamsSchema, disconnectResultSchema, disconnectSchema, getAccountsMethodName, getAccountsParamsSchema, getAccountsRequestMessageSchema, getAccountsResultSchema, getAddress, getAddressesMethodName, getAddressesParamsSchema, getAddressesRequestMessageSchema, getAddressesResultSchema, getBalanceMethodName, getBalanceParamsSchema, getBalanceResultSchema, getBalanceSchema, getCapabilities, getDefaultProvider, getInfoMethodName, getInfoParamsSchema, getInfoResultSchema, getInfoSchema, getProviderById, getProviderOrThrow, getProviders, getSupportedWallets, isProviderInstalled, removeDefaultProvider, request, rpcErrorResponseMessageSchema, rpcRequestMessageSchema, rpcResponseMessageSchema, rpcSuccessResponseMessageSchema, sendBtcTransaction, setDefaultProvider, signMessage, signMessageMethodName, signMessageParamsSchema, signMessageRequestMessageSchema, signMessageResultSchema, signMultipleTransactions, signTransaction };

package/dist/index.mjs

@@ -6,6 +6,7 @@ var BitcoinNetworkType = /* @__PURE__ */ ((BitcoinNetworkType2) => {
   BitcoinNetworkType2["Signet"] = "Signet";
   return BitcoinNetworkType2;
 })(BitcoinNetworkType || {});
+var RpcIdSchema = v.optional(v.union([v.string(), v.number(), v.null()]));
 var rpcRequestMessageSchema = v.object({
   jsonrpc: v.literal("2.0"),
   method: v.string(),
@@ -20,7 +21,7 @@ var rpcRequestMessageSchema = v.object({
       v.null()
     ])
   ),
-  id: v.optional(v.union([v.string(), v.number(), v.null()]))
+  id: RpcIdSchema
 });
 var RpcErrorCode = /* @__PURE__ */ ((RpcErrorCode2) => {
   RpcErrorCode2[RpcErrorCode2["PARSE_ERROR"] = -32700] = "PARSE_ERROR";
@@ -33,6 +34,20 @@ var RpcErrorCode = /* @__PURE__ */ ((RpcErrorCode2) => {
   RpcErrorCode2[RpcErrorCode2["ACCESS_DENIED"] = -32002] = "ACCESS_DENIED";
   return RpcErrorCode2;
 })(RpcErrorCode || {});
+var rpcSuccessResponseMessageSchema = v.object({
+  jsonrpc: v.literal("2.0"),
+  result: v.unknown(),
+  id: RpcIdSchema
+});
+var rpcErrorResponseMessageSchema = v.object({
+  jsonrpc: v.literal("2.0"),
+  error: v.unknown(),
+  id: RpcIdSchema
+});
+var rpcResponseMessageSchema = v.union([
+  rpcSuccessResponseMessageSchema,
+  rpcErrorResponseMessageSchema
+]);
 
 // src/runes/api.ts
 import axios from "axios";
@@ -510,6 +525,9 @@ function getSupportedWallets() {
   return wallets;
 }
 
+// src/request/index.ts
+import * as v5 from "valibot";
+
 // src/addresses/index.ts
 import { createUnsecuredToken } from "jsontokens";
 
@@ -654,10 +672,18 @@ var getBalanceMethodName = "getBalance";
 var getBalanceParamsSchema = v3.undefined();
 var getBalanceResultSchema = v3.object({
   /**
-   * The balance of the wallet in sats.
+   * The confirmed balance of the wallet in sats.
+   */
+  confirmed: v3.bigint(),
+  /**
+   * The unconfirmed balance of the wallet in sats.
+   */
+  unconfirmed: v3.bigint(),
+  /**
+   * The total balance (both confirmed and unconfrimed UTXOs) of the wallet in
+   * sats.
    */
-  confirmedBalance: v3.bigint(),
-  unconfirmedUtxosBalance: v3.bigint()
+  total: v3.bigint()
 });
 var getBalanceSchema = v3.object({
   ...rpcRequestMessageSchema.entries,
@@ -705,20 +731,29 @@ var request = async (method, params, providerId) => {
     throw new Error("A wallet method is required");
   }
   const response = await provider.request(method, params);
-  if (isRpcSuccessResponse(response)) {
+  const parseResult = v5.safeParse(rpcResponseMessageSchema, response);
+  if (!parseResult.success) {
     return {
-      status: "success",
-      result: response.result
+      status: "error",
+      error: {
+        code: -32603 /* INTERNAL_ERROR */,
+        message: "Received unknown response from provider.",
+        data: response
+      }
+    };
+  }
+  const parsedResponse = parseResult.output;
+  if ("error" in parsedResponse) {
+    return {
+      status: "error",
+      error: parsedResponse.error
     };
   }
   return {
-    status: "error",
-    error: response.error
+    status: "success",
+    result: parsedResponse.result
   };
 };
-var isRpcSuccessResponse = (response) => {
-  return Object.hasOwn(response, "result") && !!response.result;
-};
 
 // src/adapters/xverse.ts
 var XverseAdapter = class extends SatsConnectAdapter {
@@ -1134,6 +1169,7 @@ export {
   BitcoinNetworkType,
   DefaultAdaptersInfo,
   RpcErrorCode,
+  RpcIdSchema,
   SatsConnectAdapter,
   addressSchema,
   connectMethodName,
@@ -1173,7 +1209,10 @@ export {
   isProviderInstalled,
   removeDefaultProvider,
   request,
+  rpcErrorResponseMessageSchema,
   rpcRequestMessageSchema,
+  rpcResponseMessageSchema,
+  rpcSuccessResponseMessageSchema,
   sendBtcTransaction,
   setDefaultProvider,
   signMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sats-connect/core",
-  "version": "0.0.11-1501a20",
+  "version": "0.0.11-2768523",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",