wao 0.5.6 → 0.6.0

package/esm/ar.js

@@ -2,7 +2,7 @@ import _Arweave from "arweave"
 const Arweave = _Arweave.default ?? _Arweave
 import { ArweaveSigner, bundleAndSignData, createData } from "arbundles"
 import { buildTags, tag, isLocalhost } from "./utils.js"
-import { is } from "ramda"
+import { is, isNil } from "ramda"
 import GQL from "./gql.js"
 
 class AR {
@@ -258,9 +258,15 @@ class AR {
     return (await this.gql.txs({ id: txid }))[0] ?? null
   }
 
-  async data(txid, string = false) {
+  async data(txid, _string = false) {
+    let decode = true
+    let string = _string
+    if (is(Object, _string)) {
+      if (!isNil(_string.decode)) decode = _string.decode
+      if (!isNil(_string.string)) string = _string.string
+    }
     const _data = await this.arweave.transactions.getData(txid, {
-      decode: true,
+      decode,
       string,
     })
     return _data

package/esm/armem.js

@@ -50,6 +50,7 @@ export default class ArMem {
           "Output-Encoding": "JSON-V1",
           "Memory-Limit": "1-gb",
           "Compute-Limit": "9000000000000",
+          Extension: "WeaveDrive",
         }),
       }
     }

package/esm/gql.js

