@mainsail/crypto-block 0.0.1-evm.3 → 0.0.1-evm.30

package/distribution/block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,UAAU,cAAc;IACvB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;CAC7C;AAED,eAAO,MAAM,SAAS,uCAAwC,cAAc,KAAG,UAAU,MAAM,CAAC,KAS7F,CAAC"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,UAAU,cAAc;IACvB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;CAC7C;AAED,eAAO,MAAM,SAAS,GAAI,oCAAoC,cAAc,KAAG,SAAS,CAAC,MAAM,CAAC,KAS7F,CAAC"}

package/distribution/block.js

@@ -3,7 +3,7 @@ export const sealBlock = ({ data, serialized, transactions }) => Object.seal({
     header: data,
     serialized,
     transactions: transactions.map((transaction, index) => {
-        transaction.data.sequence = index;
+        transaction.data.transactionIndex = index;
         return transaction;
     }),
 });

package/distribution/block.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.js","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAkB,EAA0B,EAAE,CACvG,MAAM,CAAC,IAAI,CAAC;IACX,IAAI;IACJ,MAAM,EAAE,IAAI;IACZ,UAAU;IACV,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACrD,WAAW,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAClC,OAAO,WAAW,CAAC;IACpB,CAAC,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAkB,EAA0B,EAAE,CACvG,MAAM,CAAC,IAAI,CAAC;IACX,IAAI;IACJ,MAAM,EAAE,IAAI;IACZ,UAAU;IACV,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACrD,WAAW,CAAC,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;QAC1C,OAAO,WAAW,CAAC;IACpB,CAAC,CAAC;CACF,CAAC,CAAC"}

package/distribution/deserializer.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Contracts } from "@mainsail/contracts";
 export declare class Deserializer implements Contracts.Crypto.BlockDeserializer {
     #private;
-    private readonly idFactory;
+    private readonly hashFactory;
     private readonly transactionFactory;
     private readonly serializer;
-    private readonly blockSerializer;
+    private readonly headerSize;
     deserializeHeader(serialized: Buffer): Promise<Contracts.Crypto.BlockHeader>;
     deserializeWithTransactions(serialized: Buffer): Promise<Contracts.Crypto.BlockWithTransactions>;
 }

package/distribution/deserializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deserializer.d.ts","sourceRoot":"","sources":["../source/deserializer.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAsB,MAAM,qBAAqB,CAAC;AAOpE,qBACa,YAAa,YAAW,SAAS,CAAC,MAAM,CAAC,iBAAiB;;IAEtE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IAGvC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IAGzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAG9D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IAEvD,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;IAU5E,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC;CAyG7G"}
+{"version":3,"file":"deserializer.d.ts","sourceRoot":"","sources":["../source/deserializer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAsB,MAAM,qBAAqB,CAAC;AAMpE,qBACa,YAAa,YAAW,SAAS,CAAC,MAAM,CAAC,iBAAiB;;IAEtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IAGzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAG9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAE9B,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;IAU5E,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC;CA0G7G"}

package/distribution/deserializer.js

@@ -7,122 +7,116 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Deserializer_instances, _Deserializer_deserializeBufferHeader, _Deserializer_deserializeTransactions;
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Identifiers } from "@mainsail/contracts";
 import { TransactionFactory } from "@mainsail/crypto-transaction";
-import { Utils as AppUtils } from "@mainsail/kernel";
-import { ByteBuffer } from "@mainsail/utils";
-import { IDFactory } from "./id.factory.js";
+import { ByteBuffer, sleep } from "@mainsail/utils";
+import { HashFactory } from "./hash.factory.js";
 let Deserializer = class Deserializer {
-    constructor() {
-        _Deserializer_instances.add(this);
-    }
+    hashFactory;
+    transactionFactory;
+    serializer;
+    headerSize;
     async deserializeHeader(serialized) {
         const buffer = ByteBuffer.fromBuffer(serialized);
-        const header = await __classPrivateFieldGet(this, _Deserializer_instances, "m", _Deserializer_deserializeBufferHeader).call(this, buffer);
-        header.id = await this.idFactory.make(header);
+        const header = await this.#deserializeBufferHeader(buffer);
+        header.hash = await this.hashFactory.make(header);
         return header;
     }
     async deserializeWithTransactions(serialized) {
         const buffer = ByteBuffer.fromBuffer(serialized);
-        const block = await __classPrivateFieldGet(this, _Deserializer_instances, "m", _Deserializer_deserializeBufferHeader).call(this, buffer);
+        const block = await this.#deserializeBufferHeader(buffer);
         let transactions = [];
         if (buffer.getRemainderLength() > 0) {
-            transactions = await __classPrivateFieldGet(this, _Deserializer_instances, "m", _Deserializer_deserializeTransactions).call(this, block, buffer);
+            transactions = await this.#deserializeTransactions(block, buffer);
         }
-        block.id = await this.idFactory.make(block);
+        block.hash = await this.hashFactory.make(block);
         return { data: block, transactions };
     }
-};
-_Deserializer_instances = new WeakSet();
-_Deserializer_deserializeBufferHeader = async function _Deserializer_deserializeBufferHeader(buffer) {
-    const block = {};
-    await this.serializer.deserialize(buffer, block, {
-        length: this.blockSerializer.headerSize(),
-        schema: {
-            version: {
-                type: "uint8",
-            },
-            timestamp: {
-                type: "uint48",
-            },
-            height: {
-                type: "uint32",
-            },
-            round: {
-                type: "uint32",
-            },
-            previousBlock: {
-                type: "hash",
-            },
-            stateHash: {
-                type: "hash",
-            },
-            numberOfTransactions: {
-                type: "uint16",
-            },
-            totalGasUsed: {
-                type: "uint32",
+    async #deserializeBufferHeader(buffer) {
+        const block = {};
+        await this.serializer.deserialize(buffer, block, {
+            length: this.headerSize(),
+            schema: {
+                version: {
+                    type: "uint8",
+                },
+                timestamp: {
+                    type: "uint48",
+                },
+                number: {
+                    type: "uint32",
+                },
+                round: {
+                    type: "uint32",
+                },
+                parentHash: {
+                    type: "hash",
+                },
+                stateRoot: {
+                    type: "hash",
+                },
+                logsBloom: {
+                    type: "hash",
+                    size: 256,
+                },
+                transactionsCount: {
+                    type: "uint16",
+                },
+                gasUsed: {
+                    type: "uint32",
+                },
+                fee: {
+                    type: "uint256",
+                },
+                reward: {
+                    type: "uint256",
+                },
+                payloadSize: {
+                    type: "uint32",
+                },
+                transactionsRoot: {
+                    type: "hash",
+                },
+                proposer: {
+                    type: "address",
+                },
             },
-            totalAmount: {
-                type: "uint256",
-            },
-            totalFee: {
-                type: "uint256",
-            },
-            reward: {
-                type: "uint256",
-            },
-            payloadLength: {
-                type: "uint32",
-            },
-            payloadHash: {
-                type: "hash",
-            },
-            generatorAddress: {
-                type: "address",
-            },
-        },
-    });
-    return block;
-};
-_Deserializer_deserializeTransactions = async function _Deserializer_deserializeTransactions(block, buf) {
-    await this.serializer.deserialize(buf, block, {
-        length: block.payloadLength,
-        schema: {
-            transactions: {
-                type: "transactions",
+        });
+        return block;
+    }
+    async #deserializeTransactions(block, buf) {
+        await this.serializer.deserialize(buf, block, {
+            length: block.payloadSize,
+            schema: {
+                transactions: {
+                    type: "transactions",
+                },
             },
-        },
-    });
-    /**
-     * After unpacking we need to turn the transactions into DTOs!
-     *
-     * We keep this behaviour out of the (de)serialiser because it
-     * is very specific to this bit of code in this specific class.
-     */
-    const transactions = [];
-    for (let index = 0; index < block.transactions.length; index++) {
-        if (index % 20 === 0) {
-            await AppUtils.sleep(0);
+        });
+        /**
+         * After unpacking we need to turn the transactions into DTOs!
+         *
+         * We keep this behaviour out of the (de)serialiser because it
+         * is very specific to this bit of code in this specific class.
+         */
+        const transactions = [];
+        for (let index = 0; index < block.transactions.length; index++) {
+            if (index % 20 === 0) {
+                await sleep(0);
+            }
+            const transaction = await this.transactionFactory.fromBytes(block.transactions[index]);
+            transactions.push(transaction);
+            block.transactions[index] = transaction.data;
         }
-        const transaction = await this.transactionFactory.fromBytes(block.transactions[index]);
-        transactions.push(transaction);
-        block.transactions[index] = transaction.data;
+        return transactions;
     }
-    return transactions;
 };
 __decorate([
-    inject(Identifiers.Cryptography.Block.IDFactory),
-    __metadata("design:type", IDFactory)
-], Deserializer.prototype, "idFactory", void 0);
+    inject(Identifiers.Cryptography.Block.HashFactory),
+    __metadata("design:type", HashFactory)
+], Deserializer.prototype, "hashFactory", void 0);
 __decorate([
     inject(Identifiers.Cryptography.Transaction.Factory),
     __metadata("design:type", TransactionFactory)
@@ -132,9 +126,9 @@ __decorate([
     __metadata("design:type", Object)
 ], Deserializer.prototype, "serializer", void 0);
 __decorate([
-    inject(Identifiers.Cryptography.Block.Serializer),
-    __metadata("design:type", Object)
-], Deserializer.prototype, "blockSerializer", void 0);
+    inject(Identifiers.Cryptography.Block.HeaderSize),
+    __metadata("design:type", Function)
+], Deserializer.prototype, "headerSize", void 0);
 Deserializer = __decorate([
     injectable()
 ], Deserializer);

package/distribution/deserializer.js.map

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

package/distribution/factory.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Contracts, Utils } from "@mainsail/contracts";
 export declare class BlockFactory implements Contracts.Crypto.BlockFactory {
     #private;
     private readonly serializer;
     private readonly deserializer;
-    private readonly idFactory;
+    private readonly hashFactory;
     private readonly validator;
     make(data: Utils.Mutable<Contracts.Crypto.BlockDataSerializable>, transactions: Contracts.Crypto.Transaction[]): Promise<Contracts.Crypto.Block>;
     fromHex(hex: string): Promise<Contracts.Crypto.Block>;

package/distribution/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../source/factory.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAA2B,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAMhF,qBACa,YAAa,YAAW,SAAS,CAAC,MAAM,CAAC,YAAY;;IAEjE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAG/D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IAGnE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IAGvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAE3C,IAAI,CAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAC3D,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,GAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAYrB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAIrD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAIxD,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAkB3E,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;CA8DxF"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../source/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA2B,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAMhF,qBACa,YAAa,YAAW,SAAS,CAAC,MAAM,CAAC,YAAY;;IAEjE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAG/D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IAGnE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAE3C,IAAI,CAChB,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAC3D,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,GAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAYrB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAIrD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAIxD,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAgB3E,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;CA8DxF"}

package/distribution/factory.js

@@ -7,23 +7,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _BlockFactory_instances, _BlockFactory_fromSerialized, _BlockFactory_applySchema;
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Exceptions, Identifiers } from "@mainsail/contracts";
 import { BigNumber } from "@mainsail/utils";
 import { sealBlock } from "./block.js";
