@samitouri / QOSAMI-cakewallet / commits / 2fc18de96

Normalize erc20 token addresses and fix duplicate tokens (#2884)

David Adegoke committed Feb 10, 2026 at 15:53 UTC 2fc18de966b37000ac5bb472508b32ed71d965a5
6 files changed +119 -35
cw_evm/lib/evm_chain_wallet.dart
+84
@@ -276,6 +276,8 @@ abstract class EVMChainWalletBase
276 evmChainErc20TokensBox = await CakeHive.openBox<Erc20Token>(boxName);
277 }
278
279 + await _normalizeEvmChainErc20TokensBoxKeys();
280 +
281 addInitialTokens();
282 }
283
@@ -306,6 +308,88 @@ abstract class EVMChainWalletBase
308 String getTransactionHistoryFileName() =>
309 EVMChainUtils.getTransactionHistoryFileName(selectedChainId);
310
311 + /// Ensures all ERC20 token entries use lowercase contract addresses as
312 + /// their Hive keys to avoid duplicates caused by case differences.
313 + Future<void> _normalizeEvmChainErc20TokensBoxKeys() async {
314 + if (!evmChainErc20TokensBox.isOpen) return;
315 +
316 + final prefs = await sharedPrefs.future;
317 + final migrationKey = 'erc20_box_normalized_${walletInfo.name}_$selectedChainId';
318 +
319 + if (prefs.getBool(migrationKey) ?? false) return;
320 +
321 + final box = evmChainErc20TokensBox;
322 + final keys = box.keys.cast<String>().toList(growable: false);
323 +
324 + if (keys.isEmpty) {
325 + await prefs.setBool(migrationKey, true);
326 + return;
327 + }
328 +
329 + final Map<String, Erc20Token> normalizedTokens = {};
330 + var needsRewrite = false;
331 +
332 + for (final key in keys) {
333 + final token = box.get(key);
334 +
335 + if (token == null) {
336 + needsRewrite = true;
337 + continue;
338 + }
339 +
340 + final lowerKey = key.toLowerCase();
341 +
342 + final Erc20Token normalizedToken =
343 + token.contractAddress == token.contractAddress.toLowerCase()
344 + ? token
345 + : Erc20Token(
346 + name: token.name,
347 + symbol: token.symbol,
348 + contractAddress: token.contractAddress.toLowerCase(),
349 + decimal: token.decimal,
350 + enabled: token.enabled,
351 + iconPath: token.iconPath,
352 + tag: token.tag,
353 + isPotentialScam: token.isPotentialScam,
354 + );
355 +
356 + if (!needsRewrite && (lowerKey != key || identical(normalizedToken, token) == false)) {
357 + needsRewrite = true;
358 + }
359 +
360 + final existing = normalizedTokens[lowerKey];
361 +
362 + if (existing == null) {
363 + normalizedTokens[lowerKey] = normalizedToken;
364 + continue;
365 + }
366 +
367 + final merged = Erc20Token(
368 + name: normalizedToken.name,
369 + symbol: normalizedToken.symbol,
370 + contractAddress: lowerKey,
371 + decimal: normalizedToken.decimal,
372 + enabled: normalizedToken.enabled || existing.enabled,
373 + iconPath: (normalizedToken.iconPath?.isNotEmpty ?? false)
374 + ? normalizedToken.iconPath
375 + : existing.iconPath,
376 + tag: normalizedToken.tag ?? existing.tag,
377 + isPotentialScam: normalizedToken.isPotentialScam || existing.isPotentialScam,
378 + );
379 +
380 + normalizedTokens[lowerKey] = merged;
381 + }
382 +
383 + if (needsRewrite) {
384 + await box.clear();
385 + for (final entry in normalizedTokens.entries) {
386 + await box.put(entry.key, entry.value);
387 + }
388 + }
389 +
390 + await prefs.setBool(migrationKey, true);
391 + }
392 +
393 Future<bool> checkIfScanProviderIsEnabled() async {
394 final key = EVMChainUtils.getScanProviderPreferenceKey(selectedChainId);
395 return (await sharedPrefs.future).getBool(key) ?? true;
cw_evm/lib/tokens/arbitrum_tokens.dart
+8 -8
@@ -8,56 +8,56 @@ class ArbitrumTokens {
8 Erc20Token(
9 name: "Arbitrum",
10 symbol: "ARB",
11 - contractAddress: "0x912CE59144191C1204E64559FE8253a0e49E6548",
11 + contractAddress: "0x912ce59144191c1204e64559fe8253a0e49e6548",
12 decimal: 18,
13 enabled: true,
14 ),
15 Erc20Token(
16 name: "USD Coin",
17 symbol: "USDC",
18 - contractAddress: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
18 + contractAddress: "0xaf88d065e77c8cc2239327c5edb3a432268e5831",
19 decimal: 6,
20 enabled: true,
21 ),
22 Erc20Token(
23 name: "USDC.e",
24 symbol: "USDC.e",
25 - contractAddress: "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8",
25 + contractAddress: "0xff970a61a04b1ca14834a43f5de4533ebddb5cc8",
26 decimal: 6,
27 enabled: true,
28 ),
29 Erc20Token(
30 name: "Wrapped BTC",
31 symbol: "WBTC",
32 - contractAddress: "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f",
32 + contractAddress: "0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f",
33 decimal: 8,
34 enabled: true,
35 ),
36 Erc20Token(
37 name: "Chainlink Token",
38 symbol: "LINK",
39 - contractAddress: "0xf97f4df75117a78c1A5a0DBb814Af92458539FB4",
39 + contractAddress: "0xf97f4df75117a78c1a5a0dbb814af92458539fb4",
40 decimal: 18,
41 enabled: true,
42 ),
43 Erc20Token(
44 name: "Wrapped liquid staked Ether 2.0",
45 symbol: "wstETH",
46 - contractAddress: "0x0fBcbaEA96Ce0cF7Ee00A8c19c3ab6f5Dc8E1921",
46 + contractAddress: "0x0fbcbaea96ce0cf7ee00a8c19c3ab6f5dc8e1921",
47 decimal: 18,
48 enabled: false,
49 ),
50 Erc20Token(
51 name: "Wrapped Ether",
52 symbol: "WETH",
53 - contractAddress: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
53 + contractAddress: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
54 decimal: 18,
55 enabled: false,
56 ),
57 Erc20Token(
58 name: "DAI",
59 symbol: "DAI",
60 - contractAddress: "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
60 + contractAddress: "0xda10009cbd5d07dd0cecc66161fc93d7c9000da1",
61 decimal: 18,
62 enabled: false,
63 ),
cw_evm/lib/tokens/base_tokens.dart
+5 -5
@@ -15,21 +15,21 @@ class BaseTokens {
15 Erc20Token(
16 name: "USDe",
17 symbol: "USDe",
18 - contractAddress: "0x5d3a1Ff2b6BAb83b63cd9AD0787074081a52ef34",
18 + contractAddress: "0x5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
19 decimal: 18,
20 enabled: true,
21 ),
22 Erc20Token(
23 name: "Dai",
24 symbol: "DAI",
25 - contractAddress: "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb",
25 + contractAddress: "0x50c5725949a6f0c72e6c4a641f24049a917db0cb",
26 decimal: 18,
27 enabled: true,
28 ),
29 Erc20Token(
30 name: "Bridged Tether USD",
31 symbol: "USDT",
32 - contractAddress: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2",
32 + contractAddress: "0xfde4c96c8593536e31f229ea8f37b2ada2699bb2",
33 decimal: 6,
34 enabled: true,
35 ),
@@ -43,14 +43,14 @@ class BaseTokens {
43 Erc20Token(
44 name: "Wrapped BTC",
45 symbol: "WBTC",
46 - contractAddress: "0x0555E30da8f98308EdB960aa94C0Db47230d2B9c",
46 + contractAddress: "0x0555e30da8f98308edb960aa94c0db47230d2b9c",
47 decimal: 8,
48 enabled: false,
49 ),
50 Erc20Token(
51 name: "SPX6900",
52 symbol: "SPX",
53 - contractAddress: "0x50dA645f148798F68EF2d7dB7C1CB22A6819bb2C",
53 + contractAddress: "0x50da645f148798f68ef2d7db7c1cb22a6819bb2c",
54 decimal: 8,
55 enabled: false,
56 ),
cw_evm/lib/tokens/bsc_tokens.dart
+8 -8
@@ -8,42 +8,42 @@ class BSCTokens {
8 Erc20Token(
9 name: "USD Coin",
10 symbol: "USDC",
11 - contractAddress: "0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d",
11 + contractAddress: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
12 decimal: 18,
13 enabled: true,
14 ),
15 Erc20Token(
16 name: "Ethereum",
17 symbol: "ETH",
18 - contractAddress: "0x2170Ed0880ac9A755fd29B2688956BD959F933F8",
18 + contractAddress: "0x2170ed0880ac9a755fd29b2688956bd959f933f8",
19 decimal: 18,
20 enabled: true,
21 ),
22 Erc20Token(
23 name: "Tether USD",
24 symbol: "USDT",
25 - contractAddress: "0x55d398326f99059fF775485246999027B3197955",
25 + contractAddress: "0x55d398326f99059ff775485246999027b3197955",
26 decimal: 18,
27 enabled: true,
28 ),
29 Erc20Token(
30 name: "USDe",
31 symbol: "USDe",
32 - contractAddress: "0x5d3a1Ff2b6BAb83b63cd9AD0787074081a52ef34",
32 + contractAddress: "0x5d3a1ff2b6bab83b63cd9ad0787074081a52ef34",
33 decimal: 18,
34 enabled: true,
35 ),
36 Erc20Token(
37 name: "PancakeSwap Token",
38 symbol: "CAKE",
39 - contractAddress: "0x0E09FaBB73Bd3Ade0a17ECC321fD13a19e81cE82",
39 + contractAddress: "0x0e09fabb73bd3ade0a17ecc321fd13a19e81ce82",
40 decimal: 18,
41 enabled: false,
42 ),
43 Erc20Token(
44 name: "Cardano Token",
45 symbol: "ADA",
46 - contractAddress: "0x3EE2200Efb3400fAbB9AacF31297cBdD1d435D47",
46 + contractAddress: "0x3ee2200efb3400fabb9aacf31297cbdd1d435d47",
47 decimal: 18,
48 enabled: false,
49 ),
@@ -57,14 +57,14 @@ class BSCTokens {
57 Erc20Token(
58 name: "Wrapped BTC",
59 symbol: "WBTC",
60 - contractAddress: "0x0555E30da8f98308EdB960aa94C0Db47230d2B9c",
60 + contractAddress: "0x0555e30da8f98308edb960aa94c0db47230d2b9c",
61 decimal: 8,
62 enabled: false,
63 ),
64 Erc20Token(
65 name: "Wrapped BNB",
66 symbol: "WBNB",
67 - contractAddress: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
67 + contractAddress: "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
68 decimal: 18,
69 enabled: false,
70 ),
cw_evm/lib/tokens/ethereum_tokens.dart
+5 -5
@@ -22,21 +22,21 @@ class EthereumTokens {
22 Erc20Token(
23 name: "Decentralized Euro",
24 symbol: "DEURO",
25 - contractAddress: "0xbA3f535bbCcCcA2A154b573Ca6c5A49BAAE0a3ea",
25 + contractAddress: "0xba3f535bbcccca2a154b573ca6c5a49baae0a3ea",
26 decimal: 18,
27 enabled: true,
28 ),
29 Erc20Token(
30 name: "Dai",
31 symbol: "DAI",
32 - contractAddress: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
32 + contractAddress: "0x6b175474e89094c44da98b954eedeac495271d0f",
33 decimal: 18,
34 enabled: true,
35 ),
36 Erc20Token(
37 name: "Wrapped Ether",
38 symbol: "WETH",
39 - contractAddress: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
39 + contractAddress: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
40 decimal: 18,
41 enabled: false,
42 ),
@@ -64,7 +64,7 @@ class EthereumTokens {
64 Erc20Token(
65 name: "Matic Token",
66 symbol: "MATIC",
67 - contractAddress: "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
67 + contractAddress: "0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0",
68 decimal: 18,
69 enabled: false,
70 ),
@@ -85,7 +85,7 @@ class EthereumTokens {
85 Erc20Token(
86 name: "Tether Gold",
87 symbol: "XAUT",
88 - contractAddress: "0x68749665FF8D2d112Fa859AA293F07A622782F38",
88 + contractAddress: "0x68749665ff8d2d112fa859aa293f07a622782f38",
89 decimal: 6,
90 enabled: false,
91 iconPath: "assets/images/xaut_icon.png",
cw_evm/lib/tokens/polygon_tokens.dart
+9 -9
@@ -8,63 +8,63 @@ class PolygonTokens {
8 Erc20Token(
9 name: "Wrapped Ether",
10 symbol: "WETH",
11 - contractAddress: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
11 + contractAddress: "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",
12 decimal: 18,
13 enabled: false,
14 ),
15 Erc20Token(
16 name: "Tether USD (PoS)",
17 symbol: "USDT",
18 - contractAddress: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
18 + contractAddress: "0xc2132d05d31c914a87c6611c10748aeb04b58e8f",
19 decimal: 6,
20 enabled: true,
21 ),
22 Erc20Token(
23 name: "USD Coin",
24 symbol: "USDC",
25 - contractAddress: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
25 + contractAddress: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
26 decimal: 6,
27 enabled: true,
28 ),
29 Erc20Token(
30 name: "USD Coin (POS)",
31 symbol: "USDC.e",
32 - contractAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
32 + contractAddress: "0x2791bca1f2de4661ed88a30c99a7a9449aa84174",
33 decimal: 6,
34 enabled: true,
35 ),
36 Erc20Token(
37 name: "Decentralized Euro",
38 symbol: "DEURO",
39 - contractAddress: "0xC2ff25dD99e467d2589b2c26EDd270F220F14E47",
39 + contractAddress: "0xc2ff25dd99e467d2589b2c26edd270f220f14e47",
40 decimal: 18,
41 enabled: true,
42 ),
43 Erc20Token(
44 name: "Avalanche Token",
45 symbol: "AVAX",
46 - contractAddress: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
46 + contractAddress: "0x2c89bbc92bd86f8075d1decc58c7f4e0107f286b",
47 decimal: 18,
48 enabled: false,
49 ),
50 Erc20Token(
51 name: "Wrapped BTC (PoS)",
52 symbol: "WBTC",
53 - contractAddress: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
53 + contractAddress: "0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6",
54 decimal: 8,
55 enabled: false,
56 ),
57 Erc20Token(
58 name: "Dai (PoS)",
59 symbol: "DAI",
60 - contractAddress: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
60 + contractAddress: "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
61 decimal: 18,
62 enabled: true,
63 ),
64 Erc20Token(
65 name: "SHIBA INU (PoS)",
66 symbol: "SHIB",
67 - contractAddress: "0x6f8a06447Ff6FcF75d803135a7de15CE88C1d4ec",
67 + contractAddress: "0x6f8a06447ff6fcf75d803135a7de15ce88c1d4ec",
68 decimal: 18,
69 enabled: false,
70 ),