Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-19 17:14:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #739 from cypherstack/staging

Browse source 
Update main to v0.9.2
This commit is contained in:
Diego Salazar 2024-01-31 13:37:46 -07:00 committed by GitHub
commit afe43f2a4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 1119 additions and 802 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test.yaml vendored
View file

@ -13,7 +13,7 @@ jobs:
- name: Install Flutter - name: Install Flutter
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
flutter-version: '3.10.6' flutter-version: '3.16.0'
channel: 'stable' channel: 'stable'
- name: Setup | Rust - name: Setup | Rust
uses: ATiltedTree/setup-rust@v1 uses: ATiltedTree/setup-rust@v1

2
crypto_plugins/flutter_libepiccash

@ -1 +1 @@
Subproject commit 5566f2bdb3d960cbda44e049a2ec11c363053dab Subproject commit c976dcfc7786bbf7091e310eb877f5c685352903

83
lib/electrumx_rpc/rpc.dart
View file

@ -80,18 +80,32 @@ class JsonRPC {
void _sendNextAvailableRequest() { void _sendNextAvailableRequest() {
_requestQueue.nextIncompleteReq.then((req) { _requestQueue.nextIncompleteReq.then((req) {
if (req != null) { if (req != null) {
// \r\n required by electrumx server if (!Prefs.instance.useTor) {
if (_socket != null) { if (_socket == null) {
_socket!.write('${req.jsonRequest}\r\n'); Logging.instance.log(
"JsonRPC _sendNextAvailableRequest attempted with"
" _socket=null on $host:$port",
level: LogLevel.Error,
);
} }
if (_socksSocket != null) { // \r\n required by electrumx server
_socksSocket!.write('${req.jsonRequest}\r\n'); _socket!.write('${req.jsonRequest}\r\n');
} else {
if (_socksSocket == null) {
Logging.instance.log(
"JsonRPC _sendNextAvailableRequest attempted with"
" _socksSocket=null on $host:$port",
level: LogLevel.Error,
);
}
// \r\n required by electrumx server
_socksSocket?.write('${req.jsonRequest}\r\n');
} }
// TODO different timeout length? // TODO different timeout length?
req.initiateTimeout( req.initiateTimeout(
onTimedOut: () { onTimedOut: () {
_requestQueue.remove(req); _onReqCompleted(req);
}, },
); );
} }
@ -109,7 +123,7 @@ class JsonRPC {
"JsonRPC request: opening socket $host:$port", "JsonRPC request: opening socket $host:$port",
level: LogLevel.Info, level: LogLevel.Info,
); );
await connect().timeout(requestTimeout, onTimeout: () { await _connect().timeout(requestTimeout, onTimeout: () {
throw Exception("Request timeout: $jsonRpcRequest"); throw Exception("Request timeout: $jsonRpcRequest");
}); });
} }
@ -119,7 +133,7 @@ class JsonRPC {
"JsonRPC request: opening SOCKS socket to $host:$port", "JsonRPC request: opening SOCKS socket to $host:$port",
level: LogLevel.Info, level: LogLevel.Info,
); );
await connect().timeout(requestTimeout, onTimeout: () { await _connect().timeout(requestTimeout, onTimeout: () {
throw Exception("Request timeout: $jsonRpcRequest"); throw Exception("Request timeout: $jsonRpcRequest");
}); });
} }
@ -156,8 +170,21 @@ class JsonRPC {
return future; return future;
} }
Future<void> disconnect({required String reason}) async { /// DO NOT set [ignoreMutex] to true unless fully aware of the consequences
Future<void> disconnect({
required String reason,
bool ignoreMutex = false,
}) async {
if (ignoreMutex) {
await _disconnectHelper(reason: reason);
} else {
await _requestMutex.protect(() async { await _requestMutex.protect(() async {
await _disconnectHelper(reason: reason);
});
}
}
Future<void> _disconnectHelper({required String reason}) async {
await _subscription?.cancel(); await _subscription?.cancel();
_subscription = null; _subscription = null;
_socket?.destroy(); _socket?.destroy();
@ -169,10 +196,16 @@ class JsonRPC {
await _requestQueue.completeRemainingWithError( await _requestQueue.completeRemainingWithError(
"JsonRPC disconnect() called with reason: \"$reason\"", "JsonRPC disconnect() called with reason: \"$reason\"",
); );
});
} }
Future<void> connect() async { Future<void> _connect() async {
// ignore mutex is set to true here as _connect is already called within
// the mutex.protect block. Setting to false here leads to a deadlock
await disconnect(
reason: "New connection requested",
ignoreMutex: true,
);
if (!Prefs.instance.useTor) { if (!Prefs.instance.useTor) {
if (useSSL) { if (useSSL) {
_socket = await SecureSocket.connect( _socket = await SecureSocket.connect(
@ -352,17 +385,20 @@ class _JsonRPCRequest {
} }
void initiateTimeout({ void initiateTimeout({
VoidCallback? onTimedOut, required VoidCallback onTimedOut,
}) { }) {
Future<void>.delayed(requestTimeout).then((_) { Future<void>.delayed(requestTimeout).then((_) {
if (!isComplete) { if (!isComplete) {
try { completer.complete(
throw JsonRpcException("_JsonRPCRequest timed out: $jsonRequest"); JsonRPCResponse(
} catch (e, s) { data: null,
completer.completeError(e, s); exception: JsonRpcException(
onTimedOut?.call(); "_JsonRPCRequest timed out: $jsonRequest",
} ),
),
);
} }
onTimedOut.call();
}); });
} }
@ -375,14 +411,3 @@ class JsonRPCResponse {
JsonRPCResponse({this.data, this.exception}); JsonRPCResponse({this.data, this.exception});
} }
bool isIpAddress(String host) {
try {
// if the string can be parsed into an InternetAddress, it's an IP.
InternetAddress(host);
return true;
} catch (e) {
// if parsing fails, it's not an IP.
return false;
}
}

2
lib/main.dart
View file

@ -539,6 +539,8 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
break; break;
case AppLifecycleState.detached: case AppLifecycleState.detached:
break; break;
case AppLifecycleState.hidden:
break;
} }
} }

220
lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
View file

@ -35,7 +35,6 @@ import 'package:stackwallet/wallets/crypto_currency/coins/tezos.dart';
import 'package:stackwallet/wallets/isar/models/wallet_info.dart'; import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
import 'package:stackwallet/wallets/wallet/wallet.dart'; import 'package:stackwallet/wallets/wallet/wallet.dart';
import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart'; import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
import 'package:stackwallet/widgets/conditional_parent.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
@ -122,34 +121,23 @@ class _NewWalletRecoveryPhraseWarningViewState
) )
], ],
), ),
body: ConditionalParent( body: SingleChildScrollView(
condition: !isDesktop,
builder: (child) => LayoutBuilder(
builder: (context, constraints) {
return SingleChildScrollView(
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints( constraints:
minHeight: constraints.maxHeight, BoxConstraints(maxWidth: isDesktop ? 480 : double.infinity),
),
child: IntrinsicHeight( child: IntrinsicHeight(
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: child, child: Center(
),
),
),
);
},
),
child: Column( child: Column(
crossAxisAlignment: isDesktop crossAxisAlignment: isDesktop
? CrossAxisAlignment.center ? CrossAxisAlignment.center
: CrossAxisAlignment.stretch, : CrossAxisAlignment.stretch,
children: [ children: [
if (isDesktop) /*if (isDesktop)
const Spacer( const Spacer(
flex: 10, flex: 10,
), ),*/
if (!isDesktop) if (!isDesktop)
const SizedBox( const SizedBox(
height: 4, height: 4,
@ -191,7 +179,8 @@ class _NewWalletRecoveryPhraseWarningViewState
"able to restore your recover phrase. Only you have " "able to restore your recover phrase. Only you have "
"access to your wallet.", "access to your wallet.",
style: isDesktop style: isDesktop
? STextStyles.desktopTextMediumRegular(context) ? STextStyles.desktopTextMediumRegular(
context)
: STextStyles.subtitle(context).copyWith( : STextStyles.subtitle(context).copyWith(
fontSize: 12, fontSize: 12,
), ),
@ -200,7 +189,8 @@ class _NewWalletRecoveryPhraseWarningViewState
children: [ children: [
Text( Text(
"Important", "Important",
style: STextStyles.desktopH3(context).copyWith( style:
STextStyles.desktopH3(context).copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.accentColorBlue, .accentColorBlue,
@ -216,8 +206,10 @@ class _NewWalletRecoveryPhraseWarningViewState
.copyWith(fontSize: 18), .copyWith(fontSize: 18),
children: [ children: [
TextSpan( TextSpan(
text: "On the next screen you will be given ", text:
style: STextStyles.desktopH3(context).copyWith( "On the next screen you will be given ",
style: STextStyles.desktopH3(context)
.copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
@ -227,7 +219,8 @@ class _NewWalletRecoveryPhraseWarningViewState
), ),
TextSpan( TextSpan(
text: "$seedCount words", text: "$seedCount words",
style: STextStyles.desktopH3(context).copyWith( style: STextStyles.desktopH3(context)
.copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.accentColorBlue, .accentColorBlue,
@ -237,7 +230,8 @@ class _NewWalletRecoveryPhraseWarningViewState
), ),
TextSpan( TextSpan(
text: ". They are your ", text: ". They are your ",
style: STextStyles.desktopH3(context).copyWith( style: STextStyles.desktopH3(context)
.copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
@ -247,7 +241,8 @@ class _NewWalletRecoveryPhraseWarningViewState
), ),
TextSpan( TextSpan(
text: "recovery phrase", text: "recovery phrase",
style: STextStyles.desktopH3(context).copyWith( style: STextStyles.desktopH3(context)
.copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.accentColorBlue, .accentColorBlue,
@ -257,7 +252,8 @@ class _NewWalletRecoveryPhraseWarningViewState
), ),
TextSpan( TextSpan(
text: ".", text: ".",
style: STextStyles.desktopH3(context).copyWith( style: STextStyles.desktopH3(context)
.copyWith(
color: Theme.of(context) color: Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.textDark, .textDark,
@ -297,7 +293,8 @@ class _NewWalletRecoveryPhraseWarningViewState
), ),
Text( Text(
"Write them down.", "Write them down.",
style: STextStyles.navBarTitle(context), style:
STextStyles.navBarTitle(context),
), ),
], ],
), ),
@ -328,7 +325,8 @@ class _NewWalletRecoveryPhraseWarningViewState
), ),
Text( Text(
"Keep them safe.", "Keep them safe.",
style: STextStyles.navBarTitle(context), style:
STextStyles.navBarTitle(context),
), ),
], ],
), ),
@ -360,7 +358,8 @@ class _NewWalletRecoveryPhraseWarningViewState
Expanded( Expanded(
child: Text( child: Text(
"Do not show them to anyone.", "Do not show them to anyone.",
style: STextStyles.navBarTitle(context), style: STextStyles.navBarTitle(
context),
), ),
), ),
], ],
@ -391,14 +390,17 @@ class _NewWalletRecoveryPhraseWarningViewState
children: [ children: [
GestureDetector( GestureDetector(
onTap: () { onTap: () {
final value = final value = ref
ref.read(checkBoxStateProvider.state).state; .read(checkBoxStateProvider.state)
ref.read(checkBoxStateProvider.state).state = !value; .state;
ref.read(checkBoxStateProvider.state).state =
!value;
}, },
child: Container( child: Container(
color: Colors.transparent, color: Colors.transparent,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
width: 24, width: 24,
@ -407,11 +409,13 @@ class _NewWalletRecoveryPhraseWarningViewState
materialTapTargetSize: materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap, MaterialTapTargetSize.shrinkWrap,
value: ref value: ref
.watch(checkBoxStateProvider.state) .watch(
checkBoxStateProvider.state)
.state, .state,
onChanged: (newValue) { onChanged: (newValue) {
ref ref
.read(checkBoxStateProvider.state) .read(
checkBoxStateProvider.state)
.state = newValue!; .state = newValue!;
}, },
), ),
@ -423,8 +427,10 @@ class _NewWalletRecoveryPhraseWarningViewState
child: Text( child: Text(
"I understand that Stack Wallet does not keep and cannot restore my recovery phrase, and If I lose my recovery phrase, I will not be able to access my funds.", "I understand that Stack Wallet does not keep and cannot restore my recovery phrase, and If I lose my recovery phrase, I will not be able to access my funds.",
style: isDesktop style: isDesktop
? STextStyles.desktopTextMedium(context) ? STextStyles.desktopTextMedium(
: STextStyles.baseXS(context).copyWith( context)
: STextStyles.baseXS(context)
.copyWith(
height: 1.3, height: 1.3,
), ),
), ),
@ -441,7 +447,9 @@ class _NewWalletRecoveryPhraseWarningViewState
minHeight: isDesktop ? 70 : 0, minHeight: isDesktop ? 70 : 0,
), ),
child: TextButton( child: TextButton(
onPressed: ref.read(checkBoxStateProvider.state).state onPressed: ref
.read(checkBoxStateProvider.state)
.state
? () async { ? () async {
try { try {
unawaited(showDialog<dynamic>( unawaited(showDialog<dynamic>(
@ -457,26 +465,71 @@ class _NewWalletRecoveryPhraseWarningViewState
); );
}, },
)); ));
String? otherDataJsonString;
final info = WalletInfo.createNew( if (widget.coin == Coin.tezos) {
coin: widget.coin, otherDataJsonString = jsonEncode({
name: widget.walletName,
otherDataJsonString: coin == Coin.tezos
? jsonEncode({
WalletInfoKeys WalletInfoKeys
.tezosDerivationPath: .tezosDerivationPath:
Tezos.standardDerivationPath Tezos.standardDerivationPath
.value, .value,
}) });
: null, // }//todo: probably not needed (broken anyways)
// else if (widget.coin == Coin.epicCash) {
// final int secondsSinceEpoch =
// DateTime.now().millisecondsSinceEpoch ~/ 1000;
// const int epicCashFirstBlock = 1565370278;
// const double overestimateSecondsPerBlock = 61;
// int chosenSeconds = secondsSinceEpoch - epicCashFirstBlock;
// int approximateHeight = chosenSeconds ~/ overestimateSecondsPerBlock;
// /
// // debugPrint(
// // "approximate height: $approximateHeight chosen_seconds: $chosenSeconds");
// height = approximateHeight;
// if (height < 0) {
// height = 0;
// }
//
// otherDataJsonString = jsonEncode(
// {
// WalletInfoKeys.epiccashData: jsonEncode(
// ExtraEpiccashWalletInfo(
// receivingIndex: 0,
// changeIndex: 0,
// slatesToAddresses: {},
// slatesToCommits: {},
// lastScannedBlock: epicCashFirstBlock,
// restoreHeight: height,
// creationHeight: height,
// ).toMap(),
// ),
// },
// );
} else if (widget.coin ==
Coin.firo) {
otherDataJsonString = jsonEncode(
{
WalletInfoKeys
.lelantusCoinIsarRescanRequired:
false,
},
);
}
final info = WalletInfo.createNew(
coin: widget.coin,
name: widget.walletName,
otherDataJsonString:
otherDataJsonString,
); );
var node = ref var node = ref
.read(nodeServiceChangeNotifierProvider) .read(
nodeServiceChangeNotifierProvider)
.getPrimaryNodeFor(coin: coin); .getPrimaryNodeFor(coin: coin);
if (node == null) { if (node == null) {
node = DefaultNodes.getNodeFor(coin); node =
DefaultNodes.getNodeFor(coin);
await ref await ref
.read( .read(
nodeServiceChangeNotifierProvider) nodeServiceChangeNotifierProvider)
@ -496,8 +549,8 @@ class _NewWalletRecoveryPhraseWarningViewState
String? mnemonic; String? mnemonic;
String? privateKey; String? privateKey;
wordCount = wordCount = Constants
Constants.defaultSeedPhraseLengthFor( .defaultSeedPhraseLengthFor(
coin: info.coin, coin: info.coin,
); );
@ -508,18 +561,22 @@ class _NewWalletRecoveryPhraseWarningViewState
// own mnemonic generation // own mnemonic generation
} else if (wordCount > 0) { } else if (wordCount > 0) {
if (ref if (ref
.read(pNewWalletOptions.state) .read(pNewWalletOptions
.state)
.state != .state !=
null) { null) {
if (coin.hasMnemonicPassphraseSupport) { if (coin
.hasMnemonicPassphraseSupport) {
mnemonicPassphrase = ref mnemonicPassphrase = ref
.read(pNewWalletOptions.state) .read(pNewWalletOptions
.state)
.state! .state!
.mnemonicPassphrase; .mnemonicPassphrase;
} else {} } else {}
wordCount = ref wordCount = ref
.read(pNewWalletOptions.state) .read(
pNewWalletOptions.state)
.state! .state!
.mnemonicWordsCount; .mnemonicWordsCount;
} else { } else {
@ -529,10 +586,12 @@ class _NewWalletRecoveryPhraseWarningViewState
if (wordCount < 12 || if (wordCount < 12 ||
24 < wordCount || 24 < wordCount ||
wordCount % 3 != 0) { wordCount % 3 != 0) {
throw Exception("Invalid word count"); throw Exception(
"Invalid word count");
} }
final strength = (wordCount ~/ 3) * 32; final strength =
(wordCount ~/ 3) * 32;
mnemonic = bip39.generateMnemonic( mnemonic = bip39.generateMnemonic(
strength: strength, strength: strength,
@ -546,9 +605,10 @@ class _NewWalletRecoveryPhraseWarningViewState
ref.read(secureStoreProvider), ref.read(secureStoreProvider),
nodeService: ref.read( nodeService: ref.read(
nodeServiceChangeNotifierProvider), nodeServiceChangeNotifierProvider),
prefs: prefs: ref.read(
ref.read(prefsChangeNotifierProvider), prefsChangeNotifierProvider),
mnemonicPassphrase: mnemonicPassphrase, mnemonicPassphrase:
mnemonicPassphrase,
mnemonic: mnemonic, mnemonic: mnemonic,
privateKey: privateKey, privateKey: privateKey,
); );
@ -561,41 +621,53 @@ class _NewWalletRecoveryPhraseWarningViewState
} }
// set checkbox back to unchecked to annoy users to agree again :P // set checkbox back to unchecked to annoy users to agree again :P
ref ref
.read(checkBoxStateProvider.state) .read(
checkBoxStateProvider.state)
.state = false; .state = false;
if (mounted) { if (mounted) {
unawaited(Navigator.of(context).pushNamed( unawaited(Navigator.of(context)
NewWalletRecoveryPhraseView.routeName, .pushNamed(
NewWalletRecoveryPhraseView
.routeName,
arguments: Tuple2( arguments: Tuple2(
wallet, wallet,
await (wallet as MnemonicInterface) await (wallet
as MnemonicInterface)
.getMnemonicAsWords(), .getMnemonicAsWords(),
), ),
)); ));
} }
} catch (e, s) { } catch (e, s) {
Logging.instance Logging.instance.log("$e\n$s",
.log("$e\n$s", level: LogLevel.Fatal); level: LogLevel.Fatal);
// TODO: handle gracefully // TODO: handle gracefully
// any network/socket exception here will break new wallet creation // any network/socket exception here will break new wallet creation
rethrow; rethrow;
} }
} }
: null, : null,
style: ref.read(checkBoxStateProvider.state).state style: ref
.read(checkBoxStateProvider.state)
.state
? Theme.of(context) ? Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.getPrimaryEnabledButtonStyle(context) .getPrimaryEnabledButtonStyle(context)
: Theme.of(context) : Theme.of(context)
.extension<StackColors>()! .extension<StackColors>()!
.getPrimaryDisabledButtonStyle(context), .getPrimaryDisabledButtonStyle(
context),
child: Text( child: Text(
"View recovery phrase", "View recovery phrase",
style: isDesktop style: isDesktop
? ref.read(checkBoxStateProvider.state).state ? ref
? STextStyles.desktopButtonEnabled(context) .read(
: STextStyles.desktopButtonDisabled(context) checkBoxStateProvider.state)
.state
? STextStyles.desktopButtonEnabled(
context)
: STextStyles.desktopButtonDisabled(
context)
: STextStyles.button(context), : STextStyles.button(context),
), ),
), ),
@ -605,13 +677,17 @@ class _NewWalletRecoveryPhraseWarningViewState
}, },
), ),
), ),
if (isDesktop) /*if (isDesktop)
const Spacer( const Spacer(
flex: 15, flex: 15,
), ),*/
], ],
), ),
), ),
),
),
),
),
); );
} }
} }

