update default config

10 files changed, 60 insertions, 130 deletions

diff --git a/README.md b/README.md
index ba511256..3da279c3 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ The follow commands will set up bitcoin, liquid and lightning nodes in regtest m
 ```bash
 git clone https://github.com/coinos/coinos-server
 cd coinos-server
-cp -rf sampleconfig ./config
+cp -r sampleconfig config
+cp -r sampledata data
 sudo chown $(id -u):$(id -g) config/liquid
 sudo chown $(id -u):$(id -g) config/bitcoin
 cp .env.sample .env
@@ -27,24 +28,11 @@ docker exec -it liquid elements-cli createwallet coinos
 docker exec -it liquid elements-cli rescanblockchain
 docker exec -it liquid elements-cli sendtoaddress AzpsKhC6xE9FEK4aWAzMnbvueMLiSa5ym1xpuYogFkHzWgMHSt8B79aNNbFppQzCSQ2yZ9E4nL6RQJU7 1000000
 docker exec -it liquid elements-cli generatetoaddress 1 AzpsKhC6xE9FEK4aWAzMnbvueMLiSa5ym1xpuYogFkHzWgMHSt8B79aNNbFppQzCSQ2yZ9E4nL6RQJU7
-docker exec -it lnd lncli create # set password to "password"
-sed -i "s/# wallet/wallet/g" config/lnd/lnd.conf
-CERT=$(sudo base64 config/lnd/tls.cert | tr -d '\n') 
-sed -i "s/LS0tL.*\"/$CERT\"/g" config/index.js
-MACAROON=$(sudo base64 config/lnd/data/chain/bitcoin/regtest/admin.macaroon | tr -d '\n') 
-sed -i "s/AgED.*\"/$MACAROON\"/g" config/index.js
 curl localhost:3119/register -H "content-type: application/json" -d '{"user": { "username": "coinosfees", "password": "password"}}'
 ```
 
 After successful creation of all docker containers coinos ui will be available at http://localhost:8085 and coinos server will be available at http://localhost:3119
 
-### Setup Lightning Channels
-
-    docker exec -it cl lightning-cli getinfo
-    docker exec -it lnd lncli --network=regtest --chain=bitcoin connect 029ba19ec5f65f82b1952fd535a86ff136ccc67ff7f91e19c3fcbc83a5224adaee@cl:9735
-    docker exec -it lnd lncli --network=regtest --chain=bitcoin openchannel 029ba19ec5f65f82b1952fd535a86ff136ccc67ff7f91e19c3fcbc83a5224adaee 10000000
-    docker exec -it bitcoin bitcoin-cli generatetoaddress 10 $(docker exec -it bitcoin bitcoin-cli getnewaddress "" "legacy")
-
 ### License
 
 This code is [licensed].  Coinos is free for personal use.  Anyone can fork as long as it stays AGPLv3.  
diff --git a/index.js b/index.js
deleted file mode 100644
index 759893dc..00000000
--- a/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import app from "./app";
-import persist from "./lib/persist";
-import config from "./config/index";
-import store from "./lib/store";
-import { l, err } from "./lib/logging";
-import { optionalAuth } from "$lib/passport";
-
-import "./db";
-import "./lib/redis";
-import "./lib/sockets";
-import "./lib/webhooks";
-import "./lib/passport";
-import "./lib/upload";
-import "./lib/sync";
-import "./lib/rates";
-import "./lib/notifications";
-import "./lib/mail";
-
-import "./routes/assets";
-import "./routes/locations";
-import "./routes/info";
-import "./routes/users";
-import "./routes/invoices";
-import "./routes/payments";
-import "./routes/requests";
-import "./routes/lnurl";
-import "./routes/tickets";
-
-if (config.bitcoin) store.networks.push("bitcoin");
-if (config.liquid) store.networks.push("liquid");
-if (config.lna) store.networks.push("lightning");
-
-let host = process.env.HOST || "0.0.0.0";
-let port = process.env.PORT || 3119;
-
-app.post('/echo', optionalAuth, async (req, res) => {
-  console.log(req.user.username)
-  console.log(req.body)
-  res.send(req.body);
-}); 
-
-app.listen({ host, port }, (e, address) => {
-  e && err(e) && process.exit(1);
-  l(`CoinOS Server listening on ${address}`);
-});
diff --git a/sampleconfig/index.js b/sampleconfig/index.js
index e1478127..759893dc 100644
--- a/sampleconfig/index.js
+++ b/sampleconfig/index.js
@@ -1,63 +1,45 @@
-const db = {
-  user: "root",
-  password: "password",
-  database: "coinos",
-  host: "maria",
-  dialect: "mariadb",
-  dialectOptions: { multipleStatements: true, timezone: "Etc/GMT+7" }
-};
+import app from "./app";
+import persist from "./lib/persist";
+import config from "./config/index";
+import store from "./lib/store";
+import { l, err } from "./lib/logging";
+import { optionalAuth } from "$lib/passport";
 
