DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix

Browse Source
This commit is contained in:
blackjok3r
2018-11-03 16:40:57 +08:00
parent 4d85706859
commit 2a91d7e002
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/rpcwallet.cpp
View File

@@ -4960,6 +4960,8 @@ UniValue channelsaddress(const UniValue& params, bool fHelp)
bool pubkey2addr(char *destaddr,uint8_t *pubkey33); bool pubkey2addr(char *destaddr,uint8_t *pubkey33);
extern int32_t IS_KOMODO_NOTARY; extern int32_t IS_KOMODO_NOTARY;
extern uint8_t NOTARY_PUBKEY33[];
extern std::string NOTARY_PUBKEY,NOTARY_ADDRESS;
UniValue setpubkey(const UniValue& params, bool fHelp) UniValue setpubkey(const UniValue& params, bool fHelp)
{ {
@@ -4989,8 +4991,6 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
char Raddress[18]; char Raddress[18];
uint8_t pubkey33[33]; uint8_t pubkey33[33];
extern uint8_t NOTARY_PUBKEY33[];
extern std::string NOTARY_PUBKEY,NOTARY_ADDRESS;
if ( NOTARY_PUBKEY33[0] == 0 ) { if ( NOTARY_PUBKEY33[0] == 0 ) {
if (strlen(params[0].get_str().c_str()) == 66) { if (strlen(params[0].get_str().c_str()) == 66) {
decode_hex(pubkey33,33,(char *)params[0].get_str().c_str()); decode_hex(pubkey33,33,(char *)params[0].get_str().c_str());
@@ -5006,8 +5006,8 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
NOTARY_ADDRESS = address.ToString(); NOTARY_ADDRESS = address.ToString();
result.push_back(Pair("address", NOTARY_ADDRESS)); result.push_back(Pair("address", NOTARY_ADDRESS));
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
isminetype mine = pwalletMain; isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
if ( IsMine(*pwalletMain, dest) == ISMINE_NO ) { if ( mine == ISMINE_NO ) {
result.push_back(Pair("WARNING", "privkey for this pubkey is not imported to wallet!")); result.push_back(Pair("WARNING", "privkey for this pubkey is not imported to wallet!"));
} else { } else {
result.push_back(Pair("ismine", "true")); result.push_back(Pair("ismine", "true"));

3
src/wallet/wallet.cpp
View File

@@ -1202,6 +1202,7 @@ bool CWallet::UpdatedNoteData(const CWalletTx& wtxIn, CWalletTx& wtx)
*/ */
extern uint8_t NOTARY_PUBKEY33[33]; extern uint8_t NOTARY_PUBKEY33[33];
extern std::string NOTARY_ADDRESS; extern std::string NOTARY_ADDRESS;
extern int32_t IS_KOMODO_NOTARY;
bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate) bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate)
{ {
@@ -1254,7 +1255,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
// this means we were in a multi sig, we wil remove the utxo we spent from our wallet, // this means we were in a multi sig, we wil remove the utxo we spent from our wallet,
// IF there exisited a function for that. // IF there exisited a function for that.
// Maybe check if there are any vouts unspetn in this TX // Maybe check if there are any vouts unspetn in this TX
// then purge the TX from wallet if all spent? // then purge the TX from wallet if all spent?
fprintf(stderr, "There are vins that are not ours, notarisation?\n"); fprintf(stderr, "There are vins that are not ours, notarisation?\n");
} }
} }