Merge branch 'dev'

fboucquez · Nov 5, 2021 · 3ab2285 · 3ab2285
2 parents 487cfe0 + 013bb04
commit 3ab2285
Show file tree

Hide file tree

Showing 155 changed files with 5,614 additions and 10,373 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,35 +4,63 @@ 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.1.0] - NEXT
+
+**Milestone**: Mainnet(1.0.2.0)
+
+| Package          | Version | Link                                                               |
+| ---------------- | ------- | ------------------------------------------------------------------ |
+| Symbol Bootstrap | v1.1.0  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
+
+- Added `wizard` command.
+- Added `pack` command.
+- Added `modifyMultisig` command.
+- Added `--serviceProviderPublicKey` to `link` command.
+- Rest `2.3.8` upgrade.
+- Explorer `1.1.0` upgrade.
+- Faucet `1.0.1` upgrade.
+- Removed node reward support.
+- Removed unused `sshpk` service and dependency.
+- Removed unused `forge` service and dependency.
+- Changed `stop` command to run `docker-compose stop` instead of `docker-compose down`
+- Added statistic service integration.
+- Removed node static list from `mainnet` and `testnet` preset. The node lists are resolved using the statistic service.
+- Updated explorer and faucet urls.
+- Removed private and mijin network types support.
+
 ## [1.0.9] - Sep-15-2021
 
 **Milestone**: Mainnet(1.0.2.0)
 
+| Package          | Version | Link                                                               |
+| ---------------- | ------- | ------------------------------------------------------------------ |
+| Symbol Bootstrap | v1.0.9  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
+
 - Hot fix `updateVotingKeys` command bug.
 
 ## [1.0.8] - Sep-14-2021
 
 **Milestone**: Mainnet(1.0.2.0)
 
-- Fixed `updateVotingKeys` command when upgrading from `1.0.6`.
-- Catapult `1.0.2.0` upgrade.
-- Updated `minPartnerNodeVersion` to `1.0.1.0`. Older Catapult clients will be rejected.
-
 | Package          | Version | Link                                                               |
 | ---------------- | ------- | ------------------------------------------------------------------ |
 | Symbol Bootstrap | v1.0.8  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
 
+- Fixed `updateVotingKeys` command when upgrading from `1.0.6`.
+- Catapult `1.0.2.0` upgrade.
+- Updated `minPartnerNodeVersion` to `1.0.1.0`. Older Catapult clients will be rejected.
+
 ## [1.0.7] - June-22-2021
 
 **Milestone**: Mainnet(1.0.1.0)
 
--   Added multi voting key file support.
--   Added `updateVotingKeys` command.
-
 | Package          | Version | Link                                                               |
 | ---------------- | ------- | ------------------------------------------------------------------ |
 | Symbol Bootstrap | v1.0.7  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
 
+-   Added multi voting key file support.
+-   Added `updateVotingKeys` command.
+
 ## [1.0.6] - June-8-2021
 
 **Milestone**: Mainnet(1.0.1.0)

diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ Symbol CLI tool that allows you creating, configuring and running Symbol&#39;s c
 * [Concepts](#concepts)
 * [Requirements](#requirements)
 * [Usage](#usage)
+* [General Usage](#general-usage)
+* [Wizard](#wizard)
 * [E2E Testing support](#e2e-testing-support)
 * [Development](#development)
 * [Commands](#commands)
@@ -135,14 +137,16 @@ $ npm install -g symbol-bootstrap
 $ symbol-bootstrap COMMAND
 running command...
 $ symbol-bootstrap (-v|--version|version)
-symbol-bootstrap/1.0.9 linux-x64 node-v12.22.6
+symbol-bootstrap/1.1.0 linux-x64 node-v12.22.6
 $ symbol-bootstrap --help [COMMAND]
 USAGE
   $ symbol-bootstrap COMMAND
 ...
 ```
 <!-- usagestop -->
 
+# General Usage
+
 The general usage would be:
 
 ```
@@ -163,6 +167,14 @@ If you need to start fresh, you many need to sudo remove the target folder (dock
 sudo rm -rf ./target
 ```
 
+# Wizard
+
+If this is your first time creating a node, it's recommended to use the Wizard. Just follow the instructions:
+
+```
+symbol-bootstrap wizard
+```
+
 # E2E Testing support
 
 One use case of this CLI is client E2E testing support. If you are coding a Symbol client, you (Travis or Jenkins) can run e2e tests like:
@@ -268,17 +280,19 @@ General users should install this tool like any other node module.
 * [`symbol-bootstrap config`](docs/config.md) - Command used to set up the configuration files and the nemesis block for the current network
 * [`symbol-bootstrap decrypt`](docs/decrypt.md) - It decrypts a yml file using the provided password. The source file can be a custom preset file, a preset.yml file or an addresses.yml.
 * [`symbol-bootstrap encrypt`](docs/encrypt.md) - It encrypts a yml file using the provided password. The source files would be a custom preset file, a preset.yml file or an addresses.yml.
-* [`symbol-bootstrap enrollRewardProgram`](docs/enrollRewardProgram.md) - It enrols the nodes in the rewards program by announcing the enroll transaction to the registration address.  You can also use this command to update the program registration when you change the agent keys (changing the agent-ca-csr) or server host.
 * [`symbol-bootstrap healthCheck`](docs/healthCheck.md) - It checks if the services created with docker compose are up and running.
 * [`symbol-bootstrap help`](docs/help.md) - display help for symbol-bootstrap
 * [`symbol-bootstrap link`](docs/link.md) - It announces VRF and Voting Link transactions to the network for each node with 'Peer' or 'Voting' roles. This command finalizes the node registration to an existing network.
+* [`symbol-bootstrap modifyMultisig`](docs/modifyMultisig.md) - Create or modify a multisig account
+* [`symbol-bootstrap pack`](docs/pack.md) - It configures and packages your node into a zip file that can be uploaded to the final node machine.
 * [`symbol-bootstrap report`](docs/report.md) - it generates reStructuredText (.rst) reports describing the configuration of each node.
 * [`symbol-bootstrap resetData`](docs/resetData.md) - It removes the data keeping the generated configuration, certificates, keys and block 1.
 * [`symbol-bootstrap run`](docs/run.md) - It boots the network via docker using the generated `docker-compose.yml` file and configuration. The config and compose methods/commands need to be called before this method. This is just a wrapper for the `docker-compose up` bash call.
 * [`symbol-bootstrap start`](docs/start.md) - Single command that aggregates config, compose and run in one line!
 * [`symbol-bootstrap stop`](docs/stop.md) - It stops the docker-compose network if running (symbol-bootstrap started with --detached). This is just a wrapper for the `docker-compose down` bash call.
 * [`symbol-bootstrap updateVotingKeys`](docs/updateVotingKeys.md) - It updates the voting files containing the voting keys when required.
 * [`symbol-bootstrap verify`](docs/verify.md) - It tests the installed software in the current computer reporting if there is any missing dependency, invalid version, or software related issue.
+* [`symbol-bootstrap wizard`](docs/wizard.md) - An utility command that will help you configuring node!
 
 <!-- commandsstop -->
 

diff --git a/cmds/config-testnet-supernode.sh b/cmds/config-testnet-supernode.sh
diff --git a/cmds/enrollRewardProgram-testnet.sh b/cmds/enrollRewardProgram-testnet.sh
diff --git a/cmds/link-testnet-supernode-external-node.sh b/cmds/link-testnet-supernode-external-node.sh
diff --git a/cmds/start-testnet-supernode-demo.sh b/cmds/start-testnet-supernode-demo.sh
diff --git a/cmds/start-testnet-supernode.sh b/cmds/start-testnet-supernode.sh
diff --git a/cmds/stop-testnet-supernode.sh b/cmds/stop-testnet-supernode.sh
diff --git a/cmds/upgradeVotingKeys-testnet-supernode.sh b/cmds/upgradeVotingKeys-testnet-supernode.sh
diff --git a/config/agent-cert/agent-ca.cnf b/config/agent-cert/agent-ca.cnf
diff --git a/config/agent-cert/agent-comm.cnf b/config/agent-cert/agent-comm.cnf
diff --git a/config/agent/agent.properties.mustache b/config/agent/agent.properties.mustache
diff --git a/config/docker/explorer/run.sh.mustache b/config/docker/explorer/run.sh.mustache
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
 echo "Starting explorer $1"
-cp config.js /usr/share/nginx/html
-nginx -g 'daemon off;'
+cp default.json /app/src/config/default.json
+cd /app
+npm start
diff --git a/config/explorer/config.js.mustache b/config/explorer/config.js.mustache
diff --git a/config/explorer/default.json.mustache b/config/explorer/default.json.mustache
@@ -0,0 +1,18 @@
+{
+	"peersApi": {
+		"defaultNode": "{{defaultNode}}",
+		"nodes":  {{{toJson restNodes}}}
+	},
+	"endpoints": {
+		"marketData": "https://min-api.cryptocompare.com/"
+	},
+	"networkConfig": {
+		"namespaceName": "{{namespaceName}}",
+		"mosaicId": "{{{toSimpleHex currencyMosaicId}}}",
+		"divisibility": "{{maxMosaicDivisibility}}",
+		"namespaceId": "{{{toSimpleHex namespaceId}}}",
+		"networkIdentifier": {{networkType}}
+	},
+	"footer": {{{toJson footer}}}
+}
+
diff --git a/config/node/resources/config-finalization.properties.mustache b/config/node/resources/config-finalization.properties.mustache
@@ -14,3 +14,11 @@ maxHashesPerPoint = {{{toAmount maxHashesPerPoint}}}
 prevoteBlocksMultiple = {{{toAmount prevoteBlocksMultiple}}}
 
 unfinalizedBlocksDuration = {{{unfinalizedBlocksDuration}}}
+
+treasuryReissuanceEpoch = {{{treasuryReissuanceEpoch}}}
+
+[treasury_reissuance_epoch_ineligible_voter_addresses]
+
+{{#each treasuryReissuanceEpochIneligibleVoterAddresses}}
+{{this}} = true
+{{/each}}
diff --git a/config/node/resources/config-network.properties.mustache b/config/node/resources/config-network.properties.mustache
@@ -42,13 +42,13 @@ maxVotingKeyLifetime = {{{maxVotingKeyLifetime}}}
 
 harvestBeneficiaryPercentage = {{{harvestBeneficiaryPercentage}}}
 harvestNetworkPercentage = {{{harvestNetworkPercentage}}}
+harvestNetworkFeeSinkAddressV1 = {{{harvestNetworkFeeSinkAddressV1}}}
 harvestNetworkFeeSinkAddress = {{{harvestNetworkFeeSinkAddress}}}
 
 maxTransactionsPerBlock = {{{toAmount maxTransactionsPerBlock}}}
 
-[fork_heights]
-
-totalVotingBalanceCalculationFix = {{{toAmount totalVotingBalanceCalculationFix}}}
+treasuryReissuanceBlockTransactionsHash = {{{treasuryReissuanceBlockTransactionsHash}}}
+treasuryReissuanceFallbackBlockTransactionsHash = {{{treasuryReissuanceFallbackBlockTransactionsHash}}}
 
 [plugin:catapult.plugins.accountlink]
 
@@ -86,6 +86,7 @@ maxMosaicsPerAccount = {{{toAmount maxMosaicsPerAccount}}}
 maxMosaicDuration = {{{maxMosaicDuration}}}
 maxMosaicDivisibility = {{{maxMosaicDivisibility}}}
 
+mosaicRentalFeeSinkAddressV1 = {{{mosaicRentalFeeSinkAddressV1}}}
 mosaicRentalFeeSinkAddress = {{{mosaicRentalFeeSinkAddress}}}
 mosaicRentalFee = {{{mosaicRentalFee}}}
 
@@ -107,6 +108,7 @@ maxNamespaceDuration = {{{maxNamespaceDuration}}}
 namespaceGracePeriodDuration = {{{namespaceGracePeriodDuration}}}
 reservedRootNamespaceNames = {{{reservedRootNamespaceNames}}}
 
+namespaceRentalFeeSinkAddressV1 = {{{namespaceRentalFeeSinkAddressV1}}}
 namespaceRentalFeeSinkAddress = {{{namespaceRentalFeeSinkAddress}}}
 rootNamespaceRentalFeePerBlock = {{{rootNamespaceRentalFeePerBlock}}}
 childNamespaceRentalFee = {{{childNamespaceRentalFee}}}
@@ -122,3 +124,20 @@ maxMosaicRestrictionValues = {{{maxMosaicRestrictionValues}}}
 [plugin:catapult.plugins.transfer]
 
 maxMessageSize = {{{maxMessageSize}}}
+
+[fork_heights]
+
+totalVotingBalanceCalculationFix = {{{toAmount totalVotingBalanceCalculationFix}}}
+treasuryReissuance = {{{toAmount treasuryReissuance}}}
+
+[treasury_reissuance_transaction_signatures]
+
+{{#each treasuryReissuanceTransactionSignatures}}
+{{this}} = true
+{{/each}}
+
+[treasury_reissuance_fallback_transaction_signatures]
+
+{{#each treasuryReissuanceFallbackTransactionSignatures}}
+{{this}} = true
+{{/each}}
diff --git a/config/rest-gateway/rest.json.mustache b/config/rest-gateway/rest.json.mustache
@@ -5,6 +5,10 @@
   },
 
   "port": 3000,
+  "protocol": "{{{restProtocol}}}",
+  "sslKeyPath": "{{{restSSLPath}}}/{{{restSSLKeyFileName}}}",
+  "sslCertificatePath": "{{{restSSLPath}}}/{{{restSSLCertificateFileName}}}",
+
   "crossDomain": {
     "allowedHosts": ["*"],
     "allowedMethods": ["GET", "POST", "PUT", "OPTIONS"]

diff --git a/docs/clean.md b/docs/clean.md
@@ -21,4 +21,4 @@ EXAMPLE
   $ symbol-bootstrap clean
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.0.9/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.1.0/src/commands/clean.ts)_
diff --git a/docs/compose.md b/docs/compose.md
@@ -33,4 +33,4 @@ EXAMPLE
   $ symbol-bootstrap compose
 ```
 
-_See code: [src/commands/compose.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.0.9/src/commands/compose.ts)_
+_See code: [src/commands/compose.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.1.0/src/commands/compose.ts)_
diff --git a/docs/config.md b/docs/config.md
@@ -55,4 +55,4 @@ EXAMPLES
   $ echo "$MY_ENV_VAR_PASSWORD" | symbol-bootstrap config -p testnet -a dual
 ```
 
-_See code: [src/commands/config.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.0.9/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.1.0/src/commands/config.ts)_
diff --git a/docs/decrypt.md b/docs/decrypt.md
@@ -56,4 +56,4 @@ EXAMPLES
   plain-addresses.yml
 ```
 
-_See code: [src/commands/decrypt.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.0.9/src/commands/decrypt.ts)_
+_See code: [src/commands/decrypt.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.1.0/src/commands/decrypt.ts)_
diff --git a/docs/encrypt.md b/docs/encrypt.md
@@ -46,4 +46,4 @@ EXAMPLES
   encrypted-custom-preset.yml
 ```
 
-_See code: [src/commands/encrypt.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.0.9/src/commands/encrypt.ts)_
+_See code: [src/commands/encrypt.ts](https://github.com/nemtech/symbol-bootstrap/blob/v1.1.0/src/commands/encrypt.ts)_