@mainsail/consensus 0.0.1-evm.5 → 0.0.1-evm.51

package/distribution/processors/proposal-processor.js

@@ -7,37 +7,37 @@ 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);
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ProposalProcessor_instances, _ProposalProcessor_hasValidProposer, _ProposalProcessor_hasValidSignature;
+import { Enums, Identifiers } from "@mainsail/constants";
 import { inject, injectable, tagged } from "@mainsail/container";
-import { Contracts, Identifiers } from "@mainsail/contracts";
 import { AbstractProcessor } from "./abstract-processor.js";
 let ProposalProcessor = class ProposalProcessor extends AbstractProcessor {
-    constructor() {
-        super(...arguments);
-        _ProposalProcessor_instances.add(this);
-    }
+    proposalSerializer;
+    messageSerializer;
+    consensusSignature;
+    configuration;
+    aggregator;
+    proposerCalculator;
+    validatorSet;
+    roundStateRepo;
+    broadcaster;
+    logger;
     async process(proposal, broadcast = true) {
         return this.commitLock.runNonExclusive(async () => {
-            if (!this.hasValidHeightOrRound(proposal)) {
-                return Contracts.Consensus.ProcessorResult.Skipped;
+            if (!this.hasValidBlockNumberOrRound({ blockNumber: proposal.blockHeader.number, round: proposal.round })) {
+                return Enums.Consensus.ProcessorResult.Skipped;
             }
             if (!this.isRoundInBounds(proposal)) {
-                return Contracts.Consensus.ProcessorResult.Invalid;
+                return Enums.Consensus.ProcessorResult.Invalid;
             }
-            if (!__classPrivateFieldGet(this, _ProposalProcessor_instances, "m", _ProposalProcessor_hasValidProposer).call(this, proposal)) {
-                return Contracts.Consensus.ProcessorResult.Invalid;
+            if (!this.#hasValidProposer(proposal)) {
+                return Enums.Consensus.ProcessorResult.Invalid;
             }
-            if (!(await __classPrivateFieldGet(this, _ProposalProcessor_instances, "m", _ProposalProcessor_hasValidSignature).call(this, proposal))) {
-                return Contracts.Consensus.ProcessorResult.Invalid;
+            if (!(await this.#hasValidSignature(proposal))) {
+                return Enums.Consensus.ProcessorResult.Invalid;
             }
-            const roundState = this.roundStateRepo.getRoundState(proposal.height, proposal.round);
+            const roundState = this.roundStateRepo.getRoundState(proposal.blockHeader.number, proposal.round);
             if (roundState.hasProposal()) {
-                return Contracts.Consensus.ProcessorResult.Skipped;
+                return Enums.Consensus.ProcessorResult.Skipped;
             }
             roundState.addProposal(proposal);
             if (broadcast) {
@@ -47,7 +47,7 @@ let ProposalProcessor = class ProposalProcessor extends AbstractProcessor {
             setTimeout(() => {
                 void this.getConsensus().handle(roundState);
             }, 0);
-            return Contracts.Consensus.ProcessorResult.Accepted;
+            return Enums.Consensus.ProcessorResult.Accepted;
         });
     }
     async hasValidLockProof(proposal) {
@@ -55,35 +55,40 @@ let ProposalProcessor = class ProposalProcessor extends AbstractProcessor {
             return true;
         }
         if (proposal.validRound >= proposal.round) {
-            this.logger.debug(`Received proposal ${proposal.height}/${proposal.round} has validRound ${proposal.validRound} >= round ${proposal.round}`);
+            this.logger.debug(`Received proposal ${proposal.blockHeader.number}/${proposal.round} has validRound ${proposal.validRound} >= round ${proposal.round}`, "consensus");
             return false;
         }
-        const lockProof = proposal.getData().lockProof;
-        if (!lockProof) {
-            this.logger.debug(`Received proposal ${proposal.height}/${proposal.round} with missing lock proof`);
+        if (!proposal.lockProof) {
+            this.logger.debug(`Received proposal ${proposal.blockHeader.number}/${proposal.round} with missing lock proof`, "consensus");
             return true;
         }
-        const data = await this.messageSerializer.serializePrevoteForSignature({
-            blockId: proposal.getData().block.header.id,
-            height: proposal.height,
+        const data = await this.messageSerializer.serializeMessageForSignature({
+            blockHash: proposal.blockHeader.hash,
+            blockNumber: proposal.blockHeader.number,
             round: proposal.validRound,
-            type: Contracts.Crypto.MessageType.Prevote,
+            type: Enums.Crypto.MessageType.Prevote,
+        }, {
+            genesisBlockHash: this.stateStore.getGenesisCommit().block.hash,
+            previousBlockHash: this.stateStore.getLastBlock().hash,
         });
-        const { activeValidators } = this.configuration.getMilestone(proposal.height);
-        const verified = await this.aggregator.verify(lockProof, data, activeValidators);
+        const { roundValidators } = this.configuration.getMilestone(proposal.blockHeader.number);
+        const verified = await this.aggregator.verify(proposal.lockProof, data, roundValidators);
         if (!verified) {
-            this.logger.debug(`Received proposal ${proposal.height}/${proposal.round} with invalid lock proof`);
+            this.logger.debug(`Received proposal ${proposal.blockHeader.number}/${proposal.round} with invalid lock proof`, "consensus");
         }
         return verified;
     }
+    #hasValidProposer(proposal) {
+        return proposal.validatorIndex === this.proposerCalculator.getValidatorIndex(proposal.round);
+    }
+    async #hasValidSignature(proposal) {
+        return this.consensusSignature.verify(Buffer.from(proposal.signature, "hex"), await this.proposalSerializer.serializeProposalUnsigned(proposal.toSerializableData()), Buffer.from(this.validatorSet.getValidator(proposal.validatorIndex).blsPublicKey, "hex"));
+    }
 };
-_ProposalProcessor_instances = new WeakSet();
-_ProposalProcessor_hasValidProposer = function _ProposalProcessor_hasValidProposer(proposal) {
-    return proposal.validatorIndex === this.proposerSelector.getValidatorIndex(proposal.round);
-};
-_ProposalProcessor_hasValidSignature = async function _ProposalProcessor_hasValidSignature(proposal) {
-    return this.consensusSignature.verify(Buffer.from(proposal.signature, "hex"), await this.messageSerializer.serializeProposal(proposal.toSerializableData(), { includeSignature: false }), Buffer.from(this.validatorSet.getValidator(proposal.validatorIndex).blsPublicKey, "hex"));
-};
+__decorate([
+    inject(Identifiers.Cryptography.Proposal.Serializer),
+    __metadata("design:type", Object)
+], ProposalProcessor.prototype, "proposalSerializer", void 0);
 __decorate([
     inject(Identifiers.Cryptography.Message.Serializer),
     __metadata("design:type", Object)
@@ -102,9 +107,9 @@ __decorate([
     __metadata("design:type", Object)
 ], ProposalProcessor.prototype, "aggregator", void 0);
 __decorate([
-    inject(Identifiers.Proposer.Selector),
+    inject(Identifiers.BlockchainUtils.ProposerCalculator),
     __metadata("design:type", Object)
-], ProposalProcessor.prototype, "proposerSelector", void 0);
+], ProposalProcessor.prototype, "proposerCalculator", void 0);
 __decorate([
     inject(Identifiers.ValidatorSet.Service),
     __metadata("design:type", Object)

package/distribution/processors/proposal-processor.js.map

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

package/distribution/round-state-repository.d.ts

@@ -1,8 +1,8 @@
-import { Contracts } from "@mainsail/contracts";
+import type { Contracts } from "@mainsail/contracts";
 export declare class RoundStateRepository implements Contracts.Consensus.RoundStateRepository {
     #private;
     private readonly app;
-    getRoundState(height: number, round: number): Contracts.Consensus.RoundState;
+    getRoundState(blockNumber: number, round: number): Contracts.Consensus.RoundState;
     getRoundStates(): Contracts.Consensus.RoundState[];
     clear(): void;
 }

package/distribution/round-state-repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"round-state-repository.d.ts","sourceRoot":"","sources":["../source/round-state-repository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAG7D,qBACa,oBAAqB,YAAW,SAAS,CAAC,SAAS,CAAC,oBAAoB;;IAEpF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAI7C,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,UAAU;IAU5E,cAAc,IAAI,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE;IAIlD,KAAK,IAAI,IAAI;CAOpB"}
+{"version":3,"file":"round-state-repository.d.ts","sourceRoot":"","sources":["../source/round-state-repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAMrD,qBACa,oBAAqB,YAAW,SAAS,CAAC,SAAS,CAAC,oBAAoB;;IAEpF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAI7C,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,UAAU;IAUjF,cAAc,IAAI,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE;IAIlD,KAAK,IAAI,IAAI;CAOpB"}

package/distribution/round-state-repository.js

@@ -7,38 +7,28 @@ 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);
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _RoundStateRepository_instances, _RoundStateRepository_roundStates, _RoundStateRepository_createRoundState;
+import { Identifiers } from "@mainsail/constants";
 import { inject, injectable } from "@mainsail/container";
-import { Contracts, Identifiers } from "@mainsail/contracts";
 import { RoundState } from "./round-state.js";
 let RoundStateRepository = class RoundStateRepository {
-    constructor() {
-        _RoundStateRepository_instances.add(this);
-        _RoundStateRepository_roundStates.set(this, new Map());
-    }
-    getRoundState(height, round) {
-        const key = `${height}-${round}`;
-        if (!__classPrivateFieldGet(this, _RoundStateRepository_roundStates, "f").has(key)) {
-            __classPrivateFieldGet(this, _RoundStateRepository_roundStates, "f").set(key, __classPrivateFieldGet(this, _RoundStateRepository_instances, "m", _RoundStateRepository_createRoundState).call(this, height, round));
+    app;
+    #roundStates = new Map();
+    getRoundState(blockNumber, round) {
+        const key = `${blockNumber}-${round}`;
+        if (!this.#roundStates.has(key)) {
+            this.#roundStates.set(key, this.#createRoundState(blockNumber, round));
         }
-        return __classPrivateFieldGet(this, _RoundStateRepository_roundStates, "f").get(key);
+        return this.#roundStates.get(key);
     }
     getRoundStates() {
-        return [...__classPrivateFieldGet(this, _RoundStateRepository_roundStates, "f").values()];
+        return [...this.#roundStates.values()];
     }
     clear() {
-        __classPrivateFieldGet(this, _RoundStateRepository_roundStates, "f").clear();
+        this.#roundStates.clear();
+    }
+    #createRoundState(blockNumber, round) {
+        return this.app.resolve(RoundState).configure(blockNumber, round);
     }
-};
-_RoundStateRepository_roundStates = new WeakMap();
-_RoundStateRepository_instances = new WeakSet();
-_RoundStateRepository_createRoundState = function _RoundStateRepository_createRoundState(height, round) {
-    return this.app.resolve(RoundState).configure(height, round);
 };
 __decorate([
     inject(Identifiers.Application.Instance),

package/distribution/round-state-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"round-state-repository.js","sourceRoot":"","sources":["../source/round-state-repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEvC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;;QAIN,4CAAe,IAAI,GAAG,EAA0C,EAAC;IAuBlE,CAAC;IArBO,aAAa,CAAC,MAAc,EAAE,KAAa;QACjD,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC;QAEjC,IAAI,CAAC,uBAAA,IAAI,yCAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,uBAAA,IAAI,yCAAa,CAAC,GAAG,CAAC,GAAG,EAAE,uBAAA,IAAI,+EAAkB,MAAtB,IAAI,EAAmB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,uBAAA,IAAI,yCAAa,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACpC,CAAC;IAEM,cAAc;QACpB,OAAO,CAAC,GAAG,uBAAA,IAAI,yCAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK;QACX,uBAAA,IAAI,yCAAa,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CAKD,CAAA;;;yFAHkB,MAAc,EAAE,KAAa;IAC9C,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC;AAxBgB;IADhB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;;iDACW;AAFxC,oBAAoB;IADhC,UAAU,EAAE;GACA,oBAAoB,CA2BhC"}
+{"version":3,"file":"round-state-repository.js","sourceRoot":"","sources":["../source/round-state-repository.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEvC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAEf,GAAG,CAAgC;IAEpD,YAAY,GAAG,IAAI,GAAG,EAA0C,CAAC;IAE1D,aAAa,CAAC,WAAmB,EAAE,KAAa;QACtD,MAAM,GAAG,GAAG,GAAG,WAAW,IAAI,KAAK,EAAE,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACpC,CAAC;IAEM,cAAc;QACpB,OAAO,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK;QACX,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,iBAAiB,CAAC,WAAmB,EAAE,KAAa;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACnE,CAAC;CACD,CAAA;AAzBiB;IADhB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;;iDACW;AAFxC,oBAAoB;IADhC,UAAU,EAAE;GACA,oBAAoB,CA2BhC"}

package/distribution/round-state.d.ts

@@ -1,18 +1,18 @@
-import { Contracts } from "@mainsail/contracts";
+import type { Contracts } from "@mainsail/contracts";
 export declare class RoundState implements Contracts.Consensus.RoundState {
     #private;
     private readonly aggregator;
     private readonly configuration;
     private readonly validatorSet;
-    private readonly proposerSelector;
+    private readonly proposerCalculator;
     private readonly commitSerializer;
     private readonly logger;
-    get height(): number;
+    get blockNumber(): number;
     get round(): number;
     get persist(): boolean;
     get validators(): string[];
     get proposer(): Contracts.State.ValidatorWallet;
-    configure(height: number, round: number): RoundState;
+    configure(blockNumber: number, round: number): RoundState;
     getValidator(consensusPublicKey: string): Contracts.State.ValidatorWallet;
     hasProposal(): boolean;
     addProposal(proposal: Contracts.Crypto.Proposal): void;
@@ -25,19 +25,23 @@ export declare class RoundState implements Contracts.Consensus.RoundState {
     getAccountUpdates(): Array<Contracts.Evm.AccountUpdate>;
     setAccountUpdates(accounts: Array<Contracts.Evm.AccountUpdate>): void;
     hasPrevote(validatorIndex: number): boolean;
-    addPrevote(prevote: Contracts.Crypto.Prevote): void;
+    addPrevote(prevote: Contracts.Crypto.Message): void;
     hasPrecommit(validatorIndex: number): boolean;
-    addPrecommit(precommit: Contracts.Crypto.Precommit): void;
+    addPrecommit(precommit: Contracts.Crypto.Message): void;
+    hasMessage(message: Contracts.Crypto.Message): boolean;
+    getMessage(validatorIndex: number, type: Contracts.Crypto.MessageType): Contracts.Crypto.Message | undefined;
+    addMessage(message: Contracts.Crypto.Message): void;
     hasMajorityPrevotes(): boolean;
     hasMajorityPrevotesAny(): boolean;
     hasMajorityPrevotesNull(): boolean;
     hasMajorityPrecommits(): boolean;
     hasMajorityPrecommitsAny(): boolean;
     hasMinorityPrevotesOrPrecommits(): boolean;
-    getPrevote(validatorIndex: number): Contracts.Crypto.Prevote | undefined;
-    getPrevotes(): Contracts.Crypto.Prevote[];
-    getPrecommit(validatorIndex: number): Contracts.Crypto.Precommit | undefined;
-    getPrecommits(): Contracts.Crypto.Precommit[];
+    getPrevote(validatorIndex: number): Contracts.Crypto.Message | undefined;
+    getPrevotes(): Contracts.Crypto.Message[];
+    getPrecommit(validatorIndex: number): Contracts.Crypto.Message | undefined;
+    getMessages(): Contracts.Crypto.Message[];
+    getPrecommits(): Contracts.Crypto.Message[];
     getValidatorsSignedPrevote(): readonly boolean[];
     getValidatorsSignedPrecommit(): readonly boolean[];
     aggregatePrevotes(): Promise<Contracts.Crypto.AggregatedSignature>;

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

@@ -1 +1 @@
-{"version":3,"file":"round-state.d.ts","sourceRoot":"","sources":["../source/round-state.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,UAAU,CAAkC;IAG7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAG/D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAGhE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqC;IAGtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAkBlD,IAAW,MAAM,IAAI,MAAM,CAE1B;IAED,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,UAAU,IAAI,MAAM,EAAE,CAEhC;IAED,IAAW,QAAQ,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,CAErD;IAEM,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU;IAmBpD,YAAY,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,eAAe;IAMzE,WAAW,IAAI,OAAO;IAItB,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI;IAQtD,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,SAAS;IAIpD,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK;IAQ5B,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;IA6BnD,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;IAIrE,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;IAI3C,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI;IAUnD,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO;IAI7C,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI;IAUzD,mBAAmB,IAAI,OAAO;IAQ9B,sBAAsB,IAAI,OAAO;IAIjC,uBAAuB,IAAI,OAAO;IAIlC,qBAAqB,IAAI,OAAO;IAQhC,wBAAwB,IAAI,OAAO;IAInC,+BAA+B,IAAI,OAAO;IAI1C,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,GAAG,SAAS;IAIxE,WAAW,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE;IAIzC,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS;IAI5E,aAAa,IAAI,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE;IAI7C,0BAA0B,IAAI,SAAS,OAAO,EAAE;IAIhD,4BAA4B,IAAI,SAAS,OAAO,EAAE;IAI5C,iBAAiB,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAKlE,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAK1E,WAAW,IAAI,IAAI;IAUnB,aAAa,IAAI,IAAI;CA0D5B"}
+{"version":3,"file":"round-state.d.ts","sourceRoot":"","sources":["../source/round-state.ts"],"names":[],"mappings":"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"}