Release v0.69.0

.github/actions/setup-hathor-env/action.yml

@@ -30,7 +30,8 @@ runs:
       run: |
         brew cleanup -q
         # brew update -q
-        brew install -q graphviz rocksdb pkg-config
+        brew install -q graphviz rocksdb pkg-config openssl
+        echo "PYCOIN_LIBCRYPTO_PATH=$(brew --prefix openssl)/lib/libcrypto.dylib" >> $GITHUB_ENV
       shell: bash
 
     - name: Install Poetry dependencies

.github/workflows/lib.yml

@@ -0,0 +1,48 @@
+# yamllint disable rule:line-length
+name: lib_tests
+on: # yamllint disable-line rule:truthy
+  push:
+    branches:
+      - master
+      - dev
+    tags:
+      - v*
+  pull_request:
+    branches:
+      - master
+      - dev
+jobs:
+  test:
+    name: python-${{ matrix.python }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        working-directory: ./hathorlib
+    timeout-minutes: 40  # default is 360
+    strategy:
+      matrix:
+        python:
+          - "3.11"
+          - "3.12"
+        os:
+          - ubuntu-22.04
+          - macos-15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install Poetry
+        run: pip install 'poetry<2'
+      - name: Install Poetry dependencies
+        run: poetry install -n --no-root -E client
+      - name: Run linters
+        run: poetry run make check
+      - name: Run tests
+        run: poetry run make tests
+        continue-on-error: ${{ matrix.tier > 1 }}
+      - name: Upload coverage
+        uses: codecov/codecov-action@29386c70ef20e286228c72b668a06fd0e8399192 # https://github.com/codecov/codecov-action/releases/tag/v1
+        if: matrix.python == 3.11 && startsWith(matrix.os, 'ubuntu')

.github/workflows/main.yml

@@ -23,9 +23,9 @@ jobs:
           import os
           import json
           full_matrix = {
-            'python': ['3.11', '3.12'],
+            'python': ['3.11', '3.12', '3.13'],
             # available OS's: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idruns-on
-            'os': ['ubuntu-22.04', 'macos-13'],
+            'os': ['ubuntu-22.04', 'macos-15'],
           }
           # this is the fastest one:
           reduced_matrix = {

.yamllint.yml

@@ -1,5 +1,8 @@
 extends: default
 
+ignore:
+  - .venv/
+
 rules:
   document-start: disable
   line-length:

Dockerfile

@@ -16,6 +16,7 @@ RUN pip --no-input --no-cache-dir install --upgrade pip wheel poetry
 ENV POETRY_VIRTUALENVS_IN_PROJECT=true
 WORKDIR /app/
 COPY pyproject.toml poetry.lock  ./
+COPY hathorlib ./hathorlib
 RUN poetry install -n -E sentry --no-root --only=main
 COPY hathor ./hathor
 COPY hathor_cli ./hathor_cli

extras/github/docker.py

@@ -136,7 +136,7 @@ def extract_pyver(filename):
         output['tags'] = 'dont-push--local-only'
         output['push'] = 'false'
 
-    output['created'] = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ')
+    output['created'] = datetime.datetime.now(datetime.UTC).strftime('%Y-%m-%dT%H:%M:%SZ')
     output['dockerfile'] = dockerfile
 
     return output

hathor/__init__.py

@@ -39,7 +39,7 @@
     TxOutputScript,
     VertexId,
 )
-from hathor.nanocontracts.utils import sha3, verify_ecdsa
+from hathor.nanocontracts.utils import json_dumps, sha3, verify_ecdsa
 from hathor.version import __version__
 
 __all__ = [
@@ -73,5 +73,6 @@
     'VertexId',
     'sha3',
     'verify_ecdsa',
+    'json_dumps',
     '__version__',
 ]

hathor/_openapi/openapi_base.json

@@ -7,7 +7,7 @@
         ],
 	"info": {
             "title": "Hathor API",
-            "version": "0.68.4"
+            "version": "0.69.0"
 	},
 	"consumes": [
             "application/json"

hathor/api_util.py

@@ -152,7 +152,7 @@ def get_arg_default(args: dict[bytes, list[bytes]], key: str, default: T) -> T:
     bkey = key.encode()
     values = args.get(bkey)
     if not values:
-        return cast(T, default)
+        return default
     value: bytes = values[0]
     if isinstance(default, int):
         return cast(T, int(value))

hathor/builder/builder.py

@@ -46,7 +46,8 @@
 from hathor.storage import RocksDBStorage
 from hathor.stratum import StratumFactory
 from hathor.transaction.json_serializer import VertexJsonSerializer
-from hathor.transaction.storage import TransactionCacheStorage, TransactionRocksDBStorage, TransactionStorage
+from hathor.transaction.storage import TransactionRocksDBStorage, TransactionStorage
+from hathor.transaction.storage.rocksdb_storage import CacheConfig
 from hathor.transaction.vertex_children import RocksDBVertexChildrenService
 from hathor.transaction.vertex_parser import VertexParser
 from hathor.util import Random, get_environment_info
@@ -102,7 +103,7 @@ class BuildArtifacts(NamedTuple):
     tx_storage: TransactionStorage
     feature_service: FeatureService
     bit_signaling_service: BitSignalingService
-    indexes: Optional[IndexesManager]
+    indexes: IndexesManager
     wallet: Optional[BaseWallet]
     rocksdb_storage: RocksDBStorage
     stratum_factory: Optional[StratumFactory]
@@ -410,18 +411,17 @@ def _get_or_create_nc_log_storage(self) -> NCLogStorage:
     def _get_or_create_consensus(self) -> ConsensusAlgorithm:
         if self._consensus is None:
             soft_voided_tx_ids = self._get_soft_voided_tx_ids()
-            pubsub = self._get_or_create_pubsub()
             nc_storage_factory = self._get_or_create_nc_storage_factory()
             nc_calls_sorter = self._get_nc_calls_sorter()
             self._consensus = ConsensusAlgorithm(
                 nc_storage_factory=nc_storage_factory,
                 soft_voided_tx_ids=soft_voided_tx_ids,
-                pubsub=pubsub,
                 settings=self._get_or_create_settings(),
                 runner_factory=self._get_or_create_runner_factory(),
                 nc_log_storage=self._get_or_create_nc_log_storage(),
                 nc_calls_sorter=nc_calls_sorter,
                 feature_service=self._get_or_create_feature_service(),
+                tx_storage=self._get_or_create_tx_storage(),
             )
 
         return self._consensus
@@ -506,38 +506,27 @@ def _get_or_create_tx_storage(self) -> TransactionStorage:
             self._tx_storage.indexes = indexes
             return self._tx_storage
 
-        store_indexes: Optional[IndexesManager] = indexes
+        cache_config: CacheConfig | None = None
         if self._tx_storage_cache:
-            store_indexes = None
+            cache_config = CacheConfig()
+            if self._tx_storage_cache_capacity is not None:
+                cache_config.capacity = self._tx_storage_cache_capacity
 
         rocksdb_storage = self._get_or_create_rocksdb_storage()
         nc_storage_factory = self._get_or_create_nc_storage_factory()
         vertex_parser = self._get_or_create_vertex_parser()
         vertex_children_service = RocksDBVertexChildrenService(rocksdb_storage)
         self._tx_storage = TransactionRocksDBStorage(
-            rocksdb_storage,
-            indexes=store_indexes,
+            reactor=self._get_reactor(),
+            rocksdb_storage=rocksdb_storage,
+            indexes=indexes,
             settings=settings,
             vertex_parser=vertex_parser,
             nc_storage_factory=nc_storage_factory,
             vertex_children_service=vertex_children_service,
+            cache_config=cache_config,
         )
 
-        if self._tx_storage_cache:
-            reactor = self._get_reactor()
-            kwargs: dict[str, Any] = {}
-            if self._tx_storage_cache_capacity is not None:
-                kwargs['capacity'] = self._tx_storage_cache_capacity
-            self._tx_storage = TransactionCacheStorage(
-                self._tx_storage,
-                reactor,
-                indexes=indexes,
-                settings=settings,
-                nc_storage_factory=nc_storage_factory,
-                vertex_children_service=vertex_children_service,
-                **kwargs
-            )
-
         return self._tx_storage
 
     def _get_or_create_event_storage(self) -> EventStorage:
@@ -666,7 +655,6 @@ def _get_or_create_vertex_handler(self) -> VertexHandler:
                 feature_service=self._get_or_create_feature_service(),
                 execution_manager=self._get_or_create_execution_manager(),
                 pubsub=self._get_or_create_pubsub(),
-                wallet=self._get_or_create_wallet(),
             )
 
         return self._vertex_handler
@@ -794,9 +782,8 @@ def enable_event_queue(self) -> 'Builder':
     def set_tx_storage(self, tx_storage: TransactionStorage) -> 'Builder':
         self.check_if_can_modify()
         self._tx_storage = tx_storage
-        internal = tx_storage.store if isinstance(tx_storage, TransactionCacheStorage) else tx_storage
-        assert isinstance(internal, TransactionRocksDBStorage)
-        self._rocksdb_storage = internal._rocksdb_storage
+        assert isinstance(tx_storage, TransactionRocksDBStorage)
+        self._rocksdb_storage = tx_storage._rocksdb_storage
         return self
 
     def set_event_storage(self, event_storage: EventStorage) -> 'Builder':

hathor/builder/resources_builder.py

@@ -315,7 +315,6 @@ def create_resources(self) -> server.Site:
                 parent.putChild(url_path, resource)
 
         # Websocket resource
-        assert self.manager.tx_storage.indexes is not None
         ws_factory = HathorAdminWebsocketFactory(manager=self.manager,
                                                  metrics=self.manager.metrics,
                                                  address_index=self.manager.tx_storage.indexes.addresses)

hathor/conf/mainnet.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from hathor.checkpoint import Checkpoint as cp
-from hathor.conf.settings import HathorSettings, NanoContractsSetting
+from hathor.conf.settings import FeatureSetting, HathorSettings
 from hathor.feature_activation.feature import Feature
 from hathor.feature_activation.model.criteria import Criteria
 from hathor.feature_activation.settings import Settings as FeatureActivationSettings
