@omnisat/lasereyes 0.0.17 → 0.0.19

package/dist/index.d.ts

@@ -176,14 +176,19 @@ declare const useInscriber: ({ inscribeApiUrl, }: {
     isFetchingCommitPsbt: boolean;
     commitPsbtHex: string;
     commitPsbtBase64: string;
-    handleSignCommit: (tx: string) => Promise<string | undefined>;
+    handleSignCommit: (tx?: string) => Promise<string | undefined>;
     commitTxId: string;
     setCommitTxId: react.Dispatch<react.SetStateAction<string>>;
     feeRate: number;
     setFeeRate: react.Dispatch<react.SetStateAction<number>>;
     totalFees: number;
     inscriberAddress: string;
-    inscribe: () => Promise<string>;
+    inscribe: ({ content: providedContent, mimeType: providedMimeType, ordinalAddress: providedAddress, commitTxId: providedCommitTxId, }: {
+        content?: any;
+        mimeType?: string | undefined;
+        ordinalAddress?: string | undefined;
+        commitTxId?: string | undefined;
+    }) => Promise<string>;
     isInscribing: boolean;
     inscriptionTxId: string;
     reset: () => void;

package/dist/index.js

@@ -1355,6 +1355,8 @@ var LaserEyesProvider = ({
       let psbtHex, psbtBase64;
       if (!library)
         return;
+      if (!psbt)
+        throw new Error("No PSBT provided");
       if (isHex(psbt)) {
         psbtBase64 = bitcoin2.Psbt.fromHex(psbt).toBase64();
         psbtHex = psbt;
@@ -1466,9 +1468,7 @@ var LaserEyesProvider = ({
         const signedPsbt = yield library == null ? void 0 : library.signPsbt(psbtHex, true, true);
         console.log({ signedPsbt });
         const psbtSignedPsbt = bitcoin2.Psbt.fromHex(signedPsbt);
-        console.log("psbtSignedPsbt", psbtSignedPsbt.toBase64());
         if (broadcast) {
-          console.log("broadcastin");
           const txId = yield pushPsbt(psbtSignedPsbt.toHex());
           return {
             signedPsbtHex: psbtSignedPsbt.toHex(),
@@ -1751,6 +1751,11 @@ var useInscriber = ({
   const [previewUrl, setPreviewUrl] = (0, import_react2.useState)("");
   const [isFetchingCommitPsbt, setIsFetchingCommitPsbt] = (0, import_react2.useState)(false);
   const [isInscribing, setIsInscribing] = (0, import_react2.useState)(false);
+  (0, import_react2.useEffect)(() => {
+    setCommitPsbtHex("");
+    setCommitPsbtBase64("");
+    setCommitTxId("");
+  }, [content, address2, mimeType, feeRate]);
   const getCommitPsbt = (0, import_react2.useCallback)(() => __async(void 0, null, function* () {
     try {
       if (!content)
@@ -1780,14 +1785,17 @@ var useInscriber = ({
       });
     } catch (e) {
       console.error(e);
-      throw e;
+      throw new Error(e.response.data);
     } finally {
       setIsFetchingCommitPsbt(false);
     }
   }), [paymentAddress, paymentPublicKey, content, feeRate, mimeType, publicKey]);
   const handleSignCommit = (tx) => __async(void 0, null, function* () {
     try {
-      const signedResponse = yield signPsbt(tx, true, true);
+      const toBeSigned = tx != null ? tx : commitPsbtHex;
+      if (!toBeSigned)
+        throw new Error("missing tx");
+      const signedResponse = yield signPsbt(toBeSigned, true, true);
       setCommitTxId(signedResponse == null ? void 0 : signedResponse.txId);
       return signedResponse == null ? void 0 : signedResponse.txId;
     } catch (e) {
@@ -1795,38 +1803,53 @@ var useInscriber = ({
       throw e;
     }
   });
-  const inscribe = (0, import_react2.useCallback)(() => __async(void 0, null, function* () {
-    try {
-      setIsInscribing(true);
-      if (!content)
-        throw new Error("missing content");
-      if (!address2)
-        throw new Error("missing address");
-      if (!mimeType)
-        throw new Error("missing mimeType");
-      if (!commitTxId) {
-        console.log("commitTxId not found, getting commit psbt");
-        const signed = yield getCommitPsbt();
-        console.log({ signed });
-        yield handleSignCommit(signed.psbtBase64);
+  const inscribe = (0, import_react2.useCallback)(
+    (_0) => __async(void 0, [_0], function* ({
+      content: providedContent,
+      mimeType: providedMimeType,
+      ordinalAddress: providedAddress,
+      commitTxId: providedCommitTxId
+    }) {
+      try {
+        const inscribeContent = providedContent != null ? providedContent : content;
+        const inscribeMimeType = providedMimeType != null ? providedMimeType : mimeType;
+        const inscribeOutputAddress = providedAddress != null ? providedAddress : address2;
+        let inscribeCommitTxId = providedCommitTxId != null ? providedCommitTxId : commitTxId;
+        if (!inscribeContent)
+          throw new Error("missing content");
+        if (!inscribeMimeType)
+          throw new Error("missing mimeType");
+        if (!inscribeOutputAddress)
+          throw new Error("missing address");
+        setIsInscribing(true);
+        if (!inscribeCommitTxId) {
+          const signed = yield getCommitPsbt();
+          inscribeCommitTxId = yield handleSignCommit(signed.psbtBase64);
+          if (!inscribeCommitTxId)
+            throw new Error("failed to broadcast commit");
+          console.log("tempCommitTxId", inscribeCommitTxId);
+        }
+        yield delay(1e4);
+        if (!inscribeCommitTxId)
+          throw new Error("missing commitTxId");
+        return yield import_axios3.default.post(`${inscribeApiUrl}/inscribe`, {
+          content,
+          mimeType,
+          ordinalAddress: address2,
+          commitTxId: inscribeCommitTxId
+        }).then((res) => res.data).then((data) => {
+          setInscriptionTxId(data);
+          return data;
+        });
+      } catch (e) {
+        console.error(e);
+        throw e;
+      } finally {
+        setIsInscribing(false);
       }
-      yield delay(1e4);
-      return yield import_axios3.default.post(`${inscribeApiUrl}/inscribe`, {
-        content,
-        mimeType,
-        ordinalAddress: address2,
-        commitTxId
-      }).then((res) => res.data).then((data) => {
-        setInscriptionTxId(data);
-        return data;
-      });
-    } catch (e) {
-      console.error(e);
-      throw e;
-    } finally {
-      setIsInscribing(false);
-    }
-  }), [address2, commitTxId, content, mimeType]);
+    }),
+    [address2, commitTxId, content, mimeType]
+  );
   const reset = () => {
     setContent("");
     setMimeType(MIME_TYPE_TEXT);
@@ -1839,11 +1862,6 @@ var useInscriber = ({
     setInscriptionTxId("");
     setPreviewUrl("");
   };
-  (0, import_react2.useEffect)(() => {
-    if (commitTxId && !inscriptionTxId) {
-      inscribe();
-    }
-  }, [commitTxId, inscribe, inscriptionTxId]);
   return {
     content,
     setContent,

package/dist/index.mjs

@@ -1277,6 +1277,8 @@ var LaserEyesProvider = ({
       let psbtHex, psbtBase64;
       if (!library)
         return;
+      if (!psbt)
+        throw new Error("No PSBT provided");
       if (isHex(psbt)) {
         psbtBase64 = bitcoin2.Psbt.fromHex(psbt).toBase64();
         psbtHex = psbt;
@@ -1388,9 +1390,7 @@ var LaserEyesProvider = ({
         const signedPsbt = yield library == null ? void 0 : library.signPsbt(psbtHex, true, true);
         console.log({ signedPsbt });
         const psbtSignedPsbt = bitcoin2.Psbt.fromHex(signedPsbt);
-        console.log("psbtSignedPsbt", psbtSignedPsbt.toBase64());
         if (broadcast) {
-          console.log("broadcastin");
           const txId = yield pushPsbt(psbtSignedPsbt.toHex());
           return {
             signedPsbtHex: psbtSignedPsbt.toHex(),
@@ -1673,6 +1673,11 @@ var useInscriber = ({
   const [previewUrl, setPreviewUrl] = useState2("");
   const [isFetchingCommitPsbt, setIsFetchingCommitPsbt] = useState2(false);
   const [isInscribing, setIsInscribing] = useState2(false);
+  useEffect2(() => {
+    setCommitPsbtHex("");
+    setCommitPsbtBase64("");
+    setCommitTxId("");
+  }, [content, address2, mimeType, feeRate]);
   const getCommitPsbt = useCallback(() => __async(void 0, null, function* () {
     try {
       if (!content)
@@ -1702,14 +1707,17 @@ var useInscriber = ({
       });
     } catch (e) {
       console.error(e);
-      throw e;
+      throw new Error(e.response.data);
     } finally {
       setIsFetchingCommitPsbt(false);
     }
   }), [paymentAddress, paymentPublicKey, content, feeRate, mimeType, publicKey]);
   const handleSignCommit = (tx) => __async(void 0, null, function* () {
     try {
-      const signedResponse = yield signPsbt(tx, true, true);
+      const toBeSigned = tx != null ? tx : commitPsbtHex;
+      if (!toBeSigned)
+        throw new Error("missing tx");
+      const signedResponse = yield signPsbt(toBeSigned, true, true);
       setCommitTxId(signedResponse == null ? void 0 : signedResponse.txId);
       return signedResponse == null ? void 0 : signedResponse.txId;
     } catch (e) {
@@ -1717,38 +1725,53 @@ var useInscriber = ({
       throw e;
     }
   });
-  const inscribe = useCallback(() => __async(void 0, null, function* () {
-    try {
-      setIsInscribing(true);
-      if (!content)
-        throw new Error("missing content");
-      if (!address2)
-        throw new Error("missing address");
-      if (!mimeType)
-        throw new Error("missing mimeType");
-      if (!commitTxId) {
-        console.log("commitTxId not found, getting commit psbt");
-        const signed = yield getCommitPsbt();
-        console.log({ signed });
-        yield handleSignCommit(signed.psbtBase64);
+  const inscribe = useCallback(
+    (_0) => __async(void 0, [_0], function* ({
+      content: providedContent,
+      mimeType: providedMimeType,
+      ordinalAddress: providedAddress,
+      commitTxId: providedCommitTxId
+    }) {
+      try {
+        const inscribeContent = providedContent != null ? providedContent : content;
+        const inscribeMimeType = providedMimeType != null ? providedMimeType : mimeType;
+        const inscribeOutputAddress = providedAddress != null ? providedAddress : address2;
+        let inscribeCommitTxId = providedCommitTxId != null ? providedCommitTxId : commitTxId;
+        if (!inscribeContent)
+          throw new Error("missing content");
+        if (!inscribeMimeType)
+          throw new Error("missing mimeType");
+        if (!inscribeOutputAddress)
+          throw new Error("missing address");
+        setIsInscribing(true);
+        if (!inscribeCommitTxId) {
+          const signed = yield getCommitPsbt();
+          inscribeCommitTxId = yield handleSignCommit(signed.psbtBase64);
+          if (!inscribeCommitTxId)
+            throw new Error("failed to broadcast commit");
+          console.log("tempCommitTxId", inscribeCommitTxId);
+        }
+        yield delay(1e4);
+        if (!inscribeCommitTxId)
+          throw new Error("missing commitTxId");
+        return yield axios3.post(`${inscribeApiUrl}/inscribe`, {
+          content,
+          mimeType,
+          ordinalAddress: address2,
+          commitTxId: inscribeCommitTxId
+        }).then((res) => res.data).then((data) => {
+          setInscriptionTxId(data);
+          return data;
+        });
+      } catch (e) {
+        console.error(e);
+        throw e;
+      } finally {
+        setIsInscribing(false);
       }
-      yield delay(1e4);
-      return yield axios3.post(`${inscribeApiUrl}/inscribe`, {
-        content,
-        mimeType,
-        ordinalAddress: address2,
-        commitTxId
-      }).then((res) => res.data).then((data) => {
-        setInscriptionTxId(data);
-        return data;
-      });
-    } catch (e) {
-      console.error(e);
-      throw e;
-    } finally {
-      setIsInscribing(false);
-    }
-  }), [address2, commitTxId, content, mimeType]);
+    }),
+    [address2, commitTxId, content, mimeType]
+  );
   const reset = () => {
     setContent("");
     setMimeType(MIME_TYPE_TEXT);
@@ -1761,11 +1784,6 @@ var useInscriber = ({
     setInscriptionTxId("");
     setPreviewUrl("");
   };
-  useEffect2(() => {
-    if (commitTxId && !inscriptionTxId) {
-      inscribe();
-    }
-  }, [commitTxId, inscribe, inscriptionTxId]);
   return {
     content,
     setContent,

package/package.json

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