From d1627391ceb99d9ec678cb33718420954cbdb3ee Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 15 Jul 2020 15:10:08 +0930 Subject: [PATCH] txprepare: revert 1fb9a078b620a65a2802bc8b1303970914cfb4cb (`psbt` field) We're actually going to deprecate this, so don't add new features! Signed-off-by: Rusty Russell Changelog-Added: ***REMOVE*** JSON-API: `txprepare` returns a psbt version of the created transaction --- tests/test_wallet.py | 1 - wallet/walletrpc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/test_wallet.py b/tests/test_wallet.py index 8fabd83b025e..36b61c70b3d8 100644 --- a/tests/test_wallet.py +++ b/tests/test_wallet.py @@ -307,7 +307,6 @@ def test_txprepare(node_factory, bitcoind, chainparams): wait_for(lambda: len(l1.rpc.listfunds()['outputs']) == 10) prep = l1.rpc.txprepare(outputs=[{addr: Millisatoshi(amount * 3 * 1000)}]) - assert prep['psbt'] decode = bitcoind.rpc.decoderawtransaction(prep['unsigned_tx']) assert decode['txid'] == prep['txid'] # 4 inputs, 2 outputs (3 if we have a fee output). diff --git a/wallet/walletrpc.c b/wallet/walletrpc.c index f03de92115a9..04a4da283b72 100644 --- a/wallet/walletrpc.c +++ b/wallet/walletrpc.c @@ -490,7 +490,6 @@ static struct command_result *json_txprepare(struct command *cmd, response = json_stream_success(cmd); json_add_tx(response, "unsigned_tx", utx->tx); json_add_txid(response, "txid", &utx->txid); - json_add_psbt(response, "psbt", utx->tx->psbt); return command_success(cmd, response); } static const struct json_command txprepare_command = {