GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 6eed792d43 into merged_master (Elements PR ElementsProject/elements#1050)

Browse source 
Conflicts were mostly obvious, except for those in CreateTransactionInternal.
(This function was moved from wallet.cpp to spend.cpp, and substantially
rewritten, between 0.21 and 22.0.) For those I manually applied the changes
from the diff, which wound up taking a slightly different form.

Also had to update the new test because the `addresses` field of the RPC
output was removed.
This commit is contained in:
Andrew Poelstra 2021-10-02 15:28:13 +00:00
commit b64ca7f411
7 changed files with 175 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/util/error.cpp
View file

@ -45,6 +45,10 @@ bilingual_str TransactionErrorString(const TransactionError err)
return Untranslated("Proof of blinded value is invalid");
case TransactionError::INVALID_ASSET_PROOF:
return Untranslated("Proof of blinded asset is invalid");
case TransactionError::MISSING_BLINDING_KEY:
return Untranslated("Wallet does not have necessary blinding key");
case TransactionError::MISSING_SIDECHANNEL_DATA:
return Untranslated("A rangeproof did not encode necessary blinding data");
// no default case, so the compiler can warn about missing cases
}
assert(false);