@ckb-ccc/core 1.5.3 → 1.7.0

package/dist.commonjs/ckb/transaction.js

@@ -15,16 +15,20 @@ exports.epochFrom = epochFrom;
 exports.epochFromHex = epochFromHex;
 exports.epochToHex = epochToHex;
 exports.udtBalanceFrom = udtBalanceFrom;
+exports.calcDaoProfit = calcDaoProfit;
+exports.calcDaoClaimEpoch = calcDaoClaimEpoch;
 const index_js_1 = require("../bytes/index.js");
-const index_js_2 = require("../fixedPoint/index.js");
-const index_js_3 = require("../hasher/index.js");
-const index_js_4 = require("../hex/index.js");
-const index_js_5 = require("../molecule/index.js");
-const index_js_6 = require("../num/index.js");
-const index_js_7 = require("../utils/index.js");
+const index_js_2 = require("../client/index.js");
+const knownScript_js_1 = require("../client/knownScript.js");
+const index_js_3 = require("../fixedPoint/index.js");
+const index_js_4 = require("../hasher/index.js");
+const index_js_5 = require("../hex/index.js");
+const index_js_6 = require("../molecule/index.js");
+const index_js_7 = require("../num/index.js");
+const index_js_8 = require("../utils/index.js");
 const script_js_1 = require("./script.js");
 const transaction_advanced_js_1 = require("./transaction.advanced.js");
-exports.DepTypeCodec = index_js_5.mol.Codec.from({
+exports.DepTypeCodec = index_js_6.mol.Codec.from({
     byteLength: 1,
     encode: depTypeToBytes,
     decode: depTypeFromBytes,
@@ -94,7 +98,7 @@ function depTypeFromBytes(bytes) {
 /**
  * @public
  */
-let OutPoint = OutPoint_1 = class OutPoint extends index_js_5.mol.Entity.Base() {
+let OutPoint = OutPoint_1 = class OutPoint extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of OutPoint.
      *
@@ -121,20 +125,20 @@ let OutPoint = OutPoint_1 = class OutPoint extends index_js_5.mol.Entity.Base()
         if (outPoint instanceof OutPoint_1) {
             return outPoint;
         }
-        return new OutPoint_1((0, index_js_4.hexFrom)(outPoint.txHash), (0, index_js_6.numFrom)(outPoint.index));
+        return new OutPoint_1((0, index_js_5.hexFrom)(outPoint.txHash), (0, index_js_7.numFrom)(outPoint.index));
     }
 };
 exports.OutPoint = OutPoint;
 exports.OutPoint = OutPoint = OutPoint_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol.struct({
-        txHash: index_js_5.mol.Byte32,
-        index: index_js_5.mol.Uint32,
+    index_js_6.mol.codec(index_js_6.mol.struct({
+        txHash: index_js_6.mol.Byte32,
+        index: index_js_6.mol.Uint32,
     }))
 ], OutPoint);
 /**
  * @public
  */
-let CellOutput = CellOutput_1 = class CellOutput extends index_js_5.mol.Entity.Base() {
+let CellOutput = CellOutput_1 = class CellOutput extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of CellOutput.
      *
@@ -170,18 +174,18 @@ let CellOutput = CellOutput_1 = class CellOutput extends index_js_5.mol.Entity.B
         if (cellOutput instanceof CellOutput_1) {
             return cellOutput;
         }
-        return new CellOutput_1((0, index_js_6.numFrom)(cellOutput.capacity), script_js_1.Script.from(cellOutput.lock), (0, index_js_7.apply)(script_js_1.Script.from, cellOutput.type));
+        return new CellOutput_1((0, index_js_7.numFrom)(cellOutput.capacity), script_js_1.Script.from(cellOutput.lock), (0, index_js_8.apply)(script_js_1.Script.from, cellOutput.type));
     }
 };
 exports.CellOutput = CellOutput;
 exports.CellOutput = CellOutput = CellOutput_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol.table({
-        capacity: index_js_5.mol.Uint64,
+    index_js_6.mol.codec(index_js_6.mol.table({
+        capacity: index_js_6.mol.Uint64,
         lock: script_js_1.Script,
         type: script_js_1.ScriptOpt,
     }))
 ], CellOutput);
-exports.CellOutputVec = index_js_5.mol.vector(CellOutput);
+exports.CellOutputVec = index_js_6.mol.vector(CellOutput);
 /**
  * @public
  */
@@ -208,7 +212,83 @@ class Cell {
         if (cell instanceof Cell) {
             return cell;
         }
-        return new Cell(OutPoint.from(cell.outPoint), CellOutput.from(cell.cellOutput), (0, index_js_4.hexFrom)(cell.outputData));
+        return new Cell(OutPoint.from("outPoint" in cell ? cell.outPoint : cell.previousOutput), CellOutput.from(cell.cellOutput), (0, index_js_5.hexFrom)(cell.outputData));
+    }
+    get capacityFree() {
+        const occupiedSize = (0, index_js_3.fixedPointFrom)(this.cellOutput.occupiedSize + (0, index_js_1.bytesFrom)(this.outputData).length);
+        return this.cellOutput.capacity - occupiedSize;
+    }
+    /**
+     * Occupied bytes of a cell on chain
+     * It's CellOutput.occupiedSize + bytesFrom(outputData).byteLength
+     */
+    get occupiedSize() {
+        return this.cellOutput.occupiedSize + (0, index_js_1.bytesFrom)(this.outputData).byteLength;
+    }
+    /**
+     * Gets confirmed Nervos DAO profit of a Cell
+     * It returns non-zero value only when the cell is in withdrawal phase 2
+     * See https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0023-dao-deposit-withdraw/0023-dao-deposit-withdraw.md
+     *
+     * @param client - A client for searching DAO related headers
+     * @returns Profit
+     *
+     * @example
+     * ```typescript
+     * const profit = await cell.getDaoProfit(client);
+     * ```
+     */
+    async getDaoProfit(client) {
+        if (!(await this.isNervosDao(client, "withdrew"))) {
+            return index_js_3.Zero;
+        }
+        const { depositHeader, withdrawHeader } = await this.getNervosDaoInfo(client);
+        if (!withdrawHeader || !depositHeader) {
+            throw new Error(`Unable to get headers of a Nervos DAO cell ${this.outPoint.txHash}:${this.outPoint.index.toString()}`);
+        }
+        return calcDaoProfit(this.capacityFree, depositHeader, withdrawHeader);
+    }
+    async isNervosDao(client, phase) {
+        const { type } = this.cellOutput;
+        const daoType = await client.getKnownScript(knownScript_js_1.KnownScript.NervosDao);
+        if (!type ||
+            type.codeHash !== daoType.codeHash ||
+            type.hashType !== daoType.hashType) {
+            // Non Nervos DAO cell
+            return false;
+        }
+        const hasWithdrew = (0, index_js_7.numFrom)(this.outputData) !== index_js_3.Zero;
+        return (!phase ||
+            (phase === "deposited" && !hasWithdrew) ||
+            (phase === "withdrew" && hasWithdrew));
+    }
+    async getNervosDaoInfo(client) {
+        if (!(await this.isNervosDao(client))) {
+            // Non Nervos DAO cell
+            return {};
+        }
+        if ((0, index_js_7.numFrom)(this.outputData) === index_js_3.Zero) {
+            // Deposited Nervos DAO cell
+            const depositRes = await client.getCellWithHeader(this.outPoint);
+            if (!depositRes?.header) {
+                throw new Error(`Unable to get header of a Nervos DAO deposited cell ${this.outPoint.txHash}:${this.outPoint.index.toString()}`);
+            }
+            return {
+                depositHeader: depositRes.header,
+            };
+        }
+        // Withdrew Nervos DAO cell
+        const [depositHeader, withdrawRes] = await Promise.all([
+            client.getHeaderByNumber((0, index_js_7.numFromBytes)(this.outputData)),
+            client.getCellWithHeader(this.outPoint),
+        ]);
+        if (!withdrawRes?.header || !depositHeader) {
+            throw new Error(`Unable to get headers of a Nervos DAO withdrew cell ${this.outPoint.txHash}:${this.outPoint.index.toString()}`);
+        }
+        return {
+            depositHeader,
+            withdrawHeader: withdrawRes.header,
+        };
     }
     /**
      * Clone a Cell
@@ -229,17 +309,17 @@ exports.Cell = Cell;
  * @public
  */
 function epochFrom(epochLike) {
-    return [(0, index_js_6.numFrom)(epochLike[0]), (0, index_js_6.numFrom)(epochLike[1]), (0, index_js_6.numFrom)(epochLike[2])];
+    return [(0, index_js_7.numFrom)(epochLike[0]), (0, index_js_7.numFrom)(epochLike[1]), (0, index_js_7.numFrom)(epochLike[2])];
 }
 /**
  * @public
  */
 function epochFromHex(hex) {
-    const num = (0, index_js_6.numFrom)((0, index_js_4.hexFrom)(hex));
+    const num = (0, index_js_7.numFrom)((0, index_js_5.hexFrom)(hex));
     return [
-        num & (0, index_js_6.numFrom)("0xffffff"),
-        (num >> (0, index_js_6.numFrom)(24)) & (0, index_js_6.numFrom)("0xffff"),
-        (num >> (0, index_js_6.numFrom)(40)) & (0, index_js_6.numFrom)("0xffff"),
+        num & (0, index_js_7.numFrom)("0xffffff"),
+        (num >> (0, index_js_7.numFrom)(24)) & (0, index_js_7.numFrom)("0xffff"),
+        (num >> (0, index_js_7.numFrom)(40)) & (0, index_js_7.numFrom)("0xffff"),
     ];
 }
 /**
@@ -247,14 +327,14 @@ function epochFromHex(hex) {
  */
 function epochToHex(epochLike) {
     const epoch = epochFrom(epochLike);
-    return (0, index_js_6.numToHex)((0, index_js_6.numFrom)(epoch[0]) +
-        ((0, index_js_6.numFrom)(epoch[1]) << (0, index_js_6.numFrom)(24)) +
-        ((0, index_js_6.numFrom)(epoch[2]) << (0, index_js_6.numFrom)(40)));
+    return (0, index_js_7.numToHex)((0, index_js_7.numFrom)(epoch[0]) +
+        ((0, index_js_7.numFrom)(epoch[1]) << (0, index_js_7.numFrom)(24)) +
+        ((0, index_js_7.numFrom)(epoch[2]) << (0, index_js_7.numFrom)(40)));
 }
 /**
  * @public
  */
-let Since = Since_1 = class Since extends index_js_5.mol.Entity.Base() {
+let Since = Since_1 = class Since extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of Since.
      *
@@ -297,7 +377,7 @@ let Since = Since_1 = class Since extends index_js_5.mol.Entity.Base() {
             return since;
         }
         if (typeof since === "object" && "relative" in since) {
-            return new Since_1(since.relative, since.metric, (0, index_js_6.numFrom)(since.value));
+            return new Since_1(since.relative, since.metric, (0, index_js_7.numFrom)(since.value));
         }
         return Since_1.fromNum(since);
     }
@@ -313,11 +393,11 @@ let Since = Since_1 = class Since extends index_js_5.mol.Entity.Base() {
      */
     toNum() {
         return (this.value |
-            (this.relative === "absolute" ? index_js_2.Zero : (0, index_js_6.numFrom)("0x8000000000000000")) |
+            (this.relative === "absolute" ? index_js_3.Zero : (0, index_js_7.numFrom)("0x8000000000000000")) |
             {
-                blockNumber: (0, index_js_6.numFrom)("0x0000000000000000"),
-                epoch: (0, index_js_6.numFrom)("0x2000000000000000"),
-                timestamp: (0, index_js_6.numFrom)("0x4000000000000000"),
+                blockNumber: (0, index_js_7.numFrom)("0x0000000000000000"),
+                epoch: (0, index_js_7.numFrom)("0x2000000000000000"),
+                timestamp: (0, index_js_7.numFrom)("0x4000000000000000"),
             }[this.metric]);
     }
     /**
@@ -332,21 +412,21 @@ let Since = Since_1 = class Since extends index_js_5.mol.Entity.Base() {
      * ```
      */
     static fromNum(numLike) {
-        const num = (0, index_js_6.numFrom)(numLike);
-        const relative = num >> (0, index_js_6.numFrom)(63) === index_js_2.Zero ? "absolute" : "relative";
-        const metric = ["blockNumber", "epoch", "timestamp"][Number((num >> (0, index_js_6.numFrom)(61)) & (0, index_js_6.numFrom)(3))];
-        const value = num & (0, index_js_6.numFrom)("0x00ffffffffffffff");
+        const num = (0, index_js_7.numFrom)(numLike);
+        const relative = num >> (0, index_js_7.numFrom)(63) === index_js_3.Zero ? "absolute" : "relative";
+        const metric = ["blockNumber", "epoch", "timestamp"][Number((num >> (0, index_js_7.numFrom)(61)) & (0, index_js_7.numFrom)(3))];
+        const value = num & (0, index_js_7.numFrom)("0x00ffffffffffffff");
         return new Since_1(relative, metric, value);
     }
 };
 exports.Since = Since;
 exports.Since = Since = Since_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol.Uint64.mapIn((encodable) => Since.from(encodable).toNum()))
+    index_js_6.mol.codec(index_js_6.mol.Uint64.mapIn((encodable) => Since.from(encodable).toNum()))
 ], Since);
 /**
  * @public
  */
