Merge pull request #16 from Permissionless-Software-Foundation/ct-unstable

fix(broadcast): Fixing bug in broadcast JSON RPC

.gitignore

@@ -65,5 +65,6 @@ system-user-*.json
 orbitdb
 ipfsdata
 ipfs-service-provider.sh
+start-bch-wallet-service.sh
 
 !README.md

config/about.js

@@ -1,15 +0,0 @@
-/*
-  This file should be customized for your app. The string in this file is
-  displayed when a user makes the 'about' JSON RPC call.
-*/
-
-module.exports = `
-This is the about string for the ipfs-service-provider repository:
-https://github.com/Permissionless-Software-Foundation/ipfs-service-provider
-
-Brought to you by the Permissionless Software Foundation:
-https://PSFoundation.cash
-
-Documentation: 
-https://ipfs-service-provider.fullstack.cash/
-`

config/env/common.js

@@ -5,6 +5,10 @@
 
 /* eslint  no-unneeded-ternary:0 */
 
+// Get the version from the package.json file.
+const pkgInfo = require('../../package.json')
+const version = pkgInfo.version
+
 const ipfsCoordName = process.env.COORD_NAME
   ? process.env.COORD_NAME
   : 'ipfs-bch-wallet-service'
@@ -52,6 +56,8 @@ module.exports = {
     '@context': 'https://schema.org/',
     '@type': 'WebAPI',
     name: ipfsCoordName,
+    version,
+    protocol: 'bch-wallet',
     description:
       'IPFS service providing BCH blockchain access needed by a wallet.',
     documentation: 'https://ipfs-bch-wallet-service.fullstack.cash/',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-bch-wallet-service",
-  "version": "1.0.0",
+  "version": "1.9.1",
   "description": "IPFS and REST service providing blockchain access needed by a wallet. ",
   "main": "index.js",
   "scripts": {

src/controllers/json-rpc/about/index.js

@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const aboutStr = require('../../../../config/about')
+const config = require('../../../../config')
 
 class AboutRPC {
   constructor (localConfig) {
@@ -36,7 +36,8 @@ class AboutRPC {
     return {
       success: true,
       status: 200,
-      message: aboutStr,
+      // message: aboutStr,
+      message: JSON.stringify(config.announceJsonLd),
       endpoint: 'about'
     }
   }

src/controllers/json-rpc/bch/index.js

@@ -146,7 +146,7 @@ class BCHRPC {
 
       return retObj
     } catch (err) {
-      // console.error('Error in createUser()')
+      console.error('Error in JSON RPC BCH transactions()')
       // throw err
 
       // Return an error response
@@ -223,7 +223,7 @@ class BCHRPC {
 
       return retObj
     } catch (err) {
-      // console.error('Error in createUser()')
+      console.error('Error in JSON RPC BCH balance()')
       // throw err
 
       // Return an error response
@@ -336,7 +336,8 @@ class BCHRPC {
 
       return retObj
     } catch (err) {
-      // console.error('Error in createUser()')
+      console.error('Error in JSON RPC BCH utxos()')
+      console.error('Error in JSON RPC utxos(): ', err)
       // throw err
 
       // Return an error response
@@ -388,12 +389,17 @@ class BCHRPC {
       const data = await this.bchjs.RawTransactions.sendRawTransaction(hex)
       // console.log(`data: ${JSON.stringify(data, null, 2)}`)
 
-      const retObj = data
-      retObj.status = 200
+      const retObj = {
+        success: true,
+        status: 200,
+        endpoint: 'broadcast',
+        txid: data
+      }
+      // retObj.status = 200
 
       return retObj
     } catch (err) {
-      // console.error('Error in createUser()')
+      console.error('Error in JSON RPC BCH broadcast()')
       // throw err
 
       // Return an error response
@@ -514,7 +520,7 @@ class BCHRPC {
 
       return retObj
     } catch (err) {
-      // console.error('Error in createUser()')
+      console.error('Error in JSON RPC BCH transaction()')
       // throw err
 
       // Return an error response

test/e2e/manual/consumer/consumer.e2e.js

@@ -20,6 +20,10 @@ async function startTest () {
 
     await testUtils.testTransaction(testData.uutId)
 
+    // ToDo:
+    // testTransactions()
+    // testUtxos()
+
     console.log('E2E TEST: Tests completed successfully!')
     process.exit()
   } catch (err) {