@etherplay/wallet-connector-ethereum 0.0.5 → 0.0.6

package/README.md

@@ -0,0 +1,221 @@
+# @etherplay/wallet-connector-ethereum
+
+Ethereum wallet connector implementation for the `@etherplay/connect` ecosystem. This package provides EIP-6963 provider detection, account management, and chain switching support for Ethereum-compatible wallets.
+
+## Installation
+
+```bash
+npm install @etherplay/wallet-connector-ethereum
+# or
+pnpm add @etherplay/wallet-connector-ethereum
+# or
+yarn add @etherplay/wallet-connector-ethereum
+```
+
+## Features
+
+- **EIP-6963 Support**: Automatic detection of multiple wallet providers via the EIP-6963 standard
+- **Account Generation**: Generate Ethereum accounts from BIP-39 mnemonics using standard derivation paths (m/44'/60'/0'/0/x)
+- **Message Signing**: Support for EIP-191 personal_sign messages
+- **Chain Management**: Switch and add Ethereum chains
+- **Always-On Provider**: Fallback RPC provider for read operations
+
+## Usage
+
+### Basic Setup
+
+```typescript
+import {EthereumWalletConnector} from '@etherplay/wallet-connector-ethereum';
+
+const connector = new EthereumWalletConnector();
+
+// Fetch available wallets (EIP-6963)
+connector.fetchWallets((walletHandle) => {
+	console.log('Wallet found:', walletHandle.info.name);
+	// walletHandle.walletProvider is ready to use
+});
+```
+
+### Account Generation
+
+Generate Ethereum accounts from a BIP-39 mnemonic phrase:
+
+```typescript
+const connector = new EthereumWalletConnector();
+
+// Generate account at index 0
+const account = connector.accountGenerator.fromMnemonicToAccount(
+	'your twelve word mnemonic phrase goes here and more words',
+	0,
+);
+
+console.log(account.address); // 0x...
+console.log(account.publicKey); // 0x...
+console.log(account.privateKey); // 0x...
+```
+
+### Message Signing
+
+Sign messages using EIP-191 personal_sign:
+
+```typescript
+const connector = new EthereumWalletConnector();
+
+const signature = await connector.accountGenerator.signTextMessage('Hello, Ethereum!', account.privateKey);
+```
+
+### Always-On Provider
+
+Create a provider that falls back to an RPC endpoint when no wallet is connected:
+
+```typescript
+const connector = new EthereumWalletConnector();
+
+const provider = connector.createAlwaysOnProvider({
+	endpoint: 'https://eth-mainnet.g.alchemy.com/v2/YOUR_API_KEY',
+	chainId: '1',
+	prioritizeWalletProvider: true, // Use wallet if available
+	requestsPerSecond: 10,
+});
+
+// The provider can now be used for read operations
+// even when no wallet is connected
+```
+
+### Wallet Provider Operations
+
+```typescript
+connector.fetchWallets(async (walletHandle) => {
+	const {walletProvider} = walletHandle;
+
+	// Request account access
+	const accounts = await walletProvider.requestAccounts();
+
+	// Get current chain
+	const chainId = await walletProvider.getChainId();
+
+	// Sign a message
+	const signature = await walletProvider.signMessage('Sign this message', accounts[0]);
+
+	// Switch to a different chain
+	await walletProvider.switchChain('0x89'); // Polygon
+
+	// Add a new chain
+	await walletProvider.addChain({
+		chainId: '0x89',
+		chainName: 'Polygon Mainnet',
+		rpcUrls: ['https://polygon-rpc.com'],
+		nativeCurrency: {
+			name: 'MATIC',
+			symbol: 'MATIC',
+			decimals: 18,
+		},
+		blockExplorerUrls: ['https://polygonscan.com'],
+	});
+
+	// Listen for account changes
+	walletProvider.listenForAccountsChanged((accounts) => {
+		console.log('Accounts changed:', accounts);
+	});
+
+	// Listen for chain changes
+	walletProvider.listenForChainChanged((chainId) => {
+		console.log('Chain changed:', chainId);
+	});
+});
+```
+
+## API Reference
+
+### EthereumWalletConnector
+
+Main connector class implementing `WalletConnector<CurriedRPC<Methods>>`:
+
+```typescript
+class EthereumWalletConnector {
+	accountGenerator: AccountGenerator;
+	fetchWallets(walletAnnounced: (walletHandle: WalletHandle<CurriedRPC<Methods>>) => void): void;
+	createAlwaysOnProvider(params: {
+		endpoint: string | UnderlyingEthereumProvider;
+		chainId: string;
+		prioritizeWalletProvider?: boolean;
+		requestsPerSecond?: number;
+	}): AlwaysOnProviderWrapper<CurriedRPC<Methods>>;
+}
+```
+
+### EthereumAccountGenerator
+
+Account generator for Ethereum using BIP-32/BIP-39 standards:
+
+```typescript
+class EthereumAccountGenerator implements AccountGenerator {
+	type: 'ethereum';
+	fromMnemonicToAccount(mnemonic: string, index: number): PrivateKeyAccount;
+	signTextMessage(message: string, privateKey: `0x${string}`): Promise<`0x${string}`>;
+}
+```
+
+### EthereumWalletProvider
+
+Wrapper for EIP-1193 wallet providers:
+
+```typescript
+class EthereumWalletProvider implements WalletProvider<CurriedRPC<Methods>> {
+	underlyingProvider: CurriedRPC<Methods>;
+	signMessage(message: string, account: `0x${string}`): Promise<`0x${string}`>;
+	getChainId(): Promise<`0x${string}`>;
+	getAccounts(): Promise<`0x${string}`[]>;
+	requestAccounts(): Promise<`0x${string}`[]>;
+	listenForAccountsChanged(handler: (accounts: `0x${string}`[]) => void): void;
+	stopListenForAccountsChanged(handler: (accounts: `0x${string}`[]) => void): void;
+	listenForChainChanged(handler: (chainId: `0x${string}`) => void): void;
+	stopListenForChainChanged(handler: (chainId: `0x${string}`) => void): void;
+	switchChain(chainId: string): Promise<null | any>;
+	addChain(chainInfo: ChainInfo): Promise<null | any>;
+}
+```
+
+## Utility Functions
+
+```typescript
+// Add 0x prefix to hex string
+add0x(hex: string): string;
+
+// Remove 0x prefix from hex string
+strip0x(hex: string): string;
+
+// Get checksummed address
+addChecksum(nonChecksummedAddress: string): string;
+
+// Derive address from public key
+fromPublicKey(key: string | Uint8Array): string;
+
+// Derive address from private key
+fromPrivateKey(key: string | Uint8Array): string;
+
+// Hash a text message for signing (EIP-191)
+hashTextMessage(str: string): string;
+
+// Derive HD key from mnemonic
+fromMnemonicToHDKey(mnemonic: string, index: number): HDKey;
+```
+
+## Dependencies
+
+- `@etherplay/wallet-connector` - Core interfaces
+- `@noble/curves` - Cryptographic curve operations
+- `@noble/hashes` - Hash functions
+- `@scure/bip32` - HD wallet derivation
+- `@scure/bip39` - Mnemonic phrase handling
+- `remote-procedure-call` - RPC utilities
+
+## Related Packages
+
+- [`@etherplay/wallet-connector`](../etherplay-wallet-connector) - Core wallet connector interfaces
+- [`@etherplay/connect`](../etherplay-connect) - Main connection library
+- [`@etherplay/alchemy`](../etherplay-alchemy) - Social login mechanisms
+
+## License
+
+MIT

package/dist/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsE,OAAO,EAAC,MAAM,UAAU,CAAC;AAC3G,OAAO,EAAuB,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAC,uBAAuB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAoGtD,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACtC,QAAQ,EAAE,MAAM,GAAG,0BAA0B,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,uBAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAE/C"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsE,OAAO,EAAC,MAAM,UAAU,CAAC;AAC3G,OAAO,EAAuB,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EACN,uBAAuB,EASvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAC,0BAA0B,EAAC,MAAM,YAAY,CAAC;AAiNtD,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACtC,QAAQ,EAAE,MAAM,GAAG,0BAA0B,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,uBAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAE/C"}

