changes for prod

5 files changed, 61 insertions, 30 deletions

diff --git a/db.js b/db.js
index d8f1c45b..c10b925d 100644
--- a/db.js
+++ b/db.js
@@ -15,11 +15,12 @@ import {
 
 const Op = Sequelize.Op
 const l = console.log
+const conf = config[process.env.NODE_ENV]
 
 const auto = new SequelizeAuto(
-  config.development.database, 
-  config.development.username, 
-  config.development.password, 
+  conf.database, 
+  conf.username, 
+  conf.password, 
   config.auto
 )
 
@@ -29,12 +30,12 @@ const tables = {
 }
 
 const db = new Sequelize(
-  config.development.database,
-  config.development.username,
-  config.development.password,
+  conf.database,
+  conf.username,
+  conf.password,
   {
-    host: config.development.host,
-    dialect: config.development.dialect,
+    host: conf.host,
+    dialect: conf.dialect,
     logging: false, 
     dialectOptions: { multipleStatements: true },
     operatorsAliases: false,
diff --git a/index.js b/index.js
index 9f5a1e1c..1e85ff7d 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,3 @@
-import ba from 'bitcoinaverage'
 import bcrypt from 'bcrypt'
 import bitcoin from 'bitcoinjs-lib'
 import bodyParser from 'body-parser'
@@ -13,6 +12,7 @@ import fs from 'fs'
 import grpc from 'grpc'
 import io from 'socket.io'
 import jwt from 'jsonwebtoken'
+import morgan from 'morgan'
 import reverse from 'buffer-reverse'
 import zmq from 'zmq'
 
@@ -24,24 +24,22 @@ dotenv.config()
 const l = console.log
 
 ;(async () => {
-  const restClient = ba.restfulClient(process.env.BITCOINAVERAGE_PUBLIC, process.env.BITCOINAVERAGE_SECRET)
-
-  const lna = await require('lnrpc')({ server: 'localhost:10001', tls: '/home/adam/.lnd.testa/tls.cert' })
-  const maca = fs.readFileSync('/home/adam/.lnd.testa/admin.macaroon')
+  const lna = await require('lnrpc')({ server: 'localhost:10001', tls: '/home/adam/.lnd/tls.cert' })
+  const maca = fs.readFileSync('/home/adam/.lnd/test.macaroon')
   const meta = new grpc.Metadata()
   meta.add('macaroon', maca.toString('hex'))
   lna.meta = meta
 
-  const lnb = await require('lnrpc')({ server: 'localhost:10002', tls: '/home/adam/.lnd.testb/tls.cert' })
-  const macb = fs.readFileSync('/home/adam/.lnd.testb/admin.macaroon')
+  const lnb = await require('lnrpc')({ server: 'localhost:10002', tls: '/home/adam/.lndb/tls.cert' })
+  const macb = fs.readFileSync('/home/adam/.lndb/test.macaroon')
   const metab = new grpc.Metadata()
   metab.add('macaroon', macb.toString('hex'))
   lnb.meta = metab
 
   const bc = new core({ 
     username: 'adam',
-    password: 'MPJzfq97',
-    network: 'testnet',
+    password: 'hk79c7dI8ysAHY42eglqrJLo9A8CoyvWINMAcwuPzhQ=',
+    network: 'mainnet',
   })
 
   const app = express()
@@ -51,6 +49,7 @@ const l = console.log
   app.use(cookieParser())
   app.use(cors({ credentials: true, origin: 'http://*:*' }))
   app.use(compression())
+  app.use(morgan('combined'))
 
   const server = require('http').Server(app)
   const socket = io(server, { origins: '*:*' })
@@ -237,13 +236,10 @@ const l = console.log
 
 
   app.post('/faucet', auth, async (req, res) => {
-    await bc.walletPassphrase('kek', 30000)
-    await bc.sendToAddress(req.user.address, 0.001)
-    res.send('success')
-  })
-
-  app.post('/test', auth, async (req, res) => {
-    res.send(req.user)
+    return res.send('not for mainnet')
+    // await bc.walletPassphrase('kek', 30000)
+    // await bc.sendToAddress(req.user.address, 0.001)
+    // res.send('success')
   })
 
   app.post('/sendPayment', auth, async (req, res) => {
@@ -346,9 +342,7 @@ const l = console.log
 
   let fetchRates
   (fetchRates = () => {
-    restClient.tickerGlobalPerSymbol('BTCCAD', (data) => {
-      app.set('rates', JSON.parse(data))
-    })
+    app.set('rates', { ask: 11202.50 })
     setTimeout(fetchRates, 150000)
   })()
 
diff --git a/package.json b/package.json
index e64e9133..27b80ca0 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,10 @@
     "http-proxy-middleware": "^0.17.2",
     "jsonwebtoken": "^8.1.1",
     "less": "2.7.1",
-    "lnrpc": "https://github.com/asoltys/lnrpc#ab71ae4",
+    "lnrpc": "https://github.com/asoltys/lnrpc#ab71ae4ea79da3e9ea74d47ab50f8dba31c41322",
     "lodash": "^4.17.4",
     "moment": "^2.10.6",
+    "morgan": "^1.9.0",
     "mysql": "^2.15.0",
     "mysql2": "^1.5.1",
     "node-http-proxy": "^0.2.3",
diff --git a/test.js b/test.js
new file mode 100644
index 00000000..857c5775
--- /dev/null
+++ b/test.js
@@ -0,0 +1,19 @@
+import fs from 'fs'
+import grpc from 'grpc'
+
+try {
+  ;(async () => {
+    const lna = await require('lnrpc')({ server: 'localhost:10001', tls: '/home/adam/.lnd/tls.cert' })
+    const maca = fs.readFileSync('/home/adam/.lnd/test.macaroon')
+    const meta = new grpc.Metadata()
+    meta.add('macaroon', maca.toString('hex'))
+    lna.meta = meta
+    console.log('meow')
+    try {
+      let i = await lna.getInfo({}, meta)
+      console.log('i', i)
+    } catch (e) { console.log(e) }
+  })()
+} catch (e) { console.log(e) }
+
+console.log('done')
diff --git a/yarn.lock b/yarn.lock
index 38d5f3f8..b2fb6e1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1039,6 +1039,12 @@ [email protected], base64url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
 
+basic-auth@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"
+  dependencies:
+    safe-buffer "5.1.1"
+
 [email protected]:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.5.3.tgz#3f3414f380321743bfc1042f9a83ff1d5824d464"
@@ -2113,7 +2119,7 @@ [email protected]:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
-depd@^1.1.0:
+depd@^1.1.0, depd@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
@@ -3963,7 +3969,7 @@ limiter@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.0.tgz#6e2bd12ca3fcdaa11f224e2e53c896df3f08d913"
 
-"lnrpc@https://github.com/asoltys/lnrpc#ab71ae4":
+"lnrpc@https://github.com/asoltys/lnrpc#ab71ae4", "lnrpc@https://github.com/asoltys/lnrpc#ab71ae4ea79da3e9ea74d47ab50f8dba31c41322":
   version "0.0.3"
   resolved "https://github.com/asoltys/lnrpc#ab71ae4ea79da3e9ea74d47ab50f8dba31c41322"
   dependencies:
@@ -4387,6 +4393,16 @@ [email protected], moment@^2.10.6:
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
 
+morgan@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"
+  dependencies:
+    basic-auth "~2.0.0"
+    debug "2.6.9"
+    depd "~1.1.1"
+    on-finished "~2.3.0"
+    on-headers "~1.0.1"
+
 [email protected]:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"