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

This commit is contained in:
JoelKatz
2012-12-03 16:17:31 -08:00
3 changed files with 18 additions and 2 deletions

View File

@@ -904,6 +904,8 @@ Json::Value RPCHandler::handleJSONSubmit(const Json::Value& jvRequest)
RippleAddress raSrcAddressID;
Json::Value txJSON = jvRequest["tx_json"];
if (!naSeed.setSeedGeneric(jvRequest["secret"].asString()))
{
return rpcError(rpcBAD_SEED);
@@ -950,7 +952,7 @@ Json::Value RPCHandler::handleJSONSubmit(const Json::Value& jvRequest)
txJSON["Fee"] = (int) theConfig.FEE_ACCOUNT_CREATE;
}
if (!txJSON.isMember("Paths") && txJSON.isMember("Amount") && jvRequest.isMember("build_path"))
if (!txJSON.isMember("Paths") && txJSON.isMember("Amount") && jvRequest.isMember("build_path"))
{
// Need a ripple path.
STPathSet spsPaths;

View File

@@ -404,6 +404,16 @@ Amount.prototype.set_currency = function(c) {
return this;
};
Amount.prototype.set_issuer = function (issuer) {
if (issuer instanceof UInt160) {
issuer.copyTo(this._issuer);
} else {
this._issuer.parse_json(issuer);
}
return this;
};
// Only checks the value. Not the currency and issuer.
Amount.prototype.is_valid = function() {
return !isNaN(this._value);
@@ -775,6 +785,10 @@ Amount.prototype.parse_issuer = function (issuer) {
return this;
};
Amount.prototype.is_negative = function () {
return this._is_negative;
};
// Check BigInteger NaN
// Checks currency, does not check issuer.
Amount.prototype.equals = function (d) {

View File

@@ -489,7 +489,7 @@ Remote.prototype._connect_message = function (ws, json) {
this._ledger_hash = message.ledger_hash;
this._ledger_current_index = message.ledger_index + 1;
this.emit('ledger_closed', message.ledger_hash, message.ledger_index);
this.emit('ledger_closed', message);
break;
// All other messages