@omnisat/lasereyes 0.0.35 → 0.0.37

package/dist/index.js

@@ -310,7 +310,7 @@ var createConfig = (config) => {
 };
 
 // src/providers/LaserEyesProvider.tsx
-var import_react = _toESM(require("react"));
+var import_react = require("react");
 var bitcoin2 = __toESM(require("bitcoinjs-lib"));
 
 // src/consts/settings.ts
@@ -381,7 +381,7 @@ var initialWalletContext = {
 };
 
 // src/providers/LaserEyesProvider.tsx
-var import_usehooks_ts = _toESM(require("usehooks-ts"));
+var import_usehooks_ts = require("usehooks-ts");
 
 // src/lib/helpers.ts
 var bitcoin = __toESM(require("bitcoinjs-lib"));
@@ -533,10 +533,10 @@ function delay(ms) {
 }
 
 // src/providers/LaserEyesProvider.tsx
-var import_sats_connect = _toESM(require("sats-connect"));
-var import_address = _toESM(require("bitcoinjs-lib/src/address"));
+var import_sats_connect = require("sats-connect");
+var import_address = require("bitcoinjs-lib/src/address");
 var import_axios2 = __toESM(require("axios"));
-var import_jsx_runtime = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime = require("react/jsx-runtime");
 var LaserEyesContext = (0, import_react.createContext)(initialWalletContext);
 var useLaserEyes = () => {
   return (0, import_react.useContext)(LaserEyesContext);
@@ -1002,6 +1002,8 @@ var LaserEyesProvider = ({
         yield connectXverse();
       } else if (walletName === OYL) {
         yield connectOyl();
+      } else if (walletName === MAGIC_EDEN) {
+        yield connectMagicEden();
       } else if (walletName === LEATHER) {
         yield connectLeather();
       } else {
@@ -1326,20 +1328,31 @@ var LaserEyesProvider = ({
           throw new Error("Error sending BTC");
         return psbt.txId;
       } else if (provider === MAGIC_EDEN) {
-        const { psbtHex, psbtBase64 } = yield createSendBtcPsbt(
-          address2,
-          paymentAddress,
-          to,
-          amount,
-          paymentPublicKey,
-          //@ts-ignore
-          network,
-          7
-        );
-        const psbt = yield signPsbt(psbtBase64, true, true);
-        if (!psbt)
+        let sendResponse;
+        yield (0, import_sats_connect.sendBtcTransaction)({
+          getProvider: () => __async(void 0, null, function* () {
+            return library;
+          }),
+          payload: {
+            network: {
+              type: getXverseNetwork(network)
+            },
+            recipients: [
+              {
+                address: to,
+                amountSats: BigInt(amount)
+              }
+            ],
+            senderAddress: paymentAddress
+          },
+          onFinish: (response) => {
+            sendResponse = response;
+          },
+          onCancel: () => alert("Canceled")
+        });
+        if (!sendResponse)
           throw new Error("Error sending BTC");
-        return psbt.txId;
+        return sendResponse.txid;
       } else if (provider === OKX) {
         const txId = yield library == null ? void 0 : library.sendBitcoin(to, amount);
         if (!txId)
@@ -1397,7 +1410,8 @@ var LaserEyesProvider = ({
           }
         }
       } else if (provider === OYL) {
-        return yield library == null ? void 0 : library.signMessage(message, "bip322", toSignAddress);
+        const tempAddy = toSignAddress || paymentAddress;
+        return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
       } else if (provider === MAGIC_EDEN) {
         let signedMessage;
         yield (0, import_sats_connect.signMessage)({
@@ -1621,14 +1635,14 @@ var LaserEyesProvider = ({
           inputsToSign.push(paymentsAddressData);
         }
         let txId, signedPsbtHex, signedPsbtBase64;
-        const xverseNetwork = getXverseNetwork(network);
+        const magicEdenNetwork = getXverseNetwork(network);
         const signPsbtOptions = {
           getProvider: () => __async(void 0, null, function* () {
-            return window.magicEden.bitcoin;
+            return library;
           }),
           payload: {
             network: {
-              type: xverseNetwork
+              type: magicEdenNetwork
             },
             message: "Sign Transaction",
             psbtBase64: toSignPsbt.toBase64(),
@@ -1822,7 +1836,7 @@ var LaserEyesProvider = ({
 };
 
 // src/hooks/useInscriber.ts
-var import_react2 = _toESM(require("react"));
+var import_react2 = require("react");
 
 // src/consts/inscribe.ts
 var MIME_TYPE_TEXT = "text/plain;charset=utf-8";
@@ -1982,7 +1996,7 @@ var useInscriber = ({
 };
 
 // src/icons/oyl.tsx
-var import_jsx_runtime2 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime2 = require("react/jsx-runtime");
 var OylLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2062,7 +2076,7 @@ var OylLogo = (_a) => {
 };
 
 // src/icons/leather.tsx
-var import_jsx_runtime3 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime3 = require("react/jsx-runtime");
 var LeatherLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2122,7 +2136,7 @@ var LeatherLogo = (_a) => {
 };
 
 // src/icons/phantom.tsx
-var import_jsx_runtime4 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime4 = require("react/jsx-runtime");
 var PhantomLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2204,7 +2218,7 @@ var PhantomLogo = (_a) => {
 };
 
 // src/icons/xverse.tsx
-var import_jsx_runtime5 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime5 = require("react/jsx-runtime");
 var XverseLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2256,7 +2270,7 @@ var XverseLogo = (_a) => {
 };
 
 // src/icons/unisat.tsx
-var import_jsx_runtime6 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime6 = require("react/jsx-runtime");
 var UnisatLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2368,7 +2382,7 @@ var UnisatLogo = (_a) => {
 };
 
 // src/icons/wizz.tsx
-var import_jsx_runtime7 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime7 = require("react/jsx-runtime");
 var WizzLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2439,7 +2453,7 @@ var WizzLogo = (_a) => {
 };
 
 // src/icons/okx.tsx
-var import_jsx_runtime8 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime8 = require("react/jsx-runtime");
 var OkxLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2481,7 +2495,7 @@ var OkxLogo = (_a) => {
 };
 
 // src/icons/magiceden.tsx
-var import_jsx_runtime9 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var MagicEdenLogo = (_a) => {
   var _b = _a, {
     size = 42,
@@ -2554,7 +2568,7 @@ var MagicEdenLogo = (_a) => {
 };
 
 // src/icons/walletIcon.tsx
-var import_jsx_runtime10 = _toESM(require("react/jsx-runtime"));
+var import_jsx_runtime10 = require("react/jsx-runtime");
 var WalletIcon = ({
   size,
   className,

package/dist/index.mjs

@@ -441,6 +441,7 @@ import {
   getAddress,
   request,
   RpcErrorCode,
+  sendBtcTransaction,
   signMessage as signMessageSatsConnect,
   signTransaction
 } from "sats-connect";
@@ -912,6 +913,8 @@ var LaserEyesProvider = ({
         yield connectXverse();
       } else if (walletName === OYL) {
         yield connectOyl();
+      } else if (walletName === MAGIC_EDEN) {
+        yield connectMagicEden();
       } else if (walletName === LEATHER) {
         yield connectLeather();
       } else {
@@ -1236,20 +1239,31 @@ var LaserEyesProvider = ({
           throw new Error("Error sending BTC");
         return psbt.txId;
       } else if (provider === MAGIC_EDEN) {
-        const { psbtHex, psbtBase64 } = yield createSendBtcPsbt(
-          address2,
-          paymentAddress,
-          to,
-          amount,
-          paymentPublicKey,
-          //@ts-ignore
-          network,
-          7
-        );
-        const psbt = yield signPsbt(psbtBase64, true, true);
-        if (!psbt)
+        let sendResponse;
+        yield sendBtcTransaction({
+          getProvider: () => __async(void 0, null, function* () {
+            return library;
+          }),
+          payload: {
+            network: {
+              type: getXverseNetwork(network)
+            },
+            recipients: [
+              {
+                address: to,
+                amountSats: BigInt(amount)
+              }
+            ],
+            senderAddress: paymentAddress
+          },
+          onFinish: (response) => {
+            sendResponse = response;
+          },
+          onCancel: () => alert("Canceled")
+        });
+        if (!sendResponse)
           throw new Error("Error sending BTC");
-        return psbt.txId;
+        return sendResponse.txid;
       } else if (provider === OKX) {
         const txId = yield library == null ? void 0 : library.sendBitcoin(to, amount);
         if (!txId)
@@ -1307,7 +1321,8 @@ var LaserEyesProvider = ({
           }
         }
       } else if (provider === OYL) {
-        return yield library == null ? void 0 : library.signMessage(message, "bip322", toSignAddress);
+        const tempAddy = toSignAddress || paymentAddress;
+        return yield library == null ? void 0 : library.signMessage(message, "bip322", tempAddy);
       } else if (provider === MAGIC_EDEN) {
         let signedMessage;
         yield signMessageSatsConnect({
@@ -1531,14 +1546,14 @@ var LaserEyesProvider = ({
           inputsToSign.push(paymentsAddressData);
         }
         let txId, signedPsbtHex, signedPsbtBase64;
-        const xverseNetwork = getXverseNetwork(network);
+        const magicEdenNetwork = getXverseNetwork(network);
         const signPsbtOptions = {
           getProvider: () => __async(void 0, null, function* () {
-            return window.magicEden.bitcoin;
+            return library;
           }),
           payload: {
             network: {
-              type: xverseNetwork
+              type: magicEdenNetwork
             },
             message: "Sign Transaction",
             psbtBase64: toSignPsbt.toBase64(),

package/package.json

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