@hazae41/bobine 0.0.10 → 0.0.11

package/out/libs/packs/mod.d.ts

@@ -6,6 +6,8 @@ export declare class Pack {
     writeOrThrow(cursor: Cursor): void;
 }
 export declare namespace Pack {
-    type Value = null | Pack | number | Uint8Array | string | bigint;
-    function readOrThrow(cursor: Cursor): Pack;
+    type Value = null | number | Uint8Array | string | bigint | Array<Value>;
+    function readOrThrow(cursor: Cursor): Array<Value>;
+    function sizeOrThrow(values: Array<Value>): number;
+    function writeOrThrow(values: Array<Value>, cursor: Cursor): void;
 }

package/out/libs/packs/mod.js

@@ -5,14 +5,64 @@ export class Pack {
         this.values = values;
     }
     sizeOrThrow() {
+        return Pack.sizeOrThrow(this.values);
+    }
+    writeOrThrow(cursor) {
+        Pack.writeOrThrow(this.values, cursor);
+    }
+}
+(function (Pack) {
+    function readOrThrow(cursor) {
+        const values = [];
+        while (true) {
+            const type = cursor.readUint8OrThrow();
+            if (type === 0)
+                break;
+            if (type === 1) {
+                values.push(null);
+                continue;
+            }
+            if (type === 2) {
+                values.push(Pack.readOrThrow(cursor));
+                continue;
+            }
+            if (type === 3) {
+                values.push(cursor.readFloat64OrThrow(true));
+                continue;
+            }
+            if (type === 4) {
+                const size = cursor.readUint32OrThrow(true);
+                values.push(cursor.readOrThrow(size));
+                continue;
+            }
+            if (type === 5) {
+                const size = cursor.readUint32OrThrow(true);
+                const data = cursor.readOrThrow(size);
+                values.push(new TextDecoder().decode(data));
+                continue;
+            }
+            if (type === 6) {
+                const negative = cursor.readUint8OrThrow();
+                const size = cursor.readUint32OrThrow(true);
+                const data = cursor.readOrThrow(size);
+                const absolute = BigInt("0x" + data.toHex());
+                values.push(negative ? -absolute : absolute);
+                continue;
+            }
+            throw new Error("Unknown pack type");
+        }
+        return values;
+    }
+    Pack.readOrThrow = readOrThrow;
+    function sizeOrThrow(values) {
         let size = 0;
-        for (const value of this.values) {
+        for (const value of values) {
             if (value == null) {
                 size += 1;
                 continue;
             }
-            if (value instanceof Pack) {
-                size += 1 + value.sizeOrThrow();
+            if (Array.isArray(value)) {
+                size += 1 + sizeOrThrow(value);
                 continue;
             }
             if (typeof value === "number") {
@@ -29,9 +79,10 @@ export class Pack {
                 continue;
             }
             if (typeof value === "bigint") {
-                const text = value.toString(16);
+                const absolute = value < 0n ? -value : value;
+                const text = absolute.toString(16);
                 const data = Uint8Array.fromHex(text.length % 2 === 1 ? "0" + text : text);
-                size += 1 + 4 + data.length;
+                size += 1 + 1 + 4 + data.length;
                 continue;
             }
             throw new Error("Unknown pack value");
@@ -39,15 +90,16 @@ export class Pack {
         size += 1;
         return size;
     }
-    writeOrThrow(cursor) {
-        for (const value of this.values) {
+    Pack.sizeOrThrow = sizeOrThrow;
+    function writeOrThrow(values, cursor) {
+        for (const value of values) {
             if (value == null) {
                 cursor.writeUint8OrThrow(1);
                 continue;
             }
-            if (value instanceof Pack) {
+            if (Array.isArray(value)) {
                 cursor.writeUint8OrThrow(2);
-                value.writeOrThrow(cursor);
+                writeOrThrow(value, cursor);
                 continue;
             }
             if (typeof value === "number") {
@@ -70,8 +122,10 @@ export class Pack {
             }
             if (typeof value === "bigint") {
                 cursor.writeUint8OrThrow(6);
-                const text = value.toString(16);
+                const [negative, absolute] = value < 0n ? [1, -value] : [0, value];
+                const text = absolute.toString(16);
                 const data = Uint8Array.fromHex(text.length % 2 === 1 ? "0" + text : text);
+                cursor.writeUint8OrThrow(negative);
                 cursor.writeUint32OrThrow(data.length, true);
                 cursor.writeOrThrow(data);
                 continue;
@@ -81,46 +135,5 @@ export class Pack {
         cursor.writeUint8OrThrow(0);
         return;
     }
-}
-(function (Pack) {
-    function readOrThrow(cursor) {
-        const values = [];
-        while (true) {
-            const type = cursor.readUint8OrThrow();
-            if (type === 0)
-                break;
-            if (type === 1) {
-                values.push(null);
-                continue;
-            }
-            if (type === 2) {
-                values.push(Pack.readOrThrow(cursor));
-                continue;
-            }
-            if (type === 3) {
-                values.push(cursor.readFloat64OrThrow(true));
-                continue;
-            }
-            if (type === 4) {
-                const size = cursor.readUint32OrThrow(true);
-                values.push(cursor.readOrThrow(size));
-                continue;
-            }
-            if (type === 5) {
-                const size = cursor.readUint32OrThrow(true);
-                const data = cursor.readOrThrow(size);
-                values.push(new TextDecoder().decode(data));
-                continue;
-            }
-            if (type === 6) {
-                const size = cursor.readUint32OrThrow(true);
-                const data = cursor.readOrThrow(size);
-                values.push(BigInt("0x" + data.toHex()));
-                continue;
-            }
-            throw new Error("Unknown pack type");
-        }
-        return new Pack(values);
-    }
-    Pack.readOrThrow = readOrThrow;
+    Pack.writeOrThrow = writeOrThrow;
 })(Pack || (Pack = {}));

package/out/mods/worker/bin.js

@@ -4,7 +4,6 @@ import { RpcErr, RpcError, RpcMethodNotFoundError, RpcOk } from "@hazae41/jsonrp
 import * as Wasm from "@hazae41/wasm";
 import { Buffer } from "node:buffer";
 import { existsSync, readFileSync, symlinkSync, writeFileSync } from "node:fs";
-import { log } from "../../libs/debug/mod.js";
 import { meter } from "../../libs/metering/mod.js";
 import { Pack } from "../../libs/packs/mod.js";
 const config = await fetch(self.name).then(res => res.json());
@@ -13,9 +12,11 @@ function run(module, method, params, mode, maxsparks) {
     let sparks = 0n;
     const exports = {};
     const caches = new Map();
+    const logs = new Array();
+    const reads = new Array();
     const writes = new Array();
     const pack_encode = (pack) => {
-        return Writable.writeToBytesOrThrow(pack);
+        return Writable.writeToBytesOrThrow(new Pack(pack));
     };
     const pack_decode = (bytes) => {
         return Readable.readFromBytesOrThrow(Pack, bytes);
@@ -48,7 +49,7 @@ function run(module, method, params, mode, maxsparks) {
     };
     const ed25519_sign = (subpayload) => {
         sparks_consume(BigInt(subpayload.length) * 256n);
-        const payload = pack_encode(new Pack([Uint8Array.fromHex(module), subpayload]));
+        const payload = pack_encode([Uint8Array.fromHex(module), subpayload]);
         const result = new Int32Array(new SharedArrayBuffer(4 + 64));
         helper.postMessage({ method: "ed25519_sign", params: [payload], result });
         if (Atomics.wait(result, 0, 0) !== "ok")
@@ -79,8 +80,8 @@ function run(module, method, params, mode, maxsparks) {
             }
         };
         imports["console"] = {
-            log: (blob) => {
-                log?.(new TextDecoder().decode(blob));
+            log: (text) => {
+                logs.push(text);
             }
         };
         imports["blobs"] = {
@@ -159,16 +160,16 @@ function run(module, method, params, mode, maxsparks) {
         };
         imports["packs"] = {
             create: (...values) => {
-                return new Pack(values);
+                return values;
             },
             concat: (left, right) => {
-                return new Pack([...left.values, ...right.values]);
+                return [...left, ...right];
             },
             length: (pack) => {
-                return pack.values.length;
+                return pack.length;
             },
             get(pack, index) {
-                const value = pack.values[index >>> 0];
+                const value = pack[index >>> 0];
                 if (value === undefined)
                     throw new Error("Not found");
                 return value;
@@ -181,6 +182,9 @@ function run(module, method, params, mode, maxsparks) {
             }
         };
         imports["bigints"] = {
+            identity: (value) => {
+                return value;
+            },
             zero: () => {
                 return 0n;
             },
@@ -244,21 +248,21 @@ function run(module, method, params, mode, maxsparks) {
                 return BigInt("0x" + bytes.toHex());
             },
             from_base16: (text) => {
-                return BigInt("0x" + new TextDecoder().decode(text));
+                return BigInt("0x" + text);
             },
             to_base16: (bigint) => {
-                return new TextEncoder().encode(bigint.toString(16));
+                return bigint.toString(16);
             },
             from_base10: (text) => {
-                return BigInt(new TextDecoder().decode(text));
+                return BigInt(text);
             },
             to_base10: (bigint) => {
-                return new TextEncoder().encode(bigint.toString());
+                return bigint.toString();
             }
         };
         imports["modules"] = {
             create: (wasmAsBytes, saltAsBytes) => {
-                const packAsBytes = pack_encode(new Pack([wasmAsBytes, saltAsBytes]));
+                const packAsBytes = pack_encode([wasmAsBytes, saltAsBytes]);
                 const digestOfWasmAsBytes = sha256_digest(wasmAsBytes);
                 const digestOfPackAsBytes = sha256_digest(packAsBytes);
                 const digestOfWasmAsHex = digestOfWasmAsBytes.toHex();
@@ -307,6 +311,7 @@ function run(module, method, params, mode, maxsparks) {
                     return null;
                 const fresh = new Uint8Array(result.buffer, 4 + 4 + 4, result[2]).slice();
                 cache.set(key, fresh);
+                reads.push([module, key, fresh]);
                 return fresh;
             }
         };
@@ -380,37 +385,33 @@ function run(module, method, params, mode, maxsparks) {
     const { instance } = load(module);
     if (typeof instance.exports[method] !== "function")
         throw new Error("Not found");
-    const result = pack_encode(new Pack([instance.exports[method](...pack_decode(params).values)]));
-    return { result, writes, sparks };
+    const returned = [instance.exports[method](...pack_decode(params))];
+    if (mode !== 2)
+        return pack_encode([logs, reads, writes, returned, sparks]);
+    if (writes.length) {
+        const result = new Int32Array(new SharedArrayBuffer(4 + 4));
+        helper.postMessage({ method: "storage_set", params: [module, method, params, writes], result });
+        if (Atomics.wait(result, 0, 0) !== "ok")
+            throw new Error("Failed to wait");
+        if (result[0] === 2)
+            throw new Error("Internal error");
+        // NOOP
+    }
+    return pack_encode([logs, reads, writes, returned, sparks]);
 }
 self.addEventListener("message", (event) => {
     try {
         const request = event.data;
         if (request.method === "execute") {
             const [module, method, params, maxsparks] = request.params;
-            const start = performance.now();
-            const { result, writes, sparks } = run(module, method, params, 1, maxsparks);
-            const until = performance.now();
-            log?.(`Evaluated ${(until - start).toFixed(2)}ms with ${sparks} sparks`);
-            if (writes.length) {
-                const result = new Int32Array(new SharedArrayBuffer(4 + 4));
-                helper.postMessage({ method: "storage_set", params: [module, method, params, writes], result });
-                if (Atomics.wait(result, 0, 0) !== "ok")
-                    throw new Error("Failed to wait");
-                if (result[0] === 2)
-                    throw new Error("Internal error");
-                log?.(`Wrote ${writes.length} events to storage`);
-            }
-            self.postMessage(new RpcOk(request.id, result));
+            const proof = run(module, method, params, 1, maxsparks);
+            self.postMessage(new RpcOk(request.id, proof));
             return;
         }
         if (request.method === "simulate") {
             const [module, method, params, maxsparks] = request.params;
-            const start = performance.now();
-            const { result, sparks } = run(module, method, params, 2, maxsparks);
-            const until = performance.now();
-            log?.(`Evaluated ${(until - start).toFixed(2)}ms with ${sparks} sparks`);
-            self.postMessage(new RpcOk(request.id, result));
+            const proof = run(module, method, params, 2, maxsparks);
+            self.postMessage(new RpcOk(request.id, proof));
             return;
         }
         if (request.method === "verify") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@hazae41/bobine",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A blockchain in your garage",
   "repository": "github:hazae41/bobine",
   "author": "hazae41",

package/out/libs/debug/mod.d.ts

@@ -1 +0,0 @@
-export declare const log: (message: string) => void;

package/out/libs/debug/mod.js

@@ -1,4 +0,0 @@
-import process from "node:process";
-export const log = process.env.NODE_ENV === "development"
-    ? (message) => console.debug(message)
-    : null;