Merge pull request #4540

8833aec0 wallet2: fix cold signing using non padded bulletproofs (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-09 16:43:01 +02:00
parent cc33d3b2de
commit 1b9e6861b7
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -5563,10 +5563,7 @@ bool wallet2::sign_tx(unsigned_tx_set &exported_txs, std::vector<wallet2::pendin
rct::RangeProofType range_proof_type = rct::RangeProofBorromean; rct::RangeProofType range_proof_type = rct::RangeProofBorromean;
if (sd.use_bulletproofs) if (sd.use_bulletproofs)
{ {
range_proof_type = rct::RangeProofBulletproof; range_proof_type = rct::RangeProofPaddedBulletproof;
for (const rct::Bulletproof &proof: ptx.tx.rct_signatures.p.bulletproofs)
if (proof.V.size() > 1)
range_proof_type = rct::RangeProofPaddedBulletproof;
} }
crypto::secret_key tx_key; crypto::secret_key tx_key;
std::vector<crypto::secret_key> additional_tx_keys; std::vector<crypto::secret_key> additional_tx_keys;