Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix(python/build_tx): make build_tx work again after blockbook protection upgrades #1896

Merged
merged 2 commits into from
Nov 4, 2021

Conversation

matejcik
Copy link
Contributor

@matejcik matejcik commented Nov 4, 2021

Also improve script type selection.

@matejcik matejcik force-pushed the matejcik/fix-build-tx branch from 5796108 to 24193af Compare November 4, 2021 12:52
subrepo:
  subdir:   "common"
  merged:   "32a5a9045"
upstream:
  origin:   "git+ssh://git@github.com/trezor/trezor-common"
  branch:   "master"
  commit:   "32a5a9045"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
…tion upgrades

Also improve script type selection.
@matejcik matejcik force-pushed the matejcik/fix-build-tx branch from 24193af to 428caf3 Compare November 4, 2021 12:54
@matejcik
Copy link
Contributor Author

matejcik commented Nov 4, 2021

folded a subrepo push here just to get the block_fixup check

@matejcik matejcik merged commit 428caf3 into master Nov 4, 2021
@matejcik matejcik deleted the matejcik/fix-build-tx branch November 4, 2021 12:57
"scripthash": messages.InputScriptType.SPENDADDRESS,
"pubkeyhash": messages.InputScriptType.SPENDP2SHWITNESS,
"witness_v0_keyhash": messages.InputScriptType.SPENDWITNESS,
"witness_v1_taproot": messages.InputScriptType.SPENDP2SHWITNESS,
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be SPENDTAPROOT?

Copy link
Member

Choose a reason for hiding this comment

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

Also SPENDADDRESS and SPENDP2SHWITNESS are mixed up?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

well 💩

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants