@appliedblockchain/silentdatarollup-hardhat-plugin-fireblocks 1.0.8 → 1.0.10

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Applied Blockchain Ltd.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -20,7 +20,7 @@ Custom providers for integrating Silent Data with Hardhat and Fireblocks.
 
 - Node.js (version 18 or higher)
 - Hardhat v2
-- npm
+- pnpm
 - Basic knowledge of Ethereum and smart contracts
 
 ## Integration
@@ -30,7 +30,7 @@ Custom providers for integrating Silent Data with Hardhat and Fireblocks.
 #### Installing Hardhat Integration Dependencies
 
 ```bash
-npm install @appliedblockchain/silentdatarollup-core @appliedblockchain/silentdatarollup-hardhat-plugin-fireblocks @nomicfoundation/hardhat-ignition-ethers@0.15.7
+pnpm add @appliedblockchain/silentdatarollup-core @appliedblockchain/silentdatarollup-hardhat-plugin-fireblocks @nomicfoundation/hardhat-ignition-ethers@0.15.9
 ```
 
 #### Hardhat Integration Example

package/dist/index.js

@@ -65,8 +65,7 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
     log(".request()", JSON.stringify(args, null, 2));
     const payload = {
       jsonrpc: "2.0",
-      ...args,
-      id: Math.floor(Math.random() * 1e10)
+      ...args
     };
     if (args.method === "eth_sendTransaction") {
       return this.sendTransaction(payload);
@@ -92,7 +91,7 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
   }
   sendAsync(payload, callback) {
     log("Provider .sendAsync() method called:", payload.method);
-    this.request(payload).then(callback).catch(callback);
+    this.request(payload).then((result) => callback(null, result)).catch((error) => callback(error));
   }
   setupInterceptor(provider) {
     log("Setting up silent data interceptor for Fireblocks");
@@ -100,23 +99,28 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
     provider.send = async (payload, callback) => {
       ;
       (async () => {
-        const requiresAuthHeaders = SIGN_RPC_METHODS.includes(payload.method);
         if (payload.method === "eth_sendTransaction") {
           try {
-            const result2 = await this.sendTransaction(payload);
-            callback(null, result2);
+            const result = await this.sendTransaction(payload);
+            callback(null, result);
           } catch (error) {
             callback(error, null);
           }
           return;
         }
-        log("Intercepted send method:", JSON.stringify(payload, null, 2));
+        const requestId = payload.id ?? Math.floor(Math.random() * 1e10);
+        const modifiedPayload = { ...payload, id: requestId };
+        log(
+          "Intercepted send method:",
+          JSON.stringify(modifiedPayload, null, 2)
+        );
+        const requiresAuthHeaders = SIGN_RPC_METHODS.includes(payload.method);
         if (requiresAuthHeaders) {
           log("Request requires auth headers");
           const clonedEthereum = new import_fireblocks_web3_provider.FireblocksWeb3Provider(
             provider.config
           );
-          const authHeaders = await this.getAuthHeaders(payload);
+          const authHeaders = await this.getAuthHeaders(modifiedPayload);
           const allHeaders = [];
           for (const [key, value] of Object.entries(authHeaders)) {
             allHeaders.push({ name: key, value });
@@ -124,10 +128,12 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
           ;
           clonedEthereum.headers = allHeaders;
           log("Auth headers set for cloned FireblocksWeb3Provider provider");
-          return originalSend.call(clonedEthereum, payload, callback);
+          return originalSend.call(clonedEthereum, modifiedPayload, callback);
         }
-        const result = await originalSend.call(provider, payload, callback);
-        return result;
+        const wrappedCallback = (error, response) => {
+          callback(error, response);
+        };
+        return originalSend.call(provider, modifiedPayload, wrappedCallback);
       })();
     };
   }
@@ -159,12 +165,6 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
   }
   async getAuthHeaders(payload) {
     log("Getting auth headers for method:", JSON.stringify(payload, null, 2));
-    const requestId = this._wrappedProvider._provider._wrappedProvider._wrappedProvider._wrappedProvider._nextRequestId;
-    const rpcRequest = {
-      jsonrpc: "2.0",
-      ...payload,
-      id: requestId
-    };
     const xTimestamp = (/* @__PURE__ */ new Date()).toISOString();
     const headers = {
       [import_silentdatarollup_core2.HEADER_TIMESTAMP]: xTimestamp
@@ -174,19 +174,16 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
     let content;
     switch (signatureType) {
       case import_silentdatarollup_core2.SignatureType.Raw:
-        const preparedMessage = this.baseProvider.prepareSignatureMessage(
+        const preparedMessage = this.baseProvider.prepareMessage(
           chainId.toString(),
-          rpcRequest,
+          payload,
           xTimestamp
         );
         content = (0, import_ethers.hashMessage)(preparedMessage).slice(2);
         break;
       case import_silentdatarollup_core2.SignatureType.EIP712:
         const types = (0, import_silentdatarollup_core2.getAuthEIP721Types)(payload);
-        const message = this.baseProvider.prepareSignatureTypedData(
-          payload,
-          xTimestamp
-        );
+        const message = this.baseProvider.prepareTypedData(payload, xTimestamp);
         content = {
           types: {
             EIP712Domain: [
@@ -301,18 +298,20 @@ var SilentDataFireblocksSigner = class extends import_plugins.ProviderWrapper {
     return [maxPriorityFeePerGas, maxFeePerGas];
   }
   async estimateGasLimit(txParams) {
-    const gasLimitHex = await this._wrappedProvider.request({
-      method: "eth_estimateGas",
-      params: [txParams]
-    });
+    const gasLimitHex = await this.send("eth_estimateGas", [
+      txParams
+    ]);
     return parseInt(gasLimitHex, 16);
   }
+  async getTransactionReceipt(txHash) {
+    const receipt = await this.send("eth_getTransactionReceipt", [
+      txHash
+    ]);
+    return receipt;
+  }
   async waitForTransaction(txHash) {
     for (let i = 0; i < this.maxRetries; i++) {
-      const receipt = await this._wrappedProvider.request({
-        method: "eth_getTransactionReceipt",
-        params: [txHash]
-      });
+      const receipt = await this.getTransactionReceipt(txHash);
       if (receipt) {
         log("Transaction mined, receipt:", JSON.stringify(receipt, null, 2));
         if (receipt.status !== "0x1") {

package/dist/index.mjs

@@ -52,8 +52,7 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
     log(".request()", JSON.stringify(args, null, 2));
     const payload = {
       jsonrpc: "2.0",
-      ...args,
-      id: Math.floor(Math.random() * 1e10)
+      ...args
     };
     if (args.method === "eth_sendTransaction") {
       return this.sendTransaction(payload);
@@ -79,7 +78,7 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
   }
   sendAsync(payload, callback) {
     log("Provider .sendAsync() method called:", payload.method);
-    this.request(payload).then(callback).catch(callback);
+    this.request(payload).then((result) => callback(null, result)).catch((error) => callback(error));
   }
   setupInterceptor(provider) {
     log("Setting up silent data interceptor for Fireblocks");
@@ -87,23 +86,28 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
     provider.send = async (payload, callback) => {
       ;
       (async () => {
-        const requiresAuthHeaders = SIGN_RPC_METHODS.includes(payload.method);
         if (payload.method === "eth_sendTransaction") {
           try {
-            const result2 = await this.sendTransaction(payload);
-            callback(null, result2);
+            const result = await this.sendTransaction(payload);
+            callback(null, result);
           } catch (error) {
             callback(error, null);
           }
           return;
         }
-        log("Intercepted send method:", JSON.stringify(payload, null, 2));
+        const requestId = payload.id ?? Math.floor(Math.random() * 1e10);
+        const modifiedPayload = { ...payload, id: requestId };
+        log(
+          "Intercepted send method:",
+          JSON.stringify(modifiedPayload, null, 2)
+        );
+        const requiresAuthHeaders = SIGN_RPC_METHODS.includes(payload.method);
         if (requiresAuthHeaders) {
           log("Request requires auth headers");
           const clonedEthereum = new FireblocksWeb3Provider(
             provider.config
           );
-          const authHeaders = await this.getAuthHeaders(payload);
+          const authHeaders = await this.getAuthHeaders(modifiedPayload);
           const allHeaders = [];
           for (const [key, value] of Object.entries(authHeaders)) {
             allHeaders.push({ name: key, value });
@@ -111,10 +115,12 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
           ;
           clonedEthereum.headers = allHeaders;
           log("Auth headers set for cloned FireblocksWeb3Provider provider");
-          return originalSend.call(clonedEthereum, payload, callback);
+          return originalSend.call(clonedEthereum, modifiedPayload, callback);
         }
-        const result = await originalSend.call(provider, payload, callback);
-        return result;
+        const wrappedCallback = (error, response) => {
+          callback(error, response);
+        };
+        return originalSend.call(provider, modifiedPayload, wrappedCallback);
       })();
     };
   }
@@ -146,12 +152,6 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
   }
   async getAuthHeaders(payload) {
     log("Getting auth headers for method:", JSON.stringify(payload, null, 2));
-    const requestId = this._wrappedProvider._provider._wrappedProvider._wrappedProvider._wrappedProvider._nextRequestId;
-    const rpcRequest = {
-      jsonrpc: "2.0",
-      ...payload,
-      id: requestId
-    };
     const xTimestamp = (/* @__PURE__ */ new Date()).toISOString();
     const headers = {
       [HEADER_TIMESTAMP]: xTimestamp
@@ -161,19 +161,16 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
     let content;
     switch (signatureType) {
       case SignatureType.Raw:
-        const preparedMessage = this.baseProvider.prepareSignatureMessage(
+        const preparedMessage = this.baseProvider.prepareMessage(
           chainId.toString(),
-          rpcRequest,
+          payload,
           xTimestamp
         );
         content = hashMessage(preparedMessage).slice(2);
         break;
       case SignatureType.EIP712:
         const types = getAuthEIP721Types(payload);
-        const message = this.baseProvider.prepareSignatureTypedData(
-          payload,
-          xTimestamp
-        );
+        const message = this.baseProvider.prepareTypedData(payload, xTimestamp);
         content = {
           types: {
             EIP712Domain: [
@@ -288,18 +285,20 @@ var SilentDataFireblocksSigner = class extends ProviderWrapper {
     return [maxPriorityFeePerGas, maxFeePerGas];
   }
   async estimateGasLimit(txParams) {
-    const gasLimitHex = await this._wrappedProvider.request({
-      method: "eth_estimateGas",
-      params: [txParams]
-    });
+    const gasLimitHex = await this.send("eth_estimateGas", [
+      txParams
+    ]);
     return parseInt(gasLimitHex, 16);
   }
+  async getTransactionReceipt(txHash) {
+    const receipt = await this.send("eth_getTransactionReceipt", [
+      txHash
+    ]);
+    return receipt;
+  }
   async waitForTransaction(txHash) {
     for (let i = 0; i < this.maxRetries; i++) {
-      const receipt = await this._wrappedProvider.request({
-        method: "eth_getTransactionReceipt",
-        params: [txHash]
-      });
+      const receipt = await this.getTransactionReceipt(txHash);
       if (receipt) {
         log("Transaction mined, receipt:", JSON.stringify(receipt, null, 2));
         if (receipt.status !== "0x1") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliedblockchain/silentdatarollup-hardhat-plugin-fireblocks",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Hardhat plugin for Silent Data with Fireblocks integration",
   "author": "Applied Blockchain",
   "homepage": "https://github.com/appliedblockchain/silent-data-rollup-providers#readme",
@@ -26,22 +26,18 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsc --noEmit && tsup src/index.ts --format cjs,esm --dts --clean",
-    "check-exports": "attw --pack . --profile node16",
-    "prepack": "npm run build"
-  },
   "dependencies": {
-    "@appliedblockchain/silentdatarollup-core": "1.0.8",
+    "@ethersproject/abstract-provider": "5.8.0",
     "@fireblocks/fireblocks-web3-provider": "1.3.8",
     "@fireblocks/hardhat-fireblocks": "1.3.5",
     "debug": "4.3.7",
     "ethers": "6.13.2",
-    "fireblocks-sdk": "5.31.2"
+    "fireblocks-sdk": "5.31.2",
+    "@appliedblockchain/silentdatarollup-core": "1.0.10"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",
-    "@types/node": "22.5.4",
+    "@types/node": "24.10.1",
     "hardhat": "2.22.10",
     "ts-node": "10.9.2",
     "typescript": "5.6.2"
@@ -52,5 +48,9 @@
   },
   "engines": {
     "node": ">=18.0.0"
+  },
+  "scripts": {
+    "build": "tsc --noEmit && tsup src/index.ts --format cjs,esm --dts --clean",
+    "check-exports": "attw --pack . --profile node16"
   }
-}
+}