From edaf48599350adf7c0c00589801ab842ac0bbffa Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Thu, 19 Jun 2025 04:37:41 +0200 Subject: [PATCH 1/7] CW-1069-implement-deuro-dapp-support (#2304) * feat: started dEuro Savings integration * fix: merge conflict regarding theming * feat: Add dEuro Savings Screen * feat: Change DEuro Savings UI * feat: Complete DEuro Savings integration with UI enhancements and transaction support * style: remove forgotten print statements * feat: localize dEuro subtitle * feat: add approval flow and priority handling to DEuro Savings integration - Introduced approval flow for DEuro Savings to enable token approvals. - Added priority handling for deposit and withdrawal operations. - Updated UI to support approval state and interactions. - Localized new strings for multiple languages. - Enhanced transaction handling with separate approval and commit actions. * feat: add support for ERC20 token approval transactions - Introduced `signApprovalTransaction` and `createApprovalTransaction` methods. - Added handling for infinite approvals. - Implemented encoding for approval transaction data. - Enhanced transaction creation flow with approval-specific functionality. * Update UI * feat: enhance DEuro Savings logic and UI with computed property and fix gradient background * feat: localize transaction confirmation content for DEuro Savings * feat: enable interest collection for DEuro Savings with localized support * fix reformatting [skip ci] --------- Co-authored-by: tuxsudo Co-authored-by: OmarHatem --- cw_ethereum/lib/deuro/deuro_savings.dart | 121 ++++ .../lib/deuro/deuro_savings_contract.dart | 543 ++++++++++++++++++ cw_ethereum/pubspec.yaml | 2 +- cw_evm/lib/evm_chain_client.dart | 64 ++- cw_evm/lib/evm_chain_wallet.dart | 40 ++ cw_evm/lib/pending_evm_chain_transaction.dart | 3 + lib/di.dart | 8 +- lib/ethereum/cw_ethereum.dart | 87 ++- lib/polygon/cw_polygon.dart | 61 +- lib/router.dart | 6 + lib/routes.dart | 2 + .../dashboard/pages/cake_features_page.dart | 22 +- .../integrations/deuro/savings_page.dart | 197 +++++++ .../widgets/edit_savings_bottom_sheet.dart | 45 ++ .../deuro/widgets/interest_card_widget.dart | 67 +++ .../integrations/deuro/widgets/numpad.dart | 107 ++++ .../deuro/widgets/savings_card_widget.dart | 263 +++++++++ .../deuro/widgets/savings_edit_sheet.dart | 90 +++ lib/src/widgets/dashboard_card_widget.dart | 1 + .../integrations/deuro_view_model.dart | 119 ++++ res/values/strings_ar.arb | 10 + res/values/strings_bg.arb | 10 + res/values/strings_cs.arb | 10 + res/values/strings_de.arb | 14 +- res/values/strings_en.arb | 10 + res/values/strings_es.arb | 10 + res/values/strings_fr.arb | 10 + res/values/strings_ha.arb | 10 + res/values/strings_hi.arb | 10 + res/values/strings_hr.arb | 10 + res/values/strings_hy.arb | 10 + res/values/strings_id.arb | 10 + res/values/strings_it.arb | 10 + res/values/strings_ja.arb | 10 + res/values/strings_ko.arb | 10 + res/values/strings_my.arb | 10 + res/values/strings_nl.arb | 10 + res/values/strings_pl.arb | 10 + res/values/strings_pt.arb | 10 + res/values/strings_ru.arb | 10 + res/values/strings_th.arb | 10 + res/values/strings_tl.arb | 10 + res/values/strings_tr.arb | 10 + res/values/strings_uk.arb | 10 + res/values/strings_ur.arb | 10 + res/values/strings_vi.arb | 10 + res/values/strings_yo.arb | 10 + res/values/strings_zh.arb | 10 + tool/configure.dart | 15 + 49 files changed, 2081 insertions(+), 66 deletions(-) create mode 100644 cw_ethereum/lib/deuro/deuro_savings.dart create mode 100644 cw_ethereum/lib/deuro/deuro_savings_contract.dart create mode 100644 lib/src/screens/integrations/deuro/savings_page.dart create mode 100644 lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart create mode 100644 lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart create mode 100644 lib/src/screens/integrations/deuro/widgets/numpad.dart create mode 100644 lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart create mode 100644 lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart create mode 100644 lib/view_model/integrations/deuro_view_model.dart diff --git a/cw_ethereum/lib/deuro/deuro_savings.dart b/cw_ethereum/lib/deuro/deuro_savings.dart new file mode 100644 index 000000000..4c37f944c --- /dev/null +++ b/cw_ethereum/lib/deuro/deuro_savings.dart @@ -0,0 +1,121 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:crypto/crypto.dart'; +import 'package:cw_core/crypto_currency.dart'; +import 'package:cw_ethereum/deuro/deuro_savings_contract.dart'; +import 'package:cw_ethereum/ethereum_wallet.dart'; +import 'package:cw_evm/contract/erc20.dart'; +import 'package:cw_evm/evm_chain_transaction_priority.dart'; +import 'package:cw_evm/pending_evm_chain_transaction.dart'; +import 'package:web3dart/web3dart.dart'; + +const String savingsGatewayAddress = + "0x073493d73258C4BEb6542e8dd3e1b2891C972303"; + +const String dEuroAddress = "0xbA3f535bbCcCcA2A154b573Ca6c5A49BAAE0a3ea"; + +class DEuro { + final SavingsGateway _savingsGateway; + final ERC20 _dEuro; + final EthereumWallet _wallet; + + DEuro(EthereumWallet wallet) + : _wallet = wallet, + _savingsGateway = _getSavingsGateway(wallet.getWeb3Client()!), + _dEuro = _getDEuroToken(wallet.getWeb3Client()!); + + static SavingsGateway _getSavingsGateway(Web3Client client) => SavingsGateway( + address: EthereumAddress.fromHex(savingsGatewayAddress), + client: client, + ); + + static ERC20 _getDEuroToken(Web3Client client) => ERC20( + address: EthereumAddress.fromHex(dEuroAddress), + client: client, + ); + + final frontendCode = + Uint8List.fromList(sha256.convert(utf8.encode("wallet")).bytes); + + EthereumAddress get _address => + EthereumAddress.fromHex(_wallet.walletAddresses.primaryAddress); + + Future get savingsBalance async => + (await _savingsGateway.savings(accountOwner: _address)).saved; + + Future get accruedInterest => + _savingsGateway.accruedInterest(accountOwner: _address); + + Future get interestRate => _savingsGateway.currentRatePPM(); + + Future get approvedBalance => + _dEuro.allowance(_address, _savingsGateway.self.address); + + Future depositSavings( + BigInt amount, EVMChainTransactionPriority priority) async { + final signedTransaction = await _savingsGateway.save( + (amount: amount, frontendCode: frontendCode), + credentials: _wallet.evmChainPrivateKey, + ); + + final fee = await _wallet.calculateActualEstimatedFeeForCreateTransaction( + amount: amount, + contractAddress: _savingsGateway.self.address.hexEip55, + receivingAddressHex: _savingsGateway.self.address.hexEip55, + priority: priority, + data: _savingsGateway.self.abi.functions[17] + .encodeCall([amount, frontendCode]), + ); + + final sendTransaction = + () => _wallet.getWeb3Client()!.sendRawTransaction(signedTransaction); + + return PendingEVMChainTransaction( + sendTransaction: sendTransaction, + signedTransaction: signedTransaction, + fee: BigInt.from(fee.estimatedGasFee), + amount: amount.toString(), + exponent: 18); + } + + Future withdrawSavings( + BigInt amount, EVMChainTransactionPriority priority) async { + final signedTransaction = await _savingsGateway.withdraw( + (target: _address, amount: amount, frontendCode: frontendCode), + credentials: _wallet.evmChainPrivateKey, + ); + + final fee = await _wallet.calculateActualEstimatedFeeForCreateTransaction( + amount: amount, + contractAddress: _savingsGateway.self.address.hexEip55, + receivingAddressHex: _savingsGateway.self.address.hexEip55, + priority: priority, + data: _savingsGateway.self.abi.functions[17] + .encodeCall([amount, frontendCode]), + ); + + final sendTransaction = + () => _wallet.getWeb3Client()!.sendRawTransaction(signedTransaction); + + return PendingEVMChainTransaction( + sendTransaction: sendTransaction, + signedTransaction: signedTransaction, + fee: BigInt.from(fee.estimatedGasFee), + amount: amount.toString(), + exponent: 18); + } + + // Set an infinite approval to save gas in the future + Future enableSavings( + EVMChainTransactionPriority priority) async => + (await _wallet.createApprovalTransaction( + BigInt.parse( + 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', + radix: 16, + ), + _savingsGateway.self.address.hexEip55, + CryptoCurrency.deuro, + priority, + )) as PendingEVMChainTransaction; +} diff --git a/cw_ethereum/lib/deuro/deuro_savings_contract.dart b/cw_ethereum/lib/deuro/deuro_savings_contract.dart new file mode 100644 index 000000000..ca2eb5dcc --- /dev/null +++ b/cw_ethereum/lib/deuro/deuro_savings_contract.dart @@ -0,0 +1,543 @@ +// ignore_for_file: type=lint +// ignore_for_file: unused_local_variable, unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:web3dart/web3dart.dart' as _i1; +import 'dart:typed_data' as _i2; + +final _contractAbi = _i1.ContractAbi.fromJson( + '[{"inputs":[{"internalType":"contract IDecentralizedEURO","name":"deuro_","type":"address"},{"internalType":"uint24","name":"initialRatePPM","type":"uint24"},{"internalType":"address","name":"gateway_","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"ChangeNotReady","type":"error"},{"inputs":[],"name":"ModuleDisabled","type":"error"},{"inputs":[],"name":"NoPendingChange","type":"error"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":false,"internalType":"uint256","name":"interest","type":"uint256"}],"name":"InterestCollected","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint24","name":"newRate","type":"uint24"}],"name":"RateChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"who","type":"address"},{"indexed":false,"internalType":"uint24","name":"nextRate","type":"uint24"},{"indexed":false,"internalType":"uint40","name":"nextChange","type":"uint40"}],"name":"RateProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":false,"internalType":"uint192","name":"amount","type":"uint192"}],"name":"Saved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":false,"internalType":"uint192","name":"amount","type":"uint192"}],"name":"Withdrawn","type":"event"},{"inputs":[],"name":"GATEWAY","outputs":[{"internalType":"contract IFrontendGateway","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"accountOwner","type":"address"}],"name":"accruedInterest","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"accountOwner","type":"address"},{"internalType":"uint256","name":"timestamp","type":"uint256"}],"name":"accruedInterest","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint192","name":"targetAmount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"adjust","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint192","name":"targetAmount","type":"uint192"}],"name":"adjust","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"applyChange","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"uint192","name":"saved","type":"uint192"},{"internalType":"uint64","name":"ticks","type":"uint64"}],"internalType":"struct Savings.Account","name":"account","type":"tuple"},{"internalType":"uint64","name":"ticks","type":"uint64"}],"name":"calculateInterest","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"currentRatePPM","outputs":[{"internalType":"uint24","name":"","type":"uint24"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"currentTicks","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"deuro","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"equity","outputs":[{"internalType":"contract IReserve","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"nextChange","outputs":[{"internalType":"uint40","name":"","type":"uint40"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"nextRatePPM","outputs":[{"internalType":"uint24","name":"","type":"uint24"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint24","name":"newRatePPM_","type":"uint24"},{"internalType":"address[]","name":"helpers","type":"address[]"}],"name":"proposeChange","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"refreshBalance","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"refreshMyBalance","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint192","name":"amount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint192","name":"amount","type":"uint192"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"savings","outputs":[{"internalType":"uint192","name":"saved","type":"uint192"},{"internalType":"uint64","name":"ticks","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"timestamp","type":"uint256"}],"name":"ticks","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]', + 'SavingsGateway', +); + +class SavingsGateway extends _i1.GeneratedContract { + SavingsGateway({ + required _i1.EthereumAddress address, + required _i1.Web3Client client, + int? chainId, + }) : super( + _i1.DeployedContract( + _contractAbi, + address, + ), + client, + chainId, + ); + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future<_i1.EthereumAddress> GATEWAY({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[1]; + assert(checkSignature(function, '338c5371')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as _i1.EthereumAddress); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future accruedInterest({ + required _i1.EthereumAddress accountOwner, + _i1.BlockNum? atBlock, + }) async { + final function = self.abi.functions[2]; + assert(checkSignature(function, '77267ec3')); + final params = [accountOwner]; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future accruedInterest$2( + ({_i1.EthereumAddress accountOwner, BigInt timestamp}) args, { + _i1.BlockNum? atBlock, + }) async { + final function = self.abi.functions[3]; + assert(checkSignature(function, 'a696399d')); + final params = [ + args.accountOwner, + args.timestamp, + ]; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [transaction] parameter can be used to override parameters + /// like the gas price, nonce and max gas. The `data` and `to` fields will be + /// set by the contract. + Future adjust( + ({BigInt targetAmount, _i2.Uint8List frontendCode}) args, { + required _i1.Credentials credentials, + _i1.Transaction? transaction, + }) async { + final function = self.abi.functions[4]; + assert(checkSignature(function, '753ef93c')); + final params = [ + args.targetAmount, + args.frontendCode, + ]; + return write( + credentials, + transaction, + function, + params, + ); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future calculateInterest( + ({dynamic account, BigInt ticks}) args, { + _i1.BlockNum? atBlock, + }) async { + final function = self.abi.functions[7]; + assert(checkSignature(function, '7915ce20')); + final params = [ + args.account, + args.ticks, + ]; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future currentRatePPM({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[8]; + assert(checkSignature(function, '06a7b376')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future currentTicks({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[9]; + assert(checkSignature(function, 'b079f163')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future<_i1.EthereumAddress> deuro({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[10]; + assert(checkSignature(function, '82b8eaf5')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as _i1.EthereumAddress); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future<_i1.EthereumAddress> equity({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[11]; + assert(checkSignature(function, '91a0ac6a')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as _i1.EthereumAddress); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future nextChange({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[12]; + assert(checkSignature(function, 'b6f83c17')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future nextRatePPM({_i1.BlockNum? atBlock}) async { + final function = self.abi.functions[13]; + assert(checkSignature(function, '2e4b20ab')); + final params = []; + final response = await read( + function, + params, + atBlock, + ); + return (response[0] as BigInt); + } + + /// The optional [transaction] parameter can be used to override parameters + /// like the gas price, nonce and max gas. The `data` and `to` fields will be + /// set by the contract. + Future refreshBalance( + ({_i1.EthereumAddress owner}) args, { + required _i1.Credentials credentials, + _i1.Transaction? transaction, + }) async { + final function = self.abi.functions[15]; + assert(checkSignature(function, 'b77cd1c7')); + final params = [args.owner]; + return write( + credentials, + transaction, + function, + params, + ); + } + + /// The optional [transaction] parameter can be used to override parameters + /// like the gas price, nonce and max gas. The `data` and `to` fields will be + /// set by the contract. + Future refreshMyBalance({ + required _i1.Credentials credentials, + _i1.Transaction? transaction, + }) async { + final function = self.abi.functions[16]; + assert(checkSignature(function, '85bd12d1')); + final params = []; + return write( + credentials, + transaction, + function, + params, + ); + } + + /// The optional [transaction] parameter can be used to override parameters + /// like the gas price, nonce and max gas. The `data` and `to` fields will be + /// set by the contract. + Future<_i2.Uint8List> save( + ({BigInt amount, _i2.Uint8List frontendCode}) args, { + required _i1.Credentials credentials, + _i1.Transaction? transaction, + }) async { + final function = self.abi.functions[17]; + assert(checkSignature(function, '9e2363dc')); + final params = [ + args.amount, + args.frontendCode, + ]; + return writeRaw( + credentials, + transaction, + function, + params, + ); + } + + /// The optional [transaction] parameter can be used to override parameters + /// like the gas price, nonce and max gas. The `data` and `to` fields will be + /// set by the contract. + Future<_i2.Uint8List> saveTo( + ({ + _i1.EthereumAddress owner, + BigInt amount, + _i2.Uint8List frontendCode + }) args, { + required _i1.Credentials credentials, + _i1.Transaction? transaction, + }) async { + final function = self.abi.functions[19]; + assert(checkSignature(function, 'cbcf9676')); + final params = [ + args.owner, + args.amount, + args.frontendCode, + ]; + return writeRaw( + credentials, + transaction, + function, + params, + ); + } + + /// The optional [atBlock] parameter can be used to view historical data. When + /// set, the function will be evaluated in the specified block. By default, the + /// latest on-chain block will be used. + Future savings({ + required _i1.EthereumAddress accountOwner, + _i1.BlockNum? atBlock, + }) async { + final function = self.abi.functions[21]; + assert(checkSignature(function, '1f7cdd5f')); + final params = [accountOwner]; + final response = await read( + function, + params, + atBlock, + ); + return Savings(response); + } + + /// The optional [transaction] parameter can be used to override parameters + /// like the gas price, nonce and max gas. The `data` and `to` fields will be + /// set by the contract. + Future<_i2.Uint8List> withdraw( + ({ + _i1.EthereumAddress target, + BigInt amount, + _i2.Uint8List frontendCode + }) args, { + required _i1.Credentials credentials, + _i1.Transaction? transaction, + }) async { + final function = self.abi.functions[24]; + assert(checkSignature(function, '829a0476')); + final params = [ + args.target, + args.amount, + args.frontendCode, + ]; + return writeRaw( + credentials, + transaction, + function, + params, + ); + } + + /// Returns a live stream of all InterestCollected events emitted by this contract. + Stream interestCollectedEvents({ + _i1.BlockNum? fromBlock, + _i1.BlockNum? toBlock, + }) { + final event = self.event('InterestCollected'); + final filter = _i1.FilterOptions.events( + contract: self, + event: event, + fromBlock: fromBlock, + toBlock: toBlock, + ); + return client.events(filter).map((_i1.FilterEvent result) { + final decoded = event.decodeResults( + result.topics!, + result.data!, + ); + return InterestCollected( + decoded, + result, + ); + }); + } + + /// Returns a live stream of all RateChanged events emitted by this contract. + Stream rateChangedEvents({ + _i1.BlockNum? fromBlock, + _i1.BlockNum? toBlock, + }) { + final event = self.event('RateChanged'); + final filter = _i1.FilterOptions.events( + contract: self, + event: event, + fromBlock: fromBlock, + toBlock: toBlock, + ); + return client.events(filter).map((_i1.FilterEvent result) { + final decoded = event.decodeResults( + result.topics!, + result.data!, + ); + return RateChanged( + decoded, + result, + ); + }); + } + + /// Returns a live stream of all RateProposed events emitted by this contract. + Stream rateProposedEvents({ + _i1.BlockNum? fromBlock, + _i1.BlockNum? toBlock, + }) { + final event = self.event('RateProposed'); + final filter = _i1.FilterOptions.events( + contract: self, + event: event, + fromBlock: fromBlock, + toBlock: toBlock, + ); + return client.events(filter).map((_i1.FilterEvent result) { + final decoded = event.decodeResults( + result.topics!, + result.data!, + ); + return RateProposed( + decoded, + result, + ); + }); + } + + /// Returns a live stream of all Saved events emitted by this contract. + Stream savedEvents({ + _i1.BlockNum? fromBlock, + _i1.BlockNum? toBlock, + }) { + final event = self.event('Saved'); + final filter = _i1.FilterOptions.events( + contract: self, + event: event, + fromBlock: fromBlock, + toBlock: toBlock, + ); + return client.events(filter).map((_i1.FilterEvent result) { + final decoded = event.decodeResults( + result.topics!, + result.data!, + ); + return Saved( + decoded, + result, + ); + }); + } + + /// Returns a live stream of all Withdrawn events emitted by this contract. + Stream withdrawnEvents({ + _i1.BlockNum? fromBlock, + _i1.BlockNum? toBlock, + }) { + final event = self.event('Withdrawn'); + final filter = _i1.FilterOptions.events( + contract: self, + event: event, + fromBlock: fromBlock, + toBlock: toBlock, + ); + return client.events(filter).map((_i1.FilterEvent result) { + final decoded = event.decodeResults( + result.topics!, + result.data!, + ); + return Withdrawn( + decoded, + result, + ); + }); + } +} + +class Savings { + Savings(List response) + : saved = (response[0] as BigInt), + ticks = (response[1] as BigInt); + + final BigInt saved; + + final BigInt ticks; +} + +class InterestCollected { + InterestCollected( + List response, + this.event, + ) : account = (response[0] as _i1.EthereumAddress), + interest = (response[1] as BigInt); + + final _i1.EthereumAddress account; + + final BigInt interest; + + final _i1.FilterEvent event; +} + +class RateChanged { + RateChanged( + List response, + this.event, + ) : newRate = (response[0] as BigInt); + + final BigInt newRate; + + final _i1.FilterEvent event; +} + +class RateProposed { + RateProposed( + List response, + this.event, + ) : who = (response[0] as _i1.EthereumAddress), + nextRate = (response[1] as BigInt), + nextChange = (response[2] as BigInt); + + final _i1.EthereumAddress who; + + final BigInt nextRate; + + final BigInt nextChange; + + final _i1.FilterEvent event; +} + +class Saved { + Saved( + List response, + this.event, + ) : account = (response[0] as _i1.EthereumAddress), + amount = (response[1] as BigInt); + + final _i1.EthereumAddress account; + + final BigInt amount; + + final _i1.FilterEvent event; +} + +class Withdrawn { + Withdrawn( + List response, + this.event, + ) : account = (response[0] as _i1.EthereumAddress), + amount = (response[1] as BigInt); + + final _i1.EthereumAddress account; + + final BigInt amount; + + final _i1.FilterEvent event; +} diff --git a/cw_ethereum/pubspec.yaml b/cw_ethereum/pubspec.yaml index c68f78fc9..1da1e3b3b 100644 --- a/cw_ethereum/pubspec.yaml +++ b/cw_ethereum/pubspec.yaml @@ -6,7 +6,7 @@ author: Cake Wallet homepage: https://cakewallet.com environment: - sdk: '>=2.18.2 <3.0.0' + sdk: ^3.5.0 flutter: ">=1.17.0" dependencies: diff --git a/cw_evm/lib/evm_chain_client.dart b/cw_evm/lib/evm_chain_client.dart index 7e6caf374..8b45d5544 100644 --- a/cw_evm/lib/evm_chain_client.dart +++ b/cw_evm/lib/evm_chain_client.dart @@ -76,7 +76,7 @@ abstract class EVMChainClient { Future getGasUnitPrice() async { try { final gasPrice = await _client!.getGasPrice(); - + return gasPrice.getInWei.toInt(); } catch (_) { return 0; @@ -101,6 +101,7 @@ abstract class EVMChainClient { String? contractAddress, EtherAmount? gasPrice, EtherAmount? maxFeePerGas, + Uint8List? data, }) async { try { if (contractAddress == null) { @@ -124,7 +125,7 @@ abstract class EVMChainClient { final gasEstimate = await _client!.estimateGas( sender: senderAddress, to: EthereumAddress.fromHex(contractAddress), - data: transfer.encodeCall([ + data: data ?? transfer.encodeCall([ toAddress, value.getInWei, ]), @@ -137,6 +138,21 @@ abstract class EVMChainClient { } } + Uint8List getEncodedDataForApprovalTransaction({ + required EthereumAddress toAddress, + required EtherAmount value, + required EthereumAddress contractAddress, + }) { + final contract = DeployedContract(ethereumContractAbi, contractAddress); + + final approve = contract.function('approve'); + + return approve.encodeCall([ + toAddress, + value.getInWei, + ]); + } + Future signTransaction({ required Credentials privateKey, required String toAddress, @@ -198,6 +214,50 @@ abstract class EVMChainClient { ); } + Future signApprovalTransaction({ + required Credentials privateKey, + required String spender, + required BigInt amount, + required BigInt gasFee, + required int estimatedGasUnits, + required int maxFeePerGas, + required EVMChainTransactionPriority priority, + required int exponent, + required String contractAddress, + }) async { + + final Transaction transaction = createTransaction( + from: privateKey.address, + to: EthereumAddress.fromHex(contractAddress), + maxPriorityFeePerGas: EtherAmount.fromInt(EtherUnit.gwei, priority.tip), + amount: EtherAmount.zero(), + maxGas: estimatedGasUnits, + maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas), + ); + + final erc20 = ERC20( + client: _client!, + address: EthereumAddress.fromHex(contractAddress), + chainId: chainId, + ); + + final signedTransaction = await erc20.approve( + EthereumAddress.fromHex(spender), + amount, + credentials: privateKey, + transaction: transaction, + ); + + return PendingEVMChainTransaction( + signedTransaction: prepareSignedTransactionForSending(signedTransaction), + amount: amount.toString(), + fee: gasFee, + sendTransaction: () => sendTransaction(signedTransaction), + exponent: exponent, + isInfiniteApproval: amount.toRadixString(16) == 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff', + ); + } + Transaction createTransaction({ required EthereumAddress from, required EthereumAddress to, diff --git a/cw_evm/lib/evm_chain_wallet.dart b/cw_evm/lib/evm_chain_wallet.dart index a1b253dd8..18f6e6ee5 100644 --- a/cw_evm/lib/evm_chain_wallet.dart +++ b/cw_evm/lib/evm_chain_wallet.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'dart:math'; +import 'dart:typed_data'; import 'package:bip32/bip32.dart' as bip32; import 'package:bip39/bip39.dart' as bip39; @@ -255,6 +256,7 @@ abstract class EVMChainWalletBase required String? contractAddress, required String receivingAddressHex, required TransactionPriority priority, + Uint8List? data, }) async { try { if (priority is EVMChainTransactionPriority) { @@ -276,6 +278,7 @@ abstract class EVMChainWalletBase gasPrice: EtherAmount.fromInt(EtherUnit.wei, gasPrice), toAddress: EthereumAddress.fromHex(receivingAddressHex), maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas), + data: data, ); final totalGasFee = estimatedGas * maxFeePerGas; @@ -478,6 +481,43 @@ abstract class EVMChainWalletBase return pendingEVMChainTransaction; } + Future createApprovalTransaction( + BigInt amount, + String spender, + CryptoCurrency token, + EVMChainTransactionPriority priority) async { + final CryptoCurrency transactionCurrency = + balance.keys.firstWhere((element) => element.title == token.title); + assert(transactionCurrency is Erc20Token); + + final data = _client.getEncodedDataForApprovalTransaction( + contractAddress: EthereumAddress.fromHex( + (transactionCurrency as Erc20Token).contractAddress), + value: EtherAmount.fromBigInt(EtherUnit.wei, amount), + toAddress: EthereumAddress.fromHex(spender), + ); + + final gasFeesModel = await calculateActualEstimatedFeeForCreateTransaction( + amount: amount, + receivingAddressHex: spender, + priority: priority, + contractAddress: transactionCurrency.contractAddress, + data: data, + ); + + return _client.signApprovalTransaction( + privateKey: _evmChainPrivateKey, + spender: spender, + amount: amount, + priority: priority, + gasFee: BigInt.from(gasFeesModel.estimatedGasFee), + maxFeePerGas: gasFeesModel.maxFeePerGas, + estimatedGasUnits: gasFeesModel.estimatedGasUnits, + exponent: transactionCurrency.decimal, + contractAddress: transactionCurrency.contractAddress, + ); + } + Future _updateTransactions() async { try { if (_isTransactionUpdating) { diff --git a/cw_evm/lib/pending_evm_chain_transaction.dart b/cw_evm/lib/pending_evm_chain_transaction.dart index 6861b41f8..61b406470 100644 --- a/cw_evm/lib/pending_evm_chain_transaction.dart +++ b/cw_evm/lib/pending_evm_chain_transaction.dart @@ -11,6 +11,7 @@ class PendingEVMChainTransaction with PendingTransaction { final BigInt fee; final String amount; final int exponent; + final bool isInfiniteApproval; PendingEVMChainTransaction({ required this.sendTransaction, @@ -18,10 +19,12 @@ class PendingEVMChainTransaction with PendingTransaction { required this.fee, required this.amount, required this.exponent, + this.isInfiniteApproval = false, }); @override String get amountFormatted { + if (isInfiniteApproval) return "∞"; final _amount = (BigInt.parse(amount) / BigInt.from(pow(10, exponent))).toString(); return _amount.substring(0, min(10, _amount.length)); } diff --git a/lib/di.dart b/lib/di.dart index 1d925150f..46c453d61 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -35,6 +35,7 @@ import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart'; import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart'; import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart'; import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/savings_page.dart'; import 'package:cake_wallet/src/screens/settings/background_sync_page.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart'; @@ -43,6 +44,7 @@ import 'package:cake_wallet/themes/core/theme_store.dart'; import 'package:cake_wallet/view_model/dev/monero_background_sync.dart'; import 'package:cake_wallet/view_model/dev/secure_preferences.dart'; import 'package:cake_wallet/view_model/dev/shared_preferences.dart'; +import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart'; import 'package:cake_wallet/view_model/link_view_model.dart'; import 'package:cake_wallet/tron/tron.dart'; import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart'; @@ -1510,6 +1512,10 @@ Future setup({ getIt.registerFactory(() => BackgroundSyncLogsViewModel()); getIt.registerFactory(() => DevBackgroundSyncLogsPage(getIt.get())); - + + getIt.registerFactory(() => DEuroViewModel(getIt())); + + getIt.registerFactory(() => DEuroSavingsPage(getIt())); + _isSetupFinished = true; } diff --git a/lib/ethereum/cw_ethereum.dart b/lib/ethereum/cw_ethereum.dart index 40c7a0f77..3e3675d1f 100644 --- a/lib/ethereum/cw_ethereum.dart +++ b/lib/ethereum/cw_ethereum.dart @@ -67,8 +67,7 @@ class CWEthereum extends Ethereum { @override String getPublicKey(WalletBase wallet) { final privateKeyInUnitInt = (wallet as EthereumWallet).evmChainPrivateKey; - final publicKey = privateKeyInUnitInt.address.hex; - return publicKey; + return privateKeyInUnitInt.address.hex; } @override @@ -138,29 +137,24 @@ class CWEthereum extends Ethereum { } @override - List getERC20Currencies(WalletBase wallet) { - final ethereumWallet = wallet as EthereumWallet; - return ethereumWallet.erc20Currencies; - } + List getERC20Currencies(WalletBase wallet) => + (wallet as EthereumWallet).erc20Currencies; @override - Future addErc20Token(WalletBase wallet, CryptoCurrency token) async { - await (wallet as EthereumWallet).addErc20Token(token as Erc20Token); - } + Future addErc20Token(WalletBase wallet, CryptoCurrency token) => + (wallet as EthereumWallet).addErc20Token(token as Erc20Token); @override - Future deleteErc20Token(WalletBase wallet, CryptoCurrency token) async => - await (wallet as EthereumWallet).deleteErc20Token(token as Erc20Token); + Future deleteErc20Token(WalletBase wallet, CryptoCurrency token) => + (wallet as EthereumWallet).deleteErc20Token(token as Erc20Token); @override - Future removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token) async => - await (wallet as EthereumWallet).removeTokenTransactionsInHistory(token as Erc20Token); + Future removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token) => + (wallet as EthereumWallet).removeTokenTransactionsInHistory(token as Erc20Token); @override - Future getErc20Token(WalletBase wallet, String contractAddress) async { - final ethereumWallet = wallet as EthereumWallet; - return await ethereumWallet.getErc20Token(contractAddress, 'eth'); - } + Future getErc20Token(WalletBase wallet, String contractAddress) => + (wallet as EthereumWallet).getErc20Token(contractAddress, 'eth'); @override CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction) { @@ -177,23 +171,19 @@ class CWEthereum extends Ethereum { } @override - void updateEtherscanUsageState(WalletBase wallet, bool isEnabled) { - (wallet as EthereumWallet).updateScanProviderUsageState(isEnabled); - } + void updateEtherscanUsageState(WalletBase wallet, bool isEnabled) => + (wallet as EthereumWallet).updateScanProviderUsageState(isEnabled); @override - Web3Client? getWeb3Client(WalletBase wallet) { - return (wallet as EthereumWallet).getWeb3Client(); - } + Web3Client? getWeb3Client(WalletBase wallet) => (wallet as EthereumWallet).getWeb3Client(); + @override String getTokenAddress(CryptoCurrency asset) => (asset as Erc20Token).contractAddress; @override - void setLedgerConnection( - WalletBase wallet, ledger.LedgerConnection connection) { + void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection) { ((wallet as EVMChainWallet).evmChainPrivateKey as EvmLedgerCredentials) - .setLedgerConnection( - connection, wallet.walletInfo.derivationInfo?.derivationPath); + .setLedgerConnection(connection, wallet.walletInfo.derivationInfo?.derivationPath); } @override @@ -209,7 +199,44 @@ class CWEthereum extends Ethereum { } @override - List getDefaultTokenContractAddresses() { - return DefaultEthereumErc20Tokens().initialErc20Tokens.map((e) => e.contractAddress).toList(); - } + List getDefaultTokenContractAddresses() => + DefaultEthereumErc20Tokens().initialErc20Tokens.map((e) => e.contractAddress).toList(); + + Future createTokenApproval(WalletBase wallet, BigInt amount, String spender, + CryptoCurrency token, TransactionPriority priority) => + (wallet as EVMChainWallet).createApprovalTransaction( + amount, spender, token, priority as EVMChainTransactionPriority); + + // Integrations + @override + Future getDEuroSavingsBalance(WalletBase wallet) => + DEuro(wallet as EthereumWallet).savingsBalance; + + @override + Future getDEuroAccruedInterest(WalletBase wallet) => + DEuro(wallet as EthereumWallet).accruedInterest; + + @override + Future getDEuroInterestRate(WalletBase wallet) => + DEuro(wallet as EthereumWallet).interestRate; + + @override + Future getDEuroSavingsApproved(WalletBase wallet) => + DEuro(wallet as EthereumWallet).approvedBalance; + + @override + Future addDEuroSaving( + WalletBase wallet, BigInt amount, TransactionPriority priority) => + DEuro(wallet as EthereumWallet) + .depositSavings(amount, priority as EVMChainTransactionPriority); + + @override + Future removeDEuroSaving( + WalletBase wallet, BigInt amount, TransactionPriority priority) => + DEuro(wallet as EthereumWallet) + .withdrawSavings(amount, priority as EVMChainTransactionPriority); + + @override + Future enableDEuroSaving(WalletBase wallet, TransactionPriority priority) => + DEuro(wallet as EthereumWallet).enableSavings(priority as EVMChainTransactionPriority); } diff --git a/lib/polygon/cw_polygon.dart b/lib/polygon/cw_polygon.dart index ec98137c5..557cedc39 100644 --- a/lib/polygon/cw_polygon.dart +++ b/lib/polygon/cw_polygon.dart @@ -67,8 +67,7 @@ class CWPolygon extends Polygon { @override String getPublicKey(WalletBase wallet) { final privateKeyInUnitInt = (wallet as PolygonWallet).evmChainPrivateKey; - final publicKey = privateKeyInUnitInt.address.hex; - return publicKey; + return privateKeyInUnitInt.address.hex; } @override @@ -137,28 +136,27 @@ class CWPolygon extends Polygon { } @override - List getERC20Currencies(WalletBase wallet) { - final polygonWallet = wallet as PolygonWallet; - return polygonWallet.erc20Currencies; - } + List getERC20Currencies(WalletBase wallet) => + (wallet as PolygonWallet).erc20Currencies; @override - Future addErc20Token(WalletBase wallet, CryptoCurrency token) async => - await (wallet as PolygonWallet).addErc20Token(token as Erc20Token); + Future addErc20Token(WalletBase wallet, CryptoCurrency token) => + (wallet as PolygonWallet).addErc20Token(token as Erc20Token); @override - Future deleteErc20Token(WalletBase wallet, CryptoCurrency token) async => - await (wallet as PolygonWallet).deleteErc20Token(token as Erc20Token); + Future deleteErc20Token(WalletBase wallet, CryptoCurrency token) => + (wallet as PolygonWallet).deleteErc20Token(token as Erc20Token); @override - Future removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token) async => - await (wallet as PolygonWallet).removeTokenTransactionsInHistory(token as Erc20Token); + Future removeTokenTransactionsInHistory( + WalletBase wallet, CryptoCurrency token) => + (wallet as PolygonWallet) + .removeTokenTransactionsInHistory(token as Erc20Token); @override - Future getErc20Token(WalletBase wallet, String contractAddress) async { - final polygonWallet = wallet as PolygonWallet; - return await polygonWallet.getErc20Token(contractAddress, 'polygon'); - } + Future getErc20Token( + WalletBase wallet, String contractAddress) => + (wallet as PolygonWallet).getErc20Token(contractAddress, 'polygon'); @override CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction) { @@ -176,23 +174,29 @@ class CWPolygon extends Polygon { } @override - void updatePolygonScanUsageState(WalletBase wallet, bool isEnabled) { - (wallet as PolygonWallet).updateScanProviderUsageState(isEnabled); - } + void updatePolygonScanUsageState(WalletBase wallet, bool isEnabled) => + (wallet as PolygonWallet).updateScanProviderUsageState(isEnabled); @override - Web3Client? getWeb3Client(WalletBase wallet) { - return (wallet as PolygonWallet).getWeb3Client(); - } + Web3Client? getWeb3Client(WalletBase wallet) => + (wallet as PolygonWallet).getWeb3Client(); - String getTokenAddress(CryptoCurrency asset) => (asset as Erc20Token).contractAddress; + @override + String getTokenAddress(CryptoCurrency asset) => + (asset as Erc20Token).contractAddress; + + @override + Future createTokenApproval(WalletBase wallet, + BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority) => + (wallet as EVMChainWallet) + .createApprovalTransaction(amount, spender, token, priority as EVMChainTransactionPriority); @override void setLedgerConnection( WalletBase wallet, ledger.LedgerConnection connection) { ((wallet as EVMChainWallet).evmChainPrivateKey as EvmLedgerCredentials) .setLedgerConnection( - connection, wallet.walletInfo.derivationInfo?.derivationPath); + connection, wallet.walletInfo.derivationInfo?.derivationPath); } @override @@ -206,9 +210,10 @@ class CWPolygon extends Polygon { throw err; } } - + @override - List getDefaultTokenContractAddresses() { - return DefaultPolygonErc20Tokens().initialPolygonErc20Tokens.map((e) => e.contractAddress).toList(); - } + List getDefaultTokenContractAddresses() => DefaultPolygonErc20Tokens() + .initialPolygonErc20Tokens + .map((e) => e.contractAddress) + .toList(); } diff --git a/lib/router.dart b/lib/router.dart index 4150c239f..afb1b46f8 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -48,6 +48,7 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dar import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_external_send_page.dart'; import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart'; import 'package:cake_wallet/src/screens/faq/faq_page.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/savings_page.dart'; import 'package:cake_wallet/src/screens/monero_accounts/monero_account_edit_or_create_page.dart'; import 'package:cake_wallet/src/screens/nano/nano_change_rep_page.dart'; import 'package:cake_wallet/src/screens/nano_accounts/nano_account_edit_or_create_page.dart'; @@ -920,6 +921,11 @@ Route createRoute(RouteSettings settings) { builder: (_) => getIt.get(), ); + case Routes.dEuroSavings: + return MaterialPageRoute( + builder: (_) => getIt.get(), + ); + default: return MaterialPageRoute( builder: (_) => Scaffold( diff --git a/lib/routes.dart b/lib/routes.dart index bbaca6618..addaec1d9 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -127,4 +127,6 @@ class Routes { static const walletGroupExistingSeedDescriptionPage = '/wallet_group_existing_seed_description_page'; static const walletSeedVerificationPage = '/wallet_seed_verification_page'; static const exchangeTradeExternalSendPage = '/exchange_trade_external_send_page'; + + static const dEuroSavings = '/integration/dEuro/savings'; } diff --git a/lib/src/screens/dashboard/pages/cake_features_page.dart b/lib/src/screens/dashboard/pages/cake_features_page.dart index 50257ad07..ba19f5329 100644 --- a/lib/src/screens/dashboard/pages/cake_features_page.dart +++ b/lib/src/screens/dashboard/pages/cake_features_page.dart @@ -5,15 +5,16 @@ import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/src/widgets/dashboard_card_widget.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; +import 'package:cake_wallet/view_model/dashboard/cake_features_view_model.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_type.dart'; -import 'package:cake_wallet/view_model/dashboard/cake_features_view_model.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; class CakeFeaturesPage extends StatelessWidget { - CakeFeaturesPage({required this.dashboardViewModel, required this.cakeFeaturesViewModel}); + CakeFeaturesPage( + {required this.dashboardViewModel, required this.cakeFeaturesViewModel}); final DashboardViewModel dashboardViewModel; final CakeFeaturesViewModel cakeFeaturesViewModel; @@ -58,6 +59,23 @@ class CakeFeaturesPage extends StatelessWidget { fit: BoxFit.cover, ), ), + if (dashboardViewModel.type == WalletType.ethereum) ...[ + DashBoardRoundedCardWidget( + isDarkTheme: dashboardViewModel.isDarkTheme, + shadowBlur: dashboardViewModel.getShadowBlur(), + shadowSpread: dashboardViewModel.getShadowSpread(), + onTap: () => + Navigator.of(context).pushNamed(Routes.dEuroSavings), + title: S.of(context).deuro_savings, + subTitle: S.of(context).deuro_savings_subtitle, + image: Image.asset( + 'assets/images/deuro_icon.png', + height: 80, + width: 80, + fit: BoxFit.cover, + ), + ), + ], DashBoardRoundedCardWidget( isDarkTheme: dashboardViewModel.isDarkTheme, shadowBlur: dashboardViewModel.getShadowBlur(), diff --git a/lib/src/screens/integrations/deuro/savings_page.dart b/lib/src/screens/integrations/deuro/savings_page.dart new file mode 100644 index 000000000..a58578893 --- /dev/null +++ b/lib/src/screens/integrations/deuro/savings_page.dart @@ -0,0 +1,197 @@ +import 'package:cake_wallet/core/execution_state.dart'; +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/screens/base_page.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/widgets/interest_card_widget.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_card_widget.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart'; +import 'package:cake_wallet/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart'; +import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart'; +import 'package:cake_wallet/src/widgets/gradient_background.dart'; +import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart'; +import 'package:cake_wallet/view_model/send/send_view_model_state.dart'; +import 'package:cw_core/crypto_currency.dart'; +import 'package:cw_core/pending_transaction.dart'; +import 'package:cw_core/wallet_type.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:mobx/mobx.dart'; + +class DEuroSavingsPage extends BasePage { + final DEuroViewModel _dEuroViewModel; + + DEuroSavingsPage(this._dEuroViewModel); + + @override + bool get gradientBackground => true; + + @override + Widget Function(BuildContext, Widget) get rootWrapper => + (context, scaffold) => GradientBackground(scaffold: scaffold); + + @override + String get title => S.current.deuro_savings; + + Widget trailing(BuildContext context) => MergeSemantics( + child: SizedBox( + height: 37, + width: 37, + child: ButtonTheme( + minWidth: double.minPositive, + child: Semantics( + label: "Refresh", + child: TextButton( + style: TextButton.styleFrom( + foregroundColor: Theme.of(context).colorScheme.onSurface, + overlayColor: WidgetStateColor.resolveWith( + (states) => Colors.transparent), + ), + onPressed: _dEuroViewModel.reloadSavingsUserData, + child: Icon( + Icons.refresh, + color: pageIconColor(context), + size: 20, + ), + ), + ), + ), + ), + ); + + @override + Widget body(BuildContext context) { + WidgetsBinding.instance + .addPostFrameCallback((_) => _setReactions(context, _dEuroViewModel)); + + return Container( + width: double.infinity, + child: Column( + children: [ + Observer( + builder: (_) => SavingsCard( + isDarkTheme: currentTheme.isDark, + interestRate: "${_dEuroViewModel.interestRate}%", + savingsBalance: _dEuroViewModel.savingsBalance, + currency: CryptoCurrency.deuro, + onAddSavingsPressed: () => _onSavingsAdd(context), + onRemoveSavingsPressed: () => _onSavingsRemove(context), + onApproveSavingsPressed: _dEuroViewModel.prepareApproval, + isEnabled: _dEuroViewModel.isEnabled, + ), + ), + Observer( + builder: (_) => InterestCardWidget( + isDarkTheme: currentTheme.isDark, + title: S.of(context).deuro_savings_collect_interest, + collectedInterest: _dEuroViewModel.accruedInterest, + onCollectInterest: _dEuroViewModel.prepareCollectInterest, + ), + ), + ], + ), + ); + } + + Future _onSavingsAdd(BuildContext context) async { + final amount = await Navigator.of(context).push(MaterialPageRoute( + builder: (BuildContext context) => SavingEditPage(isAdding: true))); + if (amount != null) _dEuroViewModel.prepareSavingsEdit(amount, true); + } + + Future _onSavingsRemove(BuildContext context) async { + final amount = await Navigator.of(context).push(MaterialPageRoute( + builder: (BuildContext context) => SavingEditPage(isAdding: false))); + if (amount != null) _dEuroViewModel.prepareSavingsEdit(amount, false); + } + + bool _isReactionsSet = false; + + void _setReactions(BuildContext context, DEuroViewModel dEuroViewModel) { + if (_isReactionsSet) return; + + reaction((_) => dEuroViewModel.transaction, (PendingTransaction? tx) async { + if (tx == null) return; + final result = await showModalBottomSheet( + context: context, + isDismissible: false, + isScrollControlled: true, + builder: (BuildContext bottomSheetContext) => ConfirmSendingBottomSheet( + key: ValueKey('savings_page_confirm_sending_dialog_key'), + titleText: S.of(bottomSheetContext).confirm_transaction, + currentTheme: currentTheme, + walletType: WalletType.ethereum, + titleIconPath: CryptoCurrency.deuro.iconPath, + currency: CryptoCurrency.deuro, + amount: S.of(bottomSheetContext).send_amount, + amountValue: tx.amountFormatted, + fiatAmountValue: "", + fee: S.of(bottomSheetContext).send_estimated_fee, + feeValue: tx.feeFormatted, + feeFiatAmount: "", + outputs: [], + onSlideComplete: () async { + Navigator.of(bottomSheetContext).pop(true); + dEuroViewModel.commitTransaction(); + }, + change: tx.change, + ), + ); + + if (result == null) dEuroViewModel.dismissTransaction(); + }); + + reaction((_) => dEuroViewModel.approvalTransaction, (PendingTransaction? tx) async { + if (tx == null) return; + final result = await showModalBottomSheet( + context: context, + isDismissible: false, + isScrollControlled: true, + builder: (BuildContext bottomSheetContext) => ConfirmSendingBottomSheet( + key: ValueKey('savings_page_confirm_approval_dialog_key'), + titleText: S.of(bottomSheetContext).approve_tokens, + currentTheme: currentTheme, + walletType: WalletType.ethereum, + titleIconPath: CryptoCurrency.deuro.iconPath, + currency: CryptoCurrency.deuro, + amount: S.of(bottomSheetContext).send_amount, + amountValue: tx.amountFormatted, + fiatAmountValue: "", + fee: S.of(bottomSheetContext).send_estimated_fee, + feeValue: tx.feeFormatted, + feeFiatAmount: "", + outputs: [], + onSlideComplete: () { + Navigator.of(bottomSheetContext).pop(true); + dEuroViewModel.commitApprovalTransaction(); + }, + change: tx.change, + ), + ); + + if (result == null) dEuroViewModel.dismissTransaction(); + }); + + reaction((_) => dEuroViewModel.state, (ExecutionState state) async { + if (state is TransactionCommitted) { + WidgetsBinding.instance.addPostFrameCallback((_) async { + if (!context.mounted) return; + + await showModalBottomSheet( + context: context, + isDismissible: false, + builder: (BuildContext bottomSheetContext) => InfoBottomSheet( + currentTheme: currentTheme, + titleText: S.of(bottomSheetContext).transaction_sent, + contentImage: 'assets/images/birthday_cake.png', + content: S.of(bottomSheetContext).deuro_tx_commited_content, + actionButtonText: S.of(bottomSheetContext).close, + actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'), + actionButton: () => Navigator.of(bottomSheetContext).pop(), + ), + ); + }); + } + }); + + _isReactionsSet = true; + } +} diff --git a/lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart b/lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart new file mode 100644 index 000000000..f76b13e7e --- /dev/null +++ b/lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart @@ -0,0 +1,45 @@ +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/screens/receive/widgets/currency_input_field.dart'; +import 'package:cake_wallet/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart'; +import 'package:cake_wallet/src/widgets/primary_button.dart'; +import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart'; +import 'package:cw_core/crypto_currency.dart'; +import 'package:flutter/material.dart'; + +class EditSavingsBottomSheet extends BaseBottomSheet { + EditSavingsBottomSheet(this.dEuroViewModel, {required super.titleText}); + + final _amountController = TextEditingController(); + final DEuroViewModel dEuroViewModel; + + @override + Widget contentWidget(BuildContext context) => Column( + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 10), + child: CurrencyAmountTextField( + hasUnderlineBorder: true, + borderWidth: 1.0, + selectedCurrency: CryptoCurrency.deuro.name.toUpperCase(), + amountFocusNode: null, + amountController: _amountController, + tag: CryptoCurrency.deuro.tag, + isAmountEditable: true, + ), + ), + ], + ); + + @override + Widget footerWidget(BuildContext context) => Padding( + padding: const EdgeInsets.fromLTRB(16, 12, 16, 34), + child: LoadingPrimaryButton( + onPressed: () => dEuroViewModel.prepareSavingsEdit(_amountController.text, true), + text: S.of(context).confirm, + color: Theme.of(context).colorScheme.primary, + textColor: Theme.of(context).colorScheme.onPrimary, + isLoading: false, + isDisabled: false, + ), + ); +} diff --git a/lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart b/lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart new file mode 100644 index 000000000..03dd174f6 --- /dev/null +++ b/lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart @@ -0,0 +1,67 @@ +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_card_widget.dart'; +import 'package:cake_wallet/themes/utils/custom_theme_colors.dart'; +import 'package:cw_core/crypto_currency.dart'; +import 'package:flutter/material.dart'; + +class InterestCardWidget extends StatelessWidget { + InterestCardWidget({ + required this.title, + required this.collectedInterest, + super.key, + required this.isDarkTheme, + required this.onCollectInterest, + }); + + final String title; + final String collectedInterest; + final bool isDarkTheme; + final VoidCallback onCollectInterest; + + @override + Widget build(BuildContext context) { + return Stack(children: [ + Container( + margin: EdgeInsets.symmetric(horizontal: 16), + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15), + gradient: LinearGradient( + colors: [ + isDarkTheme + ? CustomThemeColors.cardGradientColorPrimaryDark + : CustomThemeColors.cardGradientColorPrimaryLight, + isDarkTheme + ? CustomThemeColors.cardGradientColorSecondaryDark + : CustomThemeColors.cardGradientColorSecondaryLight, + ], + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + ), + ), + child: Padding( + padding: EdgeInsets.all(20), + child: Column( + children: [ + SavingsCard.getAssetBalanceRow( + context, + title: title, + subtitle: collectedInterest, + currency: CryptoCurrency.deuro, + hideSymbol: true, + ), + SizedBox(height: 10), + SavingsCard.getButton( + context, + label: S.of(context).deuro_collect_interest, + onPressed: onCollectInterest, + backgroundColor: Theme.of(context).colorScheme.primary, + color: Theme.of(context).colorScheme.onPrimary, + ), + ], + ), + ), + ), + ]); + } +} diff --git a/lib/src/screens/integrations/deuro/widgets/numpad.dart b/lib/src/screens/integrations/deuro/widgets/numpad.dart new file mode 100644 index 000000000..17914376c --- /dev/null +++ b/lib/src/screens/integrations/deuro/widgets/numpad.dart @@ -0,0 +1,107 @@ +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +class NumberPad extends StatelessWidget { + final VoidCallback? onDecimalPressed; + final VoidCallback onDeletePressed; + final void Function(int index) onNumberPressed; + final FocusNode focusNode; + + const NumberPad({ + super.key, + required this.onNumberPressed, + required this.onDeletePressed, + required this.focusNode, + this.onDecimalPressed, + }); + + @override + Widget build(BuildContext context) => KeyboardListener( + focusNode: focusNode, + onKeyEvent: (keyEvent) { + if (keyEvent is KeyDownEvent) { + if (keyEvent.logicalKey.keyLabel == "Backspace") { + return onDeletePressed(); + } + + if ([".", ","].contains(keyEvent.logicalKey.keyLabel) && + onDecimalPressed != null) { + return onDecimalPressed!(); + } + + int? number = int.tryParse(keyEvent.character ?? ''); + if (number != null) return onNumberPressed(number); + } + }, + child: SizedBox( + height: 300, + child: GridView.count( + childAspectRatio: 2, + shrinkWrap: true, + crossAxisCount: 3, + physics: const NeverScrollableScrollPhysics(), + children: List.generate(12, (index) { + if (index == 9) { + if (onDecimalPressed == null) return Container(); + return InkWell( + onTap: onDecimalPressed, + child: Center( + child: Text( + '.', + style: Theme.of(context).textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.w600, + fontSize: 30, + color: Theme.of(context).colorScheme.onSurfaceVariant, + ), + textAlign: TextAlign.center, + ), + ), + ); + } else if (index == 10) { + index = 0; + } else if (index == 11) { + return MergeSemantics( + child: Container( + child: Semantics( + label: S.of(context).delete, + button: true, + onTap: onDeletePressed, + child: TextButton( + onPressed: onDeletePressed, + style: TextButton.styleFrom( + backgroundColor: + Colors.transparent, + shape: CircleBorder(), + ), + child: Image.asset( + 'assets/images/delete_icon.png', + color: Theme.of(context).colorScheme.primary, + ), + ), + ), + ), + ); + } else { + index++; + } + + return InkWell( + onTap: () => onNumberPressed(index), + child: Center( + child: Text( + '$index', + style: Theme.of(context).textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.w600, + fontSize: 30, + color: Theme.of(context).colorScheme.onSurfaceVariant, + ), + textAlign: TextAlign.center, + ), + ), + ); + }), + ), + ), + ); +} diff --git a/lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart b/lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart new file mode 100644 index 000000000..9196929c4 --- /dev/null +++ b/lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart @@ -0,0 +1,263 @@ +import 'dart:math'; + +import 'package:auto_size_text/auto_size_text.dart'; +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; +import 'package:cake_wallet/themes/utils/custom_theme_colors.dart'; +import 'package:cw_core/crypto_currency.dart'; +import 'package:flutter/material.dart'; + +class SavingsCard extends StatelessWidget { + final bool isDarkTheme; + final bool isEnabled; + final String interestRate; + final String savingsBalance; + final CryptoCurrency currency; + final VoidCallback onAddSavingsPressed; + final VoidCallback onRemoveSavingsPressed; + final VoidCallback onApproveSavingsPressed; + + const SavingsCard({ + super.key, + required this.isDarkTheme, + required this.interestRate, + required this.savingsBalance, + required this.currency, + required this.onAddSavingsPressed, + required this.onRemoveSavingsPressed, + required this.onApproveSavingsPressed, + this.isEnabled = true, + }); + + @override + Widget build(BuildContext context) => Container( + margin: const EdgeInsets.all(15), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15), + gradient: LinearGradient( + colors: [ + isDarkTheme + ? CustomThemeColors.cardGradientColorPrimaryDark + : CustomThemeColors.cardGradientColorPrimaryLight, + isDarkTheme + ? CustomThemeColors.cardGradientColorSecondaryDark + : CustomThemeColors.cardGradientColorSecondaryLight, + ], + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + ), + ), + child: Container( + padding: const EdgeInsets.all(20), + child: Column( + children: [ + getAssetBalanceRow(context, + title: S.of(context).deuro_savings_balance, + subtitle: savingsBalance, + currency: currency), + Padding( + padding: const EdgeInsets.symmetric(vertical: 10), + child: Row( + children: [ + Expanded( + child: Text( + 'Current APR', + style: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: + Theme.of(context).colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + softWrap: true, + ), + ), + Text( + interestRate, + style: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + fontWeight: FontWeight.w500, + ), + softWrap: true, + ), + ], + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: isEnabled + ? [ + Expanded( + child: getButton( + context, + label: S.of(context).deuro_savings_add, + imagePath: 'assets/images/received.png', + onPressed: onAddSavingsPressed, + backgroundColor: + Theme.of(context).colorScheme.primary, + color: Theme.of(context).colorScheme.onPrimary, + ), + ), + SizedBox(width: 12), + Expanded( + child: getButton( + context, + label: S.of(context).deuro_savings_remove, + imagePath: 'assets/images/upload.png', + onPressed: onRemoveSavingsPressed, + backgroundColor: + Theme.of(context).colorScheme.surface, + color: Theme.of(context) + .colorScheme + .onSecondaryContainer, + ), + ), + ] + : [ + Expanded( + child: getButton( + context, + label: S.of(context).deuro_savings_set_approval, + onPressed: onApproveSavingsPressed, + backgroundColor: + Theme.of(context).colorScheme.primary, + color: Theme.of(context).colorScheme.onPrimary, + ), + ) + ], + ), + ], + ), + )); + + static Widget getButton( + BuildContext context, { + required String label, + String? imagePath, + required VoidCallback onPressed, + required Color backgroundColor, + required Color color, + }) => + Semantics( + label: label, + child: OutlinedButton( + onPressed: onPressed, + style: OutlinedButton.styleFrom( + backgroundColor: backgroundColor, + side: BorderSide( + color: Theme.of(context).colorScheme.outlineVariant.withAlpha(0), + width: 0, + ), + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + ), + child: Container( + padding: const EdgeInsets.symmetric(vertical: 12), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + if (imagePath != null) ...[ + Image.asset( + imagePath, + height: 30, + width: 30, + color: color, + ), + const SizedBox(width: 8), + ], + Text( + label, + style: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: color, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ), + ); + + static Widget getAssetBalanceRow( + BuildContext context, { + required String title, + required String subtitle, + required CryptoCurrency currency, + bool hideSymbol = true, + }) => + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: Theme.of(context).textTheme.bodySmall?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + height: 1, + ), + ), + SizedBox(height: 6), + AutoSizeText( + subtitle, + style: Theme.of(context).textTheme.titleLarge?.copyWith( + color: Theme.of(context).colorScheme.onSurface, + fontWeight: FontWeight.w900, + fontSize: 24, + height: 1, + ), + maxLines: 1, + textAlign: TextAlign.start, + ), + ], + ), + SizedBox( + //width: min(MediaQuery.of(context).size.width * 0.2, 100), + child: Center( + child: Column( + children: [ + CakeImageWidget( + imageUrl: currency.iconPath, + height: 40, + width: 40, + errorWidget: Container( + height: 30.0, + width: 30.0, + child: Center( + child: Text( + currency.title + .substring(0, min(currency.title.length, 2)), + style: + Theme.of(context).textTheme.bodySmall?.copyWith( + fontSize: 11, + color: Theme.of(context) + .colorScheme + .onSurfaceVariant, + ), + ), + ), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Theme.of(context).colorScheme.surfaceContainer, + ), + ), + ), + if (!hideSymbol) ...[ + const SizedBox(height: 10), + Text( + currency.title, + style: Theme.of(context).textTheme.bodyMedium?.copyWith( + fontSize: 16, + fontWeight: FontWeight.w700, + color: Theme.of(context).colorScheme.onSurface, + height: 1, + ), + ), + ] + ], + ), + ), + ), + ], + ); +} diff --git a/lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart b/lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart new file mode 100644 index 000000000..bb1733fb5 --- /dev/null +++ b/lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart @@ -0,0 +1,90 @@ +import 'package:auto_size_text/auto_size_text.dart'; +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/screens/base_page.dart'; +import 'package:cake_wallet/src/screens/integrations/deuro/widgets/numpad.dart'; +import 'package:cake_wallet/src/widgets/primary_button.dart'; +import 'package:flutter/material.dart'; + +class SavingEditPage extends BasePage { + final bool isAdding; + + SavingEditPage({required this.isAdding}); + + String get title => + isAdding ? S.current.deuro_savings_add : S.current.deuro_savings_remove; + + @override + Widget body(BuildContext context) => _SavingsEditBody(); +} + +class _SavingsEditBody extends StatefulWidget { + const _SavingsEditBody(); + + @override + State createState() => _SavingsEditBodyState(); +} + +class _SavingsEditBodyState extends State<_SavingsEditBody> { + @override + void initState() { + WidgetsBinding.instance + .addPostFrameCallback((_) => _numpadFocusNode.requestFocus()); + super.initState(); + } + + @override + void dispose() { + _numpadFocusNode.dispose(); + super.dispose(); + } + + String amount = '0'; + final FocusNode _numpadFocusNode = FocusNode(); + + @override + Widget build(BuildContext context) => SafeArea( + child: Column(children: [ + Expanded( + child: Center( + child: Padding( + padding: const EdgeInsets.only(left: 26, right: 26, top: 10), + child: AutoSizeText( + "${amount.toString()} dEuro", + maxLines: 1, + maxFontSize: 60, + style: Theme.of(context).textTheme.headlineMedium?.copyWith( + fontWeight: FontWeight.w600, + fontSize: 60, + color: Theme.of(context).colorScheme.onSurface, + ), + textAlign: TextAlign.center, + ), + ), + )), + NumberPad( + focusNode: _numpadFocusNode, + onNumberPressed: (i) => setState( + () => amount = amount == '0' ? i.toString() : '${amount}${i}', + ), + onDeletePressed: () => setState( + () => amount = amount.length > 1 + ? amount.substring(0, amount.length - 1) + : '0', + ), + onDecimalPressed: () => + setState(() => amount = '${amount.replaceAll('.', '')}.'), + ), + Padding( + padding: const EdgeInsets.fromLTRB(16, 12, 16, 34), + child: LoadingPrimaryButton( + onPressed: () => Navigator.pop(context, amount), + text: S.of(context).confirm, + color: Theme.of(context).colorScheme.primary, + textColor: Theme.of(context).colorScheme.onPrimary, + isLoading: false, + isDisabled: false, + ), + ) + ]), + ); +} diff --git a/lib/src/widgets/dashboard_card_widget.dart b/lib/src/widgets/dashboard_card_widget.dart index f1313c525..d5b4f8853 100644 --- a/lib/src/widgets/dashboard_card_widget.dart +++ b/lib/src/widgets/dashboard_card_widget.dart @@ -109,6 +109,7 @@ class DashBoardRoundedCardWidget extends StatelessWidget { ], ), ), + Padding(padding: EdgeInsets.only(left: 10)), if (image != null) image! else if (svgPicture != null) svgPicture!, if (icon != null) icon! ], diff --git a/lib/view_model/integrations/deuro_view_model.dart b/lib/view_model/integrations/deuro_view_model.dart new file mode 100644 index 000000000..09f9a363c --- /dev/null +++ b/lib/view_model/integrations/deuro_view_model.dart @@ -0,0 +1,119 @@ +import 'dart:math'; + +import 'package:cake_wallet/core/execution_state.dart'; +import 'package:cake_wallet/ethereum/ethereum.dart'; +import 'package:cake_wallet/store/app_store.dart'; +import 'package:cake_wallet/view_model/send/send_view_model_state.dart'; +import 'package:cw_core/pending_transaction.dart'; +import 'package:cw_core/wallet_type.dart'; +import 'package:mobx/mobx.dart'; + +part 'deuro_view_model.g.dart'; + +class DEuroViewModel = DEuroViewModelBase with _$DEuroViewModel; + +abstract class DEuroViewModelBase with Store { + final AppStore _appStore; + + DEuroViewModelBase(this._appStore) { + reloadInterestRate(); + reloadSavingsUserData(); + } + + @observable + String savingsBalance = '0.00'; + + @observable + ExecutionState state = InitialExecutionState(); + + @observable + String interestRate = '0'; + + @observable + String accruedInterest = '0.00'; + + @observable + BigInt approvedTokens = BigInt.zero; + + @computed + bool get isEnabled => approvedTokens > BigInt.zero; + + @observable + PendingTransaction? transaction = null; + + @observable + PendingTransaction? approvalTransaction = null; + + @action + Future reloadSavingsUserData() async { + final savingsBalanceRaw = + ethereum!.getDEuroSavingsBalance(_appStore.wallet!); + final accruedInterestRaw = + ethereum!.getDEuroAccruedInterest(_appStore.wallet!); + + approvedTokens = await ethereum!.getDEuroSavingsApproved(_appStore.wallet!); + + savingsBalance = ethereum! + .formatterEthereumAmountToDouble(amount: await savingsBalanceRaw) + .toStringAsFixed(6); + accruedInterest = ethereum! + .formatterEthereumAmountToDouble(amount: await accruedInterestRaw) + .toStringAsFixed(6); + } + + @action + Future reloadInterestRate() async { + final interestRateRaw = + await ethereum!.getDEuroInterestRate(_appStore.wallet!); + + interestRate = (interestRateRaw / BigInt.from(10000)).toString(); + } + + @action + Future prepareApproval() async { + final priority = _appStore.settingsStore.priority[WalletType.ethereum]!; + approvalTransaction = + await ethereum!.enableDEuroSaving(_appStore.wallet!, priority); + } + + @action + Future prepareSavingsEdit(String amountRaw, bool isAdding) async { + final amount = BigInt.from(num.parse(amountRaw) * pow(10, 18)); + final priority = _appStore.settingsStore.priority[WalletType.ethereum]!; + transaction = await (isAdding + ? ethereum!.addDEuroSaving(_appStore.wallet!, amount, priority) + : ethereum!.removeDEuroSaving(_appStore.wallet!, amount, priority)); + } + + Future prepareCollectInterest() => + prepareSavingsEdit(accruedInterest, false); + + @action + Future commitTransaction() async { + if (transaction != null) { + state = TransactionCommitting(); + await transaction!.commit(); + transaction = null; + reloadSavingsUserData(); + state = TransactionCommitted(); + } + } + + @action + Future commitApprovalTransaction() async { + if (approvalTransaction != null) { + state = TransactionCommitting(); + await approvalTransaction!.commit(); + approvalTransaction = null; + reloadSavingsUserData(); + state = TransactionCommitted(); + } + } + + @action + void dismissTransaction() { + transaction == null; + approvalTransaction = null; + state = InitialExecutionState(); + } +} diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index 0c63a33b4..a30865b76 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -56,6 +56,7 @@ "apk_update": "تحديث APK", "approve": "ﺪﻤﺘﻌﻳ", "approve_request": "الموافقة على الطلب", + "approve_tokens": "الموافقة على الرموز", "arrive_in_this_address": "سيصل ${currency} ${tag}إلى هذا العنوان", "ascending": "تصاعدي", "ask_each_time": "اسأل في كل مرة", @@ -244,6 +245,15 @@ "descending": "النزول", "description": "ﻒﺻﻭ", "destination_tag": "علامة الوجهة:", + "deuro_collect_interest": "يجمع", + "deuro_savings": "الادخار ديورو", + "deuro_savings_add": "إيداع", + "deuro_savings_balance": "توازن الادخار", + "deuro_savings_collect_interest": "جمع الاهتمام", + "deuro_savings_remove": "ينسحب", + "deuro_savings_set_approval": "تعيين الموافقة", + "deuro_savings_subtitle": "كسب ما يصل إلى 10 ٪ فائدة على مقتنيات Deuro Stablecoin", + "deuro_tx_commited_content": "قد يستغرق الأمر بضع ثوانٍ حتى يتم تأكيد المعاملة وينعكس على الشاشة", "device_is_signing": "الجهاز يوقع", "dfx_option_description": "شراء التشفير مع EUR & CHF. لعملاء البيع بالتجزئة والشركات في أوروبا", "didnt_get_code": "لم تحصل على رمز؟", diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index 8163da646..f0b992160 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -56,6 +56,7 @@ "apk_update": "APK ъпдейт", "approve": "Одобряване", "approve_request": "Одобрете искане", + "approve_tokens": "Одобрете жетоните", "arrive_in_this_address": "${currency} ${tag}ще отидат на този адрес", "ascending": "Възходящ", "ask_each_time": "Питайте всеки път", @@ -244,6 +245,15 @@ "descending": "Низходящ", "description": "Описание", "destination_tag": "Destination tag:", + "deuro_collect_interest": "Събиране", + "deuro_savings": "Спестявания на Деуро", + "deuro_savings_add": "Депозит", + "deuro_savings_balance": "Спестотен баланс", + "deuro_savings_collect_interest": "Събиране на интерес", + "deuro_savings_remove": "Оттегляне", + "deuro_savings_set_approval": "Задайте одобрение", + "deuro_savings_subtitle": "Печелете до 10% лихва за вашите Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Може да отнеме няколко секунди, за да може транзакцията да се потвърди и да бъде отразена на екрана", "device_is_signing": "Устройството подписва", "dfx_option_description": "Купете криптовалута с Eur & CHF. За търговски и корпоративни клиенти в Европа", "didnt_get_code": "Не получихте код?", diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 80b386859..e4b59562e 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -56,6 +56,7 @@ "apk_update": "aktualizace APK", "approve": "Schvalovat", "approve_request": "Schválit žádost", + "approve_tokens": "Schválit tokeny", "arrive_in_this_address": "${currency} ${tag}přijde na tuto adresu", "ascending": "Vzestupné", "ask_each_time": "Zeptejte se pokaždé", @@ -244,6 +245,15 @@ "descending": "Klesající", "description": "Popis", "destination_tag": "Destination Tag:", + "deuro_collect_interest": "Sbírat", + "deuro_savings": "dEuro úspory", + "deuro_savings_add": "Vklad", + "deuro_savings_balance": "Úspora zůstatek", + "deuro_savings_collect_interest": "Sbírat zájem", + "deuro_savings_remove": "Odstoupit", + "deuro_savings_set_approval": "Stanovit schválení", + "deuro_savings_subtitle": "Získejte až 10% úrok z vašeho Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Transakce může trvat několik sekund, aby se potvrdila a odrážela se na obrazovce", "device_is_signing": "Zařízení se podpisu", "dfx_option_description": "Koupit krypto s EUR & CHF. Pro maloobchodní a firemní zákazníky v Evropě", "didnt_get_code": "Nepřišel Vám kód?", diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 479954b23..7e3f72e2a 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -56,6 +56,7 @@ "apk_update": "APK-Update", "approve": "Genehmigen", "approve_request": "Anfrage genehmigen", + "approve_tokens": "Token genehmigen", "arrive_in_this_address": "${currency} ${tag} wird an dieser Adresse ankommen", "ascending": "Aufsteigend", "ask_each_time": "Jedes Mal fragen", @@ -206,7 +207,7 @@ "copy": "Kopieren", "copy_address": "Adresse kopieren", "copy_id": "ID kopieren", - "copy_payjoin_address": "Kopieren Sie Payjoin -Adresse", + "copy_payjoin_address": "Kopieren Sie Payjoin-Adresse", "copy_payjoin_url": "Payjoin URL kopieren", "copyWalletConnectLink": "Kopieren Sie den WalletConnect-Link von dApp und fügen Sie ihn hier ein", "corrupted_seed_notice": "Die Dateien für diese Wallet sind beschädigt und können nicht geöffnet werden. Bitte sehen Sie sich die Seeds an, speichern Sie sie und stellen Sie die Wallet wieder her.\n\nWenn der Wert leer ist, konnte der Seed nicht korrekt wiederhergestellt werden.", @@ -244,6 +245,15 @@ "descending": "Absteigend", "description": "Beschreibung", "destination_tag": "Ziel-Tag:", + "deuro_collect_interest": "Auszahlen", + "deuro_savings": "dEuro-Savings", + "deuro_savings_add": "Einzahlen", + "deuro_savings_balance": "Sparguthaben", + "deuro_savings_collect_interest": "Interesse sammeln", + "deuro_savings_remove": "Auszahlen", + "deuro_savings_set_approval": "Genehmigung festlegen", + "deuro_savings_subtitle": "Verdienen Sie bis zu 10% Zinsen für Ihre dEuro Stablecoin Holdings", + "deuro_tx_commited_content": "Es kann ein paar Sekunden dauern, bis die Transaktion bestätigt und auf dem Bildschirm angezeigt", "device_is_signing": "Das Gerät unterschreibt", "dfx_option_description": "Kaufen Sie Krypto mit EUR & CHF. Für Einzelhandel und Unternehmenskunden in Europa", "didnt_get_code": "Kein Code?", @@ -1098,4 +1108,4 @@ "you_will_send": "Konvertieren von", "youCanGoBackToYourDapp": "Sie können jetzt zu Ihrem Dapp zurückkehren", "yy": "YY" -} \ No newline at end of file +} diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 971a68455..a841c3041 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -56,6 +56,7 @@ "apk_update": "APK update", "approve": "Approve", "approve_request": "Approve Request", + "approve_tokens": "Approve tokens", "arrive_in_this_address": "${currency} ${tag}will arrive in this address", "ascending": "Ascending", "ask_each_time": "Ask each time", @@ -244,6 +245,15 @@ "descending": "Descending", "description": "Description", "destination_tag": "Destination tag:", + "deuro_collect_interest": "Collect", + "deuro_savings": "dEuro Savings", + "deuro_savings_add": "Deposit", + "deuro_savings_balance": "Savings Balance", + "deuro_savings_collect_interest": "Collect interest", + "deuro_savings_remove": "Withdraw", + "deuro_savings_set_approval": "Set approval", + "deuro_savings_subtitle": "Earn up to 10% interest on your dEuro Stablecoin holdings", + "deuro_tx_commited_content": "It might take a couple of seconds for the transaction to confirm and be reflected on screen", "device_is_signing": "Device is signing", "dfx_option_description": "Buy crypto with EUR & CHF. For retail and corporate customers in Europe", "didnt_get_code": "Didn't get code?", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index fe802237a..17687e7c0 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -56,6 +56,7 @@ "apk_update": "Actualización de APK", "approve": "Aprobar", "approve_request": "Aprobar la solicitud", + "approve_tokens": "Aprobar tokens", "arrive_in_this_address": "${currency} ${tag}llegará a esta dirección", "ascending": "Ascendente", "ask_each_time": "Pregunta cada vez", @@ -244,6 +245,15 @@ "descending": "Descendente", "description": "Descripción", "destination_tag": "Etiqueta de destino:", + "deuro_collect_interest": "Recolectar", + "deuro_savings": "ahorros de deuro", + "deuro_savings_add": "Depósito", + "deuro_savings_balance": "Saldo de ahorro", + "deuro_savings_collect_interest": "Cobrar interés", + "deuro_savings_remove": "Retirar", + "deuro_savings_set_approval": "Establecer aprobación", + "deuro_savings_subtitle": "Gane hasta un 10% de interés en sus Holdings de Deuro Stablecoin", + "deuro_tx_commited_content": "La transacción puede tardar un par de segundos en confirmar y reflejarse en la pantalla", "device_is_signing": "El dispositivo está firmando", "dfx_option_description": "Compre cripto con EUR y CHF. Para clientes minoristas y corporativos en Europa", "didnt_get_code": "¿No recibiste el código?", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index b78ef8bc5..e6b942f5c 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -56,6 +56,7 @@ "apk_update": "Mise à jour d'APK", "approve": "Approuver", "approve_request": "Approuver la demande", + "approve_tokens": "Approuver les jetons", "arrive_in_this_address": "${currency} ${tag}arrivera à cette adresse", "ascending": "Ascendant", "ask_each_time": "Demander à chaque fois", @@ -244,6 +245,15 @@ "descending": "Descendant", "description": "Description", "destination_tag": "Tag de destination :", + "deuro_collect_interest": "Collecter", + "deuro_savings": "Économies de deuro", + "deuro_savings_add": "Dépôt", + "deuro_savings_balance": "Solde d'épargne", + "deuro_savings_collect_interest": "Percevoir l'intérêt", + "deuro_savings_remove": "Retirer", + "deuro_savings_set_approval": "Établir l'approbation", + "deuro_savings_subtitle": "Gagnez jusqu'à 10% d'intérêt sur vos avoirs de Deuro Stablecoin", + "deuro_tx_commited_content": "Il pourrait prendre quelques secondes pour que la transaction confirme et soit reflétée à l'écran", "device_is_signing": "L'appareil signale", "dfx_option_description": "Achetez de la crypto avec EUR & CHF. Pour les clients de la vente au détail et des entreprises en Europe", "didnt_get_code": "Vous n'avez pas reçu le code ?", diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index 710960b7d..e38d03602 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -56,6 +56,7 @@ "apk_update": "apk sabunta", "approve": "Amincewa", "approve_request": "Amince da bukata", + "approve_tokens": "Amince da Alamu", "arrive_in_this_address": "${currency} ${tag} zai je wurin wannan adireshi", "ascending": "Hau", "ask_each_time": "Tambaya kowane lokaci", @@ -244,6 +245,15 @@ "descending": "Saukowa", "description": "Bayani", "destination_tag": "Tambarin makoma:", + "deuro_collect_interest": "Tara", + "deuro_savings": "deuro tanadi", + "deuro_savings_add": "Yi ajiya", + "deuro_savings_balance": "Ma'auni", + "deuro_savings_collect_interest": "Tattara amfani da sha'awa", + "deuro_savings_remove": "Janye", + "deuro_savings_set_approval": "Saita yarda", + "deuro_savings_subtitle": "Sami har zuwa 10% sha'awa a kan Deuro Stovecoin Rike", + "deuro_tx_commited_content": "Yana iya ɗaukar wasu secondsan seconds don ma'amala don tabbatarwa kuma a nuna shi a allon", "device_is_signing": "Na'urar tana shiga", "dfx_option_description": "Buy crypto tare da Eur & Chf. Don Retail da abokan ciniki na kamfanoni a Turai", "didnt_get_code": "Ba a samun code?", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index f0a7efaaf..e9c3bca17 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -56,6 +56,7 @@ "apk_update": "APK अद्यतन", "approve": "मंज़ूरी देना", "approve_request": "अनुरोध को स्वीकृत करें", + "approve_tokens": "टोकन को मंजूरी देना", "arrive_in_this_address": "${currency} ${tag}इस पते पर पहुंचेंगे", "ascending": "आरोही", "ask_each_time": "हर बार पूछें", @@ -244,6 +245,15 @@ "descending": "अवरोही", "description": "विवरण", "destination_tag": "गंतव्य टैग:", + "deuro_collect_interest": "इकट्ठा करना", + "deuro_savings": "देउरो बचत", + "deuro_savings_add": "जमा", + "deuro_savings_balance": "बचत शेष", + "deuro_savings_collect_interest": "ब्याज इकट्ठा करना", + "deuro_savings_remove": "निकालना", + "deuro_savings_set_approval": "अनुमोदन निर्धारित करना", + "deuro_savings_subtitle": "अपने Deuro Stablecoin होल्डिंग्स पर 10% ब्याज कमाएँ", + "deuro_tx_commited_content": "लेन -देन की पुष्टि करने और स्क्रीन पर प्रतिबिंबित होने के लिए कुछ सेकंड लग सकते हैं", "device_is_signing": "उपकरण हस्ताक्षर कर रहा है", "dfx_option_description": "EUR और CHF के साथ क्रिप्टो खरीदें। यूरोप में खुदरा और कॉर्पोरेट ग्राहकों के लिए", "didnt_get_code": "कोड नहीं मिला?", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index 5ecfb5b21..3f52f5b66 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -56,6 +56,7 @@ "apk_update": "APK ažuriranje", "approve": "Odobriti", "approve_request": "Odobriti zahtjev", + "approve_tokens": "Odobriti tokene", "arrive_in_this_address": "${currency} ${tag}će stići na ovu adresu", "ascending": "Uzlazni", "ask_each_time": "Pitajte svaki put", @@ -244,6 +245,15 @@ "descending": "Silazni", "description": "Opis", "destination_tag": "Odredišna oznaka:", + "deuro_collect_interest": "Prikupiti", + "deuro_savings": "deuro ušteda", + "deuro_savings_add": "Depozit", + "deuro_savings_balance": "Ravnoteža uštede", + "deuro_savings_collect_interest": "Prikupiti interes", + "deuro_savings_remove": "Povući", + "deuro_savings_set_approval": "Odrediti odobrenje", + "deuro_savings_subtitle": "Zaradite do 10% kamate na svoje Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Možda će trebati nekoliko sekundi da se transakcija potvrdi i odrazi na zaslonu", "device_is_signing": "Uređaj se potpisuje", "dfx_option_description": "Kupite kriptovalute s Eur & CHF. Za maloprodajne i korporativne kupce u Europi", "didnt_get_code": "Ne dobivate kod?", diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb index 5d274c632..d1d661e7c 100644 --- a/res/values/strings_hy.arb +++ b/res/values/strings_hy.arb @@ -56,6 +56,7 @@ "apk_update": "APK թարմացում", "approve": "Հաստատել", "approve_request": "Հաստատում է հայցը", + "approve_tokens": "Հաստատում է նշանները", "arrive_in_this_address": "${currency} ${tag}կժամանի այս հասցեում", "ascending": "Աճող", "ask_each_time": "Հարցնել ամեն անգամ", @@ -244,6 +245,15 @@ "descending": "Նվազող", "description": "Նկարագրություն", "destination_tag": "Նպատակակետի պիտակ:", + "deuro_collect_interest": "Հավաքել", + "deuro_savings": "dEuro խնայողություններ", + "deuro_savings_add": "Ավանդ", + "deuro_savings_balance": "Խնայողական հավասարակշռություն", + "deuro_savings_collect_interest": "Հավաքեք հետաքրքրություն", + "deuro_savings_remove": "Հեռացնել", + "deuro_savings_set_approval": "Սահմանել հաստատում", + "deuro_savings_subtitle": "Վաստակեք մինչեւ 10% տոկոսադրույքներ ձեր Deuro Stablecoin Holdings- ի համար", + "deuro_tx_commited_content": "Գործարքի հաստատման եւ արտացոլվելու համար գործարքի համար կարող է տեւել մի քանի վայրկյան", "device_is_signing": "Սարքը ստորագրում է", "dfx_option_description": "Գնեք կրիպտոարժույթ EUR և CHF: Կորպորատիվ և մանրածախ հաճախորդների համար Եվրոպայում", "didnt_get_code": "Չեք ստացել կոդը?", diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index b7847badf..eaccd3d99 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -56,6 +56,7 @@ "apk_update": "Pembaruan APK", "approve": "Menyetujui", "approve_request": "Menyetujui permintaan", + "approve_tokens": "Menyetujui token", "arrive_in_this_address": "${currency} ${tag} akan tiba di alamat ini", "ascending": "Naik", "ask_each_time": "Tanyakan setiap kali", @@ -244,6 +245,15 @@ "descending": "Menurun", "description": "Keterangan", "destination_tag": "Tag tujuan:", + "deuro_collect_interest": "Mengumpulkan", + "deuro_savings": "Tabungan dEuro", + "deuro_savings_add": "Deposito", + "deuro_savings_balance": "Keseimbangan tabungan", + "deuro_savings_collect_interest": "Mengumpulkan minat", + "deuro_savings_remove": "Menarik", + "deuro_savings_set_approval": "Tetapkan persetujuan", + "deuro_savings_subtitle": "Hasilkan hingga 10% bunga di Deuro Stablecoin Holdings Anda", + "deuro_tx_commited_content": "Mungkin butuh beberapa detik untuk transaksi untuk mengkonfirmasi dan direfleksikan di layar", "device_is_signing": "Perangkat sedang menandatangani", "dfx_option_description": "Beli crypto dengan EUR & CHF. Untuk pelanggan ritel dan perusahaan di Eropa", "didnt_get_code": "Tidak mendapatkan kode?", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index a0ff46c4f..65c4085d1 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -56,6 +56,7 @@ "apk_update": "Aggiornamento APK", "approve": "Approvare", "approve_request": "Approvare la richiesta", + "approve_tokens": "Approvare i token", "arrive_in_this_address": "${currency} ${tag}arriverà a questo indirizzo", "ascending": "Ascendente", "ask_each_time": "Chiedi ogni volta", @@ -244,6 +245,15 @@ "descending": "Discendente", "description": "Descrizione", "destination_tag": "Tag destinazione:", + "deuro_collect_interest": "Raccogliere", + "deuro_savings": "Risparmio di dEuro", + "deuro_savings_add": "Depositare", + "deuro_savings_balance": "Saldo di risparmio", + "deuro_savings_collect_interest": "Raccogliere interesse", + "deuro_savings_remove": "Ritirare", + "deuro_savings_set_approval": "Impostare l'approvazione", + "deuro_savings_subtitle": "Guadagna fino al 10% di interesse su Deuro StableCoin Holdings", + "deuro_tx_commited_content": "Potrebbero essere necessari un paio di secondi per confermare la transazione ed essere riflessa sullo schermo", "device_is_signing": "Il dispositivo sta firmando", "dfx_option_description": "Acquista Crypto con EUR & CHF. Per i clienti al dettaglio e aziendali in Europa", "didnt_get_code": "Non hai ricevuto il codice?", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index ac8dafbac..f638c1850 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -56,6 +56,7 @@ "apk_update": "APKアップデート", "approve": "承認する", "approve_request": "リクエストを承認します", + "approve_tokens": "トークンを承認します", "arrive_in_this_address": "${currency} ${tag}はこの住所に到着します", "ascending": "上昇", "ask_each_time": "毎回尋ねてください", @@ -244,6 +245,15 @@ "descending": "下降", "description": "説明", "destination_tag": "宛先タグ:", + "deuro_collect_interest": "集める", + "deuro_savings": "dEuro Savings", + "deuro_savings_add": "デポジット", + "deuro_savings_balance": "貯蓄バランス", + "deuro_savings_collect_interest": "興味を集めます", + "deuro_savings_remove": "撤回する", + "deuro_savings_set_approval": "承認を設定します", + "deuro_savings_subtitle": "Deuro Stablecoin Holdingsで最大10％の利息を稼ぐ", + "deuro_tx_commited_content": "トランザクションが確認され、画面に反映されるまでに数秒かかる場合があります", "device_is_signing": "デバイスが署名しています", "dfx_option_description": "EUR＆CHFで暗号を購入します。ヨーロッパの小売および企業の顧客向け", "didnt_get_code": "コードを取得しませんか？", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index e2b21aa04..1c0a4cee7 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -56,6 +56,7 @@ "apk_update": "APK 업데이트", "approve": "승인", "approve_request": "요청 승인", + "approve_tokens": "토큰을 승인합니다", "arrive_in_this_address": "${currency} ${tag}이(가) 이 주소로 도착합니다", "ascending": "오름차순", "ask_each_time": "매번 묻기", @@ -244,6 +245,15 @@ "descending": "내림차순", "description": "설명", "destination_tag": "목적지 태그:", + "deuro_collect_interest": "모으다", + "deuro_savings": "도로 저축", + "deuro_savings_add": "보증금", + "deuro_savings_balance": "저축 잔고", + "deuro_savings_collect_interest": "관심을 모으십시오", + "deuro_savings_remove": "철회하다", + "deuro_savings_set_approval": "승인을 설정하십시오", + "deuro_savings_subtitle": "Deuro Stablecoin Holdings에 최대 10%의이자를 받으십시오.", + "deuro_tx_commited_content": "트랜잭션이 확인하고 화면에 반영되는 데 몇 초가 걸릴 수 있습니다.", "device_is_signing": "장치가 서명 중입니다", "dfx_option_description": "EUR 및 CHF로 암호화폐 구매. 유럽의 개인 및 기업 고객 대상", "didnt_get_code": "코드를 받지 못했나요?", diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index edafed5d2..6727c7fcf 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -56,6 +56,7 @@ "apk_update": "APK အပ်ဒိတ်", "approve": "လက်မခံပါ။", "approve_request": "တောင်းဆိုမှုကိုအတည်ပြု", + "approve_tokens": "တိုကင်အတည်ပြု", "arrive_in_this_address": "${currency} ${tag}ဤလိပ်စာသို့ ရောက်ရှိပါမည်။", "ascending": "တက်", "ask_each_time": "တစ်ခုချင်းစီကိုအချိန်မေးပါ", @@ -244,6 +245,15 @@ "descending": "ဆင်း", "description": "ဖော်ပြချက်", "destination_tag": "ခရီးဆုံးအမှတ်-", + "deuro_collect_interest": "စုဝေး", + "deuro_savings": "dEuro ငွေစု", + "deuro_savings_add": "အပ်ငေှ", + "deuro_savings_balance": "ငွေစုချိန်ခွင်လျှာ", + "deuro_savings_collect_interest": "အကျိုးစီးပွားစုဆောင်းပါ", + "deuro_savings_remove": "ဆုတ်ခွာ", + "deuro_savings_set_approval": "အတည်ပြုချက်ကိုသတ်မှတ်ပါ", + "deuro_savings_subtitle": "သင်၏ Deuro Stabloin Holdings တွင် 10% အထိစိတ်ဝင်စားပါ", + "deuro_tx_commited_content": "၎င်းသည်ငွေပေးငွေယူကိုအတည်ပြုရန်နှင့်မျက်နှာပြင်ပေါ်တွင်ထင်ဟပ်ရန်စက္ကန့်အနည်းငယ်ကြာနိုင်သည်", "device_is_signing": "ကိရိယာလက်မှတ်ထိုးနေသည်", "dfx_option_description": "Crypto ကို EUR & CHF ဖြင့် 0 ယ်ပါ။ လက်လီရောင်းဝယ်မှုနှင့်ဥရောပရှိကော်ပိုရိတ်ဖောက်သည်များအတွက်", "didnt_get_code": "ကုဒ်ကို မရဘူးလား?", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index c47160a5f..4f925bc74 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -56,6 +56,7 @@ "apk_update": "APK-update", "approve": "Goedkeuren", "approve_request": "Het verzoek goedkeuren", + "approve_tokens": "Tokens goedkeuren", "arrive_in_this_address": "${currency} ${tag}komt aan op dit adres", "ascending": "Stijgend", "ask_each_time": "Vraag het elke keer", @@ -244,6 +245,15 @@ "descending": "Aflopend", "description": "Beschrijving", "destination_tag": "Bestemmingstag:", + "deuro_collect_interest": "Verzamelen", + "deuro_savings": "dEuro -besparingen", + "deuro_savings_add": "Borg", + "deuro_savings_balance": "Spaarbalans", + "deuro_savings_collect_interest": "Verzamel interesse", + "deuro_savings_remove": "Terugtrekken", + "deuro_savings_set_approval": "Goedkeuring instellen", + "deuro_savings_subtitle": "Verdien tot 10% rente op uw Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Het kan een paar seconden duren voordat de transactie wordt bevestigd en weerspiegeld op het scherm", "device_is_signing": "Apparaat ondertekent", "dfx_option_description": "Koop crypto met EUR & CHF. Voor retail- en zakelijke klanten in Europa", "didnt_get_code": "Geen code?", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index b3b99e28c..baf0f2502 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -56,6 +56,7 @@ "apk_update": "Aktualizacja APK", "approve": "Zatwierdzić", "approve_request": "Zatwierdzić żądanie", + "approve_tokens": "Zatwierdzić tokeny", "arrive_in_this_address": "${currency} ${tag}dotrze na ten adres", "ascending": "Wznoszący się", "ask_each_time": "Zapytaj za każdym razem", @@ -244,6 +245,15 @@ "descending": "Malejąco", "description": "Opis", "destination_tag": "Tag docelowy:", + "deuro_collect_interest": "Zbierać", + "deuro_savings": "dEuro oszczędności", + "deuro_savings_add": "Depozyt", + "deuro_savings_balance": "Równowaga oszczędności", + "deuro_savings_collect_interest": "Zbieraj zainteresowanie", + "deuro_savings_remove": "Wycofać", + "deuro_savings_set_approval": "Ustaw zatwierdzenie", + "deuro_savings_subtitle": "Zarabiaj do 10% odsetek od Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Potwierdzenie i odbicie na ekranie może potrwać kilka sekund", "device_is_signing": "Urządzenie podpisuje", "dfx_option_description": "Kup krypto za EUR & CHF. Dla klientów prywatnych i korporacyjnych w Europie", "didnt_get_code": "Nie dostałeś kodu?", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 9b55fc7b6..375996c99 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -56,6 +56,7 @@ "apk_update": "Atualização de APK", "approve": "Aprovar", "approve_request": "Aprovar solicitação", + "approve_tokens": "Aprovar tokens", "arrive_in_this_address": "${currency} ${tag}chegará neste endereço", "ascending": "Ascendente", "ask_each_time": "Pergunte cada vez", @@ -244,6 +245,15 @@ "descending": "descendente", "description": "Descrição", "destination_tag": "Tag de destino:", + "deuro_collect_interest": "Coletar", + "deuro_savings": "dEuro Savings", + "deuro_savings_add": "Depósito", + "deuro_savings_balance": "Balanço de poupança", + "deuro_savings_collect_interest": "Coletar juros", + "deuro_savings_remove": "Retirar", + "deuro_savings_set_approval": "Defina aprovação", + "deuro_savings_subtitle": "Ganhe até 10% de juros em sua Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Pode levar alguns segundos para a transação confirmar e se refletir na tela", "device_is_signing": "O dispositivo está assinando", "dfx_option_description": "Compre criptografia com EUR & CHF. Para clientes de varejo e corporativo na Europa", "didnt_get_code": "Não recebeu o código?", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 3e61f4277..800201b27 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -56,6 +56,7 @@ "apk_update": "Обновление APK", "approve": "Утвердить", "approve_request": "Утвердить запрос", + "approve_tokens": "Одобрить токены", "arrive_in_this_address": "${currency} ${tag}придет на этот адрес", "ascending": "Восходящий", "ask_each_time": "Спросите каждый раз", @@ -244,6 +245,15 @@ "descending": "Нисходящий", "description": "Описание", "destination_tag": "Целевой тег:", + "deuro_collect_interest": "Собирать", + "deuro_savings": "dEuro Savings", + "deuro_savings_add": "Депозитный", + "deuro_savings_balance": "Сберегательный баланс", + "deuro_savings_collect_interest": "Собирать интерес", + "deuro_savings_remove": "Отзывать", + "deuro_savings_set_approval": "Установить утверждение", + "deuro_savings_subtitle": "Заработайте до 10% процентов на ваших Deuro Stablecoin Holdings", + "deuro_tx_commited_content": "Чтобы подтвердить, может потребоваться пару секунд, чтобы подтвердить и быть отраженным на экране", "device_is_signing": "Устройство подписывает", "dfx_option_description": "Купить крипто с Eur & CHF. Для розничных и корпоративных клиентов в Европе", "didnt_get_code": "Не получить код?", diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index a60f1b332..bfaa92b08 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -56,6 +56,7 @@ "apk_update": "ปรับปรุง APK", "approve": "อนุมัติ", "approve_request": "อนุมัติคำขอ", + "approve_tokens": "อนุมัติโทเค็น", "arrive_in_this_address": "${currency} ${tag}จะมาถึงที่อยู่นี้", "ascending": "จากน้อยไปมาก", "ask_each_time": "ถามทุกครั้ง", @@ -244,6 +245,15 @@ "descending": "ลงมา", "description": "คำอธิบาย", "destination_tag": "แท็กปลายทาง:", + "deuro_collect_interest": "เก็บรวบรวม", + "deuro_savings": "การออมของ dEuro", + "deuro_savings_add": "เงินฝาก", + "deuro_savings_balance": "ยอดเงินออม", + "deuro_savings_collect_interest": "เก็บดอกเบี้ย", + "deuro_savings_remove": "ถอน", + "deuro_savings_set_approval": "ตั้งค่าการอนุมัติ", + "deuro_savings_subtitle": "รับดอกเบี้ยมากถึง 10% สำหรับ Deuro Stablecoin Holdings ของคุณ", + "deuro_tx_commited_content": "อาจใช้เวลาสองสามวินาทีในการทำธุรกรรมเพื่อยืนยันและสะท้อนบนหน้าจอ", "device_is_signing": "อุปกรณ์กำลังลงนาม", "dfx_option_description": "ซื้อ crypto ด้วย Eur & CHF สำหรับลูกค้ารายย่อยและลูกค้าในยุโรป", "didnt_get_code": "ไม่ได้รับรหัส?", diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb index 9ed4e13a8..8e571c3cb 100644 --- a/res/values/strings_tl.arb +++ b/res/values/strings_tl.arb @@ -56,6 +56,7 @@ "apk_update": "APK update", "approve": "Aprubahan", "approve_request": "Aprubahan ang kahilingan", + "approve_tokens": "Aprubahan ang mga token", "arrive_in_this_address": "Ang ${currency} ${tag} ay darating sa address na ito", "ascending": "Umakyat", "ask_each_time": "Magtanong sa tuwing", @@ -244,6 +245,15 @@ "descending": "Pababang", "description": "Paglalarawan", "destination_tag": "Tag ng patutunguhan:", + "deuro_collect_interest": "Mangolekta", + "deuro_savings": "Pagtipid ni dEuro", + "deuro_savings_add": "Deposito", + "deuro_savings_balance": "Balanse sa pagtitipid", + "deuro_savings_collect_interest": "Mangolekta ng interes", + "deuro_savings_remove": "Umatras", + "deuro_savings_set_approval": "Itakda ang pag -apruba", + "deuro_savings_subtitle": "Kumita ng hanggang sa 10% na interes sa iyong mga hawak na Deuro StableCoin", + "deuro_tx_commited_content": "Maaaring tumagal ng ilang segundo para sa transaksyon upang kumpirmahin at maipakita sa screen", "device_is_signing": "Nag -sign ang aparato", "dfx_option_description": "Bumili ng crypto kasama ang EUR & CHF. Para sa mga retail customer at corporate customer sa Europe", "didnt_get_code": "Hindi nakuha ang code?", diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index 4d790d1c6..9a9690142 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -56,6 +56,7 @@ "apk_update": "APK güncellemesi", "approve": "Onaylamak", "approve_request": "Talebi Onaylama", + "approve_tokens": "Jetonları onaylayın", "arrive_in_this_address": "${currency} ${tag}bu adrese ulaşacak", "ascending": "Yükselen", "ask_each_time": "Her seferinde sor", @@ -244,6 +245,15 @@ "descending": "Azalan", "description": "Tanım", "destination_tag": "Hedef Etiketi:", + "deuro_collect_interest": "TOPLAMAK", + "deuro_savings": "dEuro Tasarruf", + "deuro_savings_add": "Yatırmak", + "deuro_savings_balance": "Tasarruf Bakiyesi", + "deuro_savings_collect_interest": "İlgi toplamak", + "deuro_savings_remove": "Geri çekilmek", + "deuro_savings_set_approval": "Onay ayarlamak", + "deuro_savings_subtitle": "Deuro StableCoin Holdings'e% 10'a kadar faiz kazanın", + "deuro_tx_commited_content": "İşlemin onaylaması ve ekrana yansıtılması birkaç saniye sürebilir", "device_is_signing": "Cihaz imzalıyor", "dfx_option_description": "Eur & chf ile kripto satın alın. Avrupa'daki perakende ve kurumsal müşteriler için", "didnt_get_code": "Kod gelmedi mi?", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 06b6d09e7..e36599a0c 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -56,6 +56,7 @@ "apk_update": "Оновлення APK", "approve": "Затвердити", "approve_request": "Запитайте запит", + "approve_tokens": "Затвердити токени", "arrive_in_this_address": "${currency} ${tag}надійде на цю адресу", "ascending": "Висхід", "ask_each_time": "Запитайте кожен раз", @@ -244,6 +245,15 @@ "descending": "Низхідний", "description": "опис", "destination_tag": "Тег призначення:", + "deuro_collect_interest": "Збирати", + "deuro_savings": "заощадження dEuro", + "deuro_savings_add": "Депозит", + "deuro_savings_balance": "Баланс заощаджень", + "deuro_savings_collect_interest": "Збирати інтерес", + "deuro_savings_remove": "Відступати", + "deuro_savings_set_approval": "Встановити схвалення", + "deuro_savings_subtitle": "Заробляйте до 10% відсотків на ваших Holdings Deuro StableCoin", + "deuro_tx_commited_content": "Це може знадобитися кілька секунд, щоб транзакція підтвердила та відображалася на екрані", "device_is_signing": "Пристрій підписується", "dfx_option_description": "Купуйте криптовалюту з EUR & CHF. Для роздрібних та корпоративних клієнтів у Європі", "didnt_get_code": "Не отримали код?", diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index c83de672b..0ce1b4758 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -56,6 +56,7 @@ "apk_update": "APK اپ ڈیٹ", "approve": "ﻭﺮﮐ ﺭﻮﻈﻨﻣ", "approve_request": "درخواست کو منظور کریں", + "approve_tokens": "ٹوکن کو منظور کریں", "arrive_in_this_address": "${currency} ${tag}اس پتے پر پہنچے گا۔", "ascending": "چڑھنے", "ask_each_time": "ہر بار پوچھیں", @@ -244,6 +245,15 @@ "descending": "اترتے ہوئے", "description": "ﻞﯿﺼﻔﺗ", "destination_tag": "منزل کا ٹیگ:", + "deuro_collect_interest": "جمع کریں", + "deuro_savings": "ڈیورو کی بچت", + "deuro_savings_add": "جمع کروائیں", + "deuro_savings_balance": "بچت کا توازن", + "deuro_savings_collect_interest": "دلچسپی جمع کریں", + "deuro_savings_remove": "واپس لے لو", + "deuro_savings_set_approval": "منظوری طے کریں", + "deuro_savings_subtitle": "اپنے ڈیورو اسٹبل کوئن ہولڈنگز پر 10 ٪ سود حاصل کریں", + "deuro_tx_commited_content": "لین دین کی تصدیق اور اسکرین پر عکاسی کرنے میں اس میں کچھ سیکنڈ لگ سکتے ہیں", "device_is_signing": "ڈیوائس پر دستخط کر رہے ہیں", "dfx_option_description": "یورو اور سی ایچ ایف کے ساتھ کرپٹو خریدیں۔ یورپ میں خوردہ اور کارپوریٹ صارفین کے لئے", "didnt_get_code": "کوڈ نہیں ملتا؟", diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb index 14eeee189..61cadb10b 100644 --- a/res/values/strings_vi.arb +++ b/res/values/strings_vi.arb @@ -56,6 +56,7 @@ "apk_update": "Cập nhật APK", "approve": "Phê duyệt", "approve_request": "Phê duyệt yêu cầu", + "approve_tokens": "Phê duyệt mã thông báo", "arrive_in_this_address": "${currency} ${tag} sẽ đến địa chỉ này", "ascending": "Tăng dần", "ask_each_time": "Hỏi mỗi lần", @@ -243,6 +244,15 @@ "descending": "Giảm dần", "description": "Mô tả", "destination_tag": "Thẻ đích:", + "deuro_collect_interest": "Sưu tầm", + "deuro_savings": "Tiết kiệm dEuro", + "deuro_savings_add": "Tiền gửi", + "deuro_savings_balance": "Số dư tiết kiệm", + "deuro_savings_collect_interest": "Thu tiền lãi", + "deuro_savings_remove": "Rút", + "deuro_savings_set_approval": "Đặt phê duyệt", + "deuro_savings_subtitle": "Kiếm tới 10% tiền lãi cho Deuro Storcoin Holdings của bạn", + "deuro_tx_commited_content": "Có thể mất vài giây để giao dịch xác nhận và được phản ánh trên màn hình", "device_is_signing": "Thiết bị đang ký", "dfx_option_description": "Mua tiền điện tử bằng EUR & CHF. Dành cho khách hàng bán lẻ và doanh nghiệp tại Châu Âu", "didnt_get_code": "Không nhận được mã?", diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index fee486da4..761667b17 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -56,6 +56,7 @@ "apk_update": "Àtúnse áàpù títun wà", "approve": "Fi ọwọ si", "approve_request": "IKILỌ RẸ", + "approve_tokens": "Ṣe fọwọsi awọn àmi", "arrive_in_this_address": "${currency} ${tag} máa dé sí àdírẹ́sì yìí", "ascending": "Goke", "ask_each_time": "Beere lọwọ kọọkan", @@ -244,6 +245,15 @@ "descending": "Sọkalẹ", "description": "Apejuwe", "destination_tag": "Orúkọ tí ìbí tó a ránṣẹ́ sí:", + "deuro_collect_interest": "Kojọ", + "deuro_savings": "dEuro Awọn ifowopamọ", + "deuro_savings_add": "Owo ifipamọ", + "deuro_savings_balance": "Iwontunws.funfun ifowopamọ", + "deuro_savings_collect_interest": "Gba iwulo", + "deuro_savings_remove": "Yọkuro", + "deuro_savings_set_approval": "Ṣeto ifọwọsi", + "deuro_savings_subtitle": "Jo'gun to 10% iwulo lori awọn idaduro Duroblockoin rẹ", + "deuro_tx_commited_content": "O le gba tọkọtaya kan ti awọn aaya fun idunadura lati jẹrisi ati ṣe afihan loju iboju", "device_is_signing": "Ẹrọ n forukọsilẹ", "dfx_option_description": "Ra Crypto pẹlu EUR & CHF. Fun soobu ati awọn alabara ile-iṣẹ ni Yuroopu", "didnt_get_code": "Ko gba koodu?", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index ffa8509c4..5831a51c0 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -56,6 +56,7 @@ "apk_update": "APK更新", "approve": "批准", "approve_request": "批准请求", + "approve_tokens": "批准令牌", "arrive_in_this_address": "${currency} ${tag}将到达此地址", "ascending": "上升", "ask_each_time": "每次问", @@ -244,6 +245,15 @@ "descending": "下降", "description": "描述", "destination_tag": "目标Tag:", + "deuro_collect_interest": "收集", + "deuro_savings": "dEuro储蓄", + "deuro_savings_add": "订金", + "deuro_savings_balance": "储蓄平衡", + "deuro_savings_collect_interest": "收集兴趣", + "deuro_savings_remove": "提取", + "deuro_savings_set_approval": "设定批准", + "deuro_savings_subtitle": "您的Deuro Stablecoin Holdings最多可赚取10％的利息", + "deuro_tx_commited_content": "交易可能需要几秒钟才能确认并在屏幕上反射", "device_is_signing": "设备正在签名", "dfx_option_description": "用Eur＆Chf购买加密货币。对于欧洲的零售和企业客户", "didnt_get_code": "没有获取代码？", diff --git a/tool/configure.dart b/tool/configure.dart index 612958f4a..95c8a4d5a 100644 --- a/tool/configure.dart +++ b/tool/configure.dart @@ -670,6 +670,7 @@ import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/erc20_token.dart'; import 'package:cw_core/hardware/hardware_account_data.dart'; import 'package:cw_core/output_info.dart'; +import 'package:cw_core/pending_transaction.dart'; import 'package:cw_core/transaction_info.dart'; import 'package:cw_core/transaction_priority.dart'; import 'package:cw_core/wallet_base.dart'; @@ -697,6 +698,7 @@ import 'package:cw_ethereum/ethereum_client.dart'; import 'package:cw_ethereum/ethereum_wallet.dart'; import 'package:cw_ethereum/ethereum_wallet_service.dart'; import 'package:cw_ethereum/default_ethereum_erc20_tokens.dart'; +import 'package:cw_ethereum/deuro/deuro_savings.dart'; import 'package:eth_sig_util/util/utils.dart'; @@ -744,6 +746,16 @@ abstract class Ethereum { void updateEtherscanUsageState(WalletBase wallet, bool isEnabled); Web3Client? getWeb3Client(WalletBase wallet); String getTokenAddress(CryptoCurrency asset); + + Future createTokenApproval(WalletBase wallet, BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority); + + Future getDEuroSavingsBalance(WalletBase wallet); + Future getDEuroAccruedInterest(WalletBase wallet); + Future getDEuroInterestRate(WalletBase wallet); + Future getDEuroSavingsApproved(WalletBase wallet); + Future addDEuroSaving(WalletBase wallet, BigInt amount, TransactionPriority priority); + Future removeDEuroSaving(WalletBase wallet, BigInt amount, TransactionPriority priority); + Future enableDEuroSaving(WalletBase wallet, TransactionPriority priority); void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection); Future> getHardwareWalletAccounts(LedgerViewModel ledgerVM, {int index = 0, int limit = 5}); @@ -777,6 +789,7 @@ import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/erc20_token.dart'; import 'package:cw_core/hardware/hardware_account_data.dart'; import 'package:cw_core/output_info.dart'; +import 'package:cw_core/pending_transaction.dart'; import 'package:cw_core/transaction_info.dart'; import 'package:cw_core/transaction_priority.dart'; import 'package:cw_core/wallet_base.dart'; @@ -846,6 +859,8 @@ abstract class Polygon { Future deleteErc20Token(WalletBase wallet, CryptoCurrency token); Future removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token); Future getErc20Token(WalletBase wallet, String contractAddress); + + Future createTokenApproval(WalletBase wallet, BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority); CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction); void updatePolygonScanUsageState(WalletBase wallet, bool isEnabled); From 21d5c51cc965e071094de370620e4eb37605ec1d Mon Sep 17 00:00:00 2001 From: OmarHatem Date: Thu, 19 Jun 2025 05:38:58 +0300 Subject: [PATCH 2/7] remove unused file [skip ci] --- .../widgets/edit_savings_bottom_sheet.dart | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart diff --git a/lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart b/lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart deleted file mode 100644 index f76b13e7e..000000000 --- a/lib/src/screens/integrations/deuro/widgets/edit_savings_bottom_sheet.dart +++ /dev/null @@ -1,45 +0,0 @@ -import 'package:cake_wallet/generated/i18n.dart'; -import 'package:cake_wallet/src/screens/receive/widgets/currency_input_field.dart'; -import 'package:cake_wallet/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart'; -import 'package:cake_wallet/src/widgets/primary_button.dart'; -import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart'; -import 'package:cw_core/crypto_currency.dart'; -import 'package:flutter/material.dart'; - -class EditSavingsBottomSheet extends BaseBottomSheet { - EditSavingsBottomSheet(this.dEuroViewModel, {required super.titleText}); - - final _amountController = TextEditingController(); - final DEuroViewModel dEuroViewModel; - - @override - Widget contentWidget(BuildContext context) => Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(horizontal: 10), - child: CurrencyAmountTextField( - hasUnderlineBorder: true, - borderWidth: 1.0, - selectedCurrency: CryptoCurrency.deuro.name.toUpperCase(), - amountFocusNode: null, - amountController: _amountController, - tag: CryptoCurrency.deuro.tag, - isAmountEditable: true, - ), - ), - ], - ); - - @override - Widget footerWidget(BuildContext context) => Padding( - padding: const EdgeInsets.fromLTRB(16, 12, 16, 34), - child: LoadingPrimaryButton( - onPressed: () => dEuroViewModel.prepareSavingsEdit(_amountController.text, true), - text: S.of(context).confirm, - color: Theme.of(context).colorScheme.primary, - textColor: Theme.of(context).colorScheme.onPrimary, - isLoading: false, - isDisabled: false, - ), - ); -} From 4b137bc96856e618ba151f62f84c5ac1ea76e3ac Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Thu, 19 Jun 2025 18:55:41 +0200 Subject: [PATCH 3/7] CW-1091-payjoin-error-handeling (#2317) * feat: stop polling payjoin on switch wallet * refactor: improve Payjoin session handling and cleanup unused methods - Replaced `initReceiver` with `getUnusedReceiver` to reuse existing Payjoin sessions. - Streamlined session initialization by removing `spawnNewReceiver`. - Adjusted wallet sync reactions to resume Payjoin sessions when necessary. * fix: Receiver.fromJson correctly handle parameter format in Payjoin manager * fix: try reloading unspents if unspents are empty; No Unpsents available are now recoverable errors * fix: ensure transaction details display only if transactionInfo is available and adjust payjoin success status handling * fix: adjust payjoin success status handling for pending transactions * fix: add error handling for Payjoin initialization and receiver creation [skip-ci] * fix: add unrecoverable error handling for Payjoin sender sessions --- cw_bitcoin/lib/bitcoin_wallet.dart | 6 ++ cw_bitcoin/lib/bitcoin_wallet_addresses.dart | 23 ++++--- cw_bitcoin/lib/payjoin/manager.dart | 67 ++++++++++--------- .../lib/payjoin/payjoin_receive_worker.dart | 2 +- cw_bitcoin/lib/payjoin/storage.dart | 11 ++- lib/reactions/on_current_wallet_change.dart | 2 +- .../on_wallet_sync_status_change.dart | 12 +++- .../payjoin_transaction_list_item.dart | 5 +- .../payjoin_details_view_model.dart | 7 +- 9 files changed, 82 insertions(+), 53 deletions(-) diff --git a/cw_bitcoin/lib/bitcoin_wallet.dart b/cw_bitcoin/lib/bitcoin_wallet.dart index a23b72660..9231022f6 100644 --- a/cw_bitcoin/lib/bitcoin_wallet.dart +++ b/cw_bitcoin/lib/bitcoin_wallet.dart @@ -266,6 +266,12 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store { derivationPath: walletInfo.derivationInfo!.derivationPath!); } + @override + Future close({bool shouldCleanup = false}) async { + payjoinManager.cleanupSessions(); + super.close(shouldCleanup: shouldCleanup); + } + late final PayjoinManager payjoinManager; bool get isPayjoinAvailable => unspentCoinsInfo.values diff --git a/cw_bitcoin/lib/bitcoin_wallet_addresses.dart b/cw_bitcoin/lib/bitcoin_wallet_addresses.dart index a92c4770f..b33d722ab 100644 --- a/cw_bitcoin/lib/bitcoin_wallet_addresses.dart +++ b/cw_bitcoin/lib/bitcoin_wallet_addresses.dart @@ -59,19 +59,26 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S @action Future initPayjoin() async { - await payjoinManager.initPayjoin(); - currentPayjoinReceiver = await payjoinManager.initReceiver(primaryAddress); - payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint(); + try { + await payjoinManager.initPayjoin(); + currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(primaryAddress); + payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint(); - payjoinManager.resumeSessions(); + payjoinManager.resumeSessions(); + } catch (e) { + printV(e); + } } @action Future newPayjoinReceiver() async { - currentPayjoinReceiver = await payjoinManager.initReceiver(primaryAddress); - payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint(); + try { + currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(primaryAddress); + payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint(); - printV("Initializing new Payjoin Receiver"); - payjoinManager.spawnNewReceiver(receiver: currentPayjoinReceiver!); + payjoinManager.spawnReceiver(receiver: currentPayjoinReceiver!); + } catch (e) { + printV(e); + } } } diff --git a/cw_bitcoin/lib/payjoin/manager.dart b/cw_bitcoin/lib/payjoin/manager.dart index ad6fef0d8..95a523d89 100644 --- a/cw_bitcoin/lib/payjoin/manager.dart +++ b/cw_bitcoin/lib/payjoin/manager.dart @@ -53,7 +53,7 @@ class PayjoinManager { } final receiver = Receiver.fromJson(json: session.receiver!); printV("Resuming Payjoin Receiver Session ${receiver.id()}"); - return _spawnReceiver(receiver: receiver); + return spawnReceiver(receiver: receiver); }); printV("Resumed ${spawnedSessions.length} Payjoin Sessions"); @@ -121,15 +121,13 @@ class PayjoinManager { } } catch (e) { _cleanupSession(pjUri); - printV(e); - await _payjoinStorage.markSenderSessionUnrecoverable(pjUri); - completer.completeError(e); + await _payjoinStorage.markSenderSessionUnrecoverable(pjUri, e.toString()); + completer.complete(); } } else if (message is PayjoinSessionError) { _cleanupSession(pjUri); if (message is UnrecoverableError) { - printV(message.message); - await _payjoinStorage.markSenderSessionUnrecoverable(pjUri); + await _payjoinStorage.markSenderSessionUnrecoverable(pjUri, message.message); completer.complete(); } else if (message is RecoverableError) { completer.complete(); @@ -149,42 +147,41 @@ class PayjoinManager { return completer.future; } - Future initReceiver(String address, + Future getUnusedReceiver(String address, [bool isTestnet = false]) async { - try { - final ohttpKeys = await PayjoinUri.fetchOhttpKeys( - ohttpRelay: await randomOhttpRelayUrl(), - payjoinDirectory: payjoinDirectoryUrl, - ); + final session = _payjoinStorage.getUnusedActiveReceiverSession(_wallet.id); - final newReceiver = await NewReceiver.create( - address: address, - network: isTestnet ? Network.testnet : Network.bitcoin, - directory: payjoinDirectoryUrl, - ohttpKeys: ohttpKeys, - ); - final persister = PayjoinReceiverPersister.impl(); - final receiverToken = await newReceiver.persist(persister: persister); - final receiver = - await Receiver.load(persister: persister, token: receiverToken); + if (session != null) { + await PayjoinUri.Url.fromStr(payjoinDirectoryUrl); - await _payjoinStorage.insertReceiverSession(receiver, _wallet.id); - - return receiver; - } catch (e) { - throw Exception('Error initializing Payjoin Receiver: $e'); + return Receiver.fromJson(json: session.receiver!); } + + return initReceiver(address); } - Future spawnNewReceiver({ - required Receiver receiver, - bool isTestnet = false, - }) async { + Future initReceiver(String address, [bool isTestnet = false]) async { + final ohttpKeys = await PayjoinUri.fetchOhttpKeys( + ohttpRelay: await randomOhttpRelayUrl(), + payjoinDirectory: payjoinDirectoryUrl, + ); + + final newReceiver = await NewReceiver.create( + address: address, + network: isTestnet ? Network.testnet : Network.bitcoin, + directory: payjoinDirectoryUrl, + ohttpKeys: ohttpKeys, + ); + final persister = PayjoinReceiverPersister.impl(); + final receiverToken = await newReceiver.persist(persister: persister); + final receiver = await Receiver.load(persister: persister, token: receiverToken); + await _payjoinStorage.insertReceiverSession(receiver, _wallet.id); - return _spawnReceiver(isTestnet: isTestnet, receiver: receiver); + + return receiver; } - Future _spawnReceiver({ + Future spawnReceiver({ required Receiver receiver, bool isTestnet = false, }) async { @@ -229,6 +226,10 @@ class PayjoinManager { case PayjoinReceiverRequestTypes.getCandidateInputs: utxos = _wallet.getUtxoWithPrivateKeys(); + if (utxos.isEmpty) { + await _wallet.updateAllUnspents(); + utxos = _wallet.getUtxoWithPrivateKeys(); + } mainToIsolateSendPort?.send({ 'requestId': message['requestId'], 'result': utxos, diff --git a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart index e86624291..e4cd8a101 100644 --- a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart +++ b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart @@ -174,7 +174,7 @@ class PayjoinReceiverWorker { final listUnspent = await _sendRequest(PayjoinReceiverRequestTypes.getCandidateInputs); final unspent = listUnspent as List; - if (unspent.isEmpty) throw Exception('No unspent outputs available'); + if (unspent.isEmpty) throw RecoverableError('No unspent outputs available'); final selectedUtxo = await _inputPairFromUtxo(unspent[0]); final pj6 = await pj5.contributeInputs(replacementInputs: [selectedUtxo]); diff --git a/cw_bitcoin/lib/payjoin/storage.dart b/cw_bitcoin/lib/payjoin/storage.dart index 9c1c83253..5fb9d5716 100644 --- a/cw_bitcoin/lib/payjoin/storage.dart +++ b/cw_bitcoin/lib/payjoin/storage.dart @@ -23,6 +23,14 @@ class PayjoinStorage { ), ); + PayjoinSession? getUnusedActiveReceiverSession(String walletId) => + _payjoinSessionSources.values + .where((session) => + session.walletId == walletId && + session.status == PayjoinSessionStatus.created.name && + !session.isSenderSession) + .firstOrNull; + Future markReceiverSessionComplete( String sessionId, String txId, String amount) async { final session = _payjoinSessionSources.get("$_receiverPrefix${sessionId}")!; @@ -76,10 +84,11 @@ class PayjoinStorage { await session.save(); } - Future markSenderSessionUnrecoverable(String pjUrl) async { + Future markSenderSessionUnrecoverable(String pjUrl, String reason) async { final session = _payjoinSessionSources.get("$_senderPrefix$pjUrl")!; session.status = PayjoinSessionStatus.unrecoverable.name; + session.error = reason; await session.save(); } diff --git a/lib/reactions/on_current_wallet_change.dart b/lib/reactions/on_current_wallet_change.dart index 6a0be67e9..08f1a25ee 100644 --- a/lib/reactions/on_current_wallet_change.dart +++ b/lib/reactions/on_current_wallet_change.dart @@ -65,7 +65,7 @@ void startCurrentWalletChangeReaction( final node = settingsStore.getCurrentNode(wallet.type); - startWalletSyncStatusChangeReaction(wallet, fiatConversionStore); + startWalletSyncStatusChangeReaction(wallet, settingsStore); startCheckConnectionReaction(wallet, settingsStore); await Future.delayed(Duration.zero); diff --git a/lib/reactions/on_wallet_sync_status_change.dart b/lib/reactions/on_wallet_sync_status_change.dart index bf2e8ed0d..bbf4f44fe 100644 --- a/lib/reactions/on_wallet_sync_status_change.dart +++ b/lib/reactions/on_wallet_sync_status_change.dart @@ -1,5 +1,7 @@ -import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart'; +import 'package:cake_wallet/bitcoin/bitcoin.dart'; +import 'package:cake_wallet/store/settings_store.dart'; import 'package:cw_core/utils/print_verbose.dart'; +import 'package:cw_core/wallet_type.dart'; import 'package:mobx/mobx.dart'; import 'package:cw_core/transaction_history.dart'; import 'package:cw_core/wallet_base.dart'; @@ -12,7 +14,7 @@ ReactionDisposer? _onWalletSyncStatusChangeReaction; void startWalletSyncStatusChangeReaction( WalletBase, TransactionInfo> wallet, - FiatConversionStore fiatConversionStore) { + SettingsStore settingsStore) { _onWalletSyncStatusChangeReaction?.reaction.dispose(); _onWalletSyncStatusChangeReaction = reaction((_) => wallet.syncStatus, (SyncStatus status) async { try { @@ -25,6 +27,12 @@ void startWalletSyncStatusChangeReaction( if (status is SyncedSyncStatus || status is FailedSyncStatus) { await WakelockPlus.disable(); } + + if (status is SyncedSyncStatus && + wallet.type == WalletType.bitcoin && + settingsStore.usePayjoin) { + bitcoin!.resumePayjoinSessions(wallet); + } } catch (e) { printV(e.toString()); } diff --git a/lib/view_model/dashboard/payjoin_transaction_list_item.dart b/lib/view_model/dashboard/payjoin_transaction_list_item.dart index 93ed094a9..9605ab8fa 100644 --- a/lib/view_model/dashboard/payjoin_transaction_list_item.dart +++ b/lib/view_model/dashboard/payjoin_transaction_list_item.dart @@ -20,9 +20,8 @@ class PayjoinTransactionListItem extends ActionListItem { String get status { switch (session.status) { case 'success': - if (transaction?.isPending == true) - return S.current.payjoin_request_awaiting_tx; - return S.current.successful; + if (transaction?.isPending == false) return S.current.successful; + return S.current.payjoin_request_awaiting_tx; case 'inProgress': return S.current.payjoin_request_in_progress; case 'unrecoverable': diff --git a/lib/view_model/payjoin_details_view_model.dart b/lib/view_model/payjoin_details_view_model.dart index 47e6d2c5d..b19207373 100644 --- a/lib/view_model/payjoin_details_view_model.dart +++ b/lib/view_model/payjoin_details_view_model.dart @@ -69,7 +69,7 @@ abstract class PayjoinDetailsViewModelBase with Store { title: S.current.error, value: payjoinSession.error!, ), - if (payjoinSession.txId?.isNotEmpty == true) + if (payjoinSession.txId?.isNotEmpty == true && transactionInfo != null) StandartListItem( title: S.current.transaction_details_transaction_id, value: payjoinSession.txId!, @@ -107,9 +107,8 @@ abstract class PayjoinDetailsViewModelBase with Store { String _getStatusString() { switch (payjoinSession.status) { case 'success': - if (transactionInfo?.isPending == true) - return S.current.payjoin_request_awaiting_tx; - return S.current.successful; + if (transactionInfo?.isPending == false) return S.current.successful; + return S.current.payjoin_request_awaiting_tx; case 'inProgress': return S.current.payjoin_request_in_progress; case 'unrecoverable': From 18c2ba93668dce0239859809a141493f89006906 Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Thu, 19 Jun 2025 19:00:16 +0200 Subject: [PATCH 4/7] CW-1090-ledger-issues (#2314) * build: bump ledger_flutter_plus dependencies * fix: handle connection errors occurring during connecting to a ledger device * fix: enhance ledger error handling and improve wallet connection reliability * fix: enhance ledger error handling and improve wallet connection reliability * feat: add localized strings for "Try again" and update Ledger error handling on auth * fix: handle rethrow behavior in onAuthenticationStateChange * fix: improve Ledger error handling and refine error code interpretation * fix: refine Ledger error code interpretation and enhance error handling [skip-ci] * add missing ledger error codes --------- Co-authored-by: Omar Hatem --- cw_evm/pubspec.yaml | 1 + lib/core/wallet_loading_service.dart | 3 + .../on_authentication_state_change.dart | 50 +++++++++++++--- .../connect_device/connect_device_page.dart | 5 +- lib/utils/exception_handler.dart | 57 ++++++++++++++++++- .../hardware_wallet/ledger_view_model.dart | 38 +++++++------ .../wallet_hardware_restore_view_model.dart | 4 +- pubspec_base.yaml | 4 +- res/values/strings_ar.arb | 1 + res/values/strings_bg.arb | 1 + res/values/strings_cs.arb | 1 + res/values/strings_de.arb | 1 + res/values/strings_en.arb | 1 + res/values/strings_es.arb | 1 + res/values/strings_fr.arb | 1 + res/values/strings_ha.arb | 1 + res/values/strings_hi.arb | 1 + res/values/strings_hr.arb | 1 + res/values/strings_hy.arb | 1 + res/values/strings_id.arb | 1 + res/values/strings_it.arb | 1 + res/values/strings_ja.arb | 1 + res/values/strings_ko.arb | 1 + res/values/strings_my.arb | 1 + res/values/strings_nl.arb | 1 + res/values/strings_pl.arb | 1 + res/values/strings_pt.arb | 1 + res/values/strings_ru.arb | 1 + res/values/strings_th.arb | 1 + res/values/strings_tl.arb | 1 + res/values/strings_tr.arb | 1 + res/values/strings_uk.arb | 1 + res/values/strings_ur.arb | 1 + res/values/strings_vi.arb | 1 + res/values/strings_yo.arb | 1 + res/values/strings_zh.arb | 1 + 36 files changed, 159 insertions(+), 31 deletions(-) diff --git a/cw_evm/pubspec.yaml b/cw_evm/pubspec.yaml index 2e37a3b6e..80788ca06 100644 --- a/cw_evm/pubspec.yaml +++ b/cw_evm/pubspec.yaml @@ -30,6 +30,7 @@ dependencies: git: url: https://github.com/cake-tech/ledger-flutter-plus-plugins path: packages/ledger-ethereum + ref: f4761cd5171d4c1e2e42fd3298261650539fb2db dependency_overrides: web3dart: diff --git a/lib/core/wallet_loading_service.dart b/lib/core/wallet_loading_service.dart index 382b1d6c2..f16bf7e14 100644 --- a/lib/core/wallet_loading_service.dart +++ b/lib/core/wallet_loading_service.dart @@ -73,8 +73,11 @@ class WalletLoadingService { return wallet; } catch (error, stack) { await ExceptionHandler.resetLastPopupDate(); + final isLedgerError = await ExceptionHandler.isLedgerError(error); + if (isLedgerError) rethrow; await ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stack)); + // try fetching the seeds of the corrupted wallet to show it to the user String corruptedWalletsSeeds = "Corrupted wallets seeds (if retrievable, empty otherwise):"; try { diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart index 46ac481bb..8cde67731 100644 --- a/lib/reactions/on_authentication_state_change.dart +++ b/lib/reactions/on_authentication_state_change.dart @@ -9,6 +9,7 @@ import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; +import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; import 'package:cake_wallet/store/authentication_store.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/utils/exception_handler.dart'; @@ -63,14 +64,49 @@ void startAuthenticationStateChange( monero!.setGlobalLedgerConnection(ledgerVM.connection); showPopUp( context: context, - builder: (BuildContext context) => AlertWithOneAction( - alertTitle: S.of(context).proceed_on_device, - alertContent: S.of(context).proceed_on_device_description, - buttonText: S.of(context).cancel, - alertBarrierDismissible: false, - buttonAction: () => Navigator.of(context).pop()), + builder: (context) => AlertWithOneAction( + alertTitle: S.of(context).proceed_on_device, + alertContent: S.of(context).proceed_on_device_description, + buttonText: S.of(context).cancel, + alertBarrierDismissible: false, + buttonAction: () => Navigator.of(context).pop(), + ), ); - await loadCurrentWallet(); + bool tryOpening = true; + while (tryOpening) { + try { + await loadCurrentWallet(); + tryOpening = false; + } on Exception catch (e) { + final errorCode = RegExp(r'0x\S*?(?= )').firstMatch( + e.toString()); + + final errorMessage = ledgerVM.interpretErrorCode( + errorCode?.group(0).toString().replaceAll("0x", "") ?? + ""); + if (errorMessage != null) { + await showPopUp( + context: context, + builder: (context) => AlertWithTwoActions( + alertTitle: "Ledger Error", + alertContent: errorMessage, + leftButtonText: S.of(context).try_again, + alertBarrierDismissible: false, + actionLeftButton: () => Navigator.of(context).pop(), + rightButtonText: S.of(context).cancel, + actionRightButton: () { + tryOpening = false; + Navigator.of(context).pop(); + }, + ), + ); + } else { + tryOpening = false; + rethrow; + } + } + } + getIt.get().showNext(); await navigatorKey.currentState! .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false); diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart index 87c8e29a9..9e332369e 100644 --- a/lib/src/screens/connect_device/connect_device_page.dart +++ b/lib/src/screens/connect_device/connect_device_page.dart @@ -165,8 +165,9 @@ class ConnectDevicePageBodyState extends State { } Future _connectToDevice(LedgerDevice device) async { - await widget.ledgerVM.connectLedger(device, widget.walletType); - widget.onConnectDevice(context, widget.ledgerVM); + final isConnected = + await widget.ledgerVM.connectLedger(device, widget.walletType); + if (isConnected) widget.onConnectDevice(context, widget.ledgerVM); } String _getDeviceTileLeading(LedgerDeviceType deviceInfo) { diff --git a/lib/utils/exception_handler.dart b/lib/utils/exception_handler.dart index 954d4f532..a6d3774ce 100644 --- a/lib/utils/exception_handler.dart +++ b/lib/utils/exception_handler.dart @@ -4,8 +4,10 @@ import 'package:cake_wallet/di.dart'; import 'package:cake_wallet/entities/preferences_key.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/main.dart'; +import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; import 'package:cake_wallet/store/app_store.dart'; +import 'package:cake_wallet/utils/package_info.dart'; import 'package:cake_wallet/utils/show_bar.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cw_core/root_dir.dart'; @@ -15,7 +17,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_mailer/flutter_mailer.dart'; -import 'package:cake_wallet/utils/package_info.dart'; import 'package:shared_preferences/shared_preferences.dart'; class ExceptionHandler { @@ -113,6 +114,8 @@ class ExceptionHandler { } static Future onError(FlutterErrorDetails errorDetails) async { + if (await onLedgerError(errorDetails)) return; + if (kDebugMode || kProfileMode) { FlutterError.presentError(errorDetails); printV(errorDetails.toString()); @@ -183,6 +186,57 @@ class ExceptionHandler { _hasError = false; } + static const List _ledgerErrors = [ + 'Wrong Device Status', + 'PlatformException(133, Failed to write: (Unknown Error: 133), null, null)', + 'PlatformException(IllegalArgument, Unknown deviceId:', + 'ServiceNotSupportedException(ConnectionType.ble, Required service not supported. Write characteristic: false, Notify characteristic: false)', + 'Exception: 6e01', // Wrong App + 'Exception: 6d02', + 'Exception: 6511', + 'Exception: 6e00', + 'Exception: 6985', + 'Exception: 5515', + ]; + + static bool isLedgerError(Object exception) => + _ledgerErrors.any((element) => exception.toString().contains(element)); + + static Future onLedgerError(FlutterErrorDetails errorDetails) async { + if (!isLedgerError(errorDetails.exception)) return false; + + String? interpretErrorCode(String errorCode) { + if (errorCode.contains("6985")) { + return S.current.ledger_error_tx_rejected_by_user; + } else if (errorCode.contains("5515")) { + return S.current.ledger_error_device_locked; + } else + if (["6e01", "6d02", "6511", "6e00"].any((e) => errorCode.contains(e))) { + return S.current.ledger_error_wrong_app; + } + return null; + } + + printV(errorDetails.exception); + + if (navigatorKey.currentContext != null) { + await showPopUp( + context: navigatorKey.currentContext!, + builder: (context) => AlertWithOneAction( + alertTitle: "Ledger Error", + alertContent: + interpretErrorCode(errorDetails.exception.toString()) ?? + S.of(context).ledger_connection_error, + buttonText: S.of(context).close, + buttonAction: () => Navigator.of(context).pop(), + ), + ); + } + + _hasError = false; + return true; + } + /// Ignore User related errors or system errors static bool _ignoreError(String error) => _ignoredErrors.any((element) => error.contains(element)); @@ -227,6 +281,7 @@ class ExceptionHandler { "core/auth_service.dart:64", "core/key_service.dart:14", "core/wallet_loading_service.dart:139", + "Wrong Device Status: 0x5515 (UNKNOWN)", ]; static Future _addDeviceInfo(File file) async { diff --git a/lib/view_model/hardware_wallet/ledger_view_model.dart b/lib/view_model/hardware_wallet/ledger_view_model.dart index f555da0cf..132a5deb9 100644 --- a/lib/view_model/hardware_wallet/ledger_view_model.dart +++ b/lib/view_model/hardware_wallet/ledger_view_model.dart @@ -96,7 +96,8 @@ abstract class LedgerViewModelBase with Store { if (!Platform.isIOS) await ledgerPlusUSB.stopScanning(); } - Future connectLedger(sdk.LedgerDevice device, WalletType type) async { + Future connectLedger(sdk.LedgerDevice device, WalletType type) async { + if (_isConnecting) return false; _isConnecting = true; _connectingWalletType = type; if (isConnected) { @@ -110,17 +111,25 @@ abstract class LedgerViewModelBase with Store { : ledgerPlusUSB; if (_connectionChangeSubscription == null) { - _connectionChangeSubscription = - ledger.deviceStateChanges.listen(_connectionChangeListener); + _connectionChangeSubscription = ledger + .deviceStateChanges(device.id) + .listen(_connectionChangeListener); } - _connection = await ledger.connect(device); + try { + _connection = await ledger.connect(device); + _isConnecting = false; + return true; + } catch (e) { + printV(e); + } _isConnecting = false; + return false; } StreamSubscription? _connectionChangeSubscription; sdk.LedgerConnection? _connection; - bool _isConnecting = true; + bool _isConnecting = false; WalletType? _connectingWalletType; void _connectionChangeListener(sdk.BleConnectionState event) { @@ -168,17 +177,14 @@ abstract class LedgerViewModelBase with Store { } String? interpretErrorCode(String errorCode) { - switch (errorCode) { - case "6985": - return S.current.ledger_error_tx_rejected_by_user; - case "5515": - return S.current.ledger_error_device_locked; - case "6d02": // UNKNOWN_APDU - case "6511": - case "6e00": - return S.current.ledger_error_wrong_app; - default: - return null; + if (errorCode.contains("6985")) { + return S.current.ledger_error_tx_rejected_by_user; + } else if (errorCode.contains("5515")) { + return S.current.ledger_error_device_locked; + } else + if (["6e01", "6a87", "6d02", "6511", "6e00"].any((e) => errorCode.contains(e))) { + return S.current.ledger_error_wrong_app; } + return null; } } diff --git a/lib/view_model/wallet_hardware_restore_view_model.dart b/lib/view_model/wallet_hardware_restore_view_model.dart index 541e169d0..0cfc18c16 100644 --- a/lib/view_model/wallet_hardware_restore_view_model.dart +++ b/lib/view_model/wallet_hardware_restore_view_model.dart @@ -80,11 +80,9 @@ abstract class WalletHardwareRestoreViewModelBase extends WalletCreationVM with availableAccounts.addAll(accounts); _nextIndex += limit; - // } on LedgerException catch (e) { - // error = ledgerViewModel.interpretErrorCode(e.errorCode.toRadixString(16)); } catch (e) { printV(e); - error = S.current.ledger_connection_error; + error = ledgerViewModel.interpretErrorCode(e.toString()) ?? S.current.ledger_connection_error; } isLoadingMoreAccounts = false; diff --git a/pubspec_base.yaml b/pubspec_base.yaml index 21166bd74..e11703607 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -110,7 +110,7 @@ dependencies: ledger_flutter_plus: git: url: https://github.com/vespr-wallet/ledger-flutter-plus - ref: c2e341d8038f1108690ad6f80f7b4b7156aacc76 + ref: 60817d4b20144f9da9029f5034790272795b9d38 hashlib: ^1.19.2 on_chain: git: @@ -165,7 +165,7 @@ dependency_overrides: ledger_flutter_plus: git: url: https://github.com/vespr-wallet/ledger-flutter-plus - ref: c2e341d8038f1108690ad6f80f7b4b7156aacc76 + ref: 60817d4b20144f9da9029f5034790272795b9d38 web_socket_channel: ^3.0.2 freezed_annotation: 2.4.4 diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index a30865b76..f12171f31 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -979,6 +979,7 @@ "transport_type": "نوع النقل", "trongrid_history": "تاريخ ترونغريد", "trusted": "موثوق به", + "try_again": "حاول ثانية", "tx_commit_exception_no_dust_on_change": "يتم رفض المعاملة مع هذا المبلغ. باستخدام هذه العملات المعدنية ، يمكنك إرسال ${min} دون تغيير أو ${max} الذي يعيد التغيير.", "tx_commit_failed": "فشل ارتكاب المعاملة. يرجى الاتصال بالدعم.", "tx_commit_failed_no_peers": "فشل المعاملة في البث ، يرجى المحاولة مرة أخرى في ثانية أو نحو ذلك", diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index f0b992160..e1d364b95 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -979,6 +979,7 @@ "transport_type": "Тип транспорт", "trongrid_history": "Trongrid History", "trusted": "Надежден", + "try_again": "Опитайте отново", "tx_commit_exception_no_dust_on_change": "Сделката се отхвърля с тази сума. С тези монети можете да изпратите ${min} без промяна или ${max}, която връща промяна.", "tx_commit_failed": "Компетацията на транзакцията не успя. Моля, свържете се с поддръжката.", "tx_commit_failed_no_peers": "Сделката не успя да излъчи, моля, опитайте отново след секунда или така", diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index e4b59562e..0a6693316 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -979,6 +979,7 @@ "transport_type": "Typ transportu", "trongrid_history": "Trongridní historie", "trusted": "Důvěřovat", + "try_again": "Zkuste to znovu", "tx_commit_exception_no_dust_on_change": "Transakce je zamítnuta s touto částkou. S těmito mincemi můžete odeslat ${min} bez změny nebo ${max}, které se vrátí změna.", "tx_commit_failed": "Transakce COMPORT selhala. Kontaktujte prosím podporu.", "tx_commit_failed_no_peers": "Transakce se nepodařilo vysílat, zkuste to prosím znovu za vteřinu", diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 7e3f72e2a..5e9c2209c 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -980,6 +980,7 @@ "transport_type": "Transporttyp", "trongrid_history": "Trongrid-Historie", "trusted": "Vertrauenswürdige", + "try_again": "Erneut versuchen", "tx_commit_exception_no_dust_on_change": "Die Transaktion wird diesen Betrag abgelehnt. Mit diesen Münzen können Sie ${min} ohne Veränderung oder ${max} senden, die Änderungen zurückgeben.", "tx_commit_failed": "Transaktionsausschüsse ist fehlgeschlagen. Bitte wenden Sie sich an Support.", "tx_commit_failed_no_peers": "Transaktion konnte nicht übertragen werden. Bitte versuchen Sie es in einer Sekunde oder so erneut", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index a841c3041..ad4894238 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -980,6 +980,7 @@ "transport_type": "Transport Type", "trongrid_history": "TronGrid history", "trusted": "Trusted", + "try_again": "Try again", "tx_commit_exception_no_dust_on_change": "The transaction is rejected with this amount. With these coins you can send ${min} without change or ${max} that returns change.", "tx_commit_failed": "Transaction commit failed. Please contact support.", "tx_commit_failed_no_peers": "Transaction failed to broadcast, please try again in a second or so", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 17687e7c0..3f8657ec4 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -980,6 +980,7 @@ "transport_type": "Tipo de transporte", "trongrid_history": "Historia trongrid", "trusted": "de confianza", + "try_again": "Intentar otra vez", "tx_commit_exception_no_dust_on_change": "La transacción se rechaza con esta cantidad. Con estas monedas puede enviar ${min} sin cambios o ${max} que devuelve el cambio.", "tx_commit_failed": "La confirmación de transacción falló. Ponte en contacto con el soporte.", "tx_commit_failed_no_peers": "La transacción no se transmitió, intenta nuevamente en un segundo más o menos", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index e6b942f5c..ba3ae4859 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -979,6 +979,7 @@ "transport_type": "Type de transport", "trongrid_history": "Histoire de la trongride", "trusted": "de confiance", + "try_again": "Essayer à nouveau", "tx_commit_exception_no_dust_on_change": "La transaction est rejetée avec ce montant. Avec ces pièces, vous pouvez envoyer ${min} sans changement ou ${max} qui renvoie le changement.", "tx_commit_failed": "La validation de la transaction a échoué. Veuillez contacter l'assistance.", "tx_commit_failed_no_peers": "La transaction n'a pas été diffusée, veuillez réessayer dans une seconde environ", diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index e38d03602..ebd236332 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -981,6 +981,7 @@ "transport_type": "Nau'in sufuri", "trongrid_history": "Tarihin Trongrid", "trusted": "Amintacce", + "try_again": "Gwada kuma", "tx_commit_exception_no_dust_on_change": "An ƙi ma'amala da wannan adadin. Tare da waɗannan tsabar kudi Zaka iya aika ${min}, ba tare da canji ba ko ${max} wanda ya dawo canzawa.", "tx_commit_failed": "Ma'amala ya kasa. Da fatan za a tuntuɓi goyan baya.", "tx_commit_failed_no_peers": "Kasuwanci ya kasa watsa, don Allah sake gwadawa a cikin na biyu ko", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index e9c3bca17..2e71b6685 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -981,6 +981,7 @@ "transport_type": "परिवहन प्रकार", "trongrid_history": "ट्रॉन्ग्रिड का इतिहास", "trusted": "भरोसा", + "try_again": "पुनः प्रयास करें", "tx_commit_exception_no_dust_on_change": "लेनदेन को इस राशि से खारिज कर दिया जाता है। इन सिक्कों के साथ आप चेंज या ${min} के बिना ${max} को भेज सकते हैं जो परिवर्तन लौटाता है।", "tx_commit_failed": "लेन -देन प्रतिबद्ध विफल। कृपया संपर्क समर्थन करें।", "tx_commit_failed_no_peers": "लेन -देन प्रसारित करने में विफल रहा, कृपया एक या दो सेकंड में पुनः प्रयास करें", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index 3f52f5b66..b0aa12937 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -979,6 +979,7 @@ "transport_type": "Transportni tip", "trongrid_history": "Povijest Trongrida", "trusted": "vjerovao", + "try_again": "Pokušajte ponovo", "tx_commit_exception_no_dust_on_change": "Transakcija se odbija s tim iznosom. Pomoću ovih kovanica možete poslati ${min} bez promjene ili ${max} koja vraća promjenu.", "tx_commit_failed": "Obveza transakcije nije uspjela. Molimo kontaktirajte podršku.", "tx_commit_failed_no_peers": "Transakcija nije uspjela emitirati, pokušajte ponovo u sekundi ili tako", diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb index d1d661e7c..cafabe5a6 100644 --- a/res/values/strings_hy.arb +++ b/res/values/strings_hy.arb @@ -977,6 +977,7 @@ "transport_type": "Տրանսպորտի տեսակը", "trongrid_history": "TronGrid պատմություն", "trusted": "Վստահելի", + "try_again": "Կրկին փորձեք", "tx_commit_exception_no_dust_on_change": "Փոխանցումը մերժվել է այս գումարով: Այս արժույթներով կարող եք ուղարկել ${min} առանց փոփոխության կամ ${max} որը վերադարձնում է փոփոխությունը", "tx_commit_failed": "Փոխանցումը ձախողվել է: Խնդրում ենք դիմել աջակցությանը", "tx_commit_failed_no_peers": "Գործարքը չի հաջողվել հեռարձակել, խնդրում ենք կրկին փորձել մեկ վայրկյանում", diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index eaccd3d99..e726ffb3c 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -982,6 +982,7 @@ "transport_type": "Jenis transportasi", "trongrid_history": "Sejarah Trongrid", "trusted": "Dipercayai", + "try_again": "Coba lagi", "tx_commit_exception_no_dust_on_change": "Transaksi ditolak dengan jumlah ini. Dengan koin ini Anda dapat mengirim ${min} tanpa perubahan atau ${max} yang mengembalikan perubahan.", "tx_commit_failed": "Transaksi Gagal. Silakan hubungi Dukungan.", "tx_commit_failed_no_peers": "Transaksi gagal untuk disiarkan, silakan coba lagi sebentar lagi", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index 65c4085d1..4e94c349f 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -980,6 +980,7 @@ "transport_type": "Tipo di trasporto", "trongrid_history": "Cronologia TronGrid", "trusted": "Fidato", + "try_again": "Riprova", "tx_commit_exception_no_dust_on_change": "La transazione viene respinta con questo importo. Con queste monete è possibile inviare ${min} senza modifiche o ${max} che restituisce il cambiamento.", "tx_commit_failed": "Commit di transazione non riuscita. Si prega di contattare il supporto.", "tx_commit_failed_no_peers": "Errore nella trasmissione della transazione, si prega di provare nuovamente", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index f638c1850..960634e27 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -980,6 +980,7 @@ "transport_type": "輸送タイプ", "trongrid_history": "トロンリッドの歴史", "trusted": "信頼できる", + "try_again": "もう一度やり直してください", "tx_commit_exception_no_dust_on_change": "この金額ではトランザクションは拒否されます。 これらのコインを使用すると、おつりなしの ${min} またはおつりを返す ${max} を送信できます。", "tx_commit_failed": "トランザクションコミットは失敗しました。サポートに連絡してください。", "tx_commit_failed_no_peers": "トランザクションはブロードキャストに失敗しました。一瞬かそこらで再試行してください", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 1c0a4cee7..e107e1a29 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -980,6 +980,7 @@ "transport_type": "전송 유형", "trongrid_history": "TronGrid 내역", "trusted": "신뢰됨", + "try_again": "다시 시도하십시오", "tx_commit_exception_no_dust_on_change": "이 금액으로는 트랜잭션이 거부됩니다. 이 코인으로는 잔돈 없이 ${min}을(를) 보내거나 잔돈이 반환되는 ${max}을(를) 보낼 수 있습니다.", "tx_commit_failed": "트랜잭션 커밋 실패. 지원팀에 문의하세요.", "tx_commit_failed_no_peers": "트랜잭션 전파 실패. 잠시 후 다시 시도하세요.", diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index 6727c7fcf..d9f3c46da 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -979,6 +979,7 @@ "transport_type": "သယ်ယူပို့ဆောင်ရေးအမျိုးအစား", "trongrid_history": "Trongrid သမိုင်း", "trusted": "ယုံတယ်။", + "try_again": "ထပ်ကြိုးစားပါ", "tx_commit_exception_no_dust_on_change": "အဆိုပါငွေပေးငွေယူကဒီပမာဏနှင့်အတူပယ်ချခံရသည်။ ဤဒင်္ဂါးပြားများနှင့်အတူပြောင်းလဲမှုကိုပြန်လည်ပြောင်းလဲခြင်းသို့မဟုတ် ${min} မပါဘဲ ${max} ပေးပို့နိုင်သည်။", "tx_commit_failed": "ငွေပေးငွေယူကျူးလွန်မှုပျက်ကွက်။ ကျေးဇူးပြုပြီးပံ့ပိုးမှုဆက်သွယ်ပါ။", "tx_commit_failed_no_peers": "ငွေပေးငွေယူထုတ်လွှင့်ရန်ပျက်ကွက်ပါက ကျေးဇူးပြု. ဒုတိယသို့မဟုတ်ထိုအတိုင်းထပ်မံကြိုးစားပါ", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 4f925bc74..756f0b311 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -979,6 +979,7 @@ "transport_type": "Transporttype", "trongrid_history": "Trongrid geschiedenis", "trusted": "vertrouwd", + "try_again": "Probeer het opnieuw", "tx_commit_exception_no_dust_on_change": "De transactie wordt afgewezen met dit bedrag. Met deze munten kunt u ${min} verzenden zonder verandering of ${max} die wijziging retourneert.", "tx_commit_failed": "Transactiebewissing is mislukt. Neem contact op met de ondersteuning.", "tx_commit_failed_no_peers": "De transactie is niet uitgezonden, probeer het opnieuw binnen een seconde of zo", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index baf0f2502..78a1af410 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -979,6 +979,7 @@ "transport_type": "Typ transportu", "trongrid_history": "Historia Trongrida", "trusted": "Zaufany", + "try_again": "Spróbuj ponownie", "tx_commit_exception_no_dust_on_change": "Transakcja została odrzucana z tą kwotą. Za pomocą tych monet możesz wysłać ${min} bez reszty lub ${max}, które zwrócą resztę.", "tx_commit_failed": "Zatwierdzenie transakcji nie powiodło się. Skontaktuj się z obsługą.", "tx_commit_failed_no_peers": "Transakcja nie była transmitowana, spróbuj ponownie za około sekundę", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 375996c99..64c54916a 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -981,6 +981,7 @@ "transport_type": "Tipo de transporte", "trongrid_history": "História de Trongrid", "trusted": "confiável", + "try_again": "Tente novamente", "tx_commit_exception_no_dust_on_change": "A transação é rejeitada com esse valor. Com essas moedas, você pode enviar ${min} sem alteração ou ${max} que retorna alterações.", "tx_commit_failed": "A confirmação da transação falhou. Entre em contato com o suporte.", "tx_commit_failed_no_peers": "A transação não foi transmitida, tente novamente em um segundo", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 800201b27..7f0ce362a 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -980,6 +980,7 @@ "transport_type": "Транспортный тип", "trongrid_history": "История Тронгрида", "trusted": "доверенный", + "try_again": "Попробуйте еще раз", "tx_commit_exception_no_dust_on_change": "Транзакция отклоняется с этой суммой. С этими монетами вы можете отправлять ${min} без изменения или ${max}, которые возвращают изменение.", "tx_commit_failed": "Комплект транзакции не удался. Пожалуйста, свяжитесь с поддержкой.", "tx_commit_failed_no_peers": "Транзакция не смогла передать, попробуйте еще раз через секунду или около того", diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index bfaa92b08..9908f93a0 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -979,6 +979,7 @@ "transport_type": "ประเภทการขนส่ง", "trongrid_history": "ประวัติศาสตร์ Trongrid", "trusted": "มั่นคง", + "try_again": "ลองอีกครั้ง", "tx_commit_exception_no_dust_on_change": "ธุรกรรมถูกปฏิเสธด้วยจำนวนเงินนี้ ด้วยเหรียญเหล่านี้คุณสามารถส่ง ${min} โดยไม่ต้องเปลี่ยนแปลงหรือ ${max} ที่ส่งคืนการเปลี่ยนแปลง", "tx_commit_failed": "การทำธุรกรรมล้มเหลว กรุณาติดต่อฝ่ายสนับสนุน", "tx_commit_failed_no_peers": "การทำธุรกรรมล้มเหลวในการออกอากาศโปรดลองอีกครั้งในวินาทีหรือมากกว่านั้น", diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb index 8e571c3cb..9ad025aa7 100644 --- a/res/values/strings_tl.arb +++ b/res/values/strings_tl.arb @@ -979,6 +979,7 @@ "transport_type": "Uri ng transportasyon", "trongrid_history": "Kasaysayan ng TronGrid", "trusted": "Pinagkakatiwalaan", + "try_again": "Subukang muli", "tx_commit_exception_no_dust_on_change": "Ang transaksyon ay tinanggihan sa halagang ito. Sa mga barya na ito maaari kang magpadala ng ${min} nang walang sukli o ${max} na nagbabalik ng sukli.", "tx_commit_failed": "Nabigo ang transaksyon. Mangyaring makipag-ugnay sa suporta.", "tx_commit_failed_no_peers": "Nabigo ang transaksyon na mag -broadcast, mangyaring subukang muli sa isang segundo o higit pa", diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index 9a9690142..add8ee22f 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -979,6 +979,7 @@ "transport_type": "Taşıma tipi", "trongrid_history": "Trongrid tarihi", "trusted": "Güvenilir", + "try_again": "Tekrar deneyin", "tx_commit_exception_no_dust_on_change": "İşlem bu miktarla reddedilir. Bu madeni paralarla değişiklik yapmadan ${min} veya değişikliği döndüren ${max} gönderebilirsiniz.", "tx_commit_failed": "İşlem taahhüdü başarısız oldu. Lütfen Destek ile iletişime geçin.", "tx_commit_failed_no_peers": "İşlem yayın yapamadı, lütfen bir saniye içinde tekrar deneyin", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index e36599a0c..07ed5d532 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -980,6 +980,7 @@ "transport_type": "Транспортний тип", "trongrid_history": "Тронгрідська історія", "trusted": "довіряють", + "try_again": "Спробуйте ще раз", "tx_commit_exception_no_dust_on_change": "Транзакція відхилена цією сумою. За допомогою цих монет ви можете надіслати ${min} без змін або ${max}, що повертає зміни.", "tx_commit_failed": "Транзакційна комісія не вдалося. Будь ласка, зв'яжіться з підтримкою.", "tx_commit_failed_no_peers": "Транзакція не вдалося транслювати, спробуйте ще раз за секунду або близько того", diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index 0ce1b4758..7240db6b0 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -981,6 +981,7 @@ "transport_type": "ٹرانسپورٹ کی قسم", "trongrid_history": "ٹرانگریڈ ہسٹری", "trusted": "قابل اعتماد", + "try_again": "دوبارہ کوشش کریں", "tx_commit_exception_no_dust_on_change": "اس رقم سے لین دین کو مسترد کردیا گیا ہے۔ ان سککوں کے ذریعہ آپ بغیر کسی تبدیلی کے ${min} یا ${max} بھیج سکتے ہیں جو لوٹتے ہیں۔", "tx_commit_failed": "ٹرانزیکشن کمٹ ناکام ہوگیا۔ براہ کرم سپورٹ سے رابطہ کریں۔", "tx_commit_failed_no_peers": "ٹرانزیکشن نشر کرنے میں ناکام ، براہ کرم ایک سیکنڈ یا اس میں دوبارہ کوشش کریں", diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb index 61cadb10b..3dd184ddd 100644 --- a/res/values/strings_vi.arb +++ b/res/values/strings_vi.arb @@ -976,6 +976,7 @@ "transport_type": "Loại vận chuyển", "trongrid_history": "Lịch sử TronGrid", "trusted": "Đã tin cậy", + "try_again": "Hãy thử lại", "tx_commit_exception_no_dust_on_change": "Giao dịch bị từ chối với số tiền này. Với số tiền này bạn có thể gửi ${min} mà không cần đổi tiền lẻ hoặc ${max} trả lại tiền lẻ.", "tx_commit_failed": "Giao dịch không thành công. Vui lòng liên hệ với hỗ trợ.", "tx_commit_failed_no_peers": "Giao dịch không phát sóng, vui lòng thử lại trong một giây hoặc lâu hơn", diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 761667b17..0a3e382e7 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -980,6 +980,7 @@ "transport_type": "Iru irinna", "trongrid_history": "Itan Trongrid", "trusted": "A ti fọkàn ẹ̀ tán", + "try_again": "Gbiyanju lẹẹkansi", "tx_commit_exception_no_dust_on_change": "Iṣowo naa ti kọ pẹlu iye yii. Pẹlu awọn owó wọnyi o le firanṣẹ ${min} laisi ayipada tabi ${max} ni iyipada iyipada.", "tx_commit_failed": "Idunadura iṣowo kuna. Jọwọ kan si atilẹyin.", "tx_commit_failed_no_peers": "Idunadura kuna lati wa igbohungbe, jọwọ gbiyanju lẹẹkansi ni iṣẹju keji tabi bẹẹ", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 5831a51c0..2f02673b7 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -979,6 +979,7 @@ "transport_type": "运输类型", "trongrid_history": "Trongrid历史", "trusted": "值得信赖", + "try_again": "再试一次", "tx_commit_exception_no_dust_on_change": "交易被此金额拒绝。使用这些硬币，您可以发送${min}无需更改或返回${max}的变化。", "tx_commit_failed": "交易承诺失败。请联系支持。", "tx_commit_failed_no_peers": "交易无法广播，请在一秒钟左右的时间内重试", From 5082dc20f33ef8472bea8c5d904d2eff14dc334b Mon Sep 17 00:00:00 2001 From: cyan Date: Fri, 20 Jun 2025 21:56:18 +0200 Subject: [PATCH 5/7] CW-519 Enable built-in Tor (#1950) * tor wip * Enable tor on iOS * Prevent app lag when node is exceptionally slow (usually over tor) * fix: logic in daemonBlockchainHeight refresh fix: storing tor state * Pin ledger_flutter_plus dependency to fix builds * bump arti version * wip * add single httpclient * route everything I was able to catch trough the built-in tor node * Enable proxy for http.Client [run tests] * add tor proxy support to cw_evm, cw_tron and cw_polygon [run tests] * remove log pollution, cleanup [skip slack] * fix tests not working in latest main [skip slack] [run tests] * remove cw_wownero import * fix build issues * migrate all remaining calls to use ProxyWrapper add a CI action to enforce using ProxyWrapper instead of http/http.dart to prevent leaks * fix tor background sync (will work on test builds after #2142 is merged and this PR is rebased on top) * wip [skip ci] * relicense to GPLv3 add socks5 license, build fixes * use ProxyWrapper instead of http in robinhood * Revert "relicense to GPLv3" * feat(cw_bitcoin): support socks proxy and CakeTor * fix(tor): migrate OCP and EVM over to ProxyWrapper() * chore: cleanup fix: show tor loading screen when app is starting * fix: tor switch properly dismisses fullscreen loading dialog fix: connectToNode after tor startup on app start * fix(tor): status check for xmr/wow/zano * fix(tor): onramper request fix * fix(api): ServicesResponse is now being cached and doesn't fetch data everytime DashboardViewModel is being rebuilt fix(tor): do not fallback to clearnet when tor failed. fix(tor): do not leak connections during app startup chore: refactor bootstrap() function to be separated into bootstrapOffline and bootstrapOnline fix(cw_bitcoin): migrate payjoin to use ProxyWrapper * [skip ci] remove print * address comments from review * fix: derusting tor implementation Instead of rust-based Arti I've moved back to the OG C++ tor implementation. This fixed all issues we had with Tor. - onion services now work - all requests are going through without random errors - we don't have to navigate a maze of multiple forks of multiple packages - fully working `torrc` config file (probably will be needed for Tari). - logging for Tor client - and so on. feat: network logging tab feat: use built-in proxy on Tails - this should resolve all issues for Tails users (needs testing though) * fix conflicts with main bump https to fix build issue relax store() call * fix(cw_wownero): tor connection fix(tor): connection issues * fix(cw_evm): add missing chainId fix(cw_core): solana rpc fix * feat: mark tor as experimental fix: drop anonpay onion authority fix: drop fiatapi onion authority fix: drop trocador onion authority fix: disable networkimage when tor is enabled fix: handle cakepay errors gracefully * fix re-formatting [skip ci] * changes from review * Delete android/.kotlin/sessions/kotlin-compiler-2468481326039681181.salive * fix missing imports * Update pubspec_base.yaml --------- Co-authored-by: OmarHatem --- .github/workflows/no_http_imports.yaml | 21 + .github/workflows/no_print_in_dart.yaml | 2 +- assets/images/tor_logo.svg | 76 +++ cw_bitcoin/lib/electrum.dart | 18 +- cw_bitcoin/lib/electrum_wallet.dart | 52 +- .../lib/payjoin/payjoin_receive_worker.dart | 28 +- .../lib/payjoin/payjoin_send_worker.dart | 20 +- cw_bitcoin/pubspec.lock | 33 +- cw_bitcoin/pubspec.yaml | 4 + cw_core/lib/get_height_by_date.dart | 22 +- cw_core/lib/node.dart | 71 ++- cw_core/lib/solana_rpc_http_service.dart | 15 +- cw_core/lib/utils/proxy_logger/abstract.dart | 29 ++ .../proxy_logger/memory_proxy_logger.dart | 63 +++ .../lib/utils/proxy_logger/silent_logger.dart | 17 + cw_core/lib/utils/proxy_socket/abstract.dart | 47 ++ cw_core/lib/utils/proxy_socket/insecure.dart | 34 ++ cw_core/lib/utils/proxy_socket/secure.dart | 34 ++ cw_core/lib/utils/proxy_socket/socks.dart | 36 ++ cw_core/lib/utils/proxy_wrapper.dart | 447 ++++++++++++++++++ cw_core/lib/utils/tor/abstract.dart | 38 ++ cw_core/lib/utils/tor/android.dart | 73 +++ cw_core/lib/utils/tor/disabled.dart | 21 + cw_core/lib/utils/tor/tails.dart | 21 + cw_core/pubspec.lock | 35 +- cw_core/pubspec.yaml | 17 +- cw_decred/pubspec.lock | 29 +- cw_ethereum/lib/ethereum_client.dart | 4 +- cw_evm/lib/evm_chain_client.dart | 8 +- cw_monero/lib/api/wallet.dart | 23 +- cw_monero/lib/monero_wallet.dart | 11 +- cw_monero/pubspec.lock | 43 +- cw_nano/lib/nano_client.dart | 99 ++-- cw_nano/pubspec.lock | 33 +- cw_polygon/lib/polygon_client.dart | 4 +- cw_solana/lib/solana_client.dart | 54 ++- cw_tron/lib/tron_client.dart | 9 +- cw_tron/lib/tron_http_provider.dart | 21 +- cw_wownero/lib/api/wallet.dart | 13 +- cw_wownero/lib/wownero_wallet.dart | 11 +- cw_wownero/pubspec.lock | 33 +- cw_zano/pubspec.lock | 29 +- .../robots/wallet_keys_robot.dart | 42 +- lib/anonpay/anonpay_api.dart | 47 +- lib/anypay/anypay_api.dart | 17 +- lib/buy/dfx/dfx_buy_provider.dart | 24 +- lib/buy/kryptonim/kryptonim.dart | 9 +- lib/buy/meld/meld_buy_provider.dart | 14 +- lib/buy/moonpay/moonpay_provider.dart | 24 +- lib/buy/onramper/onramper_buy_provider.dart | 20 +- lib/buy/robinhood/robinhood_buy_provider.dart | 18 +- lib/buy/wyre/wyre_buy_provider.dart | 42 +- lib/cake_pay/cake_pay_api.dart | 42 +- lib/core/background_sync.dart | 8 +- lib/core/fiat_conversion_service.dart | 34 +- .../open_cryptopay_service.dart | 18 +- lib/core/yat_service.dart | 7 +- lib/di.dart | 11 +- lib/entities/ens_record.dart | 8 +- lib/entities/fio_address_provider.dart | 18 +- lib/entities/preferences_key.dart | 1 + lib/entities/unstoppable_domain_address.dart | 7 +- lib/entities/wellknown_record.dart | 7 +- lib/entities/zano_alias.dart | 7 +- .../provider/chainflip_exchange_provider.dart | 8 +- .../provider/changenow_exchange_provider.dart | 20 +- .../provider/exolix_exchange_provider.dart | 21 +- .../letsexchange_exchange_provider.dart | 17 +- .../provider/sideshift_exchange_provider.dart | 31 +- .../simpleswap_exchange_provider.dart | 23 +- .../stealth_ex_exchange_provider.dart | 31 +- .../provider/swaptrade_exchange_provider.dart | 26 +- .../provider/thorchain_exchange.provider.dart | 13 +- .../provider/trocador_exchange_provider.dart | 27 +- .../provider/xoswap_exchange_provider.dart | 19 +- lib/main.dart | 43 +- lib/mastodon/mastodon_api.dart | 8 +- lib/reactions/bootstrap.dart | 15 +- lib/reactions/check_connection.dart | 8 + lib/reactions/on_current_wallet_change.dart | 5 + lib/router.dart | 18 +- lib/routes.dart | 4 +- lib/src/screens/dev/network_requests.dart | 155 ++++++ lib/src/screens/nodes/widgets/node_form.dart | 21 +- .../settings/connection_sync_page.dart | 27 +- .../screens/settings/other_settings_page.dart | 6 + lib/src/screens/settings/tor_page.dart | 269 ----------- lib/src/screens/start_tor/start_tor_page.dart | 96 ++++ .../chain_service/eth/evm_chain_service.dart | 9 +- .../wc_pairing_detail_page.dart | 6 +- .../screens/wallet_keys/wallet_keys_page.dart | 6 +- lib/src/widgets/provider_optoin_tile.dart | 7 +- lib/src/widgets/standard_checkbox.dart | 4 +- lib/store/settings_store.dart | 12 + lib/store/yat/yat_store.dart | 4 - lib/twitter/twitter_api.dart | 5 +- lib/utils/feature_flag.dart | 3 +- lib/utils/image_utill.dart | 8 +- lib/utils/tor.dart | 80 ++++ .../cake_pay_cards_list_view_model.dart | 31 +- .../dashboard/dashboard_view_model.dart | 54 ++- .../dashboard/home_settings_view_model.dart | 15 +- lib/view_model/dashboard/nft_view_model.dart | 22 +- .../dev/network_requests_view_model.dart | 16 + .../dev/send_network_requests_view_model.dart | 16 + .../exchange/exchange_view_model.dart | 9 +- .../node_create_or_edit_view_model.dart | 4 + .../node_list/node_list_view_model.dart | 3 +- .../node_list/pow_node_list_view_model.dart | 3 +- lib/view_model/start_tor_view_model.dart | 95 ++++ pubspec_base.yaml | 14 +- res/values/strings_ar.arb | 6 + res/values/strings_bg.arb | 6 + res/values/strings_cs.arb | 6 + res/values/strings_de.arb | 6 + res/values/strings_en.arb | 6 + res/values/strings_es.arb | 6 + res/values/strings_fr.arb | 6 + res/values/strings_ha.arb | 6 + res/values/strings_hi.arb | 6 + res/values/strings_hr.arb | 6 + res/values/strings_hy.arb | 6 + res/values/strings_id.arb | 6 + res/values/strings_it.arb | 6 + res/values/strings_ja.arb | 6 + res/values/strings_ko.arb | 8 +- res/values/strings_my.arb | 6 + res/values/strings_nl.arb | 6 + res/values/strings_pl.arb | 8 +- res/values/strings_pt.arb | 6 + res/values/strings_ru.arb | 6 + res/values/strings_th.arb | 6 + res/values/strings_tl.arb | 6 + res/values/strings_tr.arb | 6 + res/values/strings_uk.arb | 6 + res/values/strings_ur.arb | 6 + res/values/strings_vi.arb | 6 + res/values/strings_yo.arb | 6 + res/values/strings_zh.arb | 6 + 139 files changed, 2754 insertions(+), 878 deletions(-) create mode 100644 .github/workflows/no_http_imports.yaml create mode 100644 assets/images/tor_logo.svg create mode 100644 cw_core/lib/utils/proxy_logger/abstract.dart create mode 100644 cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart create mode 100644 cw_core/lib/utils/proxy_logger/silent_logger.dart create mode 100644 cw_core/lib/utils/proxy_socket/abstract.dart create mode 100644 cw_core/lib/utils/proxy_socket/insecure.dart create mode 100644 cw_core/lib/utils/proxy_socket/secure.dart create mode 100644 cw_core/lib/utils/proxy_socket/socks.dart create mode 100644 cw_core/lib/utils/proxy_wrapper.dart create mode 100644 cw_core/lib/utils/tor/abstract.dart create mode 100644 cw_core/lib/utils/tor/android.dart create mode 100644 cw_core/lib/utils/tor/disabled.dart create mode 100644 cw_core/lib/utils/tor/tails.dart create mode 100644 lib/src/screens/dev/network_requests.dart delete mode 100644 lib/src/screens/settings/tor_page.dart create mode 100644 lib/src/screens/start_tor/start_tor_page.dart create mode 100644 lib/utils/tor.dart create mode 100644 lib/view_model/dev/network_requests_view_model.dart create mode 100644 lib/view_model/dev/send_network_requests_view_model.dart create mode 100644 lib/view_model/start_tor_view_model.dart diff --git a/.github/workflows/no_http_imports.yaml b/.github/workflows/no_http_imports.yaml new file mode 100644 index 000000000..dad6821ac --- /dev/null +++ b/.github/workflows/no_http_imports.yaml @@ -0,0 +1,21 @@ +name: No http imports + +on: [pull_request] + +jobs: + PR_test_build: + runs-on: ubuntu-24.04 + + steps: + - uses: actions/checkout@v4 + - name: Check for http package usage + if: github.event_name == 'pull_request' + run: | + GIT_GREP_OUT="$(git grep package:http | (grep .dart: || test $? = 1) | (grep -v proxy_wrapper.dart || test $? = 1) | (grep -v very_insecure_http_do_not_use || test $? = 1) || true)" + [[ "x$GIT_GREP_OUT" == "x" ]] && exit 0 + echo "$GIT_GREP_OUT" + echo "There are .dart files which use http imports" + echo "Using http package breaks proxy integration" + echo "Please use ProxyWrapper.getHttpClient() from package:cw_core/utils/proxy_wrapper.dart" + exit 1 + \ No newline at end of file diff --git a/.github/workflows/no_print_in_dart.yaml b/.github/workflows/no_print_in_dart.yaml index 9c3d82bc2..507793bd8 100644 --- a/.github/workflows/no_print_in_dart.yaml +++ b/.github/workflows/no_print_in_dart.yaml @@ -15,5 +15,5 @@ jobs: [[ "x$GIT_GREP_OUT" == "x" ]] && exit 0 echo "$GIT_GREP_OUT" echo "There are .dart files which use print() statements" - echo "Please use printV from package: cw_core/utils/print_verbose.dart" + echo "Please use printV from package:cw_core/utils/print_verbose.dart" exit 1 diff --git a/assets/images/tor_logo.svg b/assets/images/tor_logo.svg new file mode 100644 index 000000000..ebd00324d --- /dev/null +++ b/assets/images/tor_logo.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cw_bitcoin/lib/electrum.dart b/cw_bitcoin/lib/electrum.dart index 1f5c369e3..2ddd30df6 100644 --- a/cw_bitcoin/lib/electrum.dart +++ b/cw_bitcoin/lib/electrum.dart @@ -5,6 +5,8 @@ import 'dart:typed_data'; import 'package:bitcoin_base/bitcoin_base.dart'; import 'package:cw_bitcoin/bitcoin_amount_format.dart'; import 'package:cw_core/utils/print_verbose.dart'; +import 'package:cw_core/utils/proxy_socket/abstract.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:flutter/foundation.dart'; import 'package:rxdart/rxdart.dart'; @@ -42,7 +44,7 @@ class ElectrumClient { static const aliveTimerDuration = Duration(seconds: 4); bool get isConnected => _isConnected; - Socket? socket; + ProxySocket? socket; void Function(ConnectionStatus)? onConnectionStatusChange; int _id; final Map _tasks; @@ -72,18 +74,11 @@ class ElectrumClient { } catch (_) {} socket = null; + final ssl = !(useSSL == false || (useSSL == null && uri.toString().contains("btc-electrum"))); try { - if (useSSL == false || (useSSL == null && uri.toString().contains("btc-electrum"))) { - socket = await Socket.connect(host, port, timeout: connectionTimeout); - } else { - socket = await SecureSocket.connect( - host, - port, - timeout: connectionTimeout, - onBadCertificate: (_) => true, - ); - } + socket = await ProxyWrapper().getSocksSocket(ssl, host, port, connectionTimeout: connectionTimeout); } catch (e) { + printV("connect: $e"); if (e is HandshakeException) { useSSL = !(useSSL ?? false); } @@ -105,7 +100,6 @@ class ElectrumClient { // use ping to determine actual connection status since we could've just not timed out yet: // _setConnectionStatus(ConnectionStatus.connected); - socket!.listen( (Uint8List event) { try { diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart index 35c15682c..bb9cea1bc 100644 --- a/cw_bitcoin/lib/electrum_wallet.dart +++ b/cw_bitcoin/lib/electrum_wallet.dart @@ -4,6 +4,7 @@ import 'dart:io'; import 'dart:isolate'; import 'package:bitcoin_base/bitcoin_base.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_bitcoin/bitcoin_amount_format.dart'; import 'package:cw_core/format_amount.dart'; import 'package:cw_core/utils/print_verbose.dart'; @@ -49,7 +50,6 @@ import 'package:mobx/mobx.dart'; import 'package:rxdart/subjects.dart'; import 'package:sp_scanner/sp_scanner.dart'; import 'package:hex/hex.dart'; -import 'package:http/http.dart' as http; part 'electrum_wallet.g.dart'; @@ -493,10 +493,9 @@ abstract class ElectrumWalletBase Future updateFeeRates() async { if (await checkIfMempoolAPIIsEnabled() && type == WalletType.bitcoin) { try { - final response = await http - .get(Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended")) - .timeout(Duration(seconds: 5)); - + final response = await ProxyWrapper() + .get(clearnetUri: Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended")) + .timeout(Duration(seconds: 15)); final result = json.decode(response.body) as Map; final slowFee = (result['economyFee'] as num?)?.toInt() ?? 0; int mediumFee = (result['hourFee'] as num?)?.toInt() ?? 0; @@ -1176,20 +1175,18 @@ abstract class ElectrumWalletBase } }); - return PendingBitcoinTransaction( - transaction, - type, - electrumClient: electrumClient, - amount: estimatedTx.amount, - fee: estimatedTx.fee, - feeRate: feeRateInt.toString(), - network: network, - hasChange: estimatedTx.hasChange, - isSendAll: estimatedTx.isSendAll, - hasTaprootInputs: hasTaprootInputs, - utxos: estimatedTx.utxos, - publicKeys: estimatedTx.publicKeys - )..addListener((transaction) async { + return PendingBitcoinTransaction(transaction, type, + electrumClient: electrumClient, + amount: estimatedTx.amount, + fee: estimatedTx.fee, + feeRate: feeRateInt.toString(), + network: network, + hasChange: estimatedTx.hasChange, + isSendAll: estimatedTx.isSendAll, + hasTaprootInputs: hasTaprootInputs, + utxos: estimatedTx.utxos, + publicKeys: estimatedTx.publicKeys) + ..addListener((transaction) async { transactionHistory.addOne(transaction); if (estimatedTx.spendsSilentPayment) { transactionHistory.transactions.values.forEach((tx) { @@ -1880,20 +1877,17 @@ abstract class ElectrumWalletBase if (height != null && height > 0 && await checkIfMempoolAPIIsEnabled()) { try { - final blockHash = await http.get( - Uri.parse( - "https://mempool.cakewallet.com/api/v1/block-height/$height", - ), - ); + final blockHash = await ProxyWrapper() + .get(clearnetUri: Uri.parse("https://mempool.cakewallet.com/api/v1/block-height/$height")) + .timeout(Duration(seconds: 15)); if (blockHash.statusCode == 200 && blockHash.body.isNotEmpty && jsonDecode(blockHash.body) != null) { - final blockResponse = await http.get( - Uri.parse( - "https://mempool.cakewallet.com/api/v1/block/${blockHash.body}", - ), - ); + final blockResponse = await ProxyWrapper() + .get(clearnetUri: Uri.parse("https://mempool.cakewallet.com/api/v1/block/${blockHash}")) + .timeout(Duration(seconds: 15)); + if (blockResponse.statusCode == 200 && blockResponse.body.isNotEmpty && jsonDecode(blockResponse.body)['timestamp'] != null) { diff --git a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart index e4cd8a101..c56148de2 100644 --- a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart +++ b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart @@ -8,11 +8,12 @@ import 'package:cw_bitcoin/payjoin/manager.dart'; import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart'; import 'package:cw_bitcoin/psbt/signer.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:payjoin_flutter/bitcoin_ffi.dart'; import 'package:payjoin_flutter/common.dart'; import 'package:payjoin_flutter/receive.dart'; import 'package:payjoin_flutter/src/generated/frb_generated.dart' as pj; +import 'package:http/http.dart' as very_insecure_http_do_not_use; // for errors enum PayjoinReceiverRequestTypes { processOriginalTx, @@ -28,7 +29,7 @@ class PayjoinReceiverWorker { final pendingRequests = >{}; PayjoinReceiverWorker._(this.sendPort); - + static final client = ProxyWrapper().getHttpIOClient(); static Future run(List args) async { await pj.core.init(); @@ -42,11 +43,10 @@ class PayjoinReceiverWorker { receivePort.listen(worker.handleMessage); try { - final httpClient = http.Client(); final receiver = Receiver.fromJson(json: receiverJson); final uncheckedProposal = - await worker.receiveUncheckedProposal(httpClient, receiver); + await worker.receiveUncheckedProposal(receiver); final originalTx = await uncheckedProposal.extractTxToScheduleBroadcast(); sendPort.send({ @@ -57,14 +57,14 @@ class PayjoinReceiverWorker { final payjoinProposal = await worker.processPayjoinProposal( uncheckedProposal, ); - final psbt = await worker.sendFinalProposal(httpClient, payjoinProposal); + final psbt = await worker.sendFinalProposal(payjoinProposal); sendPort.send({ 'type': PayjoinReceiverRequestTypes.proposalSent, 'psbt': psbt, }); } catch (e) { if (e is HttpException || - (e is http.ClientException && + (e is very_insecure_http_do_not_use.ClientException && e.message.contains("Software caused connection abort"))) { sendPort.send(PayjoinSessionError.recoverable(e.toString())); } else { @@ -98,16 +98,16 @@ class PayjoinReceiverWorker { return completer.future; } - Future receiveUncheckedProposal( - http.Client httpClient, Receiver session) async { + Future receiveUncheckedProposal(Receiver session) async { while (true) { printV("Polling for Proposal (${session.id()})"); final extractReq = await session.extractReq( - ohttpRelay: PayjoinManager.randomOhttpRelayUrl()); + ohttpRelay: await PayjoinManager.randomOhttpRelayUrl(), + ); final request = extractReq.$1; final url = Uri.parse(request.url.asString()); - final httpRequest = await httpClient.post(url, + final httpRequest = await client.post(url, headers: {'Content-Type': request.contentType}, body: request.body); final proposal = await session.processRes( @@ -116,14 +116,14 @@ class PayjoinReceiverWorker { } } - Future sendFinalProposal( - http.Client httpClient, PayjoinProposal finalProposal) async { + Future sendFinalProposal(PayjoinProposal finalProposal) async { final req = await finalProposal.extractReq( - ohttpRelay: PayjoinManager.randomOhttpRelayUrl()); + ohttpRelay: await PayjoinManager.randomOhttpRelayUrl(), + ); final proposalReq = req.$1; final proposalCtx = req.$2; - final request = await httpClient.post( + final request = await client.post( Uri.parse(proposalReq.url.asString()), headers: {"Content-Type": proposalReq.contentType}, body: proposalReq.body, diff --git a/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart index f02e59f47..c11342800 100644 --- a/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart +++ b/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart @@ -5,7 +5,7 @@ import 'dart:isolate'; import 'package:cw_bitcoin/payjoin/manager.dart'; import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:payjoin_flutter/common.dart'; import 'package:payjoin_flutter/send.dart'; import 'package:payjoin_flutter/src/generated/frb_generated.dart' as pj; @@ -44,17 +44,17 @@ class PayjoinSenderWorker { sendPort.send(e); } } + final client = ProxyWrapper().getHttpIOClient(); /// Run a payjoin sender (V2 protocol first, fallback to V1). Future runSender(Sender sender) async { - final httpClient = http.Client(); try { - return await _runSenderV2(sender, httpClient); + return await _runSenderV2(sender); } catch (e) { printV(e); if (e is pj_error.FfiCreateRequestError) { - return await _runSenderV1(sender, httpClient); + return await _runSenderV1(sender); } else if (e is HttpException) { printV(e); throw Exception(PayjoinSessionError.recoverable(e.toString())); @@ -65,14 +65,14 @@ class PayjoinSenderWorker { } /// Attempt to send payjoin using the V2 of the protocol. - Future _runSenderV2(Sender sender, http.Client httpClient) async { + Future _runSenderV2(Sender sender) async { try { final postRequest = await sender.extractV2( ohttpProxyUrl: await pj_uri.Url.fromStr(PayjoinManager.randomOhttpRelayUrl()), ); - final postResult = await _postRequest(httpClient, postRequest.$1); + final postResult = await _postRequest(postRequest.$1); final getContext = await postRequest.$2.processResponse(response: postResult); @@ -84,7 +84,7 @@ class PayjoinSenderWorker { final getRequest = await getContext.extractReq( ohttpRelay: await PayjoinManager.randomOhttpRelayUrl(), ); - final getRes = await _postRequest(httpClient, getRequest.$1); + final getRes = await _postRequest(getRequest.$1); final proposalPsbt = await getContext.processResponse( response: getRes, ohttpCtx: getRequest.$2, @@ -98,10 +98,10 @@ class PayjoinSenderWorker { } /// Attempt to send payjoin using the V1 of the protocol. - Future _runSenderV1(Sender sender, http.Client httpClient) async { + Future _runSenderV1(Sender sender) async { try { final postRequest = await sender.extractV1(); - final response = await _postRequest(httpClient, postRequest.$1); + final response = await _postRequest(postRequest.$1); sendPort.send({'type': PayjoinSenderRequestTypes.requestPosted}); @@ -111,7 +111,7 @@ class PayjoinSenderWorker { } } - Future> _postRequest(http.Client client, Request req) async { + Future> _postRequest(Request req) async { final httpRequest = await client.post(Uri.parse(req.url.asString()), headers: {'Content-Type': req.contentType}, body: req.body); diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock index 83af100ae..c2987894c 100644 --- a/cw_bitcoin/pubspec.lock +++ b/cw_bitcoin/pubspec.lock @@ -948,11 +948,21 @@ packages: socks5_proxy: dependency: transitive description: - name: socks5_proxy - sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053" - url: "https://pub.dev" - source: hosted - version: "1.0.6" + path: "." + ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + url: "https://github.com/LacticWhale/socks_dart" + source: git + version: "2.1.0" + socks_socket: + dependency: "direct main" + description: + path: "." + ref: e6232c53c1595469931ababa878759a067c02e94 + resolved-ref: e6232c53c1595469931ababa878759a067c02e94 + url: "https://github.com/sneurlax/socks_socket" + source: git + version: "1.1.1" source_gen: dependency: transitive description: @@ -1038,10 +1048,19 @@ packages: dependency: transitive description: name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.1" + tor_binary: + dependency: transitive + description: + path: "." + ref: cb811c610871a9517d47134b87c2f590c15c96c5 + resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5 + url: "https://github.com/MrCyjaneK/flutter-tor_binary" + source: git + version: "4.7.14" tuple: dependency: transitive description: diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml index 09369de8e..c24732c3a 100644 --- a/cw_bitcoin/pubspec.yaml +++ b/cw_bitcoin/pubspec.yaml @@ -54,6 +54,10 @@ dependencies: git: url: https://github.com/cake-tech/ledger-flutter-plus-plugins path: packages/ledger-litecoin + socks_socket: + git: + url: https://github.com/sneurlax/socks_socket + ref: e6232c53c1595469931ababa878759a067c02e94 dev_dependencies: flutter_test: diff --git a/cw_core/lib/get_height_by_date.dart b/cw_core/lib/get_height_by_date.dart index aee12b423..4786336af 100644 --- a/cw_core/lib/get_height_by_date.dart +++ b/cw_core/lib/get_height_by_date.dart @@ -1,7 +1,7 @@ +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:intl/intl.dart'; import 'dart:convert'; -import 'package:http/http.dart' as http; // FIXME: Hardcoded values; Works only for monero @@ -234,10 +234,14 @@ int getHavenHeightByDate({required DateTime date}) { } Future getHavenCurrentHeight() async { - final response = await http.get(Uri.parse('https://explorer.havenprotocol.org/api/networkinfo')); + final req = await ProxyWrapper().getHttpClient() + .getUrl(Uri.parse('https://explorer.havenprotocol.org/api/networkinfo')) + .timeout(Duration(seconds: 15)); + final response = await req.close(); + final stringResponse = await response.transform(utf8.decoder).join(); if (response.statusCode == 200) { - final info = jsonDecode(response.body); + final info = jsonDecode(stringResponse); return info['data']['height'] as int; } else { throw Exception('Failed to load current blockchain height'); @@ -269,13 +273,13 @@ const bitcoinDates = { }; Future getBitcoinHeightByDateAPI({required DateTime date}) async { - final response = await http.get( - Uri.parse( - "https://mempool.cakewallet.com/api/v1/mining/blocks/timestamp/${(date.millisecondsSinceEpoch / 1000).round()}", - ), - ); + final req = await ProxyWrapper().getHttpClient() + .getUrl(Uri.parse("https://mempool.cakewallet.com/api/v1/mining/blocks/timestamp/${(date.millisecondsSinceEpoch / 1000).round()}")) + .timeout(Duration(seconds: 15)); + final response = await req.close(); + final stringResponse = await response.transform(utf8.decoder).join(); - return jsonDecode(response.body)['height'] as int; + return jsonDecode(stringResponse)['height'] as int; } int getBitcoinHeightByDate({required DateTime date}) { diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart index 38fcde9e1..fdffb844b 100644 --- a/cw_core/lib/node.dart +++ b/cw_core/lib/node.dart @@ -1,12 +1,12 @@ import 'dart:io'; import 'package:cw_core/keyable.dart'; +import 'package:cw_core/utils/proxy_socket/abstract.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'dart:convert'; -import 'package:http/http.dart' as http; import 'package:hive/hive.dart'; import 'package:cw_core/hive_type_ids.dart'; import 'package:cw_core/wallet_type.dart'; -import 'package:http/io_client.dart' as ioc; import 'dart:math' as math; import 'package:convert/convert.dart'; @@ -184,23 +184,17 @@ class Node extends HiveObject with Keyable { final body = {'jsonrpc': '2.0', 'id': '0', 'method': "getinfo"}; try { - final authenticatingClient = HttpClient(); - authenticatingClient.badCertificateCallback = - ((X509Certificate cert, String host, int port) => true); - - final http.Client client = ioc.IOClient(authenticatingClient); - final jsonBody = json.encode(body); - final response = await client.post( - rpcUri, + final response = await ProxyWrapper().post( + clearnetUri: rpcUri, headers: {'Content-Type': 'application/json'}, body: jsonBody, ); - printV("node check response: ${response.body}"); - + final resBody = json.decode(response.body) as Map; + return resBody['result']['height'] != null; } catch (e) { printV("error: $e"); @@ -218,11 +212,7 @@ class Node extends HiveObject with Keyable { final body = {'jsonrpc': '2.0', 'id': '0', 'method': methodName}; try { - final authenticatingClient = HttpClient(); - authenticatingClient.badCertificateCallback = - ((X509Certificate cert, String host, int port) => true); - - final http.Client client = ioc.IOClient(authenticatingClient); + final client = ProxyWrapper().getHttpIOClient(); final jsonBody = json.encode(body); @@ -242,15 +232,15 @@ class Node extends HiveObject with Keyable { return !(response['offline'] as bool); } - printV("node check response: ${response.body}"); + final responseString = await response.body; - if ((response.body.contains("400 Bad Request") // Some other generic error + if ((responseString.contains("400 Bad Request") // Some other generic error || - response.body.contains("plain HTTP request was sent to HTTPS port") // Cloudflare + responseString.contains("plain HTTP request was sent to HTTPS port") // Cloudflare || response.headers["location"] != null // Generic reverse proxy || - response.body + responseString .contains("301 Moved Permanently") // Poorly configured generic reverse proxy ) && !(useSSL ?? false)) { @@ -277,15 +267,16 @@ class Node extends HiveObject with Keyable { } Future requestNodeWithProxy() async { - if (!isValidProxyAddress /* && !Tor.instance.enabled*/) { + if (!isValidProxyAddress && !CakeTor.instance.enabled) { return false; } String? proxy = socksProxyAddress; - // if ((proxy?.isEmpty ?? true) && Tor.instance.enabled) { - // proxy = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}"; - // } + if ((proxy?.isEmpty ?? true) && CakeTor.instance.enabled) { + proxy = "${InternetAddress.loopbackIPv4.address}:${CakeTor.instance.port}"; + } + printV("proxy: $proxy"); if (proxy == null) { return false; } @@ -305,13 +296,9 @@ class Node extends HiveObject with Keyable { // you try to communicate with it Future requestElectrumServer() async { try { - final Socket socket; - if (useSSL == true) { - socket = await SecureSocket.connect(uri.host, uri.port, - timeout: Duration(seconds: 5), onBadCertificate: (_) => true); - } else { - socket = await Socket.connect(uri.host, uri.port, timeout: Duration(seconds: 5)); - } + final ProxySocket socket; + socket = await ProxyWrapper().getSocksSocket(useSSL ?? false, uri.host, uri.port); + socket.destroy(); return true; @@ -322,8 +309,8 @@ class Node extends HiveObject with Keyable { Future requestNanoNode() async { try { - final response = await http.post( - uri, + final response = await ProxyWrapper().post( + clearnetUri: uri, headers: {"Content-Type": "application/json", "nano-app": "cake-wallet"}, body: jsonEncode( { @@ -332,7 +319,8 @@ class Node extends HiveObject with Keyable { }, ), ); - final data = await jsonDecode(response.body); + + final data = jsonDecode(response.body); if (response.statusCode != 200 || data["error"] != null || data["balance"] == null || @@ -348,13 +336,14 @@ class Node extends HiveObject with Keyable { Future requestEthereumServer() async { try { - final response = await http.get( - uri, - headers: {'Content-Type': 'application/json'}, - ); + final req = await ProxyWrapper().getHttpClient() + .getUrl(uri,) + .timeout(Duration(seconds: 15)); + final response = await req.close(); return response.statusCode >= 200 && response.statusCode < 300; - } catch (_) { + } catch (err) { + printV("Failed to request ethereum server: $err"); return false; } } @@ -462,7 +451,7 @@ class DaemonRpc { /// Perform a JSON-RPC call with Digest Authentication. Future> call(String method, Map params) async { - final http.Client client = http.Client(); + final client = ProxyWrapper().getHttpIOClient(); final DigestAuth digestAuth = DigestAuth(username, password); // Initial request to get the `WWW-Authenticate` header. diff --git a/cw_core/lib/solana_rpc_http_service.dart b/cw_core/lib/solana_rpc_http_service.dart index fbe9a29dc..1c6e975aa 100644 --- a/cw_core/lib/solana_rpc_http_service.dart +++ b/cw_core/lib/solana_rpc_http_service.dart @@ -1,20 +1,19 @@ import 'dart:convert'; -import 'package:http/http.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:on_chain/solana/solana.dart'; class SolanaRPCHTTPService implements SolanaJSONRPCService { SolanaRPCHTTPService( - {required this.url, Client? client, this.defaultRequestTimeout = const Duration(seconds: 30)}) - : client = client ?? Client(); + {required this.url, + this.defaultRequestTimeout = const Duration(seconds: 30)}); @override final String url; - final Client client; final Duration defaultRequestTimeout; - @override - Future> call(SolanaRequestDetails params, [Duration? timeout]) async { - final response = await client.post( - Uri.parse(url), + Future> call(SolanaRequestDetails params, + [Duration? timeout]) async { + final response = await ProxyWrapper().post( + clearnetUri: Uri.parse(url), body: params.toRequestBody(), headers: { 'Content-Type': 'application/json', diff --git a/cw_core/lib/utils/proxy_logger/abstract.dart b/cw_core/lib/utils/proxy_logger/abstract.dart new file mode 100644 index 000000000..303b640f1 --- /dev/null +++ b/cw_core/lib/utils/proxy_logger/abstract.dart @@ -0,0 +1,29 @@ +import 'dart:typed_data'; +import 'package:http/http.dart' as very_insecure_http_do_not_use; + +enum RequestNetwork { + clearnet, + tor, +} + +enum RequestMethod { + get, + post, + put, + delete, + + newHttpClient, + newHttpIOClient, + newProxySocket, +} + +abstract class ProxyLogger { + void log({ + required Uri? uri, + required RequestMethod method, + required Uint8List body, + required very_insecure_http_do_not_use.Response? response, + required RequestNetwork network, + required String? error, + }); +} \ No newline at end of file diff --git a/cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart b/cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart new file mode 100644 index 000000000..e2929da12 --- /dev/null +++ b/cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart @@ -0,0 +1,63 @@ +import 'dart:typed_data'; + +import 'package:cw_core/utils/proxy_logger/abstract.dart'; +import 'package:http/http.dart' as very_insecure_http_do_not_use; + +class MemoryProxyLoggerEntry { + MemoryProxyLoggerEntry({ + required this.trace, + required this.uri, + required this.body, + required this.network, + required this.method, + required this.response, + required this.error, + }) : time = DateTime.now(); + + final StackTrace trace; + final Uri? uri; + final Uint8List body; + final RequestNetwork network; + final very_insecure_http_do_not_use.Response? response; + final RequestMethod method; + final String? error; + final DateTime time; + @override + String toString() => """MemoryProxyLoggerEntry( + uri: $uri, + body: $body, + network: $network, + method: $method, + response: + code: ${response?.statusCode}, + headers: ${response?.headers}, + body: ${response?.body}, + error: $error, + time: $time, + trace: ${trace} +);"""; +} + +class MemoryProxyLogger implements ProxyLogger { + static List logs = []; + @override + void log({ + required Uri? uri, + required RequestMethod method, + required Uint8List body, + required very_insecure_http_do_not_use.Response? response, + required RequestNetwork network, + required String? error, + }) { + final trace = StackTrace.current; + logs.add(MemoryProxyLoggerEntry( + method: method, + trace: trace, + uri: uri, + body: body, + network: network, + response: response, + error: error,), + ); + } +} \ No newline at end of file diff --git a/cw_core/lib/utils/proxy_logger/silent_logger.dart b/cw_core/lib/utils/proxy_logger/silent_logger.dart new file mode 100644 index 000000000..1cea0d011 --- /dev/null +++ b/cw_core/lib/utils/proxy_logger/silent_logger.dart @@ -0,0 +1,17 @@ +import 'dart:typed_data'; + +import 'package:cw_core/utils/proxy_logger/abstract.dart'; +import 'package:http/http.dart' as very_insecure_http_do_not_use; + +// we are not doing anything +class SilentProxyLogger implements ProxyLogger { + @override + void log({ + required Uri? uri, + required RequestMethod method, + required Uint8List body, + required very_insecure_http_do_not_use.Response? response, + required RequestNetwork network, + required String? error, + }) {} +} \ No newline at end of file diff --git a/cw_core/lib/utils/proxy_socket/abstract.dart b/cw_core/lib/utils/proxy_socket/abstract.dart new file mode 100644 index 000000000..b4b628f74 --- /dev/null +++ b/cw_core/lib/utils/proxy_socket/abstract.dart @@ -0,0 +1,47 @@ +import 'dart:async'; +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:cw_core/utils/proxy_socket/insecure.dart'; +import 'package:cw_core/utils/proxy_socket/secure.dart'; +import 'package:cw_core/utils/proxy_socket/socks.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; +import 'package:socks_socket/socks_socket.dart'; + +class ProxyAddress { + final String host; + final int port; + + ProxyAddress({required this.host, required this.port}); +} + +abstract class ProxySocket { + static Future connect(bool sslEnabled, ProxyAddress address, {Duration? connectionTimeout}) async { + if (CakeTor.instance.started) { + var socksSocket = await SOCKSSocket.create( + proxyHost: InternetAddress.loopbackIPv4.address, + proxyPort: CakeTor.instance.port, + sslEnabled: sslEnabled, + ); + await socksSocket.connect(); + await socksSocket.connectTo(address.host, address.port); + return ProxySocketSocks(socksSocket); + } + if (sslEnabled == false) { + return ProxySocketInsecure(await Socket.connect(address.host, address.port, timeout: connectionTimeout)); + } else { + return ProxySocketSecure(await SecureSocket.connect( + address.host, + address.port, + timeout: connectionTimeout, + onBadCertificate: (_) => true, + )); + } + } + + Future close(); + Future destroy(); + Future write(String data); + StreamSubscription> listen(Function(Uint8List event) onData, {Function (Object error)? onError, Function ()? onDone, bool cancelOnError = true}); + ProxyAddress get address; +} \ No newline at end of file diff --git a/cw_core/lib/utils/proxy_socket/insecure.dart b/cw_core/lib/utils/proxy_socket/insecure.dart new file mode 100644 index 000000000..aeac474d7 --- /dev/null +++ b/cw_core/lib/utils/proxy_socket/insecure.dart @@ -0,0 +1,34 @@ + +import 'package:cw_core/utils/proxy_socket/abstract.dart'; +import 'dart:async'; +import 'dart:typed_data'; +import 'dart:io'; + +class ProxySocketInsecure implements ProxySocket { + final Socket socket; + + ProxySocketInsecure(this.socket); + + ProxyAddress get address => ProxyAddress(host: socket.remoteAddress.host, port: socket.remotePort); + + @override + Future close() => socket.close(); + + @override + Future destroy() async => socket.destroy(); + + @override + Future write(String data) async => socket.write(data); + + @override + StreamSubscription> listen(Function(Uint8List event) onData, {Function(Object error)? onError, Function()? onDone, bool cancelOnError = true}) { + return socket.listen( + (data) { + onData(Uint8List.fromList(data)); + }, + onError: onError, + onDone: onDone, + cancelOnError: cancelOnError, + ); + } +} \ No newline at end of file diff --git a/cw_core/lib/utils/proxy_socket/secure.dart b/cw_core/lib/utils/proxy_socket/secure.dart new file mode 100644 index 000000000..2efd13ee4 --- /dev/null +++ b/cw_core/lib/utils/proxy_socket/secure.dart @@ -0,0 +1,34 @@ +import 'dart:async'; +import 'dart:io'; +import 'dart:typed_data'; + +import 'package:cw_core/utils/proxy_socket/abstract.dart'; + +class ProxySocketSecure implements ProxySocket { + final SecureSocket socket; + + ProxySocketSecure(this.socket); + + ProxyAddress get address => ProxyAddress(host: socket.remoteAddress.host, port: socket.remotePort); + + @override + Future close() => socket.close(); + + @override + Future destroy() async => socket.destroy(); + + @override + Future write(String data) async => socket.write(data); + + @override + StreamSubscription> listen(Function(Uint8List event) onData, {Function(Object error)? onError, Function()? onDone, bool cancelOnError = true}) { + return socket.listen( + (data) { + onData(Uint8List.fromList(data)); + }, + onError: onError, + onDone: onDone, + cancelOnError: cancelOnError, + ); + } +} diff --git a/cw_core/lib/utils/proxy_socket/socks.dart b/cw_core/lib/utils/proxy_socket/socks.dart new file mode 100644 index 000000000..a4e5ddeb6 --- /dev/null +++ b/cw_core/lib/utils/proxy_socket/socks.dart @@ -0,0 +1,36 @@ +import 'dart:async'; +import 'dart:typed_data'; + +import 'package:cw_core/utils/proxy_socket/abstract.dart'; +import 'package:socks_socket/socks_socket.dart'; + +class ProxySocketSocks implements ProxySocket { + final SOCKSSocket socket; + + ProxySocketSocks(this.socket); + + @override + ProxyAddress get address => ProxyAddress(host: socket.proxyHost, port: socket.proxyPort); + + @override + Future close() => socket.close(); + + @override + Future destroy() => close(); + + @override + Future write(String data) async => socket.write(data); + + @override + StreamSubscription> listen(Function(Uint8List event) onData, {Function(Object error)? onError, Function()? onDone, bool cancelOnError = true}) { + return socket.listen( + (data) { + onData(Uint8List.fromList(data)); + }, + onError: onError, + onDone: onDone, + cancelOnError: cancelOnError, + ); + } +} + diff --git a/cw_core/lib/utils/proxy_wrapper.dart b/cw_core/lib/utils/proxy_wrapper.dart new file mode 100644 index 000000000..e43f34ff1 --- /dev/null +++ b/cw_core/lib/utils/proxy_wrapper.dart @@ -0,0 +1,447 @@ +import 'dart:async'; +import 'dart:convert'; +import 'dart:io'; +import 'dart:typed_data'; +import 'package:cw_core/utils/proxy_logger/abstract.dart'; +import 'package:cw_core/utils/proxy_socket/abstract.dart'; +import 'package:cw_core/utils/tor/abstract.dart'; +import 'package:cw_core/utils/tor/android.dart'; +import 'package:cw_core/utils/tor/disabled.dart'; +import 'package:http/http.dart'; +import 'package:socks5_proxy/socks_client.dart'; +import 'package:http/io_client.dart' as ioc; + +class ProxyWrapper { + static final ProxyWrapper _proxyWrapper = ProxyWrapper._internal(); + static ProxyLogger? logger; + + factory ProxyWrapper() { + return _proxyWrapper; + } + + ProxyWrapper._internal(); + Future getSocksSocket(bool sslEnabled, String host, int port, {Duration? connectionTimeout}) async { + logger?.log( + uri: Uri( + scheme: sslEnabled ? "https" : "http", + host: host, + port: port, + ), + method: RequestMethod.newProxySocket, + body: Uint8List(0), + response: null, + network: requestNetwork(), + error: null + ); + return ProxySocket.connect(sslEnabled, ProxyAddress(host: host, port: port), connectionTimeout: connectionTimeout); + } + + RequestNetwork requestNetwork() { + return CakeTor.instance.started ? RequestNetwork.tor : RequestNetwork.clearnet; + } + + ioc.IOClient getHttpIOClient({int? portOverride, bool internal = false}) { + if (!internal) { + logger?.log( + uri: null, + method: RequestMethod.newHttpIOClient, + body: Uint8List(0), + response: null, + network: requestNetwork(), + error: null, + ); + } + // ignore: deprecated_member_use_from_same_package + final httpClient = ProxyWrapper().getHttpClient(portOverride: portOverride, internal: true); + return ioc.IOClient(httpClient); + } + + int getPort() => CakeTor.instance.port; + + @Deprecated('Use ProxyWrapper().get/post/put methods instead, and provide proper clearnet and onion uri.') + HttpClient getHttpClient({int? portOverride, bool internal = false}) { + if (!internal) { + logger?.log( + uri: null, + method: RequestMethod.newProxySocket, + body: Uint8List(0), + response: null, + network: requestNetwork(), + error: null + ); + } + if (CakeTor.instance.started) { + // Assign connection factory. + final client = HttpClient(); + SocksTCPClient.assignToHttpClient(client, [ + ProxySettings( + InternetAddress.loopbackIPv4, + CakeTor.instance.port, + password: null, + ), + ]); + return client; + } else { + return HttpClient(); + } + } + + + + Future _make({ + required RequestMethod method, + required ioc.IOClient client, + required Uri uri, + required Map? headers, + String? body, + }) async { + Object? error; + Response? resp; + try { + switch (method) { + case RequestMethod.get: + resp = await client. get( + uri, + headers: headers, + ); + break; + case RequestMethod.delete: + resp = await client.delete( + uri, + headers: headers, + body: body, + ); + break; + case RequestMethod.post: + resp = await client.post( + uri, + headers: headers, + body: body, + ); + break; + case RequestMethod.put: + resp = await client.put( + uri, + headers: headers, + body: body, + ); + break; + case RequestMethod.newHttpClient: + case RequestMethod.newHttpIOClient: + case RequestMethod.newProxySocket: + throw UnimplementedError(); + } + return resp; + } catch (e) { + error = e; + rethrow; + } finally { + logger?.log( + uri: uri, + method: RequestMethod.get, + body: utf8.encode(body ?? ''), + response: resp, + network: requestNetwork(), + error: error?.toString(), + ); + } + } + + Future get({ + Map? headers, + int? portOverride, + Uri? clearnetUri, + Uri? onionUri, + }) async { + ioc.IOClient? torClient; + bool torEnabled = CakeTor.instance.started; + + if (CakeTor.instance.started) { + torEnabled = true; + } else { + torEnabled = false; + } + + // if tor is enabled, try to connect to the onion url first: + if (torEnabled) { + try { + // ignore: deprecated_member_use_from_same_package + torClient = await getHttpIOClient(portOverride: portOverride, internal: true); + } catch (_) { + rethrow; + } + + if (onionUri != null) { + try { + return await _make( + method: RequestMethod.get, + client: torClient, + uri: onionUri, + headers: headers, + ); + } catch (_) { + rethrow; + } + } + + if (clearnetUri != null) { + try { + return await _make( + method: RequestMethod.get, + client: torClient, + uri: clearnetUri, + headers: headers, + ); + } catch (_) { + rethrow; + } + } + } + + if (clearnetUri != null) { + try { + return HttpOverrides.runZoned( + () async { + return await _make( + method: RequestMethod.get, + client: ioc.IOClient(), + uri: clearnetUri, + headers: headers, + ); + }, + ); + } catch (_) { + // we weren't able to get a response: + rethrow; + } + } + + throw Exception("Unable to connect to server"); + } + + + Future post({ + Map? headers, + int? portOverride, + Uri? clearnetUri, + Uri? onionUri, + String? body, + bool allowMitmMoneroBypassSSLCheck = false, + }) async { + HttpClient? torHttpClient; + HttpClient cleatnetHttpClient = HttpClient(); + if (allowMitmMoneroBypassSSLCheck) { + cleatnetHttpClient.badCertificateCallback = + ((X509Certificate cert, String host, int port) => true); + } + + ioc.IOClient clearnetClient = ioc.IOClient(cleatnetHttpClient); + + + bool torEnabled = CakeTor.instance.started; + + if (torEnabled) { + try { + // ignore: deprecated_member_use_from_same_package + torHttpClient = await getHttpClient(portOverride: portOverride); + } catch (_) { + rethrow; + } + if (allowMitmMoneroBypassSSLCheck) { + torHttpClient.badCertificateCallback = + ((X509Certificate cert, String host, int port) => true); + } + if (onionUri != null) { + try { + return await _make( + method: RequestMethod.post, + client: ioc.IOClient(torHttpClient), + uri: onionUri, + headers: headers, + body: body, + ); + } catch (_) { + rethrow; + } + } + + if (clearnetUri != null) { + try { + return await _make( + method: RequestMethod.post, + client: ioc.IOClient(torHttpClient), + uri: clearnetUri, + headers: headers, + body: body, + ); + } catch (_) { + rethrow; + } + } + } + + if (clearnetUri != null) { + try { + return HttpOverrides.runZoned( + () async { + return await _make( + method: RequestMethod.post, + client: clearnetClient, + uri: clearnetUri, + headers: headers, + body: body, + ); + }, + ); + } catch (_) { + rethrow; + } + } + + throw Exception("Unable to connect to server"); + } + + Future put({ + Map? headers, + int? portOverride, + Uri? clearnetUri, + Uri? onionUri, + String? body, + }) async { + ioc.IOClient? torClient; + bool torEnabled = CakeTor.instance.started; + + if (torEnabled) { + try { + // ignore: deprecated_member_use_from_same_package + torClient = await getHttpIOClient(portOverride: portOverride, internal: true); + } catch (_) {} + + if (onionUri != null) { + try { + return await _make( + method: RequestMethod.put, + client: torClient!, + uri: onionUri, + headers: headers, + body: body, + ); + } catch (_) { + rethrow; + } + } + + if (clearnetUri != null) { + try { + return await _make( + method: RequestMethod.put, + client: torClient!, + uri: clearnetUri, + headers: headers, + body: body, + ); + } catch (_) { + rethrow; + } + } + } + + if (clearnetUri != null) { + try { + return HttpOverrides.runZoned( + () async { + return await _make( + method: RequestMethod.put, + client: ioc.IOClient(), + uri: clearnetUri, + headers: headers, + body: body, + ); + }, + ); + } catch (_) { + // we weren't able to get a response: + rethrow; + } + } + + throw Exception("Unable to connect to server"); + } + + Future delete({ + Map? headers, + int? portOverride, + Uri? clearnetUri, + Uri? onionUri, + }) async { + ioc.IOClient? torClient; + bool torEnabled = CakeTor.instance.started; + + if (CakeTor.instance.started) { + torEnabled = true; + } else { + torEnabled = false; + } + + // if tor is enabled, try to connect to the onion url first: + if (torEnabled) { + try { + // ignore: deprecated_member_use_from_same_package + torClient = await getHttpIOClient(portOverride: portOverride, internal: true); + } catch (_) { + rethrow; + } + + if (onionUri != null) { + try { + return await _make( + method: RequestMethod.delete, + client: torClient, + uri: onionUri, + headers: headers, + ); + } catch (_) { + rethrow; + } + } + + if (clearnetUri != null) { + try { + return await _make( + method: RequestMethod.delete, + client: torClient, + uri: clearnetUri, + headers: headers, + ); + } catch (_) { + rethrow; + } + } + } + + if (clearnetUri != null) { + try { + return HttpOverrides.runZoned( + () async { + return await _make( + method: RequestMethod.delete, + client: ioc.IOClient(), + uri: clearnetUri, + headers: headers, + ); + }, + ); + } catch (_) { + // we weren't able to get a response: + rethrow; + } + } + + throw Exception("Unable to connect to server"); + } +} + + +class CakeTor { + static final CakeTorInstance instance = CakeTorInstance.getInstance(); +} diff --git a/cw_core/lib/utils/tor/abstract.dart b/cw_core/lib/utils/tor/abstract.dart new file mode 100644 index 000000000..aaecabc56 --- /dev/null +++ b/cw_core/lib/utils/tor/abstract.dart @@ -0,0 +1,38 @@ +import 'dart:io'; + +import 'package:cw_core/utils/print_verbose.dart'; +import 'package:cw_core/utils/tor/android.dart'; +import 'package:cw_core/utils/tor/disabled.dart'; +import 'package:cw_core/utils/tor/tails.dart'; + +abstract class CakeTorInstance { + bool get started; + + int get port => -1; + + bool get enabled => false; + + bool get bootstrapped => false; + + Future start(); + Future stop(); + + static CakeTorInstance getInstance() { + if (Platform.isAndroid) { + return CakeTorAndroid(); + } + if (Platform.isLinux) { + try { + final os = File("/etc/os-release").readAsLinesSync(); + for (var line in os) { + if (!line.startsWith("ID=")) continue; + if (!line.contains("tails")) continue; + return CakeTorTails(); + } + } catch (e) { + printV("Failed to identify linux version - /etc/os-release missing"); + } + } + return CakeTorDisabled(); + } +} \ No newline at end of file diff --git a/cw_core/lib/utils/tor/android.dart b/cw_core/lib/utils/tor/android.dart new file mode 100644 index 000000000..dfc1bfbe4 --- /dev/null +++ b/cw_core/lib/utils/tor/android.dart @@ -0,0 +1,73 @@ +import 'dart:convert'; +import 'dart:io'; + +import 'package:cw_core/utils/print_verbose.dart'; +import 'package:cw_core/utils/tor/abstract.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:path/path.dart' as p; +import 'package:tor_binary/tor_binary_platform_interface.dart'; + +class CakeTorAndroid implements CakeTorInstance { + @override + bool get bootstrapped => _proc != null; + + @override + bool get enabled => _proc != null; + + @override + int get port => 42142; + + @override + Future start() async { + await _runEmbeddedTor(); + } + + @override + bool get started => _proc != null; + + @override + Future stop() async { + _proc?.kill(); + await _proc?.exitCode; + _proc = null; + } + + static Process? _proc; + + Future _runEmbeddedTor() async { + final dir = await getApplicationCacheDirectory(); + + final torBinPath = p.join((await TorBinaryPlatform.instance.getBinaryPath())!, "libtor.so"); + printV("torPath: $torBinPath"); + + if (started) { + printV("Proxy is running"); + return; + } + + printV("Starting embedded tor"); + printV("app docs: $dir"); + final torrc = """ +SocksPort $port +Log notice file ${p.join(dir.path, "tor.log")} +RunAsDaemon 0 +DataDirectory ${p.join(dir.path, "tor-data")} +"""; + final torrcPath = p.join(dir.absolute.path, "torrc"); + File(torrcPath).writeAsStringSync(torrc); + + if (_proc != null) { + try { + _proc?.kill(); + await _proc?.exitCode; + _proc = null; + } catch (e) { + printV(e); + } + } + printV("path: $torBinPath -f $torrcPath"); + _proc = await Process.start(torBinPath, ["-f", torrcPath]); + _proc?.stdout.transform(utf8.decoder).forEach(printV); + _proc?.stderr.transform(utf8.decoder).forEach(printV); + } +} \ No newline at end of file diff --git a/cw_core/lib/utils/tor/disabled.dart b/cw_core/lib/utils/tor/disabled.dart new file mode 100644 index 000000000..8bd3d837e --- /dev/null +++ b/cw_core/lib/utils/tor/disabled.dart @@ -0,0 +1,21 @@ +import 'package:cw_core/utils/tor/abstract.dart'; + +class CakeTorDisabled implements CakeTorInstance { + @override + bool get bootstrapped => false; + + @override + bool get enabled => false; + + @override + int get port => -1; + + @override + Future start() => throw UnimplementedError(); + + @override + bool get started => false; + + @override + Future stop() => throw UnimplementedError(); +} \ No newline at end of file diff --git a/cw_core/lib/utils/tor/tails.dart b/cw_core/lib/utils/tor/tails.dart new file mode 100644 index 000000000..c37ee72aa --- /dev/null +++ b/cw_core/lib/utils/tor/tails.dart @@ -0,0 +1,21 @@ +import 'package:cw_core/utils/tor/abstract.dart'; + +class CakeTorTails implements CakeTorInstance { + @override + bool get bootstrapped => true; + + @override + bool get enabled => true; + + @override + int get port => 9150; + + @override + Future start() async {} + + @override + bool get started => true; + + @override + Future stop() async {} +} \ No newline at end of file diff --git a/cw_core/pubspec.lock b/cw_core/pubspec.lock index c4e178ccf..d7bfdbe2a 100644 --- a/cw_core/pubspec.lock +++ b/cw_core/pubspec.lock @@ -479,7 +479,7 @@ packages: description: path: "." ref: cake-update-v2 - resolved-ref: "01cbbacbb05d2113aafa8b7c4a2bb766f749d8d8" + resolved-ref: "096865a8c6b89c260beadfec04f7e184c40a3273" url: "https://github.com/cake-tech/on_chain.git" source: git version: "3.7.0" @@ -635,11 +635,21 @@ packages: socks5_proxy: dependency: "direct main" description: - name: socks5_proxy - sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053" - url: "https://pub.dev" - source: hosted - version: "1.0.6" + path: "." + ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + url: "https://github.com/LacticWhale/socks_dart" + source: git + version: "2.1.0" + socks_socket: + dependency: "direct main" + description: + path: "." + ref: e6232c53c1595469931ababa878759a067c02e94 + resolved-ref: e6232c53c1595469931ababa878759a067c02e94 + url: "https://github.com/sneurlax/socks_socket" + source: git + version: "1.1.1" source_gen: dependency: transitive description: @@ -716,10 +726,19 @@ packages: dependency: transitive description: name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.1" + tor_binary: + dependency: "direct main" + description: + path: "." + ref: cb811c610871a9517d47134b87c2f590c15c96c5 + resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5 + url: "https://github.com/MrCyjaneK/flutter-tor_binary" + source: git + version: "4.7.14" tuple: dependency: transitive description: diff --git a/cw_core/pubspec.yaml b/cw_core/pubspec.yaml index 03f039d9a..07f87475a 100644 --- a/cw_core/pubspec.yaml +++ b/cw_core/pubspec.yaml @@ -25,16 +25,23 @@ dependencies: url: https://github.com/cake-tech/cake_backup.git ref: main version: 1.0.0 - socks5_proxy: ^1.0.4 + socks5_proxy: + git: + url: https://github.com/LacticWhale/socks_dart + ref: 27ad7c2efae8d7460325c74b90f660085cbd0685 unorm_dart: ^0.3.0 on_chain: git: url: https://github.com/cake-tech/on_chain.git ref: cake-update-v2 -# tor: -# git: -# url: https://github.com/cake-tech/tor.git -# ref: main + socks_socket: + git: + url: https://github.com/sneurlax/socks_socket + ref: e6232c53c1595469931ababa878759a067c02e94 + tor_binary: + git: + url: https://github.com/MrCyjaneK/flutter-tor_binary + ref: cb811c610871a9517d47134b87c2f590c15c96c5 dev_dependencies: flutter_test: diff --git a/cw_decred/pubspec.lock b/cw_decred/pubspec.lock index f1d4dd57a..f7a5f335d 100644 --- a/cw_decred/pubspec.lock +++ b/cw_decred/pubspec.lock @@ -666,11 +666,21 @@ packages: socks5_proxy: dependency: transitive description: - name: socks5_proxy - sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053" - url: "https://pub.dev" - source: hosted - version: "1.0.6" + path: "." + ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + url: "https://github.com/LacticWhale/socks_dart" + source: git + version: "2.1.0" + socks_socket: + dependency: transitive + description: + path: "." + ref: e6232c53c1595469931ababa878759a067c02e94 + resolved-ref: e6232c53c1595469931ababa878759a067c02e94 + url: "https://github.com/sneurlax/socks_socket" + source: git + version: "1.1.1" source_gen: dependency: transitive description: @@ -751,6 +761,15 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" + tor_binary: + dependency: transitive + description: + path: "." + ref: cb811c610871a9517d47134b87c2f590c15c96c5 + resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5 + url: "https://github.com/MrCyjaneK/flutter-tor_binary" + source: git + version: "4.7.14" tuple: dependency: transitive description: diff --git a/cw_ethereum/lib/ethereum_client.dart b/cw_ethereum/lib/ethereum_client.dart index 1298d54f5..259e7d11d 100644 --- a/cw_ethereum/lib/ethereum_client.dart +++ b/cw_ethereum/lib/ethereum_client.dart @@ -19,7 +19,7 @@ class EthereumClient extends EVMChainClient { Future> fetchTransactions(String address, {String? contractAddress}) async { try { - final response = await httpClient.get(Uri.https("api.etherscan.io", "/v2/api", { + final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", { "chainid": "$chainId", "module": "account", "action": contractAddress != null ? "tokentx" : "txlist", @@ -51,7 +51,7 @@ class EthereumClient extends EVMChainClient { @override Future> fetchInternalTransactions(String address) async { try { - final response = await httpClient.get(Uri.https("api.etherscan.io", "/v2/api", { + final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", { "chainid": "$chainId", "module": "account", "action": "txlistinternal", diff --git a/cw_evm/lib/evm_chain_client.dart b/cw_evm/lib/evm_chain_client.dart index 8b45d5544..5f383b5a3 100644 --- a/cw_evm/lib/evm_chain_client.dart +++ b/cw_evm/lib/evm_chain_client.dart @@ -5,6 +5,7 @@ import 'dart:developer'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/erc20_token.dart'; import 'package:cw_core/node.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_evm/evm_chain_transaction_model.dart'; import 'package:cw_evm/evm_chain_transaction_priority.dart'; import 'package:cw_evm/evm_erc20_balance.dart'; @@ -12,13 +13,12 @@ import 'package:cw_evm/pending_evm_chain_transaction.dart'; import 'package:cw_evm/.secrets.g.dart' as secrets; import 'package:flutter/foundation.dart'; import 'package:hex/hex.dart' as hex; -import 'package:http/http.dart'; import 'package:web3dart/web3dart.dart'; import 'contract/erc20.dart'; abstract class EVMChainClient { - final httpClient = Client(); + late final client = ProxyWrapper().getHttpIOClient(); Web3Client? _client; //! To be overridden by all child classes @@ -47,7 +47,7 @@ abstract class EVMChainClient { } _client = - Web3Client(isModifiedNodeUri ? rpcUri!.toString() : node.uri.toString(), httpClient); + Web3Client(isModifiedNodeUri ? rpcUri!.toString() : node.uri.toString(), client); return true; } catch (e) { @@ -353,7 +353,7 @@ abstract class EVMChainClient { }, ); - final response = await httpClient.get( + final response = await client.get( uri, headers: { "Accept": "application/json", diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart index 8c5ab2d41..e98ba71ca 100644 --- a/cw_monero/lib/api/wallet.dart +++ b/cw_monero/lib/api/wallet.dart @@ -146,7 +146,25 @@ int getUnlockedBalance({int accountIndex = 0}) => int getCurrentHeight() => currentWallet?.blockChainHeight() ?? 0; -int getNodeHeightSync() => currentWallet?.daemonBlockChainHeight() ?? 0; + +int cachedNodeHeight = 0; +bool isHeightRefreshing = false; +int getNodeHeightSync() { + if (isHeightRefreshing == false) { + (() async { + try { + isHeightRefreshing = true; + final wptrAddress = currentWallet!.ffiAddress(); + cachedNodeHeight = await Isolate.run(() async { + return monero.Wallet_daemonBlockChainHeight(Pointer.fromAddress(wptrAddress)); + }); + } finally { + isHeightRefreshing = false; + } + })(); + } + return cachedNodeHeight; +} bool isConnectedSync() => currentWallet?.connected() != 0; @@ -202,7 +220,6 @@ Future setupNodeSync( } void startRefreshSync() { - currentWallet!.refreshAsync(); currentWallet!.startRefresh(); } @@ -228,7 +245,7 @@ void storeSync({bool force = false}) async { return monero.Wallet_synchronized(Pointer.fromAddress(addr)); }); if (lastStorePointer == addr && - lastStoreHeight + 5000 > currentWallet!.blockChainHeight() && + lastStoreHeight + 75000 > currentWallet!.blockChainHeight() && !synchronized && !force) { return; diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart index 1a6f11a1d..9a8cb70b4 100644 --- a/cw_monero/lib/monero_wallet.dart +++ b/cw_monero/lib/monero_wallet.dart @@ -17,6 +17,7 @@ import 'package:cw_core/pending_transaction.dart'; import 'package:cw_core/sync_status.dart'; import 'package:cw_core/transaction_direction.dart'; import 'package:cw_core/unspent_coins_info.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_info.dart'; @@ -207,6 +208,14 @@ abstract class MoneroWalletBase extends WalletBase connectToNode({required Node node}) async { + String socksProxy = node.socksProxyAddress ?? ''; + printV("bootstrapped: ${CakeTor.instance.bootstrapped}"); + printV(" enabled: ${CakeTor.instance.enabled}"); + printV(" port: ${CakeTor.instance.port}"); + printV(" started: ${CakeTor.instance.started}"); + if (CakeTor.instance.enabled) { + socksProxy = "127.0.0.1:${CakeTor.instance.port}"; + } try { syncStatus = ConnectingSyncStatus(); await monero_wallet.setupNodeSync( @@ -216,7 +225,7 @@ abstract class MoneroWalletBase extends WalletBase getBalance(String address) async { - final response = await http.post( - _node!.uri, + final response = await ProxyWrapper().post( + clearnetUri: _node!.uri, headers: getHeaders(_node!.uri.host), body: jsonEncode( { @@ -76,7 +76,8 @@ class NanoClient { }, ), ); - final data = await jsonDecode(response.body); + + final data = jsonDecode(response.body) as Map; if (response.statusCode != 200 || data["error"] != null || data["balance"] == null || @@ -93,8 +94,8 @@ class NanoClient { Future getAccountInfo(String address) async { try { - final response = await http.post( - _node!.uri, + final response = await ProxyWrapper().post( + clearnetUri: _node!.uri, headers: getHeaders(_node!.uri.host), body: jsonEncode( { @@ -104,8 +105,9 @@ class NanoClient { }, ), ); - final data = await jsonDecode(response.body); - return AccountInfoResponse.fromJson(data as Map); + + final data = jsonDecode(response.body) as Map; + return AccountInfoResponse.fromJson(data); } catch (e) { printV("error while getting account info $e"); return null; @@ -114,8 +116,8 @@ class NanoClient { Future getBlockContents(String block) async { try { - final response = await http.post( - _node!.uri, + final response = await ProxyWrapper().post( + clearnetUri: _node!.uri, headers: getHeaders(_node!.uri.host), body: jsonEncode( { @@ -125,7 +127,8 @@ class NanoClient { }, ), ); - final data = await jsonDecode(response.body); + + final data = jsonDecode(response.body) as Map; return BlockContentsResponse.fromJson(data["contents"] as Map); } catch (e) { printV("error while getting block info $e"); @@ -181,8 +184,8 @@ class NanoClient { } Future requestWork(String hash) async { - final response = await http.post( - _powNode!.uri, + final response = await ProxyWrapper().post( + clearnetUri: _powNode!.uri, headers: getHeaders(_powNode!.uri.host), body: json.encode( { @@ -191,8 +194,9 @@ class NanoClient { }, ), ); + if (response.statusCode == 200) { - final Map decoded = json.decode(response.body) as Map; + final decoded = jsonDecode(response.body) as Map; if (decoded.containsKey("error")) { throw Exception("Received error ${decoded["error"]}"); } @@ -224,13 +228,13 @@ class NanoClient { "block": block, }); - final processResponse = await http.post( - _node!.uri, + final processResponse = await ProxyWrapper().post( + clearnetUri: _node!.uri, headers: getHeaders(_node!.uri.host), body: processBody, ); - final Map decoded = json.decode(processResponse.body) as Map; + final Map decoded = jsonDecode(processResponse.body) as Map; if (decoded.containsKey("error")) { throw Exception("Received error ${decoded["error"]}"); } @@ -423,12 +427,11 @@ class NanoClient { "subtype": "receive", "block": receiveBlock, }); - final processResponse = await http.post( - _node!.uri, + final processResponse = await ProxyWrapper().post( + clearnetUri: _node!.uri, headers: getHeaders(_node!.uri.host), body: processBody, ); - final Map decoded = json.decode(processResponse.body) as Map; if (decoded.containsKey("error")) { throw Exception("Received error ${decoded["error"]}"); @@ -440,16 +443,17 @@ class NanoClient { required String destinationAddress, required String privateKey, }) async { - final receivableResponse = await http.post(_node!.uri, - headers: getHeaders(_node!.uri.host), - body: jsonEncode({ - "action": "receivable", - "account": destinationAddress, - "count": "-1", - "source": true, - })); - - final receivableData = await jsonDecode(receivableResponse.body); + final receivableResponse = await ProxyWrapper().post( + clearnetUri: _node!.uri, + headers: getHeaders(_node!.uri.host), + body: jsonEncode({ + "action": "receivable", + "account": destinationAddress, + "count": "-1", + "source": true, + }), + ); + final receivableData = jsonDecode(receivableResponse.body) as Map; if (receivableData["blocks"] == "" || receivableData["blocks"] == null) { return 0; } @@ -492,15 +496,18 @@ class NanoClient { Future> fetchTransactions(String address) async { try { - final response = await http.post(_node!.uri, - headers: getHeaders(_node!.uri.host), - body: jsonEncode({ - "action": "account_history", - "account": address, - "count": "100", - // "raw": true, - })); - final data = await jsonDecode(response.body); + final response = await ProxyWrapper().post( + clearnetUri: _node!.uri, + headers: getHeaders(_node!.uri.host), + body: jsonEncode({ + "action": "account_history", + "account": address, + "count": "100", + // "raw": true, + }), + ); + + final data = jsonDecode(response.body) as Map; final transactions = data["history"] is List ? data["history"] as List : []; // Map the transactions list to NanoTransactionModel using the factory @@ -516,13 +523,14 @@ class NanoClient { Future> getN2Reps() async { final uri = Uri.parse(N2_REPS_ENDPOINT); - final response = await http.post( - uri, + final response = await ProxyWrapper().post( + clearnetUri: uri, headers: getHeaders(uri.host), body: jsonEncode({"action": "reps"}), ); try { - final List nodes = (json.decode(response.body) as List) + + final List nodes = (jsonDecode(response.body) as List) .map((dynamic e) => N2Node.fromJson(e as Map)) .toList(); return nodes; @@ -533,8 +541,8 @@ class NanoClient { Future getRepScore(String rep) async { final uri = Uri.parse(N2_REPS_ENDPOINT); - final response = await http.post( - uri, + final response = await ProxyWrapper().post( + clearnetUri: uri, headers: getHeaders(uri.host), body: jsonEncode({ "action": "rep_info", @@ -542,7 +550,8 @@ class NanoClient { }), ); try { - final N2Node node = N2Node.fromJson(json.decode(response.body) as Map); + + final N2Node node = N2Node.fromJson(jsonDecode(response.body) as Map); return node.score ?? 100; } catch (error) { return 100; diff --git a/cw_nano/pubspec.lock b/cw_nano/pubspec.lock index 20b18e6ed..aa85d6dde 100644 --- a/cw_nano/pubspec.lock +++ b/cw_nano/pubspec.lock @@ -784,11 +784,21 @@ packages: socks5_proxy: dependency: transitive description: - name: socks5_proxy - sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053" - url: "https://pub.dev" - source: hosted - version: "1.0.6" + path: "." + ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + url: "https://github.com/LacticWhale/socks_dart" + source: git + version: "2.1.0" + socks_socket: + dependency: transitive + description: + path: "." + ref: e6232c53c1595469931ababa878759a067c02e94 + resolved-ref: e6232c53c1595469931ababa878759a067c02e94 + url: "https://github.com/sneurlax/socks_socket" + source: git + version: "1.1.1" source_gen: dependency: transitive description: @@ -865,10 +875,19 @@ packages: dependency: transitive description: name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.1" + tor_binary: + dependency: transitive + description: + path: "." + ref: cb811c610871a9517d47134b87c2f590c15c96c5 + resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5 + url: "https://github.com/MrCyjaneK/flutter-tor_binary" + source: git + version: "4.7.14" tuple: dependency: transitive description: diff --git a/cw_polygon/lib/polygon_client.dart b/cw_polygon/lib/polygon_client.dart index 7e9e882fa..5c344debe 100644 --- a/cw_polygon/lib/polygon_client.dart +++ b/cw_polygon/lib/polygon_client.dart @@ -40,7 +40,7 @@ class PolygonClient extends EVMChainClient { Future> fetchTransactions(String address, {String? contractAddress}) async { try { - final response = await httpClient.get(Uri.https("api.etherscan.io", "/v2/api", { + final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", { "chainid": "$chainId", "module": "account", "action": contractAddress != null ? "tokentx" : "txlist", @@ -68,7 +68,7 @@ class PolygonClient extends EVMChainClient { @override Future> fetchInternalTransactions(String address) async { try { - final response = await httpClient.get(Uri.https("api.etherscan.io", "/v2/api", { + final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", { "chainid": "$chainId", "module": "account", "action": "txlistinternal", diff --git a/cw_solana/lib/solana_client.dart b/cw_solana/lib/solana_client.dart index 128366c73..d57da5af0 100644 --- a/cw_solana/lib/solana_client.dart +++ b/cw_solana/lib/solana_client.dart @@ -2,8 +2,10 @@ import 'dart:async'; import 'dart:convert'; import 'dart:math' as math; +import 'package:blockchain_utils/blockchain_utils.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/node.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/solana_rpc_http_service.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_solana/pending_solana_transaction.dart'; @@ -11,7 +13,6 @@ import 'package:cw_solana/solana_balance.dart'; import 'package:cw_solana/solana_exceptions.dart'; import 'package:cw_solana/solana_transaction_model.dart'; import 'package:cw_solana/spl_token.dart'; -import 'package:http/http.dart' as http; import 'package:on_chain/solana/solana.dart'; import 'package:on_chain/solana/src/instructions/associated_token_account/constant.dart'; import 'package:on_chain/solana/src/models/pda/pda.dart'; @@ -20,10 +21,10 @@ import 'package:on_chain/solana/src/rpc/models/models/confirmed_transaction_meta import '.secrets.g.dart' as secrets; class SolanaWalletClient { - final httpClient = http.Client(); - SolanaRPC? _provider; // Minimum amount in SOL to consider a transaction valid (to filter spam) static const double minValidAmount = 0.00000003; + final httpClient = ProxyWrapper().getHttpClient(); + SolanaRPC? _provider; bool connect(Node node) { try { @@ -86,7 +87,8 @@ class SolanaWalletClient { } } - Future getSplTokenBalance(String mintAddress, String walletAddress) async { + Future getSplTokenBalance( + String mintAddress, String walletAddress) async { // Fetch the token accounts (a token can have multiple accounts for various uses) final tokenAccounts = await getSPLTokenAccounts(mintAddress, walletAddress); @@ -122,14 +124,16 @@ class SolanaWalletClient { ), ); - final fee = (feeForMessage?.toDouble() ?? 0.0) / SolanaUtils.lamportsPerSol; + final fee = + (feeForMessage?.toDouble() ?? 0.0) / SolanaUtils.lamportsPerSol; return fee; } catch (_) { return 0.0; } } - Future getEstimatedFee(SolanaPublicKey publicKey, Commitment commitment) async { + Future getEstimatedFee( + SolanaPublicKey publicKey, Commitment commitment) async { final message = await _getMessageForNativeTransaction( publicKey: publicKey, destinationAddress: publicKey.toAddress().address, @@ -429,17 +433,20 @@ class SolanaWalletClient { } })); - final versionedBatchResponses = batchResponses.whereType(); + final versionedBatchResponses = + batchResponses.whereType(); - final parsedTransactionsFutures = versionedBatchResponses.map((tx) => parseTransaction( - txResponse: tx, - splTokenSymbol: splTokenSymbol, - walletAddress: walletAddress?.address ?? address.address, - )); + final parsedTransactionsFutures = + versionedBatchResponses.map((tx) => parseTransaction( + txResponse: tx, + splTokenSymbol: splTokenSymbol, + walletAddress: walletAddress?.address ?? address.address, + )); final parsedTransactions = await Future.wait(parsedTransactionsFutures); - transactions.addAll(parsedTransactions.whereType().toList()); + transactions.addAll( + parsedTransactions.whereType().toList()); // Only update UI if we have new valid transactions if (parsedTransactions.isNotEmpty) { @@ -508,8 +515,8 @@ class SolanaWalletClient { } Future fetchSPLTokenInfo(String mintAddress) async { - final programAddress = - MetaplexTokenMetaDataProgramUtils.findMetadataPda(mint: SolAddress(mintAddress)); + final programAddress = MetaplexTokenMetaDataProgramUtils.findMetadataPda( + mint: SolAddress(mintAddress)); final token = await _provider!.request( SolanaRPCGetMetadataAccount( @@ -530,8 +537,9 @@ class SolanaWalletClient { // iconPath = await _client.getIconImageFromTokenUri(metadata.uri); // } catch (_) {} - String filteredTokenSymbol = - metadata.symbol.replaceFirst(RegExp('^\\\$'), '').replaceAll('\u0000', ''); + String filteredTokenSymbol = metadata.symbol + .replaceFirst(RegExp('^\\\$'), '') + .replaceAll('\u0000', ''); return SPLToken.fromMetadata( name: metadata.name, @@ -647,7 +655,8 @@ class SolanaWalletClient { return message; } - Future _getFeeFromCompiledMessage(Message message, Commitment commitment) async { + Future _getFeeFromCompiledMessage( + Message message, Commitment commitment) async { final base64Message = base64Encode(message.serialize()); final fee = await getFeeForMessage(base64Message, commitment); @@ -786,7 +795,8 @@ class SolanaWalletClient { required SolAddress mintAddress, required bool shouldCreateATA, }) async { - final associatedTokenAccount = AssociatedTokenAccountProgramUtils.associatedTokenAccount( + final associatedTokenAccount = + AssociatedTokenAccountProgramUtils.associatedTokenAccount( mint: mintAddress, owner: ownerAddress, ); @@ -857,7 +867,8 @@ class SolanaWalletClient { final amount = (inputAmount * math.pow(10, tokenDecimals)).toInt(); ProgramDerivedAddress? associatedSenderAccount; try { - associatedSenderAccount = AssociatedTokenAccountProgramUtils.associatedTokenAccount( + associatedSenderAccount = + AssociatedTokenAccountProgramUtils.associatedTokenAccount( mint: mintAddress, owner: ownerPrivateKey.publicKey().toAddress(), ); @@ -992,7 +1003,8 @@ class SolanaWalletClient { if (uri.isEmpty || uri == '…') return null; try { - final response = await httpClient.get(Uri.parse(uri)); + final client = ProxyWrapper().getHttpIOClient(); + final response = await client.get(Uri.parse(uri)); final jsonResponse = json.decode(response.body) as Map; diff --git a/cw_tron/lib/tron_client.dart b/cw_tron/lib/tron_client.dart index ee93fbd53..cceec5327 100644 --- a/cw_tron/lib/tron_client.dart +++ b/cw_tron/lib/tron_client.dart @@ -5,6 +5,7 @@ import 'dart:developer'; import 'package:blockchain_utils/blockchain_utils.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/node.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_tron/pending_tron_transaction.dart'; import 'package:cw_tron/tron_abi.dart'; import 'package:cw_tron/tron_balance.dart'; @@ -13,12 +14,12 @@ import 'package:cw_tron/tron_token.dart'; import 'package:cw_tron/tron_transaction_model.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import 'package:http/http.dart'; import '.secrets.g.dart' as secrets; import 'package:on_chain/on_chain.dart'; class TronClient { - final httpClient = Client(); + late final client = ProxyWrapper().getHttpIOClient(); + TronProvider? _provider; // This is an internal tracker, so we don't have to "refetch". int _nativeTxEstimatedFee = 0; @@ -28,7 +29,7 @@ class TronClient { Future> fetchTransactions(String address, {String? contractAddress}) async { try { - final response = await httpClient.get( + final response = await client.get( Uri.https( "api.trongrid.io", "/v1/accounts/$address/transactions", @@ -61,7 +62,7 @@ class TronClient { Future> fetchTrc20ExcludedTransactions(String address) async { try { - final response = await httpClient.get( + final response = await client.get( Uri.https( "api.trongrid.io", "/v1/accounts/$address/transactions/trc20", diff --git a/cw_tron/lib/tron_http_provider.dart b/cw_tron/lib/tron_http_provider.dart index 8a3301f87..420ff85b0 100644 --- a/cw_tron/lib/tron_http_provider.dart +++ b/cw_tron/lib/tron_http_provider.dart @@ -1,22 +1,22 @@ import 'dart:convert'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:on_chain/tron/tron.dart'; import '.secrets.g.dart' as secrets; class TronHTTPProvider implements TronServiceProvider { TronHTTPProvider( {required this.url, - http.Client? client, - this.defaultRequestTimeout = const Duration(seconds: 30)}) - : client = client ?? http.Client(); + this.defaultRequestTimeout = const Duration(seconds: 30)}); + @override final String url; - final http.Client client; + late final client = ProxyWrapper().getHttpIOClient(); final Duration defaultRequestTimeout; @override - Future> get(TronRequestDetails params, [Duration? timeout]) async { + Future> get(TronRequestDetails params, + [Duration? timeout]) async { final response = await client.get(Uri.parse(params.url(url)), headers: { 'Content-Type': 'application/json', if (url.contains("trongrid")) 'TRON-PRO-API-KEY': secrets.tronGridApiKey, @@ -27,13 +27,16 @@ class TronHTTPProvider implements TronServiceProvider { } @override - Future> post(TronRequestDetails params, [Duration? timeout]) async { + Future> post(TronRequestDetails params, + [Duration? timeout]) async { final response = await client .post(Uri.parse(params.url(url)), headers: { 'Content-Type': 'application/json', - if (url.contains("trongrid")) 'TRON-PRO-API-KEY': secrets.tronGridApiKey, - if (url.contains("nownodes")) 'api-key': secrets.tronNowNodesApiKey, + if (url.contains("trongrid")) + 'TRON-PRO-API-KEY': secrets.tronGridApiKey, + if (url.contains("nownodes")) + 'api-key': secrets.tronNowNodesApiKey, }, body: params.toRequestBody()) .timeout(timeout ?? defaultRequestTimeout); diff --git a/cw_wownero/lib/api/wallet.dart b/cw_wownero/lib/api/wallet.dart index 20783490d..a4ba8cbb2 100644 --- a/cw_wownero/lib/api/wallet.dart +++ b/cw_wownero/lib/api/wallet.dart @@ -110,7 +110,16 @@ int getUnlockedBalance({int accountIndex = 0}) => int getCurrentHeight() => wownero.Wallet_blockChainHeight(wptr!); -int getNodeHeightSync() => wownero.Wallet_daemonBlockChainHeight(wptr!); +int cachedNodeHeight = 0; +int getNodeHeightSync() { + (() async { + final wptrAddress = wptr!.address; + cachedNodeHeight = await Isolate.run(() async { + return wownero.Wallet_daemonBlockChainHeight(Pointer.fromAddress(wptrAddress)); + }); + })(); + return cachedNodeHeight; +} bool isConnectedSync() => wownero.Wallet_connected(wptr!) != 0; @@ -154,7 +163,7 @@ Future setupNodeSync( } void startRefreshSync() { - wownero.Wallet_refreshAsync(wptr!); + // wownero.Wallet_refreshAsync(wptr!); wownero.Wallet_startRefresh(wptr!); } diff --git a/cw_wownero/lib/wownero_wallet.dart b/cw_wownero/lib/wownero_wallet.dart index e26672277..2befaa20d 100644 --- a/cw_wownero/lib/wownero_wallet.dart +++ b/cw_wownero/lib/wownero_wallet.dart @@ -16,6 +16,7 @@ import 'package:cw_core/transaction_direction.dart'; import 'package:cw_core/transaction_priority.dart'; import 'package:cw_core/unspent_coins_info.dart'; import 'package:cw_core/utils/print_verbose.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_info.dart'; import 'package:cw_core/wownero_amount_format.dart'; @@ -183,6 +184,14 @@ abstract class WowneroWalletBase @override Future connectToNode({required Node node}) async { + String socksProxy = node.socksProxyAddress ?? ''; + printV("bootstrapped: ${CakeTor.instance.bootstrapped}"); + printV(" enabled: ${CakeTor.instance.enabled}"); + printV(" port: ${CakeTor.instance.port}"); + printV(" started: ${CakeTor.instance.started}"); + if (CakeTor.instance.enabled) { + socksProxy = "127.0.0.1:${CakeTor.instance.port}"; + } try { syncStatus = ConnectingSyncStatus(); await wownero_wallet.setupNode( @@ -192,7 +201,7 @@ abstract class WowneroWalletBase useSSL: node.isSSL, isLightWallet: false, // FIXME: hardcoded value - socksProxyAddress: node.socksProxyAddress); + socksProxyAddress: socksProxy); wownero_wallet.setTrustedDaemon(node.trusted); syncStatus = ConnectedSyncStatus(); diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock index dac4bda39..0fa39123b 100644 --- a/cw_wownero/pubspec.lock +++ b/cw_wownero/pubspec.lock @@ -683,11 +683,21 @@ packages: socks5_proxy: dependency: transitive description: - name: socks5_proxy - sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053" - url: "https://pub.dev" - source: hosted - version: "1.0.6" + path: "." + ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + url: "https://github.com/LacticWhale/socks_dart" + source: git + version: "2.1.0" + socks_socket: + dependency: transitive + description: + path: "." + ref: e6232c53c1595469931ababa878759a067c02e94 + resolved-ref: e6232c53c1595469931ababa878759a067c02e94 + url: "https://github.com/sneurlax/socks_socket" + source: git + version: "1.1.1" source_gen: dependency: transitive description: @@ -764,10 +774,19 @@ packages: dependency: transitive description: name: timing - sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.1" + tor_binary: + dependency: transitive + description: + path: "." + ref: cb811c610871a9517d47134b87c2f590c15c96c5 + resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5 + url: "https://github.com/MrCyjaneK/flutter-tor_binary" + source: git + version: "4.7.14" tuple: dependency: transitive description: diff --git a/cw_zano/pubspec.lock b/cw_zano/pubspec.lock index 3c790399c..41edf154e 100644 --- a/cw_zano/pubspec.lock +++ b/cw_zano/pubspec.lock @@ -680,11 +680,21 @@ packages: socks5_proxy: dependency: transitive description: - name: socks5_proxy - sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053" - url: "https://pub.dev" - source: hosted - version: "1.0.6" + path: "." + ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685" + url: "https://github.com/LacticWhale/socks_dart" + source: git + version: "2.1.0" + socks_socket: + dependency: transitive + description: + path: "." + ref: e6232c53c1595469931ababa878759a067c02e94 + resolved-ref: e6232c53c1595469931ababa878759a067c02e94 + url: "https://github.com/sneurlax/socks_socket" + source: git + version: "1.1.1" source_gen: dependency: transitive description: @@ -765,6 +775,15 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" + tor_binary: + dependency: transitive + description: + path: "." + ref: cb811c610871a9517d47134b87c2f590c15c96c5 + resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5 + url: "https://github.com/MrCyjaneK/flutter-tor_binary" + source: git + version: "4.7.14" tuple: dependency: transitive description: diff --git a/integration_test/robots/wallet_keys_robot.dart b/integration_test/robots/wallet_keys_robot.dart index 189929737..38a605b9d 100644 --- a/integration_test/robots/wallet_keys_robot.dart +++ b/integration_test/robots/wallet_keys_robot.dart @@ -70,7 +70,10 @@ class WalletKeysAndSeedPageRobot { if (walletType == WalletType.bitcoin || walletType == WalletType.litecoin || walletType == WalletType.bitcoinCash) { - commonTestCases.hasText(appStore.wallet!.seed!); + final seedWords = appStore.wallet!.seed!.split(" "); + for (var seedWord in seedWords) { + commonTestCases.hasTextAtLestOnce(seedWord); + } tester.printToConsole('$walletName wallet has seeds properly displayed'); } @@ -78,10 +81,14 @@ class WalletKeysAndSeedPageRobot { walletType == WalletType.solana || walletType == WalletType.tron) { if (hasSeed) { - commonTestCases.hasText(appStore.wallet!.seed!); + final seedWords = appStore.wallet!.seed!.split(" "); + for (var seedWord in seedWords) { + commonTestCases.hasTextAtLestOnce(seedWord); + } tester.printToConsole('$walletName wallet has seeds properly displayed'); } if (hasPrivateKey) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(appStore.wallet!.privateKey!); tester.printToConsole('$walletName wallet has private key properly displayed'); } @@ -89,14 +96,19 @@ class WalletKeysAndSeedPageRobot { if (walletType == WalletType.nano || walletType == WalletType.banano) { if (hasSeed) { - commonTestCases.hasText(appStore.wallet!.seed!); + final seedWords = appStore.wallet!.seed!.split(" "); + for (var seedWord in seedWords) { + commonTestCases.hasTextAtLestOnce(seedWord); + } tester.printToConsole('$walletName wallet has seeds properly displayed'); } if (hasHexSeed) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(appStore.wallet!.hexSeed!); tester.printToConsole('$walletName wallet has hexSeed properly displayed'); } if (hasPrivateKey) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(appStore.wallet!.privateKey!); tester.printToConsole('$walletName wallet has private key properly displayed'); } @@ -129,35 +141,39 @@ class WalletKeysAndSeedPageRobot { final hasSeedLegacy = Polyseed.isValidSeed(seed); if (hasPublicSpendKey) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(keys.publicSpendKey); tester.printToConsole('$walletName wallet has public spend key properly displayed'); } if (hasPrivateSpendKey) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(keys.privateSpendKey); tester.printToConsole('$walletName wallet has private spend key properly displayed'); } if (hasPublicViewKey) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(keys.publicViewKey); tester.printToConsole('$walletName wallet has public view key properly displayed'); } if (hasPrivateViewKey) { + await commonTestCases.tapItemByKey('wallet_keys_page_keys'); commonTestCases.hasText(keys.privateViewKey); tester.printToConsole('$walletName wallet has private view key properly displayed'); } if (hasSeeds) { - await commonTestCases.dragUntilVisible( - '${walletName}_wallet_seed_item_key', - 'wallet_keys_page_credentials_list_view_key', - ); - commonTestCases.hasText(seed); + await commonTestCases.tapItemByKey('wallet_keys_page_seed'); + final seedWords = seed.split(" "); + for (var seedWord in seedWords) { + commonTestCases.hasTextAtLestOnce(seedWord); + } tester.printToConsole('$walletName wallet has seeds properly displayed'); } if (hasSeedLegacy) { - await commonTestCases.dragUntilVisible( - '${walletName}_wallet_seed_legacy_item_key', - 'wallet_keys_page_credentials_list_view_key', - ); - commonTestCases.hasText(legacySeed); + await commonTestCases.tapItemByKey('wallet_keys_page_seed_legacy'); + final seedWords = legacySeed.split(" "); + for (var seedWord in seedWords) { + commonTestCases.hasTextAtLestOnce(seedWord); + } tester.printToConsole('$walletName wallet has legacy seeds properly displayed'); } } diff --git a/lib/anonpay/anonpay_api.dart b/lib/anonpay/anonpay_api.dart index acab662d1..d68807b95 100644 --- a/lib/anonpay/anonpay_api.dart +++ b/lib/anonpay/anonpay_api.dart @@ -6,8 +6,8 @@ import 'package:cake_wallet/anonpay/anonpay_status_response.dart'; import 'package:cake_wallet/core/fiat_conversion_service.dart'; import 'package:cake_wallet/entities/fiat_currency.dart'; import 'package:cake_wallet/exchange/limits.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/wallet_base.dart'; -import 'package:http/http.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cake_wallet/.secrets.g.dart' as secrets; @@ -20,8 +20,9 @@ class AnonPayApi { final WalletBase wallet; static const anonpayRef = secrets.anonPayReferralCode; - static const onionApiAuthority = 'tqzngtf2hybjbexznel6dhgsvbynjzezoybvtv6iofomx7gchqfssgqd.onion'; static const clearNetAuthority = 'trocador.app'; + // static const onionApiAuthority = 'tqzngtf2hybjbexznel6dhgsvbynjzezoybvtv6iofomx7gchqfssgqd.onion'; + static const onionApiAuthority = clearNetAuthority; static const markup = secrets.trocadorExchangeMarkup; static const anonPayPath = '/anonpay'; static const anonPayStatus = '/anonpay/status'; @@ -29,8 +30,11 @@ class AnonPayApi { static const apiKey = secrets.trocadorApiKey; Future paymentStatus(String id) async { - final authority = await _getAuthority(); - final response = await get(Uri.https(authority, "$anonPayStatus/$id")); + final response = await ProxyWrapper().get( + clearnetUri: Uri.https(clearNetAuthority, "$anonPayStatus/$id"), + onionUri: Uri.https(onionApiAuthority, "$anonPayStatus/$id"), + ); + final responseJSON = json.decode(response.body) as Map; final status = responseJSON['Status'] as String; final fiatAmount = responseJSON['Fiat_Amount'] as double?; @@ -69,10 +73,11 @@ class AnonPayApi { if (request.fiatEquivalent != null) { body['fiat_equiv'] = request.fiatEquivalent; } - final authority = await _getAuthority(); - - final response = await get(Uri.https(authority, anonPayPath, body)); - + final response = await ProxyWrapper().get( + clearnetUri: Uri.https(clearNetAuthority, anonPayPath, body), + onionUri: Uri.https(onionApiAuthority, anonPayPath, body), + ); + final responseJSON = json.decode(response.body) as Map; final id = responseJSON['ID'] as String; final url = responseJSON['url'] as String; @@ -146,17 +151,16 @@ class AnonPayApi { 'name': cryptoCurrency.name, }; - final String apiAuthority = await _getAuthority(); - final uri = Uri.https(apiAuthority, coinPath, params); - - final response = await get(uri); - + final response = await ProxyWrapper().get( + clearnetUri: Uri.https(clearNetAuthority, coinPath, params), + onionUri: Uri.https(onionApiAuthority, coinPath, params), + ); + + final responseJSON = json.decode(response.body) as List; if (response.statusCode != 200) { throw Exception('Unexpected http status: ${response.statusCode}'); } - final responseJSON = json.decode(response.body) as List; - if (responseJSON.isEmpty) { throw Exception('No data'); } @@ -197,17 +201,4 @@ class AnonPayApi { return tag.toLowerCase(); } } - - Future _getAuthority() async { - try { - if (useTorOnly) { - return onionApiAuthority; - } - final uri = Uri.https(onionApiAuthority, '/anonpay'); - await get(uri); - return onionApiAuthority; - } catch (e) { - return clearNetAuthority; - } - } } diff --git a/lib/anypay/anypay_api.dart b/lib/anypay/anypay_api.dart index 0b81d24c2..20187484b 100644 --- a/lib/anypay/anypay_api.dart +++ b/lib/anypay/anypay_api.dart @@ -1,8 +1,8 @@ import 'dart:convert'; import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart'; import 'package:cake_wallet/utils/exception_handler.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:flutter/foundation.dart'; -import 'package:http/http.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cake_wallet/anypay/any_pay_payment.dart'; import 'package:cake_wallet/anypay/any_pay_trasnaction.dart'; @@ -53,8 +53,12 @@ class AnyPayApi { final body = { 'chain': chainByScheme(scheme), 'currency': currencyByScheme(scheme).title}; - final response = await post(url, headers: headers, body: utf8.encode(json.encode(body))); - + final response = await ProxyWrapper().post( + clearnetUri: url, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 200) { await ExceptionHandler.onError(FlutterErrorDetails(exception: response)); throw Exception('Unexpected response http code: ${response.statusCode}'); @@ -79,7 +83,12 @@ class AnyPayApi { 'chain': chain, 'currency': currency, 'transactions': transactions.map((tx) => {'tx': tx.tx, 'tx_hash': tx.id, 'tx_key': tx.key}).toList()}; - final response = await post(Uri.parse(uri), headers: headers, body: utf8.encode(json.encode(body))); + final response = await ProxyWrapper().post( + clearnetUri: Uri.parse(uri), + headers: headers, + body: json.encode(body), + ); + if (response.statusCode == 400) { final decodedBody = json.decode(response.body) as Map; throw Exception(decodedBody['message'] as String? ?? 'Unexpected response\nError code: 400'); diff --git a/lib/buy/dfx/dfx_buy_provider.dart b/lib/buy/dfx/dfx_buy_provider.dart index 150f731dc..eed527cf1 100644 --- a/lib/buy/dfx/dfx_buy_provider.dart +++ b/lib/buy/dfx/dfx_buy_provider.dart @@ -10,6 +10,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -17,7 +18,6 @@ import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; import 'package:url_launcher/url_launcher.dart'; class DFXBuyProvider extends BuyProvider { @@ -100,11 +100,12 @@ class DFXBuyProvider extends BuyProvider { }); final uri = Uri.https(_baseUrl, _authPath); - var response = await http.post( - uri, + final response = await ProxyWrapper().post( + clearnetUri: uri, headers: {'Content-Type': 'application/json'}, body: requestBody, ); + if (response.statusCode == 201) { final responseBody = jsonDecode(response.body); @@ -137,8 +138,10 @@ class DFXBuyProvider extends BuyProvider { final url = Uri.https(_baseUrl, '/v1/fiat'); try { - final response = await http.get(url, headers: {'accept': 'application/json'}); - + final response = await ProxyWrapper().get( + clearnetUri: url, + headers: {'accept': 'application/json'}); + if (response.statusCode == 200) { final data = jsonDecode(response.body) as List; for (final item in data) { @@ -160,8 +163,8 @@ class DFXBuyProvider extends BuyProvider { final url = Uri.https(_baseUrl, '/v1/asset', {'blockchains': blockchain}); try { - final response = await http.get(url, headers: {'accept': 'application/json'}); - + final response = await ProxyWrapper().get(clearnetUri: url, headers: {'accept': 'application/json'}); + if (response.statusCode == 200) { final responseData = jsonDecode(response.body); @@ -271,7 +274,12 @@ class DFXBuyProvider extends BuyProvider { }); try { - final response = await http.put(url, headers: headers, body: body); + final response = await ProxyWrapper().put( + clearnetUri: url, + headers: headers, + body: body, + ); + final responseData = jsonDecode(response.body); if (response.statusCode == 200) { diff --git a/lib/buy/kryptonim/kryptonim.dart b/lib/buy/kryptonim/kryptonim.dart index 5e58ce190..1d2d10f58 100644 --- a/lib/buy/kryptonim/kryptonim.dart +++ b/lib/buy/kryptonim/kryptonim.dart @@ -9,10 +9,10 @@ import 'package:cake_wallet/entities/fiat_currency.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cw_core/crypto_currency.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:flutter/material.dart'; import 'dart:developer'; -import 'package:http/http.dart' as http; import 'package:url_launcher/url_launcher.dart'; class KryptonimBuyProvider extends BuyProvider { @@ -74,9 +74,14 @@ class KryptonimBuyProvider extends BuyProvider { }); try { - final response = await http.post(url, headers: headers, body: body); + final response = await ProxyWrapper().post( + clearnetUri: url, + headers: headers, + body: body, + ); if (response.statusCode == 200 || response.statusCode == 201 || response.statusCode == 401) { + return jsonDecode(response.body) as Map; } else { return {}; diff --git a/lib/buy/meld/meld_buy_provider.dart b/lib/buy/meld/meld_buy_provider.dart index db593d358..002ab0465 100644 --- a/lib/buy/meld/meld_buy_provider.dart +++ b/lib/buy/meld/meld_buy_provider.dart @@ -8,13 +8,13 @@ import 'package:cake_wallet/buy/payment_method.dart'; import 'package:cake_wallet/entities/fiat_currency.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:flutter/material.dart'; import 'dart:developer'; -import 'package:http/http.dart' as http; import 'package:url_launcher/url_launcher.dart'; class MeldBuyProvider extends BuyProvider { @@ -71,8 +71,8 @@ class MeldBuyProvider extends BuyProvider { final url = Uri.https(_baseUrl, path, params); try { - final response = await http.get( - url, + final response = await ProxyWrapper().get( + clearnetUri: url, headers: { 'Authorization': _isProduction ? '' : _testApiKey, 'Meld-Version': '2023-12-19', @@ -80,6 +80,7 @@ class MeldBuyProvider extends BuyProvider { 'content-type': 'application/json', }, ); + if (response.statusCode == 200) { final data = jsonDecode(response.body) as List; @@ -130,7 +131,12 @@ class MeldBuyProvider extends BuyProvider { }); try { - final response = await http.post(url, headers: headers, body: body); + final response = await ProxyWrapper().post( + clearnetUri: url, + headers: headers, + body: body, + ); + if (response.statusCode == 200) { final data = jsonDecode(response.body) as Map; diff --git a/lib/buy/moonpay/moonpay_provider.dart b/lib/buy/moonpay/moonpay_provider.dart index 47e8e34f9..1f9ab1bb1 100644 --- a/lib/buy/moonpay/moonpay_provider.dart +++ b/lib/buy/moonpay/moonpay_provider.dart @@ -16,12 +16,12 @@ import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/themes/core/material_base_theme.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:flutter/material.dart'; -import 'package:http/http.dart'; import 'package:url_launcher/url_launcher.dart'; class MoonPayProvider extends BuyProvider { @@ -98,9 +98,12 @@ class MoonPayProvider extends BuyProvider { Future getMoonpaySignature(String query) async { final uri = Uri.https(_cIdBaseUrl, "/api/moonpay"); - final response = await post(uri, - headers: {'Content-Type': 'application/json', 'x-api-key': _exchangeHelperApiKey}, - body: json.encode({'query': query})); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: {'Content-Type': 'application/json', 'x-api-key': _exchangeHelperApiKey}, + body: json.encode({'query': query}), + ); + if (response.statusCode == 200) { return (jsonDecode(response.body) as Map)['signature'] as String; @@ -120,7 +123,11 @@ class MoonPayProvider extends BuyProvider { final url = Uri.https(_baseUrl, path, params); try { - final response = await get(url, headers: {'accept': 'application/json'}); + final response = await ProxyWrapper().get( + clearnetUri: url, + headers: {'accept': 'application/json'}, + ); + if (response.statusCode == 200) { return jsonDecode(response.body) as Map; } else { @@ -191,8 +198,8 @@ class MoonPayProvider extends BuyProvider { final path = '$_currenciesPath/$formattedCryptoCurrency$quotePath'; final url = Uri.https(_baseUrl, path, params); try { - final response = await get(url); - + final response = await ProxyWrapper().get(clearnetUri: url); + if (response.statusCode == 200) { final data = jsonDecode(response.body) as Map; @@ -306,7 +313,8 @@ class MoonPayProvider extends BuyProvider { Future findOrderById(String id) async { final url = _apiUrl + _transactionsSuffix + '/$id' + '?apiKey=' + _apiKey; final uri = Uri.parse(url); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) { throw BuyException(title: providerDescription, content: 'Transaction $id is not found!'); diff --git a/lib/buy/onramper/onramper_buy_provider.dart b/lib/buy/onramper/onramper_buy_provider.dart index 54283a612..80c9a6326 100644 --- a/lib/buy/onramper/onramper_buy_provider.dart +++ b/lib/buy/onramper/onramper_buy_provider.dart @@ -9,11 +9,12 @@ import 'package:cake_wallet/buy/payment_method.dart'; import 'package:cake_wallet/entities/fiat_currency.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/themes/core/theme_store.dart'; +import 'package:cake_wallet/store/settings_store.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; import 'package:url_launcher/url_launcher.dart'; class OnRamperBuyProvider extends BuyProvider { @@ -66,8 +67,10 @@ class OnRamperBuyProvider extends BuyProvider { final url = Uri.https(_baseApiUrl, '$supported$defaultsAll', params); try { - final response = - await http.get(url, headers: {'Authorization': _apiKey, 'accept': 'application/json'}); + final response = await ProxyWrapper().get( + clearnetUri: url, + headers: {'Authorization': _apiKey, 'accept': 'application/json'}, + ); if (response.statusCode == 200) { final Map data = jsonDecode(response.body) as Map; @@ -102,8 +105,8 @@ class OnRamperBuyProvider extends BuyProvider { try { final response = - await http.get(url, headers: {'Authorization': _apiKey, 'accept': 'application/json'}); - + await ProxyWrapper().get(clearnetUri: url, headers: {'Authorization': _apiKey, 'accept': 'application/json'}); + if (response.statusCode == 200) { final Map data = jsonDecode(response.body) as Map; final List message = data['message'] as List; @@ -132,7 +135,8 @@ class OnRamperBuyProvider extends BuyProvider { try { final response = - await http.get(url, headers: {'Authorization': _apiKey, 'accept': 'application/json'}); + await ProxyWrapper().get(clearnetUri: url, headers: {'Authorization': _apiKey, 'accept': 'application/json'}); + if (response.statusCode == 200) { final Map data = jsonDecode(response.body) as Map; @@ -195,8 +199,8 @@ class OnRamperBuyProvider extends BuyProvider { final headers = {'Authorization': _apiKey, 'accept': 'application/json'}; try { - final response = await http.get(url, headers: headers); - + final response = await ProxyWrapper().get(clearnetUri: url, headers: headers); + if (response.statusCode == 200) { final data = jsonDecode(response.body) as List; if (data.isEmpty) return null; diff --git a/lib/buy/robinhood/robinhood_buy_provider.dart b/lib/buy/robinhood/robinhood_buy_provider.dart index 4945529ef..4b9c1aa70 100644 --- a/lib/buy/robinhood/robinhood_buy_provider.dart +++ b/lib/buy/robinhood/robinhood_buy_provider.dart @@ -11,6 +11,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart'; import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -18,7 +19,6 @@ import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; import 'package:url_launcher/url_launcher.dart'; class RobinhoodBuyProvider extends BuyProvider { @@ -69,7 +69,8 @@ class RobinhoodBuyProvider extends BuyProvider { final uri = Uri.https(_apiBaseUrl, '$_assetsPath', {'applicationId': _applicationId}); try { - final response = await http.get(uri, headers: {'accept': 'application/json'}); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'accept': 'application/json'}); + if (response.statusCode == 200) { final responseData = jsonDecode(response.body) as Map; @@ -122,12 +123,14 @@ class RobinhoodBuyProvider extends BuyProvider { final uri = Uri.https(_cIdBaseUrl, "/api/robinhood"); - var response = await http.post(uri, - headers: {'Content-Type': 'application/json'}, - body: json - .encode({'valid_until': valid_until, 'wallet': walletAddress, 'signature': signature})); + var response = await ProxyWrapper().post( + clearnetUri: uri, + headers: {'Content-Type': 'application/json'}, + body: json.encode({'valid_until': valid_until, 'wallet': walletAddress, 'signature': signature}), + ); if (response.statusCode == 200) { + return (jsonDecode(response.body) as Map)['connectId'] as String; } else { throw Exception('Provider currently unavailable. Status: ${response.statusCode}'); @@ -219,7 +222,8 @@ class RobinhoodBuyProvider extends BuyProvider { Uri.https('api.robinhood.com', '/catpay/v1/${cryptoCurrency.title}/quote/', queryParams); try { - final response = await http.get(uri, headers: {'accept': 'application/json'}); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'accept': 'application/json'}); + final responseData = jsonDecode(response.body) as Map; if (response.statusCode == 200) { diff --git a/lib/buy/wyre/wyre_buy_provider.dart b/lib/buy/wyre/wyre_buy_provider.dart index 7fe6f4be3..3f9844df6 100644 --- a/lib/buy/wyre/wyre_buy_provider.dart +++ b/lib/buy/wyre/wyre_buy_provider.dart @@ -3,7 +3,7 @@ import 'package:cake_wallet/buy/buy_exception.dart'; import 'package:cake_wallet/buy/pairs_utils.dart'; import 'package:cake_wallet/entities/fiat_currency.dart'; import 'package:cw_core/crypto_currency.dart'; -import 'package:http/http.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/buy/buy_amount.dart'; import 'package:cake_wallet/buy/buy_provider.dart'; import 'package:cake_wallet/buy/buy_provider_description.dart'; @@ -73,18 +73,21 @@ class WyreBuyProvider extends BuyProvider { 'referrerAccountId': _accountId, 'lockFields': ['amount', 'sourceCurrency', 'destCurrency', 'dest'] }; - final response = await post(uri, - headers: { - 'Authorization': 'Bearer $_secretKey', - 'Content-Type': 'application/json', - 'cache-control': 'no-cache' - }, - body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: { + 'Authorization': 'Bearer $_secretKey', + 'Content-Type': 'application/json', + 'cache-control': 'no-cache' + }, + body: json.encode(body), + ); if (response.statusCode != 200) { throw BuyException(title: providerDescription, content: 'Url $url is not found!'); } + final responseJSON = json.decode(response.body) as Map; final urlFromResponse = responseJSON['url'] as String; return urlFromResponse; @@ -101,18 +104,21 @@ class WyreBuyProvider extends BuyProvider { 'country': _countryCode }; final uri = Uri.parse(quoteUrl); - final response = await post(uri, - headers: { - 'Authorization': 'Bearer $_secretKey', - 'Content-Type': 'application/json', - 'cache-control': 'no-cache' - }, - body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: { + 'Authorization': 'Bearer $_secretKey', + 'Content-Type': 'application/json', + 'cache-control': 'no-cache' + }, + body: json.encode(body), + ); if (response.statusCode != 200) { throw BuyException(title: providerDescription, content: 'Quote is not found!'); } + final responseJSON = json.decode(response.body) as Map; final sourceAmount = responseJSON['sourceAmount'] as double; final destAmount = responseJSON['destAmount'] as double; @@ -125,8 +131,7 @@ class WyreBuyProvider extends BuyProvider { Future findOrderById(String id) async { final orderUrl = baseApiUrl + _ordersSuffix + '/$id'; final orderUri = Uri.parse(orderUrl); - final orderResponse = await get(orderUri); - + final orderResponse = await ProxyWrapper().get(clearnetUri: orderUri); if (orderResponse.statusCode != 200) { throw BuyException(title: providerDescription, content: 'Order $id is not found!'); } @@ -142,8 +147,7 @@ class WyreBuyProvider extends BuyProvider { final transferUrl = baseApiUrl + _transferSuffix + transferId + _trackSuffix; final transferUri = Uri.parse(transferUrl); - final transferResponse = await get(transferUri); - + final transferResponse = await ProxyWrapper().get(clearnetUri: transferUri); if (transferResponse.statusCode != 200) { throw BuyException(title: providerDescription, content: 'Transfer $transferId is not found!'); } diff --git a/lib/cake_pay/cake_pay_api.dart b/lib/cake_pay/cake_pay_api.dart index 5f1a350c0..a3c7f48d0 100644 --- a/lib/cake_pay/cake_pay_api.dart +++ b/lib/cake_pay/cake_pay_api.dart @@ -3,9 +3,9 @@ import 'dart:convert'; import 'package:cake_wallet/cake_pay/cake_pay_order.dart'; import 'package:cake_wallet/cake_pay/cake_pay_user_credentials.dart'; import 'package:cake_wallet/cake_pay/cake_pay_vendor.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cake_wallet/entities/country.dart'; -import 'package:http/http.dart' as http; class CakePayApi { static const testBaseUri = false; @@ -32,12 +32,17 @@ class CakePayApi { 'Content-Type': 'application/json', 'Authorization': 'Api-Key $apiKey', }; - final response = await http.post(uri, headers: headers, body: json.encode({'email': email})); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode({'email': email}), + ); if (response.statusCode != 200) { throw Exception('Unexpected http status: ${response.statusCode}'); } + final bodyJson = json.decode(response.body) as Map; if (bodyJson.containsKey('user') && bodyJson['user']['email'] != null) { @@ -64,12 +69,17 @@ class CakePayApi { }; final query = {'email': email, 'otp': code}; - final response = await http.post(uri, headers: headers, body: json.encode(query)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(query), + ); if (response.statusCode != 200) { throw Exception('Unexpected http status: ${response.statusCode}'); } + final bodyJson = json.decode(response.body) as Map; if (bodyJson.containsKey('error')) { @@ -116,9 +126,14 @@ class CakePayApi { }; try { - final response = await http.post(uri, headers: headers, body: json.encode(query)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(query), + ); if (response.statusCode != 201) { + final responseBody = json.decode(response.body); if (responseBody is List) { throw '${responseBody[0]}'; @@ -127,6 +142,7 @@ class CakePayApi { } } + final bodyJson = json.decode(response.body) as Map; return CakePayOrder.fromMap(bodyJson); } catch (e) { @@ -145,7 +161,8 @@ class CakePayApi { 'X-CSRFToken': CSRFToken, }; - final response = await http.get(uri, headers: headers); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + printV('Response: ${response.statusCode}'); @@ -168,7 +185,11 @@ class CakePayApi { }; try { - final response = await http.post(uri, headers: headers, body: json.encode({'email': email})); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode({'email': email}), + ); if (response.statusCode != 200) { throw Exception('Unexpected http status: ${response.statusCode}'); @@ -187,8 +208,8 @@ class CakePayApi { 'Authorization': 'Api-Key $apiKey', }; - final response = await http.get(uri, headers: headers); - + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + if (response.statusCode != 200) { throw Exception('Unexpected http status: ${response.statusCode}'); } @@ -234,14 +255,15 @@ class CakePayApi { 'Authorization': 'Api-Key $apiKey', }; - var response = await http.get(uri, headers: headers); + var response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + if (response.statusCode != 200) { throw Exception( 'Failed to fetch vendors: statusCode - ${response.statusCode}, queryParams -$queryParams, response - ${response.body}'); } - final bodyJson = json.decode(utf8.decode(response.bodyBytes)); + final bodyJson = json.decode(response.body); if (bodyJson is List && bodyJson.isEmpty) { return []; diff --git a/lib/core/background_sync.dart b/lib/core/background_sync.dart index 12eb81f99..a503f5c1b 100644 --- a/lib/core/background_sync.dart +++ b/lib/core/background_sync.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/di.dart'; import 'package:cake_wallet/entities/preferences_key.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/utils/feature_flag.dart'; +import 'package:cake_wallet/utils/tor.dart'; import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart'; import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart'; import 'package:cw_core/sync_status.dart'; @@ -15,6 +16,7 @@ import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:flutter/foundation.dart'; class BackgroundSync { final FlutterLocalNotificationsPlugin _notificationsPlugin = FlutterLocalNotificationsPlugin(); @@ -90,6 +92,11 @@ class BackgroundSync { } Future sync() async { + final settingsStore = getIt.get(); + if (settingsStore.currentBuiltinTor) { + printV("Starting Tor"); + await ensureTorStarted(context: null); + } printV("Background sync started"); await _syncWallets(); printV("Background sync completed"); @@ -100,7 +107,6 @@ class BackgroundSync { final walletListViewModel = getIt.get(); final settingsStore = getIt.get(); - final List moneroWallets = walletListViewModel.wallets .where((element) => !element.isHardware) .where((element) => ![WalletType.haven, WalletType.decred].contains(element.type)) diff --git a/lib/core/fiat_conversion_service.dart b/lib/core/fiat_conversion_service.dart index 8a37175b4..046c2b149 100644 --- a/lib/core/fiat_conversion_service.dart +++ b/lib/core/fiat_conversion_service.dart @@ -1,18 +1,15 @@ +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cake_wallet/entities/fiat_currency.dart'; import 'dart:convert'; -import 'package:flutter/foundation.dart'; -import 'package:http/http.dart'; import 'package:cake_wallet/.secrets.g.dart' as secrets; const _fiatApiClearNetAuthority = 'fiat-api.cakewallet.com'; -const _fiatApiOnionAuthority = 'n4z7bdcmwk2oyddxvzaap3x2peqcplh3pzdy7tpkk5ejz5n4mhfvoxqd.onion'; +// const _fiatApiOnionAuthority = 'n4z7bdcmwk2oyddxvzaap3x2peqcplh3pzdy7tpkk5ejz5n4mhfvoxqd.onion'; +const _fiatApiOnionAuthority = _fiatApiClearNetAuthority; const _fiatApiPath = '/v2/rates'; -Future _fetchPrice(Map args) async { - final crypto = args['crypto'] as String; - final fiat = args['fiat'] as String; - final torOnly = args['torOnly'] as bool; +Future _fetchPrice(String crypto, String fiat, bool torOnly) async { final Map queryParams = { 'interval_count': '1', @@ -24,14 +21,14 @@ Future _fetchPrice(Map args) async { num price = 0.0; try { - late final Uri uri; - if (torOnly) { - uri = Uri.http(_fiatApiOnionAuthority, _fiatApiPath, queryParams); - } else { - uri = Uri.https(_fiatApiClearNetAuthority, _fiatApiPath, queryParams); - } + final onionUri = Uri.http(_fiatApiOnionAuthority, _fiatApiPath, queryParams); + final clearnetUri = Uri.https(_fiatApiClearNetAuthority, _fiatApiPath, queryParams); - final response = await get(uri); + final response = await ProxyWrapper().get( + onionUri: onionUri, + clearnetUri: torOnly ? onionUri : clearnetUri, + ); + if (response.statusCode != 200) { return 0.0; @@ -50,18 +47,11 @@ Future _fetchPrice(Map args) async { } } -Future _fetchPriceAsync(CryptoCurrency crypto, FiatCurrency fiat, bool torOnly) async => - compute(_fetchPrice, { - 'fiat': fiat.toString(), - 'crypto': crypto.toString(), - 'torOnly': torOnly, - }); - class FiatConversionService { static Future fetchPrice({ required CryptoCurrency crypto, required FiatCurrency fiat, required bool torOnly, }) async => - await _fetchPriceAsync(crypto, fiat, torOnly); + await _fetchPrice(crypto.toString(), fiat.toString(), torOnly); } diff --git a/lib/core/open_crypto_pay/open_cryptopay_service.dart b/lib/core/open_crypto_pay/open_cryptopay_service.dart index 6449bbf90..4b317d9c3 100644 --- a/lib/core/open_crypto_pay/open_cryptopay_service.dart +++ b/lib/core/open_crypto_pay/open_cryptopay_service.dart @@ -5,15 +5,13 @@ import 'package:cake_wallet/core/open_crypto_pay/exceptions.dart'; import 'package:cake_wallet/core/open_crypto_pay/lnurl.dart'; import 'package:cake_wallet/core/open_crypto_pay/models.dart'; import 'package:cw_core/crypto_currency.dart'; -import 'package:http/http.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; class OpenCryptoPayService { static bool isOpenCryptoPayQR(String value) => value.toLowerCase().contains("lightning=lnurl") || value.toLowerCase().startsWith("lnurl"); - final Client _httpClient = Client(); - Future commitOpenCryptoPayRequest( String txHex, { required String txId, @@ -31,7 +29,8 @@ class OpenCryptoPayService { queryParams['tx'] = txId; final response = - await _httpClient.get(Uri.https(uri.authority, uri.path, queryParams)); + await ProxyWrapper().get(clearnetUri: Uri.https(uri.authority, uri.path, queryParams)); + if (response.statusCode == 200) { final body = jsonDecode(response.body) as Map; @@ -40,13 +39,13 @@ class OpenCryptoPayService { throw OpenCryptoPayException(body.toString()); } throw OpenCryptoPayException( - "Unexpected status code ${response.statusCode} ${response.body}"); + "Unexpected status code ${response.statusCode} ${response}"); } Future cancelOpenCryptoPayRequest(OpenCryptoPayRequest request) async { final uri = Uri.parse(request.callbackUrl.replaceAll("/cb/", "/cancel/")); - await _httpClient.delete(uri); + await ProxyWrapper().delete(clearnetUri: uri); } Future getOpenCryptoPayInvoice(String lnUrl) async { @@ -73,7 +72,8 @@ class OpenCryptoPayService { Future<(_OpenCryptoPayQuote, Map>)> _getOpenCryptoPayParams(Uri uri) async { - final response = await _httpClient.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 200) { final responseBody = jsonDecode(response.body) as Map; @@ -119,8 +119,8 @@ class OpenCryptoPayService { queryParams['asset'] = asset.title; queryParams['method'] = _getMethod(asset); - final response = - await _httpClient.get(Uri.https(uri.authority, uri.path, queryParams)); + final response = await ProxyWrapper().get(clearnetUri: Uri.https(uri.authority, uri.path, queryParams)); + if (response.statusCode == 200) { final responseBody = jsonDecode(response.body) as Map; diff --git a/lib/core/yat_service.dart b/lib/core/yat_service.dart index 92e81e5ef..84aac1626 100644 --- a/lib/core/yat_service.dart +++ b/lib/core/yat_service.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:cake_wallet/entities/yat_record.dart'; -import 'package:http/http.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; class YatService { static bool isDevMode = false; @@ -33,7 +33,8 @@ class YatService { final yatRecords = []; try { - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + final resBody = json.decode(response.body) as Map; final results = resBody["result"] as Map; // Favour a subaddress over a standard address. @@ -42,7 +43,7 @@ class YatService { results[MONERO_STD_ADDRESS] ?? results[tag]) as Map; - if (yatRecord != null) { + if (yatRecord.isNotEmpty) { yatRecords.add(YatRecord.fromJson(yatRecord)); } diff --git a/lib/di.dart b/lib/di.dart index 46c453d61..5a7be0f1f 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -33,10 +33,12 @@ import 'package:cake_wallet/exchange/provider/trocador_exchange_provider.dart'; import 'package:cake_wallet/haven/cw_haven.dart'; import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart'; import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart'; +import 'package:cake_wallet/src/screens/dev/network_requests.dart'; import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart'; import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart'; import 'package:cake_wallet/src/screens/integrations/deuro/savings_page.dart'; import 'package:cake_wallet/src/screens/settings/background_sync_page.dart'; +import 'package:cake_wallet/src/screens/start_tor/start_tor_page.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart'; @@ -48,6 +50,7 @@ import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart'; import 'package:cake_wallet/view_model/link_view_model.dart'; import 'package:cake_wallet/tron/tron.dart'; import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart'; +import 'package:cake_wallet/view_model/start_tor_view_model.dart'; import 'package:cw_core/receive_page_option.dart'; import 'package:cake_wallet/entities/wallet_edit_page_arguments.dart'; import 'package:cake_wallet/entities/wallet_manager.dart'; @@ -138,7 +141,6 @@ import 'package:cake_wallet/src/screens/settings/other_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/privacy_page.dart'; import 'package:cake_wallet/src/screens/settings/security_backup_page.dart'; import 'package:cake_wallet/src/screens/settings/silent_payments_settings.dart'; -import 'package:cake_wallet/src/screens/settings/tor_page.dart'; import 'package:cake_wallet/src/screens/settings/trocador_providers_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart'; @@ -690,7 +692,6 @@ Future setup({ return walletKitService; }); - getIt.registerFactory(() => NFTViewModel(appStore, getIt.get())); getIt.registerFactory(() => BalancePage( nftViewModel: getIt.get(), dashboardViewModel: getIt.get(), @@ -1495,7 +1496,7 @@ Future setup({ () => WalletConnectConnectionsView(walletKitService: getIt.get()), ); - getIt.registerFactory(() => TorPage(getIt.get())); + getIt.registerFactory(() => NFTViewModel(appStore, getIt.get())); getIt.registerFactory(() => SignViewModel(getIt.get().wallet!)); @@ -1512,7 +1513,11 @@ Future setup({ getIt.registerFactory(() => BackgroundSyncLogsViewModel()); getIt.registerFactory(() => DevBackgroundSyncLogsPage(getIt.get())); + + getIt.registerFactory(() => DevNetworkRequests()); + getIt.registerFactory(() => StartTorPage(StartTorViewModel(),)); + getIt.registerFactory(() => DEuroViewModel(getIt())); getIt.registerFactory(() => DEuroSavingsPage(getIt())); diff --git a/lib/entities/ens_record.dart b/lib/entities/ens_record.dart index 512244c1b..78b0f4178 100644 --- a/lib/entities/ens_record.dart +++ b/lib/entities/ens_record.dart @@ -1,14 +1,16 @@ import 'package:cake_wallet/ethereum/ethereum.dart'; import 'package:cake_wallet/polygon/polygon.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:ens_dart/ens_dart.dart'; -import 'package:http/http.dart'; import 'package:web3dart/web3dart.dart'; class EnsRecord { + static Future fetchEnsAddress(String name, {WalletBase? wallet}) async { + Web3Client? _client; if (wallet != null && wallet.type == WalletType.ethereum) { @@ -20,7 +22,9 @@ class EnsRecord { } if (_client == null) { - _client = Web3Client("https://ethereum-rpc.publicnode.com", Client()); + late final client = ProxyWrapper().getHttpIOClient(); + + _client = Web3Client("https://ethereum-rpc.publicnode.com", client); } try { diff --git a/lib/entities/fio_address_provider.dart b/lib/entities/fio_address_provider.dart index a88804c97..dcfd79c96 100644 --- a/lib/entities/fio_address_provider.dart +++ b/lib/entities/fio_address_provider.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; class FioAddressProvider { static const apiAuthority = 'fio.blockpane.com'; @@ -13,13 +13,17 @@ class FioAddressProvider { final body = {"fio_name": fioAddress}; final uri = Uri.https(apiAuthority, availCheck); - final response = - await http.post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); if (response.statusCode != 200) { return isFioRegistered; } + final responseJSON = json.decode(response.body) as Map; isFioRegistered = responseJSON['is_registered'] as int == 1; @@ -35,9 +39,13 @@ class FioAddressProvider { }; final uri = Uri.https(apiAuthority, getAddress); - final response = - await http.post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode == 400) { final responseJSON = json.decode(response.body) as Map; final error = responseJSON['error'] as String; diff --git a/lib/entities/preferences_key.dart b/lib/entities/preferences_key.dart index 9e384f462..0f3c1fe48 100644 --- a/lib/entities/preferences_key.dart +++ b/lib/entities/preferences_key.dart @@ -66,6 +66,7 @@ class PreferencesKey { static const moneroWalletPasswordUpdateV1Base = 'monero_wallet_update_v1'; static const syncModeKey = 'sync_mode'; static const syncAllKey = 'sync_all'; + static const builtinTorKey = 'builtin_tor'; static const lastPopupDate = 'last_popup_date'; static const lastAppReviewDate = 'last_app_review_date'; static const sortBalanceBy = 'sort_balance_by'; diff --git a/lib/entities/unstoppable_domain_address.dart b/lib/entities/unstoppable_domain_address.dart index a047c85d9..cf6eb8945 100644 --- a/lib/entities/unstoppable_domain_address.dart +++ b/lib/entities/unstoppable_domain_address.dart @@ -1,15 +1,16 @@ import 'dart:convert'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; Future fetchUnstoppableDomainAddress(String domain, String ticker) async { var address = ''; try { final uri = Uri.parse("https://api.unstoppabledomains.com/profile/public/${Uri.encodeQueryComponent(domain)}?fields=records"); - final jsonString = await http.read(uri); - final jsonParsed = json.decode(jsonString) as Map; + final response = await ProxyWrapper().get(clearnetUri: uri); + + final jsonParsed = json.decode(response.body) as Map; if (jsonParsed["records"] == null) { throw Exception(".records response from $uri is empty"); }; diff --git a/lib/entities/wellknown_record.dart b/lib/entities/wellknown_record.dart index dbe808281..6dd94440b 100644 --- a/lib/entities/wellknown_record.dart +++ b/lib/entities/wellknown_record.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; class WellKnownRecord { WellKnownRecord({ @@ -40,14 +40,15 @@ class WellKnownRecord { } // lookup domain/.well-known/nano-currency.json and check if it has a nano address: - final http.Response response = await http.get( - Uri.parse("https://$domain/.well-known/$jsonLocation.json?names=$name"), + final response = await ProxyWrapper().get( + clearnetUri: Uri.parse("https://$domain/.well-known/$jsonLocation.json?names=$name"), headers: {"Accept": "application/json"}, ); if (response.statusCode != 200) { return null; } + final Map decoded = json.decode(response.body) as Map; // Access the first element in the names array and retrieve its address diff --git a/lib/entities/zano_alias.dart b/lib/entities/zano_alias.dart index 1ddf95178..ec966e225 100644 --- a/lib/entities/zano_alias.dart +++ b/lib/entities/zano_alias.dart @@ -1,14 +1,14 @@ import 'dart:convert'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; class ZanoAlias { static Future fetchZanoAliasAddress(String alias) async { try { final uri = Uri.parse("http://zano.cakewallet.com:11211/json_rpc"); - final response = await http.post( - uri, + final response = await ProxyWrapper().post( + clearnetUri: uri, body: json.encode({ "id": 0, "jsonrpc": "2.0", @@ -16,6 +16,7 @@ class ZanoAlias { "params": {"alias": alias} }), ); + final jsonParsed = json.decode(response.body) as Map; return jsonParsed['result']['alias_details']['address'] as String?; diff --git a/lib/exchange/provider/chainflip_exchange_provider.dart b/lib/exchange/provider/chainflip_exchange_provider.dart index a2c27b745..c2e2f385c 100644 --- a/lib/exchange/provider/chainflip_exchange_provider.dart +++ b/lib/exchange/provider/chainflip_exchange_provider.dart @@ -12,7 +12,7 @@ import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:hive/hive.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; class ChainflipExchangeProvider extends ExchangeProvider { ChainflipExchangeProvider({required this.tradesStore}) @@ -275,7 +275,8 @@ class ChainflipExchangeProvider extends ExchangeProvider { Future> _getRequest(String path, Map params) async { final uri = Uri.https(_baseURL, path, params); - final response = await http.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if ((response.statusCode != 200) || (response.body.contains('error'))) { throw Exception('Unexpected response: ${response.statusCode} / ${uri.toString()} / ${response.body}'); @@ -287,7 +288,8 @@ class ChainflipExchangeProvider extends ExchangeProvider { Future?> _getStatus(Map params) async { final uri = Uri.https(_baseURL, _txInfoPath, params); - final response = await http.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 404) return null; diff --git a/lib/exchange/provider/changenow_exchange_provider.dart b/lib/exchange/provider/changenow_exchange_provider.dart index 79f8d70d4..2cbd97dd2 100644 --- a/lib/exchange/provider/changenow_exchange_provider.dart +++ b/lib/exchange/provider/changenow_exchange_provider.dart @@ -13,11 +13,11 @@ import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/utils/distribution_info.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/wallet_type_utils.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart'; - +import 'package:cw_core/utils/proxy_wrapper.dart'; class ChangeNowExchangeProvider extends ExchangeProvider { ChangeNowExchangeProvider({required SettingsStore settingsStore}) : _settingsStore = settingsStore, @@ -73,7 +73,8 @@ class ChangeNowExchangeProvider extends ExchangeProvider { 'flow': _getFlow(isFixedRateMode) }; final uri = Uri.https(apiAuthority, rangePath, params); - final response = await get(uri, headers: headers); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + if (response.statusCode == 400) { final responseJSON = json.decode(response.body) as Map; @@ -118,7 +119,8 @@ class ChangeNowExchangeProvider extends ExchangeProvider { params['fromAmount'] = amount.toString(); final uri = Uri.https(apiAuthority, estimatedAmountPath, params); - final response = await get(uri, headers: headers); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + final responseJSON = json.decode(response.body) as Map; final fromAmount = double.parse(responseJSON['fromAmount'].toString()); final toAmount = double.parse(responseJSON['toAmount'].toString()); @@ -177,7 +179,12 @@ class ChangeNowExchangeProvider extends ExchangeProvider { } final uri = Uri.https(apiAuthority, createTradePath); - final response = await post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode == 400) { final responseJSON = json.decode(response.body) as Map; @@ -220,7 +227,8 @@ class ChangeNowExchangeProvider extends ExchangeProvider { final headers = {apiHeaderKey: apiKey}; final params = {'id': id}; final uri = Uri.https(apiAuthority, findTradeByIdPath, params); - final response = await get(uri, headers: headers); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + if (response.statusCode == 404) throw TradeNotFoundException(id, provider: description); diff --git a/lib/exchange/provider/exolix_exchange_provider.dart b/lib/exchange/provider/exolix_exchange_provider.dart index 43f63b8ca..2d5011fe0 100644 --- a/lib/exchange/provider/exolix_exchange_provider.dart +++ b/lib/exchange/provider/exolix_exchange_provider.dart @@ -9,9 +9,9 @@ import 'package:cake_wallet/exchange/trade_not_found_exception.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart'; class ExolixExchangeProvider extends ExchangeProvider { ExolixExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -86,8 +86,9 @@ class ExolixExchangeProvider extends ExchangeProvider { // Maximum of 2 attempts to fetch limits for (int i = 0; i < 2; i++) { final uri = Uri.https(apiBaseUrl, ratePath, params); - final response = await get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + + if (response.statusCode == 200) { final responseJSON = json.decode(response.body) as Map; final minAmount = responseJSON['minAmount']; @@ -133,7 +134,8 @@ class ExolixExchangeProvider extends ExchangeProvider { params['amount'] = amount.toString(); final uri = Uri.https(apiBaseUrl, ratePath, params); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + final responseJSON = json.decode(response.body) as Map; if (response.statusCode != 200) { @@ -172,7 +174,12 @@ class ExolixExchangeProvider extends ExchangeProvider { body['amount'] = request.fromAmount; final uri = Uri.https(apiBaseUrl, transactionsPath); - final response = await post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode == 400) { final responseJSON = json.decode(response.body) as Map; @@ -214,8 +221,8 @@ class ExolixExchangeProvider extends ExchangeProvider { Future findTradeById({required String id}) async { final findTradeByIdPath = '$transactionsPath/$id'; final uri = Uri.https(apiBaseUrl, findTradeByIdPath); - final response = await get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 404) throw TradeNotFoundException(id, provider: description); if (response.statusCode == 400) { diff --git a/lib/exchange/provider/letsexchange_exchange_provider.dart b/lib/exchange/provider/letsexchange_exchange_provider.dart index d07297fcf..1fe1e9e35 100644 --- a/lib/exchange/provider/letsexchange_exchange_provider.dart +++ b/lib/exchange/provider/letsexchange_exchange_provider.dart @@ -10,9 +10,9 @@ import 'package:cake_wallet/exchange/trade_not_created_exception.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; class LetsExchangeExchangeProvider extends ExchangeProvider { LetsExchangeExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -152,7 +152,11 @@ class LetsExchangeExchangeProvider extends ExchangeProvider { final uri = Uri.https(_baseUrl, isFixedRateMode ? _createTransactionRevertPath : _createTransactionPath, tradeParams); - final response = await http.post(uri, headers: headers); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + ); + if (response.statusCode != 200) { throw Exception('LetsExchange create trade failed: ${response.body}'); @@ -218,7 +222,8 @@ class LetsExchangeExchangeProvider extends ExchangeProvider { }; final url = Uri.https(_baseUrl, '$_getTransactionPath/$id'); - final response = await http.get(url, headers: headers); + final response = await ProxyWrapper().get(clearnetUri: url, headers: headers); + if (response.statusCode != 200) { throw Exception('LetsExchange fetch trade failed: ${response.body}'); @@ -266,7 +271,11 @@ class LetsExchangeExchangeProvider extends ExchangeProvider { try { final uri = Uri.https(_baseUrl, isFixedRateMode ? _infoRevertPath : _infoPath, params); - final response = await http.post(uri, headers: headers); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + ); + if (response.statusCode != 200) { throw Exception('LetsExchange fetch info failed: ${response.body}'); } diff --git a/lib/exchange/provider/sideshift_exchange_provider.dart b/lib/exchange/provider/sideshift_exchange_provider.dart index 12ec59100..3c9b2d951 100644 --- a/lib/exchange/provider/sideshift_exchange_provider.dart +++ b/lib/exchange/provider/sideshift_exchange_provider.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:developer'; import 'package:cake_wallet/.secrets.g.dart' as secrets; import 'package:cake_wallet/exchange/provider/exchange_provider.dart'; @@ -11,9 +10,9 @@ import 'package:cake_wallet/exchange/trade_not_found_exception.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart'; class SideShiftExchangeProvider extends ExchangeProvider { SideShiftExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -60,8 +59,8 @@ class SideShiftExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async { const url = apiBaseUrl + permissionPath; final uri = Uri.parse(url); - final response = await get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 500) { final responseJSON = json.decode(response.body) as Map; final error = responseJSON['error']['message'] as String; @@ -90,7 +89,8 @@ class SideShiftExchangeProvider extends ExchangeProvider { "$apiBaseUrl$rangePath/${fromCurrency.title.toLowerCase()}-$fromNetwork/${toCurrency.title.toLowerCase()}-$toNetwork"; final uri = Uri.parse(url); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 500) { final responseJSON = json.decode(response.body) as Map; @@ -137,7 +137,8 @@ class SideShiftExchangeProvider extends ExchangeProvider { "$apiBaseUrl$rangePath/$fromCurrency-$depositNetwork/$toCurrency-$settleNetwork?amount=$amount"; final uri = Uri.parse(url); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + final responseJSON = json.decode(response.body) as Map; if (response.statusCode == 500) { @@ -186,7 +187,12 @@ class SideShiftExchangeProvider extends ExchangeProvider { final headers = {'Content-Type': 'application/json'}; final uri = Uri.parse(url); - final response = await post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 201) { if (response.statusCode == 400) { @@ -227,8 +233,8 @@ class SideShiftExchangeProvider extends ExchangeProvider { Future findTradeById({required String id}) async { final url = apiBaseUrl + orderPath + '/' + id; final uri = Uri.parse(url); - final response = await get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 404) { throw TradeNotFoundException(id, provider: description); } @@ -281,7 +287,12 @@ class SideShiftExchangeProvider extends ExchangeProvider { 'depositNetwork': _networkFor(request.fromCurrency), }; final uri = Uri.parse(url); - final response = await post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 201) { if (response.statusCode == 400) { diff --git a/lib/exchange/provider/simpleswap_exchange_provider.dart b/lib/exchange/provider/simpleswap_exchange_provider.dart index 5391d5f89..cc02ac799 100644 --- a/lib/exchange/provider/simpleswap_exchange_provider.dart +++ b/lib/exchange/provider/simpleswap_exchange_provider.dart @@ -11,8 +11,8 @@ import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; import 'package:cake_wallet/utils/device_info.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; -import 'package:http/http.dart'; class SimpleSwapExchangeProvider extends ExchangeProvider { SimpleSwapExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -48,7 +48,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider { @override Future checkIsAvailable() async { final uri = Uri.https(apiAuthority, getEstimatePath, {'api_key': apiKey}); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); return !(response.statusCode == 403); } @@ -66,7 +66,8 @@ class SimpleSwapExchangeProvider extends ExchangeProvider { }; final uri = Uri.https(apiAuthority, rangePath, params); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 500) { final responseJSON = json.decode(response.body) as Map; @@ -104,10 +105,10 @@ class SimpleSwapExchangeProvider extends ExchangeProvider { 'fixed': isFixedRateMode.toString() }; final uri = Uri.https(apiAuthority, getEstimatePath, params); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.body == "null") return 0.00; - final data = json.decode(response.body) as String; return double.parse(data) / amount; @@ -134,7 +135,12 @@ class SimpleSwapExchangeProvider extends ExchangeProvider { }; final uri = Uri.https(apiAuthority, createExchangePath, params); - final response = await post(uri, headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 200 && response.statusCode != 201) { if (response.statusCode == 400) { @@ -176,8 +182,9 @@ class SimpleSwapExchangeProvider extends ExchangeProvider { Future findTradeById({required String id}) async { final params = {'api_key': apiKey, 'id': id}; final uri = Uri.https(apiAuthority, getExchangePath, params); - final response = await get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + + if (response.statusCode == 404) { throw TradeNotFoundException(id, provider: description); } diff --git a/lib/exchange/provider/stealth_ex_exchange_provider.dart b/lib/exchange/provider/stealth_ex_exchange_provider.dart index 11b8d768a..8c7efae65 100644 --- a/lib/exchange/provider/stealth_ex_exchange_provider.dart +++ b/lib/exchange/provider/stealth_ex_exchange_provider.dart @@ -10,8 +10,8 @@ import 'package:cake_wallet/exchange/trade_not_created_exception.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; -import 'package:http/http.dart' as http; class StealthExExchangeProvider extends ExchangeProvider { StealthExExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -63,8 +63,12 @@ class StealthExExchangeProvider extends ExchangeProvider { }; try { - final response = await http.post(Uri.parse(_baseUrl + _rangePath), - headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: Uri.parse(_baseUrl + _rangePath), + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 200) { throw Exception('StealthEx fetch limits failed: ${response.body}'); } @@ -134,8 +138,12 @@ class StealthExExchangeProvider extends ExchangeProvider { 'additional_fee_percent': _additionalFeePercent, }; - final response = await http.post(Uri.parse(_baseUrl + _exchangesPath), - headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: Uri.parse(_baseUrl + _exchangesPath), + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 201) { throw Exception('StealthEx create trade failed: ${response.body}'); @@ -202,8 +210,9 @@ class StealthExExchangeProvider extends ExchangeProvider { final headers = {'Authorization': apiKey, 'Content-Type': 'application/json'}; final uri = Uri.parse('$_baseUrl$_exchangesPath/$id'); - final response = await http.get(uri, headers: headers); - + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); + + if (response.statusCode != 200) { throw Exception('StealthEx fetch trade failed: ${response.body}'); } @@ -260,8 +269,12 @@ class StealthExExchangeProvider extends ExchangeProvider { }; try { - final response = await http.post(Uri.parse(_baseUrl + _amountPath), - headers: headers, body: json.encode(body)); + final response = await ProxyWrapper().post( + clearnetUri: Uri.parse(_baseUrl + _amountPath), + headers: headers, + body: json.encode(body), + ); + if (response.statusCode != 200) return {}; final responseJSON = json.decode(response.body) as Map; final rate = responseJSON['rate'] as Map?; diff --git a/lib/exchange/provider/swaptrade_exchange_provider.dart b/lib/exchange/provider/swaptrade_exchange_provider.dart index d3f64b712..f6c8332db 100644 --- a/lib/exchange/provider/swaptrade_exchange_provider.dart +++ b/lib/exchange/provider/swaptrade_exchange_provider.dart @@ -10,9 +10,9 @@ import 'package:cake_wallet/exchange/trade_not_found_exception.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart'; class SwapTradeExchangeProvider extends ExchangeProvider { SwapTradeExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -69,7 +69,8 @@ class SwapTradeExchangeProvider extends ExchangeProvider { }) async { try { final uri = Uri.https(apiAuthority, getCoins); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + final responseJSON = json.decode(response.body) as Map; @@ -116,7 +117,12 @@ class SwapTradeExchangeProvider extends ExchangeProvider { }; final uri = Uri.https(apiAuthority, getRate, params); - final response = await post(uri, body: body, headers: headers); + final response = await ProxyWrapper().post( + clearnetUri: uri, + body: json.encode(body), + headers: headers, + ); + final responseBody = json.decode(response.body) as Map; if (response.statusCode != 200) @@ -153,7 +159,12 @@ class SwapTradeExchangeProvider extends ExchangeProvider { }; final uri = Uri.https(apiAuthority, createOrder, params); - final response = await post(uri, body: body, headers: headers); + final response = await ProxyWrapper().post( + clearnetUri: uri, + body: json.encode(body), + headers: headers, + ); + final responseBody = json.decode(response.body) as Map; if (response.statusCode == 400 || responseBody["success"] == false) { @@ -196,7 +207,12 @@ class SwapTradeExchangeProvider extends ExchangeProvider { }; final uri = Uri.https(apiAuthority, order, params); - final response = await post(uri, body: body, headers: headers); + final response = await ProxyWrapper().post( + clearnetUri: uri, + body: json.encode(body), + headers: headers, + ); + final responseBody = json.decode(response.body) as Map; if (response.statusCode == 400 || responseBody["success"] == false) { diff --git a/lib/exchange/provider/thorchain_exchange.provider.dart b/lib/exchange/provider/thorchain_exchange.provider.dart index aa7ab2d27..0cdb2a423 100644 --- a/lib/exchange/provider/thorchain_exchange.provider.dart +++ b/lib/exchange/provider/thorchain_exchange.provider.dart @@ -7,10 +7,10 @@ import 'package:cake_wallet/exchange/trade.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:hive/hive.dart'; -import 'package:http/http.dart' as http; class ThorChainExchangeProvider extends ExchangeProvider { ThorChainExchangeProvider({required this.tradesStore}) @@ -164,7 +164,8 @@ class ThorChainExchangeProvider extends ExchangeProvider { if (id.isEmpty) throw Exception('Trade id is empty'); final formattedId = id.startsWith('0x') ? id.substring(2) : id; final uri = Uri.https(_baseNodeURL, '$_txInfoPath$formattedId'); - final response = await http.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode == 404) { throw Exception('Trade not found for id: $formattedId'); @@ -217,8 +218,8 @@ class ThorChainExchangeProvider extends ExchangeProvider { static Future?>? lookupAddressByName(String name) async { final uri = Uri.https(_baseURL, '$_nameLookUpPath$name'); - final response = await http.get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) { return null; } @@ -244,8 +245,8 @@ class ThorChainExchangeProvider extends ExchangeProvider { Future> _getSwapQuote(Map params) async { Uri uri = Uri.https(_baseNodeURL, _quotePath, params); - final response = await http.get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) { throw Exception('Unexpected HTTP status: ${response.statusCode}'); } diff --git a/lib/exchange/provider/trocador_exchange_provider.dart b/lib/exchange/provider/trocador_exchange_provider.dart index 170c53627..f3a70b912 100644 --- a/lib/exchange/provider/trocador_exchange_provider.dart +++ b/lib/exchange/provider/trocador_exchange_provider.dart @@ -8,9 +8,9 @@ import 'package:cake_wallet/exchange/trade.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart'; class TrocadorExchangeProvider extends ExchangeProvider { TrocadorExchangeProvider({this.useTorOnly = false, this.providerStates = const {}}) @@ -52,8 +52,9 @@ class TrocadorExchangeProvider extends ExchangeProvider { ]; static const apiKey = secrets.trocadorApiKey; - static const onionApiAuthority = 'trocadorfyhlu27aefre5u7zri66gudtzdyelymftvr4yjwcxhfaqsid.onion'; static const clearNetAuthority = 'api.trocador.app'; + static const onionApiAuthority = clearNetAuthority; + // static const onionApiAuthority = 'trocadorfyhlu27aefre5u7zri66gudtzdyelymftvr4yjwcxhfaqsid.onion'; static const markup = secrets.trocadorExchangeMarkup; static const newRatePath = '/new_rate'; static const createTradePath = '/new_trade'; @@ -97,7 +98,8 @@ class TrocadorExchangeProvider extends ExchangeProvider { }; final uri = await _getUri(coinPath, params); - final response = await get(uri, headers: {'API-Key': apiKey}); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}); + if (response.statusCode != 200) throw Exception('Unexpected http status: ${response.statusCode}'); @@ -138,12 +140,10 @@ class TrocadorExchangeProvider extends ExchangeProvider { }; final uri = await _getUri(newRatePath, params); - final response = await get(uri, headers: {'API-Key': apiKey}); + final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}); + final responseJSON = json.decode(response.body) as Map; - - if (responseJSON['error'] != null) throw Exception(responseJSON['error']); - final fromAmount = double.parse(responseJSON['amount_from'].toString()); final toAmount = double.parse(responseJSON['amount_to'].toString()); final rateId = responseJSON['trade_id'] as String? ?? ''; @@ -206,8 +206,9 @@ class TrocadorExchangeProvider extends ExchangeProvider { params['provider'] = _provider.first as String; final uri = await _getUri(createTradePath, params); - final response = await get(uri, headers: {'API-Key': apiKey}); - + final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}); + + if (response.statusCode == 400) { final responseJSON = json.decode(response.body) as Map; final error = responseJSON['error'] as String; @@ -255,9 +256,10 @@ class TrocadorExchangeProvider extends ExchangeProvider { @override Future findTradeById({required String id}) async { final uri = await _getUri(tradePath, {'id': id}); - return get(uri, headers: {'API-Key': apiKey}).then((response) { + return ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}).then((response) async { if (response.statusCode != 200) throw Exception('Unexpected http status: ${response.statusCode}'); + final responseListJson = json.decode(response.body) as List; final responseJSON = responseListJson.first; @@ -292,7 +294,8 @@ class TrocadorExchangeProvider extends ExchangeProvider { Future> fetchProviders() async { final uri = await _getUri(providersListPath, {'api_key': apiKey}); - final response = await get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) throw Exception('Unexpected http status: ${response.statusCode}'); @@ -355,7 +358,7 @@ class TrocadorExchangeProvider extends ExchangeProvider { if (useTorOnly) return uri; try { - await get(uri); + await ProxyWrapper().get(clearnetUri: uri); return uri; } catch (e) { diff --git a/lib/exchange/provider/xoswap_exchange_provider.dart b/lib/exchange/provider/xoswap_exchange_provider.dart index 5611d6855..e70eab568 100644 --- a/lib/exchange/provider/xoswap_exchange_provider.dart +++ b/lib/exchange/provider/xoswap_exchange_provider.dart @@ -10,8 +10,7 @@ import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; - +import 'package:cw_core/utils/proxy_wrapper.dart'; class XOSwapExchangeProvider extends ExchangeProvider { XOSwapExchangeProvider() : super(pairList: supportedPairs(_notSupported)); @@ -72,7 +71,8 @@ class XOSwapExchangeProvider extends ExchangeProvider { final uri = Uri.https(_apiAuthority, _apiPath + _assets, {'networks': normalizedNetwork, 'query': currency.title}); - final response = await http.get(uri, headers: _headers); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) { throw Exception('Failed to fetch assets for ${currency.title} on ${currency.tag}'); } @@ -102,7 +102,8 @@ class XOSwapExchangeProvider extends ExchangeProvider { if (curFrom == null || curTo == null) return []; final pairId = curFrom + '_' + curTo; final uri = Uri.https(_apiAuthority, '$_apiPath$_pairsPath/$pairId$_ratePath'); - final response = await http.get(uri, headers: _headers); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) return []; return json.decode(response.body) as List; } catch (e) { @@ -205,7 +206,12 @@ class XOSwapExchangeProvider extends ExchangeProvider { 'pairId': pairId, }; - final response = await http.post(uri, headers: _headers, body: json.encode(payload)); + final response = await ProxyWrapper().post( + clearnetUri: uri, + headers: _headers, + body: json.encode(payload), + ); + if (response.statusCode != 201) { final responseJSON = json.decode(response.body) as Map; final error = responseJSON['error'] ?? 'Unknown error'; @@ -254,7 +260,8 @@ class XOSwapExchangeProvider extends ExchangeProvider { Future findTradeById({required String id}) async { try { final uri = Uri.https(_apiAuthority, '$_apiPath$_orders/$id'); - final response = await http.get(uri, headers: _headers); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) { final responseJSON = json.decode(response.body) as Map; if (responseJSON.containsKey('code') && responseJSON['code'] == 'NOT_FOUND') { diff --git a/lib/main.dart b/lib/main.dart index 6795b7ff9..709304939 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -25,9 +25,12 @@ import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/root/root.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/store/authentication_store.dart'; +import 'package:cake_wallet/themes/core/material_base_theme.dart'; import 'package:cake_wallet/themes/utils/theme_provider.dart'; +import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/utils/exception_handler.dart'; +import 'package:cake_wallet/utils/feature_flag.dart'; import 'package:cake_wallet/view_model/link_view_model.dart'; import 'package:cake_wallet/utils/responsive_layout_util.dart'; import 'package:cw_core/address_info.dart'; @@ -38,6 +41,8 @@ import 'package:cw_core/node.dart'; import 'package:cw_core/payjoin_session.dart'; import 'package:cw_core/unspent_coins_info.dart'; import 'package:cw_core/utils/print_verbose.dart'; +import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/wallet_info.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/foundation.dart'; @@ -87,6 +92,9 @@ Future runAppWithZone({Key? topLevelKey}) async { ledgerFile.writeAsStringSync("$content\n${event.message}"); }); } + if (FeatureFlag.hasDevOptions) { + ProxyWrapper.logger = MemoryProxyLogger(); + } runApp(App(key: topLevelKey)); isAppRunning = true; @@ -194,8 +202,8 @@ Future initializeAppConfigs({bool loadWallet = true}) async { final powNodes = await CakeHive.openBox(Node.boxName + "pow"); // must be different from Node.boxName final transactionDescriptions = await CakeHive.openBox( - TransactionDescription.boxName, - encryptionKey: transactionDescriptionsBoxKey); + TransactionDescription.boxName, + encryptionKey: transactionDescriptionsBoxKey); final trades = await CakeHive.openBox(Trade.boxName, encryptionKey: tradesBoxKey); final orders = await CakeHive.openBox(Order.boxName, encryptionKey: ordersBoxKey); final walletInfoSource = await CakeHive.openBox(WalletInfo.boxName); @@ -279,7 +287,11 @@ Future initialSetup({ navigatorKey: navigatorKey, secureStorage: secureStorage, ); - await bootstrap(navigatorKey, loadWallet: loadWallet); + await bootstrapOffline(); + final settingsStore = getIt(); + if (!settingsStore.currentBuiltinTor) { + bootstrapOnline(navigatorKey, loadWallet: loadWallet); + } } class App extends StatefulWidget { @@ -293,20 +305,24 @@ class App extends StatefulWidget { class AppState extends State with SingleTickerProviderStateMixin { @override Widget build(BuildContext context) { - return Observer( - builder: (BuildContext context) { + return Observer(builder: (BuildContext context) { final appStore = getIt.get(); final authService = getIt.get(); final linkViewModel = getIt.get(); final tradeMonitor = getIt.get(); + final settingsStore = appStore.settingsStore; final statusBarColor = Colors.transparent; final authenticationStore = getIt.get(); final initialRoute = authenticationStore.state == AuthenticationState.uninitialized - ? Routes.welcome - : Routes.login; + ? Routes.welcome + : settingsStore.currentBuiltinTor ? Routes.startTor : Routes.login; final currentTheme = appStore.themeStore.currentTheme; - final statusBarBrightness = currentTheme.isDark ? Brightness.light : Brightness.dark; - final statusBarIconBrightness = currentTheme.isDark ? Brightness.light : Brightness.dark; + final statusBarBrightness = currentTheme.type == currentTheme.isDark + ? Brightness.light + : Brightness.dark; + final statusBarIconBrightness = currentTheme.type == currentTheme.isDark + ? Brightness.light + : Brightness.dark; SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle( statusBarColor: statusBarColor, statusBarBrightness: statusBarBrightness, @@ -322,7 +338,8 @@ class AppState extends State with SingleTickerProviderStateMixin { tradeMonitor: tradeMonitor, child: ThemeProvider( themeStore: appStore.themeStore, - materialAppBuilder: (context, theme, darkTheme, themeMode) => MaterialApp( + materialAppBuilder: (context, theme, darkTheme, themeMode) => + MaterialApp( navigatorObservers: [routeObserver], navigatorKey: navigatorKey, debugShowCheckedModeBanner: false, @@ -365,8 +382,10 @@ class _HomeState extends State<_Home> { SystemChrome.setPreferredOrientations( [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]); } else { - SystemChrome.setPreferredOrientations( - [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]); + SystemChrome.setPreferredOrientations([ + DeviceOrientation.landscapeLeft, + DeviceOrientation.landscapeRight + ]); } } } diff --git a/lib/mastodon/mastodon_api.dart b/lib/mastodon/mastodon_api.dart index a2fdc97bd..58767eea7 100644 --- a/lib/mastodon/mastodon_api.dart +++ b/lib/mastodon/mastodon_api.dart @@ -1,6 +1,6 @@ import 'dart:convert'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/utils/print_verbose.dart'; -import 'package:http/http.dart' as http; import 'package:cake_wallet/mastodon/mastodon_user.dart'; class MastodonAPI { @@ -20,7 +20,8 @@ class MastodonAPI { queryParameters: queryParams, ); - final response = await http.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) return null; @@ -47,7 +48,8 @@ class MastodonAPI { queryParameters: queryParams, ); - final response = await http.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + if (response.statusCode != 200) { throw Exception('Unexpected HTTP status: ${response.statusCode}'); diff --git a/lib/reactions/bootstrap.dart b/lib/reactions/bootstrap.dart index e767433aa..6fb4c5ab2 100644 --- a/lib/reactions/bootstrap.dart +++ b/lib/reactions/bootstrap.dart @@ -15,24 +15,29 @@ import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/store/authentication_store.dart'; import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart'; -Future bootstrap(GlobalKey navigatorKey, {required bool loadWallet}) async { - final appStore = getIt.get(); +Future bootstrapOffline() async { final authenticationStore = getIt.get(); - final settingsStore = getIt.get(); - final fiatConversionStore = getIt.get(); final currentWalletName = getIt.get().getString(PreferencesKey.currentWalletName); if (currentWalletName != null) { authenticationStore.installed(); } +} + +void bootstrapOnline(GlobalKey navigatorKey, {required bool loadWallet}) { + final appStore = getIt.get(); + final authenticationStore = getIt.get(); + final settingsStore = getIt.get(); + final fiatConversionStore = getIt.get(); if (loadWallet) { startAuthenticationStateChange(authenticationStore, navigatorKey); } + startCurrentWalletChangeReaction(appStore, settingsStore, fiatConversionStore); startCurrentFiatChangeReaction(appStore, settingsStore, fiatConversionStore); startCurrentFiatApiModeChangeReaction(appStore, settingsStore, fiatConversionStore); startOnCurrentNodeChangeReaction(appStore); startFiatRateUpdate(appStore, settingsStore, fiatConversionStore); -} +} \ No newline at end of file diff --git a/lib/reactions/check_connection.dart b/lib/reactions/check_connection.dart index 1e8fa88fa..4591bb9ae 100644 --- a/lib/reactions/check_connection.dart +++ b/lib/reactions/check_connection.dart @@ -1,11 +1,15 @@ import 'dart:async'; +import 'package:cake_wallet/src/screens/base_page.dart'; +import 'package:cake_wallet/utils/tor.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/sync_status.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:cake_wallet/store/settings_store.dart'; +import 'package:flutter/material.dart'; +import 'package:get_it/get_it.dart'; Timer? _checkConnectionTimer; @@ -36,6 +40,10 @@ void startCheckConnectionReaction(WalletBase wallet, SettingsStore settingsStore final alive = await settingsStore.getCurrentNode(wallet.type).requestNode(); if (alive) { + if (settingsStore.currentBuiltinTor) { + await ensureTorStarted(context: null); + } + await wallet.connectToNode(node: settingsStore.getCurrentNode(wallet.type)); } } diff --git a/lib/reactions/on_current_wallet_change.dart b/lib/reactions/on_current_wallet_change.dart index 08f1a25ee..7b7199b14 100644 --- a/lib/reactions/on_current_wallet_change.dart +++ b/lib/reactions/on_current_wallet_change.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/ethereum/ethereum.dart'; import 'package:cake_wallet/polygon/polygon.dart'; import 'package:cake_wallet/solana/solana.dart'; import 'package:cake_wallet/tron/tron.dart'; +import 'package:cake_wallet/utils/tor.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/transaction_history.dart'; import 'package:cw_core/balance.dart'; @@ -83,6 +84,10 @@ void startCurrentWalletChangeReaction( bitcoin!.updatePayjoinState(wallet, settingsStore.usePayjoin); } + if (settingsStore.currentBuiltinTor) { + await ensureTorStarted(context: null); + } + await wallet.connectToNode(node: node); if (wallet.type == WalletType.nano || wallet.type == WalletType.banano) { final powNode = settingsStore.getCurrentPowNode(wallet.type); diff --git a/lib/router.dart b/lib/router.dart index afb1b46f8..00b0c5bb9 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -38,6 +38,7 @@ import 'package:cake_wallet/src/screens/dashboard/pages/transactions_page.dart'; import 'package:cake_wallet/src/screens/dashboard/sign_page.dart'; import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart'; import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart'; +import 'package:cake_wallet/src/screens/dev/network_requests.dart'; import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart'; import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart'; import 'package:cake_wallet/src/screens/dev/background_sync_logs_page.dart'; @@ -93,7 +94,6 @@ import 'package:cake_wallet/src/screens/settings/other_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/privacy_page.dart'; import 'package:cake_wallet/src/screens/settings/security_backup_page.dart'; import 'package:cake_wallet/src/screens/settings/silent_payments_settings.dart'; -import 'package:cake_wallet/src/screens/settings/tor_page.dart'; import 'package:cake_wallet/src/screens/settings/trocador_providers_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart'; @@ -101,6 +101,7 @@ import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_info_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart'; import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart'; +import 'package:cake_wallet/src/screens/start_tor/start_tor_page.dart'; import 'package:cake_wallet/src/screens/subaddress/address_edit_or_create_page.dart'; import 'package:cake_wallet/src/screens/support/support_page.dart'; import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart'; @@ -857,9 +858,6 @@ Route createRoute(RouteSettings settings) { ), ); - case Routes.torPage: - return MaterialPageRoute(builder: (_) => getIt.get()); - case Routes.signPage: return MaterialPageRoute( builder: (_) => SignPage( @@ -910,7 +908,12 @@ Route createRoute(RouteSettings settings) { return MaterialPageRoute( builder: (_) => getIt.get(), ); - + + case Routes.devNetworkRequests: + return MaterialPageRoute( + builder: (_) => getIt.get(), + ); + case Routes.devMoneroCallProfiler: return MaterialPageRoute( builder: (_) => getIt.get(), @@ -920,6 +923,11 @@ Route createRoute(RouteSettings settings) { return MaterialPageRoute( builder: (_) => getIt.get(), ); + + case Routes.startTor: + return MaterialPageRoute( + builder: (_) => getIt.get(), + ); case Routes.dEuroSavings: return MaterialPageRoute( diff --git a/lib/routes.dart b/lib/routes.dart index addaec1d9..6ff083bda 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -110,14 +110,16 @@ class Routes { static const walletConnectConnectionsListing = '/wallet-connect-connections-listing'; static const nftDetailsPage = '/nft_details_page'; static const importNFTPage = '/import_nft_page'; - static const torPage = '/tor_page'; static const backgroundSync = '/background_sync'; + static const startTor = '/start_tor'; static const devMoneroBackgroundSync = '/dev/monero_background_sync'; static const devMoneroCallProfiler = '/dev/monero_call_profiler'; + static const devSharedPreferences = '/dev/shared_preferences'; static const devSecurePreferences = '/dev/secure_preferences'; static const devBackgroundSyncLogs = '/dev/background_sync_logs'; + static const devNetworkRequests = '/dev/network_requests'; static const signPage = '/sign_page'; static const connectDevices = '/device/connect'; diff --git a/lib/src/screens/dev/network_requests.dart b/lib/src/screens/dev/network_requests.dart new file mode 100644 index 000000000..912c79da7 --- /dev/null +++ b/lib/src/screens/dev/network_requests.dart @@ -0,0 +1,155 @@ +import 'dart:convert'; +import 'dart:typed_data'; + +import 'package:cake_wallet/src/screens/base_page.dart'; +import 'package:cake_wallet/view_model/dev/network_requests_view_model.dart'; +import 'package:cw_core/utils/proxy_logger/abstract.dart'; +import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_mobx/flutter_mobx.dart'; + +class DevNetworkRequests extends BasePage { + final NetworkRequestsViewModel viewModel = NetworkRequestsViewModel(); + + DevNetworkRequests() { + viewModel.loadLogs(); + } + + @override + String? get title => "[dev] network requests"; + + @override + Widget? trailing(BuildContext context) { + return IconButton( + icon: Icon(Icons.refresh), + onPressed: () => viewModel.loadLogs(), + ); + } + + @override + Widget body(BuildContext context) { + return Observer( + builder: (_) { + if (viewModel.logs.isEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text("No logs loaded"), + SizedBox(height: 16), + ElevatedButton( + onPressed: () => viewModel.loadLogs(), + child: Text("Load Logs"), + ), + ], + ), + ); + } else { + return ListView.builder( + itemCount: viewModel.logs.length, + itemBuilder: (BuildContext context, int i) { + final item = viewModel.logs[i]; + return ListTile( + onTap: () { + Navigator.of(context).push( + MaterialPageRoute( + builder: (BuildContext context) { + return DevRequestDetails(item); + }, + ), + ); + }, + leading: switch (item.network) { + RequestNetwork.clearnet => Text("C"), + RequestNetwork.tor => Text("T"), + }, + trailing: switch (item.method) { + RequestMethod.get => Text("GET"), + RequestMethod.post => Text("POST"), + RequestMethod.put => Text("PUT"), + RequestMethod.delete => Text("DELETE"), + RequestMethod.newHttpClient || + RequestMethod.newHttpIOClient || + RequestMethod.newProxySocket => null, + }, + title: Text(item.time.toIso8601String()), + subtitle: switch (item.method) { + RequestMethod.get || + RequestMethod.post || + RequestMethod.put || + RequestMethod.delete => Text("${item.uri}"), + RequestMethod.newHttpClient => Text("newHttpClient"), + RequestMethod.newHttpIOClient => Text("newHttpIOClient"), + RequestMethod.newProxySocket => Text("newProxySocket"), + }, + tileColor: item.error != null ? Colors.red : null, + ); + }, + ); + } + }, + ); + } +} + +class DevRequestDetails extends BasePage { + final MemoryProxyLoggerEntry req; + DevRequestDetails(this.req); + + @override + Widget body(BuildContext context) { + return SingleChildScrollView( + padding: const EdgeInsets.all(16), + child: _body(context), + ); + } + + Widget _body(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _sectionTitle("Time"), + SelectableText(req.time.toString()), + + _sectionTitle("Method"), + SelectableText(req.method.toString()), + + _sectionTitle("URI"), + SelectableText(req.uri?.toString() ?? "null"), + + _sectionTitle("Network"), + SelectableText(req.network.toString()), + + _sectionTitle("Body (as UTF-8)"), + SelectableText(_tryDecodeBody(req.body)), + + _sectionTitle("Response"), + SelectableText(req.response?.body ?? "null"), + + _sectionTitle("Error"), + SelectableText(req.error ?? "No error"), + + _sectionTitle("Stack Trace"), + SelectableText(req.trace.toString()), + ], + ); + } + + Widget _sectionTitle(String title) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0), + child: Text( + title, + style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16), + ), + ); + } + + String _tryDecodeBody(Uint8List body) { + try { + return utf8.decode(body); + } catch (_) { + return 'Binary data (${body.length} bytes)'; + } + } +} diff --git a/lib/src/screens/nodes/widgets/node_form.dart b/lib/src/screens/nodes/widgets/node_form.dart index 381a9fec9..11bfea20a 100644 --- a/lib/src/screens/nodes/widgets/node_form.dart +++ b/lib/src/screens/nodes/widgets/node_form.dart @@ -196,8 +196,27 @@ class NodeForm extends StatelessWidget { Observer( builder: (_) => Column( children: [ + if (nodeViewModel.usesEmbeddedProxy) ...[ + Padding( + padding: EdgeInsets.only(top: 10), + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + StandardCheckbox( + value: nodeViewModel.usesEmbeddedProxy, + gradientBackground: false, + borderColor: Theme.of(context).dividerColor, + iconColor: Theme.of(context).colorScheme.primary, + onChanged: null, + caption: 'Embedded Tor SOCKS Proxy', + ), + ], + ), + ), + ], Padding( - padding: EdgeInsets.only(top: 20), + padding: EdgeInsets.only(top: 10), child: Row( mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.max, diff --git a/lib/src/screens/settings/connection_sync_page.dart b/lib/src/screens/settings/connection_sync_page.dart index 901b96e42..61a88cf12 100644 --- a/lib/src/screens/settings/connection_sync_page.dart +++ b/lib/src/screens/settings/connection_sync_page.dart @@ -5,6 +5,7 @@ import 'package:cake_wallet/reactions/wallet_connect.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart'; +import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart'; import 'package:cake_wallet/src/screens/settings/widgets/wallet_connect_button.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; import 'package:cake_wallet/utils/feature_flag.dart'; @@ -71,10 +72,28 @@ class ConnectionSyncPage extends BasePage { ), ], if (FeatureFlag.isInAppTorEnabled) - SettingsCellWithArrow( - title: S.current.tor_connection, - handler: (context) => Navigator.of(context).pushNamed(Routes.torPage), - ), + Observer(builder: (context) { + return SettingsSwitcherCell( + leading: Container( + padding: EdgeInsets.symmetric(horizontal: 4, vertical: 1), + decoration: BoxDecoration( + color: Colors.red.shade100, + borderRadius: BorderRadius.circular(3), + ), + child: Text( + 'Alpha', + style: TextStyle( + color: Colors.red.shade700, + fontSize: 8, + fontWeight: FontWeight.bold, + ), + ), + ), + title: S.current.enable_builtin_tor, + value: dashboardViewModel.builtinTor, + onValueChange: (_, bool value) => dashboardViewModel.setBuiltinTor(value, context), + ); + }), ], ), ); diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart index a52f9ae06..2ff9dcdaf 100644 --- a/lib/src/screens/settings/other_settings_page.dart +++ b/lib/src/screens/settings/other_settings_page.dart @@ -93,6 +93,12 @@ class OtherSettingsPage extends BasePage { handler: (BuildContext context) => Navigator.of(context).pushNamed(Routes.devBackgroundSyncLogs), ), + if (FeatureFlag.hasDevOptions) + SettingsCellWithArrow( + title: '[dev] network requests logs', + handler: (BuildContext context) => + Navigator.of(context).pushNamed(Routes.devNetworkRequests), + ), Spacer(), SettingsVersionCell( title: S.of(context).version(_otherSettingsViewModel.currentVersion)), diff --git a/lib/src/screens/settings/tor_page.dart b/lib/src/screens/settings/tor_page.dart deleted file mode 100644 index 55d96bb60..000000000 --- a/lib/src/screens/settings/tor_page.dart +++ /dev/null @@ -1,269 +0,0 @@ -import 'dart:async'; - -import 'package:cake_wallet/src/screens/base_page.dart'; -import 'package:cake_wallet/store/app_store.dart'; -import 'package:cake_wallet/themes/utils/custom_theme_colors.dart'; -import 'package:cw_core/utils/print_verbose.dart'; -import 'package:flutter/material.dart'; -// import 'package:tor/tor.dart'; - -class TorPage extends BasePage { - final AppStore appStore; - - TorPage(this.appStore); - - @override - Widget body(BuildContext context) { - return TorPageBody(appStore); - } -} - -class TorPageBody extends StatefulWidget { - final AppStore appStore; - - const TorPageBody(this.appStore, {Key? key}) : super(key: key); - - @override - State createState() => _TorPageBodyState(); -} - -class _TorPageBodyState extends State { - bool torEnabled = false; - bool connecting = false; - - // Set the default text for the host input field. - final hostController = TextEditingController(text: 'https://icanhazip.com/'); - - // https://check.torproject.org is another good option. - - Future startTor() async { - setState(() { - connecting = true; // Update flag - }); - - // await Tor.init(); - // - // // Start the proxy - // await Tor.instance.start(); - // - // // Toggle started flag. - // setState(() { - // torEnabled = Tor.instance.enabled; // Update flag - // connecting = false; - // }); - // - // final node = widget.appStore.settingsStore.getCurrentNode(widget.appStore.wallet!.type); - // if (node.socksProxyAddress?.isEmpty ?? true) { - // node.socksProxyAddress = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}"; - // } - // widget.appStore.wallet!.connectToNode(node: node); - - printV('Done awaiting; tor should be running'); - } - - Future endTor() async { - // // Start the proxy - // Tor.instance.disable(); - // - // // Toggle started flag. - // setState(() { - // torEnabled = Tor.instance.enabled; // Update flag - // }); - // - // printV('Done awaiting; tor should be stopped'); - } - // - // @override - // void initState() { - // super.initState(); - // - // torEnabled = Tor.instance.enabled; - // } - - @override - void dispose() { - // Clean up the controller when the widget is disposed. - hostController.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return SingleChildScrollView( - child: Container( - padding: const EdgeInsets.all(10), - child: connecting - ? ConnectingScreen() - : torEnabled - ? DisconnectScreen(disconnect: endTor) - : ConnectScreen(connect: startTor), - ), - ); - } -} - -class ConnectScreen extends StatelessWidget { - final Function() connect; - - const ConnectScreen({super.key, required this.connect}); - - @override - Widget build(BuildContext context) { - return Center( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: 200, - height: 200, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).colorScheme.primary, - ), - child: Icon( - Icons.lock, - color: Theme.of(context).colorScheme.onPrimary, - size: 100, - ), - ), - SizedBox(height: 48), - Text( - 'Connect to Tor', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontSize: 24, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 16), - Text( - 'Your connection to the Tor network ensures privacy and security.', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 16, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - SizedBox(height: 48), - ElevatedButton( - onPressed: connect, - style: ElevatedButton.styleFrom( - padding: EdgeInsets.symmetric(horizontal: 40, vertical: 15), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), - ), - child: Text( - 'Connect', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 18, - color: Theme.of(context).colorScheme.onPrimary, - ), - ), - ), - ], - ), - ), - ); - } -} - -class DisconnectScreen extends StatelessWidget { - final Function() disconnect; - - const DisconnectScreen({super.key, required this.disconnect}); - - @override - Widget build(BuildContext context) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: 200, - height: 200, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: CustomThemeColors.syncGreen, - ), - child: Icon( - Icons.check, - color: Theme.of(context).colorScheme.onPrimary, - size: 100, - ), - ), - SizedBox(height: 20), - Text( - 'Connected to Tor', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontSize: 24, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 10), - Text( - 'You are currently connected to the Tor network.', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 16, - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), - textAlign: TextAlign.center, - ), - SizedBox(height: 30), - ElevatedButton( - onPressed: disconnect, - style: ElevatedButton.styleFrom( - padding: EdgeInsets.symmetric(horizontal: 40, vertical: 15), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), - ), - child: Text( - 'Disconnect', - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 18, - color: Theme.of(context).colorScheme.onPrimary, - ), - ), - ), - ], - ), - ); - } -} - -class ConnectingScreen extends StatelessWidget { - @override - Widget build(BuildContext context) { - return Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - width: 200, - height: 200, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: CustomThemeColors.syncYellow, - ), - child: Icon( - Icons.hourglass_bottom, - color: Theme.of(context).colorScheme.onPrimary, - size: 100, - ), - ), - SizedBox(height: 20), - Text( - 'Connecting...', - style: Theme.of(context).textTheme.titleLarge?.copyWith( - fontSize: 24, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 10), - ], - ), - ); - } -} diff --git a/lib/src/screens/start_tor/start_tor_page.dart b/lib/src/screens/start_tor/start_tor_page.dart new file mode 100644 index 000000000..97c5c6599 --- /dev/null +++ b/lib/src/screens/start_tor/start_tor_page.dart @@ -0,0 +1,96 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/src/screens/base_page.dart'; +import 'package:cake_wallet/src/widgets/primary_button.dart'; +import 'package:cake_wallet/view_model/start_tor_view_model.dart'; + +class StartTorPage extends BasePage { + StartTorPage(this.startTorViewModel); + + final StartTorViewModel startTorViewModel; + + @override + String get title => S.current.tor_connection; + + @override + Widget leading(BuildContext context) { + return Container(); + } + + @override + Widget body(BuildContext context) { + startTorViewModel.startTor(context); + return Container( + padding: EdgeInsets.all(24), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + children: [ + SizedBox(width: double.maxFinite), + if (startTorViewModel.isLoading) ...[ + CircularProgressIndicator(), + SizedBox(height: 20), + _buildWaitingText(context), + ], + if (startTorViewModel.showOptions) ...[ + _buildOptionsButtons(context), + ], + ], + ), + ], + ), + ); + } + + Widget _buildWaitingText(BuildContext context) { + return Observer( + builder: (_) { + return Column( + children: [ + Text( + S.current.establishing_tor_connection, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + if (startTorViewModel.showOptions) _buildOptionsButtons(context), + ], + ); + }, + ); + } + + Widget _buildOptionsButtons(BuildContext context) { + return Column( + children: [ + Text( + S.current.tor_connection_timeout, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + textAlign: TextAlign.center, + ), + SizedBox(height: 24), + PrimaryButton( + onPressed: () => startTorViewModel.disableTor(context), + text: S.current.disable_tor, + color: Theme.of(context).colorScheme.primary, + textColor: Colors.white, + ), + SizedBox(height: 16), + PrimaryButton( + onPressed: () => startTorViewModel.ignoreAndLaunchApp(context), + text: S.current.ignor, + color: Theme.of(context).colorScheme.secondary, + textColor: Colors.white, + ), + ], + ); + } +} \ No newline at end of file diff --git a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart b/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart index 05c2a1f55..426c1580f 100644 --- a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart +++ b/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart @@ -2,10 +2,10 @@ import 'dart:convert'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/reactions/wallet_connect.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:eth_sig_util/eth_sig_util.dart'; import 'package:eth_sig_util/util/utils.dart'; import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; import 'package:reown_walletkit/reown_walletkit.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart'; @@ -41,7 +41,7 @@ class EvmChainServiceImpl { }) : ethClient = web3Client ?? Web3Client( appStore.settingsStore.getCurrentNode(appStore.wallet!.type).uri.toString(), - http.Client(), + ProxyWrapper().getHttpIOClient(), ) { for (final event in EventsConstants.allEvents) { walletKit.registerEventEmitter( @@ -563,14 +563,15 @@ class EvmChainServiceImpl { }, ); - final response = await http.get( - uri, + final response = await ProxyWrapper().get( + clearnetUri: uri, headers: { "Accept": "application/json", "X-API-Key": secrets.moralisApiKey, }, ); + final decodedResponse = jsonDecode(response.body)[0] as Map; final symbol = (decodedResponse['symbol'] ?? '') as String; diff --git a/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart b/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart index e60b452eb..a109fa9f3 100644 --- a/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart +++ b/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart @@ -4,6 +4,7 @@ import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_servic import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:flutter/material.dart'; import 'package:reown_walletkit/reown_walletkit.dart'; @@ -153,7 +154,10 @@ class WCCDetailsWidget extends BasePage { child: CircleAvatar( backgroundImage: (pairing.peerMetadata!.icons.isNotEmpty ? NetworkImage(pairing.peerMetadata!.icons[0]) - : const AssetImage('assets/images/app_logo.png')) as ImageProvider, + : AssetImage( + CakeTor.instance.enabled + ? 'assets/images/tor_logo.svg' + : 'assets/images/app_logo.png')) as ImageProvider, ), ), const SizedBox(height: 20.0), diff --git a/lib/src/screens/wallet_keys/wallet_keys_page.dart b/lib/src/screens/wallet_keys/wallet_keys_page.dart index 1c4b73bf8..917891854 100644 --- a/lib/src/screens/wallet_keys/wallet_keys_page.dart +++ b/lib/src/screens/wallet_keys/wallet_keys_page.dart @@ -126,9 +126,9 @@ class _WalletKeysPageBodyState extends State dividerColor: Colors.transparent, padding: EdgeInsets.zero, tabs: [ - Tab(text: S.of(context).widgets_seed), - if (showKeyTab) Tab(text: S.of(context).keys), - if (showLegacySeedTab) Tab(text: S.of(context).legacy), + Tab(text: S.of(context).widgets_seed, key: ValueKey('wallet_keys_page_seed')), + if (showKeyTab) Tab(text: S.of(context).keys, key: ValueKey('wallet_keys_page_keys'),), + if (showLegacySeedTab) Tab(text: S.of(context).legacy, key: ValueKey('wallet_keys_page_seed_legacy')), ], ), ), diff --git a/lib/src/widgets/provider_optoin_tile.dart b/lib/src/widgets/provider_optoin_tile.dart index 7d517bfa4..337e50c9e 100644 --- a/lib/src/widgets/provider_optoin_tile.dart +++ b/lib/src/widgets/provider_optoin_tile.dart @@ -1,3 +1,4 @@ +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -265,7 +266,11 @@ class Badge extends StatelessWidget { } Widget getImage(String imagePath, {double? height, double? width, Color? imageColor}) { - final bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https'); + bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https'); + if (CakeTor.instance.enabled && isNetworkImage) { + imagePath = "assets/images/tor_logo.svg"; + isNetworkImage = false; + } final bool isSvg = imagePath.endsWith('.svg'); final double imageHeight = height ?? 35; final double imageWidth = width ?? 35; diff --git a/lib/src/widgets/standard_checkbox.dart b/lib/src/widgets/standard_checkbox.dart index 946942aa5..64de5337d 100644 --- a/lib/src/widgets/standard_checkbox.dart +++ b/lib/src/widgets/standard_checkbox.dart @@ -16,7 +16,7 @@ class StandardCheckbox extends StatelessWidget { final Color? borderColor; final Color? iconColor; final Color? captionColor; - final Function(bool) onChanged; + final Function(bool)? onChanged; @override Widget build(BuildContext context) { @@ -40,7 +40,7 @@ class StandardCheckbox extends StatelessWidget { BoxDecoration(border: boxBorder, borderRadius: BorderRadius.all(Radius.circular(8.0))); return GestureDetector( - onTap: () => onChanged(!value), + onTap: onChanged == null ? null : () => onChanged!(!value), child: Row( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.start, diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index c88590475..958f682fe 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -80,6 +80,7 @@ abstract class SettingsStoreBase with Store { required String initialLanguageCode, required SyncMode initialSyncMode, required bool initialSyncAll, + required bool initialBuiltinTor, // required String initialCurrentLocale, required this.appVersion, required this.deviceName, @@ -184,6 +185,7 @@ abstract class SettingsStoreBase with Store { initialShouldRequireTOTP2FAForAllSecurityAndBackupSettings, currentSyncMode = initialSyncMode, currentSyncAll = initialSyncAll, + currentBuiltinTor = initialBuiltinTor, priority = ObservableMap() { //this.nodes = ObservableMap.of(nodes); @@ -404,6 +406,11 @@ abstract class SettingsStoreBase with Store { sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll); }); + reaction((_) => currentBuiltinTor, (bool builtinTor) { + sharedPreferences.setBool(PreferencesKey.builtinTorKey, builtinTor); + }); + + reaction( (_) => exchangeStatus, (ExchangeApiMode mode) => @@ -821,6 +828,9 @@ abstract class SettingsStoreBase with Store { @observable bool currentSyncAll; + @observable + bool currentBuiltinTor; + String appVersion; String deviceName; @@ -1168,6 +1178,7 @@ abstract class SettingsStoreBase with Store { return element.type.index == (sharedPreferences.getInt(PreferencesKey.syncModeKey) ?? 2); // default to 2 - daily sync }); final savedSyncAll = sharedPreferences.getBool(PreferencesKey.syncAllKey) ?? true; + final builtinTor = sharedPreferences.getBool(PreferencesKey.builtinTorKey) ?? false; // migrated to secure: final timeOutDuration = await SecureKey.getInt( @@ -1353,6 +1364,7 @@ abstract class SettingsStoreBase with Store { initialSyncAll: savedSyncAll, shouldShowYatPopup: shouldShowYatPopup, shouldShowRepWarning: shouldShowRepWarning, + initialBuiltinTor: builtinTor, ); } diff --git a/lib/store/yat/yat_store.dart b/lib/store/yat/yat_store.dart index 964b96db3..6b73c6211 100644 --- a/lib/store/yat/yat_store.dart +++ b/lib/store/yat/yat_store.dart @@ -5,12 +5,8 @@ import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/balance.dart'; import 'package:cw_core/transaction_info.dart'; import 'package:cake_wallet/store/app_store.dart'; -import 'package:flutter/foundation.dart'; import 'package:mobx/mobx.dart'; import 'package:cw_core/wallet_type.dart'; -import 'dart:convert'; -import 'package:cake_wallet/store/yat/yat_exception.dart'; -import 'package:http/http.dart'; import 'dart:async'; part 'yat_store.g.dart'; diff --git a/lib/twitter/twitter_api.dart b/lib/twitter/twitter_api.dart index 5acb00e2a..cccf769ad 100644 --- a/lib/twitter/twitter_api.dart +++ b/lib/twitter/twitter_api.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:cake_wallet/.secrets.g.dart' as secrets; import 'package:cake_wallet/twitter/twitter_user.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; class TwitterApi { static const twitterBearerToken = secrets.twitterBearerToken; @@ -23,13 +23,14 @@ class TwitterApi { path: userPath + userName, queryParameters: queryParams); - final response = await http.get(uri, headers: headers).catchError((error) { + final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers).catchError((error) { throw Exception('HTTP request failed: $error'); }); if (response.statusCode != 200) { throw Exception('Unexpected http status: ${response.statusCode}'); } + final Map responseJSON = jsonDecode(response.body) as Map; if (responseJSON['errors'] != null && diff --git a/lib/utils/feature_flag.dart b/lib/utils/feature_flag.dart index c968c5d75..b9314bc6e 100644 --- a/lib/utils/feature_flag.dart +++ b/lib/utils/feature_flag.dart @@ -1,10 +1,11 @@ import 'package:flutter/foundation.dart'; +import 'dart:io'; class FeatureFlag { static const bool isCakePayEnabled = false; static const bool isExolixEnabled = true; - static const bool isInAppTorEnabled = false; static const bool isBackgroundSyncEnabled = true; + static final bool isInAppTorEnabled = (Platform.isAndroid); static const int verificationWordsCount = kDebugMode ? 0 : 2; static const bool hasDevOptions = bool.fromEnvironment('hasDevOptions', defaultValue: kDebugMode); } \ No newline at end of file diff --git a/lib/utils/image_utill.dart b/lib/utils/image_utill.dart index 746fde453..994a3957b 100644 --- a/lib/utils/image_utill.dart +++ b/lib/utils/image_utill.dart @@ -1,13 +1,17 @@ +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; class ImageUtil { static Widget getImageFromPath({required String imagePath, double? height, double? width}) { - final bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https'); + bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https'); + if (CakeTor.instance.enabled && isNetworkImage) { + imagePath = "assets/images/tor_logo.svg"; + isNetworkImage = false; + } final bool isSvg = imagePath.endsWith('.svg'); final double _height = height ?? 35; final double _width = width ?? 35; - if (isNetworkImage) { return isSvg ? SvgPicture.network( diff --git a/lib/utils/tor.dart b/lib/utils/tor.dart new file mode 100644 index 000000000..233e998eb --- /dev/null +++ b/lib/utils/tor.dart @@ -0,0 +1,80 @@ +import 'dart:async'; + +import 'package:cw_core/utils/proxy_wrapper.dart'; +import 'package:cw_core/utils/print_verbose.dart'; +import 'package:flutter/material.dart'; + +bool didTorStart = false; +Future ensureTorStopped({required BuildContext? context}) async { + if (!didTorStart) { + printV("Tor hasn't been initialized yet, so it can't be stopped."); + return; + } + BuildContext? dialogContext; + if (context != null) dialogContext = await showFullscreenDialog(context); + didTorStart = false; + printV("Stopping tor"); + await CakeTor.instance.stop(); + printV("Tor stopped"); + if (context != null) dismissFullscreenDialog(dialogContext!); +} + +Future ensureTorStarted({required BuildContext? context}) async { + if (didTorStart) { + printV("Tor has already started"); + return; + } + BuildContext? dialogContext; + if (context != null) dialogContext = await showFullscreenDialog(context); + didTorStart = true; + printV("Starting tor"); + // var rootToken = RootIsolateToken.instance!; + // await Isolate.run(() async { + // BackgroundIsolateBinaryMessenger.ensureInitialized(rootToken); + // await CakeTor.instance.start(); + // }); + // second start is fast but populates the values on current thread + await CakeTor.instance.start(); + printV("Tor started"); + while (!CakeTor.instance.started) { + printV("Waiting for tor to start (part 1)"); + await Future.delayed(const Duration(seconds: 1)); + } + while (CakeTor.instance.port == -1) { + printV("Waiting for tor to start (listening on port)"); + await Future.delayed(const Duration(seconds: 1)); + } + printV("Tor started on port ${CakeTor.instance.port}"); + if (context != null) dismissFullscreenDialog(dialogContext!); +} + +Future showFullscreenDialog(BuildContext context) async { + BuildContext? dialogContext; + unawaited( + showDialog( + context: context, + barrierDismissible: false, + builder: (context) { + dialogContext = context; + return PopScope( + canPop: false, + child: Container( + color: Colors.transparent, + child: Center( + child: CircularProgressIndicator( + color: Colors.white, + ), + ), + ), + ); + }, + ), + ); + await Future.delayed(const Duration(seconds: 1)); + return dialogContext!; +} + +Future dismissFullscreenDialog(BuildContext context) async { + await Future.delayed(const Duration(seconds: 1)); + Navigator.of(context).pop(); +} \ No newline at end of file diff --git a/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart b/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart index 442bd51b4..e777813c7 100644 --- a/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart +++ b/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart @@ -6,6 +6,7 @@ import 'package:cake_wallet/entities/fiat_currency.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/view_model/dashboard/filter_item.dart'; +import 'package:cw_core/utils/print_verbose.dart'; import 'package:mobx/mobx.dart'; part 'cake_pay_cards_list_view_model.g.dart'; @@ -135,7 +136,11 @@ abstract class CakePayCardsListViewModelBase with Store { Future getCountries() async { - availableCountries = await cakePayService.getCountries(); + try { + availableCountries = await cakePayService.getCountries(); + } catch (e) { + printV(e); + } } @action @@ -144,17 +149,21 @@ abstract class CakePayCardsListViewModelBase with Store { int? currentPage, }) async { vendorsState = CakePayVendorLoadingState(); - searchString = text ?? ''; - var newVendors = await cakePayService.getVendors( - country: Country.getCakePayName(selectedCountry), - page: currentPage ?? page, - search: searchString, - giftCards: displayGiftCards, - prepaidCards: displayPrepaidCards, - custom: displayCustomValueCards, - onDemand: displayDenominationsCards); + try { + searchString = text ?? ''; + var newVendors = await cakePayService.getVendors( + country: Country.getCakePayName(selectedCountry), + page: currentPage ?? page, + search: searchString, + giftCards: displayGiftCards, + prepaidCards: displayPrepaidCards, + custom: displayCustomValueCards, + onDemand: displayDenominationsCards); - cakePayVendors = CakePayVendorList = newVendors; + cakePayVendors = CakePayVendorList = newVendors; + } catch (e) { + printV(e); + } vendorsState = CakePayVendorLoadedState(); } diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart index 30bd1c8b3..db359a3f5 100644 --- a/lib/view_model/dashboard/dashboard_view_model.dart +++ b/lib/view_model/dashboard/dashboard_view_model.dart @@ -13,6 +13,11 @@ import 'package:cake_wallet/entities/service_status.dart'; import 'package:cake_wallet/exchange/exchange_provider_description.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/monero/monero.dart'; +import 'package:cake_wallet/src/widgets/alert_with_one_action.dart'; +import 'package:cake_wallet/utils/show_pop_up.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; +import 'package:cake_wallet/utils/tor.dart'; +import 'package:cake_wallet/wownero/wownero.dart' as wow; import 'package:cake_wallet/nano/nano.dart'; import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart'; import 'package:cake_wallet/store/app_store.dart'; @@ -47,10 +52,9 @@ import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/wallet_info.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:eth_sig_util/util/utils.dart'; -import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_daemon/flutter_daemon.dart'; -import 'package:http/http.dart' as http; import 'package:mobx/mobx.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -1027,6 +1031,39 @@ abstract class DashboardViewModelBase with Store { @computed bool get syncAll => settingsStore.currentSyncAll; + @computed + bool get builtinTor => settingsStore.currentBuiltinTor; + + @action + void setBuiltinTor(bool value, BuildContext context) { + if (value) { + unawaited(showPopUp( + context: context, + builder: (BuildContext context) { + return AlertWithOneAction( + alertTitle: S.of(context).tor_connection, + alertContent: S.of(context).tor_experimental, + buttonText: S.of(context).ok, + buttonAction: () => Navigator.of(context).pop(true), + ); + }, + ), + ); + } + settingsStore.currentBuiltinTor = value; + if (value) { + unawaited(ensureTorStarted(context: context).then((_) async { + if (settingsStore.currentBuiltinTor == false) return; // return when tor got disabled in the meantime; + await wallet.connectToNode(node: appStore.settingsStore.getCurrentNode(wallet.type)); + })); + } else { + unawaited(ensureTorStopped(context: context).then((_) async { + if (settingsStore.currentBuiltinTor == true) return; // return when tor got enabled in the meantime; + await wallet.connectToNode(node: appStore.settingsStore.getCurrentNode(wallet.type)); + })); + } + } + @action void setSyncAll(bool value) => settingsStore.currentSyncAll = value; @@ -1073,7 +1110,17 @@ abstract class DashboardViewModelBase with Store { } } + static ServicesResponse? cachedServicesResponse; + Future getServicesStatus() async { + if (cachedServicesResponse != null) { + return cachedServicesResponse!; + } + cachedServicesResponse = await _getServicesStatus(); + return cachedServicesResponse!; + } + + Future _getServicesStatus() async { try { if (isEnabledBulletinAction) { final uri = Uri.https( @@ -1082,8 +1129,7 @@ abstract class DashboardViewModelBase with Store { {'key': secrets.fiatApiKey}, ); - final res = await http.get(uri); - + final res = await ProxyWrapper().get(clearnetUri: uri); if (res.statusCode < 200 || res.statusCode >= 300) { throw res.body; } diff --git a/lib/view_model/dashboard/home_settings_view_model.dart b/lib/view_model/dashboard/home_settings_view_model.dart index 4794746c4..f16d2aa95 100644 --- a/lib/view_model/dashboard/home_settings_view_model.dart +++ b/lib/view_model/dashboard/home_settings_view_model.dart @@ -12,6 +12,7 @@ import 'package:cake_wallet/reactions/wallet_connect.dart'; import 'package:cake_wallet/solana/solana.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/tron/tron.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart'; import 'package:cake_wallet/zano/zano.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -19,7 +20,6 @@ import 'package:cw_core/erc20_token.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:mobx/mobx.dart'; -import 'package:http/http.dart' as http; import 'package:cake_wallet/.secrets.g.dart' as secrets; part 'home_settings_view_model.g.dart'; @@ -240,14 +240,14 @@ abstract class HomeSettingsViewModelBase with Store { ); try { - final response = await http.get( - uri, + final response = await ProxyWrapper().get( + clearnetUri: uri, headers: { "Accept": "application/json", "X-API-Key": secrets.moralisApiKey, }, ); - + final decodedResponse = jsonDecode(response.body); final tokenInfo = Erc20TokenInfoMoralis.fromJson(decodedResponse[0] as Map); @@ -309,8 +309,8 @@ abstract class HomeSettingsViewModelBase with Store { ); try { - final response = await http.get(uri); - + final response = await ProxyWrapper().get(clearnetUri: uri); + final decodedResponse = jsonDecode(response.body) as Map; if (decodedResponse['status'] != '1') { @@ -351,7 +351,8 @@ abstract class HomeSettingsViewModelBase with Store { ); try { - final response = await http.get(uri); + final response = await ProxyWrapper().get(clearnetUri: uri); + final decodedResponse = jsonDecode(response.body) as Map; diff --git a/lib/view_model/dashboard/nft_view_model.dart b/lib/view_model/dashboard/nft_view_model.dart index 7da63d399..733cb4f47 100644 --- a/lib/view_model/dashboard/nft_view_model.dart +++ b/lib/view_model/dashboard/nft_view_model.dart @@ -7,7 +7,7 @@ import 'package:cake_wallet/reactions/wallet_connect.dart'; import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart'; import 'package:cake_wallet/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart'; import 'package:cw_core/wallet_type.dart'; -import 'package:http/http.dart' as http; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:mobx/mobx.dart'; import 'package:cake_wallet/.secrets.g.dart' as secrets; @@ -80,15 +80,16 @@ abstract class NFTViewModelBase with Store { isLoading = true; - final response = await http.get( - uri, + final response = await ProxyWrapper().get( + clearnetUri: uri, headers: { "Accept": "application/json", "X-API-Key": secrets.moralisApiKey, }, ); + - final decodedResponse = jsonDecode(response.body); + final decodedResponse = jsonDecode(response.body) as Map; if (walletType == WalletType.solana) { final results = await Future.wait( @@ -131,14 +132,14 @@ abstract class NFTViewModelBase with Store { '/nft/$chainName/$address/metadata', ); - final response = await http.get( - uri, + final response = await ProxyWrapper().get( + clearnetUri: uri, headers: { "Accept": "application/json", "X-API-Key": secrets.moralisApiKey, }, ); - + final decodedResponse = jsonDecode(response.body) as Map; return SolanaNFTAssetModel.fromJson(decodedResponse); @@ -171,15 +172,14 @@ abstract class NFTViewModelBase with Store { "normalizeMetadata": "true", }, ); - - final response = await http.get( - uri, + final response = await ProxyWrapper().get( + clearnetUri: uri, headers: { "Accept": "application/json", "X-API-Key": secrets.moralisApiKey, }, ); - + final decodedResponse = jsonDecode(response.body) as Map; final nftAsset = NFTAssetModel.fromJson(decodedResponse); diff --git a/lib/view_model/dev/network_requests_view_model.dart b/lib/view_model/dev/network_requests_view_model.dart new file mode 100644 index 000000000..401ddc6d2 --- /dev/null +++ b/lib/view_model/dev/network_requests_view_model.dart @@ -0,0 +1,16 @@ +import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart'; +import 'package:mobx/mobx.dart'; + +part 'network_requests_view_model.g.dart'; + +class NetworkRequestsViewModel = NetworkRequestsViewModelBase with _$NetworkRequestsViewModel; + +abstract class NetworkRequestsViewModelBase with Store { + @observable + List logs = MemoryProxyLogger.logs; + + @action + Future loadLogs() async { + logs = MemoryProxyLogger.logs; + } +} \ No newline at end of file diff --git a/lib/view_model/dev/send_network_requests_view_model.dart b/lib/view_model/dev/send_network_requests_view_model.dart new file mode 100644 index 000000000..1eb3bffc9 --- /dev/null +++ b/lib/view_model/dev/send_network_requests_view_model.dart @@ -0,0 +1,16 @@ +import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart'; +import 'package:mobx/mobx.dart'; + +part 'send_network_requests_view_model.g.dart'; + +class SendNetworkRequestsViewModel = SendNetworkRequestsViewModelBase with _$SendNetworkRequestsViewModel; + +abstract class SendNetworkRequestsViewModelBase with Store { + @observable + List logs = MemoryProxyLogger.logs; + + @action + Future loadLogs() async { + logs = MemoryProxyLogger.logs; + } +} \ No newline at end of file diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart index 58b5e5756..91cffe367 100644 --- a/lib/view_model/exchange/exchange_view_model.dart +++ b/lib/view_model/exchange/exchange_view_model.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/core/create_trade_result.dart'; import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/letsexchange_exchange_provider.dart'; import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cake_wallet/view_model/send/fees_view_model.dart'; import 'package:cake_wallet/exchange/provider/xoswap_exchange_provider.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -16,7 +17,6 @@ import 'package:cw_core/unspent_coin_type.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:hive/hive.dart'; -import 'package:http/http.dart' as http; import 'package:intl/intl.dart'; import 'package:mobx/mobx.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -939,8 +939,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with } Future _isContractAddress(String chainName, String contractAddress) async { - final httpClient = http.Client(); - final uri = Uri.https( 'deep-index.moralis.io', '/api/v2.2/erc20/metadata', @@ -951,13 +949,14 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with ); try { - final response = await httpClient.get( - uri, + final response = await ProxyWrapper().get( + clearnetUri: uri, headers: { "Accept": "application/json", "X-API-Key": secrets.moralisApiKey, }, ); + final decodedResponse = jsonDecode(response.body)[0] as Map; diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart index 7e4e73915..78544aa82 100644 --- a/lib/view_model/node_list/node_create_or_edit_view_model.dart +++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart @@ -1,6 +1,7 @@ import 'package:cake_wallet/core/execution_state.dart'; import 'package:cake_wallet/entities/qr_scanner.dart'; import 'package:cake_wallet/store/settings_store.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:flutter/cupertino.dart'; import 'package:hive/hive.dart'; import 'package:mobx/mobx.dart'; @@ -58,6 +59,9 @@ abstract class NodeCreateOrEditViewModelBase with Store { @observable bool useSocksProxy; + @computed + bool get usesEmbeddedProxy => CakeTor.instance.started; + @observable String socksProxyAddress; diff --git a/lib/view_model/node_list/node_list_view_model.dart b/lib/view_model/node_list/node_list_view_model.dart index 9df5f2980..9cd9ce959 100644 --- a/lib/view_model/node_list/node_list_view_model.dart +++ b/lib/view_model/node_list/node_list_view_model.dart @@ -1,6 +1,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/utils/mobx.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:hive/hive.dart'; import 'package:mobx/mobx.dart'; import 'package:cw_core/wallet_base.dart'; @@ -38,7 +39,7 @@ abstract class NodeListViewModelBase with Store { String getAlertContent(String uri) => S.current.change_current_node(uri) + - '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + S.current.orbot_running_alert : ''}'; + '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + (CakeTor.instance.enabled ? '' : S.current.orbot_running_alert) : ''}'; final ObservableList nodes; final SettingsStore settingsStore; diff --git a/lib/view_model/node_list/pow_node_list_view_model.dart b/lib/view_model/node_list/pow_node_list_view_model.dart index 5467be31a..5100676f4 100644 --- a/lib/view_model/node_list/pow_node_list_view_model.dart +++ b/lib/view_model/node_list/pow_node_list_view_model.dart @@ -1,6 +1,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/utils/mobx.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:hive/hive.dart'; import 'package:mobx/mobx.dart'; import 'package:cw_core/wallet_base.dart'; @@ -38,7 +39,7 @@ abstract class PowNodeListViewModelBase with Store { String getAlertContent(String uri) => S.current.change_current_node(uri) + - '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + S.current.orbot_running_alert : ''}'; + '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + (CakeTor.instance.enabled ? '' : S.current.orbot_running_alert) : ''}'; final ObservableList nodes; final SettingsStore settingsStore; diff --git a/lib/view_model/start_tor_view_model.dart b/lib/view_model/start_tor_view_model.dart new file mode 100644 index 000000000..1ef819d5f --- /dev/null +++ b/lib/view_model/start_tor_view_model.dart @@ -0,0 +1,95 @@ +import 'dart:async'; + +import 'package:cake_wallet/di.dart'; +import 'package:cake_wallet/main.dart'; +import 'package:cake_wallet/reactions/bootstrap.dart'; +import 'package:cake_wallet/routes.dart'; +import 'package:cake_wallet/store/app_store.dart'; +import 'package:cake_wallet/store/settings_store.dart'; +import 'package:cake_wallet/utils/tor.dart'; +import 'package:cw_core/utils/proxy_wrapper.dart'; +import 'package:flutter/material.dart'; +import 'package:mobx/mobx.dart'; + +part 'start_tor_view_model.g.dart'; + +class StartTorViewModel = StartTorViewModelBase with _$StartTorViewModel; + +abstract class StartTorViewModelBase with Store { + StartTorViewModelBase() { + _startTimer(); + } + + Timer? _timer; + final int waitTimeInSeconds = 15; + + @observable + bool isLoading = true; + + @observable + bool timeoutReached = false; + + @observable + int remainingSeconds = 15; + + @computed + bool get showOptions => timeoutReached; + + @action + void _startTimer() { + remainingSeconds = waitTimeInSeconds; + _timer = Timer.periodic(const Duration(seconds: 1), (timer) { + remainingSeconds -= 1; + + if (remainingSeconds <= 0) { + timer.cancel(); + timeoutReached = true; + } + }); + } + + @observable + bool didStartTor = false; + + @action + Future startTor(BuildContext context) async { + if (didStartTor) { + return; + } + await ensureTorStarted(context: null); + while (true) { + await Future.delayed(Duration(milliseconds: 250)); + if (CakeTor.instance.port != -1 && CakeTor.instance.started) { + break; + } + } + didStartTor = true; + final appStore = getIt.get(); + bootstrapOnline(navigatorKey, loadWallet: true); + appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type)); + Navigator.pushReplacementNamed(context, Routes.login); + } + + @action + void disableTor(BuildContext context) { + final settingsStore = getIt.get(); + settingsStore.currentBuiltinTor = false; + bootstrapOnline(navigatorKey, loadWallet: true); + final appStore = getIt.get(); + appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type)); + Navigator.pushReplacementNamed(context, Routes.login); + } + + @action + void ignoreAndLaunchApp(BuildContext context) { + bootstrapOnline(navigatorKey, loadWallet: true); + final appStore = getIt.get(); + appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type)); + Navigator.pushReplacementNamed(context, Routes.login); + } + + void dispose() { + _timer?.cancel(); + _timer = null; + } +} \ No newline at end of file diff --git a/pubspec_base.yaml b/pubspec_base.yaml index e11703607..9f7f17ae4 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -100,13 +100,17 @@ dependencies: # git: # url: https://github.com/cake-tech/tor.git # ref: main - socks5_proxy: ^1.0.4 + socks5_proxy: + git: + url: https://github.com/LacticWhale/socks_dart + ref: 27ad7c2efae8d7460325c74b90f660085cbd0685 flutter_svg: ^2.0.9 polyseed: ^0.0.7 nostr_tools: git: url: https://github.com/MrCyjaneK/nostr_tools.git ref: 089d5a2dd751429a040ba10fb24fcbae564053e5 + solana: ^0.31.0+1 ledger_flutter_plus: git: url: https://github.com/vespr-wallet/ledger-flutter-plus @@ -166,6 +170,14 @@ dependency_overrides: git: url: https://github.com/vespr-wallet/ledger-flutter-plus ref: 60817d4b20144f9da9029f5034790272795b9d38 + socks5_proxy: + git: + url: https://github.com/LacticWhale/socks_dart.git + ref: 27ad7c2efae8d7460325c74b90f660085cbd0685 + tor_binary: + git: + url: https://github.com/MrCyjaneK/flutter-tor_binary + ref: cb811c610871a9517d47134b87c2f590c15c96c5 web_socket_channel: ^3.0.2 freezed_annotation: 2.4.4 diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index f12171f31..a5b287384 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "من خلال إيقاف تشغيل هذا ، قد تكون معدلات الرسوم غير دقيقة في بعض الحالات ، لذلك قد ينتهي بك الأمر إلى دفع مبالغ زائدة أو دفع رسوم المعاملات الخاصة بك", "disable_fiat": "تعطيل fiat", "disable_sell": "قم بتعطيل إجراء البيع", + "disable_tor": "تعطيل تور", "disable_trade_option": "تعطيل خيار التجارة", "disableBatteryOptimization": "تعطيل تحسين البطارية", "disableBatteryOptimizationDescription": "هل تريد تعطيل تحسين البطارية من أجل جعل الخلفية مزامنة تعمل بحرية وسلاسة؟", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "نقوم بإنشاء عناوين جديدة في كل مرة تستخدم فيها عنوانًا ، لكن العناوين السابقة تستمر في العمل", "email_address": "عنوان البريد الالكترونى", "enable": "يُمكَِن", + "enable_builtin_tor": "تمكين بنيت في تور", "enable_mempool_api": "MEMPOOL API للحصول على رسوم وتواريخ دقيقة", "enable_replace_by_fee": "تمكين الاستبدال", "enable_silent_payments_scanning": "ابدأ في مسح المدفوعات الصامتة ، حتى يتم الوصول إلى الطرف", @@ -334,6 +336,7 @@ "error_while_processing": "حدث خطأ أثناء التنقل", "errorGettingCredentials": "ﺩﺎﻤﺘﻋﻻﺍ ﺕﺎﻧﺎﻴﺑ ﻰﻠﻋ ﻝﻮﺼﺤﻟﺍ ءﺎﻨﺛﺃ ﺄﻄﺧ ﺙﺪﺣ :ﻞﺸﻓ", "errorSigningTransaction": "ﺔﻠﻣﺎﻌﻤﻟﺍ ﻊﻴﻗﻮﺗ ءﺎﻨﺛﺃ ﺄﻄﺧ ﺙﺪﺣ", + "establishing_tor_connection": "ارتياح توصيل تور", "estimated": "مُقدَّر", "estimated_new_fee": "رسوم جديدة مقدرة", "estimated_receive_amount": "مقدرة المبلغ الاستقبال", @@ -860,6 +863,7 @@ "sort_by": "ترتيب حسب", "spend_key_private": "مفتاح الإنفاق (خاص)", "spend_key_public": "مفتاح الإنفاق (عام)", + "starting_tor_proxy": "بدء الوكيل Tor", "status": "الحالة:", "step": "خطوة", "string_default": "تقصير", @@ -916,6 +920,8 @@ "tokenID": "ﻒﻳﺮﻌﺗ ﺔﻗﺎﻄﺑ", "ton_extra_info": "يرجى عدم نسيان تحديد معرف المذكرة أثناء إرسال معاملة TON للتبادل", "tor_connection": "ﺭﻮﺗ ﻝﺎﺼﺗﺍ", + "tor_connection_timeout": "Tor Torn Connection Timeout", + "tor_experimental": "هذه ميزة تجريبية ، وليس جميع الاتصالات المصنوعة من توجيه Cake Wallet Support - قد تستخدم بعض الاتصالات ClearNet ، من أجل توجيه حركة المرور بشكل كامل باستخدام TOR مع وضع VPN.", "tor_only": "Tor فقط", "total": "المجموع", "total_saving": "إجمالي المدخرات", diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index e1d364b95..805fd9273 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Като изключите това, таксите могат да бъдат неточни в някои случаи, така че може да се препланите или да не плащате таксите за вашите транзакции", "disable_fiat": "Деактивиране на fiat", "disable_sell": "Деактивирайте действието за продажба", + "disable_tor": "Деактивирайте Tor", "disable_trade_option": "Деактивирайте опцията за търговия", "disableBatteryOptimization": "Деактивирайте оптимизацията на батерията", "disableBatteryOptimizationDescription": "Искате ли да деактивирате оптимизацията на батерията, за да направите синхронизирането на фона да работи по -свободно и гладко?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Нови адреси се генерират всеки път, когато използвате този, но и предишните продължават да работят", "email_address": "Имейл адрес", "enable": "Активиране", + "enable_builtin_tor": "Активирайте вграден Tor", "enable_mempool_api": "Mempool API за точни такси и дати", "enable_replace_by_fee": "Активиране на замяна по забрана", "enable_silent_payments_scanning": "Започнете да сканирате безшумните плащания, докато се достигне съветът", @@ -334,6 +336,7 @@ "error_while_processing": "Възникна грешка при приемане", "errorGettingCredentials": "Неуспешно: Грешка при получаване на идентификационни данни", "errorSigningTransaction": "Възникна грешка при подписване на транзакция", + "establishing_tor_connection": "Естибилиране на TOR връзка", "estimated": "Изчислено", "estimated_new_fee": "Прогнозна нова такса", "estimated_receive_amount": "Прогнозна сума за получаване", @@ -860,6 +863,7 @@ "sort_by": "Сортирай по", "spend_key_private": "Spend key (таен)", "spend_key_public": "Spend key (публичен)", + "starting_tor_proxy": "Стартиране на прокси", "status": "Статус: ", "step": "Стъпка", "string_default": "По подразбиране", @@ -916,6 +920,8 @@ "tokenID": "документ за самоличност", "ton_extra_info": "Моля, не забравяйте да посочите идентификационния номер на бележката, докато изпращате транзакцията TON за борсата", "tor_connection": "Tor връзка", + "tor_connection_timeout": "TOR ВРЕМЕ НА ВРЕМЕТО ВРЕМЕ", + "tor_experimental": "Това е експериментална функция, не всички връзки, направени от маршрутизиране на тортата за портфейл за торта - някои връзки могат да използват ClearNet, за да се насочи напълно да използва трафик на приложения TOR с VPN режим.", "tor_only": "Само чрез Tor", "total": "Обща сума", "total_saving": "Общо спестявания", diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 0a6693316..658bcdf6e 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Tímto vypnutím by sazby poplatků mohly být v některých případech nepřesné, takže byste mohli skončit přepláváním nebo nedoplatkem poplatků za vaše transakce", "disable_fiat": "Zakázat fiat", "disable_sell": "Zakázat akci prodeje", + "disable_tor": "Zakázat tor", "disable_trade_option": "Zakázat možnost TRADE", "disableBatteryOptimization": "Zakázat optimalizaci baterie", "disableBatteryOptimizationDescription": "Chcete deaktivovat optimalizaci baterie, aby se synchronizovala pozadí volně a hladce?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Po každém použití je generována nová adresa, ale předchozí adresy také stále fungují", "email_address": "E-mailová adresa", "enable": "Umožnit", + "enable_builtin_tor": "Povolte vestavěné tor", "enable_mempool_api": "Mempool API pro přesné poplatky a data", "enable_replace_by_fee": "Povolit výměnu podle poplatku", "enable_silent_payments_scanning": "Začněte skenovat tiché platby, dokud není dosaženo špičky", @@ -334,6 +336,7 @@ "error_while_processing": "Při převádění došlo k chybě", "errorGettingCredentials": "Selhalo: Chyba při získávání přihlašovacích údajů", "errorSigningTransaction": "Při podepisování transakce došlo k chybě", + "establishing_tor_connection": "Estabilizující připojení Tor", "estimated": "Odhadováno", "estimated_new_fee": "Odhadovaný nový poplatek", "estimated_receive_amount": "Odhadovaná částka přijímání", @@ -860,6 +863,7 @@ "sort_by": "Seřazeno podle", "spend_key_private": "Klíč pro platby (soukromý)", "spend_key_public": "Klíč pro platby (veřejný)", + "starting_tor_proxy": "Zahájení proxy Tor", "status": "Status: ", "step": "Krok", "string_default": "Výchozí", @@ -916,6 +920,8 @@ "tokenID": "ID", "ton_extra_info": "Při odeslání TON transakce pro výměnu nezapomeňte zadat ID Memo ID", "tor_connection": "Připojení Tor", + "tor_connection_timeout": "Časový limit připojení", + "tor_experimental": "Jedná se o experimentální funkci, ne všechna připojení vyrobená z podpory dortů na dort Tor - některá připojení mohou používat ClearNet, aby se plně směrovaly používání provozu aplikací s režimem VPN.", "tor_only": "Pouze Tor", "total": "Celkový", "total_saving": "Celkem ušetřeno", diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 5e9c2209c..b35f79cd3 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Wenn dies ausgeschaltet wird, sind die Gebührenquoten in einigen Fällen möglicherweise ungenau, sodass Sie die Gebühren für Ihre Transaktionen möglicherweise überbezahlt oder unterzahlt", "disable_fiat": "Fiat deaktivieren", "disable_sell": "Verkaufsaktion deaktivieren", + "disable_tor": "Tor deaktivieren", "disable_trade_option": "Handelsoption deaktivieren", "disableBatteryOptimization": "Batterieoptimierung deaktivieren", "disableBatteryOptimizationDescription": "Möchten Sie die Batterieoptimierung deaktivieren, um die Hintergrundsynchronisierung reibungsloser zu gestalten?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Wir generieren jedes Mal neue Adressen, wenn Sie eine verwenden, aber vorherige Adressen funktionieren weiterhin", "email_address": "E-Mail-Adresse", "enable": "Aktivieren", + "enable_builtin_tor": "Aktivieren Sie den bau-in tor", "enable_mempool_api": "Mempool-API für genaue Gebühren und Daten", "enable_replace_by_fee": "Aktivieren Sie Ersatz für Fee", "enable_silent_payments_scanning": "Scannen Sie nach Silent Payments ihrer Adresse", @@ -334,6 +336,7 @@ "error_while_processing": "Ein Fehler beim Proceessing trat ein Fehler auf", "errorGettingCredentials": "Fehlgeschlagen: Fehler beim Abrufen der Anmeldeinformationen", "errorSigningTransaction": "Beim Signieren der Transaktion ist ein Fehler aufgetreten", + "establishing_tor_connection": "Einstellung der TOR -Verbindung", "estimated": "Geschätzt", "estimated_new_fee": "Geschätzte neue Gebühr", "estimated_receive_amount": "Geschätzter Empfangsbetrag", @@ -861,6 +864,7 @@ "sort_by": "Sortiere nach", "spend_key_private": "Spend Key (geheim)", "spend_key_public": "Spend Key (öffentlich)", + "starting_tor_proxy": "TOR -Proxy beginnen", "status": "Status: ", "step": "Schritt", "string_default": "Standard", @@ -917,6 +921,8 @@ "tokenID": "AUSWEIS", "ton_extra_info": "Bitte vergessen Sie nicht, die Memo -ID anzugeben, während Sie die TON -Transaktion für den Austausch senden", "tor_connection": "Tor-Verbindung", + "tor_connection_timeout": "TOR -Verbindungs ​​-Zeitüberschreitung", + "tor_experimental": "Dies ist eine experimentelle Funktion, nicht alle Verbindungen, die aus Kuchen -Wallet -Stütze für die Routing hergestellt werden. Einige Verbindungen können ClearNET verwenden, um den App -Traffic -App -TOR mit dem VPN -Modus vollständig zu verwenden.", "tor_only": "Nur Tor", "total": "Gesamt", "total_saving": "Gesamteinsparungen", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index ad4894238..b6e655674 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "By turning this off, the fee rates might be inaccurate in some cases, so you might end up overpaying or underpaying the fees for your transactions", "disable_fiat": "Disable fiat", "disable_sell": "Disable sell action", + "disable_tor": "Disable Tor", "disable_trade_option": "Disable trade option", "disableBatteryOptimization": "Disable Battery Optimization", "disableBatteryOptimizationDescription": "Do you want to disable battery optimization in order to make background sync run more freely and smoothly?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "We generate new addresses each time you use one, but previous addresses continue to work", "email_address": "Email Address", "enable": "Enable", + "enable_builtin_tor": "Enable built-in Tor", "enable_mempool_api": "Mempool API for accurate fees and dates", "enable_replace_by_fee": "Enable Replace-By-Fee", "enable_silent_payments_scanning": "Start scanning for transactions sent to your Silent Payment address.", @@ -334,6 +336,7 @@ "error_while_processing": "An error occurred while proceessing", "errorGettingCredentials": "Failed: Error while getting credentials", "errorSigningTransaction": "An error has occured while signing transaction", + "establishing_tor_connection": "Estabilishing Tor connection", "estimated": "Estimated", "estimated_new_fee": "Estimated new fee", "estimated_receive_amount": "Estimated receive amount", @@ -861,6 +864,7 @@ "sort_by": "Sort by", "spend_key_private": "Spend key (private)", "spend_key_public": "Spend key (public)", + "starting_tor_proxy": "Starting Tor proxy", "status": "Status: ", "step": "Step", "string_default": "Default", @@ -917,6 +921,8 @@ "tokenID": "ID", "ton_extra_info": "Please don’t forget to specify the Memo ID while sending the TON transaction for the exchange", "tor_connection": "Tor connection", + "tor_connection_timeout": "Tor connection timeout", + "tor_experimental": "This is an experimental feature, not all connections made from Cake Wallet support Tor routing - some connections may use clearnet, in order to fully route app traffic use Tor with VPN mode.", "tor_only": "Tor only", "total": "Total", "total_saving": "Total Savings", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 3f8657ec4..6a75f6e62 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Al apagar esto, las tasas de tarifas pueden ser inexactas en algunos casos, por lo que puede terminar pagando en exceso o pagando menos las tarifas por sus transacciones", "disable_fiat": "Deshabilitar fiat", "disable_sell": "Desactivar acción de venta", + "disable_tor": "Deshabilitar tor", "disable_trade_option": "Deshabilitar la opción de comercio", "disableBatteryOptimization": "Deshabilitar la optimización de la batería", "disableBatteryOptimizationDescription": "¿Desea deshabilitar la optimización de la batería para que la sincronización de fondo se ejecute más libremente y sin problemas?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Generamos nuevas direcciones cada vez que usa una, pero las direcciones anteriores siguen funcionando", "email_address": "Dirección de correo electrónico", "enable": "Permitir", + "enable_builtin_tor": "Habilitar buildi-in tor", "enable_mempool_api": "API de Mempool para tarifas y fechas precisas", "enable_replace_by_fee": "Habilitar reemplazar por tarea", "enable_silent_payments_scanning": "Comienza a escanear pagos silenciosos, hasta que se alcance la altura actual", @@ -334,6 +336,7 @@ "error_while_processing": "Se produjo un error mientras procesaba", "errorGettingCredentials": "Error: error al obtener las credenciales", "errorSigningTransaction": "Se ha producido un error al firmar la transacción.", + "establishing_tor_connection": "Estabilización de la conexión para", "estimated": "Estimado", "estimated_new_fee": "Nueva tarifa estimada", "estimated_receive_amount": "Cantidad de recepción estimada", @@ -861,6 +864,7 @@ "sort_by": "Ordenar por", "spend_key_private": "Llave de gasto (privada)", "spend_key_public": "Llave de gasto (pública)", + "starting_tor_proxy": "Inicio Tor Proxy", "status": "Estado: ", "step": "Paso", "string_default": "Por defecto", @@ -917,6 +921,8 @@ "tokenID": "IDENTIFICACIÓN", "ton_extra_info": "No olvide especificar el ID de memo mientras envía la transacción TON para el intercambio", "tor_connection": "conexión tor", + "tor_connection_timeout": "Tiempo de espera de conexión de Tor", + "tor_experimental": "Esta es una característica experimental, no todas las conexiones hechas con el enrutamiento de soporte para la billetera de pastel: algunas conexiones pueden usar ClearNet, para enrutar completamente el tráfico de aplicaciones Uso Tor con el modo VPN.", "tor_only": "solo Tor", "total": "Total", "total_saving": "Ahorro Total", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index ba3ae4859..d2f8b4e6b 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "En désactivant cela, les taux de frais peuvent être inexacts dans certains cas, vous pourriez donc finir par payer trop ou sous-paiement les frais pour vos transactions", "disable_fiat": "Désactiver les montants en fiat", "disable_sell": "Désactiver l'action de vente", + "disable_tor": "Désactiver Tor", "disable_trade_option": "Désactiver l'option de commerce", "disableBatteryOptimization": "Désactiver l'optimisation de la batterie", "disableBatteryOptimizationDescription": "Voulez-vous désactiver l'optimisation de la batterie afin de faire fonctionner la synchronisation d'arrière-plan plus librement et en douceur?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Nous générons de nouvelles adresses à chaque fois que vous en utilisez une, mais les adresses précédentes continuent à fonctionner", "email_address": "Adresse e-mail", "enable": "Activer", + "enable_builtin_tor": "Activer le Tor construit", "enable_mempool_api": "API Mempool pour les frais et dates précis", "enable_replace_by_fee": "Activer Remplace-by-Fee", "enable_silent_payments_scanning": "Commencez à analyser les transactions envoyées à votre adresse de paiement silencieux.", @@ -334,6 +336,7 @@ "error_while_processing": "Une erreur s'est produite lors de la procédure", "errorGettingCredentials": "Échec : erreur lors de l'obtention des informations d'identification", "errorSigningTransaction": "Une erreur s'est produite lors de la signature de la transaction", + "establishing_tor_connection": "Établir la connexion TOR", "estimated": "Estimé", "estimated_new_fee": "De nouveaux frais estimés", "estimated_receive_amount": "Recevoir estimé le montant", @@ -860,6 +863,7 @@ "sort_by": "Trier par", "spend_key_private": "Clef de dépense (spend key) (privée)", "spend_key_public": "Clef de dépense (spend key) (publique)", + "starting_tor_proxy": "Démarrer le proxy Tor", "status": "Statut: ", "step": "Étape", "string_default": "Défaut", @@ -916,6 +920,8 @@ "tokenID": "IDENTIFIANT", "ton_extra_info": "N'oubliez pas de spécifier l'identification de la note lors de l'envoi de la transaction TON pour l'échange", "tor_connection": "Connexion Tor", + "tor_connection_timeout": "Tor Connection Timeout", + "tor_experimental": "Il s'agit d'une caractéristique expérimentale, toutes les connexions faites à partir du portefeuille du portefeuille de gâteaux TOR ROUTING - Certaines connexions peuvent utiliser ClearNet, afin d'achever entièrement le trafic d'application Utiliser TOR avec le mode VPN.", "tor_only": "Tor uniquement", "total": "Total", "total_saving": "Économies totales", diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index ebd236332..6b73db8ed 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Ta hanyar juya wannan kashe, kudaden da zai iya zama ba daidai ba a wasu halaye, saboda haka zaku iya ƙare da overpaying ko a ƙarƙashin kudaden don ma'amaloli", "disable_fiat": "Dakatar da fiat", "disable_sell": "Kashe karbuwa", + "disable_tor": "Musaki tor", "disable_trade_option": "Musaki zaɓi na kasuwanci", "disableBatteryOptimization": "Kashe ingantawa baturi", "disableBatteryOptimizationDescription": "Shin kana son kashe ingantawa baturi don yin setnc bankwali gudu da yar kyauta da kyau?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Muna samar da sababbin adireshi duk lokacin da kuka yi amfani da ɗaya, amma adiresoshin da suka gabata suna ci gaba da aiki", "email_address": "Adireshin i-mel", "enable": "Ba dama", + "enable_builtin_tor": "Sanya riguna-inf", "enable_mempool_api": "Mampool API don ingantattun kudade da kwanakin", "enable_replace_by_fee": "Ba da damar maye gurbin-by-kudin", "enable_silent_payments_scanning": "Fara bincika biya na shiru, har sai tip ɗin ya kai", @@ -334,6 +336,7 @@ "error_while_processing": "Kuskure ya faru yayin bincike", "errorGettingCredentials": "Ba a yi nasara ba: Kuskure yayin samun takaddun shaida", "errorSigningTransaction": "An sami kuskure yayin sanya hannu kan ciniki", + "establishing_tor_connection": "Kafa Tor Haɗaɗɗa", "estimated": "Kiyasta", "estimated_new_fee": "An kiyasta sabon kudin", "estimated_receive_amount": "Kiyasta samun adadin", @@ -862,6 +865,7 @@ "sort_by": "Kasa", "spend_key_private": "makullin biya (maɓallin kalmar sirri)", "spend_key_public": "makullin biya (maɓallin jama'a)", + "starting_tor_proxy": "Fara tor proxy", "status": "Matsayi:", "step": "Taka", "string_default": "Ƙin cika alƙawari", @@ -918,6 +922,8 @@ "tokenID": "ID", "ton_extra_info": "Don Allah kar a manta su saka ID na Memo yayin aikawa da ma'amala don musayar", "tor_connection": "Tor haɗin gwiwa", + "tor_connection_timeout": "A lokacin Tor Haɗin", + "tor_experimental": "Wannan fasalin gwaji ne, ba duk haɗin da aka yi ba daga Wall Wall Wall Walling goyon baya Tor Routing - don cikakken amfani da hanyar zirga-zirga amfani da tor tare da yanayin vpn.", "tor_only": "Tor kawai", "total": "Duka", "total_saving": "Jimlar Adana", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 2e71b6685..f97b0f84f 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "इसे बंद करने से, कुछ मामलों में शुल्क दरें गलत हो सकती हैं, इसलिए आप अपने लेनदेन के लिए फीस को कम कर सकते हैं या कम कर सकते हैं", "disable_fiat": "िएट को अक्षम करें", "disable_sell": "बेचने की कार्रवाई अक्षम करें", + "disable_tor": "टोर को अक्षम करें", "disable_trade_option": "व्यापार विकल्प अक्षम करें", "disableBatteryOptimization": "बैटरी अनुकूलन अक्षम करें", "disableBatteryOptimizationDescription": "क्या आप बैकग्राउंड सिंक को अधिक स्वतंत्र और सुचारू रूप से चलाने के लिए बैटरी ऑप्टिमाइज़ेशन को अक्षम करना चाहते हैं?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "हर बार जब आप एक का उपयोग करते हैं तो हम नए पते उत्पन्न करते हैं, लेकिन पिछले पते काम करना जारी रखते हैं", "email_address": "ईमेल पता", "enable": "सक्षम", + "enable_builtin_tor": "बिल्ट-इन टोर को सक्षम करें", "enable_mempool_api": "सटीक शुल्क और तिथियों के लिए मेमपूल एपीआई", "enable_replace_by_fee": "प्रतिस्थापित-दर-शुल्क सक्षम करें", "enable_silent_payments_scanning": "मूक भुगतान स्कैनिंग सक्षम करें", @@ -334,6 +336,7 @@ "error_while_processing": "प्रोकसिंग करते समय एक त्रुटि हुई", "errorGettingCredentials": "विफल: क्रेडेंशियल प्राप्त करते समय त्रुटि", "errorSigningTransaction": "लेन-देन पर हस्ताक्षर करते समय एक त्रुटि उत्पन्न हुई है", + "establishing_tor_connection": "टोर -कनेक्शन", "estimated": "अनुमानित", "estimated_new_fee": "अनुमानित नया शुल्क", "estimated_receive_amount": "अनुमानित राशि", @@ -862,6 +865,7 @@ "sort_by": "इसके अनुसार क्रमबद्ध करें", "spend_key_private": "खर्च करना (निजी)", "spend_key_public": "खर्च करना (जनता)", + "starting_tor_proxy": "टोर प्रॉक्सी शुरू करना", "status": "स्थिति: ", "step": "कदम", "string_default": "गलती करना", @@ -918,6 +922,8 @@ "tokenID": "पहचान", "ton_extra_info": "कृपया एक्सचेंज के लिए टन लेनदेन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें", "tor_connection": "टोर कनेक्शन", + "tor_connection_timeout": "टोर कनेक्शन टाइमआउट", + "tor_experimental": "यह एक प्रायोगिक विशेषता है, केक वॉलेट सपोर्ट टोर रूटिंग से किए गए सभी कनेक्शन नहीं - कुछ कनेक्शन क्लीयरनेट का उपयोग कर सकते हैं, ताकि वीपीएन मोड के साथ ऐप ट्रैफिक का उपयोग पूरी तरह से रूट करने के लिए हो।", "tor_only": "Tor केवल", "total": "कुल", "total_saving": "कुल बचत", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index b0aa12937..ef9e04bbe 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Isključivanjem ovoga, stope naknade u nekim bi slučajevima mogle biti netočne, tako da biste mogli preplatiti ili predati naknadu za vaše transakcije", "disable_fiat": "Isključi, fiat", "disable_sell": "Onemogući akciju prodaje", + "disable_tor": "Onemogućiti tor", "disable_trade_option": "Onemogući trgovinsku opciju", "disableBatteryOptimization": "Onemogući optimizaciju baterije", "disableBatteryOptimizationDescription": "Želite li onemogućiti optimizaciju baterije kako bi se pozadinska sinkronizacija radila slobodnije i glatko?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Minden egyes alkalommal új címeket generálunk, de a korábbi címek továbbra is működnek", "email_address": "Adresa e-pošte", "enable": "Omogućiti", + "enable_builtin_tor": "Omogućite ugrađeni u tor", "enable_mempool_api": "Mempool API za točne naknade i datume", "enable_replace_by_fee": "Omogući zamjenu", "enable_silent_payments_scanning": "Započnite skeniranje tihih plaćanja, dok se ne postigne savjet", @@ -334,6 +336,7 @@ "error_while_processing": "Došlo je do pogreške tijekom prožimanja", "errorGettingCredentials": "Neuspješno: Pogreška prilikom dobivanja vjerodajnica", "errorSigningTransaction": "Došlo je do pogreške prilikom potpisivanja transakcije", + "establishing_tor_connection": "Uspostavljanje torbice", "estimated": "procijenjen", "estimated_new_fee": "Procijenjena nova naknada", "estimated_receive_amount": "Procijenjeni iznos primanja", @@ -860,6 +863,7 @@ "sort_by": "Poredaj po", "spend_key_private": "Spend key (privatni)", "spend_key_public": "Spend key (javni)", + "starting_tor_proxy": "Početak Tor proxy", "status": "Status: ", "step": "Korak", "string_default": "Zadano", @@ -916,6 +920,8 @@ "tokenID": "iskaznica", "ton_extra_info": "Ne zaboravite navesti ID memorandu", "tor_connection": "Tor veza", + "tor_connection_timeout": "TOR TIMPOUCEN", + "tor_experimental": "Ovo je eksperimentalna značajka, nisu sve veze napravljene od podrške za kolače za torte - neke veze mogu koristiti ClearNet, kako bi se u potpunosti usmjerio na APP promet s TOR -om s VPN načinom rada.", "tor_only": "Samo Tor", "total": "Ukupno", "total_saving": "Ukupna ušteda", diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb index cafabe5a6..ac1bfda99 100644 --- a/res/values/strings_hy.arb +++ b/res/values/strings_hy.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Դրանից անջատելով, վճարների տեմպերը որոշ դեպքերում կարող են անճիշտ լինել, այնպես որ դուք կարող եք վերջ տալ ձեր գործարքների համար վճարների գերավճարների կամ գերավճարների վրա", "disable_fiat": "Անջատել ֆիատ", "disable_sell": "Անջատել վաճառք գործողությունը", + "disable_tor": "Անջատեք Tor- ը", "disable_trade_option": "Անջատեք առեւտրի տարբերակը", "disableBatteryOptimization": "Անջատել մարտկոցի օպտիմիզացիան", "disableBatteryOptimizationDescription": "Դուք ցանկանում եք անջատել մարտկոցի օպտիմիզացիան ֆոնային համաժամացման ավելի ազատ և հարթ ընթացքի համար?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Մենք ստեղծում ենք նոր հասցե ամեն անգամ, երբ դուք օգտագործում եք այն, բայց նախորդ հասցեները շարունակում են աշխատել", "email_address": "Էլ. փոստի հասցե", "enable": "Միացնել", + "enable_builtin_tor": "Միացրեք ներկառուցված ջահը", "enable_mempool_api": "Mempool API ճշգրիտ վճարների եւ ամսաթվերի համար", "enable_replace_by_fee": "Միացնել փոխարինումը միջնորդավճարով", "enable_silent_payments_scanning": "Միացնել Լուռ Վճարումների սկանավորումը", @@ -334,6 +336,7 @@ "error_while_processing": "Նախագծման ժամանակ սխալ է տեղի ունեցել", "errorGettingCredentials": "Սխալ. ծանրաբեռնված վստահագրեր ստանալիս", "errorSigningTransaction": "Սխալ է տեղի ունեցել գործարքը ստորագրելիս", + "establishing_tor_connection": "Չափայնացնում է Tor կապը", "estimated": "Գնահատված", "estimated_new_fee": "Գնահատված նոր միջնորդավճար", "estimated_receive_amount": "Գնահատված ստացված գումար", @@ -858,6 +861,7 @@ "sort_by": "Դասավորել ըստ", "spend_key_private": "Վճարման բանալի (գախտնի)", "spend_key_public": "Վճարման բանալի (հանրային)", + "starting_tor_proxy": "Սկսելով Tor վստահված անձը", "status": "Կարգավիճակ՝ ", "step": "Քայլ", "string_default": "Լռելայն", @@ -914,6 +918,8 @@ "tokenID": "ID", "ton_extra_info": "Խնդրում ենք մի մոռացեք նշել MEMO ID- ն, երբ փոխանակման համար տոննա գործարքը ուղարկեք", "tor_connection": "Tor կապ", + "tor_connection_timeout": "Tor կապի ժամկետ", + "tor_experimental": "Սա փորձարարական առանձնահատկություն է, ոչ բոլոր կապերը տորթ դրամապանակների աջակցության համար", "tor_only": "Միայն Tor", "total": "Ընդհանուր", "total_saving": "Ընդհանուր խնայողություն", diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index e726ffb3c..e693c98e5 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Dengan mematikan ini, tarif biaya mungkin tidak akurat dalam beberapa kasus, jadi Anda mungkin akan membayar lebih atau membayar biaya untuk transaksi Anda", "disable_fiat": "Nonaktifkan fiat", "disable_sell": "Nonaktifkan aksi jual", + "disable_tor": "Nonaktifkan tor", "disable_trade_option": "Nonaktifkan opsi perdagangan", "disableBatteryOptimization": "Nonaktifkan optimasi baterai", "disableBatteryOptimizationDescription": "Apakah Anda ingin menonaktifkan optimasi baterai untuk membuat sinkronisasi latar belakang berjalan lebih bebas dan lancar?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Kami menghasilkan alamat baru setiap kali Anda menggunakan satu, tetapi alamat sebelumnya tetap berfungsi", "email_address": "Alamat Email", "enable": "Memungkinkan", + "enable_builtin_tor": "Aktifkan built-in tor", "enable_mempool_api": "API Mempool untuk biaya dan tanggal yang akurat", "enable_replace_by_fee": "Aktifkan ganti-by-fee", "enable_silent_payments_scanning": "Mulailah memindai pembayaran diam, sampai ujung tercapai", @@ -334,6 +336,7 @@ "error_while_processing": "Terjadi kesalahan saat prosedur", "errorGettingCredentials": "Gagal: Terjadi kesalahan saat mendapatkan kredensial", "errorSigningTransaction": "Terjadi kesalahan saat menandatangani transaksi", + "establishing_tor_connection": "Estabilishing Tor Connection", "estimated": "Diperkirakan", "estimated_new_fee": "Perkiraan biaya baru", "estimated_receive_amount": "Diperkirakan jumlah menerima", @@ -863,6 +866,7 @@ "sort_by": "Sortir dengan", "spend_key_private": "Kunci pengeluaran (privat)", "spend_key_public": "Kunci pengeluaran (publik)", + "starting_tor_proxy": "Mulai untuk proxy", "status": "Status: ", "step": "Melangkah", "string_default": "Bawaan", @@ -919,6 +923,8 @@ "tokenID": "PENGENAL", "ton_extra_info": "Harap jangan lupa untuk menentukan ID memo saat mengirim transaksi ton untuk pertukaran", "tor_connection": "koneksi Tor", + "tor_connection_timeout": "Tor Connection Timeout", + "tor_experimental": "Ini adalah fitur eksperimental, tidak semua koneksi yang terbuat dari dukungan dompet kue untuk routing - beberapa koneksi dapat menggunakan clearnet, untuk sepenuhnya merutekan aplikasi lalu lintas menggunakan untuk mode VPN.", "tor_only": "Hanya Tor", "total": "Total", "total_saving": "Total Pembayaran", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index 4e94c349f..b92969550 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Disattivando quest'opzione, i tassi delle commissioni potrebbero essere inaccurati in alcuni casi, quindi potresti finire per pagare troppo o troppo poco le commissioni per le tue transazioni", "disable_fiat": "Disabilita fiat", "disable_sell": "Disabilita l'azione di vendita", + "disable_tor": "Disabilita Tor", "disable_trade_option": "Disabilita l'opzione di scambio", "disableBatteryOptimization": "Disabilita l'ottimizzazione della batteria", "disableBatteryOptimizationDescription": "Vuoi disabilitare l'ottimizzazione della batteria per migliorare la sincronizzazione in background?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Generiamo nuovi indirizzi ogni volta che ne utilizzi uno, ma gli indirizzi precedenti continuano a funzionare", "email_address": "Indirizzo e-mail", "enable": "Abilita", + "enable_builtin_tor": "Abilita buildi-in tor", "enable_mempool_api": "API Mempool per commissioni e date accurate", "enable_replace_by_fee": "Abilita Replace-By-Fee", "enable_silent_payments_scanning": "Inizia a scansionare le transazioni inviate al tuo indirizzo Silent Payments", @@ -334,6 +336,7 @@ "error_while_processing": "Si è verificato un errore durante la promozione", "errorGettingCredentials": "Non riuscito: errore durante il recupero delle credenziali", "errorSigningTransaction": "Si è verificato un errore durante la firma della transazione", + "establishing_tor_connection": "Connessione TOR di esame", "estimated": "Stimato", "estimated_new_fee": "Nuova commissione stimata", "estimated_receive_amount": "Importo di ricezione stimato", @@ -861,6 +864,7 @@ "sort_by": "Ordina per", "spend_key_private": "Chiave di spesa (privata)", "spend_key_public": "Chiave di spesa (pubblica)", + "starting_tor_proxy": "Avvio del proxy di Tor", "status": "Stato: ", "step": "Fare un passo", "string_default": "Predefinito", @@ -917,6 +921,8 @@ "tokenID": "ID", "ton_extra_info": "Non dimenticare di specificare l'ID memo durante l'invio della transazione Ton per lo scambio", "tor_connection": "Connessione Tor", + "tor_connection_timeout": "Timeout di connessione TOR", + "tor_experimental": "Questa è una funzionalità sperimentale, non tutte le connessioni realizzate con il supporto per il portafoglio di torta per routing - alcune connessioni possono utilizzare ClearNet, al fine di instradare completamente il traffico di app per l'uso del traffico con la modalità VPN.", "tor_only": "Solo Tor", "total": "Totale", "total_saving": "Risparmio totale", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 960634e27..9a0b9fc23 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "これをオフにすることで、料金金利は場合によっては不正確になる可能性があるため、取引の費用が過払いまたは不足している可能性があります", "disable_fiat": "フィアットを無効にする", "disable_sell": "販売アクションを無効にする", + "disable_tor": "torを無効にします", "disable_trade_option": "取引オプションを無効にします", "disableBatteryOptimization": "バッテリーの最適化を無効にします", "disableBatteryOptimizationDescription": "バックグラウンドシンクをより自由かつスムーズに実行するために、バッテリーの最適化を無効にしたいですか？", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "使用するたびに新しいアドレスが生成されますが、以前のアドレスは引き続き機能します", "email_address": "メールアドレス", "enable": "有効にする", + "enable_builtin_tor": "組み込みのTORを有効にします", "enable_mempool_api": "正確な料金と日付のMempool API", "enable_replace_by_fee": "交換ごとに有効にします", "enable_silent_payments_scanning": "先端に達するまで、サイレント決済のスキャンを開始します", @@ -334,6 +336,7 @@ "error_while_processing": "処理中にエラーが発生しました", "errorGettingCredentials": "失敗: 認証情報の取得中にエラーが発生しました", "errorSigningTransaction": "トランザクションの署名中にエラーが発生しました", + "establishing_tor_connection": "TOR接続を確立します", "estimated": "推定", "estimated_new_fee": "推定新しい料金", "estimated_receive_amount": "推定受信金額", @@ -861,6 +864,7 @@ "sort_by": "並び替え", "spend_key_private": "キーを使う (プライベート)", "spend_key_public": "キーを使う (パブリック)", + "starting_tor_proxy": "プロキシを開始します", "status": "状態: ", "step": "ステップ", "string_default": "デフォルト", @@ -917,6 +921,8 @@ "tokenID": "ID", "ton_extra_info": "Exchangeのトントランザクションを送信しながら、メモIDを指定することを忘れないでください", "tor_connection": "Tor接続", + "tor_connection_timeout": "TOR接続タイムアウト", + "tor_experimental": "これは実験的な機能であり、ケーキウォレットサポートTORルーティングから作成されたすべての接続ではありません。一部の接続では、APPトラフィックをVPNモードで完全にルーティングするために、ClearNetを使用する場合があります。", "tor_only": "Torのみ", "total": "合計", "total_saving": "合計節約額", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index e107e1a29..b70d30328 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -268,7 +268,8 @@ "disable_exchange_option": "교환 옵션 비활성화", "disable_fee_api_warning": "이 기능을 끄면 경우에 따라 수수료율이 정확하지 않을 수 있으며, 트랜잭션 수수료를 과다 또는 과소 지불할 수 있습니다.", "disable_fiat": "법정화폐 비활성화", - "disable_sell": "판매 기능 비활성화", + "disable_sell": "판매 조치 비활성화", + "disable_tor": "Tor를 비활성화하십시오", "disable_trade_option": "거래 옵션 비활성화", "disableBatteryOptimization": "배터리 최적화 비활성화", "disableBatteryOptimizationDescription": "백그라운드 동기화가 더 자유롭고 원활하게 실행되도록 배터리 최적화를 비활성화하시겠습니까?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "사용할 때마다 새 주소를 생성하지만 이전 주소도 계속 작동합니다", "email_address": "이메일 주소", "enable": "활성화", + "enable_builtin_tor": "내장 Tor를 활성화하십시오", "enable_mempool_api": "정확한 수수료 및 날짜를 위한 Mempool API", "enable_replace_by_fee": "RBF(Replace-By-Fee) 활성화", "enable_silent_payments_scanning": "사일런트 페이먼트 주소로 전송된 트랜잭션 스캔 시작", @@ -334,6 +336,7 @@ "error_while_processing": "처리 중 오류가 발생했습니다", "errorGettingCredentials": "실패: 자격 증명을 가져오는 중 오류 발생", "errorSigningTransaction": "트랜잭션 서명 중 오류가 발생했습니다", + "establishing_tor_connection": "Tor 연결을 실행합니다", "estimated": "예상", "estimated_new_fee": "예상 새 수수료", "estimated_receive_amount": "예상 수령 금액", @@ -861,6 +864,7 @@ "sort_by": "정렬 기준", "spend_key_private": "지출 키 (개인)", "spend_key_public": "지출 키 (공개)", + "starting_tor_proxy": "Tor 프록시 시작", "status": "상태: ", "step": "단계", "string_default": "기본값", @@ -917,6 +921,8 @@ "tokenID": "ID", "ton_extra_info": "교환을 위해 TON 트랜잭션을 보내는 동안 메모 ID를 지정하는 것을 잊지 마십시오.", "tor_connection": "Tor 연결", + "tor_connection_timeout": "Tor 연결 시간 초과", + "tor_experimental": "이것은 케이크 지갑 지원 Tor 라우팅으로 만든 모든 연결을 실험적인 기능입니다. 일부 연결은 Clearnet을 사용할 수 있습니다.", "tor_only": "Tor 전용", "total": "합계", "total_saving": "총 절약액", diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index d9f3c46da..f17bb7527 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "ဤအရာကိုဖွင့်ခြင်းအားဖြင့်အချို့သောကိစ္စရပ်များတွင်အခကြေးငွေနှုန်းထားများသည်တိကျမှုရှိနိုင်သည်,", "disable_fiat": "Fiat ကိုပိတ်ပါ။", "disable_sell": "ရောင်းချခြင်းလုပ်ဆောင်ချက်ကို ပိတ်ပါ။", + "disable_tor": "Tor ကိုပိတ်ပါ", "disable_trade_option": "ကုန်သွယ်ရေး option ကိုပိတ်ပါ", "disableBatteryOptimization": "ဘက်ထရီ optimization ကိုပိတ်ပါ", "disableBatteryOptimizationDescription": "နောက်ခံထပ်တူပြုခြင်းနှင့်ချောချောမွေ့မွေ့ပြုလုပ်နိုင်ရန်ဘက်ထရီ optimization ကိုသင်ပိတ်ထားလိုပါသလား။", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "သင်အသုံးပြုသည့်အချိန်တိုင်းတွင် ကျွန်ုပ်တို့သည် လိပ်စာအသစ်များကို ထုတ်ပေးသော်လည်း ယခင်လိပ်စာများသည် ဆက်လက်အလုပ်လုပ်နေပါသည်။", "email_address": "အီးမေးလ်လိပ်စာ", "enable": "စွမ်းဆောင်နိုင်စေ", + "enable_builtin_tor": "built-in Tor ကို Enable လုပ်ပါ", "enable_mempool_api": "Mempool API တိကျသောအခကြေးငွေနှင့်ရက်စွဲများအတွက်", "enable_replace_by_fee": "အစားထိုး - by- အခကြေးငွေ enable", "enable_silent_payments_scanning": "အစွန်အဖျားသို့ရောက်ရှိသည်အထိအသံတိတ်ငွေပေးချေမှုကိုစကင်ဖတ်စစ်ဆေးပါ", @@ -334,6 +336,7 @@ "error_while_processing": "procesing နေစဉ်အမှားတစ်ခုဖြစ်ပွားခဲ့သည်", "errorGettingCredentials": "မအောင်မြင်ပါ- အထောက်အထားများ ရယူနေစဉ် အမှားအယွင်း", "errorSigningTransaction": "ငွေပေးငွေယူ လက်မှတ်ထိုးစဉ် အမှားအယွင်းတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။", + "establishing_tor_connection": "Tor connection ကို estabilishing", "estimated": "ခန့်မှန်း", "estimated_new_fee": "ခန့်မှန်းသစ်ခန့်မှန်း", "estimated_receive_amount": "ခန့်မှန်းရရှိသောပမာဏ", @@ -860,6 +863,7 @@ "sort_by": "အလိုက်စဥ်သည်", "spend_key_private": "သော့သုံးရန် (သီးသန့်)", "spend_key_public": "သုံးစွဲရန်သော့ (အများပြည်သူ)", + "starting_tor_proxy": "Tor proxy ကိုစတင်ခြင်း", "status": "အခြေအနေ:", "step": "လှမ်း", "string_default": "ပျက်ကွက်ခြင်း", @@ -916,6 +920,8 @@ "tokenID": "အမှတ်သညာ", "ton_extra_info": "ငွေလဲလှယ်မှုအတွက်တန်ပြန်ငွေပေးငွေယူကိုပို့နေစဉ် Memo ID ကိုသတ်မှတ်ရန်မမေ့ပါနှင့်", "tor_connection": "Tor ချိတ်ဆက်မှု", + "tor_connection_timeout": "Tor Connection အချိန်ကုန်", + "tor_experimental": "၎င်းသည်စမ်းသပ်အင်္ဂါရပ်တစ်ခုဖြစ်ပြီးကိတ်မုန့်ပိုက်ဆံအိတ်ကိုပံ့ပိုးပေးသော Tor Routing မှပြုလုပ်သောဆက်သွယ်မှုအားလုံးမှာ Connections သည် Concernet ကို အသုံးပြု. VPN tor ကို VPN Mode ဖြင့် Tor ကို အသုံးပြု. Concernet ကိုသုံးနိုင်သည်။", "tor_only": "Tor သာ", "total": "လုံးဝသော", "total_saving": "စုစုပေါင်းစုဆောင်းငွေ", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 756f0b311..ebde13a68 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Door dit uit te schakelen, kunnen de tarieven in sommige gevallen onnauwkeurig zijn, dus u kunt de vergoedingen voor uw transacties te veel betalen of te weinig betalen", "disable_fiat": "Schakel Fiat uit", "disable_sell": "Verkoopactie uitschakelen", + "disable_tor": "Schakel Tor uit", "disable_trade_option": "Schakel handelsoptie uit", "disableBatteryOptimization": "Schakel de batterijoptimalisatie uit", "disableBatteryOptimizationDescription": "Wilt u de optimalisatie van de batterij uitschakelen om achtergrondsynchronisatie te laten werken, vrijer en soepeler?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "We genereren nieuwe adressen elke keer dat u er een gebruikt, maar eerdere adressen blijven werken", "email_address": "E-mailadres", "enable": "Inschakelen", + "enable_builtin_tor": "Schakel ingebouwde tor in", "enable_mempool_api": "Mempool API voor nauwkeurige kosten en datums", "enable_replace_by_fee": "Schakel vervangen door een fee", "enable_silent_payments_scanning": "Begin met het scannen van stille betalingen, totdat de tip is bereikt", @@ -334,6 +336,7 @@ "error_while_processing": "Er is een fout opgetreden tijdens het procederen", "errorGettingCredentials": "Mislukt: fout bij het ophalen van inloggegevens", "errorSigningTransaction": "Er is een fout opgetreden tijdens het ondertekenen van de transactie", + "establishing_tor_connection": "Estabilishing Tor -verbinding", "estimated": "Geschatte", "estimated_new_fee": "Geschatte nieuwe vergoeding", "estimated_receive_amount": "Geschat ontvangen bedrag", @@ -860,6 +863,7 @@ "sort_by": "Sorteer op", "spend_key_private": "Sleutel uitgeven (privaat)", "spend_key_public": "Sleutel uitgeven (openbaar)", + "starting_tor_proxy": "Tor Proxy starten", "status": "Staat: ", "step": "Stap", "string_default": "Standaard", @@ -916,6 +920,8 @@ "tokenID": "ID kaart", "ton_extra_info": "Vergeet niet om de memo -ID op te geven tijdens het verzenden van de ton -transactie voor de uitwisseling", "tor_connection": "Tor-verbinding", + "tor_connection_timeout": "Tor -verbindingstime -out", + "tor_experimental": "Dit is een experimentele functie, niet alle verbindingen gemaakt van Cake Wallet Support Tor Routing - Sommige verbindingen kunnen ClearNet gebruiken, om app -verkeer volledig te routeren Tor met VPN -modus.", "tor_only": "Alleen Tor", "total": "Totaal", "total_saving": "Totale besparingen", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 78a1af410..d83ef2f3e 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Wyłączając tą opcję, stawki opłaty mogą być w niektórych przypadkach niedokładne, więc możesz przepłacić opłatę za transakcje", "disable_fiat": "Wyłącz waluty FIAT", "disable_sell": "Wyłącz akcję sprzedaży", + "disable_tor": "Wyłącz Tor", "disable_trade_option": "Wyłącz opcję handlu", "disableBatteryOptimization": "Wyłącz optymalizację baterii", "disableBatteryOptimizationDescription": "Czy chcesz wyłączyć optymalizację baterii, aby synchronizacja tła działała swobodniej i płynnie?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Za każdym razem, gdy wykorzystasz adres, dla wiekszej prywatności generujemy nowy, ale poprzednie adresy nadal działają, i moga odbierać środki", "email_address": "Adres e-mail", "enable": "Włącz", + "enable_builtin_tor": "Włącz wbudowany tor", "enable_mempool_api": "Mempool API dla dokładnych opłat i dat", "enable_replace_by_fee": "Włącz wymianę po lewej", "enable_silent_payments_scanning": "Zacznij skanować Silent Payments", @@ -334,6 +336,7 @@ "error_while_processing": "Wystąpił błąd podczas przeróbki", "errorGettingCredentials": "Niepowodzenie: Błąd podczas uzyskiwania poświadczeń", "errorSigningTransaction": "Wystąpił błąd podczas podpisywania transakcji", + "establishing_tor_connection": "Ustalenie połączenia TOR", "estimated": "Oszacowano", "estimated_new_fee": "Szacowana nowa opłata", "estimated_receive_amount": "Szacowana kwota otrzymania", @@ -860,6 +863,7 @@ "sort_by": "Sortuj według", "spend_key_private": "Klucz prywatny", "spend_key_public": "Klucz publiczny", + "starting_tor_proxy": "Rozpoczęcie proxy TOR", "status": "Status: ", "step": "Krok", "string_default": "Domyślny", @@ -916,6 +920,7 @@ "tokenID": "ID", "ton_extra_info": "Nie zapomnij określić identyfikatora notatki podczas wysyłania transakcji TON dla wymiany", "tor_connection": "Połączenie przez Tor", + "tor_connection_timeout": "Tor Connection Timeout", "tor_only": "Tylko sieć Tor", "total": "Całkowity", "total_saving": "Całkowite oszczędności", @@ -1105,5 +1110,6 @@ "you_will_receive_estimated_amount": "Otrzymasz(oszacowane )", "you_will_send": "Konwertuj z", "youCanGoBackToYourDapp": "Możesz teraz wrócić do swojego dapp", - "yy": "RR" + "yy": "RR", + "tor_experimental": "Jest to funkcja eksperymentalna. Nie wszystkie połączenia wykonane z Cake Wallet korzystają z Tor, niektóre połączenia mogą korzystać z Clearnet, aby w pełni przekierować ruch skorzystaj z Tor w trybie VPN." } \ No newline at end of file diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 64c54916a..020f37a78 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Ao desativar isso, as taxas de taxas podem ser imprecisas em alguns casos, para que você possa acabar pagando demais ou pagando as taxas por suas transações", "disable_fiat": "Desativar fiat", "disable_sell": "Desativar ação de venda", + "disable_tor": "Desativar tor", "disable_trade_option": "Desativar a opção comercial", "disableBatteryOptimization": "Desative a otimização da bateria", "disableBatteryOptimizationDescription": "Deseja desativar a otimização da bateria para fazer a sincronização de fundo funcionar de forma mais livre e suave?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Geramos novos endereços cada vez que você usa um, mas os endereços anteriores continuam funcionando", "email_address": "Endereço de e-mail", "enable": "Habilitar", + "enable_builtin_tor": "Ative o Buildi-in Tor", "enable_mempool_api": "Mempool API para taxas e datas precisas", "enable_replace_by_fee": "Habilite substituir por taxa", "enable_silent_payments_scanning": "Comece a escanear pagamentos silenciosos, até que o topo seja alcançada", @@ -334,6 +336,7 @@ "error_while_processing": "Ocorreu um erro ao procurar", "errorGettingCredentials": "Falha: Erro ao obter credenciais", "errorSigningTransaction": "Ocorreu um erro ao assinar a transação", + "establishing_tor_connection": "Estabilizar a conexão com", "estimated": "Estimado", "estimated_new_fee": "Nova taxa estimada", "estimated_receive_amount": "Valor estimado de recebimento", @@ -862,6 +865,7 @@ "sort_by": "Ordenar por", "spend_key_private": "Chave de gastos (privada)", "spend_key_public": "Chave de gastos (pública)", + "starting_tor_proxy": "Começando por proxy", "status": "Status: ", "step": "Etapa", "string_default": "Padrão", @@ -918,6 +922,8 @@ "tokenID": "EU IA", "ton_extra_info": "Não se esqueça de especificar o ID do memorando ao enviar a transação TON para a troca", "tor_connection": "Conexão Tor", + "tor_connection_timeout": "Tor de tempo limite da conexão", + "tor_experimental": "Esse é um recurso experimental, nem todas as conexões feitas com o suporte para o suporte para a carteira de bolo - algumas conexões podem usar o ClearNet, a fim de rotear totalmente o tráfego de aplicativos TOR com o modo VPN.", "tor_only": "Tor apenas", "total": "Total", "total_saving": "Economia total", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 7f0ce362a..003829450 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Выключив это, в некоторых случаях ставки платы могут быть неточными, так что вы можете в конечном итоге переплачивать или недоплачивать сборы за ваши транзакции", "disable_fiat": "Отключить фиат", "disable_sell": "Отключить действие продажи", + "disable_tor": "Отключить Tor", "disable_trade_option": "Отключить возможность торговли", "disableBatteryOptimization": "Отключить оптимизацию батареи", "disableBatteryOptimizationDescription": "Вы хотите отключить оптимизацию батареи, чтобы сделать фона синхронизации более свободно и плавно?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Мы генерируем новые адреса каждый раз, когда вы их используете, но предыдущие адреса продолжают работать.", "email_address": "Адрес электронной почты", "enable": "Давать возможность", + "enable_builtin_tor": "Включить встроенный в Tor", "enable_mempool_api": "Mempool API за точные сборы и даты", "enable_replace_by_fee": "Включить замену за пикой", "enable_silent_payments_scanning": "Начните сканировать безмолвные платежи, пока не будет достигнут наконечник", @@ -334,6 +336,7 @@ "error_while_processing": "Произошла ошибка во время выплаты", "errorGettingCredentials": "Не удалось: ошибка при получении учетных данных.", "errorSigningTransaction": "Произошла ошибка при подписании транзакции", + "establishing_tor_connection": "Остановка связи", "estimated": "Примерно", "estimated_new_fee": "Расчетная новая плата", "estimated_receive_amount": "Расчетная сумма получения", @@ -861,6 +864,7 @@ "sort_by": "Сортировать по", "spend_key_private": "Приватный ключ траты", "spend_key_public": "Публичный ключ траты", + "starting_tor_proxy": "Запуск прокси", "status": "Статус: ", "step": "Шаг", "string_default": "По умолчанию", @@ -917,6 +921,8 @@ "tokenID": "ИДЕНТИФИКАТОР", "ton_extra_info": "Пожалуйста, не забудьте указать идентификатор записки при отправке TON транзакции для обмена", "tor_connection": "Тор соединение", + "tor_connection_timeout": "TOR Timeout", + "tor_experimental": "Это экспериментальная функция, а не все соединения, сделанные из поддержки TOR для торта - некоторые подключения могут использовать ClearNet, чтобы полностью маршрутироваться с использованием трафика приложений в режиме VPN.", "tor_only": "Только Tor", "total": "Общий", "total_saving": "Общая экономия", diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index 9908f93a0..6a9c59f57 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "โดยการปิดสิ่งนี้อัตราค่าธรรมเนียมอาจไม่ถูกต้องในบางกรณีดังนั้นคุณอาจจบลงด้วยการจ่ายเงินมากเกินไปหรือจ่ายค่าธรรมเนียมสำหรับการทำธุรกรรมของคุณมากเกินไป", "disable_fiat": "ปิดใช้งานสกุลเงินตรา", "disable_sell": "ปิดการใช้งานการขาย", + "disable_tor": "ปิดการใช้งาน TOR", "disable_trade_option": "ปิดใช้งานตัวเลือกการค้า", "disableBatteryOptimization": "ปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่", "disableBatteryOptimizationDescription": "คุณต้องการปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่เพื่อให้การซิงค์พื้นหลังทำงานได้อย่างอิสระและราบรื่นมากขึ้นหรือไม่?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "เราสร้างที่อยู่ใหม่ทุกครั้งที่คุณใช้หนึ่งอย่าง แต่ที่อยู่เก่ายังสามารถใช้ได้ต่อไป", "email_address": "ที่อยู่อีเมล", "enable": "เปิดใช้งาน", + "enable_builtin_tor": "เปิดใช้งาน Tor ในตัว", "enable_mempool_api": "Mempool API สำหรับค่าธรรมเนียมและวันที่ที่ถูกต้อง", "enable_replace_by_fee": "เปิดใช้งานการเปลี่ยนโดยค่าธรรมเนียม", "enable_silent_payments_scanning": "เริ่มสแกนการชำระเงินแบบเงียบจนกว่าจะถึงปลาย", @@ -334,6 +336,7 @@ "error_while_processing": "เกิดข้อผิดพลาดในขณะที่ proceessing", "errorGettingCredentials": "ล้มเหลว: เกิดข้อผิดพลาดขณะรับข้อมูลรับรอง", "errorSigningTransaction": "เกิดข้อผิดพลาดขณะลงนามธุรกรรม", + "establishing_tor_connection": "การเชื่อมต่อ Tor", "estimated": "ประมาณการ", "estimated_new_fee": "ค่าธรรมเนียมใหม่โดยประมาณ", "estimated_receive_amount": "โดยประมาณว่าจำนวนเงินที่ได้รับ", @@ -860,6 +863,7 @@ "sort_by": "เรียงตาม", "spend_key_private": "คีย์จ่าย (ส่วนตัว)", "spend_key_public": "คีย์จ่าย (สาธารณะ)", + "starting_tor_proxy": "เริ่มพร็อกซี TOR", "status": "สถานะ: ", "step": "ขั้นตอน", "string_default": "ค่าเริ่มต้น", @@ -916,6 +920,8 @@ "tokenID": "บัตรประจำตัวประชาชน", "ton_extra_info": "โปรดอย่าลืมระบุรหัสบันทึกในขณะที่ส่งธุรกรรม TON สำหรับการแลกเปลี่ยน", "tor_connection": "การเชื่อมต่อทอร์", + "tor_connection_timeout": "หมดเวลาเชื่อมต่อ tor", + "tor_experimental": "นี่เป็นคุณสมบัติการทดลองไม่ใช่การเชื่อมต่อทั้งหมดที่ทำจากการรองรับเค้กกระเป๋าเงิน TOR การกำหนดเส้นทาง - การเชื่อมต่อบางอย่างอาจใช้ Clearnet เพื่อกำหนดเส้นทางการจราจรแอพใช้ TOR ด้วยโหมด VPN", "tor_only": "Tor เท่านั้น", "total": "ทั้งหมด", "total_saving": "ประหยัดรวม", diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb index 9ad025aa7..2f494adce 100644 --- a/res/values/strings_tl.arb +++ b/res/values/strings_tl.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Sa pamamagitan ng pag -off nito, ang mga rate ng bayad ay maaaring hindi tumpak sa ilang mga kaso, kaya maaari mong tapusin ang labis na bayad o pagsuporta sa mga bayarin para sa iyong mga transaksyon", "disable_fiat": "Huwag paganahin ang fiat", "disable_sell": "Huwag paganahin ang pagkilos ng pagbebenta", + "disable_tor": "Huwag paganahin ang tor", "disable_trade_option": "Huwag paganahin ang pagpipilian sa kalakalan", "disableBatteryOptimization": "Huwag Paganahin ang Pag-optimize ng Baterya", "disableBatteryOptimizationDescription": "Nais mo bang huwag paganahin ang pag-optimize ng baterya upang gawing mas malaya at maayos ang background sync?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Bumubuo kami ng mga bagong address sa tuwing gagamit ka ng isa, ngunit ang mga nakaraang address ay patuloy na gumagana", "email_address": "Email Address", "enable": "Paganahin", + "enable_builtin_tor": "Paganahin ang built-in tor", "enable_mempool_api": "Mempool API para sa tumpak na bayad at mga petsa", "enable_replace_by_fee": "Paganahin ang Replace-By-Fee", "enable_silent_payments_scanning": "Simulan ang pag -scan ng tahimik na pagbabayad, hanggang sa maabot ang tip", @@ -334,6 +336,7 @@ "error_while_processing": "May naganap na error habang nagpapatuloy", "errorGettingCredentials": "Nabigo: Error habang kumukuha ng mga kredensyal", "errorSigningTransaction": "Error habang pinipirmahan ang transaksyon", + "establishing_tor_connection": "Koneksyon ng Tor", "estimated": "Tinatayang", "estimated_new_fee": "Tinatayang bagong fee", "estimated_receive_amount": "Tinatayang natanggap na halaga", @@ -860,6 +863,7 @@ "sort_by": "Pag-uri-uriin sa pamamagitan ng", "spend_key_private": "Spend key (private)", "spend_key_public": "Spend key (public)", + "starting_tor_proxy": "Simula sa Tor Proxy", "status": "Katayuan: ", "step": "Hakbang", "string_default": "Default", @@ -916,6 +920,8 @@ "tokenID": "ID", "ton_extra_info": "Mangyaring huwag kalimutan na tukuyin ang memo ID habang nagpapadala ng toneladang transaksyon para sa palitan", "tor_connection": "Koneksyon ng Tor", + "tor_connection_timeout": "Oras ng koneksyon sa tor", + "tor_experimental": "Ito ay isang pang -eksperimentong tampok, hindi lahat ng mga koneksyon na ginawa mula sa cake ng suporta sa wallet ng tor ruta - ang ilang mga koneksyon ay maaaring gumamit ng clearnet, upang ganap na ruta ang paggamit ng trapiko ng trapiko na may mode na VPN.", "tor_only": "Tor lamang", "total": "Kabuuan", "total_saving": "Kabuuang ipon", diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index add8ee22f..0b67edbe8 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Bunu kapatarak, ücret oranları bazı durumlarda yanlış olabilir, bu nedenle işlemleriniz için ücretleri fazla ödeyebilir veya az ödeyebilirsiniz.", "disable_fiat": "İtibari paraları devre dışı bırak", "disable_sell": "Satış işlemini devre dışı bırak", + "disable_tor": "Tor'u devre dışı bırak", "disable_trade_option": "Ticaret seçeneğini devre dışı bırakın", "disableBatteryOptimization": "Pil optimizasyonunu devre dışı bırakın", "disableBatteryOptimizationDescription": "Arka plan senkronizasyonunu daha özgür ve sorunsuz bir şekilde çalıştırmak için pil optimizasyonunu devre dışı bırakmak istiyor musunuz?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Adresini her kullandığında yeni adres oluşturuyoruz, ancak önceki adresler de çalışmaya devam eder", "email_address": "E-posta Adresi", "enable": "Olanak vermek", + "enable_builtin_tor": "Yerleşik Tor'u etkinleştirin", "enable_mempool_api": "Doğru ücretler ve tarihler için Mempool API'si", "enable_replace_by_fee": "Farklı Değiştir'i Etkinleştir", "enable_silent_payments_scanning": "Bahşiş ulaşılıncaya kadar sessiz ödemeleri taramaya başlayın", @@ -334,6 +336,7 @@ "error_while_processing": "ProceSting sırasında bir hata oluştu", "errorGettingCredentials": "Başarısız: Kimlik bilgileri alınırken hata oluştu", "errorSigningTransaction": "İşlem imzalanırken bir hata oluştu", + "establishing_tor_connection": "Fazla Tor Bağlantısı", "estimated": "Tahmini", "estimated_new_fee": "Tahmini yeni ücret", "estimated_receive_amount": "Tahmini alma miktarı", @@ -860,6 +863,7 @@ "sort_by": "Göre sırala", "spend_key_private": "Harcama anahtarı (özel)", "spend_key_public": "Harcama anahtarı (genel)", + "starting_tor_proxy": "Tor Proxy'yi Başlatma", "status": "Durum: ", "step": "Adım", "string_default": "Varsayılan", @@ -916,6 +920,8 @@ "tokenID": "İD", "ton_extra_info": "Lütfen değişim için ton işlemini gönderirken not kimliğini belirtmeyi unutmayın", "tor_connection": "Tor bağlantısı", + "tor_connection_timeout": "Tor bağlantı zaman aşımı", + "tor_experimental": "Bu deneysel bir özelliktir, kek cüzdanı desteğinden yapılan tüm bağlantılar değil, TOR yönlendirmesinden yapılmıştır - bazı bağlantılar, VPN moduyla uygulama trafik kullanımını tam olarak yönlendirmek için ClearNet kullanabilir.", "tor_only": "Yalnızca Tor", "total": "Toplam", "total_saving": "Toplam Tasarruf", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 07ed5d532..a4078a341 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Вимкнувши це, ставки плати в деяких випадках можуть бути неточними, тому ви можете переплатити або недооплатити плату за свої транзакції", "disable_fiat": "Вимкнути фиат", "disable_sell": "Вимкнути дію продажу", + "disable_tor": "Вимкнути Тор", "disable_trade_option": "Вимкнути можливість торгівлі", "disableBatteryOptimization": "Вимкнути оптимізацію акумулятора", "disableBatteryOptimizationDescription": "Ви хочете відключити оптимізацію акумулятора, щоб зробити фонову синхронізацію більш вільно та плавно?", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "Ми створюємо нові адреси щоразу, коли ви використовуєте їх, але попередні адреси продовжують працювати", "email_address": "Адреса електронної пошти", "enable": "Ввімкнути", + "enable_builtin_tor": "Увімкнути вбудований tor", "enable_mempool_api": "API Mempool для точних зборів та дат", "enable_replace_by_fee": "Увімкнути заміну з комісією", "enable_silent_payments_scanning": "Почніть сканувати мовчазні платежі, поки не буде досягнуто наконечника", @@ -334,6 +336,7 @@ "error_while_processing": "Помилка сталася під час проектування", "errorGettingCredentials": "Помилка: помилка під час отримання облікових даних", "errorSigningTransaction": "Під час підписання транзакції сталася помилка", + "establishing_tor_connection": "Закінчення підключення до TOR", "estimated": "Приблизно ", "estimated_new_fee": "Орієнтовна нова комісія", "estimated_receive_amount": "Орієнтовна сума отримує", @@ -861,6 +864,7 @@ "sort_by": "Сортувати за", "spend_key_private": "Приватний ключ витрати", "spend_key_public": "Публічний ключ витрати", + "starting_tor_proxy": "Початок Tor Proxy", "status": "Статус: ", "step": "Крок", "string_default": "За замовчуванням", @@ -917,6 +921,8 @@ "tokenID": "ID", "ton_extra_info": "Не забудьте вказати ідентифікатор пам’яті під час надсилання транзакції TON для обміну", "tor_connection": "Підключення Tor", + "tor_connection_timeout": "Тайм -аут підключення TOR", + "tor_experimental": "Це експериментальна функція, не всі з'єднання, зроблені з підтримки тортів, що підтримують маршрутизацію - деякі з'єднання можуть використовувати Clearnet, щоб повністю маршрутизувати трафік додатків, використовуючи TOR з режимом VPN.", "tor_only": "Тільки Tor", "total": "Загальний", "total_saving": "Загальна економія", diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index 7240db6b0..3c805fe6b 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "اس کو بند کرنے سے ، کچھ معاملات میں فیس کی شرح غلط ہوسکتی ہے ، لہذا آپ اپنے لین دین کے لئے فیسوں کو زیادہ ادائیگی یا ادائیگی ختم کرسکتے ہیں۔", "disable_fiat": "فیاٹ کو غیر فعال کریں۔", "disable_sell": "فروخت کی کارروائی کو غیر فعال کریں۔", + "disable_tor": "ٹور کو غیر فعال کریں", "disable_trade_option": "تجارت کے آپشن کو غیر فعال کریں", "disableBatteryOptimization": "بیٹری کی اصلاح کو غیر فعال کریں", "disableBatteryOptimizationDescription": "کیا آپ پس منظر کی مطابقت پذیری کو زیادہ آزادانہ اور آسانی سے چلانے کے لئے بیٹری کی اصلاح کو غیر فعال کرنا چاہتے ہیں؟", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "جب بھی آپ ایک کا استعمال کرتے ہیں تو ہم نئے پتے تیار کرتے ہیں، لیکن پچھلے پتے کام کرتے رہتے ہیں۔", "email_address": "ای میل اڈریس", "enable": "قابل بنائیں", + "enable_builtin_tor": "بلٹٹی ان ٹور کو فعال کریں", "enable_mempool_api": "درست فیسوں اور تاریخوں کے لئے میمپول API", "enable_replace_by_fee": "فی فیس کو تبدیل کریں", "enable_silent_payments_scanning": "خاموش ادائیگیوں کو اسکین کرنا شروع کریں ، جب تک کہ نوک نہ پہنچ جائے", @@ -334,6 +336,7 @@ "error_while_processing": "ایک غلطی پیش کرتے وقت ہوئی", "errorGettingCredentials": "۔ﯽﺑﺍﺮﺧ ﮟﯿﻣ ﮯﻧﺮﮐ ﻞﺻﺎﺣ ﺩﺎﻨﺳﺍ :ﻡﺎﮐﺎﻧ", "errorSigningTransaction": "۔ﮯﮨ ﯽﺌﮔﺁ ﺶﯿﭘ ﯽﺑﺍﺮﺧ ﮏﯾﺍ ﺖﻗﻭ ﮯﺗﺮﮐ ﻂﺨﺘﺳﺩ ﺮﭘ ﻦﯾﺩ ﻦﯿﻟ", + "establishing_tor_connection": "ٹور کنکشن کو کھڑا کرنا", "estimated": "تخمینہ لگایا", "estimated_new_fee": "تخمینہ شدہ نئی فیس", "estimated_receive_amount": "تخمینہ وصول کی رقم", @@ -862,6 +865,7 @@ "sort_by": "ترتیب دیں", "spend_key_private": "خرچ کی کلید (نجی)", "spend_key_public": "خرچ کی کلید (عوامی)", + "starting_tor_proxy": "ٹور پراکسی شروع کرنا", "status": "حالت:", "step": "مرحلہ", "string_default": "پہلے سے طے شدہ", @@ -918,6 +922,8 @@ "tokenID": "ID", "ton_extra_info": "ایکسچینج کے لئے ٹن ٹرانزیکشن بھیجتے وقت براہ کرم میمو آئی ڈی کی وضاحت کرنا نہ بھولیں", "tor_connection": "ﻦﺸﮑﻨﮐ ﺭﻮﭨ", + "tor_connection_timeout": "ٹور کنکشن ٹائم آؤٹ", + "tor_experimental": "یہ ایک تجرباتی خصوصیت ہے ، کیک پرس پرس سپورٹ ٹور روٹنگ سے بنے تمام رابطے نہیں - کچھ رابطے کلینیٹ کا استعمال کرسکتے ہیں ، تاکہ مکمل طور پر ایپ ٹریفک کو VPN وضع کے ساتھ ٹور کا استعمال کریں۔", "tor_only": "صرف Tor", "total": "کل", "total_saving": "کل بچت", diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb index 3dd184ddd..ea3281b2a 100644 --- a/res/values/strings_vi.arb +++ b/res/values/strings_vi.arb @@ -268,6 +268,7 @@ "disable_fee_api_warning": "Khi tắt chức năng này, tỉ lệ phí có thể không chính xác trong một số trường hợp, dẫn đến bạn trả quá hoặc không đủ phí cho giao dịch của mình.", "disable_fiat": "Vô hiệu hóa tiền tệ fiat", "disable_sell": "Vô hiệu hóa chức năng bán", + "disable_tor": "Tắt Tor", "disable_trade_option": "Tắt tùy chọn thương mại", "disableBatteryOptimization": "Vô hiệu hóa Tối ưu hóa Pin", "disableBatteryOptimizationDescription": "Bạn có muốn vô hiệu hóa tối ưu hóa pin để đồng bộ hóa nền hoạt động mượt mà hơn không?", @@ -293,6 +294,7 @@ "electrum_address_disclaimer": "Chúng tôi tạo địa chỉ mới mỗi khi bạn sử dụng, nhưng các địa chỉ cũ vẫn tiếp tục hoạt động", "email_address": "Địa chỉ Email", "enable": "Cho phép", + "enable_builtin_tor": "Bật Buildi-In Tor", "enable_mempool_api": "API Mempool cho các khoản phí và ngày chính xác", "enable_replace_by_fee": "Bật Thay thế Bằng Phí", "enable_silent_payments_scanning": "Bật quét thanh toán im lặng", @@ -333,6 +335,7 @@ "error_while_processing": "Xảy ra lỗi trong khi sử dụng", "errorGettingCredentials": "Không thành công: Lỗi khi nhận thông tin xác thực", "errorSigningTransaction": "Đã xảy ra lỗi khi ký giao dịch", + "establishing_tor_connection": "Kết nối tor", "estimated": "Ước tính", "estimated_new_fee": "Phí mới ước tính", "estimated_receive_amount": "Số tiền nhận ước tính", @@ -857,6 +860,7 @@ "sort_by": "Sắp xếp theo", "spend_key_private": "Khóa chi tiêu (riêng tư)", "spend_key_public": "Khóa chi tiêu (công khai)", + "starting_tor_proxy": "Bắt đầu proxy tor", "status": "Trạng thái: ", "step": "Bước chân", "string_default": "Mặc định", @@ -913,6 +917,8 @@ "tokenID": "ID", "ton_extra_info": "Xin đừng quên chỉ định ID ghi nhớ trong khi gửi giao dịch tấn cho trao đổi", "tor_connection": "Kết nối Tor", + "tor_connection_timeout": "Thời gian chờ kết nối tor", + "tor_experimental": "Đây là một tính năng thử nghiệm, không phải tất cả các kết nối được làm từ Wake Wallet Hỗ trợ định tuyến TOR - một số kết nối có thể sử dụng ClearNet, để định tuyến đầy đủ về lưu lượng truy cập ứng dụng Tor với chế độ VPN.", "tor_only": "Chỉ Tor", "total": "Tổng cộng", "total_saving": "Tiết kiệm tổng cộng", diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 0a3e382e7..109dac40f 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "Nipa yiyi eyi kuro, awọn oṣuwọn owo naa le jẹ aiṣe deede ni awọn ọrọ kan, nitorinaa o le pari apọju tabi awọn idiyele ti o ni agbara fun awọn iṣowo rẹ", "disable_fiat": "Pa owó tí ìjọba pàṣẹ wa lò", "disable_sell": "Ko iṣọrọ iṣọrọ", + "disable_tor": "Mu lile", "disable_trade_option": "Mu aṣayan iṣowo ṣiṣẹ", "disableBatteryOptimization": "Mu Ifasi batiri", "disableBatteryOptimizationDescription": "Ṣe o fẹ lati mu iṣapelo batiri si lati le ṣiṣe ayẹwo ẹhin ati laisiyonu?", @@ -295,6 +296,7 @@ "electrum_address_disclaimer": "A dá àwọn àdírẹ́sì títun ní gbogbo àwọn ìgbà t'ẹ́ lo ó kan ṣùgbọ́n ẹ lè tẹ̀síwájú lo àwọn àdírẹ́sì tẹ́lẹ̀tẹ́lẹ̀.", "email_address": "Àdírẹ́sì ímeèlì", "enable": "Mu ṣiṣẹ", + "enable_builtin_tor": "Mu ṣiṣẹ", "enable_mempool_api": "Mempool API fun awọn owo deede ati awọn ọjọ", "enable_replace_by_fee": "Mu ki o rọpo", "enable_silent_payments_scanning": "Bẹrẹ awọn sisanwo ipalọlọ, titi ti o fi de opin", @@ -335,6 +337,7 @@ "error_while_processing": "Aṣiṣe kan waye lakoko ti o duro", "errorGettingCredentials": "Kuna: Aṣiṣe lakoko gbigba awọn iwe-ẹri", "errorSigningTransaction": "Aṣiṣe kan ti waye lakoko ti o fowo si iṣowo", + "establishing_tor_connection": "Isopọ Stanishing", "estimated": "Ó tó a fojú díwọ̀n", "estimated_new_fee": "Ifoju tuntun owo tuntun", "estimated_receive_amount": "Ifoju gba iye", @@ -861,6 +864,7 @@ "sort_by": "Sa pelu", "spend_key_private": "Kọ́kọ́rọ́ sísan (àdáni)", "spend_key_public": "Kọ́kọ́rọ́ sísan (kò àdáni)", + "starting_tor_proxy": "Bibẹrẹ Oluṣaaju Aṣoju", "status": "Tó ń ṣẹlẹ̀: ", "step": "Igbesẹ", "string_default": "Aiyipada", @@ -917,6 +921,8 @@ "tokenID": "ID", "ton_extra_info": "Jọwọ maṣe gbagbe lati tokasi ID akọsilẹ lakoko fifiranṣẹ idunadura pupọ fun paṣipaarọ naa", "tor_connection": "Tor asopọ", + "tor_connection_timeout": "Akoko asopọ asopọ", + "tor_experimental": "Eyi jẹ ẹya ti esiperimenta ti a ṣe lati awọn Awoṣe Adwat atilẹyin ti o wa ni atilẹyin idiwọ - diẹ ninu awọn asopọ le lo imple, lati le ni ipa ọna App Prat pẹlu ipo VPN.", "tor_only": "Tor nìkan", "total": "Apapọ", "total_saving": "Owó t'ẹ́ ti pamọ́", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 2f02673b7..8f146e0fb 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -269,6 +269,7 @@ "disable_fee_api_warning": "通过将其关闭，在某些情况下，收费率可能不准确，因此您最终可能会超额付款或支付交易费用", "disable_fiat": "禁用法令", "disable_sell": "禁用卖出操作", + "disable_tor": "禁用TOR", "disable_trade_option": "禁用贸易选项", "disableBatteryOptimization": "禁用电池优化", "disableBatteryOptimizationDescription": "您是否要禁用电池优化以使背景同步更加自由，平稳地运行？", @@ -294,6 +295,7 @@ "electrum_address_disclaimer": "每次您使用一个地址时，我们都会生成新地址，但之前的地址仍然有效", "email_address": "电子邮件地址", "enable": "使能够", + "enable_builtin_tor": "启用内置的tor", "enable_mempool_api": "Mempool API获得准确的费用和日期", "enable_replace_by_fee": "启用by-Fee替换", "enable_silent_payments_scanning": "开始扫描无声付款，直到达到提示", @@ -334,6 +336,7 @@ "error_while_processing": "发动机时发生错误", "errorGettingCredentials": "失败：获取凭据时出错", "errorSigningTransaction": "签署交易时发生错误", + "establishing_tor_connection": "tor连接", "estimated": "估计值", "estimated_new_fee": "估计新费用", "estimated_receive_amount": "估计接收金额", @@ -860,6 +863,7 @@ "sort_by": "排序方式", "spend_key_private": "Spend 密钥 (私钥)", "spend_key_public": "Spend 密钥 (公钥)", + "starting_tor_proxy": "启动Tor代理", "status": "状态: ", "step": "步", "string_default": "默认", @@ -916,6 +920,8 @@ "tokenID": "ID", "ton_extra_info": "请不要忘记在发送TON交易时指定备忘录", "tor_connection": "Tor连接", + "tor_connection_timeout": "TOR连接超时", + "tor_experimental": "这是一个实验功能，并非所有由Cake Wallet Support Tor路由组成的连接 - 某些连接可能会使用Clearnet，以便完全路由App App App Appl使用VPN模式。", "tor_only": "仅限 Tor", "total": "全部的", "total_saving": "总储蓄", From 4434ad7363f300f6002b442413b7f28ec14c0af8 Mon Sep 17 00:00:00 2001 From: David Adegoke <64401859+Blazebrain@users.noreply.github.com> Date: Tue, 24 Jun 2025 03:41:43 +0100 Subject: [PATCH 6/7] CW-1086: Polygon Issues (#2329) * fix(polygon): Polygon wallets not showing in address book when sending tokens * feat(polygon_issues): Enhance gas price handling in EVM Chains This change: - Updates gas price calculation to account for minimum priority fee in Polygon - Adjusts gas price handling to use maxFeePerGas when gasPrice is not provided. - Fixes issue with send all for Polygon --- cw_evm/lib/evm_chain_client.dart | 5 +- cw_evm/lib/evm_chain_wallet.dart | 54 +++++++++++++++---- .../lib/default_polygon_erc20_tokens.dart | 2 +- cw_polygon/lib/polygon_client.dart | 11 +++- cw_polygon/lib/polygon_wallet.dart | 7 ++- 5 files changed, 63 insertions(+), 16 deletions(-) diff --git a/cw_evm/lib/evm_chain_client.dart b/cw_evm/lib/evm_chain_client.dart index 5f383b5a3..1fecc9c1e 100644 --- a/cw_evm/lib/evm_chain_client.dart +++ b/cw_evm/lib/evm_chain_client.dart @@ -109,7 +109,6 @@ abstract class EVMChainClient { sender: senderAddress, to: toAddress, value: value, - // maxFeePerGas: maxFeePerGas, ); return estimatedGas.toInt(); @@ -165,6 +164,7 @@ abstract class EVMChainClient { required int exponent, String? contractAddress, String? data, + int? gasPrice, }) async { assert(currency == CryptoCurrency.eth || currency == CryptoCurrency.maticpoly || @@ -180,6 +180,7 @@ abstract class EVMChainClient { data: data != null ? hexToBytes(data) : null, maxGas: estimatedGasUnits, maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas), + gasPrice: gasPrice != null ? EtherAmount.fromInt(EtherUnit.wei, gasPrice) : null, ); Uint8List signedTransaction; @@ -224,6 +225,7 @@ abstract class EVMChainClient { required EVMChainTransactionPriority priority, required int exponent, required String contractAddress, + int? gasPrice, }) async { final Transaction transaction = createTransaction( @@ -233,6 +235,7 @@ abstract class EVMChainClient { amount: EtherAmount.zero(), maxGas: estimatedGasUnits, maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas), + gasPrice: gasPrice != null ? EtherAmount.fromInt(EtherUnit.wei, gasPrice) : null, ); final erc20 = ERC20( diff --git a/cw_evm/lib/evm_chain_wallet.dart b/cw_evm/lib/evm_chain_wallet.dart index 18f6e6ee5..1791258f5 100644 --- a/cw_evm/lib/evm_chain_wallet.dart +++ b/cw_evm/lib/evm_chain_wallet.dart @@ -263,31 +263,65 @@ abstract class EVMChainWalletBase final priorityFee = EtherAmount.fromInt(EtherUnit.gwei, priority.tip).getInWei.toInt(); int maxFeePerGas; + int adjustedGasPrice; + + bool isPolygon = _client.chainId == 137; + if (gasBaseFee != null) { // MaxFeePerGas with EIP1559; maxFeePerGas = gasBaseFee! + priorityFee; } else { // MaxFeePerGas with gasPrice - maxFeePerGas = gasPrice; + maxFeePerGas = gasPrice + priorityFee; + } + + adjustedGasPrice = maxFeePerGas; + + // Polygon has a minimum priority fee of 25 gwei + if (isPolygon) { + int minPriorityFee = 25; + int minPriorityFeeWei = + EtherAmount.fromInt(EtherUnit.gwei, minPriorityFee).getInWei.toInt(); + + // Calculate user selected priority-based additional fee on top of minimum + int additionalPriorityFee = 0; + switch (priority) { + case EVMChainTransactionPriority.slow: + // We use minimum priority fee only + additionalPriorityFee = 0; + break; + case EVMChainTransactionPriority.medium: + // We add 15 gwei on top of minimum + additionalPriorityFee = EtherAmount.fromInt(EtherUnit.gwei, 15).getInWei.toInt(); + break; + case EVMChainTransactionPriority.fast: + // We add 35 gwei on top of minimum + additionalPriorityFee = EtherAmount.fromInt(EtherUnit.gwei, 35).getInWei.toInt(); + break; + } + + int totalPriorityFee = minPriorityFeeWei + additionalPriorityFee; + adjustedGasPrice = gasPrice + totalPriorityFee; + maxFeePerGas = gasPrice + totalPriorityFee; } final estimatedGas = await _client.getEstimatedGasUnitsForTransaction( contractAddress: contractAddress, senderAddress: _evmChainPrivateKey.address, value: EtherAmount.fromBigInt(EtherUnit.wei, amount!), - gasPrice: EtherAmount.fromInt(EtherUnit.wei, gasPrice), + gasPrice: EtherAmount.fromInt(EtherUnit.wei, adjustedGasPrice), toAddress: EthereumAddress.fromHex(receivingAddressHex), maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas), data: data, ); - final totalGasFee = estimatedGas * maxFeePerGas; + final totalGasFee = estimatedGas * adjustedGasPrice; return GasParamsHandler( estimatedGasUnits: estimatedGas, estimatedGasFee: totalGasFee, maxFeePerGas: maxFeePerGas, - gasPrice: gasPrice, + gasPrice: adjustedGasPrice, ); } return GasParamsHandler.zero(); @@ -476,23 +510,20 @@ abstract class EVMChainWalletBase contractAddress: transactionCurrency is Erc20Token ? transactionCurrency.contractAddress : null, data: hexOpReturnMemo, + gasPrice: maxFeePerGasForTransaction, ); return pendingEVMChainTransaction; } - Future createApprovalTransaction( - BigInt amount, - String spender, - CryptoCurrency token, - EVMChainTransactionPriority priority) async { + Future createApprovalTransaction(BigInt amount, String spender, + CryptoCurrency token, EVMChainTransactionPriority priority) async { final CryptoCurrency transactionCurrency = balance.keys.firstWhere((element) => element.title == token.title); assert(transactionCurrency is Erc20Token); final data = _client.getEncodedDataForApprovalTransaction( - contractAddress: EthereumAddress.fromHex( - (transactionCurrency as Erc20Token).contractAddress), + contractAddress: EthereumAddress.fromHex((transactionCurrency as Erc20Token).contractAddress), value: EtherAmount.fromBigInt(EtherUnit.wei, amount), toAddress: EthereumAddress.fromHex(spender), ); @@ -515,6 +546,7 @@ abstract class EVMChainWalletBase estimatedGasUnits: gasFeesModel.estimatedGasUnits, exponent: transactionCurrency.decimal, contractAddress: transactionCurrency.contractAddress, + gasPrice: gasFeesModel.gasPrice, ); } diff --git a/cw_polygon/lib/default_polygon_erc20_tokens.dart b/cw_polygon/lib/default_polygon_erc20_tokens.dart index 2c739e8c5..208a63345 100644 --- a/cw_polygon/lib/default_polygon_erc20_tokens.dart +++ b/cw_polygon/lib/default_polygon_erc20_tokens.dart @@ -84,6 +84,6 @@ class DefaultPolygonErc20Tokens { .iconPath; } catch (_) {} - return Erc20Token.copyWith(token, iconPath, 'POLY'); + return Erc20Token.copyWith(token, iconPath, 'POL'); }).toList(); } diff --git a/cw_polygon/lib/polygon_client.dart b/cw_polygon/lib/polygon_client.dart index 5c344debe..62dcec50e 100644 --- a/cw_polygon/lib/polygon_client.dart +++ b/cw_polygon/lib/polygon_client.dart @@ -18,13 +18,20 @@ class PolygonClient extends EVMChainClient { EtherAmount? gasPrice, EtherAmount? maxFeePerGas, }) { + EtherAmount? finalGasPrice = gasPrice; + + if (gasPrice == null && maxFeePerGas != null) { + // If we have EIP-1559 parameters but no legacy gasPrice, then use maxFeePerGas as gasPrice + finalGasPrice = maxFeePerGas; + } + return Transaction( from: from, to: to, value: amount, - // data: data, + data: data, maxGas: maxGas, - // gasPrice: gasPrice, + gasPrice: finalGasPrice, // maxFeePerGas: maxFeePerGas, // maxPriorityFeePerGas: maxPriorityFeePerGas, ); diff --git a/cw_polygon/lib/polygon_wallet.dart b/cw_polygon/lib/polygon_wallet.dart index c1d36b9cb..991552068 100644 --- a/cw_polygon/lib/polygon_wallet.dart +++ b/cw_polygon/lib/polygon_wallet.dart @@ -45,7 +45,12 @@ class PolygonWallet extends EVMChainWallet { final initialErc20Tokens = DefaultPolygonErc20Tokens().initialPolygonErc20Tokens; for (final token in initialErc20Tokens) { - if (!evmChainErc20TokensBox.containsKey(token.contractAddress)) { + if (evmChainErc20TokensBox.containsKey(token.contractAddress)) { + final existingToken = evmChainErc20TokensBox.get(token.contractAddress); + if (existingToken?.tag != token.tag) { + evmChainErc20TokensBox.put(token.contractAddress, token); + } + } else { if (isMigration) token.enabled = false; evmChainErc20TokensBox.put(token.contractAddress, token); } From af89603b81c5c62b39c44def92ff58fe34791a71 Mon Sep 17 00:00:00 2001 From: David Adegoke <64401859+Blazebrain@users.noreply.github.com> Date: Tue, 24 Jun 2025 03:47:21 +0100 Subject: [PATCH 7/7] CW-1103:Token Validation Issues (#2327) * feat(token_validation): Improve flow for adding new tokens across wallets This change: - Implements check to see if a token is already added, preventing duplicates - Triggers dialog warning if its a duplicate token - Takes EVM Chains contract adddress case-insensitivity when making checks for potential scams. * refactor(token_validation): Modify token management flow This change: - Removes duplicate token check during token addition in EVMChainWalletBase. - Introduces a flag to indicate if a token is being edited - Adjusts token addition validation to bypass checks when editing an existing token. * Update lib/src/screens/dashboard/edit_token_page.dart --------- Co-authored-by: Omar Hatem --- cw_evm/lib/evm_chain_wallet.dart | 14 ++++++++-- lib/ethereum/cw_ethereum.dart | 12 +++++++-- lib/polygon/cw_polygon.dart | 6 +++++ lib/solana/cw_solana.dart | 6 +++++ .../screens/dashboard/edit_token_page.dart | 22 +++++++++++++++ lib/tron/cw_tron.dart | 6 +++++ .../dashboard/home_settings_view_model.dart | 27 ++++++++++++++++++- lib/zano/cw_zano.dart | 6 +++++ res/values/strings_ar.arb | 1 + res/values/strings_bg.arb | 1 + res/values/strings_cs.arb | 1 + res/values/strings_de.arb | 1 + res/values/strings_en.arb | 1 + res/values/strings_es.arb | 1 + res/values/strings_fr.arb | 1 + res/values/strings_ha.arb | 1 + res/values/strings_hi.arb | 1 + res/values/strings_hr.arb | 1 + res/values/strings_hy.arb | 1 + res/values/strings_id.arb | 1 + res/values/strings_it.arb | 1 + res/values/strings_ja.arb | 1 + res/values/strings_ko.arb | 1 + res/values/strings_my.arb | 1 + res/values/strings_nl.arb | 1 + res/values/strings_pl.arb | 1 + res/values/strings_pt.arb | 1 + res/values/strings_ru.arb | 1 + res/values/strings_th.arb | 1 + res/values/strings_tl.arb | 1 + res/values/strings_tr.arb | 1 + res/values/strings_uk.arb | 1 + res/values/strings_ur.arb | 1 + res/values/strings_vi.arb | 1 + res/values/strings_yo.arb | 1 + res/values/strings_zh.arb | 1 + tool/configure.dart | 5 ++++ 37 files changed, 127 insertions(+), 5 deletions(-) diff --git a/cw_evm/lib/evm_chain_wallet.dart b/cw_evm/lib/evm_chain_wallet.dart index 1791258f5..a1285f0e4 100644 --- a/cw_evm/lib/evm_chain_wallet.dart +++ b/cw_evm/lib/evm_chain_wallet.dart @@ -198,8 +198,8 @@ abstract class EVMChainWalletBase for (var token in erc20Currencies) { bool isPotentialScam = false; - bool isWhitelisted = - getDefaultTokenContractAddresses.any((element) => element == token.contractAddress); + bool isWhitelisted = getDefaultTokenContractAddresses + .any((element) => element.toLowerCase() == token.contractAddress.toLowerCase()); final tokenSymbol = token.title.toUpperCase(); @@ -214,6 +214,16 @@ abstract class EVMChainWalletBase token.iconPath = null; await token.save(); } + + // For fixing wrongly classified tokens + if (!isPotentialScam && token.isPotentialScam) { + token.isPotentialScam = false; + final iconPath = CryptoCurrency.all + .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase()) + .iconPath; + token.iconPath = iconPath; + await token.save(); + } } } diff --git a/lib/ethereum/cw_ethereum.dart b/lib/ethereum/cw_ethereum.dart index 3e3675d1f..a6a6a7205 100644 --- a/lib/ethereum/cw_ethereum.dart +++ b/lib/ethereum/cw_ethereum.dart @@ -199,8 +199,16 @@ class CWEthereum extends Ethereum { } @override - List getDefaultTokenContractAddresses() => - DefaultEthereumErc20Tokens().initialErc20Tokens.map((e) => e.contractAddress).toList(); + List getDefaultTokenContractAddresses() { + return DefaultEthereumErc20Tokens().initialErc20Tokens.map((e) => e.contractAddress).toList(); + } + + + @override + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) { + final ethereumWallet = wallet as EthereumWallet; + return ethereumWallet.erc20Currencies.any((element) => element.contractAddress.toLowerCase() == contractAddress.toLowerCase()); + } Future createTokenApproval(WalletBase wallet, BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority) => diff --git a/lib/polygon/cw_polygon.dart b/lib/polygon/cw_polygon.dart index 557cedc39..2e6e7dd13 100644 --- a/lib/polygon/cw_polygon.dart +++ b/lib/polygon/cw_polygon.dart @@ -216,4 +216,10 @@ class CWPolygon extends Polygon { .initialPolygonErc20Tokens .map((e) => e.contractAddress) .toList(); + + @override + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) { + final polygonWallet = wallet as PolygonWallet; + return polygonWallet.erc20Currencies.any((element) => element.contractAddress.toLowerCase() == contractAddress.toLowerCase()); + } } diff --git a/lib/solana/cw_solana.dart b/lib/solana/cw_solana.dart index 9036f5584..ca001bb3b 100644 --- a/lib/solana/cw_solana.dart +++ b/lib/solana/cw_solana.dart @@ -155,4 +155,10 @@ class CWSolana extends Solana { List getDefaultTokenContractAddresses() { return DefaultSPLTokens().initialSPLTokens.map((e) => e.mintAddress).toList(); } + + @override + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) { + final solanaWallet = wallet as SolanaWallet; + return solanaWallet.splTokenCurrencies.any((element) => element.mintAddress == contractAddress); + } } diff --git a/lib/src/screens/dashboard/edit_token_page.dart b/lib/src/screens/dashboard/edit_token_page.dart index f36ca1456..8f9f67178 100644 --- a/lib/src/screens/dashboard/edit_token_page.dart +++ b/lib/src/screens/dashboard/edit_token_page.dart @@ -73,6 +73,7 @@ class _EditTokenPageBodyState extends State { bool _showDisclaimer = false; bool _disclaimerChecked = false; + bool isEditingToken = false; @override void initState() { @@ -88,6 +89,8 @@ class _EditTokenPageBodyState extends State { _tokenSymbolController.text = widget.token!.title; _tokenDecimalController.text = widget.token!.decimals.toString(); _tokenIconPathController.text = widget.token?.iconPath ?? ''; + + isEditingToken = true; } if (widget.initialContractAddress != null) { @@ -200,6 +203,25 @@ class _EditTokenPageBodyState extends State { onPressed: () async { if (_formKey.currentState!.validate() && (!_showDisclaimer || _disclaimerChecked)) { + final isTokenAlreadyAdded = isEditingToken + ? false + : await widget.homeSettingsViewModel + .checkIfTokenIsAlreadyAdded(_contractAddressController.text); + if (isTokenAlreadyAdded) { + showPopUp( + context: context, + builder: (dialogContext) { + return AlertWithOneAction( + alertTitle: S.current.warning, + alertContent: S.of(context).token_already_exists, + buttonText: S.of(context).ok, + buttonAction: () => Navigator.of(dialogContext).pop(), + ); + }, + ); + return; + } + final isWhitelisted = await widget.homeSettingsViewModel .checkIfTokenIsWhitelisted(_contractAddressController.text); diff --git a/lib/tron/cw_tron.dart b/lib/tron/cw_tron.dart index 8c29dab58..395129b8f 100644 --- a/lib/tron/cw_tron.dart +++ b/lib/tron/cw_tron.dart @@ -138,4 +138,10 @@ class CWTron extends Tron { List getDefaultTokenContractAddresses() { return DefaultTronTokens().initialTronTokens.map((e) => e.contractAddress).toList(); } + + @override + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) { + final tronWallet = wallet as TronWallet; + return tronWallet.tronTokenCurrencies.any((element) => element.contractAddress == contractAddress); + } } diff --git a/lib/view_model/dashboard/home_settings_view_model.dart b/lib/view_model/dashboard/home_settings_view_model.dart index f16d2aa95..fdf4d75a5 100644 --- a/lib/view_model/dashboard/home_settings_view_model.dart +++ b/lib/view_model/dashboard/home_settings_view_model.dart @@ -126,6 +126,31 @@ abstract class HomeSettingsViewModelBase with Store { } } + @action + bool checkIfTokenIsAlreadyAdded(String contractAddress) { + if (_balanceViewModel.wallet.type == WalletType.ethereum) { + return ethereum!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress); + } + + if (_balanceViewModel.wallet.type == WalletType.polygon) { + return polygon!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress); + } + + if (_balanceViewModel.wallet.type == WalletType.solana) { + return solana!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress); + } + + if (_balanceViewModel.wallet.type == WalletType.tron) { + return tron!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress); + } + + if (_balanceViewModel.wallet.type == WalletType.zano) { + return zano!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress); + } + + return false; + } + @action Future deleteToken(CryptoCurrency token) async { try { @@ -297,7 +322,7 @@ abstract class HomeSettingsViewModelBase with Store { required bool isEthereum, }) async { final uri = Uri.https( - "api.etherscan.io", + "api.etherscan.io", "/v2/api", { "chainid": isEthereum ? "1" : "137", diff --git a/lib/zano/cw_zano.dart b/lib/zano/cw_zano.dart index 7bd515e32..ede37eabc 100644 --- a/lib/zano/cw_zano.dart +++ b/lib/zano/cw_zano.dart @@ -136,4 +136,10 @@ class CWZano extends Zano { Map> debugCallLength() { return api.debugCallLength(); } + + @override + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) { + final zanoWallet = wallet as ZanoWallet; + return zanoWallet.zanoAssets.values.any((element) => element?.assetId == contractAddress); + } } diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index a5b287384..0a48d4da5 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -913,6 +913,7 @@ "tip": "بقشيش:", "to": "ل", "today": "اليوم", + "token_already_exists": "رمز موجود بالفعل", "token_contract_address": "عنوان عقد الرمز", "token_decimal": "رمز عشري", "token_name": "اسم الرمز ، على سبيل المثال: Tether", diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index 805fd9273..c083b8297 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -913,6 +913,7 @@ "tip": "Tip:", "to": "Да", "today": "Днес", + "token_already_exists": "Токена вече съществува", "token_contract_address": "Адрес на токен договор", "token_decimal": "Токен десетичен", "token_name": "Име на токена, напр.: Tether", diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 658bcdf6e..49becb211 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -913,6 +913,7 @@ "tip": "Spropitné:", "to": "Na", "today": "Dnes", + "token_already_exists": "Token již existuje", "token_contract_address": "Adresa tokenové smlouvy", "token_decimal": "Token v desítkové soustavě", "token_name": "Název tokenu např.: Tether", diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index b35f79cd3..4f5c3f87e 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -914,6 +914,7 @@ "tip": "Hinweis:", "to": "Zu", "today": "Heute", + "token_already_exists": "Token existiert bereits", "token_contract_address": "Token-Contract-Adresse", "token_decimal": "Token-Dezimalzahl", "token_name": "Token-Name, z. B.: Tether", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index b6e655674..3de612694 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -914,6 +914,7 @@ "tip": "Tip:", "to": "To", "today": "Today", + "token_already_exists": "Token already exists", "token_contract_address": "Token contract address", "token_decimal": "Token decimal", "token_name": "Token name eg: Tether", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 6a75f6e62..d19ec108d 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -914,6 +914,7 @@ "tip": "Consejo:", "to": "A", "today": "Hoy", + "token_already_exists": "Token ya existe", "token_contract_address": "Dirección de contrato de token", "token_decimal": "Token decimal", "token_name": "Nombre del token, por ejemplo: Tether", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index d2f8b4e6b..9056dbc49 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -913,6 +913,7 @@ "tip": "Pourboire:", "to": "À", "today": "Aujourd'hui", + "token_already_exists": "Le jeton existe déjà", "token_contract_address": "Adresse du contrat de token", "token_decimal": "Décimales de token", "token_name": "Nom du token, par exemple : Tether", diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index 6b73db8ed..b5f77a1c0 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -915,6 +915,7 @@ "tip": "Tukwici:", "to": "Zuwa", "today": "Yau", + "token_already_exists": "Alama an riga an wanzu", "token_contract_address": "Adireshin kwangilar Token", "token_decimal": "Alamar ƙima", "token_name": "Alamar sunan misali: Tether", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index f97b0f84f..79d25a1fb 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -915,6 +915,7 @@ "tip": "टिप:", "to": "को", "today": "आज", + "token_already_exists": "टोकन पहले से मौजूद है", "token_contract_address": "टोकन अनुबंध पता", "token_decimal": "सांकेतिक दशमलव", "token_name": "टोकन नाम जैसे: टीथर", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index ef9e04bbe..6f94329ff 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -913,6 +913,7 @@ "tip": "Savjet:", "to": "Do", "today": "Danas", + "token_already_exists": "Token već postoji", "token_contract_address": "Adresa ugovora tokena", "token_decimal": "Token decimalni", "token_name": "Naziv tokena npr.: Tether", diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb index ac1bfda99..c54d6b5b8 100644 --- a/res/values/strings_hy.arb +++ b/res/values/strings_hy.arb @@ -911,6 +911,7 @@ "tip": "Թեյավճար", "to": "Դեպի", "today": "Այսօր", + "token_already_exists": "Նշանն արդեն գոյություն ունի", "token_contract_address": "Token-ի պայմանագրի հասցե", "token_decimal": "Token-ի տասանիշ", "token_name": "Token-ի անուն, օրինակ՝ Tether", diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index e693c98e5..7682903fc 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -916,6 +916,7 @@ "tip": "Tip:", "to": "Ke", "today": "Hari ini", + "token_already_exists": "Token sudah ada", "token_contract_address": "Alamat kontrak token", "token_decimal": "Desimal token", "token_name": "Nama token misalnya: Tether", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index b92969550..9d03f7947 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -914,6 +914,7 @@ "tip": "Suggerimento:", "to": "A", "today": "Oggi", + "token_already_exists": "Il token esiste già", "token_contract_address": "Indirizzo del contratto token", "token_decimal": "Decimale del token", "token_name": "Nome del token, ad esempio: Tether", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 9a0b9fc23..c92a6dab1 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -914,6 +914,7 @@ "tip": "ヒント: ", "to": "に", "today": "今日", + "token_already_exists": "トークンはすでに存在します", "token_contract_address": "トークンコントラクトアドレス", "token_decimal": "トークン10進数", "token_name": "トークン名 例: Tether", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index b70d30328..0184673d7 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -914,6 +914,7 @@ "tip": "팁:", "to": "받는 통화", "today": "오늘", + "token_already_exists": "토큰이 이미 존재합니다", "token_contract_address": "토큰 계약 주소", "token_decimal": "토큰 소수 자릿수", "token_name": "토큰 이름 (예: Tether)", diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index f17bb7527..9b158be76 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -913,6 +913,7 @@ "tip": "အကြံပြုချက်-", "to": "သို့", "today": "ဒီနေ့", + "token_already_exists": "တိုကင်ရှိပြီးသား", "token_contract_address": "တိုကင်စာချုပ်လိပ်စာ", "token_decimal": "တိုကင်ဒဿမ", "token_name": "တိုကင်အမည် ဥပမာ- Tether", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index ebde13a68..948798b0a 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -913,6 +913,7 @@ "tip": "Tip:", "to": "Naar", "today": "Vandaag", + "token_already_exists": "Token bestaat al", "token_contract_address": "Token contractadres", "token_decimal": "Token decimaal", "token_name": "Tokennaam bijv.: Tether", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index d83ef2f3e..4b39a949b 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -913,6 +913,7 @@ "tip": "tip:", "to": "Do", "today": "Dzisiaj", + "token_already_exists": "Token już istnieje", "token_contract_address": "Adres kontraktu tokena", "token_decimal": "Token dziesiętny", "token_name": "Nazwa tokena, np.: Tether", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 020f37a78..c2f0f209c 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -915,6 +915,7 @@ "tip": "Dica:", "to": "Para", "today": "Hoje", + "token_already_exists": "Token já existe", "token_contract_address": "Endereço do contrato de token", "token_decimal": "Token decimal", "token_name": "Nome do token, por exemplo: Tether", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 003829450..1b59e84ab 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -914,6 +914,7 @@ "tip": "Совет:", "to": "К", "today": "Сегодня", + "token_already_exists": "Токен уже существует", "token_contract_address": "Адрес контракта токена", "token_decimal": "Десятичный токен", "token_name": "Имя токена, например: Tether", diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index 6a9c59f57..1fc8d81d5 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -913,6 +913,7 @@ "tip": "เพิ่มค่าตอบแทน:", "to": "ถึง", "today": "วันนี้", + "token_already_exists": "โทเค็นมีอยู่แล้ว", "token_contract_address": "ที่อยู่สัญญาโทเค็น", "token_decimal": "โทเค็นทศนิยม", "token_name": "ชื่อโทเค็น เช่น Tether", diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb index 2f494adce..2ca3b02e4 100644 --- a/res/values/strings_tl.arb +++ b/res/values/strings_tl.arb @@ -913,6 +913,7 @@ "tip": "Tip:", "to": "Sa", "today": "Ngayon", + "token_already_exists": "Mayroon nang token", "token_contract_address": "Address ng token contract", "token_decimal": "Token decimal", "token_name": "Pangalan ng token, halimbawa: Tether", diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index 0b67edbe8..c5582b4ef 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -913,6 +913,7 @@ "tip": "Bahşiş:", "to": "İle", "today": "Bugün", + "token_already_exists": "Token zaten var", "token_contract_address": "Token sözleşme adresi", "token_decimal": "Belirteç ondalık", "token_name": "Belirteç adı, örneğin: Tether", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index a4078a341..cdfc91433 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -914,6 +914,7 @@ "tip": "Порада:", "to": "До", "today": "Сьогодні", + "token_already_exists": "Маркер вже існує", "token_contract_address": "Адреса договору маркера", "token_decimal": "Токен десятковий", "token_name": "Назва токена, наприклад: Tether", diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index 3c805fe6b..42a2398c2 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -915,6 +915,7 @@ "tip": "ٹپ:", "to": "to", "today": "آج", + "token_already_exists": "ٹوکن پہلے ہی موجود ہے", "token_contract_address": "ٹوکن کنٹریکٹ ایڈریس", "token_decimal": "ٹوکن اعشاریہ", "token_name": "ٹوکن کا نام جیسے: Tether", diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb index ea3281b2a..5f76e666a 100644 --- a/res/values/strings_vi.arb +++ b/res/values/strings_vi.arb @@ -910,6 +910,7 @@ "tip": "Mẹo:", "to": "ĐẾN", "today": "Hôm nay", + "token_already_exists": "Mã thông báo đã tồn tại", "token_contract_address": "Địa chỉ hợp đồng token", "token_decimal": "Số thập phân của token", "token_name": "Tên token ví dụ: Tether", diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 109dac40f..360fcd6b6 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -914,6 +914,7 @@ "tip": "Owó àfikún:", "to": "Si", "today": "Lénìí", + "token_already_exists": "Token tẹlẹ wa", "token_contract_address": "Àmi guide adirẹsi", "token_decimal": "Àmi eleemewa", "token_name": "Orukọ àmi fun apẹẹrẹ: Tether", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 8f146e0fb..3bf18677c 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -913,6 +913,7 @@ "tip": "提示:", "to": "到", "today": "今天", + "token_already_exists": "令牌已经存在", "token_contract_address": "代币合约地址", "token_decimal": "令牌十进制", "token_name": "代币名称例如：Tether", diff --git a/tool/configure.dart b/tool/configure.dart index 95c8a4d5a..f6e1496de 100644 --- a/tool/configure.dart +++ b/tool/configure.dart @@ -760,6 +760,7 @@ abstract class Ethereum { void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection); Future> getHardwareWalletAccounts(LedgerViewModel ledgerVM, {int index = 0, int limit = 5}); List getDefaultTokenContractAddresses(); + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress); } """; @@ -870,6 +871,7 @@ abstract class Polygon { void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection); Future> getHardwareWalletAccounts(LedgerViewModel ledgerVM, {int index = 0, int limit = 5}); List getDefaultTokenContractAddresses(); + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress); } """; @@ -1156,6 +1158,7 @@ abstract class Solana { List? getValidationLength(CryptoCurrency type); double? getEstimateFees(WalletBase wallet); List getDefaultTokenContractAddresses(); + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress); } """; @@ -1234,6 +1237,7 @@ abstract class Tron { void updateTronGridUsageState(WalletBase wallet, bool isEnabled); List getDefaultTokenContractAddresses(); + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress); } """; @@ -1308,6 +1312,7 @@ abstract class Zano { String getAddress(WalletBase wallet); bool validateAddress(String address); Map> debugCallLength(); + bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress); } """; const zanoEmptyDefinition = 'Zano? zano;\n';