From 3408de80d6cbc57306786dea8eec7cbd6d4687d9 Mon Sep 17 00:00:00 2001
From: Matthew Fosse <matt@fosse.co>
Date: Mon, 12 Aug 2024 12:46:36 -0700
Subject: [PATCH] more merge fixes
---
cw_bitcoin/lib/electrum_wallet.dart | 2 +-
cw_bitcoin/lib/electrum_wallet_addresses.dart | 20 ++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 45e7b24ab..9b2b6fd7a 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'dart:isolate';
-import 'dart:math';
import 'package:bitcoin_base/bitcoin_base.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_wallet_addresses.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/script_hash.dart';
import 'package:cw_bitcoin/utils.dart';
diff --git a/cw_bitcoin/lib/electrum_wallet_addresses.dart b/cw_bitcoin/lib/electrum_wallet_addresses.dart
index 166ec9bb3..388b3d468 100644
--- a/cw_bitcoin/lib/electrum_wallet_addresses.dart
+++ b/cw_bitcoin/lib/electrum_wallet_addresses.dart
@@ -319,16 +319,18 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
return address;
}
- String getAddress(
- {required int index,
- required Bip32Slip10Secp256k1 hd,
- BitcoinAddressType? addressType}) =>
+ String getAddress({
+ required int index,
+ required Bip32Slip10Secp256k1 hd,
+ BitcoinAddressType? addressType,
+ }) =>
'';
- Future<String> getAddressAsync(
- {required int index,
- required bitcoin.HDWallet hd,
- BitcoinAddressType? addressType}) async =>
+ Future<String> getAddressAsync({
+ required int index,
+ required Bip32Slip10Secp256k1 hd,
+ BitcoinAddressType? addressType,
+ }) async =>
getAddress(index: index, hd: hd, addressType: addressType);
void addBitcoinAddressTypes() {
@@ -416,7 +418,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
} else {
addressesMap[address] = 'Active - P2WPKH';
}
-
+
final lastMweb = _addresses.firstWhere(
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.mweb));
if (lastMweb.address != address) {