Merge branch 'native_voting_key_file' of github.com:nemtech/symbol-bo…

…otstrap into native_voting_key_file # Conflicts: # presets/shared.yml
fboucquez · May 21, 2021 · 3b62d86 · 3b62d86
2 parents 11d3b0a + 9a3157e
commit 3b62d86
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,7 +52,6 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 | ---------------- | ------- | ------------------------------------------------------------------ |
 | Symbol Bootstrap | v1.0.3  | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |
 
--   Native and offline ready voting key file generation.
 -   Improved Custom Preset Object types for symbol bootstrap lib integration.
 -   TransactionSelectionStrategy's new default value is `oldest`.
 

diff --git a/presets/bootstrap/network.yml b/presets/bootstrap/network.yml
@@ -13,6 +13,7 @@ faucetUrl: http://localhost:100/
 beneficiaryAddress: ''
 votingKeyDesiredLifetime: 720
 lastKnownNetworkEpoch: 1
+restExtensions: 'accountLink, aggregate, lockHash, lockSecret, mosaic, metadata, multisig, namespace, receipts, restrictions, transfer'
 nemesis:
     mosaics:
         - name: '{{currencyName}}'

diff --git a/presets/mainnet/network.yml b/presets/mainnet/network.yml
@@ -50,6 +50,7 @@ maxChildNamespaces: 100
 nonVotingUnfinalizedBlocksDuration: 10m
 votingUnfinalizedBlocksDuration: 0m
 timeSynchronizationMinImportance: 10000000000
+restExtensions: 'accountLink, aggregate, lockHash, lockSecret, mosaic, metadata, multisig, namespace, receipts, restrictions, transfer, cmc'
 knownRestGateways:
     - 'http://ngl-dual-001.symbolblockchain.io:3000'
     - 'http://ngl-dual-002.symbolblockchain.io:3000'

diff --git a/presets/shared.yml b/presets/shared.yml
@@ -65,7 +65,7 @@ maxNamespaceDepth: 3
 batchVerificationRandomSource:
 symbolServerToolsImage: symbolplatform/symbol-server:tools-gcc-1.0.0.0
 symbolServerImage: symbolplatform/symbol-server:gcc-1.0.0.0
-symbolRestImage: symbolplatform/symbol-rest:2.3.5
+symbolRestImage: symbolplatform/symbol-rest:2.3.6-alpha
 symbolExplorerImage: symbolplatform/symbol-explorer:0.6.3-alpha
 symbolWalletImage: symbolplatform/symbol-desktop-wallet:1.0.1
 symbolFaucetImage: symbolplatform/symbol-faucet:0.5.0-alpha

diff --git a/presets/testnet/network.yml b/presets/testnet/network.yml
@@ -52,6 +52,7 @@ votingUnfinalizedBlocksDuration: 0m
 timeSynchronizationMinImportance: 10000000000
 faucetUrl: 'http://faucet.testnet.symboldev.network'
 explorerUrl: 'http://explorer.testnet.symboldev.network'
+restExtensions: 'accountLink, aggregate, lockHash, lockSecret, mosaic, metadata, multisig, namespace, receipts, restrictions, transfer, cmc'
 knownRestGateways:
     - 'http://ngl-dual-501.testnet.symboldev.network:3000'
     - 'http://ngl-dual-601.testnet.symboldev.network:3000'

diff --git a/test/composes/expected-docker-compose-bootstrap-custom-compose.yml b/test/composes/expected-docker-compose-bootstrap-custom-compose.yml
@@ -105,7 +105,7 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-docker-compose-bootstrap-custom.yml b/test/composes/expected-docker-compose-bootstrap-custom.yml
@@ -103,7 +103,7 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-docker-compose-bootstrap-full.yml b/test/composes/expected-docker-compose-bootstrap-full.yml
@@ -108,7 +108,7 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-docker-compose-bootstrap-repeat.yml b/test/composes/expected-docker-compose-bootstrap-repeat.yml
@@ -249,7 +249,7 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -266,7 +266,7 @@ services:
     rest-gateway-1:
         container_name: rest-gateway-1
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -283,7 +283,7 @@ services:
     rest-gateway-2:
         container_name: rest-gateway-2
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -300,7 +300,7 @@ services:
     rest-gateway-3:
         container_name: rest-gateway-3
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-docker-compose-bootstrap.yml b/test/composes/expected-docker-compose-bootstrap.yml
@@ -87,7 +87,7 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-mainnet-api-compose.yml b/test/composes/expected-mainnet-api-compose.yml
@@ -44,7 +44,7 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-mainnet-dual-compose.yml b/test/composes/expected-mainnet-dual-compose.yml
@@ -44,7 +44,7 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-testnet-api-compose.yml b/test/composes/expected-testnet-api-compose.yml
@@ -44,7 +44,7 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-testnet-dual-compose.yml b/test/composes/expected-testnet-dual-compose.yml
@@ -44,7 +44,7 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-testnet-supernode-compose.yml b/test/composes/expected-testnet-supernode-compose.yml
@@ -61,7 +61,7 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/composes/expected-testnet-voting-compose.yml b/test/composes/expected-testnet-voting-compose.yml
@@ -44,7 +44,7 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.3.5'
+        image: 'symbolplatform/symbol-rest:2.3.6-alpha'
         command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir

diff --git a/test/reports/bootstrap-voting/rest-gateway-0-rest.json b/test/reports/bootstrap-voting/rest-gateway-0-rest.json
@@ -26,8 +26,7 @@
     "namespace",
     "receipts",
     "restrictions",
-    "transfer",
-    "cmc"
+    "transfer"
   ],
   "db": {
     "url": "mongodb://db-0:27017/",
@@ -84,4 +83,4 @@
     }
   },
   "numBlocksTransactionFeeStats": 300
-}
+}