From 0a87974050af15e425b73a8d7190b4be1163a013 Mon Sep 17 00:00:00 2001
From: hunaniangstudio <891863891@qq.com>
Date: Fri, 30 Jun 2023 15:38:55 +0800
Subject: [PATCH] fix: only split inscriptions to change-address

---
 package.json                                 |  2 +-
 src/background/controller/wallet.ts          |  3 +-
 src/ui/pages/Wallet/OrdinalsDetailScreen.tsx |  8 +++++-
 src/ui/pages/Wallet/SplitTxCreateScreen.tsx  | 29 +++-----------------
 src/ui/state/transactions/hooks.ts           |  6 ++--
 src/ui/utils/WalletContext.tsx               |  2 +-
 yarn.lock                                    |  8 +++---
 7 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 1c90f46a..aaa340f6 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@types/react-dom": "^18.0.4",
     "@unisat/bitcoin-hd-keyring": "1.0.0",
     "@unisat/bitcoinjs-wallet": "^0.1.0",
-    "@unisat/ord-utils": "0.3.0",
+    "@unisat/ord-utils": "0.3.1",
     "antd": "^4.20.4",
     "antd-dayjs-webpack-plugin": "1.0.6",
     "assert": "^2.0.0",
diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
index 0bbd9971..09f74b77 100644
--- a/src/background/controller/wallet.ts
+++ b/src/background/controller/wallet.ts
@@ -737,7 +737,7 @@ export class WalletController extends BaseController {
     return psbt.toHex();
   };
 
-  splitInscription = async ({ to, inscriptionId, feeRate }: { to: string; inscriptionId: string; feeRate: number }) => {
+  splitInscription = async ({ inscriptionId, feeRate }: { to: string; inscriptionId: string; feeRate: number }) => {
     const account = await preferenceService.getCurrentAccount();
     if (!account) throw new Error('no current account');
 
@@ -764,7 +764,6 @@ export class WalletController extends BaseController {
           ords: v.inscriptions
         };
       }),
-      toAddress: to,
       wallet: this,
       network: psbtNetwork,
       changeAddress: account.address,
