Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move metadata away from workspace manifests #1193

Merged
merged 1 commit into from
Oct 10, 2024
Merged

move metadata away from workspace manifests #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/interop-cpp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "interop-cpp"
version = "0.1.0"
authors = ["fi3 <[email protected]>"]
Shourya742 marked this conversation as resolved.
Show resolved Hide resolved
authors = ["The Stratum V2 Developers"]
edition = "2018"
publish = false

Expand Down
2 changes: 1 addition & 1 deletion examples/ping-pong-with-noise/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ping_pong_with_noise"
version = "0.1.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
publish = false

Expand Down
2 changes: 1 addition & 1 deletion examples/ping-pong-without-noise/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ping_pong_without_noise"
version = "0.1.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
publish = false

Expand Down
13 changes: 0 additions & 13 deletions protocols/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
name = "stratum_v2_protocols"
version = "1.0.0"
authors = ["The Stratum v2 Developers"]
edition = "2021"
description = "The Stratum protocol defines how miners, proxies, and pools communicate to contribute hashrate to the Bitcoin network. Stratum v2 is a robust set of primitives which anyone can use to expand the protocol or implement a role."
documentation = "https://github.com/stratum-mining/stratum"
readme = "README.md"
homepage = "https://stratumprotocol.org"
repository = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
license-file = "LICENSE.md"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[workspace]

resolver="2"
Expand Down
5 changes: 5 additions & 0 deletions protocols/fuzz-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ version = "1.0.0"
edition = "2021"
authors = ["Automatically generated"]
publish = false
documentation = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[package.metadata]
cargo-fuzz = true
Expand Down
8 changes: 6 additions & 2 deletions protocols/v1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "sv1_api"
version = "1.0.1"
authors = ["user"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "API for bridging SV1 miners to SV2 pools"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/sv1_api"
license = "MIT + Apache-2.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is or, not and

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't get it, Can you elaborate?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You changed the license wording from MIT <OR> Apache to MIT <AND> Apache, it should stay as OR (i.e., don't change OR to +)

Copy link
Contributor Author

@Shourya742 Shourya742 Oct 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As it used + everywhere except this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

umm not really.. take a look into the files please. it is currently either MIT or MIT OR Apache and all of the changes modified it to MIT + Apache. Anyway, saying MIT AND Apache is confusing as AND implies both licenses forced together, while its either this or that, however the user wants.

Copy link
Contributor Author

@Shourya742 Shourya742 Oct 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, MIT + Apache means users can choose either the MIT or Apache 2.0 license. It doesn’t mean both licenses apply together, just that the user has the option to pick one.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think it is confusing to use and but mean or.. but anyway this is not a big deal

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

turns out this is actually a big deal 😛

#1217

repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/binary-sv2/binary-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "binary_sv2"
version = "1.2.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 data format"
license = "MIT"
documentation = "https://docs.rs/binary_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/binary-sv2/no-serde-sv2/codec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "binary_codec_sv2"
version = "1.2.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 data format"
license = "MIT"
documentation = "https://docs.rs/binary_codec_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/binary-sv2/no-serde-sv2/derive_codec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "derive_codec_sv2"
version = "1.1.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Derive macro for Sv2 binary format serializer and deserializer"
license = "MIT"
documentation = "https://docs.rs/derive_codec_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/binary-sv2/serde-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "serde_sv2"
version = "1.0.1"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Serlializer and Deserializer for Stratum V2 data format"
license = "MIT"
documentation = "https://docs.rs/serde_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/codec-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "codec_sv2"
version = "1.2.1"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 data format"
license = "MIT"
documentation = "https://docs.rs/codec_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[dependencies]
serde = { version = "1.0.89", default-features = false, optional = true }
Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/const-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "const_sv2"
version = "2.0.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "This crate holds all of the shared constants used across the different Stratum V2 protocols and roles crates"
license = "MIT"
documentation = "https://docs.rs/const_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/framing-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "framing_sv2"
version = "2.0.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 frames"
license = "MIT"
documentation = "https://docs.rs/framing_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/noise-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "noise_sv2"
version = "1.1.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 noise"
license = "MIT"
documentation = "https://docs.rs/noise_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[dependencies]
secp256k1 = { version = "0.28.2", default-features = false, features =["hashes", "alloc","rand","rand-std"] }
Expand Down
7 changes: 6 additions & 1 deletion protocols/v2/roles-logic-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
[package]
name = "roles_logic_sv2"
version = "1.2.1"
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Common handlers for use within SV2 roles"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/roles_logic_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/subprotocols/common-messages/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "common_messages_sv2"
version = "2.0.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 subprotocol common messages"
license = "MIT"
documentation = "https://docs.rs/common_messages_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/subprotocols/job-declaration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "job_declaration_sv2"
version = "1.0.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "SV2 job declaration protocol types"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/job_declaration_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]


