From bc35d37b40dcd7e49c20419ddf4c8cad50b174d5 Mon Sep 17 00:00:00 2001
From: Benedict Pak <10258208+Nanosync@users.noreply.github.com>
Date: Thu, 23 Nov 2023 18:41:11 +0800
Subject: [PATCH] fix(sign): error message, update ordit-sdk (#169)

* fix(sign): error message

* bump(deps): update ordit-sdk to 1.0.7
---
 packages/ord-connect/package.json                 | 4 ++--
 packages/ord-connect/src/SampleApp.tsx            | 8 ++++++--
 packages/ord-connect/src/hooks/useSign.tsx        | 2 +-
 packages/ord-connect/src/hooks/useSignMessage.tsx | 6 +++---
 packages/ord-connect/src/lib/signPsbt.ts          | 5 ++---
 pnpm-lock.yaml                                    | 8 ++++----
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/ord-connect/package.json b/packages/ord-connect/package.json
index 75fdac56..d2859b1b 100644
--- 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
index 6c080277..2f85633e 100644
--- 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
index 2b95de79..5cbb841a 100644
--- 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
index de6d0cbf..81f412f9 100644
--- 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
index b35f7d76..a9a05a6e 100644
--- 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
index 48716bbf..90ad4edc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,8 +27,8 @@ importers:
         specifier: ^1.7.17
         version: 1.7.17(react-dom@18.2.0)(react@18.2.0)
       '@ordzaar/ordit-sdk':
-        specifier: 1.0.6
-        version: 1.0.6
+        specifier: 1.0.7
+        version: 1.0.7
       bitcoinjs-lib:
         specifier: 6.1.5
         version: 6.1.5
@@ -581,8 +581,8 @@ packages:
       fastq: 1.15.0
     dev: true
 
-  /@ordzaar/ordit-sdk@1.0.6:
-    resolution: {integrity: sha512-6s7m3FBHqkMeH8KdkF8q3vlXXu6+tcFofFhc7KySgL+Mc55qzObOREch5nwHqNdy5dEfcxc8/5Tah8s/87fSdA==}
+  /@ordzaar/ordit-sdk@1.0.7:
+    resolution: {integrity: sha512-GqcOBo1gkhNnH8ccUmE1nfSD8a/fmP1EDTlzibyEOMe1ec3zK9fFVvFGRQUdmZs/ZIc0YO4rAYGyYni/HajJDw==}
     dependencies:
       '@bitcoinerlab/secp256k1': 1.0.5
       bignumber.js: 9.1.2