@mainsail/crypto-block 0.0.1-evm.43 → 0.0.1-evm.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,9 +1,30 @@
1
1
  import type { Contracts } from "@mainsail/contracts";
2
+ import type { BigNumber } from "@mainsail/utils";
2
3
  interface BlockArguments {
3
- data: Contracts.Crypto.BlockData;
4
+ data: Contracts.Crypto.BlockHeader;
4
5
  serialized: string;
5
6
  transactions: Contracts.Crypto.Transaction[];
6
7
  }
7
- export declare const sealBlock: ({ data, serialized, transactions }: BlockArguments) => Contracts.Crypto.Block;
8
+ export declare class Block implements Contracts.Crypto.Block {
9
+ readonly timestamp: number;
10
+ readonly version: number;
11
+ readonly number: number;
12
+ readonly round: number;
13
+ readonly parentHash: string;
14
+ readonly stateRoot: string;
15
+ readonly logsBloom: string;
16
+ readonly transactionsCount: number;
17
+ readonly gasUsed: number;
18
+ readonly fee: BigNumber;
19
+ readonly reward: BigNumber;
20
+ readonly payloadSize: number;
21
+ readonly transactionsRoot: string;
22
+ readonly proposer: string;
23
+ readonly hash: string;
24
+ readonly serialized: string;
25
+ readonly transactions: Contracts.Crypto.BlockTransaction[];
26
+ constructor({ data, serialized, transactions }: BlockArguments);
27
+ toData(): Contracts.Crypto.BlockData;
28
+ }
8
29
  export {};
9
30
  //# sourceMappingURL=block.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,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,KAY/F,CAAC"}
1
+ {"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,UAAU,cAAc;IACvB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;CAC7C;AAED,qBAAa,KAAM,YAAW,SAAS,CAAC,MAAM,CAAC,KAAK;IACnD,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B,SAAgB,UAAU,EAAE,MAAM,CAAC;IACnC,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,iBAAiB,EAAE,MAAM,CAAC;IAC1C,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,GAAG,EAAE,SAAS,CAAC;IAC/B,SAAgB,MAAM,EAAE,SAAS,CAAC;IAClC,SAAgB,WAAW,EAAE,MAAM,CAAC;IACpC,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IACzC,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,UAAU,EAAE,MAAM,CAAC;IACnC,SAAgB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAE/C,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,cAAc;IA6BrE,MAAM,IAAI,SAAS,CAAC,MAAM,CAAC,SAAS;CAsBpC"}
@@ -1,13 +1,66 @@
1
- export const sealBlock = ({ data, serialized, transactions }) => {
2
- const { transactions: _, ...blockHeader } = data;
3
- return Object.seal({
4
- data,
5
- header: blockHeader,
6
- serialized,
7
- transactions: transactions.map((transaction, index) => {
8
- transaction.data.transactionIndex = index;
9
- return transaction;
10
- }),
11
- });
12
- };
1
+ import { BlockTransaction } from "@mainsail/crypto-transaction";
2
+ export class Block {
3
+ timestamp;
4
+ version;
5
+ number;
6
+ round;
7
+ parentHash;
8
+ stateRoot;
9
+ logsBloom;
10
+ transactionsCount;
11
+ gasUsed;
12
+ fee;
13
+ reward;
14
+ payloadSize;
15
+ transactionsRoot;
16
+ proposer;
17
+ hash;
18
+ serialized;
19
+ transactions;
20
+ constructor({ data, serialized, transactions }) {
21
+ this.timestamp = data.timestamp;
22
+ this.version = data.version;
23
+ this.number = data.number;
24
+ this.round = data.round;
25
+ this.parentHash = data.parentHash;
26
+ this.stateRoot = data.stateRoot;
27
+ this.logsBloom = data.logsBloom;
28
+ this.transactionsCount = data.transactionsCount;
29
+ this.gasUsed = data.gasUsed;
30
+ this.fee = data.fee;
31
+ this.reward = data.reward;
32
+ this.payloadSize = data.payloadSize;
33
+ this.transactionsRoot = data.transactionsRoot;
34
+ this.proposer = data.proposer;
35
+ this.hash = data.hash;
36
+ this.serialized = serialized;
37
+ this.transactions = transactions.map((transaction, index) => new BlockTransaction(transaction, transaction.serialized, {
38
+ blockHash: this.hash,
39
+ blockNumber: this.number,
40
+ transactionIndex: index,
41
+ }));
42
+ }
43
+ toData() {
44
+ return {
45
+ /* eslint-disable sort-keys-fix/sort-keys-fix */
46
+ timestamp: this.timestamp,
47
+ version: this.version,
48
+ number: this.number,
49
+ round: this.round,
50
+ parentHash: this.parentHash,
51
+ stateRoot: this.stateRoot,
52
+ logsBloom: this.logsBloom,
53
+ transactionsCount: this.transactionsCount,
54
+ gasUsed: this.gasUsed,
55
+ fee: this.fee,
56
+ reward: this.reward,
57
+ payloadSize: this.payloadSize,
58
+ transactionsRoot: this.transactionsRoot,
59
+ proposer: this.proposer,
60
+ hash: this.hash,
61
+ transactions: this.transactions.map((transaction) => transaction.toData()),
62
+ /* eslint-enable sort-keys-fix/sort-keys-fix */
63
+ };
64
+ }
65
+ }
13
66
  //# sourceMappingURL=block.js.map
@@ -1 +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;IACvG,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC;IAEjD,OAAO,MAAM,CAAC,IAAI,CAAC;QAClB,IAAI;QACJ,MAAM,EAAE,WAAW;QACnB,UAAU;QACV,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;YACrD,WAAW,CAAC,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAC1C,OAAO,WAAW,CAAC;QACpB,CAAC,CAAC;KACF,CAAC,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"block.js","sourceRoot":"","sources":["../source/block.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,8 @@ export declare class Deserializer implements Contracts.Crypto.BlockDeserializer
3
3
  #private;
4
4
  private readonly hashFactory;
5
5
  private readonly transactionFactory;
6
- private readonly transactionDeserializer;
7
6
  private readonly serializer;
8
7
  private readonly headerSize;
9
- private readonly workerPool;
10
8
  deserializeHeader(serialized: Buffer): Promise<Contracts.Crypto.BlockHeader>;
11
9
  deserializeWithTransactions(serialized: Buffer): Promise<Contracts.Crypto.BlockWithTransactions>;
12
10
  }
@@ -1 +1 @@
1
- {"version":3,"file":"deserializer.d.ts","sourceRoot":"","sources":["../source/deserializer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOrD,qBACa,YAAa,YAAW,SAAS,CAAC,MAAM,CAAC,iBAAiB;;IAEtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuC;IAG1E,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA4C;IAGpF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmC;IAG9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAI3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0C;IAExD,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;IAW5E,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC;CA4F7G"}
1
+ {"version":3,"file":"deserializer.d.ts","sourceRoot":"","sources":["../source/deserializer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOrD,qBACa,YAAa,YAAW,SAAS,CAAC,MAAM,CAAC,iBAAiB;;IAEtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAuC;IAG1E,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;IAW5E,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC;CA8D7G"}
@@ -8,18 +8,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
10
  import { Identifiers } from "@mainsail/constants";
11
- import { inject, injectable, optional } from "@mainsail/container";
12
- import { TransactionSchemaError } from "@mainsail/exceptions";
13
- import { ByteBuffer, sleep } from "@mainsail/utils";
11
+ import { inject, injectable } from "@mainsail/container";
12
+ import { InvalidBlockBytesError } from "@mainsail/exceptions";
13
+ import { ByteBuffer } from "@mainsail/utils";
14
14
  import { HashFactory } from "./hash.factory.js";
15
- import { schema, transactionsSchema } from "./serializer-schemas.js";
15
+ import { blockHeaderSchema, transactionsSchema } from "./serializer-schemas.js";
16
16
  let Deserializer = class Deserializer {
17
17
  hashFactory;
18
18
  transactionFactory;
19
- transactionDeserializer;
20
19
  serializer;
21
20
  headerSize;
22
- workerPool;
23
21
  async deserializeHeader(serialized) {
24
22
  const buffer = ByteBuffer.fromBuffer(serialized);
25
23
  const header = await this.#deserializeBufferHeader(buffer);
@@ -35,60 +33,33 @@ let Deserializer = class Deserializer {
35
33
  if (buffer.getRemainderLength() > 0) {
36
34
  transactions = await this.#deserializeTransactions(header, buffer);
37
35
  }
36
+ if (buffer.getRemainderLength() !== 0) {
37
+ throw new InvalidBlockBytesError(`Found trailing bytes of length ${buffer.getRemainderLength()}`);
38
+ }
38
39
  return {
39
40
  data: {
40
41
  ...header,
41
42
  hash: await this.hashFactory.make(header),
42
- transactions: transactions.map((tx) => tx.data),
43
43
  },
44
44
  transactions,
45
45
  };
46
46
  }
47
47
  async #deserializeBufferHeader(buffer) {
48
- return await this.serializer.deserialize(buffer, {}, {
48
+ const header = await this.serializer.deserialize(buffer, {}, {
49
49
  length: this.headerSize(),
50
- schema,
50
+ schema: blockHeaderSchema,
51
51
  });
52
+ if (buffer.getRemainderLength() !== header.payloadSize) {
53
+ throw new InvalidBlockBytesError(`Payload size ${header.payloadSize} does not match actual payload size ${buffer.getRemainderLength()}`);
54
+ }
55
+ return header;
52
56
  }
53
57
  async #deserializeTransactions(header, buf) {
54
58
  const block = await this.serializer.deserialize(buf, { ...header }, {
55
59
  length: header.payloadSize,
56
60
  schema: transactionsSchema,
57
61
  });
58
- /**
59
- * After unpacking we need to turn the transactions into DTOs!
60
- *
61
- * We keep this behavior out of the (de)serializer because it
62
- * is very specific to this bit of code in this specific class.
63
- */
64
- const transactions = Array.from({ length: block.transactionsCount });
65
- await Promise.all(block.transactions.map(async (serialized, index) => {
66
- const transaction = await this.transactionDeserializer.deserialize(serialized);
67
- if (index % 20 === 0) {
68
- await sleep(0);
69
- }
70
- const computed = await this.#computeCryptoData(transaction.data);
71
- if (computed.schemaError) {
72
- throw new TransactionSchemaError(computed.schemaError);
73
- }
74
- transaction.data.data = transaction.data.data.startsWith("0x")
75
- ? transaction.data.data.slice(2)
76
- : transaction.data.data;
77
- transaction.data.hash = computed.hash;
78
- transaction.data.from = computed.address;
79
- transaction.data.senderPublicKey = computed.publicKey;
80
- transaction.data.senderLegacyAddress = computed.legacyAddress;
81
- transactions[index] = transaction;
82
- block.transactions[index] = transaction.data;
83
- }));
84
- return transactions;
85
- }
86
- async #computeCryptoData(transaction) {
87
- if (this.workerPool) {
88
- const worker = await this.workerPool.getWorker();
89
- return worker.transactionFactory("computeCryptoData", transaction);
90
- }
91
- return this.transactionFactory.computeCryptoData(transaction);
62
+ return Promise.all(block.transactions.map(async (serialized) => this.transactionFactory.fromBytes(serialized)));
92
63
  }
93
64
  };
94
65
  __decorate([
@@ -99,10 +70,6 @@ __decorate([
99
70
  inject(Identifiers.Cryptography.Transaction.Factory),
100
71
  __metadata("design:type", Object)
101
72
  ], Deserializer.prototype, "transactionFactory", void 0);
102
- __decorate([
103
- inject(Identifiers.Cryptography.Transaction.Deserializer),
104
- __metadata("design:type", Object)
105
- ], Deserializer.prototype, "transactionDeserializer", void 0);
106
73
  __decorate([
107
74
  inject(Identifiers.Cryptography.Serializer),
108
75
  __metadata("design:type", Object)
@@ -111,11 +78,6 @@ __decorate([
111
78
  inject(Identifiers.Cryptography.Block.HeaderSize),
112
79
  __metadata("design:type", Function)
113
80
  ], Deserializer.prototype, "headerSize", void 0);
114
- __decorate([
115
- inject(Identifiers.CryptoWorker.WorkerPool),
116
- optional(),
117
- __metadata("design:type", Object)
118
- ], Deserializer.prototype, "workerPool", void 0);
119
81
  Deserializer = __decorate([
120
82
  injectable()
121
83
  ], Deserializer);
@@ -1 +1 @@
1
- {"version":3,"file":"deserializer.js","sourceRoot":"","sources":["../source/deserializer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deserializer.js","sourceRoot":"","sources":["../source/deserializer.ts"],"names":[],"mappings":"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"}
@@ -6,11 +6,12 @@ export declare class BlockFactory implements Contracts.Crypto.BlockFactory {
6
6
  private readonly hashFactory;
7
7
  private readonly transactionFactory;
8
8
  private readonly validator;
9
- make(data: Contracts.Crypto.BlockDataSerializable, transactions: Contracts.Crypto.Transaction[]): Promise<Contracts.Crypto.Block>;
9
+ make(data: Contracts.Crypto.BlockHeaderRaw, transactions: Contracts.Crypto.Transaction[]): Promise<Contracts.Crypto.Block>;
10
10
  fromHex(hex: string): Promise<Contracts.Crypto.Block>;
11
11
  fromBytes(buff: Buffer): Promise<Contracts.Crypto.Block>;
12
+ fromStorage(header: Contracts.Evm.BlockHeaderStorageData, transactions: Contracts.Evm.TransactionStorageData[]): Promise<Contracts.Crypto.Block>;
13
+ headerFromStorage(header: Contracts.Evm.BlockHeaderStorageData): Promise<Contracts.Crypto.BlockHeader>;
12
14
  fromJson(json: Contracts.Crypto.BlockJson): Promise<Contracts.Crypto.Block>;
13
15
  fromData(data: Contracts.Crypto.BlockData): Promise<Contracts.Crypto.Block>;
14
- fromStorage(header: Contracts.Evm.BlockHeaderStorageData, transactions: Contracts.Evm.TransactionStorageData[]): Promise<Contracts.Crypto.Block>;
15
16
  }
16
17
  //# sourceMappingURL=factory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../source/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AAO5D,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,kBAAkB,CAAuC;IAG1E,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAE3C,IAAI,CAChB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,EAC5C,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;IAW3E,WAAW,CACvB,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,sBAAsB,EAC5C,YAAY,EAAE,SAAS,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAClD,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;CA6ElC"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../source/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOrD,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,kBAAkB,CAAuC;IAG1E,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;IAE3C,IAAI,CAChB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,cAAc,EACrC,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,GAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAcrB,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,WAAW,CACvB,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,sBAAsB,EAC5C,YAAY,EAAE,SAAS,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAClD,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAkBrB,iBAAiB,CAC7B,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,sBAAsB,GAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;IAoB3B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;IAe3E,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;CAmCxF"}
@@ -11,7 +11,7 @@ import { Identifiers } from "@mainsail/constants";
11
11
  import { inject, injectable } from "@mainsail/container";
12
12
  import { BlockSchemaError } from "@mainsail/exceptions";
13
13
  import { BigNumber } from "@mainsail/utils";
14
- import { sealBlock } from "./block.js";
14
+ import { Block } from "./block.js";
15
15
  import { HashFactory } from "./hash.factory.js";
16
16
  let BlockFactory = class BlockFactory {
17
17
  serializer;
@@ -21,8 +21,9 @@ let BlockFactory = class BlockFactory {
21
21
  validator;
22
22
  async make(data, transactions) {
23
23
  const block = { ...data, hash: await this.hashFactory.make(data) };
24
- const serialized = await this.serializer.serializeWithTransactions(data);
25
- return sealBlock({
24
+ await this.#verify({ ...block, transactions });
25
+ const serialized = await this.serializer.serializeWithTransactions({ ...data, transactions });
26
+ return new Block({
26
27
  data: block,
27
28
  serialized: serialized.toString("hex"),
28
29
  transactions,
@@ -34,89 +35,74 @@ let BlockFactory = class BlockFactory {
34
35
  async fromBytes(buff) {
35
36
  return this.#fromSerialized(buff);
36
37
  }
38
+ async fromStorage(header, transactions) {
39
+ const parsedTransactions = await Promise.all(transactions.map((tx) => this.transactionFactory.fromStorage({ ...tx, blockHash: header.hash })));
40
+ const data = await this.headerFromStorage(header);
41
+ const serialized = await this.serializer.serializeWithTransactions({
42
+ ...data,
43
+ transactions: parsedTransactions,
44
+ });
45
+ return new Block({
46
+ data,
47
+ serialized: serialized.toString("hex"),
48
+ transactions: parsedTransactions,
49
+ });
50
+ }
51
+ async headerFromStorage(header) {
52
+ return {
53
+ fee: BigNumber.make(header.fee),
54
+ gasUsed: header.gasUsed,
55
+ hash: header.hash,
56
+ logsBloom: header.logsBloom,
57
+ number: header.number,
58
+ parentHash: header.parentHash,
59
+ payloadSize: header.payloadSize,
60
+ proposer: header.proposer,
61
+ reward: BigNumber.make(header.reward),
62
+ round: header.round,
63
+ stateRoot: header.stateRoot,
64
+ timestamp: Number(header.timestamp),
65
+ transactionsCount: header.transactionsCount,
66
+ transactionsRoot: header.transactionsRoot,
67
+ version: header.version,
68
+ };
69
+ }
37
70
  async fromJson(json) {
38
- // @ts-ignore
39
- const data = { ...json };
40
- data.fee = BigNumber.make(data.fee);
41
- data.reward = BigNumber.make(data.reward);
42
- if (data.transactions) {
43
- for (const transaction of data.transactions) {
44
- transaction.value = BigNumber.make(transaction.value);
45
- transaction.nonce = BigNumber.make(transaction.nonce);
46
- }
47
- }
71
+ const data = {
72
+ ...json,
73
+ fee: BigNumber.make(json.fee),
74
+ reward: BigNumber.make(json.reward),
75
+ transactions: json.transactions.map((tx) => ({
76
+ ...tx,
77
+ nonce: BigNumber.make(tx.nonce),
78
+ value: BigNumber.make(tx.value),
79
+ })),
80
+ };
48
81
  return this.fromData(data);
49
82
  }
50
83
  async fromData(data) {
51
- await this.#applySchema(data);
52
- const serialized = await this.serializer.serializeWithTransactions(data);
53
- return sealBlock({
84
+ await this.#verify(data);
85
+ const transactions = await Promise.all(data.transactions.map((tx) => this.transactionFactory.fromData(tx, false)));
86
+ const serialized = await this.serializer.serializeWithTransactions({ ...data, transactions });
87
+ return new Block({
54
88
  ...(await this.deserializer.deserializeWithTransactions(serialized)),
55
89
  serialized: serialized.toString("hex"),
56
90
  });
57
91
  }
58
- async fromStorage(header, transactions) {
59
- const parsedTransactions = await Promise.all(transactions.map((tx) => this.transactionFactory.fromStorage(tx)));
60
- return sealBlock({
61
- data: {
62
- fee: BigNumber.make(header.fee),
63
- gasUsed: header.gasUsed,
64
- hash: header.hash,
65
- logsBloom: header.logsBloom,
66
- number: header.number,
67
- parentHash: header.parentHash,
68
- payloadSize: header.payloadSize,
69
- proposer: header.proposer,
70
- reward: BigNumber.make(header.reward),
71
- round: header.round,
72
- stateRoot: header.stateRoot,
73
- timestamp: Number(header.timestamp),
74
- transactions: parsedTransactions.map((tx) => tx.data),
75
- transactionsCount: header.transactionsCount,
76
- transactionsRoot: header.transactionsRoot,
77
- version: header.version,
78
- },
79
- serialized: "",
80
- transactions: parsedTransactions,
81
- });
82
- }
83
92
  async #fromSerialized(serialized) {
84
93
  const deserialized = await this.deserializer.deserializeWithTransactions(serialized);
85
- const validated = await this.#applySchema(deserialized.data);
86
- if (validated) {
87
- deserialized.data = validated;
88
- }
89
- return sealBlock({
94
+ await this.#verify({ ...deserialized.data, transactions: deserialized.transactions });
95
+ return new Block({
90
96
  ...deserialized,
91
97
  serialized: serialized.toString("hex"),
92
98
  });
93
99
  }
94
- async #applySchema(data) {
95
- const result = this.validator.validate("block", data);
96
- if (!result.error) {
97
- return result.value;
98
- }
99
- for (const error of result.errors ?? []) {
100
- let fatal = false;
101
- const match = error.instancePath.match(/\.transactions\[(\d+)]/);
102
- if (match === null) {
103
- fatal = true;
104
- }
105
- else {
106
- if (data.transactions) {
107
- const txIndex = Number(match[1]);
108
- const tx = data.transactions[txIndex];
109
- if (tx.hash === undefined) {
110
- fatal = true;
111
- }
112
- }
113
- }
114
- if (fatal) {
115
- throw new BlockSchemaError(data.number, `Invalid data${error.instancePath ? " at " + error.instancePath : ""}: ` +
116
- `${error.message}: ${JSON.stringify(error.data)}`);
117
- }
100
+ async #verify(data) {
101
+ const { error } = this.validator.validate("block", data);
102
+ if (!error) {
103
+ return;
118
104
  }
119
- return result.value;
105
+ throw new BlockSchemaError(data.number, error);
120
106
  }
121
107
  };
122
108
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"factory.js","sourceRoot":"","sources":["../source/factory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"factory.js","sourceRoot":"","sources":["../source/factory.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"hash.factory.d.ts","sourceRoot":"","sources":["../source/hash.factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,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,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;CAIzE"}
1
+ {"version":3,"file":"hash.factory.d.ts","sourceRoot":"","sources":["../source/hash.factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,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,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;CAGzE"}
@@ -13,8 +13,7 @@ let HashFactory = class HashFactory {
13
13
  hashFactory;
14
14
  serializer;
15
15
  async make(data) {
16
- const buffer = await this.hashFactory.sha256(await this.serializer.serializeHeader(data));
17
- return buffer.toString("hex");
16
+ return this.hashFactory.sha256(await this.serializer.serializeHeader(data)).toString("hex");
18
17
  }
19
18
  };
20
19
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"hash.factory.js","sourceRoot":"","sources":["../source/hash.factory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIlD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEN,WAAW,CAAgC;IAG3C,UAAU,CAAoC;IAExD,KAAK,CAAC,IAAI,CAAC,IAAqC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1F,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACD,CAAA;AATiB;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,CAWvB"}
1
+ {"version":3,"file":"hash.factory.js","sourceRoot":"","sources":["../source/hash.factory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIlD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEN,WAAW,CAAgC;IAG3C,UAAU,CAAoC;IAExD,KAAK,CAAC,IAAI,CAAC,IAAqC;QACtD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC7F,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"}
@@ -1,3 +1,3 @@
1
1
  import type { AnySchemaObject } from "ajv";
2
- export declare const schemas: Record<"block" | "blockHash" | "prefixedBlockHash" | "blockHeader" | "logsBloom", AnySchemaObject>;
2
+ export declare const schemas: Record<"block" | "blockHash" | "prefixedBlockHash" | "blockHeader" | "logsBloom" | "stateRoot" | "transactionsRoot", AnySchemaObject>;
3
3
  //# sourceMappingURL=schemas.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAE3C,eAAO,MAAM,OAAO,EAAE,MAAM,CAC3B,OAAO,GAAG,WAAW,GAAG,mBAAmB,GAAG,aAAa,GAAG,WAAW,EACzE,eAAe,CAoFf,CAAC"}
1
+ {"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAE3C,eAAO,MAAM,OAAO,EAAE,MAAM,CAC3B,OAAO,GAAG,WAAW,GAAG,mBAAmB,GAAG,aAAa,GAAG,WAAW,GAAG,WAAW,GAAG,kBAAkB,EAC5G,eAAe,CA8Gf,CAAC"}
@@ -26,36 +26,40 @@ export const schemas = {
26
26
  blockHeader: {
27
27
  $id: "blockHeader",
28
28
  properties: {
29
- fee: { bignumber: { minimum: 0 } },
30
- gasUsed: { minimum: 0, type: "integer" },
29
+ /* eslint-disable sort-keys-fix/sort-keys-fix */
31
30
  hash: { $ref: "blockHash" },
32
- logsBloom: { $ref: "logsBloom" },
31
+ version: { enum: [1] },
32
+ timestamp: { maximum: 2 ** 48 - 1, minimum: 0, type: "integer" },
33
33
  number: { minimum: 0, type: "integer" },
34
+ round: { minimum: 0, type: "integer" },
34
35
  parentHash: { $ref: "blockHash" },
36
+ stateRoot: { $ref: "stateRoot" },
37
+ logsBloom: { $ref: "logsBloom" },
38
+ transactionsCount: { minimum: 0, type: "integer" },
39
+ gasUsed: { minimum: 0, type: "integer" },
40
+ fee: { bignumber: { minimum: 0 } },
41
+ reward: { bignumber: { minimum: 0 } },
35
42
  payloadSize: { minimum: 0, type: "integer" },
43
+ transactionsRoot: { $ref: "transactionsRoot" },
36
44
  proposer: { $ref: "address" },
37
- reward: { bignumber: { minimum: 0 } },
38
- stateRoot: { $ref: "hex" },
39
- timestamp: { maximum: 2 ** 48 - 1, minimum: 0, type: "integer" },
40
- transactionsCount: { minimum: 0, type: "integer" },
41
- transactionsRoot: { $ref: "hex" },
42
- version: { enum: [1] },
45
+ /* eslint-enable sort-keys-fix/sort-keys-fix */
43
46
  },
44
47
  required: [
45
- "fee",
46
- "gasUsed",
47
48
  "hash",
48
- "logsBloom",
49
+ "version",
50
+ "timestamp",
49
51
  "number",
52
+ "round",
50
53
  "parentHash",
51
- "payloadSize",
52
- "proposer",
53
- "reward",
54
54
  "stateRoot",
55
- "timestamp",
55
+ "logsBloom",
56
56
  "transactionsCount",
57
+ "gasUsed",
58
+ "fee",
59
+ "reward",
60
+ "payloadSize",
57
61
  "transactionsRoot",
58
- "version",
62
+ "proposer",
59
63
  ],
60
64
  type: "object",
61
65
  },
@@ -81,5 +85,27 @@ export const schemas = {
81
85
  ],
82
86
  type: "string",
83
87
  },
88
+ stateRoot: {
89
+ $id: "stateRoot",
90
+ allOf: [
91
+ {
92
+ $ref: "hex",
93
+ maxLength: 64,
94
+ minLength: 64,
95
+ },
96
+ ],
97
+ type: "string",
98
+ },
99
+ transactionsRoot: {
100
+ $id: "transactionsRoot",
101
+ allOf: [
102
+ {
103
+ $ref: "hex",
104
+ maxLength: 64,
105
+ minLength: 64,
106
+ },
107
+ ],
108
+ type: "string",
109
+ },
84
110
  };
85
111
  //# sourceMappingURL=schemas.js.map
@@ -1 +1 @@
1
- {"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"}
1
+ {"version":3,"file":"schemas.js","sourceRoot":"","sources":["../source/schemas.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import type { Contracts } from "@mainsail/contracts";
2
- export declare const schema: Record<string, Contracts.Serializer.DeserializationSchema>;
2
+ export declare const blockHeaderSchema: Record<string, Contracts.Serializer.DeserializationSchema>;
3
3
  export declare const transactionsSchema: Record<string, Contracts.Serializer.SerializationSchema>;
4
- export declare const schemaWithTransactions: Record<string, Contracts.Serializer.SerializationSchema>;
4
+ export declare const blockSchema: Record<string, Contracts.Serializer.SerializationSchema>;
5
5
  //# sourceMappingURL=serializer-schemas.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"serializer-schemas.d.ts","sourceRoot":"","sources":["../source/serializer-schemas.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,qBAAqB,CA4C7E,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,mBAAmB,CAIvF,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,mBAAmB,CAK3F,CAAC"}
1
+ {"version":3,"file":"serializer-schemas.d.ts","sourceRoot":"","sources":["../source/serializer-schemas.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,qBAAqB,CA4CxF,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,mBAAmB,CAIvF,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,mBAAmB,CAKhF,CAAC"}
@@ -1,4 +1,4 @@
1
- export const schema = {
1
+ export const blockHeaderSchema = {
2
2
  version: {
3
3
  type: "uint8",
4
4
  },
@@ -48,8 +48,8 @@ export const transactionsSchema = {
48
48
  type: "transactions",
49
49
  },
50
50
  };
51
- export const schemaWithTransactions = {
52
- ...schema,
51
+ export const blockSchema = {
52
+ ...blockHeaderSchema,
53
53
  transactions: {
54
54
  type: "transactions",
55
55
  },
@@ -1 +1 @@
1
- {"version":3,"file":"serializer-schemas.js","sourceRoot":"","sources":["../source/serializer-schemas.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,MAAM,GAA+D;IACjF,OAAO,EAAE;QACR,IAAI,EAAE,OAAO;KACb;IACD,SAAS,EAAE;QACV,IAAI,EAAE,QAAQ;KACd;IACD,MAAM,EAAE;QACP,IAAI,EAAE,QAAQ;KACd;IACD,KAAK,EAAE;QACN,IAAI,EAAE,QAAQ;KACd;IACD,UAAU,EAAE;QACX,IAAI,EAAE,MAAM;KACZ;IACD,SAAS,EAAE;QACV,IAAI,EAAE,MAAM;KACZ;IACD,SAAS,EAAE;QACV,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,GAAG;KACT;IACD,iBAAiB,EAAE;QAClB,IAAI,EAAE,QAAQ;KACd;IACD,OAAO,EAAE;QACR,IAAI,EAAE,QAAQ;KACd;IACD,GAAG,EAAE;QACJ,IAAI,EAAE,SAAS;KACf;IACD,MAAM,EAAE;QACP,IAAI,EAAE,SAAS;KACf;IACD,WAAW,EAAE;QACZ,IAAI,EAAE,QAAQ;KACd;IACD,gBAAgB,EAAE;QACjB,IAAI,EAAE,MAAM;KACZ;IACD,QAAQ,EAAE;QACT,IAAI,EAAE,SAAS;KACf;CACD,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA6D;IAC3F,YAAY,EAAE;QACb,IAAI,EAAE,cAAc;KACpB;CACD,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAA6D;IAC/F,GAAG,MAAM;IACT,YAAY,EAAE;QACb,IAAI,EAAE,cAAc;KACpB;CACD,CAAC"}
1
+ {"version":3,"file":"serializer-schemas.js","sourceRoot":"","sources":["../source/serializer-schemas.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,iBAAiB,GAA+D;IAC5F,OAAO,EAAE;QACR,IAAI,EAAE,OAAO;KACb;IACD,SAAS,EAAE;QACV,IAAI,EAAE,QAAQ;KACd;IACD,MAAM,EAAE;QACP,IAAI,EAAE,QAAQ;KACd;IACD,KAAK,EAAE;QACN,IAAI,EAAE,QAAQ;KACd;IACD,UAAU,EAAE;QACX,IAAI,EAAE,MAAM;KACZ;IACD,SAAS,EAAE;QACV,IAAI,EAAE,MAAM;KACZ;IACD,SAAS,EAAE;QACV,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,GAAG;KACT;IACD,iBAAiB,EAAE;QAClB,IAAI,EAAE,QAAQ;KACd;IACD,OAAO,EAAE;QACR,IAAI,EAAE,QAAQ;KACd;IACD,GAAG,EAAE;QACJ,IAAI,EAAE,SAAS;KACf;IACD,MAAM,EAAE;QACP,IAAI,EAAE,SAAS;KACf;IACD,WAAW,EAAE;QACZ,IAAI,EAAE,QAAQ;KACd;IACD,gBAAgB,EAAE;QACjB,IAAI,EAAE,MAAM;KACZ;IACD,QAAQ,EAAE;QACT,IAAI,EAAE,SAAS;KACf;CACD,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA6D;IAC3F,YAAY,EAAE;QACb,IAAI,EAAE,cAAc;KACpB;CACD,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAA6D;IACpF,GAAG,iBAAiB;IACpB,YAAY,EAAE;QACb,IAAI,EAAE,cAAc;KACpB;CACD,CAAC"}
@@ -2,8 +2,8 @@ import type { Contracts } from "@mainsail/contracts";
2
2
  export declare class Serializer implements Contracts.Crypto.BlockSerializer {
3
3
  private readonly serializer;
4
4
  private readonly headerSize;
5
- totalSize(block: Contracts.Crypto.BlockDataSerializable): number;
5
+ totalSize(block: Contracts.Crypto.BlockHeaderRaw): number;
6
6
  serializeHeader(header: Contracts.Crypto.BlockHeaderRaw): Promise<Buffer>;
7
- serializeWithTransactions(block: Contracts.Crypto.BlockDataSerializable): Promise<Buffer>;
7
+ serializeWithTransactions(block: Contracts.Crypto.BlockSerializable): Promise<Buffer>;
8
8
  }
9
9
  //# sourceMappingURL=serializer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../source/serializer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIrD,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,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAQzE,yBAAyB,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAOtG"}
1
+ {"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../source/serializer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIrD,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,cAAc,GAAG,MAAM;IAInD,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAQzE,yBAAyB,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;CAOlG"}
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  };
10
10
  import { Identifiers } from "@mainsail/constants";
11
11
  import { inject, injectable } from "@mainsail/container";
12
- import { schema, schemaWithTransactions } from "./serializer-schemas.js";
12
+ import { blockHeaderSchema, blockSchema } from "./serializer-schemas.js";
13
13
  let Serializer = class Serializer {
14
14
  serializer;
15
15
  headerSize;
@@ -19,14 +19,14 @@ let Serializer = class Serializer {
19
19
  async serializeHeader(header) {
20
20
  return this.serializer.serialize(header, {
21
21
  length: this.headerSize(),
22
- schema,
22
+ schema: blockHeaderSchema,
23
23
  skip: 0,
24
24
  });
25
25
  }
26
26
  async serializeWithTransactions(block) {
27
27
  return this.serializer.serialize(block, {
28
28
  length: this.totalSize(block),
29
- schema: schemaWithTransactions,
29
+ schema: blockSchema,
30
30
  skip: 0,
31
31
  });
32
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"serializer.js","sourceRoot":"","sources":["../source/serializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGlE,IAAM,UAAU,GAAhB,MAAM,UAAU;IAEL,UAAU,CAAmC;IAG7C,UAAU,CAAgB;IAEpC,SAAS,CAAC,KAA6C;QAC7D,OAAO,IAAI,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,MAAuC;QACnE,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE;YACxC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE;YACzB,MAAM;YACN,IAAI,EAAE,CAAC;SACP,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,KAA6C;QACnF,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE;YACvC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAC7B,MAAM,EAAE,sBAAsB;YAC9B,IAAI,EAAE,CAAC;SACP,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAxBiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC;;8CACkB;AAG7C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC;;8CACP;AAL/B,UAAU;IADtB,UAAU,EAAE;GACA,UAAU,CA0BtB"}
1
+ {"version":3,"file":"serializer.js","sourceRoot":"","sources":["../source/serializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAGlE,IAAM,UAAU,GAAhB,MAAM,UAAU;IAEL,UAAU,CAAmC;IAG7C,UAAU,CAAgB;IAEpC,SAAS,CAAC,KAAsC;QACtD,OAAO,IAAI,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,MAAuC;QACnE,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE;YACxC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE;YACzB,MAAM,EAAE,iBAAiB;YACzB,IAAI,EAAE,CAAC;SACP,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,KAAyC;QAC/E,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE;YACvC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAC7B,MAAM,EAAE,WAAW;YACnB,IAAI,EAAE,CAAC;SACP,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAxBiB;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC;;8CACkB;AAG7C;IADhB,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC;;8CACP;AAL/B,UAAU;IADtB,UAAU,EAAE;GACA,UAAU,CA0BtB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mainsail/crypto-block",
3
- "version": "0.0.1-evm.43",
3
+ "version": "0.0.1-evm.44",
4
4
  "description": "Block utilities for the Mainsail blockchain",
5
5
  "license": "GPL-3.0-only",
6
6
  "contributors": [],
@@ -12,11 +12,12 @@
12
12
  ],
13
13
  "dependencies": {
14
14
  "ajv": "8.17.1",
15
- "@mainsail/constants": "0.0.1-evm.43",
16
- "@mainsail/container": "0.0.1-evm.43",
17
- "@mainsail/exceptions": "0.0.1-evm.43",
18
- "@mainsail/utils": "0.0.1-evm.43",
19
- "@mainsail/kernel": "0.0.1-evm.43"
15
+ "@mainsail/constants": "0.0.1-evm.44",
16
+ "@mainsail/crypto-transaction": "0.0.1-evm.44",
17
+ "@mainsail/container": "0.0.1-evm.44",
18
+ "@mainsail/exceptions": "0.0.1-evm.44",
19
+ "@mainsail/kernel": "0.0.1-evm.44",
20
+ "@mainsail/utils": "0.0.1-evm.44"
20
21
  },
21
22
  "devDependencies": {
22
23
  "@types/lodash.clone": "4.5.9",
@@ -24,19 +25,20 @@
24
25
  "lodash.clone": "4.5.0",
25
26
  "lodash.clonedeep": "4.5.0",
26
27
  "uvu": "0.5.6",
27
- "@mainsail/contracts": "0.0.1-evm.43",
28
- "@mainsail/crypto-address-base58": "0.0.1-evm.43",
29
- "@mainsail/crypto-address-keccak256": "0.0.1-evm.43",
30
- "@mainsail/crypto-consensus-bls12-381": "0.0.1-evm.43",
31
- "@mainsail/crypto-config": "0.0.1-evm.43",
32
- "@mainsail/crypto-hash-bcrypto": "0.0.1-evm.43",
33
- "@mainsail/crypto-transaction": "0.0.1-evm.43",
34
- "@mainsail/crypto-key-pair-ecdsa": "0.0.1-evm.43",
35
- "@mainsail/crypto-signature-ecdsa": "0.0.1-evm.43",
36
- "@mainsail/crypto-wif": "0.0.1-evm.43",
37
- "@mainsail/crypto-validation": "0.0.1-evm.43",
38
- "@mainsail/serializer": "0.0.1-evm.43",
39
- "@mainsail/validation": "0.0.1-evm.43"
28
+ "@mainsail/crypto-address-base58": "0.0.1-evm.44",
29
+ "@mainsail/crypto-address-keccak256": "0.0.1-evm.44",
30
+ "@mainsail/crypto-config": "0.0.1-evm.44",
31
+ "@mainsail/crypto-hash-bcrypto": "0.0.1-evm.44",
32
+ "@mainsail/crypto-key-pair-ecdsa": "0.0.1-evm.44",
33
+ "@mainsail/crypto-key-pair-bls12-381": "0.0.1-evm.44",
34
+ "@mainsail/crypto-signature-bls12-381": "0.0.1-evm.44",
35
+ "@mainsail/crypto-wif": "0.0.1-evm.44",
36
+ "@mainsail/contracts": "0.0.1-evm.44",
37
+ "@mainsail/crypto-signature-ecdsa": "0.0.1-evm.44",
38
+ "@mainsail/crypto-validation": "0.0.1-evm.44",
39
+ "@mainsail/test-runner": "0.0.1-evm.44",
40
+ "@mainsail/validation": "0.0.1-evm.44",
41
+ "@mainsail/serializer": "0.0.1-evm.44"
40
42
  },
41
43
  "engines": {
42
44
  "node": ">=20.x"
@@ -47,6 +49,7 @@
47
49
  "release": "pnpm publish --access public",
48
50
  "test": "pnpm run uvu source .test.ts",
49
51
  "test:coverage": "c8 -r=text -r=lcov --all pnpm run test",
52
+ "test:coverage:file": "c8 -r=text -r=lcov --all pnpm run test:file",
50
53
  "test:coverage:html": "c8 -r html --all pnpm run test",
51
54
  "test:file": "pnpm run uvu source",
52
55
  "uvu": "tsx --tsconfig ../../tsconfig.test.json ./node_modules/uvu/bin.js"