ckb-devrel · Hanssen0 · Oct 10, 2024 · Oct 10, 2024
diff --git a/.changeset/selfish-eggs-attack.md b/.changeset/selfish-eggs-attack.md
@@ -0,0 +1,9 @@
+---
+"@ckb-ccc/core": patch
+"@ckb-ccc/ccc": patch
+"ckb-ccc": patch
+"@ckb-ccc/connector": patch
+"@ckb-ccc/connector-react": patch
+---
+
+feat(core): auto fee rate
diff --git a/packages/core/src/ckb/transaction.ts b/packages/core/src/ckb/transaction.ts
@@ -1824,9 +1824,11 @@ export class Transaction {
   async completeFee(
     from: Signer,
     change: (tx: Transaction, capacity: Num) => Promise<NumLike> | NumLike,
-    feeRate: NumLike,
+    expectedFeeRate?: NumLike,
     filter?: ClientCollectableSearchKeyFilterLike,
   ): Promise<[number, boolean]> {
+    const feeRate = expectedFeeRate ?? (await from.client.getFeeRate());
+
     // Complete all inputs extra infos for cache
     await this.getInputsCapacity(from.client);
 
@@ -1902,7 +1904,7 @@ export class Transaction {
   completeFeeChangeToLock(
     from: Signer,
     change: ScriptLike,
-    feeRate: NumLike,
+    feeRate?: NumLike,
     filter?: ClientCollectableSearchKeyFilterLike,
   ): Promise<[number, boolean]> {
     const script = Script.from(change);
@@ -1926,7 +1928,7 @@ export class Transaction {
 
   async completeFeeBy(
     from: Signer,
-    feeRate: NumLike,
+    feeRate?: NumLike,
     filter?: ClientCollectableSearchKeyFilterLike,
   ): Promise<[number, boolean]> {
     const { script } = await from.getRecommendedAddressObj();
@@ -1937,7 +1939,7 @@ export class Transaction {
   completeFeeChangeToOutput(
     from: Signer,
     index: NumLike,
-    feeRate: NumLike,
+    feeRate?: NumLike,
     filter?: ClientCollectableSearchKeyFilterLike,
   ): Promise<[number, boolean]> {
     const change = Number(numFrom(index));

diff --git a/packages/core/src/client/client.ts b/packages/core/src/client/client.ts
@@ -11,7 +11,7 @@ import {
 } from "../ckb/index.js";
 import { Zero } from "../fixedPoint/index.js";
 import { Hex, HexLike, hexFrom } from "../hex/index.js";
-import { Num, NumLike, numFrom } from "../num/index.js";
+import { Num, NumLike, numFrom, numMax } from "../num/index.js";
 import { apply, reduceAsync } from "../utils/index.js";
 import { ClientCache } from "./cache/index.js";
 import { ClientCacheMemory } from "./cache/memory.js";
@@ -101,6 +101,13 @@ export abstract class Client {
     Pick<Script, "codeHash" | "hashType"> & { cellDeps: CellDepInfo[] }
   >;
 
+  abstract getFeeRateStatistics(
+    blockRange?: NumLike,
+  ): Promise<{ mean: Num; median: Num }>;
+  async getFeeRate(blockRange?: NumLike): Promise<Num> {
+    return numMax((await this.getFeeRateStatistics(blockRange)).median, 1000);
+  }
+
   abstract getTip(): Promise<Num>;
   abstract getTipHeader(verbosity?: number | null): Promise<ClientBlockHeader>;
   abstract getBlockByNumber(

diff --git a/packages/core/src/client/jsonRpc/index.ts b/packages/core/src/client/jsonRpc/index.ts
@@ -119,6 +119,18 @@ export abstract class ClientJsonRpc extends Client {
     return this.url_;
   }
 
+  /**
+   * Get fee rate statistics
+   *
+   * @returns Fee rate statistics
+   */
+
+  getFeeRateStatistics = this.buildSender(
+    "get_fee_rate_statistics",
+    [(n) => apply(numFrom, n)],
+    ({ mean, median }) => ({ mean: numFrom(mean), median: numFrom(median) }),
+  ) as Client["getFeeRateStatistics"];
+
   /**
    * Get tip block number
    *

diff --git a/packages/demo/src/app/connected/(tools)/IssueXUdtSus/page.tsx b/packages/demo/src/app/connected/(tools)/IssueXUdtSus/page.tsx
@@ -81,7 +81,7 @@ export default function IssueXUdtSul() {
                 ],
               });
               await susTx.completeInputsByCapacity(signer);
-              await susTx.completeFeeBy(signer, 1000);
+              await susTx.completeFeeBy(signer);
               const susTxHash = await signer.sendTransaction(susTx);
               log("Transaction sent:", explorerTransaction(susTxHash));
               await signer.client.cache.markUnusable({
@@ -106,7 +106,7 @@ export default function IssueXUdtSul() {
                 ],
               });
               await lockTx.completeInputsByCapacity(signer);
-              await lockTx.completeFeeBy(signer, 1000);
+              await lockTx.completeFeeBy(signer);
               const lockTxHash = await signer.sendTransaction(lockTx);
               log("Transaction sent:", explorerTransaction(lockTxHash));
 
@@ -166,7 +166,7 @@ export default function IssueXUdtSul() {
               mintTx.outputs[1].type!.args = ccc.hexFrom(
                 ccc.bytesFrom(ccc.hashTypeId(mintTx.inputs[0], 1)).slice(0, 20),
               );
-              await mintTx.completeFeeBy(signer, 1000);
+              await mintTx.completeFeeBy(signer);
               log(
                 "Transaction sent:",
                 explorerTransaction(await signer.sendTransaction(mintTx)),

diff --git a/packages/demo/src/app/connected/(tools)/IssueXUdtTypeId/page.tsx b/packages/demo/src/app/connected/(tools)/IssueXUdtTypeId/page.tsx
@@ -104,7 +104,7 @@ export default function IssueXUdtTypeId() {
                   typeIdTx.inputs[0],
                   0,
                 );
-                await typeIdTx.completeFeeBy(signer, 1000);
+                await typeIdTx.completeFeeBy(signer);
                 log(
                   "Transaction sent:",
                   explorerTransaction(await signer.sendTransaction(typeIdTx)),
@@ -130,7 +130,7 @@ export default function IssueXUdtTypeId() {
                 ],
               });
               await lockTx.completeInputsByCapacity(signer);
-              await lockTx.completeFeeBy(signer, 1000);
+              await lockTx.completeFeeBy(signer);
               const lockTxHash = await signer.sendTransaction(lockTx);
               log("Transaction sent:", explorerTransaction(lockTxHash));
 
@@ -195,7 +195,7 @@ export default function IssueXUdtTypeId() {
               mintTx.outputs[2].type!.args = ccc.hexFrom(
                 ccc.bytesFrom(ccc.hashTypeId(mintTx.inputs[0], 2)).slice(0, 20),
               );
-              await mintTx.completeFeeBy(signer, 1000);
+              await mintTx.completeFeeBy(signer);
               log(
                 "Transaction sent:",
                 explorerTransaction(await signer.sendTransaction(mintTx)),

diff --git a/packages/demo/src/app/connected/(tools)/NervosDao/page.tsx b/packages/demo/src/app/connected/(tools)/NervosDao/page.tsx
@@ -178,7 +178,7 @@ function DaoButton({ dao }: { dao: ccc.Cell }) {
             );
 
             await tx.completeInputsByCapacity(signer);
-            await tx.completeFeeBy(signer, 1000);
+            await tx.completeFeeBy(signer);
           } else {
             if (!infos[3]) {
               error("Unexpected no found deposit info");
@@ -225,7 +225,7 @@ function DaoButton({ dao }: { dao: ccc.Cell }) {
             );
 
             await tx.completeInputsByCapacity(signer);
-            await tx.completeFeeChangeToOutput(signer, 0, 1000);
+            await tx.completeFeeChangeToOutput(signer, 0);
             tx.outputs[0].capacity += profit;
           }
 
@@ -280,6 +280,7 @@ export default function Transfer() {
   const { explorerTransaction } = useGetExplorerLink();
 
   const [amount, setAmount] = useState<string>("");
+  const [feeRate, setFeeRate] = useState<undefined | ccc.Num>();
   const [daos, setDaos] = useState<ccc.Cell[]>([]);
 
   useEffect(() => {
@@ -347,7 +348,9 @@ export default function Transfer() {
             );
 
             await tx.completeInputsAll(signer);
-            await tx.completeFeeChangeToOutput(signer, 0, 1000);
+            const feeRate = await signer.client.getFeeRate();
+            setFeeRate(feeRate);
+            await tx.completeFeeChangeToOutput(signer, 0, feeRate);
 
             const amount = ccc.fixedPointToString(tx.outputs[0].capacity);
             log("You can deposit at most", amount, "CKB");
@@ -394,7 +397,7 @@ export default function Transfer() {
             tx.outputs[0].capacity = ccc.fixedPointFrom(amount);
 
             await tx.completeInputsByCapacity(signer);
-            await tx.completeFeeBy(signer, 1000);
+            await tx.completeFeeBy(signer, feeRate);
 
             // Sign and send the transaction
             log(

diff --git a/packages/demo/src/app/connected/(tools)/TimeLockedTransfer/page.tsx b/packages/demo/src/app/connected/(tools)/TimeLockedTransfer/page.tsx
@@ -81,7 +81,7 @@ function ClaimButton({ cell, lock }: { cell: ccc.Cell; lock: ccc.Script }) {
           );
 
           await tx.completeInputsByCapacity(signer);
-          await tx.completeFeeChangeToOutput(signer, 0, 1000);
+          await tx.completeFeeChangeToOutput(signer, 0);
 
           log(
             "Transaction sent:",
@@ -147,7 +147,7 @@ export default function TimeLockedTransfer() {
 
     // Complete missing parts for transaction
     await tx.completeInputsByCapacity(signer);
-    await tx.completeFeeBy(signer, 1000);
+    await tx.completeFeeBy(signer);
 
     log(
       "Transaction sent:",

diff --git a/packages/demo/src/app/connected/(tools)/Transfer/page.tsx b/packages/demo/src/app/connected/(tools)/Transfer/page.tsx
@@ -16,6 +16,7 @@ export default function Transfer() {
   const { explorerTransaction } = useGetExplorerLink();
 
   const [transferTo, setTransferTo] = useState<string>("");
+  const [feeRate, setFeeRate] = useState<undefined | ccc.Num>();
   const [amount, setAmount] = useState<string>("");
   const [data, setData] = useState<string>("");
 
@@ -62,8 +63,10 @@ export default function Transfer() {
 
             // Complete missing parts for transaction
             await tx.completeInputsAll(signer);
+            const feeRate = await signer.client.getFeeRate();
+            setFeeRate(feeRate);
             // Change all balance to the first output
-            await tx.completeFeeChangeToOutput(signer, 0, 1000);
+            await tx.completeFeeChangeToOutput(signer, 0, feeRate);
             const amount = ccc.fixedPointToString(tx.outputs[0].capacity);
             log("You can transfer at most", amount, "CKB");
             setAmount(amount);
@@ -100,7 +103,7 @@ export default function Transfer() {
 
             // Complete missing parts for transaction
             await tx.completeInputsByCapacity(signer);
-            await tx.completeFeeBy(signer, 1000);
+            await tx.completeFeeBy(signer, feeRate);
 
             // Sign and send the transaction
             log(

diff --git a/packages/demo/src/app/connected/(tools)/TransferXUdt/page.tsx b/packages/demo/src/app/connected/(tools)/TransferXUdt/page.tsx
@@ -83,7 +83,7 @@ export default function TransferXUdt() {
               ccc.KnownScript.XUdt,
             );
             await tx.completeInputsByCapacity(signer);
-            await tx.completeFeeBy(signer, 1000);
+            await tx.completeFeeBy(signer);
 
             // Sign and send the transaction
             log(