mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-22 19:49:22 +00:00
V4.19.0 v1.16.0 (#1520)
Some checks failed
Cache Dependencies / test (push) Has been cancelled
Some checks failed
Cache Dependencies / test (push) Has been cancelled
* remove server entitlement * remove server entitlement * minor adjustment
This commit is contained in:
parent
c28ee4b1e7
commit
9e9534a4e5
10 changed files with 18 additions and 41 deletions
7
.github/workflows/pr_test_build.yml
vendored
7
.github/workflows/pr_test_build.yml
vendored
|
@ -75,10 +75,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
/opt/android/cake_wallet/cw_haven/android/.cxx
|
/opt/android/cake_wallet/cw_haven/android/.cxx
|
||||||
/opt/android/cake_wallet/cw_haven/ios/External
|
|
||||||
/opt/android/cake_wallet/cw_monero/android/.cxx
|
|
||||||
/opt/android/cake_wallet/cw_monero/ios/External
|
|
||||||
/opt/android/cake_wallet/cw_shared_external/ios/External
|
|
||||||
/opt/android/cake_wallet/scripts/monero_c/release
|
/opt/android/cake_wallet/scripts/monero_c/release
|
||||||
key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh') }}
|
key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh') }}
|
||||||
|
|
||||||
|
@ -87,8 +83,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cd /opt/android/cake_wallet/scripts/android/
|
cd /opt/android/cake_wallet/scripts/android/
|
||||||
source ./app_env.sh cakewallet
|
source ./app_env.sh cakewallet
|
||||||
./build_all.sh
|
./build_monero_all.sh
|
||||||
./copy_monero_deps.sh
|
|
||||||
|
|
||||||
- name: Install Flutter dependencies
|
- name: Install Flutter dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
Monero enhancements
|
Monero enhancements
|
||||||
|
Improvements for Tron and Nano wallets
|
||||||
Bug fixes
|
Bug fixes
|
|
@ -10,7 +10,6 @@ import 'package:cw_core/transaction_info.dart';
|
||||||
import 'package:cw_core/wallet_base.dart';
|
import 'package:cw_core/wallet_base.dart';
|
||||||
import 'package:cw_core/wallet_type.dart';
|
import 'package:cw_core/wallet_type.dart';
|
||||||
import 'package:cw_monero/monero_wallet.dart';
|
import 'package:cw_monero/monero_wallet.dart';
|
||||||
import 'package:cw_wownero/wownero_wallet.dart';
|
|
||||||
import 'package:mobx/mobx.dart';
|
import 'package:mobx/mobx.dart';
|
||||||
import 'package:polyseed/polyseed.dart';
|
import 'package:polyseed/polyseed.dart';
|
||||||
|
|
||||||
|
@ -157,8 +156,7 @@ abstract class WalletKeysViewModelBase with Store {
|
||||||
final lang = PolyseedLang.getByPhrase(_appStore.wallet!.seed!);
|
final lang = PolyseedLang.getByPhrase(_appStore.wallet!.seed!);
|
||||||
items.add(StandartListItem(
|
items.add(StandartListItem(
|
||||||
title: S.current.wallet_seed_legacy,
|
title: S.current.wallet_seed_legacy,
|
||||||
value: (_appStore.wallet as WowneroWalletBase)
|
value: wownero!.getLegacySeed(_appStore.wallet!, lang.nameEnglish)));
|
||||||
.seedLegacy(lang.nameEnglish)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -315,23 +313,4 @@ abstract class WalletKeysViewModelBase with Store {
|
||||||
|
|
||||||
String getRoundedRestoreHeight(int height) =>
|
String getRoundedRestoreHeight(int height) =>
|
||||||
((height / 1000).floor() * 1000).toString();
|
((height / 1000).floor() * 1000).toString();
|
||||||
|
|
||||||
LegacySeedLang _getLegacySeedLang(PolyseedLang lang) {
|
|
||||||
switch (lang.nameEnglish) {
|
|
||||||
case "Spanish":
|
|
||||||
return LegacySeedLang.getByEnglishName("Spanish");
|
|
||||||
case "French":
|
|
||||||
return LegacySeedLang.getByEnglishName("French");
|
|
||||||
case "Italian":
|
|
||||||
return LegacySeedLang.getByEnglishName("Italian");
|
|
||||||
case "Japanese":
|
|
||||||
return LegacySeedLang.getByEnglishName("Japanese");
|
|
||||||
case "Portuguese":
|
|
||||||
return LegacySeedLang.getByEnglishName("Portuguese");
|
|
||||||
case "Chinese (Simplified)":
|
|
||||||
return LegacySeedLang.getByEnglishName("Chinese (simplified)");
|
|
||||||
default:
|
|
||||||
return LegacySeedLang.getByEnglishName("English");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -344,4 +344,7 @@ class CWWownero extends Wownero {
|
||||||
Future<int> getCurrentHeight() async {
|
Future<int> getCurrentHeight() async {
|
||||||
return wownero_wallet_api.getCurrentHeight();
|
return wownero_wallet_api.getCurrentHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String getLegacySeed(Object wallet, String langName) =>
|
||||||
|
(wallet as WowneroWalletBase).seedLegacy(langName);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,6 @@
|
||||||
<true/>
|
<true/>
|
||||||
<key>com.apple.security.network.client</key>
|
<key>com.apple.security.network.client</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>com.apple.security.network.server</key>
|
|
||||||
<true/>
|
|
||||||
<key>keychain-access-groups</key>
|
<key>keychain-access-groups</key>
|
||||||
<array>
|
<array>
|
||||||
<string>$(AppIdentifierPrefix)${BUNDLE_ID}</string>
|
<string>$(AppIdentifierPrefix)${BUNDLE_ID}</string>
|
||||||
|
|
|
@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
|
||||||
APP_ANDROID_TYPE=$1
|
APP_ANDROID_TYPE=$1
|
||||||
|
|
||||||
MONERO_COM_NAME="Monero.com"
|
MONERO_COM_NAME="Monero.com"
|
||||||
MONERO_COM_VERSION="1.15.2"
|
MONERO_COM_VERSION="1.16.0"
|
||||||
MONERO_COM_BUILD_NUMBER=92
|
MONERO_COM_BUILD_NUMBER=94
|
||||||
MONERO_COM_BUNDLE_ID="com.monero.app"
|
MONERO_COM_BUNDLE_ID="com.monero.app"
|
||||||
MONERO_COM_PACKAGE="com.monero.app"
|
MONERO_COM_PACKAGE="com.monero.app"
|
||||||
MONERO_COM_SCHEME="monero.com"
|
MONERO_COM_SCHEME="monero.com"
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="4.18.2"
|
CAKEWALLET_VERSION="4.19.0"
|
||||||
CAKEWALLET_BUILD_NUMBER=218
|
CAKEWALLET_BUILD_NUMBER=220
|
||||||
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
|
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
|
||||||
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
|
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
|
||||||
CAKEWALLET_SCHEME="cakewallet"
|
CAKEWALLET_SCHEME="cakewallet"
|
||||||
|
|
|
@ -14,12 +14,12 @@ APP_IOS_TYPE=$1
|
||||||
|
|
||||||
MONERO_COM_NAME="Monero.com"
|
MONERO_COM_NAME="Monero.com"
|
||||||
MONERO_COM_VERSION="1.16.0"
|
MONERO_COM_VERSION="1.16.0"
|
||||||
MONERO_COM_BUILD_NUMBER=91
|
MONERO_COM_BUILD_NUMBER=92
|
||||||
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="4.19.0"
|
CAKEWALLET_VERSION="4.19.0"
|
||||||
CAKEWALLET_BUILD_NUMBER=251
|
CAKEWALLET_BUILD_NUMBER=254
|
||||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||||
|
|
||||||
HAVEN_NAME="Haven"
|
HAVEN_NAME="Haven"
|
||||||
|
|
|
@ -16,13 +16,13 @@ if [ -n "$1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MONERO_COM_NAME="Monero.com"
|
MONERO_COM_NAME="Monero.com"
|
||||||
MONERO_COM_VERSION="1.5.2"
|
MONERO_COM_VERSION="1.6.0"
|
||||||
MONERO_COM_BUILD_NUMBER=23
|
MONERO_COM_BUILD_NUMBER=24
|
||||||
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
||||||
|
|
||||||
CAKEWALLET_NAME="Cake Wallet"
|
CAKEWALLET_NAME="Cake Wallet"
|
||||||
CAKEWALLET_VERSION="1.11.2"
|
CAKEWALLET_VERSION="1.12.0"
|
||||||
CAKEWALLET_BUILD_NUMBER=80
|
CAKEWALLET_BUILD_NUMBER=81
|
||||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||||
|
|
||||||
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
|
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#define MyAppName "Cake Wallet"
|
#define MyAppName "Cake Wallet"
|
||||||
#define MyAppVersion "0.0.1"
|
#define MyAppVersion "0.0.2"
|
||||||
#define MyAppPublisher "Cake Labs LLC"
|
#define MyAppPublisher "Cake Labs LLC"
|
||||||
#define MyAppURL "https://cakewallet.com/"
|
#define MyAppURL "https://cakewallet.com/"
|
||||||
#define MyAppExeName "CakeWallet.exe"
|
#define MyAppExeName "CakeWallet.exe"
|
||||||
|
|
|
@ -563,6 +563,7 @@ abstract class Wownero {
|
||||||
int getTransactionInfoAccountId(TransactionInfo tx);
|
int getTransactionInfoAccountId(TransactionInfo tx);
|
||||||
WalletService createWowneroWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource);
|
WalletService createWowneroWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource);
|
||||||
Map<String, String> pendingTransactionInfo(Object transaction);
|
Map<String, String> pendingTransactionInfo(Object transaction);
|
||||||
|
String getLegacySeed(Object wallet, String langName);
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract class WowneroSubaddressList {
|
abstract class WowneroSubaddressList {
|
||||||
|
|
Loading…
Reference in a new issue