@arkecosystem/typescript-crypto 0.0.12 → 0.0.14

package/dist/index.js

@@ -5657,7 +5657,7 @@ function weierstrass(curveDef) {
     return drbg(seed, k2sig);
   }
   Point3.BASE._setWindowSize(8);
-  function verify2(signature, msgHash, publicKey, opts = defaultVerOpts) {
+  function verify(signature, msgHash, publicKey, opts = defaultVerOpts) {
     const sg = signature;
     msgHash = ensureBytes("msgHash", msgHash);
     publicKey = ensureBytes("publicKey", publicKey);
@@ -5707,7 +5707,7 @@ function weierstrass(curveDef) {
     getPublicKey,
     getSharedSecret,
     sign,
-    verify: verify2,
+    verify,
     ProjectivePoint: Point3,
     Signature: Signature3,
     utils
@@ -23260,7 +23260,6 @@ var cr = () => (
 );
 var _hmacSync;
 var optS = { lowS: true };
-var optV = { lowS: true };
 var prepSig = (msgh, priv, opts = optS) => {
   if (["der", "recovered", "canonical"].some((k) => k in opts))
     err("option not supported");
@@ -23368,42 +23367,6 @@ var signAsync = async (msgh, priv, opts = optS) => {
   const { seed, k2sig } = prepSig(msgh, priv, opts);
   return hmacDrbg(true)(seed, k2sig);
 };
-var verify = (sig, msgh, pub, opts = optV) => {
-  let { lowS } = opts;
-  if (lowS == null)
-    lowS = true;
-  if ("strict" in opts)
-    err("option not supported");
-  let sig_, h, P2;
-  const rs = sig && typeof sig === "object" && "r" in sig;
-  if (!rs && toU8(sig).length !== 2 * fLen)
-    err("signature must be 64 bytes");
-  try {
-    sig_ = rs ? new Signature2(sig.r, sig.s).assertValidity() : Signature2.fromCompact(sig);
-    h = bits2int_modN(toU8(msgh));
-    P2 = pub instanceof Point2 ? pub.ok() : Point2.fromHex(pub);
-  } catch (e) {
-    return false;
-  }
-  if (!sig_)
-    return false;
-  const { r, s } = sig_;
-  if (lowS && high(s))
-    return false;
-  let R;
-  try {
-    const is = inv(s, N3);
-    const u1 = M(h * is, N3);
-    const u2 = M(r * is, N3);
-    R = G.mulAddQUns(P2, u1, u2).aff();
-  } catch (error) {
-    return false;
-  }
-  if (!R)
-    return false;
-  const v = M(R.x, N3);
-  return v === r;
-};
 var hashToPrivateKey = (hash2) => {
   hash2 = toU8(hash2);
   if (hash2.length < fLen + 8 || hash2.length > 1024)
@@ -27847,6 +27810,17 @@ var AbiDecoder = class extends AbiBase {
       args: this.interface.decodeFunctionData(functionFragment, data)
     };
   }
+  decodeError(data) {
+    if (!data.startsWith("0x")) {
+      data = "0x" + data;
+    }
+    const errorSelector = data.slice(0, 10);
+    const errorFragment = this.interface.getError(errorSelector);
+    if (!errorFragment) {
+      throw new Error(`Error selector not found in ABI: ${errorSelector}`);
+    }
+    return errorFragment.name;
+  }
 };
 
 // src/utils/AbiEncoder.ts
@@ -27992,18 +27966,18 @@ var Message = class _Message {
   static async sign(message, passphrase) {
     const privateKey = PrivateKey.fromPassphrase(passphrase);
     const publicKey = PublicKey.fromPassphrase(passphrase).publicKey;
-    const signature = await privateKey.sign(Buffer.from(message).toString("hex"));
+    const signature = new SigningKey(`0x${privateKey.privateKey}`).sign(hashMessage(message));
     return _Message.new({
       publicKey,
-      signature: signature.r + signature.s + signature.v.toString(16).padStart(2, "0"),
+      signature: signature.serialized,
       message
     });
   }
   verify() {
-    const message = Buffer.from(keccak256(Buffer.from(this.message)).slice(2), "hex");
-    const signature = Buffer.from(this.signature.slice(0, 128), "hex");
-    const publicKey = Buffer.from(this.publicKey, "hex");
-    return verify(signature, message, publicKey);
+    const message = new Uint8Array(new TextEncoder().encode(this.message));
+    const address = Address.fromPublicKey(this.publicKey);
+    const signerAddress = verifyMessage(message, this.signature);
+    return signerAddress === address;
   }
   toString() {
     return JSON.stringify(this.toJson());

package/dist/utils/AbiDecoder.d.ts

@@ -2,5 +2,6 @@ import { AbiResult } from "@/types";
 import { AbiBase } from "./AbiBase";
 export declare class AbiDecoder extends AbiBase {
     decodeFunctionData(data: string): AbiResult;
+    decodeError(data: string): string;
 }
 //# sourceMappingURL=AbiDecoder.d.ts.map

package/dist/utils/AbiDecoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbiDecoder.d.ts","sourceRoot":"","sources":["../../src/utils/AbiDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,UAAW,SAAQ,OAAO;IACtC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;CAiB3C"}
+{"version":3,"file":"AbiDecoder.d.ts","sourceRoot":"","sources":["../../src/utils/AbiDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,UAAW,SAAQ,OAAO;IACtC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;IAkB3C,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAcjC"}

package/dist/utils/AbiDecoder.js

@@ -14,4 +14,15 @@ export class AbiDecoder extends AbiBase {
             args: this.interface.decodeFunctionData(functionFragment, data),
         };
     }
+    decodeError(data) {
+        if (!data.startsWith("0x")) {
+            data = "0x" + data;
+        }
+        const errorSelector = data.slice(0, 10);
+        const errorFragment = this.interface.getError(errorSelector);
+        if (!errorFragment) {
+            throw new Error(`Error selector not found in ABI: ${errorSelector}`);
+        }
+        return errorFragment.name;
+    }
 }

package/dist/utils/Message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Message.d.ts","sourceRoot":"","sources":["../../src/utils/Message.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIxC,qBAAa,OAAO;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;gBAEX,OAAO,EAAE,aAAa;IAMlC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO;WAI9B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAaxE,MAAM,IAAI,OAAO;IAQjB,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,MAAM,EAAE;IAIpB,MAAM,IAAI,aAAa;CAOvB"}
+{"version":3,"file":"Message.d.ts","sourceRoot":"","sources":["../../src/utils/Message.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAKxC,qBAAa,OAAO;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;gBAEX,OAAO,EAAE,aAAa;IAMlC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO;WAI9B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAexE,MAAM,IAAI,OAAO;IASjB,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,MAAM,EAAE;IAIpB,MAAM,IAAI,aAAa;CAOvB"}

package/dist/utils/Message.js

@@ -7,10 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { PrivateKey } from "@/identities/PrivateKey";
 import { PublicKey } from "@/identities/PublicKey";
-import { keccak256 } from "ethers";
-import { verify } from "@noble/secp256k1";
+import { hashMessage, verifyMessage } from "ethers";
+import { Address, PrivateKey } from "@/identities";
+import { SigningKey } from "ethers";
 export class Message {
     constructor(message) {
         this.publicKey = message.publicKey;
@@ -24,19 +24,22 @@ export class Message {
         return __awaiter(this, void 0, void 0, function* () {
             const privateKey = PrivateKey.fromPassphrase(passphrase);
             const publicKey = PublicKey.fromPassphrase(passphrase).publicKey;
-            const signature = yield privateKey.sign(Buffer.from(message).toString("hex"));
+            // Sign messages using eip-191 signed data specification, to be aligned with ledger signing workflow.
+            // @see https://developers.ledger.com/docs/ledger-live/discover/integration/wallet-api/server/handlers/message
+            const signature = new SigningKey(`0x${privateKey.privateKey}`).sign(hashMessage(message));
             return Message.new({
                 publicKey,
-                signature: signature.r + signature.s + signature.v.toString(16).padStart(2, "0"),
+                signature: signature.serialized,
                 message,
             });
         });
     }
     verify() {
-        const message = Buffer.from(keccak256(Buffer.from(this.message)).slice(2), "hex");
-        const signature = Buffer.from(this.signature.slice(0, 128), "hex");
-        const publicKey = Buffer.from(this.publicKey, "hex");
-        return verify(signature, message, publicKey);
+        const message = new Uint8Array(new TextEncoder().encode(this.message));
+        const address = Address.fromPublicKey(this.publicKey);
+        // Messages need to be signed using eip-191 signed data specification
+        const signerAddress = verifyMessage(message, this.signature);
+        return signerAddress === address;
     }
     toString() {
         return JSON.stringify(this.toJson());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkecosystem/typescript-crypto",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "engines": {
     "node": ">=20.12.2"
   },

package/src/utils/AbiDecoder.ts

@@ -19,4 +19,19 @@ export class AbiDecoder extends AbiBase {
 			args: this.interface.decodeFunctionData(functionFragment, data),
 		};
 	}
+
+	decodeError(data: string): string {
+		if (!data.startsWith("0x")) {
+			data = "0x" + data;
+		}
+
+		const errorSelector = data.slice(0, 10);
+
+		const errorFragment = this.interface.getError(errorSelector);
+		if (!errorFragment) {
+			throw new Error(`Error selector not found in ABI: ${errorSelector}`);
+		}
+
+		return errorFragment.name;
+	}
 }

package/src/utils/Message.ts

@@ -1,8 +1,8 @@
-import { PrivateKey } from "@/identities/PrivateKey";
 import { PublicKey } from "@/identities/PublicKey";
 import { SignedMessage } from "@/types";
-import { keccak256 } from "ethers";
-import { verify } from "@noble/secp256k1";
+import { hashMessage, verifyMessage } from "ethers";
+import { Address, PrivateKey } from "@/identities";
+import { SigningKey } from "ethers";
 
 export class Message {
 	public publicKey: string;
@@ -23,21 +23,24 @@ export class Message {
 		const privateKey = PrivateKey.fromPassphrase(passphrase);
 		const publicKey = PublicKey.fromPassphrase(passphrase).publicKey;
 
-		const signature = await privateKey.sign(Buffer.from(message).toString("hex"));
+		// Sign messages using eip-191 signed data specification, to be aligned with ledger signing workflow.
+		// @see https://developers.ledger.com/docs/ledger-live/discover/integration/wallet-api/server/handlers/message
+		const signature = new SigningKey(`0x${privateKey.privateKey}`).sign(hashMessage(message));
 
 		return Message.new({
 			publicKey,
-			signature: signature.r + signature.s + signature.v.toString(16).padStart(2, "0"),
+			signature: signature.serialized,
 			message,
 		});
 	}
 
 	verify(): boolean {
-		const message = Buffer.from(keccak256(Buffer.from(this.message)).slice(2), "hex");
-		const signature = Buffer.from(this.signature.slice(0, 128), "hex");
-		const publicKey = Buffer.from(this.publicKey, "hex");
+		const message = new Uint8Array(new TextEncoder().encode(this.message));
+		const address = Address.fromPublicKey(this.publicKey);
+		// Messages need to be signed using eip-191 signed data specification
+		const signerAddress = verifyMessage(message, this.signature);
 
-		return verify(signature, message, publicKey);
+		return signerAddress === address;
 	}
 
 	toString(): string {

package/tests/fixtures/message-sign.json

@@ -1,5 +1,5 @@
 {
 	"message": "Hello, world!",
 	"publicKey": "0243333347c8cbf4e3cbc7a96964181d02a2b0c854faa2fef86b4b8d92afcf473d",
-	"signature": "0e2e53409be748834cac44052817ecef569b429a0492aa6bbc0d934eb71a09547e77aeef33d45669bbcba0498149f0e2b637fe8905186e08a5410c6f2b013bb400"
+	"signature": "0x2bdd0c58ff8a25f456065fb731c73308a25d0a09f351f23e3c7dd3882776d33d626b0cafc0b99dd7504b24f6ecd2e036a267c8e5e005f36dcbc03b2e33fa7fc31c"
 }

package/tests/unit/utils/AbiDecoder.test.ts

@@ -44,3 +44,32 @@ it("should decode using a custom abi", () => {
 	expect(decodedData.args[0]).toEqual(args[0]);
 	expect(decodedData.args[1].map((value: BigInt) => value.toString())).toEqual(args[1]);
 });
+
+it("should decode error data and return error name", () => {
+	const decoder = new AbiDecoder(ContractAbiType.USERNAMES);
+
+	const errorData = "0xa0ca2f4e";
+
+	const errorName = decoder.decodeError(errorData);
+
+	expect(errorName).toBe("TakenUsername");
+});
+
+it("should decode error data without 0x prefix", () => {
+	const decoder = new AbiDecoder(ContractAbiType.USERNAMES);
+
+	// Same as above but without 0x prefix
+	const errorData = "a0ca2f4e";
+
+	const errorName = decoder.decodeError(errorData);
+
+	expect(errorName).toBe("TakenUsername");
+});
+
+it("should throw error for unknown error selector", () => {
+	const decoder = new AbiDecoder(ContractAbiType.USERNAMES);
+
+	const errorData = "0x12345678";
+
+	expect(() => decoder.decodeError(errorData)).toThrow("Error selector not found in ABI: 0x12345678");
+});