drop 0x
This commit is contained in:
parent
41fe58077b
commit
0b56a4378a
|
@ -662,9 +662,6 @@ static void
|
||||||
async_get_block(uv_work_t *req) {
|
async_get_block(uv_work_t *req) {
|
||||||
async_block_data* data = static_cast<async_block_data*>(req->data);
|
async_block_data* data = static_cast<async_block_data*>(req->data);
|
||||||
std::string strHash = data->hash;
|
std::string strHash = data->hash;
|
||||||
if (strHash[1] != 'x') {
|
|
||||||
strHash = "0x" + strHash;
|
|
||||||
}
|
|
||||||
uint256 hash(strHash);
|
uint256 hash(strHash);
|
||||||
CBlock cblock;
|
CBlock cblock;
|
||||||
CBlockIndex* pblockindex = mapBlockIndex[hash];
|
CBlockIndex* pblockindex = mapBlockIndex[hash];
|
||||||
|
@ -745,14 +742,6 @@ NAN_METHOD(GetTx) {
|
||||||
blockHash = std::string("0x0000000000000000000000000000000000000000000000000000000000000000");
|
blockHash = std::string("0x0000000000000000000000000000000000000000000000000000000000000000");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (txHash[1] != 'x') {
|
|
||||||
txHash = "0x" + txHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (blockHash[1] != 'x') {
|
|
||||||
blockHash = "0x" + blockHash;
|
|
||||||
}
|
|
||||||
|
|
||||||
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->txHash = txHash;
|
||||||
|
@ -2644,7 +2633,6 @@ jsblock_to_cblock(const Local<Object> jsblock, CBlock& cblock) {
|
||||||
|
|
||||||
String::AsciiValue mhash__(jsblock->Get(NanNew<String>("merkleroot"))->ToString());
|
String::AsciiValue mhash__(jsblock->Get(NanNew<String>("merkleroot"))->ToString());
|
||||||
std::string mhash_ = *mhash__;
|
std::string mhash_ = *mhash__;
|
||||||
if (mhash_[1] != 'x') mhash_ = "0x" + mhash_;
|
|
||||||
uint256 mhash(mhash_);
|
uint256 mhash(mhash_);
|
||||||
|
|
||||||
cblock.hashMerkleRoot = mhash;
|
cblock.hashMerkleRoot = mhash;
|
||||||
|
@ -2655,7 +2643,6 @@ jsblock_to_cblock(const Local<Object> jsblock, CBlock& cblock) {
|
||||||
if (jsblock->Get(NanNew<String>("previousblockhash"))->IsString()) {
|
if (jsblock->Get(NanNew<String>("previousblockhash"))->IsString()) {
|
||||||
String::AsciiValue hash__(jsblock->Get(NanNew<String>("previousblockhash"))->ToString());
|
String::AsciiValue hash__(jsblock->Get(NanNew<String>("previousblockhash"))->ToString());
|
||||||
std::string hash_ = *hash__;
|
std::string hash_ = *hash__;
|
||||||
if (hash_[1] != 'x') hash_ = "0x" + hash_;
|
|
||||||
uint256 hash(hash_);
|
uint256 hash(hash_);
|
||||||
cblock.hashPrevBlock = hash;
|
cblock.hashPrevBlock = hash;
|
||||||
} else {
|
} else {
|
||||||
|
@ -2708,7 +2695,6 @@ jstx_to_ctx(const Local<Object> jstx, CTransaction& ctx) {
|
||||||
//} else {
|
//} else {
|
||||||
String::AsciiValue phash__(in->Get(NanNew<String>("txid"))->ToString());
|
String::AsciiValue phash__(in->Get(NanNew<String>("txid"))->ToString());
|
||||||
std::string phash_ = *phash__;
|
std::string phash_ = *phash__;
|
||||||
if (phash_[1] != 'x') phash_ = "0x" + phash_;
|
|
||||||
uint256 phash(phash_);
|
uint256 phash(phash_);
|
||||||
|
|
||||||
txin.prevout.hash = phash;
|
txin.prevout.hash = phash;
|
||||||
|
@ -2719,7 +2705,6 @@ jstx_to_ctx(const Local<Object> jstx, CTransaction& ctx) {
|
||||||
Local<Object> script_obj = Local<Object>::Cast(in->Get(NanNew<String>("scriptSig")));
|
Local<Object> script_obj = Local<Object>::Cast(in->Get(NanNew<String>("scriptSig")));
|
||||||
String::AsciiValue shash__(script_obj->Get(NanNew<String>("hex"))->ToString());
|
String::AsciiValue shash__(script_obj->Get(NanNew<String>("hex"))->ToString());
|
||||||
shash_ = *shash__;
|
shash_ = *shash__;
|
||||||
if (shash_[1] != 'x') shash_ = "0x" + shash_;
|
|
||||||
uint256 shash(shash_);
|
uint256 shash(shash_);
|
||||||
CScript scriptSig(shash);
|
CScript scriptSig(shash);
|
||||||
|
|
||||||
|
@ -2740,7 +2725,6 @@ jstx_to_ctx(const Local<Object> jstx, CTransaction& ctx) {
|
||||||
Local<Object> script_obj = Local<Object>::Cast(out->Get(NanNew<String>("scriptPubKey")));
|
Local<Object> script_obj = Local<Object>::Cast(out->Get(NanNew<String>("scriptPubKey")));
|
||||||
String::AsciiValue phash__(script_obj->Get(NanNew<String>("hex")));
|
String::AsciiValue phash__(script_obj->Get(NanNew<String>("hex")));
|
||||||
std::string phash_ = *phash__;
|
std::string phash_ = *phash__;
|
||||||
if (phash_[1] != 'x') phash_ = "0x" + phash_;
|
|
||||||
uint256 phash(phash_);
|
uint256 phash(phash_);
|
||||||
CScript scriptPubKey(phash);
|
CScript scriptPubKey(phash);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue