Skip to content

Commit

Permalink
Merge #666: bump typing-extensions dependency
Browse files Browse the repository at this point in the history
ad29646 ci: Bump protoc version (Andrew Chow)
08b5d93 trezor: Fix is_p2sh call (Andrew Chow)
d3cee84 poetry lock (Kim Neunert)
bda4e57 bump typing-extensions dependency (Kim Neunert)

Pull request description:

  Upgrade typing-extensions dependency ( #572)

  I chose not the most recent one but try to also be uptodate.
  ![image](https://user-images.githubusercontent.com/117085/219090741-c01d8b14-c15b-464f-9f7f-ff4b4fb20515.png)

Top commit has no ACKs.

Tree-SHA512: 91642a5401333bcf974366cd67acc161e4fae9509846fe9d89fbda6057e15c14d0536d4eaaf4d2ca97183a16947ec43fc3c4aec8f7006748a3b7b8cfe8649b57
  • Loading branch information
achow101 committed Feb 21, 2023
2 parents ea7fe48 + ad29646 commit f5a9b29
Show file tree
Hide file tree
Showing 4 changed files with 694 additions and 309 deletions.
4 changes: 2 additions & 2 deletions ci/cirrus.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ RUN pip install poetry flake8
RUN wget https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init
RUN chmod +x rustup-init && ./rustup-init -y
ENV PATH="/root/.cargo/bin:$PATH"
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v21.9/protoc-21.9-linux-x86_64.zip
RUN unzip protoc-21.9-linux-x86_64.zip -d /usr/local
RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v22.0/protoc-22.0-linux-x86_64.zip
RUN unzip protoc-22.0-linux-x86_64.zip -d /usr/local
RUN protoc --version

####################
Expand Down
2 changes: 1 addition & 1 deletion hwilib/devices/trezor.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ def ignore_input() -> None:
# Add to txinputtype
txinputtype.multisig = multisig
if not is_wit:
if utxo.is_p2sh:
if utxo.is_p2sh():
txinputtype.script_type = messages.InputScriptType.SPENDMULTISIG
else:
# Cannot sign bare multisig, ignore it
Expand Down

0 comments on commit f5a9b29

Please sign in to comment.