@mainsail/evm-consensus 0.0.1-evm.17 → 0.0.1-evm.19

package/distribution/deployer.d.ts

@@ -1,9 +1,9 @@
 import { Contracts } from "@mainsail/contracts";
 export interface GenesisBlockInfo {
     readonly timestamp: number;
-    readonly totalAmount: string;
+    readonly initialSupply: string;
     readonly generatorAddress: string;
-    readonly initialHeight: number;
+    readonly initialBlockNumber: 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;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;IAS7B,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwS/D,mBAAmB,IAAI,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE;CAsB9D"}
+{"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,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;CACpC;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;IAS7B,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkS/D,mBAAmB,IAAI,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE;CAsB9D"}

package/distribution/deployer.js

@@ -47,7 +47,7 @@ let Deployer = class Deployer {
         if (__classPrivateFieldGet(this, _Deployer_needsCommit, "f")) {
             await this.evm.onCommit({
                 commitKey,
-                getBlock: () => ({ header: { ...commitKey } }),
+                getBlock: () => ({ header: { ...commitKey, number: commitKey.blockNumber } }),
                 setAccountUpdates: () => ({}),
             });
         }
@@ -67,8 +67,8 @@ _Deployer_initialize = async function _Deployer_initialize(commitKey) {
     const genesisInfo = {
         account: __classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").generatorAddress,
         deployerAccount: this.deployerAddress,
-        initialHeight: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").initialHeight).toBigInt(),
-        initialSupply: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").totalAmount).toBigInt(),
+        initialBlockNumber: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").initialBlockNumber).toBigInt(),
+        initialSupply: BigNumber.make(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").initialSupply).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
     };
@@ -80,7 +80,7 @@ _Deployer_getBlockContext = function _Deployer_getBlockContext() {
     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) },
+        commitKey: { blockNumber: BigInt(2 ** 32 + 1), round: BigInt(0) },
         gasLimit: BigInt(milestone.block.maxGasLimit),
         timestamp: BigInt(__classPrivateFieldGet(this, _Deployer_genesisBlockInfo, "f").timestamp),
         validatorAddress: this.deployerAddress,
@@ -94,8 +94,8 @@ _Deployer_deployConsensusContract = async function _Deployer_deployConsensusCont
     // CONSENSUS
     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))]),
+        from: this.deployerAddress,
         gasLimit: BigInt(10_000_000),
         gasPrice: BigInt(0),
         nonce: BigInt(0),
@@ -103,31 +103,34 @@ _Deployer_deployConsensusContract = async function _Deployer_deployConsensusCont
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!receipt.success) {
+    if (!receipt.status) {
         throw new Error("failed to deploy Consensus contract");
     }
-    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 0 })) {
+    if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 0 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Consensus contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
-    return receipt.deployedContractAddress;
+    this.logger.info(`Deployed Consensus contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
+    return receipt.contractAddress;
 };
 _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(consensusContractAddress) {
+    const milestone = this.configuration.getMilestone();
     // Logic contract initializer function ABI
     const logicInterface = new ethers.Interface(ConsensusAbi.abi);
     // Encode the initializer call
-    const initializerCalldata = logicInterface.encodeFunctionData("initialize");
+    const initializerCalldata = logicInterface.encodeFunctionData("initialize", [
+        milestone.validatorRegistrationFee,
+    ]);
     // Prepare the constructor arguments for the proxy contract
     const proxyConstructorArguments = new ethers.AbiCoder()
         .encode(["address", "bytes"], [consensusContractAddress, initializerCalldata])
         .slice(2);
     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(ERC1967ProxyAbi.bytecode.object)),
             Buffer.from(proxyConstructorArguments, "hex"),
         ]),
+        from: this.deployerAddress,
         gasLimit: BigInt(10_000_000),
         gasPrice: BigInt(0),
         nonce: BigInt(1),
@@ -135,29 +138,27 @@ _Deployer_deployConsensusProxy = async function _Deployer_deployConsensusProxy(c
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!receipt.success) {
+    if (!receipt.status) {
         throw new Error("failed to deploy Consensus PROXY contract");
     }
-    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 })) {
+    if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 1 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Consensus PROXY contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
+    this.logger.info(`Deployed Consensus PROXY contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
     __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
         activeImplementation: consensusContractAddress,
-        address: receipt.deployedContractAddress,
+        address: receipt.contractAddress,
         implementations: [{ abi: ConsensusAbi.abi, address: consensusContractAddress }],
         name: "consensus",
         proxy: "UUPS",
     });
-    this.app
-        .bind(EvmConsensusIdentifiers.Contracts.Addresses.Consensus)
-        .toConstantValue(receipt.deployedContractAddress);
+    this.app.bind(EvmConsensusIdentifiers.Contracts.Addresses.Consensus).toConstantValue(receipt.contractAddress);
 };
 _Deployer_deployUsernamesContract = async function _Deployer_deployUsernamesContract() {
     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))]),
+        from: this.deployerAddress,
         gasLimit: BigInt(10_000_000),
         gasPrice: BigInt(0),
         nonce: BigInt(2),
@@ -165,14 +166,14 @@ _Deployer_deployUsernamesContract = async function _Deployer_deployUsernamesCont
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!receipt.success) {
+    if (!receipt.status) {
         throw new Error("failed to deploy Usernames contract");
     }
-    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 2 })) {
+    if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 2 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Usernames contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
-    return receipt.deployedContractAddress;
+    this.logger.info(`Deployed Usernames contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
+    return receipt.contractAddress;
 };
 _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(usernamesContractAddress) {
     // Logic contract initializer function ABI
@@ -185,11 +186,11 @@ _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(u
         .slice(2);
     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(ERC1967ProxyAbi.bytecode.object)),
             Buffer.from(proxyConstructorArguments, "hex"),
         ]),
+        from: this.deployerAddress,
         gasLimit: BigInt(10_000_000),
         gasPrice: BigInt(0),
         nonce: BigInt(3),
@@ -197,29 +198,27 @@ _Deployer_deployUsernamesProxy = async function _Deployer_deployUsernamesProxy(u
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!receipt.success) {
+    if (!receipt.status) {
         throw new Error("failed to deploy Usernames PROXY contract");
     }
-    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 })) {
+    if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 3 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed Usernames PROXY contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
+    this.logger.info(`Deployed Usernames PROXY contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
     __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
         activeImplementation: usernamesContractAddress,
-        address: receipt.deployedContractAddress,
+        address: receipt.contractAddress,
         implementations: [{ abi: UsernamesAbi.abi, address: usernamesContractAddress }],
         name: "usernames",
         proxy: "UUPS",
     });
-    this.app
-        .bind(EvmConsensusIdentifiers.Contracts.Addresses.Usernames)
-        .toConstantValue(receipt.deployedContractAddress);
+    this.app.bind(EvmConsensusIdentifiers.Contracts.Addresses.Usernames).toConstantValue(receipt.contractAddress);
 };
 _Deployer_deployMultiPaymentContract = async function _Deployer_deployMultiPaymentContract() {
     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))]),
+        from: this.deployerAddress,
         gasLimit: BigInt(10_000_000),
         gasPrice: BigInt(0),
         nonce: BigInt(4),
