chore: make changes for PR reviews

Author: ashuralyk

packages/core/src/ckb/transaction.test.ts

@@ -1234,7 +1234,7 @@ describe("Transaction", () => {
         ],
       });
 
-      await tx.completeByFeePayer(client, mockFeePayer1, mockFeePayer2);
+      await tx.completeByFeePayer(mockFeePayer1, mockFeePayer2);
 
       expect(mockFeePayer1.prepareTransaction).toHaveBeenCalledWith(tx);
       expect(mockFeePayer2.prepareTransaction).toHaveBeenCalledWith(tx);
@@ -1252,7 +1252,7 @@ describe("Transaction", () => {
         ],
       });
 
-      await tx.completeByFeePayer(client, mockFeePayer1, mockFeePayer2);
+      await tx.completeByFeePayer(mockFeePayer1, mockFeePayer2);
 
       // Verify both methods were called
       expect(mockFeePayer1.prepareTransaction).toHaveBeenCalled();
@@ -1293,7 +1293,7 @@ describe("Transaction", () => {
         ],
       });
 
-      await tx.completeByFeePayer(client, mockFeePayer1);
+      await tx.completeByFeePayer(mockFeePayer1);
 
       expect(mockFeePayer1.prepareTransaction).toHaveBeenCalledTimes(1);
       expect(mockFeePayer1.completeTxFee).toHaveBeenCalledTimes(1);
@@ -1312,7 +1312,7 @@ describe("Transaction", () => {
       });
 
       // Should not throw with empty fee payer list
