@typeberry/convert 0.1.2-726ffce6 → 0.1.2-7ebe1f6

package/index.js

@@ -4697,8 +4697,8 @@ function print(level, levelAndName, strings, data) {
         return;
     }
     const lvlText = Level[level].padEnd(5);
-    const val = strings.map((v, idx) => `${v}${data[idx]}`);
-    const msg = `${lvlText} [${levelAndName[1]}] ${val}`;
+    const val = strings.map((v, idx) => `${v}${idx < data.length ? data[idx] : ""}`);
+    const msg = `${lvlText} [${levelAndName[1]}] ${val.join("")}`;
     if (level === Level.WARN) {
         console.warn(msg);
     }
@@ -17475,6 +17475,17 @@ class page_range_PageRange {
         }
         return new page_range_PageRange(start, length);
     }
+    /** Returns true if the page range is wrapped (`start` >= `end`) and is not empty */
+    isWrapped() {
+        return this.start >= this.end && !this.isEmpty();
+    }
+    /** Checks if given page number is within the range */
+    isInRange(page) {
+        if (this.isWrapped()) {
+            return page >= this.start || page < this.end;
+        }
+        return page >= this.start && page < this.end;
+    }
     /** Checks if a range is empty (`length === 0`) */
     isEmpty() {
         return this.length === 0;
@@ -17854,10 +17865,11 @@ class memory_builder_MemoryBuilder {
       startHeapIndex (${startHeapIndex}) has to be less than or equal to endHeapIndex (${endHeapIndex})
     `;
         this.ensureNotFinalized();
-        const range = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
-        const pages = PageRange.fromMemoryRange(range);
-        for (const pageNumber of pages) {
-            if (this.initialMemory.has(pageNumber)) {
+        const heapRange = MemoryRange.fromStartAndLength(startHeapIndex, endHeapIndex - startHeapIndex);
+        const heapPagesRange = PageRange.fromMemoryRange(heapRange);
+        const initializedPageNumbers = Array.from(this.initialMemory.keys());
+        for (const pageNumber of initializedPageNumbers) {
+            if (heapPagesRange.isInRange(pageNumber)) {
                 throw new IncorrectSbrkIndex();
             }
         }
@@ -26811,6 +26823,12 @@ async function runPvmTest(testContent) {
 
 
 
+function looseType(output) {
+    return {
+        value: output.value,
+        encode: output.encode,
+    };
+}
 const SUPPORTED_TYPES = [
     {
         name: "block",
@@ -26828,8 +26846,12 @@ const SUPPORTED_TYPES = [
             run(spec, data, option) {
                 const header = data;
                 if (option === "as-hash") {
-                    return hashBytes(encoder_Encoder.encodeObject(header_Header.Codec, header, spec));
+                    return looseType({
+                        value: hashBytes(encoder_Encoder.encodeObject(header_Header.Codec, header, spec)),
+                        encode: descriptors_codec.bytes(hash_HASH_SIZE),
+                    });
                 }
+                throw new Error(`Invalid processing option: ${option}`);
             },
         },
     },
@@ -26873,11 +26895,17 @@ const SUPPORTED_TYPES = [
             run(spec, data, option) {
                 const state = data;
                 if (option === "as-entries") {
-                    return Object.fromEntries(state_entries_StateEntries.serializeInMemory(spec, state));
+                    return looseType({
+                        value: Object.fromEntries(state_entries_StateEntries.serializeInMemory(spec, state)),
+                    });
                 }
                 if (option === "as-root-hash") {
-                    return state_entries_StateEntries.serializeInMemory(spec, state).getRootHash();
+                    return looseType({
+                        value: state_entries_StateEntries.serializeInMemory(spec, state).getRootHash(),
+                        encode: descriptors_codec.bytes(hash_HASH_SIZE),
+                    });
                 }
+                throw new Error(`Invalid processing option: ${option}`);
             },
         },
     },
@@ -26887,19 +26915,39 @@ const SUPPORTED_TYPES = [
         decode: StateTransitionGenesis.Codec,
         json: () => StateTransitionGenesis.fromJson,
         process: {
-            options: ["as-state", "as-jip4"],
+            options: ["as-state", "as-jip4", "as-fuzz-message"],
             run(spec, data, option) {
                 const test = data;
                 if (option === "as-state") {
-                    return stateFromKeyvals(spec, test.state);
+                    return looseType({
+                        value: stateFromKeyvals(spec, test.state),
+                    });
                 }
                 if (option === "as-jip4") {
                     const genesisState = new Map(test.state.keyvals.map((x) => [x.key, x.value]));
-                    return JipChainSpec.create({
-                        genesisHeader: encoder_Encoder.encodeObject(header_Header.Codec, test.header, spec),
-                        genesisState,
+                    return looseType({
+                        value: JipChainSpec.create({
+                            genesisHeader: encoder_Encoder.encodeObject(header_Header.Codec, test.header, spec),
+                            genesisState,
+                        }),
+                    });
+                }
+                if (option === "as-fuzz-message") {
+                    const init = Initialize.create({
+                        header: test.header,
+                        keyvals: test.state.keyvals,
+                        ancestry: [],
+                    });
+                    const msg = {
+                        type: types_MessageType.Initialize,
+                        value: init,
+                    };
+                    return looseType({
+                        value: msg,
+                        encode: types_messageCodec,
                     });
                 }
+                throw new Error(`Invalid processing option: ${option}`);
             },
         },
     },
@@ -26909,15 +26957,32 @@ const SUPPORTED_TYPES = [
         decode: StateTransition.Codec,
         json: () => StateTransition.fromJson,
         process: {
-            options: ["as-pre-state", "as-post-state"],
+            options: ["as-pre-state", "as-post-state", "as-fuzz-message"],
             run(spec, data, option) {
                 const test = data;
                 if (option === "as-pre-state") {
-                    return stateFromKeyvals(spec, test.pre_state);
+                    return looseType({
+                        value: stateFromKeyvals(spec, test.pre_state),
+                    });
                 }
                 if (option === "as-post-state") {
-                    return stateFromKeyvals(spec, test.post_state);
+                    return looseType({
+                        value: stateFromKeyvals(spec, test.post_state),
+                    });
+                }
+                if (option === "as-fuzz-message") {
+                    const encoded = encoder_Encoder.encodeObject(block_Block.Codec, test.block, spec);
+                    const blockView = decoder_Decoder.decodeObject(block_Block.Codec.View, encoded, spec);
+                    const msg = {
+                        type: types_MessageType.ImportBlock,
+                        value: blockView,
+                    };
+                    return looseType({
+                        value: msg,
+                        encode: types_messageCodec,
+                    });
                 }
+                throw new Error(`Invalid processing option: ${option}`);
             },
         },
     },
@@ -26940,7 +27005,7 @@ const HELP = `
 @typeberry/convert ${package_namespaceObject.rE} by Fluffy Labs.
 
 Usage:
-  @typeberry/convert [options] <bin-hex-or-json-input-file> <type> [process] [output-format]
+  @typeberry/convert [options] <bin-hex-or-json-input-file> <type> [process] [output-format] [output-file]
 
 Attempts to read provided input file as 'type' and output in requested 'output-format'.
 For some 'type's it's additionally possible to process the data before outputting it.
@@ -26949,6 +27014,7 @@ The input type is detected from file extension ('.bin', '.hex' or '.json').
 Example usage:
   @typeberry/convert ./genesis-header.json header to-hex
   @typeberry/convert ./state-snapshot.json state-dump as-entries to-json
+  @typeberry/convert ./state-snapshot.json stf-vector as-fuzz-message to-bin msg0.bin
 
 Options:
   --flavor    - chain spec flavor, either 'full' or 'tiny'.
@@ -26958,6 +27024,7 @@ Output formats:
   to-print       - Print the object to the console
   to-json        - JSON format (when supported)
   to-hex         - JAM-codec hex-encoded string (when supported)
+  to-bin         - JAM-codec binary data (when supported)
   to-repl        - Start a JavaScript REPL with the data loaded into a variable
 
 Input types:
@@ -26980,6 +27047,7 @@ var OutputFormat;
     OutputFormat["Print"] = "to-print";
     OutputFormat["Json"] = "to-json";
     OutputFormat["Hex"] = "to-hex";
+    OutputFormat["Bin"] = "to-bin";
     OutputFormat["Repl"] = "to-repl";
 })(OutputFormat || (OutputFormat = {}));
 function parseArgs(cliInput, withRelPath) {
@@ -27001,14 +27069,16 @@ function parseArgs(cliInput, withRelPath) {
     const type = parseType(args._.shift());
     const maybeProcess = args._.shift();
     const maybeOutputFormat = args._.shift();
+    const maybeDestination = args._.shift();
     assertNoMoreArgs(args);
-    const { process, format } = getProcessAndOutput(type, maybeProcess, maybeOutputFormat);
+    const { process, format, destination } = getProcessFormatAndDestination(type, maybeProcess, maybeOutputFormat, maybeDestination);
     return {
         flavor: chainSpec.flavor,
         type,
         process,
         inputPath: withRelPath(input),
         outputFormat: format,
+        destination,
     };
 }
 function parseType(type) {
@@ -27034,10 +27104,21 @@ function parseOutputFormat(output) {
             return OutputFormat.Json;
         case OutputFormat.Repl:
             return OutputFormat.Repl;
+        case OutputFormat.Bin:
+            return OutputFormat.Bin;
         default:
             throw new Error(`Invalid output format: '${output}'.`);
     }
 }
+function parseProcess(processOptions, maybeProcess) {
+    if (maybeProcess === undefined) {
+        return null;
+    }
+    if (!processOptions.includes(maybeProcess)) {
+        throw new Error(`Incorrect processing option: ${maybeProcess}. Expected one of: ${processOptions}.`);
+    }
+    return maybeProcess;
+}
 // TODO [ToDr] Consider sharing that?
 function parseOption(args, option, parser, defaultValue) {
     if (args[option] === undefined) {
@@ -27073,33 +27154,64 @@ function assertNoMoreArgs(args) {
         throw new Error(`Unrecognized options: '${keysLeft}'`);
     }
 }
-function getProcessAndOutput(type, maybeProcess, maybeOutputFormat) {
+function getProcessFormatAndDestination(type, maybeProcess, maybeOutputFormat, maybeDestination) {
+    const defaultProcess = "";
     const defaultFormat = parseOutputFormat(undefined);
-    const options = type.process?.options ?? [];
-    // we have both options, so we expect them in the right order.
-    if (maybeProcess !== undefined && maybeOutputFormat !== undefined) {
+    const processOptions = type.process?.options ?? [];
+    // we have all three so it must be in order
+    if (maybeProcess !== undefined && maybeOutputFormat !== undefined && maybeDestination !== undefined) {
         const format = parseOutputFormat(maybeOutputFormat);
-        if (!options.includes(maybeProcess)) {
-            throw new Error(`Incorrect processing option: ${maybeProcess}. Expected one of: ${options}.`);
-        }
-        return { process: maybeProcess, format };
+        const process = parseProcess(processOptions, maybeProcess) ?? defaultProcess;
+        const destination = maybeDestination;
+        throwIfDumpNotSupported(format, destination);
+        return { process, format, destination };
+    }
+    // we have either:
+    // 1. process + format
+    // 2. format + destination
+    if (maybeProcess !== undefined && maybeOutputFormat !== undefined) {
+        // we've got processing first, so easy-peasy
+        if (processOptions.includes(maybeProcess)) {
+            const format = parseOutputFormat(maybeOutputFormat);
+            throwIfDumpNotSupported(format, null);
+            return { process: maybeProcess, format, destination: null };
+        }
+        // first one has to be format then.
+        const format = parseOutputFormat(maybeProcess);
+        const destination = maybeOutputFormat;
+        throwIfDumpNotSupported(format, destination);
+        return { process: defaultProcess, format, destination };
     }
     // only one parameter, but it can be either output or processing.
+    const destination = null;
     if (maybeProcess !== undefined) {
-        if (options.includes(maybeProcess)) {
-            return { process: maybeProcess, format: defaultFormat };
+        if (processOptions.includes(maybeProcess)) {
+            return { process: maybeProcess, format: defaultFormat, destination };
         }
         // now it should be output format, but we want to give a better error message,
         // if user mispelled processing.
         try {
             const format = parseOutputFormat(maybeProcess);
-            return { process: "", format };
+            throwIfDumpNotSupported(format, destination);
+            return { process: defaultProcess, format, destination };
         }
         catch {
             throw new Error(`'${maybeProcess}' is neither output format nor processing parameter.`);
         }
     }
-    return { process: "", format: defaultFormat };
+    return { process: defaultProcess, format: defaultFormat, destination };
+}
+function throwIfDumpNotSupported(format, destination) {
+    if (destination !== null) {
+        if (format === OutputFormat.Print || format === OutputFormat.Repl) {
+            throw new Error(`Dumping to file is not supported for ${format}`);
+        }
+    }
+    else {
+        if (format === OutputFormat.Bin) {
+            throw new Error(`${format} requires destination file`);
+        }
+    }
 }
 
 // EXTERNAL MODULE: ./node_modules/json-bigint-patch/dist/index.js
@@ -27159,9 +27271,13 @@ function loadInputFile(file, withRelPath) {
     throw new Error("Input file format unsupported.");
 }
 function dumpOutput(spec, data, type, outputFormat, args, withRelPath) {
+    const { destination } = args;
+    const dump = destination !== null
+        ? (v) => external_node_fs_default().writeFileSync(withRelPath(destination), v)
+        : (v) => console.info(v);
     switch (outputFormat) {
         case OutputFormat.Print: {
-            console.info(`${debug_inspect(data)}`);
+            dump(`${debug_inspect(data)}`);
             return;
         }
         case OutputFormat.Hex: {
@@ -27169,13 +27285,24 @@ function dumpOutput(spec, data, type, outputFormat, args, withRelPath) {
                 throw new Error(`${type.name} does not support encoding to JAM codec.`);
             }
             const encoded = encoder_Encoder.encodeObject(type.encode, data, spec);
-            console.info(`${encoded}`);
+            dump(`${encoded}`);
+            return;
+        }
+        case OutputFormat.Bin: {
+            if (type.encode === undefined) {
+                throw new Error(`${type.name} does not support encoding to JAM codec.`);
+            }
+            if (destination === null) {
+                throw new Error(`${OutputFormat.Bin} requires destination file.`);
+            }
+            const encoded = encoder_Encoder.encodeObject(type.encode, data, spec);
+            dump(encoded.raw);
             return;
         }
         case OutputFormat.Json: {
             // TODO [ToDr] this will probably not work for all cases,
             // but for now may be good enough.
-            console.info(toJson(data));
+            dump(toJson(data));
             return;
         }
         case OutputFormat.Repl: {
@@ -27252,12 +27379,14 @@ function processOutput(spec, data, type, process) {
     if (type.process === undefined || !type.process.options.includes(process)) {
         throw new Error(`Unsupported processing: '${process}' for '${type.name}'`);
     }
+    const processed = type.process.run(spec, data, process);
     return {
-        processed: type.process.run(spec, data, process),
+        processed: processed.value,
         type: {
             ...type,
-            // disable encoding, since it won't match
-            encode: undefined,
+            name: `${type.name}(${process})`,
+            // use encoding from processed type
+            encode: processed.encode,
         },
     };
 }