non-custodial sends

5 files changed, 43 insertions, 10 deletions

diff --git a/routes/bitcoin/broadcast.js b/routes/bitcoin/broadcast.js
new file mode 100644
index 00000000..c7b134ac
--- /dev/null
+++ b/routes/bitcoin/broadcast.js
@@ -0,0 +1,35 @@
+module.exports = ah(async (req, res) => {
+  try {
+    const { user } = req;
+    let hash = await bc.sendRawTransaction(req.body.tx);
+
+    if (user) {
+      let { account } = user;
+      let payment = await db.Payment.create({
+        ...req.body.payment,
+        hash,
+        amount: -req.body.payment.amount,
+        tip: 0,
+        account_id: account.id,
+        user_id: user.id,
+        rate: app.get("rates")[user.currency],
+        currency: user.currency,
+        confirmed: true,
+        received: false,
+        network: "BTC",
+      });
+
+      account.balance -= payment.amount + payment.fee;
+      await account.save();
+
+      payment = payment.get({ plain: true });
+      payment.account = account.get({ plain: true });
+      emit(user.username, "payment", payment);
+      res.send(payment);
+    } else {
+      res.send(result);
+    }
+  } catch (e) {
+    res.status(500).send(e.message);
+  }
+});
diff --git a/routes/bitcoin/fee.js b/routes/bitcoin/fee.js
index cd99d363..3249004c 100644
--- a/routes/bitcoin/fee.js
+++ b/routes/bitcoin/fee.js
@@ -1,4 +1,4 @@
-const buildTx = ({ address, amount, feeRate }) => {};
+const buildTx = require("../../lib/buildtx");
 
 module.exports = ah(async (req, res) => {
   let { user } = req;
@@ -6,8 +6,12 @@ module.exports = ah(async (req, res) => {
   let tx, fee;
 
   if (user.account.pubkey) {
-    tx = buildTx(req.body);
-    return res.end();
+    try {
+      let psbt = await buildTx({ address, amount, feeRate, user });
+      return res.send(psbt);
+    } catch(e) {
+      return res.status(500).send(e.message);
+    } 
   }
 
   let invoice = await db.Invoice.findOne({
diff --git a/routes/bitcoin/receive.js b/routes/bitcoin/receive.js
index 1c731118..ec120605 100644
--- a/routes/bitcoin/receive.js
+++ b/routes/bitcoin/receive.js
@@ -35,7 +35,7 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
         return;
       }
 
-      if (Object.keys(addresses).includes(address)) {
+      if (Object.keys(addresses).includes(address) && !change.includes(address)) {
         payments.push(hash);
 
         let user = await db.User.findOne({
diff --git a/routes/bitcoin/send.js b/routes/bitcoin/send.js
index 744f8f29..ddf07f3c 100644
--- a/routes/bitcoin/send.js
+++ b/routes/bitcoin/send.js
@@ -1,5 +1,4 @@
 const bitcoin = require("bitcoinjs-lib");
-const reverse = require("buffer-reverse");
 
 module.exports = ah(async (req, res) => {
   let { user } = req;
diff --git a/routes/bitcoin/sweep.js b/routes/bitcoin/sweep.js
index 7d596499..36bd11b5 100644
--- a/routes/bitcoin/sweep.js
+++ b/routes/bitcoin/sweep.js
@@ -9,11 +9,6 @@ const network = prod
   : bitcoin.networks["regtest"];
 
 module.exports = ah(async (req, res) => {
-  let ecpair = bitcoin.ECPair.fromWIF(
-    "cVosbTBiXp7LYSiGVRZfZnrEjpao4X4CUTG7Ze21XM3zFTLPCMvk",
-    network
-  );
-
   let { address: from, amount, feeRate, target } = req.body;
   let utxos;
   if (!feeRate) feeRate = (await bc.estimateSmartFee(6)).feerate * SATS;