Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-05-07 05:52:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more merge fixes

Browse source
This commit is contained in:
Matthew Fosse 2024-08-12 12:46:36 -07:00
parent b686c82a44
commit 3408de80d6
2 changed files with 12 additions and 10 deletions

2
cw_bitcoin/lib/electrum_wallet.dart
View file

@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'dart:isolate'; import 'dart:isolate';
import 'dart:math';
import 'package:bitcoin_base/bitcoin_base.dart'; import 'package:bitcoin_base/bitcoin_base.dart';
import 'package:blockchain_utils/blockchain_utils.dart'; import 'package:blockchain_utils/blockchain_utils.dart';
@ -21,6 +20,7 @@ import 'package:cw_bitcoin/electrum_transaction_history.dart';
import 'package:cw_bitcoin/electrum_transaction_info.dart'; import 'package:cw_bitcoin/electrum_transaction_info.dart';
import 'package:cw_bitcoin/electrum_wallet_addresses.dart'; import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
import 'package:cw_bitcoin/exceptions.dart'; import 'package:cw_bitcoin/exceptions.dart';
import 'package:cw_bitcoin/litecoin_wallet.dart';
import 'package:cw_bitcoin/pending_bitcoin_transaction.dart'; import 'package:cw_bitcoin/pending_bitcoin_transaction.dart';
import 'package:cw_bitcoin/script_hash.dart'; import 'package:cw_bitcoin/script_hash.dart';
import 'package:cw_bitcoin/utils.dart'; import 'package:cw_bitcoin/utils.dart';

20
cw_bitcoin/lib/electrum_wallet_addresses.dart
View file

@ -319,16 +319,18 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
return address; return address;
} }
String getAddress( String getAddress({
{required int index, required int index,
required Bip32Slip10Secp256k1 hd, required Bip32Slip10Secp256k1 hd,
BitcoinAddressType? addressType}) => BitcoinAddressType? addressType,
}) =>
''; '';
Future<String> getAddressAsync( Future<String> getAddressAsync({
{required int index, required int index,
required bitcoin.HDWallet hd, required Bip32Slip10Secp256k1 hd,
BitcoinAddressType? addressType}) async => BitcoinAddressType? addressType,
}) async =>
getAddress(index: index, hd: hd, addressType: addressType); getAddress(index: index, hd: hd, addressType: addressType);
void addBitcoinAddressTypes() { void addBitcoinAddressTypes() {
@ -416,7 +418,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
} else { } else {
addressesMap[address] = 'Active - P2WPKH'; addressesMap[address] = 'Active - P2WPKH';
} }
final lastMweb = _addresses.firstWhere( final lastMweb = _addresses.firstWhere(
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.mweb)); (addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.mweb));
if (lastMweb.address != address) { if (lastMweb.address != address) {