fix get epoch receipts optional params

Conflux-Chain · Nov 5, 2024 · cc89fc7 · cc89fc7
1 parent 4e84a9d
commit cc89fc7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/rpc/cfx.js b/src/rpc/cfx.js
@@ -373,7 +373,7 @@ class CFX extends RPCMethodFactory {
         method: 'cfx_getEpochReceipts',
         debug: true,
         requestFormatters: [
-          format.epochNumber,
+          format.epochNumberOrBlockHash,
           format.boolean.$or(undefined),
         ],
         responseFormatter: cfxFormat.epochReceipts,
@@ -593,7 +593,16 @@ class CFX extends RPCMethodFactory {
    * @returns {Promise<Array>} All receipts of one epoch
    */
   async getEpochReceiptsByPivotBlockHash(pivotBlockHash, ...extra) {
-    const result = await this.conflux.request({ method: 'cfx_getEpochReceipts', params: [`hash:${pivotBlockHash}`, ...extra] });
+    const result = await this.conflux.request({
+      method: 'cfx_getEpochReceipts',
+      params: [
+        {
+          blockHash: pivotBlockHash,
+          requirePivot: true,
+        },
+        ...extra,
+      ],
+    });
     return cfxFormat.epochReceipts(result);
   }
 

diff --git a/src/util/format.js b/src/util/format.js
@@ -492,6 +492,6 @@ format.epochNumber1898 = format({
   requirePivot: format.boolean.$or(null),
 });
 
-format.epochNumberOrBlockHash = format.epochNumberOrUndefined.$or(format.epochNumber1898);
+format.epochNumberOrBlockHash = format.epochNumber.$or(format.epochNumber1898);
 
 module.exports = format;