Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pshenmic committed Nov 15, 2024
2 parents a765aec + cdda834 commit 2ed8ce8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion electrum_dash/address_synchronizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def add_transaction(self, tx: Transaction, *, allow_unrelated=False) -> bool:
# BUT we track is_mine inputs in a txn, and during subsequent calls
# of add_transaction tx, we might learn of more-and-more inputs of
# being is_mine, as we roll the gap_limit forward
is_coinbase = tx.inputs()[0].is_coinbase_input()
is_coinbase = tx._tx_type == 9 or tx.inputs()[0].is_coinbase_input()
tx_height = self.get_tx_height(tx_hash).height
if not allow_unrelated:
# note that during sync, if the transactions are not properly sorted,
Expand Down
2 changes: 1 addition & 1 deletion electrum_dash/transaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ def read_vds(cls, vds, alone_data=False, tx=None) -> None:
tx._version = header

n_vin = vds.read_compact_size()
if n_vin < 1:
if n_vin < 1 and tx._tx_type != 9:
raise SerializationError('tx needs to have at least 1 input')
tx._inputs = [parse_input(vds) for i in range(n_vin)]
n_vout = vds.read_compact_size()
Expand Down

0 comments on commit 2ed8ce8

Please sign in to comment.