-let CellInput = CellInput_1 = class CellInput extends index_js_5.mol.Entity.Base() {
+let CellInput = CellInput_1 = class CellInput extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of CellInput.
      *
@@ -380,16 +460,31 @@ let CellInput = CellInput_1 = class CellInput extends index_js_5.mol.Entity.Base
         if (cellInput instanceof CellInput_1) {
             return cellInput;
         }
-        return new CellInput_1(OutPoint.from(cellInput.previousOutput), Since.from(cellInput.since ?? 0).toNum(), (0, index_js_7.apply)(CellOutput.from, cellInput.cellOutput), (0, index_js_7.apply)(index_js_4.hexFrom, cellInput.outputData));
+        return new CellInput_1(OutPoint.from("previousOutput" in cellInput
+            ? cellInput.previousOutput
+            : cellInput.outPoint), Since.from(cellInput.since ?? 0).toNum(), (0, index_js_8.apply)(CellOutput.from, cellInput.cellOutput), (0, index_js_8.apply)(index_js_5.hexFrom, cellInput.outputData));
+    }
+    async getCell(client) {
+        await this.completeExtraInfos(client);
+        if (!this.cellOutput || !this.outputData) {
+            throw new Error("Unable to complete input");
+        }
+        return Cell.from({
+            outPoint: this.previousOutput,
+            cellOutput: this.cellOutput,
+            outputData: this.outputData,
+        });
     }
     /**
-     * Complete extra infos in the input. Like the output of the out point.
+     * Complete extra infos in the input. Including
+     * - Previous cell output
+     * - Previous cell data
      * The instance will be modified.
      *
      * @returns true if succeed.
      * @example
      * ```typescript
-     * await cellInput.completeExtraInfos();
+     * await cellInput.completeExtraInfos(client);
      * ```
      */
     async completeExtraInfos(client) {
@@ -403,24 +498,35 @@ let CellInput = CellInput_1 = class CellInput extends index_js_5.mol.Entity.Base
         this.cellOutput = cell.cellOutput;
         this.outputData = cell.outputData;
     }
+    /**
+     * The extra capacity created when consume this input.
+     * This is usually NervosDAO interest, see https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0023-dao-deposit-withdraw/0023-dao-deposit-withdraw.md.
+     * And it can also be miners' income. (But this is not implemented yet)
+     */
+    async getExtraCapacity(client) {
+        return (await this.getCell(client)).getDaoProfit(client);
+    }
+    clone() {
+        const cloned = super.clone();
+        cloned.cellOutput = this.cellOutput;
+        cloned.outputData = this.outputData;
+        return cloned;
+    }
 };
 exports.CellInput = CellInput;
 exports.CellInput = CellInput = CellInput_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol
+    index_js_6.mol.codec(index_js_6.mol
         .struct({
         since: Since,
         previousOutput: OutPoint,
     })
-        .mapIn((encodable) => ({
-        ...encodable,
-        since: encodable.since ?? 0,
-    })))
+        .mapIn((encodable) => CellInput.from(encodable)))
 ], CellInput);
