@appliedblockchain/silentdatarollup-core 1.0.0 → 1.0.2

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

@@ -6,7 +6,8 @@ var SIGN_RPC_METHODS = [
   "eth_getTransactionByHash",
   "eth_getTransactionCount",
   "eth_getProof",
-  "eth_getTransactionReceipt"
+  "eth_getTransactionReceipt",
+  "eth_estimateGas"
 ];
 var eip721Domain = {
   name: "Silent Data [Rollup]",
@@ -495,20 +496,39 @@ var SilentDataRollupBase = class {
 // src/contract.ts
 import {
   Contract as Contract2,
-  Interface
+  Interface,
+  assertArgument
 } from "ethers";
 var CustomContractRunner = class {
-  constructor(signer) {
-    this.provider = signer.provider;
+  constructor(provider, signer) {
+    this.provider = provider;
     this.signer = signer;
   }
   async sendTransaction(tx) {
-    tx.nonce = await this.signer.getNonce();
+    const signerAddress = await this.signer.getAddress();
+    const latestNonce = await this.provider.getTransactionCount(
+      signerAddress,
+      "latest"
+    );
+    tx.nonce = latestNonce;
     return this.signer.sendTransaction(tx);
   }
 };
+function getContractRunner(runner, provider) {
+  const runnerIsSigner = typeof runner.sendTransaction === "function";
+  if (!runnerIsSigner) {
+    return runner;
+  }
+  const runnerProviderConstructor = runner.provider?.constructor.name ?? "";
+  if (!runnerProviderConstructor.includes("SilentDataRollupProvider")) {
+    assertArgument(provider, "provider is mandatory", "provider", provider);
+    return new CustomContractRunner(provider, runner);
+  }
+  return new CustomContractRunner(runner.provider, runner);
+}
 var SilentDataRollupContract = class extends Contract2 {
-  constructor(address, abi, runner, contractMethodsToSign) {
+  constructor(config) {
+    const { address, abi, runner, contractMethodsToSign, provider } = config;
     const contractInterface = new Interface(abi);
     contractMethodsToSign.forEach((method) => {
       if (!contractInterface.hasFunction(method)) {
@@ -517,18 +537,25 @@ var SilentDataRollupContract = class extends Contract2 {
         );
       }
     });
+    const contractRunner = getContractRunner(runner, provider);
+    super(address, abi, contractRunner);
     const baseProvider = runner.baseProvider || runner.provider?.baseProvider;
-    const runnerIsSigner = typeof runner.sendTransaction === "function";
-    if (runnerIsSigner) {
-      runner = new CustomContractRunner(runner);
-    }
-    super(address, abi, runner);
     if (typeof baseProvider?.setContract === "function") {
       baseProvider.setContract(this, contractMethodsToSign);
     }
   }
 };
 
+// src/privateEvents.ts
+import { keccak256, toUtf8Bytes } from "ethers";
+var PRIVATE_EVENT_SIGNATURE = "PrivateEvent(address[],bytes32,bytes)";
+var PRIVATE_EVENT_SIGNATURE_HASH = keccak256(
+  toUtf8Bytes(PRIVATE_EVENT_SIGNATURE)
+);
+function calculateEventTypeHash(eventSignature) {
+  return keccak256(toUtf8Bytes(eventSignature));
+}
+
 export {
   SIGN_RPC_METHODS,
   eip721Domain,
@@ -557,5 +584,8 @@ export {
   defaultGetDelegate,
   prepareTypedDataPayload,
   SilentDataRollupBase,
-  SilentDataRollupContract
+  SilentDataRollupContract,
+  PRIVATE_EVENT_SIGNATURE,
+  PRIVATE_EVENT_SIGNATURE_HASH,
+  calculateEventTypeHash
 };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Signer, JsonRpcPayload, Contract, TypedDataDomain, TypedDataField, InterfaceAbi, ContractRunner } from 'ethers';
+import { Signer, JsonRpcPayload, InterfaceAbi, ContractRunner, Provider, Contract, TypedDataDomain, TypedDataField } from 'ethers';
 
 declare const SIGN_RPC_METHODS: string[];
 declare const eip721Domain: {
@@ -94,6 +94,13 @@ type DelegateHeaders = {
     [HEADER_DELEGATE_SIGNATURE]?: string;
     [HEADER_EIP712_DELEGATE_SIGNATURE]?: string;
 };
+type SilentDataRollupContractConfig = {
+    address: string;
+    abi: InterfaceAbi;
+    runner: ContractRunner;
+    contractMethodsToSign: string[];
+    provider?: Provider;
+};
 
 declare class SilentDataRollupBase {
     config: BaseConfig;
@@ -158,7 +165,7 @@ declare class SilentDataRollupBase {
 }
 
 declare class SilentDataRollupContract extends Contract {
-    constructor(address: string, abi: InterfaceAbi, runner: ContractRunner, contractMethodsToSign: string[]);
+    constructor(config: SilentDataRollupContractConfig);
 }
 
 declare function getAuthEIP721Types(payload: JsonRpcPayload | JsonRpcPayload[]): {
@@ -202,4 +209,30 @@ declare function isSignableContractCall(payload: JsonRpcPayload, contractMethods
 declare const defaultGetDelegate: (provider: any) => Promise<Signer>;
 declare const prepareTypedDataPayload: (p: JsonRpcPayload) => AuthSignatureMessageRequest;
 
-export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, DEBUG_NAMESPACE, DEBUG_NAMESPACE_SILENTDATA_INTERCEPTOR, DEFAULT_DELEGATE_EXPIRES, DELEGATE_EXPIRATION_THRESHOLD_BUFFER, type DelegateConfig, type DelegateHeaders, type DelegateSignerMessage, HEADER_DELEGATE, HEADER_DELEGATE_SIGNATURE, HEADER_EIP712_DELEGATE_SIGNATURE, HEADER_EIP712_SIGNATURE, HEADER_SIGNATURE, HEADER_TIMESTAMP, NetworkName, SIGN_RPC_METHODS, SignatureType, type SilentDataProviderOptions, SilentDataRollupBase, SilentDataRollupContract, type SilentdataNetworkConfig, WHITELISTED_METHODS, defaultGetDelegate, delegateEIP721Types, eip721Domain, getAuthEIP721Types, getAuthHeaders, isSignableContractCall, prepareTypedDataPayload, signAuthHeaderRawMessage, signAuthHeaderTypedData, signRawDelegateHeader, signTypedDelegateHeader };
+/**
+ * The standard signature for the PrivateEvent as emitted by contracts
+ */
+declare const PRIVATE_EVENT_SIGNATURE = "PrivateEvent(address[],bytes32,bytes)";
+/**
+ * The keccak256 hash of the PrivateEvent signature
+ * Used for filtering logs by event signature
+ */
+declare const PRIVATE_EVENT_SIGNATURE_HASH: string;
+/**
+ * Interface describing the shape of a PrivateEvent
+ */
+interface PrivateEvent {
+    allowedViewers: string[];
+    eventType: string;
+    payload: string;
+}
+/**
+ * Calculate the keccak256 hash of an event signature
+ * This is used to create the eventType parameter for PrivateEvent
+ *
+ * @param eventSignature - The event signature (e.g., "Transfer(address,address,uint256)")
+ * @returns The keccak256 hash of the event signature
+ */
+declare function calculateEventTypeHash(eventSignature: string): string;
+
+export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, DEBUG_NAMESPACE, DEBUG_NAMESPACE_SILENTDATA_INTERCEPTOR, DEFAULT_DELEGATE_EXPIRES, DELEGATE_EXPIRATION_THRESHOLD_BUFFER, type DelegateConfig, type DelegateHeaders, type DelegateSignerMessage, HEADER_DELEGATE, HEADER_DELEGATE_SIGNATURE, HEADER_EIP712_DELEGATE_SIGNATURE, HEADER_EIP712_SIGNATURE, HEADER_SIGNATURE, HEADER_TIMESTAMP, NetworkName, PRIVATE_EVENT_SIGNATURE, PRIVATE_EVENT_SIGNATURE_HASH, type PrivateEvent, SIGN_RPC_METHODS, SignatureType, type SilentDataProviderOptions, SilentDataRollupBase, SilentDataRollupContract, type SilentDataRollupContractConfig, type SilentdataNetworkConfig, WHITELISTED_METHODS, calculateEventTypeHash, defaultGetDelegate, delegateEIP721Types, eip721Domain, getAuthEIP721Types, getAuthHeaders, isSignableContractCall, prepareTypedDataPayload, signAuthHeaderRawMessage, signAuthHeaderTypedData, signRawDelegateHeader, signTypedDelegateHeader };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Signer, JsonRpcPayload, Contract, TypedDataDomain, TypedDataField, InterfaceAbi, ContractRunner } from 'ethers';
+import { Signer, JsonRpcPayload, InterfaceAbi, ContractRunner, Provider, Contract, TypedDataDomain, TypedDataField } from 'ethers';
 
 declare const SIGN_RPC_METHODS: string[];
 declare const eip721Domain: {
@@ -94,6 +94,13 @@ type DelegateHeaders = {
     [HEADER_DELEGATE_SIGNATURE]?: string;
     [HEADER_EIP712_DELEGATE_SIGNATURE]?: string;
 };
+type SilentDataRollupContractConfig = {
+    address: string;
+    abi: InterfaceAbi;
+    runner: ContractRunner;
+    contractMethodsToSign: string[];
+    provider?: Provider;
+};
 
 declare class SilentDataRollupBase {
     config: BaseConfig;
@@ -158,7 +165,7 @@ declare class SilentDataRollupBase {
 }
 
 declare class SilentDataRollupContract extends Contract {
-    constructor(address: string, abi: InterfaceAbi, runner: ContractRunner, contractMethodsToSign: string[]);
+    constructor(config: SilentDataRollupContractConfig);
 }
 
 declare function getAuthEIP721Types(payload: JsonRpcPayload | JsonRpcPayload[]): {
@@ -202,4 +209,30 @@ declare function isSignableContractCall(payload: JsonRpcPayload, contractMethods
 declare const defaultGetDelegate: (provider: any) => Promise<Signer>;
 declare const prepareTypedDataPayload: (p: JsonRpcPayload) => AuthSignatureMessageRequest;
 
-export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, DEBUG_NAMESPACE, DEBUG_NAMESPACE_SILENTDATA_INTERCEPTOR, DEFAULT_DELEGATE_EXPIRES, DELEGATE_EXPIRATION_THRESHOLD_BUFFER, type DelegateConfig, type DelegateHeaders, type DelegateSignerMessage, HEADER_DELEGATE, HEADER_DELEGATE_SIGNATURE, HEADER_EIP712_DELEGATE_SIGNATURE, HEADER_EIP712_SIGNATURE, HEADER_SIGNATURE, HEADER_TIMESTAMP, NetworkName, SIGN_RPC_METHODS, SignatureType, type SilentDataProviderOptions, SilentDataRollupBase, SilentDataRollupContract, type SilentdataNetworkConfig, WHITELISTED_METHODS, defaultGetDelegate, delegateEIP721Types, eip721Domain, getAuthEIP721Types, getAuthHeaders, isSignableContractCall, prepareTypedDataPayload, signAuthHeaderRawMessage, signAuthHeaderTypedData, signRawDelegateHeader, signTypedDelegateHeader };
+/**
+ * The standard signature for the PrivateEvent as emitted by contracts
+ */
+declare const PRIVATE_EVENT_SIGNATURE = "PrivateEvent(address[],bytes32,bytes)";
+/**
+ * The keccak256 hash of the PrivateEvent signature
+ * Used for filtering logs by event signature
+ */
+declare const PRIVATE_EVENT_SIGNATURE_HASH: string;
+/**
+ * Interface describing the shape of a PrivateEvent
+ */
+interface PrivateEvent {
+    allowedViewers: string[];
+    eventType: string;
+    payload: string;
+}
+/**
+ * Calculate the keccak256 hash of an event signature
+ * This is used to create the eventType parameter for PrivateEvent
+ *
+ * @param eventSignature - The event signature (e.g., "Transfer(address,address,uint256)")
+ * @returns The keccak256 hash of the event signature
+ */
+declare function calculateEventTypeHash(eventSignature: string): string;
+
+export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, DEBUG_NAMESPACE, DEBUG_NAMESPACE_SILENTDATA_INTERCEPTOR, DEFAULT_DELEGATE_EXPIRES, DELEGATE_EXPIRATION_THRESHOLD_BUFFER, type DelegateConfig, type DelegateHeaders, type DelegateSignerMessage, HEADER_DELEGATE, HEADER_DELEGATE_SIGNATURE, HEADER_EIP712_DELEGATE_SIGNATURE, HEADER_EIP712_SIGNATURE, HEADER_SIGNATURE, HEADER_TIMESTAMP, NetworkName, PRIVATE_EVENT_SIGNATURE, PRIVATE_EVENT_SIGNATURE_HASH, type PrivateEvent, SIGN_RPC_METHODS, SignatureType, type SilentDataProviderOptions, SilentDataRollupBase, SilentDataRollupContract, type SilentDataRollupContractConfig, type SilentdataNetworkConfig, WHITELISTED_METHODS, calculateEventTypeHash, defaultGetDelegate, delegateEIP721Types, eip721Domain, getAuthEIP721Types, getAuthHeaders, isSignableContractCall, prepareTypedDataPayload, signAuthHeaderRawMessage, signAuthHeaderTypedData, signRawDelegateHeader, signTypedDelegateHeader };

package/dist/index.js

@@ -42,11 +42,14 @@ __export(index_exports, {
   HEADER_SIGNATURE: () => HEADER_SIGNATURE,
   HEADER_TIMESTAMP: () => HEADER_TIMESTAMP,
   NetworkName: () => NetworkName,
+  PRIVATE_EVENT_SIGNATURE: () => PRIVATE_EVENT_SIGNATURE,
+  PRIVATE_EVENT_SIGNATURE_HASH: () => PRIVATE_EVENT_SIGNATURE_HASH,
   SIGN_RPC_METHODS: () => SIGN_RPC_METHODS,
   SignatureType: () => SignatureType,
   SilentDataRollupBase: () => SilentDataRollupBase,
   SilentDataRollupContract: () => SilentDataRollupContract,
   WHITELISTED_METHODS: () => WHITELISTED_METHODS,
+  calculateEventTypeHash: () => calculateEventTypeHash,
   defaultGetDelegate: () => defaultGetDelegate,
   delegateEIP721Types: () => delegateEIP721Types,
   eip721Domain: () => eip721Domain,
@@ -69,7 +72,8 @@ var SIGN_RPC_METHODS = [
   "eth_getTransactionByHash",
   "eth_getTransactionCount",
   "eth_getProof",
-  "eth_getTransactionReceipt"
+  "eth_getTransactionReceipt",
+  "eth_estimateGas"
 ];
 var eip721Domain = {
   name: "Silent Data [Rollup]",
@@ -558,17 +562,35 @@ var SilentDataRollupBase = class {
 // src/contract.ts
 var import_ethers2 = require("ethers");
 var CustomContractRunner = class {
-  constructor(signer) {
-    this.provider = signer.provider;
+  constructor(provider, signer) {
+    this.provider = provider;
     this.signer = signer;
   }
   async sendTransaction(tx) {
-    tx.nonce = await this.signer.getNonce();
+    const signerAddress = await this.signer.getAddress();
+    const latestNonce = await this.provider.getTransactionCount(
+      signerAddress,
+      "latest"
+    );
+    tx.nonce = latestNonce;
     return this.signer.sendTransaction(tx);
   }
 };
+function getContractRunner(runner, provider) {
+  const runnerIsSigner = typeof runner.sendTransaction === "function";
+  if (!runnerIsSigner) {
+    return runner;
+  }
+  const runnerProviderConstructor = runner.provider?.constructor.name ?? "";
+  if (!runnerProviderConstructor.includes("SilentDataRollupProvider")) {
+    (0, import_ethers2.assertArgument)(provider, "provider is mandatory", "provider", provider);
+    return new CustomContractRunner(provider, runner);
+  }
+  return new CustomContractRunner(runner.provider, runner);
+}
 var SilentDataRollupContract = class extends import_ethers2.Contract {
-  constructor(address, abi, runner, contractMethodsToSign) {
+  constructor(config) {
+    const { address, abi, runner, contractMethodsToSign, provider } = config;
     const contractInterface = new import_ethers2.Interface(abi);
     contractMethodsToSign.forEach((method) => {
       if (!contractInterface.hasFunction(method)) {
@@ -577,17 +599,24 @@ var SilentDataRollupContract = class extends import_ethers2.Contract {
         );
       }
     });
+    const contractRunner = getContractRunner(runner, provider);
+    super(address, abi, contractRunner);
     const baseProvider = runner.baseProvider || runner.provider?.baseProvider;
-    const runnerIsSigner = typeof runner.sendTransaction === "function";
-    if (runnerIsSigner) {
-      runner = new CustomContractRunner(runner);
-    }
-    super(address, abi, runner);
     if (typeof baseProvider?.setContract === "function") {
       baseProvider.setContract(this, contractMethodsToSign);
     }
   }
 };
+
+// src/privateEvents.ts
+var import_ethers3 = require("ethers");
+var PRIVATE_EVENT_SIGNATURE = "PrivateEvent(address[],bytes32,bytes)";
+var PRIVATE_EVENT_SIGNATURE_HASH = (0, import_ethers3.keccak256)(
+  (0, import_ethers3.toUtf8Bytes)(PRIVATE_EVENT_SIGNATURE)
+);
+function calculateEventTypeHash(eventSignature) {
+  return (0, import_ethers3.keccak256)((0, import_ethers3.toUtf8Bytes)(eventSignature));
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ChainId,
@@ -602,11 +631,14 @@ var SilentDataRollupContract = class extends import_ethers2.Contract {
   HEADER_SIGNATURE,
   HEADER_TIMESTAMP,
   NetworkName,
+  PRIVATE_EVENT_SIGNATURE,
+  PRIVATE_EVENT_SIGNATURE_HASH,
   SIGN_RPC_METHODS,
   SignatureType,
   SilentDataRollupBase,
   SilentDataRollupContract,
   WHITELISTED_METHODS,
+  calculateEventTypeHash,
   defaultGetDelegate,
   delegateEIP721Types,
   eip721Domain,

package/dist/index.mjs

@@ -11,11 +11,14 @@ import {
   HEADER_SIGNATURE,
   HEADER_TIMESTAMP,
   NetworkName,
+  PRIVATE_EVENT_SIGNATURE,
+  PRIVATE_EVENT_SIGNATURE_HASH,
   SIGN_RPC_METHODS,
   SignatureType,
   SilentDataRollupBase,
   SilentDataRollupContract,
   WHITELISTED_METHODS,
+  calculateEventTypeHash,
   defaultGetDelegate,
   delegateEIP721Types,
   eip721Domain,
@@ -27,7 +30,7 @@ import {
   signAuthHeaderTypedData,
   signRawDelegateHeader,
   signTypedDelegateHeader
-} from "./chunk-BIZ7KJDG.mjs";
+} from "./chunk-XU34XEI3.mjs";
 export {
   ChainId,
   DEBUG_NAMESPACE,
@@ -41,11 +44,14 @@ export {
   HEADER_SIGNATURE,
   HEADER_TIMESTAMP,
   NetworkName,
+  PRIVATE_EVENT_SIGNATURE,
+  PRIVATE_EVENT_SIGNATURE_HASH,
   SIGN_RPC_METHODS,
   SignatureType,
   SilentDataRollupBase,
   SilentDataRollupContract,
   WHITELISTED_METHODS,
+  calculateEventTypeHash,
   defaultGetDelegate,
   delegateEIP721Types,
   eip721Domain,

package/dist/tests.js

@@ -52,6 +52,13 @@ var log2 = (0, import_debug2.default)(DEBUG_NAMESPACE);
 // src/contract.ts
 var import_ethers2 = require("ethers");
 
+// src/privateEvents.ts
+var import_ethers3 = require("ethers");
+var PRIVATE_EVENT_SIGNATURE = "PrivateEvent(address[],bytes32,bytes)";
+var PRIVATE_EVENT_SIGNATURE_HASH = (0, import_ethers3.keccak256)(
+  (0, import_ethers3.toUtf8Bytes)(PRIVATE_EVENT_SIGNATURE)
+);
+
 // tests/utils/mocked-custom-grpc.ts
 var import_http = __toESM(require("http"));
 var currentPort = 3e3;

package/dist/tests.mjs

@@ -1,4 +1,4 @@
-import "./chunk-BIZ7KJDG.mjs";
+import "./chunk-XU34XEI3.mjs";
 
 // tests/utils/mocked-custom-grpc.ts
 import http from "http";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliedblockchain/silentdatarollup-core",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Core library for Silent Data [Rollup]",
   "author": "Applied Blockchain",
   "homepage": "https://github.com/appliedblockchain/silent-data-rollup-providers#readme",