zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

potentially fix changelabel.

This commit is contained in:
Christopher Jeffrey 2014-11-03 13:06:30 -08:00
parent a943cb888e
commit a62382f56e
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/bitcoindjs.cc
View File

@ -4555,20 +4555,22 @@ NAN_METHOD(WalletChangeLabel) {
addr = std::string(*addr_); addr = std::string(*addr_);
} }
if (options->Get(NanNew<String>("label"))->IsString()) {
String::Utf8Value label_(options->Get(NanNew<String>("label"))->ToString()); String::Utf8Value label_(options->Get(NanNew<String>("label"))->ToString());
std::string label = std::string(*label_); accountName = std::string(*label_);
}
// LOCK2(cs_main, pwalletMain->cs_wallet); // LOCK2(cs_main, pwalletMain->cs_wallet);
CWalletDB walletdb(pwalletMain->strWalletFile); // CWalletDB walletdb(pwalletMain->strWalletFile);
CAccount account; // CAccount account;
walletdb.ReadAccount(accountName, account); // walletdb.ReadAccount(accountName, account);
// setaccount logic: // setaccount/changelabel logic (bcoin):
// If address is mine - set account label // If address is mine - set account label
// If address is not mine - create recipient // If address is not mine - create recipient
// NOTE: This now throws an error if the address is not owned by you. // NOTE: This now throws an error if the address is not owned by you (bitcoind).
// if (coin.accountByAddress(address)) { // if (coin.accountByAddress(address)) {
// coin.accountByAddress(address).label = label; // coin.accountByAddress(address).label = label;
// } else { // } else {
@ -4584,12 +4586,28 @@ NAN_METHOD(WalletChangeLabel) {
break; break;
} }
} }
args->Set(NanNew<String>("account"), NanNew<String>(accountName));
args->Set(NanNew<String>("label"), NanNew<String>(accountName));
}
if (addr.empty()) {
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, CAddressBookData)& item, pwalletMain->mapAddressBook) {
const CBitcoinAddress& address = item.first;
const string& strName = item.second.name;
if (strName == accountName) {
addr = address.ToString();
break;
}
}
args->Set(NanNew<String>("address"), NanNew<String>(addr));
}
// If it isn't our address, create a recipient: // If it isn't our address, create a recipient:
CBitcoinAddress address(addr);
if (!IsMine(*pwalletMain, address.Get())) { if (!IsMine(*pwalletMain, address.Get())) {
WalletSetRecipient(args); WalletSetRecipient(args);
NanReturnValue(True()); NanReturnValue(True());
} }
}
// Find all addresses that have the given account // Find all addresses that have the given account
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, CAddressBookData)& item, pwalletMain->mapAddressBook) { BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, CAddressBookData)& item, pwalletMain->mapAddressBook) {