From 9861994db78223bcc18b3fee4cc08b4e7d9739c6 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 18 Jun 2025 14:13:25 +0200 Subject: [PATCH 1/5] Remove maxTransactions in verifier --- .../source/verifiers/transaction-length-verifier.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/processor/source/verifiers/transaction-length-verifier.ts b/packages/processor/source/verifiers/transaction-length-verifier.ts index 42c5a768ae..757b9a306f 100644 --- a/packages/processor/source/verifiers/transaction-length-verifier.ts +++ b/packages/processor/source/verifiers/transaction-length-verifier.ts @@ -15,15 +15,5 @@ export class TransactionLengthVerifier implements Contracts.Processor.Handler { if (block.transactions.length !== block.data.transactionsCount) { throw new Exceptions.InvalidTransactionsLength(block); } - - if (block.data.number === this.configuration.getGenesisHeight()) { - return; - } - - const maxTransactions = this.configuration.getMilestone().block.maxTransactions; - - if (block.data.transactionsCount > maxTransactions) { - throw new Exceptions.MaxTransactionsExceeded(block); - } } } From 935cbb26f0757593013850ea724c7d165b5c1abb Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 18 Jun 2025 14:15:12 +0200 Subject: [PATCH 2/5] Ignore in get transactions --- .../source/handlers/get-transactions.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/transaction-pool-worker/source/handlers/get-transactions.ts b/packages/transaction-pool-worker/source/handlers/get-transactions.ts index 2e472c05bd..7e7515e4b6 100644 --- a/packages/transaction-pool-worker/source/handlers/get-transactions.ts +++ b/packages/transaction-pool-worker/source/handlers/get-transactions.ts @@ -18,10 +18,6 @@ export class GetTransactionsHandler { const candidateTransactions: Contracts.Crypto.Transaction[] = []; for (const transaction of await this.poolQuery.getFromHighestPriority().all()) { - if (candidateTransactions.length === milestone.block.maxTransactions) { - break; - } - if (bytesLeft - 4 - transaction.serialized.length < 0) { break; } From 19724777aaa2ce813ac4c257c1ee83e432e65f3f Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 18 Jun 2025 14:15:43 +0200 Subject: [PATCH 3/5] Remove injected configuration --- .../processor/source/verifiers/transaction-length-verifier.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/processor/source/verifiers/transaction-length-verifier.ts b/packages/processor/source/verifiers/transaction-length-verifier.ts index 757b9a306f..d735194650 100644 --- a/packages/processor/source/verifiers/transaction-length-verifier.ts +++ b/packages/processor/source/verifiers/transaction-length-verifier.ts @@ -6,9 +6,6 @@ export class TransactionLengthVerifier implements Contracts.Processor.Handler { @inject(Identifiers.Application.Instance) protected readonly app!: Contracts.Kernel.Application; - @inject(Identifiers.Cryptography.Configuration) - private readonly configuration!: Contracts.Crypto.Configuration; - public async execute(unit: Contracts.Processor.ProcessableUnit): Promise { const block = unit.getBlock(); From 3e2588b92fb2a4ad97099576890ef0d1234e0e4a Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 18 Jun 2025 14:20:24 +0200 Subject: [PATCH 4/5] Remove from milestones and tests --- .../source/generators/genesis-block.test.ts | 2 +- .../source/generators/milestones.test.ts | 1 - .../configuration-generator/source/generators/milestones.ts | 1 - packages/contracts/source/contracts/crypto/networks.ts | 1 - packages/crypto-config/source/configuration.test.ts | 6 +++--- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/configuration-generator/source/generators/genesis-block.test.ts b/packages/configuration-generator/source/generators/genesis-block.test.ts index aed8c163a7..ea4a630837 100644 --- a/packages/configuration-generator/source/generators/genesis-block.test.ts +++ b/packages/configuration-generator/source/generators/genesis-block.test.ts @@ -33,7 +33,7 @@ describe<{ milestones: [ { address: { bech32m: "ark" }, - block: { maxGasLimit: 30_000_000, maxPayload: 2_097_152, maxTransactions: 150, version: 1 }, + block: { maxGasLimit: 30_000_000, maxPayload: 2_097_152, version: 1 }, blockTime: 8000, evmSpec: Contracts.Evm.SpecId.SHANGHAI, // @ts-ignore diff --git a/packages/configuration-generator/source/generators/milestones.test.ts b/packages/configuration-generator/source/generators/milestones.test.ts index 5cdd046879..5c7a166667 100644 --- a/packages/configuration-generator/source/generators/milestones.test.ts +++ b/packages/configuration-generator/source/generators/milestones.test.ts @@ -37,7 +37,6 @@ describe<{ block: { maxGasLimit: 1000, maxPayload: 2000, - maxTransactions: 100, version: 1, }, epoch: date.toISOString().slice(0, 11) + "00:00:00.000Z", diff --git a/packages/configuration-generator/source/generators/milestones.ts b/packages/configuration-generator/source/generators/milestones.ts index cc776d1b65..69cf4b0faf 100644 --- a/packages/configuration-generator/source/generators/milestones.ts +++ b/packages/configuration-generator/source/generators/milestones.ts @@ -11,7 +11,6 @@ export class MilestonesGenerator { block: { maxGasLimit: options.maxBlockGasLimit, maxPayload: options.maxBlockPayload, - maxTransactions: options.maxTxPerBlock, version: 1, }, epoch: options.epoch.toISOString().slice(0, 11) + "00:00:00.000Z", diff --git a/packages/contracts/source/contracts/crypto/networks.ts b/packages/contracts/source/contracts/crypto/networks.ts index 448adf5c77..751d8b7cc2 100644 --- a/packages/contracts/source/contracts/crypto/networks.ts +++ b/packages/contracts/source/contracts/crypto/networks.ts @@ -30,7 +30,6 @@ export type Network = { export type MilestoneBlock = { maxPayload: number; maxGasLimit: number; - maxTransactions: number; version: number; }; export type MilestoneSatoshi = { diff --git a/packages/crypto-config/source/configuration.test.ts b/packages/crypto-config/source/configuration.test.ts index 2cc93e8b2b..778e7fd6a1 100644 --- a/packages/crypto-config/source/configuration.test.ts +++ b/packages/crypto-config/source/configuration.test.ts @@ -35,7 +35,7 @@ describe<{ assert.equal(configManager.getMilestones(), [ { roundValidators: 0, - block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, maxTransactions: 150, version: 1 }, + block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, version: 1 }, gas: cryptoJson.milestones[0].gas, epoch: cryptoJson.milestones[0].epoch, evmSpec: cryptoJson.milestones[0].evmSpec, @@ -53,7 +53,7 @@ describe<{ }, { roundValidators: 53, - block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, maxTransactions: 150, version: 1 }, + block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, version: 1 }, gas: cryptoJson.milestones[0].gas, epoch: cryptoJson.milestones[0].epoch, evmSpec: cryptoJson.milestones[0].evmSpec, @@ -71,7 +71,7 @@ describe<{ }, { roundValidators: 53, - block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, maxTransactions: 150, version: 1 }, + block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, version: 1 }, gas: cryptoJson.milestones[0].gas, epoch: cryptoJson.milestones[0].epoch, evmSpec: cryptoJson.milestones[0].evmSpec, From 57fffde430d22e7bb06364c245bc29ec97aa4230 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Wed, 18 Jun 2025 14:21:43 +0200 Subject: [PATCH 5/5] Remove from crypto.json --- packages/api-http/test/fixtures/node_configuration.json | 3 +-- packages/core/bin/config/devnet/core/crypto.json | 1 - packages/kernel/test/stubs/config-with-crypto/crypto.json | 2 -- tests/e2e/clients/config/core/crypto.json | 1 - tests/e2e/consensus/nodes/api-node/core/crypto.json | 1 - tests/e2e/consensus/nodes/node0/core/crypto.json | 1 - tests/e2e/consensus/nodes/node1/core/crypto.json | 1 - tests/e2e/consensus/nodes/node2/core/crypto.json | 1 - tests/e2e/consensus/nodes/node3/core/crypto.json | 1 - tests/e2e/consensus/nodes/node4/core/crypto.json | 1 - tests/e2e/snapshot/nodes/node0/core/crypto.json | 1 - tests/e2e/snapshot/nodes/node1/core/crypto.json | 1 - tests/e2e/snapshot/nodes/node2/core/crypto.json | 1 - tests/e2e/snapshot/nodes/node3/core/crypto.json | 1 - tests/e2e/snapshot/nodes/node4/core/crypto.json | 1 - tests/functional/consensus/config/crypto.json | 1 - tests/functional/transaction-pool-api/paths/config/crypto.json | 1 - 17 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packages/api-http/test/fixtures/node_configuration.json b/packages/api-http/test/fixtures/node_configuration.json index a9cc479df2..b9fd0d6285 100644 --- a/packages/api-http/test/fixtures/node_configuration.json +++ b/packages/api-http/test/fixtures/node_configuration.json @@ -3,8 +3,7 @@ "block": { "version": 1, "maxPayload": 2097152, - "maxGasLimit": 10000000, - "maxTransactions": 150 + "maxGasLimit": 10000000 }, "epoch": "2024-05-31T00:00:00.000Z", "evmSpec": "Shanghai", diff --git a/packages/core/bin/config/devnet/core/crypto.json b/packages/core/bin/config/devnet/core/crypto.json index 3189290de6..7c79eac66c 100644 --- a/packages/core/bin/config/devnet/core/crypto.json +++ b/packages/core/bin/config/devnet/core/crypto.json @@ -2576,7 +2576,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/packages/kernel/test/stubs/config-with-crypto/crypto.json b/packages/kernel/test/stubs/config-with-crypto/crypto.json index 228c54b816..9b7fc0d215 100644 --- a/packages/kernel/test/stubs/config-with-crypto/crypto.json +++ b/packages/kernel/test/stubs/config-with-crypto/crypto.json @@ -1824,7 +1824,6 @@ }, "block": { "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "blockTime": 8000, @@ -1844,7 +1843,6 @@ }, "block": { "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "blockTime": 8000, diff --git a/tests/e2e/clients/config/core/crypto.json b/tests/e2e/clients/config/core/crypto.json index cdcfcf3f70..56d65f8268 100644 --- a/tests/e2e/clients/config/core/crypto.json +++ b/tests/e2e/clients/config/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/consensus/nodes/api-node/core/crypto.json b/tests/e2e/consensus/nodes/api-node/core/crypto.json index a1a98b4fc7..55eb71ae9d 100644 --- a/tests/e2e/consensus/nodes/api-node/core/crypto.json +++ b/tests/e2e/consensus/nodes/api-node/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/consensus/nodes/node0/core/crypto.json b/tests/e2e/consensus/nodes/node0/core/crypto.json index a1a98b4fc7..55eb71ae9d 100644 --- a/tests/e2e/consensus/nodes/node0/core/crypto.json +++ b/tests/e2e/consensus/nodes/node0/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/consensus/nodes/node1/core/crypto.json b/tests/e2e/consensus/nodes/node1/core/crypto.json index a1a98b4fc7..55eb71ae9d 100644 --- a/tests/e2e/consensus/nodes/node1/core/crypto.json +++ b/tests/e2e/consensus/nodes/node1/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/consensus/nodes/node2/core/crypto.json b/tests/e2e/consensus/nodes/node2/core/crypto.json index a1a98b4fc7..55eb71ae9d 100644 --- a/tests/e2e/consensus/nodes/node2/core/crypto.json +++ b/tests/e2e/consensus/nodes/node2/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/consensus/nodes/node3/core/crypto.json b/tests/e2e/consensus/nodes/node3/core/crypto.json index a1a98b4fc7..55eb71ae9d 100644 --- a/tests/e2e/consensus/nodes/node3/core/crypto.json +++ b/tests/e2e/consensus/nodes/node3/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/consensus/nodes/node4/core/crypto.json b/tests/e2e/consensus/nodes/node4/core/crypto.json index a1a98b4fc7..55eb71ae9d 100644 --- a/tests/e2e/consensus/nodes/node4/core/crypto.json +++ b/tests/e2e/consensus/nodes/node4/core/crypto.json @@ -272,7 +272,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/snapshot/nodes/node0/core/crypto.json b/tests/e2e/snapshot/nodes/node0/core/crypto.json index 06091e708b..ecfa160b1d 100644 --- a/tests/e2e/snapshot/nodes/node0/core/crypto.json +++ b/tests/e2e/snapshot/nodes/node0/core/crypto.json @@ -31,7 +31,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/snapshot/nodes/node1/core/crypto.json b/tests/e2e/snapshot/nodes/node1/core/crypto.json index 06091e708b..ecfa160b1d 100644 --- a/tests/e2e/snapshot/nodes/node1/core/crypto.json +++ b/tests/e2e/snapshot/nodes/node1/core/crypto.json @@ -31,7 +31,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/snapshot/nodes/node2/core/crypto.json b/tests/e2e/snapshot/nodes/node2/core/crypto.json index 06091e708b..ecfa160b1d 100644 --- a/tests/e2e/snapshot/nodes/node2/core/crypto.json +++ b/tests/e2e/snapshot/nodes/node2/core/crypto.json @@ -31,7 +31,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/snapshot/nodes/node3/core/crypto.json b/tests/e2e/snapshot/nodes/node3/core/crypto.json index 06091e708b..ecfa160b1d 100644 --- a/tests/e2e/snapshot/nodes/node3/core/crypto.json +++ b/tests/e2e/snapshot/nodes/node3/core/crypto.json @@ -31,7 +31,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/e2e/snapshot/nodes/node4/core/crypto.json b/tests/e2e/snapshot/nodes/node4/core/crypto.json index 06091e708b..ecfa160b1d 100644 --- a/tests/e2e/snapshot/nodes/node4/core/crypto.json +++ b/tests/e2e/snapshot/nodes/node4/core/crypto.json @@ -31,7 +31,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z", diff --git a/tests/functional/consensus/config/crypto.json b/tests/functional/consensus/config/crypto.json index a5eafcbb31..290cb2f623 100644 --- a/tests/functional/consensus/config/crypto.json +++ b/tests/functional/consensus/config/crypto.json @@ -273,7 +273,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-03-17T00:00:00.000Z", diff --git a/tests/functional/transaction-pool-api/paths/config/crypto.json b/tests/functional/transaction-pool-api/paths/config/crypto.json index fdb30ff082..95bd99b11e 100644 --- a/tests/functional/transaction-pool-api/paths/config/crypto.json +++ b/tests/functional/transaction-pool-api/paths/config/crypto.json @@ -2576,7 +2576,6 @@ "block": { "maxGasLimit": 10000000, "maxPayload": 2097152, - "maxTransactions": 150, "version": 1 }, "epoch": "2025-06-11T00:00:00.000Z",