Fix invocation

Author: morrigan

controllers/payment.controller.js

@@ -11,19 +11,33 @@ const config = require('../config');
 const node = require("../services/blockchain");
 const calculateAmountOfNEO = require("./../services/exchange.js");
 const closeSavings = require("./../services/savings");
+const util = require('../util');
 
-exports.open_savings = function (deadline, name) {
-    const name = Neon.u.str2hexstring(name);
-    // Build script
-    const sb = Neon.sc.default.create.scriptBuilder();
-    sb.emitAppCall(config.scriptHash, "create", [name, deadline]);
 
-    const tx = node.execute_transaction(sb);
-    console.log(tx);
+exports.open_savings = function (duration, savingsName) {
+    const name = util.str2hex(savingsName);
+    const account = Neon.getAccountFromWIFKey(config.wif);
+    const scriptHash = config.scriptHash;
+    const args = [name, duration];
+    const invoke = { operation: 'createSavings', scriptHash , args};
+    const intents = [{ assetId: util.ASSETS['NEO'], value: 0, scriptHash }];
+    const gasCost = 10;
+    let signedTx;
+
+    node.getBalance(account.address).then((balances) => {
+        const unsignedTx = Neon.create.invocation(account.publicKeyEncoded, balances, intents, invoke, gasCost, { version: 1 });
+        signedTx = Neon.signTransaction(unsignedTx, account.privateKey);
+        const hexTx = Neon.serializeTransaction(signedTx);
+        return node.queryRPC('sendrawtransaction', [hexTx]);
+    }).catch(function(error) {
+        console.log(error);
+    }).then((res) => {
+        console.log(res);
+    })
 };
 
-function sendNEOToSmartContract(address, name, amount) {
-    const name = Neon.u.str2hexstring(name);
+function sendNEOToSmartContract(address, savingsName, amount) {
+    const name = Neon.u.str2hexstring(savingsName);
     // Build script
     const sb = Neon.sc.default.create.scriptBuilder();
     sb.emitAppCall(config.scriptHash, "addFunds", [address, name, amount]);
@@ -40,20 +54,20 @@ function makePayment(address, name, amount) {
 /**
  * Start cronjob to run every `time` minutes.
  * We use minutes just for development purposes.
- * @param endTime Date when saving should end.
+ * @param endDate Date when saving should end.
  * @param time Period between payments (in minutes).
  * @param amount Amount in USD to deposit.
  * @param address Savings owner address
  * @param name Savings name/purpose
  */
-exports.start_payment_cron = function (endTime, time, amount, address, name) {
+exports.start_payment_cron = function (endDate, time, amount, address, name) {
     /*
      Should use pollingPolicy?
      const pollingPolicy = neo.service.createPollingPolicy(interval);
      pollingPolicy.onInterval(function () {
      });*/
 
-    const endTime = new Date(endTime);
+    const endTime = new Date(endDate);
     const cronTime = `*/${time} * * * *`;
 
     const job = new CronJob({

package.json

@@ -6,9 +6,10 @@
   "repository": "git@github.com:BlockSaver/backend.git",
   "license": "MIT",
   "dependencies": {
+    "axios": "^0.17.1",
     "cron": "^1.3.0",
     "neo-api-js": "git+https://github.com/CityOfZion/neo-api-js.git",
-    "neon-js": "git+https://github.com/CityOfZion/neon-js.git#dev",
+    "neon-js": "git+https://github.com/CityOfZion/neon-js.git",
     "node-restify-validation": "^1.1.1",
     "restify": "^6.3.1",
     "restify-errors": "^5.0.0",

routes/index.js

@@ -11,8 +11,9 @@ const closeSavings = require('../services/savings');
 module.exports = function(server) {
 
     server.get('/test', (req, res, next) => {
-        // paymentController.start_payment_cron("11.8.2017. 00:17", "seconds");
-        paymentController.open_savings(10);
+        const endDate = new Date().getTime() + 1000;
+        paymentController.open_savings(endDate, "Testing bab bam");
+        // paymentController.start_payment_cron(data.endTime, data.time, data.amount, data.address, data.name);
     });
 
     /**

services/blockchain.js

@@ -1,24 +1,48 @@
 const neo = require('neo-api-js');
+const Neon = require('neon-js');
 
-const node = require("../services/blockchain");
 const config = require('../config');
+const axios = require("axios");
 
 module.exports = {
 
     getBalance: (address) => {
-        const node = neo.node(config.RPCEndpoint);
-        return node.getBalance(address);
+        return axios.get(config.RESTEndpoint + '/v2/address/balance/' + address)
+            .then((res) => {
+                return res.data
+                // const neo = res.data.NEO.balance
+                // const gas = res.data.GAS.balance
+                // return { Neo: neo, Gas: gas, unspent: { Neo: res.data.NEO.unspent, Gas: res.data.GAS.unspent } }
+            })
+    },
+
+    getNode: () => {
+        return neo.node(config.RPCEndpoint)
     },
 
-    getNode: () => (
-        neo.node(config.RPCEndpoint)
-    ),
+    getRPCEndpoint: () => {
+        return axios.get(config.RESTEndpoint + '/v2/network/best_node').then(function (response) {
+            return response.data.node;
+        });
+    },
+
+    queryRPC: (method, params, id = 1) => {
+        const jsonRequest = axios.create({ headers: { 'Content-Type': 'application/json' } });
+        const jsonRpcData = { method, params, id, jsonrpc: '2.0' };
+        return module.exports.getRPCEndpoint().then(function (rpcEndpoint) {
+            return jsonRequest.post(rpcEndpoint, jsonRpcData).then(function (response) {
+                return response.data;
+            });
+        });
+    },
 
     execute_transaction: (sb) => {
         // Test the script with invokescript
-        Neon.rpc.Query.invokeScript(sb.str).execute(node.getNode());
+        const node = neo.node(config.RPCEndpoint);
+        Neon.rpc.Query.invokeScript(sb.str).execute(node);
         // Create InvocationTransaction for real execution
         const account = Neon.sc.default.create.account(config.wif);
-        return Neon.sc.default.create.invocationTx(account.publicKey, {}, {}, sb.str, 0);
+        const invoke = { operation: 'createSavings', scriptHash: sb.str };
+        return tx.create.createInvocationTx(account.publicKey, {}, {}, invoke, 0);
     }
 };

services/savings.js

@@ -15,8 +15,8 @@ exports.Savings = (function(){
     };
 })();
 
-exports.getSavingsState = function(name) {
-    const name = Neon.u.str2hexstring(name);
+exports.getSavingsState = function(savingsName) {
+    const name = Neon.u.str2hexstring(savingsName);
     // Build script
     const sb = Neon.sc.default.create.scriptBuilder();
     sb.emitAppCall(config.scriptHash, "getSavingsByName", name);
@@ -31,8 +31,8 @@ exports.makeSavingsWithdrawal = function(name, savingsState) {
 
 };
 
-exports.closeSavings = function (name) {
-    const name = Neon.u.str2hexstring(name);
+exports.closeSavings = function (savingsName) {
+    const name = Neon.u.str2hexstring(savingsName);
     // Build script
     const sb = Neon.sc.default.create.scriptBuilder();
     sb.emitAppCall(config.scriptHash, "closeSavings", name);

util.js

@@ -0,0 +1,34 @@
+module.exports = {
+    ASSETS: {
+        NEO: 'c56f33fc6ecfcd0c225c4ab356fee59390af8560be0e930faebe74a6daff7c9b',
+        'c56f33fc6ecfcd0c225c4ab356fee59390af8560be0e930faebe74a6daff7c9b': 'NEO',
+        GAS: '602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7',
+        '602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7': 'GAS'
+    },
+
+    int2hex: (mNumber) => {
+        const h = mNumber.toString(16);
+        return h.length % 2 ? '0' + h : h;
+    },
+
+    /**
+     * Converts a number to a hexstring of a suitable size
+     * @param {number} num
+     * @param {number} size - The required size in chars, eg 2 for Uint8, 4 for Uint16. Defaults to 2.
+     */
+    num2hexstring: (num, size = 2) => {
+        let hexstring = num.toString(16);
+        return hexstring.length % size === 0 ? hexstring : ('0'.repeat(size) + hexstring).substring(hexstring.length);
+    },
+
+    str2hex: (str) => {
+        let hex;
+        let result = "";
+        for (let i = 0; i < str.length; i++) {
+            hex = str.charCodeAt(i).toString(16);
+            result += ("000" + hex).slice(-4);
+        }
+
+        return result;
+    }
+};

yarn.lock

@@ -108,6 +108,13 @@ axios@^0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
+axios@^0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
+  dependencies:
+    follow-redirects "^1.2.5"
+    is-buffer "^1.1.5"
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -544,7 +551,7 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-follow-redirects@^1.2.3:
+follow-redirects@^1.2.3, follow-redirects@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.5.tgz#ffd3e14cbdd5eaa72f61b6368c1f68516c2a26cc"
   dependencies:
@@ -1205,9 +1212,9 @@ negotiator@^0.6.1:
   dependencies:
     axios "^0.16.2"
 
-"neon-js@git+https://github.com/CityOfZion/neon-js.git#dev":
-  version "1.1.0"
-  resolved "git+https://github.com/CityOfZion/neon-js.git#b8e61d43f136de787a99f42192084e9bbc1a2447"
+"neon-js@git+https://github.com/CityOfZion/neon-js.git":
+  version "1.1.1"
+  resolved "git+https://github.com/CityOfZion/neon-js.git#0ae7ed07bebe5fff325b9530e8e942068ae771c9"
   dependencies:
     axios "^0.16.2"
     base-x "^3.0.2"
@@ -1219,7 +1226,6 @@ negotiator@^0.6.1:
     fs "^0.0.1-security"
     js-scrypt "^0.2.0"
     secure-random "^1.1.1"
-    semver "^5.4.1"
     wif "^2.0.6"
 
 node-pre-gyp@^0.6.36: