Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-09-29 18:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/staging' into add-ethereum

Browse source 
# Conflicts:
#	lib/widgets/wallet_card.dart
This commit is contained in:
julian 2023-03-29 14:09:23 -06:00
commit f69f9a5038
4 changed files with 365 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/models/contact_address_entry_data.dart
View file

@ -57,7 +57,10 @@ class AddressEntryData extends ChangeNotifier {
}
bool get isValidAddress {
if (_address == null || coin == null) {
if ( coin == null) {
return true;
}
if (_address == null) {
return false;
}
return AddressUtils.validateAddress(_address!, _coin!);

13
lib/pages/coin_control/utxo_details_view.dart
View file

@ -384,7 +384,7 @@ class _UtxoDetailsViewState extends ConsumerState<UtxoDetailsView> {
),
isDesktop
? IconCopyButton(
data: utxo!.address!,
data: label!.value,
)
: SimpleCopyButton(
data: label!.value,
@ -426,7 +426,7 @@ class _UtxoDetailsViewState extends ConsumerState<UtxoDetailsView> {
),
isDesktop
? IconCopyButton(
data: utxo!.address!,
data: utxo!.txid,
)
: SimpleCopyButton(
data: utxo!.txid,
@ -493,13 +493,11 @@ class _UtxoDetailsViewState extends ConsumerState<UtxoDetailsView> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"Freeze reason",
style:
STextStyles.w500_14(context).copyWith(
style: STextStyles.w500_14(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textSubtitle1,
@ -544,7 +542,8 @@ class _UtxoDetailsViewState extends ConsumerState<UtxoDetailsView> {
],
),
);
}),
},
),
);
}
}

4
lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
View file

@ -282,6 +282,7 @@ abstract class SWB {
backupWallet['id'] = manager.walletId;
backupWallet['isFavorite'] = manager.isFavorite;
backupWallet['mnemonic'] = await manager.mnemonic;
backupWallet['mnemonicPassphrase'] = await manager.mnemonicPassphrase;
backupWallet['coinName'] = manager.coin.name;
backupWallet['storedChainHeight'] = DB.instance
.get<dynamic>(boxName: manager.walletId, key: 'storedChainHeight');
@ -363,6 +364,7 @@ abstract class SWB {
walletId: manager.walletId,
restoringStatus: StackRestoringStatus.restoring,
mnemonic: mnemonic,
mnemonicPassphrase: mnemonicPassphrase,
);
if (_shouldCancelRestore) {
@ -432,6 +434,7 @@ abstract class SWB {
address: currentAddress,
height: restoreHeight,
mnemonic: mnemonic,
mnemonicPassphrase: mnemonicPassphrase,
);
} catch (e, s) {
Logging.instance.log("$e $s", level: LogLevel.Warning);
@ -440,6 +443,7 @@ abstract class SWB {
restoringStatus: StackRestoringStatus.failed,
manager: manager,
mnemonic: mnemonic,
mnemonicPassphrase: mnemonicPassphrase,
);
return false;
}

59
lib/services/coins/firo/firo_wallet.dart
View file

@ -2499,60 +2499,17 @@ class FiroWallet extends CoinServiceAPI with WalletCache, WalletDB, FiroHive {
});
}
// final int utxosIntValue = utxos.satoshiBalance;
// final Decimal utxosValue =
// Format.satoshisToAmount(utxosIntValue, coin: coin);
// List<Decimal> balances = List.empty(growable: true);
//
// Decimal lelantusBalance =
// Format.satoshisToAmount(intLelantusBalance, coin: coin);
// balances.add(lelantusBalance); 0
//
// balances.add(lelantusBalance * price); 1
// Decimal _unconfirmedLelantusBalance =
// Format.satoshisToAmount(unconfirmedLelantusBalance, coin: coin);
// balances.add(lelantusBalance + utxosValue + _unconfirmedLelantusBalance); 2
//
// balances.add(
// (lelantusBalance + utxosValue + _unconfirmedLelantusBalance) * price); 3
// int availableSats =
// utxos.satoshiBalance - utxos.satoshiBalanceUnconfirmed;
// if (availableSats < 0) {
// availableSats = 0;
// }
// balances.add(Format.satoshisToAmount(availableSats, coin: coin)); 4
_balancePrivate = Balance(
coin: coin,
total: intLelantusBalance + unconfirmedLelantusBalance,
spendable: intLelantusBalance,
blockedTotal: 0,
pendingSpendable: unconfirmedLelantusBalance,
);
await updateCachedBalanceSecondary(_balancePrivate!);
// wait for updated uxtos to get updated public balance
await utxosUpdateFuture;
// todo: shared total between private and public balances?
_balancePrivate = Balance(
coin: coin,
total: intLelantusBalance + unconfirmedLelantusBalance + balance.total,
spendable: intLelantusBalance,
blockedTotal: 0,
pendingSpendable: unconfirmedLelantusBalance + balance.total,
);
await updateCachedBalanceSecondary(_balancePrivate!);
// _balance = Balance(
// coin: coin,
// total: utxos.satoshiBalance,
// spendable: availableSats,
// blockedTotal: 0,
// pendingSpendable: utxos.satoshiBalanceUnconfirmed,
// );
// Logging.instance.log("balances $balances", level: LogLevel.Info);
// await DB.instance.put<dynamic>(
// boxName: walletId,
// key: 'totalBalance',
// value: balances[2].toString());
// return balances;
} catch (e, s) {
Logging.instance.log("Exception rethrown in getFullBalance(): $e\n$s",
level: LogLevel.Error);