@@ -227,14 +226,14 @@ _Deployer_deployMultiPaymentContract = async function _Deployer_deployMultiPayme
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!receipt.success) {
+    if (!receipt.status) {
         throw new Error("failed to deploy MultiPayment contract");
     }
-    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 4 })) {
+    if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 4 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed MultiPayment contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
-    return receipt.deployedContractAddress;
+    this.logger.info(`Deployed MultiPayment contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
+    return receipt.contractAddress;
 };
 _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentProxy(multiPaymentAddress) {
     // Logic contract initializer function ABI
@@ -247,11 +246,11 @@ _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentP
         .slice(2);
     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(ERC1967ProxyAbi.bytecode.object)),
             Buffer.from(proxyConstructorArguments, "hex"),
         ]),
+        from: this.deployerAddress,
         gasLimit: BigInt(10_000_000),
         gasPrice: BigInt(0),
         nonce: BigInt(5),
@@ -259,30 +258,30 @@ _Deployer_deployMultiPaymentProxy = async function _Deployer_deployMultiPaymentP
         txHash: __classPrivateFieldGet(this, _Deployer_generateTxHash, "f").call(this),
         value: 0n,
     });
-    if (!receipt.success) {
+    if (!receipt.status) {
         throw new Error("failed to deploy MultiPayment PROXY contract");
     }
-    if (receipt.deployedContractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 5 })) {
+    if (receipt.contractAddress !== ethers.getCreateAddress({ from: this.deployerAddress, nonce: 5 })) {
         throw new Error("Contract address mismatch");
     }
-    this.logger.info(`Deployed MultiPayment PROXY contract from ${this.deployerAddress} to ${receipt.deployedContractAddress}`);
+    this.logger.info(`Deployed MultiPayment PROXY contract from ${this.deployerAddress} to ${receipt.contractAddress}`);
     __classPrivateFieldGet(this, _Deployer_instances, "m", _Deployer_emitContractDeployed).call(this, {
         activeImplementation: multiPaymentAddress,
-        address: receipt.deployedContractAddress,
+        address: receipt.contractAddress,
         implementations: [{ abi: MultiPaymentAbi.abi, address: multiPaymentAddress }],
         name: "multi-payments",
         proxy: "UUPS",
     });
     this.app
         .bind(EvmConsensusIdentifiers.Contracts.Addresses.MultiPayment)
-        .toConstantValue(receipt.deployedContractAddress);
+        .toConstantValue(receipt.contractAddress);
 };
 _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);
+    const { receipt } = await this.evm.getReceipt(context.blockContext.commitKey.blockNumber, context.txHash);
     if (receipt) {
         return receipt;
     }

package/distribution/deployer.js.map

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

package/distribution/index.d.ts

@@ -1,6 +1,7 @@
 import { Providers } from "@mainsail/kernel";
 export { Identifiers } from "./identifiers.js";
 export declare class ServiceProvider extends Providers.ServiceProvider {
+    #private;
     register(): Promise<void>;
     boot(): Promise<void>;
 }

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,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"}
+{"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;CA2BlC;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}

package/distribution/index.js

@@ -4,16 +4,26 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __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 _ServiceProvider_instances, _ServiceProvider_calculateInitialSupply;
 import { injectable } from "@mainsail/container";
 import { Identifiers } from "@mainsail/contracts";
 import { Providers } from "@mainsail/kernel";
-import { assert } from "@mainsail/utils";
+import { assert, BigNumber } from "@mainsail/utils";
 import { Deployer } from "./deployer.js";
 import { Identifiers as EvmConsensusIdentifiers } from "./identifiers.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 {
+    constructor() {
+        super(...arguments);
+        _ServiceProvider_instances.add(this);
+    }
     async register() {
         this.app.bind(Identifiers.ValidatorSet.Service).to(ValidatorSet).inSingletonScope();
         this.app.bind(Identifiers.Evm.ContractService.Consensus).to(ConsensusContractService);
@@ -27,13 +37,22 @@ let ServiceProvider = class ServiceProvider extends Providers.ServiceProvider {
         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,
+            generatorAddress: genesisBlock.block.proposer,
+            initialBlockNumber: genesisBlock.block.number,
+            initialSupply: __classPrivateFieldGet(this, _ServiceProvider_instances, "m", _ServiceProvider_calculateInitialSupply).call(this, genesisBlock),
             timestamp: genesisBlock.block.timestamp,
-            totalAmount: genesisBlock.block.totalAmount,
         });
     }
 };
+_ServiceProvider_instances = new WeakSet();
+_ServiceProvider_calculateInitialSupply = function _ServiceProvider_calculateInitialSupply(genesisBlock) {
+    const generatorAddress = genesisBlock.block.proposer;
+    let supply = BigNumber.ZERO;
+    for (const transaction of genesisBlock.block.transactions.filter((tx) => tx.from === generatorAddress)) {
+        supply = supply.plus(transaction.value);
+    }
+    return supply.toString();
+};
 ServiceProvider = __decorate([
     injectable()
 ], ServiceProvider);

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,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"}
+{"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,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEpD,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;IAAvD;;;IAsCP,CAAC;IArCO,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,QAAQ;YAC7C,kBAAkB,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM;YAC7C,aAAa,EAAE,uBAAA,IAAI,2EAAwB,MAA5B,IAAI,EAAyB,YAAY,CAAC;YACzD,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS;SACvC,CAAC,CAAC;IACJ,CAAC;CAaD,CAAA;;2FAXwB,YAAyC;IAChE,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC;IAErD,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC;IAE5B,KAAK,MAAM,WAAW,IAAI,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,gBAAgB,CAAC,EAAE,CAAC;QACxG,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC;AArCW,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CAsC3B;;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}

package/distribution/services/consensus-contract-service.d.ts

@@ -3,7 +3,7 @@ export declare class ConsensusContractService implements Contracts.Evm.Consensus
     private readonly app;
     private readonly configuration;
     private readonly evm;
-    getActiveValidators(): Promise<Contracts.State.ValidatorWallet[]>;
+    getRoundValidators(): Promise<Contracts.State.ValidatorWallet[]>;
     getAllValidators(): Promise<Contracts.State.ValidatorWallet[]>;
     getValidatorRounds(): AsyncIterable<Contracts.Evm.ValidatorRound>;
     getVotesCount(): Promise<number>;

package/distribution/services/consensus-contract-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consensus-contract-service.d.ts","sourceRoot":"","sources":["../../source/services/consensus-contract-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAS7D,qBACa,wBAAyB,YAAW,SAAS,CAAC,GAAG,CAAC,wBAAwB;IAEtF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAIhE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAExC,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;IAuCjE,gBAAgB,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;IAuCpE,kBAAkB,IAAI,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC;IAI3D,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAwBtC,QAAQ,IAAI,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;CAG7C"}
+{"version":3,"file":"consensus-contract-service.d.ts","sourceRoot":"","sources":["../../source/services/consensus-contract-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAS7D,qBACa,wBAAyB,YAAW,SAAS,CAAC,GAAG,CAAC,wBAAwB;IAEtF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgC;IAGpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAIhE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAExC,kBAAkB,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;IAwChE,gBAAgB,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;IAwCpE,kBAAkB,IAAI,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC;IAI3D,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAwBtC,QAAQ,IAAI,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;CAG7C"}

package/distribution/services/consensus-contract-service.js

@@ -16,28 +16,29 @@ import { Identifiers as EvmConsensusIdentifiers } from "../identifiers.js";
 import { AsyncValidatorRoundsIterator } from "./rounds-iterator.js";
 import { AsyncVotesIterator } from "./votes-iterator.js";
 let ConsensusContractService = class ConsensusContractService {
-    async getActiveValidators() {
+    async getRoundValidators() {
         const consensusContractAddress = this.app.get(EvmConsensusIdentifiers.Contracts.Addresses.Consensus);
         const deployerAddress = this.app.get(EvmConsensusIdentifiers.Internal.Addresses.Deployer);
         const { evmSpec } = this.configuration.getMilestone();
         const iface = new ethers.Interface(ConsensusAbi.abi);
-        const data = iface.encodeFunctionData("getActiveValidators").slice(2);
+        const data = iface.encodeFunctionData("getRoundValidators").slice(2);
         const result = await this.evm.view({
-            caller: deployerAddress,
             data: Buffer.from(data, "hex"),
-            recipient: consensusContractAddress,
+            from: deployerAddress,
             specId: evmSpec,
+            to: consensusContractAddress,
         });
         if (!result.success) {
-            await this.app.terminate("getActiveValidators failed");
+            await this.app.terminate("getRoundValidators failed");
         }
-        const [validators] = iface.decodeFunctionResult("getActiveValidators", result.output);
+        const [validators] = iface.decodeFunctionResult("getRoundValidators", result.output);
         const validatorWallets = [];
         for (const [, validator] of validators.entries()) {
-            const [address, [votersCount, voteBalance, isResigned, blsPublicKey]] = validator;
+            const [address, [voteBalance, fee, votersCount, isResigned, blsPublicKey]] = validator;
             const validatorWallet = {
                 address,
                 blsPublicKey: blsPublicKey.slice(2),
+                fee: BigNumber.make(fee),
                 isResigned,
                 voteBalance: BigNumber.make(voteBalance),
                 votersCount: Number(votersCount),
@@ -53,10 +54,10 @@ let ConsensusContractService = class ConsensusContractService {
         const iface = new ethers.Interface(ConsensusAbi.abi);
         const data = iface.encodeFunctionData("getAllValidators").slice(2);
         const result = await this.evm.view({
-            caller: deployerAddress,
             data: Buffer.from(data, "hex"),
-            recipient: consensusContractAddress,
+            from: deployerAddress,
             specId: evmSpec,
+            to: consensusContractAddress,
         });
         if (!result.success) {
             await this.app.terminate("getAllValidators failed");
@@ -64,10 +65,11 @@ let ConsensusContractService = class ConsensusContractService {
         const [validators] = iface.decodeFunctionResult("getAllValidators", result.output);
         const validatorWallets = [];
         for (const [, validator] of validators.entries()) {
-            const [address, [votersCount, voteBalance, isResigned, blsPublicKey]] = validator;
+            const [address, [voteBalance, fee, votersCount, isResigned, blsPublicKey]] = validator;
             const validatorWallet = {
                 address,
                 blsPublicKey: blsPublicKey.slice(2),
+                fee: BigNumber.make(fee),
                 isResigned,
                 voteBalance: BigNumber.make(voteBalance),
                 votersCount: Number(votersCount),
@@ -86,10 +88,10 @@ let ConsensusContractService = class ConsensusContractService {
         const iface = new ethers.Interface(ConsensusAbi.abi);
         const data = iface.encodeFunctionData("getVotesCount").slice(2);
         const result = await this.evm.view({
-            caller: deployerAddress,
             data: Buffer.from(data, "hex"),
-            recipient: consensusContractAddress,
+            from: deployerAddress,
             specId: evmSpec,
+            to: consensusContractAddress,
         });
         if (!result.success) {
             await this.app.terminate("getVotesCount failed");

package/distribution/services/consensus-contract-service.js.map

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

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;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"}
+{"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;CA2CvB"}

package/distribution/services/rounds-iterator.js

@@ -54,11 +54,10 @@ let AsyncValidatorRoundsIterator = class AsyncValidatorRoundsIterator {
         const iface = new ethers.Interface(ConsensusAbi.abi);
         const data = iface.encodeFunctionData("getRounds", [__classPrivateFieldGet(this, _AsyncValidatorRoundsIterator_offset, "f"), ROUNDS_PER_REQUEST]).slice(2);
         const result = await this.evm.view({
-            caller: deployerAddress,
             data: Buffer.from(data, "hex"),
-            gasLimit: 100000000n,
-            recipient: consensusContractAddress,
+            from: deployerAddress,
             specId: evmSpec,
+            to: consensusContractAddress,
         });
         if (!result.success) {
             await this.app.terminate("getRounds failed");

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":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,IAAI,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAGzB,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QAcN,+CAA0C,EAAE,EAAC;QAC7C,8CAAS,CAAC,EAAC,CAAC,mCAAmC;QAC/C,+CAAU,CAAC,EAAC,CAAC,6BAA6B;IAgE3C,CAAC;IA9DA,mKAAC,MAAM,CAAC,aAAa,EAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,IAAI;;QACT,IAAI,uBAAA,IAAI,4CAAQ,CAAC,MAAM,KAAK,uBAAA,IAAI,2CAAO,EAAE,CAAC;YACzC,uBAAA,IAAI,wCAAW,MAAM,IAAI,CAAC,SAAS,EAAE,MAAA,CAAC;YAEtC,IAAI,uBAAA,IAAI,4CAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACzC,CAAC;YAED,uBAAA,IAAI,uCAAU,CAAC,MAAA,CAAC;YAChB,6IAAgB,uBAAA,IAAI,4CAAQ,CAAC,MAAM,MAAA,CAAC;QACrC,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,uBAAA,IAAI,4CAAQ,CAAC,kEAAA,CAAA,2EAAW,EAAX,KAAA,IAAa,IAAA,CAAA,MAAA,IAAA,CAAC,EAAE,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,SAAS;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC7G,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAClG,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAEtD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,CAAC,uBAAA,IAAI,4CAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEhG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;YAC9B,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,OAAO;YACf,EAAE,EAAE,wBAAwB;SAC5B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,oBAAoB,CAAC,WAAW,EAAE,MAAM,CAAC,MAAO,CAAC,CAAC;QAE1E,MAAM,eAAe,GAAmC,EAAE,CAAC;QAC3D,KAAK,MAAM,cAAc,IAAI,OAAO,EAAE,CAAC;YACtC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,cAAc,CAAC;YAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAElC,eAAe,CAAC,IAAI,CAAC;gBACpB,KAAK,EAAE,WAAW;gBAClB,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC,WAAW;gBACpF,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;oBACxC,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;oBAElD,OAAO;wBACN,OAAO,EAAE,gBAAgB;wBACzB,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;qBACxC,CAAC;gBACH,CAAC,CAAC;aACF,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,eAAe,CAAC;IACxB,CAAC;CACD,CAAA;AA9EiB;IADhB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;;yDACW;AAGnC;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;mEACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC;;qEACyB;AAI5D;IAFhB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC;IAChC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC;;yDACoB;AAZlC,4BAA4B;IADxC,UAAU,EAAE;GACA,4BAA4B,CAgFxC"}

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

@@ -1 +1 @@
-{"version":3,"file":"votes-iterator.d.ts","sourceRoot":"","sources":["../../source/services/votes-iterator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAQ7D,qBACa,kBAAmB,YAAW,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;;IAE3E,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,IAAI,CAAC;IAIrD,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAe3C,QAAQ;CAwBtB"}
+{"version":3,"file":"votes-iterator.d.ts","sourceRoot":"","sources":["../../source/services/votes-iterator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAQ7D,qBACa,kBAAmB,YAAW,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;;IAE3E,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,IAAI,CAAC;IAIrD,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAe3C,QAAQ;CAuBtB"}

package/distribution/services/votes-iterator.js

@@ -53,11 +53,10 @@ let AsyncVotesIterator = class AsyncVotesIterator {
         const iface = new ethers.Interface(ConsensusAbi.abi);
         const data = iface.encodeFunctionData("getVotes", [__classPrivateFieldGet(this, _AsyncVotesIterator_address, "f"), VOTES_PER_REQUEST]).slice(2);
         const result = await this.evm.view({
-            caller: deployerAddress,
             data: Buffer.from(data, "hex"),
-            gasLimit: 100000000n,
-            recipient: consensusContractAddress,
+            from: deployerAddress,
             specId: evmSpec,
+            to: consensusContractAddress,
         });
         if (!result.success) {
             await this.app.terminate("getVotes failed");

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

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

package/distribution/validator-set.d.ts

@@ -8,7 +8,7 @@ export declare class ValidatorSet implements Contracts.ValidatorSet.Service {
     onCommit(unit: Contracts.Processor.ProcessableUnit): Promise<void>;
     getAllValidators(): Contracts.State.ValidatorWallet[];
     getDirtyValidators(): Contracts.State.ValidatorWallet[];
-    getActiveValidators(): Contracts.State.ValidatorWallet[];
+    getRoundValidators(): Contracts.State.ValidatorWallet[];
     getValidator(index: number): Contracts.State.ValidatorWallet;
     getValidatorIndexByWalletAddress(walletAddress: string): number;
 }

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;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"}
+{"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,kBAAkB,IAAI,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE;IAUvD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,eAAe;IAI5D,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;CAyCtE"}

package/distribution/validator-set.js

@@ -18,7 +18,7 @@ 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 _ValidatorSet_instances, _ValidatorSet_topValidators, _ValidatorSet_indexByAddress, _ValidatorSet_allValidators, _ValidatorSet_dirtyValidators, _ValidatorSet_buildActiveValidators, _ValidatorSet_calculateChangedValidators;
+var _ValidatorSet_instances, _ValidatorSet_topValidators, _ValidatorSet_indexByAddress, _ValidatorSet_allValidators, _ValidatorSet_dirtyValidators, _ValidatorSet_buildRoundValidators, _ValidatorSet_calculateChangedValidators;
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Exceptions, Identifiers } from "@mainsail/contracts";
 let ValidatorSet = class ValidatorSet {
@@ -30,13 +30,13 @@ let ValidatorSet = class ValidatorSet {
         _ValidatorSet_dirtyValidators.set(this, []);
     }
     async restore() {
-        await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_buildActiveValidators).call(this);
+        await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_buildRoundValidators).call(this);
         const validators = await this.consensusContractService.getAllValidators();
         __classPrivateFieldSet(this, _ValidatorSet_allValidators, new Map(validators.map((validator) => [validator.address, validator])), "f");
     }
     async onCommit(unit) {
-        if (this.roundCalculator.isNewRound(unit.height + 1)) {
-            await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_buildActiveValidators).call(this);
+        if (this.roundCalculator.isNewRound(unit.blockNumber + 1)) {
+            await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_buildRoundValidators).call(this);
         }
         await __classPrivateFieldGet(this, _ValidatorSet_instances, "m", _ValidatorSet_calculateChangedValidators).call(this);
     }
@@ -46,12 +46,12 @@ let ValidatorSet = class ValidatorSet {
     getDirtyValidators() {
         return __classPrivateFieldGet(this, _ValidatorSet_dirtyValidators, "f");
     }
-    getActiveValidators() {
-        const { activeValidators } = this.configuration.getMilestone();
-        if (__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").length !== activeValidators) {
-            throw new Exceptions.NotEnoughActiveValidatorsError(__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").length, activeValidators);
+    getRoundValidators() {
+        const { roundValidators } = this.configuration.getMilestone();
+        if (__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").length !== roundValidators) {
+            throw new Exceptions.NotEnoughRoundValidatorsError(__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").length, roundValidators);
         }
-        return __classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").slice(0, activeValidators);
+        return __classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").slice(0, roundValidators);
     }
     getValidator(index) {
         return __classPrivateFieldGet(this, _ValidatorSet_topValidators, "f")[index];
@@ -69,13 +69,13 @@ _ValidatorSet_indexByAddress = new WeakMap();
 _ValidatorSet_allValidators = new WeakMap();
 _ValidatorSet_dirtyValidators = new WeakMap();
 _ValidatorSet_instances = new WeakSet();
-_ValidatorSet_buildActiveValidators = async function _ValidatorSet_buildActiveValidators() {
-    const { activeValidators } = this.configuration.getMilestone();
-    const validators = await this.consensusContractService.getActiveValidators();
-    if (validators.length < activeValidators) {
-        throw new Exceptions.NotEnoughActiveValidatorsError(__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").length, activeValidators);
+_ValidatorSet_buildRoundValidators = async function _ValidatorSet_buildRoundValidators() {
+    const { roundValidators } = this.configuration.getMilestone();
+    const validators = await this.consensusContractService.getRoundValidators();
+    if (validators.length < roundValidators) {
+        throw new Exceptions.NotEnoughRoundValidatorsError(__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").length, roundValidators);
     }
-    __classPrivateFieldSet(this, _ValidatorSet_topValidators, validators.slice(0, activeValidators), "f");
+    __classPrivateFieldSet(this, _ValidatorSet_topValidators, validators.slice(0, roundValidators), "f");
     __classPrivateFieldSet(this, _ValidatorSet_indexByAddress, new Map(__classPrivateFieldGet(this, _ValidatorSet_topValidators, "f").map((validator, index) => [validator.address, index])), "f");
 };
 _ValidatorSet_calculateChangedValidators = async function _ValidatorSet_calculateChangedValidators() {
@@ -85,6 +85,7 @@ _ValidatorSet_calculateChangedValidators = async function _ValidatorSet_calculat
         const currentValidator = __classPrivateFieldGet(this, _ValidatorSet_allValidators, "f").get(validator.address);
         if (!currentValidator ||
             !currentValidator.voteBalance.isEqualTo(validator.voteBalance) ||
+            !currentValidator.fee.isEqualTo(validator.fee) ||
             currentValidator.isResigned !== validator.isResigned ||
             currentValidator.votersCount !== validator.votersCount ||
             currentValidator.blsPublicKey !== validator.blsPublicKey) {

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.17",
+  "version": "0.0.1-evm.19",
   "description": "EVM development support for the Mainsail blockchain",
   "license": "GPL-3.0-only",
   "contributors": [],
@@ -12,11 +12,11 @@
   ],
   "dependencies": {
     "ethers": "6.13.5",
-    "@mainsail/container": "0.0.1-evm.17",
-    "@mainsail/contracts": "0.0.1-evm.17",
-    "@mainsail/kernel": "0.0.1-evm.17",
-    "@mainsail/evm-contracts": "0.0.1-evm.17",
-    "@mainsail/utils": "0.0.1-evm.17"
+    "@mainsail/container": "0.0.1-evm.19",
+    "@mainsail/contracts": "0.0.1-evm.19",
+    "@mainsail/evm-contracts": "0.0.1-evm.19",
+    "@mainsail/kernel": "0.0.1-evm.19",
+    "@mainsail/utils": "0.0.1-evm.19"
   },
   "devDependencies": {
     "@types/seedrandom": "3.0.8",
@@ -31,7 +31,7 @@
     "clean": "del distribution",
     "release": "pnpm publish --access public",
     "test": "pnpm run uvu source .test.ts",
-    "test:coverage": "c8 pnpm run test",
+    "test:coverage": "c8 -r=text -r=lcov --all pnpm run test",
     "test:coverage:html": "c8 -r html --all pnpm run test",
     "test:file": "pnpm run uvu source",
     "uvu": "tsx --tsconfig ../../tsconfig.test.json ./node_modules/uvu/bin.js"