@@ -1,6 +1,6 @@
 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 = `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 } bundledIn { id }`
 const full_blocks = `id timestamp height previous`
 
 const subs = {
@@ -11,6 +11,7 @@ const subs = {
   tags: ["name", "value"],
   block: ["id", "timestamp", "height", "previous"],
   parent: ["id"],
+  bundledIn: ["id"],
 }
 const field = (key, val = true) => {
   if (includes(key, ["id", "anchor", "signature", "recipient"])) {
@@ -98,8 +99,11 @@ const query = (opt = {}) => {
   }
   if (opt.first) cond.push(`first: ${opt.first}`)
   if (opt.after) cond.push(`after: "${opt.after}"`)
-  if (opt.asc) cond.push(`sort: HEIGHT_ASC`)
-
+  if (opt.asc) {
+    cond.push(`sort: HEIGHT_ASC`)
+  } else {
+    cond.push(`sort: HEIGHT_DESC`)
+  }
   let _cond = ""
   if (cond.length > 0) _cond = `(${cond.join(", ")})`
   let fields = []
@@ -124,6 +128,7 @@ const query = (opt = {}) => {
   let _fields = fields.length > 0 ? fields.join(" ") : full
   return `query {
   transactions ${_cond}{
+    pageInfo { hasNextPage }
     edges { cursor node { ${_fields} } }
   }
 }`
@@ -176,6 +181,7 @@ const query_blocks = (opt = {}) => {
   let _fields = fields.length > 0 ? fields.join(" ") : full_blocks
   return `query {
   blocks ${_cond}{
+    pageInfo { hasNextPage }
     edges { cursor node { ${_fields} } }
   }
 }`
@@ -191,13 +197,16 @@ export default class GQL {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ query }),
     }).then(r => r.json())
-    return map(v => ({ cursor: v.cursor, ...v.node }))(json.data[tar].edges)
+    return {
+      isNext: json.data[tar].pageInfo.hasNextPage,
+      data: map(v => ({ cursor: v.cursor, ...v.node }))(json.data[tar].edges),
+    }
   }
   async fetch(opt = {}, query, tar = "transactions") {
-    const data = await this._fetch(query, tar)
+    const { isNext, data } = await this._fetch(query, tar)
     if (opt.next === true) {
       let cursor = null
-      if (data.length > 0) cursor = last(data).cursor
+      if (isNext && data.length > 0) cursor = last(data).cursor
       const next = !cursor
         ? null
         : async () => {

package/esm/helpers.js

@@ -22,6 +22,13 @@ export class Src {
     this.dir = dir
     if (!dir) dirname().then(v => (this.dir = resolve(v, "lua")))
   }
+  async init(dir) {
+    if (!this.dir) {
+      dir ??= await dirname()
+      this.dir = resolve(dir, "lua")
+    }
+    return this
+  }
   data(file, ext = "lua") {
     return readFileSync(
       `${this.dir}/${file}.${ext}`,
@@ -34,6 +41,47 @@ export class Src {
   }
 }
 
+export class Testnet {
+  constructor({ port = 4000, arweave, aoconnect, docker = false } = {}) {
+    this.docker = docker
+    this.arweave = arweave ?? { port }
+    this.aoconnect = aoconnect ?? {
+      MU_URL: `http://localhost:${port + 2}`,
+      SU_URL: `http://localhost:${port + 3}`,
+      CU_URL: `http://localhost:${port + 4}`,
+      GATEWAY_URL: `http://localhost:${port}`,
+    }
+    this.ar = new AR(this.arweave)
+  }
+  async init(jwk) {
+    this.authority = (
+      await fetch(this.aoconnect.SU_URL).then(r => r.json())
+    ).address
+    this.src = await new Src({ ar: this.ar }).init()
+    await this.ar.init(jwk)
+    this.jwk = this.ar.jwk
+    this.addr = this.ar.a
+    this.gql = this.ar.gql
+    this.module_src = await this.src.upload("aos2_0_1", "wasm")
+    this.ao = await new AO({
+      ar: this.ar,
+      aoconnect: this.aoconnect,
+      authority: this.authority,
+    }).init(this.ar.jwk)
+    const { id } = await this.ao.postModule({
+      data: await this.ar.data(this.module_src),
+      overwrite: true,
+    })
+    this.module = id
+    const { scheduler } = await this.ao.postScheduler({
+      url: this.docker ? "http://su" : this.aoconnect.SU_URL,
+      overwrite: true,
+    })
+    this.scheduler = scheduler
+    return this
+  }
+}
+
 export const setup = async ({
   aoconnect,
   arweave,
@@ -61,7 +109,7 @@ export const setup = async ({
 
   if (opt) {
     const ar = await new AR(opt.ar).init(opt.jwk)
-    const src = new Src({ ar, readFileSync, dir })
+    const src = new Src({ ar, dir })
     const ao = await new AO(opt.ao).init(opt.jwk)
     const ao2 = await new AO(opt.ao2).init(opt.jwk)
     console.log("cache:\t", optPath)
@@ -78,7 +126,7 @@ export const setup = async ({
   }
   const ar = new AR(arweave)
   await ar.gen("10")
-  const src = new Src({ ar, readFileSync, dir })
+  const src = new Src({ ar, dir })
   opt = { ar: { ...arweave }, jwk: ar.jwk }
   if (!auth && /localhost/.test(aoconnect?.CU_URL ?? "")) {
     auth = (await fetch(aoconnect.CU_URL).then(r => r.json())).address

package/esm/run.js

@@ -2,6 +2,6 @@
 
 import Server from "./server.js"
 
-const main = async () => new Server()
+const main = async () => new Server({ log: true })
 
 main()

package/esm/server.js

@@ -2,176 +2,21 @@ import express from "express"
 import cors from "cors"
 import base64url from "base64url"
 import { DataItem } from "arbundles"
-import { tags } from "./utils.js"
+import { tags, toGraphObj } from "./utils.js"
 import { connect } from "./aoconnect.js"
 import { GQL, cu, su, mu } from "./test.js"
 import bodyParser from "body-parser"
-import { graphql, parse, validate, buildSchema } from "graphql"
 import { keys, map, reverse } from "ramda"
-const schema = buildSchema(`
-  schema {
-    query: Query
-  }
-
-  type Query {
-    transactions(
-      ids: [ID!]
-      tags: [TagFilter!]
-      block: BlockFilter
-      after: String
-      first: Int
-    ): TransactionConnection!
-
-    block(id: ID, height: Int): Block
-  }
-
-  type TransactionConnection {
-    edges: [TransactionEdge!]!
-    pageInfo: PageInfo!
-  }
-
-  type TransactionEdge {
-    cursor: String!
-    node: Transaction!
-  }
-
-  type Transaction {
-    id: ID!
-    anchor: String
-    signature: String!
-    recipient: String
-    owner: Owner!
-    fee: Quantity!
-    quantity: Quantity!
-    data: Data!
-    tags: [Tag!]!
-    block: Block
-    parent: Transaction
-  }
-
-  type Owner {
-    address: String!
-    key: String!
-  }
-
-  type Quantity {
-    winston: String!
-    ar: String!
-  }
-
-  type Data {
-    size: String!
-    type: String
-  }
-
-  type Tag {
-    name: String!
-    value: String!
-  }
-
-  type Block {
-    id: ID!
-    timestamp: Int!
-    height: Int!
-    previous: String
-    transactions: [Transaction!]!
-    miner: String!
-    reward: String!
-    tags: [Tag!]!
-    indepHash: String!
-    nonce: String!
-  }
-
-  type PageInfo {
-    hasNextPage: Boolean!
-  }
-
-  input TagFilter {
-    name: String!
-    values: [String!]!
-  }
-
-  input BlockFilter {
-    min: Int
-    max: Int
-  }
-`)
-
-const root = {
-  transactions: ({ first }) => ({
-    edges: [],
-    pageInfo: {
-      hasNextPage: false,
-    },
-  }),
-  block: ({ id }) => ({
-    id,
-    timestamp: Date.now(),
-    height: 123456,
-    previous: "previous-block-id",
-    transactions: [],
-    miner: "example-miner",
-    reward: "1000",
-    tags: [],
-    indepHash: "example-indep-hash",
-    nonce: "000000",
-  }),
-}
-
-const mapParsed = (parsedQuery, variables) => {
-  const operation = parsedQuery.definitions[0]
-
-  if (operation.operation !== "query") {
-    throw new Error("Only 'query' operations are supported.")
-  }
-
-  const rootField = operation.selectionSet.selections[0]
-  const rootFieldName = rootField.name.value
-
-  const parseArgumentValue = argValue => {
-    if (argValue.kind === "Variable") {
-      return variables[argValue.name.value]
-    }
-
-    if (argValue.kind === "ListValue") {
-      return argValue.values.map(value => parseArgumentValue(value))
-    }
-
-    if (argValue.kind === "ObjectValue") {
-      return argValue.fields.reduce((obj, field) => {
-        obj[field.name.value] = parseArgumentValue(field.value)
-        return obj
-      }, {})
-    }
-
-    return argValue.value
-  }
-
-  const args = rootField.arguments.reduce((acc, arg) => {
-    acc[arg.name.value] = parseArgumentValue(arg.value)
-    return acc
-  }, {})
-
-  const extractFields = selectionSet => {
-    return selectionSet.selections.map(selection => {
-      const fieldName = selection.name.value
-
-      if (selection.selectionSet) {
-        return {
-          [fieldName]: extractFields(selection.selectionSet),
-        }
-      }
-      return fieldName
-    })
-  }
-
-  const fields = extractFields(rootField.selectionSet)
-
-  return { rootFieldName, args, fields }
-}
 
 class Server {
-  constructor({ ar = 4000, mu = 4002, su = 4003, cu = 4004, aoconnect } = {}) {
+  constructor({
+    ar = 4000,
+    mu = 4002,
+    su = 4003,
+    cu = 4004,
+    aoconnect,
+    log = false,
+  } = {}) {
     const {
       ar: _ar,
       message,
@@ -182,7 +27,7 @@ class Server {
       mem,
       monitor,
       unmonitor,
-    } = connect(aoconnect)
+    } = connect(aoconnect, log)
     this.monitor = monitor
     this.unmonitor = unmonitor
     this.spawn = spawn
@@ -207,7 +52,7 @@ class Server {
     app.get("/wallet/:id/balance", (req, res) => res.send("0"))
     app.get("/mint/:id/:amount", (req, res) => res.json({ id: "0" }))
     app.get("/tx/:id/offset", async (req, res) => {
-      res.status(500)
+      res.status(400)
       res.send(null)
     })
     app.get("/tx_anchor", async (req, res) => {
@@ -229,26 +74,24 @@ class Server {
       res.send("0")
     })
     app.post("/graphql", async (req, res) => {
-      const { query, variables } = req.body
-      const parsedQuery = parse(query)
-      const errors = validate(schema, parsedQuery)
-      const parsed = mapParsed(parsedQuery, variables)
-      const tar = parsed.rootFieldName
-      const fields = parsed.fields[0].edges[0].node
-      const args = parsed.args
-      if (args.tags) {
-        let _tags = {}
-        for (const v of args.tags) _tags[v.name] = v.values
-        args.tags = _tags
-      }
-      let res2 = null
-      if (tar === "transactions") {
-        res2 = await this.gql.txs({ ...args })
-      } else if (tar === "blocks") {
-        res2 = await this.gql.blocks()
+      try {
+        const { query, variables } = req.body
+        const { tar, args } = toGraphObj({ query, variables })
+        let res2 = null
+        if (tar === "transactions") {
+          res2 = await this.gql.txs({ ...args })
+        } else if (tar === "blocks") {
+          res2 = await this.gql.blocks({ ...args })
+        }
+        const edges = map(v => ({ node: v, cursor: v.cursor }), res2)
+        res.json({
+          data: { transactions: { pageInfo: { hasNextPage: true }, edges } },
+        })
+      } catch (e) {
+        console.log(e)
+        res.status(400)
+        res.json({ error: "bad request" })
       }
-      const edges = map(v => ({ node: v, cursor: v.cursor }), res2)
-      res.json({ data: { transactions: { edges } } })
     })
     let data = {}
     app.post("/:id", async (req, res) => {
@@ -325,7 +168,7 @@ class Server {
         err = true
       }
       if (err) {
-        res.status(500)
+        res.status(400)
         res.send({ err })
       } else {
         res.send({ id: item.id })
@@ -407,7 +250,7 @@ class Server {
       const { Id: id, Owner: owner, Tags: tags, Data: data } = req.body
       const res2 = await this.dryrun({ id, owner, tags, data, process })
       if (!res2) {
-        res.status(500)
+        res.status(400)
         res.json({ err: true })
       } else {
         delete res2.Memory

package/esm/tao.js

@@ -77,7 +77,7 @@ class AO extends MAO {
     this.message = message
     this.spawn = async (...opt) => {
       const res = await spawn(...opt)
-      //await this.load({ data: log, pid: res })
+      await this.load({ data: log, pid: res })
       return res
     }
     this.dryrun = async (...opt) => {
@@ -111,11 +111,13 @@ class AO extends MAO {
       "Memory-Limit": "1-gb",
       "Compute-Limit": "9000000000000",
     })
-
-    const _tags = buildTags(null, t)
     const signer = createDataItemSigner(jwk)
-    const { id, owner } = await this.ar.dataitem({ tags: _tags, data, signer })
-    await this.ar.post({ data, tags: t, jwk })
+    const { id, owner, item } = await this.ar.dataitem({
+      tags: t,
+      data,
+      signer,
+    })
+    await this.ar.postItems(item, jwk)
     this.mem.wasms[id] = { data, format: t["Module-Format"] }
     return { id }
   }