Add account_currencies command

This commit is contained in:
wltsmrz
2013-11-05 17:06:51 -08:00
parent a306d0d0e1
commit 2a763f8f03

View File

@@ -246,13 +246,13 @@ Remote.from_config = function (obj, trace) {
var accountInfo = config.accounts[account]; var accountInfo = config.accounts[account];
if (typeof accountInfo === 'object') { if (typeof accountInfo === 'object') {
if (accountInfo.secret) { if (accountInfo.secret) {
// Index by nickname ... // Index by nickname
remote.set_secret(account, accountInfo.secret); remote.set_secret(account, accountInfo.secret);
// ... and by account ID // Index by account ID
remote.set_secret(accountInfo.account, accountInfo.secret); remote.set_secret(accountInfo.account, accountInfo.secret);
} }
} }
} };
if (typeof config.accounts === 'object') { if (typeof config.accounts === 'object') {
for (var account in config.accounts) { for (var account in config.accounts) {
@@ -530,7 +530,7 @@ Remote.prototype._server_is_available = function (server) {
Remote.prototype._next_server = function () { Remote.prototype._next_server = function () {
var result = null; var result = null;
for (var i=0; i<this._servers.length; i++) { for (var i=0, l=this._servers.length; i<l; i++) {
var server = this._servers[i]; var server = this._servers[i];
if (this._server_is_available(server)) { if (this._server_is_available(server)) {
result = server; result = server;
@@ -564,7 +564,7 @@ Remote.prototype.request = function (request) {
} else if (!this._connected) { } else if (!this._connected) {
this.once('connect', this.request.bind(this, request)); this.once('connect', this.request.bind(this, request));
} else if (request.server === null) { } else if (request.server === null) {
this.emit('error', new Error('Server does not exist')); request.emit('error', new Error('Server does not exist'));
} else { } else {
var server = request.server || this._get_server(); var server = request.server || this._get_server();
if (server) { if (server) {
@@ -592,7 +592,7 @@ Remote.prototype.request_ledger = function (ledger, opts, callback) {
request.message.ledger = ledger; request.message.ledger = ledger;
} }
var props = [ var request_fields = [
'full' 'full'
, 'expand' , 'expand'
, 'transactions' , 'transactions'
@@ -602,7 +602,7 @@ Remote.prototype.request_ledger = function (ledger, opts, callback) {
switch (typeof opts) { switch (typeof opts) {
case 'object': case 'object':
for (var key in opts) { for (var key in opts) {
if (~props.indexOf(key)) { if (~request_fields.indexOf(key)) {
request.message[key] = true; request.message[key] = true;
} }
} }
@@ -772,17 +772,32 @@ Remote.prototype.request_transaction_entry = function (hash, ledger_hash, callba
// DEPRECATED: use request_transaction_entry // DEPRECATED: use request_transaction_entry
Remote.prototype.request_tx = function (hash, callback) { Remote.prototype.request_tx = function (hash, callback) {
var request = new Request(this, 'tx'); var request = new Request(this, 'tx');
request.message.transaction = hash; request.message.transaction = hash;
request.callback(callback); request.callback(callback);
return request; return request;
}; };
Remote.prototype.request_account_info = function (accountID, callback) { Remote.prototype.request_account_info = function (accountID, callback) {
var request = new Request(this, 'account_info'); var request = new Request(this, 'account_info');
var account = UInt160.json_rewrite(accountID); var account = UInt160.json_rewrite(accountID);
request.message.ident = account; //DEPRECATED; request.message.ident = account; //DEPRECATED;
request.message.account = account; request.message.account = account;
request.callback(callback); request.callback(callback);
return request;
};
Remote.prototype.request_account_currencies = function (accountID, callback) {
var request = new Request(this, 'account_currencies');
var account = UInt160.json_rewrite(accountID);
request.message.ident = account; //DEPRECATED;
request.message.account = account;
request.callback(callback);
return request; return request;
}; };
@@ -883,7 +898,6 @@ Remote.prototype.request_tx_history = function (start, callback) {
var request = new Request(this, 'tx_history'); var request = new Request(this, 'tx_history');
request.message.start = start; request.message.start = start;
request.callback(callback); request.callback(callback);
return request; return request;
@@ -1016,6 +1030,7 @@ Remote.prototype.ledger_accept = function (callback) {
} else { } else {
this.emit('error', new RippleError('notStandAlone')); this.emit('error', new RippleError('notStandAlone'));
} }
return this; return this;
}; };
@@ -1030,10 +1045,13 @@ Remote.prototype.request_account_balance = function (account, ledger, callback)
var request = this.request_ledger_entry('account_root'); var request = this.request_ledger_entry('account_root');
request.account_root(account); request.account_root(account);
request.ledger_choose(ledger); request.ledger_choose(ledger);
request.once('success', function (message) { request.once('success', function (message) {
request.emit('account_balance', Amount.from_json(message.node.Balance)); request.emit('account_balance', Amount.from_json(message.node.Balance));
}); });
request.callback(callback, 'account_balance'); request.callback(callback, 'account_balance');
return request; return request;
}; };
@@ -1048,10 +1066,13 @@ Remote.prototype.request_account_flags = function (account, ledger, callback) {
var request = this.request_ledger_entry('account_root'); var request = this.request_ledger_entry('account_root');
request.account_root(account); request.account_root(account);
request.ledger_choose(ledger); request.ledger_choose(ledger);
request.once('success', function (message) { request.once('success', function (message) {
request.emit('account_flags', message.node.Flags); request.emit('account_flags', message.node.Flags);
}); });
request.callback(callback, 'account_flags'); request.callback(callback, 'account_flags');
return request; return request;
}; };
@@ -1066,9 +1087,11 @@ Remote.prototype.request_owner_count = function (account, ledger, callback) {
var request = this.request_ledger_entry('account_root'); var request = this.request_ledger_entry('account_root');
request.account_root(account); request.account_root(account);
request.ledger_choose(ledger); request.ledger_choose(ledger);
request.once('success', function (message) { request.once('success', function (message) {
request.emit('owner_count', message.node.OwnerCount); request.emit('owner_count', message.node.OwnerCount);
}); });
request.callback(callback, 'owner_count'); request.callback(callback, 'owner_count');
return request; return request;
@@ -1080,9 +1103,11 @@ Remote.prototype.get_account = function(accountID) {
Remote.prototype.add_account = function(accountID) { Remote.prototype.add_account = function(accountID) {
var account = new Account(this, accountID); var account = new Account(this, accountID);
if (account.is_valid()) { if (account.is_valid()) {
this._accounts[accountID] = account; this._accounts[accountID] = account;
} }
return account; return account;
}; };