Skip to content

Commit

Permalink
Working on multimodule
Browse files Browse the repository at this point in the history
  • Loading branch information
fboucquez committed Jul 20, 2021
1 parent fc5a06c commit 0352482
Show file tree
Hide file tree
Showing 3,437 changed files with 253,809 additions and 34,768 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/lib
monorepo-merge-reports.js
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
extends: [
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'prettier', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
],
parserOptions: {
Expand Down
37 changes: 16 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
*-debug.log
*-error.log
/.nyc_output
/dist
/lib
/tmp
/yarn.lock
node_modules
/target/
**/.nyc_output
**/dist
**/lib
**/tmp
**/yarn.lock
**/node_modules
**/logs.log
packages/*/target
/.idea/
/logs.log
symbol-bootstrap-*.tgz
/.eslintcache
coverage
/ts-docs/
/oclif.manifest.json
/ngrok-testnet.yml
/boat.png
/agent-linux.bin
/privateSeeds/
/test/service/logs.log
/backup-sync/
**/symbol-*.tgz
**/.eslintcache
**/coverage
**/ts-docs/
**/oclif.manifest.json
**/boat.png
**/agent-linux.bin
/test-space/
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/test/reports/**/*.json
/**/test/expectedTargets/**
/**/package-lock.json
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ cache:
- node_modules
- .eslintcache
before_script:
- npm run init
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
- . ./travis/node-functions.sh
- VERSION="$(node_load_version)"
- if [[ ! -z "$DOCKER_USERNAME" ]] ; then echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin; fi
- if [[ ! -z "$DOCKER_PASSWORD" ]] ; then echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin; fi
- log_env_variables
script:
- npm pack
- npm run build
- npm test
- npm run coveralls-report
jobs:
Expand Down
36 changes: 21 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@ All notable changes to this project will be documented in this file.

The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.0.8] - NEXT
## [1.1.0] - NEXT

**Milestone**: Mainnet(1.0.1.0)

| Package | Version | Link |
| ---------------- | ------- | ------------------------------------------------------------------ |
| Symbol Bootstrap | v1.0.8 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
| Package | Version | Link |
| --------------------- | ------- | ------------------------------------------------------------------ |
| Symbol Bootstrap | v1.1.0 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
| Symbol Bootstrap Core | v1.1.0 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
| Symbol Network | v0.0.1 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
| Symbol Network Core | v0.0.1 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |

- The `bootstrap` preset is not the default anymore. The name must be provided via --preset or as a custom preset field.
- When upgrading, the --customPreset param is now only required if there is a configuration change, since
the properties from the original custom preset are fully cached in the target folder.
- Added `wizard` command.
- Added `pack` command.

Expand All @@ -38,7 +44,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
- Symbol Rest `2.3.6` upgrade.
- Reward Program Agent `2.0.0` upgrade.
- Added `MonitorOnly` reward program.
- The `link` and `enrollRewardProgram` commands allow `--customPreset` to avoid password prompt when main private key is not stored in the target folder.
- The `link` and `enrollRewardProgram` commands allow `--customPreset` to avoid password prompt when main private key is not stored in the target folder.
- Merged tools and server docker images into one.

## [1.0.5] - May-3-2021
Expand Down Expand Up @@ -67,7 +73,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
- Fixed case issue validating keys when creating certificates.
- Updated Wallet to latest 1.0.1 release.
- Node properties sinkType: Async and enableSingleThreadPool: false by default in peer nodes too.
- Dropped NodeJS 10 support. Added Node LTS and Stable Support.
- Dropped NodeJS 10 support. Added Node LTS and Stable Support.

## [1.0.3] - Mar-31-2021

Expand Down Expand Up @@ -102,7 +108,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

- Random and limited peer/api list.
- Custom `votingUnfinalizedBlocksDuration` and `nonVotingUnfinalizedBlocksDuration` preset properties.
- Agent service is disabled until supernode program resumes.
- Agent service is disabled until supernode program resumes.
- The default `beneficiaryAddress` is the node's main address. Use `beneficiaryAddress: ''` in a custom preset to override the new default.

## [1.0.0] - Mar-16-2021
Expand All @@ -116,7 +122,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
- **New `mainnet` preset!!!**
- Removed node from its own `peers-p2p.json` and `peers-api.json` files.
- Voting keys are ephemeral. They cannot be provided, bootstrap will always generate a new one when resetting the configuration. Bootstrap will never store the voting private key in addresses.yml.
- Dropped `PROMPT_MAIN_VOTING` from `privateKeySecurityMode`.
- Dropped `PROMPT_MAIN_VOTING` from `privateKeySecurityMode`.
- Added `PROMPT_MAIN_TRANSPORT` to `privateKeySecurityMode`: The transport/node key will be asked when regenerating the certificates or when upgrading a supernode.
- Changed server file permission to 0o600

Expand All @@ -129,17 +135,17 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
| Symbol Bootstrap | v0.4.5 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |

- Added `privateKeySecurityMode`. It defines which private keys can be encrypted and stored in the `target/addresses.yml`:
- `ENCRYPT`: All private keys are encrypted and stored in the target's `addresses.yml` file. Bootstrap will require a password to operate.
- `PROMPT_MAIN`: Main private keys are not stored in the target's `addresses.yml` file. Bootstrap will request the main private key when certificates are generated, or transactions need to be signed by the `link` and `enrolProgram` commands.
- `PROMPT_MAIN_VOTING`: Main and voting private keys are not stored in the target's `addresses.yml` file. Bootstrap will request the main private key when certificates are generated, or transactions need to be signed by the `link` and `enrolProgram` commands. The voting private key will be requested when generating the voting key file.
- `PROMPT_ALL`: No private keys are stored in the in the target's `addresses.yml` file. Bootstrap will request the private keys when they are required by the different commands.
- `ENCRYPT`: All private keys are encrypted and stored in the target's `addresses.yml` file. Bootstrap will require a password to operate.
- `PROMPT_MAIN`: Main private keys are not stored in the target's `addresses.yml` file. Bootstrap will request the main private key when certificates are generated, or transactions need to be signed by the `link` and `enrolProgram` commands.
- `PROMPT_MAIN_VOTING`: Main and voting private keys are not stored in the target's `addresses.yml` file. Bootstrap will request the main private key when certificates are generated, or transactions need to be signed by the `link` and `enrolProgram` commands. The voting private key will be requested when generating the voting key file.
- `PROMPT_ALL`: No private keys are stored in the in the target's `addresses.yml` file. Bootstrap will request the private keys when they are required by the different commands.
- The `preset.yml` doesn't contain any private key anymore, encrypted or otherwise.
- Certificates are not re-generated if not needed when running `--upgrade`. In this case, the main account private key is not required and will not be requested with the `PROMPT` security modes.
- Voting key files are not re-generated if not needed when running `--upgrade`. In this case, the voting account private key is not required and will not be requested with the `PROMPT_ALL` or `PROMPT_MAIN_VOTING` security modes.
- Public keys can be used in custom presets in addition to encrypted private keys. If public keys are used, Bootstrap will prompt for the private keys when required.
- Added `encrypt` and `decrypt` commands to encrypt custom presets and decrypt generated `target/addresses.yml` files:
- The `--upgrade` param can be used to change the server keys without dropping the data.
- Splitting `userconfig` into `server-config` and `broker-config` for each service.
- Splitting `userconfig` into `server-config` and `broker-config` for each service.
- Fixed recovery process.

## [0.4.4] - Feb-24-2021
Expand All @@ -164,9 +170,9 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

- Added Core Dump files when `dockerComposeDebugMode: true`.
- Added autocomplete support. Try `symbol-bootstrap autocomplete` and follow the instructions (Thanks @44uk).
- Renamed `supernode` keywords for `rewardProgram` for clarification. Supernode is a type of Reward Program.
- Renamed `supernode` keywords for `rewardProgram` for clarification. Supernode is a type of Reward Program.
- Voting is not required to enrol a program.
- Renamed command from `enrolSupernode` for `enrolRewardProgram`.
- Renamed command from `enrolSupernode` for `enrolRewardProgram`.
- Added preset configurable `connectionPoolSize` to the Rest Gateway configuration.
- Removed Node Key Link transactions from nemesis and `link` command.

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ Then sit back and wait. There will probably be discussion about the pull request
*CONTRIBUTING.md is based on [CONTRIBUTING-template.md](https://github.com/nayafia/contributing-template/blob/master/CONTRIBUTING-template.md)* , [elasticsearch/CONTRIBUTING](https://github.com/elastic/elasticsearch/blob/master/CONTRIBUTING.md) and [spark/CONTRIBUTING](https://github.com/apache/spark/blob/master/CONTRIBUTING.md)

[pull-request]: https://help.github.com/articles/about-pull-requests/
[github-issues]: https://github.com/nemtech/symbol-bootstrap/issues
[github-issues]: https://github.com/symbol/symbol-bootstrap/issues
Loading

0 comments on commit 0352482

Please sign in to comment.