fix: removed the majority of the circular dependencies of the `networ…

…k` package (#1379) * fix: first commit * fix: first commit * fix: first commit * fix: first commit * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: refactor of one of the folders * fix: some more changes * fix: some more changes * fix: some more changes * fix: some more changes * fix: some more changes * fix: as per the tests it should break in the casting * fix: as per the tests it should break in the casting
vechain · Oct 2, 2024 · 8ecb124 · 8ecb124 · github-actions · Oct 2, 2024
1 parent 62df51d
commit 8ecb124
Show file tree

Hide file tree

Showing 199 changed files with 257 additions and 274 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -28,7 +28,7 @@
   ],
   "scripts": {
     "build": "rm -rf ./dist && tsup-node src/index.ts --format cjs,esm --dts",
-    "check:circular-dependencies": "npx madge --exclude 'transaction/Clause.ts' --circular --extensions ts src",
+    "check:circular-dependencies": "npx madge --circular --extensions ts src",
     "lint": "eslint --ext .ts src --ext .ts tests",
     "format": "prettier --write src/**/*.ts tests/**/*.ts",
     "test:unit": "rm -rf ./coverageUnit && jest --coverage --coverageDirectory=coverageUnit --group=unit",

diff --git a/packages/network/package.json b/packages/network/package.json
@@ -29,6 +29,7 @@
     "start-thor-solo": "echo 'Starting thor solo node ...' && docker compose up -d --wait && echo '\nThor solo node started ...'",
     "stop-thor-solo": "echo 'Stopping thor solo node ...' && docker compose down && echo 'Thor solo node stopped ...'",
     "build": "rm -rf ./dist && tsup-node src/index.ts --format cjs,esm --dts",
+    "check:circular-dependencies": "npx madge --exclude '^(provider/providers/vechain-provider/vechain-provider.ts|thor-client/contracts/model/contract.ts|thor-client/index.ts|provider/utils/formatter/blocks/index.ts|signer/signers/types.d.ts|provider/utils/helpers/transaction/transaction-helpers.ts|thor-client/contracts/model/contract-filter.ts)$' --circular --extensions ts src",
     "lint": "eslint --ext .ts src --ext .ts tests",
     "format": "prettier --write src/**/*.ts tests/**/*.ts solo-seeding/**/*.ts",
     "test:unit": "rm -rf ./coverageUnit && UNIT=true jest --coverage --coverageDirectory=coverageUnit --group=unit",

diff --git a/...c/provider/helpers/provider-internal-wallets/base-wallet/provider-internal-base-wallet.ts b/...c/provider/helpers/provider-internal-wallets/base-wallet/provider-internal-base-wallet.ts
@@ -1,10 +1,10 @@
 import { type ProviderInternalWalletAccount } from '../types';
-import { type SignTransactionOptions } from '../../../../thor-client';
+import { type SignTransactionOptions } from '../../../../thor-client/transactions/types';
 import {
     type AvailableVeChainProviders,
     type VeChainSigner
-} from '../../../../signer';
-import { AbstractProviderInternalWallet } from '../abstract-wallet';
+} from '../../../../signer/signers/types';
+import { AbstractProviderInternalWallet } from '../abstract-wallet/abstract-provider-internal-wallet';
 
 /**
  * Provider internal Base wallet class.

diff --git a/packages/network/src/provider/helpers/provider-internal-wallets/types.d.ts b/packages/network/src/provider/helpers/provider-internal-wallets/types.d.ts
@@ -1,8 +1,8 @@
-import { type SignTransactionOptions } from '../../../thor-client';
+import { type SignTransactionOptions } from '../../../thor-client/transactions/types';
 import {
     type AvailableVeChainProviders,
     type VeChainSigner
-} from '../../../signer';
+} from '../../../signer/signers';
 
 /**
  * Represent a single account in a provider internal wallet.

diff --git a/packages/network/src/provider/providers/ethers-provider/json-rpc-ethers-provider.ts b/packages/network/src/provider/providers/ethers-provider/json-rpc-ethers-provider.ts
@@ -1,5 +1,5 @@
 import { vechain_sdk_core_ethers } from '@vechain/sdk-core';
-import { type HardhatVeChainProvider } from '../hardhat-provider';
+import { type HardhatVeChainProvider } from '../hardhat-provider/hardhat-provider';
 import {
     type JsonRpcError,
     type JsonRpcPayload,

diff --git a/packages/network/src/provider/providers/hardhat-provider/hardhat-provider.ts b/packages/network/src/provider/providers/hardhat-provider/hardhat-provider.ts
@@ -1,4 +1,4 @@
-import { VeChainProvider } from '../vechain-provider';
+import { VeChainProvider } from '../vechain-provider/vechain-provider';
 import type { EIP1193RequestArguments } from '../../eip1193';
 import {
     JSONRPCInternalError,

diff --git a/packages/network/src/provider/providers/vechain-provider/index.ts b/packages/network/src/provider/providers/vechain-provider/index.ts
@@ -1,2 +1,2 @@
-export * from './vechain-provider';
+export { VeChainProvider } from './vechain-provider';
 export type * from './types.d';
diff --git a/packages/network/src/provider/providers/vechain-provider/vechain-provider.ts b/packages/network/src/provider/providers/vechain-provider/vechain-provider.ts
@@ -1,12 +1,20 @@
+import { HexInt } from '@vechain/sdk-core';
+import {
+    JSONRPCInvalidParams,
+    JSONRPCMethodNotFound
+} from '@vechain/sdk-errors';
 import { EventEmitter } from 'events';
+import { type VeChainSigner } from '../../../signer';
+import {
+    type CompressedBlockDetail,
+    type ThorClient
+} from '../../../thor-client';
+import { type EventPoll, Poll, vnsUtils } from '../../../utils';
 import {
     type EIP1193ProviderMessage,
     type EIP1193RequestArguments
 } from '../../eip1193';
-import {
-    JSONRPCInvalidParams,
-    JSONRPCMethodNotFound
-} from '@vechain/sdk-errors';
+import { type ProviderInternalWallet } from '../../helpers';
 import {
     ethGetLogs,
     POLLING_INTERVAL,
@@ -18,14 +26,6 @@ import {
     type SubscriptionEvent,
     type SubscriptionManager
 } from './types';
-import { HexInt } from '@vechain/sdk-core';
-import { type EventPoll, Poll, vnsUtils } from '../../../utils';
-import {
-    type CompressedBlockDetail,
-    type ThorClient
-} from '../../../thor-client';
-import { type ProviderInternalWallet } from '../../helpers';
-import type { VeChainSigner } from '../../../signer';
 
 /**
  * Our core provider class for VeChain

diff --git a/packages/network/src/provider/utils/const/blocks/blocks.ts b/packages/network/src/provider/utils/const/blocks/blocks.ts
@@ -1,5 +1,5 @@
 import { Hex } from '@vechain/sdk-core';
-import { type BlockQuantityInputRPC } from '../../rpc-mapper';
+import { type BlockQuantityInputRPC } from '../../rpc-mapper/types';
 
 /**
  * Get the correct block number for the given block number.

diff --git a/packages/network/src/provider/utils/formatter/blocks/types.d.ts b/packages/network/src/provider/utils/formatter/blocks/types.d.ts
@@ -1,4 +1,4 @@
-import { type TransactionRPC } from '../transactions';
+import { type TransactionRPC } from '../transactions/types';
 
 /**
  * Return type of block header for RPC standard.

diff --git a/packages/network/src/provider/utils/formatter/transactions/formatter.ts b/packages/network/src/provider/utils/formatter/transactions/formatter.ts
@@ -7,7 +7,7 @@ import { Hex, HexUInt, Quantity, ZERO_BYTES } from '@vechain/sdk-core';
 import {
     getNumberOfLogsAheadOfTransactionIntoBlockExpanded,
     getTransactionIndexIntoBlock
-} from '../../helpers';
+} from '../../helpers/transaction/transaction-helpers';
 import { blocksFormatter } from '../blocks';
 import {
     type ExpandedBlockDetail,

diff --git a/packages/network/src/provider/utils/rpc-mapper/index.ts b/packages/network/src/provider/utils/rpc-mapper/index.ts
@@ -1,3 +1,3 @@
-export * from './methods-map';
+export * from './methods';
 export * from './rpc-mapper';
 export type * from './types.d';
diff --git a/packages/network/src/provider/utils/rpc-mapper/methods-map/index.ts b/packages/network/src/provider/utils/rpc-mapper/methods-map/index.ts
diff --git a/.../debug_getBadBlocks/debug_getBadBlocks.ts → .../debug_getBadBlocks/debug_getBadBlocks.ts b/.../debug_getBadBlocks/debug_getBadBlocks.ts → .../debug_getBadBlocks/debug_getBadBlocks.ts
diff --git a/...s-map/methods/debug_getBadBlocks/index.ts → ...apper/methods/debug_getBadBlocks/index.ts b/...s-map/methods/debug_getBadBlocks/index.ts → ...apper/methods/debug_getBadBlocks/index.ts
diff --git a/...ds/debug_getRawBlock/debug_getRawBlock.ts → ...ds/debug_getRawBlock/debug_getRawBlock.ts b/...ds/debug_getRawBlock/debug_getRawBlock.ts → ...ds/debug_getRawBlock/debug_getRawBlock.ts
diff --git a/...ds-map/methods/debug_getRawBlock/index.ts → ...mapper/methods/debug_getRawBlock/index.ts b/...ds-map/methods/debug_getRawBlock/index.ts → ...mapper/methods/debug_getRawBlock/index.ts
diff --git a/.../debug_getRawHeader/debug_getRawHeader.ts → .../debug_getRawHeader/debug_getRawHeader.ts b/.../debug_getRawHeader/debug_getRawHeader.ts → .../debug_getRawHeader/debug_getRawHeader.ts
diff --git a/...s-map/methods/debug_getRawHeader/index.ts → ...apper/methods/debug_getRawHeader/index.ts b/...s-map/methods/debug_getRawHeader/index.ts → ...apper/methods/debug_getRawHeader/index.ts
diff --git a/...ug_getRawReceipts/debug_getRawReceipts.ts → ...ug_getRawReceipts/debug_getRawReceipts.ts b/...ug_getRawReceipts/debug_getRawReceipts.ts → ...ug_getRawReceipts/debug_getRawReceipts.ts
diff --git a/...map/methods/debug_getRawReceipts/index.ts → ...per/methods/debug_getRawReceipts/index.ts b/...map/methods/debug_getRawReceipts/index.ts → ...per/methods/debug_getRawReceipts/index.ts
diff --git a/...RawTransaction/debug_getRawTransaction.ts → ...RawTransaction/debug_getRawTransaction.ts b/...RawTransaction/debug_getRawTransaction.ts → ...RawTransaction/debug_getRawTransaction.ts
diff --git a/.../methods/debug_getRawTransaction/index.ts → .../methods/debug_getRawTransaction/index.ts b/.../methods/debug_getRawTransaction/index.ts → .../methods/debug_getRawTransaction/index.ts
diff --git a/...raceBlockByHash/debug_traceBlockByHash.ts → ...raceBlockByHash/debug_traceBlockByHash.ts b/...raceBlockByHash/debug_traceBlockByHash.ts → ...raceBlockByHash/debug_traceBlockByHash.ts
@@ -4,13 +4,13 @@ import {
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 import {
     debugTraceTransaction,
     type TraceOptionsRPC
 } from '../debug_traceTransaction';
 import { ethGetBlockByHash } from '../eth_getBlockByHash';
-import { type TracerReturnTypeRPC } from '../../../../formatter';
+import { type TracerReturnTypeRPC } from '../../../formatter/debug/types';
 
 /**
  * RPC Method debug_traceBlockByHash implementation

diff --git a/...p/methods/debug_traceBlockByHash/index.ts → ...r/methods/debug_traceBlockByHash/index.ts b/...p/methods/debug_traceBlockByHash/index.ts → ...r/methods/debug_traceBlockByHash/index.ts
diff --git a/...BlockByNumber/debug_traceBlockByNumber.ts → ...BlockByNumber/debug_traceBlockByNumber.ts b/...BlockByNumber/debug_traceBlockByNumber.ts → ...BlockByNumber/debug_traceBlockByNumber.ts
@@ -3,12 +3,12 @@ import {
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 import {
     debugTraceTransaction,
     type TraceOptionsRPC
 } from '../debug_traceTransaction';
-import { type TracerReturnTypeRPC } from '../../../../formatter';
+import { type TracerReturnTypeRPC } from '../../../formatter';
 import { ethGetBlockByNumber } from '../eth_getBlockByNumber';
 
 /**

diff --git a/...methods/debug_traceBlockByNumber/index.ts → ...methods/debug_traceBlockByNumber/index.ts b/...methods/debug_traceBlockByNumber/index.ts → ...methods/debug_traceBlockByNumber/index.ts
diff --git a/...ethods/debug_traceCall/debug_traceCall.ts → ...ethods/debug_traceCall/debug_traceCall.ts b/...ethods/debug_traceCall/debug_traceCall.ts → ...ethods/debug_traceCall/debug_traceCall.ts
@@ -1,20 +1,17 @@
-import {
-    type ThorClient,
-    type TraceReturnType,
-    type TracerName
-} from '../../../../../../thor-client';
 import {
     JSONRPCInternalError,
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
 import {
-    debugFormatter,
-    type TracerReturnTypeRPC
-} from '../../../../formatter';
+    type ThorClient,
+    type TraceReturnType,
+    type TracerName
+} from '../../../../../thor-client';
+import { debugFormatter, type TracerReturnTypeRPC } from '../../../formatter';
 
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 import { type TraceCallRPC, type TransactionObjectInput } from './types';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
 
 /**
  * RPC Method debug_traceCall implementation

diff --git a/...hods-map/methods/debug_traceCall/index.ts → ...c-mapper/methods/debug_traceCall/index.ts b/...hods-map/methods/debug_traceCall/index.ts → ...c-mapper/methods/debug_traceCall/index.ts
diff --git a/...ds-map/methods/debug_traceCall/types.d.ts → ...mapper/methods/debug_traceCall/types.d.ts b/...ds-map/methods/debug_traceCall/types.d.ts → ...mapper/methods/debug_traceCall/types.d.ts
diff --git a/...raceTransaction/debug_traceTransaction.ts → ...raceTransaction/debug_traceTransaction.ts b/...raceTransaction/debug_traceTransaction.ts → ...raceTransaction/debug_traceTransaction.ts
@@ -1,9 +1,4 @@
 import { ThorId } from '@vechain/sdk-core';
-import { ethGetTransactionReceipt } from '../eth_getTransactionReceipt';
-import {
-    debugFormatter,
-    type TracerReturnTypeRPC
-} from '../../../../formatter';
 import {
     InvalidDataType,
     JSONRPCInternalError,
@@ -14,8 +9,10 @@ import {
     type ThorClient,
     type TraceReturnType,
     type TracerName
-} from '../../../../../../thor-client';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+} from '../../../../../thor-client';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
+import { debugFormatter, type TracerReturnTypeRPC } from '../../../formatter';
+import { ethGetTransactionReceipt } from '../eth_getTransactionReceipt';
 import { type TraceOptionsRPC } from './types';
 
 /**

diff --git a/...p/methods/debug_traceTransaction/index.ts → ...r/methods/debug_traceTransaction/index.ts b/...p/methods/debug_traceTransaction/index.ts → ...r/methods/debug_traceTransaction/index.ts
diff --git a/...methods/debug_traceTransaction/types.d.ts → ...methods/debug_traceTransaction/types.d.ts b/...methods/debug_traceTransaction/types.d.ts → ...methods/debug_traceTransaction/types.d.ts
diff --git a/...pabilities/engine_exchangeCapabilities.ts → ...pabilities/engine_exchangeCapabilities.ts b/...pabilities/engine_exchangeCapabilities.ts → ...pabilities/engine_exchangeCapabilities.ts
diff --git a/...hods/engine_exchangeCapabilities/index.ts → ...hods/engine_exchangeCapabilities/index.ts b/...hods/engine_exchangeCapabilities/index.ts → ...hods/engine_exchangeCapabilities/index.ts
diff --git a/...gine_exchangeTransitionConfigurationV1.ts → ...gine_exchangeTransitionConfigurationV1.ts b/...gine_exchangeTransitionConfigurationV1.ts → ...gine_exchangeTransitionConfigurationV1.ts
diff --git a/...xchangeTransitionConfigurationV1/index.ts → ...xchangeTransitionConfigurationV1/index.ts b/...xchangeTransitionConfigurationV1/index.ts → ...xchangeTransitionConfigurationV1/index.ts
diff --git a/...ceUpdatedV1/engine_forkchoiceUpdatedV1.ts → ...ceUpdatedV1/engine_forkchoiceUpdatedV1.ts b/...ceUpdatedV1/engine_forkchoiceUpdatedV1.ts → ...ceUpdatedV1/engine_forkchoiceUpdatedV1.ts
diff --git a/...thods/engine_forkchoiceUpdatedV1/index.ts → ...thods/engine_forkchoiceUpdatedV1/index.ts b/...thods/engine_forkchoiceUpdatedV1/index.ts → ...thods/engine_forkchoiceUpdatedV1/index.ts
diff --git a/...ceUpdatedV2/engine_forkchoiceUpdatedV2.ts → ...ceUpdatedV2/engine_forkchoiceUpdatedV2.ts b/...ceUpdatedV2/engine_forkchoiceUpdatedV2.ts → ...ceUpdatedV2/engine_forkchoiceUpdatedV2.ts
diff --git a/...thods/engine_forkchoiceUpdatedV2/index.ts → ...thods/engine_forkchoiceUpdatedV2/index.ts b/...thods/engine_forkchoiceUpdatedV2/index.ts → ...thods/engine_forkchoiceUpdatedV2/index.ts
diff --git a/...ceUpdatedV3/engine_forkchoiceUpdatedV3.ts → ...ceUpdatedV3/engine_forkchoiceUpdatedV3.ts b/...ceUpdatedV3/engine_forkchoiceUpdatedV3.ts → ...ceUpdatedV3/engine_forkchoiceUpdatedV3.ts
diff --git a/...thods/engine_forkchoiceUpdatedV3/index.ts → ...thods/engine_forkchoiceUpdatedV3/index.ts b/...thods/engine_forkchoiceUpdatedV3/index.ts → ...thods/engine_forkchoiceUpdatedV3/index.ts
diff --git a/...HashV1/engine_getPayloadBodiesByHashV1.ts → ...HashV1/engine_getPayloadBodiesByHashV1.ts b/...HashV1/engine_getPayloadBodiesByHashV1.ts → ...HashV1/engine_getPayloadBodiesByHashV1.ts
diff --git a/.../engine_getPayloadBodiesByHashV1/index.ts → .../engine_getPayloadBodiesByHashV1/index.ts b/.../engine_getPayloadBodiesByHashV1/index.ts → .../engine_getPayloadBodiesByHashV1/index.ts
diff --git a/...ngeV1/engine_getPayloadBodiesByRangeV1.ts → ...ngeV1/engine_getPayloadBodiesByRangeV1.ts b/...ngeV1/engine_getPayloadBodiesByRangeV1.ts → ...ngeV1/engine_getPayloadBodiesByRangeV1.ts
diff --git a/...engine_getPayloadBodiesByRangeV1/index.ts → ...engine_getPayloadBodiesByRangeV1/index.ts b/...engine_getPayloadBodiesByRangeV1/index.ts → ...engine_getPayloadBodiesByRangeV1/index.ts
diff --git a/...ngine_getPayloadV1/engine_getPayloadV1.ts → ...ngine_getPayloadV1/engine_getPayloadV1.ts b/...ngine_getPayloadV1/engine_getPayloadV1.ts → ...ngine_getPayloadV1/engine_getPayloadV1.ts
diff --git a/...-map/methods/engine_getPayloadV1/index.ts → ...pper/methods/engine_getPayloadV1/index.ts b/...-map/methods/engine_getPayloadV1/index.ts → ...pper/methods/engine_getPayloadV1/index.ts
diff --git a/...ngine_getPayloadV2/engine_getPayloadV2.ts → ...ngine_getPayloadV2/engine_getPayloadV2.ts b/...ngine_getPayloadV2/engine_getPayloadV2.ts → ...ngine_getPayloadV2/engine_getPayloadV2.ts
diff --git a/...-map/methods/engine_getPayloadV2/index.ts → ...pper/methods/engine_getPayloadV2/index.ts b/...-map/methods/engine_getPayloadV2/index.ts → ...pper/methods/engine_getPayloadV2/index.ts
diff --git a/...ngine_getPayloadV3/engine_getPayloadV3.ts → ...ngine_getPayloadV3/engine_getPayloadV3.ts b/...ngine_getPayloadV3/engine_getPayloadV3.ts → ...ngine_getPayloadV3/engine_getPayloadV3.ts
diff --git a/...-map/methods/engine_getPayloadV3/index.ts → ...pper/methods/engine_getPayloadV3/index.ts b/...-map/methods/engine_getPayloadV3/index.ts → ...pper/methods/engine_getPayloadV3/index.ts
diff --git a/...ngine_newPayloadV1/engine_newPayloadV1.ts → ...ngine_newPayloadV1/engine_newPayloadV1.ts b/...ngine_newPayloadV1/engine_newPayloadV1.ts → ...ngine_newPayloadV1/engine_newPayloadV1.ts
diff --git a/...-map/methods/engine_newPayloadV1/index.ts → ...pper/methods/engine_newPayloadV1/index.ts b/...-map/methods/engine_newPayloadV1/index.ts → ...pper/methods/engine_newPayloadV1/index.ts
diff --git a/...ngine_newPayloadV2/engine_newPayloadV2.ts → ...ngine_newPayloadV2/engine_newPayloadV2.ts b/...ngine_newPayloadV2/engine_newPayloadV2.ts → ...ngine_newPayloadV2/engine_newPayloadV2.ts
diff --git a/...-map/methods/engine_newPayloadV2/index.ts → ...pper/methods/engine_newPayloadV2/index.ts b/...-map/methods/engine_newPayloadV2/index.ts → ...pper/methods/engine_newPayloadV2/index.ts
diff --git a/...ngine_newPayloadV3/engine_newPayloadV3.ts → ...ngine_newPayloadV3/engine_newPayloadV3.ts b/...ngine_newPayloadV3/engine_newPayloadV3.ts → ...ngine_newPayloadV3/engine_newPayloadV3.ts
diff --git a/...-map/methods/engine_newPayloadV3/index.ts → ...pper/methods/engine_newPayloadV3/index.ts b/...-map/methods/engine_newPayloadV3/index.ts → ...pper/methods/engine_newPayloadV3/index.ts
diff --git a/...-map/methods/eth_accounts/eth_accounts.ts → ...pper/methods/eth_accounts/eth_accounts.ts b/...-map/methods/eth_accounts/eth_accounts.ts → ...pper/methods/eth_accounts/eth_accounts.ts
@@ -1,4 +1,4 @@
-import { type VeChainProvider } from '../../../../../providers';
+import { type VeChainProvider } from '../../../../providers/vechain-provider';
 
 /**
  * RPC Method eth_accounts implementation

diff --git a/...methods-map/methods/eth_accounts/index.ts → .../rpc-mapper/methods/eth_accounts/index.ts b/...methods-map/methods/eth_accounts/index.ts → .../rpc-mapper/methods/eth_accounts/index.ts
diff --git a/...ethods/eth_blockNumber/eth_blockNumber.ts → ...ethods/eth_blockNumber/eth_blockNumber.ts b/...ethods/eth_blockNumber/eth_blockNumber.ts → ...ethods/eth_blockNumber/eth_blockNumber.ts
@@ -1,5 +1,5 @@
 import { JSONRPCInternalError, stringifyData } from '@vechain/sdk-errors';
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 
 /**
  * RPC Method eth_blockNumber implementation

diff --git a/...hods-map/methods/eth_blockNumber/index.ts → ...c-mapper/methods/eth_blockNumber/index.ts b/...hods-map/methods/eth_blockNumber/index.ts → ...c-mapper/methods/eth_blockNumber/index.ts
diff --git a/.../methods-map/methods/eth_call/eth_call.ts → ...s/rpc-mapper/methods/eth_call/eth_call.ts b/.../methods-map/methods/eth_call/eth_call.ts → ...s/rpc-mapper/methods/eth_call/eth_call.ts
@@ -3,15 +3,15 @@ import {
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import { getCorrectBlockNumberRPCToVeChain } from '../../../../const';
+import { getCorrectBlockNumberRPCToVeChain } from '../../../const';
 import { type TransactionObjectInput } from './types';
-import { type BlockQuantityInputRPC } from '../../../types';
+import { type BlockQuantityInputRPC } from '../../types';
 import {
     type SimulateTransactionClause,
     type SimulateTransactionOptions,
     type ThorClient
-} from '../../../../../../thor-client';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+} from '../../../../../thor-client';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 
 /**
  * RPC Method eth_call implementation

diff --git a/...per/methods-map/methods/eth_call/index.ts → ...tils/rpc-mapper/methods/eth_call/index.ts b/...per/methods-map/methods/eth_call/index.ts → ...tils/rpc-mapper/methods/eth_call/index.ts
diff --git a/...r/methods-map/methods/eth_call/types.d.ts → ...ls/rpc-mapper/methods/eth_call/types.d.ts b/...r/methods-map/methods/eth_call/types.d.ts → ...ls/rpc-mapper/methods/eth_call/types.d.ts
diff --git a/...ds-map/methods/eth_chainId/eth_chainId.ts → ...mapper/methods/eth_chainId/eth_chainId.ts b/...ds-map/methods/eth_chainId/eth_chainId.ts → ...mapper/methods/eth_chainId/eth_chainId.ts
@@ -1,10 +1,10 @@
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 import {
     JSONRPCInternalError,
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import { CHAIN_ID } from '../../../../const';
+import { CHAIN_ID } from '../../../const';
 import { networkInfo } from '@vechain/sdk-core';
 
 /**

diff --git a/.../methods-map/methods/eth_chainId/index.ts → ...s/rpc-mapper/methods/eth_chainId/index.ts b/.../methods-map/methods/eth_chainId/index.ts → ...s/rpc-mapper/methods/eth_chainId/index.ts
diff --git a/...-map/methods/eth_coinbase/eth_coinbase.ts → ...pper/methods/eth_coinbase/eth_coinbase.ts b/...-map/methods/eth_coinbase/eth_coinbase.ts → ...pper/methods/eth_coinbase/eth_coinbase.ts
diff --git a/...methods-map/methods/eth_coinbase/index.ts → .../rpc-mapper/methods/eth_coinbase/index.ts b/...methods-map/methods/eth_coinbase/index.ts → .../rpc-mapper/methods/eth_coinbase/index.ts
diff --git a/..._createAccessList/eth_createAccessList.ts → ..._createAccessList/eth_createAccessList.ts b/..._createAccessList/eth_createAccessList.ts → ..._createAccessList/eth_createAccessList.ts
diff --git a/...map/methods/eth_createAccessList/index.ts → ...per/methods/eth_createAccessList/index.ts b/...map/methods/eth_createAccessList/index.ts → ...per/methods/eth_createAccessList/index.ts
diff --git a/...ethods/eth_estimateGas/eth_estimateGas.ts → ...ethods/eth_estimateGas/eth_estimateGas.ts b/...ethods/eth_estimateGas/eth_estimateGas.ts → ...ethods/eth_estimateGas/eth_estimateGas.ts
@@ -7,10 +7,10 @@ import { type TransactionObjectInput } from './types';
 import {
     type SimulateTransactionClause,
     type ThorClient
-} from '../../../../../../thor-client';
-import { getCorrectBlockNumberRPCToVeChain } from '../../../../const';
-import { type BlockQuantityInputRPC } from '../../../types';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+} from '../../../../../thor-client';
+import { getCorrectBlockNumberRPCToVeChain } from '../../../const';
+import { type BlockQuantityInputRPC } from '../../types';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 
 /**
  * RPC Method eth_estimateGas implementation

diff --git a/...hods-map/methods/eth_estimateGas/index.ts → ...c-mapper/methods/eth_estimateGas/index.ts b/...hods-map/methods/eth_estimateGas/index.ts → ...c-mapper/methods/eth_estimateGas/index.ts
diff --git a/...ds-map/methods/eth_estimateGas/types.d.ts → ...mapper/methods/eth_estimateGas/types.d.ts b/...ds-map/methods/eth_estimateGas/types.d.ts → ...mapper/methods/eth_estimateGas/types.d.ts
diff --git a/.../methods/eth_feeHistory/eth_feeHistory.ts → .../methods/eth_feeHistory/eth_feeHistory.ts b/.../methods/eth_feeHistory/eth_feeHistory.ts → .../methods/eth_feeHistory/eth_feeHistory.ts
diff --git a/...thods-map/methods/eth_feeHistory/index.ts → ...pc-mapper/methods/eth_feeHistory/index.ts b/...thods-map/methods/eth_feeHistory/index.ts → ...pc-mapper/methods/eth_feeHistory/index.ts
diff --git a/...-map/methods/eth_gasPrice/eth_gasPrice.ts → ...pper/methods/eth_gasPrice/eth_gasPrice.ts b/...-map/methods/eth_gasPrice/eth_gasPrice.ts → ...pper/methods/eth_gasPrice/eth_gasPrice.ts
@@ -1,4 +1,4 @@
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 
 /**
  * RPC Method eth_gasPrice implementation

diff --git a/...methods-map/methods/eth_gasPrice/index.ts → .../rpc-mapper/methods/eth_gasPrice/index.ts b/...methods-map/methods/eth_gasPrice/index.ts → .../rpc-mapper/methods/eth_gasPrice/index.ts
diff --git a/.../methods/eth_getBalance/eth_getBalance.ts → .../methods/eth_getBalance/eth_getBalance.ts b/.../methods/eth_getBalance/eth_getBalance.ts → .../methods/eth_getBalance/eth_getBalance.ts
@@ -1,12 +1,12 @@
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 import {
     JSONRPCInternalError,
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import type { BlockQuantityInputRPC } from '../../../types';
-import { getCorrectBlockNumberRPCToVeChain } from '../../../../const';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+import type { BlockQuantityInputRPC } from '../../types';
+import { getCorrectBlockNumberRPCToVeChain } from '../../../const';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 
 /**
  * RPC Method eth_getBalance implementation

diff --git a/...thods-map/methods/eth_getBalance/index.ts → ...pc-mapper/methods/eth_getBalance/index.ts b/...thods-map/methods/eth_getBalance/index.ts → ...pc-mapper/methods/eth_getBalance/index.ts
diff --git a/.../eth_getBlockByHash/eth_getBlockByHash.ts → .../eth_getBlockByHash/eth_getBlockByHash.ts b/.../eth_getBlockByHash/eth_getBlockByHash.ts → .../eth_getBlockByHash/eth_getBlockByHash.ts
@@ -1,13 +1,13 @@
 import { ThorId } from '@vechain/sdk-core';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 import { ethGetBlockByNumber } from '../eth_getBlockByNumber';
 import {
     JSONRPCInternalError,
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import { type BlocksRPC } from '../../../../formatter';
-import { type ThorClient } from '../../../../../../thor-client';
+import { type BlocksRPC } from '../../../formatter';
+import { type ThorClient } from '../../../../../thor-client';
 
 /**
  * RPC Method eth_getBlockByHash implementation

diff --git a/...s-map/methods/eth_getBlockByHash/index.ts → ...apper/methods/eth_getBlockByHash/index.ts b/...s-map/methods/eth_getBlockByHash/index.ts → ...apper/methods/eth_getBlockByHash/index.ts
diff --git a/..._getBlockByNumber/eth_getBlockByNumber.ts → ..._getBlockByNumber/eth_getBlockByNumber.ts b/..._getBlockByNumber/eth_getBlockByNumber.ts → ..._getBlockByNumber/eth_getBlockByNumber.ts
@@ -1,16 +1,13 @@
-import { type ThorClient } from '../../../../../../thor-client';
 import {
     JSONRPCInternalError,
     JSONRPCInvalidParams,
     stringifyData
 } from '@vechain/sdk-errors';
-import { blocksFormatter, type BlocksRPC } from '../../../../formatter';
-import { RPCMethodsMap } from '../../../rpc-mapper';
-import {
-    getCorrectBlockNumberRPCToVeChain,
-    RPC_METHODS
-} from '../../../../const';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+import { type ThorClient } from '../../../../../thor-client';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
+import { getCorrectBlockNumberRPCToVeChain } from '../../../const';
+import { blocksFormatter, type BlocksRPC } from '../../../formatter';
+import { ethChainId } from '../eth_chainId';
 
 /**
  * RPC Method eth_getBlockByNumber implementation
@@ -51,10 +48,9 @@ const ethGetBlockByNumber = async (
         let chainId: string = '0x0';
 
         // If the transaction detail flag is set, we need to get the chain id
-        if (isTxDetail)
-            chainId = (await RPCMethodsMap(thorClient)[RPC_METHODS.eth_chainId](
-                []
-            )) as string;
+        if (isTxDetail) {
+            chainId = await ethChainId(thorClient);
+        }
 
         const block = isTxDetail
             ? await thorClient.blocks.getBlockExpanded(

diff --git a/...map/methods/eth_getBlockByNumber/index.ts → ...per/methods/eth_getBlockByNumber/index.ts b/...map/methods/eth_getBlockByNumber/index.ts → ...per/methods/eth_getBlockByNumber/index.ts
diff --git a/..._getBlockReceipts/eth_getBlockReceipts.ts → ..._getBlockReceipts/eth_getBlockReceipts.ts b/..._getBlockReceipts/eth_getBlockReceipts.ts → ..._getBlockReceipts/eth_getBlockReceipts.ts
@@ -1,4 +1,4 @@
-import { type ThorClient } from '../../../../../../thor-client';
+import { type ThorClient } from '../../../../../thor-client';
 import {
     JSONRPCInternalError,
     JSONRPCInvalidParams,
@@ -7,10 +7,10 @@ import {
 import {
     type TransactionReceiptRPC,
     type TransactionRPC
-} from '../../../../formatter';
+} from '../../../formatter';
 import { ethGetBlockByNumber } from '../eth_getBlockByNumber';
 import { ethGetTransactionReceipt } from '../eth_getTransactionReceipt';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 
 /**
  * RPC Method eth_getBlockReceipts implementation

diff --git a/...map/methods/eth_getBlockReceipts/index.ts → ...per/methods/eth_getBlockReceipts/index.ts b/...map/methods/eth_getBlockReceipts/index.ts → ...per/methods/eth_getBlockReceipts/index.ts
diff --git a/...ash/eth_getBlockTransactionCountByHash.ts → ...ash/eth_getBlockTransactionCountByHash.ts b/...ash/eth_getBlockTransactionCountByHash.ts → ...ash/eth_getBlockTransactionCountByHash.ts
@@ -1,8 +1,8 @@
-import type { ThorClient } from '../../../../../../thor-client';
+import type { ThorClient } from '../../../../../thor-client';
 import { JSONRPCInvalidParams } from '@vechain/sdk-errors';
 import { ethGetBlockByHash } from '../eth_getBlockByHash';
 import { ThorId } from '@vechain/sdk-core';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
 
 /**
  * RPC Method eth_getBlockTransactionCountByHash implementation

diff --git a/...h_getBlockTransactionCountByHash/index.ts → ...h_getBlockTransactionCountByHash/index.ts b/...h_getBlockTransactionCountByHash/index.ts → ...h_getBlockTransactionCountByHash/index.ts
diff --git a/...r/eth_getBlockTransactionCountByNumber.ts → ...r/eth_getBlockTransactionCountByNumber.ts b/...r/eth_getBlockTransactionCountByNumber.ts → ...r/eth_getBlockTransactionCountByNumber.ts
@@ -1,6 +1,6 @@
 import { JSONRPCInvalidParams } from '@vechain/sdk-errors';
-import { RPC_DOCUMENTATION_URL } from '../../../../../../utils';
-import type { ThorClient } from '../../../../../../thor-client';
+import { RPC_DOCUMENTATION_URL } from '../../../../../utils';
+import type { ThorClient } from '../../../../../thor-client';
 import { ethGetBlockByNumber } from '../eth_getBlockByNumber';
 
 /**

diff --git a/...getBlockTransactionCountByNumber/index.ts → ...getBlockTransactionCountByNumber/index.ts b/...getBlockTransactionCountByNumber/index.ts → ...getBlockTransactionCountByNumber/index.ts
Title	Tests	Time
core	782	1m 50s ⏱️
network	731	4m 40s ⏱️
errors	42	18.328s ⏱️