ArkEcosystem · sebastijankuzner · Apr 23, 2024 · Feb 26, 2024 · Feb 26, 2024 · Feb 26, 2024
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -0,0 +1,78 @@
+name: CI
+
+on:
+    push:
+        branches:
+            - "main"
+            - "develop"
+    pull_request:
+        types: [ready_for_review, synchronize, opened]
+
+jobs:
+    e2e:
+        concurrency:
+            cancel-in-progress: true
+            group: ${{ github.head_ref }}-e2e-${{ matrix.name }}
+        runs-on: ubuntu-latest
+
+        timeout-minutes: 10
+
+        strategy:
+            matrix:
+                node-version: [20.x]
+                name: ["consensus"]
+
+        steps:
+            - uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.head_ref }}
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Setup pnpm
+              uses: pnpm/action-setup@v2
+              with:
+                  run_install: false
+                  version: latest
+            - name: Get pnpm store directory
+              id: pnpm-cache
+              run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+              shell: bash
+            - name: Cache pnpm modules
+              uses: actions/cache@v3
+              with:
+                  key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+                  path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+                  restore-keys: ${{ runner.os }}-pnpm-
+            - name: Cache lerna
+              uses: actions/cache@v3
+              with:
+                  key: ${{ runner.os }}-lerna
+                  path: ./.cache
+                  restore-keys: ${{ runner.os }}-lerna-
+            - name: Install dependencies
+              run: pnpm install
+            - name: Build
+              run: pnpm run build
+
+            - name: Docker ${{ matrix.name }}
+              run: sudo chmod -R 777 tests/e2e/${{ matrix.name }}/nodes && cd tests/e2e/${{ matrix.name }} && docker-compose up -d
+
+            - name: Running checks for ${{ matrix.name }}
+              run: |
+                  container_id=$(docker ps -a | grep 'consensus_checks' | awk '{print $1}')
+                  while docker ps | grep -q $container_id; do echo "checks running..."; sleep 5; done
+                  exit_code=$(docker container inspect $container_id --format='{{.State.ExitCode}}')
+                  if [ "$exit_code" != "0" ]; then
+                    echo "Error: checks exited with code $exit_code"
+                    exit 1
+                  fi
+            - name: Show logs - node0
+              if: always()
+              run: docker logs consensus_node0_1
+            - name: Show logs - node1
+              if: always()
+              run: docker logs consensus_node1_1
+            - name: Show logs - node2
+              if: always()
+              run: docker logs consensus_node2_1
diff --git a/.gitignore b/.gitignore
@@ -81,6 +81,14 @@ transaction-pool.sqlite
 transaction-pool.sqlite-shm
 transaction-pool.sqlite-wal
 
+# LMDB
+consensus.mdb
+consensus.mdb-lock
+ledger.mdb
+ledger.mdb-lock
+
+state-export
+
 # P2P
 /peers.json
 

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
 	"$schema": "node_modules/lerna/schemas/lerna-schema.json",
 	"useWorkspaces": true,
-	"version": "0.0.1-alpha.14"
+	"version": "0.0.1-alpha.16"
 }
diff --git a/packages/api-common/package.json b/packages/api-common/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api-common",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Common API building blocks for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/api-common/source/plugins/pagination/extension.ts b/packages/api-common/source/plugins/pagination/extension.ts
@@ -27,7 +27,7 @@

 				request.query[name] = value || defaultValue;

 				return;
 			};

 			// ! should be set through validation schema
@@ -38,7 +38,7 @@
 		return h.continue;
 	}

 	public onPostHandler(request, h) {
 		const { statusCode } = request.response;
 		const processResponse: boolean =
 			this.isValidRoute(request) && statusCode >= 200 && statusCode <= 299 && this.hasPagination(request);
@@ -69,10 +69,9 @@
 		const getUri = (page: number | null): string | null =>
 			/* istanbul ignore next */
 			// tslint:disable-next-line: no-null-keyword
 			page ? baseUri + Qs.stringify(applyToDefaults({ ...query, ...request.orig.query }, { page })) : null;
 
 		const newSource = {
-			data: results,
 			meta: {
 				...source.meta,
 
@@ -84,15 +83,17 @@

 				// tslint:disable-next-line: no-null-keyword
 				/* istanbul ignore next */
 				next: totalCount && currentPage < pageCount ? getUri(currentPage + 1) : null,
 				pageCount: pageCount,

 				previous:
 					// tslint:disable-next-line: no-null-keyword
 					totalCount && currentPage > 1 && currentPage <= pageCount + 1 ? getUri(currentPage - 1) : null,
 				self: getUri(currentPage),
 				totalCount: totalCount ? totalCount : 0,
 			},
+			// eslint-disable-next-line sort-keys-fix/sort-keys-fix
+			data: results,
 		};
 
 		if (source.response) {
@@ -106,7 +107,7 @@
 			}
 		}

 		request.response.source = newSource;

 		return h.continue;
 	}

