fix: Catapult 1.0.2.0 upgrade. TotalVotingBalanceCalculationFix fork (

#292) fix: Catapult `1.0.2.0` upgrade. TotalVotingBalanceCalculationFix fork fix: Updated `minPartnerNodeVersion` to `1.0.1.0`. fix: Updated testnet fork height to 398520
fboucquez · Sep 15, 2021 · 03cd88a · 03cd88a
1 parent 83fcaf3
commit 03cd88a
Show file tree

Hide file tree

Showing 41 changed files with 184 additions and 122 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,13 @@ 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] - Sep-13-2021
+## [1.0.8] - Sep-14-2021
 
-**Milestone**: Mainnet(1.0.1.0)
+**Milestone**: Mainnet(1.0.2.0)
 
--   Fixed `updateVotingKeys` command when upgrading from 1.0.6.
+- 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                                                               |
 | ---------------- | ------- | ------------------------------------------------------------------ |

diff --git a/config/node/resources/config-network.properties.mustache b/config/node/resources/config-network.properties.mustache
@@ -46,6 +46,10 @@ harvestNetworkFeeSinkAddress = {{{harvestNetworkFeeSinkAddress}}}
 
 maxTransactionsPerBlock = {{{toAmount maxTransactionsPerBlock}}}
 
+[fork_heights]
+
+totalVotingBalanceCalculationFix = {{{toAmount totalVotingBalanceCalculationFix}}}
+
 [plugin:catapult.plugins.accountlink]
 
 dummy = to trigger plugin load

diff --git a/presets/descriptions.yml b/presets/descriptions.yml
@@ -268,6 +268,9 @@ blockPruneInterval:
 maxTransactionsPerBlock:
     type: uint32_t
     description: Maximum number of transactions per block.
+totalVotingBalanceCalculationFix:
+  type: uint32_t
+  description: Height of fork to fix TotalVotingBalance calculation.
 maxTransactionsPerAggregate:
     type: uint32_t
     description: Maximum number of transactions per aggregate.

diff --git a/presets/mainnet/network.yml b/presets/mainnet/network.yml
@@ -42,6 +42,7 @@ blockGenerationTargetTime: 30s
 defaultDynamicFeeMultiplier: 100
 rootNamespaceRentalFeePerBlock: 2
 childNamespaceRentalFee: 100000
+totalVotingBalanceCalculationFix: 528000
 mosaicRentalFee: 500000
 throttlingBurst: 80
 throttlingRate: 60

diff --git a/presets/shared.yml b/presets/shared.yml
@@ -64,7 +64,7 @@ maxNameSize: 64
 maxChildNamespaces: 256
 maxNamespaceDepth: 3
 batchVerificationRandomSource:
-symbolServerImage: symbolplatform/symbol-server:gcc-10-1.0.1.0
+symbolServerImage: symbolplatform/symbol-server:gcc-10-1.0.2.0
 symbolRestImage: symbolplatform/symbol-rest:2.3.6
 symbolExplorerImage: symbolplatform/symbol-explorer:0.6.3-alpha
 symbolWalletImage: symbolplatform/symbol-desktop-wallet:1.0.1
@@ -86,6 +86,7 @@ enableDelegatedHarvestersAutoDetection: true
 catapultAppFolder: /usr/catapult
 rewardProgramAgentPort: 7881
 enableRevoteOnBoot: true
+totalVotingBalanceCalculationFix: 0
 
 # config database
 databaseName: catapult
@@ -101,7 +102,7 @@ peersApiListLimit: 10
 shortLivedCacheMessageDuration: 10m
 messageSynchronizationMaxResponseSize: 20MB
 finalizationSize: 10000
-finalizationThreshold: 7000
+finalizationThreshold: 6700
 maxHashesPerPoint: 256
 prevoteBlocksMultiple: 4
 nonVotingUnfinalizedBlocksDuration: 8m
@@ -163,9 +164,9 @@ delegatePrioritizationPolicy: Importance
 dockerComposeVersion: '2.4'
 dockerComposeServiceRestart: 'on-failure:2'
 dockerComposeDebugMode: false
-minPartnerNodeVersion: 1.0.0.0
+minPartnerNodeVersion: 1.0.1.0
 maxPartnerNodeVersion: 1.0.255.255
-serverVersion: 1.0.1.0
+serverVersion: 1.0.2.0
 outgoing_connections_maxConnections: 10
 outgoing_connections_maxConnectionAge: 200
 outgoing_connections_maxConnectionBanAge: 20