-exports.CellInputVec = index_js_5.mol.vector(CellInput);
+exports.CellInputVec = index_js_6.mol.vector(CellInput);
 /**
  * @public
  */
-let CellDep = CellDep_1 = class CellDep extends index_js_5.mol.Entity.Base() {
+let CellDep = CellDep_1 = class CellDep extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of CellDep.
      *
@@ -468,16 +574,16 @@ let CellDep = CellDep_1 = class CellDep extends index_js_5.mol.Entity.Base() {
 };
 exports.CellDep = CellDep;
 exports.CellDep = CellDep = CellDep_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol.struct({
+    index_js_6.mol.codec(index_js_6.mol.struct({
         outPoint: OutPoint,
         depType: exports.DepTypeCodec,
     }))
 ], CellDep);
-exports.CellDepVec = index_js_5.mol.vector(CellDep);
+exports.CellDepVec = index_js_6.mol.vector(CellDep);
 /**
  * @public
  */
-let WitnessArgs = WitnessArgs_1 = class WitnessArgs extends index_js_5.mol.Entity.Base() {
+let WitnessArgs = WitnessArgs_1 = class WitnessArgs extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of WitnessArgs.
      *
@@ -510,36 +616,38 @@ let WitnessArgs = WitnessArgs_1 = class WitnessArgs extends index_js_5.mol.Entit
         if (witnessArgs instanceof WitnessArgs_1) {
             return witnessArgs;
         }
-        return new WitnessArgs_1((0, index_js_7.apply)(index_js_4.hexFrom, witnessArgs.lock), (0, index_js_7.apply)(index_js_4.hexFrom, witnessArgs.inputType), (0, index_js_7.apply)(index_js_4.hexFrom, witnessArgs.outputType));
+        return new WitnessArgs_1((0, index_js_8.apply)(index_js_5.hexFrom, witnessArgs.lock), (0, index_js_8.apply)(index_js_5.hexFrom, witnessArgs.inputType), (0, index_js_8.apply)(index_js_5.hexFrom, witnessArgs.outputType));
     }
 };
 exports.WitnessArgs = WitnessArgs;
 exports.WitnessArgs = WitnessArgs = WitnessArgs_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol.table({
-        lock: index_js_5.mol.BytesOpt,
-        inputType: index_js_5.mol.BytesOpt,
-        outputType: index_js_5.mol.BytesOpt,
+    index_js_6.mol.codec(index_js_6.mol.table({
+        lock: index_js_6.mol.BytesOpt,
+        inputType: index_js_6.mol.BytesOpt,
+        outputType: index_js_6.mol.BytesOpt,
     }))
 ], WitnessArgs);
 /**
+ * Convert a bytes to a num.
+ *
  * @public
  */
 function udtBalanceFrom(dataLike) {
     const data = (0, index_js_1.bytesFrom)(dataLike).slice(0, 16);
-    return (0, index_js_6.numFromBytes)(data);
+    return data.length === 0 ? index_js_3.Zero : (0, index_js_7.numFromBytes)(data);
 }