-      await expect(tx.completeByFeePayer(client)).resolves.not.toThrow();
+      await expect(tx.completeByFeePayer()).resolves.not.toThrow();
     });
 
     it("should handle multiple fee payers in sequence", async () => {
@@ -1349,7 +1349,7 @@ describe("Transaction", () => {
         callOrder.push("complete2");
       });
 
-      await tx.completeByFeePayer(client, mockFeePayer1, mockFeePayer2);
+      await tx.completeByFeePayer(mockFeePayer1, mockFeePayer2);
 
       // Verify order: all prepareTransaction calls first, then all completeTxFee calls
       expect(callOrder).toEqual([
@@ -1375,9 +1375,9 @@ describe("Transaction", () => {
         mockFeePayer1.prepareTransaction as ReturnType<typeof vi.fn>
       ).mockRejectedValue(error);
 
-      await expect(
-        tx.completeByFeePayer(client, mockFeePayer1),
-      ).rejects.toThrow("Prepare transaction failed");
+      await expect(tx.completeByFeePayer(mockFeePayer1)).rejects.toThrow(
+        "Prepare transaction failed",
+      );
     });
 
     it("should propagate errors from completeTxFee", async () => {
@@ -1395,9 +1395,9 @@ describe("Transaction", () => {
         mockFeePayer1.completeTxFee as ReturnType<typeof vi.fn>
       ).mockRejectedValue(error);
 
-      await expect(
-        tx.completeByFeePayer(client, mockFeePayer1),
-      ).rejects.toThrow("Complete fee failed");
+      await expect(tx.completeByFeePayer(mockFeePayer1)).rejects.toThrow(
+        "Complete fee failed",
+      );
     });
 
     it("should handle fee payer that modifies transaction in prepareTransaction", async () => {
@@ -1427,7 +1427,7 @@ describe("Transaction", () => {
         mockFeePayer1.prepareTransaction as ReturnType<typeof vi.fn>
       ).mockResolvedValue(modifiedTx);
 
-      await tx.completeByFeePayer(client, mockFeePayer1);
+      await tx.completeByFeePayer(mockFeePayer1);
 
       // prepareTransaction is called with a clone of the original transaction
       expect(mockFeePayer1.prepareTransaction).toHaveBeenCalled();

packages/core/src/ckb/transaction.ts

@@ -1957,7 +1957,6 @@ export class Transaction extends mol.Entity.Base<
   }> {
     const { addedCount, accumulated } = await from.completeInputs(
       this,
-      from.client,
       filter,
       accumulator,
       init,
@@ -1972,7 +1971,6 @@ export class Transaction extends mol.Entity.Base<
   ): Promise<number> {
     const addedCount = await from.completeInputsByCapacity(
       this,
-      from.client,
       capacityTweak,
       {
         filter,
@@ -2165,7 +2163,7 @@ export class Transaction extends mol.Entity.Base<
       shouldAddInputs?: boolean;
     },
   ): Promise<[number, boolean]> {
-    const result = await from.completeFee(this, from.client, {
+    const result = await from.completeFee(this, {
       changeFn: change,
       feeRate: expectedFeeRate,
       filter,
@@ -2279,17 +2277,14 @@ export class Transaction extends mol.Entity.Base<
     return this.completeFeeChangeToLock(from, script, feeRate, filter, options);
   }
 
-  async completeByFeePayer(
-    client: Client,
-    ...feePayers: FeePayer[]
-  ): Promise<void> {
+  async completeByFeePayer(...feePayers: FeePayer[]): Promise<void> {
     let tx = this.clone();
     for (const feePayer of feePayers) {
       tx = await feePayer.prepareTransaction(tx);
     }
 
     for (const feePayer of feePayers) {
-      await feePayer.completeTxFee(tx, client);
+      await feePayer.completeTxFee(tx);
     }
 
     this.copy(tx);

packages/core/src/signer/feePayer/feePayer.ts

@@ -1,4 +1,3 @@
-import { Address } from "../../address/index.js";
 import { Cell, Transaction, TransactionLike } from "../../ckb/index.js";
 import { Client } from "../../client/client.js";
 import { ClientCollectableSearchKeyFilterLike } from "../../client/clientTypes.advanced.js";
@@ -13,46 +12,19 @@ export interface FeeRateOptionsLike {
 }
 
 export abstract class FeePayer {
-  constructor() {}
+  constructor(protected client_: Client) {}
 
-  abstract completeTxFee(
-    tx: Transaction,
-    client: Client,
-    options?: FeeRateOptionsLike,
-  ): Promise<void>;
-
-  /**
-   * Gets an array of Address objects associated with the signer.
-   *
-   * @returns A promise that resolves to an array of Address objects.
-   */
-  async getAddressObjs(): Promise<Address[]> {
-    throw new Error("FeePayer.getAddressObjs not implemented");
-  }
-
-  /**
-   * Gets the recommended Address object for the signer.
-   *
-   * @param _preference - Optional preference parameter.
-   * @returns A promise that resolves to the recommended Address object.
-   */
-  async getRecommendedAddressObj(_preference?: unknown): Promise<Address> {
-    return (await this.getAddressObjs())[0];
+  get client(): Client {
+    return this.client_;
   }
 
-  /**
-   * Gets the recommended address for the signer as a string.
-   *
-   * @param preference - Optional preference parameter.
-   * @returns A promise that resolves to the recommended address as a string.
-   */
-  async getRecommendedAddress(preference?: unknown): Promise<string> {
-    return (await this.getRecommendedAddressObj(preference)).toString();
-  }
+  abstract completeTxFee(
+    txLike: TransactionLike,
+    options?: FeeRateOptionsLike,
+  ): Promise<Transaction>;
 
-  async completeInputs<T>(
+  abstract completeInputs<T>(
     tx: Transaction,
-    client: Client,
     filter: ClientCollectableSearchKeyFilterLike,
     accumulator: (
       acc: T,
@@ -64,53 +36,7 @@ export abstract class FeePayer {
   ): Promise<{
     addedCount: number;
     accumulated?: T;
-  }> {
-    const collectedCells = [];
-
-    let acc: T = init;
-    let fulfilled = false;
-    for (const address of await this.getAddressObjs()) {
-      for await (const cell of client.findCells({
-        script: address.script,
-        scriptType: "lock",
-        filter,
-        scriptSearchMode: "exact",
-        withData: true,
-      })) {
-        if (
-          tx.inputs.some(({ previousOutput }) =>
-            previousOutput.eq(cell.outPoint),
-          )
-        ) {
-          continue;
-        }
-        const i = collectedCells.push(cell);
-        const next = await Promise.resolve(
-          accumulator(acc, cell, i - 1, collectedCells),
-        );
-        if (next === undefined) {
-          fulfilled = true;
-          break;
-        }
-        acc = next;
-      }
-      if (fulfilled) {
-        break;
-      }
-    }
-
-    collectedCells.forEach((cell) => tx.addInput(cell));
-    if (fulfilled) {
-      return {
-        addedCount: collectedCells.length,
-      };
-    }
-
-    return {
-      addedCount: collectedCells.length,
-      accumulated: acc,
-    };
-  }
+  }>;
 
   /**
    * Prepares a transaction before signing.