eip-1193 0.0.5 → 0.1.1

package/index.d.ts

@@ -2,77 +2,77 @@
 // TYPES
 // ------------------------------------------------------------------------------------------------
 export type EIP1193Transaction = {
-	blockHash: DATA;
-	blockNumber: QUANTITY | null;
+	blockHash: EIP1193DATA;
+	blockNumber: EIP1193QUANTITY | null;
 	from: EIP1193Account;
-	gas: QUANTITY;
-	gasPrice: QUANTITY;
-	hash: DATA;
-	input: DATA;
-	nonce: QUANTITY;
+	gas: EIP1193QUANTITY;
+	gasPrice: EIP1193QUANTITY;
+	hash: EIP1193DATA;
+	input: EIP1193DATA;
+	nonce: EIP1193QUANTITY;
 	to: EIP1193Account;
-	transactionIndex: QUANTITY | null;
-	value: QUANTITY;
-	v: QUANTITY;
-	r: QUANTITY;
-	s: QUANTITY;
+	transactionIndex: EIP1193QUANTITY | null;
+	value: EIP1193QUANTITY;
+	v: EIP1193QUANTITY;
+	r: EIP1193QUANTITY;
+	s: EIP1193QUANTITY;
 };
 
 export type EIP1193SyncingStatus = {
-	startingBlock: QUANTITY;
-	currentBlock: QUANTITY;
-	highestBlock: QUANTITY;
+	startingBlock: EIP1193QUANTITY;
+	currentBlock: EIP1193QUANTITY;
+	highestBlock: EIP1193QUANTITY;
 };
 
 export type EIP1193Block = {
-	number: QUANTITY;
-	hash: DATA;
-	parentHash: DATA;
-	nonce: DATA;
-	sha3Uncles: DATA;
-	logsBloom: DATA;
-	transactionsRoot: DATA;
-	stateRoot: DATA;
-	receiptsRoot: DATA;
+	number: EIP1193QUANTITY;
+	hash: EIP1193DATA;
+	parentHash: EIP1193DATA;
+	nonce: EIP1193DATA;
+	sha3Uncles: EIP1193DATA;
+	logsBloom: EIP1193DATA;
+	transactionsRoot: EIP1193DATA;
+	stateRoot: EIP1193DATA;
+	receiptsRoot: EIP1193DATA;
 	miner: EIP1193Account;
-	difficulty: QUANTITY;
-	totalDifficulty: QUANTITY;
-	extraData: DATA;
-	size: QUANTITY;
-	gasLimit: QUANTITY;
-	gasUsed: QUANTITY;
-	timestamp: QUANTITY;
-	uncles: DATA[];
+	difficulty: EIP1193QUANTITY;
+	totalDifficulty: EIP1193QUANTITY;
+	extraEIP1193DATA: EIP1193DATA;
+	size: EIP1193QUANTITY;
+	gasLimit: EIP1193QUANTITY;
+	gasUsed: EIP1193QUANTITY;
+	timestamp: EIP1193QUANTITY;
+	uncles: EIP1193DATA[];
 };
 
 export type EIP1193Log = {
 	removed: boolean;
-	logIndex: QUANTITY | null;
-	transactionIndex: QUANTITY | null;
-	transactionHash: DATA | null;
-	blockHash: DATA | null;
-	blockNumber: QUANTITY | null;
+	logIndex: EIP1193QUANTITY | null;
+	transactionIndex: EIP1193QUANTITY | null;
+	transactionHash: EIP1193DATA | null;
+	blockHash: EIP1193DATA | null;
+	blockNumber: EIP1193QUANTITY | null;
 	address: EIP1193Account;
-	data: DATA;
-	topics: DATA[];
+	data: EIP1193DATA;
+	topics: EIP1193DATA[];
 };
 
 export type EIP1193TransactionReceipt = {
-	transactionHash: DATA;
-	transactionIndex: QUANTITY;
-	blockHash: DATA;
-	blockNumber: QUANTITY;
+	transactionHash: EIP1193DATA;
+	transactionIndex: EIP1193QUANTITY;
+	blockHash: EIP1193DATA;
+	blockNumber: EIP1193QUANTITY;
 	from: EIP1193Account;
 	to: EIP1193Account;
-	cumulativeGasUsed: QUANTITY;
-	effectiveGasPrice: QUANTITY;
-	gasUsed: QUANTITY;
+	cumulativeGasUsed: EIP1193QUANTITY;
+	effectiveGasPrice: EIP1193QUANTITY;
+	gasUsed: EIP1193QUANTITY;
 	contractAddress: EIP1193Account;
 	logs: EIP1193Log[];
-	logsBloom: DATA;
-	type: DATA;
-	root: DATA;
-	status: QUANTITY;
+	logsBloom: EIP1193DATA;
+	type: EIP1193DATA;
+	root: EIP1193DATA;
+	status: EIP1193QUANTITY;
 };
 
 export type EIP1193PendingBlock = EIP1193Block & {
@@ -90,39 +90,40 @@ export type EIP1193PendingBlockWithTransactions = EIP1193PendingBlock & {
 	transactions: EIP1193Transaction[];
 };
 
-type EIP1193BaseTransactionData = {
-	gas?: QUANTITY;
-	gasPrice?: QUANTITY;
-	value?: QUANTITY;
-	data?: DATA;
-	nonce?: QUANTITY;
-};
-export type EIP1193NormalTransactionData = EIP1193BaseTransactionData & {
-	from: EIP1193Account;
-	to: EIP1193Account;
+type EIP1193BaseTransactionEIP1193DATA = {
+	gas?: EIP1193QUANTITY;
+	gasPrice?: EIP1193QUANTITY;
+	value?: EIP1193QUANTITY;
+	data?: EIP1193DATA;
+	nonce?: EIP1193QUANTITY;
 };
+export type EIP1193NormalTransactionEIP1193DATA =
+	EIP1193BaseTransactionEIP1193DATA & {
+		from: EIP1193Account;
+		to: EIP1193Account;
+	};
 
-export type EIP1193TransactionContractCreationData =
-	EIP1193BaseTransactionData & {
+export type EIP1193TransactionContractCreationEIP1193DATA =
+	EIP1193BaseTransactionEIP1193DATA & {
 		from: EIP1193Account;
-		data: DATA;
+		data: EIP1193DATA;
 	};
 
-export type EIP1193TransactionData =
-	| EIP1193NormalTransactionData
-	| EIP1193TransactionContractCreationData;
+export type EIP1193TransactionEIP1193DATA =
+	| EIP1193NormalTransactionEIP1193DATA
+	| EIP1193TransactionContractCreationEIP1193DATA;
 
 export type EIP1193CallParam = {
 	from?: EIP1193Account;
 	to: EIP1193Account;
-	gas?: QUANTITY;
-	gasPrice?: QUANTITY;
-	value?: QUANTITY;
-	data?: `0x${string}`;
+	gas?: EIP1193QUANTITY;
+	gasPrice?: EIP1193QUANTITY;
+	value?: EIP1193QUANTITY;
+	data?: EIP1193DATA;
 };
 
 export type EIP1193AddChainParam = {
-	chainId: ChainId;
+	chainId: EIP1193ChainId;
 	rpcUrls?: string[];
 	blockExplorerUrls?: string[];
 	chainName?: string;
@@ -135,11 +136,11 @@ export type EIP1193AddChainParam = {
 };
 
 export type EIP1193LogsParam = {
-	fromBlock?: BlockTag;
-	toBlock?: BlockTag;
+	fromBlock?: EIP1193BlockTag;
+	toBlock?: EIP1193BlockTag;
 	address?: EIP1193Account | EIP1193Accounts;
-	topics?: DATA[];
-	blockhash?: DATA;
+	topics?: (EIP1193DATA | EIP1193DATA[])[];
+	blockhash?: EIP1193DATA;
 };
 
 export type EIP1193TypedSignatureParam = { [field: string]: any }; // TODO
@@ -153,7 +154,7 @@ export type EIP1193Web3ClientVersionRequest = {
 
 export type EIP1193Web3SHARequest = {
 	readonly method: "web3_sha";
-	readonly params: [DATA];
+	readonly params: [EIP1193DATA];
 };
 
 export type EIP1193NetVersionRequest = {
@@ -202,114 +203,114 @@ export type EIP1193BlockNumberRequest = {
 
 export type EIP1193GetBalanceRequest = {
 	readonly method: "eth_getBalance";
-	readonly params: [EIP1193Account] | [EIP1193Account, BlockTag];
+	readonly params: [EIP1193Account] | [EIP1193Account, EIP1193BlockTag];
 };
 
 export type EIP1193GetStorageAtRequest = {
 	readonly method: "eth_getStorageAt";
 	readonly params:
-		| [EIP1193Account, QUANTITY]
-		| [EIP1193Account, QUANTITY, BlockTag];
+		| [EIP1193Account, EIP1193QUANTITY]
+		| [EIP1193Account, EIP1193QUANTITY, EIP1193BlockTag];
 };
 
 export type EIP1193GetTransactionCountRequest = {
 	readonly method: "eth_getTransactionCount";
-	readonly params: [EIP1193Account] | [EIP1193Account, BlockTag];
+	readonly params: [EIP1193Account] | [EIP1193Account, EIP1193BlockTag];
 };
 
 export type EIP1193GetTransactionCountByHashRequest = {
 	readonly method: "eth_getBlockTransactionCountByHash";
-	readonly params: [DATA];
+	readonly params: [EIP1193DATA];
 };
 
 export type EIP1193GetTransactionCountByNumberRequest = {
 	readonly method: "eth_getBlockTransactionCountByNumber";
-	readonly params: [BlockTag];
+	readonly params: [EIP1193BlockTag];
 };
 
 export type EIP1193GetUncleCountByBlockHashRequest = {
 	readonly method: "eth_getUncleCountByBlockHash";
-	readonly params: [DATA];
+	readonly params: [EIP1193DATA];
 };
 
 export type EIP1193GetUncleCountByBlockNumberRequest = {
 	readonly method: "eth_getUncleCountByBlockNumber";
-	readonly params: [BlockTag];
+	readonly params: [EIP1193BlockTag];
 };
 
 export type EIP1193GetCodeRequest = {
 	readonly method: "eth_getCode";
-	readonly params: [EIP1193Account] | [EIP1193Account, BlockTag];
+	readonly params: [EIP1193Account] | [EIP1193Account, EIP1193BlockTag];
 };
 
 export type EIP1193LegacySignRequest = {
 	readonly method: "eth_sign";
-	readonly params: [EIP1193Account, DATA];
+	readonly params: [EIP1193Account, EIP1193DATA];
 };
 
 export type EIP1193SignTransactionRequest = {
 	readonly method: "eth_signTransaction";
-	readonly params: [EIP1193TransactionData];
+	readonly params: [EIP1193Transaction];
 };
 
 export type EIP1193SendTransactionRequest = {
 	readonly method: "eth_sendTransaction";
-	readonly params: [EIP1193TransactionData];
+	readonly params: [EIP1193Transaction];
 };
 
 export type EIP1193SendRawTransactionRequest = {
 	readonly method: "eth_sendRawTransaction";
-	readonly params: [DATA];
+	readonly params: [EIP1193DATA];
 };
 
 export type EIP119CallRequest = {
 	readonly method: "eth_call";
-	readonly params: [EIP1193CallParam] | [EIP1193CallParam, BlockTag];
+	readonly params: [EIP1193CallParam] | [EIP1193CallParam, EIP1193BlockTag];
 };
 
 export type EIP119EstimateGasRequest = {
 	readonly method: "eth_estimateGas";
-	readonly params: [EIP1193CallParam] | [EIP1193CallParam, BlockTag];
+	readonly params: [EIP1193CallParam] | [EIP1193CallParam, EIP1193BlockTag];
 };
 
 export type EIP119GetBlockByHashRequest<T extends boolean = false> = {
 	readonly method: "eth_getBlockByHash";
-	readonly params: [DATA, T];
+	readonly params: [EIP1193DATA, T];
 };
 
 export type EIP119GetBlockByNumberRequest<T = false> = {
 	readonly method: "eth_getBlockByNumber";
-	readonly params: [BlockTag, T];
+	readonly params: [EIP1193BlockTag, T];
 };
 
 export type EIP119GetTransactionByHashRequest = {
 	readonly method: "eth_getTransactionByHash";
-	readonly params: [DATA];
+	readonly params: [EIP1193DATA];
 };
 
 export type EIP119GetTransactionByBlockHashAndIndexRequest = {
 	readonly method: "eth_getTransactionByBlockHashAndIndex";
-	readonly params: [DATA, QUANTITY];
+	readonly params: [EIP1193DATA, EIP1193QUANTITY];
 };
 
 export type EIP119GetTransactionByBlockNumberAndIndexRequest = {
 	readonly method: "eth_getTransactionByBlockNumberAndIndex";
-	readonly params: [BlockTag, QUANTITY];
+	readonly params: [EIP1193BlockTag, EIP1193QUANTITY];
 };
 
 export type EIP119GetTransactionReceiptRequest = {
 	readonly method: "eth_getTransactionReceipt";
-	readonly params: [DATA];
+	readonly params: [EIP1193DATA];
 };
 
 export type EIP119GetUncleByBlockHashAndIndexRequest = {
 	readonly method: "eth_getUncleByBlockHashAndIndex";
-	readonly params: [DATA, QUANTITY];
+	readonly params: [EIP1193DATA, EIP1193QUANTITY];
 };
 
 export type EIP119GetUncleByBlockNumberAndIndexRequest = {
 	readonly method: "eth_getUncleByBlockNumberAndIndex";
-	readonly params: [BlockTag, QUANTITY];
+	readonly params: [EIP1193BlockTag, EIP1193QUANTITY];
 };
 
 export type EIP119GetLogsRequest = {
@@ -323,7 +324,7 @@ export type EIP119GetLogsRequest = {
 
 export type EIP1193PersonalSignRequest = {
 	readonly method: "personal_sign";
-	readonly params: [DATA, EIP1193Account];
+	readonly params: [EIP1193DATA, EIP1193Account];
 };
 
 export type EIP1193PTypedSignv4Request = {
@@ -348,7 +349,7 @@ export type ERIP1193SwitchChainRequest = {
 	readonly method: "wallet_switchEthereumChain";
 	readonly params: [
 		{
-			chainId: string; // TODO `0x${string}`
+			chainId: EIP1193ChainId;
 		}
 	];
 };
@@ -430,7 +431,7 @@ export interface EIP1193EthSubscription extends EIP1193ProviderMessage {
 }
 
 export interface EIP1193ProviderConnectInfo {
-	readonly chainId: string;
+	readonly chainId: EIP1193ChainId;
 }
 
 export type EIP1193AddChainError = {
@@ -478,32 +479,40 @@ export type EIP1193Provider<T = EIP1193Request> = {
 			  >
 	): EIP1193Provider;
 
-	request?(args: EIP1193Web3ClientVersionRequest): Promise<string>;
-	request?(args: EIP1193Web3SHARequest): Promise<DATA>;
-	request?(args: EIP1193NetVersionRequest): Promise<ChainId>;
-	request?(args: EIP1193NetListeningRequest): Promise<boolean>;
-	request?(args: EIP1193NetPeerCountRequest): Promise<QUANTITY>;
-	request?(args: EIP1193ProtocolVersionRequest): Promise<string>;
+	request(args: EIP1193Web3ClientVersionRequest): Promise<string>;
+	request(args: EIP1193Web3SHARequest): Promise<EIP1193DATA>;
+	request(args: EIP1193NetVersionRequest): Promise<EIP1193ChainId>;
+	request(args: EIP1193NetListeningRequest): Promise<boolean>;
+	request(args: EIP1193NetPeerCountRequest): Promise<EIP1193QUANTITY>;
+	request(args: EIP1193ProtocolVersionRequest): Promise<string>;
 	request(args: EIP1193SyncingRequest): Promise<EIP1193SyncingStatus | false>;
-	request?(args: EIP1193CoinbaseRequest): Promise<EIP1193Account>;
-	request(args: EIP1193GasPriceRequest): Promise<QUANTITY>;
+	request(args: EIP1193CoinbaseRequest): Promise<EIP1193Account>;
+	request(args: EIP1193GasPriceRequest): Promise<EIP1193QUANTITY>;
 	request(args: EIP1193AccountsRequest): Promise<EIP1193Accounts>;
-	request(args: EIP1193BlockNumberRequest): Promise<QUANTITY>;
-	request(args: EIP1193GetBalanceRequest): Promise<QUANTITY>;
-	request(args: EIP1193GetStorageAtRequest): Promise<DATA>;
-	request(args: EIP1193GetTransactionCountRequest): Promise<QUANTITY>;
-	request(args: EIP1193GetTransactionCountByHashRequest): Promise<QUANTITY>;
-	request(args: EIP1193GetTransactionCountByNumberRequest): Promise<QUANTITY>;
-
-	request?(args: EIP1193GetUncleCountByBlockHashRequest): Promise<QUANTITY>;
-	request?(args: EIP1193GetUncleCountByBlockNumberRequest): Promise<QUANTITY>;
-	request(args: EIP1193GetCodeRequest): Promise<DATA>;
-	request(args: EIP1193LegacySignRequest): Promise<DATA>;
-	request(args: EIP1193SignTransactionRequest): Promise<DATA>;
-	request(args: EIP1193SendTransactionRequest): Promise<DATA>;
-	request(args: EIP1193SendRawTransactionRequest): Promise<DATA>;
-	request(args: EIP119CallRequest): Promise<DATA>;
-	request(args: EIP119EstimateGasRequest): Promise<QUANTITY>;
+	request(args: EIP1193BlockNumberRequest): Promise<EIP1193QUANTITY>;
+	request(args: EIP1193GetBalanceRequest): Promise<EIP1193QUANTITY>;
+	request(args: EIP1193GetStorageAtRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193GetTransactionCountRequest): Promise<EIP1193QUANTITY>;
+	request(
+		args: EIP1193GetTransactionCountByHashRequest
+	): Promise<EIP1193QUANTITY>;
+	request(
+		args: EIP1193GetTransactionCountByNumberRequest
+	): Promise<EIP1193QUANTITY>;
+
+	request(
+		args: EIP1193GetUncleCountByBlockHashRequest
+	): Promise<EIP1193QUANTITY>;
+	request(
+		args: EIP1193GetUncleCountByBlockNumberRequest
+	): Promise<EIP1193QUANTITY>;
+	request(args: EIP1193GetCodeRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193LegacySignRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193SignTransactionRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193SendTransactionRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193SendRawTransactionRequest): Promise<EIP1193DATA>;
+	request(args: EIP119CallRequest): Promise<EIP1193DATA>;
+	request(args: EIP119EstimateGasRequest): Promise<EIP1193QUANTITY>;
 	request(args: EIP119GetBlockByHashRequest): Promise<EIP1193Block>;
 	request(args: EIP119GetBlockByNumberRequest): Promise<EIP1193Block>;
 	request(
@@ -522,29 +531,33 @@ export type EIP1193Provider<T = EIP1193Request> = {
 	request(
 		args: EIP119GetTransactionReceiptRequest
 	): Promise<EIP1193TransactionReceipt>;
-	request?(
+	request(
 		args: EIP119GetUncleByBlockHashAndIndexRequest
 	): Promise<EIP1193Block>;
-	request?(
+	request(
 		args: EIP119GetUncleByBlockNumberAndIndexRequest
 	): Promise<EIP1193Block>;
 	request(args: EIP119GetLogsRequest): Promise<EIP1193Log[]>;
-	request?(args: EIP1193PersonalSignRequest): Promise<DATA>;
-	request?(args: EIP1193PTypedSignv4Request): Promise<DATA>;
-	request?(args: EIP1193PTypedSignRequest): Promise<DATA>;
-	request(args: EIP1193ChainIdRequest): Promise<ChainId>;
+	request(args: EIP1193PersonalSignRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193PTypedSignv4Request): Promise<EIP1193DATA>;
+	request(args: EIP1193PTypedSignRequest): Promise<EIP1193DATA>;
+	request(args: EIP1193ChainIdRequest): Promise<EIP1193ChainId>;
 	request(args: EIP1193RequestAccountsRequest): Promise<EIP1193Accounts>;
-	request?(
+	request(
 		args: ERIP1193SwitchChainRequest
 	): Promise<EIP1193SwitchChainError | null>;
-	request?(args: ERIP1193AddChainRequest): Promise<EIP1193AddChainError | null>;
+	request(args: ERIP1193AddChainRequest): Promise<EIP1193AddChainError | null>;
 	request(args: T): Promise<unknown>;
 	// request(args: EIP1193GenericRequest): Promise<unknown>;
 };
 
-type BlockTag = QUANTITY | "latest" | "earliest" | "pending";
-type QUANTITY = `0x${string}`;
-type DATA = `0x${string}`;
-type ChainId = `0x${string}`;
+export type EIP1193DATA = `0x${string}`;
+export type EIP1193BlockTag =
+	| EIP1193QUANTITY
+	| "latest"
+	| "earliest"
+	| "pending";
+export type EIP119QUANTITY = `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.0.5",
+  "version": "0.1.1",
   "description": "Types for EIP-1193",
   "keywords": [],
   "author": "",