From b97b4f5f634f2498947f4ea4b25f5ac71d08db85 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Mon, 8 Dec 2025 14:57:32 +0000
Subject: [PATCH] update for Bitcoin Core v30.0, nixpkgs 25.11

---
 mmgen_node_tools/data/version |  2 +-
 nix/curl-cffi.nix             | 50 -----------------------------------
 nix/yahooquery.nix            |  2 +-
 test/cmdtest_d/regtest.py     |  9 ++++++-
 4 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 nix/curl-cffi.nix

diff --git a/mmgen_node_tools/data/version b/mmgen_node_tools/data/version
index bd10d35..4e5cab0 100644
--- a/mmgen_node_tools/data/version
+++ b/mmgen_node_tools/data/version
@@ -1 +1 @@
-3.6.dev10
+3.6.dev11
diff --git a/nix/curl-cffi.nix b/nix/curl-cffi.nix
deleted file mode 100644
index 15f9764..0000000
--- a/nix/curl-cffi.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    stdenv,
-    lib,
-    python,
-    buildPythonPackage,
-    fetchPypi,
-    curl-impersonate-chrome,
-}:
-
-buildPythonPackage rec {
-    pname = "curl-cffi";
-    # version = "0.13.0"; # uses option PROXY_CREDENTIAL_NO_REUSE, unavailable in current libcurl
-    version = "0.10.0";
-    pyproject = true;
-
-    src = fetchPypi {
-        pname = "curl_cffi";
-        version = version;
-        # hash = "sha256-YuzZCjgr1QI3UONgbgqnyxo6i6QcFCcLjl4Unr9yxco="; # 0.13.0
-        hash = "sha256-PjezUmjKWEkvVO0CCuS1DDPuDeutQUXbn3RvBO1GbrA="; # 0.10.0
-    };
-
-    patches = [ ./use-system-libs.patch ];
-
-    buildInputs = [ curl-impersonate-chrome ];
-
-    build-system = with python.pkgs; [
-        cffi
-        setuptools
-    ];
-
-    dependencies = with python.pkgs; [
-        cffi
-        certifi
-        typing-extensions
-    ];
-
-    env = lib.optionalAttrs stdenv.cc.isGNU {
-        NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-    };
-
-    pythonImportsCheck = [ "curl_cffi" ];
-
-    meta = with lib; {
-        description = "Python binding for curl-impersonate via cffi";
-        homepage = "https://curl-cffi.readthedocs.io";
-        license = licenses.mit;
-        maintainers = with maintainers; [ chuangzhu ];
-    };
-}
diff --git a/nix/yahooquery.nix b/nix/yahooquery.nix
index 3e8925f..ecb2494 100644
--- a/nix/yahooquery.nix
+++ b/nix/yahooquery.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     build-system = with python.pkgs; [ hatchling ];
 
     propagatedBuildInputs = with python.pkgs; [
-        (callPackage ./curl-cffi.nix {}) # >=0.10.0
+        curl-cffi
         pandas
         requests-futures
         tqdm
diff --git a/test/cmdtest_d/regtest.py b/test/cmdtest_d/regtest.py
index b35ec7a..387594b 100755
--- a/test/cmdtest_d/regtest.py
+++ b/test/cmdtest_d/regtest.py
@@ -114,7 +114,7 @@ class CmdTestRegtest(CmdTestBase):
 		self.proto = init_proto( cfg, self.proto.coin, network='regtest', need_amt=True )
 		self.addrs = [a.views[a.view_pref] for a in gen_addrs(self.proto, 'regtest', [1, 2, 3, 4, 5])]
 
-		self.use_bdb_wallet = self.bdb_wallet or self.proto.coin != 'BTC'
+		self.use_bdb_wallet = self.bdb_wallet and self.proto.coin != 'BTC'
 		self.regtest = MMGenRegtest(cfg, self.proto.coin, bdb_wallet=self.use_bdb_wallet)
 
 	def setup(self):
@@ -334,6 +334,13 @@ class CmdTestRegtest(CmdTestBase):
 					[wif],
 					[],
 					self.proto.sighash_type)
+			else:
+				tx = await r.rpc_call(
+					'signrawtransactionwithwallet',
+					tx_hex,
+					None, # prevtxs
+					self.proto.sighash_type,
+					wallet = 'miner')
 			assert tx['complete']
 			return tx['hex']