Merge branch 'release/6.0.0'

.eslintignore

@@ -8,3 +8,4 @@ jest.config.js
 coverage
 benchmark
 .eslintrc.js
+ecosystem.config.js

.eslintrc.js

@@ -5,4 +5,8 @@ module.exports = {
 		tsconfigRootDir: __dirname,
 	},
 	extends: ['lisk-base/ts'],
+	rules: {
+		'@typescript-eslint/member-ordering': 'off',
+		'@typescript-eslint/no-unsafe-argument': ['warn'],
+	},
 };

.eslintrc.test.js

@@ -4,4 +4,8 @@ module.exports = {
 		project: './tsconfig.json',
 		tsconfigRootDir: __dirname,
 	},
+	rules: {
+		'@typescript-eslint/member-ordering': 'off',
+		'@typescript-eslint/no-unsafe-argument': 'off',
+	},
 };

.github/workflows/branch.yaml

@@ -18,6 +18,13 @@ jobs:
         uses: ./.github/actions/prepare-build
         with:
           cache-key: ${{ github.ref }}
+      - run: yarn test:ci
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: coverage-final.json
+          name: codecov-umbrella
       - run: npm config set //npm.lisk.com/:_authToken=$NPM_TOKEN
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/pr.yaml

@@ -32,7 +32,7 @@ jobs:
         uses: ./.github/actions/prepare-build
         with:
           cache-key: ${{ github.event.number }}
-      - run: yarn format
+      - run: yarn format:since --base ${{ github.base_ref }}
       - name: Check format
         run: |
           if [ -z "$(git status --untracked-files=no --porcelain)" ]; then
@@ -41,7 +41,10 @@ jobs:
             echo "Running format is required"
             exit 1
           fi
-      - run: yarn lint
+      - run: yarn lint:since --base ${{ github.base_ref }}
+      - name: Check duplicate schema
+        run: |
+          node scripts/duplicate_schema_id.js ./
 
   unit-test:
     runs-on: ubuntu-latest
@@ -56,9 +59,15 @@ jobs:
         uses: ./.github/actions/prepare-build
         with:
           cache-key: ${{ github.event.number }}
-      - run: yarn test:elements
-      - run: yarn test:framework
-      - run: yarn test:commander
+      - run: yarn test:ci
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          files: coverage-final.json
+          name: codecov-umbrella
+          verbose: true
 
   integration-test:
     runs-on: ubuntu-latest
@@ -73,7 +82,7 @@ jobs:
         uses: ./.github/actions/prepare-build
         with:
           cache-key: ${{ github.event.number }}
-      - run: yarn nx run-many --target=test:integration --projects=lisk-framework
+      - run:  yarn nx run-many --target=test:integration --projects=lisk-framework
 
   functional-test:
     runs-on: ubuntu-latest

.gitignore

@@ -46,7 +46,6 @@ build/Release
 # Dependency directories
 node_modules
 jspm_packages
-.husky
 
 # Optional npm cache directory
 .npm
@@ -72,6 +71,7 @@ browsertest/browsertest.min.js
 browsertest/src
 browsertest/test
 tsconfig.tsbuildinfo
+.parcel-cache
 
 # Unsupported lock files
 package-lock.json

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

codecov.yml

@@ -0,0 +1,17 @@
+codecov:
+  max_report_age: 30
+  notify:
+    wait_for_ci: false
+github_checks:
+  annotations: false
+coverage:
+  status:
+    project:
+      default:
+        # basic
+        target: auto
+        threshold: 1%
+        base: auto
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: default

commander/README.md

@@ -16,7 +16,7 @@ Upon successful completion, NPM will add the `lisk-commander` executable `lisk`
 
 ## Usage
 
-```sh-session
+```shell
 $ lisk COMMAND
 running command...
 $ lisk (-v|--version|version)
@@ -58,13 +58,13 @@ $ npm test
 
 ## Get Involved
 
-| Reason                          | How                                                                                            |
-| ------------------------------- | ---------------------------------------------------------------------------------------------- |
-| Want to chat with our community | [Reach them on Discord](https://discord.gg/lisk)                                               |
-| Found a bug                     | [Open a new issue](https://github.com/LiskHQ/lisk/issues/new)                                  |
-| Found a security issue          | [See our bounty program](https://blog.lisk.io/announcing-lisk-bug-bounty-program-5895bdd46ed4) |
-| Want to share your research     | [Propose your research](https://research.lisk.io)                                              |
-| Want to develop with us         | [Create a fork](https://github.com/LiskHQ/lisk/fork)                                           |
+| Reason                          | How                                                                                             |
+| ------------------------------- | ----------------------------------------------------------------------------------------------- |
+| Want to chat with our community | [Reach them on Discord](https://discord.gg/lisk)                                                |
+| Found a bug                     | [Open a new issue](https://github.com/LiskHQ/lisk/issues/new)                                   |
+| Found a security issue          | [See our bounty program](https://blog.lisk.com/announcing-lisk-bug-bounty-program-5895bdd46ed4) |
+| Want to share your research     | [Propose your research](https://research.lisk.com)                                              |
+| Want to develop with us         | [Create a fork](https://github.com/LiskHQ/lisk/fork)                                            |
 
 ## License
 

commander/bin/run

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-require('@oclif/command')
+require('@oclif/core')
 	.run()
-	.then(require('@oclif/command/flush'))
-	.catch(require('@oclif/errors/handle'));
+	.then(require('@oclif/core/flush'))
+	.catch(require('@oclif/core/handle'));

commander/jest.config.js

@@ -1,16 +1,13 @@
 module.exports = {
-	globals: {
-		'ts-jest': {
-			tsconfig: './test/tsconfig.json',
-		},
-	},
 	testMatch: ['<rootDir>/test/**/?(*.)+(spec|test).+(ts|tsx|js)'],
 	setupFilesAfterEnv: ['<rootDir>/test/setup.js'],
 	transform: {
-		'^.+\\.(ts|tsx)$': 'ts-jest',
-	},
-	moduleNameMapper: {
-		'^axios$': 'axios/dist/axios.js',
+		'^.+\\.(ts|tsx)$': [
+			'ts-jest',
+			{
+				tsconfig: '<rootDir>/test/tsconfig.json',
+			},
+		],
 	},
 	verbose: false,
 	collectCoverage: false,
@@ -40,4 +37,5 @@ module.exports = {
 	 * This can be done programmatically using jest.resetModules().
 	 */
 	resetModules: true,
+	testEnvironment: 'node',
 };