diff --git a/assets/compat/bitcoin.conf.template b/assets/compat/bitcoin.conf.template index 72b6636..a6f62b5 100644 --- a/assets/compat/bitcoin.conf.template +++ b/assets/compat/bitcoin.conf.template @@ -37,6 +37,19 @@ persistmempool=0 }} maxmempool={{advanced.mempool.maxmempool}} mempoolexpiry={{advanced.mempool.mempoolexpiry}} +{{#IF advanced.mempool.datacarrier +datacarrier=1 +}} +{{#IF !advanced.mempool.datacarrier +datacarrier=0 +}} +datacarriersize={{advanced.mempool.datacarriersize}} +{{#IF advanced.mempool.permitbaremultisig +permitbaremultisig=1 +}} +{{#IF !advanced.mempool.permitbaremultisig +permitbaremultisig=0 +}} ## PEERS {{#IF advanced.peers.listen @@ -125,25 +138,6 @@ txindex=1 coinstatsindex=1 }} -## DATACARRIER -{{#IF advanced.mempool.datacarrier -datacarrier=1 -}} -{{#IF !advanced.mempool.datacarrier -datacarrier=0 -}} - -## DATACARRIER SIZE -datacarriersize={{advanced.mempool.datacarriersize}} - -## PERMIT BARE MULTISIG -{{#IF advanced.mempool.permitbaremultisig -permitbaremultisig=1 -}} -{{#IF !advanced.mempool.permitbaremultisig -permitbaremultisig=0 -}} - ## BIP37 {{#IF advanced.bloomfilters.peerbloomfilters peerbloomfilters=1 diff --git a/manifest.yaml b/manifest.yaml index 24f4e59..9083377 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,12 +1,10 @@ id: bitcoind title: "Bitcoin Core" -version: 26.0.0 +version: 26.0.0.1 eos-version: 0.3.4.3 release-notes: | - * Latest release from Core - see full release notes [here](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-26.0.md) - * Added support for v2 transport protocol (BIP 324) - * Update services base image to alpine 3.18 - * Minor readme and instructions update + * New config options for mempool filtering: permitbaremultisig, datacarrier, datacarriersize + * New config option for coinstatsindex license: MIT wrapper-repo: https://github.com/Start9Labs/bitcoind-wrapper upstream-repo: https://github.com/bitcoin/bitcoin diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index 4509df5..1d77ea7 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -249,6 +249,24 @@ export const migration: T.ExpectedExports.migration = { version: "26.0.0", type: "down" } ), }, + "26.0.0.1": { + up: compat.migrations.updateConfig((config: any) => config, false, { + version: "26.0.0.1", + type: "up", + }), + down: compat.migrations.updateConfig( + (config: any) => { + delete config.coinstatsindex; + delete config.advanced.mempool.permitbaremultisig; + delete config.advanced.mempool.datacarrier; + delete config.advanced.mempool.datacarriersize; + + return config; + }, + true, + { version: "26.0.0.1", type: "down" } + ), + }, }, - "26.0.0" + "26.0.0.1" );