Skip to content

Trezor: displayaddress#71

Merged
achow101 merged 1 commit into
bitcoin-core:masterfrom
Sjors:2018/11/trezor-displayaddress
Dec 24, 2018
Merged

Trezor: displayaddress#71
achow101 merged 1 commit into
bitcoin-core:masterfrom
Sjors:2018/11/trezor-displayaddress

Conversation

@Sjors
Copy link
Copy Markdown
Member

@Sjors Sjors commented Nov 30, 2018

Tested with Trezor T for mainnet, testnet using legacy, p2sh-wrapped and native Segwit addressees.

@achow101
Copy link
Copy Markdown
Member

achow101 commented Dec 4, 2018

Please rebase onto master now that #66 has been merged.

@Sjors Sjors force-pushed the 2018/11/trezor-displayaddress branch from 473a48a to 4486122 Compare December 4, 2018 16:35
@Sjors
Copy link
Copy Markdown
Member Author

Sjors commented Dec 4, 2018

@achow101 rebased

Comment thread hwilib/devices/trezor.py Outdated
@Sjors Sjors force-pushed the 2018/11/trezor-displayaddress branch from 4486122 to 30e87de Compare December 21, 2018 14:05
@Sjors Sjors force-pushed the 2018/11/trezor-displayaddress branch from 30e87de to 1e7ac40 Compare December 21, 2018 14:12
@Sjors
Copy link
Copy Markdown
Member Author

Sjors commented Dec 21, 2018

Rebased to support the new Trezor Python driver. Also added tests, though I haven't run those locally and I'm not sure if they would actually catch an error.

@achow101
Copy link
Copy Markdown
Member

tACK 1e7ac40

The test should at least check that the trezor api is being used correctly.

@achow101 achow101 merged commit 1e7ac40 into bitcoin-core:master Dec 24, 2018
achow101 added a commit that referenced this pull request Dec 24, 2018
1e7ac40 Trezor: add displayaddress support (Sjors Provoost)

Pull request description:

  Tested with Trezor T for mainnet, testnet using legacy, p2sh-wrapped and native Segwit addressees.

Tree-SHA512: 555a5854121971ef222886a09ce23940b0e6102bfa8ecbce31e0bf21631fee5f6446aecdb37ae1bed0663128d993236babc26c0240988a44d49975574e0a3052
@Sjors Sjors deleted the 2018/11/trezor-displayaddress branch December 25, 2018 12:03
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