Skip to content

Add P2WSH handling to wallet database #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StratisIain merged 13 commits into from
Jan 20, 2023
Merged

Add P2WSH handling to wallet database #1107

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0d95241
Add createrawtransaction RPC method
zeptin Dec 29, 2022
718b312
Better handling of Sequence field, and safer defaults
zeptin Dec 29, 2022
615ddd2
Fix case where fundrawtransaction is called for the watch-only account
zeptin Jan 6, 2023
ec0876d
Add protocol version overloads for CreateTransaction
zeptin Jan 16, 2023
d67f770
Check that createrawtransaction RPC client works for SFN/bitcoind
zeptin Jan 16, 2023
f77a9f5
Modify createrawtransaction RPC to return string response
zeptin Jan 16, 2023
88c7c08
Fix RPC middleware to correctly handle non-JSON RPC responses
zeptin Jan 16, 2023
7f5962d
Resolve conflicts
zeptin Jan 16, 2023
433d88a
Remove accidental duplication
zeptin Jan 16, 2023
26fa0a0
Fix test
zeptin Jan 17, 2023
cf77153
Revert middleware change and add additional test
zeptin Jan 18, 2023
aa343ae
Add P2WSH handling to wallet database
zeptin Jan 20, 2023
0e73a65
Merge branch 'release/1.3.3.1' of https://github.com/stratisproject/S…
zeptin Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/Stratis.Features.SQLiteWalletRepository/External/ITransactionsToLists.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,19 @@ internal IEnumerable<TxDestination> GetDestinations(Script redeemScript)
case TxOutType.TX_SEGWIT:
TxDestination txDestination = PayToWitTemplate.Instance.ExtractScriptPubKeyParameters(this.network, redeemScript);
if (txDestination != null)
yield return new KeyId(txDestination.ToBytes());
{
if (txDestination.ToBytes().Length == 20)
{
yield return PayToWitPubKeyHashTemplate.Instance.ExtractScriptPubKeyParameters(this.network, redeemScript);
}
else if (txDestination.ToBytes().Length == 32)
{
yield return PayToWitScriptHashTemplate.Instance.ExtractScriptPubKeyParameters(this.network, redeemScript);
}

// This should not happen, segwit scripts should generally only have one of the two valid lengths.
yield return txDestination;
}
break;
default:
if (this.scriptAddressReader is ScriptDestinationReader scriptDestinationReader)
Expand Down