fix: better connnect and rotate key support (#30)

* fix: better connect/disconnect handling

* feat: add consensus key rotation support

* chore: bump versions

* fix: cache population fixes

* chore: bump version and changelog

* chore: bump version

Author: clockworkgr

packages/core-modules/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eclesia/core-modules-pg
 
+## 2.15.1
+
+### Patch Changes
+
+- 7e721b5: `getConsensusAddress` now falls back to the `validators` table on a cache miss (instead of immediately throwing "No consensus address"), so an evicted `validatorAddressCache` (LRU, capped at 1000) entry or a not-yet-warmed cache after a restart no longer crashes block processing. It only throws when the validator is genuinely absent from the database.
+
+## 2.15.0
+
+### Minor Changes
+
+- 10c0226: Handle `MsgRotateConsPubKey` in the staking module: append the new consensus key to `validators` (now carrying `operator_address`, `is_active`, and `height`), deactivate the previous key, and carry live delegations over to the new consensus address. `validator_infos.consensus_address` is dropped in favour of the operator↔consensus mapping now held on `validators`.
+
 ## 2.14.3
 
 ### Patch Changes

packages/core-modules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclesia/core-modules-pg",
-  "version": "2.14.4",
+  "version": "2.15.2",
   "description": "Eclesia postgres indexer core modules",
   "type": "module",
   "scripts": {
@@ -42,6 +42,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@atomone/atomone-types": "^4.0.2",
     "@cosmjs/encoding": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
     "@cosmjs/tendermint-rpc": "^0.36.0",

packages/core-modules/src/cosmos.staking.v1beta1/index.ts

@@ -1,21 +1,49 @@
-/* ---- PARAMS ---- */
+/* ---- VALIDATORS INFO ---- */
+
+/* Operator-level static info. One row per validator, keyed by operator_address
+   (which never changes across a consensus-key rotation). Referenced by the
+   description/commission/voting-power/status tables. */
+CREATE TABLE validator_infos
+(
+    operator_address      TEXT   NOT NULL UNIQUE,
+    self_delegate_address TEXT REFERENCES accounts (address),
+    max_change_rate       TEXT   NOT NULL,
+    max_rate              TEXT   NOT NULL,
+    height                BIGINT REFERENCES blocks (height)
+);
+CREATE INDEX validator_info_operator_address_index ON validator_infos (operator_address);
+CREATE INDEX validator_info_self_delegate_address_index ON validator_infos (self_delegate_address);
+
+/* ---- VALIDATORS (consensus keys) ---- */
+
+/* One row per consensus key a validator has ever used. On a MsgRotateConsPubKey
+   the previous row is flipped to is_active=false and a new row is appended, so
+   this table doubles as the historical operator<->consensus mapping (an old
+   block's proposer_address still resolves here to its operator). */
 CREATE TABLE validators
 (
-    consensus_address TEXT NOT NULL PRIMARY KEY, /* Validator consensus address */
-    consensus_pubkey  TEXT NOT NULL UNIQUE /* Validator consensus public key */
+    consensus_address TEXT    NOT NULL PRIMARY KEY, /* Validator consensus address */
+    consensus_pubkey  TEXT    NOT NULL UNIQUE, /* Validator consensus public key */
+    operator_address  TEXT    NOT NULL REFERENCES validator_infos (operator_address),
+    is_active         BOOLEAN NOT NULL DEFAULT TRUE, /* Whether this is the validator's current consensus key */
+    height            BIGINT  REFERENCES blocks (height) /* Height at which this key became active */
 );
+/* At most one active consensus key per operator */
+CREATE UNIQUE INDEX validators_active_operator_idx ON validators (operator_address) WHERE is_active;
+CREATE INDEX validators_operator_address_index ON validators (operator_address);
 ALTER TABLE blocks ADD CONSTRAINT block_validator_fkey FOREIGN KEY(proposer_address) REFERENCES validators(consensus_address);
 
+/* ---- PARAMS ---- */
 CREATE TABLE staking_params
 (
-    
+
     params     JSONB   NOT NULL,
     height     BIGINT
-    
+
 );
 CREATE INDEX staking_params_height_index ON staking_params (height DESC NULLS LAST);
 
-CREATE TABLE staked_balances 
+CREATE TABLE staked_balances
 (
     delegator TEXT             REFERENCES accounts (address),
     shares numeric NOT NULL,
@@ -30,29 +58,14 @@ CREATE INDEX staked_balances_lookup_index ON staked_balances (delegator, validat
 /* ---- POOL ---- */
 CREATE TABLE staking_pool
 (
-    
+
     bonded_tokens            TEXT    NOT NULL,
     not_bonded_tokens        TEXT    NOT NULL,
     height                   BIGINT,
     CONSTRAINT unique_pool UNIQUE (bonded_tokens, not_bonded_tokens)
-    
-);
-CREATE INDEX staking_pool_height_index ON staking_pool (height DESC NULLS LAST);
 
-/* ---- VALIDATORS INFO ---- */
-
-CREATE TABLE validator_infos
-(
-    consensus_address     TEXT   NOT NULL UNIQUE REFERENCES validators (consensus_address),
-    operator_address      TEXT   NOT NULL UNIQUE,
-    self_delegate_address TEXT REFERENCES accounts (address),
-    max_change_rate       TEXT   NOT NULL,
-    max_rate              TEXT   NOT NULL,
-    height                BIGINT REFERENCES blocks (height)
 );
-CREATE INDEX validator_info_operator_address_index ON validator_infos (operator_address);
-CREATE INDEX validator_info_consensus_address_index ON validator_infos (consensus_address);
-CREATE INDEX validator_info_self_delegate_address_index ON validator_infos (self_delegate_address);
+CREATE INDEX staking_pool_height_index ON staking_pool (height DESC NULLS LAST);
 
 CREATE TABLE validator_descriptions
 (
@@ -98,4 +111,4 @@ CREATE TABLE validator_status
 );
 CREATE INDEX validator_status_height_index ON validator_status (height DESC NULLS LAST);
 CREATE INDEX validator_status_height_desc_null_lasts_index ON validator_status (height DESC NULLS LAST);
-CREATE INDEX validator_status_address_index ON validator_status (validator_address);
+CREATE INDEX validator_status_address_index ON validator_status (validator_address);

packages/core-modules/src/cosmos.staking.v1beta1/sql/module.sql

@@ -1,5 +1,11 @@
 # @eclesia/indexer-engine
 
+## 2.14.5
+
+### Patch Changes
+
+- 10c0226: Better RPC connect/disconnect handling and logging
+
 ## 2.14.2
 
 ### Patch Changes

packages/indexer-engine/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@eclesia/indexer-engine",
-  "version": "2.14.2",
+  "version": "2.14.5",
   "description": "Core eclesia indexer engine",
   "scripts": {
     "build": "tsc --noEmit && tsdown",

packages/indexer-engine/package.json

@@ -332,18 +332,27 @@ export class EcleciaIndexer extends EclesiaEmitter {
 
   public async connect() {
     try {
-      if (this.client && this.tryToRecover) {
+      if (this.client) {
         this.log.verbose("Recover from error. Attempting to disconnect from RPC");
-        this.client.disconnect();
-        this.blockClient.disconnect();
+        try {
+          this.client.disconnect();
+        }
+        catch (_e) { /* empty */ }
+        try {
+          this.blockClient?.disconnect();
+        }
+        catch (_e) { /* empty */ }
         this.log.verbose("Disconnected from RPC");
       }
       const connectTimeoutPromise = new Promise<ReturnType<typeof connectComet>>((resolve, reject) => {
-        setTimeout(reject, CONNECT_TIMEOUT_MS, []);
+        setTimeout(reject, CONNECT_TIMEOUT_MS, new RPCError("RPC connection timed out"));
       });
+      this.log.info("Attempting to connected to RPC: " + this.config.rpcUrl);
       this.client = await Promise.race([connectComet(this.config.rpcUrl), connectTimeoutPromise]);
+      await Promise.race([this.client.status(), connectTimeoutPromise]);
       this.log.info("Connected to RPC for ad hoc queries");
       this.blockClient = await Promise.race([connectComet(this.config.rpcUrl), connectTimeoutPromise]);
+      await Promise.race([this.blockClient.status(), connectTimeoutPromise]);
       this.log.info("Connected to RPC for block & validator info");
 
       return true;
@@ -420,7 +429,7 @@ export class EcleciaIndexer extends EclesiaEmitter {
       const statusPromise: Promise<StatusResponse> = new Promise((resolve, reject) => {
         setTimeout(reject,
           RPC_TIMEOUT_MS,
-          false);
+          new RPCError("RPC status call timed out"));
       });
       const status = await Promise.race([this.client.status(), statusPromise]);
       this.latestHeight = status.syncInfo.latestBlockHeight;