Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-03 17:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Ethereum to Linux

Browse source 
Fix conflicts with main
This commit is contained in:
OmarHatem 2023-08-07 20:40:51 +03:00
parent d106e14e74
commit 5ce1fbb1e4
7 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cw_ethereum/lib/ethereum_wallet.dart
View file

@ -470,4 +470,7 @@ abstract class EthereumWalletBase
_transactionsUpdateTimer?.cancel(); _transactionsUpdateTimer?.cancel();
} }
} }
@override
String get password => _password;
} }

4
cw_ethereum/lib/ethereum_wallet_creation_credentials.dart
View file

@ -2,8 +2,8 @@ import 'package:cw_core/wallet_credentials.dart';
import 'package:cw_core/wallet_info.dart'; import 'package:cw_core/wallet_info.dart';
class EthereumNewWalletCredentials extends WalletCredentials { class EthereumNewWalletCredentials extends WalletCredentials {
EthereumNewWalletCredentials({required String name, WalletInfo? walletInfo}) EthereumNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password})
: super(name: name, walletInfo: walletInfo); : super(name: name, walletInfo: walletInfo, password: password);
} }
class EthereumRestoreWalletFromSeedCredentials extends WalletCredentials { class EthereumRestoreWalletFromSeedCredentials extends WalletCredentials {

1
lib/di.dart
View file

@ -40,6 +40,7 @@ import 'package:cake_wallet/src/screens/settings/connection_sync_page.dart';
import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart'; import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
import 'package:cake_wallet/themes/theme_list.dart'; import 'package:cake_wallet/themes/theme_list.dart';
import 'package:cake_wallet/utils/payment_request.dart'; import 'package:cake_wallet/utils/payment_request.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:cake_wallet/view_model/dashboard/desktop_sidebar_view_model.dart'; import 'package:cake_wallet/view_model/dashboard/desktop_sidebar_view_model.dart';
import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart';
import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart'; import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart';

3
lib/ethereum/cw_ethereum.dart
View file

@ -11,8 +11,9 @@ class CWEthereum extends Ethereum {
WalletCredentials createEthereumNewWalletCredentials({ WalletCredentials createEthereumNewWalletCredentials({
required String name, required String name,
WalletInfo? walletInfo, WalletInfo? walletInfo,
String? password,
}) => }) =>
EthereumNewWalletCredentials(name: name, walletInfo: walletInfo); EthereumNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
@override @override
WalletCredentials createEthereumRestoreWalletFromSeedCredentials({ WalletCredentials createEthereumRestoreWalletFromSeedCredentials({

3
lib/src/widgets/address_text_field.dart
View file

@ -1,6 +1,5 @@
import 'dart:io';
import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/utils/device_info.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';

2
scripts/linux/app_config.sh
View file

@ -13,7 +13,7 @@ CONFIG_ARGS=""
case $APP_LINUX_TYPE in case $APP_LINUX_TYPE in
$CAKEWALLET) $CAKEWALLET)
CONFIG_ARGS="--monero --bitcoin --excludeFlutterSecureStorage";; #--haven CONFIG_ARGS="--monero --bitcoin --ethereum --excludeFlutterSecureStorage";; #--haven
esac esac
cp -rf pubspec_description.yaml pubspec.yaml cp -rf pubspec_description.yaml pubspec.yaml

2
tool/configure.dart
View file

@ -508,7 +508,7 @@ import 'package:cw_ethereum/ethereum_transaction_priority.dart';
abstract class Ethereum { abstract class Ethereum {
List<String> getEthereumWordList(String language); List<String> getEthereumWordList(String language);
WalletService createEthereumWalletService(Box<WalletInfo> walletInfoSource); WalletService createEthereumWalletService(Box<WalletInfo> walletInfoSource);
WalletCredentials createEthereumNewWalletCredentials({required String name, WalletInfo? walletInfo}); WalletCredentials createEthereumNewWalletCredentials({required String name, WalletInfo? walletInfo, String? password});
WalletCredentials createEthereumRestoreWalletFromSeedCredentials({required String name, required String mnemonic, required String password}); WalletCredentials createEthereumRestoreWalletFromSeedCredentials({required String name, required String mnemonic, required String password});
String getAddress(WalletBase wallet); String getAddress(WalletBase wallet);
TransactionPriority getDefaultTransactionPriority(); TransactionPriority getDefaultTransactionPriority();