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

handle account names better.

This commit is contained in:
Christopher Jeffrey 2014-11-11 11:44:32 -08:00
parent 9a9ddcd21a
commit 98f9c66080
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bitcoindjs.cc
View File

@ -2980,7 +2980,7 @@ NAN_METHOD(WalletGetAccountAddress) {
} }
if (strAccount == EMPTY) { if (strAccount == EMPTY) {
return NanThrowError("No account provided."); return NanThrowError("No account name provided.");
} }
std::string ret = GetAccountAddress(strAccount).ToString(); std::string ret = GetAccountAddress(strAccount).ToString();
@ -3194,7 +3194,7 @@ NAN_METHOD(WalletSetRecipient) {
} }
if (strAccount == EMPTY) { if (strAccount == EMPTY) {
return NanThrowError("No account provided."); return NanThrowError("No account name provided.");
} }
CTxDestination address = CBitcoinAddress(addr).Get(); CTxDestination address = CBitcoinAddress(addr).Get();
@ -3802,7 +3802,7 @@ NAN_METHOD(WalletGetBalance) {
Local<Object> options = Local<Object>::Cast(args[0]); Local<Object> options = Local<Object>::Cast(args[0]);
std::string strAccount = ""; std::string strAccount = std::string(EMPTY);
int nMinDepth = 1; int nMinDepth = 1;
if (options->Get(NanNew<String>("account"))->IsString()) { if (options->Get(NanNew<String>("account"))->IsString()) {
@ -3824,6 +3824,10 @@ NAN_METHOD(WalletGetBalance) {
nMinDepth = options->Get(NanNew<String>("nMinDepth"))->IntegerValue(); nMinDepth = options->Get(NanNew<String>("nMinDepth"))->IntegerValue();
} }
if (strAccount == EMPTY) {
return NanThrowError("No account name provided.");
}
if (strAccount == "*") { if (strAccount == "*") {
// Calculate total balance a different way from GetBalance() // Calculate total balance a different way from GetBalance()
// (GetBalance() sums up all unspent TxOuts) // (GetBalance() sums up all unspent TxOuts)
@ -4662,14 +4666,28 @@ NAN_METHOD(WalletImportKey) {
} }
std::string strSecret = ""; std::string strSecret = "";
std::string strLabel = ""; std::string strAccount = std::string(EMPTY);
String::Utf8Value key_(options->Get(NanNew<String>("key"))->ToString()); String::Utf8Value key_(options->Get(NanNew<String>("key"))->ToString());
strSecret = std::string(*key_); strSecret = std::string(*key_);
if (options->Get(NanNew<String>("account"))->IsString()) {
String::Utf8Value label_(options->Get(NanNew<String>("account"))->ToString());
strAccount = std::string(*label_);
}
if (options->Get(NanNew<String>("label"))->IsString()) { 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());
strLabel = std::string(*label_); strAccount = std::string(*label_);
}
if (options->Get(NanNew<String>("name"))->IsString()) {
String::Utf8Value label_(options->Get(NanNew<String>("name"))->ToString());
strAccount = std::string(*label_);
}
if (strAccount == EMPTY) {
return NanThrowError("No account name provided.");
} }
// Call to: EnsureWalletIsUnlocked() // Call to: EnsureWalletIsUnlocked()
@ -4700,7 +4718,7 @@ NAN_METHOD(WalletImportKey) {
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);
pwalletMain->MarkDirty(); pwalletMain->MarkDirty();
pwalletMain->SetAddressBook(vchAddress, strLabel, "receive"); pwalletMain->SetAddressBook(vchAddress, strAccount, "receive");
// Don't throw error in case a key is already there // Don't throw error in case a key is already there
if (pwalletMain->HaveKey(vchAddress)) { if (pwalletMain->HaveKey(vchAddress)) {