From 25d86e6c2a2dc3472e718b045597a7c4bd37dff7 Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Thu, 4 Jan 2024 06:52:31 -0800 Subject: [PATCH] Tracks ibc-rs changes up to v0.49.1 (#147) * chore: track ibc-rs pr 998 * deps: update ibc-proto to v0.39.1 * chore: track ibc-rs pr 1000 * chore: update ibc-re rev * chore: tracks ibc-rs pr 1005 * chore: track ibc-rs changes in PR 1004 * chore: tracks ibs-rs PR 1008 * chore: tracks ibc-rs PR 1010 * chore: track ibc-rs release v0.49.1 * chore: update ibc to v0.49.1 * fix: clippy v0.1.75 catches --- Cargo.lock | 389 +++++++++++------------------ Cargo.toml | 4 +- crates/app/src/abci/v0_37/impls.rs | 12 +- crates/app/src/modules/context.rs | 14 +- crates/app/src/modules/ibc/mod.rs | 1 - 5 files changed, 156 insertions(+), 264 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc9e4c24..b22b2a2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -39,30 +39,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -71,12 +71,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - [[package]] name = "async-stream" version = "0.3.5" @@ -96,7 +90,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -107,7 +101,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -299,18 +293,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -344,12 +326,6 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" -[[package]] -name = "byte-slice-cast" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" - [[package]] name = "byteorder" version = "1.5.0" @@ -382,9 +358,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.10" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -392,9 +368,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.9" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -412,7 +388,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -551,7 +527,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -562,7 +538,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -577,9 +553,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -624,7 +600,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -716,9 +692,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "8bbb8258be8305fb0237d7b295f47bb24ff1b136a535f473baf40e70468515aa" dependencies = [ "indenter", "once_cell", @@ -746,9 +722,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ - "byteorder", - "rand", - "rustc-hex", "static_assertions", ] @@ -777,12 +750,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.3.29" @@ -839,7 +806,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -994,9 +961,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1067,8 +1034,9 @@ dependencies = [ [[package]] name = "ibc" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08258907d8b5b20b5de6eb064d17bc45fd4f48e64e96efbe62e035150a7d150e" dependencies = [ "ibc-apps", "ibc-clients", @@ -1080,8 +1048,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038cacbeb1658ee4295449676a4870fdc79b1edbcb5905f6ad64e68f200d1488" dependencies = [ "ibc-app-transfer-types", "ibc-core", @@ -1090,8 +1059,9 @@ dependencies = [ [[package]] name = "ibc-app-transfer-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d89a3a0233a4e5927b116a9e6dc222cbdab0cf0fd7f0dee6308c8eefc00bb63" dependencies = [ "derive_more", "displaydoc", @@ -1104,16 +1074,18 @@ dependencies = [ [[package]] name = "ibc-apps" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61d7aafdb984fcfbbc9268fd9fa924964c2f5dfd036c5bbe3695cf28b2b2f0ea" dependencies = [ "ibc-app-transfer", ] [[package]] name = "ibc-client-tendermint" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "189dd739853e9cef400b4cb91e58ba261b85f17002caa862a7af924237d14879" dependencies = [ "ibc-client-tendermint-types", "ibc-core-client", @@ -1128,8 +1100,9 @@ dependencies = [ [[package]] name = "ibc-client-tendermint-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc6e8ff8d3a4477bfe8bc97f100dd7f13a7710e9de6e1541b76d33fa6a472ef" dependencies = [ "displaydoc", "ibc-core-client-types", @@ -1145,16 +1118,18 @@ dependencies = [ [[package]] name = "ibc-clients" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875afb9fd11cfeaa23de0234b5a353781fb18b4c4fb165719eb29a9c69a3fae6" dependencies = [ "ibc-client-tendermint", ] [[package]] name = "ibc-core" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91444e562962b9dab6f44117cb8a20a2a681733108343c4d9fbf89c506fa8081" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1168,8 +1143,9 @@ dependencies = [ [[package]] name = "ibc-core-channel" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6279ffdba5f9ea605688d2e769f5cefecd77c888d9b9d001862d2d9dfa16ee4d" dependencies = [ "ibc-core-channel-types", "ibc-core-client", @@ -1183,8 +1159,9 @@ dependencies = [ [[package]] name = "ibc-core-channel-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445888ebca9e2e72a3c03a758254887ef5ef9a1bae6baf204f2b1f6f656f70ff" dependencies = [ "derive_more", "displaydoc", @@ -1202,8 +1179,9 @@ dependencies = [ [[package]] name = "ibc-core-client" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8744739af25917b484d1030712af53331e62f0477b8411bd9ce5691c46a1b6dc" dependencies = [ "ibc-core-client-context", "ibc-core-client-types", @@ -1215,8 +1193,9 @@ dependencies = [ [[package]] name = "ibc-core-client-context" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a87a59fa85ceb0bcf5973e2327094605d2a0ef7f51e519a47f242d6d1322fe0" dependencies = [ "derive_more", "displaydoc", @@ -1232,8 +1211,9 @@ dependencies = [ [[package]] name = "ibc-core-client-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20be8f5b66c483810ff3bda67db59e5dedeeb5cef0edd18dc08f8c1f32804a2d" dependencies = [ "derive_more", "displaydoc", @@ -1248,8 +1228,9 @@ dependencies = [ [[package]] name = "ibc-core-commitment-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f784dd0a1d15430dee55558b3f7d270d3a52539ad20e1e4530bd60959e590324" dependencies = [ "derive_more", "displaydoc", @@ -1262,8 +1243,9 @@ dependencies = [ [[package]] name = "ibc-core-connection" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0075f40dae0d9d18b3e4335db78ec7cda962ba2ed791673d9015e636810b04fb" dependencies = [ "ibc-core-client", "ibc-core-connection-types", @@ -1274,8 +1256,9 @@ dependencies = [ [[package]] name = "ibc-core-connection-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b27882397e2d105ddc57718b18c74c5b6db76ed40c97c5c53dc1620c99d0554c" dependencies = [ "derive_more", "displaydoc", @@ -1291,8 +1274,9 @@ dependencies = [ [[package]] name = "ibc-core-handler" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd99fb91b3a2a4fe410a7d3f91a177f0cec32e4b29d878a334503d2341ea226" dependencies = [ "ibc-core-channel", "ibc-core-client", @@ -1306,8 +1290,9 @@ dependencies = [ [[package]] name = "ibc-core-handler-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf5890e3a731ba6f615853858b73f5db91f5f31648208250e64473c44d90e36" dependencies = [ "derive_more", "displaydoc", @@ -1326,8 +1311,9 @@ dependencies = [ [[package]] name = "ibc-core-host" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0e4e1f9e595af3f371e5cbeca6916e23eab1d2c172591fab51c21c0307642d7" dependencies = [ "derive_more", "displaydoc", @@ -1344,8 +1330,9 @@ dependencies = [ [[package]] name = "ibc-core-host-cosmos" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0d7c5228389e154b3a5ba9cc1c33eb481855aa8ae732a9135cb205a0acbca0a" dependencies = [ "derive_more", "displaydoc", @@ -1367,8 +1354,9 @@ dependencies = [ [[package]] name = "ibc-core-host-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02ecf33c6a328b922b819c336a85a8ca9ff404c64ce024d01181754b3c2671f1" dependencies = [ "derive_more", "displaydoc", @@ -1378,8 +1366,9 @@ dependencies = [ [[package]] name = "ibc-core-router" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bc590d9460935782d15f9ec307fa705847f88ca0a271c417f8b61ac4b7b55e0" dependencies = [ "derive_more", "displaydoc", @@ -1392,8 +1381,9 @@ dependencies = [ [[package]] name = "ibc-core-router-types" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81c009c007673cfc677b120577dd11d95e8a7613eed5a8f0b9a9f0a23f9a4895" dependencies = [ "derive_more", "displaydoc", @@ -1407,19 +1397,21 @@ dependencies = [ [[package]] name = "ibc-derive" -version = "0.4.0" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cac1e3c7ab92abf785bb86675bdc02e3d67e9e4624c1d513e83ff3098f9c461" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] name = "ibc-primitives" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff38e0e738c53cb38fe8a7b52571a7205c3014fa194dcebc018b5f0528258cc5" dependencies = [ "derive_more", "displaydoc", @@ -1449,8 +1441,9 @@ dependencies = [ [[package]] name = "ibc-query" -version = "0.48.1" -source = "git+https://github.com/cosmos/ibc-rs?rev=5a16481#5a16481aabba0012e248da9fc8519947b6448cc2" +version = "0.49.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6b842c18a030e4ad39f577739d0cce3ae47016b94ec59a8d200d326088bf51e" dependencies = [ "displaydoc", "ibc", @@ -1491,15 +1484,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "impl-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "impl-serde" version = "0.4.0" @@ -1509,17 +1493,6 @@ dependencies = [ "serde", ] -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "indenter" version = "0.3.3" @@ -1573,9 +1546,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" @@ -1615,9 +1588,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libm" @@ -1676,9 +1649,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", @@ -1737,9 +1710,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -1759,32 +1732,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parity-scale-codec" -version = "3.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" -dependencies = [ - "arrayvec", - "bitvec", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "3.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1864,7 +1811,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1908,20 +1855,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", - "impl-codec", "impl-serde", "uint", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro2" version = "1.0.70" @@ -1971,7 +1908,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -1998,12 +1935,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.8.5" @@ -2110,9 +2041,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", @@ -2137,30 +2068,24 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -2219,9 +2144,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -2335,7 +2260,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2357,7 +2282,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2540,9 +2465,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" dependencies = [ "proc-macro2", "quote", @@ -2576,12 +2501,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempfile" version = "3.8.1" @@ -2743,7 +2662,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2801,9 +2720,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", @@ -2836,7 +2755,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -2906,7 +2825,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit", ] [[package]] @@ -2918,17 +2837,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.1.0", - "toml_datetime", - "winnow", -] - [[package]] name = "toml_edit" version = "0.21.0" @@ -3054,7 +2962,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] [[package]] @@ -3094,9 +3002,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -3124,9 +3032,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -3239,7 +3147,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "wasm-bindgen-shared", ] @@ -3273,7 +3181,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3459,9 +3367,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" dependencies = [ "memchr", ] @@ -3476,15 +3384,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "zeroize" version = "1.7.0" @@ -3502,5 +3401,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.40", ] diff --git a/Cargo.toml b/Cargo.toml index 28873065..31bffc82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,8 @@ base64 = { version = "0.21", default-features = false, features = ["alloc"] } 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 } -ibc = { git ="https://github.com/cosmos/ibc-rs", rev = "5a16481" } -ibc-query = { git ="https://github.com/cosmos/ibc-rs", rev = "5a16481" } +ibc = { version = "0.49.1", default-features = false } +ibc-query = { version = "0.49.1", default-features = false } ibc-proto = { version = "0.39.1", default-features = false } ics23 = { version = "0.11", default-features = false } prost = { version = "0.12", default-features = false } diff --git a/crates/app/src/abci/v0_37/impls.rs b/crates/app/src/abci/v0_37/impls.rs index eab7e267..6e762918 100644 --- a/crates/app/src/abci/v0_37/impls.rs +++ b/crates/app/src/abci/v0_37/impls.rs @@ -222,10 +222,8 @@ pub fn deliver_tx( match app.deliver_msg(message, &signer) { // success - append events and continue with next message Ok(msg_events) => { - let mut proto_events: Vec = msg_events - .into_iter() - .map(|event| event.try_into().unwrap()) - .collect(); + let mut proto_events: Vec = + msg_events.into_iter().map(|event| event.into()).collect(); events.append(&mut proto_events); } @@ -293,10 +291,8 @@ pub fn begin_block( for IdentifiedModule { module, .. } in modules.iter_mut() { let tm_event = module.begin_block(&header); - let proto_events: Vec = tm_event - .into_iter() - .map(|event| event.try_into().unwrap()) - .collect(); + let proto_events: Vec = + tm_event.into_iter().map(|event| event.into()).collect(); events.extend(proto_events); } diff --git a/crates/app/src/modules/context.rs b/crates/app/src/modules/context.rs index 3b8132ed..5aa7d451 100644 --- a/crates/app/src/modules/context.rs +++ b/crates/app/src/modules/context.rs @@ -89,8 +89,6 @@ pub trait Identifiable { } pub mod prefix { - use core::convert::TryInto; - use super::Identifiable; use basecoin_store::types::Identifier as StoreIdentifier; @@ -102,7 +100,7 @@ pub mod prefix { type Identifier = StoreIdentifier; fn identifier(&self) -> Self::Identifier { - "bank".to_owned().try_into().unwrap() + "bank".to_owned().into() } } @@ -114,7 +112,7 @@ pub mod prefix { type Identifier = StoreIdentifier; fn identifier(&self) -> Self::Identifier { - "ibc".to_owned().try_into().unwrap() + "ibc".to_owned().into() } } @@ -126,7 +124,7 @@ pub mod prefix { type Identifier = StoreIdentifier; fn identifier(&self) -> Self::Identifier { - "auth".to_owned().try_into().unwrap() + "auth".to_owned().into() } } @@ -138,7 +136,7 @@ pub mod prefix { type Identifier = StoreIdentifier; fn identifier(&self) -> Self::Identifier { - "gov".to_owned().try_into().unwrap() + "gov".to_owned().into() } } @@ -150,7 +148,7 @@ pub mod prefix { type Identifier = StoreIdentifier; fn identifier(&self) -> Self::Identifier { - "staking".to_owned().try_into().unwrap() + "staking".to_owned().into() } } @@ -162,7 +160,7 @@ pub mod prefix { type Identifier = StoreIdentifier; fn identifier(&self) -> Self::Identifier { - "upgrade".to_owned().try_into().unwrap() + "upgrade".to_owned().into() } } } diff --git a/crates/app/src/modules/ibc/mod.rs b/crates/app/src/modules/ibc/mod.rs index 2988807d..82f364da 100644 --- a/crates/app/src/modules/ibc/mod.rs +++ b/crates/app/src/modules/ibc/mod.rs @@ -4,7 +4,6 @@ mod impls; mod router; mod transfer; -pub use client_contexts::*; pub use error::*; pub use impls::*; pub use router::*;