@msaki/eth-rpc 0.2.0 → 0.2.1

package/src/types/eth/methods.d.ts

@@ -0,0 +1,55 @@
+declare global {
+	export enum EthMethods {
+		// eth/transaction
+		eth_getTransactionByHash = "eth_getTransactionByHash",
+		eth_getTransactionByBlockHashAndIndex = "eth_getTransactionByBlockHashAndIndex",
+		eth_getTransactionReceipt = "eth_getTransactionReceipt",
+		// eth/submit
+		eth_sendTransaction = "eth_sendTransaction",
+		eth_sendRawTransaction = "eth_sendRawTransaction",
+		// eth/state
+		eth_getBalance = "eth_getBalance",
+		eth_getStorageAt = "eth_getStorageAt",
+		eth_getTransactionCount = "eth_getTransactionCount",
+		eth_getCode = "eth_getCode",
+		eth_getProof = "eth_getProof",
+		// eth/sign
+		eth_sign = "eth_sign",
+		eth_signTransaction = "eth_signTransaction",
+		// eth/filter
+		eth_newFilter = "eth_newFilter",
+		eth_newBlockFilter = "eth_newBlockFilter",
+		eth_newPendingTransactionFilter = "eth_newPendingTransactionFilter",
+		eth_uninstallFilter = "eth_uninstallFilter",
+		eth_getFilterChanges = "eth_getFilterChanges",
+		eth_getFilterLogs = "eth_getFilterLogs",
+		eth_getLogs = "eth_getLogs",
+		// eth/feeMarket
+		eth_gasPrice = "eth_gasPrice",
+		eth_blobBaseFee = "eth_blobBaseFee",
+		eth_maxPriorityFeePerGas = "eth_maxPriorityFeePerGas",
+		eth_feeHistory = "eth_feeHistory",
+		// eth/execute
+		eth_call = "eth_call",
+		eth_estimateGas = "eth_estimateGas",
+		eth_createAccessList = "eth_createAccessList",
+		eth_simulateV1 = "eth_simulateV1",
+		// eth/client
+		eth_chainId = "eth_chainId",
+		eth_syncing = "eth_syncing",
+		eth_coinbase = "eth_coinbase",
+		eth_accounts = "eth_accounts",
+		eth_blockNumber = "eth_blockNumber",
+		net_version = "net_version",
+		// eth/block
+		eth_getBlockByHash = "eth_getBlockByHash",
+		eth_getBlockByNumber = "eth_getBlockByNumber",
+		eth_getBlockTransactionCountByHash = "eth_getBlockTransactionCountByHash",
+		eth_getBlockTransactionCountByNumber = "eth_getBlockTransactionCountByNumber",
+		eth_getUncleCountByBlockHash = "eth_getUncleCountByBlockHash",
+		eth_getUncleCountByBlockNumber = "eth_getUncleCountByBlockNumber",
+		eth_getBlockReceipts = "eth_getBlockReceipts",
+	}
+}
+
+export { };

package/dist/beacon-methods.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=beacon-methods.d.ts.map

package/dist/beacon-methods.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"beacon-methods.d.ts","sourceRoot":"","sources":["../src/beacon-methods.ts"],"names":[],"mappings":""}

package/dist/beacon-methods.js

@@ -1 +0,0 @@
-//# sourceMappingURL=beacon-methods.js.map

package/dist/beacon-methods.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"beacon-methods.js","sourceRoot":"","sources":["../src/beacon-methods.ts"],"names":[],"mappings":""}

package/dist/engine/index.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/engine/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/engine/index.ts"],"names":[],"mappings":""}

package/dist/engine/index.js

@@ -1 +0,0 @@
-//# sourceMappingURL=index.js.map

package/dist/engine/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/engine/index.ts"],"names":[],"mappings":""}