@@ -213,7 +213,8 @@
         '00004305882eb3eef6b45f025ff58eb7baa5ca35f7d6f42c8b085482b00474e6',
         '000045ecbab77c9a8d819ff6d26893b9da2774eee5539f17d8fc2394f82b758e',
     ])),
-    ENABLE_NANO_CONTRACTS=NanoContractsSetting.FEATURE_ACTIVATION,
+    ENABLE_NANO_CONTRACTS=FeatureSetting.FEATURE_ACTIVATION,
+    ENABLE_FEE_BASED_TOKENS=FeatureSetting.DISABLED,
     NC_ON_CHAIN_BLUEPRINT_ALLOWED_ADDRESSES=[
         'HDkKGHwDHTuUGbhET73XdTJZkS8uU7PHf9',
         'HUbxYhtqW8pdRCC2WngPxN7MB4SUMDPrrh',
@@ -256,6 +257,26 @@
                 version='0.67.0',
                 signal_support_by_default=True,
             ),
+            Feature.FEE_TOKENS: Criteria(
+                # XXX: parity with hathor/conf/mainnet.yml
+                bit=2,
+                start_height=6_249_600,
+                timeout_height=6_592_320,
+                minimum_activation_height=6_350_400,
+                lock_in_on_timeout=False,
+                version='0.69.0',
+                signal_support_by_default=True,
+            ),
+            Feature.OPCODES_V2: Criteria(
+                # XXX: parity with hathor/conf/mainnet.yml
+                bit=3,
+                start_height=6_249_600,
+                timeout_height=6_592_320,
+                minimum_activation_height=6_350_400,
+                lock_in_on_timeout=False,
+                version='0.69.0',
+                signal_support_by_default=True,
+            ),
         }
     )
 )

hathor/conf/mainnet.yml

@@ -230,6 +230,26 @@ FEATURE_ACTIVATION:
       version: 0.67.0
       signal_support_by_default: true
 
+    FEE_TOKENS:
+      bit: 2
+      # Right now the best block is 6_248_703 at Tuesday, 2026-01-27 22:45:36 GMT
+      start_height: 6_249_600  # expected around 2026-02-04 06:14:06 GMT
+      timeout_height: 6_592_320  # 16 weeks, expected around 2026-05-27 06:14:06 GMT
+      minimum_activation_height: 6_350_400 # 4 weeks, expected around 2026-03-04 06:14:06 GMT
+      lock_in_on_timeout: false
+      version: 0.69.0
+      signal_support_by_default: true
+
+    OPCODES_V2:
+      bit: 3
+      # Right now the best block is 6_248_703 at Tuesday, 2026-01-27 21:45:36 GMT
+      start_height: 6_249_600  # expected around 2026-02-04 06:14:06 GMT
+      timeout_height: 6_592_320  # 16 weeks, expected around 2026-05-27 06:14:06 GMT
+      minimum_activation_height: 6_350_400 # 4 weeks, expected around 2026-03-04 06:14:06 GMT
+      lock_in_on_timeout: false
+      version: 0.69.0
+      signal_support_by_default: true
+
 ENABLE_NANO_CONTRACTS: feature_activation
 NC_ON_CHAIN_BLUEPRINT_ALLOWED_ADDRESSES:
   - HDkKGHwDHTuUGbhET73XdTJZkS8uU7PHf9

hathor/conf/settings.py

@@ -35,8 +35,8 @@
 
 
 @unique
-class NanoContractsSetting(StrEnum):
-    """Enum to configure the state of the Nano Contracts feature."""
+class FeatureSetting(StrEnum):
+    """Enum to configure the state of a feature."""
 
     # Completely disabled.
     DISABLED = auto()
@@ -49,14 +49,14 @@ class NanoContractsSetting(StrEnum):
 
     def __bool__(self) -> bool:
         """
-        >>> bool(NanoContractsSetting.DISABLED)
+        >>> bool(FeatureSetting.DISABLED)
         False
-        >>> bool(NanoContractsSetting.ENABLED)
+        >>> bool(FeatureSetting.ENABLED)
         True
-        >>> bool(NanoContractsSetting.FEATURE_ACTIVATION)
+        >>> bool(FeatureSetting.FEATURE_ACTIVATION)
         True
         """
-        return self in (NanoContractsSetting.ENABLED, NanoContractsSetting.FEATURE_ACTIVATION)
+        return self in (FeatureSetting.ENABLED, FeatureSetting.FEATURE_ACTIVATION)
 
 
 class HathorSettings(NamedTuple):
@@ -480,7 +480,13 @@ def GENESIS_TX2_TIMESTAMP(self) -> int:
     MAX_UNVERIFIED_PEERS_PER_CONN: int = 100
 
     # Used to enable nano contracts.
-    ENABLE_NANO_CONTRACTS: NanoContractsSetting = NanoContractsSetting.DISABLED
+    ENABLE_NANO_CONTRACTS: FeatureSetting = FeatureSetting.DISABLED
+
+    # Used to enable fee-based tokens.
+    ENABLE_FEE_BASED_TOKENS: FeatureSetting = FeatureSetting.DISABLED
+
+    # Used to enable opcodes V2.
+    ENABLE_OPCODES_V2: FeatureSetting = FeatureSetting.DISABLED
 
     # List of enabled blueprints.
     BLUEPRINTS: dict[bytes, str] = {}