-exports.RawTransaction = index_js_5.mol.table({
-    version: index_js_5.mol.Uint32,
+exports.RawTransaction = index_js_6.mol.table({
+    version: index_js_6.mol.Uint32,
     cellDeps: exports.CellDepVec,
-    headerDeps: index_js_5.mol.Byte32Vec,
+    headerDeps: index_js_6.mol.Byte32Vec,
     inputs: exports.CellInputVec,
     outputs: exports.CellOutputVec,
-    outputsData: index_js_5.mol.BytesVec,
+    outputsData: index_js_6.mol.BytesVec,
 });
 /**
  * @public
  */
-let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entity.Base() {
+let Transaction = Transaction_1 = class Transaction extends index_js_6.mol.Entity.Base() {
     /**
      * Creates an instance of Transaction.
      *
@@ -620,17 +728,17 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
                 ...output,
                 capacity: output.capacity ?? 0,
             });
-            if (o.capacity === index_js_2.Zero) {
-                o.capacity = (0, index_js_2.fixedPointFrom)(o.occupiedSize +
-                    ((0, index_js_7.apply)(index_js_1.bytesFrom, tx.outputsData?.[i])?.length ?? 0));
+            if (o.capacity === index_js_3.Zero) {
+                o.capacity = (0, index_js_3.fixedPointFrom)(o.occupiedSize +
+                    ((0, index_js_8.apply)(index_js_1.bytesFrom, tx.outputsData?.[i])?.length ?? 0));
             }
             return o;
         }) ?? [];
-        const outputsData = outputs.map((_, i) => (0, index_js_4.hexFrom)(tx.outputsData?.[i] ?? "0x"));
+        const outputsData = outputs.map((_, i) => (0, index_js_5.hexFrom)(tx.outputsData?.[i] ?? "0x"));
         if (tx.outputsData != null && outputsData.length < tx.outputsData.length) {
-            outputsData.push(...tx.outputsData.slice(outputsData.length).map((d) => (0, index_js_4.hexFrom)(d)));
+            outputsData.push(...tx.outputsData.slice(outputsData.length).map((d) => (0, index_js_5.hexFrom)(d)));
         }
-        return new Transaction_1((0, index_js_6.numFrom)(tx.version ?? 0), tx.cellDeps?.map((cellDep) => CellDep.from(cellDep)) ?? [], tx.headerDeps?.map(index_js_4.hexFrom) ?? [], tx.inputs?.map((input) => CellInput.from(input)) ?? [], outputs, outputsData, tx.witnesses?.map(index_js_4.hexFrom) ?? []);
+        return new Transaction_1((0, index_js_7.numFrom)(tx.version ?? 0), tx.cellDeps?.map((cellDep) => CellDep.from(cellDep)) ?? [], tx.headerDeps?.map(index_js_5.hexFrom) ?? [], tx.inputs?.map((input) => CellInput.from(input)) ?? [], outputs, outputsData, tx.witnesses?.map(index_js_5.hexFrom) ?? []);
     }
     /**
      * Creates a Transaction instance from a Lumos skeleton.
@@ -666,10 +774,15 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
             witnesses: skeleton.witnesses.toArray(),
         });
     }
+    /**
+     * @deprecated
+     * Use ccc.stringify instead.
+     * stringify the tx to JSON string.
+     */
     stringify() {
         return JSON.stringify(this, (_, value) => {
             if (typeof value === "bigint") {
-                return (0, index_js_6.numToHex)(value);
+                return (0, index_js_7.numToHex)(value);
             }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return value;
@@ -700,7 +813,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
      * ```
      */
     hash() {
-        return (0, index_js_3.hashCkb)(this.rawToBytes());
+        return (0, index_js_4.hashCkb)(this.rawToBytes());
     }
     /**
      * Calculates the hash of the transaction with witnesses.
@@ -713,7 +826,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
      * ```
      */
     hashFull() {
-        return (0, index_js_3.hashCkb)(this.toBytes());
+        return (0, index_js_4.hashCkb)(this.toBytes());
     }
     /**
      * Hashes a witness and updates the hasher.
@@ -727,8 +840,8 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
      * ```
      */
     static hashWitnessToHasher(witness, hasher) {
-        const raw = (0, index_js_1.bytesFrom)((0, index_js_4.hexFrom)(witness));
-        hasher.update((0, index_js_6.numToBytes)(raw.length, 8));
+        const raw = (0, index_js_1.bytesFrom)((0, index_js_5.hexFrom)(witness));
+        hasher.update((0, index_js_7.numToBytes)(raw.length, 8));
         hasher.update(raw);
     }
     /**
@@ -748,18 +861,15 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
      * }
      * ```
      */
-    async getSignHashInfo(scriptLike, client, hasher = new index_js_3.HasherCkb()) {
+    async getSignHashInfo(scriptLike, client, hasher = new index_js_4.HasherCkb()) {
         const script = script_js_1.Script.from(scriptLike);
         let position = -1;
         hasher.update(this.hash());
         for (let i = 0; i < this.witnesses.length; i += 1) {
             const input = this.inputs[i];
             if (input) {
-                await input.completeExtraInfos(client);
-                if (!input.cellOutput) {
-                    throw new Error("Unable to complete input");
-                }
-                if (!script.eq(input.cellOutput.lock)) {
+                const { cellOutput } = await input.getCell(client);
+                if (!script.eq(cellOutput.lock)) {
                     continue;
                 }
                 if (position === -1) {
@@ -794,13 +904,9 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
     async findInputIndexByLockId(scriptIdLike, client) {
         const script = script_js_1.Script.from({ ...scriptIdLike, args: "0x" });
         for (let i = 0; i < this.inputs.length; i += 1) {
-            const input = this.inputs[i];
-            await input.completeExtraInfos(client);
-            if (!input.cellOutput) {
-                throw new Error("Unable to complete input");
-            }
-            if (script.codeHash === input.cellOutput.lock.codeHash &&
-                script.hashType === input.cellOutput.lock.hashType) {
+            const { cellOutput } = await this.inputs[i].getCell(client);
+            if (script.codeHash === cellOutput.lock.codeHash &&
+                script.hashType === cellOutput.lock.hashType) {
                 return i;
             }
         }
@@ -820,12 +926,8 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
     async findInputIndexByLock(scriptLike, client) {
         const script = script_js_1.Script.from(scriptLike);
         for (let i = 0; i < this.inputs.length; i += 1) {
-            const input = this.inputs[i];
-            await input.completeExtraInfos(client);
-            if (!input.cellOutput) {
-                throw new Error("Unable to complete input");
-            }
-            if (script.eq(input.cellOutput.lock)) {
+            const { cellOutput } = await this.inputs[i].getCell(client);
+            if (script.eq(cellOutput.lock)) {
                 return i;
             }
         }
@@ -845,12 +947,8 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
     async findLastInputIndexByLock(scriptLike, client) {
         const script = script_js_1.Script.from(scriptLike);
         for (let i = this.inputs.length - 1; i >= 0; i -= 1) {
-            const input = this.inputs[i];
-            await input.completeExtraInfos(client);
-            if (!input.cellOutput) {
-                throw new Error("Unable to complete input");
-            }
-            if (script.eq(input.cellOutput.lock)) {
+            const { cellOutput } = await this.inputs[i].getCell(client);
+            if (script.eq(cellOutput.lock)) {
                 return i;
             }
         }
@@ -938,7 +1036,56 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         if (this.outputsData.length < index) {
             this.outputsData.push(...Array.from(new Array(index - this.outputsData.length), () => "0x"));
         }
-        this.outputsData[index] = (0, index_js_4.hexFrom)(witness);
+        this.outputsData[index] = (0, index_js_5.hexFrom)(witness);
+    }
+    /**
+     * get input
+     *
+     * @param index - The cell input index
+     *
+     * @example
+     * ```typescript
+     * await tx.getInput(0);
+     * ```
+     */
+    getInput(index) {
+        return this.inputs[Number((0, index_js_7.numFrom)(index))];
+    }
+    /**
+     * add input
+     *
+     * @param inputLike - The cell input.
+     *
+     * @example
+     * ```typescript
+     * await tx.addInput({ });
+     * ```
+     */
+    addInput(inputLike) {
+        if (this.witnesses.length > this.inputs.length) {
+            this.witnesses.splice(this.inputs.length, 0, "0x");
+        }
+        return this.inputs.push(CellInput.from(inputLike));
+    }
+    /**
+     * get output
+     *
+     * @param index - The cell output index
+     *
+     * @example
+     * ```typescript
+     * await tx.getOutput(0);
+     * ```
+     */
+    getOutput(index) {
+        const i = Number((0, index_js_7.numFrom)(index));
+        if (i >= this.outputs.length) {
+            return;
+        }
+        return {
+            cellOutput: this.outputs[i],
+            outputData: this.outputsData[i] ?? "0x",
+        };
     }
     /**
      * Add output
@@ -956,11 +1103,12 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
             ...outputLike,
             capacity: outputLike.capacity ?? 0,
         });
-        if (output.capacity === index_js_2.Zero) {
-            output.capacity = (0, index_js_2.fixedPointFrom)(output.occupiedSize + (0, index_js_1.bytesFrom)(outputData).length);
+        if (output.capacity === index_js_3.Zero) {
+            output.capacity = (0, index_js_3.fixedPointFrom)(output.occupiedSize + (0, index_js_1.bytesFrom)(outputData).length);
         }
-        const i = this.outputs.push(output) - 1;
-        this.setOutputDataAt(i, outputData);
+        const len = this.outputs.push(output);
+        this.setOutputDataAt(len - 1, outputData);
+        return len;
     }
     /**
      * Get witness at index as WitnessArgs
@@ -991,10 +1139,24 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
      * ```
      */
     setWitnessArgsAt(index, witness) {
+        this.setWitnessAt(index, witness.toBytes());
+    }
+    /**
+     * Set witness at index
+     *
+     * @param index - The index of the witness.
+     * @param witness - The witness to set.
+     *
+     * @example
+     * ```typescript
+     * await tx.setWitnessAt(0, witness);
+     * ```
+     */
+    setWitnessAt(index, witness) {
         if (this.witnesses.length < index) {
             this.witnesses.push(...Array.from(new Array(index - this.witnesses.length), () => "0x"));
         }
-        this.witnesses[index] = (0, index_js_4.hexFrom)(witness.toBytes());
+        this.witnesses[index] = (0, index_js_5.hexFrom)(witness);
     }
     /**
      * Prepare dummy witness for sighash all method
@@ -1015,32 +1177,30 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
             return;
         }
         const witness = this.getWitnessArgsAt(position) ?? WitnessArgs.from({});
-        witness.lock = (0, index_js_4.hexFrom)(Array.from(new Array(lockLen), () => 0));
+        witness.lock = (0, index_js_5.hexFrom)(Array.from(new Array(lockLen), () => 0));
         this.setWitnessArgsAt(position, witness);
     }
+    async getInputsCapacityExtra(client) {
+        return (0, index_js_8.reduceAsync)(this.inputs, async (acc, input) => acc + (await input.getExtraCapacity(client)), (0, index_js_7.numFrom)(0));
+    }
+    // This also includes extra amount
     async getInputsCapacity(client) {
-        return (0, index_js_7.reduceAsync)(this.inputs, async (acc, input) => {
-            await input.completeExtraInfos(client);
-            if (!input.cellOutput) {
-                throw new Error("Unable to complete input");
-            }
-            return acc + input.cellOutput.capacity;
-        }, (0, index_js_6.numFrom)(0));
+        return ((await (0, index_js_8.reduceAsync)(this.inputs, async (acc, input) => {
+            const { cellOutput: { capacity }, } = await input.getCell(client);
+            return acc + capacity;
+        }, (0, index_js_7.numFrom)(0))) + (await this.getInputsCapacityExtra(client)));
     }
     getOutputsCapacity() {
-        return this.outputs.reduce((acc, { capacity }) => acc + capacity, (0, index_js_6.numFrom)(0));
+        return this.outputs.reduce((acc, { capacity }) => acc + capacity, (0, index_js_7.numFrom)(0));
     }
     async getInputsUdtBalance(client, type) {
-        return (0, index_js_7.reduceAsync)(this.inputs, async (acc, input) => {
-            await input.completeExtraInfos(client);
-            if (!input.cellOutput || !input.outputData) {
-                throw new Error("Unable to complete input");
-            }
-            if (!input.cellOutput.type?.eq(type)) {
+        return (0, index_js_8.reduceAsync)(this.inputs, async (acc, input) => {
+            const { cellOutput, outputData } = await input.getCell(client);
+            if (!cellOutput.type?.eq(type)) {
                 return;
             }
-            return acc + udtBalanceFrom(input.outputData);
-        }, (0, index_js_6.numFrom)(0));
+            return acc + udtBalanceFrom(outputData);
+        }, (0, index_js_7.numFrom)(0));
     }
     getOutputsUdtBalance(type) {
         return this.outputs.reduce((acc, output, i) => {
@@ -1048,7 +1208,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
                 return acc;
             }
             return acc + udtBalanceFrom(this.outputsData[i]);
-        }, (0, index_js_6.numFrom)(0));
+        }, (0, index_js_7.numFrom)(0));
     }
     async completeInputs(from, filter, accumulator, init) {
         const collectedCells = [];
@@ -1066,11 +1226,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
             }
             acc = next;
         }
-        this.inputs.push(...collectedCells.map(({ outPoint, outputData, cellOutput }) => CellInput.from({
-            previousOutput: outPoint,
-            outputData,
-            cellOutput,
-        })));
+        collectedCells.forEach((cell) => this.addInput(cell));
         if (fulfilled) {
             return {
                 addedCount: collectedCells.length,
@@ -1082,7 +1238,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         };
     }
     async completeInputsByCapacity(from, capacityTweak, filter) {
-        const exceptedCapacity = this.getOutputsCapacity() + (0, index_js_6.numFrom)(capacityTweak ?? 0);
+        const exceptedCapacity = this.getOutputsCapacity() + (0, index_js_7.numFrom)(capacityTweak ?? 0);
         const inputsCapacity = await this.getInputsCapacity(from.client);
         if (inputsCapacity >= exceptedCapacity) {
             return 0;
@@ -1097,24 +1253,24 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         if (accumulated === undefined) {
             return addedCount;
         }
-        throw new Error(`Insufficient CKB, need ${(0, index_js_2.fixedPointToString)(exceptedCapacity - accumulated)} extra CKB`);
+        throw new Error(`Insufficient CKB, need ${(0, index_js_3.fixedPointToString)(exceptedCapacity - accumulated)} extra CKB`);
     }
     async completeInputsAll(from, filter) {
         const { addedCount } = await this.completeInputs(from, filter ?? {
             scriptLenRange: [0, 1],
             outputDataLenRange: [0, 1],
-        }, (acc, { cellOutput: { capacity } }) => acc + capacity, index_js_2.Zero);
+        }, (acc, { cellOutput: { capacity } }) => acc + capacity, index_js_3.Zero);
         return addedCount;
     }
     async completeInputsByUdt(from, type, balanceTweak) {
-        const exceptedBalance = this.getOutputsUdtBalance(type) + (0, index_js_6.numFrom)(balanceTweak ?? 0);
+        const exceptedBalance = this.getOutputsUdtBalance(type) + (0, index_js_7.numFrom)(balanceTweak ?? 0);
         const inputsBalance = await this.getInputsUdtBalance(from.client, type);
         if (inputsBalance >= exceptedBalance) {
             return 0;
         }
         const { addedCount, accumulated } = await this.completeInputs(from, {
             script: type,
-            outputDataLenRange: [16, (0, index_js_6.numFrom)("0xffffffff")],
+            outputDataLenRange: [16, (0, index_js_7.numFrom)("0xffffffff")],
         }, (acc, { outputData }) => {
             const balance = udtBalanceFrom(outputData);
             const sum = acc + balance;
@@ -1126,19 +1282,12 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         throw new Error(`Insufficient coin, need ${exceptedBalance - accumulated} extra coin`);
     }
     async completeInputsAddOne(from, filter) {
-        for await (const cell of from.findCells(filter ?? {
+        const { addedCount, accumulated } = await this.completeInputs(from, filter ?? {
             scriptLenRange: [0, 1],
             outputDataLenRange: [0, 1],
-        }, true, undefined, 1)) {
-            if (this.inputs.some(({ previousOutput }) => previousOutput.eq(cell.outPoint))) {
-                continue;
-            }
-            this.inputs.push(CellInput.from({
-                previousOutput: cell.outPoint,
-                outputData: cell.outputData,
-                cellOutput: cell.cellOutput,
-            }));
-            return 1;
+        }, () => undefined, true);
+        if (accumulated === undefined) {
+            return addedCount;
         }
         throw new Error(`Insufficient CKB, need at least one new cell`);
     }
@@ -1148,16 +1297,25 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         }
         return this.completeInputsAddOne(from, filter);
     }
+    async getFee(client) {
+        return (await this.getInputsCapacity(client)) - this.getOutputsCapacity();
+    }
+    async getFeeRate(client) {
+        return (((await this.getFee(client)) * (0, index_js_7.numFrom)(1000)) /
+            (0, index_js_7.numFrom)(this.toBytes().length + 4));
+    }
     estimateFee(feeRate) {
         const txSize = this.toBytes().length + 4;
-        return ((0, index_js_6.numFrom)(txSize) * (0, index_js_6.numFrom)(feeRate) + (0, index_js_6.numFrom)(1000)) / (0, index_js_6.numFrom)(1000);
+        // + 999 then / 1000 to ceil the calculated fee
+        return ((0, index_js_7.numFrom)(txSize) * (0, index_js_7.numFrom)(feeRate) + (0, index_js_7.numFrom)(999)) / (0, index_js_7.numFrom)(1000);
     }
-    async completeFee(from, change, expectedFeeRate, filter) {
-        const feeRate = expectedFeeRate ?? (await from.client.getFeeRate());
+    async completeFee(from, change, expectedFeeRate, filter, options) {
+        const feeRate = expectedFeeRate ??
+            (await from.client.getFeeRate(options?.feeRateBlockRange, options));
         // Complete all inputs extra infos for cache
         await this.getInputsCapacity(from.client);
-        let leastFee = index_js_2.Zero;
-        let leastExtraCapacity = index_js_2.Zero;
+        let leastFee = index_js_3.Zero;
+        let leastExtraCapacity = index_js_3.Zero;
         while (true) {
             const tx = this.clone();
             const collected = await (async () => {
@@ -1165,31 +1323,30 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
                     return await tx.completeInputsByCapacity(from, leastFee + leastExtraCapacity, filter);
                 }
                 catch (err) {
-                    if (leastExtraCapacity !== index_js_2.Zero) {
+                    if (leastExtraCapacity !== index_js_3.Zero) {
                         throw new Error("Not enough capacity for the change cell");
                     }
                     throw err;
                 }
             })();
             await from.prepareTransaction(tx);
-            if (leastFee === index_js_2.Zero) {
+            if (leastFee === index_js_3.Zero) {
                 // The initial fee is calculated based on prepared transaction
                 leastFee = tx.estimateFee(feeRate);
             }
-            const extraCapacity = (await tx.getInputsCapacity(from.client)) - tx.getOutputsCapacity();
+            const fee = await tx.getFee(from.client);
             // The extra capacity paid the fee without a change
-            if (extraCapacity === leastFee) {
+            if (fee === leastFee) {
                 this.copy(tx);
                 return [collected, false];
             }
-            const needed = (0, index_js_6.numFrom)(await Promise.resolve(change(tx, extraCapacity - leastFee)));
+            const needed = (0, index_js_7.numFrom)(await Promise.resolve(change(tx, fee - leastFee)));
             // No enough extra capacity to create new cells for change
-            if (needed > index_js_2.Zero) {
+            if (needed > index_js_3.Zero) {
                 leastExtraCapacity = needed;
                 continue;
             }
-            if ((await tx.getInputsCapacity(from.client)) - tx.getOutputsCapacity() !==
-                leastFee) {
+            if ((await tx.getFee(from.client)) !== leastFee) {
                 throw new Error("The change function doesn't use all available capacity");
             }
             // New change cells created, update the fee
@@ -1211,7 +1368,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         const script = script_js_1.Script.from(change);
         return this.completeFee(from, (tx, capacity) => {
             const changeCell = CellOutput.from({ capacity: 0, lock: script });
-            const occupiedCapacity = (0, index_js_2.fixedPointFrom)(changeCell.occupiedSize);
+            const occupiedCapacity = (0, index_js_3.fixedPointFrom)(changeCell.occupiedSize);
             if (capacity < occupiedCapacity) {
                 return occupiedCapacity;
             }
@@ -1225,7 +1382,7 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
         return this.completeFeeChangeToLock(from, script, feeRate, filter);
     }
     completeFeeChangeToOutput(from, index, feeRate, filter) {
-        const change = Number((0, index_js_6.numFrom)(index));
+        const change = Number((0, index_js_7.numFrom)(index));
         if (!this.outputs[change]) {
             throw new Error("Non-existed output to change");
         }
@@ -1237,10 +1394,10 @@ let Transaction = Transaction_1 = class Transaction extends index_js_5.mol.Entit
 };
 exports.Transaction = Transaction;
 exports.Transaction = Transaction = Transaction_1 = __decorate([
-    index_js_5.mol.codec(index_js_5.mol
+    index_js_6.mol.codec(index_js_6.mol
         .table({
         raw: exports.RawTransaction,
-        witnesses: index_js_5.mol.BytesVec,
+        witnesses: index_js_6.mol.BytesVec,
     })
         .mapIn((txLike) => {
         const tx = Transaction.from(txLike);
@@ -1251,3 +1408,38 @@ exports.Transaction = Transaction = Transaction_1 = __decorate([
     })
         .mapOut((tx) => Transaction.from({ ...tx.raw, witnesses: tx.witnesses })))
 ], Transaction);
+/**
+ * Calculate Nervos DAO profit between two blocks
+ */
+function calcDaoProfit(profitableCapacity, depositHeaderLike, withdrawHeaderLike) {
+    const depositHeader = index_js_2.ClientBlockHeader.from(depositHeaderLike);
+    const withdrawHeader = index_js_2.ClientBlockHeader.from(withdrawHeaderLike);
+    const profitableSize = (0, index_js_7.numFrom)(profitableCapacity);
+    return ((profitableSize * withdrawHeader.dao.ar) / depositHeader.dao.ar -
+        profitableSize);
+}
+/**
+ * Calculate claimable epoch for Nervos DAO withdrawal
+ * See https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0023-dao-deposit-withdraw/0023-dao-deposit-withdraw.md
+ */
+function calcDaoClaimEpoch(depositHeader, withdrawHeader) {
+    const depositEpoch = index_js_2.ClientBlockHeader.from(depositHeader).epoch;
+    const withdrawEpoch = index_js_2.ClientBlockHeader.from(withdrawHeader).epoch;
+    const intDiff = withdrawEpoch[0] - depositEpoch[0];
+    // deposit[1]    withdraw[1]
+    // ---------- <= -----------
+    // deposit[2]    withdraw[2]
+    if (intDiff % (0, index_js_7.numFrom)(180) !== (0, index_js_7.numFrom)(0) ||
+        depositEpoch[1] * withdrawEpoch[2] <= depositEpoch[2] * withdrawEpoch[1]) {
+        return [
+            depositEpoch[0] + (intDiff / (0, index_js_7.numFrom)(180) + (0, index_js_7.numFrom)(1)) * (0, index_js_7.numFrom)(180),
+            depositEpoch[1],
+            depositEpoch[2],
+        ];
+    }
+    return [
+        depositEpoch[0] + (intDiff / (0, index_js_7.numFrom)(180)) * (0, index_js_7.numFrom)(180),
+        depositEpoch[1],
+        depositEpoch[2],
+    ];
+}