diff --git a/presets/testnet/network.yml b/presets/testnet/network.yml
@@ -42,6 +42,7 @@ blockGenerationTargetTime: 30s
 defaultDynamicFeeMultiplier: 100
 rootNamespaceRentalFeePerBlock: 2
 childNamespaceRentalFee: 100000
+totalVotingBalanceCalculationFix: 398520
 mosaicRentalFee: 500000
 throttlingBurst: 80
 throttlingRate: 60

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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 NORMAL
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 DEBUG
         ports:

diff --git a/test/composes/expected-docker-compose-bootstrap-full.yml b/test/composes/expected-docker-compose-bootstrap-full.yml
@@ -21,7 +21,7 @@ services:
         privileged: true
     peer-node-0:
         container_name: peer-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 DEBUG false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -43,7 +43,7 @@ services:
         hostname: peer-node-0
     peer-node-1:
         container_name: peer-node-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 DEBUG false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -65,7 +65,7 @@ services:
         hostname: peer-node-1
     api-node-0:
         container_name: api-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 DEBUG true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -88,7 +88,7 @@ services:
         hostname: api-node-0
     api-node-broker-0:
         container_name: api-node-broker-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 DEBUG
         ports:

diff --git a/test/composes/expected-docker-compose-bootstrap-repeat.yml b/test/composes/expected-docker-compose-bootstrap-repeat.yml
@@ -59,7 +59,7 @@ services:
     peer-node-0:
         user: '1000:1000'
         container_name: peer-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -77,7 +77,7 @@ services:
     peer-node-1:
         user: '1000:1000'
         container_name: peer-node-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -95,7 +95,7 @@ services:
     peer-node-2:
         user: '1000:1000'
         container_name: peer-node-2
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-2 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -113,7 +113,7 @@ services:
     api-node-0:
         user: '1000:1000'
         container_name: api-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -132,7 +132,7 @@ services:
     api-node-1:
         user: '1000:1000'
         container_name: api-node-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-1 NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -151,7 +151,7 @@ services:
     api-node-2:
         user: '1000:1000'
         container_name: api-node-2
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-2 NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -170,7 +170,7 @@ services:
     api-node-3:
         user: '1000:1000'
         container_name: api-node-3
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-3 NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -189,7 +189,7 @@ services:
     api-node-broker-0:
         user: '1000:1000'
         container_name: api-node-broker-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 NORMAL
         ports:
@@ -204,7 +204,7 @@ services:
     api-node-broker-1:
         user: '1000:1000'
         container_name: api-node-broker-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-1 NORMAL
         ports:
@@ -219,7 +219,7 @@ services:
     api-node-broker-2:
         user: '1000:1000'
         container_name: api-node-broker-2
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-2 NORMAL
         ports:
@@ -234,7 +234,7 @@ services:
     api-node-broker-3:
         user: '1000:1000'
         container_name: api-node-broker-3
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-3 NORMAL
         ports:

diff --git a/test/composes/expected-docker-compose-bootstrap.yml b/test/composes/expected-docker-compose-bootstrap.yml
@@ -17,7 +17,7 @@ services:
     peer-node-0:
         user: '1000:1000'
         container_name: peer-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -35,7 +35,7 @@ services:
     peer-node-1:
         user: '1000:1000'
         container_name: peer-node-1
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 NORMAL false
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -53,7 +53,7 @@ services:
     api-node-0:
         user: '1000:1000'
         container_name: api-node-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 NORMAL true
         stop_signal: SIGINT
         working_dir: /symbol-workdir
@@ -72,7 +72,7 @@ services:
     api-node-broker-0:
         user: '1000:1000'
         container_name: api-node-broker-0
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server api-node-broker-0 NORMAL
         ports:

diff --git a/test/composes/expected-mainnet-api-compose.yml b/test/composes/expected-mainnet-api-compose.yml
@@ -15,7 +15,7 @@ services:
     node:
         user: '1000:1000'
         container_name: node
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT

diff --git a/test/composes/expected-mainnet-dual-compose.yml b/test/composes/expected-mainnet-dual-compose.yml
@@ -15,7 +15,7 @@ services:
     node:
         user: '1000:1000'
         container_name: node
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT

diff --git a/test/composes/expected-mainnet-peer-compose.yml b/test/composes/expected-mainnet-peer-compose.yml
@@ -3,7 +3,7 @@ services:
     node:
         user: '1000:1000'
         container_name: node
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node NORMAL false
         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
@@ -15,7 +15,7 @@ services:
     node:
         user: '1000:1000'
         container_name: node
-        image: 'symbolplatform/symbol-server:gcc-10-1.0.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         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.1.0'
+        image: 'symbolplatform/symbol-server:gcc-10-1.0.2.0'
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT