fix: bugs

fix: bugs

Author: slient-coder

package.json

@@ -221,7 +221,6 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@notionhq/client": "^1.0.4",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
-    "@types/bitcore-lib": "^0.15.6",
     "@types/less": "^3.0.3",
     "@types/lodash": "^4.14.182",
     "@types/node-sass": "^4.11.2",

src/background/controller/provider/controller.ts

@@ -181,8 +181,8 @@ class ProviderController extends BaseController {
     req.data.params.psbtHex = formatPsbtHex(psbtHex);
   }])
   signPsbt = async ({ data: { params: { psbtHex, options } }, approvalRes }) => {
-    if (approvalRes?.signedPsbtHex) {
-      return approvalRes.signedPsbtHex
+    if (approvalRes && approvalRes.signed==true) {
+      return approvalRes.psbtHex
     }
     const networkType = wallet.getNetworkType()
     const psbtNetwork = toPsbtNetwork(networkType)

src/background/controller/wallet.ts

@@ -595,7 +595,7 @@ export class WalletController extends BaseController {
   signMessage = async (text: string) => {
     const account = preferenceService.getCurrentAccount();
     if (!account) throw new Error('no current account');
-    return keyringService.signMessage(account.pubkey, text);
+    return keyringService.signMessage(account.pubkey, account.type, text);
   };
 
   signBIP322Simple = async (text: string) => {

src/background/service/keyring/index.ts

@@ -570,8 +570,8 @@ class KeyringService extends EventEmitter {
    *
    * Attempts to sign the provided message parameters.
    */
-  signMessage = async (address: string, data: string) => {
-    const keyring = await this.getKeyringForAccount(address);
+  signMessage = async (address: string, keyringType: string, data: string) => {
+    const keyring = await this.getKeyringForAccount(address, keyringType);
     const sig = await keyring.signMessage(address, data);
     return sig;
   };
@@ -861,6 +861,7 @@ class KeyringService extends EventEmitter {
   clearKeyrings = async (): Promise<void> => {
     // clear keyrings from memory
     this.keyrings = [];
+    this.addressTypes = [];
     this.memStore.updateState({
       keyrings: []
     });

src/ui/pages/Account/CreateKeystoneWalletScreen.tsx

@@ -133,10 +133,11 @@ function Step3({
   const navigate = useNavigate();
   const wallet = useWallet();
   const tools = useTools();
-  const [addressType, setAddressType] = useState(AddressType.P2PKH);
+  const [addressType, setAddressType] = useState(AddressType.P2WPKH);
   const addressTypes = useMemo(() => {
-    return ADDRESS_TYPES.filter((item) => item.displayIndex < 4);
+    return ADDRESS_TYPES.filter((item) => item.displayIndex < 4).sort((a, b) => a.displayIndex - b.displayIndex);
   }, []);
+
   const [groups, setGroups] = useState<
     { type: AddressType; address_arr: string[]; pubkey_arr: string[]; satoshis_arr: number[] }[]
   >([]);

src/ui/pages/Approval/components/SignPsbt/index.tsx

@@ -588,14 +588,14 @@ export default function SignPsbt({
 
   if (!handleConfirm) {
     handleConfirm = (res) => {
-      if (res) {
-        resolveApproval({
-          // signed by hardware wallet
-          signedPsbtHex: res.psbtHex
-        });
-      } else {
-        resolveApproval();
+      let signed = true;
+      if (type === TxType.SIGN_TX && currentAccount.type !== KEYRING_TYPE.KeystoneKeyring) {
+        signed = false;
       }
+      resolveApproval({
+        psbtHex: (res ?? txInfo).psbtHex,
+        signed
+      });
     };
   }
 

src/ui/pages/BRC20/BRC20SendScreen.tsx

@@ -410,8 +410,8 @@ function Step3({
           options: { autoFinalized: false }
         }
       }}
-      handleConfirm={() => {
-        pushOrdinalsTx(contextData.rawTxInfo.rawtx).then(({ success, txid, error }) => {
+      handleConfirm={(res) => {
+        pushOrdinalsTx(res ? res.rawtx : contextData.rawTxInfo.rawtx).then(({ success, txid, error }) => {
           if (success) {
             navigate('TxSuccessScreen', { txid });
           } else {

src/ui/state/transactions/hooks.ts

@@ -1,12 +1,12 @@
 import { useCallback, useMemo } from 'react';
 
+import { KEYRING_TYPE } from '@/shared/constant';
 import { RawTxInfo, ToAddressInfo } from '@/shared/types';
 import { useTools } from '@/ui/components/ActionComponent';
 import { satoshisToAmount, satoshisToBTC, sleep, useWallet } from '@/ui/utils';
 import { UnspentOutput } from '@unisat/wallet-sdk';
 import { bitcoin } from '@unisat/wallet-sdk/lib/bitcoin-core';
 
-import { KEYRING_TYPE } from '@/shared/constant';
 import { AppState } from '..';
 import { useAccountAddress, useCurrentAccount } from '../accounts/hooks';
 import { accountActions } from '../accounts/reducer';
@@ -629,6 +629,7 @@ export function usePrepareSendRunesCallback() {
   const fetchUtxos = useFetchUtxosCallback();
   const assetUtxosRunes = useAssetUtxosRunes();
   const fetchAssetUtxosRunes = useFetchAssetUtxosRunesCallback();
+  const account = useCurrentAccount();
   return useCallback(
     async ({
       toAddressInfo,
@@ -666,7 +667,8 @@ export function usePrepareSendRunesCallback() {
         assetUtxos
       });
       const psbt = bitcoin.Psbt.fromHex(psbtHex);
-      const rawtx = psbt.extractTransaction().toHex();
+
+      const rawtx = account.type === KEYRING_TYPE.KeystoneKeyring ? '' : psbt.extractTransaction().toHex();
       dispatch(
         transactionsActions.updateRunesTx({
           rawtx,
@@ -686,7 +688,7 @@ export function usePrepareSendRunesCallback() {
       };
       return rawTxInfo;
     },
-    [dispatch, wallet, fromAddress, utxos, assetUtxosRunes, fetchAssetUtxosRunes]
+    [dispatch, wallet, fromAddress, utxos, assetUtxosRunes, fetchAssetUtxosRunes, account]
   );
 }
 

yarn.lock

@@ -2435,13 +2435,6 @@
   dependencies:
     bignumber.js "*"
 
-"@types/bitcore-lib@^0.15.6":
-  version "0.15.6"
-  resolved "https://registry.yarnpkg.com/@types/bitcore-lib/-/bitcore-lib-0.15.6.tgz#6cbb5889e7fdb49e26d2a7e4e522275b1d03d449"
-  integrity sha512-CtKDBgSBubPXZ0wFeCiUCSdzH+cuy6nFya3FboOqf44evi+OmkQPqEg3ASMpmPDYE8vkcxV302Iu8lZqCjYieg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/bn.js@^5.1.0":
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.5.tgz#2e0dacdcce2c0f16b905d20ff87aedbc6f7b4bf0"