From 83dba5c0256a46e6ef58f1b4338883d88d161fb1 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Mon, 14 Oct 2024 13:00:10 -0700 Subject: [PATCH 1/3] move maxmempoolback to advanced --- scripts/services/getConfig.ts | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/scripts/services/getConfig.ts b/scripts/services/getConfig.ts index e4cc245..80a52bd 100644 --- a/scripts/services/getConfig.ts +++ b/scripts/services/getConfig.ts @@ -68,17 +68,17 @@ export const getConfig: T.ExpectedExports.getConfig = async (effects) => { description: "Save the mempool on shutdown and load on restart.", default: true, }, - maxmempool: { - type: "number", - nullable: false, - name: "Max Mempool Size", - description: - "Keep the transaction memory pool below megabytes.", - range: "[1,*)", - integral: true, - units: "MiB", - default: 300, - }, + // maxmempool: { + // type: "number", + // nullable: false, + // name: "Max Mempool Size", + // description: + // "Keep the transaction memory pool below megabytes.", + // range: "[1,*)", + // integral: true, + // units: "MiB", + // default: 300, + // }, mempoolexpiry: { type: "number", nullable: false, @@ -365,6 +365,17 @@ export const getConfig: T.ExpectedExports.getConfig = async (effects) => { name: "Advanced", description: "Advanced Settings", spec: { + maxmempool: { + type: "number", + nullable: false, + name: "Max Mempool Size", + description: + "Keep the transaction memory pool below megabytes.", + range: "[1,*)", + integral: true, + units: "MiB", + default: 300, + }, peers: { type: "object", name: "Peers", From caf1844c5895f8db3a9e3704f85547d38d94b044 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Mon, 14 Oct 2024 15:12:06 -0700 Subject: [PATCH 2/3] oops --- scripts/services/getConfig.ts | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/scripts/services/getConfig.ts b/scripts/services/getConfig.ts index 80a52bd..cc448ee 100644 --- a/scripts/services/getConfig.ts +++ b/scripts/services/getConfig.ts @@ -365,16 +365,23 @@ export const getConfig: T.ExpectedExports.getConfig = async (effects) => { name: "Advanced", description: "Advanced Settings", spec: { - maxmempool: { - type: "number", - nullable: false, - name: "Max Mempool Size", - description: - "Keep the transaction memory pool below megabytes.", - range: "[1,*)", - integral: true, - units: "MiB", - default: 300, + mempool: { + type: "object", + name: "Mempool", + description: "Mempool Settings", + spec: { + maxmempool: { + type: "number", + nullable: false, + name: "Max Mempool Size", + description: + "Keep the transaction memory pool below megabytes.", + range: "[1,*)", + integral: true, + units: "MiB", + default: 300, + }, + }, }, peers: { type: "object", From c6a0e56ac15d28b9d3468ea532eb305f8241d956 Mon Sep 17 00:00:00 2001 From: BitcoinMechanic Date: Mon, 14 Oct 2024 15:44:18 -0700 Subject: [PATCH 3/3] fix conf template --- assets/compat/bitcoin.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/compat/bitcoin.conf.template b/assets/compat/bitcoin.conf.template index 71b21c9..bf89398 100644 --- a/assets/compat/bitcoin.conf.template +++ b/assets/compat/bitcoin.conf.template @@ -39,7 +39,7 @@ persistmempool=1 {{#IF !blkconstr.persistmempool persistmempool=0 }} -maxmempool={{blkconstr.maxmempool}} +maxmempool={{advanced.mempool.maxmempool}} mempoolexpiry={{blkconstr.mempoolexpiry}} ## PEERS