tiamak/node-cryptoforknote-util-mo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed build issues

Browse Source
This commit is contained in:
Some Random Crypto Guy
2024-07-09 13:17:28 +01:00
committed by MoneroOcean
parent 66854eb683
commit be8c2e9c8f
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package.json
View File

@@ -10,16 +10,16 @@
"url": "https://github.com/haven-protocol-org/node-cryptoforknote-util.git" "url": "https://github.com/haven-protocol-org/node-cryptoforknote-util.git"
}, },
"dependencies": { "dependencies": {
"promise": "*",
"bindings": "*",
"nan": "^2.14.2",
"bignum": "^0.13.1",
"sha3": "*",
"base58-native": "*", "base58-native": "*",
"bech32": "*", "bech32": "*",
"varuint-bitcoin": "^1.0.4", "bignum": "^0.13.1",
"bindings": "*",
"bitcoinjs-lib": "git+https://github.com/MoneroOcean/bitcoinjs-lib.git",
"merkle-lib": "^2.0.10", "merkle-lib": "^2.0.10",
"bitcoinjs-lib": "git+https://github.com/MoneroOcean/bitcoinjs-lib.git" "nan": "^2.20.0",
"promise": "*",
"sha3": "*",
"varuint-bitcoin": "^1.0.4"
}, },
"keywords": [ "keywords": [
"cryptonight", "cryptonight",

10
src/cryptonote_core/cryptonote_basic.h
View File

@@ -445,7 +445,7 @@ namespace cryptonote
// SALVIUM-SPECIFIC FIELDS // SALVIUM-SPECIFIC FIELDS
// TX type // TX type
cryptonote::salvium_transaction_type type; cryptonote::salvium_transaction_type tx_type;
// Return address // Return address
crypto::public_key return_address; crypto::public_key return_address;
// Return TX public key // Return TX public key
@@ -732,10 +732,10 @@ namespace cryptonote
FIELD(vin) FIELD(vin)
FIELD(vout) FIELD(vout)
FIELD(extra) FIELD(extra)
VARINT_FIELD(type) VARINT_FIELD(tx_type)
if (type != cryptonote::transaction_type::PROTOCOL) { if (type != cryptonote::salvium_transaction_type::PROTOCOL) {
VARINT_FIELD(amount_burnt) VARINT_FIELD(amount_burnt)
if (type != cryptonote::transaction_type::MINER) { if (type != cryptonote::salvium_transaction_type::MINER) {
FIELD(return_address) FIELD(return_address)
FIELD(return_pubkey) FIELD(return_pubkey)
FIELD(source_asset_type) FIELD(source_asset_type)
@@ -1129,7 +1129,7 @@ namespace cryptonote
FIELD_N("parent_block", sbb); FIELD_N("parent_block", sbb);
} }
FIELD(miner_tx) FIELD(miner_tx)
if (blob_type == BLOB_TYPE_SALVIUM) if (blob_type == BLOB_TYPE_CRYPTONOTE_SALVIUM)
{ {
FIELD(protocol_tx) FIELD(protocol_tx)
} }

4
src/ringct/rctTypes.h
View File

@@ -87,6 +87,8 @@ namespace rct {
typedef std::vector<key> keyV; //vector of keys typedef std::vector<key> keyV; //vector of keys
typedef std::vector<keyV> keyM; //matrix of keys (indexed by column first) typedef std::vector<keyV> keyM; //matrix of keys (indexed by column first)
static key null_key = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
//containers For CT operations //containers For CT operations
//if it's representing a private ctkey then "dest" contains the secret key of the address //if it's representing a private ctkey then "dest" contains the secret key of the address
// while "mask" contains a where C = aG + bH is CT pedersen commitment and b is the amount // while "mask" contains a where C = aG + bH is CT pedersen commitment and b is the amount
@@ -385,7 +387,7 @@ namespace rct {
FIELDS(maskSums[2]) FIELDS(maskSums[2])
ar.end_array(); ar.end_array();
} }
if (p_r != crypto::null_pkey) if (crypto_verify_32(p_r.bytes, null_key.bytes))
FIELD(p_r) FIELD(p_r)
return ar.stream().good(); return ar.stream().good();
} }