Merge pull request #290 from Bitcoin-com/stage

2.2.2

dist/public/bitcoin-com-mainnet-rest-v2.json

@@ -1091,7 +1091,7 @@
 	"openapi": "3.0.0",
 	"info": {
 		"description": "rest.bitcoin.com is the REST layer for Bitcoin.com's Cloud. More info: [developer.bitcoin.com/rest](https://developer.bitcoin.com/rest). Chatroom [geni.us/CashDev](http://geni.us/CashDev)",
-		"version": "2.2.1",
+		"version": "2.2.2",
 		"title": "REST",
 		"license": {
 			"name": "MIT",
@@ -2656,6 +2656,33 @@
 				}
 			}
 		},
+		"/slp/address/convert/{address}": {
+			"get": {
+				"tags": [
+					"slp"
+				],
+				"summary": "convert address to slpAddr, cashAddr and legacy",
+				"description": "convert address to slpAddr, cashAddr and legacy",
+				"operationId": "slpAddressConvert",
+				"parameters": [
+					{
+						"name": "address",
+						"in": "path",
+						"description": "The slp address",
+						"required": true,
+						"example": "simpleledger:qz9tzs6d5097ejpg279rg0rnlhz546q4fsnck9wh5m",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful response"
+					}
+				}
+			}
+		},
 		"/slp/validateTxid": {
 			"post": {
 				"tags": [

dist/public/bitcoin-com-testnet-rest-v2.json

@@ -1091,7 +1091,7 @@
 	"openapi": "3.0.0",
 	"info": {
 		"description": "trest.bitcoin.com is the REST layer for Bitcoin.com's Cloud. More info: [developer.bitcoin.com/rest](https://developer.bitcoin.com/rest). Chatroom [geni.us/CashDev](http://geni.us/CashDev)",
-		"version": "2.2.1",
+		"version": "2.2.2",
 		"title": "REST",
 		"license": {
 			"name": "MIT",
@@ -2656,6 +2656,33 @@
 				}
 			}
 		},
+		"/slp/address/convert/{address}": {
+			"get": {
+				"tags": [
+					"slp"
+				],
+				"summary": "convert address to slpAddr, cashAddr and legacy",
+				"description": "convert address to slpAddr, cashAddr and legacy",
+				"operationId": "slpAddressConvert",
+				"parameters": [
+					{
+						"name": "address",
+						"in": "path",
+						"description": "The slp address",
+						"required": true,
+						"example": "slptest:qz35h5mfa8w2pqma2jq06lp7dnv5fxkp2shlcycvd5",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful response"
+					}
+				}
+			}
+		},
 		"/slp/validateTxid": {
 			"post": {
 				"tags": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rest.bitcoin.com",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "REST API for Bitcoin.com's Cloud",
   "author": "Gabriel Cardona <[email protected]>",
   "contributors": [
@@ -50,6 +50,7 @@
     "pg": "^6.2.3",
     "pg-hstore": "^2.3.2",
     "sequelize": "^3.30.4",
+    "slp-sdk": "1.1.7",
     "slpjs": "0.12.2",
     "socket.io": "^2.1.1",
     "strftime": "^0.10.0",

src/routes/v2/slp.ts

@@ -19,6 +19,9 @@ util.inspect.defaultOptions = { depth: 5 }
 const BITBOXCli = require("bitbox-sdk/lib/bitbox-sdk").default
 const BITBOX = new BITBOXCli()
 
+const SLPSDK = require("slp-sdk/lib/SLP").default
+const SLP = new SLPSDK()
+
 // Instantiate SLPJS.
 const slp = require("slpjs")
 const slpjs = new slp.Slp(BITBOX)
@@ -35,9 +38,6 @@ const BitboxHTTP = axios.create({
 const username = process.env.RPC_USERNAME
 const password = process.env.RPC_PASSWORD
 
-// const SLPsdk = require("slp-sdk/lib/SLP").default
-// const SLP = new SLPsdk()
-
 // Retrieve raw transactions details from the full node.
 async function getRawTransactionsFromNode(txids: string[]) {
   try {
@@ -176,7 +176,7 @@ router.get(
   config.slpRateLimit5,
   balancesForAddressByTokenID
 )
-// router.get("/address/convert/:address", config.slpRateLimit6, convertAddress)
+router.get("/address/convert/:address", config.slpRateLimit6, convertAddress)
 router.post("/validateTxid", config.slpRateLimit7, validateBulk)
 
 function root(
@@ -539,43 +539,43 @@ async function balancesForAddressByTokenID(
   }
 }
 
-// async function convertAddress(
-//   req: express.Request,
-//   res: express.Response,
-//   next: express.NextFunction
-// ) {
-//   try {
-//     let address = req.params.address
-//     if (!address || address === "") {
-//       res.status(400)
-//       return res.json({ error: "address can not be empty" })
-//     }
-//     const slpAddr = SLP.Address.toSLPAddress(req.params.address)
-//     const obj: {
-//       [slpAddress: string]: any
-//       cashAddress: any
-//       legacyAddress: any
-//     } = {
-//       slpAddress: "",
-//       cashAddress: "",
-//       legacyAddress: ""
-//     }
-//     obj.slpAddress = slpAddr
-//     obj.cashAddress = SLP.Address.toCashAddress(slpAddr)
-//     obj.legacyAddress = BITBOX.Address.toLegacyAddress(obj.cashAddress)
-//     return res.json(obj)
-//   } catch (err) {
-//     const { msg, status } = routeUtils.decodeError(err)
-//     if (msg) {
-//       res.status(status)
-//       return res.json({ error: msg })
-//     }
-//     res.status(500)
-//     return res.json({
-//       error: `Error in /address/convert/:address: ${err.message}`
-//     })
-//   }
-// }
+async function convertAddress(
+  req: express.Request,
+  res: express.Response,
+  next: express.NextFunction
+) {
+  try {
+    let address = req.params.address
+    if (!address || address === "") {
+      res.status(400)
+      return res.json({ error: "address can not be empty" })
+    }
+    const slpAddr = SLP.Address.toSLPAddress(req.params.address)
+    const obj: {
+      [slpAddress: string]: any
+      cashAddress: any
+      legacyAddress: any
+    } = {
+      slpAddress: "",
+      cashAddress: "",
+      legacyAddress: ""
+    }
+    obj.slpAddress = slpAddr
+    obj.cashAddress = SLP.Address.toCashAddress(slpAddr)
+    obj.legacyAddress = BITBOX.Address.toLegacyAddress(obj.cashAddress)
+    return res.json(obj)
+  } catch (err) {
+    const { msg, status } = routeUtils.decodeError(err)
+    if (msg) {
+      res.status(status)
+      return res.json({ error: msg })
+    }
+    res.status(500)
+    return res.json({
+      error: `Error in /address/convert/:address: ${err.message}`
+    })
+  }
+}
 
 async function validateBulk(
   req: express.Request,
@@ -654,7 +654,7 @@ module.exports = {
     listSingleToken,
     balancesForAddress,
     balancesForAddressByTokenID,
-    // convertAddress,
+    convertAddress,
     validateBulk,
     isValidSlpTxid
   }

swaggerJSONFiles/info.json

@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "description": "The Bitcoin Cash JSON PRC over HTTP",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "title": "REST",
     "license": {
       "name": "MIT",

swaggerJSONFiles/paths.json

@@ -1467,6 +1467,31 @@
         }
       }
     },
+    "/slp/address/convert/{address}": {
+      "get": {
+        "tags": ["slp"],
+        "summary": "convert address to slpAddr, cashAddr and legacy",
+        "description": "convert address to slpAddr, cashAddr and legacy",
+        "operationId": "slpAddressConvert",
+        "parameters": [
+          {
+            "name": "address",
+            "in": "path",
+            "description": "The slp address",
+            "required": true,
+            "example": "",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful response"
+          }
+        }
+      }
+    },
     "/slp/validateTxid": {
       "post": {
         "tags": ["slp"],