diff --git a/src/ui/pages/Wallet/OrdinalsDetailScreen.tsx b/src/ui/pages/Wallet/OrdinalsDetailScreen.tsx
index 164bdbce..e67c5a0a 100644
--- a/src/ui/pages/Wallet/OrdinalsDetailScreen.tsx
+++ b/src/ui/pages/Wallet/OrdinalsDetailScreen.tsx
@@ -56,7 +56,13 @@ export default function OrdinalsDetailScreen() {
             <InscriptionPreview data={inscription} preset="large" />
           </Row>
 
-          {isMultiStuck && <Text color="danger" textCenter text={'This inscription is stuck by other inscriptions'} />}
+          {isMultiStuck && (
+            <Text
+              color="danger"
+              textCenter
+              text={'Multiple inscriptions are mixed together. Please split them first.'}
+            />
+          )}
           {withSend &&
             (isMultiStuck ? (
               <Button
diff --git a/src/ui/pages/Wallet/SplitTxCreateScreen.tsx b/src/ui/pages/Wallet/SplitTxCreateScreen.tsx
index 0a0b02df..a9406c9c 100644
--- a/src/ui/pages/Wallet/SplitTxCreateScreen.tsx
+++ b/src/ui/pages/Wallet/SplitTxCreateScreen.tsx
@@ -5,8 +5,7 @@ import { Inscription, RawTxInfo } from '@/shared/types';
 import { Button, Column, Content, Header, Input, Layout, Row, Text } from '@/ui/components';
 import { FeeRateBar } from '@/ui/components/FeeRateBar';
 import InscriptionPreview from '@/ui/components/InscriptionPreview';
-import { useCurrentAccount } from '@/ui/state/accounts/hooks';
-import { useCreateOrdinalsTxCallback, useCreateSplitTxCallback, useOrdinalsTx } from '@/ui/state/transactions/hooks';
+import { useCreateSplitTxCallback, useOrdinalsTx } from '@/ui/state/transactions/hooks';
 import { isValidAddress, useWallet } from '@/ui/utils';
 
 import { useNavigate } from '../MainRoute';
@@ -21,11 +20,6 @@ export default function SplitTxCreateScreen() {
   };
   const ordinalsTx = useOrdinalsTx();
 
-  const [toInfo, setToInfo] = useState({
-    address: '',
-    domain: ''
-  });
-
   const [error, setError] = useState('');
   const createSplitTx = useCreateSplitTxCallback();
 
@@ -51,17 +45,13 @@ export default function SplitTxCreateScreen() {
       return;
     }
 
-    if (!isValidAddress(toInfo.address)) {
-      return;
-    }
-
-    if (toInfo.address == ordinalsTx.toAddress && feeRate == ordinalsTx.feeRate) {
+    if (feeRate == ordinalsTx.feeRate) {
       //Prevent repeated triggering caused by setAmount
       setDisabled(false);
       return;
     }
 
-    createSplitTx(toInfo, inscription.inscriptionId, feeRate)
+    createSplitTx(inscription.inscriptionId, feeRate)
       .then((data) => {
         setRawTxInfo(data);
         setDisabled(false);
@@ -70,7 +60,7 @@ export default function SplitTxCreateScreen() {
         console.log(e);
         setError(e.message);
       });
-  }, [toInfo, feeRate]);
+  }, [feeRate]);
 
   return (
     <Layout>
@@ -97,17 +87,6 @@ export default function SplitTxCreateScreen() {
             </Row>
           </Row>
 
-          <Text text="Recipient" color="textDim" />
-
-          <Input
-            preset="address"
-            addressInputData={toInfo}
-            autoFocus={true}
-            onAddressInputChange={(val) => {
-              setToInfo(val);
-            }}
-          />
-
           <Text text="Fee" color="textDim" />
 
           <FeeRateBar
diff --git a/src/ui/state/transactions/hooks.ts b/src/ui/state/transactions/hooks.ts
index d50798bc..df5da402 100644
--- a/src/ui/state/transactions/hooks.ts
+++ b/src/ui/state/transactions/hooks.ts
@@ -197,9 +197,8 @@ export function useCreateSplitTxCallback() {
   const fromAddress = useAccountAddress();
   const utxos = useUtxos();
   return useCallback(
-    async (toAddressInfo: ToAddressInfo, inscriptionId: string, feeRate: number) => {
+    async (inscriptionId: string, feeRate: number) => {
       const psbtHex = await wallet.splitInscription({
-        to: toAddressInfo.address,
         inscriptionId,
         feeRate
       });
@@ -216,8 +215,7 @@ export function useCreateSplitTxCallback() {
       );
       const rawTxInfo: RawTxInfo = {
         psbtHex,
-        rawtx,
-        toAddressInfo
+        rawtx
       };
       return rawTxInfo;
     },
diff --git a/src/ui/utils/WalletContext.tsx b/src/ui/utils/WalletContext.tsx
index 836274eb..2fb51fda 100644
--- a/src/ui/utils/WalletContext.tsx
+++ b/src/ui/utils/WalletContext.tsx
@@ -130,7 +130,7 @@ export interface WalletController {
 
   sendInscriptions(data: { to: string; inscriptionIds: string[]; feeRate: number }): Promise<string>;
 
-  splitInscription(data: { to: string; inscriptionId: string; feeRate: number }): Promise<string>;
+  splitInscription(data: { inscriptionId: string; feeRate: number }): Promise<string>;
 
   pushTx(rawtx: string): Promise<string>;
 
diff --git a/yarn.lock b/yarn.lock
index 0f4e809f..cccf1311 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2734,10 +2734,10 @@
     tiny-secp256k1 "^2.2.1"
     uuid "^9.0.0"
 
-"@unisat/ord-utils@0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@unisat/ord-utils/-/ord-utils-0.3.0.tgz#94222a870acd98232b19e5383469db98289942e4"
-  integrity sha512-QQQqqeP/pB6AdaibT9KX+gl4BTAXQEz0zIbWPnTa6cGij2GYfrDpuP6y3Pyj9Y797Et4dDOsAnHfQeUq51KOJA==
+"@unisat/ord-utils@0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@unisat/ord-utils/-/ord-utils-0.3.1.tgz#55bce4cd4c7ac95871391f481bd266a8edb7d36b"
+  integrity sha512-65Z8gURDZDfiUVMjMQ0Efi/GaiojgQ3Voyjwb0CXLZxM2+jZFSyTvhUiHzfIUmDGkpQlnlBe8ul1r2UzbM8/xw==
   dependencies:
     bignumber.js "^9.1.1"
     bitcoinjs-lib "^6.1.0"