have refs in d.ts file instead of .ts file

4 files changed, 57 insertions, 53 deletions

diff --git a/lib/decl/filewriter/filewriter.d.ts b/lib/decl/filewriter/filewriter.d.ts
index a4910d0b1..78370f1d8 100644
--- a/lib/decl/filewriter/filewriter.d.ts
+++ b/lib/decl/filewriter/filewriter.d.ts
@@ -95,7 +95,7 @@ declare var FileSaver: {
      * This constructor must be visible when the script's global object is either a Window object or an object implementing the WorkerUtils interface.
      */
     new(data:Blob): FileSaver;
-}
+};
 
 /**
  * This interface expands on the FileSaver interface to allow for multiple write actions, rather than just saving a single Blob.
diff --git a/lib/decl/lib.es6.d.ts b/lib/decl/lib.es6.d.ts
index 084ed4e8a..fc08339de 100644
--- a/lib/decl/lib.es6.d.ts
+++ b/lib/decl/lib.es6.d.ts
@@ -20288,44 +20288,44 @@ declare function addEventListener(type: "mouseenter", listener: (this: Window, e
 declare function addEventListener(type: "mouseleave", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;

 declare function addEventListener(type: "mousemove", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;

 declare function addEventListener(type: "mouseout", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "mouseover", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "mouseup", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "mousewheel", listener: (this: Window, ev: WheelEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "offline", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "online", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "orientationchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pagehide", listener: (this: Window, ev: PageTransitionEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pageshow", listener: (this: Window, ev: PageTransitionEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pause", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "play", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "playing", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointercancel", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointerdown", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointerenter", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointerleave", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointermove", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointerout", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointerover", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "pointerup", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "popstate", listener: (this: Window, ev: PopStateEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "progress", listener: (this: Window, ev: ProgressEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "ratechange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "readystatechange", listener: (this: Window, ev: ProgressEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "reset", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "resize", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "scroll", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "seeked", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "seeking", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "select", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "stalled", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "storage", listener: (this: Window, ev: StorageEvent) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "submit", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "suspend", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "timeupdate", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "unload", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "volumechange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "waiting", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;

-declare function addEventListener(type: "wheel", listener: (this: Window, ev: WheelEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "mouseover", listener: (this: Window, MouseEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "mouseup", listener: (this: Window, MouseEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "mousewheel", listener: (this: Window, WheelEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "offline", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "online", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "orientationchange", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pagehide", listener: (this: Window, PageTransitionEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pageshow", listener: (this: Window, PageTransitionEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pause", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "play", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "playing", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointercancel", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointerdown", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointerenter", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointerleave", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointermove", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointerout", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointerover", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "pointerup", listener: (this: Window, PointerEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "popstate", listener: (this: Window, PopStateEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "progress", listener: (this: Window, ProgressEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "ratechange", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "readystatechange", listener: (this: Window, ProgressEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "reset", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "resize", listener: (this: Window, UIEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "scroll", listener: (this: Window, UIEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "seeked", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "seeking", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "select", listener: (this: Window, UIEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "stalled", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "storage", listener: (this: Window, StorageEvent) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "submit", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "suspend", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "timeupdate", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "unload", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "volumechange", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "waiting", listener: (this: Window, Event) => any, useCapture?: boolean): void;

+declare function addEventListener(type: "wheel", listener: (this: Window, WheelEvent) => any, useCapture?: boolean): void;

 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;

 type AAGUID = string;

 type AlgorithmIdentifier = string | Algorithm;

diff --git a/lib/refs.d.ts b/lib/refs.d.ts
new file mode 100644
index 000000000..a9c2c5eb8
--- /dev/null
+++ b/lib/refs.d.ts
@@ -0,0 +1,6 @@
+
+// Help the TypeScript compiler find declarations.
+
+/// <reference path="decl/lib.es6.d.ts" />
+/// <reference path="decl/urijs/URIjs.d.ts" />
+/// <reference path="decl/systemjs/systemjs.d.ts" />
diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts
index f4b0a83a5..601cf3536 100644
--- a/lib/wallet/wallet.ts
+++ b/lib/wallet/wallet.ts
@@ -1273,20 +1273,18 @@ export class Wallet {
                                   .iter(Stores.exchanges)
                                   .reduce(collectSmallestWithdraw, {}));
 
-    console.log("smallest withdraws", smallestWithdraw)
-    await (this.q()
-               .iter(Stores.coins)
-               .reduce(collectBalances, balance));
-
-    await (this.q()
-               .iter(Stores.refresh)
-               .reduce(collectPendingRefresh, balance));
-    await (this.q()
-               .iter(Stores.reserves)
-               .reduce(collectPendingWithdraw, balance));
-    await (this.q()
-               .iter(Stores.transactions)
-               .reduce(collectPayments, balance));
+    console.log("smallest withdraws", smallestWithdraw);
+
+    let tx = this.q();
+    tx.iter(Stores.coins)
+      .reduce(collectBalances, balance);
+    tx.iter(Stores.refresh)
+      .reduce(collectPendingRefresh, balance);
+    tx.iter(Stores.reserves)
+      .reduce(collectPendingWithdraw, balance);
+    tx.iter(Stores.transactions)
+      .reduce(collectPayments, balance);
+    await tx.finish();
     return balance;
 
   }