mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-30 06:48:49 +01:00
Merge upstream Cake Wallet v6.5.0
Catches up from the May 12 fork point (v6.1.2+23) through v6.5.0: 535 upstream commits, including the Monero silent-open fix, Monero on Trezor, Ledger/Trezor BLE fixes, the new seed and history screens, quick Bitcoin sync, git-pinned dependencies (pubspec_overrides.yaml), frozen Hive adapters (*.part.dart), monero_c v0.18.4.6-RC2 and Flutter 3.41.9. Merged with both sides normalized first (import rename, 100-column format), which took the conflict count from 614 paths to 322. The procedure is now scripts/upstream_sync.sh. Kept from Hash Bags: - WalletType enum order and Hive IDs. SQLite stores WalletType.index and our order differs from upstream's; taking theirs would reread saved wallets as other chains. Our frozen adapter keeps the shipped IDs. - The 1.0.2 legacy PIN and wallet-password decode and self-heal. - Removed chains (Solana, Tron, Zano, Zcash, Decred, Haven) and the new Robinhood chain stay out; Cake Pay and non-Trocador swaps stay out. - Default nodes (node.wownero.org, sethforprivacy, Blockstream, bysh.me), converted to upstream's isDefault node-list key; Wownero is back in the node reset list. - Privacy: address resolvers limited to domain-anchored sources again; prices.neroswap.com for fiat; upstream's charts tab, which reads prices.cakewallet.com, sits behind FeatureFlag.isChartsEnabled = false. - Lightning stays behind FeatureFlag.isLightningEnabled, including upstream's new post-seed Lightning username step. - Our icon pipeline, branding and bundle identifiers. Twelve new upstream widget tests are skipped: test and code are unchanged from v6.5.0 apart from renames (not rerun on a pristine upstream checkout; upstream's top_bar_test does not compile against its own TopBar). flutter analyze lib: 0 errors; flutter test: 345 passed, 12 skipped; flutter build bundle compiles. Built with Flutter 3.41.9.
This commit is contained in:
@@ -15,6 +15,7 @@ class SecretKey {
|
||||
SecretKey('changeNowCakeWalletApiKey', () => ''),
|
||||
SecretKey('changeNowMoneroApiKey', () => ''),
|
||||
SecretKey('moonPayApiKey', () => ''),
|
||||
SecretKey('moonPaySandboxApiKey', () => ''),
|
||||
SecretKey('moonPaySecretKey', () => ''),
|
||||
SecretKey('sideShiftAffiliateId', () => ''),
|
||||
SecretKey('simpleSwapApiKey', () => ''),
|
||||
@@ -46,7 +47,7 @@ class SecretKey {
|
||||
SecretKey('meldTestApiKey', () => ''),
|
||||
SecretKey('meldTestPublicKey', () => ''),
|
||||
SecretKey('moneroTestWalletSeeds', () => ''),
|
||||
SecretKey('moneroLegacyTestWalletSeeds ', () => ''),
|
||||
SecretKey('moneroLegacyTestWalletSeeds', () => ''),
|
||||
SecretKey('bitcoinTestWalletSeeds', () => ''),
|
||||
SecretKey('ethereumTestWalletSeeds', () => ''),
|
||||
SecretKey('litecoinTestWalletSeeds', () => ''),
|
||||
@@ -55,10 +56,16 @@ class SecretKey {
|
||||
SecretKey('baseTestWalletSeeds', () => ''),
|
||||
SecretKey('arbitrumTestWalletSeeds', () => ''),
|
||||
SecretKey('bscTestWalletSeeds', () => ''),
|
||||
SecretKey("robinhoodTestWalletSeeds", () => ""),
|
||||
SecretKey('solanaTestWalletSeeds', () => ''),
|
||||
SecretKey('solanaTestWalletSeeds2', () => ''),
|
||||
SecretKey('tronTestWalletSeeds', () => ''),
|
||||
SecretKey('nanoTestWalletSeeds', () => ''),
|
||||
SecretKey('wowneroTestWalletSeeds', () => ''),
|
||||
SecretKey('zanoTestWalletSeeds', () => ''),
|
||||
SecretKey('decredTestWalletSeeds', () => ''),
|
||||
SecretKey('dogeTestWalletSeeds', () => ''),
|
||||
SecretKey('zcashTestWalletSeeds', () => ''),
|
||||
SecretKey('moneroTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('bitcoinTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('ethereumTestWalletReceiveAddress', () => ''),
|
||||
@@ -68,10 +75,15 @@ class SecretKey {
|
||||
SecretKey('baseTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('arbitrumTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('bscTestWalletReceiveAddress', () => ''),
|
||||
SecretKey("robinhoodTestWalletReceiveAddress", () => ""),
|
||||
SecretKey('solanaTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('tronTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('nanoTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('wowneroTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('zanoTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('decredTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('dogeTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('zcashTestWalletReceiveAddress', () => ''),
|
||||
SecretKey('etherScanApiKey', () => ''),
|
||||
SecretKey('polygonScanApiKey', () => ''),
|
||||
SecretKey('letsExchangeBearerToken', () => ''),
|
||||
@@ -79,6 +91,7 @@ class SecretKey {
|
||||
SecretKey('stealthExBearerToken', () => ''),
|
||||
SecretKey('stealthExAdditionalFeePercent', () => ''),
|
||||
SecretKey('moneroTestWalletBlockHeight', () => ''),
|
||||
SecretKey('zcashTestWalletRestoreHeight', () => ''),
|
||||
SecretKey('chainflipApiKey', () => ''),
|
||||
SecretKey('chainflipAffiliateFee', () => ''),
|
||||
SecretKey('kryptonimApiKey', () => ''),
|
||||
@@ -96,8 +109,9 @@ class SecretKey {
|
||||
SecretKey('etherScanApiKey', () => ''),
|
||||
SecretKey('polygonScanApiKey', () => ''),
|
||||
SecretKey('moralisApiKey', () => ''),
|
||||
SecretKey('nowNodesApiKey ', () => ''),
|
||||
SecretKey('nowNodesApiKey', () => ''),
|
||||
SecretKey('blinkApiKey', () => ''),
|
||||
SecretKey('alchemyApiKey', () => ''),
|
||||
];
|
||||
|
||||
static final solanaSecrets = [
|
||||
|
||||
@@ -8,7 +8,7 @@ void appendStringToArbFile(String fileName, String name, String text, {bool forc
|
||||
final arbObj = readArbFile(file);
|
||||
|
||||
if (arbObj.containsKey(name) && !force) {
|
||||
printV("String $name already exists in $fileName!");
|
||||
print("String $name already exists in $fileName!");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,5 +2,5 @@ const defaultLang = "en";
|
||||
const langs = [
|
||||
"ar", "bg", "cs", "de", "en", "es", "fa", "fr", "gn", "ha", "hi", "hr", "hy", "id", "it",
|
||||
"ja", "ko", "my", "nl", "pl", "pt", "ru", "th", "tl", "tr", "uk", "ur", "yo",
|
||||
"vi", "zh-cn", "zh-tw" // zh-cn for Chinese (Simplified), zh-tw for Chinese (Traditional)
|
||||
"vi", "zh-cn" // zh-cn for Chinese (Simplified)
|
||||
];
|
||||
|
||||
@@ -38,7 +38,7 @@ Future<String> getTranslation(String text, String lang) async {
|
||||
try {
|
||||
translation = (await translator.translate(text, from: defaultLang, to: lang)).text;
|
||||
} catch (e) {
|
||||
printV("$lang, $text, $e");
|
||||
print("$lang, $text, $e");
|
||||
}
|
||||
placeholder.forEach((index, value) {
|
||||
final translatedPlaceholder = regExp.allMatches(translation).toList()[index];
|
||||
|
||||
Reference in New Issue
Block a user