diff --git a/cw_lightning/lib/lightning_wallet.dart b/cw_lightning/lib/lightning_wallet.dart index 2629dbdd2..246cc85d8 100644 --- a/cw_lightning/lib/lightning_wallet.dart +++ b/cw_lightning/lib/lightning_wallet.dart @@ -43,7 +43,7 @@ abstract class LightningWalletBase with Store { final bitcoin.HDWallet hd; final String mnemonic; - String _password; + final String _password; bool _isTransactionUpdating; late ElectrumClient electrumClient; @@ -159,7 +159,6 @@ abstract class LightningWalletBase walletInfo: walletInfo, unspentCoinsInfo: unspentCoinsInfo, initialAddresses: snp.addresses, - // initialBalance: snp.balance, seedBytes: await mnemonicToSeedBytes(snp.mnemonic), initialRegularAddressIndex: snp.regularAddressIndex, initialChangeAddressIndex: snp.changeAddressIndex, @@ -217,8 +216,7 @@ abstract class LightningWalletBase sdk.paymentsStream.listen((payments) { _isTransactionUpdating = true; - print("payment event: $payments"); - var txs = convertToTxInfo(payments); + final txs = convertToTxInfo(payments); transactionHistory.addMany(txs); _isTransactionUpdating = false; }); @@ -352,24 +350,11 @@ abstract class LightningWalletBase await transactionHistory.save(); } - Future<void> updateBalance() async { - // balance[currency] = await _fetchBalances(); - await save(); - } - @override String get seed => mnemonic; Future<String> makePath() async => pathForWallet(name: walletInfo.name, type: walletInfo.type); - // String toJSON() => json.encode({ - // 'seedKey': _hexSeed, - // 'mnemonic': _mnemonic, - // 'currentBalance': balance[currency]?.currentBalance.toString() ?? "0", - // 'receivableBalance': balance[currency]?.receivableBalance.toString() ?? "0", - // 'derivationType': _derivationType.toString() - // }); - @override Future<void> renameWalletFiles(String newWalletName) async { final currentWalletPath = await pathForWallet(name: walletInfo.name, type: type); diff --git a/lib/lightning/cw_lightning.dart b/lib/lightning/cw_lightning.dart index c2cb983cc..a9f575bc3 100644 --- a/lib/lightning/cw_lightning.dart +++ b/lib/lightning/cw_lightning.dart @@ -1,8 +1,6 @@ part of 'lightning.dart'; class CWLightning extends Lightning { - @override - TransactionPriority getMediumTransactionPriority() => BitcoinTransactionPriority.medium; @override WalletCredentials createLightningRestoreWalletFromSeedCredentials({ @@ -39,20 +37,6 @@ class CWLightning extends Lightning { 'publicKey': keys.publicKey }; } - - @override - List<TransactionPriority> getTransactionPriorities() - => BitcoinTransactionPriority.all; - - @override - TransactionPriority deserializeLightningTransactionPriority(int raw) - => BitcoinTransactionPriority.deserialize(raw: raw); - - @override - int getFeeRate(Object wallet, TransactionPriority priority) { - final lightningWallet = wallet as ElectrumWallet; - return lightningWallet.feeRate(priority); - } @override Future<void> generateNewAddress(Object wallet, String label) async { @@ -132,10 +116,6 @@ class CWLightning extends Lightning { int formatterStringDoubleToLightningAmount(String amount) => stringDoubleToBitcoinAmount(amount); - @override - String lightningTransactionPriorityWithLabel(TransactionPriority priority, int rate) - => (priority as BitcoinTransactionPriority).labelWithRate(rate); - @override List<BitcoinUnspent> getUnspents(Object wallet) { final lightningWallet = wallet as ElectrumWallet; @@ -150,14 +130,6 @@ class CWLightning extends Lightning { WalletService createLightningWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) { return LightningWalletService(walletInfoSource, unspentCoinSource); } - - @override - TransactionPriority getLightningTransactionPriorityMedium() - => BitcoinTransactionPriority.medium; - - @override - TransactionPriority getLightningTransactionPrioritySlow() - => BitcoinTransactionPriority.slow; @override List<LightningReceivePageOption> getLightningReceivePageOptions() => LightningReceivePageOption.all; diff --git a/lib/lightning/lightning.dart b/lib/lightning/lightning.dart index d2f31296d..d3957c79c 100644 --- a/lib/lightning/lightning.dart +++ b/lib/lightning/lightning.dart @@ -27,8 +27,6 @@ part 'cw_lightning.dart'; Lightning? lightning = CWLightning(); abstract class Lightning { - TransactionPriority getMediumTransactionPriority(); - WalletCredentials createLightningRestoreWalletFromSeedCredentials( {required String name, required String mnemonic, required String password}); WalletCredentials createLightningRestoreWalletFromWIFCredentials( @@ -40,9 +38,6 @@ abstract class Lightning { {required String name, WalletInfo? walletInfo}); List<String> getWordList(); Map<String, String> getWalletKeys(Object wallet); - List<TransactionPriority> getTransactionPriorities(); - TransactionPriority deserializeLightningTransactionPriority(int raw); - int getFeeRate(Object wallet, TransactionPriority priority); Future<void> generateNewAddress(Object wallet, String label); Future<void> updateAddress(Object wallet, String address, String label); Object createLightningTransactionCredentials(List<Output> outputs, @@ -58,14 +53,11 @@ abstract class Lightning { String formatterLightningAmountToString({required int amount}); double formatterLightningAmountToDouble({required int amount}); int formatterStringDoubleToLightningAmount(String amount); - String lightningTransactionPriorityWithLabel(TransactionPriority priority, int rate); List<Unspent> getUnspents(Object wallet); Future<void> updateUnspents(Object wallet); WalletService createLightningWalletService( Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource); - TransactionPriority getLightningTransactionPriorityMedium(); - TransactionPriority getLightningTransactionPrioritySlow(); List<LightningReceivePageOption> getLightningReceivePageOptions(); } \ No newline at end of file diff --git a/tool/configure.dart b/tool/configure.dart index 5840b208e..9ac47039b 100644 --- a/tool/configure.dart +++ b/tool/configure.dart @@ -745,8 +745,6 @@ import 'package:cw_lightning/lightning_receive_page_option.dart'; const lightningCwPart = "part 'cw_lightning.dart';"; const lightningContent = """ abstract class Lightning { - TransactionPriority getMediumTransactionPriority(); - WalletCredentials createLightningRestoreWalletFromSeedCredentials( {required String name, required String mnemonic, required String password}); WalletCredentials createLightningRestoreWalletFromWIFCredentials( @@ -758,9 +756,6 @@ abstract class Lightning { {required String name, WalletInfo? walletInfo}); List<String> getWordList(); Map<String, String> getWalletKeys(Object wallet); - List<TransactionPriority> getTransactionPriorities(); - TransactionPriority deserializeLightningTransactionPriority(int raw); - int getFeeRate(Object wallet, TransactionPriority priority); Future<void> generateNewAddress(Object wallet, String label); Future<void> updateAddress(Object wallet, String address, String label); Object createLightningTransactionCredentials(List<Output> outputs, @@ -776,14 +771,11 @@ abstract class Lightning { String formatterLightningAmountToString({required int amount}); double formatterLightningAmountToDouble({required int amount}); int formatterStringDoubleToLightningAmount(String amount); - String lightningTransactionPriorityWithLabel(TransactionPriority priority, int rate); List<Unspent> getUnspents(Object wallet); Future<void> updateUnspents(Object wallet); WalletService createLightningWalletService( Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource); - TransactionPriority getLightningTransactionPriorityMedium(); - TransactionPriority getLightningTransactionPrioritySlow(); List<LightningReceivePageOption> getLightningReceivePageOptions(); } """;