@omnisat/lasereyes 0.0.56 → 0.0.58

package/dist/index.js

@@ -643,7 +643,7 @@ var LaserEyesProvider = ({
   const [hasWizz, setHasWizz] = (0, import_react.useState)(false);
   const [network, setNetwork] = (0, import_usehooks_ts.useLocalStorage)("network", (config == null ? void 0 : config.network) || MAINNET);
   (0, import_react.useEffect)(() => {
-    if (config && config.network) {
+    if (config && config.network && library) {
       setNetwork(config.network);
       getNetwork().then((foundNetwork) => {
         try {
@@ -655,7 +655,7 @@ var LaserEyesProvider = ({
         }
       });
     }
-  }, [config]);
+  }, [config, library]);
   const checkInitializationComplete = () => {
     if (hasUnisat !== void 0 && hasXverse !== void 0 && hasOyl !== void 0 && hasMagicEden !== void 0 && hasOkx !== void 0 && hasLeather !== void 0 && hasPhantom !== void 0 && hasWizz !== void 0) {
       setIsInitializing(false);
@@ -806,6 +806,7 @@ var LaserEyesProvider = ({
     try {
       localStorage == null ? void 0 : localStorage.setItem(LOCAL_STORAGE_DEFAULT_WALLET, UNISAT);
       const lib = window.unisat;
+      setLibrary(lib);
       const unisatAccounts = yield lib.requestAccounts();
       if (!unisatAccounts)
         throw new Error("No accounts found");
@@ -817,7 +818,6 @@ var LaserEyesProvider = ({
       setPaymentAddress(unisatAccounts[0]);
       setPublicKey(unisatPubKey);
       setPaymentPublicKey(unisatPubKey);
-      setLibrary(lib);
       yield getNetwork().then((network2) => {
         if (config.network !== network2) {
           switchNetwork(network2);
@@ -1255,7 +1255,8 @@ var LaserEyesProvider = ({
     var _a, _b;
     try {
       if (provider === UNISAT) {
-        const unisatNetwork = yield library == null ? void 0 : library.getChain();
+        const lib = window.unisat;
+        const unisatNetwork = yield lib == null ? void 0 : lib.getChain();
         if (!unisatNetwork) {
           return (_a = config == null ? void 0 : config.network) != null ? _a : MAINNET;
         }
@@ -1331,9 +1332,10 @@ var LaserEyesProvider = ({
       if (!library)
         return;
       if (provider === UNISAT) {
+        const lib = window.unisat;
         const wantedNetwork = getUnisatNetwork(network2);
         console.log("wantedNetwork", wantedNetwork);
-        yield library == null ? void 0 : library.switchChain(wantedNetwork);
+        yield lib == null ? void 0 : lib.switchChain(wantedNetwork);
         setNetwork(network2);
         yield getBalance();
       } else if (provider === WIZZ) {
@@ -1543,81 +1545,86 @@ var LaserEyesProvider = ({
       throw error;
     }
   });
-  const signMessage = (message, toSignAddress) => __async(void 0, null, function* () {
-    var _a;
-    try {
-      if (!library)
-        return;
-      if (provider === UNISAT) {
-        return yield library == null ? void 0 : library.signMessage(message);
-      } else if (provider === XVERSE) {
-        const tempAddy = toSignAddress || paymentAddress;
-        const response = yield (0, import_sats_connect.request)("signMessage", {
-          address: tempAddy,
-          message
-        });
-        if (response.status === "success") {
-          return response.result.signature;
-        } else {
-          if (response.error.code === import_sats_connect.RpcErrorCode.USER_REJECTION) {
-            throw new Error("User rejected the request");
+  const signMessage = (0, import_react.useCallback)(
+    (message, toSignAddress) => __async(void 0, null, function* () {
+      var _a;
+      try {
+        if (!library)
+          return;
+        if (provider === UNISAT) {
+          return yield library == null ? void 0 : library.signMessage(message);
+        } else if (provider === XVERSE) {
+          const tempAddy = toSignAddress || paymentAddress;
+          const response = yield (0, import_sats_connect.request)("signMessage", {
+            address: tempAddy,
+            message
+          });
+          if (response.status === "success") {
+            return response.result.signature;
           } else {
-            throw new Error("Error signing message: " + response.error.message);
+            if (response.error.code === import_sats_connect.RpcErrorCode.USER_REJECTION) {
+              throw new Error("User rejected the request");
+            } else {
+              throw new Error(
+                "Error signing message: " + response.error.message
+              );
+            }
           }
-        }
-      } else if (provider === OYL) {
-        const tempAddy = toSignAddress || paymentAddress;
-        return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
-      } else if (provider === MAGIC_EDEN) {
-        const tempAddy = toSignAddress || paymentAddress;
-        let signedMessage;
-        yield (0, import_sats_connect.signMessage)({
-          getProvider: () => __async(void 0, null, function* () {
-            return window.magicEden.bitcoin;
-          }),
-          payload: {
-            network: {
-              type: import_sats_connect.BitcoinNetworkType.Mainnet
+        } else if (provider === OYL) {
+          const tempAddy = toSignAddress || paymentAddress;
+          return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
+        } else if (provider === MAGIC_EDEN) {
+          const tempAddy = toSignAddress || paymentAddress;
+          let signedMessage;
+          yield (0, import_sats_connect.signMessage)({
+            getProvider: () => __async(void 0, null, function* () {
+              return window.magicEden.bitcoin;
+            }),
+            payload: {
+              network: {
+                type: import_sats_connect.BitcoinNetworkType.Mainnet
+              },
+              address: tempAddy,
+              message,
+              protocol: import_sats_connect.MessageSigningProtocols.BIP322
             },
-            address: tempAddy,
-            message,
-            protocol: import_sats_connect.MessageSigningProtocols.BIP322
-          },
-          onFinish: (response) => {
-            signedMessage = response;
-          },
-          onCancel: () => {
-            alert("Request canceled");
+            onFinish: (response) => {
+              signedMessage = response;
+            },
+            onCancel: () => {
+              alert("Request canceled");
+            }
+          });
+          return signedMessage;
+        } else if (provider === OKX) {
+          return yield library == null ? void 0 : library.signMessage(message);
+        } else if (provider === LEATHER) {
+          const paymentType = toSignAddress === address2 ? P2TR : P2WPKH;
+          if (toSignAddress !== address2 && toSignAddress !== paymentAddress) {
+            throw new Error("Invalid address to sign message");
           }
-        });
-        return signedMessage;
-      } else if (provider === OKX) {
-        return yield library == null ? void 0 : library.signMessage(message);
-      } else if (provider === LEATHER) {
-        const paymentType = toSignAddress === address2 ? P2TR : P2WPKH;
-        if (toSignAddress !== address2 && toSignAddress !== paymentAddress) {
-          throw new Error("Invalid address to sign message");
+          const signed = yield library == null ? void 0 : library.request("signMessage", {
+            message,
+            paymentType
+          });
+          return (_a = signed == null ? void 0 : signed.result) == null ? void 0 : _a.signature;
+        } else if (provider === PHANTOM) {
+          const utf8Bytes = new TextEncoder().encode(message);
+          const uintArray = new Uint8Array(utf8Bytes);
+          const response = yield library == null ? void 0 : library.signMessage(address2, uintArray);
+          const binaryString = String.fromCharCode(...response.signature);
+          return btoa(binaryString);
+        } else if (provider === WIZZ) {
+          return yield library == null ? void 0 : library.signMessage(message);
+        } else {
+          throw new Error("The connected wallet doesn't support this method..");
         }
-        const signed = yield library == null ? void 0 : library.request("signMessage", {
-          message,
-          paymentType
-        });
-        return (_a = signed == null ? void 0 : signed.result) == null ? void 0 : _a.signature;
-      } else if (provider === PHANTOM) {
-        const utf8Bytes = new TextEncoder().encode(message);
-        const uintArray = new Uint8Array(utf8Bytes);
-        const response = yield library == null ? void 0 : library.signMessage(address2, uintArray);
-        const binaryString = String.fromCharCode(...response.signature);
-        return btoa(binaryString);
-      } else if (provider === WIZZ) {
-        return yield library == null ? void 0 : library.signMessage(message);
-      } else {
-        throw new Error("The connected wallet doesn't support this method..");
+      } catch (error) {
+        throw error;
       }
-    } catch (error) {
-      throw error;
-    }
-  });
+    }),
+    [library, address2, paymentAddress]
+  );
   const signPsbt = (psbt, finalize = false, broadcast = false) => __async(void 0, null, function* () {
     try {
       let psbtHex, psbtBase64;

package/dist/index.mjs

@@ -548,7 +548,7 @@ var LaserEyesProvider = ({
   const [hasWizz, setHasWizz] = useState(false);
   const [network, setNetwork] = useLocalStorage("network", (config == null ? void 0 : config.network) || MAINNET);
   useEffect(() => {
-    if (config && config.network) {
+    if (config && config.network && library) {
       setNetwork(config.network);
       getNetwork().then((foundNetwork) => {
         try {
@@ -560,7 +560,7 @@ var LaserEyesProvider = ({
         }
       });
     }
-  }, [config]);
+  }, [config, library]);
   const checkInitializationComplete = () => {
     if (hasUnisat !== void 0 && hasXverse !== void 0 && hasOyl !== void 0 && hasMagicEden !== void 0 && hasOkx !== void 0 && hasLeather !== void 0 && hasPhantom !== void 0 && hasWizz !== void 0) {
       setIsInitializing(false);
@@ -711,6 +711,7 @@ var LaserEyesProvider = ({
     try {
       localStorage == null ? void 0 : localStorage.setItem(LOCAL_STORAGE_DEFAULT_WALLET, UNISAT);
       const lib = window.unisat;
+      setLibrary(lib);
       const unisatAccounts = yield lib.requestAccounts();
       if (!unisatAccounts)
         throw new Error("No accounts found");
@@ -722,7 +723,6 @@ var LaserEyesProvider = ({
       setPaymentAddress(unisatAccounts[0]);
       setPublicKey(unisatPubKey);
       setPaymentPublicKey(unisatPubKey);
-      setLibrary(lib);
       yield getNetwork().then((network2) => {
         if (config.network !== network2) {
           switchNetwork(network2);
@@ -1160,7 +1160,8 @@ var LaserEyesProvider = ({
     var _a, _b;
     try {
       if (provider === UNISAT) {
-        const unisatNetwork = yield library == null ? void 0 : library.getChain();
+        const lib = window.unisat;
+        const unisatNetwork = yield lib == null ? void 0 : lib.getChain();
         if (!unisatNetwork) {
           return (_a = config == null ? void 0 : config.network) != null ? _a : MAINNET;
         }
@@ -1236,9 +1237,10 @@ var LaserEyesProvider = ({
       if (!library)
         return;
       if (provider === UNISAT) {
+        const lib = window.unisat;
         const wantedNetwork = getUnisatNetwork(network2);
         console.log("wantedNetwork", wantedNetwork);
-        yield library == null ? void 0 : library.switchChain(wantedNetwork);
+        yield lib == null ? void 0 : lib.switchChain(wantedNetwork);
         setNetwork(network2);
         yield getBalance();
       } else if (provider === WIZZ) {
@@ -1448,81 +1450,86 @@ var LaserEyesProvider = ({
       throw error;
     }
   });
-  const signMessage = (message, toSignAddress) => __async(void 0, null, function* () {
-    var _a;
-    try {
-      if (!library)
-        return;
-      if (provider === UNISAT) {
-        return yield library == null ? void 0 : library.signMessage(message);
-      } else if (provider === XVERSE) {
-        const tempAddy = toSignAddress || paymentAddress;
-        const response = yield request("signMessage", {
-          address: tempAddy,
-          message
-        });
-        if (response.status === "success") {
-          return response.result.signature;
-        } else {
-          if (response.error.code === RpcErrorCode.USER_REJECTION) {
-            throw new Error("User rejected the request");
+  const signMessage = useCallback(
+    (message, toSignAddress) => __async(void 0, null, function* () {
+      var _a;
+      try {
+        if (!library)
+          return;
+        if (provider === UNISAT) {
+          return yield library == null ? void 0 : library.signMessage(message);
+        } else if (provider === XVERSE) {
+          const tempAddy = toSignAddress || paymentAddress;
+          const response = yield request("signMessage", {
+            address: tempAddy,
+            message
+          });
+          if (response.status === "success") {
+            return response.result.signature;
           } else {
-            throw new Error("Error signing message: " + response.error.message);
+            if (response.error.code === RpcErrorCode.USER_REJECTION) {
+              throw new Error("User rejected the request");
+            } else {
+              throw new Error(
+                "Error signing message: " + response.error.message
+              );
+            }
           }
-        }
-      } else if (provider === OYL) {
-        const tempAddy = toSignAddress || paymentAddress;
-        return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
-      } else if (provider === MAGIC_EDEN) {
-        const tempAddy = toSignAddress || paymentAddress;
-        let signedMessage;
-        yield signMessageSatsConnect({
-          getProvider: () => __async(void 0, null, function* () {
-            return window.magicEden.bitcoin;
-          }),
-          payload: {
-            network: {
-              type: BitcoinNetworkType.Mainnet
+        } else if (provider === OYL) {
+          const tempAddy = toSignAddress || paymentAddress;
+          return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
+        } else if (provider === MAGIC_EDEN) {
+          const tempAddy = toSignAddress || paymentAddress;
+          let signedMessage;
+          yield signMessageSatsConnect({
+            getProvider: () => __async(void 0, null, function* () {
+              return window.magicEden.bitcoin;
+            }),
+            payload: {
+              network: {
+                type: BitcoinNetworkType.Mainnet
+              },
+              address: tempAddy,
+              message,
+              protocol: MessageSigningProtocols.BIP322
             },
-            address: tempAddy,
-            message,
-            protocol: MessageSigningProtocols.BIP322
-          },
-          onFinish: (response) => {
-            signedMessage = response;
-          },
-          onCancel: () => {
-            alert("Request canceled");
+            onFinish: (response) => {
+              signedMessage = response;
+            },
+            onCancel: () => {
+              alert("Request canceled");
+            }
+          });
+          return signedMessage;
+        } else if (provider === OKX) {
+          return yield library == null ? void 0 : library.signMessage(message);
+        } else if (provider === LEATHER) {
+          const paymentType = toSignAddress === address2 ? P2TR : P2WPKH;
+          if (toSignAddress !== address2 && toSignAddress !== paymentAddress) {
+            throw new Error("Invalid address to sign message");
           }
-        });
-        return signedMessage;
-      } else if (provider === OKX) {
-        return yield library == null ? void 0 : library.signMessage(message);
-      } else if (provider === LEATHER) {
-        const paymentType = toSignAddress === address2 ? P2TR : P2WPKH;
-        if (toSignAddress !== address2 && toSignAddress !== paymentAddress) {
-          throw new Error("Invalid address to sign message");
+          const signed = yield library == null ? void 0 : library.request("signMessage", {
+            message,
+            paymentType
+          });
+          return (_a = signed == null ? void 0 : signed.result) == null ? void 0 : _a.signature;
+        } else if (provider === PHANTOM) {
+          const utf8Bytes = new TextEncoder().encode(message);
+          const uintArray = new Uint8Array(utf8Bytes);
+          const response = yield library == null ? void 0 : library.signMessage(address2, uintArray);
+          const binaryString = String.fromCharCode(...response.signature);
+          return btoa(binaryString);
+        } else if (provider === WIZZ) {
+          return yield library == null ? void 0 : library.signMessage(message);
+        } else {
+          throw new Error("The connected wallet doesn't support this method..");
         }
-        const signed = yield library == null ? void 0 : library.request("signMessage", {
-          message,
-          paymentType
-        });
-        return (_a = signed == null ? void 0 : signed.result) == null ? void 0 : _a.signature;
-      } else if (provider === PHANTOM) {
-        const utf8Bytes = new TextEncoder().encode(message);
-        const uintArray = new Uint8Array(utf8Bytes);
-        const response = yield library == null ? void 0 : library.signMessage(address2, uintArray);
-        const binaryString = String.fromCharCode(...response.signature);
-        return btoa(binaryString);
-      } else if (provider === WIZZ) {
-        return yield library == null ? void 0 : library.signMessage(message);
-      } else {
-        throw new Error("The connected wallet doesn't support this method..");
+      } catch (error) {
+        throw error;
       }
-    } catch (error) {
-      throw error;
-    }
-  });
+    }),
+    [library, address2, paymentAddress]
+  );
   const signPsbt = (psbt, finalize = false, broadcast = false) => __async(void 0, null, function* () {
     try {
       let psbtHex, psbtBase64;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnisat/lasereyes",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "sideEffects": false,
   "private": false,
   "license": "MIT",