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

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
Arthur Britto
2012-10-03 14:45:10 -07:00
parent 5b1ac0b1e5 f0320f0b7f
commit 66fd6146fa
6 changed files with 120 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Amount.cpp
View File

@@ -106,7 +106,7 @@ STAmount::STAmount(SField::ref n, const Json::Value& v)
else if (value.isUInt())
mValue = v.asUInt();
else if (value.isString())
{ // FIXME: If it has a '.' we have to process it specially!
{
if (mIsNative)
{
int64 val = lexical_cast_st<int64>(value.asString());
@@ -127,8 +127,23 @@ STAmount::STAmount(SField::ref n, const Json::Value& v)
if (mIsNative)
return;
// parse currency and issuer
// WRITEME
if (!currencyFromString(mCurrency, currency.asString()))
throw std::runtime_error("invalid currency");
if (!issuer.isString())
throw std::runtime_error("invalid issuer");
if (issuer.size() == (160/4))
mIssuer.SetHex(issuer.asString());
else
{
NewcoinAddress is;
if(!is.setAccountID(issuer.asString()))
throw std::runtime_error("invalid issuer");
mIssuer = is.getAccountID();
}
if (mIssuer.isZero())
throw std::runtime_error("invalid issuer");
canonicalize();
}