package/dist/eth-methods.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eth-methods.d.ts","sourceRoot":"","sources":["../src/eth-methods.ts"],"names":[],"mappings":"AAEA,oBAAY,OAAO;IAElB,wBAAwB,6BAA6B;IACrD,qCAAqC,0CAA0C;IAC/E,yBAAyB,8BAA8B;IAEvD,mBAAmB,wBAAwB;IAC3C,sBAAsB,2BAA2B;IAEjD,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;IACrC,uBAAuB,4BAA4B;IACnD,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;IAE7B,QAAQ,aAAa;IACrB,mBAAmB,wBAAwB;IAE3C,aAAa,kBAAkB;IAC/B,kBAAkB,uBAAuB;IACzC,+BAA+B,oCAAoC;IACnE,mBAAmB,wBAAwB;IAC3C,oBAAoB,yBAAyB;IAC7C,iBAAiB,sBAAsB;IACvC,WAAW,gBAAgB;IAE3B,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,wBAAwB,6BAA6B;IACrD,cAAc,mBAAmB;IAEjC,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,oBAAoB,yBAAyB;IAC7C,cAAc,mBAAmB;IAEjC,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;IACnC,WAAW,gBAAgB;IAE3B,kBAAkB,uBAAuB;IACzC,oBAAoB,yBAAyB;IAC7C,kCAAkC,uCAAuC;IACzE,oCAAoC,yCAAyC;IAC7E,4BAA4B,iCAAiC;IAC7D,8BAA8B,mCAAmC;IACjE,oBAAoB,yBAAyB;CAC7C;AAED,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,MAAM,CAAgB;gBAElB,GAAG,EAAE,MAAM;IAKjB,wBAAwB,CAC7B,cAAc,EAAE,MAAM,GACpB,OAAO,CAAC,QAAQ,GAAG,eAAe,CAAC;IAKhC,qCAAqC,CAC1C,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,IAAI,GACpB,OAAO,CAAC,QAAQ,GAAG,eAAe,CAAC;IAMhC,yBAAyB,CAC9B,eAAe,EAAE,MAAM,GACrB,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;IAO5B,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC;IAGrE,sBAAsB,CAAC,WAAW,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAM3D,cAAc,CACnB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAGV,gBAAgB,CACrB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,OAAO,EACpB,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,KAAK,CAAC;IAOX,uBAAuB,CAC5B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAMV,WAAW,CAChB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,KAAK,CAAC;IAGX,YAAY,CACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,OAAO,EAAE,EACtB,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,YAAY,CAAC;IAQlB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAG5D,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAG5C,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGnC,+BAA+B,IAAI,OAAO,CAAC,IAAI,CAAC;IAGhD,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGpC,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC;IAG9C,iBAAiB,CAAC,gBAAgB,EAAE,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAKjE,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAInD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAG7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAGhC,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGzC,cAAc,CACnB,UAAU,EAAE,IAAI,EAChB,WAAW,EAAE,gBAAgB,EAC7B,iBAAiB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,iBAAiB,CAAC;IAQvB,QAAQ,CACb,WAAW,EAAE,kBAAkB,EAC/B,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,KAAK,CAAC;IAGX,eAAe,CACpB,WAAW,EAAE,kBAAkB,EAC/B,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,IAAI,CAAC;IAMV,oBAAoB,CACzB,WAAW,EAAE,kBAAkB,EAC/B,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,gBAAgB,CAAC;IAMtB,cAAc,CACnB,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,sBAAsB,GAC9B,OAAO,CAAC,iBAAiB,CAAC;IAIvB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAG5B,WAAW,IAAI,OAAO,CAAC,aAAa,CAAC;IAGrC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAGhC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAGlC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAGhC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAInC,kBAAkB,CACvB,SAAS,EAAE,MAAM,EACjB,oBAAoB,EAAE,OAAO,GAC3B,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;IAMtB,oBAAoB,CACzB,KAAK,EAAE,gBAAgB,EACvB,oBAAoB,EAAE,OAAO,GAC3B,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;IAMtB,kCAAkC,CACvC,SAAS,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAKrB,oCAAoC,CACzC,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAMrB,4BAA4B,CACjC,SAAS,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAKrB,8BAA8B,CACnC,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAKrB,oBAAoB,CACzB,KAAK,EAAE,sBAAsB,GAC3B,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;CAGlC"}

package/dist/eth-methods.js

