diff --git a/Cargo.lock b/Cargo.lock index 4d3cc0c787..ac9dd02fa1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -504,9 +504,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.76" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -1022,7 +1022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -1078,19 +1078,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder 1.5.0", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1394,16 +1381,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature 2.1.0", -] - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", + "signature", ] [[package]] @@ -1413,19 +1391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature 2.1.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "sha2 0.9.9", - "zeroize", + "signature", ] [[package]] @@ -1434,9 +1400,9 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519 2.2.3", - "rand_core 0.6.4", + "curve25519-dalek", + "ed25519", + "rand_core", "serde", "sha2 0.10.8", "subtle", @@ -1461,7 +1427,7 @@ dependencies = [ "ff", "generic-array", "group", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -1497,29 +1463,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -1607,7 +1550,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -1880,7 +1823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2038,14 +1981,15 @@ dependencies = [ [[package]] name = "hidapi" -version = "1.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798154e4b6570af74899d71155fb0072d5b17e6aa12f39c8ef22c60fb8ec99e7" +checksum = "03b876ecf37e86b359573c16c8366bc3eba52b689884a0fc42ba3f67203d2a8b" dependencies = [ "cc", + "cfg-if", "libc", "pkg-config", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2697,9 +2641,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "ledger-apdu" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe435806c197dfeaa5efcded5e623c4b8230fd28fdf1e91e7a86e40ef2acbf90" +checksum = "c21ffd28d97c9252671ab2ebe7078c9fa860ff3c5a125039e174d25ec6872169" dependencies = [ "arrayref", "no-std-compat", @@ -2708,9 +2652,9 @@ dependencies = [ [[package]] name = "ledger-transport" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1117f2143d92c157197785bf57711d7b02f2cfa101e162f8ca7900fb7f976321" +checksum = "c2f18de77d956a030dbc5869ced47d404bbd641216ef2f9dce7ca90833ca64ff" dependencies = [ "async-trait", "ledger-apdu", @@ -2718,9 +2662,9 @@ dependencies = [ [[package]] name = "ledger-transport-hid" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ba81a1f5f24396b37211478aff7fbcd605dd4544df8dbed07b9da3c2057aee" +checksum = "a4e34341e2708fbf805a9ada44ef6182170c6464c4fc068ab801abb7562fd5e8" dependencies = [ "byteorder 1.5.0", "cfg-if", @@ -3488,7 +3432,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3498,15 +3442,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - [[package]] name = "rand_core" version = "0.6.4" @@ -3958,15 +3896,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scc" -version = "2.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ff467073ddaff34c3a39e5b454f25dd982484a26fff50254ca793c56a1b714" -dependencies = [ - "sdd", -] - [[package]] name = "schannel" version = "0.1.23" @@ -4022,12 +3951,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sdd" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177258b64c0faaa9ffd3c65cd3262c2bc7e2588dbbd9c1641d0346145c1bbda8" - [[package]] name = "sec1" version = "0.7.2" @@ -4210,31 +4133,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "serial_test" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" -dependencies = [ - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "sha2" version = "0.9.9" @@ -4299,12 +4197,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.1.0" @@ -4312,7 +4204,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -4336,24 +4228,13 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slip10" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28724a6e6f70b0cb115c580891483da6f3aa99e6a353598303a57f89d23aa6bc" -dependencies = [ - "ed25519-dalek 1.0.1", - "hmac 0.9.0", - "sha2 0.9.9", -] - [[package]] name = "slipped10" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a45443e66aa5d96db5e02d17db056e1ca970232a4fe73e1f9bc1816d68f4e98" dependencies = [ - "ed25519-dalek 2.1.1", + "ed25519-dalek", "hmac 0.9.0", "sha2 0.9.9", ] @@ -4366,24 +4247,23 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snafu" -version = "0.7.5" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +checksum = "223891c85e2a29c3fe8fb900c1fae5e69c2e42415e3177752e8718475efa5019" dependencies = [ - "doc-comment", "snafu-derive", ] [[package]] name = "snafu-derive" -version = "0.7.5" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -4451,7 +4331,7 @@ dependencies = [ "directories", "dirs 4.0.0", "dotenvy", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "ethnum", "flate2", "fqdn", @@ -4492,7 +4372,7 @@ dependencies = [ "soroban-spec-tools", "soroban-spec-typescript", "stellar-rpc-client", - "stellar-strkey 0.0.11", + "stellar-strkey 0.0.9", "stellar-xdr 22.0.0-rc.1.1", "strsim 0.10.0", "strum 0.17.1", @@ -4582,9 +4462,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b7a32c28f281c423189f1298960194f0e0fc4eeb72378028171e556d8cd6160" dependencies = [ "backtrace", - "curve25519-dalek 4.1.3", + "curve25519-dalek", "ecdsa", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "elliptic-curve", "generic-array", "getrandom", @@ -4618,9 +4498,9 @@ dependencies = [ "ark-ec", "ark-ff", "ark-serialize", - "curve25519-dalek 4.1.3", + "curve25519-dalek", "ecdsa", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "elliptic-curve", "generic-array", "getrandom", @@ -4715,7 +4595,7 @@ dependencies = [ "arbitrary", "bytes-lit", "ctor", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "rand", "serde", "serde_json", @@ -4735,7 +4615,7 @@ dependencies = [ "arbitrary", "bytes-lit", "ctor", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "rand", "rustc_version", "serde", @@ -4867,7 +4747,7 @@ dependencies = [ "itertools 0.10.5", "serde_json", "soroban-spec 22.0.0-rc.3", - "stellar-strkey 0.0.11", + "stellar-strkey 0.0.9", "stellar-xdr 22.0.0-rc.1.1", "thiserror", "tokio", @@ -4902,7 +4782,7 @@ version = "22.0.0-rc.1" dependencies = [ "assert_cmd", "assert_fs", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "fs_extra", "hex", "predicates 2.1.5", @@ -4914,7 +4794,7 @@ dependencies = [ "soroban-spec 22.0.0-rc.3", "soroban-spec-tools", "stellar-rpc-client", - "stellar-strkey 0.0.11", + "stellar-strkey 0.0.9", "thiserror", "tokio", "toml 0.8.19", @@ -4983,31 +4863,20 @@ name = "stellar-ledger" version = "22.0.0-rc.1" dependencies = [ "async-trait", - "bollard", - "byteorder 1.5.0", - "ed25519-dalek 2.1.1", - "env_logger", - "futures", + "ed25519-dalek", "hex", - "home", "httpmock", "ledger-transport", "ledger-transport-hid", - "log", "once_cell", "phf", - "pretty_assertions", "reqwest 0.11.27", - "sep5", "serde", "serde_derive", "serde_json", - "serial_test", "sha2 0.9.9", - "slip10", - "soroban-spec 22.0.0-rc.3", - "stellar-rpc-client", - "stellar-strkey 0.0.11", + "slipped10", + "stellar-strkey 0.0.9", "stellar-xdr 22.0.0-rc.1.1", "test-case", "testcontainers", @@ -5064,16 +4933,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "stellar-strkey" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0989c9a05eccbd08b60e603a1c7e3ed3ec92c0de73b8681fc964d272ab2b2697" -dependencies = [ - "crate-git-revision 0.0.6", - "data-encoding", -] - [[package]] name = "stellar-xdr" version = "21.2.0" diff --git a/Cargo.toml b/Cargo.toml index 31e92e40b1..d447cf090b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ version = "=22.0.0-rc.1" # Dependencies from elsewhere shared by crates: [workspace.dependencies] -stellar-strkey = "0.0.11" +stellar-strkey = "0.0.9" sep5 = "0.0.4" base64 = "0.21.2" thiserror = "1.0.46" diff --git a/cmd/crates/soroban-spec-json/Cargo.toml b/cmd/crates/soroban-spec-json/Cargo.toml index b13012a2ef..988d5ad233 100644 --- a/cmd/crates/soroban-spec-json/Cargo.toml +++ b/cmd/crates/soroban-spec-json/Cargo.toml @@ -12,7 +12,7 @@ rust-version.workspace = true [dependencies] soroban-spec = { workspace = true } -thiserror = "1.0.32" +thiserror = { workspace = true } serde = "1.0.82" serde_derive = "1.0.82" serde_json = "1.0.82" diff --git a/cmd/crates/soroban-spec-tools/Cargo.toml b/cmd/crates/soroban-spec-tools/Cargo.toml index a17a5d31f1..848175691f 100644 --- a/cmd/crates/soroban-spec-tools/Cargo.toml +++ b/cmd/crates/soroban-spec-tools/Cargo.toml @@ -26,7 +26,7 @@ ethnum = { workspace = true } hex = { workspace = true } wasmparser = { workspace = true } base64 = { workspace = true } -thiserror = "1.0.31" +thiserror = { workspace = true } [dev-dependencies] diff --git a/cmd/crates/soroban-spec-typescript/Cargo.toml b/cmd/crates/soroban-spec-typescript/Cargo.toml index f856f76ef9..761e240739 100644 --- a/cmd/crates/soroban-spec-typescript/Cargo.toml +++ b/cmd/crates/soroban-spec-typescript/Cargo.toml @@ -12,7 +12,7 @@ rust-version.workspace = true [dependencies] soroban-spec = { workspace = true } -thiserror = "1.0.32" +thiserror = { workspace = true } serde = "1.0.82" serde_derive = "1.0.82" serde_json = "1.0.82" diff --git a/cmd/crates/soroban-test/Cargo.toml b/cmd/crates/soroban-test/Cargo.toml index d9eb31bddc..86e15248de 100644 --- a/cmd/crates/soroban-test/Cargo.toml +++ b/cmd/crates/soroban-test/Cargo.toml @@ -25,7 +25,7 @@ sep5 = { workspace = true } soroban-cli = { workspace = true } soroban-rpc = { workspace = true } -thiserror = "1.0.31" +thiserror = { workspace = true } sha2 = "0.10.6" assert_cmd = "2.0.4" assert_fs = "1.0.7" diff --git a/cmd/crates/stellar-ledger/Cargo.toml b/cmd/crates/stellar-ledger/Cargo.toml index 10fd34e427..396846fe20 100644 --- a/cmd/crates/stellar-ledger/Cargo.toml +++ b/cmd/crates/stellar-ledger/Cargo.toml @@ -13,44 +13,38 @@ rust-version.workspace = true # This crate has not yet ever been published. Skip publishing until these # security issues are addressed: # https://github.com/stellar/stellar-cli/issues/1706 -publish = false +publish = true [dependencies] -soroban-spec = { workspace = true } -thiserror = "1.0.32" +thiserror = { workspace = true } serde = "1.0.82" serde_derive = "1.0.82" serde_json = "1.0.82" sha2 = "0.9.9" ed25519-dalek = { workspace = true } stellar-strkey = { workspace = true } -ledger-transport-hid = "0.10.0" -ledger-transport = "0.10.0" -sep5.workspace = true -slip10 = "0.4.3" +ledger-transport-hid = "0.11.0" +ledger-transport = "0.11.0" tracing = { workspace = true } hex.workspace = true -byteorder = "1.5.0" -bollard = { workspace = true } -home = "0.5.9" -tokio = { version = "1", features = ["full"] } -reqwest = { version = "0.11", features = ["json"] } -soroban-rpc.workspace = true -phf = { version = "0.11.2", features = ["macros"] } -futures = "0.3.30" async-trait = { workspace = true } +slip10 = {version = "0.4.6", package = "slipped10"} [dependencies.stellar-xdr] workspace = true features = ["curr", "std", "serde"] + + [dev-dependencies] -env_logger = "0.11.3" -futures = "0.3.30" -log = "0.4.21" +phf = { version = "0.11.2", features = ["macros"] } +tokio = { version = "1", features = ["full"] } +reqwest = { version = "0.11", features = ["json"] } +# futures = "0.3.30" + once_cell = "1.19.0" -pretty_assertions = "1.2.1" -serial_test = "3.0.0" + + httpmock = "0.7.0-rc.1" test-case = "3.3.1" testcontainers = "0.20.1"