fix(sign): error message, update ordit-sdk (#169)

* fix(sign): error message * bump(deps): update ordit-sdk to 1.0.7
ordzaar · Nov 23, 2023 · bc35d37 · bc35d37
1 parent 182c746
commit bc35d37
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/packages/ord-connect/package.json b/packages/ord-connect/package.json
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@headlessui/react": "^1.7.17",
-    "@ordzaar/ordit-sdk": "1.0.6",
+    "@ordzaar/ordit-sdk": "1.0.7",
     "bitcoinjs-lib": "6.1.5",
     "boring-avatars": "^1.10.1"
   },
@@ -60,7 +60,7 @@
     ]
   },
   "peerDependencies": {
-    "@ordzaar/ordit-sdk": "1.0.6",
+    "@ordzaar/ordit-sdk": "1.0.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/packages/ord-connect/src/SampleApp.tsx b/packages/ord-connect/src/SampleApp.tsx
@@ -15,8 +15,8 @@ import "./style.css";
 function TestControls() {
   const [send, sendError, isSending] = useSend();
   const [getBalance, balanceError, isLoadingBalance] = useBalance();
-  const [sign] = useSign();
-  const { signMsg } = useSignMessage();
+  const [sign, signPsbtError] = useSign();
+  const { signMsg, error: signMessageError } = useSignMessage();
   const [result, setResult] = useState("");
   const [balance, setBalance] = useState(0);
 
@@ -84,6 +84,10 @@ function TestControls() {
         ) : null}
         {balanceError ? <p>Wallet Balance Error: {balanceError}</p> : null}
         {result ? <p>Transaction ID: {result}</p> : null}
+        {signPsbtError ? <p>Sign Psbt Error: {signPsbtError}</p> : null}
+        {signMessageError ? (
+          <p>Sign Message Error: {signMessageError}</p>
+        ) : null}
         {sendError ? <p>Send Error: {sendError}</p> : null}
         {isSending ? <p>Sending</p> : null}
       </div>

diff --git a/packages/ord-connect/src/hooks/useSign.tsx b/packages/ord-connect/src/hooks/useSign.tsx
@@ -51,7 +51,7 @@ export function useSign(): [
     } catch (err) {
       setError(err.message);
       setLoading(false);
-      throw new Error(err);
+      throw err;
     }
   };
 

diff --git a/packages/ord-connect/src/hooks/useSignMessage.tsx b/packages/ord-connect/src/hooks/useSignMessage.tsx
@@ -29,10 +29,10 @@ export function useSignMessage(): {
 
       setIsLoading(false);
       return signedMessage;
-    } catch (e) {
-      setError(e.message);
+    } catch (err) {
+      setError(err.message);
       setIsLoading(false);
-      throw new Error(e);
+      throw err;
     }
   };
 

diff --git a/packages/ord-connect/src/lib/signPsbt.ts b/packages/ord-connect/src/lib/signPsbt.ts
@@ -52,7 +52,7 @@ export default async function signPsbt({
   if (wallet === Wallet.XVERSE) {
     const getAllInputIndices = () =>
       psbt.data.inputs.map((value, index) => index);
-    const xverseSignPsbtOptions = {
+    const signedXversePsbt = await signXversePsbt(psbt, {
       network,
       inputsToSign: [
         {
@@ -63,8 +63,7 @@ export default async function signPsbt({
       ],
       finalize,
       extractTx,
-    };
-    const signedXversePsbt = await signXversePsbt(psbt, xverseSignPsbtOptions);
+    });
     return signedXversePsbt;
   }
   // else throw error

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml