v4.11.0 and v1.8.0 (#1192)
* v4.11.0 and v1.8.0 * Add missing functionalities to mac os monero api.cpp * Fix creating a new wallet issue * Remove un-necessary linux, macos, and windows files from bitcoincash package
Omar Hatem committed
Nov 30, 2023 at 16:51 UTC
4d245b7ff159a09484f29f0a3466e5eaea7376f6
20 files changed
+67
-171
assets/text/Monerocom_Release_Notes.txt
+2
-7
@@ -1,7 +1,2 @@
1
-Coin control fixes and enhancements
2
-In-app Tor connection
3
-Accessibility enhancements
4
-Privacy settings enhancements
5
-UI enhancements
6
-Backup flow fixes
7
-Bug fixes
\ No newline at end of file
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
assets/text/Release_Notes.txt
+3
-7
@@ -1,7 +1,3 @@
1
-Coin control fixes and enhancements
2
-In-app Tor connection
3
-Accessibility enhancements
4
-Privacy settings enhancements
5
-UI enhancements
6
-Backup flow fixes
7
-Bug fixes
\ No newline at end of file
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
cw_bitcoin_cash/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
deleted
-1
@@ -1 +0,0 @@
1
-/Users/blazebrain/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
\ No newline at end of file
cw_bitcoin_cash/linux/flutter/ephemeral/.plugin_symlinks/tor
deleted
-1
@@ -1 +0,0 @@
1
-/Users/blazebrain/.pub-cache/git/tor-09ba92cb11d4e3cacf97256e57863b805f79f2e5/
\ No newline at end of file
cw_bitcoin_cash/linux/flutter/generated_plugin_registrant.cc
deleted
-11
@@ -1,11 +0,0 @@
1
-//
2
-// Generated file. Do not edit.
3
-//
4
-
5
-// clang-format off
6
-
7
-#include "generated_plugin_registrant.h"
8
-
9
-
10
-void fl_register_plugins(FlPluginRegistry* registry) {
11
-}
cw_bitcoin_cash/linux/flutter/generated_plugin_registrant.h
deleted
-15
@@ -1,15 +0,0 @@
1
-//
2
-// Generated file. Do not edit.
3
-//
4
-
5
-// clang-format off
6
-
7
-#ifndef GENERATED_PLUGIN_REGISTRANT_
8
-#define GENERATED_PLUGIN_REGISTRANT_
9
-
10
-#include <flutter_linux/flutter_linux.h>
11
-
12
-// Registers Flutter plugins.
13
-void fl_register_plugins(FlPluginRegistry* registry);
14
-
15
-#endif // GENERATED_PLUGIN_REGISTRANT_
cw_bitcoin_cash/linux/flutter/generated_plugins.cmake
deleted
-24
@@ -1,24 +0,0 @@
1
-#
2
-# Generated file, do not edit.
3
-#
4
-
5
-list(APPEND FLUTTER_PLUGIN_LIST
6
-)
7
-
8
-list(APPEND FLUTTER_FFI_PLUGIN_LIST
9
- tor
10
-)
11
-
12
-set(PLUGIN_BUNDLED_LIBRARIES)
13
-
14
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
15
- add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
16
- target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
17
- list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
18
- list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
19
-endforeach(plugin)
20
-
21
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
22
- add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
23
- list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
24
-endforeach(ffi_plugin)
cw_bitcoin_cash/macos/Flutter/GeneratedPluginRegistrant.swift
deleted
-12
@@ -1,12 +0,0 @@
1
-//
2
-// Generated file. Do not edit.
3
-//
4
-
5
-import FlutterMacOS
6
-import Foundation
7
-
8
-import path_provider_foundation
9
-
10
-func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
11
- PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
12
-}
cw_bitcoin_cash/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
deleted
-11
@@ -1,11 +0,0 @@
1
-// This is a generated file; do not edit or check into version control.
2
-FLUTTER_ROOT=C:\Users\borod\flutter
3
-FLUTTER_APPLICATION_PATH=C:\cake_wallet\cw_bitcoin_cash
4
-COCOAPODS_PARALLEL_CODE_SIGN=true
5
-FLUTTER_BUILD_DIR=build
6
-FLUTTER_BUILD_NAME=0.0.1
7
-FLUTTER_BUILD_NUMBER=0.0.1
8
-DART_OBFUSCATION=false
9
-TRACK_WIDGET_CREATION=true
10
-TREE_SHAKE_ICONS=false
11
-PACKAGE_CONFIG=.dart_tool/package_config.json
cw_bitcoin_cash/macos/Flutter/ephemeral/flutter_export_environment.sh
deleted
-12
@@ -1,12 +0,0 @@
1
-#!/bin/sh
2
-# This is a generated file; do not edit or check into version control.
3
-export "FLUTTER_ROOT=C:\Users\borod\flutter"
4
-export "FLUTTER_APPLICATION_PATH=C:\cake_wallet\cw_bitcoin_cash"
5
-export "COCOAPODS_PARALLEL_CODE_SIGN=true"
6
-export "FLUTTER_BUILD_DIR=build"
7
-export "FLUTTER_BUILD_NAME=0.0.1"
8
-export "FLUTTER_BUILD_NUMBER=0.0.1"
9
-export "DART_OBFUSCATION=false"
10
-export "TRACK_WIDGET_CREATION=true"
11
-export "TREE_SHAKE_ICONS=false"
12
-export "PACKAGE_CONFIG=.dart_tool/package_config.json"
cw_bitcoin_cash/windows/flutter/generated_plugin_registrant.cc
deleted
-11
@@ -1,11 +0,0 @@
1
-//
2
-// Generated file. Do not edit.
3
-//
4
-
5
-// clang-format off
6
-
7
-#include "generated_plugin_registrant.h"
8
-
9
-
10
-void RegisterPlugins(flutter::PluginRegistry* registry) {
11
-}
cw_bitcoin_cash/windows/flutter/generated_plugin_registrant.h
deleted
-15
@@ -1,15 +0,0 @@
1
-//
2
-// Generated file. Do not edit.
3
-//
4
-
5
-// clang-format off
6
-
7
-#ifndef GENERATED_PLUGIN_REGISTRANT_
8
-#define GENERATED_PLUGIN_REGISTRANT_
9
-
10
-#include <flutter/plugin_registry.h>
11
-
12
-// Registers Flutter plugins.
13
-void RegisterPlugins(flutter::PluginRegistry* registry);
14
-
15
-#endif // GENERATED_PLUGIN_REGISTRANT_
cw_bitcoin_cash/windows/flutter/generated_plugins.cmake
deleted
-23
@@ -1,23 +0,0 @@
1
-#
2
-# Generated file, do not edit.
3
-#
4
-
5
-list(APPEND FLUTTER_PLUGIN_LIST
6
-)
7
-
8
-list(APPEND FLUTTER_FFI_PLUGIN_LIST
9
-)
10
-
11
-set(PLUGIN_BUNDLED_LIBRARIES)
12
-
13
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
14
- add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
15
- target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
16
- list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
17
- list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
18
-endforeach(plugin)
19
-
20
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
21
- add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
22
- list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
23
-endforeach(ffi_plugin)
cw_ethereum/pubspec.yaml
-1
@@ -17,7 +17,6 @@ dependencies:
17
mobx: ^2.0.7+4
18
bip39: ^1.0.6
19
bip32: ^2.0.0
20
- ed25519_hd_key: ^2.2.0
20
hex: ^0.2.0
21
http: ^1.1.0
22
shared_preferences: ^2.0.15
cw_monero/macos/Classes/monero_api.cpp
+49
-1
@@ -234,7 +234,6 @@ extern "C"
234
}
235
236
void setUnlocked(bool unlocked);
237
-
237
};
238
239
Monero::Coins *m_coins;
@@ -375,6 +374,35 @@ extern "C"
374
return true;
375
}
376
377
+ bool restore_wallet_from_spend_key(char *path, char *password, char *seed, char *language, char *spendKey, int32_t networkType, uint64_t restoreHeight, char *error)
378
+ {
379
+ Monero::NetworkType _networkType = static_cast<Monero::NetworkType>(networkType);
380
+ Monero::Wallet *wallet = Monero::WalletManagerFactory::getWalletManager()->createDeterministicWalletFromSpendKey(
381
+ std::string(path),
382
+ std::string(password),
383
+ std::string(language),
384
+ _networkType,
385
+ (uint64_t)restoreHeight,
386
+ std::string(spendKey));
387
+
388
+ int status;
389
+ std::string errorString;
390
+
391
+ wallet->statusWithErrorString(status, errorString);
392
+
393
+ if (status != Monero::Wallet::Status_Ok || !errorString.empty())
394
+ {
395
+ error = strdup(errorString.c_str());
396
+ return false;
397
+ }
398
+
399
+ // Cache Raw to support Polyseed
400
+ wallet->setCacheAttribute("cakewallet.seed", std::string(seed));
401
+
402
+ change_current_wallet(wallet);
403
+ return true;
404
+ }
405
+
406
bool load_wallet(char *path, char *password, int32_t nettype)
407
{
408
nice(19);
@@ -439,6 +467,11 @@ extern "C"
467
468
const char *seed()
469
{
470
+ std::string _rawSeed = get_current_wallet()->getCacheAttribute("cakewallet.seed");
471
+ if (!_rawSeed.empty())
472
+ {
473
+ return strdup(_rawSeed.c_str());
474
+ }
475
return strdup(get_current_wallet()->seed().c_str());
476
}
477
@@ -842,6 +875,12 @@ extern "C"
875
return m_transaction_history->count();
876
}
877
878
+ TransactionInfoRow* get_transaction(char * txId)
879
+ {
880
+ Monero::TransactionInfo *row = m_transaction_history->transaction(std::string(txId));
881
+ return new TransactionInfoRow(row);
882
+ }
883
+
884
int LedgerExchange(
885
unsigned char *command,
886
unsigned int cmd_len,
@@ -971,6 +1010,15 @@ extern "C"
1010
return result;
1011
}
1012
1013
+ void freeze_coin(int index)
1014
+ {
1015
+ m_coins->setFrozen(index);
1016
+ }
1017
+
1018
+ void thaw_coin(int index)
1019
+ {
1020
+ m_coins->thaw(index);
1021
+ }
1022
1023
#ifdef __cplusplus
1024
}
ios/Podfile.lock
-6
@@ -122,8 +122,6 @@ PODS:
122
- Flutter
123
- MTBBarcodeScanner (5.0.11)
124
- OrderedSet (5.0.0)
125
- - package_info (0.0.1):
126
- - Flutter
125
- package_info_plus (0.4.5):
126
- Flutter
127
- path_provider_foundation (0.0.1):
@@ -177,7 +175,6 @@ DEPENDENCIES:
175
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
176
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
177
- local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
180
- - package_info (from `.symlinks/plugins/package_info/ios`)
178
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
179
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
180
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
@@ -239,8 +236,6 @@ EXTERNAL SOURCES:
236
:path: ".symlinks/plugins/in_app_review/ios"
237
local_auth_ios:
238
:path: ".symlinks/plugins/local_auth_ios/ios"
242
- package_info:
243
- :path: ".symlinks/plugins/package_info/ios"
239
package_info_plus:
240
:path: ".symlinks/plugins/package_info_plus/ios"
241
path_provider_foundation:
@@ -287,7 +282,6 @@ SPEC CHECKSUMS:
282
local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
283
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
284
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
290
- package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
285
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
286
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
287
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
lib/view_model/wallet_new_vm.dart
+3
-3
@@ -32,18 +32,18 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
32
33
@override
34
WalletCredentials getCredentials(dynamic _options) {
35
- final options = _options as List<dynamic>;
35
+ final options = _options as List<dynamic>?;
36
switch (type) {
37
case WalletType.monero:
38
return monero!.createMoneroNewWalletCredentials(
39
- name: name, language: options.first as String, isPolyseed: options.last as bool);
39
+ name: name, language: options!.first as String, isPolyseed: options.last as bool);
40
case WalletType.bitcoin:
41
return bitcoin!.createBitcoinNewWalletCredentials(name: name);
42
case WalletType.litecoin:
43
return bitcoin!.createBitcoinNewWalletCredentials(name: name);
44
case WalletType.haven:
45
return haven!.createHavenNewWalletCredentials(
46
- name: name, language: options.first as String);
46
+ name: name, language: options!.first as String);
47
case WalletType.ethereum:
48
return ethereum!.createEthereumNewWalletCredentials(name: name);
49
case WalletType.bitcoinCash:
scripts/android/app_env.sh
+4
-4
@@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
15
APP_ANDROID_TYPE=$1
16
17
MONERO_COM_NAME="Monero.com"
18
-MONERO_COM_VERSION="1.7.5"
19
-MONERO_COM_BUILD_NUMBER=67
18
+MONERO_COM_VERSION="1.8.0"
19
+MONERO_COM_BUILD_NUMBER=68
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.10.5"
26
-CAKEWALLET_BUILD_NUMBER=181
25
+CAKEWALLET_VERSION="4.11.0"
26
+CAKEWALLET_BUILD_NUMBER=182
27
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
28
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
29
CAKEWALLET_SCHEME="cakewallet"
scripts/ios/app_env.sh
+4
-4
@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
13
APP_IOS_TYPE=$1
14
15
MONERO_COM_NAME="Monero.com"
16
-MONERO_COM_VERSION="1.7.5"
17
-MONERO_COM_BUILD_NUMBER=65
16
+MONERO_COM_VERSION="1.8.0"
17
+MONERO_COM_BUILD_NUMBER=66
18
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20
CAKEWALLET_NAME="Cake Wallet"
21
-CAKEWALLET_VERSION="4.10.5"
22
-CAKEWALLET_BUILD_NUMBER=199
21
+CAKEWALLET_VERSION="4.11.0"
22
+CAKEWALLET_BUILD_NUMBER=200
23
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25
HAVEN_NAME="Haven"
scripts/macos/app_env.sh
+2
-2
@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
15
fi
16
17
CAKEWALLET_NAME="Cake Wallet"
18
-CAKEWALLET_VERSION="1.3.5"
19
-CAKEWALLET_BUILD_NUMBER=42
18
+CAKEWALLET_VERSION="1.4.0"
19
+CAKEWALLET_BUILD_NUMBER=43
20
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
21
22
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then