dequanto 0.1.21 → 0.1.23

package/src/utils/$abiParser.ts

@@ -124,10 +124,17 @@ export namespace $abiParser {
             }
             let tupleName = line.substring(end + 1, delimiter).trim();
             if (tupleName) {
+                let type = 'tuple';
+                // e.g. tupleName "[] users" from (uint256 foo, uint256 bar)[] users
+                let arrMatch = /\[(\d+)?\]/.exec(tupleName);
+                if (arrMatch != null) {
+                    type = type + arrMatch[0];
+                    tupleName = tupleName.substring(arrMatch[0].length).trim();
+                }
                 return [
                     {
                         name: tupleName,
-                        type: `tuple`,
+                        type,
                         components: params
                     }
                 ];

package/src/utils/$bigint.ts

@@ -1,6 +1,7 @@
 import { TEth } from '@dequanto/models/TEth';
 import { $buffer } from './$buffer';
 import { $require } from './$require';
+import { $is } from '@dequanto/utils/$is';
 
 export namespace $bigint {
 
@@ -48,6 +49,46 @@ export namespace $bigint {
         return BigInt(Math.round(amount));
     }
 
+    /**
+     * @param amount e.g "2.4 ether", "10 gwei", "1.7^18", "123456"
+     */
+    export function parse (amount: string): bigint {
+        if (/^\d+$/.test(amount) || $is.Hex(amount) ) {
+            return BigInt(amount);
+        }
+        let rgxName = /^(?<number>[\d.]+)\s*(?<name>ether|gwei|wei)$/i;
+        let rgxMatch = rgxName.exec(amount);
+        if (rgxMatch != null) {
+            let number = Number(rgxMatch.groups.number);
+            if (isNaN(number)) {
+                throw new Error(`Invalid format: ${amount}`);
+            }
+            let name = rgxMatch.groups.name;
+            if (name === 'ether') {
+                return toWei(number, ETHER_DECIMALS);
+            }
+            if (name === 'gwei') {
+                return toWei(number, GWEI_DECIMALS);
+            }
+            if (name === 'wei') {
+                return BigInt(number);
+            }
+        }
+
+        // 2.5^18
+        let rgxMantissa = /^(?<number>[\d.]+)\s*\^\s*(?<decimals>\d+)$/;
+        let rgxMantissaMatch = rgxMantissa.exec(amount);
+        if (rgxMantissaMatch != null) {
+            let number = Number(rgxMantissaMatch.groups.number);
+            let decimals = Number(rgxMantissaMatch.groups.decimals);
+            if (isNaN(number) || isNaN(decimals)) {
+                throw new Error(`Invalid format: ${amount}`);
+            }
+            return toWei(number, decimals);
+        }
+        throw new Error(`Unsupported format: ${amount}`);
+    }
+
     export function ensureWei (amount: number | bigint, decimals: number) {
         if (typeof amount === 'number') {
             return toWei(amount, decimals);

package/src/utils/$contract.ts

@@ -124,12 +124,17 @@ export namespace $contract {
         let evm = new EvmBytecode(input, { withConstructorCode: true });
         let opcodes = evm.getOpcodes();
         let codeSize = opcodes.findIndex(x => x.name === 'CODESIZE');
+        if (codeSize === -1) {
+            return {
+                bytecode: input,
+                arguments: '0x',
+            };
+        }
         let prev = opcodes[codeSize - 1];
         $require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
 
         let codeSizeValue = $buffer.toBigInt(prev.pushData) * 2n;
         let inputCursor = 2 /*0x*/ + Number(codeSizeValue);
-
         return {
             bytecode: input.substring(0, inputCursor),
             arguments: '0x' + input.substring(inputCursor),

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

@@ -45,6 +45,26 @@ export namespace $path {
         }
         return path;
     }
+    export function getDirectory (path: string) {
+        const dir = path.replace(/[^\/\\]+$/, '');
+        return dir;
+    }
+
+    export function getFilename (path: string) {
+        const match = /(?<filename>[^\/\\]+)\.(?<extension>\w+)$/.exec(path);
+        const { filename, extension } = match?.groups ?? { filename: null, extension: null };
+        return { filename, extension };
+    }
+
+    export function getRelativePath (path: string, base: string) {
+        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;
+    }
 
     function getRoot () {
         let base = $config.get('settings.base');

package/src/utils/$sig.ts

@@ -681,7 +681,7 @@ export namespace $sig {
 
 type TKey = TEth.Hex | `p1:0x${string}`;
 
-namespace KeyUtils {
+export namespace KeyUtils {
     const rgx = /^p1:/
 
     export async function withKey <TReturn> (account: TEth.EoAccount, fn: (account: TEth.EoAccount) => TReturn): Promise<TReturn> {

package/src/utils/types.ts

@@ -17,6 +17,9 @@ export type DeepPartial<T> = {
         DeepPartial<T[P]> | T[P]
 };
 
+export type Constructor<T = {}> = {
+    new (...args: any[]): T;
+};
 
 
 export type IntersectionTypeWithArrays<T1, T2, arrayKeys extends (keyof T1 & keyof T2)> = (

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