[v10.10.0] Code cleaning

counterparty-core/counterpartycore/lib/__init__.py

@@ -0,0 +1 @@
+from . import cli  # noqa F401

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

@@ -11,15 +11,17 @@
 import flask
 import requests
 from bitcoin.wallet import CBitcoinAddressError
-from counterpartycore import server
+from flask import Flask, request
+from flask_httpauth import HTTPBasicAuth
+from sentry_sdk import capture_exception
+from sentry_sdk import configure_scope as configure_sentry_scope
+from sentry_sdk import start_span as start_sentry_span
+
 from counterpartycore.lib import (
-    check,
     config,
     database,
     exceptions,
     ledger,
-    script,
-    sentry,
     util,
 )
 from counterpartycore.lib.api import api_watcher, dbbuilder, queries, wsgi
@@ -31,12 +33,10 @@
     inject_details,
     to_json,
 )
+from counterpartycore.lib.cli import server
 from counterpartycore.lib.database import LedgerDBConnectionPool, StateDBConnectionPool
-from flask import Flask, request
-from flask_httpauth import HTTPBasicAuth
-from sentry_sdk import capture_exception
-from sentry_sdk import configure_scope as configure_sentry_scope
-from sentry_sdk import start_span as start_sentry_span
+from counterpartycore.lib.parser import check
+from counterpartycore.lib.tools import sentry
 
 multiprocessing.set_start_method("spawn", force=True)
 
@@ -358,7 +358,7 @@ def handle_route(**kwargs):
         exceptions.ComposeError,
         exceptions.UnpackError,
         CBitcoinAddressError,
-        script.AddressError,
+        exceptions.AddressError,
         exceptions.ElectrsError,
         OverflowError,
     ) as e:

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

@@ -15,19 +15,22 @@
 import threading
 import time
 
-import counterpartycore.lib.sentry as sentry  # noqa: F401
 import flask
 import jsonrpc
+from flask import request
+from flask_httpauth import HTTPBasicAuth
+from jsonrpc import dispatcher
+from jsonrpc.exceptions import JSONRPCDispatchException
+from sentry_sdk import configure_scope as configure_sentry_scope
+from werkzeug.serving import make_server
+from xmltodict import unparse as serialize_to_xml
+
 from counterpartycore.lib import (
     backend,
     composer,
     config,
-    deserialize,
     exceptions,
-    gettxinfo,
     ledger,
-    message_type,
-    script,
     util,
 )
 from counterpartycore.lib.api import util as api_util
@@ -50,18 +53,13 @@
     sweep,  # noqa: F401
 )
 from counterpartycore.lib.messages.versions import enhanced_send  # noqa: E402
-from counterpartycore.lib.telemetry.util import (  # noqa: E402
+from counterpartycore.lib.parser import deserialize, gettxinfo, message_type
+from counterpartycore.lib.tools import sentry
+from counterpartycore.lib.tools.telemetry.util import (  # noqa: E402
     get_uptime,
     is_docker,
     is_force_enabled,
 )
-from flask import request
-from flask_httpauth import HTTPBasicAuth
-from jsonrpc import dispatcher
-from jsonrpc.exceptions import JSONRPCDispatchException
-from sentry_sdk import configure_scope as configure_sentry_scope
-from werkzeug.serving import make_server
-from xmltodict import unparse as serialize_to_xml
 
 D = decimal.Decimal
 
@@ -204,7 +202,7 @@ def get_rows(
     def value_to_marker(value):
         # if value is an array place holder is (?,?,?,..)
         if isinstance(value, list):
-            return f"""({','.join(['?' for e in range(0, len(value))])})"""
+            return f"""({",".join(["?" for e in range(0, len(value))])})"""
         else:
             return """?"""
 
@@ -290,10 +288,10 @@ def value_to_marker(value):
     for filter_ in filters:
         case_sensitive = False if "case_sensitive" not in filter_ else filter_["case_sensitive"]
         if filter_["op"] == "LIKE" and case_sensitive == False:  # noqa: E712
-            filter_["field"] = f"""UPPER({filter_['field']})"""
+            filter_["field"] = f"""UPPER({filter_["field"]})"""
             filter_["value"] = filter_["value"].upper()
         marker = value_to_marker(filter_["value"])
-        conditions.append(f"""{filter_['field']} {filter_['op']} {marker}""")
+        conditions.append(f"""{filter_["field"]} {filter_["op"]} {marker}""")
         if isinstance(filter_["value"], list):
             bindings += filter_["value"]
         else:
@@ -334,10 +332,10 @@ def value_to_marker(value):
         statement += """ WHERE"""
         all_conditions = []
         if len(conditions) > 0:
-            all_conditions.append(f"""({f' {filterop.upper()} '.join(conditions)})""")
+            all_conditions.append(f"""({f" {filterop.upper()} ".join(conditions)})""")
         if len(more_conditions) > 0:
-            all_conditions.append(f"""({' AND '.join(more_conditions)})""")
-        statement += f""" {' AND '.join(all_conditions)}"""
+            all_conditions.append(f"""({" AND ".join(more_conditions)})""")
+        statement += f""" {" AND ".join(all_conditions)}"""
 
     # ORDER BY
     if order_by != None:  # noqa: E711
@@ -637,7 +635,7 @@ def create_method(**kwargs):
                                 return tx_hexes
                 except (
                     TypeError,
-                    script.AddressError,
+                    exceptions.AddressError,
                     exceptions.ComposeError,
                     exceptions.TransactionError,
                     exceptions.BalanceError,
@@ -1233,7 +1231,7 @@ def handle_rest(path_args, flask_request):
                             db, query_type, transaction_args, common_args
                         )
                 except (
-                    script.AddressError,
+                    exceptions.AddressError,
                     exceptions.ComposeError,
                     exceptions.TransactionError,
                     exceptions.BalanceError,

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

@@ -5,15 +5,13 @@
     backend,
     composer,
     config,
-    deserialize,
     exceptions,
-    gas,
-    gettxinfo,
-    message_type,
     messages,
     util,
 )
+from counterpartycore.lib.messages import gas
 from counterpartycore.lib.messages.attach import ID as UTXO_ID
+from counterpartycore.lib.parser import deserialize, gettxinfo, message_type
 
 D = decimal.Decimal
 

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

@@ -4,11 +4,13 @@
 import sys
 import time
 
-from counterpartycore.lib import config, log
 from yoyo import get_backend, read_migrations
 from yoyo.exceptions import LockTimeout
 from yoyo.migrations import topological_sort
 
+from counterpartycore.lib import config
+from counterpartycore.lib.cli import log
+
 logger = logging.getLogger(config.LOGGER_NAME)
 
 CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))

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

@@ -2,9 +2,10 @@
 import typing
 from typing import Literal
 
-from counterpartycore.lib.api.util import divide
 from sentry_sdk import start_span as start_sentry_span
 
+from counterpartycore.lib.api.util import divide
+
 OrderStatus = Literal["all", "open", "expired", "filled", "cancelled"]
 OrderMatchesStatus = Literal["all", "pending", "completed", "expired"]
 BetStatus = Literal["cancelled", "dropped", "expired", "filled", "open"]

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

@@ -11,6 +11,8 @@
 import flask
 import requests
 import werkzeug
+from docstring_parser import parse as parse_docstring
+
 from counterpartycore.lib import (
     backend,
     composer,
@@ -20,7 +22,6 @@
     util,
 )
 from counterpartycore.lib.api import compose
-from docstring_parser import parse as parse_docstring
 
 D = decimal.Decimal
 logger = logging.getLogger(config.LOGGER_NAME)

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

@@ -8,14 +8,16 @@
 import gunicorn.app.base
 import waitress
 import waitress.server
-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
 from gunicorn.arbiter import Arbiter
 from gunicorn.errors import AppImportError
 from werkzeug.serving import make_server
 
+from counterpartycore.lib import config, database, ledger, util
+from counterpartycore.lib.api import api_watcher
+from counterpartycore.lib.api.util import BackendHeight
+from counterpartycore.lib.cli import log
+
 multiprocessing.set_start_method("spawn", force=True)
 
 logger = logging.getLogger(config.LOGGER_NAME)

counterparty-core/counterpartycore/lib/backend/bitcoind.py

@@ -8,9 +8,11 @@
 from threading import current_thread
 
 import requests
+from bitcoinutils.keys import PublicKey
 from requests.exceptions import ChunkedEncodingError, ConnectionError, ReadTimeout, Timeout
 
-from counterpartycore.lib import config, deserialize, exceptions, script, util
+from counterpartycore.lib import config, exceptions, util
+from counterpartycore.lib.parser import deserialize
 from counterpartycore.lib.util import ib2h
 
 logger = logging.getLogger(config.LOGGER_NAME)
@@ -412,7 +414,10 @@ def search_pubkey_in_transactions(pubkeyhash, tx_hashes):
                     # catch unhexlify errs for when txinwitness[1] isn't a witness program (eg; for P2W)
                     try:
                         pubkey = vin["txinwitness"][1]
-                        if pubkeyhash == script.pubkey_to_p2whash2(pubkey):
+                        if (
+                            pubkeyhash
+                            == PublicKey.from_hex(pubkey).get_segwit_address().to_string()
+                        ):
                             return pubkey
                     except binascii.Error:
                         pass
@@ -423,7 +428,15 @@ def search_pubkey_in_transactions(pubkeyhash, tx_hashes):
                     # catch unhexlify errs for when asm[1] isn't a pubkey (eg; for P2SH)
                     try:
                         pubkey = asm[3]
-                        if pubkeyhash == script.pubkey_to_pubkeyhash(util.unhexlify(pubkey)):
+                        if (
+                            pubkeyhash
+                            == PublicKey.from_hex(pubkey).get_address(compressed=False).to_string()
+                        ):
+                            return pubkey
+                        if (
+                            pubkeyhash
+                            == PublicKey.from_hex(pubkey).get_address(compressed=True).to_string()
+                        ):
                             return pubkey
                     except binascii.Error:
                         pass
@@ -432,7 +445,15 @@ def search_pubkey_in_transactions(pubkeyhash, tx_hashes):
             if len(asm) == 3:  # p2pk
                 try:
                     pubkey = asm[1]
-                    if pubkeyhash == script.pubkey_to_pubkeyhash(util.unhexlify(pubkey)):
+                    if (
+                        pubkeyhash
+                        == PublicKey.from_hex(pubkey).get_address(compressed=False).to_string()
+                    ):
+                        return pubkey
+                    if (
+                        pubkeyhash
+                        == PublicKey.from_hex(pubkey).get_address(compressed=True).to_string()
+                    ):
                         return pubkey
                 except binascii.Error:
                     pass
@@ -462,3 +483,14 @@ def list_unspent(source, allow_unconfirmed_inputs):
         return unspent_list
 
     return []
+
+
+def get_vin_info(vin):
+    # Note: We don't know what block the `vin` is in, and the block might
+    # have been from a while ago, so this call may not hit the cache.
+    vin_ctx = get_decoded_transaction(vin["hash"])
+
+    is_segwit = vin_ctx["segwit"]
+    vout = vin_ctx["vout"][vin["n"]]
+
+    return vout["value"], vout["script_pub_key"], is_segwit