gp/update-fee-rate-checker (#15)

gpBlockchain · web-flow · commit 0fb148df02b3 · 2025-06-19T21:56:03.000+08:00
* gp/update-fee-rate-checker

* add ci

* update dev test

* update ckb-light-client version

* fix tx commit

* fix ci

* Update README.md

* update light version
diff --git a/.github/workflows/ci-client-cli.yml b/.github/workflows/ci-client-cli.yml
@@ -24,7 +24,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Node Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: npm-and-yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: |
@@ -45,7 +45,7 @@ jobs:
 
       - name: Publish reports
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: mochawesome-report/
diff --git a/.github/workflows/ci-data.yml b/.github/workflows/ci-data.yml
@@ -24,7 +24,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Node Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: npm-and-yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: |
diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml
@@ -0,0 +1,40 @@
+name: ci-dev
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+
+jobs:
+  npm-install-1:
+    strategy:
+      fail-fast: false
+      matrix:
+        net: ['testnet_v1']
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+      - name: prepare env
+        id: runtest
+        run: |
+          npm install --save-dev mocha @types/mocha chai @types/chai
+          sh prepare_dev.sh
+      - name: run test
+        id: ci-test
+        run: |
+          npm run test-dev
+
+      - name: Publish reports
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jfoa-build-reports-${{ runner.os }}
+          path: mochawesome-report/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Node Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: npm-and-yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: |
diff --git a/.github/workflows/ckb-index-panic.yml b/.github/workflows/ckb-index-panic.yml
@@ -24,7 +24,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Node Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: npm-and-yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: |
@@ -45,7 +45,7 @@ jobs:
           npm run test-index-panic
       - name: Publish reports
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: mochawesome-report/
diff --git a/.github/workflows/ckb-light-client-roll-back.yml b/.github/workflows/ckb-light-client-roll-back.yml
@@ -24,7 +24,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Node Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: npm-and-yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: |
@@ -45,7 +45,7 @@ jobs:
           npm run test-roll-back
       - name: Publish reports
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: mochawesome-report/
diff --git a/.github/workflows/miner-load.yml b/.github/workflows/miner-load.yml
@@ -21,7 +21,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Node Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: npm-and-yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: |
@@ -42,7 +42,7 @@ jobs:
 
       - name: Publish reports
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: jfoa-build-reports-${{ runner.os }}
           path: mochawesome-report/
diff --git a/ckb-light-wasm-demo b/ckb-light-wasm-demo
@@ -1 +1 @@
-Subproject commit 3b055fe4d29230b3f0372dc64681285137a36eca
+Subproject commit a283ded948ec8f5b8bfa6dbdccd295bedd487a29
diff --git a/config/config.ts b/config/config.ts
@@ -2,6 +2,7 @@ import {config, helpers, Indexer, RPC} from "@ckb-lumos/lumos";
 import {LightClient} from "../service/node";
 import {LightClientCli} from "../service/light-cli";
 import {LightClientRPC} from "@ckb-lumos/light-client";
+import {CkbIndexer} from "@ckb-lumos/ckb-indexer/lib/indexer";
 
 const CKB_CLIENT_CLI_PATH = "tmp/ckb-cli-light-client"
 const CKB_LIGHT_CLIENT_PATH = "tmp/startBlockchain/ckbLightClient/ckb-light-client"
@@ -11,7 +12,7 @@ const CKB_DEV_INDEX_PATH = "tmp/startBlockchain/ckbDevWithIndexAndLightClient/ck
 const CKB_DEV_LIGHT_CLIENT_PATH = "tmp/startBlockchain/ckbDevWithIndexAndLightClient/ckb-light-client/target/release"
 
 const CKB_DEV_RPC_URL = "http://localhost:8114/";
-const CKB_DEV_RPC_INDEX_URL = "http://localhost:8116/";
+const CKB_DEV_RPC_INDEX_URL = "http://localhost:8114/";
 
 const RPC_DEBUG = true
 const CKB_RPC_URL = "https://testnet.ckbapp.dev/";
@@ -46,6 +47,9 @@ const newFullAddr = helpers.encodeToAddress(script);
 const rpcCLient = new RPC(CKB_RPC_URL);
 const rpcDevCLient = new RPC(CKB_DEV_RPC_URL);
 
+export const rpcDevIndexClient = new CkbIndexer(CKB_DEV_RPC_URL,CKB_DEV_RPC_URL);
+
+
 const {AGGRON4} = config.predefined;
 const RPC_NETWORK = AGGRON4;
 const ACCOUNT_PRIVATE = "0xdd50cac37ec6dd12539a968c1a2cbedda75bd8724f7bcad486548eaabb87fc8b"
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
   "scripts": {
     "test-wasm": "USE_LIGHT_CLIENT_WASM=true mocha --config test/runners/mocha/.mocharc.jsonc --reporter mochawesome",
     "test": "mocha --config test/runners/mocha/.mocharc.jsonc --reporter mochawesome",
+    "test-dev": "mocha --config test/runners/mocha/.mocharc.dev.jsonc --reporter mochawesome",
     "test-load": "mocha --config  test/runners/mocha/.mocharc.load.jsonc --reporter mochawesome",
     "test-data": "mocha --config  test/runners/mocha/.mocharc.data.jsonc --reporter mochawesome",
     "test-data-wasm": "USE_LIGHT_CLIENT_WASM=true mocha mocha --config  test/runners/mocha/.mocharc.data.jsonc --reporter mochawesome",
diff --git a/prepare.sh b/prepare.sh
@@ -1,7 +1,8 @@
 mkdir tmp
 cd tmp
 git clone https://github.com/gpBlockchain/startBlockchain.git
-cd startBlockchain/ckbLightClient
+cd startBlockchain
+cd ckbLightClient
 sh prepare.sh
 sh start.sh
 sh status.sh
diff --git a/prepare_dev.sh b/prepare_dev.sh
@@ -0,0 +1,7 @@
+mkdir tmp
+cd tmp
+git clone https://github.com/gpBlockchain/startBlockchain.git
+cd startBlockchain
+cd ckbDevWithIndexAndLightClient
+sh prepare.sh
+sh start.sh
diff --git a/service/CkbDevService.ts b/service/CkbDevService.ts
@@ -151,14 +151,9 @@ export async function cleanAllEnv() {
 }
 
 export async function startEnv() {
-    await shWithTimeout("cd " + DEV_PATH + " sh start.sh", 100_000)
+    await shWithTimeout("cd " + DEV_PATH + " && sh start.sh", 100_000)
 }
 
-export async function restartAndSyncCkbIndex() {
-    await shWithTimeOutNotErr(" pkill ckb-indexer",1000)
-    await sh("cd " + CKB_DEV_INDEX_PATH + " && rm -rf ckb-test && RUST_LOG=info ./ckb-indexer -s ckb-test > ckb-indexer.log 2>&1 &")
-    await checkCKbIndexSync()
-}
 
 export async function checkCKbIndexSync() {
     let acc1 = generateAccountFromPrivateKey(ACCOUNT_PRIVATE);
diff --git a/service/ckbService.ts b/service/ckbService.ts
@@ -1,6 +1,6 @@
-import { CKB_RPC_URL} from "../config/config";
+import {CKB_RPC_URL} from "../config/config";
 import {request} from "./index";
-import { formatter as paramsFmts } from "@ckb-lumos/rpc/lib/paramsFormatter";
+import {formatter as paramsFmts} from "@ckb-lumos/rpc/lib/paramsFormatter";
 
 
 export async function estimate_cycles(tx: any, ckbLightClient: string = CKB_RPC_URL) {
@@ -16,3 +16,8 @@ export async function send_transaction(tx: any, ckbLightClient: string = CKB_RPC
     ]);
     return res;
 }
+
+export async function generate_epochs(epoch: any, ckbLightClient: string = CKB_RPC_URL) {
+    const res = await request(1, ckbLightClient, "generate_epochs", [epoch]);
+    return res;
+}
diff --git a/service/index.ts b/service/index.ts
@@ -1,7 +1,7 @@
 import { ScriptWrapper} from "@ckb-lumos/base";
 import fetch from "cross-fetch";
 import { RPC_DEBUG} from "../config/config";
-const RPC_DEBUG_SERVICE = RPC_DEBUG
+const RPC_DEBUG_SERVICE = true
 
 function instanceOfScriptWrapper(object: unknown): object is ScriptWrapper {
     return typeof object === "object" && object != null && "script" in object;
diff --git a/service/transfer.ts b/service/transfer.ts
@@ -67,6 +67,9 @@ export class TransferService {
             from: options.from,
             outputCells: [transferOutput],
             privKey: options.privKey,
+            fee: options.fee,
+            lightMode: options.lightMode,
+            lightNotInstallCellMode: options.lightNotInstallCellMode
         });
     }
 
@@ -91,11 +94,11 @@ export class TransferService {
         if (collectedSum < neededCapacity) {
             throw new Error("Not enough CKB");
         }
-
-        if (collectedSum.sub(neededCapacity).sub(FeeRate.NORMAL).gt(BI.from('0'))) {
+        let fee = options.fee || FeeRate.NORMAL
+        if (collectedSum.sub(neededCapacity).sub(fee).gt(BI.from('0'))) {
             const changeOutput: Cell = {
                 cellOutput: {
-                    capacity: collectedSum.sub(neededCapacity).sub(FeeRate.NORMAL).toHexString(),
+                    capacity: collectedSum.sub(neededCapacity).sub(fee).toHexString(),
                     lock: fromScript,
                 },
                 data: "0x",
@@ -193,7 +196,6 @@ export const generateAccountFromPrivateKey = (privKey: string): Account => {
         args: args,
     };
     const address = helpers.generateAddress(lockScript, {config: AGGRON4});
-    console.log("address:",address)
     return {
         lockScript,
         address,
@@ -219,6 +221,9 @@ interface transferOptions {
     to: string;
     amount: string;
     privKey: string;
+    fee?: number;
+    lightMode?: boolean;
+    lightNotInstallCellMode?: boolean;
 }
 
 interface Options {
@@ -229,6 +234,7 @@ interface Options {
     deps?: CellDep[];
     lightMode?: boolean;
     lightNotInstallCellMode?: boolean;
+    fee?: number;
 }
 
 function getOutPutCell(to: string, amount: string, data: string): Cell {
@@ -536,7 +542,6 @@ export async function send_tx_options(options: Options): Promise<string> {
     const tx = helpers.sealTransaction(txSkeleton, [Sig]);
     const hash = await defaultRpc.sendTransaction(tx, "passthrough");
     console.log("The transaction hash is", hash);
-
     return hash;
 
 }
diff --git a/test/dev/DaoScriptSizeVerifier.spec.ts b/test/dev/DaoScriptSizeVerifier.spec.ts
diff --git a/test/dev/ckbIndexPanic.spec.ts b/test/dev/ckbIndexPanic.spec.ts
diff --git a/test/dev/ckbLightClientCut.spec.ts b/test/dev/ckbLightClientCut.spec.ts
diff --git a/test/dev/minFeeVerifier.spec.ts b/test/dev/minFeeVerifier.spec.ts
diff --git a/test/runners/mocha/.mocharc.dev.jsonc b/test/runners/mocha/.mocharc.dev.jsonc