package/dist/provider.js

@@ -1,5 +1,22 @@
 import { createCurriedJSONRPC } from 'remote-procedure-call';
 import { withTimeout } from './utils.js';
+import { TRACKED_REQUEST_METHODS, TRANSACTION_METHODS, } from '@etherplay/wallet-connector';
+// Type guard for transaction methods
+function isTransactionMethod(method) {
+    return TRANSACTION_METHODS.includes(method);
+}
+// Helper to create a properly typed PendingRequest
+function createPendingRequest(id, method, startedAt) {
+    if (isTransactionMethod(method)) {
+        return { id, method, kind: 'transaction', startedAt };
+    }
+    // TypeScript knows method is SignatureMethod here
+    return { id, method: method, kind: 'signature', startedAt };
+}
+// Helper to check if method should be tracked
+function isTrackedMethod(method) {
+    return TRACKED_REQUEST_METHODS.includes(method);
+}
 const signerMethods = [
     'eth_accounts',
     'eth_sign',
@@ -16,62 +33,134 @@ class AlwaysOnEthereumProviderWrapper {
     walletProvider;
     jsonRPC;
     status = 'disconnected';
+    // Request tracking fields
+    pendingRequests = new Map();
+    requestHandlers = new Set();
+    requestCounter = 0;
     constructor(params) {
         const self = this;
         this.chainId = params.chainId;
         this.jsonRPC = createCurriedJSONRPC(params.endpoint);
         const provider = {
             async request(req) {
-                const signingMethod = signerMethods.includes(req.method) ||
-                    connectedAccountMethods.includes(req.method) ||
-                    walletOnlyMethods.includes(req.method) ||
-                    req.method.indexOf('sign') != -1;
-                if (self.walletProvider) {
-                    if (params.prioritizeWalletProvider || signingMethod) {
-                        if (signingMethod) {
-                            if (self.status !== 'connected') {
-                                return Promise.reject({ message: 'wallet provider is not connected', code: 4001 });
-                            }
-                        }
-                        let currentChainIdAsHex;
-                        try {
-                            currentChainIdAsHex = await withTimeout(self.walletProvider.request({
-                                method: 'eth_chainId',
-                            }));
-                        }
-                        catch (err) {
-                            if (signingMethod) {
-                                return Promise.reject(err);
-                            }
-                            else {
-                                // we fallback on jsonRPc if error while getting  chain and not a signing method
-                                return self.jsonRPC.request(req);
-                            }
-                        }
-                        const currentChainId = Number(currentChainIdAsHex).toString();
-                        if (self.chainId !== currentChainId) {
-                            if (signingMethod) {
-                                return Promise.reject({
-                                    message: `wallet provider is connected to a different chain, expected ${self.chainId} but got ${currentChainId}`,
-                                    code: 4001,
-                                });
-                            }
-                            else {
-                                // we fallback on jsonRPc if invalid chain and not a signing method
-                                return self.jsonRPC.request(req);
-                            }
-                        }
-                        return self.walletProvider.request(req);
-                    }
-                }
-                if (signingMethod) {
-                    return Promise.reject(new Error('wallet provider is not connected'));
+                // Check if this is a tracked method
+                if (isTrackedMethod(req.method)) {
+                    return self.executeTrackedRequest(req, params.prioritizeWalletProvider);
                 }
-                return self.jsonRPC.request(req);
+                // Non-tracked methods - execute directly
+                return self.executeRequest(req, params.prioritizeWalletProvider);
             },
         };
         this.provider = createCurriedJSONRPC(provider, { requestsPerSecond: params.requestsPerSecond });
     }
+    // Event subscription
+    onRequest(handler) {
+        this.requestHandlers.add(handler);
+        return () => {
+            this.requestHandlers.delete(handler);
+        };
+    }
+    // Get current pending requests
+    getPendingRequests() {
+        return Array.from(this.pendingRequests.values());
+    }
+    // Emit event to all handlers
+    emitRequestEvent(event) {
+        for (const handler of this.requestHandlers) {
+            try {
+                handler(event);
+            }
+            catch (e) {
+                console.error('Request event handler error:', e);
+            }
+        }
+    }
+    // Generate unique request ID
+    generateRequestId() {
+        return `req_${++this.requestCounter}_${Date.now()}`;
+    }
+    // Execute tracked request with event emission
+    async executeTrackedRequest(req, prioritizeWalletProvider) {
+        const method = req.method;
+        const requestId = this.generateRequestId();
+        const pendingRequest = createPendingRequest(requestId, method, Date.now());
+        // Track and emit start event
+        this.pendingRequests.set(requestId, pendingRequest);
+        this.emitRequestEvent({ type: 'requestStart', request: pendingRequest });
+        try {
+            const result = await this.executeRequest(req, prioritizeWalletProvider);
+            // Emit success event
+            this.pendingRequests.delete(requestId);
+            this.emitRequestEvent({
+                type: 'requestEnd',
+                request: pendingRequest,
+                result: 'success',
+            });
+            return result;
+        }
+        catch (error) {
+            // Determine if user rejected
+            const isRejected = error?.code === 4001;
+            // Emit end event
+            this.pendingRequests.delete(requestId);
+            this.emitRequestEvent({
+                type: 'requestEnd',
+                request: pendingRequest,
+                result: isRejected ? 'rejected' : 'error',
+                error: isRejected ? undefined : error,
+            });
+            throw error;
+        }
+    }
+    // Execute request (original request routing logic)
+    async executeRequest(req, prioritizeWalletProvider) {
+        const signingMethod = signerMethods.includes(req.method) ||
+            connectedAccountMethods.includes(req.method) ||
+            walletOnlyMethods.includes(req.method) ||
+            req.method.indexOf('sign') != -1;
+        if (this.walletProvider) {
+            if (prioritizeWalletProvider || signingMethod) {
+                if (signingMethod) {
+                    if (this.status !== 'connected') {
+                        return Promise.reject({ message: 'wallet provider is not connected', code: 4001 });
+                    }
+                }
+                let currentChainIdAsHex;
+                try {
+                    currentChainIdAsHex = await withTimeout(this.walletProvider.request({
+                        method: 'eth_chainId',
+                    }));
+                }
+                catch (err) {
+                    if (signingMethod) {
+                        return Promise.reject(err);
+                    }
+                    else {
+                        // we fallback on jsonRPc if error while getting  chain and not a signing method
+                        return this.jsonRPC.request(req);
+                    }
+                }
+                const currentChainId = Number(currentChainIdAsHex).toString();
+                if (this.chainId !== currentChainId) {
+                    if (signingMethod) {
+                        return Promise.reject({
+                            message: `wallet provider is connected to a different chain, expected ${this.chainId} but got ${currentChainId}`,
+                            code: 4001,
+                        });
+                    }
+                    else {
+                        // we fallback on jsonRPc if invalid chain and not a signing method
+                        return this.jsonRPC.request(req);
+                    }
+                }
+                return this.walletProvider.request(req);
+            }
+        }
+        if (signingMethod) {
+            return Promise.reject(new Error('wallet provider is not connected'));
+        }
+        return this.jsonRPC.request(req);
+    }
     setWalletProvider(walletProvider) {
         this.walletProvider = walletProvider;
     }

package/dist/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAa,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAIvC,MAAM,aAAa,GAAG;IACrB,cAAc;IACd,UAAU;IACV,qBAAqB;IACrB,eAAe;IACf,sBAAsB;IACtB,mBAAmB;CACnB,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAExD,MAAM,iBAAiB,GAAG,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,yBAAyB,CAAC,CAAC;AAE3G,MAAM,+BAA+B;IACpB,OAAO,CAAS;IAChB,QAAQ,CAAsB;IACtC,cAAc,CAAuB;IACrC,OAAO,CAAsB;IAC7B,MAAM,GAA4C,cAAc,CAAC;IAEzE,YAAY,MAKX;QACA,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAU,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE9D,MAAM,QAAQ,GAAG;YAChB,KAAK,CAAC,OAAO,CAAC,GAAqC;gBAClD,MAAM,aAAa,GAClB,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;oBAClC,uBAAuB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;oBAC5C,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;oBACtC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAElC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACzB,IAAI,MAAM,CAAC,wBAAwB,IAAI,aAAa,EAAE,CAAC;wBACtD,IAAI,aAAa,EAAE,CAAC;4BACnB,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gCACjC,OAAO,OAAO,CAAC,MAAM,CAAC,EAAC,OAAO,EAAE,kCAAkC,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;4BAClF,CAAC;wBACF,CAAC;wBAED,IAAI,mBAA2B,CAAC;wBAChC,IAAI,CAAC;4BACJ,mBAAmB,GAAG,MAAM,WAAW,CACtC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gCAC3B,MAAM,EAAE,aAAa;6BACrB,CAAC,CACF,CAAC;wBACH,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACd,IAAI,aAAa,EAAE,CAAC;gCACnB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;4BAC5B,CAAC;iCAAM,CAAC;gCACP,gFAAgF;gCAChF,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAU,CAAC,CAAC;4BACzC,CAAC;wBACF,CAAC;wBAED,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC9D,IAAI,IAAI,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;4BACrC,IAAI,aAAa,EAAE,CAAC;gCACnB,OAAO,OAAO,CAAC,MAAM,CAAC;oCACrB,OAAO,EAAE,+DAA+D,IAAI,CAAC,OAAO,YAAY,cAAc,EAAE;oCAChH,IAAI,EAAE,IAAI;iCACV,CAAC,CAAC;4BACJ,CAAC;iCAAM,CAAC;gCACP,mEAAmE;gCACnE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAU,CAAC,CAAC;4BACzC,CAAC;wBACF,CAAC;wBACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAU,CAAC,CAAC;oBAChD,CAAC;gBACF,CAAC;gBAED,IAAI,aAAa,EAAE,CAAC;oBACnB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;gBACtE,CAAC;gBAED,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAU,CAAC,CAAC;YACzC,CAAC;SAC6B,CAAC;QAEhC,IAAI,CAAC,QAAQ,GAAG,oBAAoB,CAAU,QAAQ,EAAE,EAAC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAC,CAAC,CAAC;IACxG,CAAC;IAED,iBAAiB,CAAC,cAA+C;QAChE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,SAAkD;QACjE,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IACzB,CAAC;CACD;AAED,MAAM,UAAU,cAAc,CAAC,MAK9B;IACA,OAAO,IAAI,+BAA+B,CAAC,MAAM,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,31 @@
 {
   "name": "@etherplay/wallet-connector-ethereum",
-  "version": "0.0.5",
+  "version": "0.0.6",
+  "description": "Ethereum wallet connector implementation for @etherplay/connect - provides EIP-6963 provider detection, account management, and chain switching support",
+  "keywords": [
+    "ethereum",
+    "wallet",
+    "connector",
+    "eip-6963",
+    "metamask",
+    "web3",
+    "provider",
+    "chain-switching",
+    "account-management",
+    "typescript",
+    "eth_sign",
+    "personal_sign"
+  ],
+  "homepage": "https://github.com/wighawag/etherplay-connect#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/wighawag/etherplay-connect.git",
+    "directory": "packages/etherplay-wallet-connector-ethereum"
+  },
+  "bugs": {
+    "url": "https://github.com/wighawag/etherplay-connect/issues"
+  },
+  "author": "Ronan Sandford",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -30,12 +55,12 @@
     "@noble/curves": "1.8.1",
     "@noble/secp256k1": "^2.2.3",
     "remote-procedure-call": "^0.1.1",
-    "@etherplay/wallet-connector": "0.0.4"
+    "@etherplay/wallet-connector": "0.0.5"
   },
   "scripts": {
     "build": "tsc --project tsconfig.json",
     "dev": "as-soon -w src pnpm build",
     "format:check": "prettier --check .",
-    "format:write": "prettier --write ."
+    "format": "prettier --write ."
   }
 }

package/src/provider.ts

@@ -1,9 +1,38 @@
 import type {EIP1193Provider, EIP1193WalletProvider, EIP1193WindowWalletProvider, Methods} from 'eip-1193';
 import {createCurriedJSONRPC, CurriedRPC} from 'remote-procedure-call';
 import {withTimeout} from './utils.js';
-import {AlwaysOnProviderWrapper} from '@etherplay/wallet-connector';
+import {
+	AlwaysOnProviderWrapper,
+	PendingRequest,
+	RequestEvent,
+	RequestEventHandler,
+	TrackedRequestMethod,
+	TRACKED_REQUEST_METHODS,
+	TRANSACTION_METHODS,
+	TransactionMethod,
+	SignatureMethod,
+} from '@etherplay/wallet-connector';
 import {UnderlyingEthereumProvider} from './index.js';
 
+// Type guard for transaction methods
+function isTransactionMethod(method: TrackedRequestMethod): method is TransactionMethod {
+	return (TRANSACTION_METHODS as readonly string[]).includes(method);
+}
+
+// Helper to create a properly typed PendingRequest
+function createPendingRequest(id: string, method: TrackedRequestMethod, startedAt: number): PendingRequest {
+	if (isTransactionMethod(method)) {
+		return {id, method, kind: 'transaction', startedAt};
+	}
+	// TypeScript knows method is SignatureMethod here
+	return {id, method: method as SignatureMethod, kind: 'signature', startedAt};
+}
+
+// Helper to check if method should be tracked
+function isTrackedMethod(method: string): method is TrackedRequestMethod {
+	return (TRACKED_REQUEST_METHODS as readonly string[]).includes(method);
+}
+
 const signerMethods = [
 	'eth_accounts',
 	'eth_sign',
@@ -24,6 +53,11 @@ class AlwaysOnEthereumProviderWrapper implements AlwaysOnProviderWrapper<Curried
 	private jsonRPC: CurriedRPC<Methods>;
 	private status: 'connected' | 'locked' | 'disconnected' = 'disconnected';
 
+	// Request tracking fields
+	private pendingRequests: Map<string, PendingRequest> = new Map();
+	private requestHandlers: Set<RequestEventHandler> = new Set();
+	private requestCounter = 0;
+
 	constructor(params: {
 		endpoint: string | UnderlyingEthereumProvider;
 		chainId: string;
@@ -36,63 +70,148 @@ class AlwaysOnEthereumProviderWrapper implements AlwaysOnProviderWrapper<Curried
 
 		const provider = {
 			async request(req: {method: string; params?: any[]}) {
-				const signingMethod =
-					signerMethods.includes(req.method) ||
-					connectedAccountMethods.includes(req.method) ||
-					walletOnlyMethods.includes(req.method) ||
-					req.method.indexOf('sign') != -1;
-
-				if (self.walletProvider) {
-					if (params.prioritizeWalletProvider || signingMethod) {
-						if (signingMethod) {
-							if (self.status !== 'connected') {
-								return Promise.reject({message: 'wallet provider is not connected', code: 4001});
-							}
-						}
-
-						let currentChainIdAsHex: string;
-						try {
-							currentChainIdAsHex = await withTimeout(
-								self.walletProvider.request({
-									method: 'eth_chainId',
-								}),
-							);
-						} catch (err) {
-							if (signingMethod) {
-								return Promise.reject(err);
-							} else {
-								// we fallback on jsonRPc if error while getting  chain and not a signing method
-								return self.jsonRPC.request(req as any);
-							}
-						}
-
-						const currentChainId = Number(currentChainIdAsHex).toString();
-						if (self.chainId !== currentChainId) {
-							if (signingMethod) {
-								return Promise.reject({
-									message: `wallet provider is connected to a different chain, expected ${self.chainId} but got ${currentChainId}`,
-									code: 4001,
-								});
-							} else {
-								// we fallback on jsonRPc if invalid chain and not a signing method
-								return self.jsonRPC.request(req as any);
-							}
-						}
-						return self.walletProvider.request(req as any);
-					}
+				// Check if this is a tracked method
+				if (isTrackedMethod(req.method)) {
+					return self.executeTrackedRequest(req, params.prioritizeWalletProvider);
 				}
 
-				if (signingMethod) {
-					return Promise.reject(new Error('wallet provider is not connected'));
-				}
-
-				return self.jsonRPC.request(req as any);
+				// Non-tracked methods - execute directly
+				return self.executeRequest(req, params.prioritizeWalletProvider);
 			},
 		} as unknown as EIP1193Provider;
 
 		this.provider = createCurriedJSONRPC<Methods>(provider, {requestsPerSecond: params.requestsPerSecond});
 	}
 
+	// Event subscription
+	onRequest(handler: RequestEventHandler): () => void {
+		this.requestHandlers.add(handler);
+		return () => {
+			this.requestHandlers.delete(handler);
+		};
+	}
+
+	// Get current pending requests
+	getPendingRequests(): PendingRequest[] {
+		return Array.from(this.pendingRequests.values());
+	}
+
+	// Emit event to all handlers
+	private emitRequestEvent(event: RequestEvent): void {
+		for (const handler of this.requestHandlers) {
+			try {
+				handler(event);
+			} catch (e) {
+				console.error('Request event handler error:', e);
+			}
+		}
+	}
+
+	// Generate unique request ID
+	private generateRequestId(): string {
+		return `req_${++this.requestCounter}_${Date.now()}`;
+	}
+
+	// Execute tracked request with event emission
+	private async executeTrackedRequest(
+		req: {method: string; params?: any[]},
+		prioritizeWalletProvider?: boolean,
+	): Promise<any> {
+		const method = req.method as TrackedRequestMethod;
+		const requestId = this.generateRequestId();
+		const pendingRequest = createPendingRequest(requestId, method, Date.now());
+
+		// Track and emit start event
+		this.pendingRequests.set(requestId, pendingRequest);
+		this.emitRequestEvent({type: 'requestStart', request: pendingRequest});
+
+		try {
+			const result = await this.executeRequest(req, prioritizeWalletProvider);
+
+			// Emit success event
+			this.pendingRequests.delete(requestId);
+			this.emitRequestEvent({
+				type: 'requestEnd',
+				request: pendingRequest,
+				result: 'success',
+			});
+
+			return result;
+		} catch (error) {
+			// Determine if user rejected
+			const isRejected = (error as any)?.code === 4001;
+
+			// Emit end event
+			this.pendingRequests.delete(requestId);
+			this.emitRequestEvent({
+				type: 'requestEnd',
+				request: pendingRequest,
+				result: isRejected ? 'rejected' : 'error',
+				error: isRejected ? undefined : error,
+			});
+
+			throw error;
+		}
+	}
+
+	// Execute request (original request routing logic)
+	private async executeRequest(
+		req: {method: string; params?: any[]},
+		prioritizeWalletProvider?: boolean,
+	): Promise<any> {
+		const signingMethod =
+			signerMethods.includes(req.method) ||
+			connectedAccountMethods.includes(req.method) ||
+			walletOnlyMethods.includes(req.method) ||
+			req.method.indexOf('sign') != -1;
+
+		if (this.walletProvider) {
+			if (prioritizeWalletProvider || signingMethod) {
+				if (signingMethod) {
+					if (this.status !== 'connected') {
+						return Promise.reject({message: 'wallet provider is not connected', code: 4001});
+					}
+				}
+
+				let currentChainIdAsHex: string;
+				try {
+					currentChainIdAsHex = await withTimeout(
+						this.walletProvider.request({
+							method: 'eth_chainId',
+						}),
+					);
+				} catch (err) {
+					if (signingMethod) {
+						return Promise.reject(err);
+					} else {
+						// we fallback on jsonRPc if error while getting  chain and not a signing method
+						return this.jsonRPC.request(req as any);
+					}
+				}
+
+				const currentChainId = Number(currentChainIdAsHex).toString();
+				if (this.chainId !== currentChainId) {
+					if (signingMethod) {
+						return Promise.reject({
+							message: `wallet provider is connected to a different chain, expected ${this.chainId} but got ${currentChainId}`,
+							code: 4001,
+						});
+					} else {
+						// we fallback on jsonRPc if invalid chain and not a signing method
+						return this.jsonRPC.request(req as any);
+					}
+				}
+				return this.walletProvider.request(req as any);
+			}
+		}
+
+		if (signingMethod) {
+			return Promise.reject(new Error('wallet provider is not connected'));
+		}
+
+		return this.jsonRPC.request(req as any);
+	}
+
 	setWalletProvider(walletProvider: CurriedRPC<Methods> | undefined) {
 		this.walletProvider = walletProvider;
 	}