diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index dd19eb3f..eef15b7e 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -2,6 +2,8 @@ on: [push, pull_request] name: Code Coverage +permissions: {} + jobs: Codecov: name: Code Coverage diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 1bd20afa..7b3bb715 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -2,6 +2,8 @@ on: [push, pull_request] name: CI +permissions: {} + jobs: prepare: diff --git a/.github/workflows/cron-update-rust.yml b/.github/workflows/cron-update-rust.yml index 2fc212eb..1264203d 100644 --- a/.github/workflows/cron-update-rust.yml +++ b/.github/workflows/cron-update-rust.yml @@ -1,4 +1,7 @@ name: Update rust version + +permissions: {} + on: schedule: - cron: "0 0 15 * *" # At 00:00 on day-of-month 15. diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml new file mode 100644 index 00000000..0c2aa080 --- /dev/null +++ b/.github/workflows/zizmor.yml @@ -0,0 +1,35 @@ +name: Zizmor Actions Analysis + +on: + push: + branches: ["master"] + pull_request: + branches: ["**"] + +jobs: + zizmor: + runs-on: ubuntu-latest + permissions: + security-events: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + persist-credentials: false + + - name: Rust Cache + uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 + + - name: Install zizmor + run: cargo install zizmor --locked --version 1.6.0 + + - name: Run zizmor 🌈 + run: zizmor --format sarif . > results.sarif + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload SARIF file + uses: github/codeql-action/upload-sarif@v3 + with: + sarif_file: results.sarif + category: zizmor \ No newline at end of file diff --git a/wallet/src/wallet/signer.rs b/wallet/src/wallet/signer.rs index e08a4341..f9a1b741 100644 --- a/wallet/src/wallet/signer.rs +++ b/wallet/src/wallet/signer.rs @@ -577,7 +577,7 @@ fn sign_psbt_schnorr( let keypair = match leaf_hash { None => keypair .tap_tweak(secp, psbt_input.tap_merkle_root) - .to_inner(), + .to_keypair(), Some(_) => keypair, // no tweak for script spend }; diff --git a/wallet/tests/psbt.rs b/wallet/tests/psbt.rs index a4d17493..d34f7ec4 100644 --- a/wallet/tests/psbt.rs +++ b/wallet/tests/psbt.rs @@ -214,7 +214,7 @@ fn test_psbt_multiple_internalkey_signers() { let message = Message::from(sighash); // add tweak. this was taken from `signer::sign_psbt_schnorr` - let keypair = keypair.tap_tweak(&secp, None).to_inner(); + let keypair = keypair.tap_tweak(&secp, None).to_keypair(); let (xonlykey, _parity) = XOnlyPublicKey::from_keypair(&keypair); // Must verify if we used the correct key to sign