Add remove_partial_sigs and try_finalize to SignOptions - #621

Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged

Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom
kafaichoi:remove-partial-signature-after-finalizing-psbt

Conversation

@kafaichoi

@kafaichoikafaichoi commented Jun 4, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612

Notes to the reviewers

I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?

Checklists

All Submissions:

  • I've signed all my commits
  • I followed the contribution guidelines
  • I ran cargo fmt and cargo clippy before committing

New Features:

  • I've added tests for the new feature
  • I've added docs for the new feature
  • I've updated CHANGELOG.md

Bugfixes:

  • This pull request breaks the existing API
  • I've added tests to reproduce the issue which are now passing
  • I'm linking the issue being fixed by this PR

@kafaichoikafaichoi changed the title Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch from 47642ff to 4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi commented Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs Outdated
@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch from 4bbb9ac to e272a14CompareJune 5, 2022 02:43
@notmandatory

notmandatory commented Jun 5, 2022

Copy link
Copy Markdown
Member

I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.

danielabrozzoni
danielabrozzoni reviewed Jun 7, 2022
View reviewed changes

@danielabrozzonidanielabrozzoni left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!
I have a couple of comments.

I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)

Comment threadsrc/wallet/mod.rs Outdated
Comment threadsrc/wallet/mod.rs Outdated
Comment threadsrc/wallet/signer.rs Outdated
/// what its value is
///
/// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
/// Defaults to `false` which will remove partial_sigs after input is signed

@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...

@kafaichoikafaichoiJun 9, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad

@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch from e272a14 to 09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi changed the title Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch 4 times, most recently from c018a7a to c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra reviewed Jun 10, 2022
View reviewed changes

@rajarshimaitrarajarshimaitra left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1

Just few nits..

Comment threadsrc/wallet/mod.rs Outdated
Comment on lines +3914 to +3915
// remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
// do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.

@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.

Comment threadsrc/wallet/signer.rs Outdated
Comment on lines +670 to +672
/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.

@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change
/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.

@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch 3 times, most recently from 726a14d to be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra approved these changes Jun 11, 2022
View reviewed changes

@rajarshimaitrarajarshimaitra left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc

All looks good to me.. Just one minor nit..

Comment threadCHANGELOG.md Outdated
- Signing Taproot PSBTs (key spend and script spend)
- Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`

@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`

@notmandatorynotmandatory mentioned this pull request Jun 21, 2022
Closed
14 tasks
@danielabrozzoni

danielabrozzoni commented Jun 28, 2022

Copy link
Copy Markdown
Contributor

Can you please rebase on master, to pick up the CI changes? :)

@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch 2 times, most recently from 46a2f4e to 5eac541CompareJune 29, 2022 05:39
@danielabrozzoni

danielabrozzoni commented Jun 29, 2022

Copy link
Copy Markdown
Contributor

tACK 5eac541

rajarshimaitra
rajarshimaitra suggested changes Jul 1, 2022
View reviewed changes

@rajarshimaitrarajarshimaitra left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541

modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365

@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch from 5eac541 to 6a79f39CompareJuly 2, 2022 06:30
@kafaichoi

kafaichoi commented Jul 2, 2022

Copy link
Copy Markdown
ContributorAuthor

tACK 5eac541

modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)

rajarshimaitra
rajarshimaitra approved these changes Jul 3, 2022
View reviewed changes

@rajarshimaitrarajarshimaitra left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)

No issues, not a big deal..

ACK 6a79f39

notmandatory
notmandatory approved these changes Jul 4, 2022
View reviewed changes

@notmandatorynotmandatory left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39

@notmandatorynotmandatory mentioned this pull request Jul 5, 2022
Closed
24 tasks
@kafaichoi
kafaichoiforce-pushed the remove-partial-signature-after-finalizing-psbt branch from 6a79f39 to e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory approved these changes Jul 6, 2022
View reviewed changes

@notmandatorynotmandatory left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6

