ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change native coin functions to use uint64_t instead of STAmount.

Browse Source
This commit is contained in:
JoelKatz
2012-04-30 11:30:34 -07:00
parent 6c52f735d9
commit f05b88d459
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Amount.cpp
View File

@@ -228,7 +228,7 @@ STAmount operator/(const STAmount& num, const STAmount& den)
CBigNum v; CBigNum v;
if ((BN_add_word(&v, num.value) != 1) || if ((BN_add_word(&v, num.value) != 1) ||
(BN_mul_word(&v, 10000000000000000ull) != 1) || (BN_mul_word(&v, 10000000000000000ull) != 1) ||
(BN_div_word(&v, den.value) == ((BN_ULONG)-1))) (BN_div_word(&v, den.value) == ((BN_ULONG) - 1)))
{ {
throw std::runtime_error("internal bn error"); throw std::runtime_error("internal bn error");
} }
@@ -248,7 +248,7 @@ STAmount operator*(const STAmount &v1, const STAmount &v2)
CBigNum v; CBigNum v;
if ((BN_add_word(&v, (v1.value*10) + 3) != 1) || if ((BN_add_word(&v, (v1.value*10) + 3) != 1) ||
(BN_mul_word(&v, (v2.value*10) + 3) != 1) || (BN_mul_word(&v, (v2.value*10) + 3) != 1) ||
(BN_div_word(&v, 1000000000000000000ull) == ((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");
} }
@@ -309,14 +309,27 @@ STAmount getNeeded(const STAmount& offerOut, const STAmount& offerIn, const STAm
return (ret > offerIn) ? offerIn : ret; return (ret > offerIn) ? offerIn : ret;
} }
STAmount convertToDisplayAmount(const STAmount& internalAmount, const STAmount& totalNow, const STAmount& totalInit) static uint64_t muldiv(uint64_t a, uint64_t b, uint64_t c)
{ // Convert an internal ledger/account quantity of native currency to a display amount { // computes (a*b)/c rounding up - supports values up to 10^18
return (internalAmount * totalInit) / totalNow; if (c == 0) throw std::runtime_error("underflow");
if ((a == 0) || (b == 0)) return 0;
CBigNum v;
if ((BN_add_word(&v, a * 10 + 3) != 1) || (BN_mul_word(&v, b * 10 + 3) != 1) ||
(BN_div_word(&v, c) == ((BN_ULONG) - 1)) || (BN_div_word(&v, 100) == ((BN_ULONG) - 1)))
throw std::runtime_error("muldiv error");
return v.getulong();
} }
STAmount convertToInternalAmount(const STAmount& displayAmount, const STAmount& totalNow, const STAmount& totalInit) STAmount convertToDisplayAmount(uint64_t internalAmount, uint64_t totalNow, uint64_t totalInit)
{ // Convert an internal ledger/account quantity of native currency to a display amount
return muldiv(internalAmount, totalInit, totalNow);
}
STAmount convertToInternalAmount(uint64_t displayAmount, uint64_t totalNow, uint64_t totalInit)
{ // Convert a display/request currency amount to an internal amount { // Convert a display/request currency amount to an internal amount
return (displayAmount * totalNow) / totalInit; return muldiv(displayAmount, totalNow, totalInit);
} }
void STAmount::unitTest() void STAmount::unitTest()