@appliedblockchain/silentdatarollup-ethers-provider 1.0.6 → 1.0.8

package/README.md

@@ -1,4 +1,4 @@
-# Silent Data [Rollup] Providers - Ethers Provider Package
+# Silent Data Providers - Ethers Provider Package
 
 ## Table of Contents
 
@@ -21,7 +21,7 @@
 
 ## Introduction
 
-Custom providers for Silent Data [Rollup], compatible with ethers.js.
+Custom providers for Silent Data, compatible with ethers.js.
 
 ## Prerequisites
 
@@ -230,5 +230,5 @@ If you encounter any issues, please check the following:
 
 ## Additional Resources
 
-- [Silent Data [Rollup] Documentation](https://docs.silentdata.com)
+- [Silent Data Documentation](https://docs.silentdata.com)
 - [Ethers.js Documentation](https://docs.ethers.org/v6/)

package/dist/index.d.mts

@@ -10,6 +10,7 @@ interface SilentDataRollupProviderConfig extends BaseConfig {
     privateKey?: string;
     signer?: Signer;
     options?: JsonRpcApiProviderOptions;
+    smartWalletAddress?: string;
 }
 /**
  * Extended filter type that includes a special flag for private events

package/dist/index.d.ts

@@ -10,6 +10,7 @@ interface SilentDataRollupProviderConfig extends BaseConfig {
     privateKey?: string;
     signer?: Signer;
     options?: JsonRpcApiProviderOptions;
+    smartWalletAddress?: string;
 }
 /**
  * Extended filter type that includes a special flag for private events

package/dist/index.js

@@ -40,28 +40,77 @@ module.exports = __toCommonJS(index_exports);
 var DEBUG_NAMESPACE = "silentdata:ethers-provider";
 
 // src/provider.ts
+var import_debug = __toESM(require("debug"));
 var import_silentdatarollup_core = require("@appliedblockchain/silentdatarollup-core");
+var import_ethers2 = require("ethers");
+
+// src/signer.ts
 var import_ethers = require("ethers");
+var SilentDataRollupSigner = class extends import_ethers.AbstractSigner {
+  constructor(provider, signer) {
+    if (!provider) {
+      throw new Error("Provider is required");
+    }
+    if (!signer) {
+      throw new Error("Signer is required");
+    }
+    super(provider);
+    this.signer = signer;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  connect(provider) {
+    (0, import_ethers.assert)(
+      false,
+      "cannot reconnect SilentDataRollupSigner",
+      "UNSUPPORTED_OPERATION",
+      {
+        operation: "signer.connect"
+      }
+    );
+  }
+  async getAddress() {
+    return this.signer.getAddress();
+  }
+  async signTransaction(tx) {
+    return this.signer.signTransaction(tx);
+  }
+  async signMessage(message) {
+    return this.signer.signMessage(message);
+  }
+  signTypedData(domain, types, value) {
+    return this.signer.signTypedData(domain, types, value);
+  }
+  async sendTransaction(tx) {
+    let gasLimit = tx.gasLimit;
+    if (!gasLimit) {
+      gasLimit = await this.estimateGas(tx);
+    }
+    return this.signer.sendTransaction({ ...tx, gasLimit });
+  }
+};
+
+// src/provider.ts
+var log = (0, import_debug.default)(import_silentdatarollup_core.DEBUG_NAMESPACE);
 function isPromise(value) {
   return value && typeof value.then === "function";
 }
 function getNetwork(networkName, chainId) {
   if (chainId) {
-    return new import_ethers.Network(networkName ?? "custom", chainId);
+    return new import_ethers2.Network(networkName ?? "custom", chainId);
   }
   if (networkName === import_silentdatarollup_core.NetworkName.MAINNET) {
-    return new import_ethers.Network(networkName, import_silentdatarollup_core.ChainId.MAINNET);
+    return new import_ethers2.Network(networkName, import_silentdatarollup_core.ChainId.MAINNET);
   } else if (networkName === import_silentdatarollup_core.NetworkName.TESTNET) {
-    return new import_ethers.Network(networkName, import_silentdatarollup_core.ChainId.TESTNET);
+    return new import_ethers2.Network(networkName, import_silentdatarollup_core.ChainId.TESTNET);
   }
   return void 0;
 }
 var providerDefaultOptions = {
   batchMaxCount: 1
 };
-var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_ethers.JsonRpcProvider {
+var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_ethers2.JsonRpcProvider {
   constructor(config) {
-    (0, import_ethers.assertArgument)(config.rpcUrl, "rpcUrl is mandatory", "config", config);
+    (0, import_ethers2.assertArgument)(config.rpcUrl, "rpcUrl is mandatory", "config", config);
     const network = getNetwork(config.network, config.chainId);
     const request = _SilentDataRollupProvider.getRequest({
       rpcUrl: config.rpcUrl
@@ -71,7 +120,7 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
       ...config.options
     };
     super(request, network, combinedOptions);
-    (0, import_ethers.assertArgument)(
+    (0, import_ethers2.assertArgument)(
       config.signer || config.privateKey,
       "signer or privateKey is mandatory",
       "config",
@@ -84,10 +133,10 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
       try {
         this.signer = config.signer.connect(this);
       } catch {
-        this.signer = config.signer;
+        this.signer = new SilentDataRollupSigner(this, config.signer);
       }
     } else {
-      const wallet = new import_ethers.Wallet(config.privateKey);
+      const wallet = new import_ethers2.Wallet(config.privateKey);
       this.signer = wallet.connect(this);
     }
   }
@@ -95,6 +144,9 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
     if (Array.isArray(payload)) {
       throw new Error("Batch requests are not currently supported");
     }
+    if (["eth_getBlockByNumber", "eth_getBlockByHash"].includes(payload.method) && Array.isArray(payload.params) && payload.params.length > 1) {
+      payload.params[1] = false;
+    }
     const isEthCallOrEstimateGas = payload.method === "eth_call" || payload.method === "eth_estimateGas";
     if (isEthCallOrEstimateGas && Array.isArray(payload.params)) {
       const txParams = payload.params[0];
@@ -135,6 +187,10 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
           );
         }
       }
+      if (this.config.smartWalletAddress) {
+        log("Setting smart wallet header:", this.config.smartWalletAddress);
+        request.setHeader(import_silentdatarollup_core.HEADER_SIGNER_SWC, this.config.smartWalletAddress);
+      }
       const {
         [import_silentdatarollup_core.HEADER_TIMESTAMP]: xTimestamp,
         [import_silentdatarollup_core.HEADER_SIGNATURE]: xSignature,
@@ -157,7 +213,7 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
     return resp;
   }
   static getRequest({ rpcUrl }) {
-    const request = new import_ethers.FetchRequest(rpcUrl);
+    const request = new import_ethers2.FetchRequest(rpcUrl);
     request.allowGzip = true;
     return request;
   }
@@ -253,7 +309,7 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
         enumerable: false
       });
     }
-    const { network, params } = await (0, import_ethers.resolveProperties)({
+    const { network, params } = await (0, import_ethers2.resolveProperties)({
       network: this.getNetwork(),
       params: this._perform({ method: "getLogs", filter })
     });
@@ -262,17 +318,17 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends import_et
 };
 
 // src/sdInterface.ts
-var import_debug = __toESM(require("debug"));
-var import_ethers2 = require("ethers");
-var debugLog = (0, import_debug.default)(DEBUG_NAMESPACE);
-var SDInterface = class extends import_ethers2.Interface {
+var import_debug2 = __toESM(require("debug"));
+var import_ethers3 = require("ethers");
+var debugLog = (0, import_debug2.default)(DEBUG_NAMESPACE);
+var SDInterface = class extends import_ethers3.Interface {
   /**
    * Extends the parseLog method to handle PrivateEvent logs
    * @param log - The log to parse
    * @returns The parsed log description with additional private event details if applicable
    */
-  parseLog(log) {
-    const parsedLog = super.parseLog(log);
+  parseLog(log2) {
+    const parsedLog = super.parseLog(log2);
     if (!parsedLog) {
       debugLog(
         "Failed to parse log - no matching event found or event is anonymous"

package/dist/index.mjs

@@ -2,14 +2,17 @@
 var DEBUG_NAMESPACE = "silentdata:ethers-provider";
 
 // src/provider.ts
+import debug from "debug";
 import {
   calculateEventTypeHash,
   ChainId,
+  DEBUG_NAMESPACE as DEBUG_NAMESPACE2,
   HEADER_DELEGATE,
   HEADER_DELEGATE_SIGNATURE,
   HEADER_EIP712_DELEGATE_SIGNATURE,
   HEADER_EIP712_SIGNATURE,
   HEADER_SIGNATURE,
+  HEADER_SIGNER_SWC,
   HEADER_TIMESTAMP,
   isSignableContractCall,
   NetworkName,
@@ -26,6 +29,57 @@ import {
   resolveProperties,
   Wallet
 } from "ethers";
+
+// src/signer.ts
+import {
+  AbstractSigner,
+  assert
+} from "ethers";
+var SilentDataRollupSigner = class extends AbstractSigner {
+  constructor(provider, signer) {
+    if (!provider) {
+      throw new Error("Provider is required");
+    }
+    if (!signer) {
+      throw new Error("Signer is required");
+    }
+    super(provider);
+    this.signer = signer;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  connect(provider) {
+    assert(
+      false,
+      "cannot reconnect SilentDataRollupSigner",
+      "UNSUPPORTED_OPERATION",
+      {
+        operation: "signer.connect"
+      }
+    );
+  }
+  async getAddress() {
+    return this.signer.getAddress();
+  }
+  async signTransaction(tx) {
+    return this.signer.signTransaction(tx);
+  }
+  async signMessage(message) {
+    return this.signer.signMessage(message);
+  }
+  signTypedData(domain, types, value) {
+    return this.signer.signTypedData(domain, types, value);
+  }
+  async sendTransaction(tx) {
+    let gasLimit = tx.gasLimit;
+    if (!gasLimit) {
+      gasLimit = await this.estimateGas(tx);
+    }
+    return this.signer.sendTransaction({ ...tx, gasLimit });
+  }
+};
+
+// src/provider.ts
+var log = debug(DEBUG_NAMESPACE2);
 function isPromise(value) {
   return value && typeof value.then === "function";
 }
@@ -68,7 +122,7 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends JsonRpcPr
       try {
         this.signer = config.signer.connect(this);
       } catch {
-        this.signer = config.signer;
+        this.signer = new SilentDataRollupSigner(this, config.signer);
       }
     } else {
       const wallet = new Wallet(config.privateKey);
@@ -79,6 +133,9 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends JsonRpcPr
     if (Array.isArray(payload)) {
       throw new Error("Batch requests are not currently supported");
     }
+    if (["eth_getBlockByNumber", "eth_getBlockByHash"].includes(payload.method) && Array.isArray(payload.params) && payload.params.length > 1) {
+      payload.params[1] = false;
+    }
     const isEthCallOrEstimateGas = payload.method === "eth_call" || payload.method === "eth_estimateGas";
     if (isEthCallOrEstimateGas && Array.isArray(payload.params)) {
       const txParams = payload.params[0];
@@ -119,6 +176,10 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends JsonRpcPr
           );
         }
       }
+      if (this.config.smartWalletAddress) {
+        log("Setting smart wallet header:", this.config.smartWalletAddress);
+        request.setHeader(HEADER_SIGNER_SWC, this.config.smartWalletAddress);
+      }
       const {
         [HEADER_TIMESTAMP]: xTimestamp,
         [HEADER_SIGNATURE]: xSignature,
@@ -246,17 +307,17 @@ var SilentDataRollupProvider = class _SilentDataRollupProvider extends JsonRpcPr
 };
 
 // src/sdInterface.ts
-import debug from "debug";
+import debug2 from "debug";
 import { Interface } from "ethers";
-var debugLog = debug(DEBUG_NAMESPACE);
+var debugLog = debug2(DEBUG_NAMESPACE);
 var SDInterface = class extends Interface {
   /**
    * Extends the parseLog method to handle PrivateEvent logs
    * @param log - The log to parse
    * @returns The parsed log description with additional private event details if applicable
    */
-  parseLog(log) {
-    const parsedLog = super.parseLog(log);
+  parseLog(log2) {
+    const parsedLog = super.parseLog(log2);
     if (!parsedLog) {
       debugLog(
         "Failed to parse log - no matching event found or event is anonymous"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@appliedblockchain/silentdatarollup-ethers-provider",
-  "version": "1.0.6",
-  "description": "Ethers.js provider for Silent Data [Rollup]",
+  "version": "1.0.8",
+  "description": "Ethers.js provider for Silent Data",
   "author": "Applied Blockchain",
   "homepage": "https://github.com/appliedblockchain/silent-data-rollup-providers#readme",
   "keywords": [
@@ -32,7 +32,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@appliedblockchain/silentdatarollup-core": "1.0.6",
+    "@appliedblockchain/silentdatarollup-core": "1.0.8",
     "debug": "4.3.7",
     "ethers": "6.13.2"
   },