non-standard-p2tr-spend.diff

diff --git a/src/init.cpp b/src/init.cpp
index 6380da4f7..96334d42c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1171,9 +1171,9 @@ bool AppInitParameterInteraction(const ArgsManager& args)
     }

     fRequireStandard = !args.GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
-    if (!chainparams.IsTestChain() && !fRequireStandard) {
-        return InitError(strprintf(Untranslated("acceptnonstdtxn is not currently supported for %s chain"), chainparams.NetworkIDString()));
-    }
+    //if (!chainparams.IsTestChain() && !fRequireStandard) {
+    //    return InitError(strprintf(Untranslated("acceptnonstdtxn is not currently supported for %s chain"), chainparams.NetworkIDString()));
+    //}
     nBytesPerSigOp = args.GetArg("-bytespersigop", nBytesPerSigOp);

     if (!g_wallet_init_interface.ParameterInteraction()) return false;
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 8090dff4c..1a257bc64 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -71,7 +71,7 @@ static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VE
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM |
                                                              SCRIPT_VERIFY_WITNESS_PUBKEYTYPE |
                                                              SCRIPT_VERIFY_CONST_SCRIPTCODE |
-                                                             SCRIPT_VERIFY_TAPROOT |
+                                                             //SCRIPT_VERIFY_TAPROOT |
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_TAPROOT_VERSION |
                                                              SCRIPT_VERIFY_DISCOURAGE_OP_SUCCESS |
                                                              SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE;