diff --git a/Cargo.lock b/Cargo.lock index 909d8eab..f26b2f8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -49,9 +49,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -103,7 +103,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -114,7 +114,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -170,9 +170,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -189,6 +189,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base58ck" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" +dependencies = [ + "bitcoin-internals", + "bitcoin_hashes", +] + [[package]] name = "base64" version = "0.21.7" @@ -214,11 +224,10 @@ dependencies = [ "basecoin-app", "basecoin-modules", "basecoin-store", - "bech32 0.11.0", + "bech32", "bitcoin", "clap", "digest 0.10.7", - "generic-array", "hdpath", "ibc", "ibc-proto", @@ -250,9 +259,9 @@ dependencies = [ "ibc-proto", "prost", "serde_json", - "tendermint 0.36.0", + "tendermint 0.37.0", "tendermint-abci", - "tendermint-proto 0.36.0", + "tendermint-proto 0.37.0", "tonic", "tower", "tower-abci", @@ -263,7 +272,7 @@ dependencies = [ name = "basecoin-modules" version = "0.1.0" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "basecoin-store", "cosmrs", "derive_more", @@ -278,7 +287,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.8", - "tendermint 0.36.0", + "tendermint 0.37.0", "tendermint-rpc", "tonic", "tracing", @@ -295,16 +304,10 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "tendermint 0.36.0", + "tendermint 0.37.0", "tracing", ] -[[package]] -name = "bech32" -version = "0.10.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" - [[package]] name = "bech32" version = "0.11.0" @@ -329,12 +332,15 @@ dependencies = [ [[package]] name = "bitcoin" -version = "0.31.2" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c85783c2fe40083ea54a33aa2f0ba58831d90fcd190f5bdc47e74e84d2a96ae" +checksum = "ea507acc1cd80fc084ace38544bbcf7ced7c2aa65b653b102de0ce718df668f6" dependencies = [ - "bech32 0.10.0-beta", + "base58ck", + "bech32", "bitcoin-internals", + "bitcoin-io", + "bitcoin-units", "bitcoin_hashes", "hex-conservative", "hex_lit", @@ -343,17 +349,32 @@ dependencies = [ [[package]] name = "bitcoin-internals" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" +checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2" [[package]] -name = "bitcoin_hashes" -version = "0.13.0" +name = "bitcoin-io" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" + +[[package]] +name = "bitcoin-units" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +checksum = "cb54da0b28892f3c52203a7191534033e051b6f4b52bc15480681b57b7e036f5" dependencies = [ "bitcoin-internals", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", "hex-conservative", ] @@ -441,9 +462,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cfg-if" @@ -453,9 +474,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -463,9 +484,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -476,21 +497,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "colorchoice" @@ -628,13 +649,13 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -660,13 +681,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -865,7 +886,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -924,9 +945,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "group" @@ -1009,9 +1030,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] [[package]] name = "hex_lit" @@ -1052,9 +1076,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1064,9 +1088,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -1115,7 +1139,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-apps", "ibc-clients", @@ -1128,7 +1152,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1138,7 +1162,7 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1152,7 +1176,7 @@ dependencies = [ [[package]] name = "ibc-apps" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-app-transfer", ] @@ -1160,7 +1184,7 @@ dependencies = [ [[package]] name = "ibc-client-tendermint" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "ibc-client-tendermint-types", @@ -1170,14 +1194,14 @@ dependencies = [ "ibc-core-host", "ibc-primitives", "serde", - "tendermint 0.36.0", + "tendermint 0.37.0", "tendermint-light-client-verifier", ] [[package]] name = "ibc-client-tendermint-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1186,17 +1210,17 @@ dependencies = [ "ibc-primitives", "ibc-proto", "serde", - "tendermint 0.36.0", + "tendermint 0.37.0", "tendermint-light-client-verifier", - "tendermint-proto 0.36.0", + "tendermint-proto 0.37.0", ] [[package]] name = "ibc-client-wasm-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "displaydoc", "ibc-core-client", "ibc-core-host-types", @@ -1208,7 +1232,7 @@ dependencies = [ [[package]] name = "ibc-clients" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-client-tendermint", "ibc-client-wasm-types", @@ -1217,7 +1241,7 @@ dependencies = [ [[package]] name = "ibc-core" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1233,7 +1257,7 @@ dependencies = [ [[package]] name = "ibc-core-channel" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1248,7 +1272,7 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1261,13 +1285,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-core-client" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1280,7 +1304,7 @@ dependencies = [ [[package]] name = "ibc-core-client-context" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1290,13 +1314,13 @@ dependencies = [ "ibc-core-host-types", "ibc-primitives", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-core-client-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1306,13 +1330,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-core-commitment-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1326,7 +1350,7 @@ dependencies = [ [[package]] name = "ibc-core-connection" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1338,7 +1362,7 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1349,13 +1373,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-core-handler" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1370,7 +1394,7 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1384,13 +1408,13 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-core-host" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1408,7 +1432,7 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1425,13 +1449,13 @@ dependencies = [ "serde", "sha2 0.10.8", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-core-host-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1442,7 +1466,7 @@ dependencies = [ [[package]] name = "ibc-core-router" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1456,7 +1480,7 @@ dependencies = [ [[package]] name = "ibc-core-router-types" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", @@ -1465,38 +1489,38 @@ dependencies = [ "ibc-proto", "serde", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", ] [[package]] name = "ibc-derive" version = "0.7.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] name = "ibc-primitives" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "derive_more", "displaydoc", "ibc-proto", "prost", "serde", - "tendermint 0.36.0", + "tendermint 0.37.0", "time", ] [[package]] name = "ibc-proto" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7002e679ad26dc29bd27dfa490bb689d121d03c1512bed9f646f75028165644d" +checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65" dependencies = [ "base64 0.22.1", "bytes", @@ -1506,14 +1530,14 @@ dependencies = [ "prost", "serde", "subtle-encoding", - "tendermint-proto 0.36.0", + "tendermint-proto 0.37.0", "tonic", ] [[package]] name = "ibc-query" version = "0.53.0" -source = "git+https://github.com/cosmos/ibc-rs.git?rev=1b3aed9#1b3aed9d8dbbe645e6aa4e49547dc48cf9f2cbb3" +source = "git+https://github.com/cosmos/ibc-rs.git?rev=5dc0b09#5dc0b09fd953914d574e47e87f785a079e37e73f" dependencies = [ "displaydoc", "ibc", @@ -1694,9 +1718,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -1706,9 +1730,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -1748,7 +1772,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -1772,9 +1796,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -1805,9 +1829,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1891,7 +1915,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -1941,9 +1965,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1968,7 +1992,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -2021,9 +2045,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.5.0", ] @@ -2233,9 +2257,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" +checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ "bitcoin_hashes", "rand", @@ -2245,9 +2269,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" +checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" dependencies = [ "cc", ] @@ -2283,9 +2307,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -2310,13 +2334,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -2338,7 +2362,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -2479,9 +2503,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5" [[package]] name = "subtle-encoding" @@ -2500,20 +2524,9 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.65" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -2580,9 +2593,9 @@ dependencies = [ [[package]] name = "tendermint" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b50aae6ec24c3429149ad59b5b8d3374d7804d4c7d6125ceb97cb53907fb68d" +checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42" dependencies = [ "bytes", "digest 0.10.7", @@ -2602,48 +2615,48 @@ dependencies = [ "signature", "subtle", "subtle-encoding", - "tendermint-proto 0.36.0", + "tendermint-proto 0.37.0", "time", "zeroize", ] [[package]] name = "tendermint-abci" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4dbda8bb1cf62112b79cfe7d4aea59b0038a96aac2f027747d180f9ad758515" +checksum = "c4dafb8cd52d40bcda1c40c826a7e63c744fd46d4c67a8ec4fe98a6f6499a790" dependencies = [ "bytes", "flex-error", "prost", - "tendermint-proto 0.36.0", + "tendermint-proto 0.37.0", "tracing", ] [[package]] name = "tendermint-config" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e07b383dc8780ebbec04cfb603f3fdaba6ea6663d8dd861425b1ffa7761fe90d" +checksum = "f84b11b57d20ee4492a1452faff85f5c520adc36ca9fe5e701066935255bb89f" dependencies = [ "flex-error", "serde", "serde_json", - "tendermint 0.36.0", + "tendermint 0.37.0", "toml", "url", ] [[package]] name = "tendermint-light-client-verifier" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4216e487165e5dbd7af79952eaa0d5f06c5bde861eb76c690acd7f2d2a19395c" +checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e" dependencies = [ "derive_more", "flex-error", "serde", - "tendermint 0.36.0", + "tendermint 0.37.0", "time", ] @@ -2667,9 +2680,9 @@ dependencies = [ [[package]] name = "tendermint-proto" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f193d04afde6592c20fd70788a10b8cb3823091c07456db70d8a93f5fb99c1" +checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87" dependencies = [ "bytes", "flex-error", @@ -2683,9 +2696,9 @@ dependencies = [ [[package]] name = "tendermint-rpc" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3c231a3632cab53f92ad4161c730c468c08cfe4f0aa5a6735b53b390aecbd" +checksum = "dfdc2281e271277fda184d96d874a6fe59f569b130b634289257baacfc95aa85" dependencies = [ "async-trait", "bytes", @@ -2702,9 +2715,9 @@ dependencies = [ "serde_json", "subtle", "subtle-encoding", - "tendermint 0.36.0", + "tendermint 0.37.0", "tendermint-config", - "tendermint-proto 0.36.0", + "tendermint-proto 0.37.0", "thiserror", "time", "tokio", @@ -2741,7 +2754,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -2820,9 +2833,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2849,13 +2862,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -2908,9 +2921,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -2929,9 +2942,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", @@ -3004,15 +3017,14 @@ dependencies = [ [[package]] name = "tower-abci" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74290cdda37842bf92c7deb4e7742d087af864fe4f4953446156d72a7778a626" +source = "git+https://github.com/informalsystems/tower-abci?rev=37d952e#37d952e5cd8405cf47e761a20ac3a377119b0ad5" dependencies = [ "bytes", "futures", "pin-project", "prost", - "tendermint 0.36.0", - "tendermint-proto 0.36.0", + "tendermint 0.37.0", + "tendermint-proto 0.37.0", "tokio", "tokio-stream", "tokio-util 0.6.10", @@ -3052,7 +3064,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] [[package]] @@ -3143,9 +3155,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3154,9 +3166,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -3222,7 +3234,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.65", + "syn", "wasm-bindgen-shared", ] @@ -3256,7 +3268,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3449,9 +3461,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -3468,9 +3480,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -3483,5 +3495,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn", ] diff --git a/Cargo.toml b/Cargo.toml index 8c7f9b61..4d0ac345 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,35 +15,38 @@ authors = [ "Informal Systems " ] [workspace.dependencies] # external dependencies -base64 = { version = "0.21.6", default-features = false, features = [ "alloc" ] } +base64 = { version = "0.22.1", default-features = false, features = [ "alloc" ] } cosmrs = { version = "0.16.0" } displaydoc = { version = "0.2", default-features = false } -derive_more = { version = "0.99.17", default-features = false, features = [ "from", "into", "display" ] } -ed25519 = { version = "2.1.0", default-features = false } +derive_more = { version = "0.99.18", default-features = false, features = [ "from", "into", "display" ] } +ed25519 = { version = "2.2.3", default-features = false } prost = { version = "0.12", default-features = false } serde = "1.0" serde_json = "1.0" -sha2 = "0.10.2" +sha2 = "0.10.8" tonic = "0.11" tonic-reflection = "0.11" -tracing = "0.1.26" -tracing-subscriber = "0.3.16" +tracing = "0.1.40" +tracing-subscriber = "0.3.18" # ibc dependencies ibc = { version = "0.53.0", default-features = false, features = [ "serde" ] } ibc-query = { version = "0.53.0", default-features = false } -ibc-proto = { version = "0.45.0", default-features = false } +ibc-proto = { version = "0.46.0", default-features = false } ics23 = { version = "0.11", default-features = false } # tendermint dependencies -tendermint = { version = "0.36", default-features = false } -tendermint-abci = { version = "0.36", default-features = false } -tendermint-proto = { version = "0.36", default-features = false } -tendermint-rpc = { version = "0.36", default-features = false } +tendermint = { version = "0.37", default-features = false } +tendermint-abci = { version = "0.37", default-features = false } +tendermint-proto = { version = "0.37", default-features = false } +tendermint-rpc = { version = "0.37", default-features = false } # tower abci tower-abci = { version = "0.14" } [patch.crates-io] -ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "5779e86" } -ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "5779e86" } +ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "5dc0b09" } +ibc-query = { git = "https://github.com/cosmos/ibc-rs.git", rev = "5dc0b09" } + +# for tendermint 0.37 +tower-abci = { git = "https://github.com/informalsystems/tower-abci", rev = "37d952e" } diff --git a/basecoin/Cargo.toml b/basecoin/Cargo.toml index cc443790..480cf789 100644 --- a/basecoin/Cargo.toml +++ b/basecoin/Cargo.toml @@ -18,17 +18,16 @@ v0_38 = [ "basecoin-app/v0_38", "dep:tendermint-abci" ] bech32 = { version = "0.11.0" } tiny-bip39 = { version = "1" } digest = { version = "0.10.7" } -bitcoin = { version = "0.31.2" } +bitcoin = { version = "0.32.2" } hdpath = { version = "0.6.3" } -clap = { version = "4.5.0", features = [ "derive", "wrap_help" ] } -generic-array = { version = "0.14.7" } +clap = { version = "4.5.7", features = [ "derive", "wrap_help" ] } prost = { workspace = true } serde = { workspace = true } -serde_derive = { version = "1.0.104", default-features = false } +serde_derive = { version = "1.0.203", default-features = false } serde_json = { workspace = true } -secp256k1 = { version = "0.28.2", features = [ "serde", "rand-std" ] } +secp256k1 = { version = "0.29.0", features = [ "serde", "rand-std" ] } sha2 = { workspace = true } -tokio = { version = "1.0", features = [ "macros", "rt-multi-thread" ] } +tokio = { version = "1.38", features = [ "macros", "rt-multi-thread" ] } tonic = { workspace = true } tonic-reflection = { workspace = true } toml = { version = "0.8" } diff --git a/basecoin/modules/Cargo.toml b/basecoin/modules/Cargo.toml index 9682c46a..68e93034 100644 --- a/basecoin/modules/Cargo.toml +++ b/basecoin/modules/Cargo.toml @@ -14,10 +14,10 @@ base64 = { workspace = true } cosmrs = { workspace = true } displaydoc = { workspace = true } derive_more = { workspace = true } -primitive-types = { version = "0.12.0", default-features = false, features = [ "serde_no_std" ] } +primitive-types = { version = "0.12.2", default-features = false, features = [ "serde_no_std" ] } prost = { workspace = true } serde = { workspace = true } -serde_derive = { version = "1.0.104", default-features = false } +serde_derive = { version = "1.0.203", default-features = false } serde_json = { workspace = true } sha2 = { workspace = true } tonic = { workspace = true } diff --git a/basecoin/src/runner.rs b/basecoin/src/runner.rs index 9812a229..5740b339 100644 --- a/basecoin/src/runner.rs +++ b/basecoin/src/runner.rs @@ -9,10 +9,6 @@ use basecoin_modules::upgrade::Upgrade; use basecoin_store::impls::InMemoryStore; use ibc_proto::cosmos::base::tendermint::v1beta1::service_server::ServiceServer as HealthServer; use ibc_proto::cosmos::tx::v1beta1::service_server::ServiceServer as TxServer; -#[cfg(all(feature = "v0_38", not(feature = "v0_37")))] -use tendermint_abci::ServerBuilder; -#[cfg(all(feature = "v0_37", not(feature = "v0_38")))] -use tower_abci::v037::split; use crate::config::ServerConfig; @@ -64,7 +60,7 @@ pub async fn default_app_runner(server_cfg: ServerConfig) { tracing::info!("Starting Tendermint ABCI server"); // run the blocking ABCI server on a separate thread - let server = ServerBuilder::new(server_cfg.read_buf_size) + let server = tendermint_abci::ServerBuilder::new(server_cfg.read_buf_size) .bind( format!("{}:{}", server_cfg.host, server_cfg.port), app.clone(), @@ -81,7 +77,7 @@ pub async fn default_app_runner(server_cfg: ServerConfig) { tracing::info!("Starting tower ABCI server"); let app_split = app.clone(); - let (consensus, mempool, snapshot, info) = split::service(app_split, 10); + let (consensus, mempool, snapshot, info) = tower_abci::v037::split::service(app_split, 10); let server = tower_abci::v037::Server::builder() .consensus(consensus) diff --git a/basecoin/src/tx/key_pair.rs b/basecoin/src/tx/key_pair.rs index 2ce44abf..7ea8545a 100644 --- a/basecoin/src/tx/key_pair.rs +++ b/basecoin/src/tx/key_pair.rs @@ -5,8 +5,6 @@ use bip39::{Language, Mnemonic, Seed}; use bitcoin::bip32::{ChildNumber, DerivationPath, Xpriv, Xpub}; use bitcoin::network::Network; use digest::Digest; -use generic_array::typenum::U32; -use generic_array::GenericArray; use hdpath::StandardHDPath; use secp256k1::{Message, PublicKey, Secp256k1, SecretKey}; use serde::{Deserialize, Serialize}; @@ -76,7 +74,7 @@ impl KeyPair { } pub fn sign(&self, message: &[u8]) -> Result, Error> { - let hashed_message: GenericArray = Sha256::digest(message); + let hashed_message = Sha256::digest(message); let message = Message::from_digest_slice(&hashed_message).map_err(|_| Error::Custom { reason: "attempted to sign a malformed message".to_string(),