dequanto 0.1.22 → 0.1.23

package/src/tokens/TokenExchanges/AmmV2ExchangeBase.ts

@@ -12,10 +12,10 @@ import { TokensServiceBsc } from '../TokensServiceBsc';
 import { $address } from '@dequanto/utils/$address';
 import { $require } from '@dequanto/utils/$require';
 import { $cache } from '@dequanto/utils/$cache';
-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 '@dequanto/prebuilt/amm/AmmFactoryV2Contract/AmmFactoryV2Contract';
+import { AmmMasterChefV2Contract } from '@dequanto/prebuilt/amm/AmmMasterChefV2Contract/AmmMasterChefV2Contract';
+import { AmmVaultV2Contract } from '@dequanto/prebuilt/amm/AmmVaultV2Contract/AmmVaultV2Contract';
+import { AmmPairV2Contract } from '@dequanto/prebuilt/amm/AmmPairV2Contract/AmmPairV2Contract';
 
 
 interface ILPPair extends IToken {

package/src/tokens/TokenExchanges/OneInchExchange.ts

@@ -11,7 +11,7 @@ import { TxWriter } from '@dequanto/txs/TxWriter';
 import { TxDataBuilder } from '@dequanto/txs/TxDataBuilder';
 import { Web3Client } from '@dequanto/clients/Web3Client';
 import { IBlockChainExplorer } from '@dequanto/explorer/IBlockChainExplorer';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 import { $http } from '@dequanto/utils/$http';
 
 const PLATFORMS = {

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

@@ -17,7 +17,7 @@ import { TAddress } from '@dequanto/models/TAddress';
 import { IBlockChainExplorer } from '@dequanto/explorer/IBlockChainExplorer';
 import { ContractReader } from '@dequanto/contracts/ContractReader';
 import { $config } from '@dequanto/utils/$config';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 import { TokensService } from '@dequanto/tokens/TokensService';
 import { $bigint } from '@dequanto/utils/$bigint';
 import { $block } from '@dequanto/utils/$block';

package/src/tokens/TokenService.ts

@@ -8,7 +8,7 @@ import { $bigint } from '@dequanto/utils/$bigint';
 import { TokensServiceFactory } from './TokensServiceFactory';
 import { $require } from '@dequanto/utils/$require';
 import { TokensService } from './TokensService';
-import { WETH } from '@dequanto-contracts/weth/WETH/WETH';
+import { WETH } from '@dequanto/prebuilt/weth/WETH/WETH';
 import { BlockDateResolver } from '@dequanto/blocks/BlockDateResolver';
 
 

package/src/tokens/TokensService.ts

@@ -8,7 +8,7 @@ import { ITokenProvider } from './TokenProviders/ITokenProvider';
 import { Web3ClientFactory } from '@dequanto/clients/Web3ClientFactory';
 import { BlockChainExplorerProvider } from '@dequanto/explorer/BlockChainExplorerProvider';
 import { TokenDataProvider } from './TokenDataProvider';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 
 
 export class TokensService {

package/src/tokens/TokensServiceBsc.ts

@@ -2,7 +2,7 @@ import di from 'a-di';
 import { TokensService } from './TokensService';
 import { Bscscan } from '@dequanto/explorer/Bscscan';
 import { TAddress } from '@dequanto/models/TAddress';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 
 export class TokensServiceBsc extends TokensService {
     constructor () {

package/src/tokens/TokensServicePolygon.ts

@@ -2,7 +2,7 @@ import di from 'a-di';
 import { TokensService } from './TokensService';
 import { TAddress } from '@dequanto/models/TAddress';
 import { Polyscan } from '@dequanto/explorer/Polyscan';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 
 export class TokensServicePolygon extends TokensService {
     constructor () {

package/src/tokens/TokensServiceXDai.ts

@@ -4,7 +4,7 @@ import { TAddress } from '@dequanto/models/TAddress';
 import { XDaiscan } from '@dequanto/chains/xdai/XDaiscan';
 import { IToken } from '@dequanto/models/IToken';
 import { ITokenProvider } from './TokenProviders/ITokenProvider';
-import { ERC20 } from '@dequanto-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 
 export class TokensServiceXDai extends TokensService {
     constructor () {

package/src/utils/$logger.ts

@@ -72,6 +72,10 @@ class Logger {
     table(arr: (string | number | bigint)[][]) {
 
         arr = arr.filter(x => x != null && x.length > 0);
+        if (arr.length === 0) {
+            // No rows
+            return;
+        }
 
         let lengths = arr[0].map((_, i) => {
             let size = alot(arr).max(x => {

package/src/utils/$path.ts

@@ -57,9 +57,11 @@ export namespace $path {
     }
 
     export function getRelativePath (path: string, base: string) {
-        let i = path.toLowerCase().indexOf(base.toLowerCase());
+        let path_ = normalize(path).replace('file://', '');
+        let base_ = normalize(base).replace('file://', '');
+        let i = path_.toLowerCase().indexOf(base_.toLowerCase());
         if (i > -1) {
-            return path.substring(i + base.length);
+            return path_.substring(i + base_.length);
         }
         return path;
     }

package/src/wallets/Wallet.ts

@@ -4,7 +4,7 @@ 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-contracts/openzeppelin/ERC20';
+import { ERC20 } from '@dequanto/prebuilt/openzeppelin/ERC20';
 
 export class Wallet {
 

package/tsconfig.json

@@ -6,6 +6,7 @@
         "baseUrl": "./",
         "paths": {
             "@dequanto/*": [ "src/*" ],
+            "dequanto/*": [ "src/*" ],
             "@dequanto-contracts/*": [ "src/prebuilt/*" ]
         },
         "typeRoots": [

package/lib/cjs/gen/ContractStorageReaderTemplate.js

@@ -1,13 +0,0 @@
-class $NAME$ extends ContractStorageReaderBase {
-    constructor(address, client, explorer) {
-        super(address, client, explorer);
-        this.address = address;
-        this.client = client;
-        this.explorer = explorer;
-        /* METHODS */
-        this.$slots = $SLOTS$;
-        this.$createHandler(this.$slots);
-    }
-}
-//# sourceMappingURL=ContractStorageReaderTemplate.js.map
-//# sourceMappingURL=ContractStorageReaderTemplate.ts.map

package/lib/cjs/gen/ContractStorageReaderTemplate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContractStorageReaderTemplate.js","sourceRoot":"","sources":["../../../src/gen/ContractStorageReaderTemplate.ts"],"names":[],"mappings":"AAEA,MAAM,MAAO,SAAQ,yBAAyB;IAC1C,YACW,OAAiB,EACjB,MAAkB,EAClB,QAA6B;QAEpC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAJ1B,YAAO,GAAP,OAAO,CAAU;QACjB,WAAM,GAAN,MAAM,CAAY;QAClB,aAAQ,GAAR,QAAQ,CAAqB;QAO5C,aAAa;QAET,WAAM,GAAG,OAAO,CAAA;QALZ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;CAMJ"}

package/lib/cjs/gen/ContractTemplate.js

@@ -1,56 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.$NAME$ = void 0;
-/**
- *  AUTO-Generated Class: $DATE$
- *  Implementation: $EXPLORER_URL$
- */
-const a_di_1 = __importDefault(require("a-di"));
-const ContractBase_1 = require("../contracts/ContractBase.js");
-/* IMPORTS */
-/* ERRORS */
-class $NAME$ extends ContractBase_1.ContractBase {
-    constructor(address = $ADDRESS$, client = a_di_1.default.resolve($EthWeb3Client$, $Web3ClientOptions$), explorer = a_di_1.default.resolve($Etherscan$, $EvmScanOptions$)) {
-        super(address, client, explorer);
-        this.address = address;
-        this.client = client;
-        this.explorer = explorer;
-        /* EVENTS */
-        /* EVENTS_EXTRACTORS */
-        /* EVENTS_FETCHERS */
-        this.abi = $ABI$;
-        /* STORAGE_READER_INITIALIZER */
-    }
-    /* META_PROPERTY */
-    /* METHODS */
-    $call() {
-        return super.$call();
-    }
-    $signed() {
-        return super.$signed();
-    }
-    $data() {
-        return super.$data();
-    }
-    $gas() {
-        return super.$gas();
-    }
-    onTransaction(method, options) {
-        options ??= {};
-        options.filter ??= {};
-        options.filter.method = method;
-        return this.$onTransaction(options);
-    }
-    onLog(event, cb) {
-        return this.$onLog(event, cb);
-    }
-    async getPastLogs(mix, options) {
-        return await super.getPastLogs(mix, options);
-    }
-}
-exports.$NAME$ = $NAME$;
-//# sourceMappingURL=ContractTemplate.js.map
-//# sourceMappingURL=ContractTemplate.ts.map

package/lib/cjs/gen/ContractTemplate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContractTemplate.js","sourceRoot":"","sources":["../../../src/gen/ContractTemplate.ts"],"names":[],"mappings":";;;;;;AAAA;;;GAGG;AACH,gDAAsB;AAKtB,mEAAgE;AAgBhE,aAAa;AAEb,YAAY;AAEZ,MAAa,MAAO,SAAQ,2BAAY;IACpC,YACW,UAAwB,SAAS,EACjC,SAAqB,cAAE,CAAC,OAAO,CAAC,eAAe,EAAE,mBAAmB,CAAC,EACrE,WAAgC,cAAE,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC;QAEhF,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAJzB,YAAO,GAAP,OAAO,CAA0B;QACjC,WAAM,GAAN,MAAM,CAA+D;QACrE,aAAQ,GAAR,QAAQ,CAAiE;QAwDxF,YAAY;QAEZ,uBAAuB;QAEvB,qBAAqB;QAEjB,QAAG,GAAe,KAAK,CAAA;QA1DnB,gCAAgC;IACpC,CAAC;IAIL,mBAAmB;IAEnB,aAAa;IAET,KAAK;QACD,OAAO,KAAK,CAAC,KAAK,EAAqB,CAAC;IAC5C,CAAC;IACD,OAAO;QACH,OAAO,KAAK,CAAC,OAAO,EAAS,CAAC;IAClC,CAAC;IACD,KAAK;QACD,OAAO,KAAK,CAAC,KAAK,EAAmB,CAAC;IAC1C,CAAC;IACD,IAAI;QACA,OAAO,KAAK,CAAC,IAAI,EAAS,CAAC;IAC/B,CAAC;IAED,aAAa,CAAkD,MAAe,EAAE,OAAsD;QAQlI,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC/B,OAAa,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAE,KAAoB,EAAE,EAA6C;QACtE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAUD,KAAK,CAAC,WAAW,CAAE,GAAQ,EAAE,OAAQ;QACjC,OAAO,MAAM,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAQ,CAAC;IACxD,CAAC;CAWJ;AArED,wBAqEC"}

package/lib/esm/gen/ContractStorageReaderTemplate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContractStorageReaderTemplate.js","sourceRoot":"","sources":["../../../src/gen/ContractStorageReaderTemplate.ts"],"names":[],"mappings":"AAEA,MAAM,MAAO,SAAQ,yBAAyB;IAC1C,YACW,OAAiB,EACjB,MAAkB,EAClB,QAA6B;QAEpC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAJ1B,YAAO,GAAP,OAAO,CAAU;QACjB,WAAM,GAAN,MAAM,CAAY;QAClB,aAAQ,GAAR,QAAQ,CAAqB;QAO5C,aAAa;QAET,WAAM,GAAG,OAAO,CAAA;QALZ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;CAMJ"}

package/lib/esm/gen/ContractStorageReaderTemplate.mjs

@@ -1,13 +0,0 @@
-class $NAME$ extends ContractStorageReaderBase {
-    constructor(address, client, explorer) {
-        super(address, client, explorer);
-        this.address = address;
-        this.client = client;
-        this.explorer = explorer;
-        /* METHODS */
-        this.$slots = $SLOTS$;
-        this.$createHandler(this.$slots);
-    }
-}
-//# sourceMappingURL=ContractStorageReaderTemplate.js.map
-//# sourceMappingURL=ContractStorageReaderTemplate.ts.map

package/lib/esm/gen/ContractTemplate.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContractTemplate.js","sourceRoot":"","sources":["../../../src/gen/ContractTemplate.ts"],"names":[],"mappings":";;;;;;AAAA;;;GAGG;AACH,gDAAsB;AAKtB,mEAAgE;AAgBhE,aAAa;AAEb,YAAY;AAEZ,MAAa,MAAO,SAAQ,2BAAY;IACpC,YACW,UAAwB,SAAS,EACjC,SAAqB,cAAE,CAAC,OAAO,CAAC,eAAe,EAAE,mBAAmB,CAAC,EACrE,WAAgC,cAAE,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC;QAEhF,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAJzB,YAAO,GAAP,OAAO,CAA0B;QACjC,WAAM,GAAN,MAAM,CAA+D;QACrE,aAAQ,GAAR,QAAQ,CAAiE;QAwDxF,YAAY;QAEZ,uBAAuB;QAEvB,qBAAqB;QAEjB,QAAG,GAAe,KAAK,CAAA;QA1DnB,gCAAgC;IACpC,CAAC;IAIL,mBAAmB;IAEnB,aAAa;IAET,KAAK;QACD,OAAO,KAAK,CAAC,KAAK,EAAqB,CAAC;IAC5C,CAAC;IACD,OAAO;QACH,OAAO,KAAK,CAAC,OAAO,EAAS,CAAC;IAClC,CAAC;IACD,KAAK;QACD,OAAO,KAAK,CAAC,KAAK,EAAmB,CAAC;IAC1C,CAAC;IACD,IAAI;QACA,OAAO,KAAK,CAAC,IAAI,EAAS,CAAC;IAC/B,CAAC;IAED,aAAa,CAAkD,MAAe,EAAE,OAAsD;QAQlI,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC/B,OAAa,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAE,KAAoB,EAAE,EAA6C;QACtE,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IAUD,KAAK,CAAC,WAAW,CAAE,GAAQ,EAAE,OAAQ;QACjC,OAAO,MAAM,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAQ,CAAC;IACxD,CAAC;CAWJ;AArED,wBAqEC"}

package/lib/esm/gen/ContractTemplate.mjs

@@ -1,49 +0,0 @@
-/**
- *  AUTO-Generated Class: $DATE$
- *  Implementation: $EXPLORER_URL$
- */
-import di from 'a-di';
-import { ContractBase } from '../contracts/ContractBase.mjs';
-/* IMPORTS */
-/* ERRORS */
-export class $NAME$ extends ContractBase {
-    constructor(address = $ADDRESS$, client = di.resolve($EthWeb3Client$, $Web3ClientOptions$), explorer = di.resolve($Etherscan$, $EvmScanOptions$)) {
-        super(address, client, explorer);
-        this.address = address;
-        this.client = client;
-        this.explorer = explorer;
-        /* EVENTS */
-        /* EVENTS_EXTRACTORS */
-        /* EVENTS_FETCHERS */
-        this.abi = $ABI$;
-        /* STORAGE_READER_INITIALIZER */
-    }
-    /* META_PROPERTY */
-    /* METHODS */
-    $call() {
-        return super.$call();
-    }
-    $signed() {
-        return super.$signed();
-    }
-    $data() {
-        return super.$data();
-    }
-    $gas() {
-        return super.$gas();
-    }
-    onTransaction(method, options) {
-        options ??= {};
-        options.filter ??= {};
-        options.filter.method = method;
-        return this.$onTransaction(options);
-    }
-    onLog(event, cb) {
-        return this.$onLog(event, cb);
-    }
-    async getPastLogs(mix, options) {
-        return await super.getPastLogs(mix, options);
-    }
-}
-//# sourceMappingURL=ContractTemplate.js.map
-//# sourceMappingURL=ContractTemplate.ts.map

package/src/gen/ContractStorageReaderTemplate.d.ts.template

@@ -1,14 +0,0 @@
-
-
-declare class $NAME$ extends ContractStorageReaderBase {
-    constructor(
-        public address,
-        public client,
-        public explorer,
-    )
-
-/* METHODS */
-
-    $slots: $SLOTS$
-
-}