v29.4-roots.4 · Commit 4: [PATCH 04/37] wallet: harden database and signing behavior
src/wallet/external_signer_scriptpubkeyman.h
Before: src/wallet/external_signer_scriptpubkeyman.h · After: src/wallet/external_signer_scriptpubkeyman.h
File metadata
index 10d67d2ab471c50b6f3e3d6bbb56319008ca057d..96374e1885effa0bfa553204a5a4ccc9c88f7ef5 100644
Download original patch · Release notes
Diff rows 1–14 of 14. 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/wallet/external_signer_scriptpubkeyman.h
CHANGED
|
@@ -8,6 +8,7 @@
|
|
| 8 |
#include <wallet/scriptpubkeyman.h>
|
| 9 |
|
| 10 |
#include <memory>
|
|
|
|
| 11 |
|
| 12 |
struct bilingual_str;
|
| 13 |
|
|
@@ -28,6 +29,7 @@ class ExternalSignerScriptPubKeyMan : public DescriptorScriptPubKeyMan
|
|
| 28 |
bool SetupDescriptor(WalletBatch& batch, std::unique_ptr<Descriptor>desc);
|
| 29 |
|
| 30 |
static ExternalSigner GetExternalSigner();
|
|
|
|
| 31 |
|
| 32 |
/**
|
| 33 |
* Display address on the device and verify that the returned value matches.
|
|
|
|
| 8 |
#include <wallet/scriptpubkeyman.h>
|
| 9 |
|
| 10 |
#include <memory>
|
| 11 |
+
#include <util/result.h>
|
| 12 |
|
| 13 |
struct bilingual_str;
|
| 14 |
|
|
|
|
| 29 |
bool SetupDescriptor(WalletBatch& batch, std::unique_ptr<Descriptor>desc);
|
| 30 |
|
| 31 |
static ExternalSigner GetExternalSigner();
|
| 32 |
+
static util::Result<ExternalSigner> GetExternalSigner2();
|
| 33 |
|
| 34 |
/**
|
| 35 |
* Display address on the device and verify that the returned value matches.
|