Skip to content

Commit

Permalink
Merge branch 'master' of github.com:entropyxyz/entropy-core into add-…
Browse files Browse the repository at this point in the history
…no-hash-option
  • Loading branch information
JesseAbram committed Jan 29, 2025
2 parents ac38a17 + 3fad280 commit cc9c9e0
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 22 deletions.
47 changes: 33 additions & 14 deletions 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 crates/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ reqwest ={ version="0.12.12", features=["json", "stream"], optional=tr
base64 ={ version="0.22.0", optional=true }
synedrion ={ version="0.2.0", optional=true }
hex ={ version="0.4.3", optional=true }
parity-scale-codec={ version="3.7.1", default-features=false, optional=true }
parity-scale-codec={ version="3.7.2", default-features=false, optional=true }

# Only for the browser
js-sys={ version="0.3.74", optional=true }
Expand Down
4 changes: 2 additions & 2 deletions crates/test-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bincode ="1.3.3"
x25519-dalek ="2.0.1"
sp-runtime ={ version="32.0.0", default-features=false }
entropy-shared ={ version="0.3.0", path="../shared" }
serde_json ="1.0.137"
serde_json ="1.0.138"
serde ={ version="1.0.217", features=["derive"] }
reqwest ="0.12.12"
parity-scale-codec={ version="3.7.1", default-features=false }
parity-scale-codec={ version="3.7.2", default-features=false }
2 changes: 1 addition & 1 deletion crates/testing-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ subxt ="0.35.3"
sp-keyring ="34.0.0"
project-root ="0.2.2"
sp-core ={ version="31.0.0", default-features=false }
parity-scale-codec="3.7.1"
parity-scale-codec="3.7.2"
lazy_static ="1.5.0"
hex-literal ="0.4.1"
tokio ={ version="1.43", features=["macros", "fs", "rt-multi-thread", "io-util", "process"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/threshold-signature-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ axum ={ version="0.8.2", features=["ws"] }

# Substrate
subxt ="0.35.3"
parity-scale-codec="3.7.1"
parity-scale-codec="3.7.2"
sp-core ={ version="31.0.0", default-features=false }
sp-keyring ="34.0.0"

Expand All @@ -60,7 +60,7 @@ uuid ={ version="1.12.1", features=["v4"] }
# Misc
tokio-tungstenite="0.26.1"
bincode ="1.3.3"
bip32 ={ version="0.5.2" }
bip32 ={ version="0.5.3" }
bip39 ={ version="2.1.0", features=["zeroize"] }
bytes ={ version="1.9", default-features=false, features=["serde"] }
base64 ="0.22.1"
Expand Down
2 changes: 2 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ exceptions=[
# them
{ allow=["OpenSSL"], name="ring" },
{ allow=["Unicode-DFS-2016"], name="unicode-ident" },
{ allow=["Zlib"], name="const_format" },
{ allow=["Zlib"], name="const_format_proc_macros" },
]

# Some crates don't have (easily) machine readable licensing information,
Expand Down
2 changes: 1 addition & 1 deletion node/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ log ="0.4.25"
pallet-im-online={ version="28.0.0" }
rand ="0.8.5"
serde ={ version="1.0.217", features=["derive"] }
serde_json ='1.0.137'
serde_json ='1.0.138'

# Substrate Client

Expand Down
2 changes: 1 addition & 1 deletion pallets/registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ publish =false
targets=['x86_64-unknown-linux-gnu']

[dependencies]
bip32 ={ version="0.5.2", default-features=false, features=["alloc"] }
bip32 ={ version="0.5.3", default-features=false, features=["alloc"] }
codec ={ package="parity-scale-codec", version="3.6.3", default-features=false, features=["derive"] }
log ={ version="0.4.25", default-features=false }
scale-info={ version="2.11", default-features=false, features=["derive"] }
Expand Down

0 comments on commit cc9c9e0

Please sign in to comment.