eip-1193 0.5.0 → 0.6.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-present Ronan Sandford
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/index.d.ts

@@ -1,6 +1,24 @@
 // ------------------------------------------------------------------------------------------------
 // TYPES
 // ------------------------------------------------------------------------------------------------
+export type EIP1193DATA = `0x${string}`;
+export type EIP1193BlockTag = EIP1193QUANTITY | 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized';
+
+export type EIP1898BlockTag =
+	| EIP1193QUANTITY
+	| 'latest'
+	| 'earliest'
+	| 'pending'
+	| 'safe'
+	| 'finalized'
+	| {blockHash: EIP1193QUANTITY; requireCanonical?: boolean} // EIP-1898
+	| {blockNumber: EIP1193QUANTITY}; // EIP-1898
+
+export type EIP1193QUANTITY = `0x${string}`;
+export type EIP1193ChainId = `0x${string}`;
+export type EIP1193Account = `0x${string}`;
+export type EIP1193Accounts = EIP1193Account[];
+
 type BaseEIP1193Transaction = {
 	blockHash: EIP1193DATA;
 	blockNumber: EIP1193QUANTITY | null;
@@ -199,318 +217,147 @@ export type EIP1193LogsParam = {
 	blockhash?: EIP1193DATA;
 };
 
-export type EIP1193TypedSignatureParam = {[field: string]: any}; // TODO
-// ------------------------------------------------------------------------------------------------
-// REQUEST TYPES
-// ------------------------------------------------------------------------------------------------
-
-export type EIP1193Web3ClientVersionRequest = {
-	readonly method: 'web3_clientVersion';
-};
-
-export type EIP1193Web3SHARequest = {
-	readonly method: 'web3_sha';
-	readonly params: [EIP1193DATA];
-};
-
-export type EIP1193NetVersionRequest = {
-	readonly method: 'net_version';
-};
-
-export type EIP1193NetListeningRequest = {
-	readonly method: 'net_listening';
-};
-
-export type EIP1193NetPeerCountRequest = {
-	readonly method: 'net_peerCount';
-};
-
-export type EIP1193ProtocolVersionRequest = {
-	readonly method: 'eth_protocolVersion';
-};
-
-export type EIP1193SyncingRequest = {
-	readonly method: 'eth_syncing';
-};
-
-export type EIP1193CoinbaseRequest = {
-	readonly method: 'eth_coinbase';
-};
-
-export type EIP1193MiningRequest = {
-	readonly method: 'eth_mining';
-};
-
-export type EIP1193HashrateRequest = {
-	readonly method: 'eth_hashrate';
-};
-
-export type EIP1193GasPriceRequest = {
-	readonly method: 'eth_gasPrice';
-};
-
-export type EIP1193AccountsRequest = {
-	readonly method: 'eth_accounts';
-};
-
-export type EIP1193BlockNumberRequest = {
-	readonly method: 'eth_blockNumber';
-};
-
-export type EIP1193GetBalanceRequest = {
-	readonly method: 'eth_getBalance';
-	readonly params: [EIP1193Account] | [EIP1193Account, EIP1898BlockTag];
-};
-
-export type EIP1193GetStorageAtRequest = {
-	readonly method: 'eth_getStorageAt';
-	readonly params: [EIP1193Account, EIP1193QUANTITY] | [EIP1193Account, EIP1193QUANTITY, EIP1898BlockTag];
-};
-
-export type EIP1193GetTransactionCountRequest = {
-	readonly method: 'eth_getTransactionCount';
-	readonly params: [EIP1193Account] | [EIP1193Account, EIP1898BlockTag];
-};
-
-export type EIP1193GetTransactionCountByHashRequest = {
-	readonly method: 'eth_getBlockTransactionCountByHash';
-	readonly params: [EIP1193DATA];
-};
-
-export type EIP1193GetTransactionCountByNumberRequest = {
-	readonly method: 'eth_getBlockTransactionCountByNumber';
-	readonly params: [EIP1193BlockTag];
-};
-
-export type EIP1193GetUncleCountByBlockHashRequest = {
-	readonly method: 'eth_getUncleCountByBlockHash';
-	readonly params: [EIP1193DATA];
-};
-
-export type EIP1193GetUncleCountByBlockNumberRequest = {
-	readonly method: 'eth_getUncleCountByBlockNumber';
-	readonly params: [EIP1193BlockTag];
-};
-
-export type EIP1193GetCodeRequest = {
-	readonly method: 'eth_getCode';
-	readonly params: [EIP1193Account] | [EIP1193Account, EIP1898BlockTag]; // TODO EIP1898BlockTag mandatory (base network gateway seems to think so)?
-};
-
-export type EIP1193LegacySignRequest = {
-	readonly method: 'eth_sign';
-	readonly params: [EIP1193Account, EIP1193DATA];
-};
-
-export type EIP1193SignTransactionRequest = {
-	readonly method: 'eth_signTransaction';
-	readonly params: [EIP1193TransactionData];
-};
-
-export type EIP1193SendTransactionRequest = {
-	readonly method: 'eth_sendTransaction';
-	readonly params: [EIP1193TransactionData];
-};
-
-export type EIP1193SendRawTransactionRequest = {
-	readonly method: 'eth_sendRawTransaction';
-	readonly params: [EIP1193DATA];
-};
-
-export type EIP1193CallRequest = {
-	readonly method: 'eth_call';
-	readonly params: [EIP1193CallParam] | [EIP1193CallParam, EIP1898BlockTag];
-};
-
-export type EIP1193EstimateGasRequest = {
-	readonly method: 'eth_estimateGas';
-	readonly params: [EIP1193CallParam] | [EIP1193CallParam, EIP1193BlockTag]; // EIP1898BlockTag ?
-};
-
-export type EIP1193GetBlockByHashRequest<T extends boolean = false> = {
-	readonly method: 'eth_getBlockByHash';
-	readonly params: [EIP1193DATA, T];
-};
-
-export type EIP1193GetBlockByNumberRequest<T = false> = {
-	readonly method: 'eth_getBlockByNumber';
-	readonly params: [EIP1193BlockTag, T];
-};
-
-export type EIP1193GetTransactionByHashRequest = {
-	readonly method: 'eth_getTransactionByHash';
-	readonly params: [EIP1193DATA];
+export type EIP1193TracedTransaction = {
+	failed: boolean;
+	gas: EIP1193QUANTITY;
+	returnValue: EIP1193DATA;
+	structLogs: any[]; // TODO
+	// TODO more
 };
 
-export type EIP1193GetTransactionByBlockHashAndIndexRequest = {
-	readonly method: 'eth_getTransactionByBlockHashAndIndex';
-	readonly params: [EIP1193DATA, EIP1193QUANTITY];
-};
+export type EIP1193SubscriptionMessage = EIP1193KnownSubscriptionMessage | EIP1193UnknownSubscriptionMessage;
 
-export type EIP1193GetTransactionByBlockNumberAndIndexRequest = {
-	readonly method: 'eth_getTransactionByBlockNumberAndIndex';
-	readonly params: [EIP1193BlockTag, EIP1193QUANTITY];
-};
+export type EIP1193Message = EIP1193SubscriptionMessage | EIP1193UnknownMessage;
 
-export type EIP1193GetTransactionReceiptRequest = {
-	readonly method: 'eth_getTransactionReceipt';
-	readonly params: [EIP1193DATA];
+export type EIP1193AddChainError = {
+	// TODO
 };
 
-export type EIP1193GetUncleByBlockHashAndIndexRequest = {
-	readonly method: 'eth_getUncleByBlockHashAndIndex';
-	readonly params: [EIP1193DATA, EIP1193QUANTITY];
+export type EIP1193SwitchChainError = {
+	// TODO
 };
 
-export type EIP1193GetUncleByBlockNumberAndIndexRequest = {
-	readonly method: 'eth_getUncleByBlockNumberAndIndex';
-	readonly params: [EIP1193BlockTag, EIP1193QUANTITY];
-};
+/*
+// TODO
+4001	User Rejected Request	The user rejected the request.
+4100	Unauthorized	The requested method and/or account has not been authorized by the user.
+4200	Unsupported Method	The Provider does not support the requested method.
+4900	Disconnected	The Provider is disconnected from all chains.
+4901	Chain Disconnected	The Provider is not connected to the requested chain.
+*/
 
-export type EIP1193GetLogsRequest = {
-	readonly method: 'eth_getLogs';
-	readonly params: [EIP1193LogsParam];
-};
+type Listener<Message> = (message: Message) => unknown | Promise<unknown>;
 
 // ------------------------------------------------------------------------------------------------
-// MORE REQUEST TYPES
+// REQUEST TYPES
 // ------------------------------------------------------------------------------------------------
 
-export type EIP1193PersonalSignRequest = {
-	readonly method: 'personal_sign';
-	readonly params: [EIP1193DATA, EIP1193Account];
-};
-
-export type EIP1193PTypedSignv4Request = {
-	readonly method: 'eth_signTypedData_v4';
-	readonly params: [EIP1193Account, EIP1193TypedSignatureParam];
-};
-
-export type EIP1193PTypedSignRequest = {
-	readonly method: 'eth_signTypedData';
-	readonly params: [EIP1193Account, EIP1193TypedSignatureParam];
-};
-
-export type EIP1193ChainIdRequest = {
-	readonly method: 'eth_chainId';
-};
-
-export type EIP1193RequestAccountsRequest = {
-	readonly method: 'eth_requestAccounts';
-};
-
-export type ERIP1193SwitchChainRequest = {
-	readonly method: 'wallet_switchEthereumChain';
-	readonly params: [
-		{
-			chainId: EIP1193ChainId;
-		}
-	];
-};
-export type ERIP1193AddChainRequest = {
-	readonly method: 'wallet_addEthereumChain';
-	readonly params: [EIP1193AddChainParam];
-};
-
-export type EIP1193OtherSubscribeRequest = {
-	readonly method: 'eth_subscribe';
-	readonly params: ['newHeads' | 'newPendingTransactions' | 'syncing'];
-};
-
-export type EIP1193LogsSubscribeRequest = {
-	readonly method: 'eth_subscribe';
-	readonly params: [
-		'logs',
-		{
-			address: EIP1193Account | EIP1193Account[];
-			topics: (EIP1193DATA[] | EIP1193DATA)[];
-		}
-	];
-};
-
-export type EIP1193SubscribeRequest = EIP1193LogsSubscribeRequest | EIP1193OtherSubscribeRequest;
+export type Methods = ReadMethods & NodeOnlyReadMethods & WriteMethods & SignerMethods & WalletOnlyMethods;
+
+export type NodeOnlyReadMethods = {
+	web3_clientVersion: {result: string};
+	web3_sha: {params: [EIP1193DATA]; result: EIP1193DATA};
+	net_version: {result: EIP1193ChainId};
+	net_listening: {result: boolean};
+	net_peerCount: {result: EIP1193QUANTITY};
+	eth_protocolVersion: {result: string};
+	eth_syncing: {result: EIP1193SyncingStatus | false};
+	eth_coinbase: {result: EIP1193Account};
+	eth_mining: {result: boolean}; // TODO check
+	eth_hashrate: {result: unknown}; // TODO
+};
+
+export type ReadMethods = {
+	eth_gasPrice: {result: EIP1193QUANTITY};
+
+	eth_blockNumber: {result: EIP1193QUANTITY};
+	eth_getBalance: {params: [EIP1193Account] | [EIP1193Account, EIP1898BlockTag]; result: EIP1193QUANTITY};
+	eth_getStorageAt: {
+		params: [EIP1193Account, EIP1193QUANTITY] | [EIP1193Account, EIP1193QUANTITY, EIP1898BlockTag];
+		result: EIP1193DATA;
+	};
+	eth_getTransactionCount: {params: [EIP1193Account] | [EIP1193Account, EIP1898BlockTag]; result: EIP1193QUANTITY};
+	eth_getBlockTransactionCountByHash: {params: [EIP1193DATA]; result: EIP1193QUANTITY};
+	eth_getBlockTransactionCountByNumber: {params: [EIP1193BlockTag]; result: EIP1193QUANTITY};
+	eth_getUncleCountByBlockHash: {params: [EIP1193DATA]; result: EIP1193QUANTITY};
+	eth_getUncleCountByBlockNumber: {params: [EIP1193BlockTag]; resu; t: EIP1193QUANTITY};
+	eth_getCode: {params: [EIP1193Account] | [EIP1193Account, EIP1898BlockTag]; result: EIP1193DATA};
+
+	eth_call: {params: [EIP1193CallParam] | [EIP1193CallParam, EIP1898BlockTag]; result: EIP1193DATA};
+	eth_estimateGas: {params: [EIP1193CallParam] | [EIP1193CallParam, EIP1193BlockTag]; result: EIP1193QUANTITY}; // EIP1898BlockTag ?
+	eth_getBlockByHash:
+		| {params: [EIP1193DATA, true]; result: EIP1193BlockWithTransactions | null}
+		| {params: [EIP1193DATA, false]; result: EIP1193Block | null};
+	eth_getBlockByNumber:
+		| {params: [EIP1193BlockTag, true]; result: EIP1193BlockWithTransactions | null}
+		| {params: [EIP1193BlockTag, false]; result: EIP1193Block | null};
+	eth_getTransactionByHash: {params: [EIP1193DATA]; result: EIP1193Transaction | null};
+	eth_getTransactionByBlockHashAndIndex: {params: [EIP1193DATA, EIP1193QUANTITY]; result: EIP1193Transaction | null};
+	eth_getTransactionByBlockNumberAndIndex: {
+		params: [EIP1193BlockTag, EIP1193QUANTITY];
+		result: EIP1193Transaction | null;
+	};
 
-export type EIP1193UnsubscribeRequest = {
-	readonly method: 'eth_unsubscribe';
-	readonly params: [EIP1193DATA];
+	eth_getTransactionReceipt: {params: [EIP1193DATA]; result: EIP1193TransactionReceipt | null};
+	eth_getUncleByBlockHashAndIndex: {params: [EIP1193DATA, EIP1193QUANTITY]; result: EIP1193Block | null};
+	eth_getUncleByBlockNumberAndIndex: {params: [EIP1193BlockTag, EIP1193QUANTITY]; result: EIP1193Block | null};
+	eth_getLogs: {params: [EIP1193LogsParam]; result: EIP1193Log[]};
+	eth_chainId: {result: EIP1193ChainId};
+
+	eth_subscribe:
+		| {params: ['newHeads' | 'newPendingTransactions' | 'syncing']; result: string}
+		| {
+				params: [
+					'logs',
+					{
+						address: EIP1193Account | EIP1193Account[];
+						topics: (EIP1193DATA[] | EIP1193DATA)[];
+					}
+				];
+				result: string;
+		  };
+	eth_unsubscribe: {params: [EIP1193DATA]; result: boolean};
+	eth_getProof: {params: [EIP1193DATA, EIP1193DATA[]] | [EIP1193DATA, EIP1193DATA[], EIP1898BlockTag]; result: unknown}; // TODO
+};
+
+export type WriteMethods = {
+	eth_sendRawTransaction: {params: [EIP1193DATA]; result: EIP1193DATA};
+};
+
+export type SignerMethods = {
+	eth_accounts: {result: EIP1193Accounts};
+	eth_sign: {params: [EIP1193Account, EIP1193DATA]; result: EIP1193DATA};
+	eth_signTransaction: {params: [EIP1193TransactionData]; result: EIP1193DATA};
+
+	personal_sign: {params: [EIP1193DATA, EIP1193Account]; result: EIP1193DATA};
+	eth_signTypedData_v4: {params: [EIP1193Account, EIP1193TypedSignatureParam]; result: EIP1193DATA};
+	eth_signTypedData: {params: [EIP1193Account, EIP1193TypedSignatureParam]; result: EIP1193DATA};
+};
+
+export type ConnectedAccountMethods = {
+	eth_sendTransaction: {params: [EIP1193TransactionData]; result: EIP1193DATA};
+};
+
+export type WalletOnlyMethods = {
+	eth_requestAccounts: {result: EIP1193Accounts};
+	wallet_switchEthereumChain: {
+		params: [
+			{
+				chainId: EIP1193ChainId;
+			}
+		];
+		result: EIP1193SwitchChainError | null;
+	};
+	wallet_addEthereumChain: {params: [EIP1193AddChainParam]; result: EIP1193AddChainError | null};
 };
 
-export type EIP1193GetProofRequest = {
-	readonly method: 'eth_getProof';
-	readonly params: [EIP1193DATA, EIP1193DATA[]] | [EIP1193DATA, EIP1193DATA[], EIP1898BlockTag];
+export type DebugOnlyMethods = {
+	debug_traceTransaction: {params: [EIP1193DATA]; result: EIP1193TracedTransaction};
 };
 
-// ------------------------------------------------------------------------------------------------
+export type WalletMethods = ReadMethods & SignerMethods & ConnectedAccountMethods & WalletOnlyMethods;
 
-export type EIP1193Request =
-	| EIP1193Web3ClientVersionRequest
-	| EIP1193Web3SHARequest
-	| EIP1193NetVersionRequest
-	| EIP1193NetListeningRequest
-	| EIP1193NetPeerCountRequest
-	| EIP1193ProtocolVersionRequest
-	| EIP1193SyncingRequest
-	| EIP1193CoinbaseRequest
-	| EIP1193MiningRequest
-	| EIP1193HashrateRequest
-	| EIP1193AccountsRequest
-	| EIP1193BlockNumberRequest
-	| EIP1193GetBalanceRequest
-	| EIP1193GetStorageAtRequest
-	| EIP1193GetTransactionCountRequest
-	| EIP1193GetTransactionCountByHashRequest
-	| EIP1193GetTransactionCountByNumberRequest
-	| EIP1193GetUncleCountByBlockHashRequest
-	| EIP1193GetUncleCountByBlockNumberRequest
-	| EIP1193GetCodeRequest
-	| EIP1193LegacySignRequest
-	| EIP1193SignTransactionRequest
-	| EIP1193SendTransactionRequest
-	| EIP1193SendRawTransactionRequest
-	| EIP1193CallRequest
-	| EIP1193EstimateGasRequest
-	| EIP1193GetBlockByHashRequest<false>
-	| EIP1193GetBlockByNumberRequest<false>
-	| EIP1193GetBlockByHashRequest<true>
-	| EIP1193GetBlockByNumberRequest<true>
-	| EIP1193GetTransactionByHashRequest
-	| EIP1193GetTransactionByBlockHashAndIndexRequest
-	| EIP1193GetTransactionByBlockNumberAndIndexRequest
-	| EIP1193GetTransactionReceiptRequest
-	| EIP1193GetUncleByBlockHashAndIndexRequest
-	| EIP1193GetUncleByBlockNumberAndIndexRequest
-	| EIP1193GetLogsRequest
-	| EIP1193PersonalSignRequest
-	| EIP1193PTypedSignv4Request
-	| EIP1193PTypedSignRequest
-	| EIP1193ChainIdRequest
-	| EIP1193RequestAccountsRequest
-	| ERIP1193SwitchChainRequest
-	| ERIP1193AddChainRequest
-	| EIP1193SubscribeRequest
-	| EIP1193UnsubscribeRequest
-	| EIP1193GasPriceRequest;
-
-export type EIP1193Response =
-	| EIP1193ChainId
-	| EIP1193SyncingStatus
-	| false
-	| EIP1193QUANTITY
-	| EIP1193BlockWithTransactions
-	| EIP1193Transaction
-	| null
-	| EIP1193TransactionReceipt
-	| null
-	| EIP1193Block
-	| null
-	| EIP1193Log[]
-	| EIP1193DATA
-	| EIP1193ChainId
-	| EIP1193Accounts
-	| EIP1193SwitchChainError
-	| EIP1193AddChainError
-	| string
-	| boolean;
+export type EIP1193TypedSignatureParam = {[field: string]: any}; // TODO
 
 export type EIP1193GenericRequest = {
 	method: string;
@@ -561,304 +408,76 @@ export type EIP1193KnownSubscriptionMessage = EIP1193UnknownMessage & {
 	};
 };
 
-export type EIP1193SubscriptionMessage = EIP1193KnownSubscriptionMessage | EIP1193UnknownSubscriptionMessage;
-
-export type EIP1193Message = EIP1193SubscriptionMessage | EIP1193UnknownMessage;
-
-export type EIP1193AddChainError = {
-	// TODO
-};
-
-export type EIP1193SwitchChainError = {
-	// TODO
-};
-
-/*
-// TODO
-4001	User Rejected Request	The user rejected the request.
-4100	Unauthorized	The requested method and/or account has not been authorized by the user.
-4200	Unsupported Method	The Provider does not support the requested method.
-4900	Disconnected	The Provider is disconnected from all chains.
-4901	Chain Disconnected	The Provider is not connected to the requested chain.
-*/
-
-type Listener<Message> = (message: Message) => unknown | Promise<unknown>;
-
-export type EIP1193Web3ClientVersionProvider = {
-	request(args: EIP1193Web3ClientVersionRequest): Promise<string>;
-};
-
-export type EIP1193Web3SHAProvider = {
-	request(args: EIP1193Web3SHARequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193NetVersionProvider = {
-	request(args: EIP1193NetVersionRequest): Promise<EIP1193ChainId>;
-};
-
-export type EIP1193NetListeningProvider = {
-	request(args: EIP1193NetListeningRequest): Promise<boolean>;
-};
-
-export type EIP1193NetPeerCountProvider = {
-	request(args: EIP1193NetPeerCountRequest): Promise<EIP1193QUANTITY>;
-};
-
-export type EIP1193ProtocolVersionProvider = {
-	request(args: EIP1193ProtocolVersionRequest): Promise<string>;
-};
-
-export type EIP1193SyncingProvider = {
-	request(args: EIP1193SyncingRequest): Promise<EIP1193SyncingStatus | false>;
-};
-export type EIP1193CoinbaseProvider = {
-	request(args: EIP1193CoinbaseRequest): Promise<EIP1193Account>;
-};
-export type EIP1193GasPriceProvider = {
-	request(args: EIP1193GasPriceRequest): Promise<EIP1193QUANTITY>;
-};
-export type EIP1193AccountsProvider = {
-	request(args: EIP1193AccountsRequest): Promise<EIP1193Accounts>;
-};
-export type EIP1193BlockNumberProvider = {
-	request(args: EIP1193BlockNumberRequest): Promise<EIP1193QUANTITY>;
-};
-export type EIP1193GetBalanceProvider = {
-	request(args: EIP1193GetBalanceRequest): Promise<EIP1193QUANTITY>;
-};
-export type EIP1193GetStorageAtProvider = {
-	request(args: EIP1193GetStorageAtRequest): Promise<EIP1193DATA>;
-};
-export type EIP1193GetTransactionCountProvider = {
-	request(args: EIP1193GetTransactionCountRequest): Promise<EIP1193QUANTITY>;
-};
-export type EIP1193GetTransactionCountByHashProvider = {
-	request(args: EIP1193GetTransactionCountByHashRequest): Promise<EIP1193QUANTITY>;
-};
-export type EIP1193GetTransactionCountByNumberProvider = {
-	request(args: EIP1193GetTransactionCountByNumberRequest): Promise<EIP1193QUANTITY>;
-};
-
-export type EIP1193GetUncleCountByBlockHashProvider = {
-	request(args: EIP1193GetUncleCountByBlockHashRequest): Promise<EIP1193QUANTITY>;
-};
-
-export type EIP1193GetUncleCountByBlockNumberProvider = {
-	request(args: EIP1193GetUncleCountByBlockNumberRequest): Promise<EIP1193QUANTITY>;
-};
-
-export type EIP1193GetCodeProvider = {
-	request(args: EIP1193GetCodeRequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193LegacySignProvider = {
-	request(args: EIP1193LegacySignRequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193SignTransactionProvider = {
-	request(args: EIP1193SignTransactionRequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193SendTransactionProvider = {
-	request(args: EIP1193SendTransactionRequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193SendRawTransactionProvider = {
-	request(args: EIP1193SendRawTransactionRequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193CallProvider = {
-	request(args: EIP1193CallRequest): Promise<EIP1193DATA>;
-};
-
-export type EIP1193EstimateGasProvider = {
-	request(args: EIP1193EstimateGasRequest): Promise<EIP1193QUANTITY>;
-};
-
-export type EIP1193GetBlockByHashProvider = {
-	request(args: EIP1193GetBlockByHashRequest): Promise<EIP1193Block | null>;
-	request(args: EIP1193GetBlockByHashRequest<true>): Promise<EIP1193BlockWithTransactions | null>;
-};
+// ------------------------------------------------------------------------------------------------
+// TOOLS
+// ------------------------------------------------------------------------------------------------
 
-export type EIP1193GetBlockByNumberProvider = {
-	request(args: EIP1193GetBlockByNumberRequest): Promise<EIP1193Block | null>;
-	request(args: EIP1193GetBlockByNumberRequest<true>): Promise<EIP1193BlockWithTransactions | null>;
-};
+// taken from https://dev.to/bwca/deep-readonly-generic-in-typescript-4b04
+type DeepReadonly<T> = Readonly<{
+	[K in keyof T]: T[K] extends number | string | symbol // Is it a primitive? Then make it readonly
+		? Readonly<T[K]>
+		: // Is it an array of items? Then make the array readonly and the item as well
+		T[K] extends Array<infer A>
+		? Readonly<Array<DeepReadonly<A>>>
+		: // It is some other object, make it readonly as well
+		  DeepReadonly<T[K]>;
+}>;
+
+export type RPCRequestData = {params?: any; result?: any; errors?: any};
+
+export type RPCMethods = Record<string, RPCRequestData>;
+
+export type RemoteRequestCallType<
+	Method extends string,
+	Value,
+	Params extends any[] | Record<string, any> | undefined = undefined
+> = Params extends undefined
+	? {
+			request: (req: {method: Method}) => Promise<Value>;
+	  }
+	: Params extends []
+	? {
+			request: (req: {method: Method}) => Promise<Value>;
+	  }
+	: {
+			request: (req: {method: Method; params: DeepReadonly<Params>}) => Promise<Value>;
+	  };
+
+export type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+
+export type RequestUnion<T extends RPCMethods> = {
+	[Property in keyof T]: RemoteRequestCallType<
+		Property extends string ? Property : never,
+		T[Property] extends {result: any} ? T[Property]['result'] : undefined,
+		T[Property] extends {params: any} ? T[Property]['params'] : undefined
+	>;
+}[keyof T];
 
-export type EIP1193GetTransactionByHashProvider = {
-	request(args: EIP1193GetTransactionByHashRequest): Promise<EIP1193Transaction | null>;
-};
-export type EIP1193GetTransactionByBlockHashAndIndexProvider = {
-	request(args: EIP1193GetTransactionByBlockHashAndIndexRequest): Promise<EIP1193Transaction | null>;
-};
-export type EIP1193GetTransactionByBlockNumberAndIndexProvider = {
-	request(args: EIP1193GetTransactionByBlockNumberAndIndexRequest): Promise<EIP1193Transaction | null>;
-};
-export type EIP1193GetTransactionReceiptProvider = {
-	request(args: EIP1193GetTransactionReceiptRequest): Promise<EIP1193TransactionReceipt | null>;
-};
-export type EIP1193GetUncleByBlockHashAndIndexProvider = {
-	request(args: EIP1193GetUncleByBlockHashAndIndexRequest): Promise<EIP1193Block | null>;
-};
-export type EIP1193GetUncleByBlockNumberAndIndexProvider = {
-	request(args: EIP1193GetUncleByBlockNumberAndIndexRequest): Promise<EIP1193Block | null>;
-};
-export type EIP1193GetLogsProvider = {
-	request(args: EIP1193GetLogsRequest): Promise<EIP1193Log[]>;
-};
-export type EIP1193PersonalSignProvider = {
-	request(args: EIP1193PersonalSignRequest): Promise<EIP1193DATA>;
-};
-export type EIP1193PTypedSignv4Provider = {
-	request(args: EIP1193PTypedSignv4Request): Promise<EIP1193DATA>;
-};
+// ------------------------------------------------------------------------------------------------
+// PROVIDERS
+// ------------------------------------------------------------------------------------------------
 
-export type EIP1193PTypedSignProvider = {
-	request(args: EIP1193PTypedSignRequest): Promise<EIP1193DATA>;
-};
+export type RequestRPC<T extends RPCMethods> = UnionToIntersection<RequestUnion<T>>;
 
-export type EIP1193ChainIdProvider = {
-	request(args: EIP1193ChainIdRequest): Promise<EIP1193ChainId>;
-};
+export type EIP1193ProviderWithoutEvents = RequestRPC<Methods>;
 
-export type EIP1193RequestAccountsProvider = {
-	request(args: EIP1193RequestAccountsRequest): Promise<EIP1193Accounts>;
-};
+// export type EIP1193WindowWalletProvider = EIP1193Provider;
 
-export type ERIP1193SwitchChainProvider = {
-	request(args: ERIP1193SwitchChainRequest): Promise<EIP1193SwitchChainError | null>;
-};
+export type EIP1193WalletProvider = RequestRPC<WalletMethods>;
 
-export type ERIP1193AddChainProvider = {
-	request(args: ERIP1193AddChainRequest): Promise<EIP1193AddChainError | null>;
-};
+export type EIP1193WindowWalletProvider = EIP1193WalletProvider & EIP1193EventsProvider;
 
-export type EIP1193SubscribtionProvider = {
-	request(args: EIP1193SubscribeRequest): Promise<string>;
-	request(args: EIP1193UnsubscribeRequest): Promise<boolean>;
-};
+export type EIP1193SignerProvider = RequestRPC<SignerMethods>;
 
-// export type EIP1193RequestProvider<V extends EIP1193GenericRequest = EIP1193GenericRequest> = {
-// 	request<T = unknown>(args: V): Promise<T>;
-// };
+export type EIP1193DebugProvider = EIP1193ProviderWithoutEvents & RequestRPC<DebugOnlyMethods>;
 
 export type EIP1193GenericRequestProvider = {
 	request<T = unknown, V extends EIP1193GenericRequest = EIP1193GenericRequest>(args: V): Promise<T>;
 };
 
-export type EIP1193ProviderWithoutEvents = EIP1193Web3ClientVersionProvider &
-	EIP1193Web3SHAProvider &
-	EIP1193NetVersionProvider &
-	EIP1193NetListeningProvider &
-	EIP1193NetPeerCountProvider &
-	EIP1193ProtocolVersionProvider &
-	EIP1193SyncingProvider &
-	EIP1193CoinbaseProvider &
-	EIP1193GasPriceProvider &
-	EIP1193AccountsProvider &
-	EIP1193BlockNumberProvider &
-	EIP1193GetBalanceProvider &
-	EIP1193GetStorageAtProvider &
-	EIP1193GetTransactionCountProvider &
-	EIP1193GetTransactionCountByHashProvider &
-	EIP1193GetTransactionCountByNumberProvider &
-	EIP1193GetUncleCountByBlockHashProvider &
-	EIP1193GetUncleCountByBlockNumberProvider &
-	EIP1193GetCodeProvider &
-	EIP1193LegacySignProvider &
-	EIP1193SignTransactionProvider &
-	EIP1193SendTransactionProvider &
-	EIP1193SendRawTransactionProvider &
-	EIP1193CallProvider &
-	EIP1193EstimateGasProvider &
-	EIP1193GetBlockByHashProvider &
-	EIP1193GetBlockByNumberProvider &
-	EIP1193GetTransactionByHashProvider &
-	EIP1193GetTransactionByBlockHashAndIndexProvider &
-	EIP1193GetTransactionByBlockNumberAndIndexProvider &
-	EIP1193GetTransactionReceiptProvider &
-	EIP1193GetUncleByBlockHashAndIndexProvider &
-	EIP1193GetUncleByBlockNumberAndIndexProvider &
-	EIP1193GetLogsProvider &
-	EIP1193PersonalSignProvider &
-	EIP1193PTypedSignv4Provider &
-	EIP1193PTypedSignProvider &
-	EIP1193ChainIdProvider &
-	EIP1193RequestAccountsProvider &
-	ERIP1193SwitchChainProvider &
-	ERIP1193AddChainProvider &
-	EIP1193SubscribtionProvider &
-	EIP1193GenericRequestProvider;
-
-export type EIP1193DebugTraceTransactionRequest = {
-	readonly method: 'debug_traceTransaction';
-	readonly params: [EIP1193DATA];
-};
-
-export type EIP1193TracedTransaction = {
-	failed: boolean;
-	gas: EIP1193QUANTITY;
-	returnValue: EIP1193DATA;
-	structLogs: any[]; // TODO
-	// TODO more
-};
-
-export type EIP1193DebugTraceTransactionProvider = {
-	request(args: EIP1193DebugTraceTransactionRequest): Promise<EIP1193TracedTransaction>;
-};
-
-// export type EIP1193WindowWalletProvider = EIP1193Provider;
-
-export type EIP1193WalletProvider = EIP1193GasPriceProvider &
-	EIP1193AccountsProvider &
-	EIP1193BlockNumberProvider &
-	EIP1193GetBalanceProvider &
-	EIP1193GetStorageAtProvider &
-	EIP1193GetTransactionCountProvider &
-	EIP1193GetTransactionCountByHashProvider &
-	EIP1193GetTransactionCountByNumberProvider &
-	EIP1193GetUncleCountByBlockHashProvider &
-	EIP1193GetUncleCountByBlockNumberProvider &
-	EIP1193GetCodeProvider &
-	EIP1193LegacySignProvider &
-	// EIP1193SignTransactionProvider &
-	EIP1193SendTransactionProvider &
-	EIP1193SendRawTransactionProvider &
-	EIP1193CallProvider &
-	EIP1193EstimateGasProvider &
-	EIP1193GetBlockByHashProvider &
-	EIP1193GetBlockByNumberProvider &
-	EIP1193GetTransactionByHashProvider &
-	EIP1193GetTransactionByBlockHashAndIndexProvider &
-	EIP1193GetTransactionByBlockNumberAndIndexProvider &
-	EIP1193GetTransactionReceiptProvider &
-	EIP1193GetUncleByBlockHashAndIndexProvider &
-	EIP1193GetUncleByBlockNumberAndIndexProvider &
-	EIP1193GetLogsProvider &
-	EIP1193PersonalSignProvider &
-	EIP1193PTypedSignv4Provider &
-	EIP1193PTypedSignProvider &
-	EIP1193ChainIdProvider &
-	EIP1193RequestAccountsProvider &
-	ERIP1193SwitchChainProvider &
-	ERIP1193AddChainProvider &
-	EIP1193SubscribtionProvider &
-	EIP1193GenericRequestProvider;
-
-export type EIP1193WindowWalletProvider = EIP1193WalletProvider & EIP1193EventsProvider;
-
-export type EIP1193SignerProvider = EIP1193AccountsProvider &
-	EIP1193LegacySignProvider &
-	EIP1193SignTransactionProvider &
-	EIP1193PersonalSignProvider &
-	EIP1193PTypedSignv4Provider &
-	EIP1193PTypedSignProvider &
-	EIP1193GenericRequestProvider;
-
-export type EIP1193DebugProvider = EIP1193ProviderWithoutEvents &
-	EIP1193GenericRequestProvider &
-	EIP1193DebugTraceTransactionProvider;
-
+// ------------------------------------------------------------------------------------------------
+// EVENTS PROVIDERS
+// ------------------------------------------------------------------------------------------------
 export interface EIP1193OnMessageProvider {
 	on(eventName: 'message', listener: Listener<EIP1193Message>): this;
 	removeListener(eventName: 'message', listener: Listener<EIP1193Message>): this;
@@ -898,21 +517,3 @@ export interface EIP1193EventsProvider {
 }
 
 export interface EIP1193Provider extends EIP1193ProviderWithoutEvents, EIP1193EventsProvider {}
-
-export type EIP1193DATA = `0x${string}`;
-export type EIP1193BlockTag = EIP1193QUANTITY | 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized';
-
-export type EIP1898BlockTag =
-	| EIP1193QUANTITY
-	| 'latest'
-	| 'earliest'
-	| 'pending'
-	| 'safe'
-	| 'finalized'
-	| {blockHash: EIP1193QUANTITY; requireCanonical?: boolean} // EIP-1898
-	| {blockNumber: EIP1193QUANTITY}; // EIP-1898
-
-export type EIP1193QUANTITY = `0x${string}`;
-export type EIP1193ChainId = `0x${string}`;
-export type EIP1193Account = `0x${string}`;
-export type EIP1193Accounts = EIP1193Account[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-1193",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Types for EIP-1193 ethereum provider",
   "keywords": ["ethereum", "eip-1193"],
   "author": "Ronan Sandford",