Skip to content

Commit

Permalink
Merge #533: Oct 2021 Fix CI
Browse files Browse the repository at this point in the history
e168d8f tests: Use a different magic value for "blank" fingerprint (Andrew Chow)
0148966 tests, build: Make sure rust is up to date (Andrew Chow)

Pull request description:

  Fixing CI, again.

  * Coldcard needs a different special fingerprint for "not ours" because the fingerprint `00000000` is now being treated as "ours"
  * Fixed some rust problems for building Trezor T

Top commit has no ACKs.

Tree-SHA512: 43e943c637255256ef878de4fe9cd3cfdafe91c7a6eae4d7575ef1590a5f1443d37eb91aff63c024ba241d401059acd4ceaa0b593e6f51498e4f645755e9568c
  • Loading branch information
achow101 committed Oct 22, 2021
2 parents 18b89a6 + e168d8f commit 583c4a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions test/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ if [[ -n ${build_trezor_1} || -n ${build_trezor_t} ]]; then
fi

if [[ -n ${build_trezor_t} ]]; then
rustup toolchain uninstall stable
rustup toolchain install stable
rustup update
# Build trezor t emulator. This is pretty fast, so rebuilding every time is ok
# But there should be some caching that makes this faster
Expand Down
4 changes: 2 additions & 2 deletions test/test_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ def _generate_and_finalize(self, unknown_inputs, psbt):
# Single input PSBTs will be fully signed by first signer
for psbt_input in first_psbt.inputs[1:]:
for pubkey, path in psbt_input.hd_keypaths.items():
psbt_input.hd_keypaths[pubkey] = KeyOriginInfo(b"\x00\x00\x00\x00", path.path)
psbt_input.hd_keypaths[pubkey] = KeyOriginInfo(b"\x00\x00\x00\x01", path.path)
for pubkey, path in second_psbt.inputs[0].hd_keypaths.items():
second_psbt.inputs[0].hd_keypaths[pubkey] = KeyOriginInfo(b"\x00\x00\x00\x00", path.path)
second_psbt.inputs[0].hd_keypaths[pubkey] = KeyOriginInfo(b"\x00\x00\x00\x01", path.path)

single_input = len(first_psbt.inputs) == 1

Expand Down

0 comments on commit 583c4a4

Please sign in to comment.