From 0933546806f03dfe922a74c980542b6ed80e0d5b Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 24 May 2023 11:00:54 -0600
Subject: [PATCH] fix: various eCash tweaks + 0 conf
---
.../generate_receiving_uri_qr_code_view.dart | 2 ++
.../manage_nodes_views/add_edit_node_view.dart | 1 +
.../transaction_views/transaction_details_view.dart | 1 +
lib/services/coins/ecash/ecash_wallet.dart | 10 +++++-----
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
index bc1281156..46867c7e1 100644
--- a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
+++ b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
@@ -150,6 +150,7 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
String receivingAddress = widget.receivingAddress;
if ((widget.coin == Coin.bitcoincash ||
+ widget.coin == Coin.eCash ||
widget.coin == Coin.bitcoincashTestnet) &&
receivingAddress.contains(":")) {
// remove cash addr prefix
@@ -246,6 +247,7 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
String receivingAddress = widget.receivingAddress;
if ((widget.coin == Coin.bitcoincash ||
+ widget.coin == Coin.eCash ||
widget.coin == Coin.bitcoincashTestnet) &&
receivingAddress.contains(":")) {
// remove cash addr prefix
diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
index 1ff1a1359..aa5461ab2 100644
--- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
+++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
@@ -150,6 +150,7 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
case Coin.bitcoincash:
case Coin.litecoin:
case Coin.dogecoin:
+ case Coin.eCash:
case Coin.firo:
case Coin.namecoin:
case Coin.particl:
diff --git a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart
index 5a0068c93..d3f8467cd 100644
--- a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart
+++ b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart
@@ -1033,6 +1033,7 @@ class _TransactionDetailsViewState
final String height;
if (widget.coin == Coin.bitcoincash ||
+ widget.coin == Coin.eCash ||
widget.coin == Coin.bitcoincashTestnet) {
height =
"${_transaction.height != null && _transaction.height! > 0 ? _transaction.height! : "Pending"}";
diff --git a/lib/services/coins/ecash/ecash_wallet.dart b/lib/services/coins/ecash/ecash_wallet.dart
index f45c23a73..ce04befe4 100644
--- a/lib/services/coins/ecash/ecash_wallet.dart
+++ b/lib/services/coins/ecash/ecash_wallet.dart
@@ -47,7 +47,7 @@ import 'package:stackwallet/widgets/crypto_notifications.dart';
import 'package:tuple/tuple.dart';
import 'package:uuid/uuid.dart';
-const int MINIMUM_CONFIRMATIONS = 1;
+const int MINIMUM_CONFIRMATIONS = 0;
const String GENESIS_HASH_MAINNET =
"000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f";
@@ -361,9 +361,9 @@ class ECashWallet extends CoinServiceAPI
print("format $format");
}
- if (_coin == Coin.bitcoincashTestnet) {
- return true;
- }
+ // if (_coin == Coin.bitcoincashTestnet) {
+ // return true;
+ // }
if (format == bitbox.Address.formatCashAddr) {
return validateCashAddr(address);
@@ -1899,7 +1899,7 @@ class ECashWallet extends CoinServiceAPI
required List<int> satoshiAmounts,
}) async {
final builder = bitbox.Bitbox.transactionBuilder(
- testnet: coin == Coin.bitcoincashTestnet,
+ testnet: false, //coin == Coin.bitcoincashTestnet,
);
// retrieve address' utxos from the rest api