devop: merge

Author: kvhnuke

README.md

@@ -32,28 +32,82 @@ Enkrypt is a web3 wallet built from the ground up to support the multi-chain fut
 ## Currently Supported Chains
 
 - Ethereum
-- Polygon
-- BNB Smart Chain
-- Moonbeam
-- Moonriver
-- Karura EVM
-- Ethereum Classic
-- Polkadot
-- Kusama
-- Edgeware
+- Bitcoin
+- Solana
 - Acala
-- Karura
-- TomoChain
+- Amplitude
 - Arbitrum
-- Gnosis
+- Arbitrum Nova
+- Arthera
+- Astar
+- Astar EVM
+- Aurora
 - Avalanche
+- Base
+- Bifrost
+- Bifrost (Kusama)
+- Binance Smart Chain
+- Bitcoin Testnet
+- Bitrock
+- Blast
+- Caga Ankara Testnet
+- Canto
+- Celo
+- Degen
+- Dogecoin
+- Edgeware
+- Edgeware EVM
+- Ethereum Classic
 - Fantom
+- Forma
+- Fraxtal
+- Gnosis
+- Godwoken
+- Goerli
+- Ham Chain
+- Immutable zkEVM
+- Kadena
+- Karura
+- Karura EVM
 - Klaytn
-- Aurora
-- Ontology
+- Kusama
+- Linea
+- Litecoin
+- Manta Pacific
+- Mode
+- Moonbeam
+- Moonriver
+- OKX Chain
+- Ontology EVM
+- Opal
+- opBNB
+- Optimism
+- Palm Network
+- Pendulum
+- Polkadot
+- Polygon
+- Polygon zkEVM
+- Proof of Play Apex
 - Puppy Net
