Merge branch 'develop' into feature/integrated-fee-estimator

nervosnetwork · Oct 23, 2024 · 95c27e1 · 95c27e1
2 parents 4834161 + 0404654
commit 95c27e1
Show file tree

Hide file tree

Showing 125 changed files with 1,443 additions and 1,075 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.github/workflows/ci_aarch64_build_ubuntu.yaml b/.github/workflows/ci_aarch64_build_ubuntu.yaml
@@ -45,7 +45,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - uses: actions/checkout@v3
     - run: rustup component add rustfmt
     - run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y && sudo apt-get install -y gcc-multilib

diff --git a/.github/workflows/ci_benchmarks_ubuntu.yaml b/.github/workflows/ci_benchmarks_ubuntu.yaml
@@ -52,7 +52,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - run: rustup component add rustfmt
     - run: rustup component add clippy
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev

diff --git a/.github/workflows/ci_integration_tests_ubuntu.yaml b/.github/workflows/ci_integration_tests_ubuntu.yaml
@@ -57,7 +57,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - run: rustup component add rustfmt
     - run: rustup component add clippy
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
@@ -86,7 +86,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - run: rustup component add rustfmt
     - run: rustup component add clippy
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev

diff --git a/.github/workflows/ci_linters_ubuntu.yaml b/.github/workflows/ci_linters_ubuntu.yaml
@@ -53,7 +53,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - uses: actions/checkout@v3
     - run: rustup component add rustfmt
     - run: cargo fmt --all -- --check

diff --git a/.github/workflows/ci_quick_checks_ubuntu.yaml b/.github/workflows/ci_quick_checks_ubuntu.yaml
@@ -53,7 +53,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - run: rustup component add rustfmt
     - uses: actions/checkout@v3
     - run: cargo fmt --all -- --check

diff --git a/.github/workflows/ci_unit_tests_ubuntu.yaml b/.github/workflows/ci_unit_tests_ubuntu.yaml
@@ -53,7 +53,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.75.0
+        toolchain: 1.81.0
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
     - name: Install nextest
       uses: taiki-e/install-action@nextest

diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -82,7 +82,7 @@ jobs:
           name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
           path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
     env:
-      BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.75.0
+      BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.81.0
       REL_PKG: ${{ matrix.rel_pkg }}
 
   package-for-linux-aarch64:
@@ -167,7 +167,7 @@ jobs:
           name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
           path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
     env:
-      BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.75.0
+      BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.81.0
       REL_PKG: ${{ matrix.rel_pkg }}
 
   package-for-mac: