@qevm/bytes - npm Package Compare versions

Comparing version 5.7.2 to 5.8.2

lib/_version.d.ts

@@ -1,2 +0,2 @@
-export declare const version = "bytes/5.7.2";
+export declare const version = "bytes/5.8.2";
 //# sourceMappingURL=_version.d.ts.map

lib/_version.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = "bytes/5.7.2";
+exports.version = "bytes/5.8.2";
 //# sourceMappingURL=_version.js.map

lib/index.d.ts

@@ -1,4 +0,4 @@
-export type Bytes = ArrayLike<number>;
-export type BytesLike = Bytes | string;
-export type DataOptions = {
+export declare type Bytes = ArrayLike<number>;
+export declare type BytesLike = Bytes | string;
+export declare type DataOptions = {
     allowMissingPrefix?: boolean;
@@ -10,3 +10,3 @@ hexPad?: "left" | "right" | null;
 }
-export type SignatureLike = {
+export declare type SignatureLike = {
     signature: string;
@@ -34,3 +34,3 @@ publicKey: string;
 export declare function splitSignature(signature: SignatureLike): Signature;
-export declare function joinSignature(signature: SignatureLike): string;
+export declare function joinSignature(signature: SignatureLike, sigType?: number): string;
 //# sourceMappingURL=index.d.ts.map

lib/index.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAEtC,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC;AAEvC,MAAM,MAAM,WAAW,GAAG;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;CACpC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,WAAW,IAAI,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,aAAa,GACnB;IACI,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB,GACD,SAAS,CAAC;AAEhB,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAuBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,SAAS,CAE1D;AAMD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,KAAK,CAsBlD;AAED,wBAAgB,QAAQ,CACpB,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,EACnC,OAAO,CAAC,EAAE,WAAW,GACtB,UAAU,CA6DZ;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,UAAU,CAYlE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,CAmBvD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAUpE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhE;AAID,wBAAgB,OAAO,CACnB,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,EAC5C,OAAO,CAAC,EAAE,WAAW,GACtB,MAAM,CAuER;AAUD,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,UAQ5C;AAED,wBAAgB,YAAY,CACxB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACnB,MAAM,CAcR;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,MAAM,CAMjE;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CActD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgBnE;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,CAgBlE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM,CAI9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"AASA,oBAAY,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAEtC,oBAAY,SAAS,GAAG,KAAK,GAAG,MAAM,CAAC;AAEvC,oBAAY,WAAW,GAAG;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;CACpC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,WAAW,IAAI,MAAM,CAAC;CACzB;AAED,oBAAY,aAAa,GACnB;IACI,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB,GACD,SAAS,CAAC;AAKhB,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAuBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,SAAS,CAE1D;AAMD,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,KAAK,CAsBlD;AAED,wBAAgB,QAAQ,CACpB,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,EACnC,OAAO,CAAC,EAAE,WAAW,GACtB,UAAU,CA6DZ;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,UAAU,CAYlE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,CAmBvD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAUpE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhE;AAID,wBAAgB,OAAO,CACnB,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,EAC5C,OAAO,CAAC,EAAE,WAAW,GACtB,MAAM,CAuER;AAUD,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,UAQ5C;AAED,wBAAgB,YAAY,CACxB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACnB,MAAM,CAcR;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,MAAM,CAMjE;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CActD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAgBnE;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,CA+ClE;AAED,wBAAgB,aAAa,CACzB,SAAS,EAAE,aAAa,EACxB,OAAO,SAAS,GACjB,MAAM,CAcR"}

lib/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBytesLike = isBytesLike;
-exports.isBytes = isBytes;
-exports.arrayify = arrayify;
-exports.concat = concat;
-exports.stripZeros = stripZeros;
-exports.zeroPad = zeroPad;
-exports.isHexString = isHexString;
-exports.hexlify = hexlify;
-exports.hexDataLength = hexDataLength;
-exports.hexDataSlice = hexDataSlice;
-exports.hexConcat = hexConcat;
-exports.hexValue = hexValue;
-exports.hexStripZeros = hexStripZeros;
-exports.hexZeroPad = hexZeroPad;
-exports.splitSignature = splitSignature;
-exports.joinSignature = joinSignature;
+exports.joinSignature = exports.splitSignature = exports.hexZeroPad = exports.hexStripZeros = exports.hexValue = exports.hexConcat = exports.hexDataSlice = exports.hexDataLength = exports.hexlify = exports.isHexString = exports.zeroPad = exports.stripZeros = exports.concat = exports.arrayify = exports.isBytes = exports.isBytesLike = void 0;
 const logger_1 = require("@qevm/logger");
 const _version_1 = require("./_version");
 const logger = new logger_1.Logger(_version_1.version);
+// Wire-format signature header size: [sig_type: 4][pubkey_size: 4][sig_size: 4]
+const SIG_WIRE_HEADER_SIZE = 12;
 ///////////////////////////////
@@ -39,2 +26,3 @@ function isHexable(value) {
 }
+exports.isBytesLike = isBytesLike;
 function isInteger(value) {
@@ -64,2 +52,3 @@ return typeof value === "number" && value == value && value % 1 === 0;
 }
+exports.isBytes = isBytes;
 function arrayify(value, options) {
@@ -113,2 +102,3 @@ if (!options) {
 }
+exports.arrayify = arrayify;
 function concat(items) {
@@ -124,2 +114,3 @@ const objects = items.map((item) => arrayify(item));
 }
+exports.concat = concat;
 function stripZeros(value) {
@@ -141,2 +132,3 @@ let result = arrayify(value);
 }
+exports.stripZeros = stripZeros;
 function zeroPad(value, length) {
@@ -151,2 +143,3 @@ value = arrayify(value);
 }
+exports.zeroPad = zeroPad;
 function isHexString(value, length) {
@@ -161,2 +154,3 @@ if (typeof value !== "string" || !value.match(/^0x[0-9A-Fa-f]*$/)) {
 }
+exports.isHexString = isHexString;
 const HexCharacters = "0123456789abcdef";
@@ -221,2 +215,3 @@ function hexlify(value, options) {
 }
+exports.hexlify = hexlify;
 /*
@@ -239,2 +234,3 @@ function unoddify(value: BytesLike | Hexable | number): BytesLike | Hexable | number {
 }
+exports.hexDataLength = hexDataLength;
 function hexDataSlice(data, offset, endOffset) {
@@ -253,2 +249,3 @@ if (typeof data !== "string") {
 }
+exports.hexDataSlice = hexDataSlice;
 function hexConcat(items) {
@@ -261,2 +258,3 @@ let result = "0x";
 }
+exports.hexConcat = hexConcat;
 function hexValue(value) {
@@ -269,2 +267,3 @@ const trimmed = hexStripZeros(hexlify(value, { hexPad: "left" }));
 }
+exports.hexValue = hexValue;
 function hexStripZeros(value) {
@@ -284,2 +283,3 @@ if (typeof value !== "string") {
 }
+exports.hexStripZeros = hexStripZeros;
 function hexZeroPad(value, length) {
@@ -300,2 +300,3 @@ if (typeof value !== "string") {
 }
+exports.hexZeroPad = hexZeroPad;
 function splitSignature(signature) {
@@ -307,5 +308,17 @@ const result = {
     if (isBytesLike(signature)) {
-        let bytes = arrayify(signature);
-        result.publicKey = hexlify(bytes.slice(0, 1184));
-        result.signature = hexlify(bytes.slice(1184));
+        const bytes = arrayify(signature);
+        if (bytes.length < SIG_WIRE_HEADER_SIZE) {
+            throw new Error("splitSignature: blob too small to contain wire header");
+        }
+        // Parse wire header (little-endian uint32):
+        //   [sig_type: 4][pubkey_size: 4][sig_size: 4]
+        const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+        const pubkeySize = view.getUint32(4, true);
+        const sigSize = view.getUint32(8, true);
+        const expectedLen = SIG_WIRE_HEADER_SIZE + pubkeySize + sigSize;
+        if (bytes.length !== expectedLen) {
+            throw new Error(`splitSignature: blob length ${bytes.length} does not match header (expected ${expectedLen})`);
+        }
+        result.publicKey = hexlify(bytes.slice(SIG_WIRE_HEADER_SIZE, SIG_WIRE_HEADER_SIZE + pubkeySize));
+        result.signature = hexlify(bytes.slice(SIG_WIRE_HEADER_SIZE + pubkeySize));
     }
@@ -318,6 +331,16 @@ else {
 }
-function joinSignature(signature) {
-    signature = splitSignature(signature);
-    return hexlify(concat([signature.publicKey, signature.signature]));
+exports.splitSignature = splitSignature;
+function joinSignature(signature, sigType = 0x0102) {
+    const sig = splitSignature(signature);
+    const pubkeyBytes = arrayify(sig.publicKey);
+    const sigBytes = arrayify(sig.signature);
+    // Build wire header: [sig_type: 4 LE][pubkey_size: 4 LE][sig_size: 4 LE]
+    const header = new Uint8Array(SIG_WIRE_HEADER_SIZE);
+    const view = new DataView(header.buffer);
+    view.setUint32(0, sigType, true);
+    view.setUint32(4, pubkeyBytes.length, true);
+    view.setUint32(8, sigBytes.length, true);
+    return hexlify(concat([header, pubkeyBytes, sigBytes]));
 }
+exports.joinSignature = joinSignature;
 //# sourceMappingURL=index.js.map

lib/index.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src.ts/index.ts"],"names":[],"mappings":"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"}

package.json

@@ -30,3 +30,3 @@ {
     "types": "./lib/index.d.ts",
-    "version": "5.7.2"
+    "version": "5.8.2"
 }

src.ts/_version.ts

@@ -1,1 +0,1 @@
-export const version = "bytes/5.7.2";
+export const version = "bytes/5.8.2";

src.ts/index.ts

@@ -30,2 +30,5 @@ "use strict";
 
+// Wire-format signature header size: [sig_type: 4][pubkey_size: 4][sig_size: 4]
+const SIG_WIRE_HEADER_SIZE = 12;
+
 export interface Signature {
@@ -385,5 +388,36 @@ signature: string;
     if (isBytesLike(signature)) {
-        let bytes: Uint8Array = arrayify(signature);
-        result.publicKey = hexlify(bytes.slice(0, 1184));
-        result.signature = hexlify(bytes.slice(1184));
+        const bytes: Uint8Array = arrayify(signature);
+
+        if (bytes.length < SIG_WIRE_HEADER_SIZE) {
+            throw new Error(
+                "splitSignature: blob too small to contain wire header",
+            );
+        }
+
+        // Parse wire header (little-endian uint32):
+        //   [sig_type: 4][pubkey_size: 4][sig_size: 4]
+        const view = new DataView(
+            bytes.buffer,
+            bytes.byteOffset,
+            bytes.byteLength,
+        );
+        const pubkeySize = view.getUint32(4, true);
+        const sigSize = view.getUint32(8, true);
+
+        const expectedLen = SIG_WIRE_HEADER_SIZE + pubkeySize + sigSize;
+        if (bytes.length !== expectedLen) {
+            throw new Error(
+                `splitSignature: blob length ${bytes.length} does not match header (expected ${expectedLen})`,
+            );
+        }
+
+        result.publicKey = hexlify(
+            bytes.slice(
+                SIG_WIRE_HEADER_SIZE,
+                SIG_WIRE_HEADER_SIZE + pubkeySize,
+            ),
+        );
+        result.signature = hexlify(
+            bytes.slice(SIG_WIRE_HEADER_SIZE + pubkeySize),
+        );
     } else {
@@ -397,6 +431,19 @@ result.publicKey = signature.publicKey;
 
-export function joinSignature(signature: SignatureLike): string {
-    signature = splitSignature(signature);
+export function joinSignature(
+    signature: SignatureLike,
+    sigType = 0x0102,
+): string {
+    const sig = splitSignature(signature);
 
-    return hexlify(concat([signature.publicKey, signature.signature]));
+    const pubkeyBytes = arrayify(sig.publicKey);
+    const sigBytes = arrayify(sig.signature);
+
+    // Build wire header: [sig_type: 4 LE][pubkey_size: 4 LE][sig_size: 4 LE]
+    const header = new Uint8Array(SIG_WIRE_HEADER_SIZE);
+    const view = new DataView(header.buffer);
+    view.setUint32(0, sigType, true);
+    view.setUint32(4, pubkeyBytes.length, true);
+    view.setUint32(8, sigBytes.length, true);
+
+    return hexlify(concat([header, pubkeyBytes, sigBytes]));
 }

No alert changes

Improved metrics

Total package byte prevSize

39428

10.4%

Lines of code

735

9.54%

No dependency changes