refactor(state): rename height to blockNumber

packages/api-development/source/controllers/node.ts

@@ -30,7 +30,7 @@
 
 		return {
 			data: {
-				constants: this.configuration.getMilestone(this.stateStore.getHeight()),
+				constants: this.configuration.getMilestone(this.stateStore.getBlockNumber()),
 				core: {
 					version: this.app.version(),
 				},

packages/api-development/source/controllers/round.ts

@@ -23,11 +23,11 @@
 			(_, 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(),

packages/api-evm/source/actions/eth-block-number.test.ts

@@ -14,7 +14,7 @@ describe<{
 
 	beforeEach(async (context) => {
 		context.store = {
-			getHeight() {
+			getBlockNumber() {
 				return height;
 			},
 		};

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)}`;
 	}
 }

packages/api-evm/source/actions/eth-get-uncle-by-block-number-and-index.ts

@@ -18,7 +18,7 @@
 	};
 
 	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");
 		}
 

packages/api-evm/source/actions/eth-get-uncle-count-by-block-number.ts

@@ -18,7 +18,7 @@
 	};
 
 	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");
 		}
 

packages/api-evm/source/utils/resolve-block-tag.ts

@@ -12,7 +12,7 @@
 		case "finalized":
 		case "latest":
 		case "safe": {
-			return stateStore.getHeight();
+			return stateStore.getBlockNumber();
 		}
 		default: {
 			throw new Error("invalid blockTag:" + tag);

packages/api-evm/source/validation/keywords.ts

@@ -3,7 +3,7 @@
 
 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: {

packages/api-transaction-pool/source/controllers/configuration.ts

@@ -16,10 +16,10 @@
 	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"),

packages/bootstrap/source/bootstrapper.ts

@@ -69,8 +69,8 @@
 		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();
 

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 = {

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;

packages/evm-api-worker/source/handlers/commit.ts

@@ -9,7 +9,7 @@
 	@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);
 	}
 }

packages/evm-api-worker/source/handlers/start.ts

@@ -14,8 +14,8 @@
 	@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();

packages/p2p/source/downloader/block-downloader.ts

@@ -93,7 +93,7 @@
 	#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 @@
 	}
 
 	#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 @@
 		}
 
 		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;

packages/p2p/source/downloader/message-downloader.ts

@@ -70,8 +70,8 @@
 	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());
 			},
 		});
 	}

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) => {

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) => {

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: [] };
 		}

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,
 	};

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;
 };

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);
 	});
 

packages/state/source/store.ts

@@ -15,7 +15,7 @@ export class Store implements Contracts.State.Store {
 
 	#genesisCommit?: Contracts.Crypto.Commit;
 	#lastBlock?: Contracts.Crypto.Block;
-	#height = 0;
+	#blockNumber = 0;
 	#totalRound = 0;
 
 	public setGenesisCommit(block: Contracts.Crypto.Commit): void {
@@ -30,27 +30,27 @@ export class Store implements Contracts.State.Store {
 
 	public setLastBlock(block: Contracts.Crypto.Block): void {
 		this.#lastBlock = block;
-		this.setHeight(block.data.number);
+		this.setBlockNumber(block.data.number);
 	}
 
 	public getLastBlock(): Contracts.Crypto.Block {
 		assert.defined(this.#lastBlock);
 		return this.#lastBlock;
 	}
 
-	// Set height is used on workers, because last block is not transferred
-	public setHeight(height: number): void {
-		this.#height = height;
-		this.configuration.setHeight(height + 1);
+	// Set blockNumber is used on workers, because last block is not transferred
+	public setBlockNumber(blockNumber: number): void {
+		this.#blockNumber = blockNumber;
+		this.configuration.setHeight(blockNumber + 1);
 
 		if (this.configuration.isNewMilestone()) {
 			this.logger.notice(`Milestone change: ${JSON.stringify(this.configuration.getMilestoneDiff())}`);
 			void this.events.dispatch(Events.CryptoEvent.MilestoneChanged);
 		}
 	}
 
-	public getHeight(): number {
-		return this.#height;
+	public getBlockNumber(): number {
+		return this.#blockNumber;
 	}
 
 	public setTotalRound(totalRound: number): void {

packages/test-framework/source/utils/generic.ts

@@ -13,7 +13,7 @@
 	});
 
 export const getLastHeight = (app: Contracts.Kernel.Application): number =>
-	app.get<Contracts.State.Store>(Identifiers.State.Store).getHeight();
+	app.get<Contracts.State.Store>(Identifiers.State.Store).getBlockNumber();
 
 export const getWalletNonce = async (app: Contracts.Kernel.Application, publicKey: string): Promise<BigNumber> =>
 	BigNumber.ZERO;

packages/test-transaction-builders/source/utilities.ts

@@ -163,13 +163,13 @@
 export const waitBlock = async (sandbox: Sandbox, count: number = 1) => {
 	const state = sandbox.app.get<Contracts.State.Store>(Identifiers.State.Store);
 
-	let currentHeight = state.getHeight();
-	const targetHeight = currentHeight + count;
+	let currentBlockNumber = state.getBlockNumber();
+	const targetBlockNumber = currentBlockNumber + count;
 
 	do {
 		await sleep(200);
-		currentHeight = state.getHeight();
-	} while (currentHeight < targetHeight);
+		currentBlockNumber = state.getBlockNumber();
+	} while (currentBlockNumber < targetBlockNumber);
 };
 
 export const getRandomFundedWallet = async (

packages/transaction-pool-service/source/service.ts

@@ -84,7 +84,7 @@
 			}
 
 			this.storage.addTransaction({
-				blockNumber: this.stateStore.getHeight(),
+				blockNumber: this.stateStore.getBlockNumber(),
 				hash: transaction.hash,
 				senderPublicKey: transaction.data.senderPublicKey,
 				serialized: transaction.serialized,
@@ -121,7 +121,7 @@
 			let previouslyStoredFailures = 0;
 
 			const maxTransactionAge: number = this.pluginConfiguration.getRequired<number>("maxTransactionAge");
-			const lastBlockNumber: number = this.stateStore.getHeight();
+			const lastBlockNumber: number = this.stateStore.getBlockNumber();
 			const expiredBlockNumber: number = lastBlockNumber - maxTransactionAge;
 
 			for (const { blockNumber, hash, serialized } of this.storage.getAllTransactions()) {
@@ -179,7 +179,7 @@
 
 	async #removeOldTransactions(): Promise<void> {
 		const maxTransactionAge: number = this.pluginConfiguration.getRequired<number>("maxTransactionAge");
-		const lastBlockNumber: number = this.stateStore.getHeight();
+		const lastBlockNumber: number = this.stateStore.getBlockNumber();
 		const expiredBlockNumber: number = lastBlockNumber - maxTransactionAge;
 
 		for (const { senderPublicKey, hash } of this.storage.getOldTransactions(expiredBlockNumber)) {

packages/transaction-pool-worker/source/handlers/commit.ts

@@ -15,9 +15,9 @@
 	@inject(Identifiers.Services.Log.Service)
 	protected readonly logger!: Contracts.Kernel.Logger;
 
-	public async handle(height: number, sendersAddresses: string[]): Promise<void> {
+	public async handle(blockNumber: number, sendersAddresses: string[]): Promise<void> {
 		try {
-			this.stateStore.setHeight(height);
+			this.stateStore.setBlockNumber(blockNumber);
 
 			if (this.configuration.isNewMilestone()) {
 				void this.transactionPoolService.reAddTransactions();

packages/transaction-pool-worker/source/handlers/start.ts

@@ -17,8 +17,8 @@
 	@tagged("plugin", "api-transaction-pool")
 	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);
 		await this.transactionPoolService.reAddTransactions();
 
 		if (this.configuration.get("server.http.enabled")) {