smoldot 1.0.2 → 1.0.3

package/dist/mjs/instance/bindings-smoldot-light.d.ts

@@ -7,10 +7,6 @@ export interface Config {
      * When `buffer_size` or `buffer_index` are called, the buffer is found here.
      */
     bufferIndices: Array<Uint8Array>;
-    /**
-     * Returns the number of milliseconds since an arbitrary epoch.
-     */
-    performanceNow: () => number;
     /**
      * Tries to open a new connection using the given configuration.
      *
@@ -71,7 +67,7 @@ export interface Connection {
      *
      * The connection and stream must currently be in the `Open` state.
      *
-     * The number of bytes most never exceed the number of "writable bytes" of the stream.
+     * The number of bytes must never exceed the number of "writable bytes" of the stream.
      * `onWritableBytes` can be used in order to notify that more writable bytes are available.
      *
      * The `streamId` must be provided if and only if the connection is of type "multi-stream".
@@ -160,7 +156,8 @@ export interface ConnectionConfig {
      */
     onStreamReset: (streamId: number) => void;
     /**
-     * Callback called when more data can be written on the stream.
+     * Callback called when some data sent using {@link Connection.send} has effectively been
+     * written on the stream, meaning that some buffer space is now free.
      *
      * Can only happen while the connection is in the `Open` state.
      *
@@ -168,6 +165,9 @@ export interface ConnectionConfig {
      *
      * The `streamId` parameter must be provided if and only if the connection is of type
      * "multi-stream".
+     *
+     * Only a number of bytes equal to the size of the data provided to {@link Connection.send}
+     * must be reported. In other words, the `initialWritableBytes` must never be exceeded.
      */
     onWritableBytes: (numExtra: number, streamId?: number) => void;
     /**

package/dist/mjs/instance/bindings-smoldot-light.js

@@ -85,10 +85,6 @@ export default function (config) {
                 config.logCallback(level, target, message);
             }
         },
-        // Must return the UNIX time in milliseconds.
-        unix_time_ms: () => Date.now(),
-        // Must return the value of a monotonic clock in milliseconds.
-        monotonic_clock_ms: () => config.performanceNow(),
         // Must call `timer_finished` after the given number of milliseconds has elapsed.
         start_timer: (id, ms) => {
             if (killedTracked.killed)

package/dist/mjs/instance/bindings-wasi.d.ts

@@ -5,6 +5,10 @@ export interface Config {
      * Fills the given buffer with randomly-generated bytes.
      */
     getRandomValues: (buffer: Uint8Array) => void;
+    /**
+     * Returns the number of milliseconds since an arbitrary epoch.
+     */
+    performanceNow: () => number;
     /**
      * List of environment variables to feed to the Rust program. An array of strings.
      * Example: `["RUST_BACKTRACE=1", "RUST_LOG=foo"];`

package/dist/mjs/instance/bindings-wasi.js

@@ -39,6 +39,36 @@ export default (config) => {
             }
             return 0;
         },
+        clock_time_get: (clockId, _precision, outPtr) => {
+            // See <https://github.com/rust-lang/rust/blob/master/library/std/src/sys/wasi/time.rs>
+            // and <docs.rs/wasi/> for help.
+            const instance = config.instance;
+            const mem = new Uint8Array(instance.exports.memory.buffer);
+            outPtr >>>= 0;
+            // We ignore the precision, as it can't be implemented anyway.
+            switch (clockId) {
+                case 0: {
+                    // Realtime clock.
+                    const now = BigInt(Math.floor(Date.now())) * BigInt(1000000);
+                    buffer.writeUInt64LE(mem, outPtr, now);
+                    // Success.
+                    return 0;
+                }
+                case 1: {
+                    // Monotonic clock.
+                    const nowMs = config.performanceNow();
+                    const nowMsInt = Math.floor(nowMs);
+                    const now = BigInt(nowMsInt) * BigInt(1000000) +
+                        BigInt(Math.floor(((nowMs - nowMsInt) * 1000000)));
+                    buffer.writeUInt64LE(mem, outPtr, now);
+                    // Success.
+                    return 0;
+                }
+                default:
+                    // Return an `EINVAL` error.
+                    return 28;
+            }
+        },
         // Writing to a file descriptor is used in order to write to stdout/stderr.
         fd_write: (fd, addr, num, outPtr) => {
             const instance = config.instance;

package/dist/mjs/instance/buffer.d.ts

@@ -8,3 +8,4 @@ export declare function readUInt32LE(buffer: Uint8Array, offset: number): number
  */
 export declare function writeUInt8(buffer: Uint8Array, offset: number, value: number): void;
 export declare function writeUInt32LE(buffer: Uint8Array, offset: number, value: number): void;
+export declare function writeUInt64LE(buffer: Uint8Array, offset: number, value: bigint): void;

package/dist/mjs/instance/buffer.js

@@ -38,6 +38,17 @@ export function writeUInt32LE(buffer, offset, value) {
     buffer[offset + 1] = (value >>> 8) & 0xff;
     buffer[offset] = value & 0xff;
 }
+export function writeUInt64LE(buffer, offset, value) {
+    checkRange(buffer, offset, 8);
+    buffer[offset + 7] = Number((value >> BigInt(56)) & BigInt(0xff));
+    buffer[offset + 6] = Number((value >> BigInt(48)) & BigInt(0xff));
+    buffer[offset + 5] = Number((value >> BigInt(40)) & BigInt(0xff));
+    buffer[offset + 4] = Number((value >> BigInt(32)) & BigInt(0xff));
+    buffer[offset + 3] = Number((value >> BigInt(24)) & BigInt(0xff));
+    buffer[offset + 2] = Number((value >> BigInt(16)) & BigInt(0xff));
+    buffer[offset + 1] = Number((value >> BigInt(8)) & BigInt(0xff));
+    buffer[offset] = Number(value & BigInt(0xff));
+}
 function checkRange(buffer, offset, length) {
     if (!Number.isInteger(offset) || offset < 0)
         throw new RangeError();

package/dist/mjs/instance/raw-instance.js

@@ -34,7 +34,7 @@ export function startInstance(config, platformBindings) {
         let killAll;
         const bufferIndices = new Array;
         // Used to bind with the smoldot-light bindings. See the `bindings-smoldot-light.js` file.
-        const smoldotJsConfig = Object.assign({ bufferIndices, performanceNow: platformBindings.performanceNow, connect: platformBindings.connect, onPanic: (message) => {
+        const smoldotJsConfig = Object.assign({ bufferIndices, connect: platformBindings.connect, onPanic: (message) => {
                 killAll();
                 config.onWasmPanic(message);
                 throw new Error();
@@ -43,6 +43,7 @@ export function startInstance(config, platformBindings) {
         const wasiConfig = {
             envVars: [],
             getRandomValues: platformBindings.getRandomValues,
+            performanceNow: platformBindings.performanceNow,
             onProcExit: (retCode) => {
                 killAll();
                 config.onWasmPanic(`proc_exit called: ${retCode}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoldot",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Light client that connects to Polkadot and Substrate-based blockchains",
   "author": "Parity Technologies <admin@parity.io>",
   "license": "GPL-3.0-or-later WITH Classpath-exception-2.0",
@@ -46,7 +46,7 @@
     "@types/ws": "^8.5.3",
     "ava": "^5.0.1",
     "dtslint": "^4.0.6",
-    "rimraf": "^4.1.2",
+    "rimraf": "^5.0.0",
     "typedoc": "^0.24.1",
     "typescript": "^5.0.2"
   }