Merge pull request #5 from osmose-collective/update_blockchainlib_docker

fix: fixed blockchain library to use latest available ARK API

Author: Z-a-r-a-k-i

.gitignore

@@ -73,3 +73,5 @@ typings/
 .serverless
 
 .vscode
+
+docker/data

.nvmrc

@@ -0,0 +1 @@
+11.15

docker/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log

docker/Dockerfile

@@ -0,0 +1,20 @@
+FROM node:11-alpine
+
+# Create app directory
+WORKDIR /home/node/faucet
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+RUN apk add --no-cache --virtual .build-deps make gcc g++ python git bash \
+    && npm ci --only=production
+
+COPY . /home/node/faucet
+
+USER node
+
+EXPOSE 8080
+
+CMD [ "node", "main.js"]

docker/docker-compose-build.yml

@@ -0,0 +1,19 @@
+version: '2'
+services:
+  mongodb:
+    image: "mongo:latest"
+    container_name: mongodb-faucet
+    environment:
+      - MONGO_DATA_DIR=/data/db
+      - MONGO_LOG_DIR=/dev/null
+    volumes:
+      - ./data/db:/data/db
+    restart: always
+    command: mongod --smallfiles --logpath=/dev/null # --quiet
+
+  faucet:
+    build:
+      context: ../
+      dockerfile: docker/Dockerfile
+    ports:
+      - "8080:8080"

lib/dbclient.js

@@ -1,5 +1,5 @@
 var MongoClient = require('mongodb').MongoClient;