6
lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
View file

@ -250,6 +250,12 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
), ),
}, },
); );
} else if (widget.coin == Coin.firo) {
otherDataJsonString = jsonEncode(
{
WalletInfoKeys.lelantusCoinIsarRescanRequired: false,
},
);
} }
// TODO: do actual check to make sure it is a valid mnemonic for monero // TODO: do actual check to make sure it is a valid mnemonic for monero

2
lib/pages/exchange_view/exchange_step_views/step_4_view.dart
View file

@ -138,7 +138,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
Future<bool?> _showSendFromFiroBalanceSelectSheet(String walletId) async { Future<bool?> _showSendFromFiroBalanceSelectSheet(String walletId) async {
final coin = ref.read(pWalletCoin(walletId)); final coin = ref.read(pWalletCoin(walletId));
final balancePublic = ref.read(pWalletBalance(walletId)); final balancePublic = ref.read(pWalletBalance(walletId));
final balancePrivate = ref.read(pWalletBalanceSecondary(walletId)); final balancePrivate = ref.read(pWalletBalanceTertiary(walletId));
return await showModalBottomSheet<bool?>( return await showModalBottomSheet<bool?>(
context: context, context: context,

5
lib/pages/wallets_view/sub_widgets/favorite_card.dart
View file

@ -198,6 +198,11 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
pWalletBalanceSecondary(walletId), pWalletBalanceSecondary(walletId),
) )
.total; .total;
total += ref
.watch(
pWalletBalanceTertiary(walletId),
)
.total;
} }
Amount fiatTotal = Amount.zero; Amount fiatTotal = Amount.zero;

1
lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
View file

@ -294,6 +294,7 @@ class _BalanceDisplay extends ConsumerWidget {
Amount total = ref.watch(pWalletBalance(walletId)).total; Amount total = ref.watch(pWalletBalance(walletId)).total;
if (coin == Coin.firo || coin == Coin.firoTestNet) { if (coin == Coin.firo || coin == Coin.firoTestNet) {
total += ref.watch(pWalletBalanceSecondary(walletId)).total; total += ref.watch(pWalletBalanceSecondary(walletId)).total;
total += ref.watch(pWalletBalanceTertiary(walletId)).total;
} }
return Text( return Text(

3
lib/wallets/crypto_currency/coins/bitcoincash.dart
View file

@ -192,7 +192,8 @@ class Bitcoincash extends Bip39HDCurrency {
addr = cashAddr.split(":").last; addr = cashAddr.split(":").last;
} }
return addr.startsWith("q") || addr.startsWith("p"); return addr.startsWith("q") /*|| addr.startsWith("p")*/;
// Do not validate "p" (P2SH) addresses.
} }
@override @override

158
lib/wallets/wallet/impl/monero_wallet.dart
View file

@ -37,7 +37,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Address addressFor({required int index, int account = 0}) { Address addressFor({required int index, int account = 0}) {
String address = (cwWalletBase as MoneroWalletBase) String address = (CwBasedInterface.cwWalletBase as MoneroWalletBase)
.getTransactionAddress(account, index); .getTransactionAddress(account, index);
final newReceivingAddress = Address( final newReceivingAddress = Address(
@ -55,14 +55,20 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<void> exitCwWallet() async { Future<void> exitCwWallet() async {
(cwWalletBase as MoneroWalletBase?)?.onNewBlock = null; (CwBasedInterface.cwWalletBase as MoneroWalletBase?)?.onNewBlock = null;
(cwWalletBase as MoneroWalletBase?)?.onNewTransaction = null; (CwBasedInterface.cwWalletBase as MoneroWalletBase?)?.onNewTransaction =
(cwWalletBase as MoneroWalletBase?)?.syncStatusChanged = null; null;
await (cwWalletBase as MoneroWalletBase?)?.save(prioritySave: true); (CwBasedInterface.cwWalletBase as MoneroWalletBase?)?.syncStatusChanged =
null;
await (CwBasedInterface.cwWalletBase as MoneroWalletBase?)
?.save(prioritySave: true);
} }
@override @override
Future<void> open() async { Future<void> open() async {
// await any previous exit
await CwBasedInterface.exitMutex.protect(() async {});
String? password; String? password;
try { try {
password = await cwKeysStorage.getWalletPassword(walletName: walletId); password = await cwKeysStorage.getWalletPassword(walletName: walletId);
@ -70,28 +76,32 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
throw Exception("Password not found $e, $s"); throw Exception("Password not found $e, $s");
} }
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
cwWalletBase = (await cwWalletService!.openWallet(walletId, password)) CwBasedInterface.cwWalletBase = (await CwBasedInterface.cwWalletService!
as MoneroWalletBase; .openWallet(walletId, password)) as MoneroWalletBase;
(cwWalletBase as MoneroWalletBase?)?.onNewBlock = onNewBlock; (CwBasedInterface.cwWalletBase as MoneroWalletBase?)?.onNewBlock =
(cwWalletBase as MoneroWalletBase?)?.onNewTransaction = onNewTransaction; onNewBlock;
(cwWalletBase as MoneroWalletBase?)?.syncStatusChanged = syncStatusChanged; (CwBasedInterface.cwWalletBase as MoneroWalletBase?)?.onNewTransaction =
onNewTransaction;
(CwBasedInterface.cwWalletBase as MoneroWalletBase?)?.syncStatusChanged =
syncStatusChanged;
await updateNode(); await updateNode();
await cwWalletBase?.startSync(); await CwBasedInterface.cwWalletBase?.startSync();
unawaited(refresh()); unawaited(refresh());
autoSaveTimer?.cancel(); autoSaveTimer?.cancel();
autoSaveTimer = Timer.periodic( autoSaveTimer = Timer.periodic(
const Duration(seconds: 193), const Duration(seconds: 193),
(_) async => await cwWalletBase?.save(), (_) async => await CwBasedInterface.cwWalletBase?.save(),
); );
} }
@override @override
Future<Amount> estimateFeeFor(Amount amount, int feeRate) async { Future<Amount> estimateFeeFor(Amount amount, int feeRate) async {
if (cwWalletBase == null || cwWalletBase?.syncStatus is! SyncedSyncStatus) { if (CwBasedInterface.cwWalletBase == null ||
CwBasedInterface.cwWalletBase?.syncStatus is! SyncedSyncStatus) {
return Amount.zeroWith( return Amount.zeroWith(
fractionDigits: cryptoCurrency.fractionDigits, fractionDigits: cryptoCurrency.fractionDigits,
); );
@ -119,7 +129,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
int approximateFee = 0; int approximateFee = 0;
await estimateFeeMutex.protect(() async { await estimateFeeMutex.protect(() async {
approximateFee = cwWalletBase!.calculateEstimatedFee( approximateFee = CwBasedInterface.cwWalletBase!.calculateEstimatedFee(
priority, priority,
amount.raw.toInt(), amount.raw.toInt(),
); );
@ -133,7 +143,9 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<bool> pingCheck() async { Future<bool> pingCheck() async {
return await (cwWalletBase as MoneroWalletBase?)?.isConnected() ?? false; return await (CwBasedInterface.cwWalletBase as MoneroWalletBase?)
?.isConnected() ??
false;
} }
@override @override
@ -141,7 +153,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
final node = getCurrentNode(); final node = getCurrentNode();
final host = Uri.parse(node.host).host; final host = Uri.parse(node.host).host;
await cwWalletBase?.connectToNode( await CwBasedInterface.cwWalletBase?.connectToNode(
node: Node( node: Node(
uri: "$host:${node.port}", uri: "$host:${node.port}",
type: WalletType.monero, type: WalletType.monero,
@ -152,9 +164,15 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<void> updateTransactions() async { Future<void> updateTransactions() async {
await (cwWalletBase as MoneroWalletBase?)?.updateTransactions(); final base = (CwBasedInterface.cwWalletBase as MoneroWalletBase?);
final transactions =
(cwWalletBase as MoneroWalletBase?)?.transactionHistory?.transactions; if (base == null ||
base.walletInfo.name != walletId ||
CwBasedInterface.exitMutex.isLocked) {
return;
}
await base.updateTransactions();
final transactions = base.transactionHistory?.transactions;
// final cachedTransactions = // final cachedTransactions =
// DB.instance.get<dynamic>(boxName: walletId, key: 'latest_tx_model') // DB.instance.get<dynamic>(boxName: walletId, key: 'latest_tx_model')
@ -198,7 +216,8 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
final addressInfo = tx.value.additionalInfo; final addressInfo = tx.value.additionalInfo;
final addressString = final addressString =
(cwWalletBase as MoneroWalletBase?)?.getTransactionAddress( (CwBasedInterface.cwWalletBase as MoneroWalletBase?)
?.getTransactionAddress(
addressInfo!['accountIndex'] as int, addressInfo!['accountIndex'] as int,
addressInfo['addressIndex'] as int, addressInfo['addressIndex'] as int,
); );
@ -244,15 +263,42 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
} }
} }
await mainDB.addNewTransactionData(txnsData, walletId); await mainDB.isar.writeTxn(() async {
await mainDB.isar.transactions
.where()
.walletIdEqualTo(walletId)
.deleteAll();
for (final data in txnsData) {
final tx = data.item1;
// save transaction
await mainDB.isar.transactions.put(tx);
if (data.item2 != null) {
final address = await mainDB.getAddress(walletId, data.item2!.value);
// check if address exists in db and add if it does not
if (address == null) {
await mainDB.isar.addresses.put(data.item2!);
}
// link and save address
tx.address.value = address ?? data.item2!;
await tx.address.save();
}
}
});
} }
@override @override
Future<void> init({bool? isRestore}) async { Future<void> init({bool? isRestore}) async {
cwWalletService = xmr_dart.monero await CwBasedInterface.exitMutex.protect(() async {});
CwBasedInterface.cwWalletService = xmr_dart.monero
.createMoneroWalletService(DB.instance.moneroWalletInfoBox); .createMoneroWalletService(DB.instance.moneroWalletInfoBox);
if (!(await cwWalletService!.isWalletExit(walletId)) && isRestore != true) { if (!(await CwBasedInterface.cwWalletService!.isWalletExit(walletId)) &&
isRestore != true) {
WalletInfo walletInfo; WalletInfo walletInfo;
WalletCredentials credentials; WalletCredentials credentials;
try { try {
@ -280,7 +326,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
final _walletCreationService = WalletCreationService( final _walletCreationService = WalletCreationService(
secureStorage: secureStorageInterface, secureStorage: secureStorageInterface,
walletService: cwWalletService, walletService: CwBasedInterface.cwWalletService,
keyService: cwKeysStorage, keyService: cwKeysStorage,
); );
_walletCreationService.type = WalletType.monero; _walletCreationService.type = WalletType.monero;
@ -316,7 +362,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
wallet.close(); wallet.close();
} catch (e, s) { } catch (e, s) {
Logging.instance.log("$e\n$s", level: LogLevel.Fatal); Logging.instance.log("$e\n$s", level: LogLevel.Fatal);
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
} }
await updateNode(); await updateNode();
} }
@ -326,14 +372,17 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<void> recover({required bool isRescan}) async { Future<void> recover({required bool isRescan}) async {
await CwBasedInterface.exitMutex.protect(() async {});
if (isRescan) { if (isRescan) {
await refreshMutex.protect(() async { await refreshMutex.protect(() async {
// clear blockchain info // clear blockchain info
await mainDB.deleteWalletBlockchainData(walletId); await mainDB.deleteWalletBlockchainData(walletId);
var restoreHeight = cwWalletBase?.walletInfo.restoreHeight; var restoreHeight =
CwBasedInterface.cwWalletBase?.walletInfo.restoreHeight;
highestPercentCached = 0; highestPercentCached = 0;
await cwWalletBase?.rescan(height: restoreHeight ?? 0); await CwBasedInterface.cwWalletBase?.rescan(height: restoreHeight ?? 0);
}); });
unawaited(refresh()); unawaited(refresh());
return; return;
@ -355,7 +404,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
isar: mainDB.isar, isar: mainDB.isar,
); );
cwWalletService = xmr_dart.monero CwBasedInterface.cwWalletService = xmr_dart.monero
.createMoneroWalletService(DB.instance.moneroWalletInfoBox); .createMoneroWalletService(DB.instance.moneroWalletInfoBox);
WalletInfo walletInfo; WalletInfo walletInfo;
WalletCredentials credentials; WalletCredentials credentials;
@ -385,7 +434,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
final cwWalletCreationService = WalletCreationService( final cwWalletCreationService = WalletCreationService(
secureStorage: secureStorageInterface, secureStorage: secureStorageInterface,
walletService: cwWalletService, walletService: CwBasedInterface.cwWalletService,
keyService: cwKeysStorage, keyService: cwKeysStorage,
); );
cwWalletCreationService.type = WalletType.monero; cwWalletCreationService.type = WalletType.monero;
@ -395,15 +444,33 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
walletInfo.address = wallet.walletAddresses.address; walletInfo.address = wallet.walletAddresses.address;
await DB.instance await DB.instance
.add<WalletInfo>(boxName: WalletInfo.boxName, value: walletInfo); .add<WalletInfo>(boxName: WalletInfo.boxName, value: walletInfo);
cwWalletBase?.close(); if (walletInfo.address != null) {
cwWalletBase = wallet as MoneroWalletBase; final newReceivingAddress = await getCurrentReceivingAddress() ??
Address(
walletId: walletId,
derivationIndex: 0,
derivationPath: null,
value: walletInfo.address!,
publicKey: [],
type: AddressType.cryptonote,
subType: AddressSubType.receiving,
);
await mainDB.updateOrPutAddresses([newReceivingAddress]);
await info.updateReceivingAddress(
newAddress: newReceivingAddress.value,
isar: mainDB.isar,
);
}
CwBasedInterface.cwWalletBase?.close();
CwBasedInterface.cwWalletBase = wallet as MoneroWalletBase;
} catch (e, s) { } catch (e, s) {
Logging.instance.log("$e\n$s", level: LogLevel.Fatal); Logging.instance.log("$e\n$s", level: LogLevel.Fatal);
} }
await updateNode(); await updateNode();
await cwWalletBase?.rescan(height: credentials.height); await CwBasedInterface.cwWalletBase?.rescan(height: credentials.height);
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
} catch (e, s) { } catch (e, s) {
Logging.instance.log( Logging.instance.log(
"Exception rethrown from recoverFromMnemonic(): $e\n$s", "Exception rethrown from recoverFromMnemonic(): $e\n$s",
@ -445,7 +512,7 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
List<monero_output.Output> outputs = []; List<monero_output.Output> outputs = [];
for (final recipient in txData.recipients!) { for (final recipient in txData.recipients!) {
final output = monero_output.Output(cwWalletBase!); final output = monero_output.Output(CwBasedInterface.cwWalletBase!);
output.address = recipient.address; output.address = recipient.address;
output.sendAll = isSendAll; output.sendAll = isSendAll;
String amountToSend = recipient.amount.decimal.toString(); String amountToSend = recipient.amount.decimal.toString();
@ -460,7 +527,8 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
); );
await prepareSendMutex.protect(() async { await prepareSendMutex.protect(() async {
awaitPendingTransaction = cwWalletBase!.createTransaction(tmp); awaitPendingTransaction =
CwBasedInterface.cwWalletBase!.createTransaction(tmp);
}); });
} catch (e, s) { } catch (e, s) {
Logging.instance.log("Exception rethrown from prepareSend(): $e\n$s", Logging.instance.log("Exception rethrown from prepareSend(): $e\n$s",
@ -519,9 +587,13 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<Amount> get availableBalance async { Future<Amount> get availableBalance async {
try { try {
if (CwBasedInterface.exitMutex.isLocked) {
throw Exception("Exit in progress");
}
int runningBalance = 0; int runningBalance = 0;
for (final entry for (final entry in (CwBasedInterface.cwWalletBase as MoneroWalletBase?)!
in (cwWalletBase as MoneroWalletBase?)!.balance!.entries) { .balance!
.entries) {
runningBalance += entry.value.unlockedBalance; runningBalance += entry.value.unlockedBalance;
} }
return Amount( return Amount(
@ -536,8 +608,13 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<Amount> get totalBalance async { Future<Amount> get totalBalance async {
try { try {
if (CwBasedInterface.exitMutex.isLocked) {
throw Exception("Exit in progress");
}
final balanceEntries = final balanceEntries =
(cwWalletBase as MoneroWalletBase?)?.balance?.entries; (CwBasedInterface.cwWalletBase as MoneroWalletBase?)
?.balance
?.entries;
if (balanceEntries != null) { if (balanceEntries != null) {
int bal = 0; int bal = 0;
for (var element in balanceEntries) { for (var element in balanceEntries) {
@ -548,7 +625,8 @@ class MoneroWallet extends CryptonoteWallet with CwBasedInterface {
fractionDigits: cryptoCurrency.fractionDigits, fractionDigits: cryptoCurrency.fractionDigits,
); );
} else { } else {
final transactions = (cwWalletBase as MoneroWalletBase?)! final transactions =
(CwBasedInterface.cwWalletBase as MoneroWalletBase?)!
.transactionHistory! .transactionHistory!
.transactions; .transactions;
int transactionBalance = 0; int transactionBalance = 0;

159
lib/wallets/wallet/impl/wownero_wallet.dart
View file

@ -39,7 +39,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Address addressFor({required int index, int account = 0}) { Address addressFor({required int index, int account = 0}) {
String address = (cwWalletBase as WowneroWalletBase) String address = (CwBasedInterface.cwWalletBase as WowneroWalletBase)
.getTransactionAddress(account, index); .getTransactionAddress(account, index);
final newReceivingAddress = Address( final newReceivingAddress = Address(
@ -57,7 +57,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<Amount> estimateFeeFor(Amount amount, int feeRate) async { Future<Amount> estimateFeeFor(Amount amount, int feeRate) async {
if (cwWalletBase == null || cwWalletBase?.syncStatus is! SyncedSyncStatus) { if (CwBasedInterface.cwWalletBase == null ||
CwBasedInterface.cwWalletBase?.syncStatus is! SyncedSyncStatus) {
return Amount.zeroWith( return Amount.zeroWith(
fractionDigits: cryptoCurrency.fractionDigits, fractionDigits: cryptoCurrency.fractionDigits,
); );
@ -112,7 +113,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
// unsure why this delay? // unsure why this delay?
await Future<void>.delayed(const Duration(milliseconds: 500)); await Future<void>.delayed(const Duration(milliseconds: 500));
} catch (e) { } catch (e) {
approximateFee = cwWalletBase!.calculateEstimatedFee( approximateFee = CwBasedInterface.cwWalletBase!.calculateEstimatedFee(
priority, priority,
amount.raw.toInt(), amount.raw.toInt(),
); );
@ -132,7 +133,9 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<bool> pingCheck() async { Future<bool> pingCheck() async {
return await (cwWalletBase as WowneroWalletBase?)?.isConnected() ?? false; return await (CwBasedInterface.cwWalletBase as WowneroWalletBase?)
?.isConnected() ??
false;
} }
@override @override
@ -140,7 +143,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
final node = getCurrentNode(); final node = getCurrentNode();
final host = Uri.parse(node.host).host; final host = Uri.parse(node.host).host;
await cwWalletBase?.connectToNode( await CwBasedInterface.cwWalletBase?.connectToNode(
node: Node( node: Node(
uri: "$host:${node.port}", uri: "$host:${node.port}",
type: WalletType.wownero, type: WalletType.wownero,
@ -151,9 +154,15 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<void> updateTransactions() async { Future<void> updateTransactions() async {
await (cwWalletBase as WowneroWalletBase?)?.updateTransactions(); final base = (CwBasedInterface.cwWalletBase as WowneroWalletBase?);
final transactions =
(cwWalletBase as WowneroWalletBase?)?.transactionHistory?.transactions; if (base == null ||
base.walletInfo.name != walletId ||
CwBasedInterface.exitMutex.isLocked) {
return;
}
await base.updateTransactions();
final transactions = base.transactionHistory?.transactions;
// final cachedTransactions = // final cachedTransactions =
// DB.instance.get<dynamic>(boxName: walletId, key: 'latest_tx_model') // DB.instance.get<dynamic>(boxName: walletId, key: 'latest_tx_model')
@ -197,7 +206,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
final addressInfo = tx.value.additionalInfo; final addressInfo = tx.value.additionalInfo;
final addressString = final addressString =
(cwWalletBase as WowneroWalletBase?)?.getTransactionAddress( (CwBasedInterface.cwWalletBase as WowneroWalletBase?)
?.getTransactionAddress(
addressInfo!['accountIndex'] as int, addressInfo!['accountIndex'] as int,
addressInfo['addressIndex'] as int, addressInfo['addressIndex'] as int,
); );
@ -243,15 +253,41 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
} }
} }
await mainDB.addNewTransactionData(txnsData, walletId); await mainDB.isar.writeTxn(() async {
await mainDB.isar.transactions
.where()
.walletIdEqualTo(walletId)
.deleteAll();
for (final data in txnsData) {
final tx = data.item1;
// save transaction
await mainDB.isar.transactions.put(tx);
if (data.item2 != null) {
final address = await mainDB.getAddress(walletId, data.item2!.value);
// check if address exists in db and add if it does not
if (address == null) {
await mainDB.isar.addresses.put(data.item2!);
}
// link and save address
tx.address.value = address ?? data.item2!;
await tx.address.save();
}
}
});
} }
@override @override
Future<void> init({bool? isRestore}) async { Future<void> init({bool? isRestore}) async {
cwWalletService = wow_dart.wownero await CwBasedInterface.exitMutex.protect(() async {});
CwBasedInterface.cwWalletService = wow_dart.wownero
.createWowneroWalletService(DB.instance.moneroWalletInfoBox); .createWowneroWalletService(DB.instance.moneroWalletInfoBox);
if (!(await cwWalletService!.isWalletExit(walletId)) && isRestore != true) { if (!(await CwBasedInterface.cwWalletService!.isWalletExit(walletId)) &&
isRestore != true) {
WalletInfo walletInfo; WalletInfo walletInfo;
WalletCredentials credentials; WalletCredentials credentials;
try { try {
@ -280,7 +316,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
final _walletCreationService = WalletCreationService( final _walletCreationService = WalletCreationService(
secureStorage: secureStorageInterface, secureStorage: secureStorageInterface,
walletService: cwWalletService, walletService: CwBasedInterface.cwWalletService,
keyService: cwKeysStorage, keyService: cwKeysStorage,
); );
// _walletCreationService.changeWalletType(); // _walletCreationService.changeWalletType();
@ -321,7 +357,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
wallet.close(); wallet.close();
} catch (e, s) { } catch (e, s) {
Logging.instance.log("$e\n$s", level: LogLevel.Fatal); Logging.instance.log("$e\n$s", level: LogLevel.Fatal);
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
} }
await updateNode(); await updateNode();
} }
@ -331,6 +367,9 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<void> open() async { Future<void> open() async {
// await any previous exit
await CwBasedInterface.exitMutex.protect(() async {});
String? password; String? password;
try { try {
password = await cwKeysStorage.getWalletPassword(walletName: walletId); password = await cwKeysStorage.getWalletPassword(walletName: walletId);
@ -338,43 +377,52 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
throw Exception("Password not found $e, $s"); throw Exception("Password not found $e, $s");
} }
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
cwWalletBase = (await cwWalletService!.openWallet(walletId, password)) CwBasedInterface.cwWalletBase = (await CwBasedInterface.cwWalletService!
as WowneroWalletBase; .openWallet(walletId, password)) as WowneroWalletBase;
(cwWalletBase as WowneroWalletBase?)?.onNewBlock = onNewBlock; (CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.onNewBlock =
(cwWalletBase as WowneroWalletBase?)?.onNewTransaction = onNewTransaction; onNewBlock;
(cwWalletBase as WowneroWalletBase?)?.syncStatusChanged = syncStatusChanged; (CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.onNewTransaction =
onNewTransaction;
(CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.syncStatusChanged =
syncStatusChanged;
await updateNode(); await updateNode();
await (cwWalletBase as WowneroWalletBase?)?.startSync(); await (CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.startSync();
unawaited(refresh()); unawaited(refresh());
autoSaveTimer?.cancel(); autoSaveTimer?.cancel();
autoSaveTimer = Timer.periodic( autoSaveTimer = Timer.periodic(
const Duration(seconds: 193), const Duration(seconds: 193),
(_) async => await cwWalletBase?.save(), (_) async => await CwBasedInterface.cwWalletBase?.save(),
); );
} }
@override @override
Future<void> exitCwWallet() async { Future<void> exitCwWallet() async {
(cwWalletBase as WowneroWalletBase?)?.onNewBlock = null; (CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.onNewBlock = null;
(cwWalletBase as WowneroWalletBase?)?.onNewTransaction = null; (CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.onNewTransaction =
(cwWalletBase as WowneroWalletBase?)?.syncStatusChanged = null; null;
await (cwWalletBase as WowneroWalletBase?)?.save(prioritySave: true); (CwBasedInterface.cwWalletBase as WowneroWalletBase?)?.syncStatusChanged =
null;
await (CwBasedInterface.cwWalletBase as WowneroWalletBase?)
?.save(prioritySave: true);
} }
@override @override
Future<void> recover({required bool isRescan}) async { Future<void> recover({required bool isRescan}) async {
await CwBasedInterface.exitMutex.protect(() async {});
if (isRescan) { if (isRescan) {
await refreshMutex.protect(() async { await refreshMutex.protect(() async {
// clear blockchain info // clear blockchain info
await mainDB.deleteWalletBlockchainData(walletId); await mainDB.deleteWalletBlockchainData(walletId);
var restoreHeight = cwWalletBase?.walletInfo.restoreHeight; var restoreHeight =
CwBasedInterface.cwWalletBase?.walletInfo.restoreHeight;
highestPercentCached = 0; highestPercentCached = 0;
await cwWalletBase?.rescan(height: restoreHeight ?? 0); await CwBasedInterface.cwWalletBase?.rescan(height: restoreHeight ?? 0);
}); });
unawaited(refresh()); unawaited(refresh());
return; return;
@ -402,7 +450,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
// await DB.instance // await DB.instance
// .put<dynamic>(boxName: walletId, key: "restoreHeight", value: height); // .put<dynamic>(boxName: walletId, key: "restoreHeight", value: height);
cwWalletService = wow_dart.wownero CwBasedInterface.cwWalletService = wow_dart.wownero
.createWowneroWalletService(DB.instance.moneroWalletInfoBox); .createWowneroWalletService(DB.instance.moneroWalletInfoBox);
WalletInfo walletInfo; WalletInfo walletInfo;
WalletCredentials credentials; WalletCredentials credentials;
@ -432,7 +480,7 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
final cwWalletCreationService = WalletCreationService( final cwWalletCreationService = WalletCreationService(
secureStorage: secureStorageInterface, secureStorage: secureStorageInterface,
walletService: cwWalletService, walletService: CwBasedInterface.cwWalletService,
keyService: cwKeysStorage, keyService: cwKeysStorage,
); );
cwWalletCreationService.type = WalletType.wownero; cwWalletCreationService.type = WalletType.wownero;
@ -442,15 +490,33 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
walletInfo.address = wallet.walletAddresses.address; walletInfo.address = wallet.walletAddresses.address;
await DB.instance await DB.instance
.add<WalletInfo>(boxName: WalletInfo.boxName, value: walletInfo); .add<WalletInfo>(boxName: WalletInfo.boxName, value: walletInfo);
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
cwWalletBase = wallet; CwBasedInterface.cwWalletBase = wallet;
if (walletInfo.address != null) {
final newReceivingAddress = await getCurrentReceivingAddress() ??
Address(
walletId: walletId,
derivationIndex: 0,
derivationPath: null,
value: walletInfo.address!,
publicKey: [],
type: AddressType.cryptonote,
subType: AddressSubType.receiving,
);
await mainDB.updateOrPutAddresses([newReceivingAddress]);
await info.updateReceivingAddress(
newAddress: newReceivingAddress.value,
isar: mainDB.isar,
);
}
} catch (e, s) { } catch (e, s) {
Logging.instance.log("$e\n$s", level: LogLevel.Fatal); Logging.instance.log("$e\n$s", level: LogLevel.Fatal);
} }
await updateNode(); await updateNode();
await cwWalletBase?.rescan(height: credentials.height); await CwBasedInterface.cwWalletBase?.rescan(height: credentials.height);
cwWalletBase?.close(); CwBasedInterface.cwWalletBase?.close();
} catch (e, s) { } catch (e, s) {
Logging.instance.log( Logging.instance.log(
"Exception rethrown from recoverFromMnemonic(): $e\n$s", "Exception rethrown from recoverFromMnemonic(): $e\n$s",
@ -492,7 +558,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
List<wownero_output.Output> outputs = []; List<wownero_output.Output> outputs = [];
for (final recipient in txData.recipients!) { for (final recipient in txData.recipients!) {
final output = wownero_output.Output(cwWalletBase!); final output =
wownero_output.Output(CwBasedInterface.cwWalletBase!);
output.address = recipient.address; output.address = recipient.address;
output.sendAll = isSendAll; output.sendAll = isSendAll;
String amountToSend = recipient.amount.decimal.toString(); String amountToSend = recipient.amount.decimal.toString();
@ -507,7 +574,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
); );
await prepareSendMutex.protect(() async { await prepareSendMutex.protect(() async {
awaitPendingTransaction = cwWalletBase!.createTransaction(tmp); awaitPendingTransaction =
CwBasedInterface.cwWalletBase!.createTransaction(tmp);
}); });
} catch (e, s) { } catch (e, s) {
Logging.instance.log("Exception rethrown from prepareSend(): $e\n$s", Logging.instance.log("Exception rethrown from prepareSend(): $e\n$s",
@ -566,9 +634,14 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<Amount> get availableBalance async { Future<Amount> get availableBalance async {
try { try {
if (CwBasedInterface.exitMutex.isLocked) {
throw Exception("Exit in progress");
}
int runningBalance = 0; int runningBalance = 0;
for (final entry for (final entry in (CwBasedInterface.cwWalletBase as WowneroWalletBase?)!
in (cwWalletBase as WowneroWalletBase?)!.balance!.entries) { .balance!
.entries) {
runningBalance += entry.value.unlockedBalance; runningBalance += entry.value.unlockedBalance;
} }
return Amount( return Amount(
@ -583,8 +656,13 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
@override @override
Future<Amount> get totalBalance async { Future<Amount> get totalBalance async {
try { try {
if (CwBasedInterface.exitMutex.isLocked) {
throw Exception("Exit in progress");
}
final balanceEntries = final balanceEntries =
(cwWalletBase as WowneroWalletBase?)?.balance?.entries; (CwBasedInterface.cwWalletBase as WowneroWalletBase?)
?.balance
?.entries;
if (balanceEntries != null) { if (balanceEntries != null) {
int bal = 0; int bal = 0;
for (var element in balanceEntries) { for (var element in balanceEntries) {
@ -595,7 +673,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
fractionDigits: cryptoCurrency.fractionDigits, fractionDigits: cryptoCurrency.fractionDigits,
); );
} else { } else {
final transactions = cwWalletBase!.transactionHistory!.transactions; final transactions =
CwBasedInterface.cwWalletBase!.transactionHistory!.transactions;
int transactionBalance = 0; int transactionBalance = 0;
for (var tx in transactions!.entries) { for (var tx in transactions!.entries) {
if (tx.value.direction == TransactionDirection.incoming) { if (tx.value.direction == TransactionDirection.incoming) {

16
lib/wallets/wallet/intermediate/cryptonote_wallet.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:stackwallet/wallets/crypto_currency/intermediate/cryptonote_currency.dart'; import 'package:stackwallet/wallets/crypto_currency/intermediate/cryptonote_currency.dart';
import 'package:stackwallet/wallets/models/tx_data.dart'; import 'package:stackwallet/wallets/models/tx_data.dart';
import 'package:stackwallet/wallets/wallet/wallet.dart'; import 'package:stackwallet/wallets/wallet/wallet.dart';
@ -7,6 +9,20 @@ abstract class CryptonoteWallet<T extends CryptonoteCurrency> extends Wallet<T>
with MnemonicInterface<T> { with MnemonicInterface<T> {
CryptonoteWallet(T currency) : super(currency); CryptonoteWallet(T currency) : super(currency);
Completer<void>? walletOpenCompleter;
void resetWalletOpenCompleter() {
if (walletOpenCompleter == null || walletOpenCompleter!.isCompleted) {
walletOpenCompleter = Completer<void>();
}
}
Future<void> waitForWalletOpen() async {
if (walletOpenCompleter != null && !walletOpenCompleter!.isCompleted) {
await walletOpenCompleter!.future;
}
}
// ========== Overrides ====================================================== // ========== Overrides ======================================================
@override @override

5
lib/wallets/wallet/wallet.dart
View file

@ -482,6 +482,11 @@ abstract class Wallet<T extends CryptoCurrency> {
), ),
); );
// add some small buffer before making calls.
// this can probably be removed in the future but was added as a
// debugging feature
await Future<void>.delayed(const Duration(milliseconds: 300));
// TODO: [prio=low] handle this differently. Extra modification of this file for coin specific functionality should be avoided. // TODO: [prio=low] handle this differently. Extra modification of this file for coin specific functionality should be avoided.
final Set<String> codesToCheck = {}; final Set<String> codesToCheck = {};
if (this is PaynymInterface) { if (this is PaynymInterface) {

11
lib/wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart
View file

@ -35,8 +35,8 @@ mixin CwBasedInterface<T extends CryptonoteCurrency> on CryptonoteWallet<T>
KeyService get cwKeysStorage => KeyService get cwKeysStorage =>
_cwKeysStorageCached ??= KeyService(secureStorageInterface); _cwKeysStorageCached ??= KeyService(secureStorageInterface);
WalletService? cwWalletService; static WalletService? cwWalletService;
WalletBase? cwWalletBase; static WalletBase? cwWalletBase;
bool _hasCalledExit = false; bool _hasCalledExit = false;
bool _txRefreshLock = false; bool _txRefreshLock = false;
@ -46,7 +46,6 @@ mixin CwBasedInterface<T extends CryptonoteCurrency> on CryptonoteWallet<T>
double highestPercentCached = 0; double highestPercentCached = 0;
Timer? autoSaveTimer; Timer? autoSaveTimer;
Future<String> pathForWalletDir({ Future<String> pathForWalletDir({
required String name, required String name,
required WalletType type, required WalletType type,
@ -297,13 +296,19 @@ mixin CwBasedInterface<T extends CryptonoteCurrency> on CryptonoteWallet<T>
} }
} }
static Mutex exitMutex = Mutex();
@override @override
Future<void> exit() async { Future<void> exit() async {
if (!_hasCalledExit) { if (!_hasCalledExit) {
await exitMutex.protect(() async {
_hasCalledExit = true; _hasCalledExit = true;
autoSaveTimer?.cancel(); autoSaveTimer?.cancel();
await exitCwWallet(); await exitCwWallet();
cwWalletBase?.close(); cwWalletBase?.close();
cwWalletBase = null;
cwWalletService = null;
});
} }
} }

6
lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart
View file

@ -1702,7 +1702,7 @@ mixin ElectrumXInterface<T extends Bip39HDCurrency> on Bip39HDWallet<T> {
try { try {
final features = await electrumXClient final features = await electrumXClient
.getServerFeatures() .getServerFeatures()
.timeout(const Duration(seconds: 4)); .timeout(const Duration(seconds: 5));
Logging.instance.log("features: $features", level: LogLevel.Info); Logging.instance.log("features: $features", level: LogLevel.Info);
@ -1715,8 +1715,8 @@ mixin ElectrumXInterface<T extends Bip39HDCurrency> on Bip39HDWallet<T> {
} catch (e, s) { } catch (e, s) {
// do nothing, still allow user into wallet // do nothing, still allow user into wallet
Logging.instance.log( Logging.instance.log(
"$runtimeType init() failed: $e\n$s", "$runtimeType init() did not complete: $e\n$s",
level: LogLevel.Error, level: LogLevel.Warning,
); );
} }

6
lib/widgets/managed_favorite.dart
View file

@ -51,9 +51,11 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
Amount total = ref.watch(pWalletBalance(walletId)).total; Amount total = ref.watch(pWalletBalance(walletId)).total;
if (coin == Coin.firo || coin == Coin.firoTestNet) { if (coin == Coin.firo || coin == Coin.firoTestNet) {
final balancePrivate = ref.watch(pWalletBalanceSecondary(walletId)); final balancePrivate =
ref.watch(pWalletBalanceSecondary(walletId)).total +
ref.watch(pWalletBalanceTertiary(walletId)).total;
total += balancePrivate.total; total += balancePrivate;
} }
final isFavourite = ref.watch(pWalletIsFavourite(walletId)); final isFavourite = ref.watch(pWalletIsFavourite(walletId));

68
pubspec.lock
View file

@ -29,10 +29,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: ansicolor name: ansicolor
sha256: "607f8fa9786f392043f169898923e6c59b4518242b68b8862eb8a8b7d9c30b4a" sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.1" version: "2.0.2"
archive: archive:
dependency: "direct main" dependency: "direct main"
description: description:
@ -292,10 +292,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.17.1" version: "1.18.0"
connectivity_plus: connectivity_plus:
dependency: "direct main" dependency: "direct main"
description: description:
@ -665,8 +665,8 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: d99c34cbb39666c8dcb819b457b3314577aaad43 ref: fb50031056fbea0326f7dd76ad59d165c1e5eee5
resolved-ref: d99c34cbb39666c8dcb819b457b3314577aaad43 resolved-ref: fb50031056fbea0326f7dd76ad59d165c1e5eee5
url: "https://github.com/cypherstack/flutter_libsparkmobile.git" url: "https://github.com/cypherstack/flutter_libsparkmobile.git"
source: git source: git
version: "0.0.1" version: "0.0.1"
@ -1070,18 +1070,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.12.15" version: "0.12.16"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.2.0" version: "0.5.0"
memoize: memoize:
dependency: transitive dependency: transitive
description: description:
@ -1094,10 +1094,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: meta name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.10.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -1318,10 +1318,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: platform name: platform
sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.0" version: "3.1.2"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -1556,18 +1556,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: source_span name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.1" version: "1.10.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.11.0" version: "1.11.1"
stack_wallet_backup: stack_wallet_backup:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1597,10 +1597,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
stream_transform: stream_transform:
dependency: transitive dependency: transitive
description: description:
@ -1645,26 +1645,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test name: test
sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4" sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.24.1" version: "1.24.9"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.5.1" version: "0.6.1"
test_core: test_core:
dependency: transitive dependency: transitive
description: description:
name: test_core name: test_core
sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93" sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.5.1" version: "0.5.9"
tezart: tezart:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1863,10 +1863,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "11.3.0" version: "11.10.0"
wakelock: wakelock:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1932,6 +1932,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.3.0"
web3dart: web3dart:
dependency: "direct main" dependency: "direct main"
description: description:
@ -2038,5 +2046,5 @@ packages:
source: hosted source: hosted
version: "1.0.0" version: "1.0.0"
sdks: sdks:
dart: ">=3.0.6 <4.0.0" dart: ">=3.2.0-194.0.dev <4.0.0"
flutter: ">=3.10.3" flutter: ">=3.16.0"

6
pubspec.yaml
View file

@ -11,11 +11,11 @@ description: Stack Wallet
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.9.0+199 version: 1.9.2+201
environment: environment:
sdk: ">=3.0.2 <4.0.0" sdk: ">=3.0.2 <4.0.0"
flutter: ^3.10.0 flutter: ^3.16.0
dependencies: dependencies:
flutter: flutter:
@ -30,7 +30,7 @@ dependencies:
flutter_libsparkmobile: flutter_libsparkmobile:
git: git:
url: https://github.com/cypherstack/flutter_libsparkmobile.git url: https://github.com/cypherstack/flutter_libsparkmobile.git
ref: d99c34cbb39666c8dcb819b457b3314577aaad43 ref: fb50031056fbea0326f7dd76ad59d165c1e5eee5
flutter_libmonero: flutter_libmonero:
path: ./crypto_plugins/flutter_libmonero path: ./crypto_plugins/flutter_libmonero

2
scripts/android/build_all.sh
View file

@ -6,7 +6,7 @@ set -e
source ../rust_version.sh source ../rust_version.sh
set_rust_to_1671 set_rust_to_1671
mkdir build mkdir -p build
. ./config.sh . ./config.sh
./install_ndk.sh ./install_ndk.sh

2
scripts/android/install_ndk.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
mkdir build mkdir -p build
. ./config.sh . ./config.sh
TOOLCHAIN_DIR=${WORKDIR}/toolchain TOOLCHAIN_DIR=${WORKDIR}/toolchain
ANDROID_NDK_SHA256="8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c" ANDROID_NDK_SHA256="8381c440fe61fcbb01e209211ac01b519cd6adf51ab1c2281d5daad6ca4c8c8c"

8
test/electrumx_test.dart
View file

@ -985,8 +985,8 @@ void main() {
expect(result, GetUsedSerialsSampleData.serials); expect(result, GetUsedSerialsSampleData.serials);
verify(mockPrefs.wifiOnly).called(1); verify(mockPrefs.wifiOnly).called(3);
verify(mockPrefs.useTor).called(1); verify(mockPrefs.useTor).called(3);
verifyNoMoreInteractions(mockPrefs); verifyNoMoreInteractions(mockPrefs);
}); });
@ -1298,8 +1298,8 @@ void main() {
expect(result, GetUsedSerialsSampleData.serials); expect(result, GetUsedSerialsSampleData.serials);
verify(mockPrefs.wifiOnly).called(1); verify(mockPrefs.wifiOnly).called(3);
verify(mockPrefs.useTor).called(1); verify(mockPrefs.useTor).called(3);
verifyNoMoreInteractions(mockPrefs); verifyNoMoreInteractions(mockPrefs);
}); });

20
test/electrumx_test.mocks.dart
View file

@ -140,20 +140,18 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
)), )),
) as _i5.Future<_i2.JsonRPCResponse>); ) as _i5.Future<_i2.JsonRPCResponse>);
@override @override
_i5.Future<void> disconnect({required String? reason}) => (super.noSuchMethod( _i5.Future<void> disconnect({
required String? reason,
bool? ignoreMutex = false,
}) =>
(super.noSuchMethod(
Invocation.method( Invocation.method(
#disconnect, #disconnect,
[], [],
{#reason: reason}, {
), #reason: reason,
returnValue: _i5.Future<void>.value(), #ignoreMutex: ignoreMutex,
returnValueForMissingStub: _i5.Future<void>.value(), },
) as _i5.Future<void>);
@override
_i5.Future<void> connect() => (super.noSuchMethod(
Invocation.method(
#connect,
[],
), ),
returnValue: _i5.Future<void>.value(), returnValue: _i5.Future<void>.value(),
returnValueForMissingStub: _i5.Future<void>.value(), returnValueForMissingStub: _i5.Future<void>.value(),

8
test/json_rpc_test.dart
View file

@ -55,11 +55,13 @@ void main() {
const jsonRequestString = const jsonRequestString =
'{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}'; '{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}';
expect( await expectLater(
() => jsonRPC.request( jsonRPC.request(
jsonRequestString, jsonRequestString,
const Duration(seconds: 1), const Duration(seconds: 1),
), ),
throwsA(isA<SocketException>())); throwsA(isA<Exception>()
.having((e) => e.toString(), 'message', contains("Request timeout"))),
);
}); });
} }

20
test/widget_tests/desktop/desktop_dialog_close_button_test.dart
View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:mockingjay/mockingjay.dart' as mockingjay;
import 'package:stackwallet/models/isar/stack_theme.dart'; import 'package:stackwallet/models/isar/stack_theme.dart';
import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/themes/stack_colors.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
@ -11,14 +10,13 @@ import '../../sample_data/theme_json.dart';
void main() { void main() {
testWidgets("test DesktopDialog button pressed", (widgetTester) async { testWidgets("test DesktopDialog button pressed", (widgetTester) async {
final key = UniqueKey(); final navigatorKey = GlobalKey<NavigatorState>();
final navigator = mockingjay.MockNavigator();
await widgetTester.pumpWidget( await widgetTester.pumpWidget(
ProviderScope( ProviderScope(
overrides: [], overrides: [],
child: MaterialApp( child: MaterialApp(
navigatorKey: navigatorKey,
theme: ThemeData( theme: ThemeData(
extensions: [ extensions: [
StackColors.fromStackColorTheme( StackColors.fromStackColorTheme(
@ -28,19 +26,19 @@ void main() {
), ),
], ],
), ),
home: mockingjay.MockNavigatorProvider( home: DesktopDialogCloseButton(
navigator: navigator, key: UniqueKey(),
child: DesktopDialogCloseButton(
key: key,
onPressedOverride: null, onPressedOverride: null,
)), ),
), ),
), ),
); );
await widgetTester.tap(find.byType(AppBarIconButton)); final button = find.byType(AppBarIconButton);
await widgetTester.tap(button);
await widgetTester.pumpAndSettle(); await widgetTester.pumpAndSettle();
mockingjay.verify(() => navigator.pop()).called(1); final navigatorState = navigatorKey.currentState;
expect(navigatorState?.overlay, isNotNull);
}); });
} }

78
test/widget_tests/emoji_select_sheet_test.dart
View file

@ -34,43 +34,43 @@ void main() {
expect(find.text("Select emoji"), findsOneWidget); expect(find.text("Select emoji"), findsOneWidget);
}); });
testWidgets("Emoji tapped test", (tester) async { // testWidgets("Emoji tapped test", (tester) async {
const emojiSelectSheet = EmojiSelectSheet(); // const emojiSelectSheet = EmojiSelectSheet();
//
final navigator = mockingjay.MockNavigator(); // final navigator = mockingjay.MockNavigator();
//
await tester.pumpWidget( // await tester.pumpWidget(
ProviderScope( // ProviderScope(
overrides: [], // overrides: [],
child: MaterialApp( // child: MaterialApp(
theme: ThemeData( // theme: ThemeData(
extensions: [ // extensions: [
StackColors.fromStackColorTheme( // StackColors.fromStackColorTheme(
StackTheme.fromJson( // StackTheme.fromJson(
json: lightThemeJsonMap, // json: lightThemeJsonMap,
), // ),
), // ),
], // ],
), // ),
home: mockingjay.MockNavigatorProvider( // home: mockingjay.MockNavigatorProvider(
navigator: navigator, // navigator: navigator,
child: Column( // child: Column(
children: const [ // children: const [
Expanded(child: emojiSelectSheet), // Expanded(child: emojiSelectSheet),
], // ],
), // ),
), // ),
), // ),
), // ),
); // );
//
final gestureDetector = find.byType(GestureDetector).at(5); // final gestureDetector = find.byType(GestureDetector).at(5);
expect(gestureDetector, findsOneWidget); // expect(gestureDetector, findsOneWidget);
//
final emoji = Emoji.byChar("😅"); // final emoji = Emoji.byChar("😅");
//
await tester.tap(gestureDetector); // await tester.tap(gestureDetector);
await tester.pumpAndSettle(); // await tester.pumpAndSettle();
mockingjay.verify(() => navigator.pop(emoji)).called(1); // mockingjay.verify(() => navigator.pop(emoji)).called(1);
}); // });
} }

65
test/widget_tests/node_options_sheet_test.dart
View file

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:mockingjay/mockingjay.dart' as mockingjay;
import 'package:mockito/annotations.dart'; import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:stackwallet/models/isar/stack_theme.dart'; import 'package:stackwallet/models/isar/stack_theme.dart';
@ -15,7 +14,6 @@ import 'package:stackwallet/themes/stack_colors.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/prefs.dart'; import 'package:stackwallet/utilities/prefs.dart';
import 'package:stackwallet/widgets/node_options_sheet.dart'; import 'package:stackwallet/widgets/node_options_sheet.dart';
import 'package:tuple/tuple.dart';
import '../sample_data/theme_json.dart'; import '../sample_data/theme_json.dart';
import 'node_options_sheet_test.mocks.dart'; import 'node_options_sheet_test.mocks.dart';
@ -89,13 +87,14 @@ void main() {
}); });
testWidgets("Details tap", (tester) async { testWidgets("Details tap", (tester) async {
final navigatorKey = GlobalKey<NavigatorState>();
final mockWallets = MockWallets(); final mockWallets = MockWallets();
final mockPrefs = MockPrefs(); final mockPrefs = MockPrefs();
final mockNodeService = MockNodeService(); final mockNodeService = MockNodeService();
final navigator = mockingjay.MockNavigator(); final mockTorService = MockTorService();
when(mockNodeService.getNodeById(id: "node id")).thenAnswer( when(mockNodeService.getNodeById(id: "node id")).thenAnswer(
(realInvocation) => NodeModel( (_) => NodeModel(
host: "127.0.0.1", host: "127.0.0.1",
port: 2000, port: 2000,
name: "Stack Default", name: "Stack Default",
@ -104,33 +103,34 @@ void main() {
enabled: true, enabled: true,
coinName: "Bitcoin", coinName: "Bitcoin",
isFailover: false, isFailover: false,
isDown: false)); isDown: false,
),
);
when(mockNodeService.getPrimaryNodeFor(coin: Coin.bitcoin)).thenAnswer( when(mockNodeService.getPrimaryNodeFor(coin: Coin.bitcoin)).thenAnswer(
(realInvocation) => NodeModel( (_) => NodeModel(
host: "127.0.0.1", host: "127.0.0.1",
port: 2000, port: 2000,
name: "Stack Default", name: "Stack Default",
id: "node id", id: "some node id",
useSSL: true, useSSL: true,
enabled: true, enabled: true,
coinName: "Bitcoin", coinName: "Bitcoin",
isFailover: false, isFailover: false,
isDown: false)); isDown: false,
),
mockingjay );
.when(() => navigator.pushNamed("/nodeDetails",
arguments: const Tuple3(Coin.bitcoin, "node id", "coinNodes")))
.thenAnswer((_) async => {});
await tester.pumpWidget( await tester.pumpWidget(
ProviderScope( ProviderScope(
overrides: [ overrides: [
pWallets.overrideWithValue(mockWallets), pWallets.overrideWithValue(mockWallets),
prefsChangeNotifierProvider.overrideWithValue(mockPrefs), prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService) nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
pTorService.overrideWithValue(mockTorService),
], ],
child: MaterialApp( child: MaterialApp(
navigatorKey: navigatorKey,
theme: ThemeData( theme: ThemeData(
extensions: [ extensions: [
StackColors.fromStackColorTheme( StackColors.fromStackColorTheme(
@ -140,12 +140,17 @@ void main() {
), ),
], ],
), ),
home: mockingjay.MockNavigatorProvider( onGenerateRoute: (settings) {
navigator: navigator, if (settings.name == '/nodeDetails') {
child: const NodeOptionsSheet( return MaterialPageRoute(builder: (_) => Scaffold());
}
return null;
},
home: const NodeOptionsSheet(
nodeId: "node id", nodeId: "node id",
coin: Coin.bitcoin, coin: Coin.bitcoin,
popBackToRoute: "coinNodes")), popBackToRoute: "coinNodes",
),
), ),
), ),
); );
@ -153,11 +158,8 @@ void main() {
await tester.tap(find.text("Details")); await tester.tap(find.text("Details"));
await tester.pumpAndSettle(); await tester.pumpAndSettle();
mockingjay.verify(() => navigator.pop()).called(1); var currentRoute = navigatorKey.currentState?.overlay?.context;
mockingjay expect(currentRoute, isNotNull);
.verify(() => navigator.pushNamed("/nodeDetails",
arguments: const Tuple3(Coin.bitcoin, "node id", "coinNodes")))
.called(1);
}); });
testWidgets("Connect tap", (tester) async { testWidgets("Connect tap", (tester) async {
@ -167,7 +169,7 @@ void main() {
final mockTorService = MockTorService(); final mockTorService = MockTorService();
when(mockNodeService.getNodeById(id: "node id")).thenAnswer( when(mockNodeService.getNodeById(id: "node id")).thenAnswer(
(realInvocation) => NodeModel( (_) => NodeModel(
host: "127.0.0.1", host: "127.0.0.1",
port: 2000, port: 2000,
name: "Stack Default", name: "Stack Default",
@ -176,10 +178,12 @@ void main() {
enabled: true, enabled: true,
coinName: "Bitcoin", coinName: "Bitcoin",
isFailover: false, isFailover: false,
isDown: false)); isDown: false,
),
);
when(mockNodeService.getPrimaryNodeFor(coin: Coin.bitcoin)).thenAnswer( when(mockNodeService.getPrimaryNodeFor(coin: Coin.bitcoin)).thenAnswer(
(realInvocation) => NodeModel( (_) => NodeModel(
host: "127.0.0.1", host: "127.0.0.1",
port: 2000, port: 2000,
name: "Some other node name", name: "Some other node name",
@ -188,7 +192,9 @@ void main() {
enabled: true, enabled: true,
coinName: "Bitcoin", coinName: "Bitcoin",
isFailover: false, isFailover: false,
isDown: false)); isDown: false,
),
);
await tester.pumpWidget( await tester.pumpWidget(
ProviderScope( ProviderScope(
@ -209,7 +215,10 @@ void main() {
], ],
), ),
home: const NodeOptionsSheet( home: const NodeOptionsSheet(
nodeId: "node id", coin: Coin.bitcoin, popBackToRoute: ""), nodeId: "node id",
coin: Coin.bitcoin,
popBackToRoute: "",
),
), ),
), ),
); );

31
test/widget_tests/stack_dialog_test.dart
View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:mockingjay/mockingjay.dart' as mockingjay;
import 'package:stackwallet/models/isar/stack_theme.dart'; import 'package:stackwallet/models/isar/stack_theme.dart';
import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/themes/stack_colors.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -63,11 +62,13 @@ void main() {
}); });
testWidgets("Test StackDialogOk", (widgetTester) async { testWidgets("Test StackDialogOk", (widgetTester) async {
final navigator = mockingjay.MockNavigator(); final navigatorKey = GlobalKey<NavigatorState>();
await widgetTester.pumpWidget(ProviderScope( await widgetTester.pumpWidget(
ProviderScope(
overrides: [], overrides: [],
child: MaterialApp( child: MaterialApp(
navigatorKey: navigatorKey,
theme: ThemeData( theme: ThemeData(
extensions: [ extensions: [
StackColors.fromStackColorTheme( StackColors.fromStackColorTheme(
@ -77,23 +78,23 @@ void main() {
), ),
], ],
), ),
home: mockingjay.MockNavigatorProvider( home: StackOkDialog(
navigator: navigator,
child: const StackOkDialog(
title: "Some random title", title: "Some random title",
message: "Some message", message: "Some message",
leftButton: TextButton(onPressed: null, child: Text("I am left")), leftButton: TextButton(
onPressed: () {},
child: const Text("I am left"),
), ),
), ),
))); ),
),
);
final button = find.text('I am left');
await widgetTester.tap(button);
await widgetTester.pumpAndSettle(); await widgetTester.pumpAndSettle();
expect(find.byType(StackOkDialog), findsOneWidget); final navigatorState = navigatorKey.currentState;
expect(find.text("Some random title"), findsOneWidget); expect(navigatorState?.overlay, isNotNull);
expect(find.text("Some message"), findsOneWidget);
expect(find.byType(TextButton), findsNWidgets(2));
await widgetTester.tap(find.text("I am left"));
await widgetTester.pumpAndSettle();
}); });
} }