Revert "constructor support wallet as public client"

This reverts commit 21cd32b.

Author: JaCoderX

sdk/typescript/SecureOwnable.tsx

@@ -1,70 +1,21 @@
-import { 
-  Address, 
-  PublicClient, 
-  WalletClient, 
-  Chain, 
-  Hex, 
-  createPublicClient, 
-  custom,
-  http,
-  EIP1193Provider
-} from 'viem';
+import { Address, PublicClient, WalletClient, Chain, Hex } from 'viem';
 import SecureOwnableABIJson from '../../abi/SecureOwnable.abi.json';
 import { TransactionOptions, TransactionResult } from './interfaces/base.index';
 import { ISecureOwnable } from './interfaces/core.access.index';
 import { TxRecord, MetaTransaction, MetaTxParams } from './interfaces/lib.index';
 import { ExecutionType } from './types/lib.index';
 
-declare global {
-  interface Window {
-    ethereum?: EIP1193Provider;
-  }
-}
-
-export interface SecureOwnableConfig {
-  walletClient?: WalletClient;
-  publicClient?: PublicClient;
-  contractAddress: Address;
-  chain: Chain;
-  useWalletAsProvider?: boolean;
-  fallbackRpcUrl?: string;
-}
-
 /**
  * @title SecureOwnable
- * @notice TypeScript wrapper for SecureOwnable smart contract with optional wallet-based provider
+ * @notice TypeScript wrapper for SecureOwnable smart contract
  */
 export class SecureOwnable implements ISecureOwnable {
-  protected publicClient: PublicClient;
-  protected walletClient?: WalletClient;
-  protected contractAddress: Address;
-  protected chain: Chain;
-
-  constructor(config: SecureOwnableConfig) {
-    this.contractAddress = config.contractAddress;
-    this.chain = config.chain;
-    this.walletClient = config.walletClient;
-
-    // Initialize public client based on configuration
-    if (config.publicClient) {
-      // Use provided public client
-      this.publicClient = config.publicClient;
-    } else if (typeof window !== 'undefined' && window.ethereum) {
-      // Use window.ethereum if available
-      this.publicClient = createPublicClient({
-        chain: this.chain,
-        transport: custom(window.ethereum)
-      });
-    } else if (config.fallbackRpcUrl) {
-      // Use fallback RPC URL if provided
-      this.publicClient = createPublicClient({
-        chain: this.chain,
-        transport: http(config.fallbackRpcUrl)
-      });
-    } else {
-      throw new Error('Either publicClient must be provided, window.ethereum must be available, or fallbackRpcUrl must be provided');
-    }
-  }
+  constructor(
+    protected client: PublicClient,
+    protected walletClient: WalletClient | undefined,
+    protected contractAddress: Address,
+    protected chain: Chain
+  ) {}
 
   // Ownership Management
   async transferOwnershipRequest(options: TransactionOptions): Promise<TransactionResult> {
@@ -80,7 +31,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -98,7 +49,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -116,7 +67,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -134,7 +85,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -152,7 +103,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -171,7 +122,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -194,7 +145,7 @@ export class SecureOwnable implements ISecureOwnable {
     console.log('hash', hash);
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -212,7 +163,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -230,7 +181,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -248,13 +199,13 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
   // Recovery Management
   async updateRecoveryExecutionOptions(newRecoveryAddress: Address): Promise<Hex> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'updateRecoveryExecutionOptions',
@@ -276,13 +227,13 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
   // TimeLock Management
   async updateTimeLockExecutionOptions(newTimeLockPeriodInMinutes: bigint): Promise<Hex> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'updateTimeLockExecutionOptions',
@@ -304,7 +255,7 @@ export class SecureOwnable implements ISecureOwnable {
 
     return {
       hash,
-      wait: () => this.publicClient.waitForTransactionReceipt({ hash })
+      wait: () => this.client.waitForTransactionReceipt({ hash })
     };
   }
 
@@ -316,7 +267,7 @@ export class SecureOwnable implements ISecureOwnable {
     maxGasPrice: bigint,
     signer: Address
   ): Promise<MetaTxParams> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'createMetaTxParams',
@@ -334,7 +285,7 @@ export class SecureOwnable implements ISecureOwnable {
     executionOptions: Hex,
     metaTxParams: MetaTxParams
   ): Promise<MetaTransaction> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'generateUnsignedMetaTransactionForNew',
@@ -355,7 +306,7 @@ export class SecureOwnable implements ISecureOwnable {
     txId: bigint,
     metaTxParams: MetaTxParams
   ): Promise<MetaTransaction> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'generateUnsignedMetaTransactionForExisting',
@@ -365,15 +316,15 @@ export class SecureOwnable implements ISecureOwnable {
 
   // Getters
   async getOperationHistory(): Promise<TxRecord[]> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'getOperationHistory'
     }) as TxRecord[];
   }
 
   async getOperation(txId: bigint): Promise<TxRecord> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'getOperation',
@@ -382,47 +333,47 @@ export class SecureOwnable implements ISecureOwnable {
   }
 
   async getBroadcaster(): Promise<Address> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'getBroadcaster'
     }) as Address;
   }
 
   async getRecoveryAddress(): Promise<Address> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'getRecoveryAddress'
     }) as Address;
   }
 
   async getTimeLockPeriodInMinutes(): Promise<bigint> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'getTimeLockPeriodInMinutes'
     }) as bigint;
   }
 
   async owner(): Promise<Address> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'owner'
     }) as Address;
   }
 
   async getSupportedOperationTypes(): Promise<Array<{ operationType: Hex; name: string }>> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'getSupportedOperationTypes'
     }) as Array<{ operationType: Hex; name: string }>;
   }
 
   async isOperationTypeSupported(operationType: Hex): Promise<boolean> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'isOperationTypeSupported',
@@ -431,7 +382,7 @@ export class SecureOwnable implements ISecureOwnable {
   }
 
   async supportsInterface(interfaceId: Hex): Promise<boolean> {
-    return await this.publicClient.readContract({
+    return await this.client.readContract({
       address: this.contractAddress,
       abi: SecureOwnableABIJson,
       functionName: 'supportsInterface',