refactor: migrate from UdtHandler to IckbUdt across packages

- Remove udtHandler parameter from LogicManager and OwnedOwnerManager
  constructors; callers now manage UDT cellDeps via IckbUdt.addCellDeps()
- Replace UdtHandler with plain udtScript in OrderManager
- Wire getConfig() to construct IckbUdt with code OutPoints,
  computing the UDT type script dynamically via IckbUdt.typeScriptFrom()
- Delete UDT infrastructure from @ickb/utils (UdtHandler, UdtManager,
  UdtCell, ErrorTransactionInsufficientCoin) — all superseded by CCC

Author: phroi

packages/core/src/logic.ts

@@ -3,7 +3,6 @@ import { DaoManager } from "@ickb/dao";
 import {
   defaultFindCellsLimit,
   type ScriptDeps,
-  type UdtHandler,
   unique,
 } from "@ickb/utils";
 import {
@@ -25,13 +24,11 @@ export class LogicManager implements ScriptDeps {
    * @param script - The script associated with the manager.
    * @param cellDeps - The cell dependencies for the manager.
    * @param daoManager - The DAO manager for handling deposits and receipts.
-   * @param udtHandler - The handler for User Defined Tokens (UDTs).
    */
   constructor(
     public readonly script: ccc.Script,
     public readonly cellDeps: ccc.CellDep[],
     public readonly daoManager: DaoManager,
-    public readonly udtHandler: UdtHandler,
   ) {}
 
   /**
@@ -63,6 +60,9 @@ export class LogicManager implements ScriptDeps {
    * @param depositQuantity - The quantity of deposits.
    * @param depositAmount - The amount of each deposit.
    * @param lock - The lock script for the output receipt cell.
+   *
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction
+   * (e.g., via ickbUdt.addCellDeps(tx)).
    */
   async deposit(
     txLike: ccc.TransactionLike,
@@ -85,7 +85,6 @@ export class LogicManager implements ScriptDeps {
     }
 
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     const capacities = Array.from(
       { length: depositQuantity },
@@ -111,6 +110,9 @@ export class LogicManager implements ScriptDeps {
    *
    * @param txLike - The transaction to add the receipts to.
    * @param receipts - The receipts to add to the transaction.
+   *
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction
+   * (e.g., via ickbUdt.addCellDeps(tx)).
    */
   completeDeposit(
     txLike: ccc.TransactionLike,
@@ -122,7 +124,6 @@ export class LogicManager implements ScriptDeps {
     }
 
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     for (const r of receipts) {
       const hash = r.header.header.hash;

packages/core/src/owned_owner.ts

@@ -3,7 +3,6 @@ import {
   defaultFindCellsLimit,
   unique,
   type ScriptDeps,
-  type UdtHandler,
 } from "@ickb/utils";
 import { daoCellFrom, DaoManager } from "@ickb/dao";
 import { OwnerData } from "./entities.js";
@@ -20,13 +19,11 @@ export class OwnedOwnerManager implements ScriptDeps {
    * @param script - The script associated with the OwnedOwner script.
    * @param cellDeps - The cell dependencies for the OwnedOwner script.
    * @param daoManager - The DAO manager for handling withdrawal requests.
-   * @param udtHandler - The handler for User Defined Tokens (UDTs).
    */
   constructor(
     public readonly script: ccc.Script,
     public readonly cellDeps: ccc.CellDep[],
     public readonly daoManager: DaoManager,
-    public readonly udtHandler: UdtHandler,
   ) {}
 
   /**
@@ -64,6 +61,9 @@ export class OwnedOwnerManager implements ScriptDeps {
    * @param options - Optional parameters for the withdrawal request.
    * @param options.isReadyOnly - Whether to only process ready deposits (default: false).
    * @returns void
+   *
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction
+   * (e.g., via ickbUdt.addCellDeps(tx)).
    */
   async requestWithdrawal(
     txLike: ccc.TransactionLike,
@@ -92,7 +92,6 @@ export class OwnedOwnerManager implements ScriptDeps {
       options,
     );
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     const outputData = OwnerData.encode({ ownedDistance: -deposits.length });
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -118,6 +117,9 @@ export class OwnedOwnerManager implements ScriptDeps {
    * @param options - Optional parameters for the withdrawal process.
    * @param options.isReadyOnly - Whether to only process ready withdrawal groups (default: false).
    * @returns void
+   *
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction
+   * (e.g., via ickbUdt.addCellDeps(tx)).
    */
   async withdraw(
     txLike: ccc.TransactionLike,
@@ -137,7 +139,6 @@ export class OwnedOwnerManager implements ScriptDeps {
     }
 
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     const requests = withdrawalGroups.map((g) => g.owned);
     tx = await this.daoManager.withdraw(tx, requests, client);

packages/order/src/order.ts

@@ -4,7 +4,6 @@ import {
   defaultFindCellsLimit,
   type ExchangeRatio,
   type ScriptDeps,
-  type UdtHandler,
   type ValueComponents,
 } from "@ickb/utils";
 import { Info, OrderData, Ratio, Relative, type InfoLike } from "./entities.js";
@@ -19,12 +18,12 @@ export class OrderManager implements ScriptDeps {
    *
    * @param script - The order script.
    * @param cellDeps - The cell dependencies for the order.
-   * @param udtHandler - The handler for UDT (User Defined Token).
+   * @param udtScript - The UDT (User Defined Token) type script.
    */
   constructor(
     public readonly script: ccc.Script,
     public readonly cellDeps: ccc.CellDep[],
-    public readonly udtHandler: UdtHandler,
+    public readonly udtScript: ccc.Script,
   ) {}
 
   /**
@@ -39,7 +38,7 @@ export class OrderManager implements ScriptDeps {
   isOrder(cell: ccc.Cell): boolean {
     return (
       cell.cellOutput.lock.eq(this.script) &&
-      Boolean(cell.cellOutput.type?.eq(this.udtHandler.script))
+      Boolean(cell.cellOutput.type?.eq(this.udtScript))
     );
   }
 
@@ -156,10 +155,12 @@ export class OrderManager implements ScriptDeps {
    *
    * The method performs the following:
    * - Creates order data using the provided amounts and order information.
-   * - Adds required cell dependencies and UDT handlers to the transaction.
+   * - Adds required cell dependencies to the transaction.
    * - Appends the order cell to the outputs with the UDT data and adjusts the CKB capacity.
    * - Appends a corresponding master cell immediately after the order cell.
    *
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction (e.g., via CCC Udt balance completion).
+   *
    * @param txLike - The transaction to which the order will be added.
    * @param lock - The lock script for the master cell.
    * @param info - The information related to the order, usually calculated using OrderManager.convert.
@@ -187,13 +188,12 @@ export class OrderManager implements ScriptDeps {
     });
 
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     // Append order cell to Outputs
     const position = tx.addOutput(
       {
         lock: this.script,
-        type: this.udtHandler.script,
+        type: this.udtScript,
       },
       data.toBytes(),
     );
@@ -215,6 +215,8 @@ export class OrderManager implements ScriptDeps {
    * - Adds the original order as an input.
    * - Creates an updated output with adjusted CKB capacity and UDT data.
    *
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction (e.g., via CCC Udt balance completion).
+   *
    * @param txLike - The transaction to which the matches will be added.
    * @param match - The match object containing partial matches.
    */
@@ -226,14 +228,13 @@ export class OrderManager implements ScriptDeps {
     }
 
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     for (const { order, ckbOut, udtOut } of partials) {
       tx.addInput(order.cell);
       tx.addOutput(
         {
           lock: this.script,
-          type: this.udtHandler.script,
+          type: this.udtScript,
           capacity: ckbOut,
         },
         OrderData.from({
@@ -495,6 +496,8 @@ export class OrderManager implements ScriptDeps {
    *
    * @param txLike - The transaction to which the groups will be added.
    * @param groups - The array of OrderGroup instances to melt.
+   * @remarks Caller must ensure UDT cellDeps are added to the transaction (e.g., via CCC Udt balance completion).
+   *
    * @param options - Optional parameters:
    *    @param options.isFulfilledOnly - If true, only groups with fulfilled orders will be melted.
    *
@@ -516,7 +519,6 @@ export class OrderManager implements ScriptDeps {
       return tx;
     }
     tx.addCellDeps(this.cellDeps);
-    tx.addCellDeps(this.udtHandler.cellDeps);
 
     for (const group of groups) {
       tx.addInput(group.order.cell);
@@ -615,7 +617,7 @@ export class OrderManager implements ScriptDeps {
    * Finds simple orders on the blockchain.
    *
    * Queries cells whose lock script equals the order script and whose type script
-   * matches the UDT handler's script, returning only valid {@link OrderCell} instances.
+   * matches the UDT type script, returning only valid {@link OrderCell} instances.
    *
    * @param client – The client used to interact with the blockchain.
    * @param limit – Maximum cells to scan per findCells batch.
@@ -632,7 +634,7 @@ export class OrderManager implements ScriptDeps {
         script: this.script,
         scriptType: "lock",
         filter: {
-          script: this.udtHandler.script,
+          script: this.udtScript,
         },
         scriptSearchMode: "exact",
         withData: true,

packages/sdk/src/constants.ts

@@ -1,5 +1,5 @@
 import { ccc } from "@ckb-ccc/core";
-import { IckbUdtManager, LogicManager, OwnedOwnerManager } from "@ickb/core";
+import { IckbUdt, LogicManager, OwnedOwnerManager } from "@ickb/core";
 import { DaoManager } from "@ickb/dao";
 import { OrderManager } from "@ickb/order";
 import { unique, type ScriptDeps } from "@ickb/utils";
@@ -34,13 +34,16 @@ export function getConfig(
 ): {
   managers: {
     dao: DaoManager;
-    ickbUdt: IckbUdtManager;
+    ickbUdt: IckbUdt;
     logic: LogicManager;
     ownedOwner: OwnedOwnerManager;
     order: OrderManager;
   };
   bots: ccc.Script[];
 } {
+  // Capture network before d gets reassigned to ScriptDeps.
+  const network = typeof d === "string" ? d : undefined;
+
   // If deps is provided as a network string, use the pre-defined constants.
   if (d === "mainnet" || d === "testnet") {
     bots = bots.concat(
@@ -57,25 +60,30 @@ export function getConfig(
   }
 
   const dao = new DaoManager(d.dao.script, d.dao.cellDeps);
-  const ickbUdt = new IckbUdtManager(
-    d.udt.script,
-    d.udt.cellDeps,
-    d.logic.script,
-    dao,
-  );
-  const logic = new LogicManager(
+  const ickbUdt = new IckbUdt(
+    // xUDT code cell OutPoint: use known constants for mainnet/testnet,
+    // fall back to first cellDep's outPoint for devnet.
+    network
+      ? (network === "mainnet" ? MAINNET_XUDT_CODE : TESTNET_XUDT_CODE)
+      : d.udt.cellDeps[0]?.outPoint ?? ((): never => { throw new Error("devnet config missing xUDT code cell outPoint in udt.cellDeps"); })(),
+    IckbUdt.typeScriptFrom(
+      ccc.Script.from(d.udt.script),
+      ccc.Script.from(d.logic.script),
+    ),
+    // iCKB Logic code cell OutPoint: same pattern as above.
+    network
+      ? (network === "mainnet" ? MAINNET_LOGIC_CODE : TESTNET_LOGIC_CODE)
+      : d.logic.cellDeps[0]?.outPoint ?? ((): never => { throw new Error("devnet config missing Logic code cell outPoint in logic.cellDeps"); })(),
     d.logic.script,
-    d.logic.cellDeps,
     dao,
-    ickbUdt,
   );
+  const logic = new LogicManager(d.logic.script, d.logic.cellDeps, dao);
   const ownedOwner = new OwnedOwnerManager(
     d.ownedOwner.script,
     d.ownedOwner.cellDeps,
     dao,
-    ickbUdt,
   );
-  const order = new OrderManager(d.order.script, d.order.cellDeps, ickbUdt);
+  const order = new OrderManager(d.order.script, d.order.cellDeps, ickbUdt.script);
 
   return {
     managers: {
@@ -114,13 +122,15 @@ const DAO = {
 };
 
 /**
- * UDT (User Defined Token) lock script information used for onchain validation.
+ * Raw xUDT type script (codeHash + hashType only).
+ * The iCKB UDT type script args are computed dynamically by
+ * IckbUdt.typeScriptFrom() from ICKB_LOGIC.
  */
 const UDT = {
   codeHash:
     "0x50bd8d6680b8b9cf98b73f3c08faf8b2a21914311954118ad6609be6e78a1b95",
   hashType: "data1",
-  args: "0xb73b6ab39d79390c6de90a09c96b290c331baf1798ed6f97aed02590929734e800000080",
+  args: "0x",
 };
 
 /**
@@ -153,6 +163,46 @@ const ORDER = {
   args: "0x",
 };
 
+/**
+ * Mainnet xUDT code cell OutPoint.
+ * Source: forks/contracts/scripts/deployment/mainnet/deployment.toml
+ */
+const MAINNET_XUDT_CODE = {
+  txHash:
+    "0xc07844ce21b38e4b071dd0e1ee3b0e27afd8d7532491327f39b786343f558ab7",
+  index: "0x0",
+};
+
+/**
+ * Mainnet iCKB Logic code cell OutPoint.
+ * Source: forks/contracts/scripts/deployment/mainnet/deployment.toml
+ */
+const MAINNET_LOGIC_CODE = {
+  txHash:
+    "0xd7309191381f5a8a2904b8a79958a9be2752dbba6871fa193dab6aeb29dc8f44",
+  index: "0x0",
+};
+
+/**
+ * Testnet xUDT code cell OutPoint.
+ * Source: forks/contracts/scripts/deployment/testnet/deployment.toml
+ */
+const TESTNET_XUDT_CODE = {
+  txHash:
+    "0xbf6fb538763efec2a70a6a3dcb7242787087e1030c4e7d86585bc63a9d337f5f",
+  index: "0x0",
+};
+
+/**
+ * Testnet iCKB Logic code cell OutPoint.
+ * Source: forks/contracts/scripts/deployment/testnet/deployment.toml
+ */
+const TESTNET_LOGIC_CODE = {
+  txHash:
+    "0x9ac989b3355764f76cdce02c69dedb819fdfbcbda49a7db1a2c9facdfdb9a7fe",
+  index: "0x0",
+};
+
 /**
  * Mainnet dependency group cell dep.
  */

packages/utils/src/index.ts

@@ -1,4 +1,3 @@
 export * from "./codec.js";
 export * from "./heap.js";
-export * from "./udt.js";
 export * from "./utils.js";