[TASK] bump version to 0.9.1-rc2

Switch account requests to use ledgerSelect rather than ledgerChoose

HISTORY.md

@@ -1,3 +1,18 @@
+##0.9.1
+
++ Switch account requests to use ledgerSelect rather than ledgerChoose ([278df90](https://github.com/ripple/ripple-lib/commit/278df9025a20228de22379a53c76ca12d40fa591))
+
++ **Deprecated** setting `ident` and `account_index` on account requests ([278df90](https://github.com/ripple/ripple-lib/commit/278df9025a20228de22379a53c76ca12d40fa591))
+
++ Change initial account transaction sequence to 1 ([a3c1d06](https://github.com/ripple/ripple-lib/commit/a3c1d06eba883dc84fe2bfe700e4309795c84cac))
+
++ Fix: instance transaction withoute remote ([d3b6b81](https://github.com/ripple/ripple-lib/commit/d3b6b8127c7b01e416b400c25abf1719bdd008ca))
+
++ Fix: account root request ledger argument ([bc1f9f8](https://github.com/ripple/ripple-lib/commit/bc1f9f8a286b187d36ebaf552694e31e73742293))
+
++ Fix: rsign.js local signing and example ([d3b6b81](https://github.com/ripple/ripple-lib/commit/d3b6b8127c7b01e416b400c25abf1719bdd008ca) and [f1004c6](https://github.com/ripple/ripple-lib/commit/f1004c6db2a0ce59bbabbb8f2b355a9fd9995fd8))
+
+
 ##0.9.0
 
 + Add routes to the vault client for KYC attestations ([ed2da574](https://github.com/ripple/ripple-lib/commit/ed2da57475acf5e9d2cf3373858f4274832bd83f))

bin/rsign.js

@@ -56,7 +56,7 @@ function ready() {
 function print_usage() {
   console.log(
     'Usage: rsign.js <secret> <json>\n\n',
-    'Example: rsign.js ssq55ueDob4yV3kPVnNQLHB6icwpC',
+    'Example: rsign.js ssq55ueDob4yV3kPVnNQLHB6icwpC','\''+
     JSON.stringify({
       TransactionType: 'Payment',
       Account: 'r3P9vH81KBayazSTrQj6S25jW6kDb779Gi',
@@ -64,7 +64,7 @@ function print_usage() {
       Amount: '200000000',
       Fee: '10',
       Sequence: 1
-    })
+    })+'\''
     );
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ripple-lib",
-  "version": "0.9.0",
+  "version": "0.9.1-rc2",
   "description": "Ripple JavaScript client library",
   "files": [
     "src/js/*",

src/js/ripple/account.js

@@ -174,8 +174,8 @@ Account.prototype.getNextSequence = function(callback) {
 
   function accountInfo(err, info) {
     if (isNotFound(err)) {
-      // New accounts will start out as sequence zero
-      callback(null, 0);
+      // New accounts will start out as sequence one
+      callback(null, 1);
     } else if (err) {
       callback(err);
     } else {

src/js/ripple/remote.js

@@ -945,6 +945,8 @@ Remote.prototype.requestLedger = function(options, callback) {
       break;
 
     case 'object':
+      if (!options) break;
+
       Object.keys(options).forEach(function(o) {
         switch (o) {
           case 'full':
@@ -953,17 +955,15 @@ Remote.prototype.requestLedger = function(options, callback) {
           case 'accounts':
             request.message[o] = true;
             break;
-            
           case 'ledger_index':
           case 'ledger_hash':
             request.message[o] = options[o];
-            break;  
-            
+            break;
           case 'closed' :
           case 'current' :
           case 'validated' :
             request.message.ledger_index = o;
-            break;  
+            break;
         }
       }, options);
       break;
@@ -1200,16 +1200,16 @@ Remote.prototype.requestTx = function(hash, callback) {
 /**
  * Account request abstraction
  *
+ * @this Remote
  * @api private
  */
 
-Remote.accountRequest = function(type, account, accountIndex, ledger, peer, callback) {
+Remote.accountRequest = function(type, account, ledger, peer, callback) {
   if (typeof account === 'object') {
     var options  = account;
-    callback     = accountIndex;
+    callback     = ledger;
     ledger       = options.ledger;
-    accountIndex = options.account_index || options.accountIndex;
-    account      = options.accountID || options.account;
+    account      = options.account || options.accountID;
     peer         = options.peer;
   }
 
@@ -1222,18 +1222,10 @@ Remote.accountRequest = function(type, account, accountIndex, ledger, peer, call
   var request = new Request(this, type);
   var account = UInt160.json_rewrite(account);
 
-  request.message.ident   = account; //DEPRECATED;
   request.message.account = account;
+  request.ledgerSelect(ledger);
 
-  if (typeof accountIndex === 'number') {
-    request.message.index = accountIndex;
-  }
-
-  if (!/^(undefined|function)$/.test(typeof ledger)) {
-    request.ledgerChoose(ledger);
-  }
-
-  if (!/^(undefined|function)$/.test(typeof peer)) {
+  if (UInt160.is_valid(peer)) {
     request.message.peer = UInt160.json_rewrite(peer);
   }
 
@@ -1246,6 +1238,7 @@ Remote.accountRequest = function(type, account, accountIndex, ledger, peer, call
  * Request account_info
  *
  * @param {String} ripple address
+ * @param [String|Number] ledger identifier
  * @param [Function] callback
  * @return {Request}
  */
@@ -1259,6 +1252,7 @@ Remote.prototype.requestAccountInfo = function(account, callback) {
  * Request account_currencies
  *
  * @param {String} ripple address
+ * @param [String|Number] ledger identifier
  * @param [Function] callback
  * @return {Request}
  */
@@ -1272,14 +1266,13 @@ Remote.prototype.requestAccountCurrencies = function(account, callback) {
  * Request account_lines
  *
  * @param {String} ripple address
- * @param {Number] sub-account index
- * @param [String|Number] ledger
+ * @param [String|Number] ledger identifier
  * @param [String] peer
  * @param [Function] callback
  * @return {Request}
  */
 
-Remote.prototype.requestAccountLines = function(account, accountIndex, ledger, peer, callback) {
+Remote.prototype.requestAccountLines = function(account, peer, callback) {
   // XXX Does this require the server to be trusted?
   //utils.assert(this.trusted);
   var args = Array.prototype.concat.apply(['account_lines'], arguments);
@@ -1290,19 +1283,16 @@ Remote.prototype.requestAccountLines = function(account, accountIndex, ledger, p
  * Request account_offers
  *
  * @param {String} ripple address
- * @param {Number] sub-account index
- * @param [String|Number] ledger
- * @param [String] peer
+ * @param [String|Number] ledger identifier
  * @param [Function] callback
  * @return {Request}
  */
 
-Remote.prototype.requestAccountOffers = function(account, accountIndex, ledger, callback) {
+Remote.prototype.requestAccountOffers = function(account, callback) {
   var args = Array.prototype.concat.apply(['account_offers'], arguments);
   return Remote.accountRequest.apply(this, args);
 };
 
-
 /**
  * Request account_tx
  *
@@ -1318,9 +1308,6 @@ Remote.prototype.requestAccountOffers = function(account, accountIndex, ledger,
  *    @param [Number] offset, defaults to 0
  *    @param [Number] limit
  *
- * @param [Function] filter
- * @param [Function] map
- * @param [Function] reduce
  * @param [Function] callback
  * @return {Request}
  */
@@ -1606,6 +1593,7 @@ Remote.prototype.requestLedgerAccept = function(callback) {
 /**
  * Account root request abstraction
  *
+ * @this Remote
  * @api private
  */
 
@@ -1625,7 +1613,7 @@ Remote.accountRootRequest = function(type, responseFilter, account, ledger, call
   var request = this.requestLedgerEntry('account_root');
 
   request.accountRoot(account);
-  request.ledgerChoose(ledger);
+  request.ledgerSelect(ledger);
 
   request.once('success', function(message) {
     request.emit(type, responseFilter(message));

src/js/ripple/request.js

@@ -208,6 +208,13 @@ Request.prototype.ledgerIndex = function(ledger_index) {
   return this;
 };
 
+/**
+ * Set either ledger_index or ledger_hash based on heuristic
+ *
+ * @param {Number|String} ledger identifier
+ */
+
+Request.prototype.selectLedger =
 Request.prototype.ledgerSelect = function(ledger) {
   switch (ledger) {
     case 'current':
@@ -217,10 +224,10 @@ Request.prototype.ledgerSelect = function(ledger) {
       break;
 
     default:
-      if (isNaN(ledger)) {
-        this.message.ledger_hash  = ledger;
-      } else if ((ledger = Number(ledger))) {
-        this.message.ledger_index = ledger;
+      if (Number(ledger)) {
+        this.message.ledger_index = Number(ledger);
+      } if (/^[A-F0-9]+$/.test(ledger)) {
+        this.message.ledger_hash = ledger;
       }
       break;
   }

src/js/ripple/transaction.js

@@ -60,7 +60,7 @@ function Transaction(remote) {
 
   var self = this;
 
-  var remote = remote || { };
+  var remote = remote || void(0);
 
   this.remote = remote;
 
@@ -69,7 +69,7 @@ function Transaction(remote) {
 
   this._secret = void(0);
   this._build_path = false;
-  this._maxFee = this.remote.max_fee;
+  this._maxFee = (typeof remote === 'object') ? this.remote.max_fee : void(0);
 
   this.state = 'unsubmitted';
   this.finalized = false;
@@ -241,7 +241,7 @@ Transaction.prototype.finalize = function(message) {
 };
 
 Transaction.prototype._accountSecret = function(account) {
-  return this.remote.secrets[account];
+  return this.remote ? this.remote.secrets[account] : void(0);
 };
 
 /**
@@ -266,6 +266,10 @@ Transaction.prototype.feeUnits = function() {
  */
 
 Transaction.prototype._computeFee = function() {
+  if (!this.remote) {
+    return void(0);
+  }
+
   var servers = this.remote._servers;
   var fees = [ ];
 
@@ -898,6 +902,10 @@ Transaction.prototype.submit = function(callback) {
 
   var account = this.tx_json.Account;
 
+  if (!this.remote) {
+    return this.emit('error', new Error('No remote found'));
+  }
+
   if (!UInt160.is_valid(account)) {
     return this.emit('error', new RippleError('tejInvalidAccount', 'Account is missing or invalid'));
   }

test/orderbook-test.js

@@ -276,7 +276,6 @@ describe('OrderBook', function() {
       assert.deepEqual(request.message, {
         command: 'account_info',
         id: void(0),
-        ident: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
         account: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
       });
       request.emit('success', {
@@ -1360,7 +1359,6 @@ describe('OrderBook', function() {
       assert.deepEqual(request.message, {
         command: 'account_info',
         id: undefined,
-        ident: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
         account: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
       });
 

test/remote-test.js

@@ -144,7 +144,7 @@ describe('Remote', function () {
     );
   });
 
-  it('request constructors', function () {
+  describe('request constructors', function () {
     beforeEach(function () {
       callback = function () {}
       remote = new Remote(options);
@@ -184,6 +184,44 @@ describe('Remote', function () {
       var request = remote.request_unl_delete(null, {}, callback);
       assert(request instanceof Request);
     });
+
+    it('request account info with ledger index', function() {
+      var request = remote.requestAccountInfo('r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS', 9592219);
+      assert.strictEqual(request.message.command, 'account_info');
+      assert.strictEqual(request.message.account, 'r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS');
+      assert.strictEqual(request.message.ledger_index, 9592219);
+    });
+    it('request account info with ledger hash', function() {
+      var request = remote.requestAccountInfo('r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS', 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
+      assert.strictEqual(request.message.command, 'account_info');
+      assert.strictEqual(request.message.account, 'r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS');
+      assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
+    });
+    it('request account info with ledger identifier', function() {
+      var request = remote.requestAccountInfo('r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS', 'validated');
+      assert.strictEqual(request.message.command, 'account_info');
+      assert.strictEqual(request.message.account, 'r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS');
+      assert.strictEqual(request.message.ledger_index, 'validated');
+    });
+
+    it('request account balance with ledger index', function() {
+      var request = remote.requestAccountBalance('r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS', 9592219);
+      assert.strictEqual(request.message.command, 'ledger_entry');
+      assert.strictEqual(request.message.account_root, 'r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS');
+      assert.strictEqual(request.message.ledger_index, 9592219);
+    });
+    it('request account balance with ledger hash', function() {
+      var request = remote.requestAccountBalance('r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS', 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
+      assert.strictEqual(request.message.command, 'ledger_entry');
+      assert.strictEqual(request.message.account_root, 'r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS');
+      assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
+    });
+    it('request account balance with ledger identifier', function() {
+      var request = remote.requestAccountBalance('r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS', 'validated');
+      assert.strictEqual(request.message.command, 'ledger_entry');
+      assert.strictEqual(request.message.account_root, 'r4qLSAzv4LZ9TLsR7diphGwKnSEAMQTSjS');
+      assert.strictEqual(request.message.ledger_index, 'validated');
+    });
   })
 
   it('create remote and get pending transactions', function() {

test/request-test.js

@@ -355,13 +355,20 @@ describe('Request', function() {
     assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
   });
 
-  it('Select ledger - hash', function() {
+  it('Select ledger - undefined', function() {
     var remote = new Remote();
     remote._connected = true;
 
     var request = new Request(remote, 'server_info');
-    request.ledgerSelect('B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
-    assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
+    request.ledgerSelect();
+    assert.strictEqual(request.message.ledger_hash, void(0));
+    assert.strictEqual(request.message.ledger_index, void(0));
+    request.ledgerSelect(null);
+    assert.strictEqual(request.message.ledger_hash, void(0));
+    assert.strictEqual(request.message.ledger_index, void(0));
+    request.ledgerSelect(NaN);
+    assert.strictEqual(request.message.ledger_hash, void(0));
+    assert.strictEqual(request.message.ledger_index, void(0));
   });
 
   it('Set account_root', function() {

test/transaction-test.js

@@ -229,6 +229,11 @@ describe('Transaction', function() {
     assert.strictEqual(transaction._computeFee(), '72');
   });
 
+  it('Compute fee, no remote', function() {
+    var transaction = new Transaction();
+    assert.strictEqual(transaction._computeFee(10), void(0));
+  });
+
   it('Compute fee - no connected server', function() {
     var remote = new Remote();
 
@@ -371,6 +376,16 @@ describe('Transaction', function() {
     done();
   });
 
+  it('Complete transaction, local signing, no remote', function(done) {
+    var transaction = new Transaction();
+    transaction._secret = 'sh2pTicynUEG46jjR4EoexHcQEoij';
+    transaction.tx_json.Account = 'rMWwx3Ma16HnqSd4H6saPisihX9aKpXxHJ';
+
+    assert(transaction.complete());
+
+    done();
+  });
+
   it('Complete transaction - untrusted', function(done) {
     var remote = new Remote();
     var transaction = new Transaction(remote);
@@ -1505,6 +1520,18 @@ describe('Transaction', function() {
     transaction.submit(submitCallback);
   });
 
+  it('Submit transaction - submission error, no remote', function(done) {
+    var transaction = new Transaction();
+
+    transaction.once('error', function(error) {
+      assert(error);
+      assert.strictEqual(error.message, 'No remote found');
+      done();
+    });
+
+    transaction.submit();
+  });
+
   it('Submit transaction - invalid account', function(done) {
     var remote = new Remote();
     var transaction = new Transaction(remote).accountSet('r36xtKNKR43SeXnGn7kN4r4JdQzcrkqpWe');