refactor: cleanup

Author: ganchoradkov

advanced/dapps/react-dapp-v2/src/chains/bip122.ts

@@ -17,10 +17,6 @@ export const BtcMetadata: NamespaceMetadata = {
   },
 };
 
-// "Non conforming namespaces. approve() namespaces chains don't satisfy required namespaces.
-//       Required: bip122:000000000019d6689c085ae165831e93
-//       Approved: xrpl:1,eip155:114,eip155:16,eip155:11155111,eip155:97,eip155:80002,eip155:4002,eip155:421614,eip155:11155420,eip155:51,eip155:84532,bip122:000000000933ea01ad0ee984209779ba,bip122:4966625a4b2851d9fdee139e56211a0d,bip122:bb0a78264637406b6360aad926284d54"
-
 export function getChainMetadata(chainId: string): ChainMetadata {
   const reference = chainId.split(":")[1];
   const metadata = BtcMetadata[reference];

advanced/dapps/react-dapp-v2/src/constants/default.ts

@@ -277,8 +277,6 @@ export enum DEFAULT_KADENA_EVENTS {}
  * BITCOIN
  */
 export enum DEFAULT_BIP122_METHODS {
-  // BIP122_SIGN_MESSAGE = "btc_signMessage",
-  // BIP122_SEND_TRANSACTION = "btc_sendTransaction",
   BIP122_SEND_TRANSACTION = "sendTransfer",
   BIP122_GET_ACCOUNT_ADDRESSES = "getAccountAddresses",
   BIP122_SIGN_MESSAGE = "signMessage",

advanced/dapps/react-dapp-v2/src/helpers/bip122.ts

@@ -2,7 +2,7 @@ import { schnorr } from "@noble/secp256k1";
 import * as bitcoin from "bitcoinjs-lib";
 import BitcoinMessage from "bitcoinjs-message";
 import { convertHexToBase64 } from "./utilities";
-
+import { IUTXO } from "./types";
 export async function apiGetBip122AccountBalance(
   address: string,
   chainId: string
@@ -19,15 +19,15 @@ export async function apiGetAddressUtxos(address: string, chainId: string) {
   ).json();
 }
 
-export function getAvailableBalanceFromUtxos(utxos: any[]) {
+export function getAvailableBalanceFromUtxos(utxos: IUTXO[]) {
   if (!utxos || !utxos.length) {
     return 0;
   }
   return utxos.reduce((acc, { value }) => acc + value, 0);
 }
 
 export function calculateChange(
-  utxos: any[],
+  utxos: IUTXO[],
   amount: number,
   feeRate: number
 ): number {

advanced/dapps/react-dapp-v2/src/helpers/types.ts

@@ -163,3 +163,15 @@ export interface KadenaAccount {
   account: string; // Kadena account
   chainId: ChainId; // Kadena ChainId
 }
+
+export interface IUTXO {
+  txid: string;
+  vout: number;
+  value: number;
+  status: {
+    confirmed: boolean;
+    block_height: number;
+    block_hash: string;
+    block_time: number;
+  };
+}

advanced/dapps/react-dapp-v2/src/pages/index.tsx

@@ -50,7 +50,6 @@ import OriginSimulationDropdown from "../components/OriginSimulationDropdown";
 import LoaderModal from "../modals/LoaderModal";
 import { numberToHex } from "@walletconnect/encoding";
 import RequestLoaderModal from "../modals/RequestLoaderModal";
-import { cons } from "fp-ts/lib/ReadonlyNonEmptyArray";
 
 // Normal import does not work here
 const { version } = require("@walletconnect/sign-client/package.json");

advanced/wallets/react-wallet-v2/src/data/Bip122Data.ts

@@ -2,8 +2,8 @@
  * Chains
  */
 export const BITCOIN_MAINNET = {
-  'bip122:000000000933ea01ad0ee984209779ba4ff763ae46a2a6c172b3f1b60a8ce26f': {
-    chainId: '000000000933ea01ad0ee984209779ba4ff763ae46a2a6c172b3f1b60a8ce26f',
+  'bip122:000000000019d6689c085ae165831e93': {
+    chainId: '000000000019d6689c085ae165831e93',
     name: 'BTC Mainnet',
     logo: '/chain-logos/btc-mainnet.png',
     rgb: '107, 111, 147',

advanced/wallets/react-wallet-v2/src/lib/Bip122Lib.ts

@@ -13,13 +13,25 @@ interface IInitArguments {
   privateKey?: string
 }
 
+interface IUTXO {
+  txid: string
+  vout: number
+  value: number
+  status: {
+    confirmed: boolean
+    block_height: number
+    block_hash: string
+    block_time: number
+  }
+}
+
 interface ICreateTransaction {
   network: bitcoin.Network
   recipientAddress: string
   amount: number
   changeAddress: string
   memo?: string
-  utxos: any[]
+  utxos: IUTXO[]
   privateKeyWIF: string
   feeRate: number
 }
@@ -146,13 +158,13 @@ export default class Bip122Lib {
       throw new Error(`Invalid amount: ${amount}`)
     }
 
-    const utxos = await this.getUtXOs(account)
+    const utxos = (await this.getUTXOs(account)) as IUTXO[]
     if (!utxos || utxos.length === 0) {
       throw new Error(`No UTXOs found for address: ${account}`)
     }
 
     let utxosValue = 0
-    const utxosToSpend: any[] = []
+    const utxosToSpend: IUTXO[] = []
     utxos.forEach(utxo => {
       utxosValue += utxo.value
       utxosToSpend.push(utxo)
@@ -175,7 +187,7 @@ export default class Bip122Lib {
     return await this.broadcastTransaction(transaction)
   }
 
-  async getUtXOs(address: string): Promise<any[]> {
+  async getUTXOs(address: string): Promise<IUTXO[]> {
     // make chain dynamic
     return await (await fetch(`https://mempool.space/testnet/api/address/${address}/utxo`)).json()
   }
@@ -192,7 +204,7 @@ export default class Bip122Lib {
     throw new Error('Error broadcasting transaction: ' + (await result.text()))
   }
 
-  getAvailableBalance(utxos: any[]) {
+  getAvailableBalance(utxos: IUTXO[]) {
     return utxos.reduce((acc, { value }) => acc + value, 0)
   }
 
@@ -352,8 +364,14 @@ export default class Bip122Lib {
   }
 
   // Helper function to calculate change
-  private calculateChange(utxos: any[], amount: number, feeRate: number): number {
+  private calculateChange(utxos: IUTXO[], amount: number, feeRate: number): number {
     const inputSum = utxos.reduce((sum, utxo) => sum + utxo.value, 0)
+    /**
+     * 10 bytes: This is an estimated fixed overhead for the transaction.
+     * 148 bytes: This is the average size of each input (UTXO).
+     * 34 bytes: This is the size of each output.
+     * The multiplication by 2 indicates that there are usually two outputs in a typical transaction (one for the recipient and one for change)
+     */
     const estimatedSize = 10 + 148 * utxos.length + 34 * 2
     const fee = estimatedSize * feeRate
     const change = inputSum - amount - fee