@appliedblockchain/silentdatarollup-custom-rpc 1.0.3 → 1.0.5

package/dist/index.js

@@ -56,8 +56,9 @@ function validateRFC3339Timestamp(timestamp) {
   );
   return timestampDate >= minAllowedTime && timestampDate <= maxAllowedTime;
 }
-function recoverSerialSigner(message, signature) {
+function recoverSerialSigner(message, signature, chainId) {
   try {
+    message = chainId.toString() + message;
     const messageHash = import_ethers.ethers.hashMessage(message);
     const recoveredAddress = import_ethers.ethers.recoverAddress(messageHash, signature);
     return recoveredAddress;
@@ -65,9 +66,9 @@ function recoverSerialSigner(message, signature) {
     return null;
   }
 }
-function recoverTypedSigner(data, signature) {
+function recoverTypedSigner(data, signature, chainId) {
   try {
-    const domain = import_silentdatarollup_core.eip721Domain;
+    const domain = { ...import_silentdatarollup_core.eip721Domain, chainId };
     const types = {
       Request: [
         { name: "method", type: "string" },
@@ -86,7 +87,7 @@ function recoverTypedSigner(data, signature) {
     return null;
   }
 }
-function recoverSignerWithDelegate(delegateTicket, delegateSignature, message, isEIP712) {
+function recoverSignerWithDelegate(delegateTicket, delegateSignature, message, isEIP712, chainId) {
   try {
     const ticket = JSON.parse(delegateTicket);
     if (!ticket.expires || !ticket.ephemeralAddress) {
@@ -103,9 +104,9 @@ function recoverSignerWithDelegate(delegateTicket, delegateSignature, message, i
         params: JSON.stringify(JSON.parse(message).params),
         timestamp: ticket.timestamp
       };
-      delegateAddress = recoverTypedSigner(data, delegateSignature);
+      delegateAddress = recoverTypedSigner(data, delegateSignature, chainId);
     } else {
-      delegateAddress = recoverSerialSigner(message, delegateSignature);
+      delegateAddress = recoverSerialSigner(message, delegateSignature, chainId);
     }
     if (!delegateAddress || delegateAddress.toLowerCase() !== ticket.ephemeralAddress.toLowerCase()) {
       return null;
@@ -115,7 +116,7 @@ function recoverSignerWithDelegate(delegateTicket, delegateSignature, message, i
       ephemeralAddress: ticket.ephemeralAddress
     };
     const delegatorAddress = import_ethers.ethers.verifyTypedData(
-      import_silentdatarollup_core.eip721Domain,
+      { ...import_silentdatarollup_core.eip721Domain, chainId },
       import_silentdatarollup_core.delegateEIP721Types,
       ticketData,
       ticket.signature
@@ -128,7 +129,7 @@ function recoverSignerWithDelegate(delegateTicket, delegateSignature, message, i
     return null;
   }
 }
-function recoverSigner(headers, body) {
+function recoverSigner(headers, body, chainId) {
   const timestamp = headers[import_silentdatarollup_core.HEADER_TIMESTAMP];
   if (!timestamp) {
     return null;
@@ -149,13 +150,14 @@ function recoverSigner(headers, body) {
       delegateTicket,
       delegateSignature || eip712DelegateSignature || "",
       body,
-      !!eip712DelegateSignature
+      !!eip712DelegateSignature,
+      chainId
     );
     return result ? result.delegator : null;
   }
   if (signature) {
     const message = `${body}${timestamp}`;
-    return recoverSerialSigner(message, signature);
+    return recoverSerialSigner(message, signature, chainId);
   }
   if (eip712Signature) {
     try {
@@ -165,7 +167,7 @@ function recoverSigner(headers, body) {
         params: JSON.stringify(parsedBody.params),
         timestamp
       };
-      return recoverTypedSigner(data, eip712Signature);
+      return recoverTypedSigner(data, eip712Signature, chainId);
     } catch {
       return null;
     }
@@ -393,9 +395,11 @@ function createRpcValidationMiddleware(provider2) {
       next();
       return;
     }
+    const { chainId } = await provider2.getNetwork();
     const signer = recoverSigner(
       req.headers,
-      bodyString
+      bodyString,
+      chainId
     );
     if (["eth_getTransactionByHash", "eth_getTransactionReceipt"].includes(method)) {
       const transaction = await validateTransactionMethod(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliedblockchain/silentdatarollup-custom-rpc",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Custom RPC for Silent Data [Rollup]",
   "author": "Applied Blockchain",
   "homepage": "https://github.com/appliedblockchain/silent-data-rollup-providers#readme",
@@ -19,13 +19,13 @@
   ],
   "bin": "dist/index.js",
   "scripts": {
-    "build": "tsup src/index.ts --format cjs --clean",
+    "build": "tsc --noEmit && tsup src/index.ts --format cjs --clean",
     "check-exports": "attw --pack . --profile node16",
     "dev": "concurrently --kill-others-on-fail -s all -p '[{name}]' -n 'HARDHAT,CUSTOM RPC' -c 'bgGreen.bold,bgBlue.bold' 'hardhat node' 'nodemon'",
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@appliedblockchain/silentdatarollup-core": "1.0.3",
+    "@appliedblockchain/silentdatarollup-core": "1.0.5",
     "body-parser": "1.20.3",
     "dotenv": "16.4.7",
     "ethers": "6.13.2",