-var url = "mongodb://localhost:27017/osmose_faucet";
+var url = "mongodb://mongodb-faucet:27017/osmose_faucet";
 
 module.exports = {
   CheckAddressInDatabase: async function (address) {

lib/osmose.js

@@ -1,39 +1,48 @@
-var arkjs = require("arkjs");
-var fs = require('fs');
-var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest;
+const fs = require('fs');
+const Connection = require("@arkecosystem/client").Connection;
+const Crypto = require("@arkecosystem/crypto").Crypto;
+const Managers = require("@arkecosystem/crypto").Managers;
+const Transactions = require("@arkecosystem/crypto").Transactions;
+const Identities = require("@arkecosystem/crypto").Identities;
+
+// Global var
+Managers.configManager.setConfig(
+  JSON.parse(fs.readFileSync("networks.json", "utf8"))
+  );
+
+const client = new Connection("http://testnet.osmose.world:4003/api/v2");
 
 module.exports = {
   CheckAddress: function (address) {
-    return arkjs.crypto.validateAddress(address, 115);
+    return Identities.Address.validate(address, 65);
   },
-  SendOSM: function (address) {
-    let wallet = JSON.parse(fs.readFileSync('config.json', 'utf8')).faucetWallet;
-    let nethash = "fa976091894eee4cad258bdae4e3323d0768c4f8610e471237408ac4aa0a92d0";
-    let sender = arkjs.crypto.getKeys(wallet);
-    let amountSatoshi = 1000 * Math.pow(10, 8);
+  SendOSM: async function (address) {
+    const walletPassphrase = JSON.parse(fs.readFileSync('config.json', 'utf8')).faucetWallet.normalize('NFD');
+    const sender = Identities.Address.fromPublicKey(Identities.Keys.fromPassphrase(walletPassphrase).publicKey, 65);
+    const amountoOSMtoshi = 100 * Math.pow(10, 8);
 
-    let transaction = arkjs.transaction.createTransaction(address, amountSatoshi, "Courtesy of our faucet", sender, undefined, 115);
+    const data = "Courtesy from OSMOSE Faucet"
 
-    let transactions = {
-      transactions: [transaction]
-    }
+    let transaction = Transactions.BuilderFactory
+    .transfer()
+    .amount(`${amountoOSMtoshi}`)
+    .recipientId(address)
+    .network(65)
+    .vendorField(data)
+    .sign(walletPassphrase);
 
-    let http = new XMLHttpRequest();
-    let url = 'http://blockchain.osmose.world:4100/peer/transactions';
-    http.open('POST', url, true);
-    http.setRequestHeader("nethash", nethash);
-    http.setRequestHeader("version", "1.6.0");
-    http.setRequestHeader("port", "1");
-    
-    //Send the proper header information along with the request
-    http.setRequestHeader("Content-Type", "application/json");
-    
-    http.onreadystatechange = function () {
-      if (http.readyState === 4 && http.status === 200) {
-          console.log(new Date() + " | 1000 OSM sent from : " + arkjs.crypto.getAddress(sender.publicKey, 115) + " --> " + address);
+    const response = await client.api("transactions").create({ transactions: [transaction.getStruct()] });
+
+    if (response.status === 200) {
+      if(response.body.errors) 
+        console.log('Error during transaction, please check if there is a valid passphrase in config.json file');
+      else
+      {
+        console.log(new Date() + " | 100 OSM sent from : " + sender + " --> " + address);
+        return true;
       }
-    };
+    }
 
-    http.send(JSON.stringify(transactions));
+    return false;
   }
 };

main.js

@@ -1,7 +1,10 @@
-var express = require('express');
-var bodyParser = require('body-parser');
-var osmose = require('./lib/osmose');
-var dbclient = require('./lib/dbclient');
+const express = require('express');
+const bodyParser = require('body-parser');
+const osmose = require('./lib/osmose');
+const dbclient = require('./lib/dbclient');
+
+const PORT = 8080;
+const HOST = '0.0.0.0';
 
 var app = express();
 app.use(express.static('public'));
@@ -16,6 +19,7 @@ app.get('/', function(req, res) {
       addressError: false,
       delayError: false,
       delayAddressError: false,
+      error: false,
       success: false
     }
   };
@@ -37,9 +41,12 @@ app.post('/', async function(req, res) {
   if(!param.formData.addressError) {
     if(await dbclient.CheckAddressInDatabase(address)) {
       if(await dbclient.CanSend()) {
-        osmose.SendOSM(address);
-        dbclient.AddAddressToDatabase(address);
-        param.formData.success = true;
+        if(await osmose.SendOSM(address)) {
+          dbclient.AddAddressToDatabase(address);
+          param.formData.success = true;
+        }
+        else
+          param.formData.error = true;
       }
       else {
         param.formData.delayError = true;
@@ -52,4 +59,5 @@ app.post('/', async function(req, res) {
   res.render('index.ejs', param);
 });
 
-app.listen(8080);
+app.listen(PORT, HOST);
+console.log(`Running on http://${HOST}:${PORT}`);

networks.json

@@ -0,0 +1,56 @@
+{
+  "network": {
+    "name": "osmose",
+    "messagePrefix": "OSMOSE message:\n",
+    "bip32": {
+        "public": 70617039,
+        "private": 70615956
+    },
+    "pubKeyHash": 65,
+    "nethash": "2ff10d167c01e661eef477b55a4915cf881e924076f63f7f005e6f10a4383b53",
+    "wif": 129,
+    "slip44": 1,
+    "aip20": 0,
+    "client": {
+        "token": "OSMOSE",
+        "symbol": "OSM",
+        "explorer": "http://testnet.osmose.world"
+    }
+  },
+  "milestones": [
+    {
+      "height": 1,
+      "reward": 0,
+      "activeDelegates": 42,
+      "blocktime": 8,
+      "block": {
+          "version": 0,
+          "maxTransactions": 150,
+          "maxPayload": 6291456
+      },
+      "epoch": "2019-05-15T12:16:01.019Z",
+      "fees": {
+          "staticFees": {
+              "transfer": 1000000,
+              "secondSignature": 500000000,
+              "delegateRegistration": 5000000000,
+              "vote": 100000000,
+              "multiSignature": 500000000,
+              "ipfs": 500000000,
+              "timelockTransfer": 0,
+              "multiPayment": 0,
+              "delegateResignation": 2500000000
+          }
+      },
+      "vendorFieldLength": 255
+    },
+    {
+        "height": 10000,
+        "reward": 100000000
+    }
+  ],
+  "exceptions": {
+    "blocks": [],
+    "transactions": []
+  }
+}