@omnisat/lasereyes 0.0.67 → 0.0.70

package/dist/index.js

@@ -899,19 +899,17 @@ var LaserEyesProvider = ({
     try {
       localStorage == null ? void 0 : localStorage.setItem(LOCAL_STORAGE_DEFAULT_WALLET, OYL);
       const lib = window.oyl;
-      const result = yield lib.requestAccounts();
-      const oylPubKey = yield lib.getPublicKey();
-      setPaymentPublicKey(oylPubKey);
-      setAccounts(result);
-      setAddress(result[0]);
-      setPaymentAddress(result[1]);
+      console.log({ lib });
+      const { nativeSegwit, taproot } = yield lib.getAddresses();
+      setAddress(taproot.address);
+      setPublicKey(taproot.publicKey);
+      setPaymentPublicKey(nativeSegwit.publicKey);
+      setPaymentAddress(nativeSegwit.address);
       setLibrary(lib);
       setProvider(OYL);
-      handleAccountsChanged(result);
       setConnected(true);
-      getBTCBalance(result[1], network).then((totalBalance) => {
-        setBalance(totalBalance);
-      });
+      const balance2 = yield lib == null ? void 0 : lib.getBalance();
+      setBalance(balance2 == null ? void 0 : balance2.total);
     } catch (error) {
       throw new Error(`Can't lasereyes to ${OYL} wallet`);
     }
@@ -1187,7 +1185,8 @@ var LaserEyesProvider = ({
       if (!library)
         throw new Error("No wallet connected");
       if (provider === UNISAT) {
-        return yield library.requestAccounts();
+        const lib = window.unisat;
+        return yield lib.requestAccounts();
       } else if (provider === XVERSE) {
         const getAddressOptions = {
           payload: {
@@ -1412,10 +1411,10 @@ var LaserEyesProvider = ({
         setBalance(bal);
         return bal;
       } else if (provider === OYL) {
-        const balanceResponse = yield library.getBalance();
-        const bal = balanceResponse.btc.total * 1e8;
-        setBalance(bal);
-        return bal;
+        const lib = window == null ? void 0 : window.oyl;
+        const bal = yield lib.getBalance();
+        setBalance(bal.total);
+        return bal.total;
       } else if (provider === MAGIC_EDEN) {
         const bal = yield getBTCBalance(paymentAddress, network);
         setBalance(bal);
@@ -1497,7 +1496,7 @@ var LaserEyesProvider = ({
           }
         }
       } else if (provider === OYL) {
-        const { psbtHex, psbtBase64 } = yield createSendBtcPsbt(
+        const { psbtHex } = yield createSendBtcPsbt(
           address2,
           paymentAddress,
           to,
@@ -1600,8 +1599,13 @@ var LaserEyesProvider = ({
             }
           }
         } else if (provider === OYL) {
+          const lib = window == null ? void 0 : window.oyl;
           const tempAddy = toSignAddress || paymentAddress;
-          return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
+          const response = yield lib == null ? void 0 : lib.signMessage({
+            address: tempAddy,
+            message
+          });
+          return response.signature;
         } else if (provider === MAGIC_EDEN) {
           const tempAddy = toSignAddress || paymentAddress;
           let signedMessage;
@@ -1775,22 +1779,18 @@ var LaserEyesProvider = ({
           txId
         };
       } else if (provider === OYL) {
-        const signedPsbt = yield library == null ? void 0 : library.signPsbt(psbtHex, true, true);
-        const psbtSignedPsbt = bitcoin2.Psbt.fromHex(signedPsbt);
-        if (broadcast) {
-          const txId = yield pushPsbt(psbtSignedPsbt.toHex());
-          return {
-            signedPsbtHex: psbtSignedPsbt.toHex(),
-            signedPsbtBase64: psbtSignedPsbt.toBase64(),
-            txId
-          };
-        } else {
-          return {
-            signedPsbtHex: psbtSignedPsbt.toHex(),
-            signedPsbtBase64: psbtSignedPsbt.toBase64(),
-            txId: void 0
-          };
-        }
+        const lib = window == null ? void 0 : window.oyl;
+        const { psbt: psbt2, txid } = yield lib == null ? void 0 : lib.signPsbt({
+          psbt: psbtHex,
+          finalize,
+          broadcast
+        });
+        const psbtSignedPsbt = bitcoin2.Psbt.fromHex(psbt2);
+        return {
+          signedPsbtHex: psbtSignedPsbt.toHex(),
+          signedPsbtBase64: psbtSignedPsbt.toBase64(),
+          txId: txid
+        };
       } else if (provider === MAGIC_EDEN) {
         const toSignPsbt = bitcoin2.Psbt.fromBase64(String(psbtBase64), {
           network: getBitcoinNetwork(network)
@@ -1978,7 +1978,9 @@ var LaserEyesProvider = ({
       if (provider === UNISAT) {
         return yield import_axios2.default.post(`${getMempoolSpaceUrl2(network)}/api/tx`, psbt).then((res) => res.data);
       } else if (provider === OYL) {
-        return yield import_axios2.default.post(`${getMempoolSpaceUrl2(network)}/api/tx`, psbt).then((res) => res.data);
+        const oylLib = window == null ? void 0 : window.oyl;
+        const response = yield oylLib.pushPsbt({ psbt });
+        return response.txid;
       } else if (provider === OKX) {
         return yield import_axios2.default.post(`${getMempoolSpaceUrl2(network)}/api/tx`, psbt).then((res) => res.data);
       } else if (provider === MAGIC_EDEN) {

package/dist/index.mjs

@@ -804,19 +804,17 @@ var LaserEyesProvider = ({
     try {
       localStorage == null ? void 0 : localStorage.setItem(LOCAL_STORAGE_DEFAULT_WALLET, OYL);
       const lib = window.oyl;
-      const result = yield lib.requestAccounts();
-      const oylPubKey = yield lib.getPublicKey();
-      setPaymentPublicKey(oylPubKey);
-      setAccounts(result);
-      setAddress(result[0]);
-      setPaymentAddress(result[1]);
+      console.log({ lib });
+      const { nativeSegwit, taproot } = yield lib.getAddresses();
+      setAddress(taproot.address);
+      setPublicKey(taproot.publicKey);
+      setPaymentPublicKey(nativeSegwit.publicKey);
+      setPaymentAddress(nativeSegwit.address);
       setLibrary(lib);
       setProvider(OYL);
-      handleAccountsChanged(result);
       setConnected(true);
-      getBTCBalance(result[1], network).then((totalBalance) => {
-        setBalance(totalBalance);
-      });
+      const balance2 = yield lib == null ? void 0 : lib.getBalance();
+      setBalance(balance2 == null ? void 0 : balance2.total);
     } catch (error) {
       throw new Error(`Can't lasereyes to ${OYL} wallet`);
     }
@@ -1092,7 +1090,8 @@ var LaserEyesProvider = ({
       if (!library)
         throw new Error("No wallet connected");
       if (provider === UNISAT) {
-        return yield library.requestAccounts();
+        const lib = window.unisat;
+        return yield lib.requestAccounts();
       } else if (provider === XVERSE) {
         const getAddressOptions = {
           payload: {
@@ -1317,10 +1316,10 @@ var LaserEyesProvider = ({
         setBalance(bal);
         return bal;
       } else if (provider === OYL) {
-        const balanceResponse = yield library.getBalance();
-        const bal = balanceResponse.btc.total * 1e8;
-        setBalance(bal);
-        return bal;
+        const lib = window == null ? void 0 : window.oyl;
+        const bal = yield lib.getBalance();
+        setBalance(bal.total);
+        return bal.total;
       } else if (provider === MAGIC_EDEN) {
         const bal = yield getBTCBalance(paymentAddress, network);
         setBalance(bal);
@@ -1402,7 +1401,7 @@ var LaserEyesProvider = ({
           }
         }
       } else if (provider === OYL) {
-        const { psbtHex, psbtBase64 } = yield createSendBtcPsbt(
+        const { psbtHex } = yield createSendBtcPsbt(
           address2,
           paymentAddress,
           to,
@@ -1505,8 +1504,13 @@ var LaserEyesProvider = ({
             }
           }
         } else if (provider === OYL) {
+          const lib = window == null ? void 0 : window.oyl;
           const tempAddy = toSignAddress || paymentAddress;
-          return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
+          const response = yield lib == null ? void 0 : lib.signMessage({
+            address: tempAddy,
+            message
+          });
+          return response.signature;
         } else if (provider === MAGIC_EDEN) {
           const tempAddy = toSignAddress || paymentAddress;
           let signedMessage;
@@ -1680,22 +1684,18 @@ var LaserEyesProvider = ({
           txId
         };
       } else if (provider === OYL) {
-        const signedPsbt = yield library == null ? void 0 : library.signPsbt(psbtHex, true, true);
-        const psbtSignedPsbt = bitcoin2.Psbt.fromHex(signedPsbt);
-        if (broadcast) {
-          const txId = yield pushPsbt(psbtSignedPsbt.toHex());
-          return {
-            signedPsbtHex: psbtSignedPsbt.toHex(),
-            signedPsbtBase64: psbtSignedPsbt.toBase64(),
-            txId
-          };
-        } else {
-          return {
-            signedPsbtHex: psbtSignedPsbt.toHex(),
-            signedPsbtBase64: psbtSignedPsbt.toBase64(),
-            txId: void 0
-          };
-        }
+        const lib = window == null ? void 0 : window.oyl;
+        const { psbt: psbt2, txid } = yield lib == null ? void 0 : lib.signPsbt({
+          psbt: psbtHex,
+          finalize,
+          broadcast
+        });
+        const psbtSignedPsbt = bitcoin2.Psbt.fromHex(psbt2);
+        return {
+          signedPsbtHex: psbtSignedPsbt.toHex(),
+          signedPsbtBase64: psbtSignedPsbt.toBase64(),
+          txId: txid
+        };
       } else if (provider === MAGIC_EDEN) {
         const toSignPsbt = bitcoin2.Psbt.fromBase64(String(psbtBase64), {
           network: getBitcoinNetwork(network)
@@ -1883,7 +1883,9 @@ var LaserEyesProvider = ({
       if (provider === UNISAT) {
         return yield axios2.post(`${getMempoolSpaceUrl2(network)}/api/tx`, psbt).then((res) => res.data);
       } else if (provider === OYL) {
-        return yield axios2.post(`${getMempoolSpaceUrl2(network)}/api/tx`, psbt).then((res) => res.data);
+        const oylLib = window == null ? void 0 : window.oyl;
+        const response = yield oylLib.pushPsbt({ psbt });
+        return response.txid;
       } else if (provider === OKX) {
         return yield axios2.post(`${getMempoolSpaceUrl2(network)}/api/tx`, psbt).then((res) => res.data);
       } else if (provider === MAGIC_EDEN) {

package/package.json

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