RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement sendfrom and sendtoaddress.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-09-26 13:18:23 -07:00
parent 7f8ea209ab
commit 0d1497a4c7
1 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/bitcoindjs.cc
View File

@ -1259,38 +1259,45 @@ NAN_METHOD(SendToAddress) {
"Usage: bitcoindjs.sendToAddress(options)"); "Usage: bitcoindjs.sendToAddress(options)");
} }
// Parse the account first so we don't generate a key if there's an error
Local<Object> options = Local<Object>::Cast(args[0]); Local<Object> options = Local<Object>::Cast(args[0]);
String::Utf8Value name_(options->Get(NanNew<String>("name"))->ToString());
std::string strAccount = std::string(*name_);
String::Utf8Value addr_(options->Get(NanNew<String>("address"))->ToString());
std::string addr = std::string(*addr_);
string strAccount = from;
CBitcoinAddress address(addr);
CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) {
if (!address.IsValid()) return NanThrowError("Invalid Bitcoin address");
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); }
// Amount // Amount
int64_t nAmount = AmountFromValue(params[1]); int64_t nAmount = options->Get(NanNew<String>("amount"))->IntegerValue()
// Wallet comments // Wallet comments
CWalletTx wtx; CWalletTx wtx;
if (params.size() > 2 && params[2].type() != null_type && !params[2].get_str().empty()) wtx.strFromAccount = strAccount;
wtx.mapValue["comment"] = params[2].get_str(); if (options->Get(NanNew<String>("comment"))) {
if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty()) String::Utf8Value comment_(options->Get(NanNew<String>("comment"))->ToString());
wtx.mapValue["to"] = params[3].get_str(); std::string comment = std::string(*comment_);
wtx.mapValue["comment"] = comment;
}
if (options->Get(NanNew<String>("to"))) {
String::Utf8Value to_(options->Get(NanNew<String>("to"))->ToString());
std::string to = std::string(*to_);
wtx.mapValue["to"] = to;
}
EnsureWalletIsUnlocked(); EnsureWalletIsUnlocked();
string strError = pwalletMain->SendMoneyToDestination(address.Get(), nAmount, wtx); string strError = pwalletMain->SendMoneyToDestination(address.Get(), nAmount, wtx);
if (strError != "") if (strError != "") {
throw JSONRPCError(RPC_WALLET_ERROR, strError); return NanThrowError(strError);
}
return wtx.GetHash().GetHex(); std::string tx_hash = wtx.GetHash().GetHex();
NanReturnValue(NanNew<String>(tx_hash));
NanReturnValue(Undefined());
} }
NAN_METHOD(SignMessage) { NAN_METHOD(SignMessage) {
@ -1365,44 +1372,56 @@ NAN_METHOD(SendFrom) {
"Usage: bitcoindjs.sendFrom(options)"); "Usage: bitcoindjs.sendFrom(options)");
} }
// Parse the account first so we don't generate a key if there's an error
Local<Object> options = Local<Object>::Cast(args[0]); Local<Object> options = Local<Object>::Cast(args[0]);
String::Utf8Value name_(options->Get(NanNew<String>("name"))->ToString());
std::string strAccount = std::string(*name_);
String::Utf8Value from_(options->Get(NanNew<String>("from"))->ToString());
std::string from = std::string(*from_);
String::Utf8Value addr_(options->Get(NanNew<String>("address"))->ToString());
std::string addr = std::string(*addr_);
string strAccount = AccountFromValue(params[0]); string strAccount = from;
CBitcoinAddress address(params[1].get_str()); CBitcoinAddress address(addr);
if (!address.IsValid())
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Bitcoin address"); if (!address.IsValid()) {
int64_t nAmount = AmountFromValue(params[2]); return NanThrowError("Invalid Bitcoin address");
}
int64_t nAmount = options->Get(NanNew<String>("amount"))->IntegerValue()
int nMinDepth = 1; int nMinDepth = 1;
if (params.size() > 3) if (options->Get(NanNew<String>("minDepth"))) {
nMinDepth = params[3].get_int(); nMinDepth = options->Get(NanNew<String>("minDepth"))->IntegerValue();
}
CWalletTx wtx; CWalletTx wtx;
wtx.strFromAccount = strAccount; wtx.strFromAccount = strAccount;
if (params.size() > 4 && params[4].type() != null_type && !params[4].get_str().empty()) if (options->Get(NanNew<String>("comment"))) {
wtx.mapValue["comment"] = params[4].get_str(); String::Utf8Value comment_(options->Get(NanNew<String>("comment"))->ToString());
if (params.size() > 5 && params[5].type() != null_type && !params[5].get_str().empty()) std::string comment = std::string(*comment_);
wtx.mapValue["to"] = params[5].get_str(); wtx.mapValue["comment"] = comment;
}
if (options->Get(NanNew<String>("to"))) {
String::Utf8Value to_(options->Get(NanNew<String>("to"))->ToString());
std::string to = std::string(*to_);
wtx.mapValue["to"] = to;
}
EnsureWalletIsUnlocked(); EnsureWalletIsUnlocked();
// Check funds // Check funds
int64_t nBalance = GetAccountBalance(strAccount, nMinDepth); int64_t nBalance = GetAccountBalance(strAccount, nMinDepth);
if (nAmount > nBalance) if (nAmount > nBalance) {
throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds"); return NanThrowError("Account has insufficient funds");
}
// Send // Send
string strError = pwalletMain->SendMoneyToDestination(address.Get(), nAmount, wtx); string strError = pwalletMain->SendMoneyToDestination(address.Get(), nAmount, wtx);
if (strError != "") if (strError != "") {
throw JSONRPCError(RPC_WALLET_ERROR, strError); return NanThrowError(strError);
}
return wtx.GetHash().GetHex(); std::string tx_hash = wtx.GetHash().GetHex();
NanReturnValue(NanNew<String>(tx_hash));
NanReturnValue(Undefined());
} }
NAN_METHOD(ListTransactions) { NAN_METHOD(ListTransactions) {