Fixes
M committed
Aug 31, 2020 at 17:39 UTC
eaa5d48bb6847103645a48f1241e0e34325d6725
3 files changed
+9
-7
lib/bitcoin/bitcoin_wallet.dart
-1
@@ -37,7 +37,6 @@ import 'package:shared_preferences/shared_preferences.dart';
37
38
part 'bitcoin_wallet.g.dart';
39
40
-
40
class BitcoinWallet = BitcoinWalletBase with _$BitcoinWallet;
41
42
abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
lib/bitcoin/bitcoin_wallet_service.dart
-1
@@ -1,5 +1,4 @@
1
import 'dart:io';
2
-import 'dart:convert';
2
import 'package:bip39/bip39.dart' as bip39;
3
import 'package:cake_wallet/bitcoin/file.dart';
4
import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
lib/bitcoin/electrum.dart
+9
-5
@@ -1,6 +1,7 @@
1
import 'dart:async';
2
import 'dart:convert';
3
import 'dart:io';
4
+import 'dart:typed_data';
5
import 'package:cake_wallet/bitcoin/script_hash.dart';
6
import 'package:flutter/foundation.dart';
7
import 'package:rxdart/rxdart.dart';
@@ -52,9 +53,11 @@ class ElectrumClient {
53
54
socket = await SecureSocket.connect(host, port, timeout: connectionTimeout);
55
_setIsConnected(true);
55
- socket.listen((List<int> event) {
56
+
57
+ socket.listen((Uint8List event) {
58
try {
57
- final jsoned = json.decode(utf8.decode(event)) as Map<String, Object>;
59
+ final jsoned =
60
+ json.decode(utf8.decode(event.toList())) as Map<String, Object>;
61
print(jsoned);
62
final method = jsoned['method'];
63
final id = jsoned['id'] as String;
@@ -69,9 +72,10 @@ class ElectrumClient {
72
} catch (e) {
73
print(e);
74
}
72
- },
73
- onError: (Error _) => _setIsConnected(false),
74
- onDone: () => _setIsConnected(false));
75
+ }, onError: (Object error) {
76
+ print(error.toString());
77
+ _setIsConnected(false);
78
+ }, onDone: () => _setIsConnected(false));
79
keepAlive();
80
}
81