updated core-custom for 0.14.0.0 fork and monero_transfer_utils for new construct_tx_and_get_tx_key interface

pull/24/head
Paul Shapiro 5 years ago
parent 3b7cc01878
commit e27621f435

@ -68,7 +68,7 @@ set(
${MONERO_SRC}/cryptonote_basic/cryptonote_format_utils.cpp
${MONERO_SRC}/crypto/crypto.cpp
${MONERO_SRC}/crypto/hash.c
${MONERO_SRC}/crypto/slow-hash.c
${MONERO_SRC}/crypto/slow-hash-dummied.cpp
${MONERO_SRC}/crypto/oaes_lib.c
${MONERO_SRC}/crypto/crypto-ops.c
${MONERO_SRC}/crypto/crypto-ops-data.c

@ -1 +1 @@
Subproject commit a0809886bee0f7872ce5d7ad9465736b05407efe
Subproject commit 4f29efe73f06af98037a65d2eb1332267555cd97

@ -459,7 +459,12 @@ void monero_transfer_utils::create_transaction(
//
uint32_t fake_outputs_count = fixed_mixinsize();
bool bulletproof = true;
const rct::RangeProofType range_proof_type = bulletproof ? rct::RangeProofPaddedBulletproof : rct::RangeProofBorromean;
rct::RangeProofType range_proof_type = bulletproof ? rct::RangeProofPaddedBulletproof : rct::RangeProofBorromean;
int bp_version = bulletproof ? (use_fork_rules_fn(HF_VERSION_SMALLER_BP, -10) ? 2 : 1) : 0;
const rct::RCTConfig rct_config {
range_proof_type,
bp_version,
};
//
if (mix_outs.size() != outputs.size() && fake_outputs_count != 0) {
retVals.errCode = wrongNumberOfMixOutsProvided;
@ -663,7 +668,7 @@ void monero_transfer_utils::create_transaction(
sender_account_keys, subaddresses,
sources, splitted_dsts, change_dst.addr, extra,
tx, unlock_time, tx_key, additional_tx_keys,
true, range_proof_type,
true, rct_config,
/*m_multisig ? &msout : */NULL
);
LOG_PRINT_L2("constructed tx, r="<<r);

Loading…
Cancel
Save