wao 0.10.1 → 0.10.2

package/esm/aoconnect-base.js

@@ -14,7 +14,7 @@ import {
   dirname,
 } from "./utils.js"
 import weavedrive from "./weavedrive.js"
-import { is, clone, fromPairs, map, mergeLeft, isNil } from "ramda"
+import { is, clone, fromPairs, map, mergeLeft, isNil, dissoc, o } from "ramda"
 
 export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
   return (mem, { cache, log = false, extensions = {} } = {}) => {
@@ -70,12 +70,12 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       return {
         Process: {
           Id: pid,
-          Tags: (await mem.get("txs", pid))?.tags ?? [],
+          Tags: (await mem.getTx(pid))?.tags ?? [],
           Owner: owner,
         },
         Module: {
           Id: module,
-          Tags: (await mem.get("txs", module))?.tags ?? [],
+          Tags: (await mem.getTx(module))?.tags ?? [],
         },
       }
     }
@@ -124,7 +124,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           format,
           WeaveDrive: wdrive,
           spawn: item,
-          module: await mem.get("txs", mod),
+          module: await mem.getTx(mod),
         })
       } catch (e) {}
       if (!handle) return null
@@ -136,7 +136,6 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       let memory = opt.memory ?? null
       let p = {
         extension: ext,
-        item: item?.binary,
         format,
         id: id,
         epochs: [],
@@ -146,10 +145,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         memory,
         owner,
         height: 0,
-        res: { [id]: res },
+        //res: { [id]: res },
         results: [id],
-        txs: [],
-        opt,
       }
       if (memory) {
         // forking...
@@ -166,11 +163,12 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         res = await _module.handle(null, msg, _env)
         p.memory = res.Memory
         delete res.Memory
-        p.res[id] = res
+        //p.res[id] = res
       } else {
         p.height += 1
       }
-      await mem.set(opt, "msgs", id)
+      const _msg = { ...o(dissoc("signer"), dissoc("memory"))(opt), res }
+      await mem.set(_msg, "msgs", id)
       if (_tags["Cron-Interval"]) {
         let [num, unit] = _tags["Cron-Interval"].split("-")
         let int = 0
@@ -285,19 +283,19 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           p.handle = await AoLoader(wasm, {
             format,
             WeaveDrive: wdrive,
-            spawn: new DataItem(p.item),
-            module: await mem.get("txs", mod),
+            spawn: (await mem.getTx(p.id)).item,
+            module: await mem.getTx(mod),
           })
           mem.env[opt.process].handle = p.handle
         }
         const res = await p.handle(p.memory, msg, _env)
         p.memory = res.Memory
         delete res.Memory
-        p.res[opt.message] = res
+        //p.res[opt.message] = res
         p.results.push(opt.message)
-        p.txs.unshift({ id, ...opt })
         await mem.set(p, "env", opt.process)
-        await mem.set(_opt, "msgs", opt.message)
+        const _msg = { ...dissoc("signer", _opt), res }
+        await mem.set(_msg, "msgs", opt.message)
         for (const v of res.Messages ?? []) {
           if (await mem.get("env", v.Target)) {
             await message({
@@ -361,7 +359,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         if (opt.for) {
           opt.tags.push({ name: "Pushed-For", value: opt.for })
           opt.tags.push({ name: "From-Process", value: opt.from })
-          const pr = (await mem.get("txs", opt.from))?.tags ?? []
+          const pr = (await mem.getTx(opt.from))?.tags ?? []
           const module = tags(pr).Module
           if (module) opt.tags.push({ name: "From-Module", value: module })
         }
@@ -372,7 +370,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           target: opt.process,
         }))
       }
