refactor(ecash): update background handlers, keyring and filters

Author: Amatack

packages/extension/src/libs/background/index.ts

@@ -108,6 +108,15 @@ class BackgroundHandler {
         error: JSON.stringify(getCustomError('Enkrypt: not implemented')),
       };
     }
+    if (_provider === ProviderName.ecash) {
+      return {
+        error: JSON.stringify(
+          getCustomError(
+            'Enkrypt: eCash does not support external requests in this wallet',
+          ),
+        ),
+      };
+    }
     if (this.#geoRestricted !== undefined && this.#geoRestricted) {
       return {
         error: JSON.stringify(

packages/extension/src/libs/background/internal/ecash-sign.ts

@@ -38,10 +38,6 @@ const ecashSign = async (
     return { error: getCustomError('ecash-sign: missing required parameters') };
   }
 
-  if (!isValidECashAddress(params.toAddress)) {
-    return { error: getCustomError('ecash-sign: invalid destination address') };
-  }
-
   if (keyring.isLocked()) {
     return { error: getCustomError('ecash-sign: keyring is locked') };
   }
@@ -66,9 +62,14 @@ const ecashSign = async (
       return { error: getCustomError('ecash-sign: unknown network') };
     }
 
-    privateKeyBuffer = await keyring.getPrivateKeyForECash(
-      params.account,
-    );
+    const cashAddrPrefix = (network as any).cashAddrPrefix ?? 'ecash';
+    if (!isValidECashAddress(params.toAddress, cashAddrPrefix)) {
+      return {
+        error: getCustomError('ecash-sign: invalid destination address'),
+      };
+    }
+
+    privateKeyBuffer = await keyring.getPrivateKeyForECash(params.account);
     pkBytes = new Uint8Array(privateKeyBuffer);
     const chronik = new ChronikClient([network.node]);
     const wallet = Wallet.fromSk(pkBytes, chronik);
@@ -97,8 +98,10 @@ const ecashSign = async (
         result.errors?.length ? result.errors.join(', ') : 'Broadcast failed',
       );
     }
-
-    const txid = result.broadcasted[0] || '';
+    const txid = result.broadcasted[0];
+    if (!txid) {
+      throw new Error('Broadcast succeeded but no txid returned');
+    }
     return { result: JSON.stringify({ txid }) };
   } catch (e: any) {
     console.error('[ecash-sign] Error:', e);

packages/extension/src/ui/action/utils/filters.ts

@@ -39,26 +39,27 @@ export const parseCurrency = (value: string | number): string => {
 
   const notation = BigNumber(finalValue).gt(999999) ? 'compact' : 'standard';
 
-  let minimumFractionDigits = 2;
-  let maximumFractionDigits = 2;
+  const decimalStr = new BigNumber(finalValue).toFixed();
+  const decimalPlaces = Math.min(
+    (decimalStr.split('.')[1] ?? '').replace(/0+$/, '').length,
+    8,
+  );
 
-  if (finalValue > 0 && finalValue < 0.01) {
-    minimumFractionDigits = 2;
-    maximumFractionDigits = 8;
-  } else if (finalValue >= 0.01 && finalValue < 1) {
-    minimumFractionDigits = 2;
-    maximumFractionDigits = 4;
-  }
+  const minimumFractionDigits = 2;
+  const maximumFractionDigits = Math.max(2, decimalPlaces);
 
-  const formatted = new Intl.NumberFormat(locale, {
+  const formatter = new Intl.NumberFormat(locale, {
     style: 'currency',
     currency: currency,
     notation,
     minimumFractionDigits,
     maximumFractionDigits,
-  }).format(finalValue);
+  });
+
+  const formatted = formatter.format(finalValue);
+  const zeroFormatted = formatter.format(0);
 
-  return `${amount.lt(0.0000001) && amount.gt(0) ? '< ' : ''}${formatted}`;
+  return `${finalValue > 0 && formatted === zeroFormatted ? '< ' : ''}${formatted}`;
 };
 
 export const truncate = (value: string, length: number): string => {

packages/keyring/src/index.ts

@@ -426,7 +426,13 @@ class KeyRing {
       );
     }
 
-    return hexToBuffer(keypair.privateKey);
+    const privKeyHex = keypair.privateKey;
+    assert(
+      /^(0x)?[0-9a-fA-F]{64}$/.test(privKeyHex),
+      "Invalid private key format: expected 32-byte hex string",
+    );
+
+    return hexToBuffer(privKeyHex);
   }
 }