dequanto 0.1.22 → 0.1.24

package/lib/{esm → types}/ns/providers/EnsProvider.d.ts

@@ -1,6 +1,6 @@
 import { TAddress } from '../../models/TAddress';
-import type { EnsPublicResolver } from '@dequanto-contracts/ens/EnsPublicResolver/EnsPublicResolver';
-import type { EnsRegistry } from '@dequanto-contracts/ens/EnsRegistry/EnsRegistry';
+import type { EnsPublicResolver } from '../../prebuilt/ens/EnsPublicResolver/EnsPublicResolver';
+import type { EnsRegistry } from '../../prebuilt/ens/EnsRegistry/EnsRegistry';
 import { TEth } from '../../models/TEth';
 import { Web3Client } from '../../clients/Web3Client';
 import { TPlatform } from '../../models/TPlatform';

package/lib/{cjs → types}/services/TimelockService/TimelockService.d.ts

@@ -1,4 +1,4 @@
-import { TimelockController } from '@dequanto-contracts/openzeppelin/TimelockController';
+import { TimelockController } from '../../prebuilt/openzeppelin/TimelockController';
 import { ContractBase } from '../../contracts/ContractBase';
 import { IAccount } from '../../models/TAccount';
 import { TEth } from '../../models/TEth';

package/lib/{cjs → types}/tokens/TokenExchanges/AmmV2ExchangeBase.d.ts

@@ -3,10 +3,10 @@ import { Web3Client } from '../../clients/Web3Client';
 import { JsonArrayStore } from '../../json/JsonArrayStore';
 import { IToken } from '../../models/IToken';
 import { TAddress } from '../../models/TAddress';