-- Arthera
-- Caga Ankara Testnet
+- Quartz
+- RARI Chain
+- Rollux
+- Rootstock
+- Sanko Chain
+- Scroll
+- Shibarium
+- Shiden
+- Shiden EVM
+- Sepolia
+- Syscoin
+- Telos EVM
+- Unique
+- Vara Network
+- Viction
+- Westend
+- ZChains
+- zkSync
+- zkSync Goerli
 - More coming soon!
 
 Looking to add your project? [Contact us!](https://mewwallet.typeform.com/enkrypt-inquiry?typeform-source=www.enkrypt.com)

packages/extension/.env.example

@@ -0,0 +1,2 @@
+# VITE_DEBUG_LOG="swap:*"
+VITE_DEBUG_LOG=

packages/extension/src/libs/cache-fetch/index.ts

@@ -42,7 +42,7 @@ const cacheFetch = async (
       .then(json => {
         const jsondata = options.postProcess ? options.postProcess(json) : json;
         const jsonstring = JSON.stringify(jsondata);
-        if (!jsonstring.includes('error')) {
+        if (!json.error) {
           const store: StoredData = {
             timestamp: new Date().getTime(),
             data: jsonstring,

packages/extension/src/libs/tokens-state/index.ts

@@ -35,7 +35,7 @@ export class TokensState {
         if (
           t.type === TokenType.ERC20 &&
           (t as CustomErc20Token).address.toLowerCase() ===
-            token.address.toLowerCase()
+          token.address.toLowerCase()
         ) {
           return false;
         }
@@ -54,6 +54,44 @@ export class TokensState {
     return true;
   }
 
+  /**
+   * Remove a custom ERC20 token from a given network.
+   * Returns `true` if the token was removed and false otherwise.
+   * @param {NetworkNames} chainName - The name of the network the token is being removed from.
+   * @param {string} address - The address of the token being removed.
+   */
+  async removeErc20Token(
+    chainName: NetworkNames,
+    address: string,
+  ): Promise<boolean> {
+    const state: IState | null = await this.storage.get(StorageKeys.customTokens);
+
+    if (state && state[chainName]) {
+      const tokens = state[chainName];
+
+      for (let i = 0; i < tokens!.length; i++) {
+        const token = tokens![i];
+
+        if (
+          token.type === TokenType.ERC20 &&
+          (token as CustomErc20Token).address.toLowerCase() ===
+          address.toLowerCase()
+        ) {
+          tokens!.splice(i, 1);
+
+          if (tokens!.length === 0) {
+            delete state[chainName];
+          }
+
+          await this.storage.set(StorageKeys.customTokens, state);
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
   async getTokensByNetwork(chainName: NetworkNames): Promise<CustomToken[]> {
     const state: IState | null = await this.storage.get(
       StorageKeys.customTokens,

packages/extension/src/libs/utils/number-formatter.ts

@@ -517,6 +517,19 @@ const toBNSafe = (number: number) => {
   return toBN(new BigNumber(number).toFixed(0));
 };
 
+/**
+ * Validates if a string represents a positive numeric value less than 2^256.
+ * Used for validating transaction amounts across different blockchain implementations.
+ * @param {string} value - The string value to validate
+ * @returns {boolean} - True if the value is a valid positive number within bounds
+ */
+const isNumericPositive = (value: string) => {
+  if (!value?.trim()) return false;
+  const num = BigNumber(value);
+  return !num.isNaN() && num.isPositive() && num.lt(new BigNumber(2).pow(256));
+};
+
+
 export {
   formatIntegerToString,
   formatIntegerValue,
@@ -526,4 +539,5 @@ export {
   formatPercentageValue,
   formatGasValue,
   toBNSafe,
+  isNumericPositive
 };

packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue

@@ -149,7 +149,10 @@ import { BTCToken } from '../../types/btc-token';
 import BigNumber from 'bignumber.js';
 import { defaultGasCostVals } from '@/providers/common/libs/default-vals';
 import { fromBase, toBase, isValidDecimals } from '@enkryptcom/utils';
-import { formatFloatingPointValue } from '@/libs/utils/number-formatter';
+import {
+  formatFloatingPointValue,
+  isNumericPositive,
+} from '@/libs/utils/number-formatter';
 import { routes as RouterNames } from '@/ui/action/router';
 import getUiPath from '@/libs/utils/get-ui-path';
 import Browser from 'webextension-polyfill';
@@ -218,6 +221,10 @@ onMounted(async () => {
 });
 
 const nativeBalanceAfterTransaction = computed(() => {
+  if (!isNumericPositive(sendAmount.value)) {
+    return toBN(0);
+  }
+
   if (
     selectedAsset.value &&
     isValidDecimals(sendAmount.value, selectedAsset.value.decimals!)
@@ -305,7 +312,10 @@ const isInputsValid = computed<boolean>(() => {
     isSendToken.value
   )
     return false;
-  if (new BigNumber(sendAmount.value).gt(assetMaxValue.value)) return false;
+
+  const sendAmountBigNumber = new BigNumber(sendAmount.value)
+  if (sendAmountBigNumber.isNaN()) return false
+  if (sendAmountBigNumber.gt(assetMaxValue.value)) return false;
   return true;
 });
 

packages/extension/src/providers/common/ui/send-transaction/send-input-amount.vue

@@ -73,9 +73,16 @@ const amount = computed({
 
 const onlyNumber = ($event: KeyboardEvent) => {
   const keyCode = $event.keyCode ? $event.keyCode : $event.which;
-  if ((keyCode < 48 || keyCode > 57) && keyCode !== 46) {
-    $event.preventDefault();
+  // Numeric
+  if (keyCode >= /* 0 */ 48 && keyCode <= /* 9 */ 57) {
+    return;
   }
+  // Only allow a single period
+  if (keyCode === /* '.' */ 46 && amount.value.indexOf('.') === -1) {
+    return;
+  }
+  // Alphabetical (/non-numeric) or mulitple periods. Don't propagate change
+  $event.preventDefault();
 };
 const changeFocus = () => {
   isFocus.value = !isFocus.value;

packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts

@@ -68,6 +68,7 @@ const NetworkEndpoints: Record<string, string> = {
   [NetworkNames.Mode]: 'https://explorer.mode.network/',
   [NetworkNames.ProofOfPlayApex]: 'https://explorer.apex.proofofplay.com/',
   [NetworkNames.Scroll]: 'https://api.scrollscan.com/',
+  [NetworkNames.Fraxtal]: 'https://api.fraxscan.com/',
 };
 
 export { NetworkEndpoints };

packages/extension/src/providers/ethereum/libs/transaction/gas-utils.ts

@@ -62,7 +62,7 @@ const getGasBasedOnType = (
   }
 };
 const getMinPriorityFee = (): BNType => {
-  return toBN(toWei('0.1', 'gwei'));
+  return toBN(toWei('1', 'gwei'));
 };
 const getPriorityFeeAvg = (arr: BNType[]): BNType => {
   const sum = arr.reduce((a, v) => a.add(v));