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

This commit is contained in:
JoelKatz
2012-12-28 16:59:56 -08:00
2 changed files with 17 additions and 7 deletions

View File

@@ -96,13 +96,6 @@
# [currencies]:
# This section allows a site to declare currencies it currently issues.
#
# [ledger_history]:
# To serve clients, servers need historical ledger data. This sets the number of
# past ledgers to acquire on server startup and the minimum to maintain while
# running. Servers that don't need to serve clients can set this to "none" or "off".
# Servers that want complete history can set this to "full" or "on".
# The default is 256 ledgers.
[validation_public_key]
n9MZTnHe5D5Q2cgE8oV2usFwRqhUvEA8MwP5Mu1XVD6TxmssPRev

View File

@@ -206,6 +206,14 @@ var Remote = function (opts, trace) {
this.retry_timer = undefined;
this.retry = undefined;
this._load_base = 256;
this._load_fee = 256;
this._load_base = undefined;
this._load_fee = undefined;
this._reserve_base = undefined;
this._reserve_inc = undefined;
this._server_status = undefined;
// Cache information for accounts.
this.accounts = {
// Consider sequence numbers stable if you know you're not generating bad transactions.
@@ -864,6 +872,15 @@ Remote.prototype._server_subscribe = function () {
self.emit('ledger_closed', message);
}
// FIXME Use this to estimate fee.
self._load_base = message.load_base || 256;
self._load_fee = message.load_fee || 256;
self._load_base = message.fee_ref;
self._load_fee = message.fee_base;
self._reserve_base = message.reverse_base;
self._reserve_inc = message.reserve_inc;
self._server_status = message.server_status;
if (message.server_status === 'tracking' || message.server_status === 'full') {
self._set_state('online');
}