Merge pull request #2864 from CounterpartyXCP/killaddrindexrs2

Kill Addrindexrs

.github/workflows/propertytest.yml

@@ -35,9 +35,6 @@ jobs:
         cd counterparty-rs && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
         pip install evdev
-        git clone https://github.com/CounterpartyXCP/addrindexrs.git
-        cd addrindexrs
-        cargo install --path=.
         wget https://bitcoincore.org/bin/bitcoin-core-27.1/bitcoin-27.1-x86_64-linux-gnu.tar.gz
         tar -xvf bitcoin-27.1-x86_64-linux-gnu.tar.gz
         sudo cp bitcoin-27.1/bin/bitcoin-cli /usr/local/bin/bitcoin-cli

.github/workflows/regtest.yml

@@ -35,9 +35,6 @@ jobs:
         cd counterparty-rs && pip install -e . && cd ..
         cd counterparty-core && pip install -e . && cd ..
         pip install evdev
-        git clone https://github.com/CounterpartyXCP/addrindexrs.git
-        cd addrindexrs
-        cargo install --path=.
         wget https://bitcoincore.org/bin/bitcoin-core-27.1/bitcoin-27.1-x86_64-linux-gnu.tar.gz
         tar -xvf bitcoin-27.1-x86_64-linux-gnu.tar.gz
         sudo cp bitcoin-27.1/bin/bitcoin-cli /usr/local/bin/bitcoin-cli

.github/workflows/test_compose.sh

@@ -110,7 +110,6 @@ sudo touch $LOG_PATH
 docker compose --profile mainnet stop counterparty-core
 docker compose --profile mainnet run counterparty-core reparse $REPARSE_FROM \
    --backend-connect=bitcoind \
-   --indexd-connect=addrindexrs \
    --rpc-host=0.0.0.0 \
    --api-host=0.0.0.0
 

counterparty-core/counterpartycore/cli.py

@@ -148,11 +148,6 @@ def float_range_checker(arg):
             "help": "pubkey to receive dust when multisig encoding is used for P2SH source (default: none)"
         },
     ],
-    [
-        ("--indexd-connect",),
-        {"default": "localhost", "help": "the hostname or IP of the indexd server"},
-    ],
-    [("--indexd-port",), {"type": int, "help": "the indexd server port to connect to"}],
     [
         ("--rpc-host",),
         {
@@ -365,6 +360,12 @@ def float_range_checker(arg):
         },
     ],
     [("--bootstrap-url",), {"type": str, "help": "the URL of the bootstrap snapshot to use"}],
+    [
+        ("--electrs-url",),
+        {
+            "help": "the URL of the Electrs server",
+        },
+    ],
 ]
 
 
@@ -384,7 +385,6 @@ def welcome_message(action, server_configfile):
         pass_str = f":{urlencode(config.BACKEND_PASSWORD)}@"
         cleaned_backend_url = config.BACKEND_URL.replace(pass_str, ":*****@")
         cprint(f"Bitcoin Core: {cleaned_backend_url}", "light_grey")
-        cprint(f"AddrIndexRs: {config.INDEXD_URL}", "light_grey")
 
         api_url = "http://"
         if config.API_USER and config.API_PASSWORD:

counterparty-core/counterpartycore/lib/api/api_server.py

@@ -358,13 +358,18 @@ def handle_route(**kwargs):
         exceptions.UnpackError,
         CBitcoinAddressError,
         script.AddressError,
+        exceptions.ElectrsError,
     ) as e:
+        import traceback
+
+        print(traceback.format_exc())
         return return_result(400, error=str(e), start_time=start_time, query_args=query_args)
     except Exception as e:
         capture_exception(e)
         logger.error("Error in API: %s", e)
-        # import traceback
-        # print(traceback.format_exc())
+        import traceback
+
+        print(traceback.format_exc())
         return return_result(
             503, error="Unknown error", start_time=start_time, query_args=query_args
         )

counterparty-core/counterpartycore/lib/api/api_v1.py

@@ -53,7 +53,6 @@
 )
 from counterpartycore.lib.messages.versions import enhanced_send  # noqa: E402
 from counterpartycore.lib.telemetry.util import (  # noqa: E402
-    get_addrindexrs_version,
     get_uptime,
     is_docker,
     is_force_enabled,
@@ -132,7 +131,7 @@ def check_backend_state():
     # check backend index
     blocks_behind = backend.bitcoind.get_blocks_behind()
     if blocks_behind > 5:
-        raise BackendError(f"Indexd is running {blocks_behind} blocks behind.")
+        raise BackendError(f"Bitcoind is running {blocks_behind} blocks behind.")
 
     logger.debug("API Status Poller - Backend state check passed.")
 
@@ -820,22 +819,20 @@ def get_running_info():
                     last_message = None
 
             try:
-                indexd_blocks_behind = backend.bitcoind.get_blocks_behind()
+                bitcoind_blocks_behind = backend.bitcoind.get_blocks_behind()
             except:  # noqa: E722
-                indexd_blocks_behind = latest_block_index if latest_block_index > 0 else 999999
-            indexd_caught_up = indexd_blocks_behind <= 1
+                bitcoind_blocks_behind = latest_block_index if latest_block_index > 0 else 999999
+            bitcoind_caught_up = bitcoind_blocks_behind <= 1
 
-            server_ready = caught_up and indexd_caught_up
-
-            addrindexrs_version = get_addrindexrs_version().split(".")
+            server_ready = caught_up and bitcoind_caught_up
 
             return {
                 "server_ready": server_ready,
                 "db_caught_up": caught_up,
                 "bitcoin_block_count": latest_block_index,
                 "last_block": last_block,
-                "indexd_caught_up": indexd_caught_up,
-                "indexd_blocks_behind": indexd_blocks_behind,
+                "bitcoind_caught_up": bitcoind_caught_up,
+                "bitcoind_blocks_behind": bitcoind_blocks_behind,
                 "last_message_index": (last_message["message_index"] if last_message else -1),
                 "api_limit_rows": config.API_LIMIT_ROWS,
                 "running_testnet": config.TESTNET,
@@ -844,9 +841,6 @@ def get_running_info():
                 "version_major": config.VERSION_MAJOR,
                 "version_minor": config.VERSION_MINOR,
                 "version_revision": config.VERSION_REVISION,
-                "addrindexrs_version_major": int(addrindexrs_version[0]),
-                "addrindexrs_version_minor": int(addrindexrs_version[1]),
-                "addrindexrs_version_revision": int(addrindexrs_version[2]),
                 "uptime": int(get_uptime()),
                 "dockerized": is_docker(),
                 "force_enabled": is_force_enabled(),
@@ -925,17 +919,13 @@ def get_holders(asset):
 
         @dispatcher.add_method
         def search_raw_transactions(address, unconfirmed=True, only_tx_hashes=False):
-            return backend.addrindexrs.search_raw_transactions(
+            return backend.electrs.get_history(
                 address, unconfirmed=unconfirmed, only_tx_hashes=only_tx_hashes
             )
 
-        @dispatcher.add_method
-        def get_oldest_tx(address):
-            return backend.addrindexrs.get_oldest_tx(address, block_index=util.CURRENT_BLOCK_INDEX)
-
         @dispatcher.add_method
         def get_unspent_txouts(address, unconfirmed=False, unspent_tx_hash=None, order_by=None):
-            results = backend.addrindexrs.get_unspent_txouts(
+            results = backend.electrs.get_utxos(
                 address, unconfirmed=unconfirmed, unspent_tx_hash=unspent_tx_hash
             )
             if order_by is None:
@@ -953,9 +943,9 @@ def getrawtransaction(tx_hash, verbose=False):
             return backend.bitcoind.getrawtransaction(tx_hash, verbose=verbose)
 
         @dispatcher.add_method
-        def getrawtransaction_batch(txhash_list, verbose=False, skip_missing=False):
-            return backend.addrindexrs.getrawtransaction_batch(
-                txhash_list, verbose=verbose, skip_missing=skip_missing
+        def getrawtransaction_batch(txhash_list, verbose=False):
+            return backend.bitcoind.getrawtransaction_batch(
+                txhash_list, verbose=verbose, return_dict=True
             )
 
         @dispatcher.add_method

counterparty-core/counterpartycore/lib/api/routes.py

@@ -1,5 +1,5 @@
 from counterpartycore.lib.api import compose, queries, util
-from counterpartycore.lib.backend import addrindexrs, bitcoind
+from counterpartycore.lib.backend import bitcoind, electrs
 
 
 def get_routes():
@@ -172,10 +172,9 @@ def get_routes():
         "/v2/fairmints": queries.get_all_fairmints,
         "/v2/fairmints/<tx_hash>": queries.get_fairmint,
         ### /bitcoin ###
-        "/v2/bitcoin/addresses/utxos": addrindexrs.get_unspent_txouts_by_addresses,
-        "/v2/bitcoin/addresses/<address>/transactions": addrindexrs.get_transactions_by_address,
-        "/v2/bitcoin/addresses/<address>/transactions/oldest": util.get_oldest_transaction_by_address,
-        "/v2/bitcoin/addresses/<address>/utxos": addrindexrs.get_unspent_txouts,
+        "/v2/bitcoin/addresses/utxos": electrs.get_utxos_by_addresses,
+        "/v2/bitcoin/addresses/<address>/transactions": electrs.get_history,
+        "/v2/bitcoin/addresses/<address>/utxos": electrs.get_utxos,
         "/v2/bitcoin/addresses/<address>/pubkey": util.pubkeyhash_to_pubkey,
         "/v2/bitcoin/transactions/<tx_hash>": util.get_transaction,
         "/v2/bitcoin/estimatesmartfee": bitcoind.fee_per_kb,

counterparty-core/counterpartycore/lib/api/util.py

@@ -155,17 +155,6 @@ def get_transaction(tx_hash: str, format: str = "json"):
     return backend.bitcoind.getrawtransaction(tx_hash, verbose=format == "json")
 
 
-def get_oldest_transaction_by_address(address: str, block_index: int = None):
-    """
-    Get the oldest transaction for an address.
-    :param address: The address to search for. (e.g. $ADDRESS_9)
-    :param block_index: The block index to search from.
-    """
-    return backend.addrindexrs.get_oldest_tx(
-        address, block_index=block_index or util.CURRENT_BLOCK_INDEX
-    )
-
-
 def get_backend_height():
     block_count = backend.bitcoind.getblockcount()
     blocks_behind = backend.bitcoind.get_blocks_behind()

counterparty-core/counterpartycore/lib/api/wsgi.py

@@ -8,7 +8,7 @@
 import gunicorn.app.base
 import waitress
 import waitress.server
-from counterpartycore.lib import backend, config, database, ledger, log, util
+from counterpartycore.lib import config, database, ledger, log, util
 from counterpartycore.lib.api import api_watcher
 from counterpartycore.lib.api.util import BackendHeight
 from gunicorn import util as gunicorn_util
@@ -34,8 +34,6 @@ def refresh_current_state(ledger_db, state_db):
         util.CURRENT_BLOCK_TIME = 0
         util.CURRENT_BLOCK_INDEX = 0
 
-    backend.addrindexrs.clear_raw_transactions_cache()
-
     if util.CURRENT_BACKEND_HEIGHT > util.CURRENT_BLOCK_INDEX:
         logger.debug(
             f"Counterparty is currently behind Bitcoin Core. ({util.CURRENT_BLOCK_INDEX} < {util.CURRENT_BACKEND_HEIGHT})"