diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile index 054b58cdf..1a5627af3 100644 --- a/contrib/android/Dockerfile +++ b/contrib/android/Dockerfile @@ -165,7 +165,7 @@ RUN chown --recursive ${USER} ${WORK_DIR} ${ANDROID_SDK_HOME} RUN chown ${USER} /opt USER ${USER} -# venv, VIRTUAL_ENV is used by buildozer to indicate a venv environemnt +# venv, VIRTUAL_ENV is used by buildozer to indicate a venv environment ENV VIRTUAL_ENV=/opt/venv RUN python3 -m venv ${VIRTUAL_ENV} ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" diff --git a/contrib/android/blacklist.txt b/contrib/android/blacklist.txt index bb689ff32..aaf29e901 100644 --- a/contrib/android/blacklist.txt +++ b/contrib/android/blacklist.txt @@ -100,7 +100,7 @@ lib-dynload/pyexpat.so plat-linux3/regen #>sqlite3 -# conditionnal include depending if some recipes are included or not. +# conditional include depending if some recipes are included or not. #sqlite3/* #lib-dynload/_sqlite3.so # local_height: continue - # Do not force-close if we just sent fullfill_htlc and have not received revack yet + # Do not force-close if we just sent fulfill_htlc and have not received revack yet if htlc_id in self.htlc_settle_time and now() - self.htlc_settle_time[htlc_id] < 30: continue htlcs_we_could_reclaim[(RECEIVED, htlc_id)] = htlc diff --git a/electrum/lnpeer.py b/electrum/lnpeer.py index 8985f5993..37b67579e 100644 --- a/electrum/lnpeer.py +++ b/electrum/lnpeer.py @@ -2252,7 +2252,7 @@ class Peer(Logger): if not (their_scriptpubkey == their_upfront_scriptpubkey): await self.send_warning( chan.channel_id, - "remote didn't use upfront shutdown script it commited to in channel opening", + "remote didn't use upfront shutdown script it committed to in channel opening", close_connection=True) else: # BOLT-02 restrict the scriptpubkey to some templates: @@ -2298,7 +2298,7 @@ class Peer(Logger): await asyncio.sleep(0.1) self.send_message('shutdown', channel_id=chan.channel_id, len=len(scriptpubkey), scriptpubkey=scriptpubkey) chan.set_state(ChannelState.SHUTDOWN) - # can fullfill or fail htlcs. cannot add htlcs, because state != OPEN + # can fulfill or fail htlcs. cannot add htlcs, because state != OPEN chan.set_can_send_ctx_updates(True) def get_shutdown_fee_range(self, chan, closing_tx, is_local): diff --git a/electrum/payment_identifier.py b/electrum/payment_identifier.py index 1b2e3dbf6..732dda042 100644 --- a/electrum/payment_identifier.py +++ b/electrum/payment_identifier.py @@ -64,7 +64,7 @@ class PaymentIdentifierState(IntEnum): # and supply a refund address (bip70) MERCHANT_ACK = 6 # PI notified merchant. nothing to be done. ERROR = 50 # generic error - NOT_FOUND = 51 # PI contains a recognized destination format, but resolve step was unsuccesful + NOT_FOUND = 51 # PI contains a recognized destination format, but resolve step was unsuccessful MERCHANT_ERROR = 52 # PI failed notifying the merchant after broadcasting onchain TX INVALID_AMOUNT = 53 # Specified amount not accepted diff --git a/electrum/plugins/coldcard/qt.py b/electrum/plugins/coldcard/qt.py index d46896230..c7d4ed48b 100644 --- a/electrum/plugins/coldcard/qt.py +++ b/electrum/plugins/coldcard/qt.py @@ -256,7 +256,7 @@ class CKCCSettingsDialog(WindowModalDialog): # append the firmware header a second time result = dev.send_recv(CCProtocolPacker.upload(size, size+FW_HEADER_SIZE, hdr)) - # make it reboot into bootlaoder which might install it + # make it reboot into bootloader which might install it dev.send_recv(CCProtocolPacker.reboot()) self.thread.add(doit) diff --git a/electrum/sql_db.py b/electrum/sql_db.py index a6459fc06..749eb93d3 100644 --- a/electrum/sql_db.py +++ b/electrum/sql_db.py @@ -60,7 +60,7 @@ class SqlDB(Logger): if not future.cancelled(): self.asyncio_loop.call_soon_threadsafe(future.set_result, result) # note: in sweepstore session.commit() is called inside - # the sql-decorated methods, so commiting to disk is awaited + # the sql-decorated methods, so committing to disk is awaited if self.commit_interval: i = (i + 1) % self.commit_interval if i == 0: