wao 0.23.0 → 0.23.1

package/cjs/adaptor-base.js

@@ -272,7 +272,7 @@ var Adaptor = /*#__PURE__*/function () {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.t0 = req.path;
-              _context9.next = _context9.t0 === "/" ? 3 : _context9.t0 === "/tx" ? 6 : _context9.t0 === "/wallet/:id/balance" ? 9 : _context9.t0 === "/mint/:id/:amount" ? 12 : _context9.t0 === "/tx/:id/offset" ? 15 : _context9.t0 === "/tx_anchor" ? 18 : _context9.t0 === "/mine" ? 21 : _context9.t0 === "/:id" ? 24 : _context9.t0 === "/price/:id" ? 27 : 30;
+              _context9.next = _context9.t0 === "/" ? 3 : _context9.t0 === "/wallet/:id/balance" ? 6 : _context9.t0 === "/mint/:id/:amount" ? 9 : _context9.t0 === "/tx/:id/offset" ? 12 : _context9.t0 === "/tx_anchor" ? 15 : _context9.t0 === "/mine" ? 18 : _context9.t0 === "/:id" ? 21 : _context9.t0 === "/price/:id" ? 24 : 27;
               break;
             case 3:
               _context9.next = 5;
@@ -281,50 +281,45 @@ var Adaptor = /*#__PURE__*/function () {
               return _context9.abrupt("return", _context9.sent);
             case 6:
               _context9.next = 8;
-              return this.ar_get_tx(req);
+              return this.ar_get_wallet_balance(req);
             case 8:
               return _context9.abrupt("return", _context9.sent);
             case 9:
               _context9.next = 11;
-              return this.ar_get_wallet_balance(req);
+              return this.ar_get_mint(req);
             case 11:
               return _context9.abrupt("return", _context9.sent);
             case 12:
               _context9.next = 14;
-              return this.ar_get_mint(req);
+              return this.ar_get_tx_offset(req);
             case 14:
               return _context9.abrupt("return", _context9.sent);
             case 15:
               _context9.next = 17;
-              return this.ar_get_tx_offset(req);
+              return this.ar_get_tx_anchor(req);
             case 17:
               return _context9.abrupt("return", _context9.sent);
             case 18:
               _context9.next = 20;
-              return this.ar_get_tx_anchor(req);
+              return this.ar_get_mine(req);
             case 20:
               return _context9.abrupt("return", _context9.sent);
             case 21:
               _context9.next = 23;
-              return this.ar_get_mine(req);
+              return this.ar_get_id(req);
             case 23:
               return _context9.abrupt("return", _context9.sent);
             case 24:
               _context9.next = 26;
-              return this.ar_get_id(req);
+              return this.ar_get_price(req);
             case 26:
               return _context9.abrupt("return", _context9.sent);
             case 27:
               _context9.next = 29;
-              return this.ar_get_price(req);
+              return this.bad();
             case 29:
               return _context9.abrupt("return", _context9.sent);
             case 30:
-              _context9.next = 32;
-              return this.bad();
-            case 32:
-              return _context9.abrupt("return", _context9.sent);
-            case 33:
             case "end":
               return _context9.stop();
           }
@@ -1602,32 +1597,31 @@ var Adaptor = /*#__PURE__*/function () {
               query = _ref25.query, params = _ref25.params, body = _ref25.body, headers = _ref25.headers, method = _ref25.method;
               _context42.prev = 1;
               _query = body.query, variables = body.variables;
-              console.log(_query, variables);
               _toGraphObj = (0, _utils.toGraphObj)({
                 query: _query,
                 variables: variables
               }), tar = _toGraphObj.tar, args = _toGraphObj.args;
               res2 = null;
               if (!(tar === "transactions")) {
-                _context42.next = 12;
+                _context42.next = 11;
                 break;
               }
-              _context42.next = 9;
+              _context42.next = 8;
               return this.gql.txs(_objectSpread({}, args));
-            case 9:
+            case 8:
               res2 = _context42.sent;
-              _context42.next = 16;
+              _context42.next = 15;
               break;
-            case 12:
+            case 11:
               if (!(tar === "blocks")) {
-                _context42.next = 16;
+                _context42.next = 15;
                 break;
               }
-              _context42.next = 15;
+              _context42.next = 14;
               return this.gql.blocks(_objectSpread({}, args));
-            case 15:
+            case 14:
               res2 = _context42.sent;
-            case 16:
+            case 15:
               edges = (0, _ramda.map)(function (v) {
                 return {
                   node: v,
@@ -1644,19 +1638,19 @@ var Adaptor = /*#__PURE__*/function () {
                   })
                 }
               });
-            case 20:
-              _context42.prev = 20;
+            case 19:
+              _context42.prev = 19;
               _context42.t0 = _context42["catch"](1);
               console.log(_context42.t0);
               return _context42.abrupt("return", {
                 status: 400,
                 error: "bad request"
               });
-            case 24:
+            case 23:
             case "end":
               return _context42.stop();
           }
-        }, _callee42, this, [[1, 20]]);
+        }, _callee42, this, [[1, 19]]);
       }));
       function ar_post_graphql(_x42) {
         return _ar_post_graphql.apply(this, arguments);

package/cjs/hyperbeam.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _child_process = require("child_process");
 var _path = require("path");
+var _ramda = require("ramda");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -27,8 +28,17 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       c = _ref.c,
       cmake = _ref.cmake,
       _ref$legacy = _ref.legacy,
-      legacy = _ref$legacy === void 0 ? false : _ref$legacy;
+      legacy = _ref$legacy === void 0 ? false : _ref$legacy,
+      faff = _ref.faff,
+      _ref$simplePay = _ref.simplePay,
+      simplePay = _ref$simplePay === void 0 ? false : _ref$simplePay,
+      simplePayPrice = _ref.simplePayPrice,
+      operator = _ref.operator;
     _classCallCheck(this, HyperBEAM);
+    this.simplePay = simplePay;
+    this.spp = simplePayPrice;
+    this.operator = operator;
+    this.faff = faff;
     this.c = c;
     this.cmake = cmake;
     this.port = port;
@@ -78,8 +88,15 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       var _store = ", store => [#{ <<\"store-module\">> => hb_store_fs, <<\"prefix\">> => <<\"cache-mainnet\">> }, #{ <<\"store-module\">> => hb_store_gateway, <<\"subindex\">> => [#{ <<\"name\">> => <<\"Data-Protocol\">>, <<\"value\">> => <<\"ao\">> }], <<\"store\">> => [#{ <<\"store-module\">> => hb_store_fs, <<\"prefix\">> => <<\"cache-mainnet\">> }] }, #{ <<\"store-module\">> => hb_store_gateway, <<\"store\">> => [#{ <<\"store-module\">> => hb_store_fs, <<\"prefix\">> => <<\"cache-mainnet\">> }] }]";
       var _bundler = ", bundler_httpsig => <<\"http://localhost:4001\">>";
       var _routes = ", routes => [#{ <<\"template\">> => <<\"/result/.*\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:6363\">> } }, #{ <<\"template\">> => <<\"/graphql\">>, <<\"nodes\">> => [#{ <<\"prefix\">> => <<\"http://localhost:".concat(gateway, "\">>, <<\"opts\">> => #{ http_client => httpc, protocol => http2 } }, #{ <<\"prefix\">> => <<\"http://localhost:").concat(gateway, "\">>, <<\"opts\">> => #{ http_client => gun, protocol => http2 } }] }, #{ <<\"template\">> => <<\"/raw\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:").concat(gateway, "\">>, <<\"opts\">> => #{ http_client => gun, protocol => http2 } } }]");
+      var _p4_non_chargeable = !this.simplePay ? "" : ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/~simple-pay@1.0/topup\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]";
+      var _operator = this.operator ? ", operator => <<\"".concat(this.operator, "\">>") : "";
+      var _spp = this.spp ? ", simple_pay_price => ".concat(this.spp) : "";
       var _port = "port => ".concat(this.port);
-      return !legacy ? "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_store, " }).") : "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_store).concat(_bundler).concat(_routes, " }).");
+      var _faff = (0, _ramda.isNil)(this.faff) ? "" : ", faff_allow_list => [ ".concat((0, _ramda.map)(function (addr) {
+        return "<<\"".concat(addr, "\">>");
+      })(this.faff).join(", "), " ]");
+      var _on = this.simplePay ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> } }" : ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> } }";
+      return !legacy ? "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_store).concat(_on, " }).") : "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_store).concat(_faff).concat(_bundler).concat(_routes).concat(_on).concat(_p4_non_chargeable).concat(_operator).concat(_spp, " }).");
     }
   }, {
     key: "kill",

package/cjs/server.js

@@ -88,7 +88,7 @@ var Server = /*#__PURE__*/function () {
         limit: "100mb"
       }));
       this.launch("AR", app, {
-        get: ["/", "/tx", "/wallet/:id/balance", "/mint/:id/:amount", "/tx/:id/offset", "/tx_anchor", "/mine", "/:id", "/price/:id"],
+        get: ["/", "/wallet/:id/balance", "/mint/:id/:amount", "/tx/:id/offset", "/tx_anchor", "/mine", "/:id", "/price/:id"],
         post: ["/graphql", "/:id"]
       });
     }

package/esm/adaptor-base.js

@@ -90,8 +90,6 @@ class Adaptor {
     switch (req.path) {
       case "/":
         return await this.ar_get_root(req)
-      case "/tx":
-        return await this.ar_get_tx(req)
       case "/wallet/:id/balance":
         return await this.ar_get_wallet_balance(req)
       case "/mint/:id/:amount":
@@ -471,7 +469,6 @@ class Adaptor {
   async ar_post_graphql({ query, params, body, headers, method }) {
     try {
       const { query, variables } = body
-      console.log(query, variables)
       const { tar, args } = toGraphObj({ query, variables })
       let res2 = null
       if (tar === "transactions") {

package/esm/hyperbeam.js

@@ -1,5 +1,6 @@
 import { spawn } from "child_process"
 import { resolve } from "path"
+import { isNil, map } from "ramda"
 
 export default class HyperBEAM {
   constructor({
@@ -10,7 +11,15 @@ export default class HyperBEAM {
     c,
     cmake,
     legacy = false,
+    faff,
+    simplePay = false,
+    simplePayPrice,
+    operator,
   } = {}) {
+    this.simplePay = simplePay
+    this.spp = simplePayPrice
+    this.operator = operator
+    this.faff = faff
     this.c = c
     this.cmake = cmake
     this.port = port
@@ -49,10 +58,24 @@ export default class HyperBEAM {
     const _store = `, store => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"cache-mainnet">> }, #{ <<"store-module">> => hb_store_gateway, <<"subindex">> => [#{ <<"name">> => <<"Data-Protocol">>, <<"value">> => <<"ao">> }], <<"store">> => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"cache-mainnet">> }] }, #{ <<"store-module">> => hb_store_gateway, <<"store">> => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"cache-mainnet">> }] }]`
     const _bundler = `, bundler_httpsig => <<"http://localhost:4001">>`
     const _routes = `, routes => [#{ <<"template">> => <<"/result/.*">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:6363">> } }, #{ <<"template">> => <<"/graphql">>, <<"nodes">> => [#{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => httpc, protocol => http2 } }, #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } }] }, #{ <<"template">> => <<"/raw">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } } }]`
+    const _p4_non_chargeable = !this.simplePay
+      ? ""
+      : `, p4_non_chargable_routes => [#{ <<"template">> => <<"/~simple-pay@1.0/topup">> }, #{ <<"template">> => <<"/~p4@1.0/balance">> }, #{ <<"template">> => <<"/~meta@1.0/*">> }]`
+    const _operator = this.operator
+      ? `, operator => <<"${this.operator}">>`
+      : ""
+    const _spp = this.spp ? `, simple_pay_price => ${this.spp}` : ""
+
     const _port = `port => ${this.port}`
+    const _faff = isNil(this.faff)
+      ? ""
+      : `, faff_allow_list => [ ${map(addr => `<<"${addr}">>`)(this.faff).join(", ")} ]`
+    const _on = this.simplePay
+      ? `, on => #{ <<"request">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"simple-pay@1.0">>, <<"ledger-device">> => <<"simple-pay@1.0">> }, <<"response">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"simple-pay@1.0">>, <<"ledger-device">> => <<"simple-pay@1.0">> } }`
+      : `, on => #{ <<"request">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"faff@1.0">>, <<"ledger-device">> => <<"faff@1.0">> }, <<"response">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"faff@1.0">>, <<"ledger-device">> => <<"faff@1.0">> } }`
     return !legacy
-      ? `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_store} }).`
-      : `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_store}${_bundler}${_routes} }).`
+      ? `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_store}${_on} }).`
+      : `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_store}${_faff}${_bundler}${_routes}${_on}${_p4_non_chargeable}${_operator}${_spp} }).`
   }
 
   kill() {

package/esm/server.js

@@ -47,7 +47,6 @@ class Server {
     this.launch("AR", app, {
       get: [
         "/",
-        "/tx",
         "/wallet/:id/balance",
         "/mint/:id/:amount",
         "/tx/:id/offset",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"