diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-17 16:51:47 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-17 16:51:47 +0200 |
| commit | 83651630bc98370696cb83f987a1f89244ca1349 (patch) | |
| tree | 43c513d49cecca880440ea0dce2df0837bf46c06 /src/cryptonote_core/blockchain.cpp | |
| parent | Merge pull request #3412 (diff) | |
| parent | blockchain: forbid bulletproof types before v8 (diff) | |
| download | monero-83651630bc98370696cb83f987a1f89244ca1349.tar.xz | |
Merge pull request #3418
20a00266 blockchain: forbid bulletproof types before v8 (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index bc3575aa1..4fa6d94f1 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -2446,7 +2446,8 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context // from v8, allow bulletproofs if (hf_version < 8) { - if (!tx.rct_signatures.p.bulletproofs.empty()) + 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 v8"); tvc.m_invalid_output = true; |