Hotfix: Catapult client aggregate v2 (#388)

BREAKING - catapult client register aggregate transaction hash validator and require aggregate version 2 after fork. Client version is v1.0.3.4. rest-gateway update to v2.4.2 symbol-sdk update to v2.0.3
fboucquez · Oct 25, 2022 · 1faad8a · 1faad8a
1 parent 2b984eb
commit 1faad8a
Show file tree

Hide file tree

Showing 46 changed files with 538 additions and 150 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,15 @@
 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.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
 

diff --git a/config/node/resources/config-network.properties.mustache b/config/node/resources/config-network.properties.mustache
@@ -126,9 +126,16 @@ maxMessageSize = {{{maxMessageSize}}}
 
 totalVotingBalanceCalculationFix = {{{toAmount totalVotingBalanceCalculationFix}}}
 treasuryReissuance = {{{toAmount treasuryReissuance}}}
+strictAggregateTransactionHash = {{{toAmount strictAggregateTransactionHash}}}
 
 [treasury_reissuance_transaction_signatures]
 
 {{#each treasuryReissuanceTransactionSignatures}}
 {{this}} = true
 {{/each}}
+
+[corrupt_aggregate_transaction_hashes]
+
+{{#each corruptAggregateTransactionHashes}}
+{{this.key}} = {{this.value}}
+{{/each}}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "symbol-bootstrap",
     "description": "Symbol tool that allows you creating, configuring and running Symbol's networks",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "author": "Fernando Boucquez <fboucquez@gmail.com>",
     "bin": {
         "symbol-bootstrap": "bin/run"
@@ -25,7 +25,7 @@
         "rxjs": "^7.5.2",
         "semver": "^7.3.5",
         "shx": "^0.3.4",
-        "symbol-sdk": "^1.0.4-alpha-202112211435",
+        "symbol-sdk": "^2.0.3",
         "symbol-statistics-service-typescript-fetch-client": "^1.1.5",
         "tslib": "^2.3.1",
         "utf8": "^3.0.0",
@@ -71,7 +71,7 @@
         "typescript": "^4.5.5"
     },
     "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
     },
     "files": [
         "/config",

diff --git a/presets/mainnet/network.yml b/presets/mainnet/network.yml
@@ -27,7 +27,7 @@ minVotingKeyLifetime: 112
 maxVotingKeyLifetime: 360
 votingKeyDesiredLifetime: 360
 votingKeyDesiredFutureLifetime: 60
-lastKnownNetworkEpoch: 688
+lastKnownNetworkEpoch: 1176
 stepDuration: 5m
 maxBlockFutureTime: 300ms
 maxAccountRestrictionValues: 100
@@ -41,6 +41,7 @@ rootNamespaceRentalFeePerBlock: 2
 childNamespaceRentalFee: 100000
 totalVotingBalanceCalculationFix: 528000
 treasuryReissuance: 689761
+strictAggregateTransactionHash: 1'690'500
 mosaicRentalFee: 500000
 throttlingBurst: 80
 throttlingRate: 60
@@ -128,6 +129,67 @@ treasuryReissuanceTransactionSignatures:
     - C0BAE301EC15B514C5685A661BC3E23A6596CE9DC412A83F67A8C8611A4415B1B0447E8C09D2816CAE0D750C4AB1ED8FE9C85C05D448C2114147A2C935030708
     - A317F4EB085C8D3D80435669EF54C6C9C9AD9B57165B14CF051F43879D0112E3A79591DD6D469BFAA850891FA2CB601BA58CD1BAEBFF5D84C49179AC7FE14706
     - FDB98C472D0B98FDD766DA177366DEB2DB0E79721BD73DA96A84622A98932DA75BAA327BA9E23D448C6F25344654A6F17F7734C14D1530B327F911A97B4DE30A
+corruptAggregateTransactionHashes:
+    -
+        key: 97CA49FCE55644FF28248C6EA4DCB6E87E53909811DEE2513F0218DAA394679F
+        value: 657BE411624B617F51CD8D151735F50FE50A91A5B7D0658192EF3EC4DD0C91C3
+    -
+        key: B2813813F709C3011468E23E61AE102BCB55A28A87D0CF74968B8BD2413615AA
+        value: 3FEF96C5496E60BC1D33815139BDCD4FA707CE1C2A9A25FF4F7D3B1BE698116C
+    -
+        key: 30FA71E6D1E34DF1E430A07E1B0817BED9A4ED6B0245B7471B0557380A700E1B
+        value: AE377EAB7F1970DEC21FF305C39EBDD3ECE413B911EF3E4E11F7DDDC9C9C9748
+    -
+        key: E14FB95DA63CDA9899474D7EFD0DCB6A6C9E8931DF12ECA01F22DF2B59B6624C
+        value: 342E7C1E6318F7DCE5CE5A09B8FA1820453C4437AEF1B872BD06531E3ADB41C0
+    -
+        key: 55EB9659C81600F1760C4C0A4F8A7A5C90A39FCEE36E3165143B8E72BBC709E8
+        value: 8980CF4407A48410C4E910FE766C135F8C3C84EA9917BFDB7A71434C2CDC625A
+    -
+        key: D24D000FABBD1AC4BC21006A5CAE76AE9C32792A4920F66D6A6C6F76B438BDF1
+        value: 5FDEF85E8B3669FF155B5F3DA98288C6ED8A293CC699338ADB743C0F5E8614ED
+    -
+        key: 26FF5E7174DEEF3147DB25C37C7AE9905157ACBA2D233D40D1F77A65B60D59BC
+        value: 3A2F78C2E7B10FF84EB33BF1DD0FD61951F8E3EA3303614D1B20060CD88F6E14
+    -
+        key: 2DF1D19B5E68102665D11B3CF3069AB5DFED2E60A7690C8788172E0E5E30B72D
+        value: 3B64321593D06FF37B191F52FE31E107A8FDB0116AB5374157F8F415B8C73BE4
+    -
+        key: 8BAA5EC2DDF55EE583ABB7EA4A4FE6EB8A4C16C41ED30CB1E68F6D1F40C3FC5A
+        value: 59850BF728A08555D10DAD5745EE2A349FECC0B16810F5D32CF3DFC376DEFFE1
+    -
+        key: 8CE147B1B64E200FA48B17FE5B6F4FA2FFEC83FF03A1EC0D4725AB8122AF5B05
+        value: 1F3D4045C3482A9EED536F61CAA58284323037B72A9A774A0C75932F85999B0F
+    -
+        key: BC312549DB027287836AD52B6EA30171AA1958B20BEB3D659F843D699DE45FD3
+        value: 4AC4B12DE7C5B0D02BFFEA3ED98F4247FAFF701C4CE0A2CFD75E7F633DB0ED60
+    -
+        key: B35D60C826470EB38B6963DCEF5A9FE406EDE405676EDB027956999D7618998D
+        value: D8915C7EFFDB62B3CB5872597522C0920AF5D55EC44A4548DF8679C08A0C0541
+    -
+        key: 91C27BE7E5AC8EBCE6A5D576DE250054A3CDC2B674BAD5FA29B554C0A50E2973
+        value: 05718908AFBA83B420AE19BE0A11EE36119AC960353BA6C3F180078C8C4B428D
+    -
+        key: D91689D6A3C9FE7AABB45C3FC44373DA23EF363D71360CB4B7ECD74F0BDE893B
+        value: D8915C7EFFDB62B3CB5872597522C0920AF5D55EC44A4548DF8679C08A0C0541
+    -
+        key: 8090FFF457D88D98ACFDA7872DAAD1A901B4CB081387B1A45AFDA8EEF686EB54
+        value: 05718908AFBA83B420AE19BE0A11EE36119AC960353BA6C3F180078C8C4B428D
+    -
+        key: 33937869216924161235BA8E10DC075592022C22F6593042A1064ADD24B64FE8
+        value: 9C00D552960DEDC38A009B541681B2C7A68902D94A9D6C089604D2E7EFCCD88E
+    -
+        key: BDF7755E44E1405C3353AB97651DD82785C6A3A8EAA5EA1CEA0E30DADB0D12F8
+        value: B6D02DA3F69C20F69A9209B13192174091544512CD7D2CE53C366909B354B7B1
+    -
+        key: 852A41F9452A34054DE1C21E46F925EA7B50D26AF97FBA8D745F01CC6DD5097F
+        value: 8626BB52F6457D95B01A5C178E6A6977F8BD418CD9A7D5B0A814210E0A4FBBA3
+    -
+        key: C1E7404CDAE41ACE07E8649FA2D5E3E2FF5DA502E43E5D1C6073192823F90BE6
+        value: A7321E82547506079C0692DC0DFF8C9CB0D56DD2C9E3208F479DB8970B985E6C
+    -
+        key: C0FAAD2439E9D8017F9A2E5F67A46850195209402C1EE55CF99880426D0F454F
+        value: 3B74892D50665E4A989C89EDCE88905937B81BF260A679653E86886407812F83
 nemesis:
     mosaics:
         -

diff --git a/presets/shared.yml b/presets/shared.yml
@@ -64,8 +64,8 @@ maxNameSize: 64
 maxChildNamespaces: 256
 maxNamespaceDepth: 3
 batchVerificationRandomSource:
-symbolServerImage: symbolplatform/symbol-server:gcc-10-1.0.3.3
-symbolRestImage: symbolplatform/symbol-rest:2.4.0
+symbolServerImage: symbolplatform/symbol-server:gcc-1.0.3.4
+symbolRestImage: symbolplatform/symbol-rest:2.4.2
 symbolExplorerImage: symbolplatform/symbol-explorer:1.1.1-alpha-202110290945
 symbolFaucetImage: symbolplatform/symbol-faucet:1.0.1-alpha-202110131930
 mongoImage: mongo:4.4.3-bionic
@@ -86,6 +86,7 @@ catapultAppFolder: /usr/catapult
 enableRevoteOnBoot: true
 totalVotingBalanceCalculationFix: 0
 treasuryReissuance: 0
+strictAggregateTransactionHash: 0
 caCertificateExpirationInDays: 7300 # 20 years
 nodeCertificateExpirationInDays: 375 # 1.02 years
 certificateExpirationWarningInDays: 30 # certificates are allowed to be renewed 30 before expiring
@@ -226,3 +227,5 @@ statisticsServicePeerFilter: ''
 statisticsServicePeerLimit: 50
 statisticsServiceRestFilter: suggested
 statisticsServiceRestLimit: 10
+
+corruptAggregateTransactionHashes: []
diff --git a/presets/testnet/network.yml b/presets/testnet/network.yml
@@ -22,7 +22,7 @@ importanceGrouping: 180
 votingSetGrouping: 720
 votingKeyDesiredLifetime: 720
 votingKeyDesiredFutureLifetime: 120
-lastKnownNetworkEpoch: 260
+lastKnownNetworkEpoch: 1002
 minVotingKeyLifetime: 28
 maxVotingKeyLifetime: 720
 stepDuration: 4m

diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts
@@ -247,8 +247,9 @@ export class ComposeService {
                         await resolveService(n, {
                             container_name: n.name,
                             user,
+                            environment: { npm_config_cache: nodeWorkingDirectory },
                             image: presetData.symbolRestImage,
-                            command: 'npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json',
+                            command: 'npm start --prefix /app /symbol-workdir/rest.json',
                             stop_signal: 'SIGINT',
                             working_dir: nodeWorkingDirectory,
                             ports: resolvePorts([{ internalPort: restInternalPort, openPort: n.openPort }]),

diff --git a/test/composes/expected-docker-compose-bootstrap-custom-compose.yml b/test/composes/expected-docker-compose-bootstrap-custom-compose.yml
@@ -23,7 +23,7 @@ services:
     peer-node-0:
         user: '1000:1000'
         container_name: peer-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -47,7 +47,7 @@ services:
     peer-node-1:
         user: '1000:1000'
         container_name: peer-node-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -71,7 +71,7 @@ services:
     api-node-0:
         user: '1000:1000'
         container_name: api-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -90,7 +90,7 @@ services:
     api-node-broker-0:
         user: '1000:1000'
         container_name: api-node-broker-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 NORMAL
         ports:
@@ -105,8 +105,10 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.4.0'
-        command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
+        environment:
+          npm_config_cache: /symbol-workdir
+        image: 'symbolplatform/symbol-rest:2.4.2'
+        command: npm start --prefix /app /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
         ports:

diff --git a/test/composes/expected-docker-compose-bootstrap-custom.yml b/test/composes/expected-docker-compose-bootstrap-custom.yml
@@ -16,7 +16,7 @@ services:
             - '../databases/db-0:/dbdata:rw'
     peer-node-0:
         container_name: peer-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 DEBUG false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -38,7 +38,7 @@ services:
         hostname: peer-node-0
     peer-node-1:
         container_name: peer-node-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 DEBUG false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -60,7 +60,7 @@ services:
         hostname: peer-node-1
     api-node-0:
         container_name: api-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 DEBUG true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -83,7 +83,7 @@ services:
         hostname: api-node-0
     api-node-broker-0:
         container_name: api-node-broker-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 DEBUG
         ports:
@@ -103,8 +103,10 @@ services:
     rest-gateway-0:
         container_name: rest-gateway-0
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.4.0'
-        command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
+        environment:
+          npm_config_cache: /symbol-workdir
+        image: 'symbolplatform/symbol-rest:2.4.2'
+        command: npm start --prefix /app /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
         ports:

diff --git a/test/composes/expected-docker-compose-bootstrap-demo.yml b/test/composes/expected-docker-compose-bootstrap-demo.yml
@@ -19,7 +19,7 @@ services:
         privileged: true
     node:
         container_name: node
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node DEBUG true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -39,7 +39,7 @@ services:
         privileged: true
     broker:
         container_name: broker
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker DEBUG
         stop_signal: SIGINT
@@ -57,8 +57,10 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.4.0'
-        command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
+        environment:
+          npm_config_cache: /symbol-workdir
+        image: 'symbolplatform/symbol-rest:2.4.2'
+        command: npm start --prefix /app /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
         ports:

diff --git a/test/composes/expected-docker-compose-bootstrap-dual.yml b/test/composes/expected-docker-compose-bootstrap-dual.yml
@@ -15,7 +15,7 @@ services:
     node:
         user: '1000:1000'
         container_name: node
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -31,7 +31,7 @@ services:
     broker:
         user: '1000:1000'
         container_name: broker
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.3.3'
+        image: 'symbolplatform/symbol-server:gcc-1.0.3.4'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT
@@ -44,8 +44,10 @@ services:
     rest-gateway:
         container_name: rest-gateway
         user: '1000:1000'
-        image: 'symbolplatform/symbol-rest:2.4.0'
-        command: npm start --prefix /app/catapult-rest/rest /symbol-workdir/rest.json
+        environment:
+          npm_config_cache: /symbol-workdir
+        image: 'symbolplatform/symbol-rest:2.4.2'
+        command: npm start --prefix /app /symbol-workdir/rest.json
         stop_signal: SIGINT
         working_dir: /symbol-workdir
         ports: