V4.11.0 v1.8.0 (#1216)
* V4.11.0 and v1.8.0 * Add polygon to iOS and macOS Minor import fix for monero.com * Remove Polygon temporarily * Remove tor temorarily [skip ci] * Remove tor temorarily [skip ci]
Omar Hatem committed
Dec 5, 2023 at 02:35 UTC
b95af3a649fc4f28701f6d8dd173921a95b95d10
12 files changed
+61
-57
assets/text/Monerocom_Release_Notes.txt
+2
-2
@@ -1,2 +1,2 @@
1
-Monero Polyseed support, under Advanced privacy settings, create and restore from a 16 words phrase and without the need to remember the wallet creation date
2
-Minor bug fixes and enhancements
\ No newline at end of file
1
+Monero Polyseed support, create and restore from a 16 words phrase and without the need to remember the wallet creation date
2
+Bug fixes and enhancements
\ No newline at end of file
assets/text/Release_Notes.txt
+3
-3
@@ -1,3 +1,3 @@
1
-Monero Polyseed support, under Advanced privacy settings, create and restore from a 16 words phrase and without the need to remember the wallet creation date
2
-Add Ethereum NFTs tab to see all of your purchased NFTs
3
-Minor bug fixes and enhancements
\ No newline at end of file
1
+Monero Polyseed support, create and restore from a 16 words phrase and without the need to remember the wallet creation date
2
+Add NFTs tab to see all of your purchased NFTs on Ethereum
3
+Bug fixes and enhancements
\ No newline at end of file
configure_cake_wallet_android.sh
+1
@@ -10,4 +10,5 @@ cd cw_haven && flutter pub get && flutter packages pub run build_runner build --
10
cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
11
cd cw_nano && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
12
cd cw_bitcoin_cash && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
13
+cd cw_polygon && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
14
flutter packages pub run build_runner build --delete-conflicting-outputs
cw_core/lib/node.dart
+7
-4
@@ -6,7 +6,7 @@ import 'package:hive/hive.dart';
6
import 'package:cw_core/hive_type_ids.dart';
7
import 'package:cw_core/wallet_type.dart';
8
import 'package:http/io_client.dart' as ioc;
9
-import 'package:tor/tor.dart';
9
+// import 'package:tor/tor.dart';
10
11
part 'node.g.dart';
12
@@ -214,14 +214,17 @@ class Node extends HiveObject with Keyable {
214
}
215
216
Future<bool> requestNodeWithProxy() async {
217
- if (!isValidProxyAddress && !Tor.instance.enabled) {
217
+ if (!isValidProxyAddress/* && !Tor.instance.enabled*/) {
218
return false;
219
}
220
221
String? proxy = socksProxyAddress;
222
223
- if ((proxy?.isEmpty ?? true) && Tor.instance.enabled) {
224
- proxy = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}";
223
+ // if ((proxy?.isEmpty ?? true) && Tor.instance.enabled) {
224
+ // proxy = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}";
225
+ // }
226
+ if (proxy == null) {
227
+ return false;
228
}
229
final proxyAddress = proxy!.split(':')[0];
230
final proxyPort = int.parse(proxy.split(':')[1]);
cw_core/pubspec.yaml
+4
-4
@@ -20,10 +20,10 @@ dependencies:
20
intl: ^0.18.0
21
encrypt: ^5.0.1
22
socks5_proxy: ^1.0.4
23
- tor:
24
- git:
25
- url: https://github.com/cake-tech/tor.git
26
- ref: main
23
+# tor:
24
+# git:
25
+# url: https://github.com/cake-tech/tor.git
26
+# ref: main
27
28
dev_dependencies:
29
flutter_test:
lib/src/screens/settings/tor_page.dart
+33
-33
@@ -4,7 +4,7 @@ import 'dart:io';
4
import 'package:cake_wallet/src/screens/base_page.dart';
5
import 'package:cake_wallet/store/app_store.dart';
6
import 'package:flutter/material.dart';
7
-import 'package:tor/tor.dart';
7
+// import 'package:tor/tor.dart';
8
9
class TorPage extends BasePage {
10
final AppStore appStore;
@@ -40,44 +40,44 @@ class _TorPageBodyState extends State<TorPageBody> {
40
connecting = true; // Update flag
41
});
42
43
- await Tor.init();
44
-
45
- // Start the proxy
46
- await Tor.instance.start();
47
-
48
- // Toggle started flag.
49
- setState(() {
50
- torEnabled = Tor.instance.enabled; // Update flag
51
- connecting = false;
52
- });
53
-
54
- final node = widget.appStore.settingsStore.getCurrentNode(widget.appStore.wallet!.type);
55
- if (node.socksProxyAddress?.isEmpty ?? true) {
56
- node.socksProxyAddress = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}";
57
- }
58
- widget.appStore.wallet!.connectToNode(node: node);
43
+ // await Tor.init();
44
+ //
45
+ // // Start the proxy
46
+ // await Tor.instance.start();
47
+ //
48
+ // // Toggle started flag.
49
+ // setState(() {
50
+ // torEnabled = Tor.instance.enabled; // Update flag
51
+ // connecting = false;
52
+ // });
53
+ //
54
+ // final node = widget.appStore.settingsStore.getCurrentNode(widget.appStore.wallet!.type);
55
+ // if (node.socksProxyAddress?.isEmpty ?? true) {
56
+ // node.socksProxyAddress = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}";
57
+ // }
58
+ // widget.appStore.wallet!.connectToNode(node: node);
59
60
print('Done awaiting; tor should be running');
61
}
62
63
Future<void> endTor() async {
64
- // Start the proxy
65
- Tor.instance.disable();
66
-
67
- // Toggle started flag.
68
- setState(() {
69
- torEnabled = Tor.instance.enabled; // Update flag
70
- });
71
-
72
- print('Done awaiting; tor should be stopped');
73
- }
74
-
75
- @override
76
- void initState() {
77
- super.initState();
78
-
79
- torEnabled = Tor.instance.enabled;
64
+ // // Start the proxy
65
+ // Tor.instance.disable();
66
+ //
67
+ // // Toggle started flag.
68
+ // setState(() {
69
+ // torEnabled = Tor.instance.enabled; // Update flag
70
+ // });
71
+ //
72
+ // print('Done awaiting; tor should be stopped');
73
}
74
+ //
75
+ // @override
76
+ // void initState() {
77
+ // super.initState();
78
+ //
79
+ // torEnabled = Tor.instance.enabled;
80
+ // }
81
82
@override
83
void dispose() {
pubspec_base.yaml
+4
-4
@@ -98,10 +98,10 @@ dependencies:
98
url: https://github.com/cake-tech/bitcoin_flutter.git
99
ref: cake-update-v3
100
fluttertoast: 8.1.4
101
- tor:
102
- git:
103
- url: https://github.com/cake-tech/tor.git
104
- ref: main
101
+# tor:
102
+# git:
103
+# url: https://github.com/cake-tech/tor.git
104
+# ref: main
105
socks5_proxy: ^1.0.4
106
flutter_svg: ^2.0.9
107
polyseed:
scripts/android/app_env.sh
+2
-2
@@ -16,14 +16,14 @@ APP_ANDROID_TYPE=$1
16
17
MONERO_COM_NAME="Monero.com"
18
MONERO_COM_VERSION="1.8.0"
19
-MONERO_COM_BUILD_NUMBER=68
19
+MONERO_COM_BUILD_NUMBER=69
20
MONERO_COM_BUNDLE_ID="com.monero.app"
21
MONERO_COM_PACKAGE="com.monero.app"
22
MONERO_COM_SCHEME="monero.com"
23
24
CAKEWALLET_NAME="Cake Wallet"
25
CAKEWALLET_VERSION="4.11.0"
26
-CAKEWALLET_BUILD_NUMBER=182
26
+CAKEWALLET_BUILD_NUMBER=184
27
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
28
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
29
CAKEWALLET_SCHEME="cakewallet"
scripts/android/pubspec_gen.sh
+1
-1
@@ -10,7 +10,7 @@ case $APP_ANDROID_TYPE in
10
CONFIG_ARGS="--monero"
11
;;
12
$CAKEWALLET)
13
- CONFIG_ARGS="--monero --bitcoin --haven --ethereum --nano --bitcoinCash --polygon"
13
+ CONFIG_ARGS="--monero --bitcoin --haven --ethereum --nano --bitcoinCash"
14
;;
15
$HAVEN)
16
CONFIG_ARGS="--haven"
scripts/ios/app_env.sh
+2
-2
@@ -14,12 +14,12 @@ APP_IOS_TYPE=$1
14
15
MONERO_COM_NAME="Monero.com"
16
MONERO_COM_VERSION="1.8.0"
17
-MONERO_COM_BUILD_NUMBER=66
17
+MONERO_COM_BUILD_NUMBER=67
18
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20
CAKEWALLET_NAME="Cake Wallet"
21
CAKEWALLET_VERSION="4.11.0"
22
-CAKEWALLET_BUILD_NUMBER=200
22
+CAKEWALLET_BUILD_NUMBER=202
23
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25
HAVEN_NAME="Haven"
scripts/macos/app_env.sh
+1
-1
@@ -16,7 +16,7 @@ fi
16
17
CAKEWALLET_NAME="Cake Wallet"
18
CAKEWALLET_VERSION="1.4.0"
19
-CAKEWALLET_BUILD_NUMBER=43
19
+CAKEWALLET_BUILD_NUMBER=45
20
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
21
22
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
tool/configure.dart
+1
-1
@@ -590,7 +590,6 @@ import 'package:cw_core/wallet_base.dart';
590
import 'package:cw_core/wallet_credentials.dart';
591
import 'package:cw_core/wallet_info.dart';
592
import 'package:cw_core/wallet_service.dart';
593
-import 'package:cw_ethereum/ethereum_mnemonics.dart';
593
import 'package:eth_sig_util/util/utils.dart';
594
import 'package:hive/hive.dart';
595
import 'package:web3dart/web3dart.dart';
@@ -603,6 +602,7 @@ import 'package:cw_polygon/polygon_wallet.dart';
602
import 'package:cw_polygon/polygon_wallet_creation_credentials.dart';
603
import 'package:cw_polygon/polygon_wallet_service.dart';
604
import 'package:cw_polygon/polygon_transaction_priority.dart';
605
+import 'package:cw_ethereum/ethereum_mnemonics.dart';
606
""";
607
const polygonCwPart = "part 'cw_polygon.dart';";
608
const polygonContent = """