Merge remote-tracking branch 'upstream/dev' into 1.1.19

.github/workflows/alpha.yml

@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                  node-version: 12.x
+                  node-version: 14.x
                   registry-url: https://registry.npmjs.org
             - run: npm ci
             - run: npm run doc
@@ -26,7 +26,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                  node-version: 12.x
+                  node-version: 14.x
                   registry-url: https://registry.npmjs.org
             - run: npm ci
             - run: npm pack

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node-version: [12.x, 14.x, 15.x]
+                node-version: [14.x, 16.x, 18.x]
         steps:
             - uses: actions/checkout@v2
             - name: Use Node.js ${{ matrix.node-version }}
@@ -28,7 +28,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                  node-version: 12.x
+                  node-version: 14.x
                   registry-url: https://registry.npmjs.org
             - run: npm ci
             - run: npm run lint

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
               uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                  node-version: 12.x
+                  node-version: 14.x
                   registry-url: https://registry.npmjs.org
             - run: npm ci
             - id: version
@@ -47,7 +47,7 @@ jobs:
               uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                  node-version: 12.x
+                  node-version: 14.x
                   registry-url: https://registry.npmjs.org
             - run: npm ci
             - run: npm version patch -m "Increasing version to %s" --git-tag-version false

CHANGELOG.md

@@ -3,8 +3,48 @@
 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.9] - Nov-09-2022
 
-## [1.1.4] - NEXT
+**Milestone**: Mainnet(1.0.3.5)
+
+| Package          | Version | Link                                                               |
+| ---------------- |---------| ------------------------------------------------------------------ |
+| Symbol Bootstrap | v1.1.9  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
+
+- Testnet reset(sainet).
+- Update to [Catapult Client v1.0.3.5](https://github.com/symbol/symbol/releases/tag/client%2Fcatapult%2Fv1.0.3.5)
+
+## [1.1.8] - Oct-25-2022
+
+**Milestone**: Mainnet(1.0.3.4)
+
+| Package          | Version | Link                                                               |
+| ---------------- |---------| ------------------------------------------------------------------ |
+| Symbol Bootstrap | v1.1.8  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
+
+- (BREAKING FORK) catapult client register aggregate transaction hash validator and require aggregate version 2 after fork
+
+## [1.1.6] - Mar-16-2022
+
+**Milestone**: Mainnet(1.0.3.3)
+
+| Package          | Version | Link                                                               |
+| ---------------- |---------| ------------------------------------------------------------------ |
+| Symbol Bootstrap | v1.1.6  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
+
+- Fixed openssl security vulnerability [issue](https://www.opencve.io/cve/CVE-2022-0778)
+
+## [1.1.5] - Mar-1-2022
+
+**Milestone**: Mainnet(1.0.3.1)
+
+| Package          | Version | Link                                                               |
+| ---------------- |---------| ------------------------------------------------------------------ |
+| Symbol Bootstrap | v1.1.5  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
+
+- Fixed undefined error circular dependency when using PROMPT_MAIN. Issue #378.
+
+## [1.1.4] - Feb-4-2022
 
 **Milestone**: Mainnet(1.0.3.1)
 
@@ -14,6 +54,8 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 
 - `BootstrapUtils` code clean up split.
 - Allowing user provided compose services via custom preset.
+- Added `services` assembly.
+- Lib upgrades.
 
 ## [1.1.3] - Jan-21-2022
 

README.md

@@ -70,6 +70,7 @@ Properties in each file override the previous values (by object deep merge).
 -   [`dual`](presets/assemblies/assembly-dual.yml): A standard dual node that contains 1 Mongo database, 1 API node, 1 REST gateway, 1 broker, and 1 peer node.
 -   [`demo`](presets/assemblies/assembly-demo.yml): A dual node with an additional explorer and faucet for test and demonstration purposes.
 -   [`multinode`](presets/assemblies/assembly-multinode.yml): A special assembly that contains 1 API node and 2 peer-only nodes. This assembly is for testing, it showcases how a private network with 3 nodes runs.
+-   [`services`](presets/assemblies/assembly-services.yml): A special docker compose that includes the Explorer, Faucet and HTTPS proxy. This is an easy and quick way of running Symbol services when creating a new network. Note that the services are not HA, it's not for production environments. 
 
 ### Custom preset:
 

config/docker/mongo/mongoDbPrepare.js

@@ -40,12 +40,15 @@
     db.transactions.createIndex({ 'transaction.deadline': -1 });
     db.transactions.createIndex({ 'transaction.cosignatures.signerPublicKey': 1 }, makeSparse('transaction.cosignatures.signerPublicKey'));
     db.transactions.createIndex({ 'transaction.id': 1, 'transaction.type': 1 }, makeSparse('transaction.id'));
+    db.transactions.createIndex({ 'transaction.mosaics.id': 1});
 
     db.createCollection('transactionStatements');
     db.transactionStatements.createIndex(
         { 'statement.height': 1, 'statement.source.primaryId': 1, 'statement.source.secondaryId': 1 },
         { unique: true },
     );
+    db.transactionStatements.createIndex({ 'statement.receipts.targetAddress': 1 });
+    db.transactionStatements.createIndex({ 'statement.receipts.senderAddress': 1 });
 
     ['addressResolutionStatements', 'mosaicResolutionStatements'].forEach((collectionName) => {
         db.createCollection(collectionName);

config/node/resources/config-network.properties.mustache

@@ -141,14 +141,16 @@ totalVotingBalanceCalculationFix = {{{toAmount totalVotingBalanceCalculationFix}
 treasuryReissuance = {{{toAmount treasuryReissuance}}}
 strictAggregateTransactionHash = {{{toAmount strictAggregateTransactionHash}}}
 
+{{#treasuryReissuanceTransactionSignatures_has_items}}
 [treasury_reissuance_transaction_signatures]
-
+{{/treasuryReissuanceTransactionSignatures_has_items}}
 {{#each treasuryReissuanceTransactionSignatures}}
 {{this}} = true
 {{/each}}
 
+{{#corruptAggregateTransactionHashes_has_items}}
 [corrupt_aggregate_transaction_hashes]
-
+{{/corruptAggregateTransactionHashes_has_items}}
 {{#each corruptAggregateTransactionHashes}}
 {{this.key}} = {{this.value}}
 {{/each}}

docs/autocomplete.md

@@ -26,4 +26,4 @@ EXAMPLES
   $ symbol-bootstrap autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v0.3.0/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.2.0/src/commands/autocomplete/index.ts)_

docs/clean.md

@@ -24,4 +24,4 @@ EXAMPLE
   $ symbol-bootstrap clean
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/clean.ts)_

docs/compose.md

@@ -26,6 +26,8 @@ OPTIONS
   --noPassword         When provided, Bootstrap will not use a password, so private keys will be stored in plain text.
                        Use with caution.
 
+  --offline            If --offline is used, Bootstrap resolves the configuration without querying the running network.
+
   --password=password  A password used to encrypt and decrypt private keys in preset files like addresses.yml and
                        preset.yml. Bootstrap prompts for a password by default, can be provided in the command line
                        (--password=XXXX) or disabled in the command line (--noPassword).
@@ -36,4 +38,4 @@ EXAMPLE
   $ symbol-bootstrap compose
 ```
 
-_See code: [src/commands/compose.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/compose.ts)_
+_See code: [src/commands/compose.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/compose.ts)_

docs/config.md

@@ -16,7 +16,7 @@ USAGE
 OPTIONS
   -a, --assembly=assembly          The assembly that defines the node(s) layout. It can be provided via custom preset or
                                    cli parameter. If not provided, the value is resolved from the target/preset.yml
-                                   file. Options are: api, demo, dual, multinode, peer, my-custom-assembly.yml
+                                   file. Options are: dual, peer, api, demo, multinode, services, my-custom-assembly.yml
                                    (advanced).
 
   -c, --customPreset=customPreset  External preset file. Values in this file will override the provided presets.
@@ -41,6 +41,9 @@ OPTIONS
   --noPassword                     When provided, Bootstrap will not use a password, so private keys will be stored in
                                    plain text. Use with caution.
 
+  --offline                        If --offline is used, Bootstrap resolves the configuration without querying the
+                                   running network.
+
   --password=password              A password used to encrypt and decrypt private keys in preset files like
                                    addresses.yml and preset.yml. Bootstrap prompts for a password by default, can be
                                    provided in the command line (--password=XXXX) or disabled in the command line
@@ -62,4 +65,4 @@ EXAMPLES
   $ echo "$MY_ENV_VAR_PASSWORD" | symbol-bootstrap config -p testnet -a dual
 ```
 
-_See code: [src/commands/config.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/config.ts)_

docs/decrypt.md

@@ -59,4 +59,4 @@ EXAMPLES
   plain-addresses.yml
 ```
 
-_See code: [src/commands/decrypt.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/decrypt.ts)_
+_See code: [src/commands/decrypt.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/decrypt.ts)_

docs/encrypt.md

@@ -49,4 +49,4 @@ EXAMPLES
   encrypted-custom-preset.yml
 ```
 
-_See code: [src/commands/encrypt.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/encrypt.ts)_
+_See code: [src/commands/encrypt.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/encrypt.ts)_

docs/healthCheck.md

@@ -39,4 +39,4 @@ EXAMPLE
   $ symbol-bootstrap healthCheck
 ```
 
-_See code: [src/commands/healthCheck.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/healthCheck.ts)_
+_See code: [src/commands/healthCheck.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/healthCheck.ts)_

docs/help.md

@@ -20,4 +20,4 @@ OPTIONS
   --all  see all commands in CLI
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.17/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.18/src/commands/help.ts)_

docs/link.md

@@ -58,4 +58,4 @@ EXAMPLES
   $ echo "$MY_ENV_VAR_PASSWORD" | symbol-bootstrap link --unlink --useKnownRestGateways
 ```
 
-_See code: [src/commands/link.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/link.ts)_
+_See code: [src/commands/link.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/link.ts)_

docs/modifyMultisig.md

@@ -69,4 +69,4 @@ EXAMPLES
   $ echo "$MY_ENV_VAR_PASSWORD" | symbol-bootstrap modifyMultisig --useKnownRestGateways
 ```
 
-_See code: [src/commands/modifyMultisig.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/modifyMultisig.ts)_
+_See code: [src/commands/modifyMultisig.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/modifyMultisig.ts)_

docs/pack.md

@@ -16,7 +16,7 @@ USAGE
 OPTIONS
   -a, --assembly=assembly          The assembly that defines the node(s) layout. It can be provided via custom preset or
                                    cli parameter. If not provided, the value is resolved from the target/preset.yml
-                                   file. Options are: api, demo, dual, multinode, peer, my-custom-assembly.yml
+                                   file. Options are: dual, peer, api, demo, multinode, services, my-custom-assembly.yml
                                    (advanced).
 
   -c, --customPreset=customPreset  External preset file. Values in this file will override the provided presets.
@@ -41,6 +41,9 @@ OPTIONS
   --noPassword                     When provided, Bootstrap will not use a password, so private keys will be stored in
                                    plain text. Use with caution.
 
+  --offline                        If --offline is used, Bootstrap resolves the configuration without querying the
+                                   running network.
+
   --password=password              A password used to encrypt and decrypt private keys in preset files like
                                    addresses.yml and preset.yml. Bootstrap prompts for a password by default, can be
                                    provided in the command line (--password=XXXX) or disabled in the command line
@@ -63,4 +66,4 @@ EXAMPLES
   $ echo "$MY_ENV_VAR_PASSWORD" | symbol-bootstrap pack -c custom-preset.yml
 ```
 
-_See code: [src/commands/pack.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/pack.ts)_
+_See code: [src/commands/pack.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/pack.ts)_

docs/presetGuides.md

@@ -385,3 +385,11 @@ Usage examples:
 - Replicate integration tests that may use specific values.
 
 Keep the generated `addresses.yml` and `preset.yml` in the target folder privately!
+
+## Services assembly
+
+When running a `services` assembly with a Faucet, Explorer and HttpProxy, you need to provide the following custom preset:
+```yaml
+domain: my.domain.com   #Your domain, faucet.my.domain.com and explorer.my.domain.com would need to be registered. 
+faucetPrivateKey: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA # The symbol account private key where the Faucet can transfer the tokens from.
+```

docs/renewCertificates.md

@@ -58,4 +58,4 @@ EXAMPLE
   $ symbol-bootstrap renewCertificates
 ```
 
-_See code: [src/commands/renewCertificates.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/renewCertificates.ts)_
+_See code: [src/commands/renewCertificates.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/renewCertificates.ts)_

docs/report.md

@@ -24,4 +24,4 @@ EXAMPLE
   $ symbol-bootstrap report
 ```
 
-_See code: [src/commands/report.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/report.ts)_
+_See code: [src/commands/report.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/report.ts)_

docs/resetData.md

@@ -24,4 +24,4 @@ EXAMPLE
   $ symbol-bootstrap resetData
 ```
 
-_See code: [src/commands/resetData.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/resetData.ts)_
+_See code: [src/commands/resetData.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/resetData.ts)_

docs/run.md

@@ -57,4 +57,4 @@ EXAMPLE
   $ symbol-bootstrap run
 ```
 
-_See code: [src/commands/run.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/run.ts)_
+_See code: [src/commands/run.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/run.ts)_

docs/start.md

@@ -16,8 +16,8 @@ USAGE
 OPTIONS
   -a, --assembly=assembly
       The assembly that defines the node(s) layout. It can be provided via custom preset or cli parameter. If not
-      provided, the value is resolved from the target/preset.yml file. Options are: api, demo, dual, multinode, peer,
-      my-custom-assembly.yml (advanced).
+      provided, the value is resolved from the target/preset.yml file. Options are: dual, peer, api, demo, multinode,
+      services, my-custom-assembly.yml (advanced).
 
   -b, --build
       If provided, docker-compose will run with -b (--build)
@@ -67,6 +67,9 @@ OPTIONS
   --noPassword
       When provided, Bootstrap will not use a password, so private keys will be stored in plain text. Use with caution.
 
+  --offline
+      If --offline is used, Bootstrap resolves the configuration without querying the running network.
+
   --password=password
       A password used to encrypt and decrypt private keys in preset files like addresses.yml and preset.yml. Bootstrap
       prompts for a password by default, can be provided in the command line (--password=XXXX) or disabled in the command
@@ -98,4 +101,4 @@ EXAMPLES
   $ echo "$MY_ENV_VAR_PASSWORD" | symbol-bootstrap start -p testnet -a dual
 ```
 
-_See code: [src/commands/start.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/start.ts)_
+_See code: [src/commands/start.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/start.ts)_

docs/stop.md

@@ -24,4 +24,4 @@ EXAMPLE
   $ symbol-bootstrap stop
 ```
 
-_See code: [src/commands/stop.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/stop.ts)_
+_See code: [src/commands/stop.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/stop.ts)_

docs/updateVotingKeys.md

@@ -47,4 +47,4 @@ EXAMPLE
   $ symbol-bootstrap updateVotingKeys
 ```
 
-_See code: [src/commands/updateVotingKeys.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/updateVotingKeys.ts)_
+_See code: [src/commands/updateVotingKeys.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/updateVotingKeys.ts)_

docs/verify.md

@@ -23,4 +23,4 @@ EXAMPLE
   $ symbol-bootstrap verify
 ```
 
-_See code: [src/commands/verify.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/verify.ts)_
+_See code: [src/commands/verify.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/verify.ts)_

docs/wizard.md

@@ -39,4 +39,4 @@ EXAMPLE
   $ symbol-bootstrap wizard
 ```
 
-_See code: [src/commands/wizard.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.4/src/commands/wizard.ts)_
+_See code: [src/commands/wizard.ts](https://github.com/fboucquez/symbol-bootstrap/blob/v1.1.7/src/commands/wizard.ts)_