add domain field to assets

5 files changed, 18 insertions, 13 deletions

diff --git a/routes/assets.js b/routes/assets.js
index 27643c0d..5f838992 100644
--- a/routes/assets.js
+++ b/routes/assets.js
@@ -29,13 +29,13 @@ app.post("/assets", auth, async (req, res) => {
     const info = await lq.getAddressInfo(asset_address);
     const { pubkey: issuer_pubkey } = info;
 
-    const { name, asset_amount, token_amount, precision, ticker } = req.body;
-    const domain = "adamsoltys.com";
+    const { domain, name, asset_amount, token_amount, precision, ticker } = req.body;
     const version = 0;
 
     const contract = {
       entity: { domain },
       issuer_pubkey,
+      domain,
       name,
       precision,
       ticker,
@@ -113,6 +113,7 @@ app.post("/assets", auth, async (req, res) => {
         account = await db.Account.create(
           {
             asset,
+            domain,
             user_id,
             ticker,
             precision,
@@ -152,6 +153,7 @@ app.post("/assets", auth, async (req, res) => {
             {
               asset: token,
               user_id,
+              domain,
               ticker: `${ticker}REISSUANCETOKEN`,
               precision: 8,
               name: `${name} Reissuance Token`,
diff --git a/routes/liquid/receive.js b/routes/liquid/receive.js
index 690f1b2c..4a00de78 100644
--- a/routes/liquid/receive.js
+++ b/routes/liquid/receive.js
@@ -46,6 +46,7 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
           await account.save();
         } else {
           let name = asset.substr(0, 6);
+          let domain = '';
           let ticker = asset.substr(0, 3).toUpperCase();
           let precision = 8;
 
@@ -53,7 +54,7 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
             .data;
 
           if (assets[asset]) {
-            ({ ticker, precision, name } = assets[asset]);
+            ({ domain, ticker, precision, name } = assets[asset]);
           } else {
             const existing = await db.Account.findOne({
               where: {
@@ -64,11 +65,11 @@ zmqRawTx.on("message", async (topic, message, sequence) => {
             });
 
             if (existing) {
-              ({ ticker, precision, name } = existing);
+              ({ domain, ticker, precision, name } = existing);
             }
           }
 
-          params = { ...params, ...{ ticker, precision, name } };
+          params = { ...params, ...{ domain, ticker, precision, name } };
           params.balance = 0;
           params.pending = value;
           account = await db.Account.create(params);
diff --git a/routes/send.js b/routes/send.js
index f774e852..2fad326d 100644
--- a/routes/send.js
+++ b/routes/send.js
@@ -73,6 +73,7 @@ module.exports = async (req, res) => {
         await account.save({ transaction });
       } else {
         let name = asset.substr(0, 6);
+        let domain;
         let ticker = asset.substr(0, 3).toUpperCase();
         let precision = 8;
 
@@ -80,7 +81,7 @@ module.exports = async (req, res) => {
           .data;
 
         if (assets[asset]) {
-          ({ ticker, precision, name } = assets[asset]);
+          ({ domain, ticker, precision, name } = assets[asset]);
         } else {
           const existing = await db.Account.findOne({
             where: {
@@ -93,12 +94,11 @@ module.exports = async (req, res) => {
           l.info("existing", existing);
 
           if (existing) {
-            l.info(existing.name);
-            ({ ticker, precision, name } = existing);
+            ({ domain, ticker, precision, name } = existing);
           }
         }
 
-        params = { ...params, ...{ ticker, precision, name } };
+        params = { ...params, ...{ domain, ticker, precision, name } };
         params.balance = amount;
         params.pending = 0;
         account = await db.Account.create(params, { transaction });
diff --git a/routes/swaps.js b/routes/swaps.js
index 69bcd75c..2d9fa5dc 100644
--- a/routes/swaps.js
+++ b/routes/swaps.js
@@ -553,13 +553,14 @@ const getAccount = async (asset, user) => {
     asset,
   };
   let name = asset.substr(0, 6);
+  let domain = '';
   let ticker = asset.substr(0, 3).toUpperCase();
   let precision = 8;
 
   const assets = (await axios.get("https://assets.blockstream.info/")).data;
 
   if (assets[asset]) {
-    ({ ticker, precision, name } = assets[asset]);
+    ({ domain, ticker, precision, name } = assets[asset]);
   } else {
     const existing = await db.Account.findOne({
       where: {
@@ -570,11 +571,11 @@ const getAccount = async (asset, user) => {
     });
 
     if (existing) {
-      ({ ticker, precision, name } = existing);
+      ({ domain, ticker, precision, name } = existing);
     }
   }
 
-  params = { ...params, ...{ ticker, precision, name } };
+  params = { ...params, ...{ domain, ticker, precision, name } };
   params.balance = 0;
   params.pending = 0;
   return db.Account.create(params);
diff --git a/routes/users.js b/routes/users.js
index a8b92860..eaf10d72 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -264,13 +264,14 @@ app.post("/address", auth, async (req, res) => {
 
 app.post("/account", auth, async (req, res) => {
   let { user } = req;
-  let { asset, precision, name, ticker, user_id } = req.body;
+  let { asset, domain, precision, name, ticker, user_id } = req.body;
 
   try {
     const account = await db.Account.findOne({
       where: { user_id, asset },
     });
 
+    account.domain = domain;
     account.name = name;
     account.ticker = ticker;
     account.precision = precision;