feat: configure wait for ST result timeout (#2045)

dashpay · Aug 13, 2024 · 38fa81b · 38fa81b
1 parent c4b4e02
commit 38fa81b
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 10 deletions.
diff --git a/packages/dapi/.env.example b/packages/dapi/.env.example
@@ -42,3 +42,5 @@ DRIVE_RPC_PORT=26670
 NODE_ENV=production
 
 LOG_LEVEL=trace
+
+WAIT_FOR_ST_RESULT_TIMEOUT=80000
diff --git a/packages/dapi/lib/grpcServer/handlers/platform/platformHandlersFactory.js b/packages/dapi/lib/grpcServer/handlers/platform/platformHandlersFactory.js
@@ -104,6 +104,7 @@ function platformHandlersFactory(
     blockchainListener,
     dpp,
     createGrpcErrorFromDriveResponse,
+    parseInt(process.env.WAIT_FOR_ST_RESULT_TIMEOUT, 10),
   );
 
   const wrappedWaitForStateTransitionResult = jsonToProtobufHandlerWrapper(

diff --git a/packages/dapi/lib/grpcServer/handlers/platform/waitForStateTransitionResultHandlerFactory.js b/packages/dapi/lib/grpcServer/handlers/platform/waitForStateTransitionResultHandlerFactory.js
@@ -34,7 +34,7 @@ function waitForStateTransitionResultHandlerFactory(
   blockchainListener,
   dpp,
   createGrpcErrorFromDriveResponse,
-  stateTransitionWaitTimeout = 80000,
+  stateTransitionWaitTimeout,
 ) {
   /**
    * @param {Object} txDeliverResult

diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -178,6 +178,7 @@ export default function getBaseConfigFactory(homeDir) {
               http2: {
                 maxConcurrentStreams: 10,
               },
+              waitForStResultTimeout: '125s',
               host: '0.0.0.0',
               port: 443,
             },
@@ -235,6 +236,7 @@ export default function getBaseConfigFactory(homeDir) {
                 target: 'dapi',
               },
             },
+            waitForStResultTimeout: 120000,
           },
         },
         drive: {

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -768,6 +768,8 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
       '1.1.0-dev.1': (configFile) => {
         Object.entries(configFile.configs)
           .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;

diff --git a/packages/dashmate/docker-compose.yml b/packages/dashmate/docker-compose.yml
@@ -140,6 +140,7 @@ services:
       - NODE_ENV=${ENVIRONMENT:?err}
       - DRIVE_RPC_HOST=drive_abci
       - DRIVE_RPC_PORT=26670
+      - WAIT_FOR_ST_RESULT_TIMEOUT=${PLATFORM_DAPI_API_WAIT_FOR_ST_RESULT_TIMEOUT:?err}
     command: yarn run api
     stop_grace_period: 10s
     expose:

diff --git a/packages/dashmate/src/config/configJsonSchema.js b/packages/dashmate/src/config/configJsonSchema.js
@@ -519,6 +519,9 @@ export default {
                       additionalProperties: false,
                       required: ['maxConcurrentStreams'],
                     },
+                    waitForStResultTimeout: {
+                      $ref: '#/definitions/durationInSeconds',
+                    },
                     host: {
                       type: 'string',
                       minLength: 1,
@@ -528,7 +531,7 @@ export default {
                       $ref: '#/definitions/port',
                     },
                   },
-                  required: ['http2', 'host', 'port'],
+                  required: ['http2', 'host', 'port', 'waitForStResultTimeout'],
                   additionalProperties: false,
                 },
               },
@@ -777,8 +780,13 @@ export default {
                   required: ['image', 'build', 'deploy'],
                   additionalProperties: false,
                 },
+                waitForStResultTimeout: {
+                  type: 'integer',
+                  minimum: 1,
+                  description: 'How many millis to wait for state transition result before timeout',
+                },
               },
-              required: ['docker'],
+              required: ['docker', 'waitForStResultTimeout'],
               additionalProperties: false,
             },
           },

diff --git a/packages/dashmate/templates/platform/gateway/envoy.yaml.dot b/packages/dashmate/templates/platform/gateway/envoy.yaml.dot
@@ -135,13 +135,13 @@
                   path: "/org.dash.platform.dapi.v0.Platform/waitForStateTransitionResult"
                 route:
                   cluster: dapi_api
-                  idle_timeout: 85s
+                  idle_timeout: {{= it.platform.gateway.listeners.dapiAndDrive.waitForStResultTimeout }}
                   # Upstream response timeout
-                  timeout: 85s
+                  timeout: {{= it.platform.gateway.listeners.dapiAndDrive.waitForStResultTimeout }}
                   max_stream_duration:
                     # Entire stream/request timeout
-                    max_stream_duration: 85s
-                    grpc_timeout_header_max: 85s
+                    max_stream_duration: {{= it.platform.gateway.listeners.dapiAndDrive.waitForStResultTimeout }}
+                    grpc_timeout_header_max: {{= it.platform.gateway.listeners.dapiAndDrive.waitForStResultTimeout }}
               # DAPI getConsensusParams endpoint
               - match:
                   path: "/org.dash.platform.dapi.v0.Platform/getConsensusParams"

diff --git a/.../lib/methods/platform/waitForStateTransitionResult/waitForStateTransitionResultFactory.js b/.../lib/methods/platform/waitForStateTransitionResult/waitForStateTransitionResultFactory.js
@@ -24,7 +24,7 @@ function waitForStateTransitionResultFactory(grpcTransport) {
     // eslint-disable-next-line no-param-reassign
     options = {
       // Set default timeout
-      timeout: 80000,
+      timeout: 120000,
       prove: false,
       retry: 0,
       throwDeadlineExceeded: true,

diff --git a/packages/rs-dapi-client/src/transport/grpc.rs b/packages/rs-dapi-client/src/transport/grpc.rs
@@ -186,8 +186,7 @@ impl_transport_request_grpc!(
     platform_proto::WaitForStateTransitionResultResponse,
     PlatformGrpcClient,
     RequestSettings {
-        timeout: Some(Duration::from_secs(80)),
-        retries: Some(0),
+        timeout: Some(Duration::from_secs(120)),
         ..RequestSettings::default()
     },
     wait_for_state_transition_result
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,3 +42,5 @@ DRIVE_RPC_PORT=26670
		NODE_ENV=production

		LOG_LEVEL=trace

		WAIT_FOR_ST_RESULT_TIMEOUT=80000