dequanto 0.2.50 → 0.2.52

package/src/clients/ClientPool.ts

@@ -1,12 +1,12 @@
 import alot from 'alot';
 import memd from 'memd';
-import { $date } from '@dequanto/utils/$date';
-import { $number } from '@dequanto/utils/$number';
-import { $require } from '@dequanto/utils/$require';
-import { $contract } from '@dequanto/utils/$contract';
-import { $logger, l } from '@dequanto/utils/$logger';
-import { $promise } from '@dequanto/utils/$promise';
-import { $array } from '@dequanto/utils/$array';
+import { $date } from 'dequanto/utils/$date';
+import { $number } from 'dequanto/utils/$number';
+import { $require } from 'dequanto/utils/$require';
+import { $contract } from 'dequanto/utils/$contract';
+import { $logger, l } from 'dequanto/utils/$logger';
+import { $promise } from 'dequanto/utils/$promise';
+import { $array } from 'dequanto/utils/$array';
 
 import { PromiseEventWrap } from './model/PromiEventWrap';
 import { IWeb3ClientStatus } from './interfaces/IWeb3ClientStatus';
@@ -18,20 +18,23 @@ import { IWeb3ClientOptions } from './interfaces/IWeb3Client';
 import { RateLimitGuard } from './handlers/RateLimitGuard';
 import { Web3BatchRequests } from './Web3BatchRequests';
 
-import { Rpc, RpcTypes } from '@dequanto/rpc/Rpc';
+import { Rpc, RpcTypes } from 'dequanto/rpc/Rpc';
 
-import { PromiseEvent } from '@dequanto/class/PromiseEvent';
-import { TTransport } from '@dequanto/rpc/transports/ITransport';
+import { PromiseEvent } from 'dequanto/class/PromiseEvent';
+import { TTransport } from 'dequanto/rpc/transports/ITransport';
 
-import { TRpc } from '@dequanto/rpc/RpcBase';
-import { TEth } from '@dequanto/models/TEth';
-import { $rpc } from '@dequanto/rpc/$rpc';
-import { DataLike } from '@dequanto/utils/types';
+import { TRpc } from 'dequanto/rpc/RpcBase';
+import { TEth } from 'dequanto/models/TEth';
+import { $rpc } from 'dequanto/rpc/$rpc';
+import { DataLike } from 'dequanto/utils/types';
 
 export interface IRpcConfig {
     url?: string
     options?: TTransport.Options.Http | TTransport.Options.Ws
 
+    /** Maximum time for an RPC request in milliseconds. Set to 0 to disable. */
+    timeout?: number
+
     /** Preferred node for submitting transactions */
     safe?: boolean
     distinct?: boolean
@@ -748,7 +751,7 @@ export class ClientPool {
 
 export class WClient {
     lastStatus = 0;
-    lastDate = new Date(2000).getTime();
+    lastDate = 0;
 
     status: 'ok' | 'off' | 'ping' = 'ok'
 
@@ -780,7 +783,7 @@ export class WClient {
             return true;
         }
         let health = this.requests.fail / this.getRequestCount();
-        if (health > .5) {
+        if (health <= .5) {
             return true;
         }
         if (Date.now() - this.lastDate > $date.parseTimespan('10m')) {
@@ -969,11 +972,13 @@ export class WClient {
 
         let connectionError = await this.ensureConnected();
         if (connectionError) {
+            let time = Date.now() - now;
+            this.onComplete(ClientStatus.NetworkError, time);
             return {
                 status: ClientStatus.NetworkError,
                 result: null,
                 error: connectionError,
-                time: Date.now() - now
+                time
             };
         }
 
@@ -1025,11 +1030,13 @@ export class WClient {
         result.on('error', error => {
             if (ClientErrorUtil.isConnectionFailed(error)) {
                 this.lastStatus = ClientStatus.NetworkError;
+                this.lastDate = Date.now();
                 this.requests.fail++;
             }
         });
         result.on('transactionHash', hash => {
             this.lastStatus = ClientStatus.Ok;
+            this.lastDate = Date.now();
             this.requests.success++;
         })
         return result;
@@ -1039,11 +1046,13 @@ export class WClient {
         result.on('error', error => {
             if (ClientErrorUtil.isConnectionFailed(error)) {
                 this.lastStatus = ClientStatus.NetworkError;
+                this.lastDate = Date.now();
                 this.requests.fail++;
             }
         });
         result.on('transactionHash', hash => {
             this.lastStatus = ClientStatus.Ok;
+            this.lastDate = Date.now();
             this.requests.success++;
         })
         return result;
@@ -1065,6 +1074,7 @@ export class WClient {
         let ping = this.requests.ping;
 
         this.lastStatus = status;
+        this.lastDate = Date.now();
         switch (status) {
             case ClientStatus.Ok:
                 this.requests.success++;

package/src/clients/ClientPoolStats.ts

@@ -1,5 +1,5 @@
-import { TAddress } from '@dequanto/models/TAddress';
-import { $logger } from '@dequanto/utils/$logger';
+import { TAddress } from 'dequanto/models/TAddress';
+import { $logger } from 'dequanto/utils/$logger';
 import { ClientStatus } from './model/ClientStatus';
 
 

package/src/clients/EthWeb3Client.ts

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

package/src/clients/EvmWeb3Client.ts

@@ -1,9 +1,9 @@
-import { config } from '@dequanto/config/Config';
-import { $require } from '@dequanto/utils/$require';
+import { config } from 'dequanto/config/Config';
+import { $require } from 'dequanto/utils/$require';
 import { EthWeb3Client } from './EthWeb3Client'
 import { IWeb3EndpointOptions } from './interfaces/IWeb3EndpointOptions'
-import { ConfigDefaults } from '@dequanto/config/ConfigDefaults';
-import { $config } from '@dequanto/utils/$config';
+import { ConfigDefaults } from 'dequanto/config/ConfigDefaults';
+import { $config } from 'dequanto/utils/$config';
 
 
 export class EvmWeb3Client extends EthWeb3Client {

package/src/clients/PolyWeb3Client.ts

@@ -1,9 +1,9 @@
-import { $config } from '@dequanto/utils/$config';
+import { $config } from 'dequanto/utils/$config';
 import { Web3Client } from './Web3Client';
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { ClientEndpoints } from './utils/ClientEndpoints';
 import { IWeb3EndpointOptions } from './interfaces/IWeb3EndpointOptions';
-import { $bigint } from '@dequanto/utils/$bigint';
+import { $bigint } from 'dequanto/utils/$bigint';
 
 export class PolyWeb3Client extends Web3Client {
 

package/src/clients/WalletClient.ts

@@ -1,11 +1,11 @@
 import di from 'a-di';
-import { TEth } from '@dequanto/models/TEth';
-import { Rpc, RpcTypes } from '@dequanto/rpc/Rpc';
-import { $require } from '@dequanto/utils/$require';
-import { DataLike } from '@dequanto/utils/types';
-import { EIP6963ProviderDetail, EIP6963ProviderFactory } from '@dequanto/wallets/EIP6963ProviderFactory';
+import { TEth } from 'dequanto/models/TEth';
+import { Rpc, RpcTypes } from 'dequanto/rpc/Rpc';
+import { $require } from 'dequanto/utils/$require';
+import { DataLike } from 'dequanto/utils/types';
+import { EIP6963ProviderDetail, EIP6963ProviderFactory } from 'dequanto/wallets/EIP6963ProviderFactory';
 import { WClient } from './ClientPool';
-import { $hex } from '@dequanto/utils/$hex';
+import { $hex } from 'dequanto/utils/$hex';
 
 /** Wallet actions only. Use Web3Client for all node/chain-related actions */
 

package/src/clients/Web3BatchRequests.ts

@@ -1,9 +1,9 @@
-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 { $web3Abi } from './utils/$web3Abi';
-import { Rpc } from '@dequanto/rpc/Rpc';
-import { TEth } from '@dequanto/models/TEth';
-import { TRpc } from '@dequanto/rpc/RpcBase';
+import { Rpc } from 'dequanto/rpc/Rpc';
+import { TEth } from 'dequanto/models/TEth';
+import { TRpc } from 'dequanto/rpc/RpcBase';
 
 export namespace Web3BatchRequests {
 

package/src/clients/Web3Client.ts

@@ -1,39 +1,39 @@
 import di from 'a-di';
 import memd from 'memd';
 
-import type { TAbiItem } from '@dequanto/types/TAbi';
-import type { TPlatform } from '@dequanto/models/TPlatform';
+import type { TAbiItem } from 'dequanto/types/TAbi';
+import type { TPlatform } from 'dequanto/models/TPlatform';
 
 import type { IWeb3Client, IWeb3ClientOptions } from './interfaces/IWeb3Client';
 
 import { ClientPool, IRpcConfig, IPoolWeb3Request, WClient } from './ClientPool';
-import { BlockDateResolver } from '@dequanto/blocks/BlockDateResolver';
-import { $number } from '@dequanto/utils/$number';
+import { BlockDateResolver } from 'dequanto/blocks/BlockDateResolver';
+import { $number } from 'dequanto/utils/$number';
 
-import { $logger } from '@dequanto/utils/$logger';
+import { $logger } from 'dequanto/utils/$logger';
 import { ClientEventsStream } from './ClientEventsStream';
-import { $abiUtils } from '@dequanto/utils/$abiUtils';
+import { $abiUtils } from 'dequanto/utils/$abiUtils';
 import { ClientDebugMethods } from './debug/ClientDebugMethods';
-import { $require } from '@dequanto/utils/$require';
-import { $is } from '@dequanto/utils/$is';
-import { $hex } from '@dequanto/utils/$hex';
+import { $require } from 'dequanto/utils/$require';
+import { $is } from 'dequanto/utils/$is';
+import { $hex } from 'dequanto/utils/$hex';
 
-import { $bigint } from '@dequanto/utils/$bigint';
+import { $bigint } from 'dequanto/utils/$bigint';
 
-import { RpcContract, TRpcContractCall } from '@dequanto/rpc/RpcContract';
-import { RpcLogFilterOptions, RpcSubscription } from '@dequanto/rpc/RpcSubscription';
-import { TEth } from '@dequanto/models/TEth';
+import { RpcContract, TRpcContractCall } from 'dequanto/rpc/RpcContract';
+import { RpcLogFilterOptions, RpcSubscription } from 'dequanto/rpc/RpcSubscription';
+import { TEth } from 'dequanto/models/TEth';
 
-import { PromiseEvent } from '@dequanto/class/PromiseEvent';
-import { Rpc, RpcTypes } from '@dequanto/rpc/Rpc';
-import { TRpc } from '@dequanto/rpc/RpcBase';
-import { $sig } from '@dequanto/utils/$sig';
-import { DataLike } from '@dequanto/utils/types';
+import { PromiseEvent } from 'dequanto/class/PromiseEvent';
+import { Rpc, RpcTypes } from 'dequanto/rpc/Rpc';
+import { TRpc } from 'dequanto/rpc/RpcBase';
+import { $sig } from 'dequanto/utils/$sig';
+import { DataLike } from 'dequanto/utils/types';
 import { ErrorCode } from './ClientPoolStats';
-import { $date } from '@dequanto/utils/$date';
+import { $date } from 'dequanto/utils/$date';
 import { WalletClient } from './WalletClient';
 import alot from 'alot';
-import { $abiParser } from '@dequanto/utils/$abiParser';
+import { $abiParser } from 'dequanto/utils/$abiParser';
 
 export abstract class Web3Client implements IWeb3Client {
 
@@ -135,10 +135,9 @@ export abstract class Web3Client implements IWeb3Client {
                 method = abi[0].name;
             }
             return {
-                address: request.address,
+                ...request,
                 abi: abi,
                 method: method,
-                params: request.params,
                 blockNumber: blockNumber,
                 options: options
             } as TRpcContractCall;
@@ -791,7 +790,7 @@ namespace RangeWorker {
                 }
             };
         } catch (error) {
-            if (error.code === ErrorCode.NO_LIVE_CLIENT) {
+            if (error.code === ErrorCode.NO_LIVE_CLIENT || currentWClient == null) {
                 throw error;
             }
 
@@ -803,7 +802,7 @@ namespace RangeWorker {
             let matchCountLimit = /(?<count>\d+) results/.exec(error.message);
             if (matchCountLimit) {
                 let count = Number(matchCountLimit.groups.count);
-                let newRange = Math.floor(blockRange * 0.8);
+                let newRange = $require.gt(Math.floor(blockRange * 0.8), 0, `NewRange is 0`);
                 currentWClient.updateBlockRangeInfo({
                     blocks: newRange,
                     results: count,
@@ -825,7 +824,7 @@ namespace RangeWorker {
             }
             if (/\b(range|limit)\b/.test(error.message)) {
                 // Generic "block range is too wide" or "limit exceeded" error
-                let newRange = Math.floor(blockRange * 0.8);
+                let newRange = $require.gt(Math.floor(blockRange * 0.8), 0, `NewRange is 0`);
                 currentWClient.updateBlockRangeInfo({
                     blocks: newRange
                 });
@@ -852,7 +851,9 @@ namespace LogsFetcher {
             }) as RpcTypes.Log[];
             if (arr.length > 0 && arr.length % MAX_RESULTS === 0) {
                 $logger.log(`Too many results: ${arr.length} at block ${fromBlock} to ${toBlockExcluded}. Fetching sub-ranges.`);
+                let firstBlock = arr[0].blockNumber;
                 let lastBlock = arr[arr.length - 1].blockNumber;
+                $require.lt(firstBlock, lastBlock, `Single-block response would cause an infinite loop.`);
 
                 let { result } = await fetch (client, lastBlock, toBlockExcluded, blockRange, filter);
 

package/src/clients/Web3ClientFactory.ts

@@ -1,13 +1,13 @@
 import di from 'a-di';
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { IWeb3EndpointOptions } from './interfaces/IWeb3EndpointOptions';
-import { HardhatProvider } from '@dequanto/hardhat/HardhatProvider';
-import { Config } from '@dequanto/config/Config';
+import { HardhatProvider } from 'dequanto/hardhat/HardhatProvider';
+import { Config } from 'dequanto/config/Config';
 import { EvmWeb3Client } from './EvmWeb3Client';
-import { $require } from '@dequanto/utils/$require';
-import { $config } from '@dequanto/utils/$config';
-import type { HardhatWeb3Client } from '@dequanto/hardhat/HardhatWeb3Client';
-import { IConfigData } from '@dequanto/config/interface/IConfigData';
+import { $require } from 'dequanto/utils/$require';
+import { $config } from 'dequanto/utils/$config';
+import type { HardhatWeb3Client } from 'dequanto/hardhat/HardhatWeb3Client';
+import { IConfigData } from 'dequanto/config/interface/IConfigData';
 
 export namespace Web3ClientFactory {
 

package/src/clients/compatibility/Web3.ts

@@ -1,17 +1,17 @@
 import alot from 'alot';
-import { PromiseEvent } from '@dequanto/class/PromiseEvent';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TEth } from '@dequanto/models/TEth';
-import { RpcTypes } from '@dequanto/rpc/Rpc';
+import { PromiseEvent } from 'dequanto/class/PromiseEvent';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TEth } from 'dequanto/models/TEth';
+import { RpcTypes } from 'dequanto/rpc/Rpc';
 import { Web3Client } from '../Web3Client';
-import { TxWriter } from '@dequanto/txs/TxWriter';
-import { TxDataBuilder } from '@dequanto/txs/TxDataBuilder';
-import { EoAccount } from '@dequanto/models/TAccount';
-import { $address } from '@dequanto/utils/$address';
-import { $require } from '@dequanto/utils/$require';
-import { $abiUtils } from '@dequanto/utils/$abiUtils';
-import { $sig } from '@dequanto/utils/$sig';
-import { $abiCoder } from '@dequanto/abi/$abiCoder';
+import { TxWriter } from 'dequanto/txs/TxWriter';
+import { TxDataBuilder } from 'dequanto/txs/TxDataBuilder';
+import { EoAccount } from 'dequanto/models/TAccount';
+import { $address } from 'dequanto/utils/$address';
+import { $require } from 'dequanto/utils/$require';
+import { $abiUtils } from 'dequanto/utils/$abiUtils';
+import { $sig } from 'dequanto/utils/$sig';
+import { $abiCoder } from 'dequanto/abi/$abiCoder';
 
 export class Web3 {
     eth: Web3Eth

package/src/clients/debug/ClientDebugMethods.ts

@@ -1,13 +1,13 @@
-import { $bytecode } from '@dequanto/evm/utils/$bytecode';
+import { $bytecode } from 'dequanto/evm/utils/$bytecode';
 import type { IWeb3ClientOptions } from '../interfaces/IWeb3Client';
 import type { Web3Client } from '../Web3Client';
-import { TAddress } from '@dequanto/models/TAddress'
-import { $bigint } from '@dequanto/utils/$bigint';
-import { $hex } from '@dequanto/utils/$hex';
-import { TEth } from '@dequanto/models/TEth';
-import { $array } from '@dequanto/utils/$array';
-import { $date } from '@dequanto/utils/$date';
-import { $number } from '@dequanto/utils/$number';
+import { TAddress } from 'dequanto/models/TAddress'
+import { $bigint } from 'dequanto/utils/$bigint';
+import { $hex } from 'dequanto/utils/$hex';
+import { TEth } from 'dequanto/models/TEth';
+import { $array } from 'dequanto/utils/$array';
+import { $date } from 'dequanto/utils/$date';
+import { $number } from 'dequanto/utils/$number';
 
 
 export class ClientDebugMethods {

package/src/clients/handlers/RateLimitGuard.ts

@@ -1,6 +1,6 @@
-import { $date } from '@dequanto/utils/$date';
-import { l } from '@dequanto/utils/$logger';
-import { $promise } from '@dequanto/utils/$promise';
+import { $date } from 'dequanto/utils/$date';
+import { l } from 'dequanto/utils/$logger';
+import { $promise } from 'dequanto/utils/$promise';
 import alot from 'alot';
 import memd from 'memd';
 

package/src/clients/interfaces/IWeb3Client.ts

@@ -1,6 +1,6 @@
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { IRpcConfig } from '../ClientPool';
-import { TTransport } from '@dequanto/rpc/transports/ITransport';
+import { TTransport } from 'dequanto/rpc/transports/ITransport';
 
 export interface IWeb3Client {
     platform: string

package/src/clients/interfaces/IWeb3EndpointOptions.ts

@@ -1,6 +1,6 @@
-import { IConfigData } from '@dequanto/config/interface/IConfigData';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { TTransport } from '@dequanto/rpc/transports/ITransport';
+import { IConfigData } from 'dequanto/config/interface/IConfigData';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { TTransport } from 'dequanto/rpc/transports/ITransport';
 
 
 export interface IWeb3EndpointOptions {

package/src/clients/model/PromiEventWrap.ts

@@ -1,5 +1,5 @@
 
-import { PromiseEvent } from '@dequanto/class/PromiseEvent';
+import { PromiseEvent } from 'dequanto/class/PromiseEvent';
 import { class_Dfr, class_EventEmitter } from 'atma-utils';
 
 

package/src/clients/utils/$web3Abi.ts

@@ -1,5 +1,5 @@
-import { $abiParser } from '@dequanto/utils/$abiParser';
-import type { TAbiItem } from '@dequanto/types/TAbi';
+import { $abiParser } from 'dequanto/utils/$abiParser';
+import type { TAbiItem } from 'dequanto/types/TAbi';
 
 export namespace $web3Abi {
 

package/src/clients/utils/ClientErrorUtil.ts

@@ -1,4 +1,4 @@
-import { $require } from '@dequanto/utils/$require';
+import { $require } from 'dequanto/utils/$require';
 
 
 export namespace ClientErrorUtil {

package/src/config/AConfigBase.ts

@@ -1,7 +1,7 @@
-import { IRpcConfig } from '@dequanto/clients/ClientPool'
+import { IRpcConfig } from 'dequanto/clients/ClientPool'
 import { IConfigData } from './interface/IConfigData'
-import { TPlatform } from '@dequanto/models/TPlatform'
-import { TEth } from '@dequanto/models/TEth'
+import { TPlatform } from 'dequanto/models/TPlatform'
+import { TEth } from 'dequanto/models/TEth'
 
 type TConfigParamsBase = {
     config?: Partial<IConfigData>

package/src/config/ConfigProvider.ts

@@ -5,8 +5,8 @@ import { IConfigProvider, TConfigParamsNode } from './AConfigBase';
 import { IConfigData } from './interface/IConfigData';
 import { $cli } from '../utils/$cli';
 import { $secret } from '../utils/$secret';
-import { $require } from '@dequanto/utils/$require';
-import { is_BROWSER } from '@dequanto/utils/$const';
+import { $require } from 'dequanto/utils/$require';
+import { is_BROWSER } from 'dequanto/utils/$const';
 import { ConfigDefaults } from './ConfigDefaults';
 
 const DEFAULT_PATHS = {

package/src/config/DefaultFactory.ts

@@ -1,13 +1,19 @@
+import alot from 'alot';
 import { IConfigData } from './interface/IConfigData';
 
 export function DefaultFactory (config: IConfigData): IConfigData {
 
     if (typeof process !== 'undefined' && process.env != null) {
+        let urls = [] as { url: string, platform: string }[]
         for (let key in process.env) {
             if (key.startsWith('RPC_') === false) {
                 continue;
             }
-            const platform = key.replace('RPC_', '').toLowerCase();
+            let platform = key
+                .replace('RPC_', '')
+                .replace(/_(WSS|\d+)$/i, '')
+                .toLowerCase();
+
             if (platform in config.web3 === false) {
                 continue;
             }
@@ -16,9 +22,16 @@ export function DefaultFactory (config: IConfigData): IConfigData {
             if (/^(http|ws)/.test(url) === false) {
                 continue;
             }
-            config.web3[platform].endpoints = [
-                { url: url }
-            ];
+            urls.push({ url, platform });
+        }
+        if (urls.length > 0) {
+            const dict = alot(urls)
+                .groupBy(x => x.platform)
+                .toDictionary(x => x.key, x => x.values.map(item => ({ url: item.url })));
+
+            for (let platform in dict) {
+                config.web3[platform].endpoints = dict[platform];
+            }
         }
     }
 

package/src/config/interface/IConfigData.ts

@@ -1,10 +1,10 @@
-import { IContractDetails } from '@dequanto/models/IContractDetails';
-import { ITokenGlob } from '@dequanto/models/ITokenGlob';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { IRpcConfig } from '@dequanto/clients/ClientPool';
-import { TChain } from '@dequanto/models/TChain';
-import { TEth } from '@dequanto/models/TEth';
+import { IContractDetails } from 'dequanto/models/IContractDetails';
+import { ITokenGlob } from 'dequanto/models/ITokenGlob';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { IRpcConfig } from 'dequanto/clients/ClientPool';
+import { TChain } from 'dequanto/models/TChain';
+import { TEth } from 'dequanto/models/TEth';
 
 
 export interface IConfigData {

package/src/contracts/BscContract.ts

@@ -1,7 +1,7 @@
 import di from 'a-di'
-import { BscWeb3Client } from '@dequanto/clients/BscWeb3Client'
+import { BscWeb3Client } from 'dequanto/clients/BscWeb3Client'
 import { ContractReader } from './ContractReader'
-import { Bscscan } from '@dequanto/explorer/Bscscan'
+import { Bscscan } from 'dequanto/explorer/Bscscan'
 import { Contract, IContractInit } from './Contract'
 import { ContractProvider } from './ContractProvider'
 

package/src/contracts/Contract.ts

@@ -1,19 +1,19 @@
 import di from 'a-di'
 import alot from 'alot'
-import { IBlockchainExplorer } from '@dequanto/explorer/IBlockchainExplorer'
-import { IContractDetails } from '@dequanto/models/IContractDetails'
+import { IBlockchainExplorer } from 'dequanto/explorer/IBlockchainExplorer'
+import { IContractDetails } from 'dequanto/models/IContractDetails'
 import { ContractProvider, IContractProvider } from './ContractProvider'
 import { IContractReader } from './ContractReader'
 
-import { ITransactionDetails } from '@dequanto/models/ITransactionDetails'
-import { TxDataBuilder } from '@dequanto/txs/TxDataBuilder'
-import { TxWriter } from '@dequanto/txs/TxWriter'
-import { Web3Client } from '@dequanto/clients/Web3Client'
-import { EoAccount } from "@dequanto/models/TAccount"
-import { $is } from '@dequanto/utils/$is'
-import { $abiUtils } from '@dequanto/utils/$abiUtils'
-import { TAbiItem } from '@dequanto/types/TAbi'
-import { TEth } from '@dequanto/models/TEth'
+import { ITransactionDetails } from 'dequanto/models/ITransactionDetails'
+import { TxDataBuilder } from 'dequanto/txs/TxDataBuilder'
+import { TxWriter } from 'dequanto/txs/TxWriter'
+import { Web3Client } from 'dequanto/clients/Web3Client'
+import { EoAccount } from "dequanto/models/TAccount"
+import { $is } from 'dequanto/utils/$is'
+import { $abiUtils } from 'dequanto/utils/$abiUtils'
+import { TAbiItem } from 'dequanto/types/TAbi'
+import { TEth } from 'dequanto/models/TEth'
 
 export interface IContractInit {
     Ctor?:  new (...args) => any

package/src/contracts/ContractAbiProvider.ts

@@ -1,15 +1,15 @@
-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 { TAddress } from '@dequanto/models/TAddress';
+import { TAddress } from 'dequanto/models/TAddress';
 import { File } from 'atma-io';
 import { class_Uri } from 'atma-utils';
-import { $path } from '@dequanto/utils/$path';
-import { $logger } from '@dequanto/utils/$logger';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-import { $is } from '@dequanto/utils/$is';
+import { $path } from 'dequanto/utils/$path';
+import { $logger } from 'dequanto/utils/$logger';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { $is } from 'dequanto/utils/$is';
 
 
 export class ContractAbiProvider {