Merge 9bae3fe into b587605

blockchain · Sep 1, 2017 · 7aa5a7f · 7aa5a7f
2 parents b587605 + 9bae3fe
commit 7aa5a7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/helpers.js b/src/helpers.js
@@ -260,6 +260,14 @@ Helpers.guessFee = function (nInputs, nOutputs, feePerKb) {
   return Math.ceil(feePerKb * (sizeBytes / 1000));
 };
 
+Helpers.toMilliseconds = function (n, unit) {
+  var units = {
+    seconds: 1000,
+    minutes: 60000
+  };
+  return n * units[unit];
+};
+
 // password scorer
 Helpers.scorePassword = function (password) {
   if (!Helpers.isString(password)) { return 0; }

diff --git a/src/shift/quote.js b/src/shift/quote.js
@@ -1,4 +1,6 @@
 /* eslint-disable semi */
+const Helpers = require('../helpers')
+
 class Quote {
   constructor (obj) {
     this._orderId = obj.orderId
@@ -8,8 +10,8 @@ class Quote {
     this._withdrawal = obj.withdrawal
     this._withdrawalAmount = obj.withdrawalAmount
     this._minerFee = obj.minerFee
-    this._expiration = new Date(obj.expiration)
     this._quotedRate = obj.quotedRate
+    this._expiration = new Date(obj.expiration - Helpers.toMilliseconds(5, 'minutes'));
   }
 
   get orderId () {