dequanto 0.2.53 → 0.2.56

package/lib/esm/txs/agents/BatchAgent.mjs

@@ -6,6 +6,7 @@ import { $date } from '../../utils/$date.mjs';
 import { $address } from '../../utils/$address.mjs';
 import { $logger } from '../../utils/$logger.mjs';
 import { SafeTx } from '../../safe/SafeTx.mjs';
+import { ZodiacTx } from '../../zodiac/ZodiacTx.mjs';
 import { TimelockController } from '../../prebuilt/openzeppelin/TimelockController.mjs';
 import { TimelockService } from '../../services/TimelockService/TimelockService.mjs';
 import { $contract } from '../../utils/$contract.mjs';
@@ -57,7 +58,7 @@ export class BatchAgent {
     /**
      * Executes the queued transactions.
      *
-     * By default, duplicate transactions are skipped. If the account is Safe or Timelock,
+     * By default, duplicate transactions are skipped. If the account is Safe, Zodiac, or Timelock,
      * prepares the corresponding calldata and submits it as a batch transaction.
      *
      * @param options.includeDuplicates Include duplicate transactions in the execution batch.
@@ -68,10 +69,10 @@ export class BatchAgent {
         if (options?.includeDuplicates !== true) {
             txs = alot(txs).distinctBy(x => {
                 const data = x.outerWriter.builder.data;
-                const acc = x.account ?? x.sender;
-                // remove duplicates by [from,to,data]
+                // Remove duplicates by account, value, target, and calldata.
                 return [
-                    acc.address.toLowerCase(),
+                    this.getAccountKey(x),
+                    String(data.value ?? 0),
                     data.to?.toLowerCase() ?? '',
                     data.data ?? ''
                 ].join('');
@@ -84,9 +85,9 @@ export class BatchAgent {
             let next = i < txs.length - 1
                 ? txs[i + 1]
                 : null;
-            let acc0 = tx.account?.address ?? tx.sender?.address;
-            let acc1 = next?.account?.address ?? next?.sender?.address;
-            if (next == null || $address.eq(acc0, acc1) === false) {
+            let acc0 = this.getAccountKey(tx);
+            let acc1 = next == null ? null : this.getAccountKey(next);
+            if (next == null || acc0 !== acc1) {
                 let arr = await this.executeGroup(txs.slice(groupStart, i + 1));
                 writers.push(...arr);
                 groupStart = i + 1;
@@ -129,9 +130,33 @@ export class BatchAgent {
         }).toArrayAsync();
         return lines.join('\n');
     }
+    getAccountKey(tx) {
+        let account = tx.account ?? tx.sender;
+        let address = (account.address ?? tx.sender?.address)?.toLowerCase();
+        if ($account.isZodiac(account)) {
+            let roleKey = account.roleKey?.toLowerCase() ?? '';
+            return `${address}-${roleKey}`;
+        }
+        return address;
+    }
     async executeGroup(txs) {
         let { account, sender } = txs[0];
         let acc = account ?? sender;
+        if ($account.isZodiac(acc)) {
+            let first = txs[0].outerWriter;
+            let { client, builder, options } = first;
+            let zodiac = new ZodiacTx({
+                ...acc,
+                operator: sender ?? acc.operator
+            }, client, {
+                builder: builder.config,
+                writer: options,
+            });
+            let calls = txs.map(x => x.outerWriter.builder.getTxData());
+            let writer = await zodiac.executeBatch(...calls);
+            await writer.wait();
+            return [writer];
+        }
         if ($account.isSafe(acc)) {
             let tx = await this.executeBatchSafe(acc, txs);
             return [tx];

package/lib/esm/txs/agents/TxWriterAccountAgents.js.map

@@ -1 +1 @@
-{"version":3,"file":"TxWriterAccountAgents.js","sourceRoot":"","sources":["../../../../src/txs/agents/TxWriterAccountAgents.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,iDAA8C;AAC9C,mDAAgD;AAWhD,IAAiB,qBAAqB,CAerC;AAfD,WAAiB,qBAAqB;IAElC,MAAM,MAAM,GAA4B;QACpC,IAAI,qBAAS,EAAE;QACf,IAAI,2BAAY,EAAE;QAClB,IAAI,6BAAa,EAAE;KACtB,CAAC;IAEF,SAAgB,QAAQ,CAAE,KAA4B;QAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAFe,8BAAQ,WAEvB,CAAA;IAED,SAAgB,GAAG,CAAE,OAAiB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IAFe,yBAAG,MAElB,CAAA;AACL,CAAC,EAfgB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAerC"}
+{"version":3,"file":"TxWriterAccountAgents.js","sourceRoot":"","sources":["../../../../src/txs/agents/TxWriterAccountAgents.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AACxC,iDAA8C;AAC9C,mDAAgD;AAChD,+CAA4C;AAW5C,IAAiB,qBAAqB,CAgBrC;AAhBD,WAAiB,qBAAqB;IAElC,MAAM,MAAM,GAA4B;QACpC,IAAI,qBAAS,EAAE;QACf,IAAI,yBAAW,EAAE;QACjB,IAAI,2BAAY,EAAE;QAClB,IAAI,6BAAa,EAAE;KACtB,CAAC;IAEF,SAAgB,QAAQ,CAAE,KAA4B;QAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAFe,8BAAQ,WAEvB,CAAA;IAED,SAAgB,GAAG,CAAE,OAAiB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;IAFe,yBAAG,MAElB,CAAA;AACL,CAAC,EAhBgB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAgBrC"}

package/lib/esm/txs/agents/TxWriterAccountAgents.mjs

@@ -1,10 +1,12 @@
 import { SafeAgent } from './SafeAgent.mjs';
 import { Erc4337Agent } from './Erc4337Agent.mjs';
 import { TimelockAgent } from './TimelockAgent.mjs';
+import { ZodiacAgent } from './ZodiacAgent.mjs';
 export var TxWriterAccountAgents;
 (function (TxWriterAccountAgents) {
     const agents = [
         new SafeAgent(),
+        new ZodiacAgent(),
         new Erc4337Agent(),
         new TimelockAgent(),
     ];

package/lib/esm/txs/agents/ZodiacAgent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ZodiacAgent.js","sourceRoot":"","sources":["../../../../src/txs/agents/ZodiacAgent.ts"],"names":[],"mappings":";;;AACA,sDAAmD;AACnD,uDAAoD;AAIpD,MAAa,WAAW;IACpB,QAAQ,CAAE,OAAiB;QACvB,OAAO,mBAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,MAAiB,EAAE,OAAsB,EAAE,WAAqB;QAC3E,IAAI,MAAM,GAAG,IAAI,mBAAQ,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,CAAC,MAAM,EAAE;YAC5E,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM;YACnC,MAAM,EAAE,WAAW,CAAC,OAAO;SAC9B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3D,CAAC;CACJ;AAZD,kCAYC"}

package/lib/esm/txs/agents/ZodiacAgent.mjs

@@ -0,0 +1,16 @@
+import { $account } from '../../utils/$account.mjs';
+import { ZodiacTx } from '../../zodiac/ZodiacTx.mjs';
+export class ZodiacAgent {
+    supports(account) {
+        return $account.isZodiac(account);
+    }
+    async process(sender, account, outerWriter) {
+        let zodiac = new ZodiacTx({ ...account, operator: sender }, outerWriter.client, {
+            builder: outerWriter.builder.config,
+            writer: outerWriter.options,
+        });
+        return zodiac.execute(outerWriter.builder.getTxData());
+    }
+}
+//# sourceMappingURL=ZodiacAgent.js.map
+//# sourceMappingURL=ZodiacAgent.ts.map

package/lib/esm/utils/$account.js.map

@@ -1 +1 @@
-{"version":3,"file":"$account.js","sourceRoot":"","sources":["../../../src/utils/$account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"$account.js","sourceRoot":"","sources":["../../../src/utils/$account.ts"],"names":[],"mappings":"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"}

package/lib/esm/utils/$account.mjs

@@ -10,13 +10,17 @@ export var $account;
             }
             return { name: account };
         }
-        let acc = isSafe(account) || isErc4337(account) || isTimelock(account)
+        let acc = isSafe(account) || isErc4337(account) || isTimelock(account) || isZodiac(account)
             ? account.operator
             : account;
         $require.notNull(acc, `Sender not resolved for ${account?.address ?? account}`);
         return acc;
     }
     $account.getSender = getSender;
+    function isZodiac(account) {
+        return account != null && typeof account === 'object' && account.type === 'zodiac';
+    }
+    $account.isZodiac = isZodiac;
     function isSafe(account) {
         if (account == null) {
             return false;

package/lib/esm/zodiac/ZodiacTx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ZodiacTx.js","sourceRoot":"","sources":["../../../src/zodiac/ZodiacTx.ts"],"names":[],"mappings":"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"}

package/lib/esm/zodiac/ZodiacTx.mjs

@@ -0,0 +1,79 @@
+import { config } from '../config/Config.mjs';
+import { TxDataBuilder } from '../txs/TxDataBuilder.mjs';
+import { TxWriter } from '../txs/TxWriter.mjs';
+import { $abi } from '../abi/$abi.mjs';
+import { $abiUtils } from '../utils/$abiUtils.mjs';
+import { $hex } from '../utils/$hex.mjs';
+import { $require } from '../utils/$require.mjs';
+/** Roles v2 execution. Inner values are paid by the avatar, not the operator. */
+export class ZodiacTx {
+    constructor(account, client, options) {
+        this.account = account;
+        this.client = client;
+        this.options = options;
+    }
+    /** Encode a transaction to the Roles Modifier without submitting it. */
+    getTxData(call, operation = 0) {
+        $require.Address(this.account.address, 'Zodiac Roles Modifier address');
+        $require.Hex(this.account.roleKey, 'Zodiac roleKey must be hex');
+        $require.Address(call.to, 'Zodiac transaction target');
+        return {
+            to: this.account.address,
+            value: 0n,
+            data: $abi.encodeCall('execTransactionWithRole(address to,uint256 value,bytes data,uint8 operation,bytes32 roleKey,bool shouldRevert)', [
+                call.to,
+                call.value ?? 0n,
+                call.data ?? '0x',
+                operation,
+                $hex.padBytes(this.account.roleKey ?? '0x0', 32),
+                true
+            ])
+        };
+    }
+    /** The Roles Modifier must have an unwrapper registered for this MultiSend deployment. */
+    getBatchTxData(...calls) {
+        $require.gt(calls.length, 0, 'Zodiac batch must not be empty');
+        let getAddress = (key) => {
+            return this.options?.contracts?.[this.client.network]?.[key]
+                ?? config.safe?.contracts?.[this.client.network]?.[key];
+        };
+        let multiSendAddress = getAddress('MultiSendCallOnly') ?? getAddress('MultiSend');
+        $require.Address(multiSendAddress, 'Zodiac MultiSend contract');
+        let transactions = calls.map(call => {
+            $require.Address(call.to, 'Zodiac batch transaction target');
+            let data = call.data ?? '0x';
+            return $abiUtils.encodePacked(['uint8', 0], ['address', call.to], ['uint256', call.value ?? 0n], ['uint256', $hex.getBytesLength(data)], ['bytes', data]);
+        });
+        return this.getTxData({
+            to: multiSendAddress,
+            value: 0n,
+            data: $abi.encodeCall('multiSend(bytes transactions)', [$hex.concat(transactions)])
+        }, 1);
+    }
+    async execute(call) {
+        return this.send(this.getTxData(call));
+    }
+    async executeBatch(...calls) {
+        return this.send(this.getBatchTxData(...calls));
+    }
+    async send(data) {
+        $require.notNull(this.account.operator, 'Zodiac operator is required');
+        let sender = await TxWriter.prepareAccount(this.account.operator);
+        let builder = new TxDataBuilder(this.client, sender, data, this.options?.builder);
+        let config = this.options?.builder;
+        await builder.setGas({
+            price: config?.gasPrice,
+            priceRatio: config?.gasPriceRatio,
+            gasLimit: config?.gasLimit,
+            gasLimitRatio: config?.gasLimitRatio,
+            gasEstimation: config?.gasEstimation,
+            from: config?.from ?? sender.address,
+            type: config?.type,
+        });
+        return TxWriter
+            .create(this.client, builder, sender)
+            .send(this.options?.writer);
+    }
+}
+//# sourceMappingURL=ZodiacTx.js.map
+//# sourceMappingURL=ZodiacTx.ts.map

package/lib/types/contracts/ContractReader.d.ts

@@ -48,7 +48,7 @@ export declare class ContractReader implements IContractReader {
             [key: string]: any;
         } | any[];
     }): Promise<RpcTypes.Filter>;
-    static read<TResult = any>(client: Web3Client, address: TAddress, methodAbi: string): Promise<TResult>;
+    static read<TResult = any>(client: Web3Client, address: TAddress, methodAbi: string, ...params: any[]): Promise<TResult>;
 }
 export declare namespace ContractReaderUtils {
     class DeferredRequest<T = any> {

package/lib/types/gen/Generator.d.ts

@@ -27,6 +27,8 @@ export interface IGenerateOptions {
      * c) Method function to read the implementation address from
      */
     implementation?: TEth.Hex | TEth.Address | string;
+    /** When false: no files will be saved. Use "files" in result */
+    save?: boolean;
     /** ABI will be save alongside with TS classes */
     saveAbi?: boolean;
     /** Sources will not be saved if FALSE */
@@ -44,6 +46,11 @@ export declare class Generator {
         address: `0x${string}`;
         implementation: `0x${string}`;
         contractName: string;
+        files: {
+            kind: string;
+            path: string;
+            content: string;
+        }[];
     }>;
     static generateFromJson(artifact: string): Promise<{
         main: string;
@@ -52,6 +59,11 @@ export declare class Generator {
         address: `0x${string}`;
         implementation: `0x${string}`;
         contractName: string;
+        files: {
+            kind: string;
+            path: string;
+            content: string;
+        }[];
     }>;
     /**
      * @deprecated Was possible to generate the Contract Class based on the meta information header in TS file
@@ -64,6 +76,11 @@ export declare class Generator {
         address: `0x${string}`;
         implementation: `0x${string}`;
         contractName: string;
+        files: {
+            kind: string;
+            path: string;
+            content: string;
+        }[];
     }>;
     private getAbi;
     private getSources;

package/lib/types/gen/GeneratorFromAbi.d.ts

@@ -13,6 +13,8 @@ export declare class GeneratorFromAbi {
         output: string;
         outputFileExt?: string;
         implementation: TAddress;
+        /** No FS writes, use files in response  */
+        save?: boolean;
         saveAbi?: boolean;
         saveSources?: boolean;
         sources?: {
@@ -31,6 +33,11 @@ export declare class GeneratorFromAbi {
         address: `0x${string}`;
         implementation: `0x${string}`;
         contractName: string;
+        files: {
+            kind: string;
+            path: string;
+            content: string;
+        }[];
     }>;
     private getRelativePath;
 }

package/lib/types/models/TAccount.d.ts

@@ -3,7 +3,7 @@ import { TAddress } from './TAddress';
 import { TEth } from './TEth';
 import { TPlatform } from './TPlatform';
 export interface IAccount {
-    type?: 'eoa' | 'safe' | 'erc4337' | 'timelock' | 'impersonated';
+    type?: 'eoa' | 'safe' | 'erc4337' | 'timelock' | 'impersonated' | 'zodiac';
     name?: string;
     platform?: TPlatform;
     address?: TAddress;
@@ -47,5 +47,14 @@ export interface TimelockAccount extends IAccount {
     platform: TPlatform;
     operator: IAccount;
 }
-export type TAccount = string | IAccount | EoAccount | SafeAccount | Erc4337Account;
+export interface ZodiacAccount extends IAccount {
+    type: 'zodiac';
+    platform: TPlatform;
+    /** Zodiac Roles Modifier address, not the Safe/avatar address. */
+    address: TAddress;
+    operator: EoAccount;
+    /** Roles v2 bytes32 role key. */
+    roleKey: TEth.Hex;
+}
+export type TAccount = string | IAccount | EoAccount | SafeAccount | Erc4337Account | ZodiacAccount;
 export {};

package/lib/types/models/TEth.d.ts

@@ -1,3 +1,4 @@
+import type { ZodiacAccount as TZodiacAccount } from './TAccount';
 import type { RpcTypes } from 'dequanto/rpc/Rpc';
 import { TPlatform } from './TPlatform';
 export declare namespace TEth {
@@ -107,7 +108,7 @@ export declare namespace TEth {
     }
     type Platform = 'eth' | 'eth:goerli' | 'bsc' | 'polygon' | 'arbitrum' | 'xdai' | 'boba' | 'hardhat' | 'optimism' | 'avalanche' | string;
     interface IAccount {
-        type?: 'eoa' | 'safe' | 'erc4337' | 'timelock' | 'impersonated';
+        type?: 'eoa' | 'safe' | 'erc4337' | 'timelock' | 'impersonated' | 'zodiac';
         name?: string;
         address?: Address;
         platform?: Platform;
@@ -123,6 +124,8 @@ export declare namespace TEth {
         eth_signTypedData_v4(address: TEth.Address, typedData: Partial<RpcTypes.TypedData>): Promise<TEth.Hex>;
         personal_sign(challenge: string, address: TEth.Address): Promise<TEth.Hex>;
     }
+    interface ZodiacAccount extends TZodiacAccount {
+    }
     interface SafeAccount extends IAccount {
         type: 'safe';
         provider?: 'gnosis';

package/lib/types/services/TimelockService/ITimelockService.d.ts

@@ -45,6 +45,7 @@ export interface ITimelockService {
     }>;
 }
 export interface ITimelockTx {
+    timelock?: TEth.Address;
     id: TEth.Hex;
     key: TEth.Hex;
     salt: TEth.Hex;

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

@@ -1,8 +1,16 @@
+import { type TAbiInput } from 'dequanto/types/TAbi';
 export declare namespace $types {
     function isFixedArray(type: string): boolean;
     function isDynamicArray(type: string): boolean;
     function isArray(type: string): boolean;
     function isStruct(type: string): boolean;
     function isMapping(type: string): boolean;
+    /**
+     * Returns the type size in bits, excluding ABI padding.
+     * Sums element sizes for fixed arrays and tuple declarations.
+     * Returns Infinity for dynamic or unknown types.
+     */
     function sizeOf(type: string): any;
+    /** Number of 32-byte ABI words; Infinity for dynamic or unknown types. */
+    function wordSizeOf(type: string | TAbiInput): number;
 }

package/lib/types/txs/agents/BatchAgent.d.ts

@@ -25,7 +25,7 @@ export declare class BatchAgent implements ITxWriterAgent {
     /**
      * Executes the queued transactions.
      *
-     * By default, duplicate transactions are skipped. If the account is Safe or Timelock,
+     * By default, duplicate transactions are skipped. If the account is Safe, Zodiac, or Timelock,
      * prepares the corresponding calldata and submits it as a batch transaction.
      *
      * @param options.includeDuplicates Include duplicate transactions in the execution batch.
@@ -39,6 +39,7 @@ export declare class BatchAgent implements ITxWriterAgent {
     print(data?: {
         deployments: Deployments[];
     }): Promise<string>;
+    private getAccountKey;
     private executeGroup;
     private executeBatchSafe;
     private executeBatchTimelock;

package/lib/types/txs/agents/ZodiacAgent.d.ts

@@ -0,0 +1,7 @@
+import { EoAccount, TAccount, ZodiacAccount } from 'dequanto/models/TAccount';
+import { TxWriter } from '../TxWriter';
+import { ITxWriterAccountAgent } from './TxWriterAccountAgents';
+export declare class ZodiacAgent implements ITxWriterAccountAgent {
+    supports(account: TAccount): account is ZodiacAccount;
+    process(sender: EoAccount, account: ZodiacAccount, outerWriter: TxWriter): Promise<TxWriter>;
+}

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

@@ -1,6 +1,7 @@
-import { EoAccount, Erc4337Account, SafeAccount, TAccount, TimelockAccount } from "dequanto/models/TAccount";
+import { EoAccount, Erc4337Account, SafeAccount, TAccount, TimelockAccount, ZodiacAccount } from "dequanto/models/TAccount";
 export declare namespace $account {
     function getSender(account: TAccount): EoAccount;
+    function isZodiac(account: TAccount): account is ZodiacAccount;
     function isSafe(account: TAccount): account is SafeAccount;
     function isErc4337(account: TAccount): account is Erc4337Account;
     function isTimelock(account: TAccount): account is TimelockAccount;

package/lib/types/zodiac/ZodiacTx.d.ts

@@ -0,0 +1,30 @@
+import { Web3Client } from 'dequanto/clients/Web3Client';
+import { ZodiacAccount } from 'dequanto/models/TAccount';
+import { TEth } from 'dequanto/models/TEth';
+import { config } from 'dequanto/config/Config';
+import { ITxBuilderOptions } from 'dequanto/txs/ITxBuilderOptions';
+import { ITxWriterOptions, TxWriter } from 'dequanto/txs/TxWriter';
+type TCall = Pick<TEth.TxLike, 'to' | 'data' | 'value'>;
+/** Roles v2 execution. Inner values are paid by the avatar, not the operator. */
+export declare class ZodiacTx {
+    account: ZodiacAccount;
+    client: Web3Client;
+    options?: {
+        contracts?: typeof config.safe.contracts;
+        builder?: ITxBuilderOptions;
+        writer?: ITxWriterOptions;
+    };
+    constructor(account: ZodiacAccount, client: Web3Client, options?: {
+        contracts?: typeof config.safe.contracts;
+        builder?: ITxBuilderOptions;
+        writer?: ITxWriterOptions;
+    });
+    /** Encode a transaction to the Roles Modifier without submitting it. */
+    getTxData(call: TCall, operation?: 0 | 1): TEth.TxLike;
+    /** The Roles Modifier must have an unwrapper registered for this MultiSend deployment. */
+    getBatchTxData(...calls: TCall[]): TEth.TxLike;
+    execute(call: TCall): Promise<TxWriter>;
+    executeBatch(...calls: TCall[]): Promise<TxWriter>;
+    private send;
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dequanto",
-    "version": "0.2.53",
+    "version": "0.2.56",
     "author": {
         "name": "Alex Kit",
         "email": "alex.kit@atmajs.com"

package/skills/dequanto/INDEX.md

@@ -24,7 +24,7 @@ Before using an unfamiliar dequanto API, verify the exact signature in `src/` or
 | Encode/decode ABI data, hash Solidity values, validate inputs, manipulate hex, work with dates, sign data, or capture promise errors | `$abi`, `$contract`, `$require`, `$hex`, `$date`, `$sig`, `$promise` | `references/utils.md` | `examples/utils.spec.ts` |
 | Read Solidity storage, structs, mappings, arrays, or diamond storage | `SlotsParser`, `SlotsStorage`, generated storage readers | `references/storage.md` | `examples/storage.spec.ts` |
 | Work with tokens and balances | `TokensService`, `TokensServiceFactory`, `TokenTransferService`, generated ERC20 wrappers | `references/tokens-accounts.md` | `examples/token-transfer.spec.ts` |
-| Work with accounts, signing, Safe, or ERC-4337 | `ChainAccountService`, `$sig`, `GnosisSafeHandler`, `SafeTx`, `Erc4337Service`, `Erc4337TxWriter` | `references/safe-erc4337.md`, `references/tokens-accounts.md` | `examples/safe-batch.spec.ts`, `examples/erc4337-userop.spec.ts` |
+| Work with accounts, signing, Safe, Zodiac Roles, or ERC-4337 | `ChainAccountService`, `$sig`, `GnosisSafeHandler`, `SafeTx`, `ZodiacAccount`, `ZodiacTx`, `Erc4337Service`, `Erc4337TxWriter` | `references/safe-erc4337.md`, `references/tokens-accounts.md` | `examples/safe-batch.spec.ts`, `examples/erc4337-userop.spec.ts` |
 | Connect a browser wallet (MetaMask, Rabby, etc.) or build a dApp; request accounts, switch chains, or sign/send txs from browser | `client.wallet`, `EIP6963ProviderFactory`, `WalletClient` | `references/browser.md` | `examples/browser-wallet.spec.ts` |
 | Convert code from ethers or viem habits | Use the dequanto equivalents instead of adding external clients | `references/migration-from-ethers-viem.md` | all examples |
 

package/skills/dequanto/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: dequanto
-description: Use when implementing EVM, blockchain, smart-contract, token, RPC, event-indexing, Safe, ERC-4337, storage, deployment, or ABI work in TypeScript projects that use the dequanto framework. Prefer dequanto APIs over ethers, viem, web3.js, raw JSON-RPC, manual explorer HTTP calls, or hand-written ABI encoding unless the user explicitly asks otherwise.
+description: Use when implementing EVM, blockchain, smart-contract, token, RPC, event-indexing, Safe, Zodiac, ERC-4337, storage, deployment, or ABI work in TypeScript projects that use the dequanto framework. Prefer dequanto APIs over ethers, viem, web3.js, raw JSON-RPC, manual explorer HTTP calls, or hand-written ABI encoding unless the user explicitly asks otherwise.
 ---
 
 # Dequanto
@@ -37,6 +37,7 @@ Examples use published `dequanto/...` imports. They retain the repository's `UTe
     - EOA with only `address`: the RPC provider/node is responsible for signing.
     - EOA with `key`: dequanto signs directly; encrypted `p1:0x...` keys require the PIN from environment configuration.
     - `safe`: wrap calldata into a Gnosis Safe transaction. Provide `address` and an `operator`; if enough owners/signers are available, dequanto signs and submits on-chain, otherwise it submits to the Gnosis Safe service for later signing.
+    - `zodiac`: wrap calldata into a Zodiac Roles Modifier `execTransactionWithRole` call and submit directly on-chain. Provide `platform`, the modifier `address`, an EOA `operator`, and a hex `roleKey`. See `./references/safe-erc4337.md` for batching and configuration.
     - `timelock`: wrap calldata into an OpenZeppelin Timelock transaction and submit it via `operator`.
     - `erc4337`: wrap calldata into an ERC-4337 user operation and submit it via `operator`.
 - Account agents can be chained. For example, a Timelock account can use a Safe account as `operator`, so the initial calldata is wrapped first as Timelock calldata and then as Safe transaction calldata.
@@ -44,7 +45,7 @@ Examples use published `dequanto/...` imports. They retain the repository's `UTe
 - Use `BlockchainExplorerFactory` for explorer ABI, source, creation, transactions, and transfers.
 - Prefer generated `contract.storage` readers and `storage.$set(name, value)` when available; use `SlotsParser` and `SlotsStorage` for manual Solidity layouts.
 - Use `Deployments` for idempotent deployments, proxy deployments, beacon deployments, and verification.
-- Use dequanto account-agent flows when the account type says `safe`, `timelock`, or `erc4337`.
+- Use dequanto account-agent flows when the account type says `safe`, `zodiac`, `timelock`, or `erc4337`.
 - For browser and dApp workflows, use `client.wallet` (`WalletClient`) and `EIP6963ProviderFactory` to discover injected wallets, connect accounts, switch chains, and delegate signing.
 
 ## Reference Routing
@@ -62,7 +63,7 @@ Examples use published `dequanto/...` imports. They retain the repository's `UTe
 - ABI, hashing, validation, hex, dates, signing, and promise helpers: `./references/utils.md`
 - Solidity storage: `./references/storage.md`
 - Tokens and accounts: `./references/tokens-accounts.md`
-- Safe and ERC-4337: `./references/safe-erc4337.md`
+- Safe, Zodiac Roles, and ERC-4337: `./references/safe-erc4337.md`
 - Browser wallet and dApp integration: `./references/browser.md`
 - Translating ethers/viem habits: `./references/migration-from-ethers-viem.md`
 

package/skills/dequanto/examples/browser-wallet.spec.ts

@@ -1,3 +1,4 @@
+import { UTest } from 'atma-utest';
 import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
 import { TokenTransferService } from 'dequanto/tokens/TokenTransferService';
 import { $require } from 'dequanto/utils/$require';
@@ -8,7 +9,7 @@ import { MockWallet } from '../../../test/eip6963/MockWallet';
 // In browser applications (dApps), dequanto discovers injected wallets via EIP-6963 / EIP-1193.
 // When an account is connected to client.wallet, TxWriter routes transactions to the browser wallet
 // for signing and submission without needing a private key.
-UTest({
+UTest.create({
     async 'connect to an injected browser wallet and send a transaction' () {
         const client = await Web3ClientFactory.getAsync('hh:memory');
 

package/skills/dequanto/examples/config.spec.ts

@@ -1,10 +1,11 @@
+import { UTest } from 'atma-utest';
 import { Config } from 'dequanto/config/Config';
 import { IRpcConfig } from 'dequanto/clients/ClientPool';
 import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
 import { $require } from 'dequanto/utils/$require';
 import { BlockchainExplorerFactory } from 'dequanto/explorer/BlockchainExplorerFactory';
 
-UTest({
+UTest.create({
     async 'load default configuration before RPC actions' () {
         const config = await Config.fetch();
 

package/skills/dequanto/examples/contract-read.spec.ts

@@ -1,3 +1,4 @@
+import { UTest } from 'atma-utest';
 import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
 import { ContractClassFactory } from 'dequanto/contracts/ContractClassFactory';
 // dequanto ships prebuilt TypeScript clients for all OpenZeppelin contracts.
@@ -13,7 +14,7 @@ import { $address } from 'dequanto/utils/$address';
 const USDC = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' as const;
 const AAVE_POOL = '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2' as const;
 
-UTest({
+UTest.create({
     async 'read data from mainnet using the prebuilt ERC20 contract' () {
         const client = await Web3ClientFactory.getAsync('eth');
         const usdc = new ERC20(USDC, client);

package/skills/dequanto/examples/contract-write.spec.ts

@@ -1,3 +1,4 @@
+import { UTest } from 'atma-utest';
 import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
 import { ContractReader } from 'dequanto/contracts/ContractReader';
 import { ERC20 } from 'dequanto/prebuilt/openzeppelin/ERC20';
@@ -9,7 +10,7 @@ import { $require } from 'dequanto/utils/$require';
 
 const USDC = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' as const;
 
-UTest({
+UTest.create({
     async 'submit a contract write transaction' () {
         // Use getAsync(platform) with a real funded account to submit the same write on mainnet
         const client = await Web3ClientFactory.getAsync('hh:memory:eth');

package/skills/dequanto/examples/deploy-contract.spec.ts

@@ -1,3 +1,4 @@
+import { UTest } from 'atma-utest';
 import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
 import { Deployments } from 'dequanto/contracts/deploy/Deployments';
 import { Generator } from 'dequanto/gen/Generator';
@@ -12,7 +13,7 @@ import { File } from 'atma-io';
 // import { FooContract } from '0xc/hardhat/FooContract/FooContract';
 declare const include: any;
 
-UTest({
+UTest.create({
     async 'deploy a generated contract class with Deployments.ensure' () {
         const { client, deployer, FooContract } = await getContractClass();
         const deployments = new Deployments(client, deployer, {

package/skills/dequanto/examples/erc4337-userop.spec.ts

@@ -1,3 +1,4 @@
+import { UTest } from 'atma-utest';
 import { Web3ClientFactory } from 'dequanto/clients/Web3ClientFactory';
 import { BlockchainExplorerFactory } from 'dequanto/explorer/BlockchainExplorerFactory';
 import { Erc4337Service } from 'dequanto/erc4337/Erc4337Service';
@@ -6,7 +7,7 @@ import { $address } from 'dequanto/utils/$address';
 import { $erc4337 } from 'dequanto/erc4337/utils/$erc4337';
 import { $require } from 'dequanto/utils/$require';
 
-UTest({
+UTest.create({
     async 'hash a UserOperation and create an ERC-4337 service' () {
         const client = await Web3ClientFactory.getAsync('eth');
         const explorer = await BlockchainExplorerFactory.getAsync('eth');

package/skills/dequanto/examples/explorer-abi.spec.ts

@@ -1,8 +1,9 @@
+import { UTest } from 'atma-utest';
 import { BlockchainExplorerFactory } from 'dequanto/explorer/BlockchainExplorerFactory';
 import { $address } from 'dequanto/utils/$address';
 import { $require } from 'dequanto/utils/$require';
 
-UTest({
+UTest.create({
     async 'fetch stable USDC ABI and source from configured Ethereum explorer' () {
         const explorer = await BlockchainExplorerFactory.getAsync('eth');
         const address = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';

package/skills/dequanto/examples/generate-contract-class.spec.ts

@@ -1,10 +1,11 @@
+import { UTest } from 'atma-utest';
 import { Generator } from 'dequanto/gen/Generator';
 import { $require } from 'dequanto/utils/$require';
 import { File } from 'atma-io';
 
 // Generator is the low-level API for creating contract classes programmatically.
 // Prefer 0xweb install for third-party contracts and @0xweb/hardhat for local Hardhat contracts.
-UTest({
+UTest.create({
     async 'generate a typed contract class from a fixture artifact' () {
         const output = './test/tmp/ai-examples/hardhat/';
         const gen = new Generator({