mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-06-28 20:39:51 +00:00
Omar Hatem
GitHub
parent
b77c22b0df
commit
d332377a2b
36 changed files with 402 additions and 667 deletions
|
|
@ -17,16 +17,21 @@ BitcoinBaseAddress addressFromScript(Script script,
|
|||
|
||||
switch (addressType) {
|
||||
case P2pkhAddressType.p2pkh:
|
||||
return P2pkhAddress.fromScriptPubkey(script: script);
|
||||
return P2pkhAddress.fromScriptPubkey(
|
||||
script: script, network: BitcoinNetwork.mainnet);
|
||||
case P2shAddressType.p2pkhInP2sh:
|
||||
case P2shAddressType.p2pkInP2sh:
|
||||
return P2shAddress.fromScriptPubkey(script: script);
|
||||
case SegwitAddressType.p2wpkh:
|
||||
return P2wpkhAddress.fromScriptPubkey(script: script);
|
||||
case SegwitAddressType.p2wsh:
|
||||
return P2wshAddress.fromScriptPubkey(script: script);
|
||||
case SegwitAddressType.p2tr:
|
||||
return P2trAddress.fromScriptPubkey(script: script);
|
||||
return P2shAddress.fromScriptPubkey(
|
||||
script: script, network: BitcoinNetwork.mainnet);
|
||||
case SegwitAddresType.p2wpkh:
|
||||
return P2wpkhAddress.fromScriptPubkey(
|
||||
script: script, network: BitcoinNetwork.mainnet);
|
||||
case SegwitAddresType.p2wsh:
|
||||
return P2wshAddress.fromScriptPubkey(
|
||||
script: script, network: BitcoinNetwork.mainnet);
|
||||
case SegwitAddresType.p2tr:
|
||||
return P2trAddress.fromScriptPubkey(
|
||||
script: script, network: BitcoinNetwork.mainnet);
|
||||
}
|
||||
|
||||
throw ArgumentError("Invalid script");
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
|
|||
type: decoded['type'] != null && decoded['type'] != ''
|
||||
? BitcoinAddressType.values
|
||||
.firstWhere((type) => type.toString() == decoded['type'] as String)
|
||||
: SegwitAddressType.p2wpkh,
|
||||
: SegwitAddresType.p2wpkh,
|
||||
scriptHash: decoded['scriptHash'] as String?,
|
||||
network: network,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ class BitcoinReceivePageOption implements ReceivePageOption {
|
|||
BitcoinAddressType toType() {
|
||||
switch (this) {
|
||||
case BitcoinReceivePageOption.p2tr:
|
||||
return SegwitAddressType.p2tr;
|
||||
return SegwitAddresType.p2tr;
|
||||
case BitcoinReceivePageOption.p2wsh:
|
||||
return SegwitAddressType.p2wsh;
|
||||
return SegwitAddresType.p2wsh;
|
||||
case BitcoinReceivePageOption.p2pkh:
|
||||
return P2pkhAddressType.p2pkh;
|
||||
case BitcoinReceivePageOption.p2sh:
|
||||
|
|
@ -46,20 +46,20 @@ class BitcoinReceivePageOption implements ReceivePageOption {
|
|||
case BitcoinReceivePageOption.silent_payments:
|
||||
return SilentPaymentsAddresType.p2sp;
|
||||
case BitcoinReceivePageOption.mweb:
|
||||
return SegwitAddressType.mweb;
|
||||
return SegwitAddresType.mweb;
|
||||
case BitcoinReceivePageOption.p2wpkh:
|
||||
default:
|
||||
return SegwitAddressType.p2wpkh;
|
||||
return SegwitAddresType.p2wpkh;
|
||||
}
|
||||
}
|
||||
|
||||
factory BitcoinReceivePageOption.fromType(BitcoinAddressType type) {
|
||||
switch (type) {
|
||||
case SegwitAddressType.p2tr:
|
||||
case SegwitAddresType.p2tr:
|
||||
return BitcoinReceivePageOption.p2tr;
|
||||
case SegwitAddressType.p2wsh:
|
||||
case SegwitAddresType.p2wsh:
|
||||
return BitcoinReceivePageOption.p2wsh;
|
||||
case SegwitAddressType.mweb:
|
||||
case SegwitAddresType.mweb:
|
||||
return BitcoinReceivePageOption.mweb;
|
||||
case P2pkhAddressType.p2pkh:
|
||||
return BitcoinReceivePageOption.p2pkh;
|
||||
|
|
@ -67,7 +67,7 @@ class BitcoinReceivePageOption implements ReceivePageOption {
|
|||
return BitcoinReceivePageOption.p2sh;
|
||||
case SilentPaymentsAddresType.p2sp:
|
||||
return BitcoinReceivePageOption.silent_payments;
|
||||
case SegwitAddressType.p2wpkh:
|
||||
case SegwitAddresType.p2wpkh:
|
||||
default:
|
||||
return BitcoinReceivePageOption.p2wpkh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,8 +73,9 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
initialBalance: initialBalance,
|
||||
seedBytes: seedBytes,
|
||||
encryptionFileUtils: encryptionFileUtils,
|
||||
currency:
|
||||
networkParam == BitcoinNetwork.testnet ? CryptoCurrency.tbtc : CryptoCurrency.btc,
|
||||
currency: networkParam == BitcoinNetwork.testnet
|
||||
? CryptoCurrency.tbtc
|
||||
: CryptoCurrency.btc,
|
||||
alwaysScan: alwaysScan,
|
||||
) {
|
||||
// in a standard BIP44 wallet, mainHd derivation path = m/84'/0'/0'/0 (account 0, index unspecified here)
|
||||
|
|
@ -93,12 +94,14 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
mainHd: hd,
|
||||
sideHd: accountHD.childKey(Bip32KeyIndex(1)),
|
||||
network: networkParam ?? network,
|
||||
masterHd: seedBytes != null ? Bip32Slip10Secp256k1.fromSeed(seedBytes) : null,
|
||||
masterHd:
|
||||
seedBytes != null ? Bip32Slip10Secp256k1.fromSeed(seedBytes) : null,
|
||||
isHardwareWallet: walletInfo.isHardwareWallet,
|
||||
payjoinManager: payjoinManager);
|
||||
|
||||
autorun((_) {
|
||||
this.walletAddresses.isEnabledAutoGenerateSubaddress = this.isEnabledAutoGenerateSubaddress;
|
||||
this.walletAddresses.isEnabledAutoGenerateSubaddress =
|
||||
this.isEnabledAutoGenerateSubaddress;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -133,7 +136,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
break;
|
||||
case DerivationType.electrum:
|
||||
default:
|
||||
seedBytes = await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
|
||||
seedBytes =
|
||||
await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -206,8 +210,10 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
walletInfo.derivationInfo ??= DerivationInfo();
|
||||
|
||||
// set the default if not present:
|
||||
walletInfo.derivationInfo!.derivationPath ??= snp?.derivationPath ?? electrum_path;
|
||||
walletInfo.derivationInfo!.derivationType ??= snp?.derivationType ?? DerivationType.electrum;
|
||||
walletInfo.derivationInfo!.derivationPath ??=
|
||||
snp?.derivationPath ?? electrum_path;
|
||||
walletInfo.derivationInfo!.derivationType ??=
|
||||
snp?.derivationType ?? DerivationType.electrum;
|
||||
|
||||
Uint8List? seedBytes = null;
|
||||
final mnemonic = keysData.mnemonic;
|
||||
|
|
@ -216,7 +222,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
if (mnemonic != null) {
|
||||
switch (walletInfo.derivationInfo!.derivationType) {
|
||||
case DerivationType.electrum:
|
||||
seedBytes = await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
|
||||
seedBytes =
|
||||
await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
|
||||
break;
|
||||
case DerivationType.bip39:
|
||||
default:
|
||||
|
|
@ -262,7 +269,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
late final PayjoinManager payjoinManager;
|
||||
|
||||
bool get isPayjoinAvailable => unspentCoinsInfo.values
|
||||
.where((element) => element.walletId == id && element.isSending && !element.isFrozen)
|
||||
.where((element) =>
|
||||
element.walletId == id && element.isSending && !element.isFrozen)
|
||||
.isNotEmpty;
|
||||
|
||||
Future<PsbtV2> buildPsbt({
|
||||
|
|
@ -279,8 +287,10 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
}) async {
|
||||
final psbtReadyInputs = <PSBTReadyUtxoWithAddress>[];
|
||||
for (final utxo in utxos) {
|
||||
final rawTx = await electrumClient.getTransactionHex(hash: utxo.utxo.txHash);
|
||||
final publicKeyAndDerivationPath = publicKeys[utxo.ownerDetails.address.pubKeyHash()]!;
|
||||
final rawTx =
|
||||
await electrumClient.getTransactionHex(hash: utxo.utxo.txHash);
|
||||
final publicKeyAndDerivationPath =
|
||||
publicKeys[utxo.ownerDetails.address.pubKeyHash()]!;
|
||||
|
||||
psbtReadyInputs.add(PSBTReadyUtxoWithAddress(
|
||||
utxo: utxo.utxo,
|
||||
|
|
@ -292,7 +302,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
));
|
||||
}
|
||||
|
||||
return PSBTTransactionBuild(inputs: psbtReadyInputs, outputs: outputs, enableRBF: enableRBF)
|
||||
return PSBTTransactionBuild(
|
||||
inputs: psbtReadyInputs, outputs: outputs, enableRBF: enableRBF)
|
||||
.psbt;
|
||||
}
|
||||
|
||||
|
|
@ -331,7 +342,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
Future<PendingTransaction> createTransaction(Object credentials) async {
|
||||
credentials = credentials as BitcoinTransactionCredentials;
|
||||
|
||||
final tx = (await super.createTransaction(credentials)) as PendingBitcoinTransaction;
|
||||
final tx = (await super.createTransaction(credentials))
|
||||
as PendingBitcoinTransaction;
|
||||
|
||||
final payjoinUri = credentials.payjoinUri;
|
||||
if (payjoinUri == null) return tx;
|
||||
|
|
@ -354,12 +366,12 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
publicKeys: tx.publicKeys!,
|
||||
masterFingerprint: Uint8List(0));
|
||||
|
||||
final originalPsbt =
|
||||
await signPsbt(base64.encode(transaction.asPsbtV0()), getUtxoWithPrivateKeys());
|
||||
final originalPsbt = await signPsbt(
|
||||
base64.encode(transaction.asPsbtV0()), getUtxoWithPrivateKeys());
|
||||
|
||||
tx.commitOverride = () async {
|
||||
final sender =
|
||||
await payjoinManager.initSender(payjoinUri, originalPsbt, int.parse(tx.feeRate));
|
||||
final sender = await payjoinManager.initSender(
|
||||
payjoinUri, originalPsbt, int.parse(tx.feeRate));
|
||||
payjoinManager.spawnNewSender(
|
||||
sender: sender, pjUrl: payjoinUri, amount: BigInt.from(tx.amount));
|
||||
};
|
||||
|
|
@ -375,7 +387,8 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
Future<void> commitPsbt(String finalizedPsbt) {
|
||||
final psbt = PsbtV2()..deserializeV0(base64.decode(finalizedPsbt));
|
||||
|
||||
final btcTx = BtcTransaction.fromRaw(BytesUtils.toHexString(psbt.extract()));
|
||||
final btcTx =
|
||||
BtcTransaction.fromRaw(BytesUtils.toHexString(psbt.extract()));
|
||||
|
||||
return PendingBitcoinTransaction(
|
||||
btcTx,
|
||||
|
|
@ -389,11 +402,12 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
).commit();
|
||||
}
|
||||
|
||||
Future<String> signPsbt(String preProcessedPsbt, List<UtxoWithPrivateKey> utxos) async {
|
||||
Future<String> signPsbt(
|
||||
String preProcessedPsbt, List<UtxoWithPrivateKey> utxos) async {
|
||||
final psbt = PsbtV2()..deserializeV0(base64Decode(preProcessedPsbt));
|
||||
|
||||
await psbt.signWithUTXO(utxos, (txDigest, utxo, key, sighash) {
|
||||
return utxo.utxo.isP2tr
|
||||
return utxo.utxo.isP2tr()
|
||||
? key.signTapRoot(
|
||||
txDigest,
|
||||
sighash: sighash,
|
||||
|
|
@ -414,15 +428,17 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
|
|||
Future<String> signMessage(String message, {String? address = null}) async {
|
||||
if (walletInfo.isHardwareWallet) {
|
||||
final addressEntry = address != null
|
||||
? walletAddresses.allAddresses.firstWhere((element) => element.address == address)
|
||||
? walletAddresses.allAddresses
|
||||
.firstWhere((element) => element.address == address)
|
||||
: null;
|
||||
final index = addressEntry?.index ?? 0;
|
||||
final isChange = addressEntry?.isHidden == true ? 1 : 0;
|
||||
final accountPath = walletInfo.derivationInfo?.derivationPath;
|
||||
final derivationPath = accountPath != null ? "$accountPath/$isChange/$index" : null;
|
||||
final derivationPath =
|
||||
accountPath != null ? "$accountPath/$isChange/$index" : null;
|
||||
|
||||
final signature = await _bitcoinLedgerApp!
|
||||
.signMessage(message: ascii.encode(message), signDerivationPath: derivationPath);
|
||||
final signature = await _bitcoinLedgerApp!.signMessage(
|
||||
message: ascii.encode(message), signDerivationPath: derivationPath);
|
||||
return base64Encode(signature);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,10 +47,10 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
|
|||
if (addressType == P2pkhAddressType.p2pkh)
|
||||
return generateP2PKHAddress(hd: hd, index: index, network: network);
|
||||
|
||||
if (addressType == SegwitAddressType.p2tr)
|
||||
if (addressType == SegwitAddresType.p2tr)
|
||||
return generateP2TRAddress(hd: hd, index: index, network: network);
|
||||
|
||||
if (addressType == SegwitAddressType.p2wsh)
|
||||
if (addressType == SegwitAddresType.p2wsh)
|
||||
return generateP2WSHAddress(hd: hd, index: index, network: network);
|
||||
|
||||
if (addressType == P2shAddressType.p2wpkhInP2sh)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import 'dart:isolate';
|
|||
|
||||
import 'package:bitcoin_base/bitcoin_base.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_amount_format.dart';
|
||||
import 'package:cw_core/format_amount.dart';
|
||||
import 'package:cw_core/utils/print_verbose.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_wallet.dart';
|
||||
import 'package:cw_bitcoin/litecoin_wallet.dart';
|
||||
|
|
@ -17,7 +18,7 @@ import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
|
|||
import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_unspent.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_wallet_keys.dart';
|
||||
import 'package:cw_bitcoin/electrum.dart' as electrum;
|
||||
import 'package:cw_bitcoin/electrum.dart';
|
||||
import 'package:cw_bitcoin/electrum_balance.dart';
|
||||
import 'package:cw_bitcoin/electrum_derivations.dart';
|
||||
import 'package:cw_bitcoin/electrum_transaction_history.dart';
|
||||
|
|
@ -68,7 +69,7 @@ abstract class ElectrumWalletBase
|
|||
Uint8List? seedBytes,
|
||||
this.passphrase,
|
||||
List<BitcoinAddressRecord>? initialAddresses,
|
||||
electrum.ElectrumClient? electrumClient,
|
||||
ElectrumClient? electrumClient,
|
||||
ElectrumBalance? initialBalance,
|
||||
CryptoCurrency? currency,
|
||||
this.alwaysScan,
|
||||
|
|
@ -95,7 +96,7 @@ abstract class ElectrumWalletBase
|
|||
this.isTestnet = !network.isMainnet,
|
||||
this._mnemonic = mnemonic,
|
||||
super(walletInfo) {
|
||||
this.electrumClient = electrumClient ?? electrum.ElectrumClient();
|
||||
this.electrumClient = electrumClient ?? ElectrumClient();
|
||||
this.walletInfo = walletInfo;
|
||||
transactionHistory = ElectrumTransactionHistory(
|
||||
walletInfo: walletInfo,
|
||||
|
|
@ -166,7 +167,7 @@ abstract class ElectrumWalletBase
|
|||
@observable
|
||||
bool isEnabledAutoGenerateSubaddress;
|
||||
|
||||
late electrum.ElectrumClient electrumClient;
|
||||
late ElectrumClient electrumClient;
|
||||
Box<UnspentCoinsInfo> unspentCoinsInfo;
|
||||
|
||||
@override
|
||||
|
|
@ -181,7 +182,7 @@ abstract class ElectrumWalletBase
|
|||
SyncStatus syncStatus;
|
||||
|
||||
Set<String> get addressesSet => walletAddresses.allAddresses
|
||||
.where((element) => element.type != SegwitAddressType.mweb)
|
||||
.where((element) => element.type != SegwitAddresType.mweb)
|
||||
.map((addr) => addr.address)
|
||||
.toSet();
|
||||
|
||||
|
|
@ -332,14 +333,14 @@ abstract class ElectrumWalletBase
|
|||
|
||||
final receivePort = ReceivePort();
|
||||
_isolate = Isolate.spawn(
|
||||
_handleScanSilentPayments,
|
||||
startRefresh,
|
||||
ScanData(
|
||||
sendPort: receivePort.sendPort,
|
||||
silentAddress: walletAddresses.silentAddress!,
|
||||
network: network,
|
||||
height: height,
|
||||
chainTip: chainTip,
|
||||
electrumClient: electrum.ElectrumClient(),
|
||||
electrumClient: ElectrumClient(),
|
||||
transactionHistoryIds: transactionHistory.transactions.keys.toList(),
|
||||
node: (await getNodeSupportsSilentPayments()) == true
|
||||
? ScanNode(node!.uri, node!.useSSL)
|
||||
|
|
@ -438,6 +439,7 @@ abstract class ElectrumWalletBase
|
|||
BigintUtils.fromBytes(BytesUtils.fromHexString(unspent.silentPaymentLabel!)),
|
||||
)
|
||||
: silentAddress.B_spend,
|
||||
network: network,
|
||||
);
|
||||
|
||||
final addressRecord = walletAddresses.silentAddresses
|
||||
|
|
@ -562,7 +564,7 @@ abstract class ElectrumWalletBase
|
|||
node!.save();
|
||||
return node!.supportsSilentPayments!;
|
||||
}
|
||||
} on electrum.RequestFailedTimeoutException catch (_) {
|
||||
} on RequestFailedTimeoutException catch (_) {
|
||||
node!.supportsSilentPayments = false;
|
||||
node!.save();
|
||||
return node!.supportsSilentPayments!;
|
||||
|
|
@ -623,9 +625,9 @@ abstract class ElectrumWalletBase
|
|||
|
||||
switch (coinTypeToSpendFrom) {
|
||||
case UnspentCoinType.mweb:
|
||||
return utx.bitcoinAddressRecord.type == SegwitAddressType.mweb;
|
||||
return utx.bitcoinAddressRecord.type == SegwitAddresType.mweb;
|
||||
case UnspentCoinType.nonMweb:
|
||||
return utx.bitcoinAddressRecord.type != SegwitAddressType.mweb;
|
||||
return utx.bitcoinAddressRecord.type != SegwitAddresType.mweb;
|
||||
case UnspentCoinType.any:
|
||||
return true;
|
||||
}
|
||||
|
|
@ -633,7 +635,7 @@ abstract class ElectrumWalletBase
|
|||
final unconfirmedCoins = availableInputs.where((utx) => utx.confirmations == 0).toList();
|
||||
|
||||
// sort the unconfirmed coins so that mweb coins are last:
|
||||
availableInputs.sort((a, b) => a.bitcoinAddressRecord.type == SegwitAddressType.mweb ? 1 : -1);
|
||||
availableInputs.sort((a, b) => a.bitcoinAddressRecord.type == SegwitAddresType.mweb ? 1 : -1);
|
||||
|
||||
for (int i = 0; i < availableInputs.length; i++) {
|
||||
final utx = availableInputs[i];
|
||||
|
|
@ -641,7 +643,7 @@ abstract class ElectrumWalletBase
|
|||
|
||||
if (paysToSilentPayment) {
|
||||
// Check inputs for shared secret derivation
|
||||
if (utx.bitcoinAddressRecord.type == SegwitAddressType.p2wsh) {
|
||||
if (utx.bitcoinAddressRecord.type == SegwitAddresType.p2wsh) {
|
||||
throw BitcoinTransactionSilentPaymentsNotSupported();
|
||||
}
|
||||
}
|
||||
|
|
@ -676,7 +678,7 @@ abstract class ElectrumWalletBase
|
|||
if (privkey != null) {
|
||||
inputPrivKeyInfos.add(ECPrivateInfo(
|
||||
privkey,
|
||||
address.type == SegwitAddressType.p2tr,
|
||||
address.type == SegwitAddresType.p2tr,
|
||||
tweak: !isSilentPayment,
|
||||
));
|
||||
|
||||
|
|
@ -1162,7 +1164,7 @@ abstract class ElectrumWalletBase
|
|||
throw Exception(error);
|
||||
}
|
||||
|
||||
if (utxo.utxo.isP2tr) {
|
||||
if (utxo.utxo.isP2tr()) {
|
||||
hasTaprootInputs = true;
|
||||
return key.privkey.signTapRoot(
|
||||
txDigest,
|
||||
|
|
@ -1174,18 +1176,20 @@ abstract class ElectrumWalletBase
|
|||
}
|
||||
});
|
||||
|
||||
return PendingBitcoinTransaction(transaction, type,
|
||||
electrumClient: electrumClient,
|
||||
amount: estimatedTx.amount,
|
||||
fee: estimatedTx.fee,
|
||||
feeRate: feeRateInt.toString(),
|
||||
network: network,
|
||||
hasChange: estimatedTx.hasChange,
|
||||
isSendAll: estimatedTx.isSendAll,
|
||||
hasTaprootInputs: hasTaprootInputs,
|
||||
utxos: estimatedTx.utxos,
|
||||
publicKeys: estimatedTx.publicKeys)
|
||||
..addListener((transaction) async {
|
||||
return PendingBitcoinTransaction(
|
||||
transaction,
|
||||
type,
|
||||
electrumClient: electrumClient,
|
||||
amount: estimatedTx.amount,
|
||||
fee: estimatedTx.fee,
|
||||
feeRate: feeRateInt.toString(),
|
||||
network: network,
|
||||
hasChange: estimatedTx.hasChange,
|
||||
isSendAll: estimatedTx.isSendAll,
|
||||
hasTaprootInputs: hasTaprootInputs,
|
||||
utxos: estimatedTx.utxos,
|
||||
publicKeys: estimatedTx.publicKeys
|
||||
)..addListener((transaction) async {
|
||||
transactionHistory.addOne(transaction);
|
||||
if (estimatedTx.spendsSilentPayment) {
|
||||
transactionHistory.transactions.values.forEach((tx) {
|
||||
|
|
@ -1229,7 +1233,7 @@ abstract class ElectrumWalletBase
|
|||
'change_address_index': walletAddresses.currentChangeAddressIndexByType,
|
||||
'addresses': walletAddresses.allAddresses.map((addr) => addr.toJSON()).toList(),
|
||||
'address_page_type': walletInfo.addressPageType == null
|
||||
? SegwitAddressType.p2wpkh.toString()
|
||||
? SegwitAddresType.p2wpkh.toString()
|
||||
: walletInfo.addressPageType.toString(),
|
||||
'balance': balance[currency]?.toJSON(),
|
||||
'derivationTypeIndex': walletInfo.derivationInfo?.derivationType?.index,
|
||||
|
|
@ -1369,7 +1373,7 @@ abstract class ElectrumWalletBase
|
|||
List<BitcoinUnspent> updatedUnspentCoins = [];
|
||||
|
||||
final previousUnspentCoins = List<BitcoinUnspent>.from(unspentCoins.where((utxo) =>
|
||||
utxo.bitcoinAddressRecord.type != SegwitAddressType.mweb &&
|
||||
utxo.bitcoinAddressRecord.type != SegwitAddresType.mweb &&
|
||||
utxo.bitcoinAddressRecord is! BitcoinSilentPaymentAddressRecord));
|
||||
|
||||
if (hasSilentPaymentsScanning) {
|
||||
|
|
@ -1383,13 +1387,13 @@ abstract class ElectrumWalletBase
|
|||
|
||||
// Set the balance of all non-silent payment and non-mweb addresses to 0 before updating
|
||||
walletAddresses.allAddresses
|
||||
.where((element) => element.type != SegwitAddressType.mweb)
|
||||
.where((element) => element.type != SegwitAddresType.mweb)
|
||||
.forEach((addr) {
|
||||
if (addr is! BitcoinSilentPaymentAddressRecord) addr.balance = 0;
|
||||
});
|
||||
|
||||
final addressFutures = walletAddresses.allAddresses
|
||||
.where((element) => element.type != SegwitAddressType.mweb)
|
||||
.where((element) => element.type != SegwitAddresType.mweb)
|
||||
.map((address) => fetchUnspent(address))
|
||||
.toList();
|
||||
|
||||
|
|
@ -1830,7 +1834,7 @@ abstract class ElectrumWalletBase
|
|||
throw Exception("Cannot find private key");
|
||||
}
|
||||
|
||||
if (utxo.utxo.isP2tr) {
|
||||
if (utxo.utxo.isP2tr()) {
|
||||
return key.signTapRoot(txDigest, sighash: sighash);
|
||||
} else {
|
||||
return key.signInput(txDigest, sigHash: sighash);
|
||||
|
|
@ -1980,7 +1984,7 @@ abstract class ElectrumWalletBase
|
|||
.map((type) => fetchTransactionsForAddressType(historiesWithDetails, type)));
|
||||
} else if (type == WalletType.litecoin) {
|
||||
await Future.wait(LITECOIN_ADDRESS_TYPES
|
||||
.where((type) => type != SegwitAddressType.mweb)
|
||||
.where((type) => type != SegwitAddresType.mweb)
|
||||
.map((type) => fetchTransactionsForAddressType(historiesWithDetails, type)));
|
||||
}
|
||||
|
||||
|
|
@ -2169,7 +2173,7 @@ abstract class ElectrumWalletBase
|
|||
final unsubscribedScriptHashes = walletAddresses.allAddresses.where(
|
||||
(address) =>
|
||||
!_scripthashesUpdateSubject.containsKey(address.getScriptHash(network)) &&
|
||||
address.type != SegwitAddressType.mweb,
|
||||
address.type != SegwitAddresType.mweb,
|
||||
);
|
||||
|
||||
await Future.wait(unsubscribedScriptHashes.map((address) async {
|
||||
|
|
@ -2392,9 +2396,9 @@ abstract class ElectrumWalletBase
|
|||
derivationPath.substring(0, derivationPath.lastIndexOf("'") + 1);
|
||||
|
||||
@action
|
||||
void _onConnectionStatusChange(electrum.ConnectionStatus status) {
|
||||
void _onConnectionStatusChange(ConnectionStatus status) {
|
||||
switch (status) {
|
||||
case electrum.ConnectionStatus.connected:
|
||||
case ConnectionStatus.connected:
|
||||
if (syncStatus is NotConnectedSyncStatus ||
|
||||
syncStatus is LostConnectionSyncStatus ||
|
||||
syncStatus is ConnectingSyncStatus) {
|
||||
|
|
@ -2402,19 +2406,19 @@ abstract class ElectrumWalletBase
|
|||
}
|
||||
|
||||
break;
|
||||
case electrum.ConnectionStatus.disconnected:
|
||||
case ConnectionStatus.disconnected:
|
||||
if (syncStatus is! NotConnectedSyncStatus &&
|
||||
syncStatus is! ConnectingSyncStatus &&
|
||||
syncStatus is! SyncronizingSyncStatus) {
|
||||
syncStatus = NotConnectedSyncStatus();
|
||||
}
|
||||
break;
|
||||
case electrum.ConnectionStatus.failed:
|
||||
case ConnectionStatus.failed:
|
||||
if (syncStatus is! LostConnectionSyncStatus) {
|
||||
syncStatus = LostConnectionSyncStatus();
|
||||
}
|
||||
break;
|
||||
case electrum.ConnectionStatus.connecting:
|
||||
case ConnectionStatus.connecting:
|
||||
if (syncStatus is! ConnectingSyncStatus) {
|
||||
syncStatus = ConnectingSyncStatus();
|
||||
}
|
||||
|
|
@ -2526,7 +2530,7 @@ class ScanData {
|
|||
final ScanNode? node;
|
||||
final BasedUtxoNetwork network;
|
||||
final int chainTip;
|
||||
final electrum.ElectrumClient electrumClient;
|
||||
final ElectrumClient electrumClient;
|
||||
final List<String> transactionHistoryIds;
|
||||
final Map<String, String> labels;
|
||||
final List<int> labelIndexes;
|
||||
|
|
@ -2570,234 +2574,6 @@ class SyncResponse {
|
|||
SyncResponse(this.height, this.syncStatus);
|
||||
}
|
||||
|
||||
Future<void> _handleScanSilentPayments(ScanData scanData) async {
|
||||
try {
|
||||
// if (scanData.shouldSwitchNodes) {
|
||||
var scanningClient = await ElectrumProvider.connect(
|
||||
ElectrumTCPService.connect(
|
||||
Uri.parse("tcp://electrs.cakewallet.com:50001"),
|
||||
),
|
||||
);
|
||||
// }
|
||||
|
||||
int syncHeight = scanData.height;
|
||||
int initialSyncHeight = syncHeight;
|
||||
|
||||
final receiver = Receiver(
|
||||
scanData.silentAddress.b_scan.toHex(),
|
||||
scanData.silentAddress.B_spend.toHex(),
|
||||
scanData.network == BitcoinNetwork.testnet,
|
||||
scanData.labelIndexes,
|
||||
);
|
||||
|
||||
int getCountToScanPerRequest(int syncHeight) {
|
||||
if (scanData.isSingleScan) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
final amountLeft = scanData.chainTip - syncHeight + 1;
|
||||
return amountLeft;
|
||||
}
|
||||
|
||||
// Initial status UI update, send how many blocks in total to scan
|
||||
scanData.sendPort.send(SyncResponse(syncHeight, StartingScanSyncStatus(syncHeight)));
|
||||
|
||||
final req = ElectrumTweaksSubscribe(
|
||||
height: syncHeight,
|
||||
count: getCountToScanPerRequest(syncHeight),
|
||||
historicalMode: false,
|
||||
);
|
||||
|
||||
var _scanningStream = await scanningClient.subscribe(req);
|
||||
|
||||
void listenFn(Map<String, dynamic> event, ElectrumTweaksSubscribe req) {
|
||||
final response = req.onResponse(event);
|
||||
|
||||
if (response == null || _scanningStream == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
// is success or error msg
|
||||
final noData = response.message != null;
|
||||
|
||||
if (noData) {
|
||||
if (scanData.isSingleScan) {
|
||||
return;
|
||||
}
|
||||
|
||||
// re-subscribe to continue receiving messages, starting from the next unscanned height
|
||||
final nextHeight = syncHeight + 1;
|
||||
|
||||
if (nextHeight <= scanData.chainTip) {
|
||||
final nextStream = scanningClient.subscribe(
|
||||
ElectrumTweaksSubscribe(
|
||||
height: nextHeight,
|
||||
count: getCountToScanPerRequest(nextHeight),
|
||||
historicalMode: false,
|
||||
),
|
||||
);
|
||||
|
||||
if (nextStream != null) {
|
||||
nextStream.listen((event) => listenFn(event, req));
|
||||
} else {
|
||||
scanData.sendPort.send(
|
||||
SyncResponse(scanData.height, LostConnectionSyncStatus()),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
final tweakHeight = response.block;
|
||||
|
||||
if (initialSyncHeight < tweakHeight) initialSyncHeight = tweakHeight;
|
||||
|
||||
// Continuous status UI update, send how many blocks left to scan
|
||||
final syncingStatus = scanData.isSingleScan
|
||||
? SyncingSyncStatus(1, 0)
|
||||
: SyncingSyncStatus.fromHeightValues(scanData.chainTip, initialSyncHeight, tweakHeight);
|
||||
|
||||
scanData.sendPort.send(SyncResponse(syncHeight, syncingStatus));
|
||||
|
||||
try {
|
||||
final blockTweaks = response.blockTweaks;
|
||||
|
||||
for (final txid in blockTweaks.keys) {
|
||||
final tweakData = blockTweaks[txid];
|
||||
final outputPubkeys = tweakData!.outputPubkeys;
|
||||
final tweak = tweakData.tweak;
|
||||
|
||||
try {
|
||||
final addToWallet = {};
|
||||
|
||||
// receivers.forEach((receiver) {
|
||||
// NOTE: scanOutputs, from sp_scanner package, called from rust here
|
||||
final scanResult = scanOutputs([outputPubkeys.keys.toList()], tweak, receiver);
|
||||
|
||||
if (scanResult.isEmpty) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (addToWallet[receiver.BSpend] == null) {
|
||||
addToWallet[receiver.BSpend] = scanResult;
|
||||
} else {
|
||||
addToWallet[receiver.BSpend].addAll(scanResult);
|
||||
}
|
||||
// });
|
||||
|
||||
if (addToWallet.isEmpty) {
|
||||
// no results tx, continue to next tx
|
||||
continue;
|
||||
}
|
||||
|
||||
// initial placeholder ElectrumTransactionInfo object to update values based on new scanned unspent(s) on the following loop
|
||||
final txInfo = ElectrumTransactionInfo(
|
||||
WalletType.bitcoin,
|
||||
id: txid,
|
||||
height: tweakHeight,
|
||||
amount: 0,
|
||||
fee: 0,
|
||||
direction: TransactionDirection.incoming,
|
||||
isReplaced: false,
|
||||
date: DateTime.fromMillisecondsSinceEpoch(
|
||||
DateTime.now().millisecondsSinceEpoch * 1000,
|
||||
),
|
||||
confirmations: scanData.chainTip - tweakHeight + 1,
|
||||
isReceivedSilentPayment: true,
|
||||
isPending: false,
|
||||
unspents: [],
|
||||
);
|
||||
|
||||
List<BitcoinUnspent> unspents = [];
|
||||
|
||||
addToWallet.forEach((BSpend, scanResultPerLabel) {
|
||||
scanResultPerLabel.forEach((label, scanOutput) {
|
||||
final labelValue = label == "None" ? null : label.toString();
|
||||
|
||||
(scanOutput as Map<String, dynamic>).forEach((outputPubkey, tweak) {
|
||||
final t_k = tweak as String;
|
||||
|
||||
final receivingOutputAddress = ECPublic.fromHex(outputPubkey)
|
||||
.toTaprootAddress(tweak: false)
|
||||
.toAddress(scanData.network);
|
||||
|
||||
final matchingOutput = outputPubkeys[outputPubkey]!;
|
||||
final amount = matchingOutput.amount;
|
||||
final pos = matchingOutput.vout;
|
||||
|
||||
// final matchingSPWallet = scanData.silentPaymentsWallets.firstWhere(
|
||||
// (receiver) => receiver.B_spend.toHex() == BSpend.toString(),
|
||||
// );
|
||||
|
||||
// final labelIndex = labelValue != null ? scanData.labels[label] : 0;
|
||||
// final balance = ElectrumBalance();
|
||||
// balance.confirmed = amount;
|
||||
|
||||
final receivedAddressRecord = BitcoinSilentPaymentAddressRecord(
|
||||
receivingOutputAddress,
|
||||
index: 0,
|
||||
isHidden: false,
|
||||
isUsed: true,
|
||||
network: scanData.network,
|
||||
silentPaymentTweak: t_k,
|
||||
type: SegwitAddressType.p2tr,
|
||||
txCount: 1,
|
||||
balance: amount,
|
||||
);
|
||||
|
||||
final unspent = BitcoinSilentPaymentsUnspent(
|
||||
receivedAddressRecord,
|
||||
txid,
|
||||
amount,
|
||||
pos,
|
||||
silentPaymentTweak: t_k,
|
||||
silentPaymentLabel: labelValue,
|
||||
);
|
||||
|
||||
unspents.add(unspent);
|
||||
txInfo.unspents!.add(unspent);
|
||||
txInfo.amount += unspent.value;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
scanData.sendPort.send({txInfo.id: txInfo});
|
||||
} catch (e, stacktrace) {
|
||||
printV(stacktrace);
|
||||
printV(e.toString());
|
||||
}
|
||||
}
|
||||
} catch (e, stacktrace) {
|
||||
printV(stacktrace);
|
||||
printV(e.toString());
|
||||
}
|
||||
|
||||
syncHeight = tweakHeight;
|
||||
|
||||
if ((tweakHeight >= scanData.chainTip) || scanData.isSingleScan) {
|
||||
if (tweakHeight >= scanData.chainTip)
|
||||
scanData.sendPort.send(
|
||||
SyncResponse(syncHeight, SyncedTipSyncStatus(scanData.chainTip)),
|
||||
);
|
||||
|
||||
if (scanData.isSingleScan) {
|
||||
scanData.sendPort.send(SyncResponse(syncHeight, SyncedSyncStatus()));
|
||||
}
|
||||
|
||||
_scanningStream?.close();
|
||||
_scanningStream = null;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
_scanningStream?.listen((event) => listenFn(event, req));
|
||||
} catch (e) {
|
||||
printV("Error in _handleScanSilentPayments: $e");
|
||||
scanData.sendPort.send(SyncResponse(scanData.height, LostConnectionSyncStatus()));
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> startRefresh(ScanData scanData) async {
|
||||
int syncHeight = scanData.height;
|
||||
int initialSyncHeight = syncHeight;
|
||||
|
|
@ -2810,7 +2586,7 @@ Future<void> startRefresh(ScanData scanData) async {
|
|||
useSSL: scanData.node?.useSSL ?? false,
|
||||
);
|
||||
|
||||
int getCountToScanPerRequest(int syncHeight) {
|
||||
int getCountPerRequest(int syncHeight) {
|
||||
if (scanData.isSingleScan) {
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -2825,10 +2601,11 @@ Future<void> startRefresh(ScanData scanData) async {
|
|||
scanData.silentAddress.B_spend.toHex(),
|
||||
scanData.network == BitcoinNetwork.testnet,
|
||||
scanData.labelIndexes,
|
||||
scanData.labelIndexes.length,
|
||||
);
|
||||
|
||||
// Initial status UI update, send how many blocks in total to scan
|
||||
final initialCount = getCountToScanPerRequest(syncHeight);
|
||||
final initialCount = getCountPerRequest(syncHeight);
|
||||
scanData.sendPort.send(SyncResponse(syncHeight, StartingScanSyncStatus(syncHeight)));
|
||||
|
||||
tweaksSubscription = await electrumClient.tweaksSubscribe(
|
||||
|
|
@ -2839,24 +2616,22 @@ Future<void> startRefresh(ScanData scanData) async {
|
|||
Future<void> listenFn(t) async {
|
||||
final tweaks = t as Map<String, dynamic>;
|
||||
final msg = tweaks["message"];
|
||||
|
||||
// is success or error msg
|
||||
// success or error msg
|
||||
final noData = msg != null;
|
||||
|
||||
if (noData) {
|
||||
if (scanData.isSingleScan) {
|
||||
return;
|
||||
}
|
||||
|
||||
// re-subscribe to continue receiving messages, starting from the next unscanned height
|
||||
final nextHeight = syncHeight + 1;
|
||||
final nextCount = getCountPerRequest(nextHeight);
|
||||
|
||||
if (nextHeight <= scanData.chainTip) {
|
||||
final nextStream = electrumClient.tweaksSubscribe(
|
||||
if (nextCount > 0) {
|
||||
tweaksSubscription?.close();
|
||||
|
||||
final nextTweaksSubscription = electrumClient.tweaksSubscribe(
|
||||
height: nextHeight,
|
||||
count: getCountToScanPerRequest(nextHeight),
|
||||
count: nextCount,
|
||||
);
|
||||
nextStream?.listen(listenFn);
|
||||
nextTweaksSubscription?.listen(listenFn);
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
@ -2938,7 +2713,7 @@ Future<void> startRefresh(ScanData scanData) async {
|
|||
isUsed: true,
|
||||
network: scanData.network,
|
||||
silentPaymentTweak: t_k,
|
||||
type: SegwitAddressType.p2tr,
|
||||
type: SegwitAddresType.p2tr,
|
||||
txCount: 1,
|
||||
balance: amount!,
|
||||
);
|
||||
|
|
@ -3031,15 +2806,15 @@ BitcoinAddressType _getScriptType(BitcoinBaseAddress type) {
|
|||
} else if (type is P2shAddress) {
|
||||
return P2shAddressType.p2wpkhInP2sh;
|
||||
} else if (type is P2wshAddress) {
|
||||
return SegwitAddressType.p2wsh;
|
||||
return SegwitAddresType.p2wsh;
|
||||
} else if (type is P2trAddress) {
|
||||
return SegwitAddressType.p2tr;
|
||||
return SegwitAddresType.p2tr;
|
||||
} else if (type is MwebAddress) {
|
||||
return SegwitAddressType.mweb;
|
||||
return SegwitAddresType.mweb;
|
||||
} else if (type is SilentPaymentsAddresType) {
|
||||
return SilentPaymentsAddresType.p2sp;
|
||||
} else {
|
||||
return SegwitAddressType.p2wpkh;
|
||||
return SegwitAddresType.p2wpkh;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@ part 'electrum_wallet_addresses.g.dart';
|
|||
class ElectrumWalletAddresses = ElectrumWalletAddressesBase with _$ElectrumWalletAddresses;
|
||||
|
||||
const List<BitcoinAddressType> BITCOIN_ADDRESS_TYPES = [
|
||||
SegwitAddressType.p2wpkh,
|
||||
SegwitAddresType.p2wpkh,
|
||||
P2pkhAddressType.p2pkh,
|
||||
SegwitAddressType.p2tr,
|
||||
SegwitAddressType.p2wsh,
|
||||
SegwitAddresType.p2tr,
|
||||
SegwitAddresType.p2wsh,
|
||||
P2shAddressType.p2wpkhInP2sh,
|
||||
];
|
||||
|
||||
const List<BitcoinAddressType> LITECOIN_ADDRESS_TYPES = [
|
||||
SegwitAddressType.p2wpkh,
|
||||
SegwitAddressType.mweb,
|
||||
SegwitAddresType.p2wpkh,
|
||||
SegwitAddresType.mweb,
|
||||
];
|
||||
|
||||
const List<BitcoinAddressType> BITCOIN_CASH_ADDRESS_TYPES = [
|
||||
|
|
@ -62,7 +62,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
_addressPageType = initialAddressPageType ??
|
||||
(walletInfo.addressPageType != null
|
||||
? BitcoinAddressType.fromValue(walletInfo.addressPageType!)
|
||||
: SegwitAddressType.p2wpkh),
|
||||
: SegwitAddresType.p2wpkh),
|
||||
silentAddresses = ObservableList<BitcoinSilentPaymentAddressRecord>.of(
|
||||
(initialSilentAddresses ?? []).toSet()),
|
||||
currentSilentAddressIndex = initialSilentAddressIndex,
|
||||
|
|
@ -71,12 +71,9 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
super(walletInfo) {
|
||||
if (masterHd != null) {
|
||||
silentAddress = SilentPaymentOwner.fromPrivateKeys(
|
||||
b_scan: ECPrivate.fromHex(
|
||||
masterHd.derivePath("m/352'/1'/0'/1'/0").privateKey.toHex(),
|
||||
),
|
||||
b_spend: ECPrivate.fromHex(
|
||||
masterHd.derivePath("m/352'/1'/0'/0'/0").privateKey.toHex(),
|
||||
),
|
||||
b_scan: ECPrivate.fromHex(masterHd.derivePath(SCAN_PATH).privateKey.toHex()),
|
||||
b_spend: ECPrivate.fromHex(masterHd.derivePath(SPEND_PATH).privateKey.toHex()),
|
||||
network: network,
|
||||
);
|
||||
|
||||
if (silentAddresses.length == 0) {
|
||||
|
|
@ -147,13 +144,12 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
return silentAddress.toString();
|
||||
}
|
||||
|
||||
final typeMatchingAddresses =
|
||||
_addresses.where((addr) => !addr.isHidden && _isAddressPageTypeMatch(addr)).toList();
|
||||
final typeMatchingReceiveAddresses =
|
||||
typeMatchingAddresses.where((addr) => !addr.isUsed).toList();
|
||||
final typeMatchingAddresses = _addresses.where((addr) => !addr.isHidden && _isAddressPageTypeMatch(addr)).toList();
|
||||
final typeMatchingReceiveAddresses = typeMatchingAddresses.where((addr) => !addr.isUsed).toList();
|
||||
|
||||
if (!isEnabledAutoGenerateSubaddress) {
|
||||
if (previousAddressRecord != null && previousAddressRecord!.type == addressPageType) {
|
||||
if (previousAddressRecord != null &&
|
||||
previousAddressRecord!.type == addressPageType) {
|
||||
return previousAddressRecord!.address;
|
||||
}
|
||||
|
||||
|
|
@ -253,17 +249,17 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
if (walletInfo.type == WalletType.bitcoinCash) {
|
||||
await _generateInitialAddresses(type: P2pkhAddressType.p2pkh);
|
||||
} else if (walletInfo.type == WalletType.litecoin) {
|
||||
await _generateInitialAddresses(type: SegwitAddressType.p2wpkh);
|
||||
await _generateInitialAddresses(type: SegwitAddresType.p2wpkh);
|
||||
if ((Platform.isAndroid || Platform.isIOS) && !isHardwareWallet) {
|
||||
await _generateInitialAddresses(type: SegwitAddressType.mweb);
|
||||
await _generateInitialAddresses(type: SegwitAddresType.mweb);
|
||||
}
|
||||
} else if (walletInfo.type == WalletType.bitcoin) {
|
||||
await _generateInitialAddresses();
|
||||
if (!isHardwareWallet) {
|
||||
await _generateInitialAddresses(type: P2pkhAddressType.p2pkh);
|
||||
await _generateInitialAddresses(type: P2shAddressType.p2wpkhInP2sh);
|
||||
await _generateInitialAddresses(type: SegwitAddressType.p2tr);
|
||||
await _generateInitialAddresses(type: SegwitAddressType.p2wsh);
|
||||
await _generateInitialAddresses(type: SegwitAddresType.p2tr);
|
||||
await _generateInitialAddresses(type: SegwitAddresType.p2wsh);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -327,7 +323,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
BaseBitcoinAddressRecord generateNewAddress({String label = ''}) {
|
||||
if (addressPageType == SilentPaymentsAddresType.p2sp && silentAddress != null) {
|
||||
final currentSilentAddressIndex = silentAddresses
|
||||
.where((addressRecord) => addressRecord.type != SegwitAddressType.p2tr)
|
||||
.where((addressRecord) => addressRecord.type != SegwitAddresType.p2tr)
|
||||
.length -
|
||||
1;
|
||||
|
||||
|
|
@ -385,7 +381,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
void addBitcoinAddressTypes() {
|
||||
final lastP2wpkh = _addresses
|
||||
.where((addressRecord) =>
|
||||
_isUnusedReceiveAddressByType(addressRecord, SegwitAddressType.p2wpkh))
|
||||
_isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2wpkh))
|
||||
.toList()
|
||||
.last;
|
||||
if (lastP2wpkh.address != address) {
|
||||
|
|
@ -411,7 +407,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
}
|
||||
|
||||
final lastP2tr = _addresses.firstWhere(
|
||||
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddressType.p2tr));
|
||||
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2tr));
|
||||
if (lastP2tr.address != address) {
|
||||
addressesMap[lastP2tr.address] = 'P2TR';
|
||||
} else {
|
||||
|
|
@ -419,7 +415,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
}
|
||||
|
||||
final lastP2wsh = _addresses.firstWhere(
|
||||
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddressType.p2wsh));
|
||||
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2wsh));
|
||||
if (lastP2wsh.address != address) {
|
||||
addressesMap[lastP2wsh.address] = 'P2WSH';
|
||||
} else {
|
||||
|
|
@ -444,7 +440,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
void addLitecoinAddressTypes() {
|
||||
final lastP2wpkh = _addresses
|
||||
.where((addressRecord) =>
|
||||
_isUnusedReceiveAddressByType(addressRecord, SegwitAddressType.p2wpkh))
|
||||
_isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.p2wpkh))
|
||||
.toList()
|
||||
.last;
|
||||
if (lastP2wpkh.address != address) {
|
||||
|
|
@ -454,7 +450,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
}
|
||||
|
||||
final lastMweb = _addresses.firstWhere(
|
||||
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddressType.mweb));
|
||||
(addressRecord) => _isUnusedReceiveAddressByType(addressRecord, SegwitAddresType.mweb));
|
||||
if (lastMweb.address != address) {
|
||||
addressesMap[lastMweb.address] = 'MWEB';
|
||||
} else {
|
||||
|
|
@ -564,14 +560,14 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
addressRecord.isHidden &&
|
||||
!addressRecord.isUsed &&
|
||||
// TODO: feature to change change address type. For now fixed to p2wpkh, the cheapest type
|
||||
(walletInfo.type != WalletType.bitcoin || addressRecord.type == SegwitAddressType.p2wpkh));
|
||||
(walletInfo.type != WalletType.bitcoin || addressRecord.type == SegwitAddresType.p2wpkh));
|
||||
changeAddresses.addAll(newAddresses);
|
||||
}
|
||||
|
||||
@action
|
||||
Future<void> discoverAddresses(List<BitcoinAddressRecord> addressList, bool isHidden,
|
||||
Future<String?> Function(BitcoinAddressRecord) getAddressHistory,
|
||||
{BitcoinAddressType type = SegwitAddressType.p2wpkh}) async {
|
||||
{BitcoinAddressType type = SegwitAddresType.p2wpkh}) async {
|
||||
final newAddresses = await _createNewAddresses(gap,
|
||||
startIndex: addressList.length, isHidden: isHidden, type: type);
|
||||
addAddresses(newAddresses);
|
||||
|
|
@ -585,7 +581,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
}
|
||||
|
||||
Future<void> _generateInitialAddresses(
|
||||
{BitcoinAddressType type = SegwitAddressType.p2wpkh}) async {
|
||||
{BitcoinAddressType type = SegwitAddresType.p2wpkh}) async {
|
||||
var countOfReceiveAddresses = 0;
|
||||
var countOfHiddenAddresses = 0;
|
||||
|
||||
|
|
@ -662,7 +658,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
|
||||
void _validateAddresses() {
|
||||
_addresses.forEach((element) async {
|
||||
if (element.type == SegwitAddressType.mweb) {
|
||||
if (element.type == SegwitAddresType.mweb) {
|
||||
// this would add a ton of startup lag for mweb addresses since we have 1000 of them
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,8 +87,8 @@ class ElectrumWalletSnapshot {
|
|||
|
||||
final balance = ElectrumBalance.fromJSON(data['balance'] as String?) ??
|
||||
ElectrumBalance(confirmed: 0, unconfirmed: 0, frozen: 0);
|
||||
var regularAddressIndexByType = {SegwitAddressType.p2wpkh.toString(): 0};
|
||||
var changeAddressIndexByType = {SegwitAddressType.p2wpkh.toString(): 0};
|
||||
var regularAddressIndexByType = {SegwitAddresType.p2wpkh.toString(): 0};
|
||||
var changeAddressIndexByType = {SegwitAddresType.p2wpkh.toString(): 0};
|
||||
var silentAddressIndex = 0;
|
||||
|
||||
final derivationType = DerivationType
|
||||
|
|
@ -97,10 +97,10 @@ class ElectrumWalletSnapshot {
|
|||
|
||||
try {
|
||||
regularAddressIndexByType = {
|
||||
SegwitAddressType.p2wpkh.toString(): int.parse(data['account_index'] as String? ?? '0')
|
||||
SegwitAddresType.p2wpkh.toString(): int.parse(data['account_index'] as String? ?? '0')
|
||||
};
|
||||
changeAddressIndexByType = {
|
||||
SegwitAddressType.p2wpkh.toString():
|
||||
SegwitAddresType.p2wpkh.toString():
|
||||
int.parse(data['change_address_index'] as String? ?? '0')
|
||||
};
|
||||
silentAddressIndex = int.parse(data['silent_address_index'] as String? ?? '0');
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import 'package:fixnum/fixnum.dart';
|
|||
import 'package:bip39/bip39.dart' as bip39;
|
||||
import 'package:bitcoin_base/bitcoin_base.dart';
|
||||
import 'package:blockchain_utils/blockchain_utils.dart';
|
||||
import 'package:blockchain_utils/signer/ecdsa_signing_key.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_address_record.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
|
||||
|
|
@ -970,9 +971,9 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
|
|||
List<ECPrivateInfo>? inputPrivKeyInfos,
|
||||
List<Outpoint>? vinOutpoints,
|
||||
}) async {
|
||||
bool spendsMweb = utxos.any((utxo) => utxo.utxo.scriptType == SegwitAddressType.mweb);
|
||||
bool spendsMweb = utxos.any((utxo) => utxo.utxo.scriptType == SegwitAddresType.mweb);
|
||||
bool paysToMweb = outputs
|
||||
.any((output) => output.toOutput.scriptPubKey.getAddressType() == SegwitAddressType.mweb);
|
||||
.any((output) => output.toOutput.scriptPubKey.getAddressType() == SegwitAddresType.mweb);
|
||||
|
||||
bool isRegular = !spendsMweb && !paysToMweb;
|
||||
bool isMweb = spendsMweb || paysToMweb;
|
||||
|
|
@ -1063,9 +1064,9 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
|
|||
tx.isMweb = mwebEnabled;
|
||||
|
||||
if (!mwebEnabled) {
|
||||
tx.changeAddressOverride = (await (walletAddresses as LitecoinWalletAddresses)
|
||||
.getChangeAddress(coinTypeToSpendFrom: UnspentCoinType.nonMweb))
|
||||
.address;
|
||||
tx.changeAddressOverride =
|
||||
(await (walletAddresses as LitecoinWalletAddresses).getChangeAddress(coinTypeToSpendFrom: UnspentCoinType.nonMweb))
|
||||
.address;
|
||||
return tx;
|
||||
}
|
||||
await waitForMwebAddresses();
|
||||
|
|
@ -1107,7 +1108,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
|
|||
|
||||
// check if mweb inputs are used:
|
||||
for (final utxo in tx.utxos) {
|
||||
if (utxo.utxo.scriptType == SegwitAddressType.mweb) {
|
||||
if (utxo.utxo.scriptType == SegwitAddresType.mweb) {
|
||||
hasMwebInput = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1118,9 +1119,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
|
|||
bool isRegular = !hasMwebInput && !hasMwebOutput;
|
||||
bool shouldNotUseMwebChange = isPegIn || isRegular || !hasMwebInput;
|
||||
tx.changeAddressOverride = (await (walletAddresses as LitecoinWalletAddresses)
|
||||
.getChangeAddress(
|
||||
coinTypeToSpendFrom:
|
||||
shouldNotUseMwebChange ? UnspentCoinType.nonMweb : UnspentCoinType.any))
|
||||
.getChangeAddress(coinTypeToSpendFrom: shouldNotUseMwebChange ? UnspentCoinType.nonMweb : UnspentCoinType.any))
|
||||
.address;
|
||||
if (isRegular) {
|
||||
tx.isMweb = false;
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
|
|||
.map((e) => BitcoinAddressRecord(
|
||||
e.value,
|
||||
index: e.key,
|
||||
type: SegwitAddressType.mweb,
|
||||
type: SegwitAddresType.mweb,
|
||||
network: network,
|
||||
))
|
||||
.toList();
|
||||
|
|
@ -128,7 +128,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
|
|||
required Bip32Slip10Secp256k1 hd,
|
||||
BitcoinAddressType? addressType,
|
||||
}) {
|
||||
if (addressType == SegwitAddressType.mweb) {
|
||||
if (addressType == SegwitAddresType.mweb) {
|
||||
return hd == sideHd ? mwebAddrs[0] : mwebAddrs[index + 1];
|
||||
}
|
||||
return generateP2WPKHAddress(hd: hd, index: index, network: network);
|
||||
|
|
@ -140,7 +140,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
|
|||
required Bip32Slip10Secp256k1 hd,
|
||||
BitcoinAddressType? addressType,
|
||||
}) async {
|
||||
if (addressType == SegwitAddressType.mweb) {
|
||||
if (addressType == SegwitAddresType.mweb) {
|
||||
await ensureMwebAddressUpToIndexExists(index);
|
||||
}
|
||||
return getAddress(index: index, hd: hd, addressType: addressType);
|
||||
|
|
@ -195,7 +195,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
|
|||
return BitcoinAddressRecord(
|
||||
mwebAddrs[0],
|
||||
index: 0,
|
||||
type: SegwitAddressType.mweb,
|
||||
type: SegwitAddresType.mweb,
|
||||
network: network,
|
||||
);
|
||||
}
|
||||
|
|
@ -207,7 +207,7 @@ abstract class LitecoinWalletAddressesBase extends ElectrumWalletAddresses with
|
|||
String get addressForExchange {
|
||||
// don't use mweb addresses for exchange refund address:
|
||||
final addresses = receiveAddresses
|
||||
.where((element) => element.type == SegwitAddressType.p2wpkh && !element.isUsed);
|
||||
.where((element) => element.type == SegwitAddresType.p2wpkh && !element.isUsed);
|
||||
return addresses.first.address;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ class PayjoinManager {
|
|||
'https://ohttp.cakewallet.com',
|
||||
];
|
||||
|
||||
static Future<PayjoinUri.Url> randomOhttpRelayUrl() =>
|
||||
PayjoinUri.Url.fromStr(ohttpRelayUrls[Random.secure().nextInt(ohttpRelayUrls.length)]);
|
||||
static Future<PayjoinUri.Url> randomOhttpRelayUrl() => PayjoinUri.Url.fromStr(
|
||||
ohttpRelayUrls[Random.secure().nextInt(ohttpRelayUrls.length)]);
|
||||
|
||||
static const payjoinDirectoryUrl = 'https://payjo.in';
|
||||
|
||||
|
|
@ -59,7 +59,8 @@ class PayjoinManager {
|
|||
Future<Sender> initSender(
|
||||
String pjUriString, String originalPsbt, int networkFeesSatPerVb) async {
|
||||
try {
|
||||
final pjUri = (await PayjoinUri.Uri.fromStr(pjUriString)).checkPjSupported();
|
||||
final pjUri =
|
||||
(await PayjoinUri.Uri.fromStr(pjUriString)).checkPjSupported();
|
||||
final minFeeRateSatPerKwu = BigInt.from(networkFeesSatPerVb * 250);
|
||||
final senderBuilder = await SenderBuilder.fromPsbtAndUri(
|
||||
psbtBase64: originalPsbt,
|
||||
|
|
@ -78,7 +79,8 @@ class PayjoinManager {
|
|||
bool isTestnet = false,
|
||||
}) async {
|
||||
final pjUri = Uri.parse(pjUrl).queryParameters['pj']!;
|
||||
await _payjoinStorage.insertSenderSession(sender, pjUri, _wallet.id, amount);
|
||||
await _payjoinStorage.insertSenderSession(
|
||||
sender, pjUri, _wallet.id, amount);
|
||||
|
||||
return _spawnSender(isTestnet: isTestnet, sender: sender, pjUri: pjUri);
|
||||
}
|
||||
|
|
@ -138,9 +140,11 @@ class PayjoinManager {
|
|||
return completer.future;
|
||||
}
|
||||
|
||||
Future<Receiver> initReceiver(String address, [bool isTestnet = false]) async {
|
||||
Future<Receiver> initReceiver(String address,
|
||||
[bool isTestnet = false]) async {
|
||||
try {
|
||||
final payjoinDirectory = await PayjoinUri.Url.fromStr(payjoinDirectoryUrl);
|
||||
final payjoinDirectory =
|
||||
await PayjoinUri.Url.fromStr(payjoinDirectoryUrl);
|
||||
|
||||
final ohttpKeys = await PayjoinUri.fetchOhttpKeys(
|
||||
ohttpRelay: await randomOhttpRelayUrl(),
|
||||
|
|
@ -195,7 +199,8 @@ class PayjoinManager {
|
|||
_payjoinStorage.markReceiverSessionInProgress(receiver.id());
|
||||
|
||||
final inputScript = message['input_script'] as Uint8List;
|
||||
final isOwned = _wallet.isMine(Script.fromRaw(bytes: inputScript));
|
||||
final isOwned =
|
||||
_wallet.isMine(Script.fromRaw(byteData: inputScript));
|
||||
mainToIsolateSendPort?.send({
|
||||
'requestId': message['requestId'],
|
||||
'result': isOwned,
|
||||
|
|
@ -204,7 +209,8 @@ class PayjoinManager {
|
|||
|
||||
case PayjoinReceiverRequestTypes.checkIsReceiverOutput:
|
||||
final outputScript = message['output_script'] as Uint8List;
|
||||
final isReceiverOutput = _wallet.isMine(Script.fromRaw(bytes: outputScript));
|
||||
final isReceiverOutput =
|
||||
_wallet.isMine(Script.fromRaw(byteData: outputScript));
|
||||
mainToIsolateSendPort?.send({
|
||||
'requestId': message['requestId'],
|
||||
'result': isReceiverOutput,
|
||||
|
|
@ -237,13 +243,15 @@ class PayjoinManager {
|
|||
}
|
||||
} catch (e) {
|
||||
_cleanupSession(receiver.id());
|
||||
await _payjoinStorage.markReceiverSessionUnrecoverable(receiver.id(), e.toString());
|
||||
await _payjoinStorage.markReceiverSessionUnrecoverable(
|
||||
receiver.id(), e.toString());
|
||||
completer.completeError(e);
|
||||
}
|
||||
} else if (message is PayjoinSessionError) {
|
||||
_cleanupSession(receiver.id());
|
||||
if (message is UnrecoverableError) {
|
||||
await _payjoinStorage.markReceiverSessionUnrecoverable(receiver.id(), message.message);
|
||||
await _payjoinStorage.markReceiverSessionUnrecoverable(
|
||||
receiver.id(), message.message);
|
||||
completer.complete();
|
||||
} else if (message is RecoverableError) {
|
||||
completer.complete();
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ extension PsbtSigner on PsbtV2 {
|
|||
return tx.buffer();
|
||||
}
|
||||
|
||||
Future<void> signWithUTXO(List<UtxoWithPrivateKey> utxos, UTXOSignerCallBack signer,
|
||||
Future<void> signWithUTXO(
|
||||
List<UtxoWithPrivateKey> utxos, UTXOSignerCallBack signer,
|
||||
[UTXOGetterCallBack? getTaprootPair]) async {
|
||||
final raw = BytesUtils.toHexString(extractUnsignedTX(getSegwit: false));
|
||||
final tx = BtcTransaction.fromRaw(raw);
|
||||
|
|
@ -50,10 +51,10 @@ extension PsbtSigner on PsbtV2 {
|
|||
List<BigInt> taprootAmounts = [];
|
||||
List<Script> taprootScripts = [];
|
||||
|
||||
if (utxos.any((e) => e.utxo.isP2tr)) {
|
||||
if (utxos.any((e) => e.utxo.isP2tr())) {
|
||||
for (final input in tx.inputs) {
|
||||
final utxo = utxos
|
||||
.firstWhereOrNull((u) => u.utxo.txHash == input.txId && u.utxo.vout == input.txIndex);
|
||||
final utxo = utxos.firstWhereOrNull(
|
||||
(u) => u.utxo.txHash == input.txId && u.utxo.vout == input.txIndex);
|
||||
|
||||
if (utxo == null) {
|
||||
final trPair = await getTaprootPair!.call(input.txId, input.txIndex);
|
||||
|
|
@ -75,29 +76,37 @@ extension PsbtSigner on PsbtV2 {
|
|||
/// We receive the owner's ScriptPubKey
|
||||
final script = _findLockingScript(utxo, false);
|
||||
|
||||
final int sighash =
|
||||
utxo.utxo.isP2tr ? BitcoinOpCodeConst.sighashDefault : BitcoinOpCodeConst.sighashAll;
|
||||
final int sighash = utxo.utxo.isP2tr()
|
||||
? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
|
||||
: BitcoinOpCodeConst.SIGHASH_ALL;
|
||||
|
||||
/// We generate transaction digest for current input
|
||||
final digest =
|
||||
_generateTransactionDigest(script, i, utxo.utxo, tx, taprootAmounts, taprootScripts);
|
||||
final digest = _generateTransactionDigest(
|
||||
script, i, utxo.utxo, tx, taprootAmounts, taprootScripts);
|
||||
|
||||
/// now we need sign the transaction digest
|
||||
final sig = signer(digest, utxo, utxo.privateKey, sighash);
|
||||
|
||||
if (utxo.utxo.isP2tr) {
|
||||
if (utxo.utxo.isP2tr()) {
|
||||
setInputTapKeySig(i, Uint8List.fromList(BytesUtils.fromHexString(sig)));
|
||||
} else {
|
||||
setInputPartialSig(i, Uint8List.fromList(BytesUtils.fromHexString(utxo.public().toHex())),
|
||||
setInputPartialSig(
|
||||
i,
|
||||
Uint8List.fromList(BytesUtils.fromHexString(utxo.public().toHex())),
|
||||
Uint8List.fromList(BytesUtils.fromHexString(sig)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<int> _generateTransactionDigest(Script scriptPubKeys, int input, BitcoinUtxo utxo,
|
||||
BtcTransaction transaction, List<BigInt> taprootAmounts, List<Script> tapRootPubKeys) {
|
||||
if (utxo.isSegwit) {
|
||||
if (utxo.isP2tr) {
|
||||
List<int> _generateTransactionDigest(
|
||||
Script scriptPubKeys,
|
||||
int input,
|
||||
BitcoinUtxo utxo,
|
||||
BtcTransaction transaction,
|
||||
List<BigInt> taprootAmounts,
|
||||
List<Script> tapRootPubKeys) {
|
||||
if (utxo.isSegwit()) {
|
||||
if (utxo.isP2tr()) {
|
||||
return transaction.getTransactionTaprootDigset(
|
||||
txIndex: input,
|
||||
scriptPubKeys: tapRootPubKeys,
|
||||
|
|
@ -107,7 +116,8 @@ extension PsbtSigner on PsbtV2 {
|
|||
return transaction.getTransactionSegwitDigit(
|
||||
txInIndex: input, script: scriptPubKeys, amount: utxo.value);
|
||||
}
|
||||
return transaction.getTransactionDigest(txInIndex: input, script: scriptPubKeys);
|
||||
return transaction.getTransactionDigest(
|
||||
txInIndex: input, script: scriptPubKeys);
|
||||
}
|
||||
|
||||
Script _findLockingScript(UtxoWithAddress utxo, bool isTaproot) {
|
||||
|
|
@ -119,23 +129,23 @@ extension PsbtSigner on PsbtV2 {
|
|||
switch (utxo.utxo.scriptType) {
|
||||
case PubKeyAddressType.p2pk:
|
||||
return senderPub.toRedeemScript();
|
||||
case SegwitAddressType.p2wsh:
|
||||
case SegwitAddresType.p2wsh:
|
||||
if (isTaproot) {
|
||||
return senderPub.toP2wshAddress().toScriptPubKey();
|
||||
}
|
||||
return senderPub.toP2wshRedeemScript();
|
||||
case P2pkhAddressType.p2pkh:
|
||||
return senderPub.toP2pkhAddress().toScriptPubKey();
|
||||
case SegwitAddressType.p2wpkh:
|
||||
case SegwitAddresType.p2wpkh:
|
||||
if (isTaproot) {
|
||||
return senderPub.toP2wpkhAddress().toScriptPubKey();
|
||||
}
|
||||
return senderPub.toP2pkhAddress().toScriptPubKey();
|
||||
case SegwitAddressType.p2tr:
|
||||
case SegwitAddresType.p2tr:
|
||||
return senderPub
|
||||
.toTaprootAddress(tweak: utxo.utxo.isSilentPayment != true)
|
||||
.toScriptPubKey();
|
||||
case SegwitAddressType.mweb:
|
||||
case SegwitAddresType.mweb:
|
||||
return Script(script: []);
|
||||
case P2shAddressType.p2pkhInP2sh:
|
||||
if (isTaproot) {
|
||||
|
|
@ -162,10 +172,11 @@ extension PsbtSigner on PsbtV2 {
|
|||
}
|
||||
}
|
||||
|
||||
typedef UTXOSignerCallBack = String Function(
|
||||
List<int> trDigest, UtxoWithAddress utxo, ECPrivate privateKey, int sighash);
|
||||
typedef UTXOSignerCallBack = String Function(List<int> trDigest,
|
||||
UtxoWithAddress utxo, ECPrivate privateKey, int sighash);
|
||||
|
||||
typedef UTXOGetterCallBack = Future<TaprootAmountScriptPair> Function(String txId, int vout);
|
||||
typedef UTXOGetterCallBack = Future<TaprootAmountScriptPair> Function(
|
||||
String txId, int vout);
|
||||
|
||||
class TaprootAmountScriptPair {
|
||||
final BigInt value;
|
||||
|
|
@ -205,17 +216,23 @@ class UtxoWithPrivateKey extends UtxoWithAddress {
|
|||
}
|
||||
|
||||
return UtxoWithPrivateKey(
|
||||
utxo: input.utxo, ownerDetails: input.ownerDetails, privateKey: key.privkey);
|
||||
utxo: input.utxo,
|
||||
ownerDetails: input.ownerDetails,
|
||||
privateKey: key.privkey);
|
||||
}
|
||||
|
||||
factory UtxoWithPrivateKey.fromUnspent(BitcoinUnspent input, BitcoinWalletBase wallet) {
|
||||
final address = RegexUtils.addressTypeFromStr(input.address, BitcoinNetwork.mainnet);
|
||||
factory UtxoWithPrivateKey.fromUnspent(
|
||||
BitcoinUnspent input, BitcoinWalletBase wallet) {
|
||||
final address =
|
||||
RegexUtils.addressTypeFromStr(input.address, BitcoinNetwork.mainnet);
|
||||
|
||||
final newHd = input.bitcoinAddressRecord.isHidden ? wallet.sideHd : wallet.hd;
|
||||
final newHd =
|
||||
input.bitcoinAddressRecord.isHidden ? wallet.sideHd : wallet.hd;
|
||||
|
||||
ECPrivate privkey;
|
||||
if (input.bitcoinAddressRecord is BitcoinSilentPaymentAddressRecord) {
|
||||
final unspentAddress = input.bitcoinAddressRecord as BitcoinSilentPaymentAddressRecord;
|
||||
final unspentAddress =
|
||||
input.bitcoinAddressRecord as BitcoinSilentPaymentAddressRecord;
|
||||
privkey = wallet.walletAddresses.silentAddress!.b_spend.tweakAdd(
|
||||
BigintUtils.fromBytes(
|
||||
BytesUtils.fromHexString(unspentAddress.silentPaymentTweak!),
|
||||
|
|
@ -223,7 +240,9 @@ class UtxoWithPrivateKey extends UtxoWithAddress {
|
|||
);
|
||||
} else {
|
||||
privkey = generateECPrivate(
|
||||
hd: newHd, index: input.bitcoinAddressRecord.index, network: BitcoinNetwork.mainnet);
|
||||
hd: newHd,
|
||||
index: input.bitcoinAddressRecord.index,
|
||||
network: BitcoinNetwork.mainnet);
|
||||
}
|
||||
|
||||
return UtxoWithPrivateKey(
|
||||
|
|
@ -232,7 +251,8 @@ class UtxoWithPrivateKey extends UtxoWithAddress {
|
|||
value: BigInt.from(input.value),
|
||||
vout: input.vout,
|
||||
scriptType: input.bitcoinAddressRecord.type,
|
||||
isSilentPayment: input.bitcoinAddressRecord is BitcoinSilentPaymentAddressRecord,
|
||||
isSilentPayment:
|
||||
input.bitcoinAddressRecord is BitcoinSilentPaymentAddressRecord,
|
||||
),
|
||||
ownerDetails: UtxoAddressDetails(
|
||||
publicKey: privkey.getPublic().toHex(),
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@ class PSBTTransactionBuild {
|
|||
final PsbtV2 psbt = PsbtV2();
|
||||
|
||||
PSBTTransactionBuild(
|
||||
{required List<PSBTReadyUtxoWithAddress> inputs,
|
||||
required List<BitcoinBaseOutput> outputs,
|
||||
bool enableRBF = true}) {
|
||||
{required List<PSBTReadyUtxoWithAddress> inputs, required List<BitcoinBaseOutput> outputs, bool enableRBF = true}) {
|
||||
psbt.setGlobalTxVersion(2);
|
||||
psbt.setGlobalInputCount(inputs.length);
|
||||
psbt.setGlobalOutputCount(outputs.length);
|
||||
|
|
@ -19,20 +17,20 @@ class PSBTTransactionBuild {
|
|||
for (var i = 0; i < inputs.length; i++) {
|
||||
final input = inputs[i];
|
||||
|
||||
printV(input.utxo.isP2tr);
|
||||
printV(input.utxo.isSegwit);
|
||||
printV(input.utxo.isP2shSegwit);
|
||||
printV(input.utxo.isP2tr());
|
||||
printV(input.utxo.isSegwit());
|
||||
printV(input.utxo.isP2shSegwit());
|
||||
|
||||
psbt.setInputPreviousTxId(
|
||||
i, Uint8List.fromList(hex.decode(input.utxo.txHash).reversed.toList()));
|
||||
psbt.setInputPreviousTxId(i, Uint8List.fromList(hex.decode(input.utxo.txHash).reversed.toList()));
|
||||
psbt.setInputOutputIndex(i, input.utxo.vout);
|
||||
psbt.setInputSequence(i, enableRBF ? 0x1 : 0xffffffff);
|
||||
|
||||
if (input.utxo.isSegwit) {
|
||||
|
||||
if (input.utxo.isSegwit()) {
|
||||
setInputSegwit(i, input);
|
||||
} else if (input.utxo.isP2shSegwit) {
|
||||
} else if (input.utxo.isP2shSegwit()) {
|
||||
setInputP2shSegwit(i, input);
|
||||
} else if (input.utxo.isP2tr) {
|
||||
} else if (input.utxo.isP2tr()) {
|
||||
// ToDo: (Konsti) Handle Taproot Inputs
|
||||
} else {
|
||||
setInputP2pkh(i, input);
|
||||
|
|
@ -51,14 +49,20 @@ class PSBTTransactionBuild {
|
|||
|
||||
void setInputP2pkh(int i, PSBTReadyUtxoWithAddress input) {
|
||||
psbt.setInputNonWitnessUtxo(i, Uint8List.fromList(hex.decode(input.rawTx)));
|
||||
psbt.setInputBip32Derivation(i, Uint8List.fromList(hex.decode(input.ownerPublicKey)),
|
||||
input.ownerMasterFingerprint, BIPPath.fromString(input.ownerDerivationPath).toPathArray());
|
||||
psbt.setInputBip32Derivation(
|
||||
i,
|
||||
Uint8List.fromList(hex.decode(input.ownerPublicKey)),
|
||||
input.ownerMasterFingerprint,
|
||||
BIPPath.fromString(input.ownerDerivationPath).toPathArray());
|
||||
}
|
||||
|
||||
void setInputSegwit(int i, PSBTReadyUtxoWithAddress input) {
|
||||
psbt.setInputNonWitnessUtxo(i, Uint8List.fromList(hex.decode(input.rawTx)));
|
||||
psbt.setInputBip32Derivation(i, Uint8List.fromList(hex.decode(input.ownerPublicKey)),
|
||||
input.ownerMasterFingerprint, BIPPath.fromString(input.ownerDerivationPath).toPathArray());
|
||||
psbt.setInputBip32Derivation(
|
||||
i,
|
||||
Uint8List.fromList(hex.decode(input.ownerPublicKey)),
|
||||
input.ownerMasterFingerprint,
|
||||
BIPPath.fromString(input.ownerDerivationPath).toPathArray());
|
||||
|
||||
psbt.setInputWitnessUtxo(i, Uint8List.fromList(bigIntToUint64LE(input.utxo.value)),
|
||||
Uint8List.fromList(input.ownerDetails.address.toScriptPubKey().toBytes()));
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ String getOutputAmountFromPsbt(String psbtV0, BitcoinWalletBase wallet) {
|
|||
int amount = 0;
|
||||
for (var i = 0; i < psbt.getGlobalOutputCount(); i++) {
|
||||
final script = psbt.getOutputScript(i);
|
||||
if (wallet.isMine(Script.fromRaw(bytes: script))) {
|
||||
if (wallet.isMine(Script.fromRaw(byteData: script))) {
|
||||
amount += psbt.getOutputAmount(i);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue