Skip to content

Commit 58ba386

Browse files
refactor: remove maxTransactions milestone (#984)
* Remove maxTransactions in verifier * Ignore in get transactions * Remove injected configuration * Remove from milestones and tests * Remove from crypto.json
1 parent 6a4ae74 commit 58ba386

24 files changed

Lines changed: 5 additions & 43 deletions

File tree

packages/api-http/test/fixtures/node_configuration.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"block": {
44
"version": 1,
55
"maxPayload": 2097152,
6-
"maxGasLimit": 10000000,
7-
"maxTransactions": 150
6+
"maxGasLimit": 10000000
87
},
98
"epoch": "2024-05-31T00:00:00.000Z",
109
"evmSpec": "Shanghai",

packages/configuration-generator/source/generators/genesis-block.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe<{
3333
milestones: [
3434
{
3535
address: { bech32m: "ark" },
36-
block: { maxGasLimit: 30_000_000, maxPayload: 2_097_152, maxTransactions: 150, version: 1 },
36+
block: { maxGasLimit: 30_000_000, maxPayload: 2_097_152, version: 1 },
3737
blockTime: 8000,
3838
evmSpec: Contracts.Evm.SpecId.SHANGHAI,
3939
// @ts-ignore

packages/configuration-generator/source/generators/milestones.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ describe<{
3737
block: {
3838
maxGasLimit: 1000,
3939
maxPayload: 2000,
40-
maxTransactions: 100,
4140
version: 1,
4241
},
4342
epoch: date.toISOString().slice(0, 11) + "00:00:00.000Z",

packages/configuration-generator/source/generators/milestones.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export class MilestonesGenerator {
1111
block: {
1212
maxGasLimit: options.maxBlockGasLimit,
1313
maxPayload: options.maxBlockPayload,
14-
maxTransactions: options.maxTxPerBlock,
1514
version: 1,
1615
},
1716
epoch: options.epoch.toISOString().slice(0, 11) + "00:00:00.000Z",

packages/contracts/source/contracts/crypto/networks.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export type Network = {
3030
export type MilestoneBlock = {
3131
maxPayload: number;
3232
maxGasLimit: number;
33-
maxTransactions: number;
3433
version: number;
3534
};
3635
export type MilestoneSatoshi = {

packages/core/bin/config/devnet/core/crypto.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,7 +2576,6 @@
25762576
"block": {
25772577
"maxGasLimit": 10000000,
25782578
"maxPayload": 2097152,
2579-
"maxTransactions": 150,
25802579
"version": 1
25812580
},
25822581
"epoch": "2025-06-11T00:00:00.000Z",

packages/crypto-config/source/configuration.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe<{
3535
assert.equal(configManager.getMilestones(), [
3636
{
3737
roundValidators: 0,
38-
block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, maxTransactions: 150, version: 1 },
38+
block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, version: 1 },
3939
gas: cryptoJson.milestones[0].gas,
4040
epoch: cryptoJson.milestones[0].epoch,
4141
evmSpec: cryptoJson.milestones[0].evmSpec,
@@ -53,7 +53,7 @@ describe<{
5353
},
5454
{
5555
roundValidators: 53,
56-
block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, maxTransactions: 150, version: 1 },
56+
block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, version: 1 },
5757
gas: cryptoJson.milestones[0].gas,
5858
epoch: cryptoJson.milestones[0].epoch,
5959
evmSpec: cryptoJson.milestones[0].evmSpec,
@@ -71,7 +71,7 @@ describe<{
7171
},
7272
{
7373
roundValidators: 53,
74-
block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, maxTransactions: 150, version: 1 },
74+
block: { maxPayload: 2_097_152, maxGasLimit: 10_000_000, version: 1 },
7575
gas: cryptoJson.milestones[0].gas,
7676
epoch: cryptoJson.milestones[0].epoch,
7777
evmSpec: cryptoJson.milestones[0].evmSpec,

packages/kernel/test/stubs/config-with-crypto/crypto.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,6 @@
18241824
},
18251825
"block": {
18261826
"maxPayload": 2097152,
1827-
"maxTransactions": 150,
18281827
"version": 1
18291828
},
18301829
"blockTime": 8000,
@@ -1844,7 +1843,6 @@
18441843
},
18451844
"block": {
18461845
"maxPayload": 2097152,
1847-
"maxTransactions": 150,
18481846
"version": 1
18491847
},
18501848
"blockTime": 8000,

packages/processor/source/verifiers/transaction-length-verifier.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,11 @@ export class TransactionLengthVerifier implements Contracts.Processor.Handler {
66
@inject(Identifiers.Application.Instance)
77
protected readonly app!: Contracts.Kernel.Application;
88

9-
@inject(Identifiers.Cryptography.Configuration)
10-
private readonly configuration!: Contracts.Crypto.Configuration;
11-
129
public async execute(unit: Contracts.Processor.ProcessableUnit): Promise<void> {
1310
const block = unit.getBlock();
1411

1512
if (block.transactions.length !== block.data.transactionsCount) {
1613
throw new Exceptions.InvalidTransactionsLength(block);
1714
}
18-
19-
if (block.data.number === this.configuration.getGenesisHeight()) {
20-
return;
21-
}
22-
23-
const maxTransactions = this.configuration.getMilestone().block.maxTransactions;
24-
25-
if (block.data.transactionsCount > maxTransactions) {
26-
throw new Exceptions.MaxTransactionsExceeded(block);
27-
}
2815
}
2916
}

packages/transaction-pool-worker/source/handlers/get-transactions.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ export class GetTransactionsHandler {
1818

1919
const candidateTransactions: Contracts.Crypto.Transaction[] = [];
2020
for (const transaction of await this.poolQuery.getFromHighestPriority().all()) {
21-
if (candidateTransactions.length === milestone.block.maxTransactions) {
22-
break;
23-
}
24-
2521
if (bytesLeft - 4 - transaction.serialized.length < 0) {
2622
break;
2723
}

0 commit comments

Comments
 (0)