zebra.lucky
/
joinmarket-clientserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge #764: Drop support for pre-0.17 Bitcoin Core 

81982c729f Drop support for pre-0.17 Bitcoin Core (Kristaps Kaupe)

Pull request description:

  Simplifies code, resolves #452.

  I would like also drop official support for versions older than 0.18 (still support 0.17 at first, but put 0.18 as a requirement in docs), as 0.18 is minimum required for [wallet no history sync](https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/444). In future that would allow [some more optimizations](https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/462). Asked it [here](https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/452#issuecomment-742166828), want to hear some comments about that. In any case, these would be changes on top of this anyway.

  Tested by running test suite with 0.17.1 (where 4 of  tests of `jmclient/test/test_core_nohistory_sync.py` fail as expected) and 0.20.1.

Top commit has no ACKs.

Tree-SHA512: 240a0dc0887465ecc5545dffa3759e9b03cc41fc54a759c6757328949d4b40621e029b7f3acfe6d456b659d3d62a9d1df1c6a39594dd2c94ee66b71a267a65bb
master
Kristaps Kaupe 5 years ago
parent
86af73d417 81982c729f
commit
2f8bbe8233
No known key found for this signature in database
GPG Key ID: D47B1B4232B55437
4 changed files with 24 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      docs/INSTALL.md
  2. 2
      docs/PAYJOIN.md
  3. 2
      docs/TESTING.md
  4. 61
      jmclient/jmclient/blockchaininterface.py

4
docs/INSTALL.md
Unescape View File

@ -117,9 +117,11 @@ Before starting, note you need either (a) Bitcoin Core installed on Windows or (
If (a), then note the following two points: If (a), then note the following two points:
##### Installing Bitcoin Core ##### Installing Bitcoin Core
If you haven't done so yet, install Bitcoin Core as described [here](https://bitcoin.org/en/full-node#windows-10). After starting it for the first time, it will start the Initial Block Download. JoinMarket cannot be used until this is finished. More information on that can be found [here](https://bitcoin.org/en/full-node#initial-block-downloadibd).
If you haven't done so yet, install Bitcoin Core, version 0.18 or newer, as described [here](https://bitcoin.org/en/full-node#windows-10). After starting it for the first time, it will start the Initial Block Download. JoinMarket cannot be used until this is finished. More information on that can be found [here](https://bitcoin.org/en/full-node#initial-block-downloadibd).
##### Configuring Bitcoin Core ##### Configuring Bitcoin Core
Bitcoin Core needs to be configured to allow JoinMarket to connect to it. From the `Settings` menu choose `Options` and click `Open Configuration File`. Add `server=1`, save and close the file. After that restart Bitcoin Core. Bitcoin Core needs to be configured to allow JoinMarket to connect to it. From the `Settings` menu choose `Options` and click `Open Configuration File`. Add `server=1`, save and close the file. After that restart Bitcoin Core.
There are currently two choices for installing on Windows; one, directly installing on Windows, requiring the manual addition of a libsodium dependency, or, two, using Ubuntu via the WSL mechanism (which may require additional setup to make the Qt GUI work). There are currently two choices for installing on Windows; one, directly installing on Windows, requiring the manual addition of a libsodium dependency, or, two, using Ubuntu via the WSL mechanism (which may require additional setup to make the Qt GUI work).

2
docs/PAYJOIN.md
Unescape View File

@ -39,7 +39,7 @@ So just skip those sections if you already know it.
### Preparatory step: configuring for Bitcoin Core. ### Preparatory step: configuring for Bitcoin Core.
Joinmarket currently requires a Bitcoin Core full node, although it can be pruned. Joinmarket currently requires a Bitcoin Core full node, version 0.18 or newer, although it can be pruned.
First thing to do: in `scripts/`, run: First thing to do: in `scripts/`, run:

2
docs/TESTING.md
Unescape View File

@ -1,6 +1,6 @@
### Test instructions (for developers): ### Test instructions (for developers):
Work in your `jmvenv` virtualenv as for all Joinmarket work. Make sure to have [bitcoind](https://bitcoin.org/en/full-node) 0.17 or newer installed. Also need miniircd installed to the root (i.e. in your `joinmarket-clientserver` directory): Work in your `jmvenv` virtualenv as for all Joinmarket work. Make sure to have [bitcoind](https://bitcoin.org/en/full-node) 0.18 or newer installed. Also need miniircd installed to the root (i.e. in your `joinmarket-clientserver` directory):
(jmvenv)$ cd /path/to/joinmarket-clientserver (jmvenv)$ cd /path/to/joinmarket-clientserver
(jmvenv)$ git clone https://github.com/Joinmarket-Org/miniircd (jmvenv)$ git clone https://github.com/Joinmarket-Org/miniircd

61
jmclient/jmclient/blockchaininterface.py
Unescape View File

@ -184,10 +184,7 @@ class BitcoinCoreInterface(BlockchainInterface):
raise Exception('wrong network configured') raise Exception('wrong network configured')
def is_address_imported(self, addr): def is_address_imported(self, addr):
try: return len(self._rpc('getaddressinfo', [addr])['labels']) > 0
return self._rpc('getaccount', [addr]) != ''
except JsonRpcError:
return len(self._rpc('getaddressinfo', [addr])['labels']) > 0
def get_block(self, blockheight): def get_block(self, blockheight):
"""Returns full serialized block at a given height. """Returns full serialized block at a given height.
@ -232,11 +229,7 @@ class BitcoinCoreInterface(BlockchainInterface):
return res return res
def is_address_labeled(self, utxo, walletname): def is_address_labeled(self, utxo, walletname):
# Bitcoin Core before 0.17 used accounts, new versions has labels return ("label" in utxo and utxo["label"] == walletname)
return (
("label" in utxo and utxo["label"] == walletname) or
("account" in utxo and utxo["account"] == walletname)
)
def import_addresses(self, addr_list, wallet_name, restart_cb=None): def import_addresses(self, addr_list, wallet_name, restart_cb=None):
"""Imports addresses in a batch during initial sync. """Imports addresses in a batch during initial sync.
@ -275,15 +268,11 @@ class BitcoinCoreInterface(BlockchainInterface):
sys.exit(EXIT_FAILURE) sys.exit(EXIT_FAILURE)
def import_addresses_if_needed(self, addresses, wallet_name): def import_addresses_if_needed(self, addresses, wallet_name):
try: if wallet_name in self._rpc('listlabels', []):
imported_addresses = set(self._rpc('getaddressesbyaccount', imported_addresses = set(self._rpc('getaddressesbylabel',
[wallet_name])) [wallet_name]).keys())
except JsonRpcError: else:
if wallet_name in self._rpc('listlabels', []): imported_addresses = set()
imported_addresses = set(self._rpc('getaddressesbylabel',
[wallet_name]).keys())
else:
imported_addresses = set()
import_needed = not addresses.issubset(imported_addresses) import_needed = not addresses.issubset(imported_addresses)
if import_needed: if import_needed:
self.import_addresses(addresses - imported_addresses, wallet_name) self.import_addresses(addresses - imported_addresses, wallet_name)
@ -327,25 +316,21 @@ class BitcoinCoreInterface(BlockchainInterface):
watch-only wallets. watch-only wallets.
""" """
htxid = bintohex(txid) htxid = bintohex(txid)
#changed syntax in 0.14.0; allow both syntaxes
try: try:
res = self._rpc("gettransaction", [htxid, True]) res = self._rpc("gettransaction", [htxid, True])
except JsonRpcError as e:
#This should never happen (gettransaction is a wallet rpc).
log.warn("Failed gettransaction call; JsonRpcError: " + repr(e))
return None
except Exception as e: except Exception as e:
try: log.warn("Failed gettransaction call; unexpected error:")
res = self._rpc("gettransaction", [htxid, 1]) log.warn(str(e))
except JsonRpcError as e: return None
#This should never happen (gettransaction is a wallet rpc).
log.warn("Failed gettransaction call; JsonRpcError: " + repr(e))
return None
except Exception as e:
log.warn("Failed gettransaction call; unexpected error:")
log.warn(str(e))
return None
if res is None: if res is None:
# happens in case of rpc connection failure: # happens in case of rpc connection failure:
return None return None
if "confirmations" not in res: if "confirmations" not in res:
log.warning("Malformed gettx result: " + str(res)) log.warning("Malformed gettransaction result: " + str(res))
return None return None
return res return res
@ -479,11 +464,7 @@ class BitcoinCoreInterface(BlockchainInterface):
return self._rpc('getblockchaininfo', [])['mediantime'] return self._rpc('getblockchaininfo', [])['mediantime']
def _get_block_header_data(self, blockhash, key): def _get_block_header_data(self, blockhash, key):
try: return self._rpc('getblockheader', [blockhash])[key]
# works with pruning enabled, but only after v0.12
return self._rpc('getblockheader', [blockhash])[key]
except JsonRpcError:
return self._rpc('getblock', [blockhash])[key]
def get_block_height(self, blockhash): def get_block_height(self, blockhash):
return self._get_block_header_data(blockhash, 'height') return self._get_block_header_data(blockhash, 'height')
@ -594,13 +575,9 @@ class BitcoinCoreNoHistoryInterface(BitcoinCoreInterface, RegtestBitcoinCoreMixi
addr_list = ["addr(" + a + ")" for a in addresses] addr_list = ["addr(" + a + ")" for a in addresses]
log.debug("Starting scan of UTXO set") log.debug("Starting scan of UTXO set")
st = time.time() st = time.time()
try: self._rpc("scantxoutset", ["abort", []])
self._rpc("scantxoutset", ["abort", []]) self.scan_result = self._rpc("scantxoutset", ["start",
self.scan_result = self._rpc("scantxoutset", ["start", addr_list])
addr_list])
except JsonRpcError as e:
raise RuntimeError("Bitcoin Core 0.17.0 or higher required "
+ "for no-history sync (" + repr(e) + ")")
et = time.time() et = time.time()
log.debug("UTXO set scan took " + str(et - st) + "sec") log.debug("UTXO set scan took " + str(et - st) + "sec")
elif self.import_addresses_call_count > 4: elif self.import_addresses_call_count > 4:

Write Preview
Loading…
Cancel
Save