Skip to content

Commit

Permalink
Merge branch 'dev' into 2024-07-pre-push-bash-fmt-only
Browse files Browse the repository at this point in the history
  • Loading branch information
rrybarczyk committed Aug 15, 2024
2 parents 2c47248 + 742dfd1 commit 8c9923f
Show file tree
Hide file tree
Showing 29 changed files with 719 additions and 163 deletions.
131 changes: 131 additions & 0 deletions .github/workflows/semver-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
name: Semver Check

on:
push:
branches:
- "main"
- "dev"
pull_request:
branches:
- "main"
- "dev"

jobs:
semver-check:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Cache Cargo registry
uses: actions/cache@v2
with:
path: ~/.cargo/registry
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-
- name: Cache Cargo index
uses: actions/cache@v2
with:
path: ~/.cargo/git
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-index-
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y cmake

- name: Install cargo-semver-checks
run: cargo install cargo-semver-checks --locked

- name: Run semver checks for common
working-directory: common
run: cargo semver-checks

- name: Run semver checks for utils/buffer
working-directory: utils/buffer
run: cargo semver-checks

- name: Run semver checks for protocols/v2/binary-sv2/no-serde-sv2/codec
working-directory: protocols/v2/binary-sv2/no-serde-sv2/codec
run: cargo semver-checks

- name: Run semver checks for protocols/v2/binary-sv2/serde-sv2
working-directory: protocols/v2/binary-sv2/serde-sv2
run: cargo semver-checks

- name: Run semver checks for protocols/v2/binary-sv2/binary-sv2
working-directory: protocols/v2/binary-sv2/binary-sv2
run: cargo semver-checks

- name: Run semver checks for protocols/v2/const-sv2
working-directory: protocols/v2/const-sv2
run: cargo semver-checks

- name: Run semver checks for protocols/v2/framing-sv2
working-directory: protocols/v2/framing-sv2
run: cargo semver-checks

- name: Run semver checks for protocols/v2/noise-sv2
working-directory: protocols/v2/noise-sv2
run: cargo semver-checks

- name: Run semver checks for protocols/v2/codec-sv2
working-directory: protocols/v2/codec-sv2
run: cargo semver-checks

- name: Run semver checks for protocols/v2/subprotocols/common-messages
working-directory: protocols/v2/subprotocols/common-messages
run: cargo semver-checks

- name: Run semver checks for protocols/v2/subprotocols/job-declaration
working-directory: protocols/v2/subprotocols/job-declaration
run: cargo semver-checks

- name: Run semver checks for protocols/v2/subprotocols/mining
working-directory: protocols/v2/subprotocols/mining
run: cargo semver-checks

- name: Run semver checks for protocols/v2/subprotocols/template-distribution
working-directory: protocols/v2/subprotocols/template-distribution
run: cargo semver-checks

- name: Run semver checks for protocols/v2/sv2-ffi
working-directory: protocols/v2/sv2-ffi
run: cargo semver-checks

- name: Run semver checks for protocols/v2/roles-logic-sv2
working-directory: protocols/v2/roles-logic-sv2
run: cargo semver-checks --default-features

- name: Run semver checks for protocols/v1
working-directory: protocols/v1
run: cargo semver-checks

- name: Run semver checks for utils/bip32-key-derivation
working-directory: utils/bip32-key-derivation
run: cargo semver-checks

- name: Run semver checks for utils/error-handling
working-directory: utils/error-handling
run: cargo semver-checks

- name: Run semver checks for utils/key-utils
working-directory: utils/key-utils
run: cargo semver-checks

- name: Run semver checks for roles/roles-utils/network-helpers
working-directory: roles/roles-utils/network-helpers
run: cargo semver-checks

- name: Run semver checks for roles/roles-utils/rpc
working-directory: roles/roles-utils/rpc
run: cargo semver-checks
2 changes: 1 addition & 1 deletion benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ serde_json = { version = "1.0.64", default-features = false, features = ["alloc"
iai="0.1"
mining_sv2 = { path = "../protocols/v2/subprotocols/mining", version = "^1.0.0" }
roles_logic_sv2 = { path = "../protocols/v2/roles-logic-sv2", version = "^1.0.0" }
framing_sv2 = { version = "1.1.0", path = "../protocols/v2/framing-sv2" }
framing_sv2 = { version = "2.0.0", path = "../protocols/v2/framing-sv2" }
serde = { version = "1.0.89", default-features = false, features = ["derive", "alloc"] }
num-bigint = "0.4.3"
num-traits = "0.2.15"
Expand Down
14 changes: 7 additions & 7 deletions protocols/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion protocols/v2/binary-sv2/binary-sv2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "binary_sv2"
version = "1.0.0"
version = "1.0.1"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 data format"
Expand Down
6 changes: 3 additions & 3 deletions protocols/v2/codec-sv2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "codec_sv2"
version = "1.2.0"
version = "1.2.1"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 data format"
Expand All @@ -9,10 +9,10 @@ repository = "https://github.com/stratum-mining/stratum"

[dependencies]
serde = { version = "1.0.89", default-features = false, optional = true }
framing_sv2 = { version = "1.1.0", path = "../../../protocols/v2/framing-sv2" }
framing_sv2 = { version = "^2.0.0", path = "../../../protocols/v2/framing-sv2" }
noise_sv2 = { version = "1.0", path = "../../../protocols/v2/noise-sv2", optional=true}
binary_sv2 = { version = "1.0.0", path = "../../../protocols/v2/binary-sv2/binary-sv2" }
const_sv2 = { version = "1.0.0", path = "../../../protocols/v2/const-sv2"}
const_sv2 = { version = "2.0.0", path = "../../../protocols/v2/const-sv2"}
buffer_sv2 = { version = "1.0.0", path = "../../../utils/buffer"}
tracing = { version = "0.1"}

Expand Down
2 changes: 2 additions & 0 deletions protocols/v2/codec-sv2/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![cfg_attr(feature = "no_std", no_std)]

pub use framing_sv2::framing::Frame;

extern crate alloc;

#[cfg(feature = "noise_sv2")]
Expand Down
2 changes: 1 addition & 1 deletion protocols/v2/const-sv2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "const_sv2"
version = "1.0.0"
version = "2.0.0"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 constatnts"
Expand Down
4 changes: 2 additions & 2 deletions protocols/v2/framing-sv2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "framing_sv2"
version = "1.1.0"
version = "2.0.0"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 frames"
Expand All @@ -12,7 +12,7 @@ repository = "https://github.com/stratum-mining/stratum"

[dependencies]
serde = { version = "1.0.89", default-features = false, optional = true }
const_sv2 = { version = "^1.0.0", path = "../../../protocols/v2/const-sv2"}
const_sv2 = { version = "^2.0.0", path = "../../../protocols/v2/const-sv2"}
binary_sv2 = { version = "^1.0.0", path = "../../../protocols/v2/binary-sv2/binary-sv2" }
buffer_sv2 = { version = "^1.0.0", path = "../../../utils/buffer", optional=true }

Expand Down
2 changes: 1 addition & 1 deletion protocols/v2/noise-sv2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rand = {version = "0.8.5", default-features = false, features = ["std","std_rng"
aes-gcm = "0.10.2"
chacha20poly1305 = "0.10.1"
rand_chacha = "0.3.1"
const_sv2 = { version = "^1.0.0", path = "../../../protocols/v2/const-sv2"}
const_sv2 = { version = "^2.0.0", path = "../../../protocols/v2/const-sv2"}

[dev-dependencies]
quickcheck = "1.0.3"
Expand Down
11 changes: 5 additions & 6 deletions protocols/v2/roles-logic-sv2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "roles_logic_sv2"
version = "1.1.0"
version = "1.2.1"
edition = "2018"
description = "Common handlers for use within SV2 roles"
license = "MIT OR Apache-2.0"
Expand All @@ -12,12 +12,12 @@ repository = "https://github.com/stratum-mining/stratum"
stratum-common = { version="1.0.0", path = "../../../common", features=["bitcoin"]}
serde = { version = "1.0.89", features = ["derive", "alloc"], default-features = false, optional = true}
binary_sv2 = {version = "^1.0.0", path = "../../../protocols/v2/binary-sv2/binary-sv2", default-features = true }
common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^1.0.0" }
common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^2.0.0" }
mining_sv2 = { path = "../../../protocols/v2/subprotocols/mining", version = "^1.0.0" }
template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^1.0.1" }
job_declaration_sv2 = { path = "../../../protocols/v2/subprotocols/job-declaration", version = "^1.0.0" }
const_sv2 = { version = "^1.0.0", path = "../../../protocols/v2/const-sv2"}
framing_sv2 = { version = "^1.1.0", path = "../../../protocols/v2/framing-sv2" }
const_sv2 = { version = "^2.0.0", path = "../../../protocols/v2/const-sv2"}
framing_sv2 = { version = "^2.0.0", path = "../../../protocols/v2/framing-sv2" }
tracing = { version = "0.1"}
chacha20poly1305 = { version = "0.10.1"}
nohash-hasher = "0.2.0"
Expand All @@ -35,8 +35,7 @@ with_serde = [ "serde",
"common_messages_sv2/with_serde",
"template_distribution_sv2/with_serde",
"job_declaration_sv2/with_serde",
"mining_sv2/with_serde",
"framing_sv2/with_serde"]
"mining_sv2/with_serde"]
prop_test = ["template_distribution_sv2/prop_test"]
# Code coverage tools may conflict with the nopanic logic, so we can disable it when needed
disable_nopanic = []
4 changes: 2 additions & 2 deletions protocols/v2/subprotocols/common-messages/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "common_messages_sv2"
version = "1.0.0"
version = "2.0.0"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 subprotocol common messages"
Expand All @@ -12,7 +12,7 @@ repository = "https://github.com/stratum-mining/stratum"
[dependencies]
serde = { version = "1.0.89", default-features = false, optional= true }
binary_sv2 = {version = "^1.0.0", path = "../../../../protocols/v2/binary-sv2/binary-sv2" }
const_sv2 = {version = "^1.0.0", path = "../../../../protocols/v2/const-sv2"}
const_sv2 = {version = "^2.0.0", path = "../../../../protocols/v2/const-sv2"}
quickcheck = { version = "1.0.3", optional=true }
quickcheck_macros = { version = "1", optional=true }
serde_repr = {version= "0.1.10", optional=true}
Expand Down
2 changes: 1 addition & 1 deletion protocols/v2/subprotocols/job-declaration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = "https://github.com/stratum-mining/stratum"
[dependencies]
serde = { version = "1.0.89", default-features = false, optional= true }
binary_sv2 = {version = "^1.0.0", path = "../../../../protocols/v2/binary-sv2/binary-sv2" }
const_sv2 = {version = "^1.0.0", path = "../../../../protocols/v2/const-sv2"}
const_sv2 = {version = "^2.0.0", path = "../../../../protocols/v2/const-sv2"}

[features]
no_std = []
Expand Down
2 changes: 1 addition & 1 deletion protocols/v2/subprotocols/mining/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repository = "https://github.com/stratum-mining/stratum"
[dependencies]
serde = { version = "1.0.89", default-features = false, optional= true }
binary_sv2 = {version = "^1.0.0", path = "../../../../protocols/v2/binary-sv2/binary-sv2" }
const_sv2 = {version = "^1.0.0", path = "../../../../protocols/v2/const-sv2"}
const_sv2 = {version = "^2.0.0", path = "../../../../protocols/v2/const-sv2"}

[dev-dependencies]
quickcheck = "1.0.3"
Expand Down
6 changes: 3 additions & 3 deletions protocols/v2/subprotocols/template-distribution/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "template_distribution_sv2"
version = "1.0.1"
version = "1.0.2"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 template distribution subprotocol"
Expand All @@ -11,8 +11,8 @@ repository = "https://github.com/stratum-mining/stratum"

[dependencies]
serde = { version = "1.0.89", default-features = false, optional= true }
binary_sv2 = { version = "^1.0.0", path = "../../../../protocols/v2/binary-sv2/binary-sv2" }
const_sv2 = { version = "^1.0.0", path = "../../../../protocols/v2/const-sv2"}
binary_sv2 = { version = "^1.0.1", path = "../../../../protocols/v2/binary-sv2/binary-sv2" }
const_sv2 = { version = "^2.0.0", path = "../../../../protocols/v2/const-sv2"}
quickcheck = { version = "1.0.3", optional=true }
quickcheck_macros = { version = "1", optional=true }

Expand Down
4 changes: 2 additions & 2 deletions protocols/v2/sv2-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ crate-type = ["staticlib"]

[dependencies]
codec_sv2 = { path = "../../../protocols/v2/codec-sv2", version = "^1.0.0" }
const_sv2 = { path = "../../../protocols/v2/const-sv2", version = "^1.0.0" }
const_sv2 = { path = "../../../protocols/v2/const-sv2", version = "^2.0.0" }
binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2", version = "^1.0.0" }
common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^1.0.0" }
common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^2.0.0" }
template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^1.0.1" }

[dev-dependencies]
Expand Down
Loading

0 comments on commit 8c9923f

Please sign in to comment.