refactor: remove redundant signTransaction method (#37)

Author: danwag06

public/background.js

@@ -5,7 +5,6 @@ let responseCallbackForConnectRequest;
 let responseCallbackForSendBsvRequest;
 let responseCallbackForTransferOrdinalRequest;
 let responseCallbackForSignMessageRequest;
-let responseCallbackForSignTransactionRequest;
 let responseCallbackForBroadcastRequest;
 let responseCallbackForGetSignaturesRequest;
 let popupWindowId = null;
@@ -76,8 +75,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
         return processTransferOrdinalResponse(message);
       case "signMessageResponse":
         return processSignMessageResponse(message);
-      case "signTransactionResponse":
-        return processSignTransactionResponse(message);
       case "broadcastResponse":
         return processBroadcastResponse(message);
       case "getSignaturesResponse":
@@ -121,8 +118,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
         return processTransferOrdinalRequest(message, sendResponse);
       case "signMessage":
         return processSignMessageRequest(message, sendResponse);
-      case "signTransaction":
-        return processSignTransactionRequest(message, sendResponse);
       case "broadcast":
         return processBroadcastRequest(message, sendResponse);
       case "getSignatures":
@@ -385,32 +380,6 @@ const processSignMessageRequest = (message, sendResponse) => {
   return true;
 };
 
-const processSignTransactionRequest = (message, sendResponse) => {
-  if (!message.params) {
-    sendResponse({
-      type: "signTransaction",
-      success: false,
-      error: "Must provide valid params!",
-    });
-  }
-  try {
-    responseCallbackForSignTransactionRequest = sendResponse;
-    chrome.storage.local
-      .set({
-        signTransactionRequest: message.params,
-      })
-      .then(() => {
-        launchPopUp();
-      });
-  } catch (error) {
-    sendResponse({
-      type: "signTransaction",
-      success: false,
-      error: JSON.stringify(error),
-    });
-  }
-};
-
 const processGetSignaturesRequest = (message, sendResponse) => {
   if (!message.params) {
     sendResponse({
@@ -544,30 +513,6 @@ const processSignMessageResponse = (message) => {
   return true;
 };
 
-const processSignTransactionResponse = (message) => {
-  if (!responseCallbackForSignTransactionRequest)
-    throw Error("Missing callback!");
-  try {
-    responseCallbackForSignTransactionRequest({
-      type: "signTransaction",
-      success: true,
-      data: message?.signatureHex,
-    });
-  } catch (error) {
-    responseCallbackForSignTransactionRequest({
-      type: "signTransaction",
-      success: false,
-      error: JSON.stringify(error),
-    });
-  } finally {
-    responseCallbackForSignTransactionRequest = null;
-    popupWindowId = null;
-    chrome.storage.local.remove(["signTransactionRequest", "popupWindowId"]);
-  }
-
-  return true;
-};
-
 const processBroadcastResponse = (message) => {
   if (!responseCallbackForBroadcastRequest) throw Error("Missing callback!");
   try {
@@ -592,7 +537,8 @@ const processBroadcastResponse = (message) => {
 };
 
 const processGetSignaturesResponse = (message) => {
-  if (!responseCallbackForGetSignaturesRequest) throw Error("Missing callback!");
+  if (!responseCallbackForGetSignaturesRequest)
+    throw Error("Missing callback!");
   try {
     responseCallbackForGetSignaturesRequest({
       type: "getSignatures",
@@ -649,16 +595,6 @@ chrome.windows.onRemoved.addListener((closedWindowId) => {
       chrome.storage.local.remove("signMessageRequest");
     }
 
-    if (responseCallbackForSignTransactionRequest) {
-      responseCallbackForSignTransactionRequest({
-        type: "signTransaction",
-        success: false,
-        error: "User dismissed the request!",
-      });
-      responseCallbackForSignTransactionRequest = null;
-      chrome.storage.local.remove("signTransactionRequest");
-    }
-
     if (responseCallbackForTransferOrdinalRequest) {
       responseCallbackForTransferOrdinalRequest({
         type: "transferOrdinal",

public/inject.js

@@ -37,7 +37,6 @@ window.panda = {
   sendBsv: createPandaMethod("sendBsv"),
   transferOrdinal: createPandaMethod("transferOrdinal"),
   signMessage: createPandaMethod("signMessage"),
-  signTransaction: createPandaMethod("signTransaction"),
   broadcast: createPandaMethod("broadcast"),
   getSignatures: createPandaMethod("getSignatures"),
 };

src/App.tsx

@@ -16,19 +16,14 @@ import { useTheme } from "./hooks/useTheme";
 import { BsvSendRequest } from "./pages/requests/BsvSendRequest";
 import { storage } from "./utils/storage";
 import { useContext, useEffect, useState } from "react";
-import {
-  Web3BroadcastRequest,
-  Web3SendBsvRequest,
-  Web3SignTransactionRequest,
-} from "./hooks/useBsv";
+import { Web3BroadcastRequest, Web3SendBsvRequest } from "./hooks/useBsv";
 import { Web3TransferOrdinalRequest } from "./hooks/useOrds";
 import { Web3GetSignaturesRequest } from "./hooks/useContracts";
 import { OrdTransferRequest } from "./pages/requests/OrdTransferRequest";
 import { BottomMenuContext } from "./contexts/BottomMenuContext";
 import { ConnectRequest } from "./pages/requests/ConnectRequest";
 import { SignMessageRequest } from "./pages/requests/SignMessageRequest";
 import { BroadcastRequest } from "./pages/requests/BroadcastRequest";
-import { SignTransactionRequest } from "./pages/requests/SignTransactionRequest";
 import { GetSignaturesRequest } from "./pages/requests/GetSignaturesRequest";
 
 export type ThirdPartyAppRequestData = {
@@ -73,10 +68,6 @@ export const App = () => {
     Web3TransferOrdinalRequest | undefined
   >(undefined);
 
-  const [signTransactionRequest, setSignTransactionRequest] = useState<
-    Web3SignTransactionRequest | undefined
-  >(undefined);
-
   const [getSignaturesRequest, setGetSignaturesRequest] = useState<
     Web3GetSignaturesRequest | undefined
   >(undefined);
@@ -108,7 +99,6 @@ export const App = () => {
           sendBsvRequest,
           transferOrdinalRequest,
           signMessageRequest,
-          signTransactionRequest,
           broadcastRequest,
           getSignaturesRequest,
         } = result;
@@ -137,10 +127,6 @@ export const App = () => {
           setMessageToSign(signMessageRequest.message);
         }
 
-        if (signTransactionRequest) {
-          setSignTransactionRequest(signTransactionRequest);
-        }
-
         if (broadcastRequest) {
           setBroadcastRequest(broadcastRequest);
         }
@@ -183,7 +169,6 @@ export const App = () => {
                       !bsvSendRequest &&
                       !messageToSign &&
                       !broadcastRequest &&
-                      !signTransactionRequest &&
                       !getSignaturesRequest
                     }
                     whenFalseContent={
@@ -201,17 +186,6 @@ export const App = () => {
                             onSignature={() => setMessageToSign(undefined)}
                           />
                         </Show>
-                        <Show when={!!signTransactionRequest}>
-                          <SignTransactionRequest
-                            request={
-                              signTransactionRequest as Web3SignTransactionRequest
-                            }
-                            popupId={popupId}
-                            onSignature={() =>
-                              setSignTransactionRequest(undefined)
-                            }
-                          />
-                        </Show>
                         <Show when={!!broadcastRequest}>
                           <BroadcastRequest
                             request={broadcastRequest as Web3BroadcastRequest}
@@ -221,9 +195,13 @@ export const App = () => {
                         </Show>
                         <Show when={!!getSignaturesRequest}>
                           <GetSignaturesRequest
-                            getSigsRequest={getSignaturesRequest as Web3GetSignaturesRequest}
+                            getSigsRequest={
+                              getSignaturesRequest as Web3GetSignaturesRequest
+                            }
                             popupId={popupId}
-                            onSignature={() => setGetSignaturesRequest(undefined)}
+                            onSignature={() =>
+                              setGetSignaturesRequest(undefined)
+                            }
                           />
                         </Show>
                       </>

src/hooks/useBsv.ts

@@ -25,20 +25,6 @@ type SendBsvResponse = {
   error?: string;
 };
 
-type SignTransactionResponse = {
-  signatureHex?: string;
-  error?: string;
-};
-
-export type Web3SignTransactionRequest = {
-  rawtx: string;
-  vin: number;
-  sigHashTypeNumber: number;
-  keyType: "bsv" | "ord";
-  outputScript: string;
-  outputSats: bigint;
-};
-
 export type Web3SendBsvRequest = {
   satAmount: number;
   address: string;
@@ -57,12 +43,13 @@ export const useBsv = () => {
   const { bsvWasmInitialized } = useBsvWasm();
   const { network } = useNetwork();
   const { getUtxos, getBsvBalance, getExchangeRate, broadcastRawTx } =
-  useWhatsOnChain();
-  useEffect(() => { }, []);
+    useWhatsOnChain();
 
   const getChainParams = (network: NetWork): ChainParams => {
-    return network === NetWork.Mainnet ? ChainParams.mainnet() : ChainParams.testnet();
-  }
+    return network === NetWork.Mainnet
+      ? ChainParams.mainnet()
+      : ChainParams.testnet();
+  };
 
   const sendBsv = async (
     request: Web3SendBsvRequest,
@@ -82,7 +69,10 @@ export const useBsv = () => {
       if (!keys?.walletWif || !keys.walletPubKey) throw Error("Undefined key");
       const paymentPk = PrivateKey.from_wif(keys.walletWif);
       const pubKey = paymentPk.to_public_key();
-      const fromAddress = pubKey.to_address().set_chain_params(getChainParams(network)).to_string();
+      const fromAddress = pubKey
+        .to_address()
+        .set_chain_params(getChainParams(network))
+        .to_string();
       const amount = request.reduce((a, r) => a + r.satAmount, 0);
 
       // Format in and outs
@@ -188,39 +178,6 @@ export const useBsv = () => {
     }
   };
 
-  const signTransaction = async (
-    password: string,
-    request: Web3SignTransactionRequest
-  ): Promise<SignTransactionResponse> => {
-    const { keyType, outputSats, outputScript, rawtx, sigHashTypeNumber, vin } =
-      request;
-
-    const isAuthenticated = await verifyPassword(password);
-    if (!isAuthenticated) {
-      return { error: "invalid-password" };
-    }
-    try {
-      const transaction = Transaction.from_hex(rawtx);
-      const keys = await retrieveKeys(password);
-      if (!keys?.walletWif || !keys.ordWif) throw Error("Undefined key");
-      const privateKey = PrivateKey.from_wif(
-        keyType === "bsv" ? keys.walletWif : keys.ordWif
-      );
-      const script = Script.from_hex(outputScript);
-      const sig = transaction.sign(
-        privateKey,
-        sigHashTypeNumber,
-        vin,
-        script,
-        BigInt(outputSats)
-      );
-      return { signatureHex: sig.to_hex() };
-    } catch (error) {
-      console.error("Error signing the transaction: ", error);
-      throw error;
-    }
-  };
-
   const signMessage = async (
     message: string,
     password: string
@@ -235,7 +192,10 @@ export const useBsv = () => {
       const hash = Hash.sha_256(Buffer.from(message)).to_hex();
       const privateKey = PrivateKey.from_wif(keys.walletWif);
       const publicKey = privateKey.to_public_key();
-      const address = publicKey.to_address().set_chain_params(getChainParams(network)).to_string();
+      const address = publicKey
+        .to_address()
+        .set_chain_params(getChainParams(network))
+        .to_string();
       const encoder = new TextEncoder();
       const encodedMessage = encoder.encode(hash);
       const signature = privateKey.sign_message(encodedMessage);
@@ -318,6 +278,5 @@ export const useBsv = () => {
     exchangeRate,
     signMessage,
     verifyMessage,
-    signTransaction,
   };
 };