refactor(ecash): improve utility and helper functions

Author: Amatack

packages/extension/src/providers/ecash/libs/utils.ts

@@ -1,10 +1,15 @@
 import { Address } from 'ecash-lib';
 import { toBN } from 'web3-utils';
 
-export const isValidECashAddress = (address: string): boolean => {
+export const isValidECashAddress = (
+  address: string,
+  cashAddrPrefix: string = 'ecash',
+): boolean => {
   try {
     const addr = Address.parse(address);
-    return Boolean(addr);
+    if (addr.prefix !== cashAddrPrefix) return false;
+    if (!addr.hash || addr.hash.length === 0) return false;
+    return true;
   } catch {
     return false;
   }
@@ -65,19 +70,20 @@ export function sumSatoshis(items: any[]): string {
  */
 export function calculateTransactionValue(
   outputs: any[],
-  normalizedAddress: string,
+  ownedAddresses: string[],
   isReceive: boolean,
   cashAddrPrefix: string = 'ecash',
 ): string {
+  const ownedSet = new Set(ownedAddresses);
   return outputs
     .filter((output: any) => {
       const outputAddress = scriptToAddress(
         output.outputScript,
         cashAddrPrefix,
       );
       return isReceive
-        ? outputAddress === normalizedAddress
-        : outputAddress !== normalizedAddress;
+        ? ownedSet.has(outputAddress)
+        : !ownedSet.has(outputAddress);
     })
     .reduce((sum, output) => sum.add(toBN(extractSats(output))), toBN('0'))
     .toString();
@@ -91,27 +97,40 @@ export function calculateOnchainTxFee(tx: any): number {
 
 export function getTransactionAddresses(
   tx: any,
-  normalizedAddress: string,
+  ownedAddresses: string[],
   isReceive: boolean,
   isSend: boolean,
   cashAddrPrefix: string = 'ecash',
 ): { fromAddress: string; toAddress: string } {
   let fromAddress = 'Unknown';
   let toAddress = 'Unknown';
+  const ownedSet = new Set(ownedAddresses);
 
   if (isReceive) {
+    // From: first input (external sender)
     fromAddress = tx.inputs[0]?.outputScript
       ? scriptToAddress(tx.inputs[0].outputScript, cashAddrPrefix)
       : 'Unknown';
-    toAddress = normalizedAddress;
+    // To: first owned address that received funds
+    const receivingOutput = tx.outputs.find((output: any) => {
+      const outputAddress = scriptToAddress(
+        output.outputScript,
+        cashAddrPrefix,
+      );
+      return ownedSet.has(outputAddress);
+    });
+    toAddress = receivingOutput
+      ? scriptToAddress(receivingOutput.outputScript, cashAddrPrefix)
+      : (ownedAddresses[0] ?? 'Unknown');
   } else if (isSend) {
-    fromAddress = normalizedAddress;
+    fromAddress = ownedAddresses[0] ?? 'Unknown';
+    // To: first EXTERNAL output (not owned = recipient, not change)
     const recipientOutput = tx.outputs.find((output: any) => {
       const outputAddress = scriptToAddress(
         output.outputScript,
         cashAddrPrefix,
       );
-      return outputAddress !== normalizedAddress;
+      return !ownedSet.has(outputAddress);
     });
     toAddress = recipientOutput
       ? scriptToAddress(recipientOutput.outputScript, cashAddrPrefix)

packages/extension/src/providers/ecash/tests/utils.test.ts

@@ -13,16 +13,32 @@ import {
 
 describe('ECash Utils Tests', () => {
   describe('isValidECashAddress', () => {
-    it('should validate correct eCash address', () => {
+    it('should validate correct eCash address with prefix', () => {
       const validAddress = 'ecash:qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
       expect(isValidECashAddress(validAddress)).toBe(true);
     });
 
-    it('should validate correct eCash address without prefix', () => {
+    it('should validate correct eCash address without prefix (default ecash)', () => {
       const validAddress = 'qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
       expect(isValidECashAddress(validAddress)).toBe(true);
     });
 
+    it('should validate correct ectest address without prefix', () => {
+      const validAddress = 'qz5fdmzx8cdqspevemxe20z94y6689zhdqm5xdfvsm';
+      expect(isValidECashAddress(validAddress, 'ectest')).toBe(true);
+    });
+
+    it('should reject ecash address when ectest prefix is expected', () => {
+      const validEcashAddress =
+        'ecash:qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
+      expect(isValidECashAddress(validEcashAddress, 'ectest')).toBe(false);
+    });
+
+    it('should reject ectest address when ecash prefix is expected', () => {
+      const ectestAddress = 'ectest:qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
+      expect(isValidECashAddress(ectestAddress, 'ecash')).toBe(false);
+    });
+
     it('should reject invalid eCash address', () => {
       const invalidAddress = 'invalid_address_123';
       expect(isValidECashAddress(invalidAddress)).toBe(false);
@@ -31,6 +47,12 @@ describe('ECash Utils Tests', () => {
     it('should reject empty string', () => {
       expect(isValidECashAddress('')).toBe(false);
     });
+
+    it('should use ecash as default prefix', () => {
+      const validAddress = 'ecash:qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
+      expect(isValidECashAddress(validAddress)).toBe(true);
+      expect(isValidECashAddress(validAddress, 'ecash')).toBe(true);
+    });
   });
 
   describe('scriptToAddress', () => {
@@ -124,7 +146,11 @@ describe('ECash Utils Tests', () => {
         },
       ];
       const normalizedAddress = scriptToAddress(outputs[0].outputScript);
-      const value = calculateTransactionValue(outputs, normalizedAddress, true);
+      const value = calculateTransactionValue(
+        outputs,
+        [normalizedAddress],
+        true,
+      );
       expect(value).to.equal('1000');
     });
 
@@ -142,7 +168,7 @@ describe('ECash Utils Tests', () => {
       const normalizedAddress = scriptToAddress(outputs[0].outputScript);
       const value = calculateTransactionValue(
         outputs,
-        normalizedAddress,
+        [normalizedAddress],
         false,
       );
       expect(value).to.equal('2000');
@@ -157,7 +183,7 @@ describe('ECash Utils Tests', () => {
       ];
       const value = calculateTransactionValue(
         outputs,
-        'nonexistent_address',
+        ['nonexistent_address'],
         true,
       );
       expect(value).to.equal('0');
@@ -207,15 +233,16 @@ describe('ECash Utils Tests', () => {
         ],
         outputs: [
           {
-            outputScript: '76a914b9b67dd5f6b3f3b4f7c8d9e0f1a2b3c4d5e6f788ac',
+            outputScript: '76a9142aa5b50d61a930bc280c9a53165c0dbbc46daef488ac',
             sats: 1000,
           },
         ],
       };
+      // The owned address matches the output script above
       const normalizedAddress = 'qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
       const { fromAddress, toAddress } = getTransactionAddresses(
         tx,
-        normalizedAddress,
+        [normalizedAddress],
         true,
         false,
       );
@@ -232,19 +259,20 @@ describe('ECash Utils Tests', () => {
         ],
         outputs: [
           {
-            outputScript: '76a914b9b67dd5f6b3f3b4f7c8d9e0f1a2b3c4d5e6f788ac',
+            outputScript: '76a9142aa5b50d61a930bc280c9a53165c0dbbc46daef488ac',
             sats: 1000,
           },
           {
-            outputScript: '76a914c0c78ee6f7c4f4c5f8d9e0f1a2b3c4d5e6f788ac',
+            outputScript: '76a914b9b67dd5f6b3f3b4f7c8d9e0f1a2b3c4d5e6f788ac',
             sats: 2000,
           },
         ],
       };
-      const normalizedAddress = scriptToAddress(tx.outputs[0].outputScript);
+      // owned address is the first output (change), recipient is the second
+      const normalizedAddress = 'qq42tdgdvx5np0pgpjd9x9jupkaugmdw7sjp5dqa63';
       const { fromAddress, toAddress } = getTransactionAddresses(
         tx,
-        normalizedAddress,
+        [normalizedAddress],
         false,
         true,
       );
@@ -260,7 +288,7 @@ describe('ECash Utils Tests', () => {
       };
       const { fromAddress, toAddress } = getTransactionAddresses(
         tx,
-        'someaddress',
+        ['someaddress'],
         false,
         false,
       );

packages/extension/src/providers/ecash/types/ecash-network.ts

@@ -39,7 +39,8 @@ export const getAddress = (
   pubkey: string,
   cashAddrPrefix: string = 'ecash',
 ): string => {
-  if (isValidECashAddress(pubkey)) return getAddressWithoutPrefix(pubkey);
+  if (isValidECashAddress(pubkey, cashAddrPrefix))
+    return getAddressWithoutPrefix(pubkey);
 
   try {
     let cleanPubkey = pubkey;
@@ -56,6 +57,6 @@ export const getAddress = (
     return getAddressWithoutPrefix(address);
   } catch (error) {
     console.error('Error converting pubkey to cashaddr:', error);
-    return pubkey;
+    return '';
   }
 };

packages/extension/src/providers/ecash/ui/libs/fee-calculator.ts

@@ -59,7 +59,15 @@ export const calculateTransactionFee = (
         if (bSats.lt(aSats)) return -1;
         return 0;
       });
-
+    if (nonTokenUTXOs.length === 0) {
+      console.warn(
+        '⚠️ [calculateTransactionFee] No spendable XEC UTXOs available',
+      );
+      return {
+        feeInXEC: fromBase(fallbackByteSize.toString(), networkDecimals),
+        txSize: fallbackByteSize,
+      };
+    }
     const result = calculateNativeXECFee(
       sendAmount,
       nonTokenUTXOs,
@@ -146,30 +154,17 @@ export const buildGasCostValues = (
 ): GasFeeType => {
   const feeUSD = new BigNumber(feeInXEC).times(assetPrice || '0').toString();
 
+  const entry = {
+    nativeValue: feeInXEC,
+    fiatValue: feeUSD,
+    nativeSymbol: currencyName,
+    fiatSymbol: 'USD',
+  };
+
   return {
-    [GasPriceTypes.ECONOMY]: {
-      nativeValue: new BigNumber(feeInXEC).times(0.8).toString(),
-      fiatValue: new BigNumber(feeUSD).times(0.8).toString(),
-      nativeSymbol: currencyName,
-      fiatSymbol: 'USD',
-    },
-    [GasPriceTypes.REGULAR]: {
-      nativeValue: feeInXEC,
-      fiatValue: feeUSD,
-      nativeSymbol: currencyName,
-      fiatSymbol: 'USD',
-    },
-    [GasPriceTypes.FAST]: {
-      nativeValue: new BigNumber(feeInXEC).times(1.2).toString(),
-      fiatValue: new BigNumber(feeUSD).times(1.2).toString(),
-      nativeSymbol: currencyName,
-      fiatSymbol: 'USD',
-    },
-    [GasPriceTypes.FASTEST]: {
-      nativeValue: new BigNumber(feeInXEC).times(1.5).toString(),
-      fiatValue: new BigNumber(feeUSD).times(1.5).toString(),
-      nativeSymbol: currencyName,
-      fiatSymbol: 'USD',
-    },
+    [GasPriceTypes.ECONOMY]: entry,
+    [GasPriceTypes.REGULAR]: entry,
+    [GasPriceTypes.FAST]: entry,
+    [GasPriceTypes.FASTEST]: entry,
   };
 };

packages/extension/src/providers/ecash/ui/libs/send-utils.ts

@@ -2,21 +2,19 @@ import { toBN } from 'web3-utils';
 import { toBase, fromBase } from '@enkryptcom/utils';
 
 interface UTXO {
-  sats?: number;
-  value?: number;
+  sats?: number | bigint;
+  value?: number | bigint;
   token?: any;
 }
 
 export const calculateUTXOBalance = (
   accountUTXOs: UTXO[],
 ): ReturnType<typeof toBN> => {
   const nonTokenUTXOs = accountUTXOs.filter((utxo: UTXO) => !utxo.token);
-  return toBN(
-    nonTokenUTXOs.reduce(
-      (acc, utxo) => acc + Number(utxo.sats || utxo.value || 0),
-      0,
-    ),
-  );
+  return nonTokenUTXOs.reduce((acc, utxo) => {
+    const sats = utxo.sats ?? utxo.value ?? 0;
+    return acc.add(toBN(sats.toString()));
+  }, toBN(0));
 };
 
 export const calculateBalanceAfterTransaction = (
@@ -41,8 +39,8 @@ export const isBelowDustLimit = (
   assetDecimals: number,
   dustLimit: number,
 ): boolean => {
-  const amountInSatoshis = toBase(sendAmount, assetDecimals);
-  return Number(amountInSatoshis) < dustLimit && Number(sendAmount) > 0;
+  const amountInSats = toBN(toBase(sendAmount, assetDecimals));
+  return amountInSats.lt(toBN(dustLimit)) && amountInSats.gt(toBN(0));
 };
 
 export const calculateMaxSendableValue = (