haraldwolff
/
node-cryptonote-util
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 218b5dd8f0 into 974b506a0f

pull/4/merge
Sergey Kirichenko 2017-08-20 08:46:13 +00:00 committed by GitHub
parent 974b506a0f 218b5dd8f0
commit d3f9ae61ec
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/crypto.cpp
View File

@ -221,7 +221,7 @@ DISABLE_VS_WARNINGS(4200)
POP_WARNINGS
static inline size_t rs_comm_size(size_t pubs_count) {
return sizeof(rs_comm) + pubs_count * sizeof(rs_comm().ab[0]);
return sizeof(rs_comm) + pubs_count * 2 * sizeof(ec_point);
}
void crypto_ops::generate_ring_signature(const hash &prefix_hash, const key_image &image,

4
src/cryptonote_config.h
View File

@ -8,8 +8,8 @@
#define BLOCK_MAJOR_VERSION_1 1
#define BLOCK_MAJOR_VERSION_2 3
#define COIN ((uint64_t)100000000) // pow(10, 8)
#define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6)
#define COIN ((uint64_t)1000000000000) // pow(10, 12)
#define DEFAULT_FEE ((uint64_t)10000000000) // pow(10, 10)
#define CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW 60

5
src/main.cc
View File

@ -293,7 +293,10 @@ void address_decode(const Nan::FunctionCallbackInfo<v8::Value>& info) {
info.GetReturnValue().Set(Nan::Undefined());
}
// info.GetReturnValue().Set(Nan::Undefined());
// Skip integrated payment id if exists
if (data.size() == 2 * sizeof(crypto::public_key) + 8)
data.resize(data.size() - 8);
account_public_address adr;
if (!::serialization::parse_binary(data, adr) || !crypto::check_key(adr.m_spend_public_key) || !crypto::check_key(adr.m_view_public_key))