mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-12-22 12:58:53 +00:00
Merge pull request #8953
ed05ac6
wallet2: when checking frozen multisig tx set, don't assume order (jeffro256)
This commit is contained in:
commit
3bebcc4a7d
@ -2006,14 +2006,14 @@ bool wallet2::frozen(const multisig_tx_set& txs) const
|
||||
CHECK_AND_ASSERT_THROW_MES(cd.sources.size() == ptx.tx.vin.size(), "mismatched multisg tx set source sizes");
|
||||
for (size_t src_idx = 0; src_idx < cd.sources.size(); ++src_idx)
|
||||
{
|
||||
// Check that the key images are consistent between tx vin and construction data
|
||||
// Extract keys images from tx vin and construction data
|
||||
const crypto::key_image multisig_ki = rct::rct2ki(cd.sources[src_idx].multisig_kLRki.ki);
|
||||
CHECK_AND_ASSERT_THROW_MES(ptx.tx.vin[src_idx].type() == typeid(cryptonote::txin_to_key), "multisig tx cannot be miner");
|
||||
const crypto::key_image vin_ki = boost::get<cryptonote::txin_to_key>(ptx.tx.vin[src_idx]).k_image;
|
||||
CHECK_AND_ASSERT_THROW_MES(multisig_ki == vin_ki, "Mismatched key image b/t vin and construction data");
|
||||
const crypto::key_image& vin_ki = boost::get<cryptonote::txin_to_key>(ptx.tx.vin[src_idx]).k_image;
|
||||
|
||||
// Add key image to set
|
||||
// Add key images to set (there will be some overlap)
|
||||
kis_to_sign.insert(multisig_ki);
|
||||
kis_to_sign.insert(vin_ki);
|
||||
}
|
||||
}
|
||||
// Step 2. Scan all transfers for frozen key images
|
||||
|
Loading…
Reference in New Issue
Block a user