Merge pull request #1032

34bb789 Re-add s to rangesigs (luigi1111)
dbf017a Fix some rct tx size calculations (luigi1111)
This commit is contained in:
Riccardo Spagni 2016-09-01 22:59:10 +02:00
commit 05418fdaf9
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -3105,27 +3105,24 @@ static size_t estimate_rct_tx_size(int n_inputs, int mixin, int n_outputs)
// rct signatures // rct signatures
// simple // type
size += 1; size += 1;
// message
size += 32;
// rangeSigs // rangeSigs
size += (2*64*32+32+64*32) * n_outputs; size += (2*64*32+32+64*32) * n_outputs;
// MGs - only the last slot of II is saved, the rest can be reconstructed // MGs
size += n_inputs * (32 * (mixin+1) * n_inputs + 32 + 32 * (/*n_inputs+*/1)); size += n_inputs * (32 * (mixin+1) + 32);
// mixRing - not serialized, can be reconstructed // mixRing - not serialized, can be reconstructed
/* size += 2 * 32 * (mixin+1) * n_inputs; */ /* size += 2 * 32 * (mixin+1) * n_inputs; */
// pseudoOuts // pseudoOuts
size += 32 * n_outputs; size += 32 * n_inputs;
// ecdhInfo // ecdhInfo
size += 3 * 32 * n_outputs; size += 2 * 32 * n_outputs;
// outPk - only commitment is saved // outPk - only commitment is saved
size += 1 * 32 * n_outputs; size += 32 * n_outputs;
// txnFee // txnFee
size += 4; size += 4;