From 4459bf5b9f517da28413d9725e6691e8d8a232b7 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 1 Dec 2014 17:12:53 -0800 Subject: [PATCH] more leveldb work. --- src/bitcoindjs.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/bitcoindjs.cc b/src/bitcoindjs.cc index 738cc67b..71f3efc2 100644 --- a/src/bitcoindjs.cc +++ b/src/bitcoindjs.cc @@ -187,7 +187,7 @@ using namespace v8; #define EMPTY ("\\x01") // LevelDB options -#define USE_LDB_ADDR 1 +#define USE_LDB_ADDR 0 /** * Node.js Exposed Function Templates @@ -5891,13 +5891,18 @@ read_addr(const std::string addr) { CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION); char type; ssKey >> type; - if (type == 'b') { //if (slKey.ToString().c_str()[0] == 'b') { + if (type == 'b') { leveldb::Slice slValue = pcursor->value(); - //CDataStream ssValue(ParseHex(slValue.ToString()), SER_DISK, CLIENT_VERSION); - //CDataStream ssValue(ParseHex(slValue.ToString()), SER_NETWORK, PROTOCOL_VERSION); + + // correct: CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_DISK, CLIENT_VERSION); //CDataStream ssValue(slValue.data(), slValue.data() + slValue.size(), SER_NETWORK, PROTOCOL_VERSION); + + //std::vector blockData(ParseHex(slValue.ToString())); + //CDataStream ssValue(blockData, SER_DISK, CLIENT_VERSION); + //CDataStream ssValue(blockData, SER_NETWORK, PROTOCOL_VERSION); + uint256 blockhash; ssKey >> blockhash; CBlock cblock;