Skip to content

Commit 37a79a4

Browse files
committed
Move various SigningProviders to signingprovider.{cpp,h}
Moves all of the various SigningProviders out of sign.{cpp,h} and keystore.{cpp,h}. As such, keystore.{cpp,h} is also removed. Includes and the Makefile are updated to reflect this. Includes were largely changed using: git grep -l "keystore.h" | xargs sed -i -e 's;keystore.h;script/signingprovider.h;g'
1 parent 16f8096 commit 37a79a4

26 files changed

+194
-184
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ BITCOIN_CORE_H = \
143143
interfaces/wallet.h \
144144
key.h \
145145
key_io.h \
146-
keystore.h \
147146
dbwrapper.h \
148147
limitedmap.h \
149148
logging.h \
@@ -184,6 +183,7 @@ BITCOIN_CORE_H = \
184183
script/keyorigin.h \
185184
script/sigcache.h \
186185
script/sign.h \
186+
script/signingprovider.h \
187187
script/standard.h \
188188
shutdown.h \
189189
streams.h \
@@ -447,7 +447,6 @@ libbitcoin_common_a_SOURCES = \
447447
core_write.cpp \
448448
key.cpp \
449449
key_io.cpp \
450-
keystore.cpp \
451450
merkleblock.cpp \
452451
netaddress.cpp \
453452
netbase.cpp \
@@ -461,6 +460,7 @@ libbitcoin_common_a_SOURCES = \
461460
scheduler.cpp \
462461
script/descriptor.cpp \
463462
script/sign.cpp \
463+
script/signingprovider.cpp \
464464
script/standard.cpp \
465465
versionbitsinfo.cpp \
466466
warnings.cpp \

src/bench/ccoins_caching.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <bench/bench.h>
66
#include <coins.h>
77
#include <policy/policy.h>
8-
#include <wallet/crypter.h>
8+
#include <script/signingprovider.h>
99

1010
#include <vector>
1111

src/bitcoin-tx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#include <consensus/consensus.h>
1212
#include <core_io.h>
1313
#include <key_io.h>
14-
#include <keystore.h>
1514
#include <policy/policy.h>
1615
#include <policy/rbf.h>
1716
#include <primitives/transaction.h>
1817
#include <script/script.h>
1918
#include <script/sign.h>
19+
#include <script/signingprovider.h>
2020
#include <univalue.h>
2121
#include <util/rbf.h>
2222
#include <util/system.h>

src/keystore.h

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/outputtype.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55

66
#include <outputtype.h>
77

8-
#include <keystore.h>
98
#include <pubkey.h>
109
#include <script/script.h>
10+
#include <script/sign.h>
11+
#include <script/signingprovider.h>
1112
#include <script/standard.h>
1213

1314
#include <assert.h>
@@ -98,4 +99,3 @@ CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore,
9899
default: assert(false);
99100
}
100101
}
101-

src/outputtype.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define BITCOIN_OUTPUTTYPE_H
88

99
#include <attributes.h>
10-
#include <keystore.h>
10+
#include <script/signingprovider.h>
1111
#include <script/standard.h>
1212

1313
#include <string>

src/psbt.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <primitives/transaction.h>
1313
#include <pubkey.h>
1414
#include <script/sign.h>
15+
#include <script/signingprovider.h>
1516

1617
// Magic bytes
1718
static constexpr uint8_t PSBT_MAGIC_BYTES[5] = {'p', 's', 'b', 't', 0xff};

src/rpc/rawtransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <core_io.h>
1111
#include <index/txindex.h>
1212
#include <key_io.h>
13-
#include <keystore.h>
1413
#include <merkleblock.h>
1514
#include <node/coin.h>
1615
#include <node/psbt.h>
@@ -24,6 +23,7 @@
2423
#include <script/script.h>
2524
#include <script/script_error.h>
2625
#include <script/sign.h>
26+
#include <script/signingprovider.h>
2727
#include <script/standard.h>
2828
#include <uint256.h>
2929
#include <util/moneystr.h>

src/rpc/rawtransaction_util.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
#include <coins.h>
99
#include <core_io.h>
1010
#include <key_io.h>
11-
#include <keystore.h>
1211
#include <policy/policy.h>
1312
#include <primitives/transaction.h>
1413
#include <rpc/protocol.h>
1514
#include <rpc/util.h>
15+
#include <script/sign.h>
16+
#include <script/signingprovider.h>
1617
#include <tinyformat.h>
1718
#include <univalue.h>
1819
#include <util/rbf.h>

src/rpc/util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <key_io.h>
6-
#include <keystore.h>
76
#include <outputtype.h>
7+
#include <script/signingprovider.h>
88
#include <rpc/util.h>
99
#include <script/descriptor.h>
1010
#include <tinyformat.h>

0 commit comments

Comments
 (0)