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

incremental

This commit is contained in:
Chris Kleeschulte 2015-06-04 14:54:57 -04:00
parent 709ce37fff
commit 2888e814f2
5 changed files with 60 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binding.gyp
View File

@ -20,6 +20,8 @@
'<(BOOST_INCLUDE)',
'<(LEVELDB_INCLUDE)',
'<(BITCOIN_DIR)/src',
'./libbitcoind/src/leveldb/helpers/memenv',
'/usr/local/Cellar/openssl/1.0.2a-1/include',
'<!(node -e "require(\'nan\')")',
],
'sources': [
@ -31,12 +33,14 @@
'-fpermissive',
],
'libraries': [
'-L/usr/local/Cellar/openssl/1.0.2a-1/lib',
'-lssl',
'-lcrypto',
'-lboost_system',
'-lboost_filesystem',
'-lboost_program_options',
'-lboost_thread',
'-lboost_thread-mt',
'-lboost_chrono',
'-lsecp256k1',
'<(LIBBITCOIND)',
]
}]

6
example/index.js
View File

@ -16,9 +16,9 @@ var assert = require('assert');
* bitcoind
*/
if (fs.existsSync(process.env.HOME + '/.libbitcoind-example')) {
rimraf.sync(process.env.HOME + '/.libbitcoind-example');
}
//if (fs.existsSync(process.env.HOME + '/.libbitcoind-example')) {
// rimraf.sync(process.env.HOME + '/.libbitcoind-example');
//}
var bitcoind = require('../')({
directory: '~/.libbitcoind-example'

42
libbitcoind.includes Normal file
View File

@ -0,0 +1,42 @@
include/boost
include/boost/container/detail
include/boost/predef
include/boost/predef/architecture
include/boost/predef/architecture/x86
include/boost/predef/compiler
include/boost/predef/detail
include/boost/predef/language
include/boost/predef/library
include/boost/predef/library/c
include/boost/predef/library/std
include/boost/predef/os
include/boost/predef/os/bsd
include/boost/predef/other
include/boost/predef/platform
include/boost/python/detail
include/boost/tr1/tr1/bcc32
include/leveldb
libbitcoind/src
libbitcoind/src/compat
libbitcoind/src/config
libbitcoind/src/crypto
libbitcoind/src/json
libbitcoind/src/leveldb/db
libbitcoind/src/leveldb/helpers/memenv
libbitcoind/src/leveldb/include/leveldb
libbitcoind/src/leveldb/port
libbitcoind/src/leveldb/port/win
libbitcoind/src/leveldb/table
libbitcoind/src/leveldb/util
libbitcoind/src/obj
libbitcoind/src/primitives
libbitcoind/src/qt
libbitcoind/src/qt/test
libbitcoind/src/script
libbitcoind/src/secp256k1/include
libbitcoind/src/secp256k1/src
libbitcoind/src/secp256k1/src/java
libbitcoind/src/test
libbitcoind/src/univalue
node_modules/nan
src

2
platform/os.sh
View File

@ -69,7 +69,7 @@ if test -z "$1" -o x"$1" = x'lib'; then
if test -n "$BITCOIN_DIR" -a -e "${BITCOIN_DIR}/src/libbitcoind.so"; then
echo -n "${BITCOIN_DIR}/src/libbitcoind.so"
else
echo -n "$(pwd)/platform/${os}/libbitcoind.so"
echo -n "$(pwd)/platform/${os}/libbitcoind.dylib"
fi
exit 0
fi

215
src/bitcoindjs.cc
View File

@ -990,7 +990,6 @@ NAN_METHOD(StopBitcoind) {
static void
async_stop_node(uv_work_t *req) {
async_node_data *data = static_cast<async_node_data*>(req->data);
// if (SHUTTING_DOWN()) return;
unhook_packets();
StartShutdown();
data->result = std::string("bitcoind shutdown.");
@ -1006,8 +1005,6 @@ async_stop_node_after(uv_work_t *req) {
NanScope();
async_node_data* data = static_cast<async_node_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -1045,7 +1042,6 @@ async_stop_node_after(uv_work_t *req) {
NAN_METHOD(IsStopping) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
NanReturnValue(NanNew<Boolean>(ShutdownRequested()));
}
@ -1058,7 +1054,6 @@ NAN_METHOD(IsStopping) {
NAN_METHOD(IsStopped) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
NanReturnValue(NanNew<Boolean>(shutdown_complete));
}
@ -1071,8 +1066,6 @@ NAN_METHOD(IsStopped) {
NAN_METHOD(GetBlock) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2
|| (!args[0]->IsString() && !args[0]->IsNumber())
|| !args[1]->IsFunction()) {
@ -1115,8 +1108,6 @@ static void
async_get_block(uv_work_t *req) {
async_block_data* data = static_cast<async_block_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->height != -1) {
CBlockIndex* pblockindex = chainActive[data->height];
CBlock cblock;
@ -1147,8 +1138,6 @@ async_get_block_after(uv_work_t *req) {
NanScope();
async_block_data* data = static_cast<async_block_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -1192,8 +1181,6 @@ async_get_block_after(uv_work_t *req) {
NAN_METHOD(GetTransaction) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 3
|| !args[0]->IsString()
|| !args[1]->IsString()
@ -1235,8 +1222,6 @@ static void
async_get_tx(uv_work_t *req) {
async_tx_data* data = static_cast<async_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
uint256 hash(data->txid);
uint256 blockhash(data->blockhash);
CTransaction ctx;
@ -1259,8 +1244,6 @@ async_get_tx_after(uv_work_t *req) {
NanScope();
async_tx_data* data = static_cast<async_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
CTransaction ctx = data->ctx;
uint256 blockhash(data->blockhash);
@ -1305,8 +1288,6 @@ async_get_tx_after(uv_work_t *req) {
NAN_METHOD(BroadcastTx) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 4
|| !args[0]->IsObject()
|| !args[1]->IsBoolean()
@ -1347,8 +1328,6 @@ static void
async_broadcast_tx(uv_work_t *req) {
async_broadcast_tx_data* data = static_cast<async_broadcast_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
bool fOverrideFees = false;
bool fOwnOnly = false;
@ -1398,8 +1377,6 @@ async_broadcast_tx_after(uv_work_t *req) {
NanScope();
async_broadcast_tx_data* data = static_cast<async_broadcast_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -1439,8 +1416,6 @@ async_broadcast_tx_after(uv_work_t *req) {
NAN_METHOD(VerifyBlock) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.verifyBlock(block)");
@ -1470,8 +1445,6 @@ NAN_METHOD(VerifyBlock) {
NAN_METHOD(VerifyTransaction) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.verifyTransaction(tx)");
@ -1504,8 +1477,6 @@ NAN_METHOD(VerifyTransaction) {
NAN_METHOD(FillTransaction) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.fillTransaction(tx, options)");
@ -1516,8 +1487,8 @@ NAN_METHOD(FillTransaction) {
String::Utf8Value tx_hex_(jstx->Get(NanNew<String>("hex"))->ToString());
std::string tx_hex = std::string(*tx_hex_);
CTransaction ctx;
jstx_to_ctx(jstx, ctx);
CMutableTransaction ctx;
jstx_to_ctx(jstx, (CTransaction &)ctx);
// Get total value of outputs
// Get the scriptPubKey of the first output (presumably our destination)
@ -1525,7 +1496,6 @@ NAN_METHOD(FillTransaction) {
for (unsigned int vo = 0; vo < ctx.vout.size(); vo++) {
const CTxOut& txout = ctx.vout[vo];
int64_t value = txout.nValue;
const CScript& scriptPubKey = txout.scriptPubKey;
nValue += value;
}
@ -1594,8 +1564,6 @@ NAN_METHOD(FillTransaction) {
NAN_METHOD(GetInfo) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() > 0) {
return NanThrowError(
"Usage: bitcoindjs.getInfo()");
@ -1645,8 +1613,6 @@ NAN_METHOD(GetInfo) {
NAN_METHOD(GetPeerInfo) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() > 0) {
return NanThrowError(
"Usage: bitcoindjs.getPeerInfo()");
@ -1722,8 +1688,6 @@ NAN_METHOD(GetPeerInfo) {
NAN_METHOD(GetAddresses) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() > 0) {
return NanThrowError(
"Usage: bitcoindjs.getAddresses()");
@ -1738,7 +1702,7 @@ NAN_METHOD(GetAddresses) {
Local<Object> obj = NanNew<Object>();
char nServices[21] = {0};
int written = snprintf(nServices, sizeof(nServices), "%020lu", (uint64_t)addr.nServices);
int written = snprintf(nServices, sizeof(nServices), "%020llu", (uint64_t)addr.nServices);
assert(written == 20);
obj->Set(NanNew<String>("services"), NanNew<String>((char *)nServices));
@ -1764,8 +1728,6 @@ NAN_METHOD(GetAddresses) {
NAN_METHOD(GetProgress) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsFunction()) {
return NanThrowError(
"Usage: bitcoindjs.getProgress(callback)");
@ -1795,7 +1757,6 @@ NAN_METHOD(GetProgress) {
static void
async_get_progress(uv_work_t *req) {
// if (SHUTTING_DOWN()) return;
async_get_block(req);
}
@ -1804,8 +1765,6 @@ async_get_progress_after(uv_work_t *req) {
NanScope();
async_block_data* data = static_cast<async_block_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -1885,8 +1844,6 @@ async_get_progress_after(uv_work_t *req) {
NAN_METHOD(SetGenerate) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.setGenerate(options)");
@ -1952,7 +1909,6 @@ NAN_METHOD(SetGenerate) {
NAN_METHOD(GetGenerate) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
bool generate = GetBoolArg("-gen", false);
NanReturnValue(NanNew<Boolean>(generate));
}
@ -1966,8 +1922,6 @@ NAN_METHOD(GetGenerate) {
NAN_METHOD(GetMiningInfo) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
Local<Object> obj = NanNew<Object>();
json_spirit::Array empty_params;
@ -2006,8 +1960,6 @@ NAN_METHOD(GetMiningInfo) {
NAN_METHOD(GetAddrTransactions) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2
|| (!args[0]->IsString() && !args[0]->IsObject())
|| !args[1]->IsFunction()) {
@ -2075,8 +2027,6 @@ static void
async_get_addrtx(uv_work_t *req) {
async_addrtx_data* data = static_cast<async_addrtx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->addr.empty()) {
data->err_msg = std::string("Invalid address.");
return;
@ -2173,8 +2123,6 @@ async_get_addrtx_after(uv_work_t *req) {
NanScope();
async_addrtx_data* data = static_cast<async_addrtx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -2226,8 +2174,6 @@ async_get_addrtx_after(uv_work_t *req) {
NAN_METHOD(GetBestBlock) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 0) {
return NanThrowError(
"Usage: bitcoindjs.getBestBlock()");
@ -2247,8 +2193,6 @@ NAN_METHOD(GetBestBlock) {
NAN_METHOD(GetChainHeight) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() > 0) {
return NanThrowError(
"Usage: bitcoindjs.getChainHeight()");
@ -2266,8 +2210,6 @@ NAN_METHOD(GetChainHeight) {
NAN_METHOD(GetBlockByTx) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2
|| !args[0]->IsString()
|| !args[1]->IsFunction()) {
@ -2300,7 +2242,6 @@ NAN_METHOD(GetBlockByTx) {
static void
async_block_tx(uv_work_t *req) {
async_block_tx_data* data = static_cast<async_block_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
#if USE_LDB_TX
if (!g_txindex) {
parse:
@ -2336,8 +2277,6 @@ async_block_tx_after(uv_work_t *req) {
NanScope();
async_block_tx_data* data = static_cast<async_block_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -2386,8 +2325,6 @@ async_block_tx_after(uv_work_t *req) {
NAN_METHOD(GetBlocksByTime) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2
|| !args[0]->IsString()
|| !args[1]->IsFunction()) {
@ -2431,7 +2368,6 @@ NAN_METHOD(GetBlocksByTime) {
static void
async_block_time(uv_work_t *req) {
async_block_time_data* data = static_cast<async_block_time_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (!data->gte && !data->lte) {
data->err_msg = std::string("gte and lte not found.");
return;
@ -2472,8 +2408,6 @@ async_block_time_after(uv_work_t *req) {
NanScope();
async_block_time_data* data = static_cast<async_block_time_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -2522,8 +2456,6 @@ async_block_time_after(uv_work_t *req) {
NAN_METHOD(GetFromTx) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2
|| !args[0]->IsString()
|| !args[1]->IsFunction()) {
@ -2559,8 +2491,6 @@ static void
async_from_tx(uv_work_t *req) {
async_from_tx_data* data = static_cast<async_from_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
uint256 txid(data->txid);
bool found = false;
int64_t i = 0;
@ -2596,8 +2526,6 @@ async_from_tx_after(uv_work_t *req) {
NanScope();
async_from_tx_data* data = static_cast<async_from_tx_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -2654,8 +2582,6 @@ static const unsigned int MAX_HASH_FUNCS = 50;
NAN_METHOD(BloomCreate) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1) {
return NanThrowError(
"Usage: bitcoindjs.bloomCreate(options)");
@ -2690,8 +2616,6 @@ NAN_METHOD(BloomCreate) {
NAN_METHOD(BloomHash) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1) {
return NanThrowError(
"Usage: bitcoindjs.bloomHash(filter)");
@ -2724,8 +2648,6 @@ NAN_METHOD(BloomHash) {
NAN_METHOD(BloomInsert) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2) {
return NanThrowError(
"Usage: bitcoindjs.bloomInsert(filter, hash)");
@ -2769,8 +2691,6 @@ NAN_METHOD(BloomInsert) {
NAN_METHOD(BloomContains) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2) {
return NanThrowError(
"Usage: bitcoindjs.bloomContains(filter, hash)");
@ -2804,8 +2724,6 @@ NAN_METHOD(BloomContains) {
NAN_METHOD(BloomSize) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1) {
return NanThrowError(
"Usage: bitcoindjs.bloomSize(filter)");
@ -2839,8 +2757,6 @@ NAN_METHOD(BloomSize) {
NAN_METHOD(GetLastFileIndex) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() > 0) {
return NanThrowError(
"Usage: bitcoindjs.getLastFileIndex(callback)");
@ -2862,8 +2778,6 @@ NAN_METHOD(GetLastFileIndex) {
NAN_METHOD(GetBlockHex) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.getBlockHex(block)");
@ -2896,8 +2810,6 @@ NAN_METHOD(GetBlockHex) {
NAN_METHOD(GetTxHex) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.getTxHex(tx)");
@ -2929,8 +2841,6 @@ NAN_METHOD(GetTxHex) {
NAN_METHOD(BlockFromHex) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsString()) {
return NanThrowError(
"Usage: bitcoindjs.blockFromHex(hex)");
@ -3011,8 +2921,6 @@ boost::mutex poll_packets_mutex;
NAN_METHOD(HookPackets) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
Local<Array> obj = NanNew<Array>();
poll_packets_list *cur = NULL;
poll_packets_list *next = NULL;
@ -3127,7 +3035,7 @@ NAN_METHOD(HookPackets) {
Local<Object> obj = NanNew<Object>();
char nServices[21] = {0};
int written = snprintf(nServices, sizeof(nServices), "%020lu", (uint64_t)addr.nServices);
int written = snprintf(nServices, sizeof(nServices), "%020llu", (uint64_t)addr.nServices);
assert(written == 20);
obj->Set(NanNew<String>("services"), NanNew<String>((char *)nServices));
@ -3279,12 +3187,12 @@ NAN_METHOD(HookPackets) {
uint64_t nonce = 0;
vRecv >> nonce;
char sNonce[21] = {0};
int written = snprintf(sNonce, sizeof(sNonce), "%020lu", (uint64_t)nonce);
int written = snprintf(sNonce, sizeof(sNonce), "%020llu", (uint64_t)nonce);
assert(written == 20);
o->Set(NanNew<String>("nonce"), NanNew<String>(sNonce));
} else {
char sNonce[21] = {0};
int written = snprintf(sNonce, sizeof(sNonce), "%020lu", (uint64_t)0);
int written = snprintf(sNonce, sizeof(sNonce), "%020llu", (uint64_t)0);
assert(written == 20);
o->Set(NanNew<String>("nonce"), NanNew<String>(sNonce));
}
@ -3330,11 +3238,11 @@ NAN_METHOD(HookPackets) {
}
char sNonce[21] = {0};
int written = snprintf(sNonce, sizeof(sNonce), "%020lu", (uint64_t)nonce);
int written = snprintf(sNonce, sizeof(sNonce), "%020llu", (uint64_t)nonce);
assert(written == 20);
char sPingNonceSent[21] = {0};
written = snprintf(sPingNonceSent, sizeof(sPingNonceSent), "%020lu", (uint64_t)pfrom->nPingNonceSent);
written = snprintf(sPingNonceSent, sizeof(sPingNonceSent), "%020llu", (uint64_t)pfrom->nPingNonceSent);
assert(written == 20);
o->Set(NanNew<String>("expected"), NanNew<String>(sPingNonceSent));
@ -3580,8 +3488,6 @@ process_packet(CNode* pfrom, string strCommand, CDataStream& vRecv, int64_t nTim
NAN_METHOD(WalletNewAddress) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletNewAddress(options)");
@ -3668,8 +3574,6 @@ CBitcoinAddress GetAccountAddress(std::string strAccount, bool bForceNew=false)
NAN_METHOD(WalletGetAccountAddress) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletGetAccountAddress(options)");
@ -3713,8 +3617,6 @@ NAN_METHOD(WalletGetAccountAddress) {
NAN_METHOD(WalletSetAccount) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletSetAccount(options)");
@ -3807,8 +3709,6 @@ NAN_METHOD(WalletSetAccount) {
NAN_METHOD(WalletGetAccount) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletGetAccount(options)");
@ -3842,8 +3742,6 @@ NAN_METHOD(WalletGetAccount) {
NAN_METHOD(WalletGetRecipients) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletGetRecipients(options)");
@ -3887,8 +3785,6 @@ NAN_METHOD(WalletGetRecipients) {
NAN_METHOD(WalletSetRecipient) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletSetRecipient(options)");
@ -3936,8 +3832,6 @@ NAN_METHOD(WalletSetRecipient) {
NAN_METHOD(WalletRemoveRecipient) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletRemoveRecipient(options)");
@ -3965,8 +3859,6 @@ NAN_METHOD(WalletRemoveRecipient) {
NAN_METHOD(WalletSendTo) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsFunction()) {
return NanThrowError(
"Usage: bitcoindjs.walletSendTo(options, callback)");
@ -4018,8 +3910,6 @@ static void
async_wallet_sendto(uv_work_t *req) {
async_wallet_sendto_data* data = static_cast<async_wallet_sendto_data*>(req->data);
// if (SHUTTING_DOWN()) return;
CBitcoinAddress address(data->address);
if (!address.IsValid()) {
@ -4027,9 +3917,6 @@ async_wallet_sendto(uv_work_t *req) {
return;
}
// Amount
int64_t nAmount = data->nAmount;
// Wallet Transaction
CWalletTx wtx = data->wtx;
@ -4039,12 +3926,6 @@ async_wallet_sendto(uv_work_t *req) {
return;
}
std::string strError = pwalletMain->SendMoney(address.Get(), nAmount, wtx);
if (strError != "") {
data->err_msg = strError;
return;
}
data->txid = wtx.GetHash().GetHex();
}
@ -4053,8 +3934,6 @@ async_wallet_sendto_after(uv_work_t *req) {
NanScope();
async_wallet_sendto_data* data = static_cast<async_wallet_sendto_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -4094,8 +3973,6 @@ async_wallet_sendto_after(uv_work_t *req) {
NAN_METHOD(WalletSendFrom) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsFunction()) {
return NanThrowError(
"Usage: bitcoindjs.walletSendFrom(options, callback)");
@ -4156,8 +4033,6 @@ static void
async_wallet_sendfrom(uv_work_t *req) {
async_wallet_sendfrom_data* data = static_cast<async_wallet_sendfrom_data*>(req->data);
// if (SHUTTING_DOWN()) return;
CBitcoinAddress address(data->address);
if (!address.IsValid()) {
@ -4183,13 +4058,6 @@ async_wallet_sendfrom(uv_work_t *req) {
return;
}
// Send
std::string strError = pwalletMain->SendMoney(address.Get(), nAmount, wtx);
if (strError != "") {
data->err_msg = strError;
return;
}
data->txid = wtx.GetHash().GetHex();
}
@ -4198,8 +4066,6 @@ async_wallet_sendfrom_after(uv_work_t *req) {
NanScope();
async_wallet_sendfrom_data* data = static_cast<async_wallet_sendfrom_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -4237,8 +4103,6 @@ async_wallet_sendfrom_after(uv_work_t *req) {
NAN_METHOD(WalletMove) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletMove(options)");
@ -4320,8 +4184,6 @@ NAN_METHOD(WalletMove) {
NAN_METHOD(WalletSignMessage) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletSignMessage(options)");
@ -4377,8 +4239,6 @@ NAN_METHOD(WalletSignMessage) {
NAN_METHOD(WalletVerifyMessage) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletVerifyMessage(options)");
@ -4500,8 +4360,6 @@ CScript _createmultisig_redeemScript(int nRequired, Local<Array> keys) {
NAN_METHOD(WalletCreateMultiSigAddress) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletCreateMultiSigAddress(options)");
@ -4570,8 +4428,6 @@ NAN_METHOD(WalletCreateMultiSigAddress) {
NAN_METHOD(WalletGetBalance) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletGetBalance(options)");
@ -4648,7 +4504,6 @@ NAN_METHOD(WalletGetBalance) {
NAN_METHOD(WalletGetUnconfirmedBalance) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
NanReturnValue(NanNew<Number>(pwalletMain->GetUnconfirmedBalance()));
}
@ -4661,8 +4516,6 @@ NAN_METHOD(WalletGetUnconfirmedBalance) {
NAN_METHOD(WalletListTransactions) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletListTransactions(options)");
@ -4896,8 +4749,6 @@ ListTransactions_V8(const CWalletTx& wtx, const string& strAccount,
NAN_METHOD(WalletReceivedByAddress) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletReceivedByAddress(options)");
@ -4956,8 +4807,6 @@ NAN_METHOD(WalletReceivedByAddress) {
NAN_METHOD(WalletListAccounts) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletListAccounts(options)");
@ -5068,8 +4917,6 @@ NAN_METHOD(WalletListAccounts) {
NAN_METHOD(WalletGetTransaction) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletGetTransaction(options)");
@ -5136,8 +4983,6 @@ NAN_METHOD(WalletGetTransaction) {
NAN_METHOD(WalletBackup) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletBackup(options)");
@ -5164,8 +5009,6 @@ NAN_METHOD(WalletBackup) {
NAN_METHOD(WalletPassphrase) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletPassphrase(options)");
@ -5207,8 +5050,6 @@ NAN_METHOD(WalletPassphrase) {
NAN_METHOD(WalletPassphraseChange) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletPassphraseChange(options)");
@ -5254,8 +5095,6 @@ NAN_METHOD(WalletPassphraseChange) {
NAN_METHOD(WalletLock) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 0) {
return NanThrowError(
"Usage: bitcoindjs.walletLock([options])");
@ -5280,8 +5119,6 @@ NAN_METHOD(WalletLock) {
NAN_METHOD(WalletEncrypt) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletEncrypt(options)");
@ -5335,8 +5172,6 @@ NAN_METHOD(WalletEncrypt) {
NAN_METHOD(WalletEncrypted) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() > 0) {
return NanThrowError(
"Usage: bitcoindjs.walletEncrypted()");
@ -5367,8 +5202,6 @@ NAN_METHOD(WalletEncrypted) {
NAN_METHOD(WalletKeyPoolRefill) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletKeyPoolRefill(options)");
@ -5405,8 +5238,6 @@ NAN_METHOD(WalletKeyPoolRefill) {
NAN_METHOD(WalletSetTxFee) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletSetTxFee(options)");
@ -5436,8 +5267,6 @@ NAN_METHOD(WalletSetTxFee) {
NAN_METHOD(WalletDumpKey) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletDumpKey(options)");
@ -5485,8 +5314,6 @@ NAN_METHOD(WalletDumpKey) {
NAN_METHOD(WalletImportKey) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletImportKey(options, callback)");
@ -5624,7 +5451,6 @@ rescan:
static void
async_import_key(uv_work_t *req) {
async_import_key_data* data = static_cast<async_import_key_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
return;
}
@ -5639,8 +5465,6 @@ async_import_key_after(uv_work_t *req) {
NanScope();
async_import_key_data* data = static_cast<async_import_key_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -5678,8 +5502,6 @@ async_import_key_after(uv_work_t *req) {
NAN_METHOD(WalletDumpWallet) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsFunction()) {
return NanThrowError(
"Usage: bitcoindjs.walletDumpWallet(options, callback)");
@ -5718,9 +5540,6 @@ NAN_METHOD(WalletDumpWallet) {
static void
async_dump_wallet(uv_work_t *req) {
async_dump_wallet_data* data = static_cast<async_dump_wallet_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
return;
}
@ -5792,8 +5611,6 @@ async_dump_wallet_after(uv_work_t *req) {
NanScope();
async_dump_wallet_data* data = static_cast<async_dump_wallet_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -5831,8 +5648,6 @@ async_dump_wallet_after(uv_work_t *req) {
NAN_METHOD(WalletImportWallet) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsFunction()) {
return NanThrowError(
"Usage: bitcoindjs.walletImportWallet(options, callback)");
@ -5872,8 +5687,6 @@ static void
async_import_wallet(uv_work_t *req) {
async_import_wallet_data* data = static_cast<async_import_wallet_data*>(req->data);
// if (SHUTTING_DOWN()) return;
std::string path = data->path;
ifstream file;
@ -5973,8 +5786,6 @@ async_import_wallet_after(uv_work_t *req) {
NanScope();
async_import_wallet_data* data = static_cast<async_import_wallet_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
const unsigned argc = 1;
@ -6012,8 +5823,6 @@ async_import_wallet_after(uv_work_t *req) {
NAN_METHOD(WalletChangeLabel) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletChangeLabel(options)");
@ -6095,8 +5904,6 @@ NAN_METHOD(WalletChangeLabel) {
NAN_METHOD(WalletDeleteAccount) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletDeleteAccount(options)");
@ -6176,8 +5983,6 @@ NAN_METHOD(WalletDeleteAccount) {
NAN_METHOD(WalletIsMine) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 1 || !args[0]->IsObject()) {
return NanThrowError(
"Usage: bitcoindjs.walletIsMine(options)");
@ -6224,8 +6029,6 @@ NAN_METHOD(WalletIsMine) {
NAN_METHOD(WalletRescan) {
NanScope();
// if (SHUTTING_DOWN()) NanReturnValue(Undefined());
if (args.Length() < 2 || !args[0]->IsObject() || !args[1]->IsFunction()) {
return NanThrowError(
"Usage: bitcoindjs.walletRescan(options, callback)");
@ -6253,7 +6056,6 @@ NAN_METHOD(WalletRescan) {
static void
async_rescan(uv_work_t *req) {
// if (SHUTTING_DOWN()) return;
// async_rescan_data* data = static_cast<async_rescan_data*>(req->data);
// This may take a long time, do it on the libuv thread pool:
pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
@ -6264,7 +6066,6 @@ async_rescan_after(uv_work_t *req) {
NanScope();
async_rescan_data* data = static_cast<async_rescan_data*>(req->data);
// if (SHUTTING_DOWN()) return;
if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));