Merge branch 'v1.1-dev' into feat/configure-wait-for-st-result-timeout

dashpay · Aug 13, 2024 · 9988f37 · 9988f37
2 parents faf6497 + c4b4e02
commit 9988f37
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -303,7 +303,7 @@ export default function getBaseConfigFactory(homeDir) {
           tenderdash: {
             mode: 'full',
             docker: {
-              image: 'dashpay/tenderdash:1.1.0',
+              image: 'dashpay/tenderdash:1.2.0-dev.3',
             },
             p2p: {
               host: '0.0.0.0',
@@ -314,6 +314,8 @@ export default function getBaseConfigFactory(homeDir) {
               maxPacketMsgPayloadSize: 10240,
               sendRate: 5120000,
               recvRate: 5120000,
+              maxConnections: 64,
+              maxOutgoingConnections: 30,
             },
             rpc: {
               host: '127.0.0.1',
@@ -390,15 +392,13 @@ export default function getBaseConfigFactory(homeDir) {
                   app_version: '1',
                 },
                 timeout: {
-                  propose: '40000000000',
+                  propose: '50000000000',
                   propose_delta: '5000000000',
-                  vote: '2000000000',
-                  vote_delta: '500000000',
-                  commit: '1000000000',
-                  bypass_commit_timeout: false,
+                  vote: '10000000000',
+                  vote_delta: '1000000000',
                 },
                 synchrony: {
-                  message_delay: '32000000000',
+                  message_delay: '70000000000',
                   precision: '1000000000',
                 },
                 abci: {

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -770,6 +770,12 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
           .forEach(([, options]) => {
             options.platform.gateway.listeners.dapiAndDrive.waitForStResultTimeout = '125s';
             options.platform.dapi.api.waitForStResultTimeout = 120000;
+
+            options.platform.drive.tenderdash.p2p.maxConnections = 64;
+            options.platform.drive.tenderdash.p2p.maxOutgoingConnections = 30;
+            options.platform.drive.tenderdash.genesis
+              .consensus_params = base.get('platform.drive.tenderdash.genesis.consensus_params');
+            options.platform.drive.tenderdash.docker.image = base.get('platform.drive.tenderdash.docker.image');
           });
         return configFile;
       },

diff --git a/packages/dashmate/src/config/configJsonSchema.js b/packages/dashmate/src/config/configJsonSchema.js
@@ -947,8 +947,16 @@ export default {
                       type: 'integer',
                       minimum: 0,
                     },
+                    maxConnections: {
+                      type: 'integer',
+                      minimum: 1,
+                    },
+                    maxOutgoingConnections: {
+                      type: 'integer',
+                      minimum: 1,
+                    },
                   },
-                  required: ['host', 'port', 'persistentPeers', 'seeds', 'flushThrottleTimeout', 'maxPacketMsgPayloadSize', 'sendRate', 'recvRate'],
+                  required: ['host', 'port', 'persistentPeers', 'seeds', 'flushThrottleTimeout', 'maxPacketMsgPayloadSize', 'sendRate', 'recvRate', 'maxConnections', 'maxOutgoingConnections'],
                   additionalProperties: false,
                 },
                 mempool: {

diff --git a/packages/dashmate/templates/platform/drive/tenderdash/config.toml.dot b/packages/dashmate/templates/platform/drive/tenderdash/config.toml.dot
@@ -278,11 +278,11 @@ persistent-peers = "{{~it.platform.drive.tenderdash.p2p.persistentPeers :peer:in
 upnp = false
 
 # Maximum number of connections (inbound and outbound).
-max-connections = 64
+max-connections = {{=it.platform.drive.tenderdash.p2p.maxConnections}}
 
 # Maximum number of connections reserved for outgoing
 # connections. Must be less than max-connections
-max-outgoing-connections = 12
+max-outgoing-connections = {{=it.platform.drive.tenderdash.p2p.maxOutgoingConnections}}
 
 # Rate limits the number of incoming connection attempts per IP address.
 max-incoming-connection-attempts = 100