@sats-connect/core 0.4.0-b520920 → 0.4.0-bcedde9

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({
@@ -385,8 +382,19 @@ var getBalanceRequestMessageSchema = v6.object({
 
 // src/request/types/walletMethods.ts
 import * as v7 from "valibot";
+import { permissions } from "@secretkeylabs/xverse-core";
+var permissionTemplate = v7.variant("type", [
+  v7.object({
+    ...v7.omit(permissions.resources.account.accountPermissionSchema, ["clientId", "actions"]).entries,
+    actions: v7.partial(permissions.resources.account.accountActionsSchema)
+  }),
+  v7.object({
+    ...v7.omit(permissions.resources.wallet.walletPermissionSchema, ["clientId"]).entries,
+    actions: v7.partial(permissions.resources.wallet.walletActionsSchema)
+  })
+]);
 var requestPermissionsMethodName = "wallet_requestPermissions";
-var requestPermissionsParamsSchema = v7.undefined();
+var requestPermissionsParamsSchema = v7.nullish(v7.array(permissionTemplate));
 var requestPermissionsResultSchema = v7.literal(true);
 var requestPermissionsRequestMessageSchema = v7.object({
   ...rpcRequestMessageSchema.entries,
@@ -397,8 +405,8 @@ var requestPermissionsRequestMessageSchema = v7.object({
   }).entries
 });
 var renouncePermissionsMethodName = "wallet_renouncePermissions";
-var renouncePermissionsParamsSchema = v7.undefined();
-var renouncePermissionsResultSchema = v7.literal(true);
+var renouncePermissionsParamsSchema = v7.nullish(v7.null());
+var renouncePermissionsResultSchema = v7.nullish(v7.null());
 var renouncePermissionsRequestMessageSchema = v7.object({
   ...rpcRequestMessageSchema.entries,
   ...v7.object({
@@ -407,6 +415,17 @@ var renouncePermissionsRequestMessageSchema = v7.object({
     id: v7.string()
   }).entries
 });
+var disconnectMethodName = "wallet_disconnect";
+var disconnectParamsSchema = v7.nullish(v7.null());
+var disconnectResultSchema = v7.nullish(v7.null());
+var disconnectRequestMessageSchema = v7.object({
+  ...rpcRequestMessageSchema.entries,
+  ...v7.object({
+    method: v7.literal(disconnectMethodName),
+    params: disconnectParamsSchema,
+    id: v7.string()
+  }).entries
+});
 var getWalletTypeMethodName = "wallet_getWalletType";
 var getWalletTypeParamsSchema = v7.nullish(v7.null());
 var getWalletTypeResultSchema = walletTypeSchema;
@@ -414,16 +433,48 @@ var getWalletTypeRequestMessageSchema = v7.object({
   ...rpcRequestMessageSchema.entries,
   ...v7.object({
     method: v7.literal(getWalletTypeMethodName),
+    params: getWalletTypeParamsSchema,
+    id: v7.string()
+  }).entries
+});
+var getCurrentPermissionsMethodName = "wallet_getCurrentPermissions";
+var getCurrentPermissionsParamsSchema = v7.nullish(v7.null());
+var getCurrentPermissionsResultSchema = v7.array(permissions.store.permission);
+var getCurrentPermissionsRequestMessageSchema = v7.object({
+  ...rpcRequestMessageSchema.entries,
+  ...v7.object({
+    method: v7.literal(getCurrentPermissionsMethodName),
+    params: getCurrentPermissionsParamsSchema,
+    id: v7.string()
+  }).entries
+});
+var getAccountMethodName = "wallet_getAccount";
+var getAccountParamsSchema = v7.nullish(v7.null());
+var getAccountResultSchema = v7.object({
+  id: permissions.utils.account.accountIdSchema,
+  addresses: v7.array(addressSchema),
+  walletType: walletTypeSchema
+});
+var getAccountRequestMessageSchema = v7.object({
+  ...rpcRequestMessageSchema.entries,
+  ...v7.object({
+    method: v7.literal(getAccountMethodName),
+    params: getAccountParamsSchema,
     id: v7.string()
   }).entries
 });
-var getPermissionsMethodName = "wallet_getPermissions";
-var getPermissionsParamsSchema = v7.nullish(v7.null());
-var getPermissionsResultSchema = v7.array(v7.string());
-var getPermissionsRequestMessageSchema = v7.object({
+var connectMethodName = "wallet_connect";
+var connectParamsSchema = v7.nullish(
+  v7.object({
+    permissions: v7.optional(v7.array(permissionTemplate))
+  })
+);
+var connectResultSchema = getAccountResultSchema;
+var connectRequestMessageSchema = v7.object({
   ...rpcRequestMessageSchema.entries,
   ...v7.object({
-    method: v7.literal(getPermissionsMethodName),
+    method: v7.literal(connectMethodName),
+    params: connectParamsSchema,
     id: v7.string()
   }).entries
 });
@@ -1059,17 +1110,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 +1151,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 +1167,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 +1190,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 +1264,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
@@ -1476,11 +1555,23 @@ export {
   accountChangeSchema,
   addListener,
   addressSchema,
+  connectMethodName,
+  connectParamsSchema,
+  connectRequestMessageSchema,
+  connectResultSchema,
   createInscription,
   createRepeatInscriptions,
   defaultAdapters,
   disconnectEventName,
+  disconnectMethodName,
+  disconnectParamsSchema,
+  disconnectRequestMessageSchema,
+  disconnectResultSchema,
   disconnectSchema,
+  getAccountMethodName,
+  getAccountParamsSchema,
+  getAccountRequestMessageSchema,
+  getAccountResultSchema,
   getAccountsMethodName,
   getAccountsParamsSchema,
   getAccountsRequestMessageSchema,
@@ -1495,6 +1586,10 @@ export {
   getBalanceRequestMessageSchema,
   getBalanceResultSchema,
   getCapabilities,
+  getCurrentPermissionsMethodName,
+  getCurrentPermissionsParamsSchema,
+  getCurrentPermissionsRequestMessageSchema,
+  getCurrentPermissionsResultSchema,
   getDefaultProvider,
   getInfoMethodName,
   getInfoParamsSchema,
@@ -1504,10 +1599,6 @@ export {
   getInscriptionsParamsSchema,
   getInscriptionsResultSchema,
   getInscriptionsSchema,
-  getPermissionsMethodName,
-  getPermissionsParamsSchema,
-  getPermissionsRequestMessageSchema,
-  getPermissionsResultSchema,
   getProviderById,
   getProviderOrThrow,
   getProviders,
@@ -1523,6 +1614,7 @@ export {
   isProviderInstalled,
   networkChangeEventName,
   networkChangeSchema,
+  permissionTemplate,
   removeDefaultProvider,
   renouncePermissionsMethodName,
   renouncePermissionsParamsSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sats-connect/core",
-  "version": "0.4.0-b520920",
+  "version": "0.4.0-bcedde9",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",
@@ -9,11 +9,12 @@
   ],
   "scripts": {
     "test": "jest",
-    "build-debug": "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",
-    "lint": "prettier --write .",
+    "build": "tsup",
+    "build:watch": "tsup --watch",
+    "check-types": "tsc --noEmit",
+    "check-format": "prettier --check .",
+    "format": "prettier --write .",
+    "ci": "npm run check-types && npm run check-format && npm run build",
     "prepare": "husky install"
   },
   "lint-staged": {
@@ -25,16 +26,15 @@
     ]
   },
   "dependencies": {
+    "@secretkeylabs/xverse-core": "24.0.0-4db3b55",
     "axios": "1.7.4",
     "bitcoin-address-validation": "2.2.3",
     "buffer": "6.0.3",
     "jsontokens": "4.0.1",
-    "lodash.omit": "4.5.0",
-    "valibot": "0.33.2"
+    "valibot": "0.42.1"
   },
   "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",
@@ -46,9 +46,7 @@
     "tsup": "^8.0.2",
     "typescript": "5.4.5",
     "util": "^0.12.4",
-    "vm-browserify": "^1.1.2",
-    "webpack": "^5.74.0",
-    "webpack-cli": "^4.10.0"
+    "vm-browserify": "^1.1.2"
   },
   "repository": {
     "type": "git",