[dependencies]
Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/subprotocols/mining/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "mining_sv2"
version = "1.0.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "SV2 mining protocol types"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/mining_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/subprotocols/template-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "template_distribution_sv2"
version = "1.0.2"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "Sv2 template distribution subprotocol"
license = "MIT"
documentation = "https://docs.rs/template_distribution_sv2"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
8 changes: 6 additions & 2 deletions protocols/v2/sv2-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "sv2_ffi"
version = "1.0.0"
authors = ["fi3 <[email protected]>"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
readme = "README.md"
description = "SV2 FFI"
license = "MIT OR Apache-2.0"
documentation = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
repository = "https://github.com/stratum-mining/stratum"
homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[lib]
crate-type = ["staticlib"]
Expand Down
13 changes: 0 additions & 13 deletions roles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
name = "stratum_v2_roles"
version = "0.1.0"
authors = ["The Stratum v2 Developers"]
edition = "2021"
description = "The Stratum protocol defines how miners, proxies, and pools communicate to contribute hashrate to the Bitcoin network. Stratum v2 is a robust set of primitives which anyone can use to expand the protocol or implement a role."
documentation = "https://github.com/stratum-mining/stratum"
readme = "README.md"
homepage = "https://stratumprotocol.org"
repository = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
license-file = "LICENSE.md"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[workspace]

resolver="2"
Expand Down
9 changes: 7 additions & 2 deletions roles/jd-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
[package]
name = "jd_client"
version = "0.1.1"
authors = ["The Stratum V2 Developers"]
edition = "2021"
description = "TODO"
license = "MIT OR Apache-2.0"
description = "Job Declarator Client (JDC) role"
documentation = "https://docs.rs/jd_client"
readme = "README.md"
homepage = "https://stratumprotocol.org"
repository = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[lib]
name = "jd_client"
Expand Down
9 changes: 8 additions & 1 deletion roles/jd-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
[package]
name = "jd_server"
version = "0.1.1"
authors = ["The Stratum V2 Developers"]
edition = "2018"
license = "MIT OR Apache-2.0"
description = "Job Declarator Server (JDS) role"
documentation = "https://github.com/stratum-mining/stratum"
readme = "README.md"
homepage = "https://stratumprotocol.org"
repository = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
keywords = ["stratum", "mining", "bitcoin", "protocol"]


[lib]
name = "jd_server"
Expand Down
9 changes: 7 additions & 2 deletions roles/mining-proxy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
[package]
name = "mining_proxy_sv2"
version = "0.1.1"
authors = ["user"]
authors = ["The Stratum V2 Developers"]
edition = "2018"
description = "SV2 mining proxy role"
license = "MIT OR Apache-2.0"
documentation = "https://docs.rs/mining_proxy_sv2"
readme = "README.md"
homepage = "https://stratumprotocol.org"
repository = "https://github.com/stratum-mining/stratum"
license = "MIT + Apache-2.0"
keywords = ["stratum", "mining", "bitcoin", "protocol"]


[lib]
name = "mining_proxy_sv2"
Expand Down
Loading
Loading