@appliedblockchain/silentdatarollup-core 1.0.2 → 1.0.4

package/dist/{chunk-XU34XEI3.mjs → chunk-CH35C5Q7.mjs}

@@ -3,11 +3,11 @@ import debug2 from "debug";
 
 // src/constants.ts
 var SIGN_RPC_METHODS = [
+  "eth_estimateGas",
+  "eth_getProof",
   "eth_getTransactionByHash",
   "eth_getTransactionCount",
-  "eth_getProof",
-  "eth_getTransactionReceipt",
-  "eth_estimateGas"
+  "eth_getTransactionReceipt"
 ];
 var eip721Domain = {
   name: "Silent Data [Rollup]",
@@ -27,7 +27,7 @@ var HEADER_EIP712_SIGNATURE = "x-eip712-signature";
 var HEADER_DELEGATE = "x-delegate";
 var HEADER_DELEGATE_SIGNATURE = "x-delegate-signature";
 var HEADER_EIP712_DELEGATE_SIGNATURE = "x-eip712-delegate-signature";
-var DEFAULT_DELEGATE_EXPIRES = 24 * 60 * 60;
+var DEFAULT_DELEGATE_EXPIRES = 10 * 60 * 60;
 var DELEGATE_EXPIRATION_THRESHOLD_BUFFER = 5;
 var WHITELISTED_METHODS = [
   "eth_blockNumber",
@@ -79,8 +79,8 @@ var WHITELISTED_METHODS = [
 
 // src/types.ts
 var ChainId = /* @__PURE__ */ ((ChainId2) => {
-  ChainId2[ChainId2["MAINNET"] = 51966] = "MAINNET";
-  ChainId2[ChainId2["TESTNET"] = 1001] = "TESTNET";
+  ChainId2[ChainId2["MAINNET"] = 380929] = "MAINNET";
+  ChainId2[ChainId2["TESTNET"] = 381185] = "TESTNET";
   return ChainId2;
 })(ChainId || {});
 var NetworkName = /* @__PURE__ */ ((NetworkName2) => {
@@ -116,7 +116,7 @@ function getAuthEIP721Types(payload) {
     ]
   };
 }
-async function signAuthHeaderTypedData(signer, payload, timestamp) {
+async function signAuthHeaderTypedData(signer, payload, timestamp, chainId) {
   log("Preparing payload for signTypedData");
   const preparePayload = (p) => ({
     ...p,
@@ -128,27 +128,25 @@ async function signAuthHeaderTypedData(signer, payload, timestamp) {
     timestamp
   };
   const types = getAuthEIP721Types(payload);
-  log(
-    "Signing typed data",
-    JSON.stringify({ eip721Domain, types, message }, null, 2)
-  );
-  const signature = await signer.signTypedData(eip721Domain, types, message);
+  const domain = { ...eip721Domain, chainId };
+  log("Signing typed data", JSON.stringify({ domain, types, message }, null, 2));
+  const signature = await signer.signTypedData(domain, types, message);
   log("Signature generated:", signature);
   return signature;
 }
-async function signAuthHeaderRawMessage(signer, payload, timestamp) {
+async function signAuthHeaderRawMessage(signer, payload, timestamp, chainId) {
   log("Preparing raw message for signing");
   const serialRequest = JSON.stringify(payload);
-  const xMessage = serialRequest + timestamp;
+  const xMessage = chainId + serialRequest + timestamp;
   log("Raw message:", xMessage);
   const signature = await signer.signMessage(xMessage);
   log("Raw signature generated:", signature);
   return signature;
 }
-async function signTypedDelegateHeader(signer, message) {
-  log("Signing typed delegate header");
+async function signTypedDelegateHeader(signer, chainId, message) {
+  log("Signing typed delegate header", { chainId, message });
   const signature = await signer.signTypedData(
-    eip721Domain,
+    { ...eip721Domain, chainId },
     delegateEIP721Types,
     message
   );
@@ -156,9 +154,8 @@ async function signTypedDelegateHeader(signer, message) {
   return signature;
 }
 async function signRawDelegateHeader(signer, message) {
-  log("Signing raw delegate header");
-  log("Raw message:", message);
-  const signature = await signer.signMessage(JSON.stringify(message));
+  log("Signing raw delegate header", message);
+  const signature = await signer.signMessage(message);
   log("Raw signature generated:", signature);
   return signature;
 }
@@ -167,13 +164,15 @@ async function getAuthHeaders(signer, payload, signatureType) {
   const headers = {
     [HEADER_TIMESTAMP]: xTimestamp
   };
+  const chainId = (await signer.provider.getNetwork()).chainId.toString();
   switch (signatureType) {
     case "RAW" /* Raw */:
       log("Generating raw signature");
       headers[HEADER_SIGNATURE] = await signAuthHeaderRawMessage(
         signer,
         payload,
-        xTimestamp
+        xTimestamp,
+        chainId
       );
       break;
     case "EIP712" /* EIP712 */:
@@ -181,7 +180,8 @@ async function getAuthHeaders(signer, payload, signatureType) {
       headers[HEADER_EIP712_SIGNATURE] = await signAuthHeaderTypedData(
         signer,
         payload,
-        xTimestamp
+        xTimestamp,
+        chainId
       );
       break;
     default:
@@ -231,6 +231,7 @@ var SilentDataRollupBase = class {
     this.cachedHeadersExpiry = 0;
     this.contract = null;
     this.contractMethodsToSign = [];
+    this._cachedNetwork = null;
     this.config = {
       ...config,
       authSignatureType: config.authSignatureType ?? "RAW" /* Raw */
@@ -255,6 +256,18 @@ var SilentDataRollupBase = class {
     }
     return null;
   }
+  /**
+   * Get cached network with simple caching
+   * @param provider - The provider to get the network from
+   * @returns Promise<Network> - The cached or freshly fetched network
+   */
+  async getCachedNetwork(provider) {
+    if (!this._cachedNetwork) {
+      this._cachedNetwork = await provider.getNetwork();
+      log2("Network cached:", this._cachedNetwork);
+    }
+    return this._cachedNetwork;
+  }
   async getDelegateSigner(provider) {
     if (!this.delegateConfig) {
       log2("getDelegateSigner: No delegate config, returning null");
@@ -311,9 +324,8 @@ var SilentDataRollupBase = class {
    * @returns A promise that resolves to the signature string
    */
   async signRawDelegateHeader(provider, message) {
-    log2("signRawDelegateHeader: Signing raw delegate header");
-    log2("signRawDelegateHeader: Raw message:", JSON.stringify(message, null, 2));
-    const signature = await provider.signer.signMessage(JSON.stringify(message));
+    log2("signRawDelegateHeader: Signing raw delegate header", message);
+    const signature = await provider.signer.signMessage(message);
     log2("signRawDelegateHeader: Raw signature generated:", signature);
     return signature;
   }
@@ -324,14 +336,14 @@ var SilentDataRollupBase = class {
    * @param message - The delegate signer message to be signed
    * @returns A promise that resolves to the signature string
    */
-  async signTypedDelegateHeader(provider, message) {
+  async signTypedDelegateHeader(provider, chainId, message) {
     log2("signTypedDelegateHeader: Signing typed delegate header");
     log2(
       "signTypedDelegateHeader: Typed message:",
       JSON.stringify(message, null, 2)
     );
     const signature = await provider.signer.signTypedData(
-      eip721Domain,
+      { ...eip721Domain, chainId },
       delegateEIP721Types,
       message
     );
@@ -359,17 +371,24 @@ var SilentDataRollupBase = class {
       const headers = {
         [HEADER_DELEGATE]: JSON.stringify(delegateSignerMessage)
       };
+      const chainId = (await this.getCachedNetwork(provider)).chainId.toString();
       switch (signatureType) {
-        case "RAW" /* Raw */:
+        case "RAW" /* Raw */: {
           log2("Generating delegate raw signature");
+          const delegateMessageToSign = chainId + JSON.stringify(delegateSignerMessage);
           headers[HEADER_DELEGATE_SIGNATURE] = await this.signRawDelegateHeader(
             provider,
-            delegateSignerMessage
+            delegateMessageToSign
           );
           break;
+        }
         case "EIP712" /* EIP712 */:
           log2("Generating delegate EIP712 signature");
-          headers[HEADER_EIP712_DELEGATE_SIGNATURE] = await this.signTypedDelegateHeader(provider, delegateSignerMessage);
+          headers[HEADER_EIP712_DELEGATE_SIGNATURE] = await this.signTypedDelegateHeader(
+            provider,
+            chainId,
+            delegateSignerMessage
+          );
           break;
         default:
           throw new Error(`Unsupported signature type: ${signatureType}`);
@@ -388,6 +407,7 @@ var SilentDataRollupBase = class {
     const headers = {
       [HEADER_TIMESTAMP]: xTimestamp
     };
+    const chainId = (await this.getCachedNetwork(provider)).chainId.toString();
     const signatureType = this.config.authSignatureType;
     switch (signatureType) {
       case "RAW" /* Raw */:
@@ -395,7 +415,8 @@ var SilentDataRollupBase = class {
         headers[HEADER_SIGNATURE] = await this.signAuthHeaderRawMessage(
           provider,
           payload,
-          xTimestamp
+          xTimestamp,
+          chainId
         );
         break;
       case "EIP712" /* EIP712 */:
@@ -403,7 +424,8 @@ var SilentDataRollupBase = class {
         headers[HEADER_EIP712_SIGNATURE] = await this.signAuthHeaderTypedData(
           provider,
           payload,
-          xTimestamp
+          xTimestamp,
+          chainId
         );
         break;
       default:
@@ -412,29 +434,25 @@ var SilentDataRollupBase = class {
     log2("Auth headers:", JSON.stringify(headers, null, 2));
     return headers;
   }
-  async signAuthHeaderRawMessage(provider, payload, timestamp) {
-    const xMessage = this.prepareSignatureMessage(payload, timestamp);
+  async signAuthHeaderRawMessage(provider, payload, timestamp, chainId) {
+    const xMessage = this.prepareSignatureMessage(chainId, payload, timestamp);
     const delegateSigner = await this.getDelegateSigner(this);
     const signer = delegateSigner ?? provider.signer;
     const signature = await this.signMessage(signer, xMessage);
     log2("Message signed. Signature:", signature);
     return signature;
   }
-  async signAuthHeaderTypedData(provider, payload, timestamp) {
+  async signAuthHeaderTypedData(provider, payload, timestamp, chainId) {
     const message = this.prepareSignatureTypedData(payload, timestamp);
     const types = getAuthEIP721Types(payload);
     const delegateSigner = await this.getDelegateSigner(this);
     const signer = delegateSigner ?? provider.signer;
+    const domain = { ...eip721Domain, chainId };
     log2(
       "Signing typed data",
-      JSON.stringify({ message, types, eip721Domain }, null, 2)
-    );
-    const signature = await this.signTypedData(
-      signer,
-      eip721Domain,
-      types,
-      message
+      JSON.stringify({ message, types, domain }, null, 2)
     );
+    const signature = await this.signTypedData(signer, domain, types, message);
     log2("Message signed. Signature:", signature);
     return signature;
   }
@@ -468,13 +486,13 @@ var SilentDataRollupBase = class {
   /**
    * Prepares the message to be signed for the x-signature header.
    */
-  prepareSignatureMessage(payload, timestamp) {
+  prepareSignatureMessage(chainId, payload, timestamp) {
     log2("Preparing raw message for signing", {
       payload: JSON.stringify(payload, null, 2),
       timestamp
     });
     const serialRequest = JSON.stringify(payload);
-    const xMessage = serialRequest + timestamp;
+    const xMessage = chainId + serialRequest + timestamp;
     log2("Raw message to be signed:", xMessage);
     return xMessage;
   }
@@ -511,6 +529,9 @@ var CustomContractRunner = class {
       "latest"
     );
     tx.nonce = latestNonce;
+    if (!tx.gasLimit) {
+      tx.gasLimit = await this.provider.estimateGas(tx);
+    }
     return this.signer.sendTransaction(tx);
   }
 };

package/dist/index.d.mts

@@ -29,8 +29,8 @@ declare const DELEGATE_EXPIRATION_THRESHOLD_BUFFER = 5;
 declare const WHITELISTED_METHODS: string[];
 
 declare enum ChainId {
-    MAINNET = 51966,
-    TESTNET = 1001
+    MAINNET = 380929,
+    TESTNET = 381185
 }
 declare enum NetworkName {
     MAINNET = "sdr",
@@ -111,8 +111,15 @@ declare class SilentDataRollupBase {
     private cachedHeadersExpiry;
     contract: Contract | null;
     contractMethodsToSign: string[];
+    private _cachedNetwork;
     constructor(config: BaseConfig);
     private resolveDelegateConfig;
+    /**
+     * Get cached network with simple caching
+     * @param provider - The provider to get the network from
+     * @returns Promise<Network> - The cached or freshly fetched network
+     */
+    getCachedNetwork(provider: any): Promise<any>;
     getDelegateSigner(provider: any): Promise<Signer | null>;
     getDelegateSignerMessage(provider: any): Promise<DelegateSignerMessage | null>;
     /**
@@ -122,7 +129,7 @@ declare class SilentDataRollupBase {
      * @param message - The delegate signer message to be signed
      * @returns A promise that resolves to the signature string
      */
-    protected signRawDelegateHeader(provider: any, message: DelegateSignerMessage): Promise<string>;
+    protected signRawDelegateHeader(provider: any, message: string): Promise<string>;
     /**
      * Signs a typed delegate header message.
      * This method can be overridden by extending classes to customize the signing process.
@@ -130,11 +137,11 @@ declare class SilentDataRollupBase {
      * @param message - The delegate signer message to be signed
      * @returns A promise that resolves to the signature string
      */
-    protected signTypedDelegateHeader(provider: any, message: DelegateSignerMessage): Promise<string>;
+    protected signTypedDelegateHeader(provider: any, chainId: string, message: DelegateSignerMessage): Promise<string>;
     getDelegateHeaders(provider: any): Promise<DelegateHeaders>;
     getAuthHeaders(provider: any, payload: JsonRpcPayload | JsonRpcPayload[]): Promise<AuthHeaders>;
-    signAuthHeaderRawMessage(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
-    signAuthHeaderTypedData(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
+    signAuthHeaderRawMessage(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
+    signAuthHeaderTypedData(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
     /**
      * Signs a message using the provided signer.
      * This method can be overridden to customize the signing process.
@@ -157,7 +164,7 @@ declare class SilentDataRollupBase {
     /**
      * Prepares the message to be signed for the x-signature header.
      */
-    prepareSignatureMessage(payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): string;
+    prepareSignatureMessage(chainId: string, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): string;
     /**
      * Prepares the message to be signed for the x-eip712-signature header.
      */
@@ -178,10 +185,10 @@ declare function getAuthEIP721Types(payload: JsonRpcPayload | JsonRpcPayload[]):
         type: string;
     }[];
 };
-declare function signAuthHeaderTypedData(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
-declare function signAuthHeaderRawMessage(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
-declare function signTypedDelegateHeader(signer: any, message: DelegateSignerMessage): Promise<any>;
-declare function signRawDelegateHeader(signer: any, message: DelegateSignerMessage): Promise<string>;
+declare function signAuthHeaderTypedData(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
+declare function signAuthHeaderRawMessage(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
+declare function signTypedDelegateHeader(signer: any, chainId: string, message: DelegateSignerMessage): Promise<any>;
+declare function signRawDelegateHeader(signer: any, message: string): Promise<string>;
 declare function getAuthHeaders(signer: Signer, payload: JsonRpcPayload | JsonRpcPayload[], signatureType: SignatureType): Promise<AuthHeaders>;
 /**
  * Determines if a given JSON-RPC payload represents a call to a contract method that requires signing.

package/dist/index.d.ts

@@ -29,8 +29,8 @@ declare const DELEGATE_EXPIRATION_THRESHOLD_BUFFER = 5;
 declare const WHITELISTED_METHODS: string[];
 
 declare enum ChainId {
-    MAINNET = 51966,
-    TESTNET = 1001
+    MAINNET = 380929,
+    TESTNET = 381185
 }
 declare enum NetworkName {
     MAINNET = "sdr",
@@ -111,8 +111,15 @@ declare class SilentDataRollupBase {
     private cachedHeadersExpiry;
     contract: Contract | null;
     contractMethodsToSign: string[];
+    private _cachedNetwork;
     constructor(config: BaseConfig);
     private resolveDelegateConfig;
+    /**
+     * Get cached network with simple caching
+     * @param provider - The provider to get the network from
+     * @returns Promise<Network> - The cached or freshly fetched network
+     */
+    getCachedNetwork(provider: any): Promise<any>;
     getDelegateSigner(provider: any): Promise<Signer | null>;
     getDelegateSignerMessage(provider: any): Promise<DelegateSignerMessage | null>;
     /**
@@ -122,7 +129,7 @@ declare class SilentDataRollupBase {
      * @param message - The delegate signer message to be signed
      * @returns A promise that resolves to the signature string
      */
-    protected signRawDelegateHeader(provider: any, message: DelegateSignerMessage): Promise<string>;
+    protected signRawDelegateHeader(provider: any, message: string): Promise<string>;
     /**
      * Signs a typed delegate header message.
      * This method can be overridden by extending classes to customize the signing process.
@@ -130,11 +137,11 @@ declare class SilentDataRollupBase {
      * @param message - The delegate signer message to be signed
      * @returns A promise that resolves to the signature string
      */
-    protected signTypedDelegateHeader(provider: any, message: DelegateSignerMessage): Promise<string>;
+    protected signTypedDelegateHeader(provider: any, chainId: string, message: DelegateSignerMessage): Promise<string>;
     getDelegateHeaders(provider: any): Promise<DelegateHeaders>;
     getAuthHeaders(provider: any, payload: JsonRpcPayload | JsonRpcPayload[]): Promise<AuthHeaders>;
-    signAuthHeaderRawMessage(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
-    signAuthHeaderTypedData(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
+    signAuthHeaderRawMessage(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
+    signAuthHeaderTypedData(provider: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
     /**
      * Signs a message using the provided signer.
      * This method can be overridden to customize the signing process.
@@ -157,7 +164,7 @@ declare class SilentDataRollupBase {
     /**
      * Prepares the message to be signed for the x-signature header.
      */
-    prepareSignatureMessage(payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): string;
+    prepareSignatureMessage(chainId: string, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): string;
     /**
      * Prepares the message to be signed for the x-eip712-signature header.
      */
@@ -178,10 +185,10 @@ declare function getAuthEIP721Types(payload: JsonRpcPayload | JsonRpcPayload[]):
         type: string;
     }[];
 };
-declare function signAuthHeaderTypedData(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
-declare function signAuthHeaderRawMessage(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string): Promise<string>;
-declare function signTypedDelegateHeader(signer: any, message: DelegateSignerMessage): Promise<any>;
-declare function signRawDelegateHeader(signer: any, message: DelegateSignerMessage): Promise<string>;
+declare function signAuthHeaderTypedData(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
+declare function signAuthHeaderRawMessage(signer: any, payload: JsonRpcPayload | JsonRpcPayload[], timestamp: string, chainId: string): Promise<string>;
+declare function signTypedDelegateHeader(signer: any, chainId: string, message: DelegateSignerMessage): Promise<any>;
+declare function signRawDelegateHeader(signer: any, message: string): Promise<string>;
 declare function getAuthHeaders(signer: Signer, payload: JsonRpcPayload | JsonRpcPayload[], signatureType: SignatureType): Promise<AuthHeaders>;
 /**
  * Determines if a given JSON-RPC payload represents a call to a contract method that requires signing.

package/dist/index.js

@@ -69,11 +69,11 @@ var import_debug2 = __toESM(require("debug"));
 
 // src/constants.ts
 var SIGN_RPC_METHODS = [
+  "eth_estimateGas",
+  "eth_getProof",
   "eth_getTransactionByHash",
   "eth_getTransactionCount",
-  "eth_getProof",
-  "eth_getTransactionReceipt",
-  "eth_estimateGas"
+  "eth_getTransactionReceipt"
 ];
 var eip721Domain = {
   name: "Silent Data [Rollup]",
@@ -93,7 +93,7 @@ var HEADER_EIP712_SIGNATURE = "x-eip712-signature";
 var HEADER_DELEGATE = "x-delegate";
 var HEADER_DELEGATE_SIGNATURE = "x-delegate-signature";
 var HEADER_EIP712_DELEGATE_SIGNATURE = "x-eip712-delegate-signature";
-var DEFAULT_DELEGATE_EXPIRES = 24 * 60 * 60;
+var DEFAULT_DELEGATE_EXPIRES = 10 * 60 * 60;
 var DELEGATE_EXPIRATION_THRESHOLD_BUFFER = 5;
 var WHITELISTED_METHODS = [
   "eth_blockNumber",
@@ -145,8 +145,8 @@ var WHITELISTED_METHODS = [
 
 // src/types.ts
 var ChainId = /* @__PURE__ */ ((ChainId2) => {
-  ChainId2[ChainId2["MAINNET"] = 51966] = "MAINNET";
-  ChainId2[ChainId2["TESTNET"] = 1001] = "TESTNET";
+  ChainId2[ChainId2["MAINNET"] = 380929] = "MAINNET";
+  ChainId2[ChainId2["TESTNET"] = 381185] = "TESTNET";
   return ChainId2;
 })(ChainId || {});
 var NetworkName = /* @__PURE__ */ ((NetworkName2) => {
@@ -182,7 +182,7 @@ function getAuthEIP721Types(payload) {
     ]
   };
 }
-async function signAuthHeaderTypedData(signer, payload, timestamp) {
+async function signAuthHeaderTypedData(signer, payload, timestamp, chainId) {
   log("Preparing payload for signTypedData");
   const preparePayload = (p) => ({
     ...p,
@@ -194,27 +194,25 @@ async function signAuthHeaderTypedData(signer, payload, timestamp) {
     timestamp
   };
   const types = getAuthEIP721Types(payload);
-  log(
-    "Signing typed data",
-    JSON.stringify({ eip721Domain, types, message }, null, 2)
-  );
-  const signature = await signer.signTypedData(eip721Domain, types, message);
+  const domain = { ...eip721Domain, chainId };
+  log("Signing typed data", JSON.stringify({ domain, types, message }, null, 2));
+  const signature = await signer.signTypedData(domain, types, message);
   log("Signature generated:", signature);
   return signature;
 }
-async function signAuthHeaderRawMessage(signer, payload, timestamp) {
+async function signAuthHeaderRawMessage(signer, payload, timestamp, chainId) {
   log("Preparing raw message for signing");
   const serialRequest = JSON.stringify(payload);
-  const xMessage = serialRequest + timestamp;
+  const xMessage = chainId + serialRequest + timestamp;
   log("Raw message:", xMessage);
   const signature = await signer.signMessage(xMessage);
   log("Raw signature generated:", signature);
   return signature;
 }
-async function signTypedDelegateHeader(signer, message) {
-  log("Signing typed delegate header");
+async function signTypedDelegateHeader(signer, chainId, message) {
+  log("Signing typed delegate header", { chainId, message });
   const signature = await signer.signTypedData(
-    eip721Domain,
+    { ...eip721Domain, chainId },
     delegateEIP721Types,
     message
   );
@@ -222,9 +220,8 @@ async function signTypedDelegateHeader(signer, message) {
   return signature;
 }
 async function signRawDelegateHeader(signer, message) {
-  log("Signing raw delegate header");
-  log("Raw message:", message);
-  const signature = await signer.signMessage(JSON.stringify(message));
+  log("Signing raw delegate header", message);
+  const signature = await signer.signMessage(message);
   log("Raw signature generated:", signature);
   return signature;
 }
@@ -233,13 +230,15 @@ async function getAuthHeaders(signer, payload, signatureType) {
   const headers = {
     [HEADER_TIMESTAMP]: xTimestamp
   };
+  const chainId = (await signer.provider.getNetwork()).chainId.toString();
   switch (signatureType) {
     case "RAW" /* Raw */:
       log("Generating raw signature");
       headers[HEADER_SIGNATURE] = await signAuthHeaderRawMessage(
         signer,
         payload,
-        xTimestamp
+        xTimestamp,
+        chainId
       );
       break;
     case "EIP712" /* EIP712 */:
@@ -247,7 +246,8 @@ async function getAuthHeaders(signer, payload, signatureType) {
       headers[HEADER_EIP712_SIGNATURE] = await signAuthHeaderTypedData(
         signer,
         payload,
-        xTimestamp
+        xTimestamp,
+        chainId
       );
       break;
     default:
@@ -297,6 +297,7 @@ var SilentDataRollupBase = class {
     this.cachedHeadersExpiry = 0;
     this.contract = null;
     this.contractMethodsToSign = [];
+    this._cachedNetwork = null;
     this.config = {
       ...config,
       authSignatureType: config.authSignatureType ?? "RAW" /* Raw */
@@ -321,6 +322,18 @@ var SilentDataRollupBase = class {
     }
     return null;
   }
+  /**
+   * Get cached network with simple caching
+   * @param provider - The provider to get the network from
+   * @returns Promise<Network> - The cached or freshly fetched network
+   */
+  async getCachedNetwork(provider) {
+    if (!this._cachedNetwork) {
+      this._cachedNetwork = await provider.getNetwork();
+      log2("Network cached:", this._cachedNetwork);
+    }
+    return this._cachedNetwork;
+  }
   async getDelegateSigner(provider) {
     if (!this.delegateConfig) {
       log2("getDelegateSigner: No delegate config, returning null");
@@ -377,9 +390,8 @@ var SilentDataRollupBase = class {
    * @returns A promise that resolves to the signature string
    */
   async signRawDelegateHeader(provider, message) {
-    log2("signRawDelegateHeader: Signing raw delegate header");
-    log2("signRawDelegateHeader: Raw message:", JSON.stringify(message, null, 2));
-    const signature = await provider.signer.signMessage(JSON.stringify(message));
+    log2("signRawDelegateHeader: Signing raw delegate header", message);
+    const signature = await provider.signer.signMessage(message);
     log2("signRawDelegateHeader: Raw signature generated:", signature);
     return signature;
   }
@@ -390,14 +402,14 @@ var SilentDataRollupBase = class {
    * @param message - The delegate signer message to be signed
    * @returns A promise that resolves to the signature string
    */
-  async signTypedDelegateHeader(provider, message) {
+  async signTypedDelegateHeader(provider, chainId, message) {
     log2("signTypedDelegateHeader: Signing typed delegate header");
     log2(
       "signTypedDelegateHeader: Typed message:",
       JSON.stringify(message, null, 2)
     );
     const signature = await provider.signer.signTypedData(
-      eip721Domain,
+      { ...eip721Domain, chainId },
       delegateEIP721Types,
       message
     );
@@ -425,17 +437,24 @@ var SilentDataRollupBase = class {
       const headers = {
         [HEADER_DELEGATE]: JSON.stringify(delegateSignerMessage)
       };
+      const chainId = (await this.getCachedNetwork(provider)).chainId.toString();
       switch (signatureType) {
-        case "RAW" /* Raw */:
+        case "RAW" /* Raw */: {
           log2("Generating delegate raw signature");
+          const delegateMessageToSign = chainId + JSON.stringify(delegateSignerMessage);
           headers[HEADER_DELEGATE_SIGNATURE] = await this.signRawDelegateHeader(
             provider,
-            delegateSignerMessage
+            delegateMessageToSign
           );
           break;
+        }
         case "EIP712" /* EIP712 */:
           log2("Generating delegate EIP712 signature");
-          headers[HEADER_EIP712_DELEGATE_SIGNATURE] = await this.signTypedDelegateHeader(provider, delegateSignerMessage);
+          headers[HEADER_EIP712_DELEGATE_SIGNATURE] = await this.signTypedDelegateHeader(
+            provider,
+            chainId,
+            delegateSignerMessage
+          );
           break;
         default:
           throw new Error(`Unsupported signature type: ${signatureType}`);
@@ -454,6 +473,7 @@ var SilentDataRollupBase = class {
     const headers = {
       [HEADER_TIMESTAMP]: xTimestamp
     };
+    const chainId = (await this.getCachedNetwork(provider)).chainId.toString();
     const signatureType = this.config.authSignatureType;
     switch (signatureType) {
       case "RAW" /* Raw */:
@@ -461,7 +481,8 @@ var SilentDataRollupBase = class {
         headers[HEADER_SIGNATURE] = await this.signAuthHeaderRawMessage(
           provider,
           payload,
-          xTimestamp
+          xTimestamp,
+          chainId
         );
         break;
       case "EIP712" /* EIP712 */:
@@ -469,7 +490,8 @@ var SilentDataRollupBase = class {
         headers[HEADER_EIP712_SIGNATURE] = await this.signAuthHeaderTypedData(
           provider,
           payload,
-          xTimestamp
+          xTimestamp,
+          chainId
         );
         break;
       default:
@@ -478,29 +500,25 @@ var SilentDataRollupBase = class {
     log2("Auth headers:", JSON.stringify(headers, null, 2));
     return headers;
   }
-  async signAuthHeaderRawMessage(provider, payload, timestamp) {
-    const xMessage = this.prepareSignatureMessage(payload, timestamp);
+  async signAuthHeaderRawMessage(provider, payload, timestamp, chainId) {
+    const xMessage = this.prepareSignatureMessage(chainId, payload, timestamp);
     const delegateSigner = await this.getDelegateSigner(this);
     const signer = delegateSigner ?? provider.signer;
     const signature = await this.signMessage(signer, xMessage);
     log2("Message signed. Signature:", signature);
     return signature;
   }
-  async signAuthHeaderTypedData(provider, payload, timestamp) {
+  async signAuthHeaderTypedData(provider, payload, timestamp, chainId) {
     const message = this.prepareSignatureTypedData(payload, timestamp);
     const types = getAuthEIP721Types(payload);
     const delegateSigner = await this.getDelegateSigner(this);
     const signer = delegateSigner ?? provider.signer;
+    const domain = { ...eip721Domain, chainId };
     log2(
       "Signing typed data",
-      JSON.stringify({ message, types, eip721Domain }, null, 2)
-    );
-    const signature = await this.signTypedData(
-      signer,
-      eip721Domain,
-      types,
-      message
+      JSON.stringify({ message, types, domain }, null, 2)
     );
+    const signature = await this.signTypedData(signer, domain, types, message);
     log2("Message signed. Signature:", signature);
     return signature;
   }
@@ -534,13 +552,13 @@ var SilentDataRollupBase = class {
   /**
    * Prepares the message to be signed for the x-signature header.
    */
-  prepareSignatureMessage(payload, timestamp) {
+  prepareSignatureMessage(chainId, payload, timestamp) {
     log2("Preparing raw message for signing", {
       payload: JSON.stringify(payload, null, 2),
       timestamp
     });
     const serialRequest = JSON.stringify(payload);
-    const xMessage = serialRequest + timestamp;
+    const xMessage = chainId + serialRequest + timestamp;
     log2("Raw message to be signed:", xMessage);
     return xMessage;
   }
@@ -573,6 +591,9 @@ var CustomContractRunner = class {
       "latest"
     );
     tx.nonce = latestNonce;
+    if (!tx.gasLimit) {
+      tx.gasLimit = await this.provider.estimateGas(tx);
+    }
     return this.signer.sendTransaction(tx);
   }
 };

package/dist/index.mjs

@@ -30,7 +30,7 @@ import {
   signAuthHeaderTypedData,
   signRawDelegateHeader,
   signTypedDelegateHeader
-} from "./chunk-XU34XEI3.mjs";
+} from "./chunk-CH35C5Q7.mjs";
 export {
   ChainId,
   DEBUG_NAMESPACE,

package/dist/tests.js

@@ -39,7 +39,7 @@ var import_debug2 = __toESM(require("debug"));
 
 // src/constants.ts
 var DEBUG_NAMESPACE = "silentdata:core";
-var DEFAULT_DELEGATE_EXPIRES = 24 * 60 * 60;
+var DEFAULT_DELEGATE_EXPIRES = 10 * 60 * 60;
 
 // src/utils.ts
 var import_debug = __toESM(require("debug"));
@@ -62,7 +62,7 @@ var PRIVATE_EVENT_SIGNATURE_HASH = (0, import_ethers3.keccak256)(
 // tests/utils/mocked-custom-grpc.ts
 var import_http = __toESM(require("http"));
 var currentPort = 3e3;
-var CHAIN_ID = 1001 /* TESTNET */;
+var CHAIN_ID = 381185 /* TESTNET */;
 function createCustomRpcServer(callback) {
   const port = currentPort++;
   const customRpcUrl = `http://localhost:${port}`;

package/dist/tests.mjs

@@ -1,9 +1,9 @@
-import "./chunk-XU34XEI3.mjs";
+import "./chunk-CH35C5Q7.mjs";
 
 // tests/utils/mocked-custom-grpc.ts
 import http from "http";
 var currentPort = 3e3;
-var CHAIN_ID = 1001 /* TESTNET */;
+var CHAIN_ID = 381185 /* TESTNET */;
 function createCustomRpcServer(callback) {
   const port = currentPort++;
   const customRpcUrl = `http://localhost:${port}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliedblockchain/silentdatarollup-core",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Core library for Silent Data [Rollup]",
   "author": "Applied Blockchain",
   "homepage": "https://github.com/appliedblockchain/silent-data-rollup-providers#readme",
@@ -29,7 +29,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts src/tests.ts --format cjs,esm --dts --clean",
+    "build": "tsc --noEmit && tsup src/index.ts src/tests.ts --format cjs,esm --dts --clean",
     "check-exports": "attw --pack . --profile node16",
     "prepack": "npm run build"
   },