-      await mem.set(opt, "msgs", id)
+      const _msg = dissoc("signer", opt)
+      await mem.set(_msg, "msgs", id)
       await assign({
         message_item: item,
         message: id,
@@ -408,20 +407,22 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       spawn,
       assign,
       ar,
-      result: async opt =>
-        (await mem.get("env", opt.process))?.res[opt.message],
+      result: async opt => (await mem.get("msgs", opt.message))?.res,
       results: async opt => {
         const p = await mem.get("env", opt.process)
         let results = []
         const limit = opt.limit ?? 25
         if (opt.sort === "DESC") {
           for (let i = p.results.length - 1; 0 < i; i--) {
-            results.push({ cursor: p.results[i], node: p.res[p.results[i]] })
+            results.push({
+              cursor: p.results[i],
+              node: await this.result(p.results[i]),
+            })
             if (results.length >= limit) break
           }
         } else {
           for (let i = 0; i < p.results.length; i++) {
-            results.push({ node: p.res[p.results[i]] })
+            results.push({ node: await this.result(p.results[i]) })
             if (results.length >= limit) break
           }
         }
@@ -464,8 +465,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
             p.handle = await AoLoader(wasm, {
               format,
               WeaveDrive: wdrive,
-              spawn: new DataItem(p.item),
-              module: await mem.get("txs", mod),
+              spawn: (await mem.getTx(p.id)).item,
+              module: await mem.getTx(mod),
             })
             mem.env[opt.process].handle = p.handle
           }

package/esm/armem-base.js

@@ -1,8 +1,10 @@
 import _Arweave from "arweave"
 const Arweave = _Arweave.default ?? _Arweave
+import { Bundle } from "arbundles"
 import { compress, decompress } from "./compress.js"
 import { last, assoc, is } from "ramda"
 import { buildTags, tags } from "./utils.js"
+import base64url from "base64url"
 
 export default class ArMemBase {
   constructor({
@@ -29,6 +31,11 @@ export default class ArMemBase {
     this.scheduler = scheduler
     this.SU_URL = SU_URL
   }
+  async owner(di) {
+    return base64url.encode(
+      Buffer.from(await crypto.subtle.digest("SHA-256", di.rawOwner)),
+    )
+  }
   getAnchor() {
     return this.blocks.length === 0
       ? "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM"
@@ -66,9 +73,9 @@ export default class ArMemBase {
     }
   }
   initSync() {
+    this.items = {}
     this.addrmap = {}
     this.txs = {}
-    this.jwks = {}
     this.blocks = []
     this.blockmap = {}
     this.env = {}
@@ -152,8 +159,8 @@ export default class ArMemBase {
     if (this.db) {
       for (const v of ["height", "blocks"]) this[v] = await this.get(v)
       for (const v of [
+        "items",
         "txs",
-        "jwks",
         "env",
         "modules",
         "wasms",
@@ -191,6 +198,36 @@ export default class ArMemBase {
       }
     }
   }
+  async getTx(id) {
+    let tx = this.txs[id]
+    if (tx.bundle) {
+      try {
+        let bundle = new Bundle(this.txs[tx.bundle].data)
+        for (let di of bundle.items) {
+          if (id === di.id) {
+            const data = di.data
+            const data_size = Buffer.byteLength(di.rawData).toString()
+            let data_type = ""
+            for (const t of di.tags)
+              if (t.name === "Content-Type") data_type = t.value
+            const owner = await this.owner(di)
+            tx = {
+              _data: { size: data_size, type: data_type },
+              anchor: di.anchor,
+              signature: di.signature,
+              recipient: di.target,
+              id: await di.id,
+              item: di,
+              owner,
+              tags: di.tags,
+              data,
+            }
+          }
+        }
+      } catch (e) {}
+    }
+    return tx
+  }
   async getWasm(module) {
     let mod = module ?? this.modules.aos2_0_1
     if (!mod) throw Error("module not found")
@@ -202,7 +239,7 @@ export default class ArMemBase {
         wasm = await this._getWasm(this.wasms[mod].file)
         format = _wasm.format
       } else {
-        const tx = await this.get("txs", mod)
+        const tx = await this.getTx(mod)
         if (tx) {
           wasm = Buffer.from(tx.data, "base64")
           format = tags(tx.tags)["Module-Format"]

package/esm/{ar-base.js → bar.js}

@@ -3,7 +3,7 @@ import { buildTags, tags as t } from "./utils.js"
 import * as WarpArBundles from "warp-arbundles"
 const pkg = WarpArBundles.default ?? WarpArBundles
 const { DataItem } = pkg
-import { bundleAndSignData, ArweaveSigner } from "arbundles"
+import { Bundle, bundleAndSignData, ArweaveSigner } from "arbundles"
 import base64url from "base64url"
 import GQL from "./tgql.js"
 import { last, is, includes, isNil } from "ramda"
@@ -18,21 +18,16 @@ class AR extends MAR {
     this.arweave = this.mem.arweave
   }
   async owner(di) {
-    const raw_owner = di.rawOwner
-    const hashBuffer = Buffer.from(
-      await crypto.subtle.digest("SHA-256", raw_owner),
+    return base64url.encode(
+      Buffer.from(await crypto.subtle.digest("SHA-256", di.rawOwner)),
     )
-    return base64url.encode(hashBuffer)
   }
   async dataitem({ target = "", data = "1984", tags = {}, signer, item }) {
     let di = item
     if (!di) {
-      const _tags = buildTags(tags)
-      const _item = await signer({ data, tags: _tags, target })
+      const _item = await signer({ data, tags: buildTags(tags), target })
       di = new DataItem(_item.raw)
-    } else {
-      tags = t(di.tags)
-    }
+    } else tags = t(di.tags)
     const owner = await this.owner(di)
     return { id: await di.id, owner, item: di, tags }
   }
@@ -42,8 +37,7 @@ class AR extends MAR {
     ;({ err, jwk } = await this.checkWallet({ jwk }))
     if (err) return { err }
     let tx = await this.arweave.createTransaction({ data: data })
-    let _tags = buildTags(null, tags)
-    for (const v of _tags) tx.addTag(v.name, v.value)
+    for (const v of buildTags(null, tags)) tx.addTag(v.name, v.value)
     return await this.postTx(tx, jwk)
   }
 
@@ -129,7 +123,7 @@ class AR extends MAR {
         }
         block.txs.push(item.id)
         _txs.block = block.id
-        await this.mem.set(_txs, "txs", item.id)
+        await this.mem.set({ bundle: tx.id }, "txs", item.id)
       }
     }
     let _tags = []
@@ -179,7 +173,7 @@ class AR extends MAR {
   }
 
   async tx(id) {
-    return await this.mem.get("txs", id)
+    return await this.mem.getTx(id)
   }
 
   async data(id, _string, log) {
@@ -189,7 +183,7 @@ class AR extends MAR {
       if (!isNil(_string.decode)) decode = _string.decode
       if (!isNil(_string.string)) string = _string.string
     }
-    let tx = await this.mem.get("txs", id)
+    let tx = await this.mem.getTx(id)
     let _data = tx?.data ?? null
     if (tx?.format === 2 && _data) {
       _data = Buffer.from(_data, "base64")

package/esm/lfdb.js

@@ -4,7 +4,6 @@ import { is, keys } from "ramda"
 export default _this => {
   return {
     put: async (key, val) => {
-      console.log(key, val)
       let _val = null
       if (typeof val === "object" && !is(Array, val)) {
         _val = {}

package/esm/server.js

@@ -216,13 +216,13 @@ class Server {
     )
     app.get("/:pid", (req, res) => {
       const pid = req.params.pid
-      const edges = map(v => {
-        const tx = this.mem.txs[v.id]
+      const edges = map(async v => {
+        const tx = await this.mem.getTx(v)
         const _tags = tags(v.tags)
         const mid = _tags.Message
-        const mtx = this.mem.txs[mid]
+        const mtx = await this.mem.getTx(mid)
         return {
-          cursor: v.id,
+          cursor: v,
           node: {
             message: {
               id: mtx.id,
@@ -243,7 +243,7 @@ class Server {
             },
           },
         }
-      })(reverse(this.mem.env[pid]?.txs ?? []))
+      })(reverse(this.mem.env[pid]?.results ?? [])) // need mod
       res.json({ page_info: { has_next_page: false }, edges })
     })
     const server = app.listen(this.ports.su, () =>

package/esm/tar.js

@@ -1,4 +1,4 @@
-import BAR from "./ar-base.js"
+import BAR from "./bar.js"
 import ArMem from "./armem.js"
 
 class AR extends BAR {

package/esm/tgql.js

@@ -10,6 +10,7 @@ const subs = {
   parent: ["id"],
   bundledIn: ["id"],
 }
+
 const field = (key, val = true) => {
   if (includes(key, ["id", "anchor", "signature", "recipient"])) {
     return { key }
@@ -101,8 +102,7 @@ export default class GQL {
           break
         }
         if (!isNil(opt.after) && count === 0 && !after) continue
-        let tx = this.mem.txs[v2]
-
+        let tx = await this.mem.getTx(v2)
         if (!isNil(ids) && ids.length > 0) {
           if (!includes(tx.id, ids)) continue
         }

package/esm/war.js

@@ -1,4 +1,4 @@
-import BAR from "./ar-base.js"
+import BAR from "./bar.js"
 import ArMem from "./armem-web.js"
 
 class AR extends BAR {

package/package.json

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