-const btcasset =
-  "5ac9f65c0efcc4775e0baec4ec03abdde22473cd3cf33c0419ca290e0751b225";
+import "./db";
+import "./lib/redis";
+import "./lib/sockets";
+import "./lib/webhooks";
+import "./lib/passport";
+import "./lib/upload";
+import "./lib/sync";
+import "./lib/rates";
+import "./lib/notifications";
+import "./lib/mail";
 
-export default {
-  db,
-  clientVersion: "3b96359d6a6ce68fe4a32f495fc9a6f78af0aa63",
-  knex: {
-    client: "mysql2",
-    connection: db
-  },
-  jwt: Buffer.from(
-    "00d0ab4f7738a83feb37f661526512063c41e49278b7c32cba87314269a5788b",
-    "hex"
-  ),
-  port: 3119,
-  taxi: "864234bccdd230ecb6db05ebdf5061c3af42fefb9f186b3326e6454fdd3a9475",
-  bitcoin: {
-    masterkey:
-      "tprv8ZgxMBicQKsPdTUoagV41nang9pQUA2DKoVWLmTrWmb2PfsC8pDTHveCMyzUyMguKJCjd5uyHcqg27r7gDzz4TY3MgucpLsSXwCbjn2C3Q1",
-    host: "bitcoin",
-    wallet: "coinos",
-    username: "admin1",
-    password: "123",
-    network: "regtest",
-    port: 18443,
-    zmqrawblock: "tcp://bitcoin:18506",
-    zmqrawtx: "tcp://bitcoin:18507"
-  },
-  liquid: {
-    masterkey:
-      "tprv8ZgxMBicQKsPfBjZp16yQUmZM3DWh5fb366inBXF3Xk6ANhJYqxXYL4FeQxAW5kjT3ku1A1wmS79c5y6RajKr2TkCADG8A3h4WdggbFMXX1",
-    blindkey:
-      "099e599b1d79dbc536c6f8461772d7f2f9583d7b6f3fba70394d60b599c3bd96",
-    host: "liquid",
-    username: "admin1",
-    password: "123",
-    network: "regtest",
-    wallet: "coinos",
-    port: 7040,
-    zmqrawblock: "tcp://liquid:18606",
-    zmqrawtx: "tcp://liquid:18607",
-    btcasset
-  },
-  lna: {
-    lnd: true,
-    socket: "lnd:10009",
-    // get this with: sudo base64 config/lnd/tls.cert | tr -d '\n'
-    cert:
-      "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNLekNDQWRDZ0F3SUJBZ0lSQUxrWGlSWVc1RHptTFVEa1FyVEk0eEl3Q2dZSUtvWkl6ajBFQXdJd09ERWYKTUIwR0ExVUVDaE1XYkc1a0lHRjFkRzluWlc1bGNtRjBaV1FnWTJWeWRERVZNQk1HQTFVRUF4TU1ZVFE0WVRNMgpORFkwT0dVeE1CNFhEVEl5TURrd05URTRNek0xT1ZvWERUSXpNVEF6TVRFNE16TTFPVm93T0RFZk1CMEdBMVVFCkNoTVdiRzVrSUdGMWRHOW5aVzVsY21GMFpXUWdZMlZ5ZERFVk1CTUdBMVVFQXhNTVlUUTRZVE0yTkRZME9HVXgKTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFVjFFRHV5MmtwK0g2K3VVRlgxSHVaYlBQeTh6KwprcUVOaS9BVGdSWnZLSnRTazd5TUJWRm1uM3ZZZmNNWDJTVSs5WjN2MXQzdml6aTM2MmNDYjJLUFJxT0J1akNCCnR6QU9CZ05WSFE4QkFmOEVCQU1DQXFRd0V3WURWUjBsQkF3d0NnWUlLd1lCQlFVSEF3RXdEd1lEVlIwVEFRSC8KQkFVd0F3RUIvekFkQmdOVkhRNEVGZ1FVNTR6TmNmdlV6aG94dGR2a2RBcnhtQ3U1UEVzd1lBWURWUjBSQkZrdwpWNElNWVRRNFlUTTJORFkwT0dVeGdnbHNiMk5oYkdodmMzU0NBMnh1WklJRWRXNXBlSUlLZFc1cGVIQmhZMnRsCmRJSUhZblZtWTI5dWJvY0Vmd0FBQVljUUFBQUFBQUFBQUFBQUFBQUFBQUFBQVljRXJCSUFHVEFLQmdncWhrak8KUFFRREFnTkpBREJHQWlFQWhHbFgvbkxCNDFlaDc3bjM4THZUTzlZcVpMajdKVC9CVk5zM0hYY1Y1UGNDSVFELwo0anNrdWs4WmdoUlFoTWhLdDhhbmhXSzhXTzNRdm5KVWcrdUxQdUZsQWc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
-    // get this with: sudo base64 config/lnd/data/chain/bitcoin/regtest/admin.macaroon | tr -d '\n'
-    macaroon:
-      "AgEDbG5kAvgBAwoQmmnvoarLAytdlv0oasTlIhIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaIQoIbWFjYXJvb24SCGdlbmVyYXRlEgRyZWFkEgV3cml0ZRoWCgdtZXNzYWdlEgRyZWFkEgV3cml0ZRoXCghvZmZjaGFpbhIEcmVhZBIFd3JpdGUaFgoHb25jaGFpbhIEcmVhZBIFd3JpdGUaFAoFcGVlcnMSBHJlYWQSBXdyaXRlGhgKBnNpZ25lchIIZ2VuZXJhdGUSBHJlYWQAAAYgVPkLxSu/6QCUX5+ObLWXD2XD88NiR3AZNknn8QrYepM="
-  }
-};
+import "./routes/assets";
+import "./routes/locations";
+import "./routes/info";
+import "./routes/users";
+import "./routes/invoices";
+import "./routes/payments";
+import "./routes/requests";
+import "./routes/lnurl";
+import "./routes/tickets";
+
+if (config.bitcoin) store.networks.push("bitcoin");
+if (config.liquid) store.networks.push("liquid");
+if (config.lna) store.networks.push("lightning");
+
+let host = process.env.HOST || "0.0.0.0";
+let port = process.env.PORT || 3119;
+
+app.post('/echo', optionalAuth, async (req, res) => {
+  console.log(req.user.username)
+  console.log(req.body)
+  res.send(req.body);
+}); 
+
+app.listen({ host, port }, (e, address) => {
+  e && err(e) && process.exit(1);
+  l(`CoinOS Server listening on ${address}`);
+});
diff --git a/sampleconfig/lnurl.js b/sampleconfig/lnurl.js
index aeb1dc32..b101e23c 100644
--- a/sampleconfig/lnurl.js
+++ b/sampleconfig/lnurl.js
@@ -4,7 +4,7 @@ export default {
   host: "app",
   port: 3118,
   protocol: "http",
-  url: "https://desk.bobcat-liberty.ts.net",
+  url: "https://staging.coinos.io",
   endpoint: "/lnurl",
   listen: true,
   auth: {
@@ -16,16 +16,9 @@ export default {
     ]
   },
   lightning: {
-    backend: "lnd",
+    backend: "c-lightning",
     config: {
-      hostname: "lnd:9735",
-      cert: {
-        data: fs.readFileSync("/app/config/lnd/tls.cert", "utf8")
-      },
-      macaroon: {
-        data:
-          "0201036c6e6402f801030a100a1edc729d77423ec23fa75b85b781391201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620aea455def2702fb1ec9838f1300255147ed20e825a539a1ee2e99e7049b04c11"
-      }
+      unixSockPath: "/app/config/lightning/regtest/lightning-rpc"
     }
   },
   store: {
diff --git a/sampledata/conversions.json b/sampledata/conversions.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/sampledata/conversions.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/sampledata/emails.json b/sampledata/emails.json
new file mode 100644
index 00000000..5fbac846
--- /dev/null
+++ b/sampledata/emails.json
@@ -0,0 +1,4 @@
+{
+  "emails": [
+  ]
+}
diff --git a/sampledata/logins.json b/sampledata/logins.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/sampledata/logins.json
@@ -0,0 +1 @@
+{}
diff --git a/sampledata/payments.json b/sampledata/payments.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/sampledata/payments.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/sampledata/recipients.json b/sampledata/recipients.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/sampledata/recipients.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/sampledata/withdrawals.json b/sampledata/withdrawals.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/sampledata/withdrawals.json
@@ -0,0 +1 @@
+{}