fix: Made OP_Return as last output, fixed type errors

zeta-chain · Jun 30, 2024 · 54f4936 · 54f4936
1 parent 076022d
commit 54f4936
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/app/btcintegration/page.tsx b/app/btcintegration/page.tsx
@@ -17,10 +17,23 @@ interface ConnectedAddressData {
   pubKey: string
 }
 
+export type Params = {
+  contract: string
+  message: string
+  amount: number
+  tss: string
+}
+
+declare global {
+  interface Window {
+    unisat: any
+  }
+}
+
 const BtcIntegration = () => {
   const [contractAddress, setContractAddress] = useState("")
   const [message, setMessage] = useState("")
-  const [amount, setAmount] = useState()
+  const [amount, setAmount] = useState<number | undefined>()
   const [selectedWallet, setSelectedWallet] = useState<Wallet>("XDefi")
 
   const sendTransaction = async () => {
@@ -50,7 +63,7 @@ const BtcIntegration = () => {
     }
   }
 
-  const callXDefi = async (params) => {
+  const callXDefi = async (params: Params) => {
     if (!window.xfi) return alert("XDEFI wallet not installed")
     const wallet = window.xfi
     window.xfi.bitcoin.changeNetwork("testnet")
@@ -71,7 +84,7 @@ const BtcIntegration = () => {
         },
       ],
     }
-    window.xfi.bitcoin.request(tx, (err, res) => {
+    window.xfi.bitcoin.request(tx, (err: Error, res: Response) => {
       if (err) {
         return alert(`Couldn't send transaction, ${JSON.stringify(err)}`)
       } else if (res) {
@@ -80,7 +93,7 @@ const BtcIntegration = () => {
     })
   }
 
-  const callUniSat = async (params) => {
+  const callUniSat = async (params: Params) => {
     if (!window.unisat) return alert("Unisat wallet not installed")
     try {
       await window.unisat.requestAccounts()
@@ -94,7 +107,7 @@ const BtcIntegration = () => {
     }
   }
 
-  const callXverse = async (params) => {
+  const callXverse = async (params: Params) => {
     const response = await Wallet.request("getAccounts", {
       purposes: [AddressPurpose.Payment],
       message: "Test app wants to know your addresses!",
@@ -128,7 +141,7 @@ const BtcIntegration = () => {
               type="number"
               value={amount}
               onChange={(e) => {
-                setAmount(e.target.value)
+                setAmount(Number(e.target.value))
               }}
               placeholder="0"
             />
@@ -159,7 +172,7 @@ const BtcIntegration = () => {
           <div>
             <select
               onChange={(e) => {
-                setSelectedWallet(e.target.value)
+                setSelectedWallet(e.target.value as Wallet)
               }}
               className="block my-2"
             >

diff --git a/app/btcintegration/xverse-utils.ts b/app/btcintegration/xverse-utils.ts
@@ -2,6 +2,8 @@ import { base64, hex } from "@scure/base"
 import * as btc from "micro-btc-signer"
 import Wallet, { RpcErrorCode } from "sats-connect"
 
+import { Params } from "./page"
+
 const bitcoinTestnet = {
   bech32: "tb",
   pubKeyHash: 0x6f,
@@ -32,7 +34,7 @@ async function fetchUtxo(address: string): Promise<any[]> {
 async function createTransaction(
   publickkey: string,
   senderAddress: string,
-  params
+  params: Params
 ) {
   const publicKey = hex.decode(publickkey)
 
@@ -72,12 +74,12 @@ async function createTransaction(
 
   const opReturn = btc.Script.encode(["RETURN", Buffer.from(memo, "utf8")])
 
+  tx.addOutputAddress(recipientAddress, BigInt(params.amount), bitcoinTestnet)
+  tx.addOutputAddress(changeAddress, BigInt(800), bitcoinTestnet)
   tx.addOutput({
     script: opReturn,
     amount: BigInt(0),
   })
-  tx.addOutputAddress(recipientAddress, BigInt(params.amount), bitcoinTestnet)
-  tx.addOutputAddress(changeAddress, BigInt(800), bitcoinTestnet)
 
   const psbt = tx.toPSBT(0)