@notmandatory
notmandatory merged commit dd51380 into bitcoindevkit:masterJul 6, 2022
@notmandatory

notmandatory commented Jul 6, 2022

Copy link
Copy Markdown
Member

I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022
Closed
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes
+2 more reviewers
@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels

None yet

Projects

None yet

Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add remove_partial_sigs and try_finalize to SignOptions - #621
Merged
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Jul 6, 2022
Merged
Add remove_partial_sigs and try_finalize to SignOptions#621
notmandatory merged 2 commits into
bitcoindevkit:masterfrom 
kafaichoi:remove-partial-signature-after-finalizing-psbt
Conversation
@kafaichoi
@kafaichoikafaichoi
commented
Jun 4, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Description
This PR is to add 2 keys(try_finalize and remove_partial_sigs) in SignOptions. See this issue for detail #612
Notes to the reviewers
I found the negative naming of these 2 new keys do_not_finalize and do_not_remove_partial_sigs are a bit confusing(like most negative named paremeter/variable). Should we actually change it back to positive naming(do_finalize and do_remove_partial_sigs)?
Checklists
All Submissions:
  •  I've signed all my commits
  •  I followed the contribution guidelines
  •  I ran cargo fmt and cargo clippy before committing
New Features:
  •  I've added tests for the new feature
  •  I've added docs for the new feature
  •  I've updated CHANGELOG.md
Bugfixes:
  •  This pull request breaks the existing API
  •  I've added tests to reproduce the issue which are now passing
  •  I'm linking the issue being fixed by this PR
@kafaichoikafaichoi
changed the title
Remove partial signature after finalizing psbtAdd do_not_finalize and do_not_remove_partial_sigs to SignOptionsJun 4, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
47642ff to
4bbb9acCompareJune 4, 2022 08:10
kafaichoi
kafaichoi
commented
Jun 4, 2022
View reviewed changes
Comment threadsrc/wallet/mod.rs
Outdated

@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
4bbb9ac to
e272a14CompareJune 5, 2022 02:43
@notmandatory
notmandatory
commented
Jun 5, 2022

Copy link


Copy Markdown

Member
I agree do_not makes the naming and and logic overly complicated, would be clearer as do_finalize and do_remove_partial_sigs, or how about try_finalize (since it may not be able to) and remove_partial_sigs.
danielabrozzoni
danielabrozzoni
reviewed
Jun 7, 2022
View reviewed changes
@danielabrozzonidanielabrozzoni
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, the code looks good!

I have a couple of comments.
I agree that the current names are a bit confusing, I really like Steve's try_finalize/remove_partial_sigs suggestion :)
Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/mod.rs
Outdated

Comment threadsrc/wallet/signer.rs
Outdated

 /// what its value is
 ///
 /// Defaults to `false` which will only allow signing using `SIGHASH_ALL`.
 /// Defaults to `false` which will remove partial_sigs after input is signed
@danielabrozzonidanielabrozzoniJun 7, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like you've accidentally modified allow_all_sighashes docs...
@kafaichoikafaichoiJun 9, 2022

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦my bad
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
e272a14 to
09d4bc6CompareJune 9, 2022 06:42
@kafaichoikafaichoi
changed the title
Add do_not_finalize and do_not_remove_partial_sigs to SignOptionsAdd remove_partial_sigs and try_finalize to SignOptionsJun 9, 2022
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
4 times, most recently
from
c018a7a to
c324eb1CompareJune 9, 2022 07:50
rajarshimaitra
rajarshimaitra
reviewed
Jun 10, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK c324eb1
Just few nits..
Comment threadsrc/wallet/mod.rs
Outdated


Comment on lines

+3914
 to 
+3915

 // remove finalized input partial_sigs if remove_partial_sigs is set as true in SignOptions
 // do not remove finalized input partial_sigs if remove_partial_sigs is set as false in SignOptions.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this comment is redundant.. It self evident from the statement below what its trying to do.
Comment threadsrc/wallet/signer.rs
Outdated


