@sats-connect/core 0.7.0 → 0.7.1

package/dist/index.d.mts

@@ -1,5 +1,136 @@
 import * as v from 'valibot';
 
+declare enum BitcoinNetworkType {
+    Mainnet = "Mainnet",
+    Testnet = "Testnet",
+    Testnet4 = "Testnet4",
+    Signet = "Signet",
+    Regtest = "Regtest"
+}
+declare enum StacksNetworkType {
+    Mainnet = "mainnet",
+    Testnet = "testnet"
+}
+declare enum StarknetNetworkType {
+    Mainnet = "mainnet",
+    Sepolia = "sepolia"
+}
+interface BitcoinNetwork {
+    type: BitcoinNetworkType;
+    address?: string;
+}
+interface RequestPayload {
+    network: BitcoinNetwork;
+}
+interface RequestOptions<Payload extends RequestPayload, Response> {
+    onFinish: (response: Response) => void;
+    onCancel: () => void;
+    payload: Payload;
+    getProvider?: () => Promise<BitcoinProvider | undefined>;
+}
+declare const RpcIdSchema: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+type RpcId = v.InferOutput<typeof RpcIdSchema>;
+declare const rpcRequestMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly method: v.StringSchema<undefined>;
+    readonly params: v.OptionalSchema<v.UnionSchema<[v.ArraySchema<v.UnknownSchema, undefined>, v.LooseObjectSchema<{}, undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+    readonly id: v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>;
+}, undefined>;
+type RpcRequestMessage = v.InferOutput<typeof rpcRequestMessageSchema>;
+interface RpcBase {
+    jsonrpc: '2.0';
+    id: RpcId;
+}
+interface RpcRequest<T extends string, U> extends RpcBase {
+    method: T;
+    params: U;
+}
+interface MethodParamsAndResult<TParams, TResult> {
+    params: TParams;
+    result: TResult;
+}
+/**
+ * @enum {number} RpcErrorCode
+ * @description JSON-RPC error codes
+ * @see https://www.jsonrpc.org/specification#error_object
+ */
+declare enum RpcErrorCode {
+    /**
+     * Parse error Invalid JSON
+     **/
+    PARSE_ERROR = -32700,
+    /**
+     * The JSON sent is not a valid Request object.
+     **/
+    INVALID_REQUEST = -32600,
+    /**
+     * The method does not exist/is not available.
+     **/
+    METHOD_NOT_FOUND = -32601,
+    /**
+     * Invalid method parameter(s).
+     */
+    INVALID_PARAMS = -32602,
+    /**
+     * Internal JSON-RPC error.
+     * This is a generic error, used when the server encounters an error in performing the request.
+     **/
+    INTERNAL_ERROR = -32603,
+    /**
+     * user rejected/canceled the request
+     */
+    USER_REJECTION = -32000,
+    /**
+     * method is not supported for the address provided
+     */
+    METHOD_NOT_SUPPORTED = -32001,
+    /**
+     * The client does not have permission to access the requested resource.
+     */
+    ACCESS_DENIED = -32002
+}
+declare const rpcSuccessResponseMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>;
+type RpcSuccessResponseMessage = v.InferOutput<typeof rpcSuccessResponseMessageSchema>;
+declare const rpcErrorResponseMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>;
+type RpcErrorResponseMessage = v.InferOutput<typeof rpcErrorResponseMessageSchema>;
+declare const rpcResponseMessageSchema: v.UnionSchema<[v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>, v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>], undefined>;
+type RpcResponseMessage = v.InferOutput<typeof rpcResponseMessageSchema>;
+interface RpcError {
+    code: number | RpcErrorCode;
+    message: string;
+    data?: any;
+}
+interface RpcErrorResponse<TError extends RpcError = RpcError> extends RpcBase {
+    error: TError;
+}
+interface RpcSuccessResponse<Method extends keyof Requests> extends RpcBase {
+    result: Return<Method>;
+}
+type RpcResponse<Method extends keyof Requests> = RpcSuccessResponse<Method> | RpcErrorResponse;
+type RpcResult<Method extends keyof Requests> = {
+    result: RpcSuccessResponse<Method>['result'];
+    status: 'success';
+} | {
+    error: RpcErrorResponse['error'];
+    status: 'error';
+};
+
 declare enum AddressPurpose {
     Ordinals = "ordinals",
     Payment = "payment",
@@ -255,137 +386,6 @@ declare function getDefaultProvider(): string | null;
 declare function removeDefaultProvider(): void;
 declare function getSupportedWallets(): SupportedWallet[];
 
-declare enum BitcoinNetworkType {
-    Mainnet = "Mainnet",
-    Testnet = "Testnet",
-    Testnet4 = "Testnet4",
-    Signet = "Signet",
-    Regtest = "Regtest"
-}
-declare enum StacksNetworkType {
-    Mainnet = "mainnet",
-    Testnet = "testnet"
-}
-declare enum StarknetNetworkType {
-    Mainnet = "mainnet",
-    Sepolia = "sepolia"
-}
-interface BitcoinNetwork {
-    type: BitcoinNetworkType;
-    address?: string;
-}
-interface RequestPayload {
-    network: BitcoinNetwork;
-}
-interface RequestOptions<Payload extends RequestPayload, Response> {
-    onFinish: (response: Response) => void;
-    onCancel: () => void;
-    payload: Payload;
-    getProvider?: () => Promise<BitcoinProvider | undefined>;
-}
-declare const RpcIdSchema: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-type RpcId = v.InferOutput<typeof RpcIdSchema>;
-declare const rpcRequestMessageSchema: v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly method: v.StringSchema<undefined>;
-    readonly params: v.OptionalSchema<v.UnionSchema<[v.ArraySchema<v.UnknownSchema, undefined>, v.LooseObjectSchema<{}, undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-    readonly id: v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>;
-}, undefined>;
-type RpcRequestMessage = v.InferOutput<typeof rpcRequestMessageSchema>;
-interface RpcBase {
-    jsonrpc: '2.0';
-    id: RpcId;
-}
-interface RpcRequest<T extends string, U> extends RpcBase {
-    method: T;
-    params: U;
-}
-interface MethodParamsAndResult<TParams, TResult> {
-    params: TParams;
-    result: TResult;
-}
-/**
- * @enum {number} RpcErrorCode
- * @description JSON-RPC error codes
- * @see https://www.jsonrpc.org/specification#error_object
- */
-declare enum RpcErrorCode {
-    /**
-     * Parse error Invalid JSON
-     **/
-    PARSE_ERROR = -32700,
-    /**
-     * The JSON sent is not a valid Request object.
-     **/
-    INVALID_REQUEST = -32600,
-    /**
-     * The method does not exist/is not available.
-     **/
-    METHOD_NOT_FOUND = -32601,
-    /**
-     * Invalid method parameter(s).
-     */
-    INVALID_PARAMS = -32602,
-    /**
-     * Internal JSON-RPC error.
-     * This is a generic error, used when the server encounters an error in performing the request.
-     **/
-    INTERNAL_ERROR = -32603,
-    /**
-     * user rejected/canceled the request
-     */
-    USER_REJECTION = -32000,
-    /**
-     * method is not supported for the address provided
-     */
-    METHOD_NOT_SUPPORTED = -32001,
-    /**
-     * The client does not have permission to access the requested resource.
-     */
-    ACCESS_DENIED = -32002
-}
-declare const rpcSuccessResponseMessageSchema: v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>;
-type RpcSuccessResponseMessage = v.InferOutput<typeof rpcSuccessResponseMessageSchema>;
-declare const rpcErrorResponseMessageSchema: v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>;
-type RpcErrorResponseMessage = v.InferOutput<typeof rpcErrorResponseMessageSchema>;
-declare const rpcResponseMessageSchema: v.UnionSchema<[v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>, v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>], undefined>;
-type RpcResponseMessage = v.InferOutput<typeof rpcResponseMessageSchema>;
-interface RpcError {
-    code: number | RpcErrorCode;
-    message: string;
-    data?: any;
-}
-interface RpcErrorResponse<TError extends RpcError = RpcError> extends RpcBase {
-    error: TError;
-}
-interface RpcSuccessResponse<Method extends keyof Requests> extends RpcBase {
-    result: Return<Method>;
-}
-type RpcResponse<Method extends keyof Requests> = RpcSuccessResponse<Method> | RpcErrorResponse;
-type RpcResult<Method extends keyof Requests> = {
-    result: RpcSuccessResponse<Method>['result'];
-    status: 'success';
-} | {
-    error: RpcErrorResponse['error'];
-    status: 'error';
-};
-
 declare const getInfoMethodName = "getInfo";
 declare const getInfoParamsSchema: v.NullishSchema<v.NullSchema<undefined>, undefined>;
 type GetInfoParams = v.InferOutput<typeof getInfoParamsSchema>;
@@ -432,18 +432,13 @@ declare const getAddressesResultSchema: v.ObjectSchema<{
     readonly addresses: v.ArraySchema<v.ObjectSchema<{
         readonly address: v.StringSchema<undefined>;
         readonly publicKey: v.StringSchema<undefined>;
-        readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>; /**
-         * [WBIP](https://wbips.netlify.app/wbips/WBIP002) methods supported by the wallet.
-         */
+        readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>;
         readonly addressType: v.EnumSchema<typeof AddressType, undefined>;
         readonly walletType: v.PicklistSchema<readonly ["software", "ledger", "keystone"], undefined>;
     }, undefined>, undefined>;
     readonly network: v.ObjectSchema<{
         readonly bitcoin: v.ObjectSchema<{
-            readonly name: v.EnumSchema<typeof BitcoinNetworkType, undefined>; /**
-             * The purposes for which to generate addresses. See
-             * {@linkcode AddressPurpose} for available purposes.
-             */
+            readonly name: v.EnumSchema<typeof BitcoinNetworkType, undefined>;
         }, undefined>;
         readonly stacks: v.ObjectSchema<{
             readonly name: v.StringSchema<undefined>;
@@ -633,9 +628,7 @@ declare const getAccountsResultSchema: v.ArraySchema<v.ObjectSchema<{
     readonly walletType: v.PicklistSchema<readonly ["software", "ledger", "keystone"], undefined>;
     readonly address: v.StringSchema<undefined>;
     readonly publicKey: v.StringSchema<undefined>;
-    readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>; /**
-     * [WBIP](https://wbips.netlify.app/wbips/WBIP002) methods supported by the wallet.
-     */
+    readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>;
     readonly addressType: v.EnumSchema<typeof AddressType, undefined>;
 }, undefined>, undefined>;
 type GetAccountsResult = v.InferOutput<typeof getAccountsResultSchema>;
@@ -1970,8 +1963,24 @@ type Requests = BtcRequests & StxRequests & RunesRequests & WalletRequests & Ord
 type Return<Method> = Method extends keyof Requests ? Requests[Method]['result'] : never;
 type Params<Method> = Method extends keyof Requests ? Requests[Method]['params'] : never;
 
-declare const request: <Method extends keyof BtcRequests | keyof StxRequests | keyof RunesRequests | keyof WalletRequests | keyof OrdinalsRequests>(method: Method, params: Params<Method>, providerId?: string) => Promise<RpcResult<Method>>;
-declare const addListener: (listenerInfo: ListenerInfo, providerId?: string) => ReturnType<AddListener>;
+declare const request: <Method extends keyof Requests>(method: Method, params: Params<Method>, 
+/**
+ * The providerId is the object path to the provider in the window object.
+ * E.g., a provider available at `window.Foo.BarProvider` would have a
+ * providerId of `Foo.BarProvider`.
+ */
+providerId?: string) => Promise<RpcResult<Method>>;
+/**
+ * Adds an event listener.
+ *
+ * Currently expects 2 arguments, although is also capable of handling legacy
+ * calls with 3 arguments consisting of:
+ *
+ * - event name (string)
+ * - callback (function)
+ * - provider ID (optional string)
+ */
+declare const addListener: (...rawArgs: unknown[]) => ReturnType<AddListener>;
 
 declare abstract class SatsConnectAdapter {
     abstract readonly id: string;
@@ -1990,7 +1999,7 @@ declare abstract class SatsConnectAdapter {
 declare class BaseAdapter extends SatsConnectAdapter {
     id: string;
     constructor(providerId: string);
-    requestInternal: <Method extends keyof BtcRequests | keyof StxRequests | keyof RunesRequests | keyof WalletRequests | keyof OrdinalsRequests>(method: Method, params: Params<Method>) => Promise<RpcResult<Method>>;
+    requestInternal: <Method extends keyof Requests>(method: Method, params: Params<Method>) => Promise<RpcResult<Method>>;
     addListener: AddListener;
 }
 

package/dist/index.d.ts

@@ -1,5 +1,136 @@
 import * as v from 'valibot';
 
+declare enum BitcoinNetworkType {
+    Mainnet = "Mainnet",
+    Testnet = "Testnet",
+    Testnet4 = "Testnet4",
+    Signet = "Signet",
+    Regtest = "Regtest"
+}
+declare enum StacksNetworkType {
+    Mainnet = "mainnet",
+    Testnet = "testnet"
+}
+declare enum StarknetNetworkType {
+    Mainnet = "mainnet",
+    Sepolia = "sepolia"
+}
+interface BitcoinNetwork {
+    type: BitcoinNetworkType;
+    address?: string;
+}
+interface RequestPayload {
+    network: BitcoinNetwork;
+}
+interface RequestOptions<Payload extends RequestPayload, Response> {
+    onFinish: (response: Response) => void;
+    onCancel: () => void;
+    payload: Payload;
+    getProvider?: () => Promise<BitcoinProvider | undefined>;
+}
+declare const RpcIdSchema: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+type RpcId = v.InferOutput<typeof RpcIdSchema>;
+declare const rpcRequestMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly method: v.StringSchema<undefined>;
+    readonly params: v.OptionalSchema<v.UnionSchema<[v.ArraySchema<v.UnknownSchema, undefined>, v.LooseObjectSchema<{}, undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+    readonly id: v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>;
+}, undefined>;
+type RpcRequestMessage = v.InferOutput<typeof rpcRequestMessageSchema>;
+interface RpcBase {
+    jsonrpc: '2.0';
+    id: RpcId;
+}
+interface RpcRequest<T extends string, U> extends RpcBase {
+    method: T;
+    params: U;
+}
+interface MethodParamsAndResult<TParams, TResult> {
+    params: TParams;
+    result: TResult;
+}
+/**
+ * @enum {number} RpcErrorCode
+ * @description JSON-RPC error codes
+ * @see https://www.jsonrpc.org/specification#error_object
+ */
+declare enum RpcErrorCode {
+    /**
+     * Parse error Invalid JSON
+     **/
+    PARSE_ERROR = -32700,
+    /**
+     * The JSON sent is not a valid Request object.
+     **/
+    INVALID_REQUEST = -32600,
+    /**
+     * The method does not exist/is not available.
+     **/
+    METHOD_NOT_FOUND = -32601,
+    /**
+     * Invalid method parameter(s).
+     */
+    INVALID_PARAMS = -32602,
+    /**
+     * Internal JSON-RPC error.
+     * This is a generic error, used when the server encounters an error in performing the request.
+     **/
+    INTERNAL_ERROR = -32603,
+    /**
+     * user rejected/canceled the request
+     */
+    USER_REJECTION = -32000,
+    /**
+     * method is not supported for the address provided
+     */
+    METHOD_NOT_SUPPORTED = -32001,
+    /**
+     * The client does not have permission to access the requested resource.
+     */
+    ACCESS_DENIED = -32002
+}
+declare const rpcSuccessResponseMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>;
+type RpcSuccessResponseMessage = v.InferOutput<typeof rpcSuccessResponseMessageSchema>;
+declare const rpcErrorResponseMessageSchema: v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>;
+type RpcErrorResponseMessage = v.InferOutput<typeof rpcErrorResponseMessageSchema>;
+declare const rpcResponseMessageSchema: v.UnionSchema<[v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>, v.ObjectSchema<{
+    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
+    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
+    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
+}, undefined>], undefined>;
+type RpcResponseMessage = v.InferOutput<typeof rpcResponseMessageSchema>;
+interface RpcError {
+    code: number | RpcErrorCode;
+    message: string;
+    data?: any;
+}
+interface RpcErrorResponse<TError extends RpcError = RpcError> extends RpcBase {
+    error: TError;
+}
+interface RpcSuccessResponse<Method extends keyof Requests> extends RpcBase {
+    result: Return<Method>;
+}
+type RpcResponse<Method extends keyof Requests> = RpcSuccessResponse<Method> | RpcErrorResponse;
+type RpcResult<Method extends keyof Requests> = {
+    result: RpcSuccessResponse<Method>['result'];
+    status: 'success';
+} | {
+    error: RpcErrorResponse['error'];
+    status: 'error';
+};
+
 declare enum AddressPurpose {
     Ordinals = "ordinals",
     Payment = "payment",
@@ -255,137 +386,6 @@ declare function getDefaultProvider(): string | null;
 declare function removeDefaultProvider(): void;
 declare function getSupportedWallets(): SupportedWallet[];
 
-declare enum BitcoinNetworkType {
-    Mainnet = "Mainnet",
-    Testnet = "Testnet",
-    Testnet4 = "Testnet4",
-    Signet = "Signet",
-    Regtest = "Regtest"
-}
-declare enum StacksNetworkType {
-    Mainnet = "mainnet",
-    Testnet = "testnet"
-}
-declare enum StarknetNetworkType {
-    Mainnet = "mainnet",
-    Sepolia = "sepolia"
-}
-interface BitcoinNetwork {
-    type: BitcoinNetworkType;
-    address?: string;
-}
-interface RequestPayload {
-    network: BitcoinNetwork;
-}
-interface RequestOptions<Payload extends RequestPayload, Response> {
-    onFinish: (response: Response) => void;
-    onCancel: () => void;
-    payload: Payload;
-    getProvider?: () => Promise<BitcoinProvider | undefined>;
-}
-declare const RpcIdSchema: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-type RpcId = v.InferOutput<typeof RpcIdSchema>;
-declare const rpcRequestMessageSchema: v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly method: v.StringSchema<undefined>;
-    readonly params: v.OptionalSchema<v.UnionSchema<[v.ArraySchema<v.UnknownSchema, undefined>, v.LooseObjectSchema<{}, undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-    readonly id: v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>;
-}, undefined>;
-type RpcRequestMessage = v.InferOutput<typeof rpcRequestMessageSchema>;
-interface RpcBase {
-    jsonrpc: '2.0';
-    id: RpcId;
-}
-interface RpcRequest<T extends string, U> extends RpcBase {
-    method: T;
-    params: U;
-}
-interface MethodParamsAndResult<TParams, TResult> {
-    params: TParams;
-    result: TResult;
-}
-/**
- * @enum {number} RpcErrorCode
- * @description JSON-RPC error codes
- * @see https://www.jsonrpc.org/specification#error_object
- */
-declare enum RpcErrorCode {
-    /**
-     * Parse error Invalid JSON
-     **/
-    PARSE_ERROR = -32700,
-    /**
-     * The JSON sent is not a valid Request object.
-     **/
-    INVALID_REQUEST = -32600,
-    /**
-     * The method does not exist/is not available.
-     **/
-    METHOD_NOT_FOUND = -32601,
-    /**
-     * Invalid method parameter(s).
-     */
-    INVALID_PARAMS = -32602,
-    /**
-     * Internal JSON-RPC error.
-     * This is a generic error, used when the server encounters an error in performing the request.
-     **/
-    INTERNAL_ERROR = -32603,
-    /**
-     * user rejected/canceled the request
-     */
-    USER_REJECTION = -32000,
-    /**
-     * method is not supported for the address provided
-     */
-    METHOD_NOT_SUPPORTED = -32001,
-    /**
-     * The client does not have permission to access the requested resource.
-     */
-    ACCESS_DENIED = -32002
-}
-declare const rpcSuccessResponseMessageSchema: v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>;
-type RpcSuccessResponseMessage = v.InferOutput<typeof rpcSuccessResponseMessageSchema>;
-declare const rpcErrorResponseMessageSchema: v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>;
-type RpcErrorResponseMessage = v.InferOutput<typeof rpcErrorResponseMessageSchema>;
-declare const rpcResponseMessageSchema: v.UnionSchema<[v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly result: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>, v.ObjectSchema<{
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly error: v.NonOptionalSchema<v.UnknownSchema, undefined>;
-    readonly id: v.OptionalSchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>;
-}, undefined>], undefined>;
-type RpcResponseMessage = v.InferOutput<typeof rpcResponseMessageSchema>;
-interface RpcError {
-    code: number | RpcErrorCode;
-    message: string;
-    data?: any;
-}
-interface RpcErrorResponse<TError extends RpcError = RpcError> extends RpcBase {
-    error: TError;
-}
-interface RpcSuccessResponse<Method extends keyof Requests> extends RpcBase {
-    result: Return<Method>;
-}
-type RpcResponse<Method extends keyof Requests> = RpcSuccessResponse<Method> | RpcErrorResponse;
-type RpcResult<Method extends keyof Requests> = {
-    result: RpcSuccessResponse<Method>['result'];
-    status: 'success';
-} | {
-    error: RpcErrorResponse['error'];
-    status: 'error';
-};
-
 declare const getInfoMethodName = "getInfo";
 declare const getInfoParamsSchema: v.NullishSchema<v.NullSchema<undefined>, undefined>;
 type GetInfoParams = v.InferOutput<typeof getInfoParamsSchema>;
@@ -432,18 +432,13 @@ declare const getAddressesResultSchema: v.ObjectSchema<{
     readonly addresses: v.ArraySchema<v.ObjectSchema<{
         readonly address: v.StringSchema<undefined>;
         readonly publicKey: v.StringSchema<undefined>;
-        readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>; /**
-         * [WBIP](https://wbips.netlify.app/wbips/WBIP002) methods supported by the wallet.
-         */
+        readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>;
         readonly addressType: v.EnumSchema<typeof AddressType, undefined>;
         readonly walletType: v.PicklistSchema<readonly ["software", "ledger", "keystone"], undefined>;
     }, undefined>, undefined>;
     readonly network: v.ObjectSchema<{
         readonly bitcoin: v.ObjectSchema<{
-            readonly name: v.EnumSchema<typeof BitcoinNetworkType, undefined>; /**
-             * The purposes for which to generate addresses. See
-             * {@linkcode AddressPurpose} for available purposes.
-             */
+            readonly name: v.EnumSchema<typeof BitcoinNetworkType, undefined>;
         }, undefined>;
         readonly stacks: v.ObjectSchema<{
             readonly name: v.StringSchema<undefined>;
@@ -633,9 +628,7 @@ declare const getAccountsResultSchema: v.ArraySchema<v.ObjectSchema<{
     readonly walletType: v.PicklistSchema<readonly ["software", "ledger", "keystone"], undefined>;
     readonly address: v.StringSchema<undefined>;
     readonly publicKey: v.StringSchema<undefined>;
-    readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>; /**
-     * [WBIP](https://wbips.netlify.app/wbips/WBIP002) methods supported by the wallet.
-     */
+    readonly purpose: v.EnumSchema<typeof AddressPurpose, undefined>;
     readonly addressType: v.EnumSchema<typeof AddressType, undefined>;
 }, undefined>, undefined>;
 type GetAccountsResult = v.InferOutput<typeof getAccountsResultSchema>;
@@ -1970,8 +1963,24 @@ type Requests = BtcRequests & StxRequests & RunesRequests & WalletRequests & Ord
 type Return<Method> = Method extends keyof Requests ? Requests[Method]['result'] : never;
 type Params<Method> = Method extends keyof Requests ? Requests[Method]['params'] : never;
 
-declare const request: <Method extends keyof BtcRequests | keyof StxRequests | keyof RunesRequests | keyof WalletRequests | keyof OrdinalsRequests>(method: Method, params: Params<Method>, providerId?: string) => Promise<RpcResult<Method>>;
-declare const addListener: (listenerInfo: ListenerInfo, providerId?: string) => ReturnType<AddListener>;
+declare const request: <Method extends keyof Requests>(method: Method, params: Params<Method>, 
+/**
+ * The providerId is the object path to the provider in the window object.
+ * E.g., a provider available at `window.Foo.BarProvider` would have a
+ * providerId of `Foo.BarProvider`.
+ */
+providerId?: string) => Promise<RpcResult<Method>>;
+/**
+ * Adds an event listener.
+ *
+ * Currently expects 2 arguments, although is also capable of handling legacy
+ * calls with 3 arguments consisting of:
+ *
+ * - event name (string)
+ * - callback (function)
+ * - provider ID (optional string)
+ */
+declare const addListener: (...rawArgs: unknown[]) => ReturnType<AddListener>;
 
 declare abstract class SatsConnectAdapter {
     abstract readonly id: string;
@@ -1990,7 +1999,7 @@ declare abstract class SatsConnectAdapter {
 declare class BaseAdapter extends SatsConnectAdapter {
     id: string;
     constructor(providerId: string);
-    requestInternal: <Method extends keyof BtcRequests | keyof StxRequests | keyof RunesRequests | keyof WalletRequests | keyof OrdinalsRequests>(method: Method, params: Params<Method>) => Promise<RpcResult<Method>>;
+    requestInternal: <Method extends keyof Requests>(method: Method, params: Params<Method>) => Promise<RpcResult<Method>>;
     addListener: AddListener;
 }
 

package/dist/index.js

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   AddressPurpose: () => AddressPurpose,
   AddressType: () => AddressType,
   BaseAdapter: () => BaseAdapter,
@@ -213,7 +213,7 @@ __export(src_exports, {
   walletTypeSchema: () => walletTypeSchema,
   walletTypes: () => walletTypes
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/provider/types.ts
 var v4 = __toESM(require("valibot"));
@@ -1414,7 +1414,37 @@ var request = async (method, params, providerId) => {
     }
   };
 };
-var addListener = (listenerInfo, providerId) => {
+var addListener = (...rawArgs) => {
+  const [listenerInfo, providerId] = (() => {
+    if (rawArgs.length === 1) {
+      return [rawArgs[0], void 0];
+    }
+    if (rawArgs.length === 2) {
+      if (typeof rawArgs[1] === "function") {
+        return [
+          {
+            eventName: rawArgs[0],
+            cb: rawArgs[1]
+          },
+          void 0
+        ];
+      } else {
+        return rawArgs;
+      }
+    }
+    if (rawArgs.length === 3) {
+      return [
+        {
+          eventName: rawArgs[0],
+          cb: rawArgs[1]
+        },
+        rawArgs[2]
+      ];
+    }
+    throw new Error("Unexpected number of arguments. Expecting 2 (or 3 for legacy requests).", {
+      cause: rawArgs
+    });
+  })();
   let provider = window.XverseProviders?.BitcoinProvider || window.BitcoinProvider;
   if (providerId) {
     provider = getProviderById(providerId);

package/dist/index.mjs

@@ -1197,7 +1197,37 @@ var request = async (method, params, providerId) => {
     }
   };
 };
-var addListener = (listenerInfo, providerId) => {
+var addListener = (...rawArgs) => {
+  const [listenerInfo, providerId] = (() => {
+    if (rawArgs.length === 1) {
+      return [rawArgs[0], void 0];
+    }
+    if (rawArgs.length === 2) {
+      if (typeof rawArgs[1] === "function") {
+        return [
+          {
+            eventName: rawArgs[0],
+            cb: rawArgs[1]
+          },
+          void 0
+        ];
+      } else {
+        return rawArgs;
+      }
+    }
+    if (rawArgs.length === 3) {
+      return [
+        {
+          eventName: rawArgs[0],
+          cb: rawArgs[1]
+        },
+        rawArgs[2]
+      ];
+    }
+    throw new Error("Unexpected number of arguments. Expecting 2 (or 3 for legacy requests).", {
+      cause: rawArgs
+    });
+  })();
   let provider = window.XverseProviders?.BitcoinProvider || window.BitcoinProvider;
   if (providerId) {
     provider = getProviderById(providerId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sats-connect/core",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",
@@ -8,7 +8,6 @@
     "dist"
   ],
   "scripts": {
-    "test": "jest",
     "build": "tsup",
     "build:watch": "tsup --watch",
     "check-types": "tsc --noEmit",
@@ -27,22 +26,20 @@
   },
   "dependencies": {
     "axios": "1.11.0",
-    "bitcoin-address-validation": "2.2.3",
+    "bitcoin-address-validation": "3.0.0",
     "buffer": "6.0.3",
     "jsontokens": "4.0.1"
   },
   "devDependencies": {
-    "@types/jest": "29.5.14",
-    "husky": "8.0.3",
-    "lint-staged": "13.3.0",
-    "prettier": "3.3.3",
+    "husky": "9.1.7",
+    "lint-staged": "16.1.5",
+    "prettier": "3.6.2",
     "process": "0.11.10",
-    "rimraf": "3.0.2",
+    "rimraf": "6.0.1",
     "stream-browserify": "3.0.0",
-    "ts-jest": "29.2.5",
-    "ts-loader": "9.5.1",
-    "tsup": "8.3.0",
-    "typescript": "5.4.5",
+    "ts-loader": "9.5.4",
+    "tsup": "8.5.0",
+    "typescript": "5.9.2",
     "util": "0.12.5",
     "vm-browserify": "1.1.2"
   },