Merge branch 'develop' into refactor/crypto-block/remove-amount

sebastijankuzner · sebastijankuzner · commit 2a7af853eec9 · 2025-06-19T16:36:21.000+02:00
diff --git a/packages/api-development/source/controllers/node.ts b/packages/api-development/source/controllers/node.ts
@@ -30,7 +30,7 @@ export class NodeController extends Controller {
 
 		return {
 			data: {
-				constants: this.configuration.getMilestone(this.stateStore.getHeight()),
+				constants: this.configuration.getMilestone(this.stateStore.getBlockNumber()),
 				core: {
 					version: this.app.version(),
 				},
diff --git a/packages/api-development/source/controllers/round.ts b/packages/api-development/source/controllers/round.ts
@@ -23,11 +23,11 @@ export class RoundController extends Controller {
 			(_, index) => roundValidators[this.proposerCalculator.getValidatorIndex(index)],
 		);
 
-		const height = this.stateStore.getHeight();
+		const blockNumber = this.stateStore.getBlockNumber();
 
 		return {
-			height,
-			...this.roundCalculator.calculateRound(height),
+			blockNumber,
+			...this.roundCalculator.calculateRound(blockNumber),
 			// Map the round validator set (static, vote-weighted, etc.) to actual proposal order
 			validators: orderedValidators.map((validator) => ({
 				// rank: validator.getVoteBalance().toFixed(),
diff --git a/packages/api-evm/source/actions/eth-block-number.test.ts b/packages/api-evm/source/actions/eth-block-number.test.ts
@@ -14,7 +14,7 @@ describe<{
 
 	beforeEach(async (context) => {
 		context.store = {
-			getHeight() {
+			getBlockNumber() {
 				return height;
 			},
 		};
diff --git a/packages/api-evm/source/actions/eth-block-number.ts b/packages/api-evm/source/actions/eth-block-number.ts
@@ -15,6 +15,6 @@ export class EthBlockNumberAction implements Contracts.Api.RPC.Action {
 	};
 
 	public async handle(parameters: []): Promise<string> {
-		return `0x${this.stateStore.getHeight().toString(16)}`;
+		return `0x${this.stateStore.getBlockNumber().toString(16)}`;
 	}
 }
diff --git a/packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts b/packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts
@@ -18,7 +18,7 @@ export class EthGetUncleByBlockNumberAndIndex implements Contracts.Api.RPC.Actio
 	};
 
 	public async handle(parameters: [string]): Promise<null> {
-		if (this.stateStore.getHeight() < Number(parameters[0])) {
+		if (this.stateStore.getBlockNumber() < Number(parameters[0])) {
 			throw new Exceptions.RpcError("Block not found");
 		}
 
diff --git a/packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts b/packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts
@@ -18,7 +18,7 @@ export class EthGetUncleCountByBlockNumber implements Contracts.Api.RPC.Action {
 	};
 
 	public async handle(parameters: [string]): Promise<string> {
-		if (this.stateStore.getHeight() < Number(parameters[0])) {
+		if (this.stateStore.getBlockNumber() < Number(parameters[0])) {
 			throw new Exceptions.RpcError("Block not found");
 		}
 
diff --git a/packages/api-evm/source/utils/resolve-block-tag.ts b/packages/api-evm/source/utils/resolve-block-tag.ts
@@ -12,7 +12,7 @@ export const resolveBlockTag = async (
 		case "finalized":
 		case "latest":
 		case "safe": {
-			return stateStore.getHeight();
+			return stateStore.getBlockNumber();
 		}
 		default: {
 			throw new Error("invalid blockTag:" + tag);
diff --git a/packages/api-evm/source/validation/keywords.ts b/packages/api-evm/source/validation/keywords.ts
@@ -3,7 +3,7 @@ import { FuncKeywordDefinition } from "ajv";
 
 export const makeKeywords = (stateStore: Contracts.State.Store) => {
 	const currentHeight: FuncKeywordDefinition = {
-		compile: (schema) => (data) => Number(data) === stateStore.getHeight(),
+		compile: (schema) => (data) => Number(data) === stateStore.getBlockNumber(),
 		errors: false,
 		keyword: "currentHeightHex",
 		metaSchema: {
diff --git 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/api-transaction-pool/source/controllers/configuration.ts b/packages/api-transaction-pool/source/controllers/configuration.ts
@@ -16,10 +16,10 @@ export class ConfigurationController extends AbstractController {
 	public async configuration(request: Hapi.Request) {
 		return {
 			data: {
+				blockNumber: this.stateStore.getBlockNumber(),
 				core: {
 					version: this.app.version(),
 				},
-				height: this.stateStore.getHeight(),
 				transactionPool: {
 					maxTransactionAge: this.pluginConfiguration.get("maxTransactionAge"),
 					maxTransactionBytes: this.pluginConfiguration.get("maxTransactionBytes"),
diff --git a/packages/bootstrap/source/bootstrapper.ts b/packages/bootstrap/source/bootstrapper.ts
@@ -69,8 +69,8 @@ export class Bootstrapper {
 		this.state.setBootstrap(false);
 
 		this.validatorRepository.printLoadedValidators();
-		await this.txPoolWorker.start(this.stateStore.getHeight());
-		await this.evmWorker.start(this.stateStore.getHeight());
+		await this.txPoolWorker.start(this.stateStore.getBlockNumber());
+		await this.evmWorker.start(this.stateStore.getBlockNumber());
 
 		void this.runConsensus();
 
diff --git 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
@@ -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
@@ -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/consensus/source/consensus.test.ts b/packages/consensus/source/consensus.test.ts
@@ -36,7 +36,7 @@ describe<Context>("Consensus", ({ it, beforeEach, assert, stub, spy, clock, each
 
 		context.state = {
 			getLastBlock: () => {},
-			getHeight: () => 1,
+			getBlockNumber: () => 1,
 		};
 
 		context.cryptoConfiguration = {
diff --git 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/contracts/source/contracts/state/store.ts b/packages/contracts/source/contracts/state/store.ts
@@ -7,8 +7,8 @@ export interface Store extends CommitHandler {
 	getLastBlock(): Block;
 	setLastBlock(block: Block): void;
 
-	setHeight(height: number): void;
-	getHeight(): number;
+	setBlockNumber(blockNumber: number): void;
+	getBlockNumber(): number;
 
 	setTotalRound(totalRound: number): void;
 	getTotalRound(): number;
diff --git a/packages/core/bin/config/devnet/core/crypto.json b/packages/core/bin/config/devnet/core/crypto.json
@@ -2575,7 +2575,6 @@
 			"block": {
 				"maxGasLimit": 10000000,
 				"maxPayload": 2097152,
-				"maxTransactions": 150,
 				"version": 1
 			},
 			"epoch": "2025-06-18T00:00:00.000Z",
diff --git 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,
diff --git a/packages/evm-api-worker/source/handlers/commit.ts b/packages/evm-api-worker/source/handlers/commit.ts
@@ -9,7 +9,7 @@ export class CommitHandler {
 	@inject(Identifiers.Services.Log.Service)
 	protected readonly logger!: Contracts.Kernel.Logger;
 
-	public async handle(height: number): Promise<void> {
-		this.stateStore.setHeight(height);
+	public async handle(blockNumber: number): Promise<void> {
+		this.stateStore.setBlockNumber(blockNumber);
 	}
 }
diff --git a/packages/evm-api-worker/source/handlers/start.ts b/packages/evm-api-worker/source/handlers/start.ts
@@ -14,8 +14,8 @@ export class StartHandler {
 	@tagged("plugin", "api-evm")
 	private readonly configuration!: Providers.PluginConfiguration;
 
-	public async handle(height: number): Promise<void> {
-		this.store.setHeight(height);
+	public async handle(blockNumber: number): Promise<void> {
+		this.store.setBlockNumber(blockNumber);
 
 		if (this.configuration.get("server.http.enabled")) {
 			await this.app.get<Contracts.Api.Server>(Identifiers.Evm.API.HTTP).boot();
diff --git 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/packages/p2p/source/downloader/block-downloader.ts b/packages/p2p/source/downloader/block-downloader.ts
@@ -93,7 +93,7 @@ export class BlockDownloader implements Contracts.P2P.Downloader {
 	#getLastRequestedBlockNumber(): number {
 		const latestJob = this.#downloadJobs.at(-1);
 		if (latestJob === undefined) {
-			return this.stateStore.getHeight();
+			return this.stateStore.getBlockNumber();
 		}
 
 		return latestJob.blockNumberTo;
@@ -210,7 +210,7 @@ export class BlockDownloader implements Contracts.P2P.Downloader {
 	}
 
 	#handleMissingBlocks(job: DownloadJob): void {
-		const configuration = this.configuration.getMilestone(this.stateStore.getHeight() + 1);
+		const configuration = this.configuration.getMilestone(this.stateStore.getBlockNumber() + 1);
 
 		const size = job.blocks.reduce((size, block) => size + block.length, 0);
 
@@ -233,13 +233,13 @@ export class BlockDownloader implements Contracts.P2P.Downloader {
 		}
 
 		const isFirstJob = index === 0;
-		const blockNumberFrom = isFirstJob ? this.stateStore.getHeight() + 1 : job.blockNumberFrom;
+		const blockNumberFrom = isFirstJob ? this.stateStore.getBlockNumber() + 1 : job.blockNumberFrom;
 
 		// Skip if next job is higher than current block number
 		if (
 			isFirstJob &&
 			this.#downloadJobs.length > 1 &&
-			this.#downloadJobs[1].blockNumberFrom > this.stateStore.getHeight()
+			this.#downloadJobs[1].blockNumberFrom > this.stateStore.getBlockNumber()
 		) {
 			this.#downloadJobs.shift();
 			return;
diff --git a/packages/p2p/source/downloader/message-downloader.ts b/packages/p2p/source/downloader/message-downloader.ts
@@ -70,8 +70,8 @@ export class MessageDownloader implements Contracts.P2P.Downloader {
 	public initialize(): void {
 		this.events.listen(Events.BlockEvent.Applied, {
 			handle: () => {
-				this.#downloadsByBlockNumber.delete(this.stateStore.getHeight());
-				this.#fullDownloadsByBlockNumber.delete(this.stateStore.getHeight());
+				this.#downloadsByBlockNumber.delete(this.stateStore.getBlockNumber());
+				this.#fullDownloadsByBlockNumber.delete(this.stateStore.getBlockNumber());
 			},
 		});
 	}
diff --git a/packages/p2p/source/socket-server/controllers/get-api-nodes.test.ts b/packages/p2p/source/socket-server/controllers/get-api-nodes.test.ts
@@ -11,7 +11,7 @@ describe<{
 	const database = { findCommitBuffers: () => {} };
 	const store = {
 		getLastDownloadedBlock: () => {},
-		getHeight: () => {},
+		getBlockNumber: () => {},
 	};
 
 	beforeEach((context) => {
diff --git a/packages/p2p/source/socket-server/controllers/get-blocks.test.ts b/packages/p2p/source/socket-server/controllers/get-blocks.test.ts
@@ -11,7 +11,7 @@ describe<{
 	const database = { findCommitBuffers: () => {} };
 	const store = {
 		getLastDownloadedBlock: () => {},
-		getHeight: () => {},
+		getBlockNumber: () => {},
 	};
 
 	beforeEach((context) => {
diff --git a/packages/p2p/source/socket-server/controllers/get-blocks.ts b/packages/p2p/source/socket-server/controllers/get-blocks.ts
@@ -24,7 +24,7 @@ export class GetBlocksController implements Contracts.P2P.Controller {
 		const requestBlockNumber: number = request.payload.fromBlockNumber;
 		const requestBlockLimit: number = request.payload.limit;
 
-		const lastBlockNumber: number = this.stateStore.getHeight();
+		const lastBlockNumber: number = this.stateStore.getBlockNumber();
 		if (requestBlockNumber > lastBlockNumber) {
 			return { blocks: [] };
 		}
diff --git a/packages/p2p/source/socket-server/utils/get-headers.test.ts b/packages/p2p/source/socket-server/utils/get-headers.test.ts
@@ -7,7 +7,7 @@ describe("getHeaders", ({ it, assert }) => {
 	let port = 4007;
 	const version = "3.0.9";
 	const height = 387;
-	const store = { getHeight: () => height, isStarted: () => true };
+	const store = { getBlockNumber: () => height, isStarted: () => true };
 	const appGet = {
 		[Identifiers.State.Store]: store,
 	};
diff --git a/packages/p2p/source/socket-server/utils/get-headers.ts b/packages/p2p/source/socket-server/utils/get-headers.ts
@@ -16,7 +16,7 @@ export const getHeaders = (app: Contracts.Kernel.Application) => {
 		version: app.version(),
 	};
 
-	headers.height = app.get<Contracts.State.Store>(Identifiers.State.Store).getHeight();
+	headers.height = app.get<Contracts.State.Store>(Identifiers.State.Store).getBlockNumber();
 
 	return headers;
 };
diff --git a/packages/processor/source/verifiers/transaction-length-verifier.ts b/packages/processor/source/verifiers/transaction-length-verifier.ts
@@ -6,24 +6,11 @@ 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<void> {
 		const block = unit.getBlock();
 
 		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);
-		}
 	}
 }
diff --git a/packages/state/source/store.test.ts b/packages/state/source/store.test.ts
@@ -38,7 +38,7 @@ describe<{
 	});
 
 	it("#initialize - should set height and totalRound", ({ store }) => {
-		assert.equal(store.getHeight(), 0);
+		assert.equal(store.getBlockNumber(), 0);
 		assert.equal(store.getTotalRound(), 0);
 	});
 
diff --git a/packages/state/source/store.ts b/packages/state/source/store.ts
diff --git a/packages/test-framework/source/utils/generic.ts b/packages/test-framework/source/utils/generic.ts
diff --git a/packages/test-transaction-builders/source/utilities.ts b/packages/test-transaction-builders/source/utilities.ts
diff --git a/packages/transaction-pool-service/source/service.ts b/packages/transaction-pool-service/source/service.ts
diff --git a/packages/transaction-pool-worker/source/handlers/commit.ts b/packages/transaction-pool-worker/source/handlers/commit.ts
diff --git a/packages/transaction-pool-worker/source/handlers/get-transactions.ts b/packages/transaction-pool-worker/source/handlers/get-transactions.ts
diff --git a/packages/transaction-pool-worker/source/handlers/start.ts b/packages/transaction-pool-worker/source/handlers/start.ts
diff --git a/tests/functional/consensus/config/crypto.json b/tests/functional/consensus/config/crypto.json
diff --git a/tests/functional/transaction-pool-api/source/utilities.ts b/tests/functional/transaction-pool-api/source/utilities.ts

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ export class EthBlockNumberAction implements Contracts.Api.RPC.Action {`
`15`	`15`	`};`
`16`	`16`
`17`	`17`	`public async handle(parameters: []): Promise<string> {`
`18`		- return `0x${this.stateStore.getHeight().toString(16)}`;
	`18`	+ return `0x${this.stateStore.getBlockNumber().toString(16)}`;
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export class EthGetUncleByBlockNumberAndIndex implements Contracts.Api.RPC.Actio`
`18`	`18`	`};`
`19`	`19`
`20`	`20`	`public async handle(parameters: [string]): Promise<null> {`
`21`		`- if (this.stateStore.getHeight() < Number(parameters[0])) {`
	`21`	`+ if (this.stateStore.getBlockNumber() < Number(parameters[0])) {`
`22`	`22`	`throw new Exceptions.RpcError("Block not found");`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export const resolveBlockTag = async (`
`12`	`12`	`case "finalized":`
`13`	`13`	`case "latest":`
`14`	`14`	`case "safe": {`
`15`		`- return stateStore.getHeight();`
	`15`	`+ return stateStore.getBlockNumber();`
`16`	`16`	`}`
`17`	`17`	`default: {`
`18`	`18`	`throw new Error("invalid blockTag:" + tag);`