@mainsail/consensus 0.0.1-evm.9 → 0.0.1-rc.2

package/distribution/aggregator.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Contracts } from "@mainsail/contracts";
 export declare class Aggregator implements Contracts.Consensus.Aggregator {
     private readonly validatorSet;
     private readonly workerPool;
     aggregate(majority: Map<number, {
         signature: string;
-    }>, activeValidators: number): Promise<Contracts.Crypto.AggregatedSignature>;
-    verify(signature: Contracts.Crypto.AggregatedSignature, data: Buffer, activeValidators: number): Promise<boolean>;
+    }>, roundValidators: number): Promise<Contracts.Crypto.AggregatedSignature>;
+    verify(signature: Contracts.Crypto.AggregatedSignature, data: Buffer, roundValidators: number): Promise<boolean>;
 }
 //# sourceMappingURL=aggregator.d.ts.map

package/distribution/aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregator.d.ts","sourceRoot":"","sources":["../source/aggregator.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAG7D,qBACa,UAAW,YAAW,SAAS,CAAC,SAAS,CAAC,UAAU;IAEhE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAG/D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAE7C,SAAS,CACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,EAC5C,gBAAgB,EAAE,MAAM,GACtB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAuB1C,MAAM,CACX,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAC/C,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC;CAoBnB"}
+{"version":3,"file":"aggregator.d.ts","sourceRoot":"","sources":["../source/aggregator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,UAAW,YAAW,SAAS,CAAC,SAAS,CAAC,UAAU;IAEhE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAG/D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAE7C,SAAS,CACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,EAC5C,eAAe,EAAE,MAAM,GACrB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAuB1C,MAAM,CACX,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAC/C,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAoBnB"}

package/distribution/aggregator.js

@@ -7,16 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { isMajority } from "@mainsail/blockchain-utils";
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Identifiers } from "@mainsail/contracts";
-import { Utils } from "@mainsail/kernel";
 let Aggregator = class Aggregator {
-    async aggregate(majority, activeValidators) {
-        if (!Utils.isMajority(majority.size, activeValidators)) {
+    async aggregate(majority, roundValidators) {
+        if (!isMajority(majority.size, roundValidators)) {
             throw new Error("Failed to aggregate signatures, because the majority is not reached.");
         }
         const signatures = [];
-        const validators = Array.from({ length: activeValidators }).fill(false);
+        const validators = Array.from({ length: roundValidators }).fill(false);
         for (const [key, { signature }] of majority) {
             signatures.push(Buffer.from(signature, "hex"));
             validators[key] = true;
@@ -28,11 +28,11 @@ let Aggregator = class Aggregator {
             validators,
         };
     }
-    async verify(signature, data, activeValidators) {
+    async verify(signature, data, roundValidators) {
         const validatorPublicKeys = signature.validators
             .map((v, index) => (v ? Buffer.from(this.validatorSet.getValidator(index).blsPublicKey, "hex") : undefined))
             .filter((item) => !!item);
-        if (!Utils.isMajority(validatorPublicKeys.length, activeValidators)) {
+        if (!isMajority(validatorPublicKeys.length, roundValidators)) {
             return false;
         }
         const worker = await this.workerPool.getWorker();

package/distribution/aggregator.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregator.js","sourceRoot":"","sources":["../source/aggregator.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGlC,IAAM,UAAU,GAAhB,MAAM,UAAU;IAOf,KAAK,CAAC,SAAS,CACrB,QAA4C,EAC5C,gBAAwB;QAExB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,MAAM,UAAU,GAAc,KAAK,CAAC,IAAI,CAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5F,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAC;YAC7C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/C,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAE3E,OAAO;YACN,SAAS;YACT,UAAU;SACV,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CACX,SAA+C,EAC/C,IAAY,EACZ,gBAAwB;QAExB,MAAM,mBAAmB,GAAa,SAAS,CAAC,UAAU;aACxD,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aAC3G,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,CAAC;YACrE,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QAEjD,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAE5F,OAAO,MAAM,MAAM,CAAC,kBAAkB,CACrC,QAAQ,EACR,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,EACvC,IAAI,EACJ,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,CACvC,CAAC;IACH,CAAC;CACD,CAAA;AAvDiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC;;gDACsB;AAG9C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC;;8CACc;AAL9C,UAAU;IADtB,UAAU,EAAE;GACA,UAAU,CAyDtB"}
+{"version":3,"file":"aggregator.js","sourceRoot":"","sources":["../source/aggregator.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGtD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAOf,KAAK,CAAC,SAAS,CACrB,QAA4C,EAC5C,eAAuB;QAEvB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,MAAM,UAAU,GAAc,KAAK,CAAC,IAAI,CAAU,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE3F,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAC;YAC7C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/C,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAE3E,OAAO;YACN,SAAS;YACT,UAAU;SACV,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CACX,SAA+C,EAC/C,IAAY,EACZ,eAAuB;QAEvB,MAAM,mBAAmB,GAAa,SAAS,CAAC,UAAU;aACxD,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aAC3G,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YAC9D,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;QAEjD,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAE5F,OAAO,MAAM,MAAM,CAAC,kBAAkB,CACrC,QAAQ,EACR,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,EACvC,IAAI,EACJ,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,CACvC,CAAC;IACH,CAAC;CACD,CAAA;AAvDiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC;;gDACsB;AAG9C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC;;8CACc;AAL9C,UAAU;IADtB,UAAU,EAAE;GACA,UAAU,CAyDtB"}

package/distribution/bootstrapper.js

@@ -14,19 +14,19 @@ let Bootstrapper = class Bootstrapper {
         const proposals = await this.storage.getProposals();
         this.logger.info(`Consensus Bootstrap - Proposals: ${proposals.length}`);
         for (const proposal of proposals) {
-            const roundState = this.roundStateRepo.getRoundState(proposal.height, proposal.round);
+            const roundState = this.roundStateRepo.getRoundState(proposal.blockNumber, proposal.round);
             roundState.addProposal(proposal);
         }
         const prevotes = await this.storage.getPrevotes();
         this.logger.info(`Consensus Bootstrap - Prevotes: ${prevotes.length}`);
         for (const prevote of prevotes) {
-            const roundState = this.roundStateRepo.getRoundState(prevote.height, prevote.round);
+            const roundState = this.roundStateRepo.getRoundState(prevote.blockNumber, prevote.round);
             roundState.addPrevote(prevote);
         }
         const precommits = await this.storage.getPrecommits();
         this.logger.info(`Consensus Bootstrap - Precommits: ${precommits.length}`);
         for (const precommit of precommits) {
-            const roundState = this.roundStateRepo.getRoundState(precommit.height, precommit.round);
+            const roundState = this.roundStateRepo.getRoundState(precommit.blockNumber, precommit.round);
             roundState.addPrecommit(precommit);
         }
         const state = (await this.storage.getState());
@@ -35,12 +35,12 @@ let Bootstrapper = class Bootstrapper {
         }
         if (state.validRound !== undefined) {
             // TODO: ensure validRound points to an existing round?
-            const roundState = this.roundStateRepo.getRoundState(state.height, state.validRound);
+            const roundState = this.roundStateRepo.getRoundState(state.blockNumber, state.validRound);
             state.validValue = roundState;
         }
         if (state.lockedRound !== undefined) {
             // TODO: ensure lockedRound points to an existing round?
-            const roundState = this.roundStateRepo.getRoundState(state.height, state.lockedRound);
+            const roundState = this.roundStateRepo.getRoundState(state.blockNumber, state.lockedRound);
             state.lockedValue = roundState;
         }
         return state;

package/distribution/bootstrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrapper.js","sourceRoot":"","sources":["../source/bootstrapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAS,MAAM,qBAAqB,CAAC;AAG7D,IAAM,YAAY,GAAlB,MAAM,YAAY;IAUjB,KAAK,CAAC,GAAG;QACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAEzE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtF,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAElD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACvE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACpF,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;YACxF,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAyD,CAAC;QACtG,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,uDAAuD;YACvD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YACrF,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,CAAC;QAED,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACrC,wDAAwD;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YACtF,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;QAChC,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAA;AArDiB;IADhB,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;;4CACS;AAGjC;IADhB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,oBAAoB,CAAC;;oDACwB;AAG1D;IADhB,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC;;6CACiB;AARlD,YAAY;IADxB,UAAU,EAAE;GACA,YAAY,CAuDxB"}
+{"version":3,"file":"bootstrapper.js","sourceRoot":"","sources":["../source/bootstrapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAS,MAAM,qBAAqB,CAAC;AAG7D,IAAM,YAAY,GAAlB,MAAM,YAAY;IAUjB,KAAK,CAAC,GAAG;QACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAEzE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC3F,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QAElD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACvE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACzF,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7F,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAyD,CAAC;QACtG,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,uDAAuD;YACvD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1F,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,CAAC;QAED,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACrC,wDAAwD;YACxD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YAC3F,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;QAChC,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAA;AArDiB;IADhB,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;;4CACS;AAGjC;IADhB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,oBAAoB,CAAC;;oDACwB;AAG1D;IADhB,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC;;6CACiB;AARlD,YAAY;IADxB,UAAU,EAAE;GACA,YAAY,CAuDxB"}

package/distribution/commit-state.d.ts

@@ -2,9 +2,8 @@ import { Contracts } from "@mainsail/contracts";
 export declare class CommitState implements Contracts.Processor.ProcessableUnit {
     #private;
     private readonly validatorSet;
-    get height(): number;
+    get blockNumber(): number;
     get round(): number;
-    get persist(): boolean;
     get validators(): string[];
     configure(commit: Contracts.Crypto.Commit): CommitState;
     getBlock(): Contracts.Crypto.Block;

package/distribution/commit-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-state.d.ts","sourceRoot":"","sources":["../source/commit-state.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,WAAY,YAAW,SAAS,CAAC,SAAS,CAAC,eAAe;;IAEtE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAO/D,IAAW,MAAM,IAAI,MAAM,CAE1B;IAED,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,UAAU,IAAI,MAAM,EAAE,CAEhC;IAEM,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,WAAW;IAYvD,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK;IAIlC,kBAAkB,CAAC,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,oBAAoB,GAAG,IAAI;IAInF,kBAAkB,IAAI,OAAO;IAI7B,kBAAkB,IAAI,SAAS,CAAC,SAAS,CAAC,oBAAoB;IAQ9D,iBAAiB,IAAI,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;IAIvD,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,IAAI;IAI/D,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;CAG1D"}
+{"version":3,"file":"commit-state.d.ts","sourceRoot":"","sources":["../source/commit-state.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,WAAY,YAAW,SAAS,CAAC,SAAS,CAAC,eAAe;;IAEtE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAO/D,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,IAAW,UAAU,IAAI,MAAM,EAAE,CAEhC;IAEM,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,WAAW;IAYvD,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK;IAIlC,kBAAkB,CAAC,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,oBAAoB,GAAG,IAAI;IAInF,kBAAkB,IAAI,OAAO;IAI7B,kBAAkB,IAAI,SAAS,CAAC,SAAS,CAAC,oBAAoB;IAQ9D,iBAAiB,IAAI,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC;IAIvD,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,IAAI;IAI/D,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;CAG1D"}

package/distribution/commit-state.js

@@ -28,21 +28,18 @@ let CommitState = class CommitState {
         _CommitState_validators.set(this, new Map());
         _CommitState_accountUpdates.set(this, []);
     }
-    get height() {
-        return __classPrivateFieldGet(this, _CommitState_commit, "f").block.data.height;
+    get blockNumber() {
+        return __classPrivateFieldGet(this, _CommitState_commit, "f").block.data.number;
     }
     get round() {
         return __classPrivateFieldGet(this, _CommitState_commit, "f").proof.round;
     }
-    get persist() {
-        return false; // Block downloader will store block in database, to improve performance
-    }
     get validators() {
         return [...__classPrivateFieldGet(this, _CommitState_validators, "f").keys()];
     }
     configure(commit) {
         __classPrivateFieldSet(this, _CommitState_commit, commit, "f");
-        const validators = this.validatorSet.getActiveValidators();
+        const validators = this.validatorSet.getRoundValidators();
         for (const validator of validators) {
             const consensusPublicKey = validator.blsPublicKey;
             __classPrivateFieldGet(this, _CommitState_validators, "f").set(consensusPublicKey, validator);

package/distribution/commit-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"commit-state.js","sourceRoot":"","sources":["../source/commit-state.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGtD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAAjB;QAIN,sCAAkC;QAClC,+CAA4D;QAC5D,kCAAc,IAAI,GAAG,EAA2C,EAAC;QACjE,sCAAsD,EAAE,EAAC;IA6D1D,CAAC;IA3DA,IAAW,MAAM;QAChB,OAAO,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IACvC,CAAC;IAED,IAAW,KAAK;QACf,OAAO,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,IAAW,OAAO;QACjB,OAAO,KAAK,CAAC,CAAC,wEAAwE;IACvF,CAAC;IAED,IAAW,UAAU;QACpB,OAAO,CAAC,GAAG,uBAAA,IAAI,+BAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,CAAC;IAEM,SAAS,CAAC,MAA+B;QAC/C,uBAAA,IAAI,uBAAW,MAAM,MAAA,CAAC;QAEtB,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAC3D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,kBAAkB,GAAG,SAAS,CAAC,YAAY,CAAC;YAClD,uBAAA,IAAI,+BAAY,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,QAAQ;QACd,OAAO,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC;IAC3B,CAAC;IAEM,kBAAkB,CAAC,eAAyD;QAClF,uBAAA,IAAI,gCAAoB,eAAe,MAAA,CAAC;IACzC,CAAC;IAEM,kBAAkB;QACxB,OAAO,uBAAA,IAAI,oCAAiB,KAAK,SAAS,CAAC;IAC5C,CAAC;IAEM,kBAAkB;QACxB,IAAI,uBAAA,IAAI,oCAAiB,IAAI,SAAS,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,uBAAA,IAAI,oCAAiB,CAAC;IAC9B,CAAC;IAEM,iBAAiB;QACvB,OAAO,uBAAA,IAAI,mCAAgB,CAAC;IAC7B,CAAC;IAEM,iBAAiB,CAAC,QAA4C;QACpE,uBAAA,IAAI,+BAAmB,QAAQ,MAAA,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,SAAS;QACrB,OAAO,uBAAA,IAAI,2BAAQ,CAAC;IACrB,CAAC;CACD,CAAA;;;;;AAlEiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC;;iDACsB;AAFnD,WAAW;IADvB,UAAU,EAAE;GACA,WAAW,CAoEvB"}
+{"version":3,"file":"commit-state.js","sourceRoot":"","sources":["../source/commit-state.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGtD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAAjB;QAIN,sCAAkC;QAClC,+CAA4D;QAC5D,kCAAc,IAAI,GAAG,EAA2C,EAAC;QACjE,sCAAsD,EAAE,EAAC;IAyD1D,CAAC;IAvDA,IAAW,WAAW;QACrB,OAAO,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IACvC,CAAC;IAED,IAAW,KAAK;QACf,OAAO,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,IAAW,UAAU;QACpB,OAAO,CAAC,GAAG,uBAAA,IAAI,+BAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IACrC,CAAC;IAEM,SAAS,CAAC,MAA+B;QAC/C,uBAAA,IAAI,uBAAW,MAAM,MAAA,CAAC;QAEtB,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;QAC1D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,kBAAkB,GAAG,SAAS,CAAC,YAAY,CAAC;YAClD,uBAAA,IAAI,+BAAY,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,QAAQ;QACd,OAAO,uBAAA,IAAI,2BAAQ,CAAC,KAAK,CAAC;IAC3B,CAAC;IAEM,kBAAkB,CAAC,eAAyD;QAClF,uBAAA,IAAI,gCAAoB,eAAe,MAAA,CAAC;IACzC,CAAC;IAEM,kBAAkB;QACxB,OAAO,uBAAA,IAAI,oCAAiB,KAAK,SAAS,CAAC;IAC5C,CAAC;IAEM,kBAAkB;QACxB,IAAI,uBAAA,IAAI,oCAAiB,IAAI,SAAS,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,uBAAA,IAAI,oCAAiB,CAAC;IAC9B,CAAC;IAEM,iBAAiB;QACvB,OAAO,uBAAA,IAAI,mCAAgB,CAAC;IAC7B,CAAC;IAEM,iBAAiB,CAAC,QAA4C;QACpE,uBAAA,IAAI,+BAAmB,QAAQ,MAAA,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,SAAS;QACrB,OAAO,uBAAA,IAAI,2BAAQ,CAAC;IACrB,CAAC;CACD,CAAA;;;;;AA9DiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC;;iDACsB;AAFnD,WAAW;IADvB,UAAU,EAAE;GACA,WAAW,CAgEvB"}

package/distribution/consensus.d.ts

@@ -16,7 +16,7 @@ export declare class Consensus implements Contracts.Consensus.Service {
     private readonly validatorSet;
     private readonly eventDispatcher;
     private readonly logger;
-    getHeight(): number;
+    getBlockNumber(): number;
     getRound(): number;
     setRound(round: number): void;
     getStep(): Contracts.Consensus.Step;
@@ -40,9 +40,9 @@ export declare class Consensus implements Contracts.Consensus.Service {
     protected onMajorityPrecommitAny(roundState: Contracts.Consensus.RoundState): Promise<void>;
     protected onMajorityPrecommit(roundState: Contracts.Processor.ProcessableUnit): Promise<void>;
     protected onMinorityWithHigherRound(roundState: Contracts.Processor.ProcessableUnit): Promise<void>;
-    onTimeoutPropose(height: number, round: number): Promise<void>;
-    onTimeoutPrevote(height: number, round: number): Promise<void>;
-    onTimeoutPrecommit(height: number, round: number): Promise<void>;
+    onTimeoutPropose(blockNumber: number, round: number): Promise<void>;
+    onTimeoutPrevote(blockNumber: number, round: number): Promise<void>;
+    onTimeoutPrecommit(blockNumber: number, round: number): Promise<void>;
     propose(roundState: Contracts.Consensus.RoundState): Promise<void>;
     prevote(value?: string): Promise<void>;
     precommit(value?: string): Promise<void>;

package/distribution/consensus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consensus.d.ts","sourceRoot":"","sources":["../source/consensus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"consensus.d.ts","sourceRoot":"","sources":["../source/consensus.ts"],"names":[],"mappings":"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"}

package/distribution/consensus.js

@@ -18,15 +18,15 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _Consensus_instances, _Consensus_height, _Consensus_round, _Consensus_step, _Consensus_lockedValue, _Consensus_validValue, _Consensus_didMajorityPrevote, _Consensus_didMajorityPrecommit, _Consensus_isDisposed, _Consensus_pendingJobs, _Consensus_proposalPromise, _Consensus_roundStartTime, _Consensus_handlerLock, _Consensus_isInvalidRoundState, _Consensus_makeProposal, _Consensus_bootstrap, _Consensus_processProposal, _Consensus_processBlock;
+var _Consensus_instances, _Consensus_blockNumber, _Consensus_round, _Consensus_step, _Consensus_lockedValue, _Consensus_validValue, _Consensus_didMajorityPrevote, _Consensus_didMajorityPrecommit, _Consensus_isDisposed, _Consensus_pendingJobs, _Consensus_proposalPromise, _Consensus_roundStartTime, _Consensus_handlerLock, _Consensus_isInvalidRoundState, _Consensus_makeProposal, _Consensus_bootstrap, _Consensus_processProposal, _Consensus_processBlock;
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Events, Identifiers } from "@mainsail/contracts";
-import { Utils } from "@mainsail/kernel";
+import { Lock } from "@mainsail/utils";
 import dayjs from "dayjs";
 let Consensus = class Consensus {
     constructor() {
         _Consensus_instances.add(this);
-        _Consensus_height.set(this, 1);
+        _Consensus_blockNumber.set(this, 1);
         _Consensus_round.set(this, 0);
         _Consensus_step.set(this, Contracts.Consensus.Step.Propose);
         _Consensus_lockedValue.set(this, void 0);
@@ -38,10 +38,10 @@ let Consensus = class Consensus {
         _Consensus_proposalPromise.set(this, void 0);
         _Consensus_roundStartTime.set(this, 0);
         // Handler lock is different than commit lock. It is used to prevent parallel processing and it is similar to queue.
-        _Consensus_handlerLock.set(this, new Utils.Lock());
+        _Consensus_handlerLock.set(this, new Lock());
     }
-    getHeight() {
-        return __classPrivateFieldGet(this, _Consensus_height, "f");
+    getBlockNumber() {
+        return __classPrivateFieldGet(this, _Consensus_blockNumber, "f");
     }
     getRound() {
         return __classPrivateFieldGet(this, _Consensus_round, "f");
@@ -73,7 +73,7 @@ let Consensus = class Consensus {
     }
     getState() {
         return {
-            height: __classPrivateFieldGet(this, _Consensus_height, "f"),
+            blockNumber: __classPrivateFieldGet(this, _Consensus_blockNumber, "f"),
             lockedRound: this.getLockedRound(),
             round: __classPrivateFieldGet(this, _Consensus_round, "f"),
             step: __classPrivateFieldGet(this, _Consensus_step, "f"),
@@ -83,10 +83,10 @@ let Consensus = class Consensus {
     async run() {
         await __classPrivateFieldGet(this, _Consensus_instances, "m", _Consensus_bootstrap).call(this);
         await this.startRound(__classPrivateFieldGet(this, _Consensus_round, "f"));
-        await this.handle(this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")));
+        await this.handle(this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")));
         // Rerun previous rounds, in case proposal & +2/3 precommits were received
         for (let index = 0; index < __classPrivateFieldGet(this, _Consensus_round, "f"); index++) {
-            await this.handle(this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), index));
+            await this.handle(this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), index));
         }
     }
     async dispose() {
@@ -146,15 +146,15 @@ let Consensus = class Consensus {
         if (__classPrivateFieldGet(this, _Consensus_isDisposed, "f")) {
             return;
         }
-        const roundState = this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
-        this.logger.info(`>> Starting new round: ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} with proposer: ${roundState.proposer.address}`);
+        const roundState = this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
+        this.logger.info(`>> Starting new round: ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} with proposer: ${roundState.proposer.address}`);
         await this.eventDispatcher.dispatch(Events.ConsensusEvent.RoundStarted, this.getState());
         this.scheduler.scheduleTimeoutBlockPrepare(this.scheduler.getNextBlockTimestamp(__classPrivateFieldGet(this, _Consensus_roundStartTime, "f")));
         // TODO: Skip on sync
         await this.propose(roundState);
     }
     async onTimeoutStartRound() {
-        this.scheduler.scheduleTimeoutPropose(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
+        this.scheduler.scheduleTimeoutPropose(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
         if (__classPrivateFieldGet(this, _Consensus_proposalPromise, "f")) {
             const proposal = await __classPrivateFieldGet(this, _Consensus_proposalPromise, "f");
             __classPrivateFieldSet(this, _Consensus_proposalPromise, undefined, "f");
@@ -171,9 +171,9 @@ let Consensus = class Consensus {
         }
         __classPrivateFieldSet(this, _Consensus_step, Contracts.Consensus.Step.Prevote, "f");
         const { block } = proposal.getData();
-        this.logger.info(`Received proposal ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} blockId: ${block.data.id}`);
+        this.logger.info(`Received proposal ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} block hash: ${block.data.hash}`);
         await this.eventDispatcher.dispatch(Events.ConsensusEvent.ProposalAccepted, this.getState());
-        await this.prevote(roundState.getProcessorResult() ? block.data.id : undefined);
+        await this.prevote(roundState.getProcessorResult() ? block.data.hash : undefined);
     }
     async onProposalLocked(roundState) {
         const proposal = roundState.getProposal();
@@ -187,11 +187,11 @@ let Consensus = class Consensus {
         }
         const { block } = proposal.getData();
         __classPrivateFieldSet(this, _Consensus_step, Contracts.Consensus.Step.Prevote, "f");
-        this.logger.info(`Received proposal ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} with locked blockId: ${block.data.id}`);
+        this.logger.info(`Received proposal ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} with locked block hash: ${block.data.hash}`);
         await this.eventDispatcher.dispatch(Events.ConsensusEvent.ProposalAccepted, this.getState());
         const lockedRound = this.getLockedRound();
         if ((!lockedRound || lockedRound <= proposal.validRound) && roundState.getProcessorResult()) {
-            await this.prevote(block.data.id);
+            await this.prevote(block.data.hash);
         }
         else {
             await this.prevote();
@@ -207,14 +207,14 @@ let Consensus = class Consensus {
             return;
         }
         const { block } = proposal.getData();
-        this.logger.info(`Received +2/3 prevotes for ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} blockId: ${block.data.id}`);
+        this.logger.info(`Received +2/3 prevotes for ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} block hash: ${block.data.hash}`);
         __classPrivateFieldSet(this, _Consensus_didMajorityPrevote, true, "f");
         if (__classPrivateFieldGet(this, _Consensus_step, "f") === Contracts.Consensus.Step.Prevote) {
             __classPrivateFieldSet(this, _Consensus_lockedValue, roundState, "f");
             __classPrivateFieldSet(this, _Consensus_validValue, roundState, "f");
             __classPrivateFieldSet(this, _Consensus_step, Contracts.Consensus.Step.Precommit, "f");
             await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedProposal, this.getState());
-            await this.precommit(block.data.id);
+            await this.precommit(block.data.hash);
         }
         else {
             __classPrivateFieldSet(this, _Consensus_validValue, roundState, "f");
@@ -225,7 +225,7 @@ let Consensus = class Consensus {
         if (__classPrivateFieldGet(this, _Consensus_step, "f") !== Contracts.Consensus.Step.Prevote || __classPrivateFieldGet(this, _Consensus_instances, "m", _Consensus_isInvalidRoundState).call(this, roundState)) {
             return;
         }
-        if (this.scheduler.scheduleTimeoutPrevote(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"))) {
+        if (this.scheduler.scheduleTimeoutPrevote(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"))) {
             await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedAny, this.getState());
         }
     }
@@ -233,7 +233,7 @@ let Consensus = class Consensus {
         if (__classPrivateFieldGet(this, _Consensus_step, "f") !== Contracts.Consensus.Step.Prevote || __classPrivateFieldGet(this, _Consensus_instances, "m", _Consensus_isInvalidRoundState).call(this, roundState)) {
             return;
         }
-        this.logger.info(`Received +2/3 prevotes for ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} blockId: null`);
+        this.logger.info(`Received +2/3 prevotes for ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} blockHash: null`);
         __classPrivateFieldSet(this, _Consensus_step, Contracts.Consensus.Step.Precommit, "f");
         await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrevotedNull, this.getState());
         await this.precommit();
@@ -242,22 +242,22 @@ let Consensus = class Consensus {
         if (__classPrivateFieldGet(this, _Consensus_instances, "m", _Consensus_isInvalidRoundState).call(this, roundState)) {
             return;
         }
-        if (this.scheduler.scheduleTimeoutPrecommit(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"))) {
+        if (this.scheduler.scheduleTimeoutPrecommit(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"))) {
             await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrecommitedAny, this.getState());
         }
     }
     async onMajorityPrecommit(roundState) {
-        // TODO: Only height must match. Round can be any. Add tests
-        if (__classPrivateFieldGet(this, _Consensus_didMajorityPrecommit, "f") || roundState.height !== __classPrivateFieldGet(this, _Consensus_height, "f")) {
+        // TODO: Only block number must match. Round can be any. Add tests
+        if (__classPrivateFieldGet(this, _Consensus_didMajorityPrecommit, "f") || roundState.blockNumber !== __classPrivateFieldGet(this, _Consensus_blockNumber, "f")) {
             return;
         }
         __classPrivateFieldSet(this, _Consensus_didMajorityPrecommit, true, "f");
         const block = roundState.getBlock();
         if (!roundState.getProcessorResult().success) {
-            this.logger.info(`Block ${block.data.id} on height ${__classPrivateFieldGet(this, _Consensus_height, "f")} received +2/3 precommits but is invalid`);
+            this.logger.info(`Block ${block.data.hash} on block number ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")} received +2/3 precommits but is invalid`);
             return;
         }
-        this.logger.info(`Received +2/3 precommits for ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${roundState.round} blockId: ${block.data.id}`);
+        this.logger.info(`Received +2/3 precommits for ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${roundState.round} block hash: ${block.data.hash}`);
         await this.eventDispatcher.dispatch(Events.ConsensusEvent.PrecommitedProposal, this.getState());
         await this.commitLock.runExclusive(async () => {
             var _a;
@@ -268,47 +268,51 @@ let Consensus = class Consensus {
                 await this.app.terminate("Failed to commit block", error);
             }
             this.roundStateRepository.clear();
-            __classPrivateFieldSet(this, _Consensus_height, (_a = __classPrivateFieldGet(this, _Consensus_height, "f"), _a++, _a), "f");
+            __classPrivateFieldSet(this, _Consensus_blockNumber, (_a = __classPrivateFieldGet(this, _Consensus_blockNumber, "f"), _a++, _a), "f");
             __classPrivateFieldSet(this, _Consensus_lockedValue, undefined, "f");
             __classPrivateFieldSet(this, _Consensus_validValue, undefined, "f");
             await this.startRound(0);
         });
     }
     async onMinorityWithHigherRound(roundState) {
-        if (roundState.height !== __classPrivateFieldGet(this, _Consensus_height, "f") || roundState.round <= __classPrivateFieldGet(this, _Consensus_round, "f")) {
+        if (roundState.blockNumber !== __classPrivateFieldGet(this, _Consensus_blockNumber, "f") || roundState.round <= __classPrivateFieldGet(this, _Consensus_round, "f")) {
             return;
         }
         await this.startRound(roundState.round);
     }
-    async onTimeoutPropose(height, round) {
+    async onTimeoutPropose(blockNumber, round) {
         await __classPrivateFieldGet(this, _Consensus_handlerLock, "f").runExclusive(async () => {
-            if (__classPrivateFieldGet(this, _Consensus_step, "f") !== Contracts.Consensus.Step.Propose || __classPrivateFieldGet(this, _Consensus_height, "f") !== height || __classPrivateFieldGet(this, _Consensus_round, "f") !== round) {
+            if (__classPrivateFieldGet(this, _Consensus_step, "f") !== Contracts.Consensus.Step.Propose ||
+                __classPrivateFieldGet(this, _Consensus_blockNumber, "f") !== blockNumber ||
+                __classPrivateFieldGet(this, _Consensus_round, "f") !== round) {
                 return;
             }
-            this.logger.info(`Timeout to propose ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} expired`);
+            this.logger.info(`Timeout to propose ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} expired`);
             __classPrivateFieldSet(this, _Consensus_step, Contracts.Consensus.Step.Prevote, "f");
             await this.prevote();
         });
     }
-    async onTimeoutPrevote(height, round) {
+    async onTimeoutPrevote(blockNumber, round) {
         await __classPrivateFieldGet(this, _Consensus_handlerLock, "f").runExclusive(async () => {
-            if (__classPrivateFieldGet(this, _Consensus_step, "f") !== Contracts.Consensus.Step.Prevote || __classPrivateFieldGet(this, _Consensus_height, "f") !== height || __classPrivateFieldGet(this, _Consensus_round, "f") !== round) {
+            if (__classPrivateFieldGet(this, _Consensus_step, "f") !== Contracts.Consensus.Step.Prevote ||
+                __classPrivateFieldGet(this, _Consensus_blockNumber, "f") !== blockNumber ||
+                __classPrivateFieldGet(this, _Consensus_round, "f") !== round) {
                 return;
             }
-            this.logger.info(`Timeout to prevote ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} expired`);
-            this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")).logPrevotes();
+            this.logger.info(`Timeout to prevote ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} expired`);
+            this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")).logPrevotes();
             __classPrivateFieldSet(this, _Consensus_step, Contracts.Consensus.Step.Precommit, "f");
             await this.precommit();
         });
     }
-    async onTimeoutPrecommit(height, round) {
+    async onTimeoutPrecommit(blockNumber, round) {
         await __classPrivateFieldGet(this, _Consensus_handlerLock, "f").runExclusive(async () => {
-            if (__classPrivateFieldGet(this, _Consensus_height, "f") !== height || __classPrivateFieldGet(this, _Consensus_round, "f") !== round) {
+            if (__classPrivateFieldGet(this, _Consensus_blockNumber, "f") !== blockNumber || __classPrivateFieldGet(this, _Consensus_round, "f") !== round) {
                 return;
             }
-            this.logger.info(`Timeout to precommit ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} expired`);
-            this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")).logPrevotes();
-            this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")).logPrecommits();
+            this.logger.info(`Timeout to precommit ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} expired`);
+            this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")).logPrevotes();
+            this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f")).logPrecommits();
             await this.startRound(__classPrivateFieldGet(this, _Consensus_round, "f") + 1);
         });
     }
@@ -324,8 +328,8 @@ let Consensus = class Consensus {
         __classPrivateFieldSet(this, _Consensus_proposalPromise, __classPrivateFieldGet(this, _Consensus_instances, "m", _Consensus_makeProposal).call(this, roundState, registeredProposer), "f");
     }
     async prevote(value) {
-        const roundState = this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
-        for (const validator of this.validatorSet.getActiveValidators()) {
+        const roundState = this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
+        for (const validator of this.validatorSet.getRoundValidators()) {
             const localValidator = this.validatorsRepository.getValidator(validator.blsPublicKey);
             if (localValidator === undefined) {
                 continue;
@@ -334,13 +338,13 @@ let Consensus = class Consensus {
             if (roundState.hasPrevote(validatorIndex)) {
                 continue;
             }
-            const prevote = await localValidator.prevote(validatorIndex, __classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"), value);
+            const prevote = await localValidator.prevote(validatorIndex, __classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"), value);
             void this.prevoteProcessor.process(prevote);
         }
     }
     async precommit(value) {
-        const roundState = this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
-        for (const validator of this.validatorSet.getActiveValidators()) {
+        const roundState = this.roundStateRepository.getRoundState(__classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"));
+        for (const validator of this.validatorSet.getRoundValidators()) {
             const localValidator = this.validatorsRepository.getValidator(validator.blsPublicKey);
             if (localValidator === undefined) {
                 continue;
@@ -349,12 +353,12 @@ let Consensus = class Consensus {
             if (roundState.hasPrecommit(validatorIndex)) {
                 continue;
             }
-            const precommit = await localValidator.precommit(validatorIndex, __classPrivateFieldGet(this, _Consensus_height, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"), value);
+            const precommit = await localValidator.precommit(validatorIndex, __classPrivateFieldGet(this, _Consensus_blockNumber, "f"), __classPrivateFieldGet(this, _Consensus_round, "f"), value);
             void this.precommitProcessor.process(precommit);
         }
     }
 };
-_Consensus_height = new WeakMap();
+_Consensus_blockNumber = new WeakMap();
 _Consensus_round = new WeakMap();
 _Consensus_step = new WeakMap();
 _Consensus_lockedValue = new WeakMap();
@@ -368,7 +372,7 @@ _Consensus_roundStartTime = new WeakMap();
 _Consensus_handlerLock = new WeakMap();
 _Consensus_instances = new WeakSet();
 _Consensus_isInvalidRoundState = function _Consensus_isInvalidRoundState(roundState) {
-    if (roundState.height !== __classPrivateFieldGet(this, _Consensus_height, "f")) {
+    if (roundState.blockNumber !== __classPrivateFieldGet(this, _Consensus_blockNumber, "f")) {
         return true;
     }
     if (roundState.round !== __classPrivateFieldGet(this, _Consensus_round, "f")) {
@@ -380,35 +384,33 @@ _Consensus_makeProposal = async function _Consensus_makeProposal(roundState, reg
     if (__classPrivateFieldGet(this, _Consensus_validValue, "f")) {
         const block = __classPrivateFieldGet(this, _Consensus_validValue, "f").getBlock();
         const lockProof = await __classPrivateFieldGet(this, _Consensus_validValue, "f").aggregatePrevotes();
-        this.logger.info(`Proposing valid block ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} from round ${this.getValidRound()} with blockId: ${block.data.id}`);
+        this.logger.info(`Proposing valid block ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} from round ${this.getValidRound()} with block hash: ${block.data.hash}`);
         return await registeredProposer.propose(this.validatorSet.getValidatorIndexByWalletAddress(roundState.proposer.address), __classPrivateFieldGet(this, _Consensus_round, "f"), __classPrivateFieldGet(this, _Consensus_validValue, "f").round, block, lockProof);
     }
     const block = await registeredProposer.prepareBlock(roundState.proposer.address, __classPrivateFieldGet(this, _Consensus_round, "f"), this.scheduler.getNextBlockTimestamp(__classPrivateFieldGet(this, _Consensus_roundStartTime, "f")));
-    this.logger.info(`Proposing new block ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} with blockId: ${block.data.id}`);
+    this.logger.info(`Proposing new block ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")} with block hash: ${block.data.hash}`);
     void this.eventDispatcher.dispatch(Events.BlockEvent.Forged, block.data);
     return registeredProposer.propose(this.validatorSet.getValidatorIndexByWalletAddress(roundState.proposer.address), __classPrivateFieldGet(this, _Consensus_round, "f"), undefined, block);
 };
 _Consensus_bootstrap = async function _Consensus_bootstrap() {
+    __classPrivateFieldSet(this, _Consensus_blockNumber, this.stateStore.getLastBlock().data.number + 1, "f");
     const state = await this.bootstrapper.run();
-    if (state && state.height === this.stateStore.getLastBlock().data.height + 1) {
-        __classPrivateFieldSet(this, _Consensus_step, state.step, "f");
-        __classPrivateFieldSet(this, _Consensus_height, state.height, "f");
-        __classPrivateFieldSet(this, _Consensus_round, state.round, "f");
-        __classPrivateFieldSet(this, _Consensus_lockedValue, state.lockedValue, "f");
-        __classPrivateFieldSet(this, _Consensus_validValue, state.validValue, "f");
-    }
-    else {
-        if (state) {
-            this.logger.warning(`Skipping state restore, because stored height is ${state.height}, but should be ${this.stateStore.getLastBlock().data.height + 1}`);
+    if (state) {
+        if (state.blockNumber === __classPrivateFieldGet(this, _Consensus_blockNumber, "f")) {
+            __classPrivateFieldSet(this, _Consensus_step, state.step, "f");
+            __classPrivateFieldSet(this, _Consensus_round, state.round, "f");
+            __classPrivateFieldSet(this, _Consensus_lockedValue, state.lockedValue, "f");
+            __classPrivateFieldSet(this, _Consensus_validValue, state.validValue, "f");
+        }
+        else {
+            this.logger.warning(`Skipping state restore, because stored block number is ${state.blockNumber}, but should be ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}`);
             this.roundStateRepository.clear();
         }
-        const lastBlock = this.stateStore.getLastBlock();
-        __classPrivateFieldSet(this, _Consensus_height, lastBlock.data.height + 1, "f");
     }
-    if (__classPrivateFieldGet(this, _Consensus_height, "f") !== this.configuration.getHeight()) {
-        throw new Error(`bootstrapped height ${__classPrivateFieldGet(this, _Consensus_height, "f")} does not match configuration height ${this.configuration.getHeight()}`);
+    if (__classPrivateFieldGet(this, _Consensus_blockNumber, "f") !== this.configuration.getHeight()) {
+        throw new Error(`bootstrapped block number ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")} does not match configuration block number ${this.configuration.getHeight()}`);
     }
-    this.logger.info(`Completed consensus bootstrap for ${__classPrivateFieldGet(this, _Consensus_height, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")}/${this.stateStore.getTotalRound()}`);
+    this.logger.info(`Completed consensus bootstrap for ${__classPrivateFieldGet(this, _Consensus_blockNumber, "f")}/${__classPrivateFieldGet(this, _Consensus_round, "f")}/${this.stateStore.getTotalRound()}`);
     await this.eventDispatcher.dispatch(Events.ConsensusEvent.Bootstrapped, this.getState());
 };
 _Consensus_processProposal = async function _Consensus_processProposal(roundState) {