mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-06-28 12:29:51 +00:00
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 <omarh.ismail1@gmail.com>
This commit is contained in:
parent
18c2ba9366
commit
5082dc20f3
139 changed files with 2754 additions and 878 deletions
|
@ -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<String, SocketTask> _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 {
|
||||
|
|
|
@ -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<void> 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<String, dynamic>;
|
||||
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) {
|
||||
|
|
|
@ -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 = <String, Completer<dynamic>>{};
|
||||
|
||||
PayjoinReceiverWorker._(this.sendPort);
|
||||
|
||||
static final client = ProxyWrapper().getHttpIOClient();
|
||||
static Future<void> run(List<Object> 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<UncheckedProposal> receiveUncheckedProposal(
|
||||
http.Client httpClient, Receiver session) async {
|
||||
Future<UncheckedProposal> 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<String> sendFinalProposal(
|
||||
http.Client httpClient, PayjoinProposal finalProposal) async {
|
||||
Future<String> 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,
|
||||
|
|
|
@ -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<String> 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<String> _runSenderV2(Sender sender, http.Client httpClient) async {
|
||||
Future<String> _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<String> _runSenderV1(Sender sender, http.Client httpClient) async {
|
||||
Future<String> _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<List<int>> _postRequest(http.Client client, Request req) async {
|
||||
Future<List<int>> _postRequest(Request req) async {
|
||||
final httpRequest = await client.post(Uri.parse(req.url.asString()),
|
||||
headers: {'Content-Type': req.contentType}, body: req.body);
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue