package rpc

7 files changed, 6 insertions, 31 deletions

diff --git a/lib/bitcoin.js.map b/lib/bitcoin.js.map
deleted file mode 100644
index b236de0d..00000000
--- a/lib/bitcoin.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"bitcoin.js","sourceRoot":"","sources":["bitcoin.ts"],"names":[],"mappings":";;;;;AAAA,oDAA6B;AAC7B,iDAA2B;AAC3B,kBAAe,IAAA,aAAG,EAAC,iBAAM,CAAC,OAAO,CAAC,CAAC"}
\ No newline at end of file
diff --git a/lib/bitcoin.ts b/lib/bitcoin.ts
deleted file mode 100644
index a811dc14..00000000
--- a/lib/bitcoin.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import config from "$config";
-import rpc from "$lib/rpc";
-export default rpc(config.bitcoin);
diff --git a/lib/invoices.ts b/lib/invoices.ts
index 013cb975..0919c948 100644
--- a/lib/invoices.ts
+++ b/lib/invoices.ts
@@ -4,7 +4,7 @@ import { db, g, s } from "$lib/db";
 import { getUser, bip21, fail, SATS } from "$lib/utils";
 import { types } from "$lib/payments";
 import { v4 } from "uuid";
-import rpc from "$lib/rpc";
+import rpc from "@coinos/rpc";
 import ln from "$lib/ln";
 
 let bc = rpc(config.bitcoin);
diff --git a/lib/liquid.js.map b/lib/liquid.js.map
deleted file mode 100644
index 2c399781..00000000
--- a/lib/liquid.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"liquid.js","sourceRoot":"","sources":["liquid.ts"],"names":[],"mappings":";;;;;AAAA,oDAA6B;AAC7B,iDAA2B;AAC3B,kBAAe,IAAA,aAAG,EAAC,iBAAM,CAAC,MAAM,CAAC,CAAC"}
\ No newline at end of file
diff --git a/lib/liquid.ts b/lib/liquid.ts
deleted file mode 100644
index ec8ec7cb..00000000
--- a/lib/liquid.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import config from "$config";
-import rpc from "$lib/rpc";
-export default rpc(config.liquid);
diff --git a/lib/payments.ts b/lib/payments.ts
index 36f18e71..bfbb457c 100644
--- a/lib/payments.ts
+++ b/lib/payments.ts
@@ -22,7 +22,7 @@ import { mqtt1, mqtt2 } from "$lib/mqtt";
 import { mail, templates } from "$lib/mail";
 import api from "$lib/api";
 import { bech32 } from "bech32";
-import rpc from "$lib/rpc";
+import rpc from "@coinos/rpc";
 
 import lq_ from "$lib/liquid";
 import bc_ from "$lib/bitcoin";
@@ -670,7 +670,7 @@ export let catchUp = async () => {
     let txns = [];
     for (let [type, n] of Object.entries({ bitcoin: bc, liquid: lq })) {
       txns.push(
-        ...(await n.listTransactions("*", 200)).filter((tx) => {
+        ...(await n.listTransactions("*", 10)).filter((tx) => {
           tx.type = type;
           return tx.category === "receive" && tx.confirmations > 0;
         }),
@@ -695,5 +695,5 @@ export let catchUp = async () => {
     err("problem syncing", e.message);
   }
 
-  setTimeout(catchUp, 2000);
+  setTimeout(catchUp, 10000);
 };
diff --git a/lib/rpc.ts b/lib/rpc.ts
index 909ec96f..2019b8ad 100644
--- a/lib/rpc.ts
+++ b/lib/rpc.ts
@@ -1,19 +1,2 @@
-import got from "got";
-import { fail } from "$lib/utils";
-import { err } from "$lib/logging";
-
-export default ({ host, port, wallet, username, password }): any => {
-  let url = `http://${host}:${port}/wallet/${wallet}`;
-  let token = btoa(`${username}:${password}`);
-  let headers = { authorization: `Basic ${token}` };
-  let p = (json) => got.post(url, { json, headers }).json();
-
-  let get =
-    (_, prop: any) =>
-    (...params) =>
-      p({ method: prop.toLowerCase(), params })
-        .then((res: any) => res.result)
-        .catch((e) => (err(e.message), fail(`Failed to call ${prop}`)));
-
-  return new Proxy({}, { get });
-};
+import rpc from "@coinos/rpc";
+export default rpc;