diff --git a/packages/api-database/package.json b/packages/api-database/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api-database",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "API database for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/api-database/source/repositories/wallet-repository.ts b/packages/api-database/source/repositories/wallet-repository.ts
@@ -14,7 +14,18 @@ export const makeWalletRepository = (dataSource: RepositoryDataSource): WalletRe
 			options?: Options,
 		): Promise<ResultsPage<Wallet>> {
 			const walletExpression = await WalletFilter.getExpression(walletCriteria);
-			return this.listByExpression(walletExpression, convertToJsonbSorting(sorting), pagination, options);
+			return this.listByExpression(
+				walletExpression,
+				convertToJsonbSorting(sorting, [
+					{
+						direction: "desc",
+						jsonFieldAccessor: { cast: "bigint", fieldName: "balance", operator: "->>" },
+						property: "attributes",
+					},
+				]),
+				pagination,
+				options,
+			);
 		},
 
 		async findManyDelegatesByCritera(
@@ -24,20 +35,24 @@ export const makeWalletRepository = (dataSource: RepositoryDataSource): WalletRe
 			options?: Options,
 		): Promise<ResultsPage<Wallet>> {
 			const walletExpression = await DelegateFilter.getExpression(delegateCriteria);
-			return this.listByExpression(walletExpression, convertToJsonbSorting(sorting), pagination, options);
+			return this.listByExpression(
+				walletExpression,
+				convertToJsonbSorting(sorting, [
+					{
+						direction: "asc",
+						jsonFieldAccessor: { cast: "bigint", fieldName: "validatorRank", operator: "->>" },
+						property: "attributes",
+					},
+				]),
+				pagination,
+				options,
+			);
 		},
 	});
 
