mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 09:46:52 -05:00
script, doc: spelling update
This commit is contained in:
parent
567670bec5
commit
184d4534f6
4 changed files with 6 additions and 5 deletions
|
@ -467,7 +467,7 @@ private:
|
||||||
bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
|
bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
|
||||||
|
|
||||||
/** Remove this block from our tracked requested blocks. Called if:
|
/** Remove this block from our tracked requested blocks. Called if:
|
||||||
* - the block has been recieved from a peer
|
* - the block has been received from a peer
|
||||||
* - the request for the block has timed out
|
* - the request for the block has timed out
|
||||||
*/
|
*/
|
||||||
void RemoveBlockRequest(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
|
void RemoveBlockRequest(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
|
||||||
|
|
|
@ -180,7 +180,7 @@ public:
|
||||||
ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
|
ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
|
||||||
return signers;
|
return signers;
|
||||||
#else
|
#else
|
||||||
// This result is undistinguisable from a succesful call that returns
|
// This result is indistinguishable from a successful call that returns
|
||||||
// no signers. For the current GUI this doesn't matter, because the wallet
|
// no signers. For the current GUI this doesn't matter, because the wallet
|
||||||
// creation dialog disables the external signer checkbox in both
|
// creation dialog disables the external signer checkbox in both
|
||||||
// cases. The return type could be changed to std::optional<std::vector>
|
// cases. The return type could be changed to std::optional<std::vector>
|
||||||
|
|
|
@ -530,9 +530,9 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
|
||||||
std::vector<std::tuple<int, CScript, int>> ret;
|
std::vector<std::tuple<int, CScript, int>> ret;
|
||||||
if (spenddata.merkle_root.IsNull()) return ret;
|
if (spenddata.merkle_root.IsNull()) return ret;
|
||||||
|
|
||||||
/** Data structure to represent the nodes of the tree we're going to be build. */
|
/** Data structure to represent the nodes of the tree we're going to build. */
|
||||||
struct TreeNode {
|
struct TreeNode {
|
||||||
/** Hash of this none, if known; 0 otherwise. */
|
/** Hash of this node, if known; 0 otherwise. */
|
||||||
uint256 hash;
|
uint256 hash;
|
||||||
/** The left and right subtrees (note that their order is irrelevant). */
|
/** The left and right subtrees (note that their order is irrelevant). */
|
||||||
std::unique_ptr<TreeNode> sub[2];
|
std::unique_ptr<TreeNode> sub[2];
|
||||||
|
@ -547,7 +547,7 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
|
||||||
bool done = false;
|
bool done = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Build tree from the provides branches.
|
// Build tree from the provided branches.
|
||||||
TreeNode root;
|
TreeNode root;
|
||||||
root.hash = spenddata.merkle_root;
|
root.hash = spenddata.merkle_root;
|
||||||
for (const auto& [key, control_blocks] : spenddata.scripts) {
|
for (const auto& [key, control_blocks] : spenddata.scripts) {
|
||||||
|
|
|
@ -7,6 +7,7 @@ hights
|
||||||
hist
|
hist
|
||||||
inout
|
inout
|
||||||
invokable
|
invokable
|
||||||
|
keypair
|
||||||
mor
|
mor
|
||||||
nin
|
nin
|
||||||
ser
|
ser
|
||||||
|
|
Loading…
Add table
Reference in a new issue