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

make var names more consistent.

Browse Source
This commit is contained in:
Christopher Jeffrey 2014-12-08 11:31:00 -08:00
parent fab1f4512b
commit 32fd1fceb4
1 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/bitcoindjs.cc
View File

@ -364,7 +364,7 @@ static inline void
cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object> jsblock, bool is_new); cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object> jsblock, bool is_new);
static inline void static inline void
ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx); ctx_to_jstx(const CTransaction& ctx, uint256 blockhash, Local<Object> jstx);
static inline void static inline void
jsblock_to_cblock(const Local<Object> jsblock, CBlock& cblock); jsblock_to_cblock(const Local<Object> jsblock, CBlock& cblock);
@ -458,8 +458,8 @@ struct async_block_data {
struct async_tx_data { struct async_tx_data {
std::string err_msg; std::string err_msg;
std::string txHash; std::string txid;
std::string blockHash; std::string blockhash;
CTransaction ctx; CTransaction ctx;
Persistent<Function> callback; Persistent<Function> callback;
}; };
@ -524,7 +524,7 @@ struct async_broadcast_tx_data {
std::string err_msg; std::string err_msg;
Persistent<Object> jstx; Persistent<Object> jstx;
CTransaction ctx; CTransaction ctx;
std::string tx_hash; std::string txid;
bool override_fees; bool override_fees;
bool own_only; bool own_only;
Persistent<Function> callback; Persistent<Function> callback;
@ -536,7 +536,7 @@ struct async_broadcast_tx_data {
struct async_wallet_sendto_data { struct async_wallet_sendto_data {
std::string err_msg; std::string err_msg;
std::string tx_hash; std::string txid;
std::string address; std::string address;
int64_t nAmount; int64_t nAmount;
CWalletTx wtx; CWalletTx wtx;
@ -549,7 +549,7 @@ struct async_wallet_sendto_data {
struct async_wallet_sendfrom_data { struct async_wallet_sendfrom_data {
std::string err_msg; std::string err_msg;
std::string tx_hash; std::string txid;
std::string address; std::string address;
int64_t nAmount; int64_t nAmount;
int nMinDepth; int nMinDepth;
@ -607,12 +607,12 @@ read_addr(const std::string addr, const int64_t blockheight, const int64_t block
#if USE_LDB_TX #if USE_LDB_TX
static bool static bool
get_block_by_tx(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcblock_index); get_block_by_tx(const std::string itxid, CBlock& rcblock, CBlockIndex **rcblock_index);
#endif #endif
#if 0 #if 0
static bool static bool
get_block_by_tx_unspent(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcblock_index); get_block_by_tx_unspent(const std::string itxid, CBlock& rcblock, CBlockIndex **rcblock_index);
#endif #endif
/** /**
@ -991,7 +991,7 @@ NAN_METHOD(IsStopped) {
/** /**
* GetBlock() * GetBlock()
* bitcoind.getBlock([blockHash,blockHeight], callback) * bitcoind.getBlock([blockhash,blockheight], callback)
* Read any block from disk asynchronously. * Read any block from disk asynchronously.
*/ */
@ -1002,7 +1002,7 @@ NAN_METHOD(GetBlock) {
|| (!args[0]->IsString() && !args[0]->IsNumber()) || (!args[0]->IsString() && !args[0]->IsNumber())
|| !args[1]->IsFunction()) { || !args[1]->IsFunction()) {
return NanThrowError( return NanThrowError(
"Usage: bitcoindjs.getBlock([blockHash,blockHeight], callback)"); "Usage: bitcoindjs.getBlock([blockhash,blockheight], callback)");
} }
async_block_data *data = new async_block_data(); async_block_data *data = new async_block_data();
@ -1106,7 +1106,7 @@ async_get_block_after(uv_work_t *req) {
/** /**
* GetTransaction() * GetTransaction()
* bitcoind.getTransaction(txHash, [blockHash], callback) * bitcoind.getTransaction(txid, [blockhash], callback)
* Read any transaction from disk asynchronously. * Read any transaction from disk asynchronously.
*/ */
@ -1118,24 +1118,24 @@ NAN_METHOD(GetTransaction) {
|| !args[1]->IsString() || !args[1]->IsString()
|| !args[2]->IsFunction()) { || !args[2]->IsFunction()) {
return NanThrowError( return NanThrowError(
"Usage: bitcoindjs.getTransaction(txHash, [blockHash], callback)"); "Usage: bitcoindjs.getTransaction(txid, [blockhash], callback)");
} }
String::Utf8Value txHash_(args[0]->ToString()); String::Utf8Value txid_(args[0]->ToString());
String::Utf8Value blockHash_(args[1]->ToString()); String::Utf8Value blockhash_(args[1]->ToString());
Local<Function> callback = Local<Function>::Cast(args[2]); Local<Function> callback = Local<Function>::Cast(args[2]);
std::string txHash = std::string(*txHash_); std::string txid = std::string(*txid_);
std::string blockHash = std::string(*blockHash_); std::string blockhash = std::string(*blockhash_);
if (blockHash == "") { if (blockhash == "") {
blockHash = uint256(0).GetHex(); blockhash = uint256(0).GetHex();
} }
async_tx_data *data = new async_tx_data(); async_tx_data *data = new async_tx_data();
data->err_msg = std::string(""); data->err_msg = std::string("");
data->txHash = txHash; data->txid = txid;
data->blockHash = blockHash; data->blockhash = blockhash;
data->callback = Persistent<Function>::New(callback); data->callback = Persistent<Function>::New(callback);
uv_work_t *req = new uv_work_t(); uv_work_t *req = new uv_work_t();
@ -1154,23 +1154,23 @@ static void
async_get_tx(uv_work_t *req) { async_get_tx(uv_work_t *req) {
async_tx_data* data = static_cast<async_tx_data*>(req->data); async_tx_data* data = static_cast<async_tx_data*>(req->data);
uint256 hash(data->txHash); uint256 hash(data->txid);
uint256 block_hash(data->blockHash); uint256 blockhash(data->blockhash);
CTransaction ctx; CTransaction ctx;
if (get_tx(hash, block_hash, ctx)) { if (get_tx(hash, blockhash, ctx)) {
data->ctx = ctx; data->ctx = ctx;
data->blockHash = block_hash; data->blockhash = blockhash;
} else { } else {
data->err_msg = std::string("get_tx(): failed."); data->err_msg = std::string("get_tx(): failed.");
} }
#if 0 #if 0
if (GetTransaction(hash, ctx, block_hash, true)) { if (GetTransaction(hash, ctx, blockhash, true)) {
data->ctx = ctx; data->ctx = ctx;
} else if (block_hash != 0) { } else if (blockhash != 0) {
CBlock block; CBlock block;
CBlockIndex* pblockindex = mapBlockIndex[block_hash]; CBlockIndex* pblockindex = mapBlockIndex[blockhash];
if (ReadBlockFromDisk(block, pblockindex)) { if (ReadBlockFromDisk(block, pblockindex)) {
BOOST_FOREACH(const CTransaction &tx, block.vtx) { BOOST_FOREACH(const CTransaction &tx, block.vtx) {
if (tx.GetHash() == hash) { if (tx.GetHash() == hash) {
@ -1189,12 +1189,8 @@ async_get_tx_after(uv_work_t *req) {
NanScope(); NanScope();
async_tx_data* data = static_cast<async_tx_data*>(req->data); async_tx_data* data = static_cast<async_tx_data*>(req->data);
std::string txHash = data->txHash;
std::string blockHash = data->blockHash;
CTransaction ctx = data->ctx; CTransaction ctx = data->ctx;
uint256 blockhash(data->blockhash);
uint256 hash(txHash);
uint256 block_hash(blockHash);
if (data->err_msg != "") { if (data->err_msg != "") {
Local<Value> err = Exception::Error(NanNew<String>(data->err_msg)); Local<Value> err = Exception::Error(NanNew<String>(data->err_msg));
@ -1207,7 +1203,7 @@ async_get_tx_after(uv_work_t *req) {
} }
} else { } else {
Local<Object> jstx = NanNew<Object>(); Local<Object> jstx = NanNew<Object>();
ctx_to_jstx(ctx, block_hash, jstx); ctx_to_jstx(ctx, blockhash, jstx);
const unsigned argc = 2; const unsigned argc = 2;
Local<Value> argv[argc] = { Local<Value> argv[argc] = {
@ -1318,7 +1314,7 @@ async_broadcast_tx(uv_work_t *req) {
RelayTransaction(ctx); RelayTransaction(ctx);
data->tx_hash = hashTx.GetHex(); data->txid = hashTx.GetHex();
} }
static void static void
@ -1339,7 +1335,7 @@ async_broadcast_tx_after(uv_work_t *req) {
const unsigned argc = 3; const unsigned argc = 3;
Local<Value> argv[argc] = { Local<Value> argv[argc] = {
Local<Value>::New(Null()), Local<Value>::New(Null()),
Local<Value>::New(NanNew<String>(data->tx_hash)), Local<Value>::New(NanNew<String>(data->txid)),
Local<Value>::New(data->jstx) Local<Value>::New(data->jstx)
}; };
TryCatch try_catch; TryCatch try_catch;
@ -3569,7 +3565,7 @@ async_wallet_sendto(uv_work_t *req) {
return; return;
} }
data->tx_hash = wtx.GetHash().GetHex(); data->txid = wtx.GetHash().GetHex();
} }
static void static void
@ -3590,7 +3586,7 @@ async_wallet_sendto_after(uv_work_t *req) {
const unsigned argc = 2; const unsigned argc = 2;
Local<Value> argv[argc] = { Local<Value> argv[argc] = {
Local<Value>::New(Null()), Local<Value>::New(Null()),
Local<Value>::New(NanNew<String>(data->tx_hash)) Local<Value>::New(NanNew<String>(data->txid))
}; };
TryCatch try_catch; TryCatch try_catch;
data->callback->Call(Context::GetCurrent()->Global(), argc, argv); data->callback->Call(Context::GetCurrent()->Global(), argc, argv);
@ -3708,7 +3704,7 @@ async_wallet_sendfrom(uv_work_t *req) {
return; return;
} }
data->tx_hash = wtx.GetHash().GetHex(); data->txid = wtx.GetHash().GetHex();
} }
static void static void
@ -3729,7 +3725,7 @@ async_wallet_sendfrom_after(uv_work_t *req) {
const unsigned argc = 2; const unsigned argc = 2;
Local<Value> argv[argc] = { Local<Value> argv[argc] = {
Local<Value>::New(Null()), Local<Value>::New(Null()),
Local<Value>::New(NanNew<String>(data->tx_hash)) Local<Value>::New(NanNew<String>(data->txid))
}; };
TryCatch try_catch; TryCatch try_catch;
data->callback->Call(Context::GetCurrent()->Global(), argc, argv); data->callback->Call(Context::GetCurrent()->Global(), argc, argv);
@ -5746,7 +5742,7 @@ async_rescan_after(uv_work_t *req) {
/** /**
* Conversions * Conversions
* cblock_to_jsblock(cblock, cblock_index, jsblock, is_new) * cblock_to_jsblock(cblock, cblock_index, jsblock, is_new)
* ctx_to_jstx(ctx, block_hash, jstx) * ctx_to_jstx(ctx, blockhash, jstx)
* jsblock_to_cblock(jsblock, cblock) * jsblock_to_cblock(jsblock, cblock)
* jstx_to_ctx(jstx, ctx) * jstx_to_ctx(jstx, ctx)
* These functions, only callable from C++, are used to convert javascript * These functions, only callable from C++, are used to convert javascript
@ -5786,9 +5782,9 @@ cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object>
cblock_index = find_new_block_index(cblock.GetHash(), cblock.hashPrevBlock, &is_allocated); cblock_index = find_new_block_index(cblock.GetHash(), cblock.hashPrevBlock, &is_allocated);
} }
uint256 block_hash = cblock.GetHash(); uint256 blockhash = cblock.GetHash();
jsblock->Set(NanNew<String>("hash"), NanNew<String>(block_hash.GetHex())); jsblock->Set(NanNew<String>("hash"), NanNew<String>(blockhash.GetHex()));
CMerkleTx txGen(cblock.vtx[0]); CMerkleTx txGen(cblock.vtx[0]);
txGen.SetMerkleBranch(cblock); txGen.SetMerkleBranch(cblock);
jsblock->Set(NanNew<String>("confirmations"), NanNew<Number>((int)txGen.GetDepthInMainChain())->ToInt32()); jsblock->Set(NanNew<String>("confirmations"), NanNew<Number>((int)txGen.GetDepthInMainChain())->ToInt32());
@ -5837,7 +5833,7 @@ cblock_to_jsblock(const CBlock& cblock, CBlockIndex* cblock_index, Local<Object>
int ti = 0; int ti = 0;
BOOST_FOREACH(const CTransaction& ctx, cblock.vtx) { BOOST_FOREACH(const CTransaction& ctx, cblock.vtx) {
Local<Object> jstx = NanNew<Object>(); Local<Object> jstx = NanNew<Object>();
ctx_to_jstx(ctx, block_hash, jstx); ctx_to_jstx(ctx, blockhash, jstx);
txs->Set(ti, jstx); txs->Set(ti, jstx);
ti++; ti++;
} }
@ -5876,7 +5872,7 @@ get_tx(uint256 txid, uint256& blockhash, CTransaction& ctx) {
} }
static inline void static inline void
ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx) { ctx_to_jstx(const CTransaction& ctx, uint256 blockhash, Local<Object> jstx) {
// With v0.9.0 // With v0.9.0
// jstx->Set(NanNew<String>("mintxfee"), NanNew<Number>((int64_t)ctx.nMinTxFee)->ToInteger()); // jstx->Set(NanNew<String>("mintxfee"), NanNew<Number>((int64_t)ctx.nMinTxFee)->ToInteger());
// jstx->Set(NanNew<String>("minrelaytxfee"), NanNew<Number>((int64_t)ctx.nMinRelayTxFee)->ToInteger()); // jstx->Set(NanNew<String>("minrelaytxfee"), NanNew<Number>((int64_t)ctx.nMinRelayTxFee)->ToInteger());
@ -5914,8 +5910,8 @@ ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx) {
Local<Object> jsprev = NanNew<Object>(); Local<Object> jsprev = NanNew<Object>();
CTransaction prev_tx; CTransaction prev_tx;
//if (get_tx(txin.prevout.hash, block_hash, prev_tx)) { //if (get_tx(txin.prevout.hash, blockhash, prev_tx)) {
if (GetTransaction(txin.prevout.hash, prev_tx, block_hash, true)) { if (GetTransaction(txin.prevout.hash, prev_tx, blockhash, true)) {
CTxDestination from; CTxDestination from;
CTxOut prev_out = prev_tx.vout[txin.prevout.n]; CTxOut prev_out = prev_tx.vout[txin.prevout.n];
ExtractDestination(prev_out.scriptPubKey, from); ExtractDestination(prev_out.scriptPubKey, from);
@ -6036,17 +6032,17 @@ ctx_to_jstx(const CTransaction& ctx, uint256 block_hash, Local<Object> jstx) {
jstx->Set(NanNew<String>("ismine"), NanNew<Boolean>(is_mine)); jstx->Set(NanNew<String>("ismine"), NanNew<Boolean>(is_mine));
// Find block hash if it's in our wallet // Find block hash if it's in our wallet
if (block_hash == 0 && is_mine) { if (blockhash == 0 && is_mine) {
block_hash = cwtx.hashBlock; blockhash = cwtx.hashBlock;
} }
if (block_hash != 0) { if (blockhash != 0) {
jstx->Set(NanNew<String>("blockhash"), NanNew<String>(block_hash.GetHex())); jstx->Set(NanNew<String>("blockhash"), NanNew<String>(blockhash.GetHex()));
if (ctx.IsCoinBase()) { if (ctx.IsCoinBase()) {
jstx->Set(NanNew<String>("generated"), NanNew<Boolean>(true)); jstx->Set(NanNew<String>("generated"), NanNew<Boolean>(true));
} }
if (mapBlockIndex.count(block_hash) > 0) { if (mapBlockIndex.count(blockhash) > 0) {
CBlockIndex* pindex = mapBlockIndex[block_hash]; CBlockIndex* pindex = mapBlockIndex[blockhash];
jstx->Set(NanNew<String>("confirmations"), jstx->Set(NanNew<String>("confirmations"),
NanNew<Number>(pindex->nHeight)); NanNew<Number>(pindex->nHeight));
// XXX Not really index: // XXX Not really index:
@ -6411,8 +6407,8 @@ read_addr(const std::string addr, const int64_t blockheight, const int64_t block
CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION);
uint256 txhash; uint256 txid;
ssKey >> txhash; ssKey >> txid;
// struct CDiskBlockPos { // struct CDiskBlockPos {
// int nFile; // int nFile;
@ -6428,7 +6424,7 @@ read_addr(const std::string addr, const int64_t blockheight, const int64_t block
CTransaction ctx; CTransaction ctx;
uint256 blockhash; uint256 blockhash;
if (!pblocktree->ReadTxIndex(txhash, txPos)) { if (!pblocktree->ReadTxIndex(txid, txPos)) {
goto next; goto next;
} }
@ -6441,7 +6437,7 @@ read_addr(const std::string addr, const int64_t blockheight, const int64_t block
} catch (std::exception &e) { } catch (std::exception &e) {
goto error; goto error;
} }
if (ctx.GetHash() != txhash) { if (ctx.GetHash() != txid) {
goto error; goto error;
} }
blockhash = header.GetHash(); blockhash = header.GetHash();
@ -6526,7 +6522,7 @@ error:
#if USE_LDB_TX #if USE_LDB_TX
static bool static bool
get_block_by_tx(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcblock_index) { get_block_by_tx(const std::string itxid, CBlock& rcblock, CBlockIndex **rcblock_index) {
leveldb::Iterator* pcursor = pblocktree->pdb->NewIterator(pblocktree->iteroptions); leveldb::Iterator* pcursor = pblocktree->pdb->NewIterator(pblocktree->iteroptions);
pcursor->SeekToFirst(); pcursor->SeekToFirst();
@ -6550,9 +6546,9 @@ get_block_by_tx(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcbloc
// Which offset in the block file the tx resides // Which offset in the block file the tx resides
// The offset from the top of the block containing the tx // The offset from the top of the block containing the tx
if (type == 't') { if (type == 't') {
uint256 txhash; uint256 txid;
ssKey >> txhash; ssKey >> txid;
if (txhash.GetHex() == itxhash) { if (txid.GetHex() == itxid) {
leveldb::Slice slValue = pcursor->value(); leveldb::Slice slValue = pcursor->value();
CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION);
@ -6571,7 +6567,7 @@ get_block_by_tx(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcbloc
CTransaction ctx; CTransaction ctx;
uint256 blockhash; uint256 blockhash;
if (!pblocktree->ReadTxIndex(txhash, txPos)) { if (!pblocktree->ReadTxIndex(txid, txPos)) {
goto error; goto error;
} }
@ -6584,7 +6580,7 @@ get_block_by_tx(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcbloc
} catch (std::exception &e) { } catch (std::exception &e) {
goto error; goto error;
} }
if (ctx.GetHash() != txhash) { if (ctx.GetHash() != txid) {
goto error; goto error;
} }
blockhash = header.GetHash(); blockhash = header.GetHash();
@ -6624,7 +6620,7 @@ error:
// extern CCoinsViewDB *pcoinsdbview; // extern CCoinsViewDB *pcoinsdbview;
static bool static bool
get_block_by_tx_unspent(const std::string itxhash, CBlock& rcblock, CBlockIndex **rcblock_index) { get_block_by_tx_unspent(const std::string itxid, CBlock& rcblock, CBlockIndex **rcblock_index) {
// XXX Will not work - db is protected property: // XXX Will not work - db is protected property:
CCoinsViewDB *pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex); CCoinsViewDB *pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex);
bool fReindex = GetBoolArg("-reindex", false); bool fReindex = GetBoolArg("-reindex", false);
@ -6655,9 +6651,9 @@ get_block_by_tx_unspent(const std::string itxhash, CBlock& rcblock, CBlockIndex
// Which outputs of the tx are unspent // Which outputs of the tx are unspent
// The scriptPubKey and amount for these unspent outputs // The scriptPubKey and amount for these unspent outputs
if (type == 'c') { if (type == 'c') {
uint256 txhash; uint256 txid;
ssKey >> txhash; ssKey >> txid;
if (txhash.GetHex() == itxhash) { if (txid.GetHex() == itxid) {
leveldb::Slice slValue = pcursor->value(); leveldb::Slice slValue = pcursor->value();
CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION);