dequanto 0.2.50 → 0.2.52

package/src/explorer/BlockchainExplorerStorage.ts

@@ -1,12 +1,12 @@
-import { IContractDetails } from '@dequanto/models/IContractDetails';
-import { TAddress } from '@dequanto/models/TAddress';
-import { $require } from '@dequanto/utils/$require';
+import { IContractDetails } from 'dequanto/models/IContractDetails';
+import { TAddress } from 'dequanto/models/TAddress';
+import { $require } from 'dequanto/utils/$require';
 
 
 
 import { IBlockchainExplorer, IBlockchainTransferEvent } from './IBlockchainExplorer';
-import { $address } from '@dequanto/utils/$address';
-import { TEth } from '@dequanto/models/TEth';
+import { $address } from 'dequanto/utils/$address';
+import { TEth } from 'dequanto/models/TEth';
 
 export class BlockchainExplorerStorage implements IBlockchainExplorer {
     inMemoryDb: IContractDetails[];
@@ -82,7 +82,7 @@ export class BlockchainExplorerStorage implements IBlockchainExplorer {
         let $address = opts?.implementation ?? address;
         let $contract = this.contracts[$address.toLowerCase()];
         $require.notNull($contract, `Contract "${$address}" not found`);
-        // @TODO: L1: return abi as json (means in *scan providers we must serialize it earlier)
+        // @TODO: L1: Return ABI as JSON. *scan providers should serialize it earlier.
         return {
             implementation: $address,
             abi: JSON.stringify($contract.abi)
@@ -92,7 +92,7 @@ export class BlockchainExplorerStorage implements IBlockchainExplorer {
         let _address = address;
         let _contract = this.contracts[_address.toLowerCase()];
         $require.notNull(_contract, `Contract "${_address}" not found`);
-        // @TODO: L1: return abi as json (means in *scan providers we must serialize it earlier)
+        // @TODO: L1: Return ABI as JSON. *scan providers should serialize it earlier.
         return {
             SourceCode: {
                 contractName: _contract.name,

package/src/explorer/Bscscan.ts

@@ -1,7 +1,7 @@
 import di from 'a-di';
 
-import { $config } from '@dequanto/utils/$config';
-import { BscWeb3Client } from '@dequanto/clients/BscWeb3Client';
+import { $config } from 'dequanto/utils/$config';
+import { BscWeb3Client } from 'dequanto/clients/BscWeb3Client';
 import { BlockchainExplorer } from './BlockchainExplorer';
 
 const contracts = $config.get('contracts.bsc', []);

package/src/explorer/ContractVerifier.ts

@@ -1,20 +1,20 @@
 import alot from 'alot';
 import { File } from 'atma-io';
-import { Constructor } from '@dequanto/utils/types';
+import { Constructor } from 'dequanto/utils/types';
 import { class_Uri } from 'atma-utils';
-import { ContractBase } from '@dequanto/contracts/ContractBase';
-import { ContractDeployer } from '@dequanto/contracts/deploy/ContractDeployer';
-import { Deployments } from '@dequanto/contracts/deploy/Deployments';
-import { LoggerService } from '@dequanto/loggers/LoggerService';
-import { TEth } from '@dequanto/models/TEth';
-import { SourceFile } from '@dequanto/solidity/SlotsParser/SourceFile';
-import { $is } from '@dequanto/utils/$is';
-import { $path } from '@dequanto/utils/$path';
-import { $promise } from '@dequanto/utils/$promise';
-import { $require } from '@dequanto/utils/$require';
+import { ContractBase } from 'dequanto/contracts/ContractBase';
+import { ContractDeployer } from 'dequanto/contracts/deploy/ContractDeployer';
+import { Deployments } from 'dequanto/contracts/deploy/Deployments';
+import { LoggerService } from 'dequanto/loggers/LoggerService';
+import { TEth } from 'dequanto/models/TEth';
+import { SourceFile } from 'dequanto/solidity/SlotsParser/SourceFile';
+import { $is } from 'dequanto/utils/$is';
+import { $path } from 'dequanto/utils/$path';
+import { $promise } from 'dequanto/utils/$promise';
+import { $require } from 'dequanto/utils/$require';
 import { IBlockchainExplorer } from './IBlockchainExplorer';
-import { $contract } from '@dequanto/utils/$contract';
-import { $abiCoder } from '@dequanto/abi/$abiCoder';
+import { $contract } from 'dequanto/utils/$contract';
+import { $abiCoder } from 'dequanto/abi/$abiCoder';
 import { IVerifier } from './verifiers/IVerifier';
 
 
@@ -42,7 +42,7 @@ export class ContractVerifier {
     }
 
     async ensure (Ctor: TContractInfo, opts: TSubmissionOptions = {}): Promise<void>  {
-        this.logger.log(`Submit sources for ${typeof Ctor === 'string' ? Ctor : Ctor.name}`);
+        this.logger.log(`Submitting sources for ${typeof Ctor === 'string' ? Ctor : Ctor.name}`);
 
         let status = await this.submit(Ctor, opts);
         await this.waitForVerification(status, opts);
@@ -66,7 +66,7 @@ export class ContractVerifier {
             } catch (e) {
                 let message = e.message;
                 if (/verified/i.test(message)) {
-                    // was already verified
+                    // Already verified.
                     return true;
                 }
                 if (/(pending|queue)/i.test(message)) {
@@ -100,13 +100,13 @@ export class ContractVerifier {
         }
 
         try {
-            this.logger.log(`Checking if already verified ${address}`);
+            this.logger.log(`Checking whether contract ${address} is already verified`);
             let currentSources = await this.explorer.getContractSource(address);
             if ($is.notEmpty(currentSources?.ContractName)) {
                 return { status:'verified' };
             }
         } catch (error) {
-            // ignore any pre-check error and continue with the verification
+            // Ignore pre-check errors and continue with verification.
         }
 
         let deployedBytecode = await client.getCode(address);
@@ -140,7 +140,7 @@ export class ContractVerifier {
         }
 
         let jsonMetaPath = info.ctx.source.path;
-        $require.notEmpty(jsonMetaPath, `Deployment should return a path to compilation JSON`);
+        $require.notEmpty(jsonMetaPath, `Deployment should return a path to the compilation JSON`);
         $require.True(await File.existsAsync(jsonMetaPath) , `${jsonMetaPath} does not exist`);
 
         let jsonMeta = await File.readAsync<{ sourceName: string, contractName: string }>(jsonMetaPath);
@@ -150,7 +150,7 @@ export class ContractVerifier {
         let jsonMetaDbg = await File.readAsync<{ buildInfo: string }>(jsonMetaDbgPath);
 
         let jsonMetaBuildInfoPath = jsonMetaDbg.buildInfo;
-        $require.notEmpty(jsonMetaPath, `${jsonMetaDbgPath} should contain the path to the buildInfo json file`);
+        $require.notEmpty(jsonMetaPath, `${jsonMetaDbgPath} should contain the path to the build info JSON file`);
 
         let buildInfoPath = new class_Uri(new class_Uri(jsonMetaPath).toDir()).combine(jsonMetaBuildInfoPath).toString();
         $require.True(await File.existsAsync(buildInfoPath) , `${buildInfoPath} does not exist`);
@@ -170,7 +170,7 @@ export class ContractVerifier {
         }
         let buildInfo = await File.readAsync<TBuildInfo>(buildInfoPath);
 
-        $require.notNull(buildInfo.solcLongVersion, `${buildInfoPath} should contain the "solcLongVersion" information`);
+        $require.notNull(buildInfo.solcLongVersion, `${buildInfoPath} should contain the "solcLongVersion" value`);
 
         let sources = await this.getSources(jsonMeta.sourceName);
         let sourcesSerialized = JSON.stringify({
@@ -181,7 +181,7 @@ export class ContractVerifier {
 
         let sourcesSerializedWrapped = `${sourcesSerialized}`;
 
-        this.logger.log(`Submit ${jsonMeta.sourceName}:${jsonMeta.contractName} and dependencies to verify ${address} contract`);
+        this.logger.log(`Submitting ${jsonMeta.sourceName}:${jsonMeta.contractName} and dependencies to verify contract ${address}`);
 
         try {
             let guid = await this.explorer.submitContractVerification({
@@ -243,7 +243,7 @@ export class ContractVerifier {
 
         await crawlSourceFile(new SourceFile(main));
 
-        this.logger.log(`Found ${Object.keys(sources).length} source files: `, Object.keys(sources));
+        this.logger.log(`Found ${Object.keys(sources).length} source files:`, Object.keys(sources));
         return sources;
     }
 
@@ -284,7 +284,7 @@ export class ContractVerifier {
             } catch (e) {
                 let message = e.message;
                 if (/verified|success/i.test(message)) {
-                    // was already verified
+                    // Already verified.
                     return true;
                 }
                 if (/(pending|queue)/i.test(message)) {

package/src/explorer/Etherscan.ts

@@ -1,13 +1,13 @@
 import di from 'a-di';
 import memd from 'memd';
-import { $config } from '@dequanto/utils/$config';
-import { EthWeb3Client } from '@dequanto/clients/EthWeb3Client';
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { $config } from 'dequanto/utils/$config';
+import { EthWeb3Client } from 'dequanto/clients/EthWeb3Client';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { IBlockchainExplorer, IBlockchainTransferEvent } from './IBlockchainExplorer';
 import { BlockchainExplorer } from './BlockchainExplorer';
-import { IContractDetails } from '@dequanto/models/IContractDetails';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TEth } from '@dequanto/models/TEth';
+import { IContractDetails } from 'dequanto/models/IContractDetails';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TEth } from 'dequanto/models/TEth';
 
 const contracts = $config.get('contracts.eth', [])
 

package/src/explorer/Evmscan.ts

@@ -1,4 +1,4 @@
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { BlockchainExplorer } from './BlockchainExplorer';
 
 

package/src/explorer/IAbiProvider.ts

@@ -1,4 +1,4 @@
-import { TAddress } from '@dequanto/models/TAddress';
+import { TAddress } from 'dequanto/models/TAddress';
 
 export interface IAbiProvider {
     getContractAbi (address: TAddress, opts: { implementation: string }): Promise<{ abi: string, implementation: TAddress }>

package/src/explorer/IBlockchainExplorer.ts

@@ -1,9 +1,9 @@
-import { IContractDetails } from '@dequanto/models/IContractDetails';
+import { IContractDetails } from 'dequanto/models/IContractDetails';
 import { IAbiProvider } from './IAbiProvider';
-import { TEth } from '@dequanto/models/TEth';
-import { TAddress } from '@dequanto/models/TAddress';
+import { TEth } from 'dequanto/models/TEth';
+import { TAddress } from 'dequanto/models/TAddress';
 import { IVerifier } from './verifiers/IVerifier';
-import { TExplorerDefinition } from '@dequanto/models/TExplorer';
+import { TExplorerDefinition } from 'dequanto/models/TExplorer';
 
 
 export interface IBlockchainExplorer extends IAbiProvider, IVerifier {

package/src/explorer/Polyscan.ts

@@ -1,6 +1,6 @@
 import di from 'a-di';
-import { $config } from '@dequanto/utils/$config';
-import { PolyWeb3Client } from '@dequanto/clients/PolyWeb3Client';
+import { $config } from 'dequanto/utils/$config';
+import { PolyWeb3Client } from 'dequanto/clients/PolyWeb3Client';
 import { BlockchainExplorer } from './BlockchainExplorer';
 
 const contracts = $config.get('contracts.polygon', []);

package/src/explorer/verifiers/FsHtmlVerifier.ts

@@ -1,11 +1,11 @@
 import { File } from 'atma-io';
-import { $require } from '@dequanto/utils/$require';
-import { TEth } from '@dequanto/models/TEth';
+import { $require } from 'dequanto/utils/$require';
+import { TEth } from 'dequanto/models/TEth';
 import { IVerifier } from './IVerifier';
 import { IBlockchainTransferEvent } from '../IBlockchainExplorer';
-import { $platform } from '@dequanto/utils/$platform';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { TExplorer, TExplorerDefinition } from '@dequanto/models/TExplorer';
+import { $platform } from 'dequanto/utils/$platform';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { TExplorer, TExplorerDefinition } from 'dequanto/models/TExplorer';
 
 const PATH_ROOT = `./data/0xc/verification`;
 const PATH_TEMPLATE = `${PATH_ROOT}/template.html`;
@@ -115,7 +115,7 @@ export class FsHtmlVerifier implements IVerifier {
 
 
         if (contractData.contractName.includes('Utils/Proxy')) {
-            // fix Proxy, rename contract duplicates
+            // Rename duplicate Proxy contracts before writing the verification form.
             html = html.replaceAll('contracts/Utils/Proxy.sol:Proxy', 'contracts/Utils/TUProxy.sol:TUProxy');
             html = html.replace('Utils/Proxy.sol":', 'Utils/TUProxy.sol":');
             html = html.replace('contract Proxy is ', 'contract TUProxy is ');

package/src/explorer/verifiers/IVerifier.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 
 export interface IVerifier {
     submitContractVerification(contractData: {

package/src/flashbots/FlashbotWeb3Client.ts

@@ -1,6 +1,6 @@
-import { $config } from '@dequanto/utils/$config';
+import { $config } from 'dequanto/utils/$config';
 import { Web3Client } from '../clients/Web3Client';
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { IWeb3EndpointOptions } from '../clients/interfaces/IWeb3EndpointOptions';
 import { ClientEndpoints } from '../clients/utils/ClientEndpoints';
 

package/src/flashbots/FlashbotsProvider.ts

@@ -1,17 +1,17 @@
-import { Config } from '@dequanto/config/Config';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-import { EoAccount, IAccount } from '@dequanto/models/TAccount';
-import { TEth } from '@dequanto/models/TEth';
-import { Rpc, RpcTypes } from '@dequanto/rpc/Rpc';
-import { $contract } from '@dequanto/utils/$contract';
-import { $hex } from '@dequanto/utils/$hex';
-import { $require } from '@dequanto/utils/$require';
-import { $sig } from '@dequanto/utils/$sig';
-import { DeepPartial } from '@dequanto/utils/types';
-
-import { $buffer } from '@dequanto/utils/$buffer';
-import { $crypto } from '@dequanto/utils/$crypto';
-import { IConfigData } from '@dequanto/config/interface/IConfigData';
+import { Config } from 'dequanto/config/Config';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { EoAccount, IAccount } from 'dequanto/models/TAccount';
+import { TEth } from 'dequanto/models/TEth';
+import { Rpc, RpcTypes } from 'dequanto/rpc/Rpc';
+import { $contract } from 'dequanto/utils/$contract';
+import { $hex } from 'dequanto/utils/$hex';
+import { $require } from 'dequanto/utils/$require';
+import { $sig } from 'dequanto/utils/$sig';
+import { DeepPartial } from 'dequanto/utils/types';
+
+import { $buffer } from 'dequanto/utils/$buffer';
+import { $crypto } from 'dequanto/utils/$crypto';
+import { IConfigData } from 'dequanto/config/interface/IConfigData';
 
 /**
  * Submits transaction to Flashbots network

package/src/gen/Generator.ts

@@ -1,24 +1,24 @@
 import di from 'a-di';
 import alot from 'alot';
-import { type TAbiItem } from '@dequanto/types/TAbi';
-import { IBlockchainExplorer } from '@dequanto/explorer/IBlockchainExplorer';
-import { $address } from '@dequanto/utils/$address';
-import { $require } from '@dequanto/utils/$require';
+import { type TAbiItem } from 'dequanto/types/TAbi';
+import { IBlockchainExplorer } from 'dequanto/explorer/IBlockchainExplorer';
+import { $address } from 'dequanto/utils/$address';
+import { $require } from 'dequanto/utils/$require';
 import { GeneratorFromAbi } from './GeneratorFromAbi';
-import { TAddress } from '@dequanto/models/TAddress';
+import { TAddress } from 'dequanto/models/TAddress';
 import { File, Directory } from 'atma-io';
 import { class_Uri, obj_setProperty } from 'atma-utils';
-import { BlockchainExplorerFactory } from '@dequanto/explorer/BlockchainExplorerFactory';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { $path } from '@dequanto/utils/$path';
-import { $logger, l } from '@dequanto/utils/$logger';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-import { Web3ClientFactory } from '@dequanto/clients/Web3ClientFactory';
-import { EvmBytecode } from '@dequanto/evm/EvmBytecode';
-import { HardhatProvider } from '@dequanto/hardhat/HardhatProvider';
-import { TEth } from '@dequanto/models/TEth';
-import { $hex } from '@dequanto/utils/$hex';
-import { SolidityParser } from '@dequanto/solidity/SolidityParser';
+import { BlockchainExplorerFactory } from 'dequanto/explorer/BlockchainExplorerFactory';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { $path } from 'dequanto/utils/$path';
+import { $logger, l } from 'dequanto/utils/$logger';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
+import { EvmBytecode } from 'dequanto/evm/EvmBytecode';
+import { HardhatProvider } from 'dequanto/hardhat/HardhatProvider';
+import { TEth } from 'dequanto/models/TEth';
+import { $hex } from 'dequanto/utils/$hex';
+import { SolidityParser } from 'dequanto/solidity/SolidityParser';
 
 export interface IGenerateOptions {
     platform: TPlatform

package/src/gen/GeneratorFromAbi.ts

@@ -1,20 +1,20 @@
 import alot from 'alot';
-import { type TAbiItem } from '@dequanto/types/TAbi';
-import { TAddress } from '@dequanto/models/TAddress';
+import { type TAbiItem } from 'dequanto/types/TAbi';
+import { TAddress } from 'dequanto/models/TAddress';
 import { env, File } from 'atma-io';
 import { class_Uri } from 'atma-utils';
-import { $abiType } from '@dequanto/utils/$abiType';
-import { $date } from '@dequanto/utils/$date';
-import { $path } from '@dequanto/utils/$path';
-import { $abiUtils } from '@dequanto/utils/$abiUtils';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { $config } from '@dequanto/utils/$config';
-import { $logger } from '@dequanto/utils/$logger';
+import { $abiType } from 'dequanto/utils/$abiType';
+import { $date } from 'dequanto/utils/$date';
+import { $path } from 'dequanto/utils/$path';
+import { $abiUtils } from 'dequanto/utils/$abiUtils';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { $config } from 'dequanto/utils/$config';
+import { $logger } from 'dequanto/utils/$logger';
 import { GeneratorStorageReader } from './GeneratorStorageReader';
-import { Web3Client } from '@dequanto/clients/Web3Client';
+import { Web3Client } from 'dequanto/clients/Web3Client';
 import { Str } from './utils/Str';
 import { $gen } from './utils/$gen';
-import { IConfigData } from '@dequanto/config/interface/IConfigData';
+import { IConfigData } from 'dequanto/config/interface/IConfigData';
 
 
 

package/src/gen/GeneratorStorageReader.ts

@@ -1,15 +1,15 @@
 import alot from 'alot'
-import { Web3Client } from '@dequanto/clients/Web3Client'
-import { TAddress } from '@dequanto/models/TAddress'
-import { TPlatform } from '@dequanto/models/TPlatform'
-import { SlotsParser } from '@dequanto/solidity/SlotsParser'
-import { $require } from '@dequanto/utils/$require'
+import { Web3Client } from 'dequanto/clients/Web3Client'
+import { TAddress } from 'dequanto/models/TAddress'
+import { TPlatform } from 'dequanto/models/TPlatform'
+import { SlotsParser } from 'dequanto/solidity/SlotsParser'
+import { $require } from 'dequanto/utils/$require'
 import { File } from 'atma-io'
 import { Str } from './utils/Str'
-import { $abiType } from '@dequanto/utils/$abiType'
-import { $path } from '@dequanto/utils/$path'
+import { $abiType } from 'dequanto/utils/$abiType'
+import { $path } from 'dequanto/utils/$path'
 import { $gen } from './utils/$gen'
-import { ISlotVarDefinition } from '@dequanto/solidity/SlotsParser/models'
+import { ISlotVarDefinition } from 'dequanto/solidity/SlotsParser/models'
 
 export class GeneratorStorageReader {
 

package/src/handlers/TokenHandler.ts

@@ -1,11 +1,11 @@
-import { EoAccount } from "@dequanto/models/TAccount";
-import { PlatformFactory } from '@dequanto/chains/PlatformFactory';
-import { IToken } from '@dequanto/models/IToken';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { $bigint } from '@dequanto/utils/$bigint';
-import { $is } from '@dequanto/utils/$is';
-import { $require } from '@dequanto/utils/$require';
+import { EoAccount } from "dequanto/models/TAccount";
+import { PlatformFactory } from 'dequanto/chains/PlatformFactory';
+import { IToken } from 'dequanto/models/IToken';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { $bigint } from 'dequanto/utils/$bigint';
+import { $is } from 'dequanto/utils/$is';
+import { $require } from 'dequanto/utils/$require';
 import di from 'a-di';
 import memd from 'memd';
 

package/src/hardhat/HardhatProvider.ts

@@ -3,39 +3,40 @@ import alot from 'alot';
 import { class_Uri } from 'atma-utils';
 import { File, env, Directory } from 'atma-io';
 
-import type { ContractBase } from '@dequanto/contracts/ContractBase';
-
-import type { TAbiItem } from '@dequanto/types/TAbi';
-import type { TEth } from '@dequanto/models/TEth';
-
-import { EoAccount } from '@dequanto/models/TAccount';
-import { HardhatWeb3Client } from '@dequanto/hardhat/HardhatWeb3Client';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-
-import { $logger } from '@dequanto/utils/$logger';
-import { $number } from '@dequanto/utils/$number';
-import { $require } from '@dequanto/utils/$require';
-import { IGeneratorSources } from '@dequanto/gen/Generator';
-import { $path } from '@dequanto/utils/$path';
-import { ContractClassFactory, IContractWrapped } from '@dequanto/contracts/ContractClassFactory';
-import { BlockchainExplorerFactory } from '@dequanto/explorer/BlockchainExplorerFactory';
-import { IWeb3EndpointOptions } from '@dequanto/clients/interfaces/IWeb3EndpointOptions';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { Web3ClientFactory } from '@dequanto/clients/Web3ClientFactory';
-
-import { ContractDeployment } from '@dequanto/contracts/deploy/ContractDeployment';
-import { ContractDeployer } from '@dequanto/contracts/deploy/ContractDeployer';
-import { $sig } from '@dequanto/utils/$sig';
-import { $address } from '@dequanto/utils/$address';
-import { $promise } from '@dequanto/utils/$promise';
-import { $date } from '@dequanto/utils/$date';
-import { $hex } from '@dequanto/utils/$hex';
-import { TAddress } from '@dequanto/models/TAddress';
-import { $contract } from '@dequanto/utils/$contract';
-import { $dependency } from '@dequanto/utils/$dependency';
-import { TTransport } from '@dequanto/rpc/transports/ITransport';
-import { Constructor } from '@dequanto/utils/types';
-import { BlockchainExplorer } from '@dequanto/explorer/BlockchainExplorer';
+import type { ContractBase } from 'dequanto/contracts/ContractBase';
+
+import type { TAbiItem } from 'dequanto/types/TAbi';
+import type { TEth } from 'dequanto/models/TEth';
+
+import { EoAccount } from 'dequanto/models/TAccount';
+import { HardhatWeb3Client } from 'dequanto/hardhat/HardhatWeb3Client';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+
+import { $logger } from 'dequanto/utils/$logger';
+import { $number } from 'dequanto/utils/$number';
+import { $require } from 'dequanto/utils/$require';
+import { IGeneratorSources } from 'dequanto/gen/Generator';
+import { $path } from 'dequanto/utils/$path';
+import { ContractClassFactory, IContractWrapped } from 'dequanto/contracts/ContractClassFactory';
+import { BlockchainExplorerFactory } from 'dequanto/explorer/BlockchainExplorerFactory';
+import { IWeb3EndpointOptions } from 'dequanto/clients/interfaces/IWeb3EndpointOptions';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
+
+import { ContractDeployment } from 'dequanto/contracts/deploy/ContractDeployment';
+import { ContractDeployer } from 'dequanto/contracts/deploy/ContractDeployer';
+import { $sig } from 'dequanto/utils/$sig';
+import { $address } from 'dequanto/utils/$address';
+import { $promise } from 'dequanto/utils/$promise';
+import { $date } from 'dequanto/utils/$date';
+import { $hex } from 'dequanto/utils/$hex';
+import { TAddress } from 'dequanto/models/TAddress';
+import { $contract } from 'dequanto/utils/$contract';
+import { $dependency } from 'dequanto/utils/$dependency';
+import { TTransport } from 'dequanto/rpc/transports/ITransport';
+import { Constructor } from 'dequanto/utils/types';
+import { BlockchainExplorer } from 'dequanto/explorer/BlockchainExplorer';
+import { Rpc } from 'dequanto/rpc/Rpc';
 
 type THardhatLib = typeof import('hardhat');
 
@@ -63,26 +64,73 @@ export class HardhatProvider {
         return client;
     }
 
-    async forked (params: { platform?: TPlatform, url?: string, block?: number | 'latest' } = {}) {
-        const client = await this.client('hardhat');
-        let { url, block } = params;
-        if (url == null) {
-            let platform = params.platform;
-            $require.notNull(platform, `Platform is required to resolve the RPC url for`);
-            let platformClient = await Web3ClientFactory.get(platform);
-            url = await platformClient.getNodeURL({ ws: false });
-
-            // Hardhat seems to support only HTTPS nodes as fork sources
-            $require.True(/^(http)/.test(url), `Requires the HTTP path of a node to fork: ${url}`);
-
-            // Removed: use default Hardhat's behavior
-            // if (block == null) {
-            //     let rpc = await platformClient.getRpc({ node: { url }});
-            //     block = await rpc.eth_blockNumber();
-            //     // hardhat performance issues on latest block. Requires at least 5 confirmations
-            //     block -= 5;
-            // }
+    /**
+     * Creates an independent in-memory fork and returns its HardhatWeb3Client.
+     * Each call creates a new provider with the requested chainId and fork state,
+     * allowing multiple forks to coexist without resetting the shared instance.
+     * Use this when a separate chainId is needed, since hardhat_reset preserves
+     * the existing provider's chainId. Supports Hardhat 2 and 3.
+     */
+    async createFork (params: {
+        chainId: number
+        platform?: TPlatform
+        url?: string
+        block?: number | 'latest'
+    }) {
+        let { block, platform } = params;
+
+        let url = params.url ?? await this.getRpcUrl(platform);
+        let chainId = $require.Number(params.chainId, 'Invalid fork chainId');
+
+        const hh = await this.getHardhat();
+        const forking = {
+            enabled: true,
+            url,
+            ...(block != null && block !== 'latest' ? { blockNumber: block } : {}),
+        };
+        // Hardhat 3 exposes a network manager; earlier releases use connect().
+        const network = hh.network as typeof hh.network & {
+            create?: (options: any) => Promise<{ provider: any }>;
+            connect?: (options: any) => Promise<{ provider: any }>;
+        };
+        const create = network.create ?? network.connect;
+        let provider;
+        if (typeof create === 'function') {
+            const networkName = Object.keys(hh.config.networks)
+                .find(name => (hh.config.networks[name] as any).type === 'edr-simulated');
+            $require.notNull(networkName, 'Hardhat 3 requires an edr-simulated network configuration');
+            const connection = await create.call(network, {
+                network: networkName,
+                override: { chainId, forking },
+            });
+            provider = connection.provider;
+        } else {
+            // Hardhat 2 has no public factory. Load its internal factory only here.
+            const { createProvider } = await $dependency.load<typeof import('hardhat/internal/core/providers/construction')>(
+                'hardhat/internal/core/providers/construction.js'
+            );
+            const config = {
+                ...hh.config,
+                networks: {
+                    ...hh.config.networks,
+                    hardhat: { ...hh.config.networks.hardhat, chainId, forking },
+                },
+            };
+            provider = await createProvider(config, 'hardhat', hh.artifacts);
         }
+
+        const client = new HardhatWeb3Client({
+            web3: provider,
+            chainId: chainId
+        });
+        client.configureFork(params.platform);
+        return client;
+    }
+
+    async forked (params: { platform: TPlatform, url?: string, block?: number | 'latest' }) {
+        const client = await this.client('hardhat');
+        let { platform, block } = params;
+        let url = params.url ?? await this.getRpcUrl(platform);
         await client.debug.reset({
             forking: {
                 jsonRpcUrl: url,
@@ -485,7 +533,17 @@ export class HardhatProvider {
 
     @memd.deco.memoize()
     public async getHardhat (): Promise<THardhatLib> {
-        return await $dependency.load<THardhatLib>('hardhat');
+        let loaded;
+        try {
+            loaded = await $dependency.load('hardhat');
+        } catch (error) {
+            if (error.code !== 'ERR_REQUIRE_ESM' && error.code !== 'ERR_REQUIRE_ASYNC_MODULE') {
+                throw error;
+            }
+            // Preserve native import when this file is compiled to CommonJS/AMD.
+            loaded = await new Function('return import("hardhat")')();
+        }
+        return loaded.default ?? loaded;
     }
 
     private async getHardhatProvider (): Promise<TTransport.Transport> {
@@ -655,6 +713,16 @@ export class HardhatProvider {
             ContractCtor
         };
     }
+
+    private async getRpcUrl (platform: TPlatform) {
+        $require.notNull(platform, `Platform is required to resolve the RPC url for`);
+        let platformClient = await Web3ClientFactory.get(platform);
+        let url = await platformClient.getNodeURL({ ws: false });
+
+        // Hardhat seems to support only HTTPS nodes as fork sources
+        $require.True(/^(http)/.test(url), `Requires the HTTP path of a node to fork: ${url}`);
+        return url;
+    }
 }