From 6ff6c8069a1d135fe7db4f8f77588a2de5dfb128 Mon Sep 17 00:00:00 2001 From: xanoni <77220130+xanoni@users.noreply.github.com> Date: Sat, 10 Jul 2021 12:38:03 -0400 Subject: [PATCH] Fix random typos Files changed: - docs/{SNICKER.md,release-notes/release-notes-0.5.5.md} - jmclient/jmclient/{configure,payjoin}.py --- docs/SNICKER.md | 2 +- docs/release-notes/release-notes-0.5.5.md | 2 +- jmclient/jmclient/configure.py | 2 +- jmclient/jmclient/payjoin.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/SNICKER.md b/docs/SNICKER.md index 1ec28aee9..a59dd4d60 100644 --- a/docs/SNICKER.md +++ b/docs/SNICKER.md @@ -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. diff --git a/docs/release-notes/release-notes-0.5.5.md b/docs/release-notes/release-notes-0.5.5.md index 78ae98f7a..baf5636ca 100644 --- a/docs/release-notes/release-notes-0.5.5.md +++ b/docs/release-notes/release-notes-0.5.5.md @@ -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. diff --git a/jmclient/jmclient/configure.py b/jmclient/jmclient/configure.py index c0a72792f..76ee92e2c 100644 --- a/jmclient/jmclient/configure.py +++ b/jmclient/jmclient/configure.py @@ -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 diff --git a/jmclient/jmclient/payjoin.py b/jmclient/jmclient/payjoin.py index f77314a35..0b4742351 100644 --- a/jmclient/jmclient/payjoin.py +++ b/jmclient/jmclient/payjoin.py @@ -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.