mirror of
https://github.com/Xahau/xahau.js.git
synced 2025-11-26 07:05:49 +00:00
Properly convert JS time to Ripple time in OfferCreate transactions
This commit is contained in:
@@ -44,6 +44,7 @@
|
|||||||
|
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
var util = require('util');
|
var util = require('util');
|
||||||
|
var utils = require('./utils');
|
||||||
var sjcl = require('./utils').sjcl;
|
var sjcl = require('./utils').sjcl;
|
||||||
var Amount = require('./amount').Amount;
|
var Amount = require('./amount').Amount;
|
||||||
var Currency = require('./amount').Currency;
|
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.Generator = generator;
|
||||||
this.tx_json.PublicKey = public_key;
|
this.tx_json.PublicKey = public_key;
|
||||||
this.tx_json.Signature = signature;
|
this.tx_json.Signature = signature;
|
||||||
|
|
||||||
return this;
|
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);
|
this.tx_json.TakerGets = Amount.json_rewrite(taker_gets);
|
||||||
|
|
||||||
if (expiration) {
|
if (expiration) {
|
||||||
switch (expiration.constructor) {
|
this.tx_json.Expiration = utils.time.toRipple(expiration);
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cancel_sequence) {
|
if (cancel_sequence) {
|
||||||
|
|||||||
@@ -135,7 +135,12 @@ function fromTimestamp(rpepoch) {
|
|||||||
rpepoch = rpepoch.getTime();
|
rpepoch = rpepoch.getTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
return Math.round(rpepoch/1000) - 0x386D4380;
|
return Math.round(rpepoch / 1000) - 0x386D4380;
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.time = {
|
||||||
|
fromRipple: toTimestamp,
|
||||||
|
toRipple: fromTimestamp
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.trace = trace;
|
exports.trace = trace;
|
||||||
|
|||||||
Reference in New Issue
Block a user