dequanto 0.2.51 → 0.2.52

package/src/txs/agents/TimelockAgent.ts

@@ -1,19 +1,19 @@
-import { EoAccount, TAccount, TimelockAccount } from '@dequanto/models/TAccount';
+import { EoAccount, TAccount, TimelockAccount } from 'dequanto/models/TAccount';
 import { ITxWriterAccountAgent } from './TxWriterAccountAgents';
-import { $account } from '@dequanto/utils/$account';
+import { $account } from 'dequanto/utils/$account';
 import { ITxWriterEmitter, ITxWriterEvents, ITxWriterTransaction, TxWriter } from '../TxWriter';
 
-import { ChainAccountService } from '@dequanto/ChainAccountService';
-import { $promise } from '@dequanto/utils/$promise';
+import { ChainAccountService } from 'dequanto/ChainAccountService';
+import { $promise } from 'dequanto/utils/$promise';
 import { class_Dfr, class_EventEmitter } from 'atma-utils';
-import { TEth } from '@dequanto/models/TEth';
-import { $require } from '@dequanto/utils/$require';
-import { $date } from '@dequanto/utils/$date';
-import { ITimelockTx } from '@dequanto/services/TimelockService/ITimelockService';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-
-import { TimelockService } from '@dequanto/services/TimelockService/TimelockService';
-import { TimelockControllerFactory } from '@dequanto/prebuilt-factories/TimelockControllerFactory';
+import { TEth } from 'dequanto/models/TEth';
+import { $require } from 'dequanto/utils/$require';
+import { $date } from 'dequanto/utils/$date';
+import { ITimelockTx } from 'dequanto/services/TimelockService/ITimelockService';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+
+import { TimelockService } from 'dequanto/services/TimelockService/TimelockService';
+import { TimelockControllerFactory } from 'dequanto/prebuilt-factories/TimelockControllerFactory';
 
 
 export class TimelockAgent implements ITxWriterAccountAgent {

package/src/txs/agents/TxWriterAccountAgents.ts

@@ -1,4 +1,4 @@
-import type { EoAccount, TAccount } from '@dequanto/models/TAccount';
+import type { EoAccount, TAccount } from 'dequanto/models/TAccount';
 import type { ITxWriterEmitter, TxWriter } from '../TxWriter';
 import { SafeAgent } from './SafeAgent';
 import { Erc4337Agent } from './Erc4337Agent';

package/src/txs/conditional/GasWatcherLogger.ts

@@ -1,6 +1,6 @@
-import { $bigint } from '@dequanto/utils/$bigint';
-import { $date } from '@dequanto/utils/$date';
-import { $logger } from '@dequanto/utils/$logger';
+import { $bigint } from 'dequanto/utils/$bigint';
+import { $date } from 'dequanto/utils/$date';
+import { $logger } from 'dequanto/utils/$logger';
 import { Everlog } from '@everlog/core';
 
 export class GasWatcherLogger {

package/src/txs/conditional/GasWatcherService.ts

@@ -1,10 +1,10 @@
 import alot from 'alot';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-import { $bigint } from '@dequanto/utils/$bigint';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { $bigint } from 'dequanto/utils/$bigint';
 import { GasWatcherLogger } from './GasWatcherLogger';
 import { GasWatcherStore, IGasWatcherStore } from './GasWatcherStore';
 import { GasWatcherTx, IGasWatcherCondition } from './GasWatcherTx';
-import { IAccount } from '@dequanto/models/TAccount';
+import { IAccount } from 'dequanto/models/TAccount';
 import type { TxWriter } from '../TxWriter';
 
 

package/src/txs/conditional/GasWatcherStore.ts

@@ -1,4 +1,4 @@
-import { JsonObjectStore } from '@dequanto/json/JsonObjectStore';
+import { JsonObjectStore } from 'dequanto/json/JsonObjectStore';
 import { TTxWriterJson } from '../TxWriter';
 import { GasWatcherTx, IGasWatcherCondition } from './GasWatcherTx';
 

package/src/txs/conditional/GasWatcherTx.ts

@@ -1,5 +1,5 @@
-import { $bigint } from '@dequanto/utils/$bigint';
-import { $logger } from '@dequanto/utils/$logger';
+import { $bigint } from 'dequanto/utils/$bigint';
+import { $logger } from 'dequanto/utils/$logger';
 import { TTxWriterJson, TxWriter } from '../TxWriter';
 import { GasWatcherLogger } from './GasWatcherLogger';
 

package/src/txs/receipt/ITxLogItem.ts

@@ -1,6 +1,6 @@
-import { TAddress } from '@dequanto/models/TAddress';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { type TAbiItem } from '@dequanto/types/TAbi';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { type TAbiItem } from 'dequanto/types/TAbi';
 
 export interface ITxLogItem<TParams = { [name: string]: any }, TEventName = string> {
     // The overall unique Log ID based on blockNumber and logIndex

package/src/txs/receipt/TxLogParser.ts

@@ -1,10 +1,10 @@
 import alot from 'alot';
-import type { TAbiItem } from '@dequanto/types/TAbi';
-import { $contract } from '@dequanto/utils/$contract';
+import type { TAbiItem } from 'dequanto/types/TAbi';
+import { $contract } from 'dequanto/utils/$contract';
 import { TxTopicProvider } from './TxTopicProvider';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { TEth } from '@dequanto/models/TEth';
-import { $require } from '@dequanto/utils/$require';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { TEth } from 'dequanto/models/TEth';
+import { $require } from 'dequanto/utils/$require';
 import { ITxLogItem } from './ITxLogItem';
 
 export class TxLogParser {

package/src/txs/receipt/TxLogsTransfer.ts

@@ -1,10 +1,10 @@
 import alot from 'alot';
-import { TPlatform } from '@dequanto/models/TPlatform';
+import { TPlatform } from 'dequanto/models/TPlatform';
 import { TxWriter } from '../TxWriter';
 import { IKnownLogFormatter, ITxLogItem } from './ITxLogItem';
-import { IToken } from '@dequanto/models/IToken';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TokenDataProvider } from '@dequanto/tokens/TokenDataProvider';
+import { IToken } from 'dequanto/models/IToken';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TokenDataProvider } from 'dequanto/tokens/TokenDataProvider';
 
 export interface ITxLogsTransferData {
     event: string

package/src/txs/receipt/TxTopicInMemoryProvider.ts

@@ -1,6 +1,6 @@
-import { $abiParser } from '@dequanto/utils/$abiParser';
-import { $abiUtils } from '@dequanto/utils/$abiUtils';
-import { type TAbiItem } from '@dequanto/types/TAbi';
+import { $abiParser } from 'dequanto/utils/$abiParser';
+import { $abiUtils } from 'dequanto/utils/$abiUtils';
+import { type TAbiItem } from 'dequanto/types/TAbi';
 import { IAbiItemFormattable, IKnownLogFormatter, ITxLogItemDescriptor } from './ITxLogItem';
 
 

package/src/txs/receipt/TxTopicProvider.ts

@@ -1,5 +1,5 @@
 import di from 'a-di';
-import { type TAbiItem } from '@dequanto/types/TAbi';
+import { type TAbiItem } from 'dequanto/types/TAbi';
 import { IAbiItemFormattable, ITxLogItemDescriptor } from './ITxLogItem';
 import { TxLogsTransfer } from './TxLogsTransfer';
 import { TxTopicInMemoryProvider } from './TxTopicInMemoryProvider';

package/src/txs/sig-transports/SigFileTransport.ts

@@ -1,9 +1,9 @@
-import { $logger } from '@dequanto/utils/$logger';
-import { $txData } from '@dequanto/utils/$txData';
+import { $logger } from 'dequanto/utils/$logger';
+import { $txData } from 'dequanto/utils/$txData';
 import { File } from 'atma-io'
 import { TxDataBuilder } from '../TxDataBuilder'
-import { $sig } from '@dequanto/utils/$sig';
-import { TEth } from '@dequanto/models/TEth';
+import { $sig } from 'dequanto/utils/$sig';
+import { TEth } from 'dequanto/models/TEth';
 export class SigFileTransport {
 
     async create (path: string, txBuilder: TxDataBuilder, params: { wait: boolean }): Promise<{ path: string, signed?: TEth.Hex }> {

package/src/utils/$abiParser.ts

@@ -1,6 +1,6 @@
-import type { TAbiItem, TAbiInput, TAbiOutput } from '@dequanto/types/TAbi';
+import type { TAbiItem, TAbiInput, TAbiOutput } from 'dequanto/types/TAbi';
 import { $require } from './$require';
-import { $str } from '@dequanto/solidity/utils/$str';
+import { $str } from 'dequanto/solidity/utils/$str';
 
 interface IParameter {
     name?: string

package/src/utils/$abiProvider.ts

@@ -1,7 +1,7 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $contract } from './$contract';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { BlockchainExplorerFactory } from '@dequanto/explorer/BlockchainExplorerFactory';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { BlockchainExplorerFactory } from 'dequanto/explorer/BlockchainExplorerFactory';
 import { l } from './$logger';
 
 export namespace $abiProvider {

package/src/utils/$abiType.ts

@@ -1,6 +1,6 @@
-import { $types } from '@dequanto/solidity/utils/$types';
+import { $types } from 'dequanto/solidity/utils/$types';
 import alot from 'alot';
-import { type TAbiInput } from '@dequanto/types/TAbi';
+import { type TAbiInput } from 'dequanto/types/TAbi';
 import { $require } from './$require';
 export namespace $abiType {
 

package/src/utils/$abiUtils.ts

@@ -1,15 +1,15 @@
-import type { TAbiItem, TAbiInput } from '@dequanto/types/TAbi';
+import type { TAbiItem, TAbiInput } from 'dequanto/types/TAbi';
 
 import { $is } from './$is';
 import { $hex } from './$hex';
-import { $str } from '@dequanto/solidity/utils/$str';
-import { $types } from '@dequanto/solidity/utils/$types';
+import { $str } from 'dequanto/solidity/utils/$str';
+import { $types } from 'dequanto/solidity/utils/$types';
 import { $abiType } from './$abiType';
 import { $contract } from './$contract';
 import { $abiParser } from './$abiParser';
-import { ParamType } from '@dequanto/abi/fragments';
-import { $abiCoder } from '@dequanto/abi/$abiCoder';
-import { TEth } from '@dequanto/models/TEth';
+import { ParamType } from 'dequanto/abi/fragments';
+import { $abiCoder } from 'dequanto/abi/$abiCoder';
+import { TEth } from 'dequanto/models/TEth';
 import alot from 'alot';
 
 export namespace $abiUtils {

package/src/utils/$account.ts

@@ -1,4 +1,4 @@
-import { EoAccount, Erc4337Account, SafeAccount, TAccount, TimelockAccount } from "@dequanto/models/TAccount";
+import { EoAccount, Erc4337Account, SafeAccount, TAccount, TimelockAccount } from "dequanto/models/TAccount";
 import { $address } from './$address';
 import { $require } from './$require';
 import { $sig } from './$sig';

package/src/utils/$address.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $hex } from './$hex';
 import { $contract } from './$contract';
 import { $buffer } from './$buffer';

package/src/utils/$base.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $hex } from './$hex';
 import { $buffer } from './$buffer';
 

package/src/utils/$bigint.ts

@@ -1,7 +1,7 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $buffer } from './$buffer';
 import { $require } from './$require';
-import { $is } from '@dequanto/utils/$is';
+import { $is } from 'dequanto/utils/$is';
 
 export namespace $bigint {
 

package/src/utils/$block.ts

@@ -1,6 +1,6 @@
 import di from 'a-di';
-import { BlockDateResolver } from '@dequanto/blocks/BlockDateResolver';
-import type { Web3Client } from '@dequanto/clients/Web3Client';
+import { BlockDateResolver } from 'dequanto/blocks/BlockDateResolver';
+import type { Web3Client } from 'dequanto/clients/Web3Client';
 
 export namespace $block {
     export function getDate(block: { timestamp: string | number }) {

package/src/utils/$buffer.ts

@@ -1,5 +1,5 @@
 import { is_NODE } from 'atma-utils';
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 
 
 interface IBufferUtils {

package/src/utils/$config.ts

@@ -1,12 +1,12 @@
 import alot from 'alot';
 import { obj_getProperty, obj_setProperty } from 'atma-utils';
-import { config } from '@dequanto/config/Config';
-import { ConfigDefaults } from '@dequanto/config/ConfigDefaults';
-import { IConfigData } from '@dequanto/config/interface/IConfigData';
-import { TEth } from '@dequanto/models/TEth';
+import { config } from 'dequanto/config/Config';
+import { ConfigDefaults } from 'dequanto/config/ConfigDefaults';
+import { IConfigData } from 'dequanto/config/interface/IConfigData';
+import { TEth } from 'dequanto/models/TEth';
 import { $require } from './$require';
-import { IWeb3ClientOptions } from '@dequanto/clients/interfaces/IWeb3Client';
-import { TExplorerDefinition } from '@dequanto/models/TExplorer';
+import { IWeb3ClientOptions } from 'dequanto/clients/interfaces/IWeb3Client';
+import { TExplorerDefinition } from 'dequanto/models/TExplorer';
 
 const $global = typeof global === 'undefined'
     ? window

package/src/utils/$contract.ts

@@ -1,21 +1,21 @@
 import alot from 'alot';
 import { keccak_256 } from '@noble/hashes/sha3';
 
-import type { TAbiItem } from '@dequanto/types/TAbi';
+import type { TAbiItem } from 'dequanto/types/TAbi';
 
-import { ITxLogItem } from '@dequanto/txs/receipt/ITxLogItem';
-import { TBufferLike } from '@dequanto/models/TBufferLike';
+import { ITxLogItem } from 'dequanto/txs/receipt/ITxLogItem';
+import { TBufferLike } from 'dequanto/models/TBufferLike';
 
 import { $abiUtils } from './$abiUtils';
 import { $abiParser } from './$abiParser';
 import { $require } from './$require';
 import { $buffer } from './$buffer';
-import { TEth } from '@dequanto/models/TEth';
-import { $abiCoder } from '@dequanto/abi/$abiCoder';
+import { TEth } from 'dequanto/models/TEth';
+import { $abiCoder } from 'dequanto/abi/$abiCoder';
 import { $logger } from './$logger';
 
-import { EvmBytecode } from '@dequanto/evm/EvmBytecode';
-import { $bytecode } from '@dequanto/evm/utils/$bytecode';
+import { EvmBytecode } from 'dequanto/evm/EvmBytecode';
+import { $bytecode } from 'dequanto/evm/utils/$bytecode';
 import { $hex } from './$hex';
 import { $is } from './$is';
 

package/src/utils/$crypto.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $buffer } from './$buffer';
 import { $require } from './$require';
 import { $is } from './$is';

package/src/utils/$date.ts

@@ -360,6 +360,26 @@ export namespace $date {
         return new Date(Y, M - 1, D, H, Min);
     }
 
+    export type TTimespanType = 'ms'
+        | 's'
+        | 'sec'
+        | 'seconds'
+        | 'm'
+        | 'min'
+        | 'mins'
+        | 'h'
+        | 'hour'
+        | 'hours'
+        | 'd'
+        | 'day'
+        | 'days'
+        | 'w'
+        | 'week'
+        | 'weeks'
+        | 'month'
+        | 'months'
+        | 'y'
+        | 'years';
     /**
      * s|sec|seconds|m|mins?|h|hours?|d|days?|w|weeks?|months?|y|years?
      * e.g: 2h

package/src/utils/$erc20.ts

@@ -2,9 +2,9 @@ import alot from 'alot';
 import { $require } from './$require';
 import { $hex } from './$hex';
 import { $bigint } from './$bigint';
-import { TEth } from '@dequanto/models/TEth';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
+import { TEth } from 'dequanto/models/TEth';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { ERC20 } from 'dequanto/prebuilt/openzeppelin/ERC20';
 
 export namespace $erc20 {
     export async function setBalanceAny(client: Web3Client, token: TEth.Address, account: TEth.Address, amount: bigint | number) {

package/src/utils/$gas.ts

@@ -1,5 +1,5 @@
-import { TEth } from '@dequanto/models/TEth';
-import { $bigint } from '@dequanto/utils/$bigint';
+import { TEth } from 'dequanto/models/TEth';
+import { $bigint } from 'dequanto/utils/$bigint';
 
 
 export namespace $gas {

package/src/utils/$hex.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $buffer } from './$buffer';
 import { $require } from './$require';
 export namespace $hex {

package/src/utils/$is.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 
 const $Array = Array;
 

package/src/utils/$number.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $require } from './$require';
 import { $bigint } from './$bigint';
 

package/src/utils/$promise.ts

@@ -1,9 +1,13 @@
-import { TError } from '@dequanto/models/TError';
+import { TError } from 'dequanto/models/TError';
 import { class_EventEmitter } from 'atma-utils';
 import { TFnWithCallback } from './types';
+import { $date } from './$date';
 
 export namespace $promise {
-    export function wait (ms) {
+    export function wait (mix: number | `${number}${$date.TTimespanType}`) {
+        const ms = typeof mix === 'string'
+            ? $date.parseTimespan(mix)
+            : mix;
         return new Promise(resolve => {
             setTimeout(resolve, ms);
         });

package/src/utils/$ref.ts

@@ -1,9 +1,7 @@
-
-import { IEIP6963Provider } from '@dequanto/rpc/transports/compatibility/IEIP6963Provider';
+import { IEIP6963Provider } from 'dequanto/rpc/transports/compatibility/IEIP6963Provider';
 import { class_EventEmitter } from 'atma-utils';
 
 
-
 export type TGlobal = {
     ethereum: IEIP6963Provider;
     addEventListener: Window['addEventListener'] //(event: string, listener: Function, options?: boolean | AddEventListenerOptions): void;
@@ -22,22 +20,29 @@ export namespace $ref {
             const g = window as any as TGlobal;
             return g;
         }
-        if (typeof global !== 'undefined' && typeof global  === 'object') {
+        if (typeof global !== 'undefined' && typeof global === 'object') {
             const g = global as any as TGlobal;
 
-            if (typeof g.addEventListener !== 'function' || typeof g.dispatchEvent !== 'function') {
+            if (typeof g.addEventListener !== 'function' || typeof g.removeEventListener !== 'function' || typeof g.dispatchEvent !== 'function') {
                 const emitter = new class_EventEmitter;
                 g.addEventListener = function (event: string, fn: (event) => any) {
                     emitter.on(event, fn);
                 };
+                g.removeEventListener = function (event: string, fn: (event) => any) {
+                    emitter.off(event, fn);
+                };
                 g.dispatchEvent = function (event: CustomEvent) {
                     emitter.emit(event.type, event);
                 };
             }
             if (typeof g.CustomEvent === 'undefined') {
                 g.CustomEvent = <any> class CustomEvent {
-                    constructor (public data) {
+                    public type: string;
+                    public detail: any;
 
+                    constructor (type: string, eventInitDict?: CustomEventInit) {
+                        this.type = type;
+                        this.detail = eventInitDict?.detail;
                     }
                 };
             }

package/src/utils/$require.ts

@@ -1,8 +1,8 @@
-import { IToken } from '@dequanto/models/IToken';
-import { TAddress } from '@dequanto/models/TAddress';
+import { IToken } from 'dequanto/models/IToken';
+import { TAddress } from 'dequanto/models/TAddress';
 import { $is } from './$is';
 import { $address } from './$address';
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 
 const $Array = Array;
 export namespace $require {

package/src/utils/$sig.ts

@@ -1,21 +1,21 @@
 import { secp256k1 } from '@noble/curves/secp256k1'
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $buffer } from './$buffer';
 import { $contract } from './$contract';
 import { $is } from './$is';
 import { $hex } from './$hex';
 import { $address } from './$address';
 import { $signSerializer } from './$signSerializer';
-import { $rlp } from '@dequanto/abi/$rlp';
+import { $rlp } from 'dequanto/abi/$rlp';
 import { $require } from './$require';
-import type { Web3Client } from '@dequanto/clients/Web3Client';
-import type { Rpc, RpcTypes } from '@dequanto/rpc/Rpc';
+import type { Web3Client } from 'dequanto/clients/Web3Client';
+import type { Rpc, RpcTypes } from 'dequanto/rpc/Rpc';
 import { $crypto } from './$crypto';
 import { $config } from './$config';
 import { HDKey } from '@scure/bip32'
 import { mnemonicToSeedSync } from '@scure/bip39'
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { EoAccount } from '@dequanto/models/TAccount';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { EoAccount } from 'dequanto/models/TAccount';
 
 
 export namespace $sig {

package/src/utils/$signSerializer.ts

@@ -1,8 +1,8 @@
 import { $buffer } from './$buffer';
 import { $bigint } from './$bigint';
-import { $abiCoder } from '@dequanto/abi/$abiCoder';
+import { $abiCoder } from 'dequanto/abi/$abiCoder';
 import { $contract } from './$contract';
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $is } from './$is';
 
 export namespace $signSerializer {

package/src/utils/$traces.ts

@@ -1,9 +1,9 @@
-import { $abiCoder } from '@dequanto/abi/$abiCoder';
-import { TClientDebugTraces } from '@dequanto/clients/debug/ClientDebugMethods';
-import { TEth } from '@dequanto/models/TEth';
+import { $abiCoder } from 'dequanto/abi/$abiCoder';
+import { TClientDebugTraces } from 'dequanto/clients/debug/ClientDebugMethods';
+import { TEth } from 'dequanto/models/TEth';
 import { $abiUtils } from './$abiUtils';
 import { $bigint } from './$bigint';
-import { $hex } from '@dequanto/utils/$hex';
+import { $hex } from 'dequanto/utils/$hex';
 import { $color, ColorData } from './$color';
 import alot from 'alot';
 import { $contract } from './$contract';

package/src/utils/$txData.ts

@@ -1,4 +1,4 @@
-import { TEth } from '@dequanto/models/TEth';
+import { TEth } from 'dequanto/models/TEth';
 import { $bigint } from './$bigint';
 
 export namespace $txData {

package/src/utils/types.ts

@@ -1,6 +1,6 @@
-import { IAccount } from '@dequanto/models/TAccount';
-import { TEth } from '@dequanto/models/TEth';
-import { TxWriter } from '@dequanto/txs/TxWriter';
+import { IAccount } from 'dequanto/models/TAccount';
+import { TEth } from 'dequanto/models/TEth';
+import { TxWriter } from 'dequanto/txs/TxWriter';
 
 type NoneMethodKeys<T> = {
     [P in keyof T]: T[P] extends ((...args) => any) ? never : P;

package/src/wallets/EIP6963ProviderFactory.ts

@@ -1,11 +1,11 @@
 import alot from 'alot';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TEth } from '@dequanto/models/TEth';
-import { $address } from '@dequanto/utils/$address';
-import { $ref, TGlobal } from '@dequanto/utils/$ref';
-import { $require } from '@dequanto/utils/$require';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TEth } from 'dequanto/models/TEth';
+import { $address } from 'dequanto/utils/$address';
+import { $ref, TGlobal } from 'dequanto/utils/$ref';
+import { $require } from 'dequanto/utils/$require';
 import { class_EventEmitter } from 'atma-utils';
-import { IEIP6963Provider } from '@dequanto/rpc/transports/compatibility/IEIP6963Provider';
+import { IEIP6963Provider } from 'dequanto/rpc/transports/compatibility/IEIP6963Provider';
 
 // Interface for provider information following EIP-6963
 interface EIP6963ProviderInfo {
@@ -175,7 +175,7 @@ export class EIP6963ProviderFactory extends class_EventEmitter<IProviderEvents>
         if (id == null) {
             return this.providers[0];
         }
-        let provider = this.providers.find(x => this.getId(x.info) === id);
+        let provider = this.providers.find(x => this.matchesId(x.info, id));
         return provider;
     }
     getProvider (id?: string, optional?: boolean) {
@@ -183,13 +183,19 @@ export class EIP6963ProviderFactory extends class_EventEmitter<IProviderEvents>
             optional !== true && $require.notNull(this.selected, `Wallet is not connected`);
             return this.selected;
         }
-        let provider = this.providers.find(x => this.getId(x.info) === id);
+        let provider = this.providers.find(x => this.matchesId(x.info, id));
         optional !== true && $require.notNull(provider, `Wallet is not found by ID ${id}`);
         return provider;
     }
 
     private getId (info: EIP6963ProviderInfo | null) {
-        return info?.rdns ?? info?.name;
+        return info?.uuid ?? info?.rdns ?? info?.name;
+    }
+
+    private matchesId (info: EIP6963ProviderInfo | null, id: string) {
+        return info?.uuid === id
+            || info?.rdns === id
+            || info?.name === id;
     }
 
     private addEventListeners (providerDetails: EIP6963ProviderDetail) {

package/src/wallets/Signer.ts

@@ -1,5 +1,5 @@
-import { TEth } from '@dequanto/models/TEth';
-import { Rpc, RpcTypes } from '@dequanto/rpc/Rpc';
+import { TEth } from 'dequanto/models/TEth';
+import { Rpc, RpcTypes } from 'dequanto/rpc/Rpc';
 
 
 export class Signer implements TEth.IRpcSigner {

package/src/wallets/Wallet.ts

@@ -1,10 +1,10 @@
 import di from 'a-di';
-import { IBlockchainExplorer } from '@dequanto/explorer/IBlockchainExplorer';
-import { Web3Client } from '@dequanto/clients/Web3Client';
-import { TAddress } from '@dequanto/models/TAddress';
-import { TokensService } from '@dequanto/tokens/TokensService';
-import { TPlatform } from '@dequanto/models/TPlatform';
-import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
+import { IBlockchainExplorer } from 'dequanto/explorer/IBlockchainExplorer';
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { TAddress } from 'dequanto/models/TAddress';
+import { TokensService } from 'dequanto/tokens/TokensService';
+import { TPlatform } from 'dequanto/models/TPlatform';
+import { ERC20 } from 'dequanto/prebuilt/openzeppelin/ERC20';
 
 export class Wallet {