diff --git a/cw_bitcoin/lib/bitcoin_address_record.dart b/cw_bitcoin/lib/bitcoin_address_record.dart
index e82a4eb8e..c1bbd43f4 100644
--- a/cw_bitcoin/lib/bitcoin_address_record.dart
+++ b/cw_bitcoin/lib/bitcoin_address_record.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:bitcoin_base/bitcoin_base.dart';
import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
abstract class BaseBitcoinAddressRecord {
@@ -27,8 +28,10 @@ abstract class BaseBitcoinAddressRecord {
final String address;
bool _isHidden;
+
bool get isHidden => _isHidden;
final bool _isChange;
+
bool get isChange => _isChange;
final int index;
int _txCount;
@@ -126,6 +129,7 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
derivationInfo: BitcoinDerivationInfo.fromJSON(
decoded['derivationInfo'] as Map<String, dynamic>,
),
+ // TODO: make nullable maybe?
cwDerivationType: CWBitcoinDerivationType.values[decoded['derivationType'] as int],
isHidden: decoded['isHidden'] as bool? ?? false,
isChange: decoded['isChange'] as bool? ?? false,
@@ -177,7 +181,9 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
class BitcoinSilentPaymentAddressRecord extends BaseBitcoinAddressRecord {
String _derivationPath;
+
String get derivationPath => _derivationPath;
+
int get labelIndex => index;
final String? labelHex;
@@ -211,7 +217,8 @@ class BitcoinSilentPaymentAddressRecord extends BaseBitcoinAddressRecord {
return BitcoinSilentPaymentAddressRecord(
decoded['address'] as String,
- derivationPath: decoded['derivationPath'] as String,
+ derivationPath:
+ decoded['derivationPath'] as String? ?? BitcoinWalletAddressesBase.OLD_SP_SPEND_PATH,
labelIndex: decoded['index'] as int,
isUsed: decoded['isUsed'] as bool? ?? false,
txCount: decoded['txCount'] as int? ?? 0,
diff --git a/cw_bitcoin/lib/electrum_wallet_snapshot.dart b/cw_bitcoin/lib/electrum_wallet_snapshot.dart
index 4fcd5d2be..98356277b 100644
--- a/cw_bitcoin/lib/electrum_wallet_snapshot.dart
+++ b/cw_bitcoin/lib/electrum_wallet_snapshot.dart
@@ -79,9 +79,9 @@ class ElectrumWalletSnapshot {
balance: balance,
derivationType: derivationType,
derivationPath: derivationPath,
- unspentCoins: (data['unspent_coins'] as List)
- .map((e) => BitcoinUnspent.fromJSON(null, e as Map<String, dynamic>))
- .toList(),
+ unspentCoins: (data['unspent_coins'] as List?)
+ ?.map((e) => BitcoinUnspent.fromJSON(null, e as Map<String, dynamic>))
+ .toList() ?? [],
didInitialSync: data['didInitialSync'] as bool?,
walletAddressesSnapshot: walletAddressesSnapshot,
);
diff --git a/cw_bitcoin/lib/electrum_worker/electrum_worker.dart b/cw_bitcoin/lib/electrum_worker/electrum_worker.dart
index 7f63b5032..b106c430c 100644
--- a/cw_bitcoin/lib/electrum_worker/electrum_worker.dart
+++ b/cw_bitcoin/lib/electrum_worker/electrum_worker.dart
@@ -1363,7 +1363,13 @@ class ElectrumWorker {
),
);
} catch (e) {
- _sendError(ElectrumWorkerGetFeesError(error: e.toString()));
+ _sendResponse(
+ ElectrumWorkerGetFeesResponse(
+ result: ElectrumTransactionPriorities.fromList(
+ await _electrumClient!.getFeeRates(),
+ ),
+ ),
+ );
}
} else {
_sendResponse(
diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
index 7af05b495..81024d5a0 100644
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: asn1lib
- sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70"
+ sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5"
url: "https://pub.dev"
source: hosted
- version: "1.5.5"
+ version: "1.5.8"
async:
dependency: transitive
description:
@@ -84,16 +84,16 @@ packages:
source: git
version: "1.0.1"
bitcoin_base:
- dependency: "direct overridden"
+ dependency: "direct main"
description:
path: "."
ref: cake-update-v15
- resolved-ref: "10bb92c563e2e05041f4215ae20d834db6c9b2cf"
+ resolved-ref: db0856e1f69f148c8cfc5e8861e1c777ce8f85db
url: "https://github.com/cake-tech/bitcoin_base"
source: git
version: "5.0.0"
blockchain_utils:
- dependency: "direct main"
+ dependency: "direct overridden"
description:
path: "."
ref: cake-update-v4
@@ -185,10 +185,10 @@ packages:
dependency: transitive
description:
name: built_value
- sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
+ sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
url: "https://pub.dev"
source: hosted
- version: "8.9.2"
+ version: "8.9.3"
cake_backup:
dependency: transitive
description:
@@ -218,10 +218,10 @@ packages:
dependency: transitive
description:
name: cli_util
- sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+ sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
url: "https://pub.dev"
source: hosted
- version: "0.4.1"
+ version: "0.4.2"
clock:
dependency: transitive
description:
@@ -234,10 +234,10 @@ packages:
dependency: transitive
description:
name: code_builder
- sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+ sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
url: "https://pub.dev"
source: hosted
- version: "4.10.0"
+ version: "4.10.1"
collection:
dependency: transitive
description:
@@ -312,10 +312,10 @@ packages:
dependency: transitive
description:
name: dbus
- sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
+ sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c"
url: "https://pub.dev"
source: hosted
- version: "0.7.10"
+ version: "0.7.11"
encrypt:
dependency: transitive
description:
@@ -373,10 +373,10 @@ packages:
dependency: "direct main"
description:
name: flutter_mobx
- sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e"
+ sha256: ba5e93467866a2991259dc51cffd41ef45f695c667c2b8e7b087bf24118b50fe
url: "https://pub.dev"
source: hosted
- version: "2.2.1+1"
+ version: "2.3.0"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -386,10 +386,10 @@ packages:
dependency: transitive
description:
name: flutter_web_bluetooth
- sha256: fcd03e2e5f82edcedcbc940f1b6a0635a50757374183254f447640886c53208e
+ sha256: "1363831def5eed1e1064d1eca04e8ccb35446e8f758579c3c519e156b77926da"
url: "https://pub.dev"
source: hosted
- version: "0.2.4"
+ version: "1.0.0"
flutter_web_plugins:
dependency: transitive
description: flutter
@@ -407,10 +407,10 @@ packages:
dependency: transitive
description:
name: glob
- sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+ sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "2.1.3"
google_identity_services_web:
dependency: transitive
description:
@@ -471,26 +471,26 @@ packages:
dependency: "direct main"
description:
name: http
- sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+ sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
url: "https://pub.dev"
source: hosted
- version: "1.2.2"
+ version: "1.3.0"
http2:
dependency: transitive
description:
name: http2
- sha256: "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d"
+ sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa"
url: "https://pub.dev"
source: hosted
- version: "2.3.0"
+ version: "2.3.1"
http_multi_server:
dependency: transitive
description:
name: http_multi_server
- sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+ sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
url: "https://pub.dev"
source: hosted
- version: "3.2.1"
+ version: "3.2.2"
http_parser:
dependency: transitive
description:
@@ -511,10 +511,10 @@ packages:
dependency: transitive
description:
name: io
- sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+ sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
url: "https://pub.dev"
source: hosted
- version: "1.0.4"
+ version: "1.0.5"
js:
dependency: transitive
description:
@@ -560,7 +560,7 @@ packages:
description:
path: "packages/ledger-bitcoin"
ref: HEAD
- resolved-ref: "07cd61ef76a2a017b6d5ef233396740163265457"
+ resolved-ref: e93254f3ff3f996fb91f65a1e7ceffb9f510b4c8
url: "https://github.com/cake-tech/ledger-flutter-plus-plugins"
source: git
version: "0.0.3"
@@ -568,16 +568,16 @@ packages:
dependency: "direct main"
description:
name: ledger_flutter_plus
- sha256: c7b04008553193dbca7e17b430768eecc372a72b0ff3625b5e7fc5e5c8d3231b
+ sha256: "58e550ef7f4e20801c1333847befb0d64592b9765a839d4463524bb6d674967c"
url: "https://pub.dev"
source: hosted
- version: "1.4.1"
+ version: "1.5.0"
ledger_litecoin:
dependency: "direct main"
description:
path: "packages/ledger-litecoin"
ref: HEAD
- resolved-ref: "3dee36713e6ebec9dceb59b9ccae7f243a53ea9e"
+ resolved-ref: e93254f3ff3f996fb91f65a1e7ceffb9f510b4c8
url: "https://github.com/cake-tech/ledger-flutter-plus-plugins"
source: git
version: "0.0.2"
@@ -633,10 +633,10 @@ packages:
dependency: "direct main"
description:
name: mobx
- sha256: "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e"
+ sha256: bf1a90e5bcfd2851fc6984e20eef69557c65d9e4d0a88f5be4cf72c9819ce6b0
url: "https://pub.dev"
source: hosted
- version: "2.3.3+2"
+ version: "2.5.0"
mobx_codegen:
dependency: "direct dev"
description:
@@ -657,10 +657,10 @@ packages:
dependency: transitive
description:
name: package_config
- sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+ sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
path:
dependency: transitive
description:
@@ -673,26 +673,26 @@ packages:
dependency: "direct main"
description:
name: path_provider
- sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+ sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.1.5"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
- sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+ sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
url: "https://pub.dev"
source: hosted
- version: "2.2.12"
+ version: "2.2.15"
path_provider_foundation:
dependency: transitive
description:
name: path_provider_foundation
- sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+ sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
url: "https://pub.dev"
source: hosted
- version: "2.4.0"
+ version: "2.4.1"
path_provider_linux:
dependency: transitive
description:
@@ -777,18 +777,18 @@ packages:
dependency: transitive
description:
name: pub_semver
- sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+ sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.1.5"
pubspec_parse:
dependency: transitive
description:
name: pubspec_parse
- sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
+ sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.4.0"
quiver:
dependency: transitive
description:
@@ -809,26 +809,26 @@ packages:
dependency: "direct main"
description:
name: shared_preferences
- sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
+ sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
url: "https://pub.dev"
source: hosted
- version: "2.3.2"
+ version: "2.3.5"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
- sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
+ sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5"
url: "https://pub.dev"
source: hosted
- version: "2.3.3"
+ version: "2.4.2"
shared_preferences_foundation:
dependency: transitive
description:
name: shared_preferences_foundation
- sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
+ sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
url: "https://pub.dev"
source: hosted
- version: "2.5.3"
+ version: "2.5.4"
shared_preferences_linux:
dependency: transitive
description:
@@ -873,10 +873,10 @@ packages:
dependency: transitive
description:
name: shelf_web_socket
- sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+ sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
url: "https://pub.dev"
source: hosted
- version: "2.0.0"
+ version: "2.0.1"
sky_engine:
dependency: transitive
description: flutter
@@ -943,10 +943,10 @@ packages:
dependency: transitive
description:
name: stream_transform
- sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+ sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
string_scanner:
dependency: transitive
description:
@@ -975,10 +975,10 @@ packages:
dependency: transitive
description:
name: timing
- sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+ sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
url: "https://pub.dev"
source: hosted
- version: "1.0.1"
+ version: "1.0.2"
tuple:
dependency: transitive
description:
@@ -999,10 +999,10 @@ packages:
dependency: transitive
description:
name: universal_ble
- sha256: "0dfbd6b64bff3ad61ed7a895c232530d9614e9b01ab261a74433a43267edb7f3"
+ sha256: c7e5156b9bbb0f9662f07e987d8d6f2083727fa8c221b19a7ecc2f3a6e8f33c3
url: "https://pub.dev"
source: hosted
- version: "0.12.0"
+ version: "0.14.0"
universal_platform:
dependency: transitive
description:
@@ -1031,18 +1031,18 @@ packages:
dependency: transitive
description:
name: vm_service
- sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+ sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
url: "https://pub.dev"
source: hosted
- version: "14.2.5"
+ version: "14.2.4"
watcher:
dependency: "direct overridden"
description:
name: watcher
- sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+ sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
url: "https://pub.dev"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
web:
dependency: transitive
description:
@@ -1063,10 +1063,10 @@ packages:
dependency: transitive
description:
name: web_socket_channel
- sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+ sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
url: "https://pub.dev"
source: hosted
- version: "3.0.1"
+ version: "3.0.2"
xdg_directories:
dependency: transitive
description:
@@ -1087,18 +1087,18 @@ packages:
dependency: transitive
description:
name: yaml
- sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+ sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
url: "https://pub.dev"
source: hosted
- version: "3.1.2"
+ version: "3.1.3"
yaml_edit:
dependency: transitive
description:
name: yaml_edit
- sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
+ sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5
url: "https://pub.dev"
source: hosted
- version: "2.2.1"
+ version: "2.2.2"
sdks:
dart: ">=3.5.0 <4.0.0"
flutter: ">=3.24.0"
diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml
index 4d018084e..1e1c8f3a0 100644
--- a/cw_bitcoin/pubspec.yaml
+++ b/cw_bitcoin/pubspec.yaml
@@ -20,16 +20,16 @@ dependencies:
shared_preferences: ^2.0.15
cw_core:
path: ../cw_core
+ bitcoin_base:
+ git:
+ url: https://github.com/cake-tech/bitcoin_base
+ ref: cake-update-v15
bitbox:
git:
url: https://github.com/cake-tech/bitbox-flutter.git
ref: Add-Support-For-OP-Return-data
rxdart: ^0.28.0
cryptography: ^2.0.5
- blockchain_utils:
- git:
- url: https://github.com/cake-tech/blockchain_utils
- ref: cake-update-v4
cw_mweb:
path: ../cw_mweb
grpc: ^3.2.4
@@ -61,10 +61,6 @@ dev_dependencies:
dependency_overrides:
watcher: ^1.1.0
protobuf: ^3.1.0
- bitcoin_base:
- git:
- url: https://github.com/cake-tech/bitcoin_base
- ref: cake-update-v15
blockchain_utils:
git:
url: https://github.com/cake-tech/blockchain_utils
diff --git a/cw_bitcoin_cash/pubspec.yaml b/cw_bitcoin_cash/pubspec.yaml
index 583bf44b5..346cfb8dc 100644
--- a/cw_bitcoin_cash/pubspec.yaml
+++ b/cw_bitcoin_cash/pubspec.yaml
@@ -25,10 +25,10 @@ dependencies:
git:
url: https://github.com/cake-tech/bitbox-flutter.git
ref: Add-Support-For-OP-Return-data
- blockchain_utils:
+ bitcoin_base:
git:
- url: https://github.com/cake-tech/blockchain_utils
- ref: cake-update-v4
+ url: https://github.com/cake-tech/bitcoin_base
+ ref: cake-update-v15
dev_dependencies:
flutter_test:
@@ -39,10 +39,6 @@ dev_dependencies:
dependency_overrides:
watcher: ^1.1.0
- bitcoin_base:
- git:
- url: https://github.com/cake-tech/bitcoin_base
- ref: cake-update-v15
blockchain_utils:
git:
url: https://github.com/cake-tech/blockchain_utils
diff --git a/cw_core/pubspec.lock b/cw_core/pubspec.lock
index 44ef15a41..c12839a19 100644
--- a/cw_core/pubspec.lock
+++ b/cw_core/pubspec.lock
@@ -722,10 +722,10 @@ packages:
dependency: transitive
description:
name: vm_service
- sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+ sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
url: "https://pub.dev"
source: hosted
- version: "14.2.5"
+ version: "14.2.4"
watcher:
dependency: "direct overridden"
description: