wao 0.4.0 → 0.4.1

package/cjs/utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isData = exports.isCheckComplete = exports.getTagVal = exports.getTag = exports.dirname = exports.checkTag = exports.buildTags = exports.action = void 0;
 exports.isJSON = isJSON;
-exports.wait = exports.validAddress = exports.udl = exports.tags = exports.tagEq = exports.tag = exports.srcs = exports.searchTag = exports.query = exports.queries = exports.mergeOut = exports.mergeChecks = exports.ltags = exports.jsonToStr = exports.isRegExp = exports.isOutComplete = exports.isLocalhost = void 0;
+exports.wait = exports.validAddress = exports.udl = exports.tags = exports.tagEq = exports.tag = exports.srcs = exports.searchTag = exports.mergeOut = exports.mergeChecks = exports.ltags = exports.jsonToStr = exports.isRegExp = exports.isOutComplete = exports.isLocalhost = void 0;
 var _ramda = require("ramda");
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -207,12 +207,6 @@ var isData = exports.isData = function isData(data, res) {
   }
   return false;
 };
-var query = exports.query = function query(txid) {
-  return "query {\n  transactions(ids: [\"".concat(txid, "\"]) {\n    edges { node { id tags { name value } owner { address } } }\n  }\n}");
-};
-var queries = exports.queries = function queries(to) {
-  return "query {\n  transactions (recipients: [\"".concat(to, "\"]){\n    edges { node { id recipient tags { name value } owner { address } } }\n  }\n}");
-};
 var isLocalhost = exports.isLocalhost = function isLocalhost(v) {
   return (0, _ramda.includes)(v, ["localhost", "127.0.0.1"]);
 };

package/esm/ao.js

@@ -384,7 +384,10 @@ class AO {
         let ex = exRef(ref, txs)
         if (!ex) {
           if (!this.in_memory) await wait(1000)
-          txs = await this.ar.txs(pid)
+          txs = await this.ar.gql.txs({
+            recipient: pid,
+            fields: ["id", "recipient", "tags", { owner: ["address"] }],
+          })
           ex = exRef(ref, txs)
         }
         if (ex) return txs

package/esm/aoconnect.js

@@ -214,6 +214,7 @@ export const connect = mem => {
       data: _opt.data,
       signer: _opt.signer,
       tags: tags(_opt.tags),
+      target: opt.process,
     })
     await ar.postItem(item, su.jwk)
     try {
@@ -265,8 +266,8 @@ export const connect = mem => {
       data: opt.data,
       signer: opt.signer,
       tags: tags(opt.tags),
+      target: opt.process,
     })
-
     await ar.postItem(item, su.jwk)
     try {
       const msg = genMsg(
@@ -372,7 +373,7 @@ export const connect = mem => {
     },
     dryrun: async opt => {
       const p = mem.env[opt.process]
-      const { id, owner } = await ar.dataitem(opt)
+      const { id, owner } = await ar.dataitem({ ...opt, target: opt.process })
       try {
         const msg = genMsg(p, opt.data ?? "", opt.tags, owner, mu.addr, true)
         const _env = genEnv({

package/esm/ar.js

@@ -1,14 +1,15 @@
 import Arweave from "arweave"
 import { ArweaveSigner, bundleAndSignData, createData } from "arbundles"
-import { buildTags, tag, query, queries, isLocalhost } from "./utils.js"
+import { buildTags, tag, isLocalhost } from "./utils.js"
 import { is } from "ramda"
+import GQL from "./gql.js"
 
 class AR {
   constructor({ host, port = 443, protocol } = {}) {
     this.__type__ = "ar"
     let _arweave = { host, port, protocol }
     if (!_arweave.host)
-      _arweave.host = port === 443 ? "arweave.net" : "127.0.0.1"
+      _arweave.host = port === 443 ? "arweave.net" : "localhost"
     if (!_arweave.protocol)
       _arweave.protocol = isLocalhost(_arweave.host) ? "http" : "https"
     if (!_arweave.port) _arweave.port = isLocalhost(_arweave.host) ? 1984 : 443
@@ -16,6 +17,9 @@ class AR {
     this.host = _arweave.host
     this.protocol = _arweave.protocol
     this.arweave = Arweave.init(_arweave)
+    this.gql = new GQL({
+      url: `${_arweave.protocol}://${_arweave.host}:${_arweave.port}/graphql`,
+    })
   }
 
   isArConnect(jwk) {
@@ -211,27 +215,7 @@ class AR {
   }
 
   async tx(txid) {
-    const json = await fetch(
-      `${this.protocol}://${this.host}:${this.port}/graphql`,
-      {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ query: query(txid) }),
-      },
-    ).then(r => r.json())
-    return json.data.transactions.edges.map(v => v.node)[0] ?? null
-  }
-
-  async txs(to) {
-    const json = await fetch(
-      `${this.protocol}://${this.host}:${this.port}/graphql`,
-      {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ query: queries(to) }),
-      },
-    ).then(r => r.json())
-    return json.data.transactions.edges.map(v => v.node)
+    return (await this.gql.txs({ id: txid }))[0] ?? null
   }
 
   async data(txid, string = false) {

package/esm/armem.js

@@ -6,12 +6,16 @@ export default class ArMem {
     this.__type__ = "mem"
     this.arweave = Arweave.init()
     this.arweave.transactions.getTransactionAnchor = () => {
-      return this.blocks.length === 0 ? "" : last(this.blocks)
+      return this.blocks.length === 0
+        ? ""
+        : last(this.blockmap[last(this.blocks)].txs)
     }
     this.arweave.transactions.getPrice = () => 0
     this.txs = {}
+    this.jwks = {}
     this.height = 0
     this.blocks = []
+    this.blockmap = {}
     this.env = {}
     this.modules = {
       aos2_0_1: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",

package/esm/gql.js

@@ -1,4 +1,5 @@
 import { includes, map, is, isNil, last, clone } from "ramda"
+
 const full = `id anchor signature recipient owner { address key } fee { winston ar } quantity { winston ar } data { size type } tags { name value } block { id timestamp height previous } parent { id }`
 const full_blocks = `id timestamp height previous`
 

package/esm/tar.js

@@ -3,25 +3,20 @@ import { buildTags } from "./utils.js"
 import { DataItem } from "warp-arbundles"
 import base64url from "base64url"
 import ArMem from "./armem.js"
-
+import GQL from "./tgql.js"
+import { last } from "ramda"
 class AR extends MAR {
   constructor(opt = {}) {
     super({ ...opt, in_memory: true })
     this.in_memory = true
     this.mem = opt.mem ?? new ArMem()
+    this.gql = new GQL({ mem: this.mem })
+    this.arweave = this.mem.arweave
   }
 
-  async txs(pid) {
-    let _txs = []
-    for (let v of this.mem.env[pid].txs) {
-      _txs.push({ tags: v.tags, id: v.id })
-    }
-    return _txs
-  }
-
-  async dataitem({ data = "1984", tags = {}, signer }) {
+  async dataitem({ target = "", data = "1984", tags = {}, signer }) {
     const _tags = buildTags(tags)
-    const item = await signer({ data, tags: _tags })
+    const item = await signer({ data, tags: _tags, target })
     const di = new DataItem(item.raw)
     const raw_owner = di.rawOwner
     const hashBuffer = Buffer.from(
@@ -35,18 +30,16 @@ class AR extends MAR {
     let tx = await this.arweave.createTransaction({ data: data })
     let _tags = buildTags(null, tags)
     for (const v of _tags) tx.addTag(v.name, v.value)
-    this.mem.height += 1
     return await this.postTx(tx, jwk, {
-      height: this.mem.height,
+      recipient: "",
       tags: _tags,
       data,
+      owner: await this.arweave.wallets.jwkToAddress(jwk),
     })
   }
 
   async postItem(item, jwk) {
-    const tx = await this.mem.arweave.createTransaction({
-      data: item.raw,
-    })
+    const tx = await this.mem.arweave.createTransaction({ data: item.raw }, jwk)
     tx.addTag("Bundle-Format", "binary")
     tx.addTag("Bundle-Version", "2.0.0")
     const di = new DataItem(item.raw)
@@ -55,34 +48,49 @@ class AR extends MAR {
       await crypto.subtle.digest("SHA-256", rowner),
     )
     const owner = base64url.encode(hashBuffer)
-    this.mem.height += 1
     let data = di.data
     try {
       data = base64url.decode(di.data)
     } catch (e) {}
-    this.mem.txs[item.id] = {
+    let _item = {
+      recipient: di.target,
       id: item.id,
       item: di,
       owner,
-      height: this.mem.height,
       tags: di.tags,
       data,
     }
-    this.mem.blocks.push(item.id)
-    return await this.postTx(tx, jwk)
+    this.mem.txs[item.id] = _item
+    return await this.postTx(tx, jwk, _item)
   }
 
   async postTx(tx, jwk, item) {
     let [res, err] = [null, null]
     await this.mem.arweave.transactions.sign(tx, jwk)
     if (item) {
-      if (!item.id) item.id = tx.id
-      this.mem.txs[item.id] = item
-      this.mem.blocks.push(item.id)
+      this.mem.height += 1
+
+      const block = {
+        id: tx.id,
+        timestamp: Date.now(),
+        height: this.mem.height,
+        previous: last(this.mem.blocks) ?? "",
+      }
+
+      if (!item.id) {
+        item.id = tx.id
+        this.mem.txs[item.id] = item
+        this.mem.txs[item.id].parent = { id: block.id }
+      } else {
+        this.mem.txs[item.id].parent = { id: "" }
+      }
+      block.txs = [item.id]
+      this.mem.txs[item.id].block = block.id
+      this.mem.txs[item.id].parent = { id: block.id }
+      this.mem.blocks.push(block.id)
+      this.mem.blockmap[block.id] = block
     }
     res = { id: tx.id, status: 200, statusText: "200" }
-    //res = await this.arweave.transactions.post(tx)
-    //if (res.status !== 200) err = res.statusText
     return { res, err, id: tx.id }
   }
 

package/esm/tgql.js

@@ -0,0 +1,282 @@
+import { reverse, includes, map, is, isNil, last, clone, pick } from "ramda"
+
+const subs = {
+  owner: ["address", "key"],
+  fee: ["winston", "ar"],
+  quantity: ["winston", "ar"],
+  data: ["size", "type"],
+  tags: ["name", "value"],
+  block: ["id", "timestamp", "height", "previous"],
+  parent: ["id"],
+}
+const field = (key, val = true) => {
+  if (includes(key, ["id", "anchor", "signature", "recipient"])) {
+    return { key }
+  } else if (subs[key]) {
+    let _subs = []
+    if (val === true) val = subs[key]
+    else if (is(Object, val) && !is(Array, val)) {
+      let _val = []
+      let isTrue = false
+      let isFalse = false
+      for (const k in val)
+        if (val[k] === true) isTrue = true
+        else if (val[k] === false) isFalse = true
+      if (!isTrue && isFalse) {
+        for (const k of subs[key]) if (val[k] !== false) _val.push(k)
+      } else {
+        for (const k in val) if (val[k] === true) _val.push(k)
+      }
+      val = _val
+    } else if (!is(Array, val)) val = subs[key]
+    for (const v2 of val) {
+      if (is(String, v2) && includes(v2, subs[key])) _subs.push(v2)
+    }
+    if (_subs.length === 0) return null
+    return { key, subs: _subs }
+  }
+  return null
+}
+
+const field_blocks = (key, val = true) => {
+  if (includes(key, ["id", "timestamp", "height", "previous"])) {
+    return { key }
+  }
+  return null
+}
+
+export default class GQL {
+  constructor({ mem }) {
+    this.mem = mem
+  }
+  async txs(opt = {}) {
+    let block_max = null
+    let block_min = null
+    let _block = {}
+    if (is(Number, opt.block)) {
+      _block = { min: opt.block, max: opt.block }
+    } else if (is(Array, opt.block) && opt.block.length > 0) {
+      _block = {}
+      if (!isNil(opt.block[0])) _block.min = opt.block[0]
+      if (!isNil(opt.block[1])) _block.max = opt.block[1]
+    }
+    let first = opt.first ?? 20
+    let tags = []
+    for (const k in opt.tags ?? {}) {
+      if (is(String, opt.tags[k])) {
+        tags.push({ name: k, values: [opt.tags[k]] })
+      } else if (is(Array, opt.tags[k])) {
+        tags.push({ name: k, values: opt.tags[k] })
+      }
+    }
+    let recipients = null
+    if (is(Array, opt.recipients)) recipients = opt.recipients
+    else if (is(String, opt.recipient)) recipients = [opt.recipient]
+
+    let owners = null
+    if (is(Array, opt.owners)) owners = opt.owners
+    else if (is(String, opt.owner)) owners = [opt.owner]
+
+    let ids = null
+    if (is(Array, opt.ids)) ids = opt.ids
+    else if (is(String, opt.id)) ids = [opt.id]
+
+    let data = []
+    let blocks = this.mem.blocks
+    if (opt.asc !== true) blocks = reverse(blocks)
+    let count = 0
+    let after = false
+    for (const v of blocks) {
+      const block = clone(this.mem.blockmap[v])
+      if (!isNil(_block.min) && block.height < _block.min) continue
+      if (!isNil(_block.max) && block.height > _block.max) continue
+      let txs = block.txs
+      if (opt.asc !== true) txs = reverse(txs)
+      for (const v2 of txs) {
+        if (!isNil(opt.after) && opt.after === v2) {
+          after = true
+          break
+        }
+        if (!isNil(opt.after) && count === 0 && !after) continue
+        let tx = this.mem.txs[v2]
+        if (!isNil(ids) && ids.length > 0) {
+          if (!includes(tx.id, ids)) continue
+        }
+        if (!isNil(owners) && owners.length > 0) {
+          if (!includes(tx.owner, owners)) continue
+        }
+
+        if (!isNil(recipients) && recipients.length > 0) {
+          if (!includes(tx.recipient, recipients)) continue
+        }
+        let tag_unmatch = false
+        for (const v of tags) {
+          let ex = false
+          for (const v2 of tx.tags) {
+            if (v2.name === v.name && includes(v2.value, v.values)) {
+              ex = true
+              break
+            }
+          }
+          if (!ex) {
+            tag_unmatch = true
+            break
+          }
+        }
+        if (tag_unmatch) continue
+        let _tx = {
+          cursor: tx.id,
+          ...tx,
+          block: pick(["id", "timestamp", "height", "previous"], block),
+          anchor: tx.anchor ?? "",
+          signature: tx.signature ?? "",
+          owner: { address: tx.owner, key: "" },
+          fee: { ar: 0, winston: 0 },
+          quantity: { ar: 0, winston: 0 },
+          data: { size: 0, type: "" },
+        }
+        if (!isNil(opt.fields)) {
+          let _tx2 = { cursor: tx.id }
+          let fields = []
+          if (is(Array, opt.fields) && opt.fields.length > 0) {
+            for (const v of opt.fields) {
+              if (is(String, v)) {
+                const fld = field(v)
+                if (fld) fields.push(fld)
+              } else if (is(Object, v) && !is(Array, v)) {
+                for (const k in v) {
+                  const fld = field(k, v[k])
+                  if (fld) fields.push(fld)
+                }
+              }
+            }
+          } else if (is(Object, opt.fields) && !is(Array, opt.fields)) {
+            for (const k in opt.fields) {
+              const fld = field(k, opt.fields[k])
+              if (fld) fields.push(fld)
+            }
+          }
+          for (const f of fields) {
+            if (isNil(f.subs)) {
+              _tx2[f.key] = _tx[f.key] ?? ""
+            } else {
+              let subs = {}
+              _tx2[f.key] = {}
+              if (is(Array, _tx[f.key])) {
+                _tx2[f.key] = map(pick(f.subs))(_tx[f.key])
+              } else {
+                for (const f2 of f.subs) {
+                  _tx2[f.key][f2] = _tx[f.key][f2] ?? ""
+                }
+              }
+            }
+          }
+          _tx = _tx2
+        }
+        data.push(_tx)
+        count += 1
+        if (count >= first) break
+      }
+      if (count >= first) break
+    }
+    if (opt.next === true) {
+      let cursor = null
+      if (data.length > 0) cursor = last(data).cursor
+      const next = !cursor
+        ? null
+        : async () => {
+            let _opt = clone(opt)
+            _opt.after = cursor
+            return await this.txs(_opt)
+          }
+      return { data, next }
+    } else {
+      return data
+    }
+  }
+  async blocks(opt = {}) {
+    let block_max = null
+    let block_min = null
+    let _block = {}
+    if (is(Number, opt.block)) {
+      _block = { min: opt.block, max: opt.block }
+    } else if (is(Array, opt.block) && opt.block.length > 0) {
+      _block = {}
+      if (!isNil(opt.block[0])) _block.min = opt.block[0]
+      if (!isNil(opt.block[1])) _block.max = opt.block[1]
+    }
+    let first = opt.first ?? 20
+
+    let ids = null
+    if (is(Array, opt.ids)) ids = opt.ids
+    else if (is(String, opt.id)) ids = [opt.id]
+
+    let data = []
+    let blocks = this.mem.blocks
+    if (opt.asc !== true) blocks = reverse(blocks)
+    let count = 0
+    let after = false
+    for (const v of blocks) {
+      let block = clone({ ...this.mem.blockmap[v], cursor: v })
+      delete block.txs
+      if (!isNil(_block.min) && block.height < _block.min) continue
+      if (!isNil(_block.max) && block.height > _block.max) continue
+      if (!isNil(ids) && ids.length > 0) if (!includes(v.id, ids)) continue
+      if (!isNil(opt.fields)) {
+        let block2 = { cursor: block.id }
+        let fields = []
+        if (is(Array, opt.fields) && opt.fields.length > 0) {
+          for (const v of opt.fields) {
+            if (is(String, v)) {
+              const fld = field_blocks(v)
+              if (fld) fields.push(fld)
+            } else if (is(Object, v) && !is(Array, v)) {
+              for (const k in v) {
+                const fld = field_blocks(k, v[k])
+                if (fld) fields.push(fld)
+              }
+            }
+          }
+        } else if (is(Object, opt.fields) && !is(Array, opt.fields)) {
+          for (const k in opt.fields) {
+            const fld = field_blocks(k, opt.fields[k])
+            if (fld) fields.push(fld)
+          }
+        }
+        for (const f of fields) {
+          if (isNil(f.subs)) {
+            block2[f.key] = block[f.key] ?? ""
+          } else {
+            let subs = {}
+            block2[f.key] = {}
+            if (is(Array, block[f.key])) {
+              block2[f.key] = map(pick(f.subs))(block[f.key])
+            } else {
+              for (const f2 of f.subs) {
+                block2[f.key][f2] = block[f.key][f2] ?? ""
+              }
+            }
+          }
+        }
+        block = block2
+      }
+      data.push(block)
+      count += 1
+      if (count >= first) break
+    }
+    if (opt.next === true) {
+      let cursor = null
+      if (data.length > 0) cursor = last(data).cursor
+      const next = !cursor
+        ? null
+        : async () => {
+            let _opt = clone(opt)
+            _opt.after = cursor
+            return await this.txs(_opt)
+          }
+      return { data, next }
+    } else {
+      return data
+    }
+  }
+}

package/esm/utils.js

@@ -91,18 +91,6 @@ const isData = (data, res) => {
   return false
 }
 
-const query = txid => `query {
-  transactions(ids: ["${txid}"]) {
-    edges { node { id tags { name value } owner { address } } }
-  }
-}`
-
-const queries = to => `query {
-  transactions (recipients: ["${to}"]){
-    edges { node { id recipient tags { name value } owner { address } } }
-  }
-}`
-
 const isLocalhost = v => includes(v, ["localhost", "127.0.0.1"])
 
 const udl = ({ payment, access, derivations, commercial, training }) => {
@@ -315,8 +303,6 @@ export {
   srcs,
   getTagVal,
   isData,
-  query,
-  queries,
   getTag,
   tagEq,
   searchTag,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",