Merge pull request #46 from syscoin/release/v3.0.1

Release/v3.0.1 into master

Author: cortesa

server/nodejs/api/swagger.yaml

@@ -6497,13 +6497,15 @@ definitions:
         type: "string"
       addresses:
         type: "array"
+        example:
+        - "list-of-addresses"
+        - "last-address-in-list-is-used-for-funding"
         items:
-          type: "object"
-          properties: {}
+          type: "string"
     example:
       addresses:
-      - "{}"
-      - "{}"
+      - "list-of-addresses"
+      - "last-address-in-list-is-used-for-funding"
       hexstring: "hexstring"
   GetAddressUTXOsRequest:
     properties:

server/nodejs/controllers/AliasesService.js

@@ -186,12 +186,35 @@ exports.aliasupdatewhitelist = function(args, res, next) {
   var arr = varUtils.getArgsArr(argList, args, "POST", cb);
   syscoinClient.aliasUpdateWhitelist.apply(syscoinClient, arr);
 }
+ 
+exports.syscointxfund = function(args, res, next) {
+  var argList = [
+    { prop: 'hexstring' },
+    { prop: 'addresses' }
+  ];
+
+  var cb = function(err, result, resHeaders) {
+    res.setHeader('Content-Type', 'application/json');
 
-exports.syscointxfund = methodGenerator.generateGenericSyscoinMethod([
-  { prop: 'hexstring' },
-  { prop: 'addresses' }
-], syscoinClient.syscoinTxFund, 'syscointxfund', 'POST');
+    if (err) {
+      return commonUtils.reportError(res, err);
+    }
 
+    commonUtils.log('Syscoin TX fund:', result, "syscointxfund");
+    res.end(JSON.stringify(result));
+  };
+ // Convert the Addresses array to string
+if(args && args.request && args.request.value && args.request.value['addresses']) {
+  var actualAddresses = args.request.value['addresses']
+  var addressObjectForCore = { addresses: actualAddresses };
+  args.request.value['addresses'] = addressObjectForCore
+} else {
+  console.error("ERROR: No value defined in request for 'addresses', this is a required param");
+}
+  
+  var arr = varUtils.getArgsArr(argList, args, "POST", cb); 
+  syscoinClient.syscoinTxFund.apply(syscoinClient, arr);
+}
 
 exports.aliasaddscript = function(args, res, next) {
   var argList = [

server/nodejs/controllers/util/varUtils.js

@@ -33,7 +33,7 @@ function getArgsArr(fullArgList, requestArgs, requestMethod, callback) {
         arr.push(requestArgs.request.value[argObj.prop]);
     } else if (argObj && notNullOrUndefined(argObj.defaultValue)) {
         arr.push(argObj.defaultValue);
-      }else{
+      } else {
         console.error("ERROR: No value defined in request for " + argObj.prop + " and no defaultValue specified. Is this a required param?");
       }
     }

server/nodejs/package-lock.json

@@ -18,6 +18,7 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
+    "@syscoin/syscoin-core": "^3.0.0-beta",
     "assert": "^1.4.1",
     "chai": "^3.5.0",
     "connect": "^3.6.5",

server/nodejs/package.json

@@ -5473,10 +5473,11 @@ definitions:
     properties:
       hexstring:
         type: string
-      addresses:
-        type: array
-        items:
-          type: object
+      addresses: 
+        type: array 
+        items: 
+          type: string
+        example: ["list-of-addresses", "last-address-in-list-is-used-for-funding"]
   GetAddressUTXOsRequest:
     properties:
       addresses:

swagger.yaml

@@ -6781,23 +6781,23 @@
         },
         "nonce" : {
           "type" : "number",
-          "description" : "?The nonce"
+          "description" : "The nonce"
         },
         "bits" : {
           "type" : "string",
           "description" : "The bits"
         },
         "difficulty" : {
           "type" : "number",
-          "description" : "?The difficulty"
+          "description" : "The difficulty"
         },
         "chainwork" : {
           "type" : "string",
-          "description" : "?Expected number of hashes required to produce the chain up to this block (in hex)"
+          "description" : "Expected number of hashes required to produce the chain up to this block (in hex)"
         },
         "previousblockhash" : {
           "type" : "string",
-          "description" : "?The hash of the previous block"
+          "description" : "The hash of the previous block"
         },
         "nextblockhash" : {
           "type" : "string",
@@ -7929,14 +7929,14 @@
         },
         "addresses" : {
           "type" : "array",
+          "example" : [ "list-of-addresses", "last-address-in-list-is-used-for-funding" ],
           "items" : {
-            "type" : "object",
-            "properties" : { }
+            "type" : "string"
           }
         }
       },
       "example" : {
-        "addresses" : [ "{}", "{}" ],
+        "addresses" : [ "list-of-addresses", "last-address-in-list-is-used-for-funding" ],
         "hexstring" : "hexstring"
       }
     },