@appliedblockchain/silentdatarollup-core 1.0.6 → 1.0.8

package/README.md

@@ -1,4 +1,4 @@
-# Silent Data [Rollup] Providers - Core Package
+# Silent Data Providers - Core Package
 
 This package contains the core functionality for the other packages.
 

package/dist/{chunk-PTTWND7Y.mjs → chunk-5JD3GAHS.mjs}

@@ -6,7 +6,6 @@ var SIGN_RPC_METHODS = [
   "eth_estimateGas",
   "eth_getProof",
   "eth_getTransactionByHash",
-  "eth_getTransactionCount",
   "eth_getTransactionReceipt"
 ];
 var eip721Domain = {
@@ -27,6 +26,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 HEADER_SIGNER_SWC = "x-signer-swc";
 var DEFAULT_DELEGATE_EXPIRES = 10 * 60 * 60;
 var DELEGATE_EXPIRATION_THRESHOLD_BUFFER = 5;
 var WHITELISTED_METHODS = [
@@ -535,44 +535,10 @@ var SilentDataRollupBase = class {
 };
 
 // src/contract.ts
-import {
-  Contract,
-  Interface,
-  assertArgument
-} from "ethers";
-var CustomContractRunner = class {
-  constructor(provider, signer) {
-    this.provider = provider;
-    this.signer = signer;
-  }
-  async sendTransaction(tx) {
-    const signerAddress = await this.signer.getAddress();
-    const latestNonce = await this.provider.getTransactionCount(
-      signerAddress,
-      "latest"
-    );
-    tx.nonce = latestNonce;
-    if (!tx.gasLimit) {
-      tx.gasLimit = await this.provider.estimateGas(tx);
-    }
-    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);
-}
+import { Contract, Interface } from "ethers";
 var SilentDataRollupContract = class extends Contract {
   constructor(config) {
-    const { address, abi, runner, contractMethodsToSign, provider } = config;
+    const { address, abi, runner, contractMethodsToSign } = config;
     const contractInterface = new Interface(abi);
     contractMethodsToSign.forEach((method) => {
       if (!contractInterface.hasFunction(method)) {
@@ -581,8 +547,7 @@ var SilentDataRollupContract = class extends Contract {
         );
       }
     });
-    const contractRunner = getContractRunner(runner, provider);
-    super(address, abi, contractRunner);
+    super(address, abi, runner);
     const baseProvider = runner.baseProvider || runner.provider?.baseProvider;
     if (typeof baseProvider?.setContract === "function") {
       baseProvider.setContract(this, contractMethodsToSign);
@@ -612,6 +577,7 @@ export {
   HEADER_DELEGATE,
   HEADER_DELEGATE_SIGNATURE,
   HEADER_EIP712_DELEGATE_SIGNATURE,
+  HEADER_SIGNER_SWC,
   DEFAULT_DELEGATE_EXPIRES,
   DELEGATE_EXPIRATION_THRESHOLD_BUFFER,
   WHITELISTED_METHODS,

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Signer, Contract, JsonRpcPayload, InterfaceAbi, ContractRunner, Provider, TypedDataDomain, TypedDataField } from 'ethers';
+import { Signer, Contract, JsonRpcPayload, InterfaceAbi, ContractRunner, TypedDataDomain, TypedDataField } from 'ethers';
 
 declare const SIGN_RPC_METHODS: string[];
 declare const eip721Domain: {
@@ -19,6 +19,7 @@ declare const HEADER_EIP712_SIGNATURE = "x-eip712-signature";
 declare const HEADER_DELEGATE = "x-delegate";
 declare const HEADER_DELEGATE_SIGNATURE = "x-delegate-signature";
 declare const HEADER_EIP712_DELEGATE_SIGNATURE = "x-eip712-delegate-signature";
+declare const HEADER_SIGNER_SWC = "x-signer-swc";
 declare const DEFAULT_DELEGATE_EXPIRES: number;
 /**
  * A buffer time (in seconds) added to the current time when verifying the validity of a delegate.
@@ -99,7 +100,6 @@ type SilentDataRollupContractConfig = {
     abi: InterfaceAbi;
     runner: ContractRunner;
     contractMethodsToSign: string[];
-    provider?: Provider;
 };
 type ContractInfo = {
     contract: Contract;
@@ -241,4 +241,4 @@ interface PrivateEvent {
  */
 declare function calculateEventTypeHash(eventSignature: string): string;
 
-export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, type ContractInfo, 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 };
+export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, type ContractInfo, 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_SIGNER_SWC, 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 };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Signer, Contract, JsonRpcPayload, InterfaceAbi, ContractRunner, Provider, TypedDataDomain, TypedDataField } from 'ethers';
+import { Signer, Contract, JsonRpcPayload, InterfaceAbi, ContractRunner, TypedDataDomain, TypedDataField } from 'ethers';
 
 declare const SIGN_RPC_METHODS: string[];
 declare const eip721Domain: {
@@ -19,6 +19,7 @@ declare const HEADER_EIP712_SIGNATURE = "x-eip712-signature";
 declare const HEADER_DELEGATE = "x-delegate";
 declare const HEADER_DELEGATE_SIGNATURE = "x-delegate-signature";
 declare const HEADER_EIP712_DELEGATE_SIGNATURE = "x-eip712-delegate-signature";
+declare const HEADER_SIGNER_SWC = "x-signer-swc";
 declare const DEFAULT_DELEGATE_EXPIRES: number;
 /**
  * A buffer time (in seconds) added to the current time when verifying the validity of a delegate.
@@ -99,7 +100,6 @@ type SilentDataRollupContractConfig = {
     abi: InterfaceAbi;
     runner: ContractRunner;
     contractMethodsToSign: string[];
-    provider?: Provider;
 };
 type ContractInfo = {
     contract: Contract;
@@ -241,4 +241,4 @@ interface PrivateEvent {
  */
 declare function calculateEventTypeHash(eventSignature: string): string;
 
-export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, type ContractInfo, 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 };
+export { type AuthHeaders, type AuthSignatureMessage, type AuthSignatureMessageRequest, type BaseConfig, ChainId, type ContractInfo, 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_SIGNER_SWC, 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 };

package/dist/index.js

@@ -40,6 +40,7 @@ __export(index_exports, {
   HEADER_EIP712_DELEGATE_SIGNATURE: () => HEADER_EIP712_DELEGATE_SIGNATURE,
   HEADER_EIP712_SIGNATURE: () => HEADER_EIP712_SIGNATURE,
   HEADER_SIGNATURE: () => HEADER_SIGNATURE,
+  HEADER_SIGNER_SWC: () => HEADER_SIGNER_SWC,
   HEADER_TIMESTAMP: () => HEADER_TIMESTAMP,
   NetworkName: () => NetworkName,
   PRIVATE_EVENT_SIGNATURE: () => PRIVATE_EVENT_SIGNATURE,
@@ -68,7 +69,6 @@ var SIGN_RPC_METHODS = [
   "eth_estimateGas",
   "eth_getProof",
   "eth_getTransactionByHash",
-  "eth_getTransactionCount",
   "eth_getTransactionReceipt"
 ];
 var eip721Domain = {
@@ -89,6 +89,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 HEADER_SIGNER_SWC = "x-signer-swc";
 var DEFAULT_DELEGATE_EXPIRES = 10 * 60 * 60;
 var DELEGATE_EXPIRATION_THRESHOLD_BUFFER = 5;
 var WHITELISTED_METHODS = [
@@ -598,39 +599,9 @@ var SilentDataRollupBase = class {
 
 // src/contract.ts
 var import_ethers2 = require("ethers");
-var CustomContractRunner = class {
-  constructor(provider, signer) {
-    this.provider = provider;
-    this.signer = signer;
-  }
-  async sendTransaction(tx) {
-    const signerAddress = await this.signer.getAddress();
-    const latestNonce = await this.provider.getTransactionCount(
-      signerAddress,
-      "latest"
-    );
-    tx.nonce = latestNonce;
-    if (!tx.gasLimit) {
-      tx.gasLimit = await this.provider.estimateGas(tx);
-    }
-    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(config) {
-    const { address, abi, runner, contractMethodsToSign, provider } = config;
+    const { address, abi, runner, contractMethodsToSign } = config;
     const contractInterface = new import_ethers2.Interface(abi);
     contractMethodsToSign.forEach((method) => {
       if (!contractInterface.hasFunction(method)) {
@@ -639,8 +610,7 @@ var SilentDataRollupContract = class extends import_ethers2.Contract {
         );
       }
     });
-    const contractRunner = getContractRunner(runner, provider);
-    super(address, abi, contractRunner);
+    super(address, abi, runner);
     const baseProvider = runner.baseProvider || runner.provider?.baseProvider;
     if (typeof baseProvider?.setContract === "function") {
       baseProvider.setContract(this, contractMethodsToSign);
@@ -669,6 +639,7 @@ function calculateEventTypeHash(eventSignature) {
   HEADER_EIP712_DELEGATE_SIGNATURE,
   HEADER_EIP712_SIGNATURE,
   HEADER_SIGNATURE,
+  HEADER_SIGNER_SWC,
   HEADER_TIMESTAMP,
   NetworkName,
   PRIVATE_EVENT_SIGNATURE,

package/dist/index.mjs

@@ -9,6 +9,7 @@ import {
   HEADER_EIP712_DELEGATE_SIGNATURE,
   HEADER_EIP712_SIGNATURE,
   HEADER_SIGNATURE,
+  HEADER_SIGNER_SWC,
   HEADER_TIMESTAMP,
   NetworkName,
   PRIVATE_EVENT_SIGNATURE,
@@ -26,7 +27,7 @@ import {
   getAuthHeaders,
   isSignableContractCall,
   prepareTypedDataPayload
-} from "./chunk-PTTWND7Y.mjs";
+} from "./chunk-5JD3GAHS.mjs";
 export {
   ChainId,
   DEBUG_NAMESPACE,
@@ -38,6 +39,7 @@ export {
   HEADER_EIP712_DELEGATE_SIGNATURE,
   HEADER_EIP712_SIGNATURE,
   HEADER_SIGNATURE,
+  HEADER_SIGNER_SWC,
   HEADER_TIMESTAMP,
   NetworkName,
   PRIVATE_EVENT_SIGNATURE,

package/dist/tests.d.mts

@@ -4,7 +4,7 @@ import http from 'http';
 interface ResponseBody {
     jsonrpc: string;
     id: any;
-    result?: string;
+    result?: string | null;
 }
 interface RequestData {
     headers: http.IncomingHttpHeaders;

package/dist/tests.d.ts

@@ -4,7 +4,7 @@ import http from 'http';
 interface ResponseBody {
     jsonrpc: string;
     id: any;
-    result?: string;
+    result?: string | null;
 }
 interface RequestData {
     headers: http.IncomingHttpHeaders;

package/dist/tests.js

@@ -86,6 +86,8 @@ function createCustomRpcServer(callback) {
         };
         if (requestBody.method === "eth_chainId") {
           responseBody.result = `0x${CHAIN_ID.toString(16)}`;
+        } else if (requestBody.method === "eth_getTransactionReceipt") {
+          responseBody.result = null;
         } else {
           responseBody.result = "0x0";
         }

package/dist/tests.mjs

@@ -1,4 +1,4 @@
-import "./chunk-PTTWND7Y.mjs";
+import "./chunk-5JD3GAHS.mjs";
 
 // tests/utils/mocked-custom-grpc.ts
 import http from "http";
@@ -27,6 +27,8 @@ function createCustomRpcServer(callback) {
         };
         if (requestBody.method === "eth_chainId") {
           responseBody.result = `0x${CHAIN_ID.toString(16)}`;
+        } else if (requestBody.method === "eth_getTransactionReceipt") {
+          responseBody.result = null;
         } else {
           responseBody.result = "0x0";
         }

package/package.json

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