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

Jump to bottom

fix: builds on various archs/platforms re: PR 4331 #4335

Merged
merged 3 commits into from
Feb 9, 2024
Merged

fix: builds on various archs/platforms re: PR 4331 #4335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af07c00
fix: builds on various archs/platforms re: PR 4331
wileyj Feb 1, 2024
49fcb0d
Merge branch 'develop' into fix/c-deps_master
wileyj Feb 2, 2024
28f2cc3
Merge branch 'develop' into fix/c-deps_master
wileyj Feb 9, 2024
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
135 changes: 0 additions & 135 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ members = [
"stacks-signer",
"testnet/stacks-node"]

# Dependencies we want to keep the same between workspace members
[workspace.dependencies]
wsts = { version = "7.0", default-features = false }
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is the correct way to include wsts to avoid including bindgen and friends.

rand_core = "0.6"
rand = "0.8"

# Use a bit more than default optimization for
# dev builds to speed up test execution
[profile.dev]
Expand Down
6 changes: 3 additions & 3 deletions stacks-signer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ clap = { version = "4.1.1", features = ["derive", "env"] }
hashbrown = "0.14"
libsigner = { path = "../libsigner" }
libstackerdb = { path = "../libstackerdb" }
p256k1 = "5.5"
p256k1 = { version = "5.5", default-features = false }
rand_core = "0.6"
reqwest = { version = "0.11.22", features = ["blocking", "json"] }
reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "json", "rustls-tls"] }
Copy link
Member

Choose a reason for hiding this comment

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

Is there a way to simply build without TLS? If not, then this is fine.

serde = "1"
serde_derive = "1"
serde_stacker = "0.1"
Expand All @@ -42,7 +42,7 @@ thiserror = "1.0"
toml = "0.5.6"
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
wsts = "4.0.0"
wsts = { version = "4.0.0", default-features = false }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a reason why we have such an old version of wsts here in the stacks-signer Cargo.toml? And why we have different versions here and in the root Cargo.toml?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can't say for certain, but best to leave as-is since this branch has been genesis-sync tested as working.


[dependencies.serde_json]
version = "1.0"
Expand Down