dequanto 0.2.38 → 0.2.41

package/src/solidity/storage/Accessor.ts

@@ -124,7 +124,7 @@ namespace Parse {
                 return i;
             }
         }
-        throw new Error(`Not found closing quote ${quote} in ${str}`);
+        throw new Error(`Closing quote ${quote} was not found in ${str}`);
     }
 
 

package/src/solidity/storage/SlotDynamicArray.ts

@@ -19,7 +19,7 @@ export abstract class ASlotDynamicArray extends ASlotsStorageHandler {
     }
 
 
-    // /** @TODO doesnt support complex arrays  */
+    // /** @TODO Does not support complex arrays */
     // protected async getCursorFor (idx: number): Promise<{
     //     slot: number | bigint,
     //     position: number,

package/src/solidity/storage/SlotFixedArray.ts

@@ -10,7 +10,7 @@ export abstract class ASlotFixedArray extends ASlotsStorageHandler {
         return $types.isFixedArray(slot.type);
     }
 
-    /** @TODO doesnt support complex arrays  */
+    /** @TODO Does not support complex arrays */
     protected async getCursorFor (idx: number): Promise<{ slot: number | bigint, position: number, size: number }> {
         let { slot } = this;
         let arrLength = $abiType.array.getLength(slot.type);

package/src/solidity/storage/SlotsStorageTransport.ts

@@ -106,7 +106,7 @@ export class SlotsStorageTransport implements ISlotsStorageTransport {
     }
 
     extractMappingKeys (ctx): Promise<{ keys: (string | number | bigint)[][] }> {
-        throw new Error(`SlotMappingReader doesn't support fetchAll method, as size could be infinite`);
+        throw new Error(`SlotMappingReader does not support the fetchAll method, as the size could be infinite`);
     }
 
     mapToGlobalSlot (slot = 0) {
@@ -128,7 +128,7 @@ export class SlotsStorageTransportForArray implements ISlotsStorageTransport {
 
     async getStorageAt (slot: string | number | bigint, position = 0, size = 256) {
         if (typeof slot !== 'number') {
-            throw new Error(`Array Slot reader supports only numbers for position. Slot ${slot}`);
+            throw new Error(`Array slot reader supports only numeric positions. Slot ${slot}`);
         }
         let location = this.mapToGlobalSlot(slot);
         let memory = await this.getUnderlyingTransport().getStorageAt(location, position, size);
@@ -172,7 +172,7 @@ export class SlotsStorageTransportForMapping implements ISlotsStorageTransport {
     async getStorageAt (slot: string | number | bigint, position: number, size: number) {
         let isValidType = typeof slot === 'number' || typeof slot === 'bigint' || $is.Hex(slot);
         if (isValidType === false) {
-            throw new Error(`Mapping Slot reader supports only numbers for position ${slot}`);
+            throw new Error(`Mapping slot reader supports only numeric positions ${slot}`);
         }
         let location = this.mapToGlobalSlot(BigInt(slot));
         let memory = await this.getUnderlyingTransport().getStorageAt(location, position, size);

package/src/solidity/storage/handlers/SlotBytesHandler.ts

@@ -98,7 +98,7 @@ export class SlotBytesHandler extends ASlotsStorageHandler {
 
     protected requireNoKeys (keys: IAccessorItem[]) {
         if (keys?.length > 0) {
-            throw new Error(`ValueTypes cann't have the nested accessors: ${ keys.map(x => x.key).join('.') }`);
+            throw new Error(`ValueTypes cannot have nested accessors: ${ keys.map(x => x.key).join('.') }`);
         }
     }
 

package/src/solidity/storage/handlers/SlotDynamicArrayHandler.ts

@@ -41,7 +41,7 @@ export class SlotDynamicArrayHandler extends ASlotDynamicArray {
     private async getStorageInner(key: IAccessorItem): Promise<any> {
 
         if (key.type !== 'index') {
-            throw new Error(`Expected to get the Array index as a Key got ${key.key} as ${key.type}`);
+            throw new Error(`Expected to get the array index as a key, but got ${key.key} as ${key.type}`);
         }
 
         let baseType = $abiType.array.getBaseType(this.slot.type);

package/src/solidity/storage/handlers/SlotFixedArrayHandler.ts

@@ -45,7 +45,7 @@ export class SlotFixedArrayHandler extends ASlotFixedArray {
     private async getStorageInner (key: IAccessorItem) {
 
         if (key.type !== 'index') {
-            throw new Error(`Expected to get the Array index as a Key got ${key.key} as ${key.type}`);
+            throw new Error(`Expected to get the array index as a key, but got ${key.key} as ${key.type}`);
         }
         let cursor = await this.getCursorFor(key.key);
         let baseType = $abiType.array.getBaseType(this.slot.type);

package/src/solidity/storage/handlers/SlotValueConstantHandler.ts

@@ -24,7 +24,7 @@ export class SlotValueConstantHandler extends ASlotsStorageHandler {
 
     private requireNoKeys (keys: IAccessorItem[]) {
         if (keys?.length > 0) {
-            throw new Error(`ValueTypes can't have the nested accessors: ${ keys.map(x => x.key).join('.') }`);
+            throw new Error(`ValueTypes cannot have nested accessors: ${ keys.map(x => x.key).join('.') }`);
         }
     }
 }

package/src/solidity/storage/handlers/SlotValueHandler.ts

@@ -30,7 +30,7 @@ export class SlotValueHandler extends ASlotsStorageHandler {
 
     private requireNoKeys (keys: IAccessorItem[]) {
         if (keys?.length > 0) {
-            throw new Error(`ValueTypes can't have the nested accessors: ${ keys.map(x => x.key).join('.') }`);
+            throw new Error(`ValueTypes cannot have nested accessors: ${ keys.map(x => x.key).join('.') }`);
         }
     }
 }

package/src/solidity/storage/handlers/SlotValueImmutableHandler.ts

@@ -10,8 +10,8 @@ export class SlotValueImmutableHandler extends ASlotsStorageHandler {
         return slot.memory === 'immutable';
     }
 
-    // We will read the public getter if any or skip for now
-    // @TODO: implement deployment tx reader
+    // Read the public getter if any, or skip for now
+    // @TODO Implement the deployment tx reader
     async get (keys?: IAccessorItem[]){
         this.requireNoKeys(keys);
 
@@ -26,7 +26,7 @@ export class SlotValueImmutableHandler extends ASlotsStorageHandler {
     }
 
     async set(keys: IAccessorItem[], value: any): Promise<any> {
-        throw new Error(`Can't set a immutable value ${this.slot.name}`);
+        throw new Error(`Cannot set an immutable value ${this.slot.name}`);
     }
 
     async fetchAll() {
@@ -35,7 +35,7 @@ export class SlotValueImmutableHandler extends ASlotsStorageHandler {
 
     private requireNoKeys (keys: IAccessorItem[]) {
         if (keys?.length > 0) {
-            throw new Error(`ValueTypes can't have the nested accessors: ${ keys.map(x => x.key).join('.') }`);
+            throw new Error(`ValueTypes cannot have nested accessors: ${ keys.map(x => x.key).join('.') }`);
         }
     }
 }

package/src/tokens/TokenDataProvider.ts

@@ -84,7 +84,7 @@ export class TokenDataProvider {
     }
 
     /**
-     *  Adds and saves the token to dequanto configuration.
+     * Adds and saves the token to the dequanto configuration
      */
     async addKnownToken (token: IToken): Promise<any> {
         await this.config.addToken(token);
@@ -109,7 +109,7 @@ export class TokenDataProvider {
         return NativeTokens.getNative(platform);
     }
 
-    /** Download tokens with various exchange/swap providers and merge them into one collection. */
+    /** Download tokens with various exchange/swap providers and merge them into one collection */
     async redownload () {
         return await alot(this.providers)
             .forEachAsync(async (x, i) => {

package/src/tokens/TokenExchangeService.ts

@@ -40,7 +40,7 @@ export class TokenExchangeService {
                 this.stables = ['USDC', 'USDT', 'DAI'];
                 break;
             default:
-                throw new Error(`Unsupported Platform for exchange yet: ${platform}`);
+                throw new Error(`Unsupported exchange platform: ${platform}`);
         }
 
         this.client = Web3ClientFactory.get(this.platform);

package/src/tokens/TokenExchanges/AmmBase/V2/AmmPairV2Service.ts

@@ -97,7 +97,7 @@ export class AmmPairV2Service {
                 this.targetCoins = ['USDC', 'USDT', 'DAI'];
                 break;
             default:
-                throw new Error(`Unsupported Platform for exchange yet: ${client.platform}`);
+                throw new Error(`Unsupported exchange platform: ${client.platform}`);
         }
 
         this.tokensService = di.resolve(TokensService, this.client.platform, this.explorer);
@@ -125,7 +125,7 @@ export class AmmPairV2Service {
 
 
         if (pool == null || pool.reserveTo < (50_000n * BigInt(pool.pair.to.decimals))) {
-            // if NO or low-liquidity pool found, check the WETH pool
+            // If no pool or only a low-liquidity pool is found, check the WETH pool
             const SYMBOL = { bsc: 'WBNB', polygon: 'MATIC' }[platform] ?? 'WETH';
             const nativeTokenPool = await this.getPoolInfo(address, SYMBOL);
 

package/src/tokens/TokenExchanges/AmmV2PriceQuote.ts

@@ -39,7 +39,7 @@ export class AmmV2PriceQuote implements IOracle {
                 this.exchange = di.resolve(SushiswapPolygonExchange, this.client, this.explorer);
                 break;
             default:
-                throw new Error(`Unsupported Platform for exchange yet: ${client.platform}`);
+                throw new Error(`Unsupported exchange platform: ${client.platform}`);
         }
         this.tokensService = di.resolve(TokensService, this.client.platform, this.explorer)
         this.pairService = di.resolve(AmmPairV2Service, this.client, this.explorer)
@@ -371,7 +371,7 @@ namespace TokenPrice {
                 fromUsd: $fromUsd,
                 fromPrice: $fromPrice,
 
-                // Optimistic assume same USD out.
+                // Optimistically assume the same USD output
                 toUsd: $fromUsd
             };
         }

package/src/tokens/TokenOracles/amm/AmmV1Oracle.ts

@@ -138,7 +138,7 @@ export class AmmV1Oracle implements IOracle {
 
         let mostLiquidity = alot(exchanges).sortBy(x => x?.eth ?? 0n, 'desc').first();
         if (mostLiquidity == null || mostLiquidity.eth < $bigint.toWei(2)) {
-            throw new Error(`ETH price can't be resolved due to NO or low-liquidity pairs: ${ exchanges.map(x => `${x.token.symbol} (${x.eth}wei)`)  }`);
+            throw new Error(`ETH price cannot be resolved due to missing or low-liquidity pairs: ${ exchanges.map(x => `${x.token.symbol} (${x.eth}wei)`)  }`);
         }
         let out = await this
             .reader
@@ -178,7 +178,7 @@ export class AmmV1Oracle implements IOracle {
             opts.block = number;
             return this.getBlockData(opts);
         }
-        throw new Error(`Unreachable reached`);
+        throw new Error(`Unreachable code reached`);
     }
 
     @memd.deco.memoize({

package/src/tokens/TokenTransferService.ts

@@ -158,8 +158,8 @@ export class TokenTransferService {
             ...(this.writerConfig ?? {}),
             retries: 3,
             async onErrorRebuild (tx, error, errCount) {
-                // In case we got `balance` value, but that one was outdated, then all our calculations where wrong.
-                // Retry the calculation and transfer once again.
+                // If we got the `balance` value, but it was outdated, then all our calculations were wrong
+                // Retry the calculation and transfer once again
                 if (/insufficient funds/.test(error.message)) {
                     const ms = 6000 * errCount;
                     $logger.log(`TokenTransfer Failed: insufficient funds. Waiting ${ms}ms to retry`);

package/src/tokens/TokensService.ts

@@ -52,7 +52,7 @@ export class TokensService {
         return this.provider.getNative(platform);
     }
 
-    /** Download tokens with various exchange/swap providers and merge them into one collection. */
+    /** Download tokens with various exchange/swap providers and merge them into one collection */
     async redownload () {
         return this.provider.redownload();
     }

package/src/txs/ITxBuilderOptions.ts

@@ -17,7 +17,7 @@ export interface ITxBuilderNonceOptions {
      * 1: Used nonce of the first pending transaction will
      * 2: second pending transaction
      * ...
-     * In any case MAX is the count of pending transactions, so any value is safe.
+     * In any case, MAX is the count of pending transactions, so any value is safe
      */
     noncePending?: number
 }

package/src/txs/TxNonceManager.ts

@@ -34,7 +34,7 @@ export class TxNonceManager {
     }
 
     /**
-     * Pick current nonce without incrementing. TxDataBuilder will call the incrementCursor after the tx signed.
+     * Pick the current nonce without incrementing. TxDataBuilder will call incrementCursor after the tx is signed
      * */
     public async pickNonce (client: Web3Client): Promise<bigint> {
         if (this.shouldUpdateNonce()) {

package/src/txs/TxWriter.ts

@@ -71,7 +71,7 @@ export interface ITxWriterOptions {
     retryDelay?: number
     safeTransport?: ISafeServiceTransport
 
-    /** Tx Data will be saved to the store(e.g. a File), and will wait until the signature appears in the store. */
+    /** Tx data will be saved to the store, e.g. a file, and wait until the signature appears in the store */
     sigTransport?: string
 
     /** Optionally disable waiting for the transport response */
@@ -83,11 +83,11 @@ export interface ITxWriterOptions {
     /** Proceed the Tx up to the signature */
     signOnly?: boolean
 
-    /** Provide a pre-signed signature for this transaction data. */
+    /** Provide a pre-signed signature for this transaction data */
     signature?: TEth.Hex
 
     /**
-     * The callback is executed on error, to give the opportunity to build a new Tx to resubmit the tx.
+     * The callback is executed on error to allow building a new tx for resubmission
      * @param tx - current TxWriter object
      * @param error - current Error with receipt(if any)
      * @param errCount - num of errors already handled
@@ -101,7 +101,7 @@ export interface ITxWriterOptions {
 
 
     /**
-     * Custom agent to process the transaction data.
+     * Custom agent to process the transaction data
      */
     agent?: ITxWriterAgent
 }
@@ -411,6 +411,17 @@ export class TxWriter extends class_EventEmitter<ITxWriterEvents> implements ITx
 
                 let submitsCount = this.txs.length;
                 let submitsMax = (options.retries ?? 0) + 1;
+
+                if (ClientErrorUtil.IsUnderpriced(err)) {
+                    if (options.retries == null) {
+                        options.retries = 1;
+                    }
+                    // Increase the price ratio and the
+                    this.builder.increaseGas(1.5);
+                    this.logger.log(`Underpriced: gas increased: retried ${submitsCount}/${options.retries ?? 0}`);
+                    submitsMax = Math.max(2, submitsMax);
+                }
+
                 if (submitsCount < submitsMax) {
                     let ms = options.retryDelay ?? 3000;
                     let waitMs = ms * submitsCount;

package/src/txs/agents/BatchAgent.ts

@@ -18,7 +18,7 @@ export class BatchAgent implements ITxWriterAgent {
     public transactions: MockTxWriter[] = []
 
     constructor (public options?: {
-        // It is usefull to not batch the deployment transactions.
+        // It is useful not to batch deployment transactions
         ignoreContractCreation?: boolean,
     }) {
 

package/src/txs/conditional/GasWatcherTx.ts

@@ -94,7 +94,7 @@ export class GasWatcherTx {
             // re-submitting
             let currentGas = BigInt(data.gasPrice.toString());
             if (currentGas >= gasPrice) {
-                // we can't resubmit with less gas
+                // We cannot resubmit with less gas
                 gasPrice = currentGas + $bigint.toWeiFromGwei(.1);
             }
         }

package/src/txs/receipt/TxLogParser.ts

@@ -17,7 +17,7 @@ export class TxLogParser {
     }
 
     /**
-     *  Sparse arrays will contain NULLs for unparsed log items.
+     * Sparse arrays will contain NULLs for unparsed log items
      *  Per default dense arrays - only with known logs - are returned
      */
     async parse (receipt: { logs: TEth.TxReceipt['logs'] }, opts?: {

package/src/utils/$crypto.ts

@@ -111,7 +111,7 @@ namespace WebCryptoImpl {
         }
         createECDH(curve: string) {
             /** use this.crypto.subtle.importKey */
-            throw new Error("Method not implemented.");
+            throw new Error("Method not implemented");
         }
         async encryptInner(buffer: Uint8Array, secret: Uint8Array): Promise<Uint8Array> {
             const key = await this._getEncryptionKey(secret);

package/src/utils/$date.ts

@@ -80,7 +80,7 @@ export class DateTool {
         if (ms != null) this.date.setMilliseconds(ms);
         return this;
     }
-    /** Sets the numeric day-of-the-month value of the Date object using local time. */
+    /** Sets the numeric day-of-the-month value of the Date object using local time */
     setDate(v: number) {
         this.date.setDate(v);
         return this;

package/src/utils/$hex.ts

@@ -6,7 +6,7 @@ export namespace $hex {
     export const ZERO = '0x'
 
     /**
-     * Adds '00' bytes to the hex string.
+     * Adds '00' bytes to the hex string
      * @param hex
      * @param byteSize Min bytes count in the hex string
      */

package/src/utils/$logger.ts

@@ -213,7 +213,7 @@ export function l(strings: TemplateStringsArray, ...values: any[]) {
             case 'bigint':
                 break;
             default:
-                // skip colorizing all non-value types.
+                // Skip colorizing all non-value types
                 continue;
         }
         args[i - 1] = `${before}${value}${after}`;

package/src/utils/$machine.ts

@@ -42,8 +42,8 @@ export namespace $machine {
             freebsd: 'kenv -q smbios.system.uuid || sysctl -n kern.hostuuid'
         };
         function isWindowsProcessMixedOrNativeArchitecture(): string {
-            // detect if the node binary is the same arch as the Windows OS.
-            // or if this is 32 bit node on 64 bit windows.
+            // Detect if the node binary has the same architecture as the Windows OS
+            // Or if this is 32-bit Node on 64-bit Windows
             if (process.platform !== 'win32') {
                 return '';
             }

package/src/utils/$require.ts

@@ -5,7 +5,7 @@ import { $address } from './$address';
 
 const $Array = Array;
 export namespace $require {
-    export function Number <T> (val: T, message: string = '', opts?: { min?: T, max?: T}): T {
+    export function Number <T> (val: T, message: string = '', opts?: { min?: T, max?: T}): number {
         if (typeof val !== 'number') {
             throw new Error(`Expects number type, got ${typeof val} ${val}. ${message}`);
         }
@@ -20,7 +20,7 @@ export namespace $require {
         }
         return val;
     }
-    export function BigInt<T> (val: T, message: string = '', opts?: { min?: T, max?: T}): T {
+    export function BigInt<T> (val: T, message: string = '', opts?: { min?: T, max?: T}): bigint {
         if (typeof val !== 'bigint') {
             throw new Error(`Expects bigint type, got ${typeof val} (${val}). ${message}`);
         }
@@ -32,35 +32,35 @@ export namespace $require {
         }
         return val;
     }
-    export function Numeric<T>(val: T, message: string = '', opts?: { min?: T, max?: T}): T {
+    export function Numeric<T>(val: T, message: string = '', opts?: { min?: T, max?: T}): NonNullable<T> {
         if (typeof val === 'number') {
-            return Number(val, message, opts);
+            return Number(val, message, opts) as any;
         }
         if (typeof val === 'bigint') {
-            return BigInt(val, message, opts);
+            return BigInt(val, message, opts) as any;
         }
         throw new Error(`Expects numeric type, got ${typeof val}. ${message}`);
     }
 
-    export function Function<T>(val: T, message: string): T {
+    export function Function<T>(val: T, message: string): NonNullable<T> {
         if (typeof val !== 'function') {
             throw new Error(`Value is not a function ${message}`);
         }
         return val;
     }
-    export function Array<T>(val: T, message: string): T {
+    export function Array<T>(val: T, message: string): NonNullable<T> {
         if ($Array.isArray(val) === false) {
             throw new Error(`Value is not a function ${message}`);
         }
         return val;
     }
-    export function String<T>(val: T, message: string): T {
+    export function String<T>(val: T, message: string): NonNullable<T> {
         if (typeof val !== 'string') {
             throw new Error(`Value ${val} is not a string ${message}`);
         }
         return val;
     }
-    export function notNull<T> (val: T, message: string, ...logs): T {
+    export function notNull<T> (val: T, message: string, ...logs): NonNullable<T> {
         if (val == null) {
             logs?.forEach(log => console.error(log));
             throw new Error(`Value is undefined. ${message}`);
@@ -74,7 +74,7 @@ export namespace $require {
         }
         return val;
     }
-    export function notEmpty<T extends string | Array<any> | { length: number }> (val: T, message: string): T {
+    export function notEmpty<T extends string | Array<any> | { length: number }> (val: T, message: string): NonNullable<T> {
         if (val == null) {
             throw new Error(`Value is undefined. ${message}`);
         }

package/src/utils/$traces.ts

@@ -512,7 +512,7 @@ export namespace $traces {
                     }).join(', ');
                 }
             } catch {
-                // Fall back to raw bytes if decoding fails.
+                // Fall back to raw bytes if decoding fails
             }
         }
         if (frame.failed) {

package/src/wallets/EIP6963ProviderFactory.ts

@@ -7,7 +7,7 @@ import { $require } from '@dequanto/utils/$require';
 import { class_EventEmitter } from 'atma-utils';
 import { IEIP6963Provider } from '@dequanto/rpc/transports/compatibility/IEIP6963Provider';
 
-// Interface for provider information following EIP-6963.
+// Interface for provider information following EIP-6963
 interface EIP6963ProviderInfo {
     rdns?: string; // Unique identifier for the wallet e.g io.metamask, io.metamask.flask
     uuid: string; // Globally unique ID to differentiate between provider sessions for the lifetime of the page
@@ -16,16 +16,16 @@ interface EIP6963ProviderInfo {
     chainId?: number;
 }
 
-// Interface for Ethereum providers based on the EIP-1193 standard.
+// Interface for Ethereum providers based on the EIP-1193 standard
 
-// Interface detailing the structure of provider information and its Ethereum provider.
+// Interface detailing the structure of provider information and its Ethereum provider
 export interface EIP6963ProviderDetail {
     info: EIP6963ProviderInfo; // The provider's info
     provider: IEIP6963Provider; // The EIP-1193 compatible provider
     accounts?: TEth.Address[]; // Optional: Array of connected Ethereum accounts
 }
 
-// Type representing the event structure for announcing a provider based on EIP-6963.
+// Type representing the event structure for announcing a provider based on EIP-6963
 type EIP6963AnnounceProviderEvent = {
     detail: EIP6963ProviderDetail
 }