Skip to content

Commit

Permalink
Merge #1037: Fix random typos
Browse files Browse the repository at this point in the history
6ff6c80 Fix random typos (xanoni)

Pull request description:

  Files changed:
  - docs/{SNICKER.md,release-notes/release-notes-0.5.5.md}
  - jmclient/jmclient/{configure,payjoin}.py

ACKs for top commit:
  kristapsk:
    utACK 6ff6c80

Tree-SHA512: a68ab9ac22ec1b40b80be14b3ef5dbd728524defbb6e2d171f25ea574a10d9d1dedc23fc4defb19d4430a0133da387afcfab23c372d6cdb1deb89d08e0810ee9
  • Loading branch information
kristapsk committed Oct 12, 2021
2 parents ff10262 + 6ff6c80 commit f466d9b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/SNICKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ For the time constraints, consider these points:

* This is *somewhat* experimental; better run it on signet for now, mainnet is not advised.
* If you do run it on mainnet, make an effort to keep backups of your jmdat wallet file; recovery with seed only is possible (a tool is provided), but it's a pain.
* This basically allows coinjoins to be proposed and executed without any interaction by the participants, even over a message channel. You can run it passsively in a yield generator, for example. You can even be paid some small amount of sats for that to happen. But the coinjoins are only 2-party.
* This basically allows coinjoins to be proposed and executed without any interaction by the participants, even over a message channel. You can run it passively in a yield generator, for example. You can even be paid some small amount of sats for that to happen. But the coinjoins are only 2-party.

<a name="longer" />

Expand Down
2 changes: 1 addition & 1 deletion docs/release-notes/release-notes-0.5.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ These are mostly minor bugfixes / smoothing out, but of note is that there is no

### Syncing improvements

As part of an ongoing project to make syncing Joinmarket wallets less cumbersome (there are too many edge cases where long waits or repeated syncing is necessary), these small changes prevent the most common annnoyance, that of being required to run sync twice instead of once after restarting, when transactions have occurred. Users are reminded that the `--fast` option was created to make it much faster to sync a wallet which is fairly heavily used, and that it can be used for all scripts (sendpayment, tumbler, yg); but please note it is also MORE reliable than the detailed (slower) sync, if you have not moved your wallet between Core instances. The latter (non --fast) should only be needed occasionally. More will hopefully be done to improve wallet sync in future, see [359](https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/359). Additionally, we switched to using `importmulti` instead of importing addresses individually, which is faster. Also, the user is now prompted to use the new `rescanblockchain` CLI command in Bitcoin, to which you can provide block height arguments, to help speed up those cases where a rescan is actually needed.
As part of an ongoing project to make syncing Joinmarket wallets less cumbersome (there are too many edge cases where long waits or repeated syncing is necessary), these small changes prevent the most common annoyance, that of being required to run sync twice instead of once after restarting, when transactions have occurred. Users are reminded that the `--fast` option was created to make it much faster to sync a wallet which is fairly heavily used, and that it can be used for all scripts (sendpayment, tumbler, yg); but please note it is also MORE reliable than the detailed (slower) sync, if you have not moved your wallet between Core instances. The latter (non --fast) should only be needed occasionally. More will hopefully be done to improve wallet sync in future, see [359](https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/359). Additionally, we switched to using `importmulti` instead of importing addresses individually, which is faster. Also, the user is now prompted to use the new `rescanblockchain` CLI command in Bitcoin, to which you can provide block height arguments, to help speed up those cases where a rescan is actually needed.

`4b4f8c9` Fix bug in detailed wallet sync relating to gap addrs.
`6c15bd7` Make address imports with address requests in wallet Prior to this commit, there was duplicated code in maker and taker modules to import addresses, now all calls to the wallet for fresh addresses can optionally pass a blockchaininterface instance and if this is done, the new address will be imported to the BCI at the same time.
Expand Down
2 changes: 1 addition & 1 deletion jmclient/jmclient/configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def jm_single():
# If makers do not respond while creating a coinjoin transaction,
# the non-responding ones will be ignored. This is the minimum
# amount of makers which we are content with for the coinjoin to
# succceed. Less makers means that the whole process will restart
# succeed. Less makers means that the whole process will restart
# after a timeout.
minimum_makers = 4
Expand Down
2 changes: 1 addition & 1 deletion jmclient/jmclient/payjoin.py
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ def request_to_psbt(self, payment_psbt_base64, sender_parameters):
assert signresult.num_inputs_final == len(receiver_utxos)
assert not signresult.is_final

# with signing succcessful, remove the utxo field from the
# with signing successful, remove the utxo field from the
# counterparty's input (this is required by BIP78). Note we don't
# do this on PSBT creation as the psbt signing code throws ValueError
# unless utxos are present.
Expand Down

0 comments on commit f466d9b

Please sign in to comment.