dequanto 0.2.49 → 0.2.50

package/src/rpc/RpcContract.ts

@@ -2,11 +2,12 @@ import di from 'a-di';
 import alot from 'alot';
 import { Rpc, RpcTypes } from './Rpc';
 
-import { TAbiItem, TAbiOutput } from '@dequanto/types/TAbi';
+import { TAbiItem } from '@dequanto/types/TAbi';
 import { TAddress } from '@dequanto/models/TAddress';
 import { $require } from '@dequanto/utils/$require';
 import { $abiUtils } from '@dequanto/utils/$abiUtils';
 import { $abiCoder } from '@dequanto/abi/$abiCoder';
+import { $abi } from '@dequanto/abi/$abi';
 import { RpcError } from './RpcError';
 import { $hex } from '@dequanto/utils/$hex';
 import { TEth } from '@dequanto/models/TEth';
@@ -54,7 +55,7 @@ export class RpcContract {
             if (methodAbi == null) {
                 return hex;
             }
-            return utils.deserializeOutput(hex, methodAbi.outputs);
+            return $abi.decodeReturn(methodAbi, hex);
         } catch (err) {
             if (err instanceof RpcError) {
                 err.message = `RpcCall ${req.method} (${JSON.stringify(req.params)}) ${err.message}`;
@@ -82,7 +83,7 @@ export class RpcContract {
                     let defaults = null;
                     try {
                         const defaultHex = $abiCoder.encode(returnABI, [null]);
-                        defaults = utils.deserializeOutput(defaultHex, returnABI);
+                        defaults = $abi.decodeReturn(abi, defaultHex);
                     } catch (error) {}
                     return {
                         defaults,
@@ -90,7 +91,7 @@ export class RpcContract {
                     };
                 }
                 let hex = typeof resp === 'string' ? resp : resp.data;
-                let result = utils.deserializeOutput(hex, returnABI);
+                let result = $abi.decodeReturn(abi, hex);
                 return result;
             });
 
@@ -191,32 +192,3 @@ export class RpcContract {
     // }
 }
 
-
-namespace utils {
-    export function deserializeOutput(hex: string, outputs: TAbiOutput[]) {
-
-        let abi = outputs;
-        let isDynamic: boolean = null;
-        if (outputs.length > 1) {
-            let isNamedTuple = outputs.every(x => x.name != null && x.name !== '');
-            if (isNamedTuple) {
-                // Return as an object
-                abi = [ { type: 'tuple', components: outputs, name: null } ];
-                isDynamic = false;
-            }
-        }
-
-        try {
-            let arr = $abiCoder.decode(abi as any, hex, {
-                dynamic: isDynamic
-            });
-            let value = abi.length === 1 ? arr[0] : arr;
-            return value;
-        } catch (error) {
-            if (outputs.length === 1 && abi.length === 1) {
-                return $abiCoder.decodeSingle(abi[0], hex);
-            }
-            throw error;
-        }
-    }
-}

package/src/utils/$account.ts

@@ -1,6 +1,7 @@
 import { EoAccount, Erc4337Account, SafeAccount, TAccount, TimelockAccount } from "@dequanto/models/TAccount";
 import { $address } from './$address';
 import { $require } from './$require';
+import { $sig } from './$sig';
 
 export namespace $account {
 
@@ -64,4 +65,8 @@ export namespace $account {
         // Optimistic match by pattern "timelock/";
         return rgx.test(account.name);
     }
+
+    export function generate(name: string): EoAccount {
+        return $sig.$account.generate({ name });
+    }
 }

package/src/utils/$config.ts

@@ -16,8 +16,8 @@ export namespace $config {
     let envOptions = null;
 
     export function get <T = any> (path: string, $default?: T): T {
-        let value = (typeof $global.app !== 'undefined' ? $global.app.config?.$get?.(path) : null)
-            ?? obj_getProperty(config, path)
+        let value = obj_getProperty(config, path)
+            ?? (typeof $global.app !== 'undefined' ? $global.app.config?.$get?.(path) : null)
             ?? obj_getProperty(envOptions, path);
 
         if (value == null && envOptions == null) {
@@ -79,11 +79,10 @@ export namespace $config {
         let explorer = $config.get<IConfigData['blockchainExplorer']>(`blockchainExplorer`);
         let chains = $config.get<IConfigData['chains']>('chains', []);
 
-
         let explorerConfig = explorer[platform];
         let chainConfig = chains.find(x => x.platform === platform || x.aliases?.includes(platform));
 
-        $require.notNull(explorerConfig || chainConfig, `Unsupported platform ${platform} for web3 client`);
+        $require.notNull(explorerConfig || chainConfig, `Unsupported platform ${platform} for blockchain explorer`);
         return {
             platform,
             ...(chainConfig?.explorers?.[0] ?? {}),
@@ -92,11 +91,10 @@ export namespace $config {
     }
 
     export function set <T = any> (path: string, value: T) {
+        obj_setProperty(config, path, value);
         if (typeof $global.app?.config?.$set === 'function') {
             $global.app.config.$set(path, value);
-            return;
         }
-        obj_setProperty(config, path, value);
     }
 
     /**

package/src/utils/$erc20.ts

@@ -0,0 +1,53 @@
+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';
+
+export namespace $erc20 {
+    export async function setBalanceAny(client: Web3Client, token: TEth.Address, account: TEth.Address, amount: bigint | number) {
+        $require.eq(client.platform, 'hardhat', `Set Balance available only on Hardhat/Forked network`);
+        const erc20 = new ERC20(token, client);
+        const rpc = await client.getRpc();
+
+        const req = await (erc20.$data() as any).balanceOf(account);
+        const balanceTrace = await rpc.request({
+            method: 'debug_traceCall',
+            params: [
+                req,
+                'latest',
+                {
+                    disableMemory: true,
+                    disableStack: true,
+                    disableStorage: false,
+                }
+            ]
+        }) as {
+            returnValue: TEth.Hex
+            failed: boolean
+            structLogs: {
+                "op": "RETURN",
+                "pc": 1698,
+                "storage": Record<string, TEth.Hex>
+            }[]
+        };
+
+        $require.True(balanceTrace.failed === false, `erc20 balance retrieval failed for ${await erc20.symbol()}`);
+        let returnOp = alot(balanceTrace.structLogs.reverse()).find(x => x.op === 'RETURN');
+        $require.notNull(returnOp, `RETURN opcode not found`);
+        $require.notNull(returnOp.storage, `Storage not found`);
+
+        let returnValue = $hex.raw(balanceTrace.returnValue);
+        let slots = alot.fromObject(returnOp.storage).filter(x => x.value === returnValue).toArray();
+        $require.gt(slots.length, 0, `Slot not found`);
+        let SLOT = $hex.ensure(slots[slots.length - 1].key);
+
+        let balance = typeof amount === 'number'
+            ? await $bigint.toWei(amount, await erc20.decimals())
+            : amount;
+
+        await client.debug.setStorageAt(erc20.address, SLOT, $bigint.toHex(balance));
+    }
+}

package/src/utils/$require.ts

@@ -61,17 +61,17 @@ export namespace $require {
         }
         return val;
     }
-    export function notNull<T> (val: T, message: string, ...logs): NonNullable<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}`);
+            throw new Error(`Value is undefined. ${message ?? ''}`);
         }
         return val;
     }
-    export function Null<T> (val: T, message: string, ...logs): T {
+    export function Null<T> (val: T, message?: string, ...logs): T {
         if (val != null) {
             logs?.forEach(log => console.error(log));
-            throw new Error(`Value ${val} expects to be undefined. ${message}`);
+            throw new Error(`Value ${val} expects to be undefined. ${message ?? ''}`);
         }
         return val;
     }

package/tsconfig.json

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

package/tsconfig.umd.json

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