-import { AmmFactoryV2Contract } from '@dequanto-contracts/amm/AmmFactoryV2Contract/AmmFactoryV2Contract';
-import { AmmMasterChefV2Contract } from '@dequanto-contracts/amm/AmmMasterChefV2Contract/AmmMasterChefV2Contract';
-import { AmmVaultV2Contract } from '@dequanto-contracts/amm/AmmVaultV2Contract/AmmVaultV2Contract';
-import { AmmPairV2Contract } from '@dequanto-contracts/amm/AmmPairV2Contract/AmmPairV2Contract';
+import { AmmFactoryV2Contract } from '../../prebuilt/amm/AmmFactoryV2Contract/AmmFactoryV2Contract';
+import { AmmMasterChefV2Contract } from '../../prebuilt/amm/AmmMasterChefV2Contract/AmmMasterChefV2Contract';
+import { AmmVaultV2Contract } from '../../prebuilt/amm/AmmVaultV2Contract/AmmVaultV2Contract';
+import { AmmPairV2Contract } from '../../prebuilt/amm/AmmPairV2Contract/AmmPairV2Contract';
 interface ILPPair extends IToken {
     token0: IToken;
     token1: IToken;

package/lib/{cjs → types}/tokens/TokensService.d.ts

@@ -4,7 +4,7 @@ import { TPlatform } from '../models/TPlatform';
 import { IToken } from '../models/IToken';
 import { ITokenProvider } from './TokenProviders/ITokenProvider';
 import { TokenDataProvider } from './TokenDataProvider';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '../prebuilt/openzeppelin/ERC20';
 export declare class TokensService {
     private platform;
     private explorer?;

package/lib/{esm → types}/tokens/TokensServiceBsc.d.ts

@@ -1,6 +1,6 @@
 import { TokensService } from './TokensService';
 import { TAddress } from '../models/TAddress';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '../prebuilt/openzeppelin/ERC20';
 export declare class TokensServiceBsc extends TokensService {
     constructor();
     static erc20(address: TAddress): Promise<ERC20>;

package/lib/{cjs → types}/tokens/TokensServicePolygon.d.ts

@@ -1,6 +1,6 @@
 import { TokensService } from './TokensService';
 import { TAddress } from '../models/TAddress';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '../prebuilt/openzeppelin/ERC20';
 export declare class TokensServicePolygon extends TokensService {
     constructor();
     static erc20(address: TAddress): Promise<ERC20>;

package/lib/{cjs → types}/tokens/TokensServiceXDai.d.ts

@@ -2,7 +2,7 @@ import { TokensService } from './TokensService';
 import { TAddress } from '../models/TAddress';
 import { IToken } from '../models/IToken';
 import { ITokenProvider } from './TokenProviders/ITokenProvider';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '../prebuilt/openzeppelin/ERC20';
 export declare class TokensServiceXDai extends TokensService {
     constructor();
     static erc20(address: TAddress): Promise<ERC20>;

package/lib/types/utils/$regexp.d.ts

@@ -0,0 +1,3 @@
+export declare namespace $regexp {
+    function matches(str: string, regexp: RegExp): RegExpExecArray[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dequanto",
-    "version": "0.1.22",
+    "version": "0.1.24",
     "author": {
         "name": "Alex Kit",
         "email": "alex.kit@atmajs.com"
@@ -12,6 +12,7 @@
     "exports": {
         "./*": {
             "import": "./lib/esm/*.mjs",
+            "types": "./lib/types/*.d.ts",
             "require": "./lib/cjs/*.js"
         }
     },
@@ -22,6 +23,7 @@
         "build-cjs": "app-bundler --app cjs",
         "build-esm": "app-bundler --app esm",
         "build-types": "tsc -p tsconfig-src.json && atma run tools/copy-dts",
+        "create-config": "atma run ./tools/copy-config.ts",
         "watch": "app-bundler --watch",
         "server": "atma server --TEST",
         "test": "atma --openssl-legacy-provider test --config='settings.base=./' --TEST",
@@ -59,12 +61,12 @@
         "@scure/bip39": "^1.2.1",
         "@solidity-parser/parser": "^0.16.0",
         "a-di": "^1.0.29",
-        "alot": "^0.3.11",
+        "alot": "^0.3.12",
         "appcfg": "^0.5.4",
         "atma-io": "^1.3.4",
         "atma-utils": "^0.2.65",
         "class-json": "^0.4.1",
-        "includejs": "^0.17.4",
+        "includejs": "^0.17.6",
         "memd": "^0.3.15",
         "ws": "^8.16.0"
     },

package/readme.md

@@ -2,51 +2,56 @@
 
 [![Documentation Link](https://img.shields.io/badge/%E2%9D%93-documentation-green.svg)](https://docs.0xweb.org/dequanto)
 [![CircleCI](https://circleci.com/gh/0xweb-org/dequanto.svg?style=svg)](https://circleci.com/gh/0xweb-org/dequanto)
+[![NPM version](https://badge.fury.io/js/dequanto.svg)](http://badge.fury.io/js/dequanto)
 
 <p align='center'>
     <img src='assets/background.jpg'/>
 </p>
 
 
-A versatile library for EVM Blockchain Developers and Consumers. Based on your requirements and expertise, this library can either fully abstract the Blockchain Layer with autogenerated classes for contract communication or give you direct access to low-level methods.
+A flexible and all-in-one library for EVM Blockchain Developers and Consumers. Based on your requirements and expertise, this library can either fully abstract the Blockchain Layer with autogenerated classes for contract communication or give you direct access to low-level methods.
 
 This library includes numerous classes to cover all facets of blockchain development. Here’s a summary of some key features:
 
-### TypeScript and ES6 Class Generation
+### ✨ Generate ES6 classes with TypeScript support
 
-Generate contract clients based on ABI or source code, which can be automatically retrieved from blockchain explorers by address.
+Create contract clients based on ABI or source code, which can be automatically retrieved from blockchain explorers by address.
 
 > This can serve as an all-in-one tool for submitting transactions, querying contracts, or fetching events, as the contract clients handle the underlying steps.
 
 ---
 
-### RPC Clients
+### 🌐 RPC Clients
 
-A robust communication layer to connect to blockchain nodes. You can add multiple nodes (private or public) to the pool to manage **request balancing**, **throttling**, **rate limits**, and **automatic retries**.
+A robust communication layer to connect to blockchain nodes. You can add multiple nodes (private or public) to the pool to manage
 
-### Transaction Builder
+- **request balancing**
+- **throttling**
+- **rate limits**
+- **automatic retries**
 
-Provides fine-tuning for transaction submission. Supports Gnosis {Safe} and Account Abstraction Transactions.
+### 🏗️ Transaction Builder
 
-### Etherscan & Co Clients
+Provides fine-tuning for transaction submission. Supports Gnosis {Safe}, Account Abstraction Transactions and Flashbots.
+
+### 💠 Etherscan & Co Clients
 
 An integrated API for blockchain explorers.
 
-### Event Indexer
+### 🔎 Event Indexer
 
-An easy-to-use indexer for fetching contract events.
+An easy-to-use indexer for fetching contract events with file persistence layer and pause-resume progress.
 
-### Event and Transaction Watcher
+### 👀 Event and Transaction Watcher
 
 Listen to events and monitor transactions in real-time.
 
-### Native **`BigInt`** Types with **`BigFloat`** Support for Mantissa Math
+### 🔢 Native **`BigInt`** Types with **`BigFloat`** Support for Mantissa Math
 
-### Pre-generated OpenZeppelin Contracts
+### 📦 Pre-generated OpenZeppelin Contracts
 
-### Flashbots Support
 
-## Installation
+## ⬇️ Installation
 
 ### Using 0xweb CLI
 
@@ -62,26 +67,17 @@ npm i dequanto
 
 The package includes three types of source files:
 
-1. **TypeScript Sources**: Configure paths in your `tsconfig.json` like so:
+1. **Compiled CommonJS (CJS) Files**: Located at `node_modules/dequanto/lib/cjs/*/**.js`
+2. **Compiled ESM (Modules)**: Located at `node_modules/dequanto/lib/esm/*/**.mjs`
+3. **TypeScript Sources**: Located at `node_modules/dequanto/src/*/**.ts`
 
-   ```json
-   {
-       "compilerOptions": {
-           "paths": {
-               "@dequanto/*": [ "node_modules/dequanto/src/*" ],
-               "@dequanto-contract/*": [ "node_modules/dequanto/src/prebuilt/*" ]
-           }
-       }
-   }
-   ```
+Node and Build environments will automatically detect between 1 and 2 based on your project setup.
 
-2. **Compiled CommonJS (CJS) Files**: Located at `node_modules/dequanto/lib/cjs/*/**.js`
-3. **Compiled ESM (Modules)**: Located at `node_modules/dequanto/lib/esm/*/**.mjs`
 
-### Configuration
+### 🛠️ Configuration
 
 While the library includes configurations for various blockchains and {Safe} infrastructure, you may need to set custom RPC URLs, Blockchain Explorer API Keys, and other settings. This can be done in a **YAML** configuration file that loads when the application starts.
 
 ----
 
-(c) 2024 0xweb.org
+🏁 (c) 2024 0xweb.org

package/src/chains/arbitrum/TokensServiceArbitrum.ts

@@ -3,7 +3,7 @@ import di from 'a-di';
 import { TAddress } from '@dequanto/models/TAddress';
 import { TokensService } from '@dequanto/tokens/TokensService';
 import { Arbiscan } from './Arbiscan';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 
 
 export class TokensServiceArbitrum extends TokensService {

package/src/clients/EvmWeb3Client.ts

@@ -2,6 +2,8 @@ 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';
 
 
 export class EvmWeb3Client extends EthWeb3Client {
@@ -11,9 +13,28 @@ export class EvmWeb3Client extends EthWeb3Client {
     }
 }
 
+export class EvmWeb3ClientDeferred extends EvmWeb3Client {
+    constructor(options: IWeb3EndpointOptions) {
+        super({
+            ...options,
+            web3: {
+                request (...args) {
+                    throw new Error('Web3 request not supported in deferred mode');
+                },
+                subscribe(...args) {
+                    throw new Error('Web3 request not supported in deferred mode');
+                },
+                unsubscribe(...args) {
+                    throw new Error('Web3 request not supported in deferred mode');
+                }
+            }
+        })
+    }
+}
+
 function resolveOptions (options: IWeb3EndpointOptions) {
     $require.notNull(options?.platform, 'Platform is required when generic evm client is used');
-    let cfg = config.web3?.[options.platform];
+    let cfg = $config.get(`web3.${options.platform}`);
     if (cfg) {
         for (let key in cfg) {
             if (options[key] == null) {
@@ -21,6 +42,6 @@ function resolveOptions (options: IWeb3EndpointOptions) {
             }
         }
     }
-    $require.Numeric(options.chainId, `ChainID should be numeric. Got ${options.chainId}`);
+    $require.Numeric(options.chainId, `ChainID should be numeric. Got ${options.chainId} for ${options.platform}`);
     return options;
 }

package/src/clients/Web3Client.ts

@@ -25,7 +25,7 @@ import { RpcLogFilterOptions, RpcSubscription } from '@dequanto/rpc/RpcSubscript
 import { TEth } from '@dequanto/models/TEth';
 
 import { PromiseEvent } from '@dequanto/class/PromiseEvent';
-import { RpcTypes } from '@dequanto/rpc/Rpc';
+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';
@@ -137,7 +137,7 @@ export abstract class Web3Client implements IWeb3Client {
     async getWeb3(options?: IPoolWeb3Request) {
         throw new Error(`To get the web3 initialize the Web3 compatibility class ('compatibility/Web3.ts') instead`)
     }
-    async getRpc(options?: IPoolWeb3Request) {
+    async getRpc(options?: IPoolWeb3Request): Promise<Rpc> {
         return await this.pool.getRpc(options);
     }
     async getNodeURL(options?: IPoolWeb3Request) {

package/src/clients/Web3ClientFactory.ts

@@ -1,4 +1,5 @@
 import di from 'a-di';
+import alot from 'alot';
 import { TPlatform } from '@dequanto/models/TPlatform';
 import { BscWeb3Client } from './BscWeb3Client';
 import { EthWeb3Client } from './EthWeb3Client';
@@ -9,7 +10,6 @@ import { XDaiWeb3Client } from '@dequanto/chains/xdai/XDaiWeb3Client';
 import { HardhatProvider } from '@dequanto/hardhat/HardhatProvider';
 import { Config, config } from '@dequanto/config/Config';
 import { EvmWeb3Client } from './EvmWeb3Client';
-import alot from 'alot';
 
 export namespace Web3ClientFactory {
 

package/src/config/ConfigDefaults.ts

@@ -102,6 +102,8 @@ export const ConfigDefaults = <IConfigData> {
     },
     "web3": {
         "eth": {
+            "chainId": 1,
+            "chainToken": "ETH",
             "endpoints": [
                 {
                     "url": "https://eth.public-rpc.com"
@@ -117,6 +119,8 @@ export const ConfigDefaults = <IConfigData> {
             ]
         },
         "eth:goerli": {
+            "chainId": 5,
+            "chainToken": "ETH",
             "endpoints": [
                 {
                     "url": "https://goerli.infura.io/v3/a83f91c556054576a4c608ad4312720b"
@@ -128,6 +132,7 @@ export const ConfigDefaults = <IConfigData> {
         },
         "eth:sepolia": {
             "chainId": 11155111,
+            "chainToken": "ETH",
             "endpoints": [
                 {
                     "url": "https://1rpc.io/sepolia"
@@ -138,6 +143,8 @@ export const ConfigDefaults = <IConfigData> {
             ]
         },
         "polygon": {
+            "chainId": 137,
+            "chainToken": "POL",
             "endpoints": [
                 {
                     "url": "https://polygon-rpc.com"
@@ -146,6 +153,7 @@ export const ConfigDefaults = <IConfigData> {
         },
         "polygon:mumbai": {
             "chainId": 80001,
+            "chainToken": "POL",
             "endpoints": [
                 {
                     "url": "https://rpc-mumbai.maticvigil.com"
@@ -153,6 +161,8 @@ export const ConfigDefaults = <IConfigData> {
             ]
         },
         "bsc": {
+            "chainId": 56,
+            "chainToken": "BNB",
             "endpoints": [
                 {
                     "url": "https://bscrpc.com"
@@ -169,6 +179,8 @@ export const ConfigDefaults = <IConfigData> {
             ]
         },
         "xdai": {
+            "chainId": 100,
+            "chainToken": "XDAI",
             "endpoints": [
                 {
                     "url": "https://rpc.gnosischain.com/"
@@ -192,6 +204,7 @@ export const ConfigDefaults = <IConfigData> {
         },
         "arbitrum": {
             "chainId": 42161,
+            "chainToken": "ETH",
             "endpoints": [
                 {
                     "url": "https://arbitrum.public-rpc.com"
@@ -200,6 +213,7 @@ export const ConfigDefaults = <IConfigData> {
         },
         "optimism": {
             "chainId": 10,
+            "chainToken": "ETH",
             "endpoints": [
                 {
                     "url": "https://mainnet.optimism.io"

package/src/config/ConfigProvider.ts

@@ -45,7 +45,11 @@ export class ConfigProvider implements IConfigProvider {
 
         return [
             {
-                config: ConfigDefaults,
+                config: {
+                    ...ConfigDefaults,
+                    pin: unlockedAccountsKey ?? void 0,
+                    ...(parameters?.config ?? {}),
+                }
             },
             {
                 path: `./configs/dequanto.yml`,
@@ -82,8 +86,11 @@ export class ConfigProvider implements IConfigProvider {
     private async getSourcesBrowser (parameters: TConfigParamsNode) {
         return [
             {
-                config: ConfigDefaults
-            }
+                config: {
+                    ...ConfigDefaults,
+                    ...(parameters?.config ?? {}),
+                }
+            },
         ];
     }
 }

package/src/erc4337/models/UserOperation.ts

@@ -1,4 +1,4 @@
-import { EntryPoint } from '@dequanto-contracts/erc4337/EntryPoint/EntryPoint';
+import { EntryPoint } from '@dequanto/prebuilt/erc4337/EntryPoint/EntryPoint';
 import { $address } from '@dequanto/utils/$address';
 
 export type UserOperation = Parameters<EntryPoint['handleOps']>[1][0];