@appliedblockchain/silentdatarollup-core 1.0.0 → 1.0.1

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

@@ -495,20 +495,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,12 +536,9 @@ 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);
     }

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,4 @@ 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 };
+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 SilentDataRollupContractConfig, type SilentdataNetworkConfig, WHITELISTED_METHODS, 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,4 @@ 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 };
+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 SilentDataRollupContractConfig, type SilentdataNetworkConfig, WHITELISTED_METHODS, defaultGetDelegate, delegateEIP721Types, eip721Domain, getAuthEIP721Types, getAuthHeaders, isSignableContractCall, prepareTypedDataPayload, signAuthHeaderRawMessage, signAuthHeaderTypedData, signRawDelegateHeader, signTypedDelegateHeader };

package/dist/index.js

@@ -558,17 +558,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,12 +595,9 @@ 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);
     }

package/dist/index.mjs

@@ -27,7 +27,7 @@ import {
   signAuthHeaderTypedData,
   signRawDelegateHeader,
   signTypedDelegateHeader
-} from "./chunk-BIZ7KJDG.mjs";
+} from "./chunk-LT2HDZHC.mjs";
 export {
   ChainId,
   DEBUG_NAMESPACE,

package/dist/tests.mjs

@@ -1,4 +1,4 @@
-import "./chunk-BIZ7KJDG.mjs";
+import "./chunk-LT2HDZHC.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.1",
   "description": "Core library for Silent Data [Rollup]",
   "author": "Applied Blockchain",
   "homepage": "https://github.com/appliedblockchain/silent-data-rollup-providers#readme",