generate new address on receive

4 files changed, 9 insertions, 2 deletions

diff --git a/bitcoinPayments.js b/bitcoinPayments.js
index 90d7836a..abdc072d 100644
--- a/bitcoinPayments.js
+++ b/bitcoinPayments.js
@@ -71,9 +71,10 @@ module.exports = (app, bc, db, addresses, payments, emit) => {
             user.pending += o.value;
           }
 
+          user.address = await bc.getNewAddress("", "bech32");
+          addresses[user.address] = user.username;
           await user.save();
           emit(user.username, "user", user);
-          l("output:", o);
 
           const payment = await db.Payment.create({
             user_id: user.id,
diff --git a/liquidPayments.js b/liquidPayments.js
index 6498be40..19e1d8e7 100644
--- a/liquidPayments.js
+++ b/liquidPayments.js
@@ -65,6 +65,10 @@ module.exports = (app, db, addresses, payments, emit) => {
             user.pending += value;
           }
 
+          user.confidential = await bc.getNewAddress();
+          user.liquid = (await bc.getAddressInfo(user.confidential)).unconfidential;
+          addresses[user.liquid] = user.username;
+
           await user.save();
           emit(user.username, "user", user);
 
diff --git a/users.js b/users.js
index 1a3b7f1c..498bc33b 100644
--- a/users.js
+++ b/users.js
@@ -19,7 +19,6 @@ module.exports = (addresses, auth, app, bc, db, emit) => {
     let users = await db.User.findAll();
     for (let i = 0; i < users.length; i++) {
       let user = users[i];
-      console.log("meow");
       if (!user.confidential) {
         user.confidential = await liquid.getNewAddress();
         user.liquid = (await liquid.getAddressInfo(user.confidential)).unconfidential;
@@ -46,6 +45,7 @@ module.exports = (addresses, auth, app, bc, db, emit) => {
     user.name = user.username;
     user.currency = "USD";
     addresses[user.address] = user.username;
+    addresses[user.liquid] = user.username;
 
     await db.User.create(user);
     res.send(pick(user, ...whitelist));
diff --git a/whitelist.js b/whitelist.js
index 2c52810e..d4db43f0 100644
--- a/whitelist.js
+++ b/whitelist.js
@@ -17,4 +17,6 @@ module.exports = [
 'phoneVerified',
 'twofa',
 'emailVerified',
+'liquid',
+'confidential',
 ]