Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OpenPoolProject/stratum
Browse files Browse the repository at this point in the history
* 'master' of github.com:OpenPoolProject/stratum: (39 commits)
  chore(deps): update ossf/scorecard-action digest to d4f9a7a
  chore(deps): update github/codeql-action digest to 70426bb
  chore(deps): update taiki-e/install-action digest to d62eacb
  chore(deps): update github/codeql-action digest to a5966ad
  chore(deps): update ossf/scorecard-action digest to 9b15950
  chore(deps): update github/codeql-action digest to d92a91c
  chore(deps): update ossf/scorecard-action digest to 3cb9305
  fix(deps): update rust crate futures to 0.3.24
  chore(deps): update taiki-e/install-action digest to 6c46ebf
  chore(deps): update github/codeql-action digest to a59fbe2
  chore(deps): update step-security/harden-runner digest to e680f76
  fix(deps): update rust crate time to 0.3.14
  chore(deps): update ossf/scorecard-action digest to dd5015a
  chore(deps): update google-github-actions/release-please-action digest to 14c6add
  chore(deps): update ossf/scorecard-action digest to 94f1815
  chore(deps): update google-github-actions/release-please-action digest to ea729d9
  chore(deps): update taiki-e/install-action digest to 581b570
  chore(deps): update ossf/scorecard-action digest to 7bd84a0
  chore(deps): update taiki-e/install-action digest to dda69ee
  chore(deps): update ossf/scorecard-action digest to b7bd96c
  ...
  • Loading branch information
kilpatty committed Sep 2, 2022
2 parents 9dcf583 + a5a723a commit b25bc23
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
issues: write
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Install Rust
uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: stable
- uses: Swatinem/rust-cache@90429b3dea365e9a1b0cb82d7f98aabf3089dc63
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ jobs:
rust: [stable, beta, nightly]
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
- uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: ${{ matrix.rust }}
components: rust-src
- uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
- uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: cargo-hack
- uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
- uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: nextest
- uses: Swatinem/rust-cache@90429b3dea365e9a1b0cb82d7f98aabf3089dc63
Expand All @@ -72,14 +72,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
persist-credentials: false
- uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
- uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: cargo-hack
- run:
Expand All @@ -90,18 +90,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
- uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: nightly
components: clippy,rustfmt
- uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
- uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: cargo-hack
- uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
- uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: cargo-minimal-versions
- run: cargo fmt --all --check
Expand All @@ -117,14 +117,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: stable
- uses: Swatinem/rust-cache@90429b3dea365e9a1b0cb82d7f98aabf3089dc63
Expand All @@ -142,14 +142,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: stable
- uses: Swatinem/rust-cache@90429b3dea365e9a1b0cb82d7f98aabf3089dc63
Expand All @@ -163,22 +163,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: stable
components: llvm-tools-preview
- name: Install cargo-llvm-cov
uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: cargo-llvm-cov
- uses: taiki-e/install-action@74efbe3ca41988b1c402800fbd3a72c98c9d8eaa
- uses: taiki-e/install-action@d62eacb5625d90e0d62e2b664b76033f6f997dc4
with:
tool: nextest
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dep-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: "Checkout Repository"
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
- name: Dependency Review
uses: actions/dependency-review-action@94145f3150bfabdc97540cbd5f7e926306ea7744 # tag=v2
uses: actions/dependency-review-action@23d1ffffb6fa5401173051ec21eba8c35242733f # tag=v2
# critical
#
# You can only include one of these two options:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v3
- uses: google-github-actions/release-please-action@14c6addfeb0bfb4b1d78fa1da89e5b08f7c6b3c3 # tag=v3
with:
release-type: rust
package-name: stratum-server
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ jobs:
contents: write
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
persist-credentials: false
- uses: dtolnay/rust-toolchain@f7003eed5ea1f2175ea1d670748f9c21af4f5d9e
- uses: dtolnay/rust-toolchain@4d318db07a155f99337e7fc8de813caea5e92c32
with:
toolchain: stable
- run: cargo package
- uses: taiki-e/create-gh-release-action@c1709ec4762e524903da52fb3313206d45556c88
- uses: taiki-e/create-gh-release-action@7677226954b76ff34a3c194447a784703dce1a99
with:
title: $version
branch: master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
security-events: write
steps:
- name: Harden Runner
uses: step-security/harden-runner@7d3610100de4da85ebb79cf22ad4c19bb1f68e12
uses: step-security/harden-runner@e680f76da57a1e1ce6dc3eed69efc703fcca8dce
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand All @@ -55,7 +55,7 @@ jobs:
continue-on-error: true

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@680d08e97de81470381833edab18a51ab5a89f0c
uses: github/codeql-action/upload-sarif@70426bb879a3be8361f4db41697ea9fb4e2d57fd
with:
sarif_file: rust-clippy-results.sarif
wait-for-processing: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@f332b6881dd8107dcfb3ba83192c6246423558fa # v1.1.1
uses: ossf/scorecard-action@d4f9a7a02bb2accd23e78b67f15bd521812e2dca # v1.1.1
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -57,6 +57,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@680d08e97de81470381833edab18a51ab5a89f0c # v1.0.26
uses: github/codeql-action/upload-sarif@70426bb879a3be8361f4db41697ea9fb4e2d57fd # v1.0.26
with:
sarif_file: results.sarif
12 changes: 3 additions & 9 deletions server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,19 @@ websockets = ["async-tungstenite"]
# Futures
async-std = { version = "1.12", features = ["attributes", "unstable"] }
async-trait = "0.1.57"
futures = "0.3.21"
futures = "0.3.24"
stop-token = "0.7.0"
# @todo probably kill this since we don't need it for the metrics, but leaving it in for now.
# tide = = { version = "0.16", }

# Serialization
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.83"
serde_json = "1.0.85"
extended-primitives = {version = "0.3.6"}
encodings = "0.1.0"

# Metrics
# metrics = { version="0.13.0-alpha.8" }
# metrics-exporter-prometheus = "0.1.0-alpha.5"

# Misc
uuid = { version = "1.1.2", features = ["serde", "v4"] }
log = "0.4"
time = "0.3.13"
time = "0.3.14"
signal-hook = "0.3.14"
signal-hook-async-std = "0.2.2"
bit-set = "0.5.3"
Expand Down

0 comments on commit b25bc23

Please sign in to comment.