ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

A 1/3 lsb offset is needed to make the multiplication round down correctly.

Browse Source
This commit is contained in:
JoelKatz
2012-04-11 00:27:49 -07:00
parent 48fe991cdb
commit b771a11836
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Amount.cpp
View File

@@ -23,13 +23,13 @@ void STAmount::canonicalize()
{ {
if(offset<=cMinOffset) throw std::runtime_error("value overflow"); if(offset<=cMinOffset) throw std::runtime_error("value overflow");
value*=10; value*=10;
offset-=1; --offset;
} }
while(value>cMaxValue) while(value>cMaxValue)
{ {
if(offset>=cMaxOffset) throw std::runtime_error("value underflow"); if(offset>=cMaxOffset) throw std::runtime_error("value underflow");
value/=10; value/=10;
offset+=1; ++offset;
} }
assert( (value==0) || ( (value>=cMinValue) && (value<=cMaxValue) ) ); assert( (value==0) || ( (value>=cMinValue) && (value<=cMaxValue) ) );
assert( (offset>=cMinOffset) && (offset<=cMaxOffset) ); assert( (offset>=cMinOffset) && (offset<=cMaxOffset) );
@@ -235,11 +235,11 @@ STAmount operator*(const STAmount &v1, const STAmount &v2)
{ {
if( (v1.value == 0) || (v2.value == 0) ) return STAmount(); if( (v1.value == 0) || (v2.value == 0) ) return STAmount();
// Compute (numerator * denominator) / 10^16 // Compute (numerator*10 * denominator*10) / 10^18
CBigNum v; CBigNum v;
if( (BN_add_word(&v, v1.value + 1) != 1) || if( (BN_add_word(&v, (v1.value*10) + 3) != 1) ||
(BN_mul_word(&v, v2.value + 1) != 1) || (BN_mul_word(&v, (v2.value*10) + 3) != 1) ||
(BN_div_word(&v, 10000000000000000ull) == ((BN_ULONG)-1)) ) (BN_div_word(&v, 1000000000000000000ull) == ((BN_ULONG)-1)) )
{ {
throw std::runtime_error("internal bn error"); throw std::runtime_error("internal bn error");
} }