ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-26 07:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly convert JS time to Ripple time in OfferCreate transactions

Browse Source
This commit is contained in:
wltsmrz
2014-04-18 23:08:19 -07:00
parent 8ffd0b13a3
commit 14f409ff56
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/ripple/transaction.js
View File

@@ -44,6 +44,7 @@
var EventEmitter = require('events').EventEmitter;
var util = require('util');
var utils = require('./utils');
var sjcl = require('./utils').sjcl;
var Amount = require('./amount').Amount;
var Currency = require('./amount').Currency;
@@ -555,6 +556,7 @@ Transaction.prototype.claim = function(src, generator, public_key, signature) {
this.tx_json.Generator = generator;
this.tx_json.PublicKey = public_key;
this.tx_json.Signature = signature;
return this;
};
@@ -600,15 +602,7 @@ Transaction.prototype.offerCreate = function(src, taker_pays, taker_gets, expira
this.tx_json.TakerGets = Amount.json_rewrite(taker_gets);
if (expiration) {
switch (expiration.constructor) {
case Date:
//offset = (new Date(2000, 0, 1).getTime()) - (new Date(1970, 0, 1).getTime());
this.tx_json.Expiration = expiration.getTime() - 946684800000;
break;
case Number:
this.tx_json.Expiration = expiration;
break;
}
this.tx_json.Expiration = utils.time.toRipple(expiration);
}
if (cancel_sequence) {

7
src/js/ripple/utils.js
View File

@@ -135,7 +135,12 @@ function fromTimestamp(rpepoch) {
rpepoch = rpepoch.getTime();
}
return Math.round(rpepoch/1000) - 0x386D4380;
return Math.round(rpepoch / 1000) - 0x386D4380;
};
exports.time = {
fromRipple: toTimestamp,
toRipple: fromTimestamp
};
exports.trace = trace;