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

Merge #825: Create witness outputs for (re)issueasset RPC

Browse source 
91583b6e0 Create witness outputs for (re)issueasset RPC (Gregory Sanders)

Pull request description:

  Band aid for https://github.com/ElementsProject/elements/issues/824

Tree-SHA512: 275056e075796513527382ab2c8164433267839c709d28fc197a250a98f6e1096761ff6ec9840723e7095f4027ca2fcdfa18990ed426c4e5d091efe7bc698253
This commit is contained in:
Steven Roose 2020-02-24 15:46:32 +00:00
commit a2fa6ba736
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
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

@ -6239,7 +6239,7 @@ UniValue issueasset(const JSONRPCRequest& request)
if (!pwallet->GetKeyFromPool(newKey)) { if (!pwallet->GetKeyFromPool(newKey)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
} }
asset_dest = PKHash(newKey.GetID()); asset_dest = WitnessV0KeyHash(newKey.GetID());
pwallet->SetAddressBook(asset_dest, "", "receive"); pwallet->SetAddressBook(asset_dest, "", "receive");
asset_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(asset_dest)); asset_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(asset_dest));
} }
@ -6247,7 +6247,7 @@ UniValue issueasset(const JSONRPCRequest& request)
if (!pwallet->GetKeyFromPool(newKey)) { if (!pwallet->GetKeyFromPool(newKey)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
} }
token_dest = PKHash(newKey.GetID()); token_dest = WitnessV0KeyHash(newKey.GetID());
pwallet->SetAddressBook(token_dest, "", "receive"); pwallet->SetAddressBook(token_dest, "", "receive");
token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest)); token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest));
} }
@ -6346,7 +6346,7 @@ UniValue reissueasset(const JSONRPCRequest& request)
if (!pwallet->GetKeyFromPool(newAssetKey)) { if (!pwallet->GetKeyFromPool(newAssetKey)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
} }
CTxDestination asset_dest = PKHash(newAssetKey.GetID()); CTxDestination asset_dest = WitnessV0KeyHash(newAssetKey.GetID());
pwallet->SetAddressBook(asset_dest, "", "receive"); pwallet->SetAddressBook(asset_dest, "", "receive");
CPubKey asset_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(asset_dest)); CPubKey asset_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(asset_dest));
@ -6355,7 +6355,7 @@ UniValue reissueasset(const JSONRPCRequest& request)
if (!pwallet->GetKeyFromPool(newTokenKey)) { if (!pwallet->GetKeyFromPool(newTokenKey)) {
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first"); throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
} }
CTxDestination token_dest = PKHash(newTokenKey.GetID()); CTxDestination token_dest = WitnessV0KeyHash(newTokenKey.GetID());
pwallet->SetAddressBook(token_dest, "", "receive"); pwallet->SetAddressBook(token_dest, "", "receive");
CPubKey token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest)); CPubKey token_dest_blindpub = pwallet->GetBlindingPubKey(GetScriptForDestination(token_dest));