-const convertToJsonbSorting = (sorting: Sorting): Sorting => {
+const convertToJsonbSorting = (sorting: Sorting, defaultSort: Sorting): Sorting => {
 	if (sorting.length === 0) {
-		// default sort
-		return [
-			{
-				direction: "desc",
-				jsonFieldAccessor: { cast: "bigint", fieldName: "balance", operator: "->>" },
-				property: "attributes",
-			},
-		];
+		return defaultSort;
 	}
 
 	return sorting.map(

diff --git a/packages/api-development/package.json b/packages/api-development/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api-development",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Development API for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/api-development/source/controllers/consensus.ts b/packages/api-development/source/controllers/consensus.ts
@@ -7,7 +7,7 @@ import { Controller } from "./controller.js";
 @injectable()
 export class ConsensusController extends Controller {
 	@inject(Identifiers.Consensus.Service)
-	private readonly consensus!: Contracts.Consensus.ConsensusService;
+	private readonly consensus!: Contracts.Consensus.Service;
 
 	@inject(Identifiers.Consensus.RoundStateRepository)
 	private readonly roundStateRepository!: Contracts.Consensus.RoundStateRepository;
@@ -55,17 +55,17 @@ export class ConsensusController extends Controller {
 				step: state.step,
 				// eslint-disable-next-line sort-keys-fix/sort-keys-fix
 				lockedRound: state.lockedRound,
-				lockedValue: state.lockedValue ? state.lockedValue.getProposal()?.block.block.header.id : null,
+				lockedValue: state.lockedValue ? state.lockedValue.getProposal()?.getData().block.header.id : null,
 				validRound: state.validRound,
-				validValue: state.validValue ? state.validValue.getProposal()?.block.block.header.id : null,
+				validValue: state.validValue ? state.validValue.getProposal()?.getData().block.header.id : null,
 				// eslint-disable-next-line sort-keys-fix/sort-keys-fix
 				precommits: collectMessages(precommits.sort((a, b) => b.round - a.round)),
 				prevotes: collectMessages(prevotes.sort((a, b) => b.round - a.round)),
 				proposals: proposals
 					.sort((a, b) => b.round - a.round)
 					.map((p) => ({
 						data: p.toData(),
-						lockProof: p.block.lockProof,
+						lockProof: p.isDataDeserialized ? p.getData().lockProof : undefined,
 						name: validators[p.validatorIndex].toString(),
 					})),
 

diff --git a/packages/api-http/integration/routes/delegates.test.ts b/packages/api-http/integration/routes/delegates.test.ts
@@ -39,7 +39,7 @@ describe<{
 		assert.equal(statusCode, 200);
 
 		const sorted = [...delegates];
-		sorted.sort((a, b) => +b.attributes.balance - +a.attributes.balance);
+		sorted.sort((a, b) => +a.attributes.validatorRank - +b.attributes.validatorRank);
 		assert.equal(data.data, sorted);
 	});
 

diff --git a/packages/api-http/package.json b/packages/api-http/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api-http",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "HTTP/S API for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/api-sync/package.json b/packages/api-sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api-sync",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "API database sync for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/api-transaction-pool/package.json b/packages/api-transaction-pool/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api-transaction-pool",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Transaction Pool API for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/api",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "API for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/bootstrap",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Bootstrap manager for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/bootstrap/source/bootstrapper.ts b/packages/bootstrap/source/bootstrapper.ts
@@ -11,7 +11,7 @@ export class Bootstrapper {
 	private readonly logger!: Contracts.Kernel.Logger;
 
 	@inject(Identifiers.Consensus.Service)
-	private readonly consensus!: Contracts.Consensus.ConsensusService;
+	private readonly consensus!: Contracts.Consensus.Service;
 
 	@inject(Identifiers.State.State)
 	private readonly state!: Contracts.State.State;

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/cli",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "CLI utilities for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/configuration-generator/package.json b/packages/configuration-generator/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/configuration-generator",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Configuration generator for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/consensus-storage/package.json b/packages/consensus-storage/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/consensus-storage",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Consensus storage for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/consensus-storage/source/index.ts b/packages/consensus-storage/source/index.ts
@@ -48,9 +48,7 @@ export class ServiceProvider extends Providers.ServiceProvider {
 		const storage = this.app.get<Service>(Identifiers.ConsensusStorage.Service);
 
 		await storage.clear();
-		await storage.saveState(
-			this.app.get<Contracts.Consensus.ConsensusService>(Identifiers.Consensus.Service).getState(),
-		);
+		await storage.saveState(this.app.get<Contracts.Consensus.Service>(Identifiers.Consensus.Service).getState());
 
 		await storage.saveProposals(
 			roundStates

diff --git a/packages/consensus-storage/source/service.ts b/packages/consensus-storage/source/service.ts
@@ -22,7 +22,7 @@ export class Service implements Contracts.ConsensusStorage.Service {
 	@inject(Identifiers.Cryptography.Message.Factory)
 	private readonly messageFactory!: Contracts.Crypto.MessageFactory;
 
-	public async getState(): Promise<Contracts.Consensus.ConsensusStateData | undefined> {
+	public async getState(): Promise<Contracts.Consensus.StateData | undefined> {
 		if (!this.stateStorage.doesExist("consensus-state")) {
 			return undefined;
 		}
@@ -38,9 +38,9 @@ export class Service implements Contracts.ConsensusStorage.Service {
 		};
 	}
 
-	public async saveState(state: Contracts.Consensus.ConsensusState): Promise<void> {
+	public async saveState(state: Contracts.Consensus.State): Promise<void> {
 		// always overwrite existing state; we only care about state for uncommitted blocks
-		const data: Contracts.Consensus.ConsensusStateData = {
+		const data: Contracts.Consensus.StateData = {
 			height: state.height,
 			lockedRound: state.lockedRound,
 			round: state.round,

diff --git a/packages/consensus/package.json b/packages/consensus/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mainsail/consensus",
-	"version": "0.0.1-alpha.14",
+	"version": "0.0.1-alpha.16",
 	"description": "Consensus for the Mainsail blockchain",
 	"license": "GPL-3.0-only",
 	"contributors": [],

diff --git a/packages/consensus/source/bootstrapper.ts b/packages/consensus/source/bootstrapper.ts
@@ -12,7 +12,7 @@ export class Bootstrapper implements Contracts.Consensus.Bootstrapper {
 	@inject(Identifiers.ConsensusStorage.Service)
 	private readonly storage!: Contracts.ConsensusStorage.Service;
 
-	public async run(): Promise<Contracts.Consensus.ConsensusState | undefined> {
+	public async run(): Promise<Contracts.Consensus.State | undefined> {
 		const proposals = await this.storage.getProposals();
 
 		this.logger.info(`Consensus Bootstrap - Proposals: ${proposals.length}`);
@@ -38,7 +38,7 @@ export class Bootstrapper implements Contracts.Consensus.Bootstrapper {
 			roundState.addPrecommit(precommit);
 		}
 
-		const state = (await this.storage.getState()) as Utils.Mutable<Contracts.Consensus.ConsensusState> | undefined;
+		const state = (await this.storage.getState()) as Utils.Mutable<Contracts.Consensus.State> | undefined;
 		if (!state) {
 			return undefined;
 		}