chore: remove bitcoinjs-lib from inscription send

leather-io · Nov 28, 2023 · 97854b0 · 97854b0
1 parent 8a81f58
commit 97854b0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/app/components/text-input-field.tsx b/src/app/components/text-input-field.tsx
@@ -55,6 +55,7 @@ export function TextInputField({
           right: '-1px',
           top: '-1px',
           bottom: '-1px',
+          pointerEvents: 'none',
         }}
         border="default"
         borderRadius="sm"

diff --git a/src/app/features/ledger/components/ledger-inline-warnings.tsx b/src/app/features/ledger/components/ledger-inline-warnings.tsx
@@ -18,7 +18,7 @@ interface CommonLedgerInlineWarningsProps extends RequiresChainProp {
 
 function OutdatedLedgerAppWarning({ chain }: RequiresChainProp) {
   return (
-    <WarningLabel fontSize="14px" textAlign="left">
+    <WarningLabel textAlign="left">
       Latest version of <Capitalize>{chain} app</Capitalize> required
       <styled.a href="ledgerlive://manager" textDecoration="underline">
         Update on Ledger Live to continue
@@ -29,7 +29,7 @@ function OutdatedLedgerAppWarning({ chain }: RequiresChainProp) {
 
 function LedgerDeviceLockedWarning({ chain }: RequiresChainProp) {
   return (
-    <WarningLabel fontSize="14px" textAlign="left">
+    <WarningLabel textAlign="left">
       Your Ledger is locked. Unlock it and open the {''}
       <Capitalize>{chain}</Capitalize>
       {''} app to continue.
@@ -39,7 +39,7 @@ function LedgerDeviceLockedWarning({ chain }: RequiresChainProp) {
 
 function LedgerAppClosedWarning({ chain }: RequiresChainProp) {
   return (
-    <WarningLabel fontSize="14px" textAlign="left">
+    <WarningLabel textAlign="left">
       The <Capitalize>{chain}</Capitalize> app appears to be closed on Ledger. Open it to continue.
     </WarningLabel>
   );

diff --git a/src/app/pages/send/ordinal-inscription/hooks/use-send-inscription-form.tsx b/src/app/pages/send/ordinal-inscription/hooks/use-send-inscription-form.tsx
@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { Psbt } from 'bitcoinjs-lib';
 import * as yup from 'yup';
 
 import { logger } from '@shared/logger';
@@ -102,11 +101,9 @@ export function useSendInscriptionForm() {
         return;
       }
 
-      const bitcoinJsPsbt = Psbt.fromBuffer(Buffer.from(signedTx.toPSBT()));
+      signedTx.finalize();
 
-      logger.debug('Pre-finalized inscription PSBT', bitcoinJsPsbt.toHex());
-
-      bitcoinJsPsbt.finalizeAllInputs();
+      logger.debug('Pre-finalized inscription PSBT', signedTx.hex);
 
       const feeRowValue = formFeeRowValue(values.feeRate, isCustomFee);
       navigate(`/${RouteUrls.SendOrdinalInscription}/${RouteUrls.SendOrdinalInscriptionReview}`, {
@@ -117,7 +114,7 @@ export function useSendInscriptionForm() {
           recipient: values.recipient,
           time,
           feeRowValue,
-          signedTx: bitcoinJsPsbt.extractTransaction().toBuffer(),
+          signedTx: signedTx.extract(),
         },
       });
     },

diff --git a/src/shared/crypto/bitcoin/bip322/sign-message-bip322.spec.ts b/src/shared/crypto/bitcoin/bip322/sign-message-bip322.spec.ts
@@ -153,16 +153,16 @@ describe(signBip322MessageSimple.name, () => {
       );
     });
 
-    test('Signature: "HiroWalletIsTheBest"', async () => {
+    test('Signature: "WearLeather"', async () => {
       const { signature } = await signBip322MessageSimple({
         address: taprootAddress,
-        message: 'HiroWalletIsTheBest',
+        message: 'WearLeather',
         network: 'mainnet',
         signPsbt,
       });
 
       expect(signature).toEqual(
-        'AUAJNdp5SEAFCDYrIR8TQRkgbNo6P+dUeL97eadGjPWC8iPrhngZSBZvcImVk/HEb3zq3xuyGqyP0dqR7CH2HCa7'
+        'AUDjK8SJX34boek3m3EKXI94AMBZynJUmdqgO7i4z6JKG6gkUgp+brkWl0ylzWb+8enM4s4B4TWel0iCmcQrKNWS'
       );
     });
   });