@witnet/sdk 1.0.15 → 1.1.1

package/src/bin/helpers.js

@@ -98,7 +98,7 @@ async function execRadonBytecode (bytecode, ...flags) {
     throw EvalError("invalid hex string")
   } else {
     const npx = os.type() === "Windows_NT" ? "npx.cmd" : "npx"
-    return cmd(npx, "witnet", "radon", "dry-run", bytecode, ...flags)
+    return cmd(npx, "witsdk", "radon", "dry-run", bytecode, ...flags)
     // .catch((err) => {
     //     let errorMessage = err.message.split('\n').slice(1).join('\n').trim()
     //     const errorRegex = /.*^error: (?<message>.*)$.*/gm
@@ -369,8 +369,8 @@ function checkRpcWildcards (wildcards) {
   } else if (typeof wildcards === "string") {
     if (isWildcard(wildcards)) {
       const char = wildcards.charAt(1)
-      if (char < "1" || char > "9") {
-        throw Error("RPC: wildcards not in range [1 .. 9]")
+      if (char < "0" || char > "9") {
+        throw Error("RPC: wildcards not in range [0 .. 9]")
       }
     }
   }
@@ -392,10 +392,25 @@ function replaceWildcards (obj, args) {
       ? replaceWildcards(value, args)
       : value
     )
+  } else if (obj && typeof obj === "object") {
+    obj = replaceObjectWildcards(obj, args)
   }
   return obj
 }
 
+function replaceObjectWildcards(obj, args) {
+  return Object.fromEntries(
+    Object.entries(obj).map(([key, value]) => {
+      for (let argIndex = 0; argIndex < args.length; argIndex ++) {
+        const wildcard = `\\${argIndex}\\`
+        key = key.replaceAll(wildcard, args[argIndex])
+        value = replaceWildcards(value, args)
+      }
+      return [key, value]
+    })
+  )
+}
+
 function spliceWildcard (obj, argIndex, argValue, argsCount) {
   if (obj && typeof obj === "string") {
     const wildcard = `\\${argIndex}\\`
@@ -716,7 +731,7 @@ function traceTransactionReceipt (receipt) {
       mblue(receipt.recipients.filter((pkh, index, array) => index === array.indexOf(pkh)))
     }`)
   }
-  if (receipt?.fees) console.info(` > Fee:          ${yellow(receipt.fees.toString(2))}`)
+  if (receipt?.fees) console.info(` > Network fee:  ${yellow(receipt.fees.toString(2))}`)
   if (receipt?.value) console.info(` > Value:        ${myellow(receipt.value.toString(2))}`)
   if (receipt?.weight) console.info(` > Weight:       ${mgreen(commas(receipt.weight))}`)
   if (receipt?.witnesses) {
@@ -771,6 +786,23 @@ async function traceTransaction (transmitter, options) {
   return receipt
 }
 
+function unescapeSlashes(str) {
+  // add another escaped slash if the string ends with an odd
+  // number of escaped slashes which will crash JSON.parse
+  let parsedStr = str.replace(/(^|[^\\])(\\\\)*\\$/, "$&\\");
+
+  // escape unescaped double quotes to prevent error with
+  // added double quotes in json string
+  parsedStr = parsedStr.replace(/(^|[^\\])((\\\\)*")/g, "$1\\$2");
+
+  try {
+    parsedStr = JSON.parse(`"${parsedStr}"`);
+  } catch(e) {
+    return str;
+  }
+  return parsedStr ;
+}
+
 module.exports = {
   colors: {
     bblue,
@@ -837,4 +869,5 @@ module.exports = {
   replaceWildcards,
   spliceWildcard,
   txJsonReplacer,
+  unescapeSlashes,
 }

package/src/bin/toolkit.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /// IMPORTS ===========================================================================================================
 
@@ -18,7 +18,7 @@ const {
 
 /// CONSTANTS =======================================================================================================
 
-const version = "2.0.8"
+const version = "2.0.21"
 const toolkitDownloadUrlBase = `https://github.com/witnet/witnet-rust/releases/download/${version}/`
 const toolkitDownloadNames = {
   win32: (arch) => `witnet_toolkit-${arch}-pc-windows-msvc.exe`,

package/witnet/assets/modals/web3/eth.js

@@ -16,13 +16,13 @@ module.exports = {
   }),
   WitOracleEthGetBalance: new RadonModal({
     retrieval: retrievals.JsonRPC({
-      rpc: retrievals.rpc.eth.getBalance("\\1\\"),
+      rpc: retrievals.rpc.eth.getBalance("\\0\\"),
       script: RadonScript(types.RadonString).asFloat().floor(),
     }),
   }),
   WitOracleEthGetTransactionReceipt: new RadonModal({
     retrieval: retrievals.JsonRPC({
-      rpc: retrievals.rpc.eth.getTransactionByHash("\\1\\"),
+      rpc: retrievals.rpc.eth.getTransactionByHash("\\0\\"),
       script: RadonScript(types.RadonString).parseJSONMap(),
     }),
   }),

package/witnet/assets/modals/web3/ipfs.js

@@ -1,8 +1,6 @@
 const {
   RadonModal,
   RadonScript,
-  // filters,
-  // reducers,
   retrievals,
   types,
 } = require("../../../../src/lib/radon")
@@ -10,10 +8,15 @@ const {
 module.exports = {
     WitOracleIpfsFileExists: new RadonModal({
         retrieval: retrievals.HttpHead({
-            headers: {},
-            script: RadonScript(types.RadonString),
+            script: RadonScript(types.RadonMap)
+                .getString("etag")
+                .slice(1, -1)
+                .match(types.RadonBoolean, { "\\0\\": true }, false)
         }),
     }),
-    WitOracleIpfsFileSha256: {},
-    WitOracleIpfsFileSha256Sealed: {},
+    WitOracleIpfsFileSha256: new RadonModal({
+        retrieval: retrievals.HttpGet({
+            script: RadonScript(types.RadonBytes).hash()
+        })
+    })
 }

package/witnet/assets/modals/web3/wit.js

@@ -8,14 +8,14 @@ const {
 module.exports = {
   WitOracleWitGetBalance: new RadonModal({
     retrieval: retrievals.JsonRPC({
-      rpc: retrievals.rpc.wit.getBalance("\\1\\"),
+      rpc: retrievals.rpc.wit.getBalance("\\0\\"),
       script: RadonScript(types.RadonString).parseJSONMap().getMap("result").values(),
     }),
   }),
   WitOracleWitGetValueTransfer: new RadonModal({
     retrieval: retrievals.JsonRPC({
-      rpc: retrievals.rpc.wit.getValueTransfer("\\1\\", "\\2\\"),
-      script: RadonScript(types.RadonString).parseJSONMap().getMap("result").getMap("\\2\\").values(),
+      rpc: retrievals.rpc.wit.getValueTransfer("\\0\\", "\\1\\"),
+      script: RadonScript(types.RadonString).parseJSONMap().getMap("result").getMap("\\1\\").values(),
     }),
   }),
 }

package/witnet/assets/requests.js

@@ -8,38 +8,16 @@ const {
 } = require("../../src/lib/radon")
 
 module.exports = {
-
   defi: {
     tickers: {
       crypto: {
         WitOracleRequestPriceCryptoWitUsdt6: new RadonRequest({
           sources: [
             retrievals.HttpGet({
-              url: "https://api-cloud.bitmart.com/spot/v1/ticker?symbol=WIT_USDT",
-              script: RadonScript(types.RadonString)
-                .parseJSONMap()
-                .getMap("data")
-                .getArray("tickers")
-                .getMap(0)
-                .getFloat("last_price")
-                .multiply(1e6)
-                .round(),
-            }),
-            retrievals.HttpGet({
-              url: "https://data.gateapi.io/api2/1/ticker/wit_usdt",
-              script: RadonScript(types.RadonString)
-                .parseJSONMap()
-                .getFloat("last")
-                .multiply(1e6)
-                .round(),
-            }),
-            retrievals.HttpGet({
-              url: "https://www.mexc.com/open/api/v2/market/ticker?symbol=WIT_USDT",
+              url: "https://api.mexc.com/api/v3/ticker/price?symbol=WITUSDT",
               script: RadonScript(types.RadonString)
                 .parseJSONMap()
-                .getArray("data")
-                .getMap(0)
-                .getFloat("last")
+                .getFloat("price")
                 .multiply(1e6)
                 .round(),
             }),
@@ -50,35 +28,11 @@ module.exports = {
         WitOracleRequestPriceCryptoUsdtWit9: new RadonRequest({
           sources: [
             retrievals.HttpGet({
-              url: "https://api-cloud.bitmart.com/spot/v1/ticker?symbol=WIT_USDT",
-              script: RadonScript(types.RadonString)
-                .parseJSONMap()
-                .getMap("data")
-                .getArray("tickers")
-                .getMap(0)
-                .getFloat("last_price")
-                .power(-1)
-                .multiply(1e9)
-                .round(),
-            }),
-            retrievals.HttpGet({
-              url: "https://data.gateapi.io/api2/1/ticker/wit_usdt",
+              url: "https://api.mexc.com/api/v3/ticker/price?symbol=WITUSDT",
               script: RadonScript(types.RadonString)
                 .parseJSONMap()
-                .getFloat("last")
-                .power(-1)
-                .multiply(1e9)
-                .round(),
-            }),
-            retrievals.HttpGet({
-              url: "https://www.mexc.com/open/api/v2/market/ticker?symbol=WIT_USDT",
-              script: RadonScript(types.RadonString)
-                .parseJSONMap()
-                .getArray("data")
-                .getMap(0)
-                .getFloat("last")
-                .power(-1)
-                .multiply(1e9)
+                .getFloat("price")
+                .multiply(1e6)
                 .round(),
             }),
           ],