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:
JoelKatz
2012-10-17 23:39:32 -07:00
parent e534f0ba78 660c7e3b2b
commit b09318f8d3
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/amount.js
View File

@@ -14,7 +14,7 @@ var UInt160 = function () {
};
UInt160.from_json = function (j) {
return (new UInt160()).parse_json(j);
return (new UInt160()).parse_json(j in accounts ? accounts[j].account : j);
};
UInt160.prototype.clone = function() {
@@ -140,6 +140,12 @@ Currency.prototype.to_human = function() {
return this.value ? this.value : "XNS";
};
var accounts = {};
var setAccounts = function (accounts_new) {
accounts = accounts_new;
};
var Amount = function () {
// Json format:
// integer : XNS
@@ -394,9 +400,10 @@ Amount.prototype.parse_json = function(j) {
return this;
};
exports.Amount = Amount;
exports.Currency = Currency;
exports.UInt160 = UInt160;
exports.setAccounts = setAccounts;
exports.Amount = Amount;
exports.Currency = Currency;
exports.UInt160 = UInt160;
exports.consts = {
'address_xns' : "rrrrrrrrrrrrrrrrrrrrrhoLvTp",

32
js/remote.js
View File

@@ -686,19 +686,19 @@ Remote.prototype.transaction = function () {
// - malformed error: local server thought it was malformed.
// - The client should only trust this when talking to a trusted server.
// 'final' : Final status of transaction.
// - Only expect a final from honest clients after a tesSUCCESS or ter*.
// - Only expect a final from dishonest servers after a tesSUCCESS or ter*.
// 'lost' : Gave up looking for on ledger_closed.
// 'pending' : Transaction was not found on ledger_closed.
// 'state' : Follow the state of a transaction.
// 'clientSubmitted' - Sent to remote
// |- 'remoteError' - Remote rejected transaction.
// \- 'clientProposed' - Remote provisionally accepted transaction.
// |- 'clientMissing' - Transaction has not appeared in ledger as expected.
// | |- 'clientLost' - No longer monitoring missing transaction.
// 'client_submitted' - Sent to remote
// |- 'remoteError' - Remote rejected transaction.
// \- 'client_proposed' - Remote provisionally accepted transaction.
// |- 'client_missing' - Transaction has not appeared in ledger as expected.
// | |\- 'client_lost' - No longer monitoring missing transaction.
// |/
// |- 'tesSUCCESS' - Transaction in ledger as expected.
// |- 'ter...' - Transaction failed.
// |- 'tep...' - Transaction partially succeeded.
// |- 'tesSUCCESS' - Transaction in ledger as expected.
// |- 'ter...' - Transaction failed.
// \- 'tep...' - Transaction partially succeeded.
//
// Notes:
// - All transactions including locally errors and malformed errors may be
@@ -734,7 +734,7 @@ var Transaction = function (remote) {
if (message.engine_result) {
self.hash = message.transaction.hash;
self.set_state('clientProposed');
self.set_state('client_proposed');
self.emit('proposed', {
'result' : message.engine_result,
@@ -866,7 +866,7 @@ Transaction.prototype.submit = function () {
this.remote.on('ledger_closed', on_ledger_closed);
}
this.set_state('clientSubmitted');
this.set_state('client_submitted');
this.remote.submit(this);
@@ -973,7 +973,7 @@ Transaction.prototype.payment = function (src, dst, deliver_amount) {
return this;
}
Remote.prototype.ripple_line_set = function (src, limit, quaility_in, quality_out) {
Transaction.prototype.ripple_line_set = function (src, limit, quality_in, quality_out) {
this.secret = this.account_secret(src);
this.transaction.TransactionType = 'CreditSet';
this.transaction.Account = this.account_default(src);
@@ -982,11 +982,11 @@ Remote.prototype.ripple_line_set = function (src, limit, quaility_in, quality_ou
if (undefined !== limit)
this.transaction.LimitAmount = limit.to_json();
if (quaility_in)
this.transaction.QualityIn = quaility_in;
if (quality_in)
this.transaction.QualityIn = quality_in;
if (quaility_out)
this.transaction.QualityOut = quaility_out;
if (quality_out)
this.transaction.QualityOut = quality_out;
// XXX Throw an error if nothing is set.