Merge pull request #4284 from Superalgos/develop

Develop

.husky/pre-commit

@@ -1,4 +1,7 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run unitTest
+if [ "$UNITTESTS" != "false" ]
+then
+    npm run unitTest
+fi

Platform/Client/bitcoinFactoryServer.js

@@ -255,6 +255,7 @@ exports.newBitcoinFactoryServer = function newBitcoinFactoryServer() {
 
                 /* Parse CSV file, convert to JSON objects */
                 const csvToJsonResult = []
+                let parsingError = 0
                 let cleanResult = rewardsFile.toString().replace(/\r/g, "")
                 let array = cleanResult.split("\n")
                 const headers = array[0].split(",")
@@ -273,20 +274,28 @@ exports.newBitcoinFactoryServer = function newBitcoinFactoryServer() {
                         if (character !== '"') string += character
                     }
                     let jsonProperties = string.split("|")
-                    for (let j in headers) {
-                        if (jsonProperties[j].includes(",")) {
-                        jsonObject[headers[j]] = jsonProperties[j]
-                            .split(",").map(item => item.trim())
+                    try {
+                        for (let j in headers) {
+                            if (jsonProperties[j].includes(",")) {
+                            jsonObject[headers[j]] = jsonProperties[j]
+                                .split(",").map(item => item.trim())
+                            }
+                            else jsonObject[headers[j]] = jsonProperties[j]
                         }
-                        else jsonObject[headers[j]] = jsonProperties[j]
+                    } catch(err) {
+                        if (parsingError === 0) { parsingError = i + 1 }
                     }
                     /* Push the genearted JSON object to result array */
                     csvToJsonResult.push(jsonObject)
                 }
-
-                /* Check if file contains mandatory columns */
+                /* Check if file contained any malformed lines */
+                if (parsingError > 0) {
+                    console.log((new Date()).toISOString(), "[WARN] Bitcoin Factory Rewards File", reportsDirectory[f], "contains malformed records - e.g. line", parsingError, ", discarding")
+                    continue
+                }             
+                /* Check if file contains mandatory columns */             
                 if (!headers.includes("assignedTimestamp") || !headers.includes("testedByProfile") || !headers.includes("status")) {
-                    console.log((new Date()).toISOString(), "[WARN] Governance Rewards File", reportsDirectory[f], "with unexpected syntax, discarding")
+                    console.log((new Date()).toISOString(), "[WARN] Bitcoin Factory Rewards File", reportsDirectory[f], "with unexpected syntax, discarding")
                     continue
                 }
 

Platform/Client/httpInterface.js

@@ -165,6 +165,7 @@ exports.newHttpInterface = function newHttpInterface() {
                                 case 'getUserWalletBalance': {
 
                                     let serverResponse = await PL.servers.WEB3_SERVER.getUserWalletBalance(
+                                        params.chain,
                                         params.walletAddress,
                                         params.contractAddress
                                     )
@@ -1107,11 +1108,11 @@ exports.newHttpInterface = function newHttpInterface() {
                         case 'Contribute': {
                             try {
                                 // We create a pull request of all active changes
-                                let commitMessage = unescape(requestPath[3])
-                                const username = unescape(requestPath[4])
-                                const token = unescape(requestPath[5])
-                                const currentBranch = unescape(requestPath[6])
-                                const contributionsBranch = unescape(requestPath[7])
+                                let commitMessage = decodeURIComponent(requestPath[3])
+                                const username = decodeURIComponent(requestPath[4])
+                                const token = decodeURIComponent(requestPath[5])
+                                const currentBranch = decodeURIComponent(requestPath[6])
+                                const contributionsBranch = decodeURIComponent(requestPath[7])
                                 let error
 
                                 // rebuild array of commit messages if committing from contribturions space
@@ -1213,9 +1214,6 @@ exports.newHttpInterface = function newHttpInterface() {
 
                                     async function pushFiles(git) {
                                         try {
-                                            await git.pull('origin', currentBranch)
-                                            await git.add('./*')
-
                                             // If contributing from contributrions space gather the correct commit message
                                             let messageToSend
                                             if (commitMessage instanceof Array) {
@@ -1225,7 +1223,17 @@ exports.newHttpInterface = function newHttpInterface() {
                                                 messageToSend = commitMessage
 
                                             }
-                                            await git.commit(messageToSend)
+                                            if (messageToSend === undefined || messageToSend === '') {
+                                                messageToSend = 'No commit message defined'
+                                            } 
+                                            await git.pull('origin', currentBranch)
+                                            await git.add('./*')
+
+                                            /* Deactivate Unit Tests for the Contributions Space by setting UNITTESTS environment variable within the commit call. */
+                                            const UNITTESTS = 'false'
+                                            await git
+                                            .env({...process.env, UNITTESTS})
+                                            .commit(messageToSend)
 
                                             await git.push('origin', currentBranch)
                                         } catch (err) {
@@ -1355,12 +1363,12 @@ exports.newHttpInterface = function newHttpInterface() {
                         case 'ContributeSingleRepo': {
                             try {
                                 // We create a pull request for the active changes of a particular repo
-                                let commitMessage = unescape(requestPath[3])
-                                const username = unescape(requestPath[4])
-                                const token = unescape(requestPath[5])
-                                const currentBranch = unescape(requestPath[6])
-                                const contributionsBranch = unescape(requestPath[7])
-                                const repoName = unescape(requestPath[8])
+                                let commitMessage = decodeURIComponent(requestPath[3])
+                                const username = decodeURIComponent(requestPath[4])
+                                const token = decodeURIComponent(requestPath[5])
+                                const currentBranch = decodeURIComponent(requestPath[6])
+                                const contributionsBranch = decodeURIComponent(requestPath[7])
+                                const repoName = decodeURIComponent(requestPath[8])
                                 let error
 
                                 /* Unsaving # */
@@ -1447,7 +1455,11 @@ exports.newHttpInterface = function newHttpInterface() {
                                         try {
                                             await git.pull('origin', currentBranch)
                                             await git.add('./*')
-                                            await git.commit(commitMessage)
+                                            /* Deactivate Unit Tests for the Contribution Space by setting UNITTESTS environment variable within the commit call. */
+                                            const UNITTESTS = 'false'
+                                            await git
+                                            .env({...process.env, UNITTESTS})
+                                            .commit(commitMessage)
                                             await git.push('origin', currentBranch)
                                         } catch (err) {
                                             console.log((new Date()).toISOString(), '[ERROR] httpInterface -> App -> Contribute -> doGit -> Method call produced an error.')
@@ -2649,8 +2661,10 @@ exports.newHttpInterface = function newHttpInterface() {
 
 
                                     await PL.servers.WEB3_SERVER.payContributors(
-                                        params.contractAddress,
-                                        params.contractAbi,
+                                        params.contractAddressDict,
+                                        params.treasuryAccountDict,
+                                        params.contractABIDict,
+                                        params.decimalFactorDict,
                                         params.paymentsArray,
                                         params.mnemonic
                                     )