Skip to content

Commit 30874b7

Browse files
committed
Merge JoinMarket-Org#1710: maker: allow receiving more money than promised
861c790 maker: allow receiving more money than promised (Matt Whitlock) Pull request description: Fixes: JoinMarket-Org#1709 ACKs for top commit: kristapsk: cr utACK 861c790 Tree-SHA512: a027817fcc66be01a5c3423f41359d3aa78caedfa5d4dba25ea3dbf3d70e6132f8f8a682610fb35cbdfa5c0802a94b5d15af1f348c9738cf9c2af29fab8c9545
2 parents 35e6f28 + 861c790 commit 30874b7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/jmclient/maker.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ def verify_unsigned_tx(self, tx, offerinfo):
230230
for outs in tx.vout:
231231
if outs.scriptPubKey == cjaddr_script:
232232
times_seen_cj_addr += 1
233-
if outs.nValue != amount:
234-
return (False, 'Wrong cj_amount. I expect ' + str(amount))
233+
if outs.nValue < amount:
234+
return (False, 'Wrong cj_amount. I expect >=' + str(amount))
235235
if outs.scriptPubKey == changeaddr_script:
236236
times_seen_change_addr += 1
237-
if outs.nValue != expected_change_value:
238-
return (False, 'wrong change, i expect ' + str(
237+
if outs.nValue < expected_change_value:
238+
return (False, 'Wrong change. I expect >=' + str(
239239
expected_change_value))
240240
if times_seen_cj_addr != 1 or times_seen_change_addr != 1:
241241
fmt = ('cj or change addr not in tx '

0 commit comments

Comments
 (0)