Skip to content
Bitcoin Roots

v29.4-roots.4 · Commit 9: [PATCH 09/37] fix: complete reconstructed runtime integration

src/node/mempool_args.cpp

Before: src/node/mempool_args.cpp · After: src/node/mempool_args.cpp

File metadata
index 76afdd23c32a9e987560a08354b619c1bae68da9..0a53907f82194cf44e56df5e9d402ef17637d889 100644

Download original patch · Release notes

Diff rows 1–9 of 9. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.

src/node/mempool_args.cpp CHANGED
@@ -218,6 +218,9 @@ util::Result<void> ApplyArgsManOptions(const ArgsManager& argsman, const CChainP
218
  mempool_opts.permitbaredatacarrier = argsman.GetBoolArg("-permitbaredatacarrier", mempool_opts.permitbaredatacarrier);
219
 
220
  mempool_opts.require_standard = !argsman.GetBoolArg("-acceptnonstdtxn", DEFAULT_ACCEPT_NON_STD_TXN);
 
 
 
221
 
222
  mempool_opts.acceptunknownwitness = argsman.GetBoolArg("-acceptunknownwitness", mempool_opts.acceptunknownwitness);
223
 
 
218
  mempool_opts.permitbaredatacarrier = argsman.GetBoolArg("-permitbaredatacarrier", mempool_opts.permitbaredatacarrier);
219
 
220
  mempool_opts.require_standard = !argsman.GetBoolArg("-acceptnonstdtxn", DEFAULT_ACCEPT_NON_STD_TXN);
221
+ if (!chainparams.IsTestChain() && !mempool_opts.require_standard) {
222
+ return util::Error{Untranslated(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.GetChainTypeString()))};
223
+ }
224
 
225
  mempool_opts.acceptunknownwitness = argsman.GetBoolArg("-acceptunknownwitness", mempool_opts.acceptunknownwitness);
226