Merge branch 'paritytech:master' into master

chainx-org · Dec 5, 2023 · 2a6bcb8 · 2a6bcb8
2 parents b208f8a + 48dabd8
commit 2a6bcb8
Show file tree

Hide file tree

Showing 11 changed files with 4,678 additions and 58 deletions.
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -10,10 +10,10 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Checkout sources
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 50
 

diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml
@@ -18,10 +18,10 @@ jobs:
       RUST_BACKTRACE:  full
     steps:
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -18,10 +18,10 @@ jobs:
       RUST_BACKTRACE:  full
     steps:
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
diff --git a/.github/workflows/rust-windows.yml b/.github/workflows/rust-windows.yml
@@ -33,7 +33,7 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Install sudo for windows #https://github.com/actions/virtual-environments/issues/572
         if: matrix.platform == 'windows-latest'
@@ -48,7 +48,7 @@ jobs:
           refreshenv
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive
@@ -70,19 +70,19 @@ jobs:
         shell:         bash
 
       - name:          Cache cargo registry
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        $HOME/.cargo/registry
           key:         cargo-registry-${{ env['cache_hash'] }}
 
       - name:          Cache cargo index
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        $HOME/.cargo/git
           key:         cargo-git-${{ env['cache_hash'] }}
 
       - name:          Cache cargo build
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        target
           key:         cargo-target-${{ env['cache_hash'] }}
@@ -113,7 +113,7 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Set default compiler
         if:            matrix.compiler == 'clang' && matrix.platform != 'windows-latest'
@@ -134,7 +134,7 @@ jobs:
           refreshenv
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive
@@ -156,19 +156,19 @@ jobs:
         shell:         bash
 
       - name:          Cache cargo registry
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        $HOME/.cargo/registry
           key:         cargo-registry-${{ env['cache_hash'] }}
 
       - name:          Cache cargo index
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        $HOME/.cargo/git
           key:         cargo-git-${{ env['cache_hash'] }}
 
       - name:          Cache cargo build
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        target
           key:         cargo-target-${{ env['cache_hash'] }}
@@ -210,7 +210,7 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Set default compiler
         if:            matrix.compiler == 'clang' && matrix.platform != 'windows-latest'
@@ -231,7 +231,7 @@ jobs:
           refreshenv
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive
@@ -253,19 +253,19 @@ jobs:
         shell:         bash
 
       - name:          Cache cargo registry
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        $HOME/.cargo/registry
           key:         cargo-registry-${{ env['cache_hash'] }}
 
       - name:          Cache cargo index
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        $HOME/.cargo/git
           key:         cargo-git-${{ env['cache_hash'] }}
 
       - name:          Cache cargo build
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        target
           key:         cargo-target-${{ env['cache_hash'] }}
@@ -310,7 +310,7 @@ jobs:
         shell:         bash
 
       - name:          Upload artifacts
-        uses:          actions/upload-artifact@v2.2.4
+        uses:          actions/upload-artifact@v3.1.0
         with:
           name:        ${{ matrix.platform }}.${{ matrix.toolchain }}.${{ matrix.compiler }}.zip
           path:        artifacts/
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Set default compiler
         if:            matrix.compiler == 'clang'
@@ -40,7 +40,7 @@ jobs:
           echo "CXX=clang++" >> "$GITHUB_ENV"
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive
@@ -54,10 +54,10 @@ jobs:
           components:  clippy, rustfmt
           override:    true
 
-      - uses:          Swatinem/rust-cache@v1.3.0
+      - uses:          Swatinem/rust-cache@22c9328bcba27aa81a32b1bef27c7e3c78052531 # v2.0.1
 
       - name:          Cache sccache
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        "$HOME/sccache"
           key:         sccache-${{ env['cache_hash'] }}
@@ -101,7 +101,7 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Set default compiler
         if:            matrix.compiler == 'clang'
@@ -110,7 +110,7 @@ jobs:
           echo "CXX=clang++" >> "$GITHUB_ENV"
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive
@@ -124,10 +124,10 @@ jobs:
           components:  clippy, rustfmt
           override:    true
 
-      - uses:          Swatinem/rust-cache@v1.3.0
+      - uses:          Swatinem/rust-cache@22c9328bcba27aa81a32b1bef27c7e3c78052531 # v2.0.1
 
       - name:          Cache sccache
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        "$HOME/sccache"
           key:         sccache-${{ env['cache_hash'] }}
@@ -182,7 +182,7 @@ jobs:
     steps:
 
       - name:          Cancel Previous Runs
-        uses:          styfle/cancel-workflow-action@0.9.1
+        uses:          styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # 0.11.0
 
       - name:          Set default compiler
         if:            matrix.compiler == 'clang'
@@ -191,7 +191,7 @@ jobs:
           echo "CXX=clang++" >> "$GITHUB_ENV"
 
       - name:          Checkout sources & submodules
-        uses:          actions/checkout@v2.3.4
+        uses:          actions/checkout@v3.1.0
         with:
           fetch-depth: 5
           submodules:  recursive
@@ -205,10 +205,10 @@ jobs:
           components:  clippy, rustfmt
           override:    true
 
-      - uses:          Swatinem/rust-cache@v1.3.0
+      - uses:          Swatinem/rust-cache@22c9328bcba27aa81a32b1bef27c7e3c78052531 # v2.0.1
 
       - name:          Cache sccache
-        uses:          actions/cache@v2.1.6
+        uses:          actions/cache@v3.0.11
         with:
           path:        "$HOME/sccache"
           key:         sccache-${{ env['cache_hash'] }}
@@ -265,7 +265,7 @@ jobs:
         shell:         bash
 
       - name:          Upload artifacts
-        uses:          actions/upload-artifact@v2.2.4
+        uses:          actions/upload-artifact@v3.1.0
         with:
           name:        ${{ matrix.platform }}.${{ matrix.toolchain }}.${{ matrix.compiler }}.zip
           path:        artifacts/
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libsecp256k1"
 description = "Pure Rust secp256k1 implementation."
 license = "Apache-2.0"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Wei Tang <hi@that.world>"]
 repository = "https://github.com/paritytech/libsecp256k1"
 keywords = ["crypto", "ECDSA", "secp256k1", "bitcoin", "no_std"]
@@ -25,7 +25,9 @@ lazy_static = { version = "1.4.0", optional = true }
 secp256k1-test = { package = "secp256k1", version = "0.20.3", features = ["rand-std", "recovery"] }
 clear_on_drop = "0.2"
 serde_json = "1.0"
+hex = "0.4"
 hex-literal = "0.3.3"
+bincode = "1.3.3"
 
 [build-dependencies]
 libsecp256k1-gen-ecmult = { version = "0.3.0", path = "gen/ecmult" }