Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
bech32 = { version = "0.8.1", default-features = false }
bitcoin_hashes = { version = "0.10.0", default-features = false }
secp256k1 = { git = "https://github.com/rust-bitcoin/rust-secp256k1", default-features = false, rev="f7cae46fc7733522cb84ef1b1ee1d1ed0cec2fd3" }
secp256k1 = { default-features = false, features = ["bitcoin_hashes"], version="0.24.2" }
core2 = { version = "0.3.0", optional = true, default-features = false }
rustversion = { version="1.0.9"}

Expand All @@ -52,7 +52,7 @@ hex = { version= "0.4", optional = true}
[dev-dependencies]
serde_json = "<1.0.45"
serde_test = "1"
secp256k1 = { git = "https://github.com/rust-bitcoin/rust-secp256k1", features = [ "recovery", "rand-std" ], rev="f7cae46fc7733522cb84ef1b1ee1d1ed0cec2fd3" }
secp256k1 = { features = [ "recovery", "rand-std", "bitcoin_hashes" ], version="0.24.2" }
bincode = "1.3.1"
# We need to pin ryu (transitive dep from serde_json) to stay compatible with Rust 1.22.0
ryu = "<1.0.5"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<h1>Rust Dash</h1>

<img alt="Rust Bitcoin logo by Hunter Trujillo, see license and source files under /logo" src="./logo/rust-bitcoin.png" width="300" />
<img alt="Rust Dash logo by Rostislav Gorbachenko, UX engineer at Dash Core Group, see license and source files under /logo" src="./logo/rust-dash-together.png" width="300" />

<p>Library with support for de/serialization, parsing and executing on data-structures
and network messages related to Dash Core payment chain.
Expand All @@ -23,7 +23,7 @@

Supports (or should support)

* De/serialization of Bitcoin protocol network messages
* De/serialization of Dash protocol network messages
* De/serialization of blocks and transactions
* Script de/serialization
* Private keys and address creation, de/serialization and validation (including full BIP32 support)
Expand Down Expand Up @@ -82,7 +82,7 @@ versions than the current stable one (see MSRV section).
The library can be built and tested using [`cargo`](https://github.com/rust-lang/cargo/):

```
git clone git@github.com:rust-bitcoin/rust-bitcoin.git
git clone git@github.com:dashpay/rust-dashcore.git
cd rust-bitcoin
cargo build
```
Expand Down
22 changes: 6 additions & 16 deletions logo/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Rust Bitcoin Logo
# Rust Dash Logo

## Files

Included are:

- [rust-bitcoin-inkscape.svg](./rust-bitcoin-inkscape.svg) - The Inkscape source file with the things used to make the logo in case adjustments are desired
- [rust-bitcoin-optimized.svg](./rust-bitcoin-optimized.svg) - An optimized SVG for embedding or rendering at any size desired
- [rust-bitcoin.png](./rust-bitcoin.png) - The PNG logo rendered at 300px used by this project
- [rust-bitcoin-large.png](./rust-bitcoin-large.png) - A larger size 1024px x 1024px for convenience for embedding in presentations
- [rust-dash-together.png](./rust-dash-together.png) - The PNG logo rendered at 938×834px used by this project
- [rust-dash.png](./rust-dash.png) - A PNG logo rendered at 938×834px of just the Dash Logo
- [rust-dash-together.svg](./rust-dash-together.svg) - An optimized SVG for embedding or rendering at any size desired
- [rust-dash.svg](./rust-dash.svg) - An optimized SVG for embedding or rendering at any size desired

## Author

Hunter Trujillo, @cryptoquick on [Twitter](https://twitter.com/cryptoquick), [GitHub](https://github.com/cryptoquick), and Telegram.
Rostislav Gorbachenko <rostislav.gorbachenko@dash.org>.

## License

Expand All @@ -20,13 +20,3 @@ Licensed in the public domain under [CC0 1.0 Universal Public Domain Dedication]
Bitcoin Logo is licensed under the CC Public Domain Dedication: <https://bitcoin.stackexchange.com/a/53422> and <https://bitcointalk.org/index.php?topic=1631.0>

Rust Logo is licensed under CC-BY, which allows reuse and modifications for any purpose, as long as distributors give appropriate credit and indicate changes have been made. See here: <https://www.rust-lang.org/policies/media-guide>

## Acknowledgements

Acknowledgement for the runners up in this PR: https://github.com/rust-bitcoin/rust-bitcoin/pull/891#issuecomment-1074476858

In particular, the Rust Bitcoin Wizard gear was an incredibly inspired piece of art. Also, the meshed gears design was beloved by some but not all.

Thank you to the Rust Bitcoin maintainers and community, your timely responses and guidance was appreciated.

Also, thank you to the voters on the Rust in Bitcoin Telegram group: <https://t.me/rust_in_bitcoin/321>.
244 changes: 0 additions & 244 deletions logo/rust-bitcoin-inkscape.svg

This file was deleted.

Binary file removed logo/rust-bitcoin-large.png
Binary file not shown.
1 change: 0 additions & 1 deletion logo/rust-bitcoin-optimized.svg

This file was deleted.

Binary file removed logo/rust-bitcoin.png
Binary file not shown.
Binary file added logo/rust-dash-together.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading