@mainsail/evm-consensus 0.0.1-evm.14 → 0.0.1-evm.16

package/distribution/deployer.d.ts

@@ -3,6 +3,7 @@ export interface GenesisBlockInfo {
     readonly timestamp: number;
     readonly totalAmount: string;
     readonly generatorAddress: string;
+    readonly initialHeight: number;
 }
 export declare class Deployer {
     #private;

package/distribution/deployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAuB,MAAM,qBAAqB,CAAC;AAOrE,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CAClC;AAED,qBACa,QAAQ;;IAEpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAG3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAIlD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAG9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAO7B,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkT/D,mBAAmB,IAAI,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE;CAS9D"}
+{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAuB,MAAM,qBAAqB,CAAC;AAOrE,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAC/B;AAED,qBACa,QAAQ;;IAEpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAG3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAIlD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAG9C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAO7B,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmS/D,mBAAmB,IAAI,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE;CAmB9D"}

package/distribution/deployer.js

@@ -18,11 +18,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _Deployer_instances, _Deployer_genesisBlockInfo, _Deployer_nonce, _Deployer_generateTxHash, _Deployer_initialize, _Deployer_getBlockContext, _Deployer_getSpecId, _Deployer_deployConsensusContract, _Deployer_deployConsensusProxy, _Deployer_deployUsernamesContract, _Deployer_deployUsernamesProxy, _Deployer_deployMultiPaymentContract, _Deployer_deployMultiPaymentProxy, _Deployer_deploymentEvents, _Deployer_emitContractDeployed;
+var _Deployer_instances, _Deployer_genesisBlockInfo, _Deployer_nonce, _Deployer_generateTxHash, _Deployer_initialize, _Deployer_getBlockContext, _Deployer_getSpecId, _Deployer_deployConsensusContract, _Deployer_deployConsensusProxy, _Deployer_deployUsernamesContract, _Deployer_deployUsernamesProxy, _Deployer_deployMultiPaymentContract, _Deployer_deployMultiPaymentProxy, _Deployer_deploymentEvents, _Deployer_emitContractDeployed, _Deployer_processTransaction;
 import { inject, injectable, tagged } from "@mainsail/container";
 import { Contracts, Events, Identifiers } from "@mainsail/contracts";
 import { ConsensusAbi, ERC1967ProxyAbi, MultiPaymentAbi, UsernamesAbi } from "@mainsail/evm-contracts";
-import { Utils } from "@mainsail/kernel";
+import { assert, BigNumber } from "@mainsail/utils";
 import { ethers, sha256 } from "ethers";
 import { Identifiers as EvmConsensusIdentifiers } from "./identifiers.js";
 let Deployer = class Deployer {
@@ -58,11 +58,12 @@ _Deployer_generateTxHash = new WeakMap();
 _Deployer_deploymentEvents = new WeakMap();
 _Deployer_instances = new WeakSet();
 _Deployer_initialize = async function _Deployer_initialize() {
-    Utils.assert.defined(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f"));
+    assert.defined(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f"));
     const genesisInfo = {
         account: __classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").generatorAddress,
         deployerAccount: this.deployerAddress,
-        initialSupply: Utils.BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").totalAmount).toBigInt(),
+        initialHeight: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").initialHeight).toBigInt(),
+        initialSupply: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").totalAmount).toBigInt(),
         usernameContract: ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 }), // PROXY Uses nonce 3
         validatorContract: ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 }), // PROXY Uses nonce 1
     };
@@ -70,7 +71,7 @@ _Deployer_initialize = async function _Deployer_initialize() {
     this.app.bind(EvmConsensusIdentifiers.Internal.GenesisInfo).toConstantValue(genesisInfo);
 };
 _Deployer_getBlockContext = function _Deployer_getBlockContext() {
-    const milestone = this.configuration.getMilestone(0);
+    const milestone = this.configuration.getMilestone();
     // Commit Key chosen in a way such that it does not conflict with blocks.
     return {
         commitKey: { height: BigInt(2 ** 32 + 1), round: BigInt(0) },
@@ -80,12 +81,12 @@ _Deployer_getBlockContext = function _Deployer_getBlockContext() {
     };
 };
 _Deployer_getSpecId = function _Deployer_getSpecId() {
-    const milestone = this.configuration.getMilestone(0);
+    const milestone = this.configuration.getMilestone();
     return milestone.evmSpec;
 };
 _Deployer_deployConsensusContract = async function _Deployer_deployConsensusContract() {
     // CONSENSUS
-    const consensusResult = await this.evm.process({
+    const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
         blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
         caller: this.deployerAddress,
         data: Buffer.concat([Buffer.from(ethers.getBytes(ConsensusAbi.bytecode.object))]),
@@ -96,15 +97,14 @@ _Deployer_deployConsensusContract = async function _Deployer_deployConsensusCont
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!consensusResult.receipt.success) {
+    if (!receipt.success) {
         throw new Error("failed to deploy Consensus contract");
     }
-    if (consensusResult.receipt.deployedContractAddress !==
-        ethers.getCreateAddress({ from: this.deployerAddress, nonce: 0 })) {
+    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 0 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Consensus contract from ${this.deployerAddress} to ${consensusResult.receipt.deployedContractAddress}`);
-    return consensusResult.receipt.deployedContractAddress;
+    this.logger.info(`Deployed Consensus contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
+    return receipt.deployedContractAddress;
 };
 _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(consensusContractAddress) {
     // Logic contract initializer function ABI
@@ -115,7 +115,7 @@ _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(c
     const proxyConstructorArguments = new ethers.AbiCoder()
         .encode(["address", "bytes"], [consensusContractAddress, initializerCalldata])
         .slice(2);
-    const proxyResult = await this.evm.process({
+    const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
         blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
         caller: this.deployerAddress,
         data: Buffer.concat([
@@ -129,27 +129,26 @@ _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(c
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!proxyResult.receipt.success) {
+    if (!receipt.success) {
         throw new Error("failed to deploy Consensus PROXY contract");
     }
-    if (proxyResult.receipt.deployedContractAddress !==
-        ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 })) {
+    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Consensus PROXY contract from ${this.deployerAddress} to ${proxyResult.receipt.deployedContractAddress}`);
+    this.logger.info(`Deployed Consensus PROXY contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
     __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
         activeImplementation: consensusContractAddress,
-        address: proxyResult.receipt.deployedContractAddress,
+        address: receipt.deployedContractAddress,
         implementations: [{ abi: ConsensusAbi.abi, address: consensusContractAddress }],
         name: "consensus",
         proxy: "UUPS",
     });
     this.app
         .bind(EvmConsensusIdentifiers.Contracts.Addresses.Consensus)
-        .toConstantValue(proxyResult.receipt.deployedContractAddress);
+        .toConstantValue(receipt.deployedContractAddress);
 };
 _Deployer_deployUsernamesContract = async function _Deployer_deployUsernamesContract() {
-    const result = await this.evm.process({
+    const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
         blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
         caller: this.deployerAddress,
         data: Buffer.concat([Buffer.from(ethers.getBytes(UsernamesAbi.bytecode.object))]),
@@ -160,14 +159,14 @@ _Deployer_deployUsernamesContract = async function _Deployer_deployUsernamesCont
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!result.receipt.success) {
+    if (!receipt.success) {
         throw new Error("failed to deploy Usernames contract");
     }
-    if (result.receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 2 })) {
+    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 2 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Usernames contract from ${this.deployerAddress} to ${result.receipt.deployedContractAddress}`);
-    return result.receipt.deployedContractAddress;
+    this.logger.info(`Deployed Usernames contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
+    return receipt.deployedContractAddress;
 };
 _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(usernamesContractAddress) {
     // Logic contract initializer function ABI
@@ -178,7 +177,7 @@ _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(u
     const proxyConstructorArguments = new ethers.AbiCoder()
         .encode(["address", "bytes"], [usernamesContractAddress, initializerCalldata])
         .slice(2);
-    const proxyResult = await this.evm.process({
+    const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
         blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
         caller: this.deployerAddress,
         data: Buffer.concat([
@@ -192,27 +191,26 @@ _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(u
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!proxyResult.receipt.success) {
+    if (!receipt.success) {
         throw new Error("failed to deploy Usernames PROXY contract");
     }
-    if (proxyResult.receipt.deployedContractAddress !==
-        ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 })) {
+    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Usernames PROXY contract from ${this.deployerAddress} to ${proxyResult.receipt.deployedContractAddress}`);
+    this.logger.info(`Deployed Usernames PROXY contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
     __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
         activeImplementation: usernamesContractAddress,
-        address: proxyResult.receipt.deployedContractAddress,
+        address: receipt.deployedContractAddress,
         implementations: [{ abi: UsernamesAbi.abi, address: usernamesContractAddress }],
         name: "usernames",
         proxy: "UUPS",
     });
     this.app
         .bind(EvmConsensusIdentifiers.Contracts.Addresses.Usernames)
-        .toConstantValue(proxyResult.receipt.deployedContractAddress);
+        .toConstantValue(receipt.deployedContractAddress);
 };
 _Deployer_deployMultiPaymentContract = async function _Deployer_deployMultiPaymentContract() {
-    const result = await this.evm.process({
+    const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
         blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
         caller: this.deployerAddress,
         data: Buffer.concat([Buffer.from(ethers.getBytes(MultiPaymentAbi.bytecode.object))]),
@@ -223,14 +221,14 @@ _Deployer_deployMultiPaymentContract = async function _Deployer_deployMultiPayme
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!result.receipt.success) {
+    if (!receipt.success) {
         throw new Error("failed to deploy MultiPayment contract");
     }
-    if (result.receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 4 })) {
+    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 4 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed MultiPayment contract from ${this.deployerAddress} to ${result.receipt.deployedContractAddress}`);
-    return result.receipt.deployedContractAddress;
+    this.logger.info(`Deployed MultiPayment contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
+    return receipt.deployedContractAddress;
 };
 _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentProxy(multiPaymentAddress) {
     // Logic contract initializer function ABI
@@ -241,7 +239,7 @@ _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentP
     const proxyConstructorArguments = new ethers.AbiCoder()
         .encode(["address", "bytes"], [multiPaymentAddress, initializerCalldata])
         .slice(2);
-    const proxyResult = await this.evm.process({
+    const receipt = await __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_processTransaction).call(this, {
         blockContext: __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_getBlockContext).call(this),
         caller: this.deployerAddress,
         data: Buffer.concat([
@@ -255,29 +253,36 @@ _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentP
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!proxyResult.receipt.success) {
+    if (!receipt.success) {
         throw new Error("failed to deploy MultiPayment PROXY contract");
     }
-    if (proxyResult.receipt.deployedContractAddress !==
-        ethers.getCreateAddress({ from: this.deployerAddress, nonce: 5 })) {
+    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 5 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed MultiPayment PROXY contract from ${this.deployerAddress} to ${proxyResult.receipt.deployedContractAddress}`);
+    this.logger.info(`Deployed MultiPayment PROXY contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
     __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
         activeImplementation: multiPaymentAddress,
-        address: proxyResult.receipt.deployedContractAddress,
+        address: receipt.deployedContractAddress,
         implementations: [{ abi: MultiPaymentAbi.abi, address: multiPaymentAddress }],
         name: "multi-payments",
         proxy: "UUPS",
     });
     this.app
         .bind(EvmConsensusIdentifiers.Contracts.Addresses.MultiPayment)
-        .toConstantValue(proxyResult.receipt.deployedContractAddress);
+        .toConstantValue(receipt.deployedContractAddress);
 };
 _Deployer_emitContractDeployed = function _Deployer_emitContractDeployed(event) {
     __classPrivateFieldGet(this, _Deployer_deploymentEvents, "f").push(event);
     void this.events.dispatch(Events.DeployerEvent.ContractCreated, event);
 };
+_Deployer_processTransaction = async function _Deployer_processTransaction(context) {
+    const { receipt } = await this.evm.getReceipt(context.blockContext.commitKey.height, context.txHash);
+    if (receipt) {
+        return receipt;
+    }
+    const result = await this.evm.process(context);
+    return result.receipt;
+};
 __decorate([
     inject(Identifiers.Application.Instance),
     __metadata("design:type", Object)

package/distribution/deployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AASnE,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAAd;;QAoBN,6CAAqC;QAErC,0BAAS,CAAC,EAAC;QACX,mCAAkB,GAAG,EAAE,eAAC,OAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,IAAI,8CAAA,CAAA,uDAAW,EAAX,KAAA,IAAa,IAAA,CAAA,MAAA,IAAA,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,EAAA,EAAC;QAwT5G,qCAAsD,EAAE,EAAC;IAK1D,CAAC;IA3TO,KAAK,CAAC,MAAM,CAAC,gBAAkC;QACrD,uBAAA,IAAI,8BAAqB,gBAAgB,MAAA,CAAC;QAE1C,MAAM,uBAAA,IAAI,iDAAY,MAAhB,IAAI,CAAc,CAAC;QAEzB,MAAM,wBAAwB,GAAG,MAAM,uBAAA,IAAI,8DAAyB,MAA7B,IAAI,CAA2B,CAAC;QACvE,MAAM,uBAAA,IAAI,2DAAsB,MAA1B,IAAI,EAAuB,wBAAwB,CAAC,CAAC;QAE3D,MAAM,wBAAwB,GAAG,MAAM,uBAAA,IAAI,8DAAyB,MAA7B,IAAI,CAA2B,CAAC;QACvE,MAAM,uBAAA,IAAI,2DAAsB,MAA1B,IAAI,EAAuB,wBAAwB,CAAC,CAAC;QAE3D,MAAM,2BAA2B,GAAG,MAAM,uBAAA,IAAI,iEAA4B,MAAhC,IAAI,CAA8B,CAAC;QAC7E,MAAM,uBAAA,IAAI,8DAAyB,MAA7B,IAAI,EAA0B,2BAA2B,CAAC,CAAC;QAEjE,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;YACvB,GAAG,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB,CAAC,SAAS;YACpC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAChD,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;SACtB,CAAC,CAAC;IACX,CAAC;IA+RM,mBAAmB;QACzB,OAAO,uBAAA,IAAI,kCAAkB,CAAC;IAC/B,CAAC;CAOD,CAAA;;;;;;uBAtSA,KAAK;IACJ,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAA,IAAI,kCAAkB,CAAC,CAAC;IAE7C,MAAM,WAAW,GAAG;QACnB,OAAO,EAAE,uBAAA,IAAI,kCAAkB,CAAC,gBAAgB;QAChD,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,uBAAA,IAAI,kCAAkB,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE;QAElF,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,qBAAqB;QAC1G,iBAAiB,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,qBAAqB;KAC3G,CAAC;IAEF,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAE9C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;AAC1F,CAAC;;IAGA,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAErD,yEAAyE;IACzE,OAAO;QACN,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE;QAC5D,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC;QAC7C,SAAS,EAAE,MAAM,CAAC,uBAAA,IAAI,kCAAkB,CAAC,SAAS,CAAC;QACnD,gBAAgB,EAAE,IAAI,CAAC,eAAe;KACtC,CAAC;AACH,CAAC;;IAGA,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrD,OAAO,SAAS,CAAC,OAAO,CAAC;AAC1B,CAAC;oCAED,KAAK;IACJ,YAAY;IACZ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAC9C,YAAY,EAAE,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB;QACrC,MAAM,EAAE,IAAI,CAAC,eAAe;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,uBAAA,IAAI,gDAAW,MAAf,IAAI,CAAa;QACzB,MAAM,EAAE,uBAAA,IAAI,gCAAgB,MAApB,IAAI,CAAkB;QAC9B,KAAK,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACxD,CAAC;IAED,IACC,eAAe,CAAC,OAAO,CAAC,uBAAuB;QAC/C,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAChE,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,oCAAoC,IAAI,CAAC,eAAe,OAAO,eAAe,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAChH,CAAC;IAEF,OAAO,eAAe,CAAC,OAAO,CAAC,uBAAwB,CAAC;AACzD,CAAC;iCAED,KAAK,yCAAuB,wBAAgC;IAC3D,0CAA0C;IAC1C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9D,8BAA8B;IAC9B,MAAM,mBAAmB,GAAG,cAAc,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC5E,2DAA2D;IAC3D,MAAM,yBAAyB,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;SACrD,MAAM,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,wBAAwB,EAAE,mBAAmB,CAAC,CAAC;SAC7E,KAAK,CAAC,CAAC,CAAC,CAAC;IAEX,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAC1C,YAAY,EAAE,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB;QACrC,MAAM,EAAE,IAAI,CAAC,eAAe;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,CAAC;SAC7C,CAAC;QACF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,uBAAA,IAAI,gDAAW,MAAf,IAAI,CAAa;QACzB,MAAM,EAAE,uBAAA,IAAI,gCAAgB,MAApB,IAAI,CAAkB;QAC9B,KAAK,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9D,CAAC;IAED,IACC,WAAW,CAAC,OAAO,CAAC,uBAAuB;QAC3C,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAChE,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,0CAA0C,IAAI,CAAC,eAAe,OAAO,WAAW,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAClH,CAAC;IAEF,uBAAA,IAAI,2DAAsB,MAA1B,IAAI,EAAuB;QAC1B,oBAAoB,EAAE,wBAAwB;QAC9C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,uBAAwB;QACrD,eAAe,EAAE,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;QAC/E,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG;SACN,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC;SAC3D,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,uBAAwB,CAAC,CAAC;AACjE,CAAC;oCAED,KAAK;IACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QACrC,YAAY,EAAE,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB;QACrC,MAAM,EAAE,IAAI,CAAC,eAAe;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACjF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,uBAAA,IAAI,gDAAW,MAAf,IAAI,CAAa;QACzB,MAAM,EAAE,uBAAA,IAAI,gCAAgB,MAApB,IAAI,CAAkB;QAC9B,KAAK,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACxD,CAAC;IAED,IACC,MAAM,CAAC,OAAO,CAAC,uBAAuB,KAAK,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAC3G,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,oCAAoC,IAAI,CAAC,eAAe,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAuB,EAAE,CACvG,CAAC;IAEF,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAwB,CAAC;AAChD,CAAC;iCAED,KAAK,yCAAuB,wBAAgC;IAC3D,0CAA0C;IAC1C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAC9D,8BAA8B;IAC9B,MAAM,mBAAmB,GAAG,cAAc,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC5E,2DAA2D;IAC3D,MAAM,yBAAyB,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;SACrD,MAAM,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,wBAAwB,EAAE,mBAAmB,CAAC,CAAC;SAC7E,KAAK,CAAC,CAAC,CAAC,CAAC;IAEX,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAC1C,YAAY,EAAE,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB;QACrC,MAAM,EAAE,IAAI,CAAC,eAAe;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,CAAC;SAC7C,CAAC;QACF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,uBAAA,IAAI,gDAAW,MAAf,IAAI,CAAa;QACzB,MAAM,EAAE,uBAAA,IAAI,gCAAgB,MAApB,IAAI,CAAkB;QAC9B,KAAK,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9D,CAAC;IAED,IACC,WAAW,CAAC,OAAO,CAAC,uBAAuB;QAC3C,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAChE,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,0CAA0C,IAAI,CAAC,eAAe,OAAO,WAAW,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAClH,CAAC;IAEF,uBAAA,IAAI,2DAAsB,MAA1B,IAAI,EAAuB;QAC1B,oBAAoB,EAAE,wBAAwB;QAC9C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,uBAAwB;QACrD,eAAe,EAAE,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;QAC/E,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG;SACN,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC;SAC3D,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,uBAAwB,CAAC,CAAC;AACjE,CAAC;uCAED,KAAK;IACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QACrC,YAAY,EAAE,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB;QACrC,MAAM,EAAE,IAAI,CAAC,eAAe;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACpF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,uBAAA,IAAI,gDAAW,MAAf,IAAI,CAAa;QACzB,MAAM,EAAE,uBAAA,IAAI,gCAAgB,MAApB,IAAI,CAAkB;QAC9B,KAAK,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC3D,CAAC;IAED,IACC,MAAM,CAAC,OAAO,CAAC,uBAAuB,KAAK,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAC3G,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,uCAAuC,IAAI,CAAC,eAAe,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAC1G,CAAC;IAEF,OAAO,MAAM,CAAC,OAAO,CAAC,uBAAwB,CAAC;AAChD,CAAC;oCAED,KAAK,4CAA0B,mBAA2B;IACzD,0CAA0C;IAC1C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACjE,8BAA8B;IAC9B,MAAM,mBAAmB,GAAG,cAAc,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC5E,2DAA2D;IAC3D,MAAM,yBAAyB,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;SACrD,MAAM,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;SACxE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEX,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAC1C,YAAY,EAAE,uBAAA,IAAI,sDAAiB,MAArB,IAAI,CAAmB;QACrC,MAAM,EAAE,IAAI,CAAC,eAAe;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,CAAC;SAC7C,CAAC;QACF,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,uBAAA,IAAI,gDAAW,MAAf,IAAI,CAAa;QACzB,MAAM,EAAE,uBAAA,IAAI,gCAAgB,MAApB,IAAI,CAAkB;QAC9B,KAAK,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IACjE,CAAC;IAED,IACC,WAAW,CAAC,OAAO,CAAC,uBAAuB;QAC3C,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAChE,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,6CAA6C,IAAI,CAAC,eAAe,OAAO,WAAW,CAAC,OAAO,CAAC,uBAAuB,EAAE,CACrH,CAAC;IAEF,uBAAA,IAAI,2DAAsB,MAA1B,IAAI,EAAuB;QAC1B,oBAAoB,EAAE,mBAAmB;QACzC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,uBAAwB;QACrD,eAAe,EAAE,CAAC,EAAE,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;QAC7E,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG;SACN,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC;SAC9D,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,uBAAwB,CAAC,CAAC;AACjE,CAAC;yEAOqB,KAAqC;IAC1D,uBAAA,IAAI,kCAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnC,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACxE,CAAC;AAjVgB;IADhB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;;qCACW;AAGnC;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;+CACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;;wCACM;AAG1C;IADhB,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;;wCACS;AAIjC;IAFhB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC;;qCACoB;AAG7B;IADhB,MAAM,CAAC,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;;iDAClB;AAlB9B,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CAoVpB"}
+{"version":3,"file":"deployer.js","sourceRoot":"","sources":["../source/deployer.ts"],"names":[],"mappings":"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"}

package/distribution/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAS,MAAM,kBAAkB,CAAC;AAQpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBACa,eAAgB,SAAQ,SAAS,CAAC,eAAe;IAChD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAclC;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBACa,eAAgB,SAAQ,SAAS,CAAC,eAAe;IAChD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAUzB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAelC;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}

package/distribution/index.js

@@ -6,17 +6,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { injectable } from "@mainsail/container";
 import { Identifiers } from "@mainsail/contracts";
-import { Providers, Utils } from "@mainsail/kernel";
+import { Providers } from "@mainsail/kernel";
+import { assert } from "@mainsail/utils";
 import { Deployer } from "./deployer.js";
 import { Identifiers as EvmConsensusIdentifiers } from "./identifiers.js";
-import { Selector } from "./selector.js";
 import { ConsensusContractService } from "./services/consensus-contract-service.js";
 import { ValidatorSet } from "./validator-set.js";
 export { Identifiers } from "./identifiers.js";
 let ServiceProvider = class ServiceProvider extends Providers.ServiceProvider {
     async register() {
         this.app.bind(Identifiers.ValidatorSet.Service).to(ValidatorSet).inSingletonScope();
-        this.app.bind(Identifiers.Proposer.Selector).to(Selector).inSingletonScope();
         this.app.bind(Identifiers.Evm.ContractService.Consensus).to(ConsensusContractService);
         this.app
             .bind(EvmConsensusIdentifiers.Internal.Addresses.Deployer)
@@ -25,10 +24,11 @@ let ServiceProvider = class ServiceProvider extends Providers.ServiceProvider {
     async boot() {
         this.app.get(Identifiers.Services.Log.Service).info("Booting EVM Consensus...");
         const genesisBlock = this.app.config("crypto.genesisBlock");
-        Utils.assert.defined(genesisBlock);
+        assert.defined(genesisBlock);
         this.app.bind(EvmConsensusIdentifiers.Internal.Deployer).to(Deployer).inSingletonScope();
         await this.app.get(EvmConsensusIdentifiers.Internal.Deployer).deploy({
             generatorAddress: genesisBlock.block.generatorAddress,
+            initialHeight: genesisBlock.block.height,
             timestamp: genesisBlock.block.timestamp,
             totalAmount: genesisBlock.block.totalAmount,
         });

package/distribution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAa,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEpF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC;QAEtF,IAAI,CAAC,GAAG;aACN,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;aACzD,eAAe,CAAC,4CAA4C,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,GAAG,CAAC,GAAG,CAA0B,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEzG,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAA8B,qBAAqB,CAAC,CAAC;QACzF,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEzF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAW,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;YAC9E,gBAAgB,EAAE,YAAY,CAAC,KAAK,CAAC,gBAAgB;YACrD,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS;YACvC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,WAAW;SAC3C,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA1BY,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CA0B3B;;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAa,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEpF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC;QAEtF,IAAI,CAAC,GAAG;aACN,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC;aACzD,eAAe,CAAC,4CAA4C,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,GAAG,CAAC,GAAG,CAA0B,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEzG,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAA8B,qBAAqB,CAAC,CAAC;QACzF,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEzF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAW,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;YAC9E,gBAAgB,EAAE,YAAY,CAAC,KAAK,CAAC,gBAAgB;YACrD,aAAa,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM;YACxC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS;YACvC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC,WAAW;SAC3C,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA1BY,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CA0B3B;;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}

package/distribution/services/rounds-iterator.d.ts

@@ -3,6 +3,7 @@ export declare class AsyncValidatorRoundsIterator implements AsyncIterable<Contr
     #private;
     private readonly app;
     private readonly configuration;
+    private readonly roundCalculator;
     private readonly evm;
     [Symbol.asyncIterator](): AsyncIterator<Contracts.Evm.ValidatorRound>;
     next(): Promise<IteratorResult<Contracts.Evm.ValidatorRound>>;

package/distribution/services/rounds-iterator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rounds-iterator.d.ts","sourceRoot":"","sources":["../../source/services/rounds-iterator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAU7D,qBACa,4BAA6B,YAAW,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC;;IAE/F,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAIhE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAM9C,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC;IAI/D,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAerD,SAAS;CA6CvB"}
+{"version":3,"file":"rounds-iterator.d.ts","sourceRoot":"","sources":["../../source/services/rounds-iterator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAS7D,qBACa,4BAA6B,YAAW,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC;;IAE/F,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;IAI7E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAM9C,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC;IAI/D,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAerD,SAAS;CA4CvB"}

package/distribution/services/rounds-iterator.js

@@ -22,7 +22,6 @@ var _AsyncValidatorRoundsIterator_rounds, _AsyncValidatorRoundsIterator_index, _
 import { inject, injectable, tagged } from "@mainsail/container";
 import { Contracts, Identifiers } from "@mainsail/contracts";
 import { ConsensusAbi } from "@mainsail/evm-contracts";
-import { Utils } from "@mainsail/kernel";
 import { BigNumber } from "@mainsail/utils";
 import { ethers } from "ethers";
 import { Identifiers as EvmConsensusIdentifiers } from "../identifiers.js";
@@ -71,8 +70,7 @@ let AsyncValidatorRoundsIterator = class AsyncValidatorRoundsIterator {
             const roundNumber = Number(round);
             validatorRounds.push({
                 round: roundNumber,
-                roundHeight: Utils.roundCalculator.calculateRoundInfoByRound(roundNumber, this.configuration)
-                    .roundHeight,
+                roundHeight: this.roundCalculator.calculateRoundInfoByRound(roundNumber).roundHeight,
                 validators: validators.map((validator) => {
                     const [validatorAddress, voteBalance] = validator;
                     return {
@@ -93,6 +91,10 @@ __decorate([
     inject(Identifiers.Cryptography.Configuration),
     __metadata("design:type", Object)
 ], AsyncValidatorRoundsIterator.prototype, "configuration", void 0);
+__decorate([
+    inject(Identifiers.BlockchainUtils.RoundCalculator),
+    __metadata("design:type", Object)
+], AsyncValidatorRoundsIterator.prototype, "roundCalculator", void 0);
 __decorate([
     inject(Identifiers.Evm.Instance),
     tagged("instance", "evm"),

package/distribution/services/rounds-iterator.js.map

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

package/distribution/validator-set.d.ts

@@ -3,6 +3,7 @@ export declare class ValidatorSet implements Contracts.ValidatorSet.Service {
     #private;
     private readonly configuration;
     private readonly consensusContractService;
+    private readonly roundCalculator;
     restore(): Promise<void>;
     onCommit(unit: Contracts.Processor.ProcessableUnit): Promise<void>;
     getAllValidators(): Contracts.State.ValidatorWallet[];

package/distribution/validator-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator-set.d.ts","sourceRoot":"","sources":["../source/validator-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA2B,MAAM,qBAAqB,CAAC;AAGzE,qBACa,YAAa,YAAW,SAAS,CAAC,YAAY,CAAC,OAAO;;IAElE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA0C;IAQtE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxE,gBAAgB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAIrD,kBAAkB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAIvD,mBAAmB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAUxD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,eAAe;IAI5D,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;CAwCtE"}
+{"version":3,"file":"validator-set.d.ts","sourceRoot":"","sources":["../source/validator-set.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA2B,MAAM,qBAAqB,CAAC;AAEzE,qBACa,YAAa,YAAW,SAAS,CAAC,YAAY,CAAC,OAAO;;IAElE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA0C;IAGnF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6C;IAQhE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxE,gBAAgB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAIrD,kBAAkB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAIvD,mBAAmB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAUxD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,eAAe;IAI5D,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;CAwCtE"}

package/distribution/validator-set.js

@@ -21,7 +21,6 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _ValidatorSet_instances, _ValidatorSet_topValidators, _ValidatorSet_indexByAddress, _ValidatorSet_allValidators, _ValidatorSet_dirtyValidators, _ValidatorSet_buildActiveValidators, _ValidatorSet_calculateChangedValidators;
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Exceptions, Identifiers } from "@mainsail/contracts";
-import { Utils } from "@mainsail/kernel";
 let ValidatorSet = class ValidatorSet {
     constructor() {
         _ValidatorSet_instances.add(this);
@@ -36,7 +35,7 @@ let ValidatorSet = class ValidatorSet {
         __classPrivateFieldSet(this, _ValidatorSet_allValidators, new Map(validators.map((validator) => [validator.address, validator])), "f");
     }
     async onCommit(unit) {
-        if (Utils.roundCalculator.isNewRound(unit.height + 1, this.configuration)) {
+        if (this.roundCalculator.isNewRound(unit.height + 1)) {
             await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_buildActiveValidators).call(this);
         }
         await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_calculateChangedValidators).call(this);
@@ -102,6 +101,10 @@ __decorate([
     inject(Identifiers.Evm.ContractService.Consensus),
     __metadata("design:type", Object)
 ], ValidatorSet.prototype, "consensusContractService", void 0);
+__decorate([
+    inject(Identifiers.BlockchainUtils.RoundCalculator),
+    __metadata("design:type", Object)
+], ValidatorSet.prototype, "roundCalculator", void 0);
 ValidatorSet = __decorate([
     injectable()
 ], ValidatorSet);

package/distribution/validator-set.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mainsail/evm-consensus",
-  "version": "0.0.1-evm.14",
+  "version": "0.0.1-evm.16",
   "description": "EVM development support for the Mainsail blockchain",
   "license": "GPL-3.0-only",
   "contributors": [],
@@ -11,16 +11,16 @@
     "/distribution"
   ],
   "dependencies": {
-    "ethers": "^6.11.0",
-    "@mainsail/contracts": "0.0.1-evm.14",
-    "@mainsail/kernel": "0.0.1-evm.14",
-    "@mainsail/utils": "0.0.1-evm.14",
-    "@mainsail/evm-contracts": "0.0.1-evm.14",
-    "@mainsail/container": "0.0.1-evm.14"
+    "ethers": "6.13.5",
+    "@mainsail/container": "0.0.1-evm.16",
+    "@mainsail/contracts": "0.0.1-evm.16",
+    "@mainsail/evm-contracts": "0.0.1-evm.16",
+    "@mainsail/utils": "0.0.1-evm.16",
+    "@mainsail/kernel": "0.0.1-evm.16"
   },
   "devDependencies": {
-    "@types/seedrandom": "^3.0.8",
-    "uvu": "^0.5.6"
+    "@types/seedrandom": "3.0.8",
+    "uvu": "0.5.6"
   },
   "engines": {
     "node": ">=20.x"

package/distribution/selector.d.ts

@@ -1,9 +0,0 @@
-import { Contracts } from "@mainsail/contracts";
-export declare class Selector implements Contracts.Proposer.Selector {
-    private readonly configuration;
-    private readonly stateStore;
-    private validatorMatrix;
-    onCommit(unit: Contracts.Processor.ProcessableUnit): Promise<void>;
-    getValidatorIndex(round: number): number;
-}
-//# sourceMappingURL=selector.d.ts.map

package/distribution/selector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../source/selector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAI7D,qBACa,QAAS,YAAW,SAAS,CAAC,QAAQ,CAAC,QAAQ;IAE3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IAEpD,OAAO,CAAC,eAAe,CAAoD;IAE9D,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxE,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAgC/C"}

package/distribution/selector.js

@@ -1,60 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { inject, injectable } from "@mainsail/container";
-import { Contracts, Identifiers } from "@mainsail/contracts";
-import { Utils } from "@mainsail/kernel";
-// import seedrandom from "seedrandom";
-let Selector = class Selector {
-    constructor() {
-        this.validatorMatrix = [...Array.from({ length: 53 }).keys()];
-        // #updateValidatorMatrix(unit: Contracts.Processor.ProcessableUnit): void {
-        // 	const seed = this.#calculateSeed(unit.store);
-        // 	const rng = seedrandom(seed);
-        // 	const { activeValidators } = this.configuration.getMilestone();
-        // 	const matrix = [...Array.from({ length: activeValidators }).keys()];
-        // 	// Based on https://stackoverflow.com/a/12646864
-        // 	for (let index = matrix.length - 1; index > 0; index--) {
-        // 		const index_ = Math.floor(rng() * (index + 1));
-        // 		[matrix[index], matrix[index_]] = [matrix[index_], matrix[index]];
-        // 	}
-        // 	unit.store.setAttribute<string>("validatorMatrix", JSON.stringify(matrix));
-        // }
-        // #calculateSeed(store: Contracts.State.Store): string {
-        // 	const totalRound = store.getTotalRound();
-        // 	// TODO: take block id into account
-        // 	return `${totalRound}`;
-        // }
-    }
-    async onCommit(unit) {
-        // if (Utils.roundCalculator.isNewRound(unit.height + 1, this.configuration)) {
-        // 	this.#updateValidatorMatrix(unit);
-        // }
-    }
-    getValidatorIndex(round) {
-        const { activeValidators } = this.configuration.getMilestone();
-        const offset = (this.stateStore.getTotalRound() + round) % activeValidators;
-        const result = this.validatorMatrix[offset % activeValidators];
-        Utils.assert.defined(result);
-        return result;
-    }
-};
-__decorate([
-    inject(Identifiers.Cryptography.Configuration),
-    __metadata("design:type", Object)
-], Selector.prototype, "configuration", void 0);
-__decorate([
-    inject(Identifiers.State.Store),
-    __metadata("design:type", Object)
-], Selector.prototype, "stateStore", void 0);
-Selector = __decorate([
-    injectable()
-], Selector);
-export { Selector };
-//# sourceMappingURL=selector.js.map

package/distribution/selector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"selector.js","sourceRoot":"","sources":["../source/selector.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;AACzC,uCAAuC;AAGhC,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAAd;QAOE,oBAAe,GAAa,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAiB3E,4EAA4E;QAC5E,iDAAiD;QACjD,iCAAiC;QAEjC,mEAAmE;QACnE,wEAAwE;QAExE,oDAAoD;QACpD,6DAA6D;QAC7D,oDAAoD;QACpD,uEAAuE;QACvE,KAAK;QAEL,+EAA+E;QAC/E,IAAI;QAEJ,yDAAyD;QACzD,6CAA6C;QAE7C,uCAAuC;QAEvC,2BAA2B;QAC3B,IAAI;IACL,CAAC;IAtCO,KAAK,CAAC,QAAQ,CAAC,IAAyC;QAC9D,+EAA+E;QAC/E,sCAAsC;QACtC,IAAI;IACL,CAAC;IAEM,iBAAiB,CAAC,KAAa;QACrC,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAE/D,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,GAAG,gBAAgB,CAAC;QAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,gBAAgB,CAAC,CAAC;QAC/D,KAAK,CAAC,MAAM,CAAC,OAAO,CAAS,MAAM,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;IACf,CAAC;CAyBD,CAAA;AA7CiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;+CACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;;4CACoB;AALxC,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CA+CpB"}