diff --git a/src/js/ripple/remote.js b/src/js/ripple/remote.js index 205f3edc..c1fc27a5 100644 --- a/src/js/ripple/remote.js +++ b/src/js/ripple/remote.js @@ -838,8 +838,7 @@ Remote.prototype.request_account_tx = function (obj, callback) { //extended account_tx , 'forward' //false - , 'fwd_marker' - , 'rev_marker' + , 'marker' ]; for (var key in obj) { diff --git a/src/js/ripple/rippleerror.js b/src/js/ripple/rippleerror.js index 2906df8d..30fbf780 100644 --- a/src/js/ripple/rippleerror.js +++ b/src/js/ripple/rippleerror.js @@ -2,11 +2,14 @@ var util = require('util'); var extend = require('extend'); function RippleError(code, message) { - if (typeof code === 'object') { - extend(this, code); - } else { - this.result = code; - this.result_message = message; + switch (typeof code) { + case 'object': + extend(this, code); + break; + case 'string': + this.result = code; + this.result_message = message; + break; } this.result = this.result || this.error || 'Error'; diff --git a/src/js/ripple/serializedobject.js b/src/js/ripple/serializedobject.js index a5744d2d..11cad35e 100644 --- a/src/js/ripple/serializedobject.js +++ b/src/js/ripple/serializedobject.js @@ -57,19 +57,6 @@ SerializedObject.prototype.resetPointer = function () { this.pointer = 0; }; -/* -SerializedObject.prototype.read = function (numberOfBytes) { - var start = this.pointer; - var end = start+numberOfBytes; - if (end > this.buffer.length) { - throw new Error("There aren't that many bytes left to read."); - } else { - var result = this.buffer.slice(start,end); - this.pointer = end; - return result; - } -}; -*/ var readOrPeek = function (advance) { return function(numberOfBytes) { @@ -113,6 +100,45 @@ var TRANSACTION_TYPES = { 101:"SetFee" }; +var LEDGER_ENTRY_TYPES = { + 97:"AccountRoot", + 99:"Contract", + 100:"DirectoryNode", + 102:"Features", + 103:"GeneratorMap", + 104:"LedgerHashes", + 110:"Nickname", + 111:"Offer", + 114:"RippleState", + 115:"FeeSettings" +}; + +var TRANSACTION_RESULTS = { + 0 :"tesSUCCESS", + 100:"tecCLAIM", + 101:"tecPATH_PARTIAL", + 102:"tecUNFUNDED_ADD", + 103:"tecUNFUNDED_OFFER", + 104:"tecUNFUNDED_PAYMENT", + 105:"tecFAILED_PROCESSING", + 121:"tecDIR_FULL", + 122:"tecINSUF_RESERVE_LINE", + 123:"tecINSUF_RESERVE_OFFER", + 124:"tecNO_DST", + 125:"tecNO_DST_INSUF_XRP", + 126:"tecNO_LINE_INSUF_RESERVE", + 127:"tecNO_LINE_REDUNDANT", + 128:"tecPATH_DRY", + 129:"tecUNFUNDED", // Deprecated, old ambiguous unfunded. + 130:"tecMASTER_DISABLED", + 131:"tecNO_REGULAR_KEY", + 132:"tecOWNERS" +}; + + + + + SerializedObject.prototype.to_json = function() { var old_pointer = this.pointer; this.resetPointer(); @@ -139,7 +165,9 @@ function jsonify_structure(thing,field_name) { if ("number" === typeof thing) { //Special codes if (field_name) { if (field_name === "LedgerEntryType") { - output = thing; //TODO: Do we have special codes for LedgerEntryType? + output = LEDGER_ENTRY_TYPES[thing] || thing; + } else if (field_name === "TransactionResult") { + output = TRANSACTION_RESULTS[thing] || thing; } else if (field_name === "TransactionType") { output = TRANSACTION_TYPES[thing] || thing; } else { @@ -166,7 +194,7 @@ function jsonify_structure(thing,field_name) { for (var i=0; i