oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

bulletproofs, wallet, core: push back bulletproofs to hard fork v10

Browse source
This commit is contained in:
jcktm 2018-08-20 09:06:10 +10:00
parent 8c7b775fd5
commit dc0810ff4d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cryptonote_core/blockchain.cpp
View file

@ -2531,12 +2531,12 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context
}
}
// from v9, allow bulletproofs
if (hf_version < 9) {
// from v10, allow bulletproofs
if (hf_version < 10) {
const bool bulletproof = tx.rct_signatures.type == rct::RCTTypeFullBulletproof || tx.rct_signatures.type == rct::RCTTypeSimpleBulletproof;
if (bulletproof || !tx.rct_signatures.p.bulletproofs.empty())
{
MERROR("Bulletproofs are not allowed before v9");
MERROR("Bulletproofs are not allowed before v10");
tvc.m_invalid_output = true;
return false;
}

2
src/wallet/wallet2.cpp
View file

@ -577,7 +577,7 @@ size_t estimate_tx_size(bool use_rct, int n_inputs, int mixin, int n_outputs, si
uint8_t get_bulletproof_fork()
{
return 9;
return 10;
}
crypto::hash8 get_short_payment_id(const tools::wallet2::pending_tx &ptx, hw::device &hwdev)