@mainsail/blockchain-utils 0.0.1-evm.17 → 0.0.1-evm.19

package/distribution/fee-calculator.js

@@ -8,7 +8,7 @@ import { injectable } from "@mainsail/container";
 import { BigNumber } from "@mainsail/utils";
 let FeeCalculator = class FeeCalculator {
     calculate(transaction) {
-        return BigNumber.make(transaction.data.gasPrice).times(transaction.data.gasLimit);
+        return BigNumber.make(transaction.data.gasPrice).times(transaction.data.gas);
     }
     calculateConsumed(gasPrice, gasUsed) {
         return BigNumber.make(gasPrice).times(gasUsed);

package/distribution/fee-calculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"fee-calculator.js","sourceRoot":"","sources":["../source/fee-calculator.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAClB,SAAS,CAAC,WAAyC;QACzD,OAAO,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnF,CAAC;IAEM,iBAAiB,CAAC,QAAgB,EAAE,OAAe;QACzD,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACD,CAAA;AARY,aAAa;IADzB,UAAU,EAAE;GACA,aAAa,CAQzB"}
+{"version":3,"file":"fee-calculator.js","sourceRoot":"","sources":["../source/fee-calculator.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAClB,SAAS,CAAC,WAAyC;QACzD,OAAO,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9E,CAAC;IAEM,iBAAiB,CAAC,QAAgB,EAAE,OAAe;QACzD,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACD,CAAA;AARY,aAAa;IADzB,UAAU,EAAE;GACA,aAAa,CAQzB"}

package/distribution/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBAAa,eAAgB,SAAQ,SAAS,CAAC,eAAe;IAChD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAO7C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,qBACa,eAAgB,SAAQ,SAAS,CAAC,eAAe;IAChD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAMtC"}

package/distribution/index.js

@@ -1,21 +1,30 @@
+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;
+};
+import { injectable } from "@mainsail/container";
 import { Identifiers } from "@mainsail/contracts";
 import { Providers } from "@mainsail/kernel";
 import { FeeCalculator } from "./fee-calculator.js";
 import { ProposerCalculator } from "./proposer-calculator.js";
 import { RoundCalculator } from "./round-calculator.js";
-import { SupplyCalculator } from "./supply-calculator.js";
 import { TimestampCalculator } from "./timestamp-calculator.js";
 export { formatCurrency } from "./format-currency.js";
 export { getBlockNotChainedErrorMessage, isBlockChained } from "./is-block-chained.js";
 export { isMajority } from "./is-majority.js";
 export { isMinority } from "./is-minority.js";
-export class ServiceProvider extends Providers.ServiceProvider {
+let ServiceProvider = class ServiceProvider extends Providers.ServiceProvider {
     async register() {
         this.app.bind(Identifiers.BlockchainUtils.ProposerCalculator).to(ProposerCalculator).inSingletonScope();
         this.app.bind(Identifiers.BlockchainUtils.FeeCalculator).to(FeeCalculator).inSingletonScope();
         this.app.bind(Identifiers.BlockchainUtils.RoundCalculator).to(RoundCalculator).inSingletonScope();
-        this.app.bind(Identifiers.BlockchainUtils.SupplyCalculator).to(SupplyCalculator).inSingletonScope();
         this.app.bind(Identifiers.BlockchainUtils.TimestampCalculator).to(TimestampCalculator).inSingletonScope();
     }
-}
+};
+ServiceProvider = __decorate([
+    injectable()
+], ServiceProvider);
+export { ServiceProvider };
 //# sourceMappingURL=index.js.map

package/distribution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,OAAO,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACxG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC9F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACpG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC3G,CAAC;CACD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvC,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACxG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC9F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAClG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC3G,CAAC;CACD,CAAA;AAPY,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CAO3B"}

package/distribution/is-block-chained.js

@@ -1,6 +1,6 @@
 const getBlockChainedDetails = (previousBlock, nextBlock) => {
-    const followsPrevious = nextBlock.previousBlock === previousBlock.id;
-    const isPlusOne = nextBlock.height === previousBlock.height + 1;
+    const followsPrevious = nextBlock.parentHash === previousBlock.hash;
+    const isPlusOne = nextBlock.number === previousBlock.number + 1;
     const isAfterPrevious = previousBlock.timestamp < nextBlock.timestamp;
     const isChained = followsPrevious && isPlusOne && isAfterPrevious;
     return { followsPrevious, isAfterPrevious, isChained, isPlusOne };
@@ -11,15 +11,15 @@ export const getBlockNotChainedErrorMessage = (previousBlock, nextBlock) => {
     if (details.isChained) {
         throw new Error("Block had no chain error");
     }
-    const messagePrefix = `Block { height: ${nextBlock.height}, id: ${nextBlock.id}, ` +
-        `previousBlock: ${nextBlock.previousBlock} } is not chained to the ` +
-        `previous block { height: ${previousBlock.height}, id: ${previousBlock.id} }`;
+    const messagePrefix = `Block { number: ${nextBlock.number}, hash: ${nextBlock.hash}, ` +
+        `parentHash: ${nextBlock.parentHash} } is not chained to the ` +
+        `previous block { number: ${previousBlock.number}, hash: ${previousBlock.hash} }`;
     let messageDetail;
     if (!details.followsPrevious) {
-        messageDetail = `previous block id mismatch`;
+        messageDetail = `previous block hash mismatch`;
     }
     else if (!details.isPlusOne) {
-        messageDetail = `height is not plus one`;
+        messageDetail = `number is not plus one`;
     }
     else if (!details.isAfterPrevious) {
         messageDetail = `previous timestamp is after current timestamp: ${previousBlock.timestamp} VS ${nextBlock.timestamp}`;

package/distribution/is-block-chained.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-block-chained.js","sourceRoot":"","sources":["../source/is-block-chained.ts"],"names":[],"mappings":"AASA,MAAM,sBAAsB,GAAG,CAC9B,aAAyC,EACzC,SAAqC,EACf,EAAE;IACxB,MAAM,eAAe,GAAY,SAAS,CAAC,aAAa,KAAK,aAAa,CAAC,EAAE,CAAC;IAC9E,MAAM,SAAS,GAAY,SAAS,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;IAEzE,MAAM,eAAe,GAAY,aAAa,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;IAE/E,MAAM,SAAS,GAAY,eAAe,IAAI,SAAS,IAAI,eAAe,CAAC;IAE3E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC7B,aAAyC,EACzC,SAAqC,EAC3B,EAAE,CAAC,sBAAsB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC;AAEzE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC7C,aAAyC,EACzC,SAAqC,EAC5B,EAAE;IACX,MAAM,OAAO,GAAwB,sBAAsB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAEtF,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,aAAa,GAClB,mBAAmB,SAAS,CAAC,MAAM,SAAS,SAAS,CAAC,EAAE,IAAI;QAC5D,kBAAkB,SAAS,CAAC,aAAa,2BAA2B;QACpE,4BAA4B,aAAa,CAAC,MAAM,SAAS,aAAa,CAAC,EAAE,IAAI,CAAC;IAE/E,IAAI,aAAiC,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC9B,aAAa,GAAG,4BAA4B,CAAC;IAC9C,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC/B,aAAa,GAAG,wBAAwB,CAAC;IAC1C,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACrC,aAAa,GAAG,kDAAkD,aAAa,CAAC,SAAS,OAAO,SAAS,CAAC,SAAS,EAAE,CAAC;IACvH,CAAC;IAED,OAAO,GAAG,aAAa,KAAK,aAAa,EAAE,CAAC;AAC7C,CAAC,CAAC"}
+{"version":3,"file":"is-block-chained.js","sourceRoot":"","sources":["../source/is-block-chained.ts"],"names":[],"mappings":"AASA,MAAM,sBAAsB,GAAG,CAC9B,aAAyC,EACzC,SAAqC,EACf,EAAE;IACxB,MAAM,eAAe,GAAY,SAAS,CAAC,UAAU,KAAK,aAAa,CAAC,IAAI,CAAC;IAC7E,MAAM,SAAS,GAAY,SAAS,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;IAEzE,MAAM,eAAe,GAAY,aAAa,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;IAE/E,MAAM,SAAS,GAAY,eAAe,IAAI,SAAS,IAAI,eAAe,CAAC;IAE3E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC7B,aAAyC,EACzC,SAAqC,EAC3B,EAAE,CAAC,sBAAsB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC;AAEzE,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC7C,aAAyC,EACzC,SAAqC,EAC5B,EAAE;IACX,MAAM,OAAO,GAAwB,sBAAsB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAEtF,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,aAAa,GAClB,mBAAmB,SAAS,CAAC,MAAM,WAAW,SAAS,CAAC,IAAI,IAAI;QAChE,eAAe,SAAS,CAAC,UAAU,2BAA2B;QAC9D,4BAA4B,aAAa,CAAC,MAAM,WAAW,aAAa,CAAC,IAAI,IAAI,CAAC;IAEnF,IAAI,aAAiC,CAAC;IAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC9B,aAAa,GAAG,8BAA8B,CAAC;IAChD,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC/B,aAAa,GAAG,wBAAwB,CAAC;IAC1C,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACrC,aAAa,GAAG,kDAAkD,aAAa,CAAC,SAAS,OAAO,SAAS,CAAC,SAAS,EAAE,CAAC;IACvH,CAAC;IAED,OAAO,GAAG,aAAa,KAAK,aAAa,EAAE,CAAC;AAC7C,CAAC,CAAC"}

package/distribution/is-majority.d.ts

@@ -1,2 +1,2 @@
-export declare const isMajority: (size: number, activeValidators: number) => boolean;
+export declare const isMajority: (size: number, roundValidators: number) => boolean;
 //# sourceMappingURL=is-majority.d.ts.map

package/distribution/is-majority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-majority.d.ts","sourceRoot":"","sources":["../source/is-majority.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,kBAAkB,MAAM,KAAG,OAA4C,CAAC"}
+{"version":3,"file":"is-majority.d.ts","sourceRoot":"","sources":["../source/is-majority.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,iBAAiB,MAAM,KAAG,OAA2C,CAAC"}

package/distribution/is-majority.js

@@ -1,2 +1,2 @@
-export const isMajority = (size, activeValidators) => size > (activeValidators / 3) * 2;
+export const isMajority = (size, roundValidators) => size > (roundValidators / 3) * 2;
 //# sourceMappingURL=is-majority.js.map

package/distribution/is-majority.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-majority.js","sourceRoot":"","sources":["../source/is-majority.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,gBAAwB,EAAW,EAAE,CAAC,IAAI,GAAG,CAAC,gBAAgB,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"is-majority.js","sourceRoot":"","sources":["../source/is-majority.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,eAAuB,EAAW,EAAE,CAAC,IAAI,GAAG,CAAC,eAAe,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC"}

package/distribution/is-minority.d.ts

@@ -1,2 +1,2 @@
-export declare const isMinority: (size: number, activeValidators: number) => boolean;
+export declare const isMinority: (size: number, roundValidators: number) => boolean;
 //# sourceMappingURL=is-minority.d.ts.map

package/distribution/is-minority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-minority.d.ts","sourceRoot":"","sources":["../source/is-minority.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,kBAAkB,MAAM,KAAG,OAAsC,CAAC"}
+{"version":3,"file":"is-minority.d.ts","sourceRoot":"","sources":["../source/is-minority.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,iBAAiB,MAAM,KAAG,OAAqC,CAAC"}

package/distribution/is-minority.js

@@ -1,2 +1,2 @@
-export const isMinority = (size, activeValidators) => size > activeValidators / 3;
+export const isMinority = (size, roundValidators) => size > roundValidators / 3;
 //# sourceMappingURL=is-minority.js.map

package/distribution/is-minority.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-minority.js","sourceRoot":"","sources":["../source/is-minority.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,gBAAwB,EAAW,EAAE,CAAC,IAAI,GAAG,gBAAgB,GAAG,CAAC,CAAC"}
+{"version":3,"file":"is-minority.js","sourceRoot":"","sources":["../source/is-minority.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,eAAuB,EAAW,EAAE,CAAC,IAAI,GAAG,eAAe,GAAG,CAAC,CAAC"}

package/distribution/proposer-calculator.d.ts

@@ -2,7 +2,6 @@ import { Contracts } from "@mainsail/contracts";
 export declare class ProposerCalculator implements Contracts.BlockchainUtils.ProposerCalculator {
     private readonly configuration;
     private readonly stateStore;
-    private validatorMatrix;
     getValidatorIndex(round: number): number;
 }
 //# sourceMappingURL=proposer-calculator.d.ts.map

package/distribution/proposer-calculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proposer-calculator.d.ts","sourceRoot":"","sources":["../source/proposer-calculator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAG7D,qBACa,kBAAmB,YAAW,SAAS,CAAC,eAAe,CAAC,kBAAkB;IAEtF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IAGpD,OAAO,CAAC,eAAe,CAAoD;IAEpE,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAQ/C"}
+{"version":3,"file":"proposer-calculator.d.ts","sourceRoot":"","sources":["../source/proposer-calculator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,kBAAmB,YAAW,SAAS,CAAC,eAAe,CAAC,kBAAkB;IAEtF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IAE7C,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAK/C"}

package/distribution/proposer-calculator.js

@@ -9,18 +9,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Identifiers } from "@mainsail/contracts";
-import { assert } from "@mainsail/utils";
 let ProposerCalculator = class ProposerCalculator {
-    constructor() {
-        // TODO: Support validator changes
-        this.validatorMatrix = [...Array.from({ length: 53 }).keys()];
-    }
     getValidatorIndex(round) {
-        const { activeValidators } = this.configuration.getMilestone();
-        const offset = (this.stateStore.getTotalRound() + round) % activeValidators;
-        const result = this.validatorMatrix[offset % activeValidators];
-        assert.number(result);
-        return result;
+        const { roundValidators } = this.configuration.getMilestone();
+        return (this.stateStore.getTotalRound() + round) % roundValidators; // This method will work fine on roundValidators change. We are not trying to get sequential indexes on value change, because validators are randomized every round.
     }
 };
 __decorate([

package/distribution/proposer-calculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"proposer-calculator.js","sourceRoot":"","sources":["../source/proposer-calculator.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,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGlC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAON,kCAAkC;QAC1B,oBAAe,GAAa,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAU5E,CAAC;IARO,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,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtB,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;AAhBiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;yDACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;;sDACoB;AALxC,kBAAkB;IAD9B,UAAU,EAAE;GACA,kBAAkB,CAkB9B"}
+{"version":3,"file":"proposer-calculator.js","sourceRoot":"","sources":["../source/proposer-calculator.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGtD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAOvB,iBAAiB,CAAC,KAAa;QACrC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;QAE9D,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,GAAG,eAAe,CAAC,CAAC,oKAAoK;IACzO,CAAC;CACD,CAAA;AAViB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;yDACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC;;sDACoB;AALxC,kBAAkB;IAD9B,UAAU,EAAE;GACA,kBAAkB,CAY9B"}

package/distribution/round-calculator.js

@@ -16,15 +16,15 @@ let RoundCalculator = class RoundCalculator {
             const genesisHeight = this.configuration.getGenesisHeight();
             const milestones = [
                 {
-                    data: configuration.getMilestone(genesisHeight).activeValidators,
+                    data: configuration.getMilestone(genesisHeight).roundValidators,
                     found: true,
                     height: genesisHeight,
                 },
             ];
-            let nextMilestone = configuration.getNextMilestoneWithNewKey(genesisHeight, "activeValidators");
+            let nextMilestone = configuration.getNextMilestoneWithNewKey(genesisHeight, "roundValidators");
             while (nextMilestone.found) {
                 milestones.push(nextMilestone);
-                nextMilestone = configuration.getNextMilestoneWithNewKey(nextMilestone.height, "activeValidators");
+                nextMilestone = configuration.getNextMilestoneWithNewKey(nextMilestone.height, "roundValidators");
             }
             return milestones;
         };
@@ -39,19 +39,19 @@ let RoundCalculator = class RoundCalculator {
             if (temporary.height > height) {
                 continue;
             }
-            if (!milestone || temporary.activeValidators === milestone.activeValidators) {
+            if (!milestone || temporary.roundValidators === milestone.roundValidators) {
                 milestone = temporary;
             }
             else {
                 break;
             }
         }
-        return height === genesisHeight || (height - Math.max(milestone.height, 1)) % milestone.activeValidators === 0;
+        return height === genesisHeight || (height - Math.max(milestone.height, 1)) % milestone.roundValidators === 0;
     }
     calculateRound(height) {
         const genesisHeight = this.configuration.getGenesisHeight();
-        let nextMilestone = this.configuration.getNextMilestoneWithNewKey(genesisHeight, "activeValidators");
-        let activeValidators = this.configuration.getMilestone(genesisHeight).activeValidators;
+        let nextMilestone = this.configuration.getNextMilestoneWithNewKey(genesisHeight, "roundValidators");
+        let roundValidators = this.configuration.getMilestone(genesisHeight).roundValidators;
         // Genesis round requires special treatment
         if (height === genesisHeight) {
             return { maxValidators: 0, nextRound: 1, round: 0, roundHeight: genesisHeight };
@@ -69,25 +69,25 @@ let RoundCalculator = class RoundCalculator {
                 break;
             }
             const spanHeight = nextMilestone.height - milestoneHeight - 1;
-            if (milestoneHeight > genesisHeight && spanHeight % activeValidators !== 0) {
+            if (milestoneHeight > genesisHeight && spanHeight % roundValidators !== 0) {
                 throw new Exceptions.InvalidMilestoneConfigurationError(`Bad milestone at height: ${height}. The number of validators can only be changed at the beginning of a new round.`);
             }
-            result.round += spanHeight / Math.max(1, activeValidators);
+            result.round += spanHeight / Math.max(1, roundValidators);
             result.roundHeight = nextMilestone.height;
             assert.number(nextMilestone.data);
             result.maxValidators = nextMilestone.data;
-            activeValidators = nextMilestone.data;
+            roundValidators = nextMilestone.data;
             milestoneHeight = nextMilestone.height - 1;
-            nextMilestone = this.configuration.getNextMilestoneWithNewKey(nextMilestone.height, "activeValidators");
+            nextMilestone = this.configuration.getNextMilestoneWithNewKey(nextMilestone.height, "roundValidators");
         }
-        const minActiveValidators = Math.max(1, activeValidators);
+        const minRoundValidators = Math.max(1, roundValidators);
         const heightFromLastSpan = height - milestoneHeight - 1;
-        const roundIncrease = Math.floor(heightFromLastSpan / minActiveValidators);
-        const nextRoundIncrease = (heightFromLastSpan + 1) % minActiveValidators === 0 ? 1 : 0;
+        const roundIncrease = Math.floor(heightFromLastSpan / minRoundValidators);
+        const nextRoundIncrease = (heightFromLastSpan + 1) % minRoundValidators === 0 ? 1 : 0;
         result.round += roundIncrease;
-        result.roundHeight += roundIncrease * minActiveValidators;
+        result.roundHeight += roundIncrease * minRoundValidators;
         result.nextRound = result.round + nextRoundIncrease;
-        result.maxValidators = minActiveValidators;
+        result.maxValidators = minRoundValidators;
         return result;
     }
     calculateRoundInfoByRound(round) {
@@ -100,8 +100,8 @@ let RoundCalculator = class RoundCalculator {
         let maxValidators = 0;
         for (let index = 1; index < milestones.length - 1; index++) {
             const milestone = milestones[index];
-            maxValidators = milestone.activeValidators;
-            roundHeight += (round - 1) * milestone.activeValidators;
+            maxValidators = milestone.roundValidators;
+            roundHeight += (round - 1) * milestone.roundValidators;
         }
         return {
             maxValidators,

package/distribution/round-calculator.js.map

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

package/distribution/timestamp-calculator.js

@@ -16,7 +16,7 @@ let TimestampCalculator = class TimestampCalculator {
             if (round > 100_000) {
                 throw new Error(`Round ${round} is too high`);
             }
-            const milestone = this.configuration.getMilestone(previousBlock.data.height + 1);
+            const milestone = this.configuration.getMilestone(previousBlock.data.number + 1);
             const roundForMath = Math.max(0, round - 1);
             return (previousBlock.data.timestamp +
                 // Append block time

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mainsail/blockchain-utils",
-  "version": "0.0.1-evm.17",
+  "version": "0.0.1-evm.19",
   "description": "Common blockchain utils for the Mainsail blockchain.",
   "license": "GPL-3.0-only",
   "contributors": [],
@@ -11,10 +11,10 @@
     "/distribution"
   ],
   "dependencies": {
-    "@mainsail/container": "0.0.1-evm.17",
-    "@mainsail/kernel": "0.0.1-evm.17",
-    "@mainsail/contracts": "0.0.1-evm.17",
-    "@mainsail/utils": "0.0.1-evm.17"
+    "@mainsail/container": "0.0.1-evm.19",
+    "@mainsail/utils": "0.0.1-evm.19",
+    "@mainsail/kernel": "0.0.1-evm.19",
+    "@mainsail/contracts": "0.0.1-evm.19"
   },
   "devDependencies": {
     "uvu": "0.5.6"
@@ -28,7 +28,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"

package/distribution/supply-calculator.d.ts

@@ -1,7 +0,0 @@
-import { Contracts } from "@mainsail/contracts";
-import { BigNumber } from "@mainsail/utils";
-export declare class SupplyCalculator implements Contracts.BlockchainUtils.SupplyCalculator {
-    private readonly configuration;
-    calculateSupply(height: number): BigNumber;
-}
-//# sourceMappingURL=supply-calculator.d.ts.map

package/distribution/supply-calculator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"supply-calculator.d.ts","sourceRoot":"","sources":["../source/supply-calculator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBACa,gBAAiB,YAAW,SAAS,CAAC,eAAe,CAAC,gBAAgB;IAElF,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAEhE,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS;CAkC1C"}

package/distribution/supply-calculator.js

@@ -1,48 +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 { BigNumber } from "@mainsail/utils";
-let SupplyCalculator = class SupplyCalculator {
-    calculateSupply(height) {
-        const initialSupply = BigNumber.make(this.configuration.get("genesisBlock.block.totalAmount"));
-        const milestones = this.configuration.get("milestones");
-        const genesisHeight = this.configuration.getGenesisHeight();
-        if (height === genesisHeight || milestones.length === 0) {
-            return initialSupply;
-        }
-        let accumulatedRewards = BigNumber.ZERO;
-        let currentHeight = 0;
-        let constantIndex = 0;
-        while (currentHeight < height) {
-            const constants = milestones[constantIndex];
-            const nextConstants = milestones[constantIndex + 1];
-            let heightJump = height - currentHeight;
-            if (nextConstants && height >= nextConstants.height && currentHeight < nextConstants.height - 1) {
-                heightJump = nextConstants.height - 1 - currentHeight;
-                constantIndex += 1;
-            }
-            currentHeight += heightJump;
-            if (currentHeight >= constants.height) {
-                accumulatedRewards = accumulatedRewards.plus(BigNumber.make(constants.reward).times(heightJump));
-            }
-        }
-        return initialSupply.plus(accumulatedRewards);
-    }
-};
-__decorate([
-    inject(Identifiers.Cryptography.Configuration),
-    __metadata("design:type", Object)
-], SupplyCalculator.prototype, "configuration", void 0);
-SupplyCalculator = __decorate([
-    injectable()
-], SupplyCalculator);
-export { SupplyCalculator };
-//# sourceMappingURL=supply-calculator.js.map

package/distribution/supply-calculator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"supply-calculator.js","sourceRoot":"","sources":["../source/supply-calculator.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,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAI5B,eAAe,CAAC,MAAc;QAC7B,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAE/F,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC;QAE5D,IAAI,MAAM,KAAK,aAAa,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO,aAAa,CAAC;QACtB,CAAC;QAED,IAAI,kBAAkB,GAAG,SAAS,CAAC,IAAI,CAAC;QACxC,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,aAAa,GAAG,CAAC,CAAC;QAEtB,OAAO,aAAa,GAAG,MAAM,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;YAC5C,MAAM,aAAa,GAAG,UAAU,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;YAEpD,IAAI,UAAU,GAAW,MAAM,GAAG,aAAa,CAAC;YAEhD,IAAI,aAAa,IAAI,MAAM,IAAI,aAAa,CAAC,MAAM,IAAI,aAAa,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACjG,UAAU,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,GAAG,aAAa,CAAC;gBACtD,aAAa,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,aAAa,IAAI,UAAU,CAAC;YAE5B,IAAI,aAAa,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACvC,kBAAkB,GAAG,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YAClG,CAAC;QACF,CAAC;QAED,OAAO,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC/C,CAAC;CACD,CAAA;AApCiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;uDACiB;AAFpD,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAsC5B"}