@sats-connect/core 0.3.0-ab35817 → 0.3.0-f1e4d08

package/dist/index.d.mts

@@ -319,6 +319,9 @@ interface GetAddressResponse {
 }
 type GetAddressOptions = RequestOptions<GetAddressPayload, GetAddressResponse>;
 
+/**
+ * @deprecated Use `request()` instead
+ */
 declare const getAddress: (options: GetAddressOptions) => Promise<void>;
 
 declare const getInfoMethodName = "getInfo";
@@ -486,11 +489,6 @@ type SignPsbtParams = {
      * The key is the address and the value is an array of indexes of the inputs to sign.
      */
     signInputs: Record<string, number[]>;
-    /**
-     * the sigHash type to use for signing.
-     * will default to the sighash type of the input if not provided.
-     **/
-    allowedSignHash?: number;
     /**
      * Whether to broadcast the transaction after signing.
      **/
@@ -1076,16 +1074,6 @@ declare const getWalletTypeRequestMessageSchema: v.ObjectSchema<{
     readonly params: v.OptionalSchema<v.UnionSchema<[v.ArraySchema<v.UnknownSchema, undefined>, v.LooseObjectSchema<{}, undefined>, v.NullSchema<undefined>], undefined>, never>;
 }, undefined>;
 type GetWalletType = MethodParamsAndResult<v.InferOutput<typeof getWalletTypeParamsSchema>, v.InferOutput<typeof getWalletTypeResultSchema>>;
-declare const getPermissionsMethodName = "wallet_getPermissions";
-declare const getPermissionsParamsSchema: v.NullishSchema<v.NullSchema<undefined>, never>;
-declare const getPermissionsResultSchema: v.ArraySchema<v.StringSchema<undefined>, undefined>;
-declare const getPermissionsRequestMessageSchema: v.ObjectSchema<{
-    readonly method: v.LiteralSchema<"wallet_getPermissions", undefined>;
-    readonly id: v.StringSchema<undefined>;
-    readonly jsonrpc: v.LiteralSchema<"2.0", undefined>;
-    readonly params: v.OptionalSchema<v.UnionSchema<[v.ArraySchema<v.UnknownSchema, undefined>, v.LooseObjectSchema<{}, undefined>, v.NullSchema<undefined>], undefined>, never>;
-}, undefined>;
-type GetPermissions = MethodParamsAndResult<v.InferOutput<typeof getPermissionsParamsSchema>, v.InferOutput<typeof getPermissionsResultSchema>>;
 
 declare const walletTypes: readonly ["software", "ledger"];
 declare const walletTypeSchema: v.PicklistSchema<readonly ["software", "ledger"], undefined>;
@@ -1133,7 +1121,6 @@ interface WalletRequests {
     wallet_requestPermissions: RequestPermissions;
     wallet_renouncePermissions: RenouncePermissions;
     wallet_getWalletType: GetWalletType;
-    wallet_getPermissions: GetPermissions;
 }
 type Requests = BtcRequests & StxRequests & RunesRequests & WalletRequests & OrdinalsRequests;
 type Return<Method> = Method extends keyof Requests ? Requests[Method]['result'] : never;
@@ -1166,4 +1153,4 @@ declare class BaseAdapter extends SatsConnectAdapter {
 declare const DefaultAdaptersInfo: Record<string, Provider>;
 declare const defaultAdapters: Record<string, new () => SatsConnectAdapter>;
 
-export { type AccountChangeEvent, type AddListener, type Address$1 as Address, AddressPurpose, AddressType, BaseAdapter, type BitcoinNetwork, BitcoinNetworkType, type BitcoinProvider, type BtcRequestMethod, type BtcRequests, type CallContractParams, type CallContractResult, type Capability, type CreateInscriptionOptions, type CreateInscriptionPayload, type CreateInscriptionResponse, type CreateRepeatInscriptionsOptions, type CreateRepeatInscriptionsPayload, type CreateRepeatInscriptionsResponse, DefaultAdaptersInfo, type DeployContractParams, type DeployContractResult, type DisconnectEvent, type EstimateRbfOrder, type EstimateRunesEtch, type EstimateRunesEtchParams, type EstimateRunesEtchResult, type EstimateRunesMint, type EstimateRunesMintParams, type EstimateRunesMintResult, type EtchRunes, type EtchRunesParams, type EtchRunesResult, type GetAccounts, type GetAccountsParams, type GetAccountsRequestMessage, type GetAccountsResult, type GetAddressOptions, type GetAddressPayload, type GetAddressResponse, type GetAddresses, type GetAddressesParams, type GetAddressesRequestMessage, type GetAddressesResult, type GetBalance, type GetCapabilitiesOptions, type GetCapabilitiesPayload, type GetCapabilitiesResponse, type GetInfo, type GetInfoParams, type GetInfoRequestMessage, type GetInfoResult, type GetInscriptions, type GetOrder, type GetPermissions, type GetRunesBalance, type GetRunesBalanceParams, type GetRunesBalanceRequestMessage, type GetRunesBalanceResult, type GetWalletType, type InputToSign, MessageSigningProtocols, type MethodParamsAndResult, type MintRunes, type MintRunesParams, type MintRunesResult, type NetworkChangeEvent, type OrdinalsRequestMethod, type OrdinalsRequests, type Params, type Provider, type PsbtPayload, type RbfOrder, type Recipient$2 as Recipient, type RenouncePermissions, type RequestOptions, type RequestPayload, type RequestPermissions, type Requests, type Return, type RpcBase, type RpcError, RpcErrorCode, type RpcErrorResponse, type RpcErrorResponseMessage, type RpcId, RpcIdSchema, type RpcRequest, type RpcRequestMessage, type RpcResponse, type RpcResponseMessage, type RpcResult, type RpcSuccessResponse, type RpcSuccessResponseMessage, type RunesRequestMethod, type RunesRequests, SatsConnectAdapter, type SendBtcTransactionOptions, type SendBtcTransactionPayload, type SendBtcTransactionResponse, type SendInscriptions, type SendTransfer, type SendTransferParams, type SerializedRecipient, type SerializedSendBtcTransactionPayload, type SignMessage, type SignMessageOptions, type SignMessageParams, type SignMessagePayload, type SignMessageRequestMessage, type SignMessageResponse, type SignMessageResult, type SignMultiplePsbtPayload, type SignMultipleTransactionOptions, type SignMultipleTransactionsPayload, type SignMultipleTransactionsResponse, type SignPsbt, type SignPsbtParams, type SignPsbtResult, type SignStructuredMessageResult, type SignStxMessageParams, type SignStxMessageResult, type SignTransactionOptions, type SignTransactionPayload, type SignTransactionResponse, type StxCallContract, type StxDeployContract, type StxGetAccounts, type StxGetAccountsResult, type StxGetAddresses, type StxGetAddressesParams, type StxGetAddressesRequestMessage, type StxGetAddressesResult, type StxRequestMethod, type StxRequests, type StxSignStructuredMessage, type StxSignStxMessage, type StxSignTransaction, type StxSignTransactionParams, type StxSignTransactionRequestMessage, type StxSignTransactionResult, type StxTransferStx, type SupportedWallet, type TransferRunes, type TransferRunesParams, type TransferRunesRequest, type TransferRunesResult, TransferRunesResultSchema, type TransferStxParams, type TransferStxResult, type WalletEvent, type WalletRequests, type WalletType, accountChangeEventName, accountChangeSchema, addListener, addressSchema, createInscription, createRepeatInscriptions, defaultAdapters, disconnectEventName, disconnectSchema, getAccountsMethodName, getAccountsParamsSchema, getAccountsRequestMessageSchema, getAccountsResultSchema, getAddress, getAddressesMethodName, getAddressesParamsSchema, getAddressesRequestMessageSchema, getAddressesResultSchema, getBalanceMethodName, getBalanceParamsSchema, getBalanceRequestMessageSchema, getBalanceResultSchema, getCapabilities, getDefaultProvider, getInfoMethodName, getInfoParamsSchema, getInfoRequestMessageSchema, getInfoResultSchema, getInscriptionsMethodName, getInscriptionsParamsSchema, getInscriptionsResultSchema, getInscriptionsSchema, getPermissionsMethodName, getPermissionsParamsSchema, getPermissionsRequestMessageSchema, getPermissionsResultSchema, getProviderById, getProviderOrThrow, getProviders, getRunesBalanceMethodName, getRunesBalanceParamsSchema, getRunesBalanceRequestMessageSchema, getRunesBalanceResultSchema, getSupportedWallets, getWalletTypeMethodName, getWalletTypeParamsSchema, getWalletTypeRequestMessageSchema, getWalletTypeResultSchema, isProviderInstalled, networkChangeEventName, networkChangeSchema, removeDefaultProvider, renouncePermissionsMethodName, renouncePermissionsParamsSchema, renouncePermissionsRequestMessageSchema, renouncePermissionsResultSchema, request, requestPermissionsMethodName, requestPermissionsParamsSchema, requestPermissionsRequestMessageSchema, requestPermissionsResultSchema, rpcErrorResponseMessageSchema, rpcRequestMessageSchema, rpcResponseMessageSchema, rpcSuccessResponseMessageSchema, sendBtcTransaction, sendInscriptionsMethodName, sendInscriptionsParamsSchema, sendInscriptionsResultSchema, sendInscriptionsSchema, setDefaultProvider, signMessage, signMessageMethodName, signMessageParamsSchema, signMessageRequestMessageSchema, signMessageResultSchema, signMultipleTransactions, signTransaction, stxGetAddressesMethodName, stxGetAddressesParamsSchema, stxGetAddressesRequestMessageSchema, stxGetAddressesResultSchema, stxSignTransactionMethodName, stxSignTransactionParamsSchema, stxSignTransactionRequestMessageSchema, stxSignTransactionResultSchema, transferRunesMethodName, transferRunesParamsSchema, transferRunesRequestSchema, walletEventSchema, walletTypeSchema, walletTypes };
+export { type AccountChangeEvent, type AddListener, type Address$1 as Address, AddressPurpose, AddressType, BaseAdapter, type BitcoinNetwork, BitcoinNetworkType, type BitcoinProvider, type BtcRequestMethod, type BtcRequests, type CallContractParams, type CallContractResult, type Capability, type CreateInscriptionOptions, type CreateInscriptionPayload, type CreateInscriptionResponse, type CreateRepeatInscriptionsOptions, type CreateRepeatInscriptionsPayload, type CreateRepeatInscriptionsResponse, DefaultAdaptersInfo, type DeployContractParams, type DeployContractResult, type DisconnectEvent, type EstimateRbfOrder, type EstimateRunesEtch, type EstimateRunesEtchParams, type EstimateRunesEtchResult, type EstimateRunesMint, type EstimateRunesMintParams, type EstimateRunesMintResult, type EtchRunes, type EtchRunesParams, type EtchRunesResult, type GetAccounts, type GetAccountsParams, type GetAccountsRequestMessage, type GetAccountsResult, type GetAddressOptions, type GetAddressPayload, type GetAddressResponse, type GetAddresses, type GetAddressesParams, type GetAddressesRequestMessage, type GetAddressesResult, type GetBalance, type GetCapabilitiesOptions, type GetCapabilitiesPayload, type GetCapabilitiesResponse, type GetInfo, type GetInfoParams, type GetInfoRequestMessage, type GetInfoResult, type GetInscriptions, type GetOrder, type GetRunesBalance, type GetRunesBalanceParams, type GetRunesBalanceRequestMessage, type GetRunesBalanceResult, type GetWalletType, type InputToSign, MessageSigningProtocols, type MethodParamsAndResult, type MintRunes, type MintRunesParams, type MintRunesResult, type NetworkChangeEvent, type OrdinalsRequestMethod, type OrdinalsRequests, type Params, type Provider, type PsbtPayload, type RbfOrder, type Recipient$2 as Recipient, type RenouncePermissions, type RequestOptions, type RequestPayload, type RequestPermissions, type Requests, type Return, type RpcBase, type RpcError, RpcErrorCode, type RpcErrorResponse, type RpcErrorResponseMessage, type RpcId, RpcIdSchema, type RpcRequest, type RpcRequestMessage, type RpcResponse, type RpcResponseMessage, type RpcResult, type RpcSuccessResponse, type RpcSuccessResponseMessage, type RunesRequestMethod, type RunesRequests, SatsConnectAdapter, type SendBtcTransactionOptions, type SendBtcTransactionPayload, type SendBtcTransactionResponse, type SendInscriptions, type SendTransfer, type SendTransferParams, type SerializedRecipient, type SerializedSendBtcTransactionPayload, type SignMessage, type SignMessageOptions, type SignMessageParams, type SignMessagePayload, type SignMessageRequestMessage, type SignMessageResponse, type SignMessageResult, type SignMultiplePsbtPayload, type SignMultipleTransactionOptions, type SignMultipleTransactionsPayload, type SignMultipleTransactionsResponse, type SignPsbt, type SignPsbtParams, type SignPsbtResult, type SignStructuredMessageResult, type SignStxMessageParams, type SignStxMessageResult, type SignTransactionOptions, type SignTransactionPayload, type SignTransactionResponse, type StxCallContract, type StxDeployContract, type StxGetAccounts, type StxGetAccountsResult, type StxGetAddresses, type StxGetAddressesParams, type StxGetAddressesRequestMessage, type StxGetAddressesResult, type StxRequestMethod, type StxRequests, type StxSignStructuredMessage, type StxSignStxMessage, type StxSignTransaction, type StxSignTransactionParams, type StxSignTransactionRequestMessage, type StxSignTransactionResult, type StxTransferStx, type SupportedWallet, type TransferRunes, type TransferRunesParams, type TransferRunesRequest, type TransferRunesResult, TransferRunesResultSchema, type TransferStxParams, type TransferStxResult, type WalletEvent, type WalletRequests, type WalletType, accountChangeEventName, accountChangeSchema, addListener, addressSchema, createInscription, createRepeatInscriptions, defaultAdapters, disconnectEventName, disconnectSchema, getAccountsMethodName, getAccountsParamsSchema, getAccountsRequestMessageSchema, getAccountsResultSchema, getAddress, getAddressesMethodName, getAddressesParamsSchema, getAddressesRequestMessageSchema, getAddressesResultSchema, getBalanceMethodName, getBalanceParamsSchema, getBalanceRequestMessageSchema, getBalanceResultSchema, getCapabilities, getDefaultProvider, getInfoMethodName, getInfoParamsSchema, getInfoRequestMessageSchema, getInfoResultSchema, getInscriptionsMethodName, getInscriptionsParamsSchema, getInscriptionsResultSchema, getInscriptionsSchema, getProviderById, getProviderOrThrow, getProviders, getRunesBalanceMethodName, getRunesBalanceParamsSchema, getRunesBalanceRequestMessageSchema, getRunesBalanceResultSchema, getSupportedWallets, getWalletTypeMethodName, getWalletTypeParamsSchema, getWalletTypeRequestMessageSchema, getWalletTypeResultSchema, isProviderInstalled, networkChangeEventName, networkChangeSchema, removeDefaultProvider, renouncePermissionsMethodName, renouncePermissionsParamsSchema, renouncePermissionsRequestMessageSchema, renouncePermissionsResultSchema, request, requestPermissionsMethodName, requestPermissionsParamsSchema, requestPermissionsRequestMessageSchema, requestPermissionsResultSchema, rpcErrorResponseMessageSchema, rpcRequestMessageSchema, rpcResponseMessageSchema, rpcSuccessResponseMessageSchema, sendBtcTransaction, sendInscriptionsMethodName, sendInscriptionsParamsSchema, sendInscriptionsResultSchema, sendInscriptionsSchema, setDefaultProvider, signMessage, signMessageMethodName, signMessageParamsSchema, signMessageRequestMessageSchema, signMessageResultSchema, signMultipleTransactions, signTransaction, stxGetAddressesMethodName, stxGetAddressesParamsSchema, stxGetAddressesRequestMessageSchema, stxGetAddressesResultSchema, stxSignTransactionMethodName, stxSignTransactionParamsSchema, stxSignTransactionRequestMessageSchema, stxSignTransactionResultSchema, transferRunesMethodName, transferRunesParamsSchema, transferRunesRequestSchema, walletEventSchema, walletTypeSchema, walletTypes };

package/dist/index.mjs

@@ -1,6 +1,3 @@
-// src/provider/index.ts
-import omit from "lodash.omit";
-
 // src/provider/types.ts
 import * as v from "valibot";
 var accountChangeEventName = "accountChange";
@@ -50,11 +47,9 @@ function removeDefaultProvider() {
   localStorage.removeItem("sats-connect_defaultProvider");
 }
 function getSupportedWallets() {
-  const btc_providers = getProviders();
-  const allProviders = [...btc_providers];
-  for (const key in omit(DefaultAdaptersInfo, ["xverse"])) {
-    allProviders.push(DefaultAdaptersInfo[key]);
-  }
+  const ambientProviders = getProviders();
+  const { xverse, ...defaultProviders } = DefaultAdaptersInfo;
+  const allProviders = [...ambientProviders, ...Object.values(defaultProviders)];
   const wallets = allProviders.map((provider) => {
     {
       return {
@@ -120,6 +115,9 @@ var rpcResponseMessageSchema = v2.union([
 // src/request/index.ts
 import * as v10 from "valibot";
 
+// src/request/types/stxMethods.ts
+import * as v4 from "valibot";
+
 // src/addresses/index.ts
 import { createUnsecuredToken } from "jsontokens";
 
@@ -165,7 +163,6 @@ var getAddress = async (options) => {
 };
 
 // src/request/types/stxMethods.ts
-import * as v4 from "valibot";
 var stxGetAddressesMethodName = "stx_getAddresses";
 var stxGetAddressesParamsSchema = v4.nullish(
   v4.object({
@@ -417,16 +414,6 @@ var getWalletTypeRequestMessageSchema = v7.object({
     id: v7.string()
   }).entries
 });
-var getPermissionsMethodName = "wallet_getPermissions";
-var getPermissionsParamsSchema = v7.nullish(v7.null());
-var getPermissionsResultSchema = v7.array(v7.string());
-var getPermissionsRequestMessageSchema = v7.object({
-  ...rpcRequestMessageSchema.entries,
-  ...v7.object({
-    method: v7.literal(getPermissionsMethodName),
-    id: v7.string()
-  }).entries
-});
 
 // src/request/types/runesMethods.ts
 import * as v8 from "valibot";
@@ -1059,17 +1046,16 @@ var XverseAdapter = class extends SatsConnectAdapter {
 };
 
 // src/adapters/unisat.ts
-import { Buffer } from "buffer";
 import { AddressType as AddressType2, getAddressInfo } from "bitcoin-address-validation";
-function convertSignInputsToInputType(signInputs, allowedSignHash) {
+import { Buffer } from "buffer";
+function convertSignInputsToInputType(signInputs) {
   let result = [];
   for (let address in signInputs) {
     let indexes = signInputs[address];
     for (let index of indexes) {
       result.push({
         index,
-        address,
-        sighashTypes: allowedSignHash ? [allowedSignHash] : void 0
+        address
       });
     }
   }
@@ -1101,10 +1087,10 @@ var UnisatAdapter = class extends SatsConnectAdapter {
     };
     const response = [];
     if (purposes.includes("payment" /* Payment */)) {
-      response.push(paymentAddress);
+      response.push({ ...paymentAddress, walletType: "software" });
     }
     if (purposes.includes("ordinals" /* Ordinals */)) {
-      response.push(ordinalsAddress);
+      response.push({ ...ordinalsAddress, walletType: "software" });
     }
     return response;
   }
@@ -1117,14 +1103,16 @@ var UnisatAdapter = class extends SatsConnectAdapter {
       return {
         address,
         messageHash: "",
-        signature: response2
+        signature: response2,
+        protocol: "BIP322" /* BIP322 */
       };
     }
     const response = await window.unisat.signMessage(message, "ecdsa");
     return {
       address,
       messageHash: "",
-      signature: response
+      signature: response,
+      protocol: "ECDSA" /* ECDSA */
     };
   }
   async sendTransfer(params) {
@@ -1138,11 +1126,11 @@ var UnisatAdapter = class extends SatsConnectAdapter {
     };
   }
   async signPsbt(params) {
-    const { psbt, signInputs, allowedSignHash, broadcast } = params;
+    const { psbt, signInputs, broadcast } = params;
     const psbtHex = Buffer.from(psbt, "base64").toString("hex");
     const signedPsbt = await window.unisat.signPsbt(psbtHex, {
       autoFinalized: broadcast,
-      toSignInputs: convertSignInputsToInputType(signInputs, allowedSignHash)
+      toSignInputs: convertSignInputsToInputType(signInputs)
     });
     if (broadcast) {
       const txid = await window.unisat.pushPsbt(psbtHex);
@@ -1212,6 +1200,33 @@ var UnisatAdapter = class extends SatsConnectAdapter {
       };
     }
   };
+  addListener = (eventName, cb) => {
+    switch (eventName) {
+      case "accountChange": {
+        const handler = () => {
+          cb({ type: "accountChange" });
+        };
+        window.unisat.on("accountsChanged", handler);
+        return () => {
+          window.unisat.removeListener("accountsChanged", handler);
+        };
+      }
+      case "networkChange": {
+        const handler = () => {
+          cb({ type: "networkChange" });
+        };
+        window.unisat.on("networkChanged", handler);
+        return () => {
+          window.unisat.removeListener("networkChanged", handler);
+        };
+      }
+      default: {
+        console.error("Event not supported by the selected wallet");
+        return () => {
+        };
+      }
+    }
+  };
 };
 
 // src/adapters/BaseAdapter.ts
@@ -1504,10 +1519,6 @@ export {
   getInscriptionsParamsSchema,
   getInscriptionsResultSchema,
   getInscriptionsSchema,
-  getPermissionsMethodName,
-  getPermissionsParamsSchema,
-  getPermissionsRequestMessageSchema,
-  getPermissionsResultSchema,
   getProviderById,
   getProviderOrThrow,
   getProviders,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sats-connect/core",
-  "version": "0.3.0-ab35817",
+  "version": "0.3.0-f1e4d08",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",
@@ -9,7 +9,7 @@
   ],
   "scripts": {
     "test": "jest",
-    "build-debug": "webpack --mode development",
+    "build-debug": "npm run clean && webpack --mode development",
     "build": "npm run clean && tsup src/index.ts --format esm --dts",
     "build:watch": "npm run clean && tsup src/index.ts --format esm --dts --watch",
     "clean": "rimraf dist",
@@ -29,12 +29,10 @@
     "bitcoin-address-validation": "2.2.3",
     "buffer": "6.0.3",
     "jsontokens": "4.0.1",
-    "lodash.omit": "4.5.0",
     "valibot": "0.33.2"
   },
   "devDependencies": {
     "@types/jest": "^29.2.6",
-    "@types/lodash.omit": "4.5.9",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.3",
     "prettier": "3.3.3",