Merge #841: [0.18 backport] Remove the min(max( construction for the ct_exponent argument

35c83bdb8 Remove the min(max( construction for the ct_exponent argument (Steven Roose)

Pull request description:

  Backport of https://github.com/ElementsProject/elements/pull/840.

  @dgpv Could you review again?

Tree-SHA512: e212bc04e314bfd8a8e7b7c9c3d5620ad1b6f603706cc038136a655ab729f49c3430f70b0a9baa2d04a2e0bdc9e0aaced413d3cb0d4a424e386b50322b958dc2
This commit is contained in:
Steven Roose 2020-03-31 11:07:01 +01:00
commit 690e999eb6
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87

View file

@ -180,7 +180,7 @@ bool GenerateRangeproof(std::vector<unsigned char>& rangeproof, const std::vecto
memcpy(asset_message+32, asset_blindptrs[asset_blindptrs.size()-1], 32);
// Sign rangeproof
int ct_exponent = std::min(std::max((int)gArgs.GetArg("-ct_exponent", 0), -1), 18);
int ct_exponent = (int)gArgs.GetArg("-ct_exponent", 0);
int ct_bits = (int)gArgs.GetArg("-ct_bits", 52);
// If min_value is 0, scriptPubKey must be unspendable
uint64_t min_value = scriptPubKey.IsUnspendable() ? 0 : 1;