Merge pull request #8 from remcoros/config-rpc-timeout

Add config option to override default RPC Timeout
remcoros · Oct 6, 2024 · 8b6f88b · 8b6f88b
2 parents 60ebc4b + c3cbe9f
commit 8b6f88b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh
@@ -8,7 +8,7 @@ echo
 
 export BITCOIN_RPC_USER=$(yq e '.bitcoind.user' /public-pool-data/start9/config.yaml)
 export BITCOIN_RPC_PASSWORD=$(yq e '.bitcoind.password' /public-pool-data/start9/config.yaml)
-export BITCOIN_RPC_TIMEOUT=10000
+export BITCOIN_RPC_TIMEOUT=$(yq e '.rpc-timeout' /public-pool-data/start9/config.yaml)
 export API_PORT=3334
 export STRATUM_PORT=3333
 export DEV_FEE_ADDRESS=

diff --git a/manifest.yaml b/manifest.yaml
@@ -1,10 +1,8 @@
 id: public-pool
 title: "Public Pool"
-version: 0.2.3
-release-notes: |
-  * Enable ZeroMQ for new block notifications
-  * instructions: use simpleproxy instead of socat
-  * public-pool-ui: fix minor warnings
+version: 0.2.4
+release-notes: |  
+  * Add config option to override default RPC Timeout
 license: GPL
 wrapper-repo: "https://github.com/remcoros/public-pool-startos"
 upstream-repo: "https://github.com/benjamin-wilson/public-pool"

diff --git a/scripts/procedures/getConfig.ts b/scripts/procedures/getConfig.ts
@@ -65,9 +65,21 @@ export const getConfig: T.ExpectedExports.getConfig = compat.getConfig({
   "zmq-enabled": {
     "type": "boolean",
     "name": "Use ZeroMQ (recommended)",
-    "description": "Uses ZeroMQ for new block notifications, this is generally faster than polling over RPC",
+    "description":
+      "Use ZeroMQ for new block notifications, this is generally faster than polling over RPC",
     "default": true,
   },
+  "rpc-timeout": {
+    "type": "number",
+    "name": "RPC Timeout",
+    "description":
+      "RPC Timeout in milliseconds. Increase this when public-pool crashes with RPC timeout errors",
+    "default": 10000,
+    "integral": true,
+    "nullable": true,
+    "units": "milliseconds",
+    "range": "[1000,300000]",
+  },
   "pool-identifier": {
     "type": "string",
     "name": "Pool Identifier",
@@ -82,7 +94,7 @@ export const getConfig: T.ExpectedExports.getConfig = compat.getConfig({
   },
   "pool-address": {
     "type": "string",
-    "name": "Server IP/hostname",
+    "name": "Server IP/hostname (on homepage)",
     "description":
       "The IP address or hostname to show on the public-pool homepage",
     "copyable": true,

diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts
@@ -1,3 +1,4 @@
+// deno-lint-ignore-file no-explicit-any
 import { compat, types as T } from "../deps.ts";
 
 export const migration: T.ExpectedExports.migration = compat.migrations
@@ -20,4 +21,4 @@ export const migration: T.ExpectedExports.migration = compat.migrations
         { version: "0.2.2", type: "down" },
       ),
     },
-  }, "0.2.3");
+  }, "0.2.4");