@@ -1,230 +0,0 @@
-import { initializeRpcClient, JsonRpcClient } from "@msaki/jsonrpc";
-export var Methods;
-(function (Methods) {
-    // eth/transaction
-    Methods["eth_getTransactionByHash"] = "eth_getTransactionByHash";
-    Methods["eth_getTransactionByBlockHashAndIndex"] = "eth_getTransactionByBlockHashAndIndex";
-    Methods["eth_getTransactionReceipt"] = "eth_getTransactionReceipt";
-    // eth/submit
-    Methods["eth_sendTransaction"] = "eth_sendTransaction";
-    Methods["eth_sendRawTransaction"] = "eth_sendRawTransaction";
-    // eth/state
-    Methods["eth_getBalance"] = "eth_getBalance";
-    Methods["eth_getStorageAt"] = "eth_getStorageAt";
-    Methods["eth_getTransactionCount"] = "eth_getTransactionCount";
-    Methods["eth_getCode"] = "eth_getCode";
-    Methods["eth_getProof"] = "eth_getProof";
-    // eth/sign
-    Methods["eth_sign"] = "eth_sign";
-    Methods["eth_signTransaction"] = "eth_signTransaction";
-    // eth/filter
-    Methods["eth_newFilter"] = "eth_newFilter";
-    Methods["eth_newBlockFilter"] = "eth_newBlockFilter";
-    Methods["eth_newPendingTransactionFilter"] = "eth_newPendingTransactionFilter";
-    Methods["eth_uninstallFilter"] = "eth_uninstallFilter";
-    Methods["eth_getFilterChanges"] = "eth_getFilterChanges";
-    Methods["eth_getFilterLogs"] = "eth_getFilterLogs";
-    Methods["eth_getLogs"] = "eth_getLogs";
-    // eth/feeMarket
-    Methods["eth_gasPrice"] = "eth_gasPrice";
-    Methods["eth_blobBaseFee"] = "eth_blobBaseFee";
-    Methods["eth_maxPriorityFeePerGas"] = "eth_maxPriorityFeePerGas";
-    Methods["eth_feeHistory"] = "eth_feeHistory";
-    // eth/execute
-    Methods["eth_call"] = "eth_call";
-    Methods["eth_estimateGas"] = "eth_estimateGas";
-    Methods["eth_createAccessList"] = "eth_createAccessList";
-    Methods["eth_simulateV1"] = "eth_simulateV1";
-    // eth/client
-    Methods["eth_chainId"] = "eth_chainId";
-    Methods["eth_syncing"] = "eth_syncing";
-    Methods["eth_coinbase"] = "eth_coinbase";
-    Methods["eth_accounts"] = "eth_accounts";
-    Methods["eth_blockNumber"] = "eth_blockNumber";
-    Methods["net_version"] = "net_version";
-    // eth/block
-    Methods["eth_getBlockByHash"] = "eth_getBlockByHash";
-    Methods["eth_getBlockByNumber"] = "eth_getBlockByNumber";
-    Methods["eth_getBlockTransactionCountByHash"] = "eth_getBlockTransactionCountByHash";
-    Methods["eth_getBlockTransactionCountByNumber"] = "eth_getBlockTransactionCountByNumber";
-    Methods["eth_getUncleCountByBlockHash"] = "eth_getUncleCountByBlockHash";
-    Methods["eth_getUncleCountByBlockNumber"] = "eth_getUncleCountByBlockNumber";
-    Methods["eth_getBlockReceipts"] = "eth_getBlockReceipts";
-})(Methods || (Methods = {}));
-export class EthExecutionClient {
-    client;
-    constructor(url) {
-        this.client = initializeRpcClient(url);
-    }
-    // eth/transaction
-    async eth_getTransactionByHash(transactioHash) {
-        return await this.client.call(Methods.eth_getTransactionByHash, [
-            transactioHash,
-        ]);
-    }
-    async eth_getTransactionByBlockHashAndIndex(blockHash, transactionIndex) {
-        return await this.client.call(Methods.eth_getTransactionByBlockHashAndIndex, [blockHash, transactionIndex]);
-    }
-    async eth_getTransactionReceipt(transactionHash) {
-        return await this.client.call(Methods.eth_getTransactionReceipt, [
-            transactionHash,
-        ]);
-    }
-    // eth/submit
-    async eth_sendTransaction(transaction) {
-        return await this.client.call(Methods.eth_sendTransaction, [transaction]);
-    }
-    async eth_sendRawTransaction(transaction) {
-        return await this.client.call(Methods.eth_sendRawTransaction, [
-            transaction,
-        ]);
-    }
-    // eth/state
-    async eth_getBalance(address, block) {
-        return await this.client.call(Methods.eth_getBalance, [address, block]);
-    }
-    async eth_getStorageAt(address, storageSlot, block) {
-        return await this.client.call(Methods.eth_getStorageAt, [
-            address,
-            storageSlot,
-            block,
-        ]);
-    }
-    async eth_getTransactionCount(address, block) {
-        return await this.client.call(Methods.eth_getTransactionCount, [
-            address,
-            block,
-        ]);
-    }
-    async eth_getCode(address, block) {
-        return await this.client.call(Methods.eth_getCode, [address, block]);
-    }
-    async eth_getProof(address, storageKeys, block) {
-        return await this.client.call(Methods.eth_getProof, [
-            address,
-            storageKeys,
-            block,
-        ]);
-    }
-    // eth/sign
-    async eth_sign(address, message) {
-        return await this.client.call(Methods.eth_sign, [address, message]);
-    }
-    async eth_signTransaction(transaction) {
-        return await this.client.call(Methods.eth_signTransaction, [transaction]);
-    }
-    // eth/filter
-    async eth_newFilter(filter) {
-        return await this.client.call(Methods.eth_newFilter, [filter]);
-    }
-    async eth_newBlockFilter() {
-        return await this.client.call(Methods.eth_newBlockFilter, []);
-    }
-    async eth_newPendingTransactionFilter() {
-        return await this.client.call(Methods.eth_newPendingTransactionFilter, []);
-    }
-    async eth_uninstallFilter() {
-        return await this.client.call(Methods.eth_uninstallFilter, []);
-    }
-    async eth_getFilterChanges() {
-        return await this.client.call(Methods.eth_getFilterChanges, []);
-    }
-    async eth_getFilterLogs(filterIdentifier) {
-        return await this.client.call(Methods.eth_getFilterLogs, [
-            filterIdentifier,
-        ]);
-    }
-    async eth_getLogs(filter) {
-        return await this.client.call(Methods.eth_getLogs, [filter]);
-    }
-    // eth/feeMarket
-    async eth_gasPrice() {
-        return await this.client.call(Methods.eth_gasPrice, []);
-    }
-    async eth_blobBaseFee() {
-        return await this.client.call(Methods.eth_blobBaseFee, []);
-    }
-    async eth_maxPriorityFeePerGas() {
-        return await this.client.call(Methods.eth_maxPriorityFeePerGas, []);
-    }
-    async eth_feeHistory(blockCount, newestBlock, rewardPercentiles) {
-        return await this.client.call(Methods.eth_feeHistory, [
-            blockCount,
-            newestBlock,
-            rewardPercentiles,
-        ]);
-    }
-    // eth/execute
-    async eth_call(transaction, block) {
-        return this.client.call(Methods.eth_call, [transaction, block]);
-    }
-    async eth_estimateGas(transaction, block) {
-        return await this.client.call(Methods.eth_estimateGas, [
-            transaction,
-            block,
-        ]);
-    }
-    async eth_createAccessList(transaction, block) {
-        return await this.client.call(Methods.eth_createAccessList, [
-            transaction,
-            block,
-        ]);
-    }
-    async eth_simulateV1(payload, blockTag) {
-        return await this.client.call(Methods.eth_simulateV1, [payload, blockTag]);
-    }
-    // eth/client
-    async eth_chainId() {
-        return await this.client.call(Methods.eth_chainId, []);
-    }
-    async eth_syncing() {
-        return await this.client.call(Methods.eth_syncing, []);
-    }
-    async eth_coinbase() {
-        return await this.client.call(Methods.eth_coinbase, []);
-    }
-    async eth_accounts() {
-        return await this.client.call(Methods.eth_accounts, []);
-    }
-    async eth_blockNumber() {
-        return await this.client.call(Methods.eth_blockNumber, []);
-    }
-    async net_version() {
-        return await this.client.call(Methods.net_version, []);
-    }
-    // eth/block
-    async eth_getBlockByHash(blockHash, hydratedTransactions) {
-        return await this.client.call(Methods.eth_getBlockByHash, [
-            blockHash,
-            hydratedTransactions,
-        ]);
-    }
-    async eth_getBlockByNumber(block, hydratedTransactions) {
-        return await this.client.call(Methods.eth_getBlockByNumber, [
-            block,
-            hydratedTransactions,
-        ]);
-    }
-    async eth_getBlockTransactionCountByHash(blockHash) {
-        return await this.client.call(Methods.eth_getBlockTransactionCountByHash, [
-            blockHash,
-        ]);
-    }
-    async eth_getBlockTransactionCountByNumber(block) {
-        return await this.client.call(Methods.eth_getBlockTransactionCountByNumber, [block]);
-    }
-    async eth_getUncleCountByBlockHash(blockHash) {
-        return await this.client.call(Methods.eth_getUncleCountByBlockHash, [
-            blockHash,
-        ]);
-    }
-    async eth_getUncleCountByBlockNumber(block) {
-        return await this.client.call(Methods.eth_getUncleCountByBlockNumber, [
-            block,
-        ]);
-    }
-    async eth_getBlockReceipts(block) {
-        return await this.client.call(Methods.eth_getBlockReceipts, [block]);
-    }
-}
-//# sourceMappingURL=eth-methods.js.map

package/dist/eth-methods.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eth-methods.js","sourceRoot":"","sources":["../src/eth-methods.ts"],"names":[],"mappings":"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"}

package/src/eth-methods.ts

@@ -1,295 +0,0 @@
-import { initializeRpcClient, JsonRpcClient } from "@msaki/jsonrpc";
-
-export enum Methods {
-	// eth/transaction
-	eth_getTransactionByHash = "eth_getTransactionByHash",
-	eth_getTransactionByBlockHashAndIndex = "eth_getTransactionByBlockHashAndIndex",
-	eth_getTransactionReceipt = "eth_getTransactionReceipt",
-	// eth/submit
-	eth_sendTransaction = "eth_sendTransaction",
-	eth_sendRawTransaction = "eth_sendRawTransaction",
-	// eth/state
-	eth_getBalance = "eth_getBalance",
-	eth_getStorageAt = "eth_getStorageAt",
-	eth_getTransactionCount = "eth_getTransactionCount",
-	eth_getCode = "eth_getCode",
-	eth_getProof = "eth_getProof",
-	// eth/sign
-	eth_sign = "eth_sign",
-	eth_signTransaction = "eth_signTransaction",
-	// eth/filter
-	eth_newFilter = "eth_newFilter",
-	eth_newBlockFilter = "eth_newBlockFilter",
-	eth_newPendingTransactionFilter = "eth_newPendingTransactionFilter",
-	eth_uninstallFilter = "eth_uninstallFilter",
-	eth_getFilterChanges = "eth_getFilterChanges",
-	eth_getFilterLogs = "eth_getFilterLogs",
-	eth_getLogs = "eth_getLogs",
-	// eth/feeMarket
-	eth_gasPrice = "eth_gasPrice",
-	eth_blobBaseFee = "eth_blobBaseFee",
-	eth_maxPriorityFeePerGas = "eth_maxPriorityFeePerGas",
-	eth_feeHistory = "eth_feeHistory",
-	// eth/execute
-	eth_call = "eth_call",
-	eth_estimateGas = "eth_estimateGas",
-	eth_createAccessList = "eth_createAccessList",
-	eth_simulateV1 = "eth_simulateV1",
-	// eth/client
-	eth_chainId = "eth_chainId",
-	eth_syncing = "eth_syncing",
-	eth_coinbase = "eth_coinbase",
-	eth_accounts = "eth_accounts",
-	eth_blockNumber = "eth_blockNumber",
-	net_version = "net_version",
-	// eth/block
-	eth_getBlockByHash = "eth_getBlockByHash",
-	eth_getBlockByNumber = "eth_getBlockByNumber",
-	eth_getBlockTransactionCountByHash = "eth_getBlockTransactionCountByHash",
-	eth_getBlockTransactionCountByNumber = "eth_getBlockTransactionCountByNumber",
-	eth_getUncleCountByBlockHash = "eth_getUncleCountByBlockHash",
-	eth_getUncleCountByBlockNumber = "eth_getUncleCountByBlockNumber",
-	eth_getBlockReceipts = "eth_getBlockReceipts",
-}
-
-export class EthExecutionClient {
-	private client: JsonRpcClient;
-
-	constructor(url: string) {
-		this.client = initializeRpcClient(url);
-	}
-
-	// eth/transaction
-	async eth_getTransactionByHash(
-		transactioHash: Hash32,
-	): Promise<NotFound | TransactionInfo> {
-		return await this.client.call(Methods.eth_getTransactionByHash, [
-			transactioHash,
-		]);
-	}
-	async eth_getTransactionByBlockHashAndIndex(
-		blockHash: Hash32,
-		transactionIndex: Uint,
-	): Promise<NotFound | TransactionInfo> {
-		return await this.client.call(
-			Methods.eth_getTransactionByBlockHashAndIndex,
-			[blockHash, transactionIndex],
-		);
-	}
-	async eth_getTransactionReceipt(
-		transactionHash: Hash32,
-	): Promise<NotFound | ReceiptInfo> {
-		return await this.client.call(Methods.eth_getTransactionReceipt, [
-			transactionHash,
-		]);
-	}
-
-	// eth/submit
-	async eth_sendTransaction(transaction: GenericTransaction): Promise<Hash32> {
-		return await this.client.call(Methods.eth_sendTransaction, [transaction]);
-	}
-	async eth_sendRawTransaction(transaction: Bytes): Promise<Hash32> {
-		return await this.client.call(Methods.eth_sendRawTransaction, [
-			transaction,
-		]);
-	}
-	// eth/state
-	async eth_getBalance(
-		address: Address,
-		block: BlockNumberOrTagOrHash,
-	): Promise<Uint> {
-		return await this.client.call(Methods.eth_getBalance, [address, block]);
-	}
-	async eth_getStorageAt(
-		address: Address,
-		storageSlot: Bytes32,
-		block: BlockNumberOrTagOrHash,
-	): Promise<Bytes> {
-		return await this.client.call(Methods.eth_getStorageAt, [
-			address,
-			storageSlot,
-			block,
-		]);
-	}
-	async eth_getTransactionCount(
-		address: Address,
-		block: BlockNumberOrTagOrHash,
-	): Promise<Uint> {
-		return await this.client.call(Methods.eth_getTransactionCount, [
-			address,
-			block,
-		]);
-	}
-	async eth_getCode(
-		address: Address,
-		block: BlockNumberOrTagOrHash,
-	): Promise<Bytes> {
-		return await this.client.call(Methods.eth_getCode, [address, block]);
-	}
-	async eth_getProof(
-		address: Address,
-		storageKeys: Bytes32[],
-		block: BlockNumberOrTagOrHash,
-	): Promise<AccountProof> {
-		return await this.client.call(Methods.eth_getProof, [
-			address,
-			storageKeys,
-			block,
-		]);
-	}
-	// eth/sign
-	async eth_sign(address: Address, message: Bytes): Promise<Bytes65> {
-		return await this.client.call(Methods.eth_sign, [address, message]);
-	}
-	async eth_signTransaction(transaction: GenericTransaction): Promise<Bytes> {
-		return await this.client.call(Methods.eth_signTransaction, [transaction]);
-	}
-	// eth/filter
-	async eth_newFilter(filter: Filter): Promise<Uint> {
-		return await this.client.call(Methods.eth_newFilter, [filter]);
-	}
-	async eth_newBlockFilter(): Promise<Uint> {
-		return await this.client.call(Methods.eth_newBlockFilter, []);
-	}
-	async eth_newPendingTransactionFilter(): Promise<Uint> {
-		return await this.client.call(Methods.eth_newPendingTransactionFilter, []);
-	}
-	async eth_uninstallFilter(): Promise<Uint> {
-		return await this.client.call(Methods.eth_uninstallFilter, []);
-	}
-	async eth_getFilterChanges(): Promise<FilterResults> {
-		return await this.client.call(Methods.eth_getFilterChanges, []);
-	}
-	async eth_getFilterLogs(filterIdentifier: Uint): Promise<FilterResults> {
-		return await this.client.call(Methods.eth_getFilterLogs, [
-			filterIdentifier,
-		]);
-	}
-	async eth_getLogs(filter: Filter): Promise<FilterResults> {
-		return await this.client.call(Methods.eth_getLogs, [filter]);
-	}
-	// eth/feeMarket
-	async eth_gasPrice(): Promise<Uint> {
-		return await this.client.call(Methods.eth_gasPrice, []);
-	}
-	async eth_blobBaseFee(): Promise<Uint> {
-		return await this.client.call(Methods.eth_blobBaseFee, []);
-	}
-	async eth_maxPriorityFeePerGas(): Promise<Uint> {
-		return await this.client.call(Methods.eth_maxPriorityFeePerGas, []);
-	}
-	async eth_feeHistory(
-		blockCount: Uint,
-		newestBlock: BlockNumberOrTag,
-		rewardPercentiles: number[],
-	): Promise<FeeHistoryResults> {
-		return await this.client.call(Methods.eth_feeHistory, [
-			blockCount,
-			newestBlock,
-			rewardPercentiles,
-		]);
-	}
-	// eth/execute
-	async eth_call(
-		transaction: GenericTransaction,
-		block: BlockNumberOrTagOrHash,
-	): Promise<Bytes> {
-		return this.client.call(Methods.eth_call, [transaction, block]);
-	}
-	async eth_estimateGas(
-		transaction: GenericTransaction,
-		block: BlockNumberOrTag,
-	): Promise<Uint> {
-		return await this.client.call(Methods.eth_estimateGas, [
-			transaction,
-			block,
-		]);
-	}
-	async eth_createAccessList(
-		transaction: GenericTransaction,
-		block: BlockNumberOrTag,
-	): Promise<AccessListResult> {
-		return await this.client.call(Methods.eth_createAccessList, [
-			transaction,
-			block,
-		]);
-	}
-	async eth_simulateV1(
-		payload: EthSimulatePayload,
-		blockTag: BlockNumberOrTagOrHash,
-	): Promise<EthSimulateResult> {
-		return await this.client.call(Methods.eth_simulateV1, [payload, blockTag]);
-	}
-	// eth/client
-	async eth_chainId(): Promise<Uint> {
-		return await this.client.call(Methods.eth_chainId, []);
-	}
-	async eth_syncing(): Promise<SyncingStatus> {
-		return await this.client.call(Methods.eth_syncing, []);
-	}
-	async eth_coinbase(): Promise<Address> {
-		return await this.client.call(Methods.eth_coinbase, []);
-	}
-	async eth_accounts(): Promise<Addresses> {
-		return await this.client.call(Methods.eth_accounts, []);
-	}
-	async eth_blockNumber(): Promise<Uint> {
-		return await this.client.call(Methods.eth_blockNumber, []);
-	}
-	async net_version(): Promise<UintDecimal> {
-		return await this.client.call(Methods.net_version, []);
-	}
-	// eth/block
-	async eth_getBlockByHash(
-		blockHash: Hash32,
-		hydratedTransactions: boolean,
-	): Promise<NotFound | Block> {
-		return await this.client.call(Methods.eth_getBlockByHash, [
-			blockHash,
-			hydratedTransactions,
-		]);
-	}
-	async eth_getBlockByNumber(
-		block: BlockNumberOrTag,
-		hydratedTransactions: boolean,
-	): Promise<NotFound | Block> {
-		return await this.client.call(Methods.eth_getBlockByNumber, [
-			block,
-			hydratedTransactions,
-		]);
-	}
-	async eth_getBlockTransactionCountByHash(
-		blockHash: Hash32,
-	): Promise<NotFound | Uint> {
-		return await this.client.call(Methods.eth_getBlockTransactionCountByHash, [
-			blockHash,
-		]);
-	}
-	async eth_getBlockTransactionCountByNumber(
-		block: BlockNumberOrTag,
-	): Promise<NotFound | Uint> {
-		return await this.client.call(
-			Methods.eth_getBlockTransactionCountByNumber,
-			[block],
-		);
-	}
-	async eth_getUncleCountByBlockHash(
-		blockHash: Hash32,
-	): Promise<NotFound | Uint> {
-		return await this.client.call(Methods.eth_getUncleCountByBlockHash, [
-			blockHash,
-		]);
-	}
-	async eth_getUncleCountByBlockNumber(
-		block: BlockNumberOrTag,
-	): Promise<NotFound | Uint> {
-		return await this.client.call(Methods.eth_getUncleCountByBlockNumber, [
-			block,
-		]);
-	}
-	async eth_getBlockReceipts(
-		block: BlockNumberOrTagOrHash,
-	): Promise<NotFound | ReceiptInfo> {
-		return await this.client.call(Methods.eth_getBlockReceipts, [block]);
-	}
-}