diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-11-16 10:58:29 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-11-16 10:58:29 +0200 |
| commit | 95d96d139d2ca3f8441f9a13751a158d36769000 (patch) | |
| tree | 46cab71c78f4e3153d8c38fd388fc4f2228ec642 /src | |
| parent | Merge pull request #4236 (diff) | |
| parent | wallet2: use padded bulletproofs for multisig signing (diff) | |
| download | monero-95d96d139d2ca3f8441f9a13751a158d36769000.tar.xz | |
Merge pull request #4764
1598f01c wallet2: use padded bulletproofs for multisig signing (stoffu)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6f919d12c..1c385fddf 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -6027,10 +6027,7 @@ bool wallet2::sign_multisig_tx(multisig_tx_set &exported_txs, std::vector<crypto rct::RangeProofType range_proof_type = rct::RangeProofBorromean; if (sd.use_bulletproofs) { - range_proof_type = rct::RangeProofBulletproof; - for (const rct::Bulletproof &proof: ptx.tx.rct_signatures.p.bulletproofs) - if (proof.V.size() > 1) - range_proof_type = rct::RangeProofPaddedBulletproof; + range_proof_type = rct::RangeProofPaddedBulletproof; } bool r = cryptonote::construct_tx_with_tx_key(m_account.get_keys(), m_subaddresses, sources, sd.splitted_dsts, ptx.change_dts.addr, sd.extra, tx, sd.unlock_time, ptx.tx_key, ptx.additional_tx_keys, sd.use_rct, range_proof_type, &msout, false); THROW_WALLET_EXCEPTION_IF(!r, error::tx_not_constructed, sd.sources, sd.splitted_dsts, sd.unlock_time, m_nettype); |