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

Merge a2fa6ba736 into merged_master (Elements PR #825)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:45 +00:00
commit 2dde4faa5c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/rpcwallet.cpp
View file

@ -6327,13 +6327,13 @@ UniValue issueasset(const JSONRPCRequest& request)
CPubKey token_dest_blindpub;
if (nAmount > 0) {
if (!pwallet->GetNewDestination(OutputType::LEGACY, "", asset_dest, error)) {
if (!pwallet->GetNewDestination(OutputType::BECH32, "", asset_dest, error)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, error);
}
asset_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(asset_dest));
}
if (nTokens > 0) {
if (!pwallet->GetNewDestination(OutputType::LEGACY, "", token_dest, error)) {
if (!pwallet->GetNewDestination(OutputType::BECH32, "", token_dest, error)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, error);
}
token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest));
@ -6431,14 +6431,14 @@ UniValue reissueasset(const JSONRPCRequest& request)
// Add destination for the to-be-created asset
std::string error;
CTxDestination asset_dest;
if (!pwallet->GetNewDestination(OutputType::LEGACY, "", asset_dest, error)) {
if (!pwallet->GetNewDestination(OutputType::BECH32, "", asset_dest, error)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, error);
}
CPubKey asset_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(asset_dest));
// Add destination for tokens we are moving
CTxDestination token_dest;
if (!pwallet->GetNewDestination(OutputType::LEGACY, "", token_dest, error)) {
if (!pwallet->GetNewDestination(OutputType::BECH32, "", token_dest, error)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, error);
}
CPubKey token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest));