CAKE-297 | merged main branch into current

This commit is contained in:
OleksandrSobol 2021-05-18 19:37:43 +03:00
parent b474936aee
commit 9ad276622f
3 changed files with 4 additions and 5 deletions

View file

@ -1,5 +1,4 @@
import 'package:cake_wallet/bitcoin/electrum_transaction_info.dart';
//import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
import 'package:cake_wallet/core/wallet_base.dart';
import 'package:cake_wallet/entities/transaction_info.dart';
import 'package:cake_wallet/entities/wallet_type.dart';

View file

@ -70,7 +70,7 @@ packages:
path: "."
ref: cake
resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
url: "git@github.com:cake-tech/bech32.git"
url: "https://github.com/cake-tech/bech32.git"
source: git
version: "0.2.0"
bip32:
@ -92,8 +92,8 @@ packages:
description:
path: "."
ref: cake
resolved-ref: b3ab2926c665f0e68b74a4a5f31059f7fcd817b7
url: "git@github.com:cake-tech/bitcoin_flutter.git"
resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
url: "https://github.com/cake-tech/bitcoin_flutter.git"
source: git
version: "2.0.2"
boolean_selector:

View file

@ -67,7 +67,7 @@ dependencies:
basic_utils: ^2.0.3
bitcoin_flutter:
git:
url: git@github.com:cake-tech/bitcoin_flutter.git
url: https://github.com/cake-tech/bitcoin_flutter.git
ref: cake
get_it: ^6.0.0
connectivity: ^3.0.3