Comment on lines

+670
 to 
+672

 /// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
 ///
 /// Defaults to `true` which will remove partial_sigs in inputs after signing.
@rajarshimaitrarajarshimaitraJun 10, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small doc nit. This sentences can be simplified a little.

Suggested change

/// Whether partial_sigs in input should be removed when the psbt inputs are signed in finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs in inputs after signing.
/// Whether to remove partial_sigs from psbt inputs while finalizing psbt.
///
/// Defaults to `true` which will remove partial_sigs after finalizing.
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
3 times, most recently
from
726a14d to
be8c9dcCompareJune 11, 2022 08:48
rajarshimaitra
rajarshimaitra
approved these changes
Jun 11, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK be8c9dc
All looks good to me.. Just one minor nit..
Comment threadCHANGELOG.md
Outdated

 - Signing Taproot PSBTs (key spend and script spend)
 - Support for `tr()` descriptors in the `descriptor!()` macro
- Add support for Bitcoin Core 23.0 when using the `rpc` blockchain
- Added `remove_partial_sigs` and `try_finalize` to `SignOptions`
@rajarshimaitrarajarshimaitraJun 11, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

-Added`remove_partial_sigs` and `try_finalize` to `SignOptions`
-Add`remove_partial_sigs` and `try_finalize` to `SignOptions`
@notmandatorynotmandatory
mentioned this pull request
Jun 21, 2022

Closed

14 tasks
@danielabrozzoni
danielabrozzoni
commented
Jun 28, 2022

Copy link


Copy Markdown

Contributor
Can you please rebase on master, to pick up the CI changes? :)
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
2 times, most recently
from
46a2f4e to
5eac541CompareJune 29, 2022 05:39
@danielabrozzoni
danielabrozzoni
commented
Jun 29, 2022

Copy link


Copy Markdown

Contributor
tACK 5eac541
rajarshimaitra
rajarshimaitra
suggested changes
Jul 1, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
5eac541 to
6a79f39CompareJuly 2, 2022 06:30
@kafaichoi
kafaichoi
commented
Jul 2, 2022

Copy link


Copy Markdown

ContributorAuthor
tACK 5eac541
modulo https://github.com/bitcoindevkit/bdk/pull/621/files#r895010365
Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
rajarshimaitra
rajarshimaitra
approved these changes
Jul 3, 2022
View reviewed changes
@rajarshimaitrarajarshimaitra
left a comment
•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for replying it previously. I saw some places using "added" so I didn't change it. But yea happy to change that if that's way we want :)
No issues, not a big deal..
ACK 6a79f39
notmandatory
notmandatory
approved these changes
Jul 4, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 6a79f39
@notmandatorynotmandatory
mentioned this pull request
Jul 5, 2022

Closed

24 tasks
@kafaichoi
kafaichoiforce-pushed
the
remove-partial-signature-after-finalizing-psbt
branch
from
6a79f39 to
e3a17f6CompareJuly 6, 2022 10:13
notmandatory
notmandatory
approved these changes
Jul 6, 2022
View reviewed changes
@notmandatorynotmandatory
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReACK e3a17f6
@notmandatory
notmandatory
merged commit dd51380
into
bitcoindevkit:masterJul 6, 2022
@notmandatory
notmandatory
commented
Jul 6, 2022

Copy link


Copy Markdown

Member
I noticed the CHANGELOG message ended up in the wrong place, I'll fix it in the release branch.

This was referenced Jul 6, 2022

Closed


Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@notmandatorynotmandatorynotmandatory approved these changes

+2 more reviewers

@danielabrozzonidanielabrozzonidanielabrozzoni left review comments
@rajarshimaitrarajarshimaitrarajarshimaitra approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@kafaichoikafaichoi

Labels


None yet


Projects


None yet


Milestone

Release 0.20.0 Feature Freeze

Development

Successfully merging this pull request may close these issues.

4 participants

@kafaichoi@notmandatory@danielabrozzoni@rajarshimaitra