-import { IDFactory } from "./id.factory.js";
+import { HashFactory } from "./hash.factory.js";
 let BlockFactory = class BlockFactory {
-    constructor() {
-        _BlockFactory_instances.add(this);
-    }
+    serializer;
+    deserializer;
+    hashFactory;
+    validator;
     async make(data, transactions) {
-        const block = { ...data, id: await this.idFactory.make(data) };
+        const block = { ...data, hash: await this.hashFactory.make(data) };
         const serialized = await this.serializer.serializeWithTransactions(data);
         return sealBlock({
             data: block,
@@ -32,73 +27,70 @@ let BlockFactory = class BlockFactory {
         });
     }
     async fromHex(hex) {
-        return __classPrivateFieldGet(this, _BlockFactory_instances, "m", _BlockFactory_fromSerialized).call(this, Buffer.from(hex, "hex"));
+        return this.#fromSerialized(Buffer.from(hex, "hex"));
     }
     async fromBytes(buff) {
-        return __classPrivateFieldGet(this, _BlockFactory_instances, "m", _BlockFactory_fromSerialized).call(this, buff);
+        return this.#fromSerialized(buff);
     }
     async fromJson(json) {
         // @ts-ignore
         const data = { ...json };
-        data.totalAmount = BigNumber.make(data.totalAmount);
-        data.totalFee = BigNumber.make(data.totalFee);
+        data.fee = BigNumber.make(data.fee);
         data.reward = BigNumber.make(data.reward);
         if (data.transactions) {
             for (const transaction of data.transactions) {
-                transaction.amount = BigNumber.make(transaction.amount);
-                transaction.fee = BigNumber.make(transaction.fee);
+                transaction.value = BigNumber.make(transaction.value);
                 transaction.nonce = BigNumber.make(transaction.nonce);
             }
         }
         return this.fromData(data);
     }
     async fromData(data) {
-        await __classPrivateFieldGet(this, _BlockFactory_instances, "m", _BlockFactory_applySchema).call(this, data);
+        await this.#applySchema(data);
         const serialized = await this.serializer.serializeWithTransactions(data);
         return sealBlock({
             ...(await this.deserializer.deserializeWithTransactions(serialized)),
             serialized: serialized.toString("hex"),
         });
     }
-};
-_BlockFactory_instances = new WeakSet();
-_BlockFactory_fromSerialized = async function _BlockFactory_fromSerialized(serialized) {
-    const deserialized = await this.deserializer.deserializeWithTransactions(serialized);
-    const validated = await __classPrivateFieldGet(this, _BlockFactory_instances, "m", _BlockFactory_applySchema).call(this, deserialized.data);
-    if (validated) {
-        deserialized.data = validated;
-    }
-    return sealBlock({
-        ...deserialized,
-        serialized: serialized.toString("hex"),
-    });
-};
-_BlockFactory_applySchema = async function _BlockFactory_applySchema(data) {
-    const result = this.validator.validate("block", data);
-    if (!result.error) {
-        return result.value;
+    async #fromSerialized(serialized) {
+        const deserialized = await this.deserializer.deserializeWithTransactions(serialized);
+        const validated = await this.#applySchema(deserialized.data);
+        if (validated) {
+            deserialized.data = validated;
+        }
+        return sealBlock({
+            ...deserialized,
+            serialized: serialized.toString("hex"),
+        });
     }
-    for (const error of result.errors ?? []) {
-        let fatal = false;
-        const match = error.instancePath.match(/\.transactions\[(\d+)]/);
-        if (match === null) {
-            fatal = true;
+    async #applySchema(data) {
+        const result = this.validator.validate("block", data);
+        if (!result.error) {
+            return result.value;
         }
-        else {
-            const txIndex = match[1];
-            if (data.transactions) {
-                const tx = data.transactions[txIndex];
-                if (tx.id === undefined) {
-                    fatal = true;
+        for (const error of result.errors ?? []) {
+            let fatal = false;
+            const match = error.instancePath.match(/\.transactions\[(\d+)]/);
+            if (match === null) {
+                fatal = true;
+            }
+            else {
+                const txIndex = match[1];
+                if (data.transactions) {
+                    const tx = data.transactions[txIndex];
+                    if (tx.id === undefined) {
+                        fatal = true;
+                    }
                 }
             }
+            if (fatal) {
+                throw new Exceptions.BlockSchemaError(data.number, `Invalid data${error.instancePath ? " at " + error.instancePath : ""}: ` +
+                    `${error.message}: ${JSON.stringify(error.data)}`);
+            }
         }
-        if (fatal) {
-            throw new Exceptions.BlockSchemaError(data.height, `Invalid data${error.instancePath ? " at " + error.instancePath : ""}: ` +
-                `${error.message}: ${JSON.stringify(error.data)}`);
-        }
+        return result.value;
     }
-    return result.value;
 };
 __decorate([
     inject(Identifiers.Cryptography.Block.Serializer),
@@ -109,9 +101,9 @@ __decorate([
     __metadata("design:type", Object)
 ], BlockFactory.prototype, "deserializer", void 0);
 __decorate([
-    inject(Identifiers.Cryptography.Block.IDFactory),
-    __metadata("design:type", IDFactory)
-], BlockFactory.prototype, "idFactory", void 0);
+    inject(Identifiers.Cryptography.Block.HashFactory),
+    __metadata("design:type", HashFactory)
+], BlockFactory.prototype, "hashFactory", void 0);
 __decorate([
     inject(Identifiers.Cryptography.Validator),
     __metadata("design:type", Object)

package/distribution/factory.js.map

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

package/distribution/{id.factory.d.ts → hash.factory.d.ts}

@@ -1,7 +1,7 @@
 import { Contracts } from "@mainsail/contracts";
-export declare class IDFactory {
+export declare class HashFactory {
     private readonly hashFactory;
     private readonly serializer;
     make(data: Contracts.Crypto.BlockDataSerializable): Promise<string>;
 }
-//# sourceMappingURL=id.factory.d.ts.map
+//# sourceMappingURL=hash.factory.d.ts.map

package/distribution/hash.factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hash.factory.d.ts","sourceRoot":"","sources":["../source/hash.factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,WAAW;IAEvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgC;IAG5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAElD,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAGhF"}

package/distribution/{id.factory.js → hash.factory.js}

@@ -9,7 +9,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { inject, injectable } from "@mainsail/container";
 import { Contracts, Identifiers } from "@mainsail/contracts";
-let IDFactory = class IDFactory {
+let HashFactory = class HashFactory {
+    hashFactory;
+    serializer;
     async make(data) {
         return (await this.hashFactory.sha256(await this.serializer.serializeHeader(data))).toString("hex");
     }
@@ -17,13 +19,13 @@ let IDFactory = class IDFactory {
 __decorate([
     inject(Identifiers.Cryptography.Hash.Factory),
     __metadata("design:type", Object)
-], IDFactory.prototype, "hashFactory", void 0);
+], HashFactory.prototype, "hashFactory", void 0);
 __decorate([
     inject(Identifiers.Cryptography.Block.Serializer),
     __metadata("design:type", Object)
-], IDFactory.prototype, "serializer", void 0);
-IDFactory = __decorate([
+], HashFactory.prototype, "serializer", void 0);
+HashFactory = __decorate([
     injectable()
-], IDFactory);
-export { IDFactory };
-//# sourceMappingURL=id.factory.js.map
+], HashFactory);
+export { HashFactory };
+//# sourceMappingURL=hash.factory.js.map

package/distribution/hash.factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hash.factory.js","sourceRoot":"","sources":["../source/hash.factory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGtD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEN,WAAW,CAAgC;IAG3C,UAAU,CAAoC;IAExD,KAAK,CAAC,IAAI,CAAC,IAA4C;QAC7D,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACrG,CAAC;CACD,CAAA;AARiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;;gDACc;AAG3C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC;;+CACa;AALnD,WAAW;IADvB,UAAU,EAAE;GACA,WAAW,CAUvB"}

package/distribution/index.d.ts

@@ -1,10 +1,9 @@
 import { Providers } from "@mainsail/kernel";
 export * from "./deserializer.js";
 export * from "./factory.js";
-export * from "./id.factory.js";
+export * from "./hash.factory.js";
 export * from "./schemas.js";
 export * from "./serializer.js";
-export * from "./verifier.js";
 export declare class ServiceProvider extends Providers.ServiceProvider {
     register(): Promise<void>;
 }

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;AAS7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAE9B,qBAAa,eAAgB,SAAQ,SAAS,CAAC,eAAe;IAChD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAWtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAEhC,qBACa,eAAgB,SAAQ,SAAS,CAAC,eAAe;IAChD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAgCtC"}

package/distribution/index.js

@@ -1,27 +1,53 @@
+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 { Deserializer } from "./deserializer.js";
 import { BlockFactory } from "./factory.js";
-import { IDFactory } from "./id.factory.js";
+import { HashFactory } from "./hash.factory.js";
 import { schemas } from "./schemas.js";
 import { Serializer } from "./serializer.js";
-import { Verifier } from "./verifier.js";
 export * from "./deserializer.js";
 export * from "./factory.js";
-export * from "./id.factory.js";
+export * from "./hash.factory.js";
 export * from "./schemas.js";
 export * from "./serializer.js";
-export * from "./verifier.js";
-export class ServiceProvider extends Providers.ServiceProvider {
+let ServiceProvider = class ServiceProvider extends Providers.ServiceProvider {
     async register() {
+        this.app.bind(Identifiers.Cryptography.Block.HeaderSize).toConstantValue(() => {
+            const hashByteLength = this.app.get(Identifiers.Cryptography.Hash.Size.SHA256);
+            const generatorAddressByteLength = this.app.get(Identifiers.Cryptography.Identity.Address.Size);
+            return (1 + // version
+                6 + // timestamp
+                4 + // height
+                4 + // round
+                hashByteLength + // previousBlock
+                hashByteLength + // stateRoot
+                256 + // logsBloom
+                2 + // transactionsCount
+                4 + // totalGasUsed
+                32 + // totalFee
+                32 + // reward
+                4 + // payloadLength
+                hashByteLength + // payloadHash
+                generatorAddressByteLength);
+        });
         this.app.bind(Identifiers.Cryptography.Block.Deserializer).to(Deserializer).inSingletonScope();
         this.app.bind(Identifiers.Cryptography.Block.Factory).to(BlockFactory).inSingletonScope();
-        this.app.bind(Identifiers.Cryptography.Block.IDFactory).to(IDFactory).inSingletonScope();
+        this.app.bind(Identifiers.Cryptography.Block.HashFactory).to(HashFactory).inSingletonScope();
         this.app.bind(Identifiers.Cryptography.Block.Serializer).to(Serializer).inSingletonScope();
-        this.app.bind(Identifiers.Cryptography.Block.Verifier).to(Verifier).inSingletonScope();
         for (const schema of Object.values(schemas)) {
             this.app.get(Identifiers.Cryptography.Validator).addSchema(schema);
         }
     }
-}
+};
+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,EAAa,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAE9B,MAAM,OAAO,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC/F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC1F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACzF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC3F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAEvF,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,GAAG,CAA6B,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChG,CAAC;IACF,CAAC;CACD"}
+{"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;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAGzB,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS,CAAC,eAAe;IACtD,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE;YAC7E,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvF,MAAM,0BAA0B,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAS,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAExG,OAAO,CACN,CAAC,GAAG,UAAU;gBACd,CAAC,GAAG,YAAY;gBAChB,CAAC,GAAG,SAAS;gBACb,CAAC,GAAG,QAAQ;gBACZ,cAAc,GAAG,gBAAgB;gBACjC,cAAc,GAAG,YAAY;gBAC7B,GAAG,GAAG,YAAY;gBAClB,CAAC,GAAG,oBAAoB;gBACxB,CAAC,GAAG,eAAe;gBACnB,EAAE,GAAG,WAAW;gBAChB,EAAE,GAAG,SAAS;gBACd,CAAC,GAAG,gBAAgB;gBACpB,cAAc,GAAG,cAAc;gBAC/B,0BAA0B,CAC1B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC/F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC1F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAE3F,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,GAAG,CAA6B,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChG,CAAC;IACF,CAAC;CACD,CAAA;AAjCY,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CAiC3B"}

package/distribution/schemas.d.ts

@@ -1,3 +1,3 @@
 import { AnySchemaObject } from "ajv";
-export declare const schemas: Record<"block" | "blockId" | "blockHeader", AnySchemaObject>;
+export declare const schemas: Record<"block" | "blockHash" | "prefixedBlockHash" | "blockHeader" | "logsBloom", AnySchemaObject>;
 //# sourceMappingURL=schemas.d.ts.map

package/distribution/schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAEtC,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,GAAG,aAAa,EAAE,eAAe,CAyDhF,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAEtC,eAAO,MAAM,OAAO,EAAE,MAAM,CAC3B,OAAO,GAAG,WAAW,GAAG,mBAAmB,GAAG,aAAa,GAAG,WAAW,EACzE,eAAe,CAoFf,CAAC"}

package/distribution/schemas.js

@@ -5,52 +5,78 @@ export const schemas = {
         properties: {
             transactions: {
                 $ref: "transactions",
-                maxItems: { $data: "1/numberOfTransactions" },
-                minItems: { $data: "1/numberOfTransactions" },
+                maxItems: { $data: "1/transactionsCount" },
+                minItems: { $data: "1/transactionsCount" },
                 type: "array",
             },
         },
         type: "object",
     },
+    blockHash: {
+        $id: "blockHash",
+        allOf: [
+            {
+                $ref: "hex",
+                maxLength: 64,
+                minLength: 64,
+            },
+        ],
+        type: "string",
+    },
     blockHeader: {
         $id: "blockHeader",
         properties: {
-            generatorAddress: { $ref: "address" },
-            height: { minimum: 0, type: "integer" },
-            id: { $ref: "blockId" },
-            numberOfTransactions: { minimum: 0, type: "integer" },
-            payloadHash: { $ref: "hex" },
-            payloadLength: { minimum: 0, type: "integer" },
-            previousBlock: { $ref: "blockId" },
+            fee: { bignumber: { minimum: 0 } },
+            gasUsed: { minimum: 0, type: "integer" },
+            hash: { $ref: "blockHash" },
+            logsBloom: { $ref: "logsBloom" },
+            number: { minimum: 0, type: "integer" },
+            parentHash: { $ref: "blockHash" },
+            payloadSize: { minimum: 0, type: "integer" },
+            proposer: { $ref: "address" },
             reward: { bignumber: { minimum: 0 } },
-            stateHash: { $ref: "hex" },
+            stateRoot: { $ref: "hex" },
             timestamp: { maximum: 2 ** 48 - 1, minimum: 0, type: "integer" },
-            totalAmount: { bignumber: { minimum: 0 } },
-            totalFee: { bignumber: { minimum: 0 } },
-            totalGasUsed: { minimum: 0, type: "integer" },
+            transactionsCount: { minimum: 0, type: "integer" },
+            transactionsRoot: { $ref: "hex" },
             version: { enum: [1] },
         },
         required: [
-            "id",
-            "timestamp",
-            "previousBlock",
-            "height",
-            "stateHash",
-            "totalGasUsed",
-            "totalAmount",
-            "totalFee",
+            "fee",
+            "gasUsed",
+            "hash",
+            "logsBloom",
+            "number",
+            "parentHash",
+            "payloadSize",
+            "proposer",
             "reward",
-            "generatorAddress",
+            "stateRoot",
+            "timestamp",
+            "transactionsCount",
+            "transactionsRoot",
+            "version",
         ],
         type: "object",
     },
-    blockId: {
-        $id: "blockId",
+    logsBloom: {
+        $id: "logsBloom",
         allOf: [
             {
                 $ref: "hex",
-                maxLength: 64,
-                minLength: 64,
+                maxLength: 512,
+                minLength: 512,
+            },
+        ],
+        type: "string",
+    },
+    prefixedBlockHash: {
+        $id: "prefixedBlockHash",
+        allOf: [
+            {
+                $ref: "prefixedQuantityHex",
+                maxLength: 66,
+                minLength: 66,
             },
         ],
         type: "string",

package/distribution/schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,OAAO,GAAiE;IACpF,KAAK,EAAE;QACN,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE;YACX,YAAY,EAAE;gBACb,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE;gBAC7C,QAAQ,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE;gBAC7C,IAAI,EAAE,OAAO;aACb;SACD;QACD,IAAI,EAAE,QAAQ;KACd;IACD,WAAW,EAAE;QACZ,GAAG,EAAE,aAAa;QAClB,UAAU,EAAE;YACX,gBAAgB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YACvC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACvB,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YACrD,WAAW,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;YAC5B,aAAa,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YAC9C,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;YACrC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;YAC1B,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YAChE,WAAW,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;YAC1C,QAAQ,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;YACvC,YAAY,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YAC7C,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;SACtB;QACD,QAAQ,EAAE;YACT,IAAI;YACJ,WAAW;YACX,eAAe;YACf,QAAQ;YACR,WAAW;YACX,cAAc;YACd,aAAa;YACb,UAAU;YACV,QAAQ;YACR,kBAAkB;SAClB;QACD,IAAI,EAAE,QAAQ;KACd;IACD,OAAO,EAAE;QACR,GAAG,EAAE,SAAS;QACd,KAAK,EAAE;YACN;gBACC,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,EAAE;aACb;SACD;QACD,IAAI,EAAE,QAAQ;KACd;CACD,CAAC"}
+{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,OAAO,GAGhB;IACH,KAAK,EAAE;QACN,GAAG,EAAE,OAAO;QACZ,IAAI,EAAE,aAAa;QACnB,UAAU,EAAE;YACX,YAAY,EAAE;gBACb,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE;gBAC1C,QAAQ,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE;gBAC1C,IAAI,EAAE,OAAO;aACb;SACD;QACD,IAAI,EAAE,QAAQ;KACd;IACD,SAAS,EAAE;QACV,GAAG,EAAE,WAAW;QAChB,KAAK,EAAE;YACN;gBACC,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,EAAE;aACb;SACD;QACD,IAAI,EAAE,QAAQ;KACd;IACD,WAAW,EAAE;QACZ,GAAG,EAAE,aAAa;QAClB,UAAU,EAAE;YACX,GAAG,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;YAClC,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YACxC,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;YAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;YAChC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YACvC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;YACjC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YAC5C,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC7B,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE;YACrC,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;YAC1B,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YAChE,iBAAiB,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE;YAClD,gBAAgB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;YACjC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;SACtB;QACD,QAAQ,EAAE;YACT,KAAK;YACL,SAAS;YACT,MAAM;YACN,WAAW;YACX,QAAQ;YACR,YAAY;YACZ,aAAa;YACb,UAAU;YACV,QAAQ;YACR,WAAW;YACX,WAAW;YACX,mBAAmB;YACnB,kBAAkB;YAClB,SAAS;SACT;QACD,IAAI,EAAE,QAAQ;KACd;IACD,SAAS,EAAE;QACV,GAAG,EAAE,WAAW;QAChB,KAAK,EAAE;YACN;gBACC,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE,GAAG;gBACd,SAAS,EAAE,GAAG;aACd;SACD;QACD,IAAI,EAAE,QAAQ;KACd;IACD,iBAAiB,EAAE;QAClB,GAAG,EAAE,mBAAmB;QACxB,KAAK,EAAE;YACN;gBACC,IAAI,EAAE,qBAAqB;gBAC3B,SAAS,EAAE,EAAE;gBACb,SAAS,EAAE,EAAE;aACb;SACD;QACD,IAAI,EAAE,QAAQ;KACd;CACD,CAAC"}

package/distribution/serializer.d.ts

@@ -1,10 +1,7 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Contracts } from "@mainsail/contracts";
 export declare class Serializer implements Contracts.Crypto.BlockSerializer {
     private readonly serializer;
-    private readonly hashByteLength;
-    private readonly generatorAddressByteLength;
-    headerSize(): number;
+    private readonly headerSize;
     totalSize(block: Contracts.Crypto.BlockDataSerializable): number;
     serializeHeader(block: Contracts.Crypto.BlockDataSerializable): Promise<Buffer>;
     serializeWithTransactions(block: Contracts.Crypto.BlockDataSerializable): Promise<Buffer>;

package/distribution/serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../source/serializer.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,UAAW,YAAW,SAAS,CAAC,MAAM,CAAC,eAAe;IAGlE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAG9D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAU;IAGzC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAU;IAE9C,UAAU,IAAI,MAAM;IAmBpB,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,MAAM;IAI1D,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAmD/E,yBAAyB,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAqDtG"}
+{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../source/serializer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,UAAW,YAAW,SAAS,CAAC,MAAM,CAAC,eAAe;IAElE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAG9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAEpC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,MAAM;IAI1D,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAmD/E,yBAAyB,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAqDtG"}

package/distribution/serializer.js

@@ -8,27 +8,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 /* eslint-disable sort-keys-fix/sort-keys-fix */
-import { inject, injectable, tagged } from "@mainsail/container";
+import { inject, injectable } from "@mainsail/container";
 import { Contracts, Identifiers } from "@mainsail/contracts";
 let Serializer = class Serializer {
-    headerSize() {
-        return (1 + // version
-            6 + // timestamp
-            4 + // height
-            4 + // round
-            this.hashByteLength + // previousBlock
-            this.hashByteLength + // stateHash
-            2 + // numberOfTransactions
-            4 + // totalGasUsed
-            32 + // totalAmount
-            32 + // totalFee
-            32 + // reward
-            4 + // payloadLength
-            this.hashByteLength + // payloadHash
-            this.generatorAddressByteLength);
-    }
+    serializer;
+    headerSize;
     totalSize(block) {
-        return this.headerSize() + block.payloadLength;
+        return this.headerSize() + block.payloadSize;
     }
     async serializeHeader(block) {
         return this.serializer.serialize(block, {
@@ -41,40 +27,40 @@ let Serializer = class Serializer {
                 timestamp: {
                     type: "uint48",
                 },
-                height: {
+                number: {
                     type: "uint32",
                 },
                 round: {
                     type: "uint32",
                 },
-                previousBlock: {
+                parentHash: {
+                    type: "hash",
+                },
+                stateRoot: {
                     type: "hash",
                 },
-                stateHash: {
+                logsBloom: {
                     type: "hash",
                 },
-                numberOfTransactions: {
+                transactionsCount: {
                     type: "uint16",
                 },
-                totalGasUsed: {
+                gasUsed: {
                     type: "uint32",
                 },
-                totalAmount: {
-                    type: "uint256",
-                },
-                totalFee: {
+                fee: {
                     type: "uint256",
                 },
                 reward: {
                     type: "uint256",
                 },
-                payloadLength: {
+                payloadSize: {
                     type: "uint32",
                 },
-                payloadHash: {
+                transactionsRoot: {
                     type: "hash",
                 },
-                generatorAddress: {
+                proposer: {
                     type: "address",
                 },
             },
@@ -91,40 +77,40 @@ let Serializer = class Serializer {
                 timestamp: {
                     type: "uint48",
                 },
-                height: {
+                number: {
                     type: "uint32",
                 },
                 round: {
                     type: "uint32",
                 },
-                previousBlock: {
+                parentHash: {
                     type: "hash",
                 },
-                stateHash: {
+                stateRoot: {
                     type: "hash",
                 },
-                numberOfTransactions: {
+                logsBloom: {
+                    type: "hash",
+                },
+                transactionsCount: {
                     type: "uint16",
                 },
-                totalGasUsed: {
+                gasUsed: {
                     type: "uint32",
                 },
-                totalAmount: {
-                    type: "uint256",
-                },
-                totalFee: {
+                fee: {
                     type: "uint256",
                 },
                 reward: {
                     type: "uint256",
                 },
-                payloadLength: {
+                payloadSize: {
                     type: "uint32",
                 },
-                payloadHash: {
+                transactionsRoot: {
                     type: "hash",
                 },
-                generatorAddress: {
+                proposer: {
                     type: "address",
                 },
                 transactions: {
@@ -136,17 +122,12 @@ let Serializer = class Serializer {
 };
 __decorate([
     inject(Identifiers.Cryptography.Serializer),
-    tagged("type", "wallet"),
     __metadata("design:type", Object)
 ], Serializer.prototype, "serializer", void 0);
 __decorate([
-    inject(Identifiers.Cryptography.Hash.Size.SHA256),
-    __metadata("design:type", Number)
-], Serializer.prototype, "hashByteLength", void 0);
-__decorate([
-    inject(Identifiers.Cryptography.Identity.Address.Size),
-    __metadata("design:type", Number)
-], Serializer.prototype, "generatorAddressByteLength", void 0);
+    inject(Identifiers.Cryptography.Block.HeaderSize),
+    __metadata("design:type", Function)
+], Serializer.prototype, "headerSize", void 0);
 Serializer = __decorate([
     injectable()
 ], Serializer);

package/distribution/serializer.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mainsail/crypto-block",
-  "version": "0.0.1-evm.3",
+  "version": "0.0.1-evm.30",
   "description": "Block utilities for the Mainsail blockchain",
   "license": "GPL-3.0-only",
   "contributors": [],
@@ -11,39 +11,42 @@
     "/distribution"
   ],
   "dependencies": {
-    "ajv": "8.12.0",
-    "@mainsail/container": "0.0.1-evm.3",
-    "@mainsail/contracts": "0.0.1-evm.3",
-    "@mainsail/crypto-transaction": "0.0.1-evm.3",
-    "@mainsail/kernel": "0.0.1-evm.3",
-    "@mainsail/utils": "0.0.1-evm.3"
+    "ajv": "8.17.1",
+    "@mainsail/contracts": "0.0.1-evm.30",
+    "@mainsail/crypto-transaction": "0.0.1-evm.30",
+    "@mainsail/kernel": "0.0.1-evm.30",
+    "@mainsail/container": "0.0.1-evm.30",
+    "@mainsail/utils": "0.0.1-evm.30"
   },
   "devDependencies": {
-    "@types/lodash.clone": "^4.5.9",
-    "lodash.clone": "^4.5.0",
-    "uvu": "^0.5.6",
-    "@mainsail/crypto-address-keccak256": "0.0.1-evm.3",
-    "@mainsail/crypto-config": "0.0.1-evm.3",
-    "@mainsail/crypto-consensus-bls12-381": "0.0.1-evm.3",
-    "@mainsail/crypto-key-pair-ecdsa": "0.0.1-evm.3",
-    "@mainsail/crypto-hash-bcrypto": "0.0.1-evm.3",
-    "@mainsail/crypto-signature-schnorr": "0.0.1-evm.3",
-    "@mainsail/crypto-validation": "0.0.1-evm.3",
-    "@mainsail/crypto-wif": "0.0.1-evm.3",
-    "@mainsail/serializer": "0.0.1-evm.3",
-    "@mainsail/validation": "0.0.1-evm.3",
-    "@mainsail/crypto-transaction-evm-call": "0.0.1-evm.3"
+    "@types/lodash.clone": "4.5.9",
+    "@types/lodash.clonedeep": "4.5.9",
+    "lodash.clone": "4.5.0",
+    "lodash.clonedeep": "4.5.0",
+    "uvu": "0.5.6",
+    "@mainsail/crypto-address-base58": "0.0.1-evm.30",
+    "@mainsail/crypto-address-keccak256": "0.0.1-evm.30",
+    "@mainsail/crypto-hash-bcrypto": "0.0.1-evm.30",
+    "@mainsail/crypto-key-pair-ecdsa": "0.0.1-evm.30",
+    "@mainsail/crypto-consensus-bls12-381": "0.0.1-evm.30",
+    "@mainsail/crypto-config": "0.0.1-evm.30",
+    "@mainsail/crypto-signature-ecdsa": "0.0.1-evm.30",
+    "@mainsail/crypto-transaction-evm-call": "0.0.1-evm.30",
+    "@mainsail/crypto-validation": "0.0.1-evm.30",
+    "@mainsail/serializer": "0.0.1-evm.30",
+    "@mainsail/validation": "0.0.1-evm.30",
+    "@mainsail/crypto-wif": "0.0.1-evm.30"
   },
   "engines": {
     "node": ">=20.x"
   },
   "scripts": {
-    "build": "pnpm run clean && tsc",
+    "build": "tsc -b",
     "build:watch": "pnpm run clean && tsc -w",
-    "clean": "del distribution",
+    "clean": "del distribution && del tsconfig.tsbuildinfo",
     "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/id.factory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"id.factory.d.ts","sourceRoot":"","sources":["../source/id.factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAe,MAAM,qBAAqB,CAAC;AAE7D,qBACa,SAAS;IAErB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgC;IAG5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAElD,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAGhF"}

package/distribution/id.factory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"id.factory.js","sourceRoot":"","sources":["../source/id.factory.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,SAAS,GAAf,MAAM,SAAS;IAOd,KAAK,CAAC,IAAI,CAAC,IAA4C;QAC7D,OAAO,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACrG,CAAC;CACD,CAAA;AARiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;;8CACc;AAG3C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC;;6CACa;AALnD,SAAS;IADrB,UAAU,EAAE;GACA,SAAS,CAUrB"}

package/distribution/verifier.d.ts

@@ -1,8 +0,0 @@
-import { Contracts } from "@mainsail/contracts";
-export declare class Verifier implements Contracts.Crypto.BlockVerifier {
-    private readonly configuration;
-    private readonly serializer;
-    private readonly hashFactory;
-    verify(block: Contracts.Crypto.Block): Promise<Contracts.Crypto.BlockVerification>;
-}
-//# sourceMappingURL=verifier.d.ts.map

package/distribution/verifier.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"verifier.d.ts","sourceRoot":"","sources":["../source/verifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAsB,MAAM,qBAAqB,CAAC;AAGpE,qBACa,QAAS,YAAW,SAAS,CAAC,MAAM,CAAC,aAAa;IAE9D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAGhE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAG/D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgC;IAE/C,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC;CAsH/F"}

package/distribution/verifier.js

@@ -1,116 +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 Verifier = class Verifier {
-    async verify(block) {
-        const blockData = block.data;
-        const result = {
-            containsMultiSignatures: false,
-            errors: [],
-            verified: false,
-        };
-        try {
-            const constants = this.configuration.getMilestone(blockData.height);
-            if (blockData.height === 0 &&
-                blockData.previousBlock !== "0000000000000000000000000000000000000000000000000000000000000000") {
-                result.errors.push("Genesis block has invalid previous block");
-            }
-            if (blockData.height !== 0 && !blockData.previousBlock) {
-                result.errors.push("Invalid previous block");
-            }
-            if (!blockData.reward.isEqualTo(constants.reward)) {
-                result.errors.push(["Invalid block reward:", blockData.reward, "expected:", constants.reward].join(" "));
-            }
-            if (blockData.version !== constants.block.version) {
-                result.errors.push("Invalid block version");
-            }
-            const headerSize = this.serializer.headerSize();
-            const totalSize = headerSize + block.header.payloadLength;
-            if (totalSize > constants.block.maxPayload) {
-                result.errors.push(`Payload is too large: ${totalSize} > ${constants.block.maxPayload}`);
-            }
-            if (totalSize !== Buffer.byteLength(block.serialized, "hex")) {
-                result.errors.push("Serialized payload size mismatch");
-            }
-            if (blockData.totalGasUsed > constants.block.maxGasLimit && blockData.height > 0) {
-                result.errors.push(`Total gas used ${blockData.totalGasUsed} exceeds max gas limit ${constants.block.maxGasLimit}`);
-            }
-            if (block.transactions.length !== blockData.numberOfTransactions) {
-                result.errors.push("Invalid number of transactions");
-            }
-            if (block.transactions.length > constants.block.maxTransactions && blockData.height > 0) {
-                result.errors.push("Transactions length is too high");
-            }
-            // Checking if transactions of the block adds up to block values.
-            const appliedTransactions = {};
-            let totalAmount = BigNumber.ZERO;
-            let totalFee = BigNumber.ZERO;
-            // The initial payload length takes the overhead for each serialized transaction into account
-            // which is a uint16 per transaction to store the individual length.
-            let totalPayloadLength = block.transactions.length * 2;
-            const payloadBuffers = [];
-            for (const transaction of block.transactions) {
-                if (!transaction || !transaction.id) {
-                    throw new Error();
-                }
-                const bytes = Buffer.from(transaction.id, "hex");
-                if (appliedTransactions[transaction.id]) {
-                    result.errors.push(`Encountered duplicate transaction: ${transaction.id}`);
-                }
-                if (transaction.data.expiration &&
-                    transaction.data.expiration > 0 &&
-                    transaction.data.expiration <= blockData.height) {
-                    result.errors.push(`Encountered expired transaction: ${transaction.id}`);
-                }
-                appliedTransactions[transaction.id] = transaction.data;
-                totalAmount = totalAmount.plus(transaction.data.amount);
-                totalFee = totalFee.plus(transaction.data.fee);
-                totalPayloadLength += transaction.serialized.byteLength;
-                payloadBuffers.push(bytes);
-            }
-            if (!totalAmount.isEqualTo(blockData.totalAmount)) {
-                result.errors.push("Invalid total amount");
-            }
-            if (!totalFee.isEqualTo(blockData.totalFee)) {
-                result.errors.push("Invalid total fee");
-            }
-            if (totalPayloadLength !== blockData.payloadLength) {
-                result.errors.push("Invalid payload length");
-            }
-            if ((await this.hashFactory.sha256(payloadBuffers)).toString("hex") !== blockData.payloadHash) {
-                result.errors.push("Invalid payload hash");
-            }
-        }
-        catch (error) {
-            result.errors.push(error);
-        }
-        result.verified = result.errors.length === 0;
-        return result;
-    }
-};
-__decorate([
-    inject(Identifiers.Cryptography.Configuration),
-    __metadata("design:type", Object)
-], Verifier.prototype, "configuration", void 0);
-__decorate([
-    inject(Identifiers.Cryptography.Block.Serializer),
-    __metadata("design:type", Object)
-], Verifier.prototype, "serializer", void 0);
-__decorate([
-    inject(Identifiers.Cryptography.Hash.Factory),
-    __metadata("design:type", Object)
-], Verifier.prototype, "hashFactory", void 0);
-Verifier = __decorate([
-    injectable()
-], Verifier);
-export { Verifier };
-//# sourceMappingURL=verifier.js.map

package/distribution/verifier.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../source/verifier.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAS,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrC,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAUb,KAAK,CAAC,MAAM,CAAC,KAA6B;QAChD,MAAM,SAAS,GAA+B,KAAK,CAAC,IAAI,CAAC;QACzD,MAAM,MAAM,GAAsD;YACjE,uBAAuB,EAAE,KAAK;YAC9B,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,KAAK;SACf,CAAC;QAEF,IAAI,CAAC;YACJ,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAEpE,IACC,SAAS,CAAC,MAAM,KAAK,CAAC;gBACtB,SAAS,CAAC,aAAa,KAAK,kEAAkE,EAC7F,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;gBACxD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC9C,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnD,MAAM,CAAC,MAAM,CAAC,IAAI,CACjB,CAAC,uBAAuB,EAAE,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACpF,CAAC;YACH,CAAC;YAED,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YAChD,MAAM,SAAS,GAAG,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1D,IAAI,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,SAAS,MAAM,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;YAC1F,CAAC;YAED,IAAI,SAAS,KAAK,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAClF,MAAM,CAAC,MAAM,CAAC,IAAI,CACjB,kBAAkB,SAAS,CAAC,YAAY,0BAA0B,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,CAC/F,CAAC;YACH,CAAC;YAED,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,KAAK,SAAS,CAAC,oBAAoB,EAAE,CAAC;gBAClE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACtD,CAAC;YAED,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,eAAe,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YACvD,CAAC;YAED,iEAAiE;YACjE,MAAM,mBAAmB,GAAqD,EAAE,CAAC;YAEjF,IAAI,WAAW,GAAc,SAAS,CAAC,IAAI,CAAC;YAC5C,IAAI,QAAQ,GAAc,SAAS,CAAC,IAAI,CAAC;YAEzC,6FAA6F;YAC7F,oEAAoE;YACpE,IAAI,kBAAkB,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;YAEvD,MAAM,cAAc,GAAa,EAAE,CAAC;YACpC,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBAC9C,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;oBACrC,MAAM,IAAI,KAAK,EAAE,CAAC;gBACnB,CAAC;gBAED,MAAM,KAAK,GAAW,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;gBAEzD,IAAI,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;oBACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5E,CAAC;gBAED,IACC,WAAW,CAAC,IAAI,CAAC,UAAU;oBAC3B,WAAW,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC;oBAC/B,WAAW,CAAC,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC,MAAM,EAC9C,CAAC;oBACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBAED,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC;gBAEvD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxD,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC/C,kBAAkB,IAAI,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC;gBAExD,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACzC,CAAC;YAED,IAAI,kBAAkB,KAAK,SAAS,CAAC,aAAa,EAAE,CAAC;gBACpD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC9C,CAAC;YAED,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC/F,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YAC5C,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QAE7C,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;AA9HiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC;;+CACiB;AAG/C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC;;4CACa;AAG9C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;;6CACc;AARhD,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CAgIpB"}