From abb374c674ab7cde206b00735c61ebc7d7c91f17 Mon Sep 17 00:00:00 2001 From: piobab Date: Tue, 28 Mar 2023 18:53:32 +0200 Subject: [PATCH 1/4] Mp 2422 emergency role improve (#185) * Improve emergency mgmt. * Update schema. * Fix clippy. * Use stable and nightly builds. Fix pipeline. --- Cargo.lock | 284 +++++++++--------- Cargo.toml | 2 +- contracts/red-bank/src/contract.rs | 3 - contracts/red-bank/src/execute.rs | 22 +- contracts/red-bank/src/query.rs | 8 +- contracts/red-bank/src/state.rs | 1 - contracts/red-bank/tests/helpers.rs | 1 - contracts/red-bank/tests/test_admin.rs | 20 +- .../tests/test_update_emergency_owner.rs | 120 ++------ integration-tests/tests/test_oracles.rs | 1 - packages/testing/src/integration/mock_env.rs | 1 - packages/types/src/red_bank/msg.rs | 5 - packages/types/src/red_bank/types.rs | 2 - .../mars-address-provider.json | 29 ++ schemas/mars-incentives/mars-incentives.json | 29 ++ .../mars-oracle-osmosis.json | 29 ++ schemas/mars-red-bank/mars-red-bank.json | 54 ++-- .../mars-rewards-collector-osmosis.json | 29 ++ .../MarsAddressProvider.types.ts | 6 + .../mars-incentives/MarsIncentives.types.ts | 6 + .../MarsOracleOsmosis.types.ts | 6 + .../mars-red-bank/MarsRedBank.client.ts | 22 -- .../mars-red-bank/MarsRedBank.react-query.ts | 20 -- .../mars-red-bank/MarsRedBank.types.ts | 11 +- .../MarsRewardsCollectorOsmosis.types.ts | 6 + 25 files changed, 356 insertions(+), 361 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01acc29c7..16831a5d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,19 +24,19 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "async-trait" -version = "0.1.63" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.8", ] [[package]] @@ -70,9 +70,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bech32" @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -168,9 +168,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cexpr" @@ -189,9 +189,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "num-integer", "num-traits", @@ -199,9 +199,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" dependencies = [ "glob", "libc", @@ -234,9 +234,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "cosmos-sdk-proto" @@ -244,7 +244,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20b42021d8488665b1a0d9748f1f81df7235362d194f44481e2e61bf376b77b4" dependencies = [ - "prost 0.11.6", + "prost 0.11.8", "prost-types", "tendermint-proto", ] @@ -271,9 +271,9 @@ dependencies = [ [[package]] name = "cosmwasm-crypto" -version = "1.2.0" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56fffc2233212e9546df66e01267277173d55f6237ab939690ef2c5cfd50c2" +checksum = "f22add0f9b2a5416df98c1d0248a8d8eedb882c38fbf0c5052b64eebe865df6d" dependencies = [ "digest 0.10.6", "ed25519-zebra", @@ -284,18 +284,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.0" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26a78e202d602a23fd5d13dff898732814ebe7a8bde20f1bf71eb0209d56d56" +checksum = "c2e64f710a18ef90d0a632cf27842e98ffc2d005a38a6f76c12fd0bc03bc1a2d" dependencies = [ - "syn", + "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.2.0" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a3dfcfa0c6f4b9aef8820c0a999410f239828a4503a388ce8e55f59fe3ac863" +checksum = "fe5ad2e23a971b9e4cd57b20cee3e2e79c33799bed4b128e473aca3702bfe5dd" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -306,20 +306,20 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.0" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19cd48063eef5b92a0aabcf0687705802178ae175571dfdc5f3b925d0741d39" +checksum = "2926d159a9bb1a716a592b40280f1663f2491a9de3b6da77c0933cee2a2655b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "cosmwasm-std" -version = "1.2.0" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50f4deaed6196047a3ceec9bc23e85d4292b73442d77af63723842d8b6049d" +checksum = "76fee88ff5bf7bef55bd37ac0619974701b99bf6bd4b16cf56ee8810718abd71" dependencies = [ "base64", "cosmwasm-crypto", @@ -474,7 +474,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -492,16 +492,16 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", "subtle", ] [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" @@ -553,9 +553,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -628,9 +628,9 @@ checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -642,9 +642,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -652,33 +652,33 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-core", "futures-sink", @@ -793,15 +793,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -842,9 +842,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libloading" @@ -972,9 +972,9 @@ dependencies = [ [[package]] name = "mars-owner" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5644a8b047a0d64d04706414805872f35439755e057431152dd36e6f369be24" +checksum = "8ca010da465b4a5ea7274f59132d22b7c10765295c73d5744add2c1fea6c5e38" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1061,7 +1061,7 @@ dependencies = [ "mars-red-bank-types", "mars-rewards-collector-osmosis", "osmosis-std 0.14.0", - "prost 0.11.6", + "prost 0.11.8", "schemars", "serde", "thiserror", @@ -1105,7 +1105,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1138,9 +1138,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -1150,9 +1150,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "osmosis-std" @@ -1163,7 +1163,7 @@ dependencies = [ "chrono", "cosmwasm-std", "osmosis-std-derive", - "prost 0.11.6", + "prost 0.11.8", "prost-types", "schemars", "serde", @@ -1179,7 +1179,7 @@ dependencies = [ "chrono", "cosmwasm-std", "osmosis-std-derive", - "prost 0.11.6", + "prost 0.11.8", "prost-types", "schemars", "serde", @@ -1195,7 +1195,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1209,7 +1209,7 @@ dependencies = [ "cosmrs", "cosmwasm-std", "osmosis-std 0.13.2", - "prost 0.11.6", + "prost 0.11.8", "serde", "serde_json", "test-tube", @@ -1218,9 +1218,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" @@ -1261,9 +1261,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] @@ -1280,12 +1280,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" +checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" dependencies = [ "bytes", - "prost-derive 0.11.6", + "prost-derive 0.11.8", ] [[package]] @@ -1298,37 +1298,36 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" +checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "prost-types" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" +checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" dependencies = [ - "bytes", - "prost 0.11.6", + "prost 0.11.8", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -1350,9 +1349,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" dependencies = [ "aho-corasick", "memchr", @@ -1361,9 +1360,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "rfc6979" @@ -1404,15 +1403,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "schemars" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", "schemars_derive", @@ -1422,14 +1421,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.109", ] [[package]] @@ -1448,15 +1447,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] @@ -1481,22 +1480,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.8", ] [[package]] @@ -1507,14 +1506,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -1523,13 +1522,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.8", ] [[package]] @@ -1621,9 +1620,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" dependencies = [ "proc-macro2", "quote", @@ -1638,7 +1648,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] @@ -1657,7 +1667,7 @@ dependencies = [ "k256", "num-traits", "once_cell", - "prost 0.11.6", + "prost 0.11.8", "prost-types", "ripemd160", "serde", @@ -1683,7 +1693,7 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.6", + "prost 0.11.8", "prost-types", "serde", "serde_bytes", @@ -1710,7 +1720,7 @@ dependencies = [ "cosmrs", "cosmwasm-std", "osmosis-std 0.13.2", - "prost 0.11.6", + "prost 0.11.8", "serde", "serde_json", "thiserror", @@ -1724,22 +1734,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.8", ] [[package]] @@ -1779,9 +1789,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-xid" @@ -1803,9 +1813,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1813,24 +1823,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1838,22 +1848,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "which" @@ -1914,6 +1924,6 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index b3ff30e40..b9e801f02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ cw2 = { git = "https://github.com/mars-protocol/cw-plus", rev = "4 cw-multi-test = "0.16.1" cw-storage-plus = "1.0.1" cw-utils = "1.0.1" -mars-owner = "1.0.0" +mars-owner = { version = "1.0.0", features = ["emergency-owner"] } osmosis-std = "0.14.0" osmosis-test-tube = "14.1.1" prost = { version = "0.11.5", default-features = false, features = ["prost-derive"] } diff --git a/contracts/red-bank/src/contract.rs b/contracts/red-bank/src/contract.rs index e01e80369..e467c5c76 100644 --- a/contracts/red-bank/src/contract.rs +++ b/contracts/red-bank/src/contract.rs @@ -22,9 +22,6 @@ pub fn execute( ) -> Result { match msg { ExecuteMsg::UpdateOwner(update) => execute::update_owner(deps, info, update), - ExecuteMsg::UpdateEmergencyOwner(update) => { - execute::update_emergency_owner(deps, info, update) - } ExecuteMsg::UpdateConfig { config, } => execute::update_config(deps, info, config), diff --git a/contracts/red-bank/src/execute.rs b/contracts/red-bank/src/execute.rs index a745295f4..3a6046aee 100644 --- a/contracts/red-bank/src/execute.rs +++ b/contracts/red-bank/src/execute.rs @@ -26,9 +26,7 @@ use crate::{ apply_accumulated_interests, get_scaled_debt_amount, get_scaled_liquidity_amount, get_underlying_debt_amount, get_underlying_liquidity_amount, update_interest_rates, }, - state::{ - COLLATERALS, CONFIG, DEBTS, EMERGENCY_OWNER, MARKETS, OWNER, UNCOLLATERALIZED_LOAN_LIMITS, - }, + state::{COLLATERALS, CONFIG, DEBTS, MARKETS, OWNER, UNCOLLATERALIZED_LOAN_LIMITS}, user::User, }; @@ -69,14 +67,6 @@ pub fn instantiate(deps: DepsMut, msg: InstantiateMsg) -> Result Result { - Ok(EMERGENCY_OWNER.update(deps, info, update)?) -} - /// Update config pub fn update_config( deps: DepsMut, @@ -216,7 +198,7 @@ pub fn update_asset( ) -> Result { if OWNER.is_owner(deps.storage, &info.sender)? { update_asset_by_owner(deps, &env, &denom, params) - } else if EMERGENCY_OWNER.is_owner(deps.storage, &info.sender)? { + } else if OWNER.is_emergency_owner(deps.storage, &info.sender)? { update_asset_by_emergency_owner(deps, &denom, params) } else { Err(OwnerError::NotOwner {}.into()) diff --git a/contracts/red-bank/src/query.rs b/contracts/red-bank/src/query.rs index 5db075b89..5fea2642b 100644 --- a/contracts/red-bank/src/query.rs +++ b/contracts/red-bank/src/query.rs @@ -15,9 +15,7 @@ use crate::{ get_scaled_debt_amount, get_scaled_liquidity_amount, get_underlying_debt_amount, get_underlying_liquidity_amount, }, - state::{ - COLLATERALS, CONFIG, DEBTS, EMERGENCY_OWNER, MARKETS, OWNER, UNCOLLATERALIZED_LOAN_LIMITS, - }, + state::{COLLATERALS, CONFIG, DEBTS, MARKETS, OWNER, UNCOLLATERALIZED_LOAN_LIMITS}, }; const DEFAULT_LIMIT: u32 = 5; @@ -25,13 +23,11 @@ const MAX_LIMIT: u32 = 10; pub fn query_config(deps: Deps) -> StdResult { let owner_state = OWNER.query(deps.storage)?; - let emergency_owner_state = EMERGENCY_OWNER.query(deps.storage)?; let config = CONFIG.load(deps.storage)?; Ok(ConfigResponse { owner: owner_state.owner, proposed_new_owner: owner_state.proposed, - emergency_owner: emergency_owner_state.owner, - proposed_new_emergency_owner: emergency_owner_state.proposed, + emergency_owner: owner_state.emergency_owner, address_provider: config.address_provider.to_string(), close_factor: config.close_factor, }) diff --git a/contracts/red-bank/src/state.rs b/contracts/red-bank/src/state.rs index 50cf3437b..4eaf0be3b 100644 --- a/contracts/red-bank/src/state.rs +++ b/contracts/red-bank/src/state.rs @@ -4,7 +4,6 @@ use mars_owner::Owner; use mars_red_bank_types::red_bank::{Collateral, Config, Debt, Market}; pub const OWNER: Owner = Owner::new("owner"); -pub const EMERGENCY_OWNER: Owner = Owner::new("emergency_owner"); pub const CONFIG: Item> = Item::new("config"); pub const MARKETS: Map<&str, Market> = Map::new("markets"); pub const COLLATERALS: Map<(&Addr, &str), Collateral> = Map::new("collaterals"); diff --git a/contracts/red-bank/tests/helpers.rs b/contracts/red-bank/tests/helpers.rs index e80550ec8..7a940a0ce 100644 --- a/contracts/red-bank/tests/helpers.rs +++ b/contracts/red-bank/tests/helpers.rs @@ -80,7 +80,6 @@ pub fn th_setup(contract_balances: &[Coin]) -> OwnedDeps, signer: &SigningAccount) -> (Strin OSMOSIS_RED_BANK_CONTRACT_NAME, &InstantiateRedBank { owner: signer.address(), - emergency_owner: signer.address(), config: CreateOrUpdateConfig { address_provider: Some(addr_provider_addr.clone()), close_factor: Some(Decimal::percent(10)), diff --git a/packages/testing/src/integration/mock_env.rs b/packages/testing/src/integration/mock_env.rs index 1fc7532cf..4a51d010a 100644 --- a/packages/testing/src/integration/mock_env.rs +++ b/packages/testing/src/integration/mock_env.rs @@ -621,7 +621,6 @@ impl MockEnvBuilder { self.owner.clone(), &red_bank::InstantiateMsg { owner: self.owner.to_string(), - emergency_owner: self.emergency_owner.to_string(), config: CreateOrUpdateConfig { address_provider: Some(address_provider_addr.to_string()), close_factor: Some(self.close_factor), diff --git a/packages/types/src/red_bank/msg.rs b/packages/types/src/red_bank/msg.rs index c7ad2029b..3a29d96e2 100644 --- a/packages/types/src/red_bank/msg.rs +++ b/packages/types/src/red_bank/msg.rs @@ -8,8 +8,6 @@ use crate::red_bank::InterestRateModel; pub struct InstantiateMsg { /// Contract's owner pub owner: String, - /// Contract's emergency owner - pub emergency_owner: String, /// Market configuration pub config: CreateOrUpdateConfig, } @@ -19,9 +17,6 @@ pub enum ExecuteMsg { /// Manages owner state UpdateOwner(OwnerUpdate), - /// Manages emergency owner state - UpdateEmergencyOwner(OwnerUpdate), - /// Update contract config (only owner can call) UpdateConfig { config: CreateOrUpdateConfig, diff --git a/packages/types/src/red_bank/types.rs b/packages/types/src/red_bank/types.rs index c6cd1202c..20b37bc10 100644 --- a/packages/types/src/red_bank/types.rs +++ b/packages/types/src/red_bank/types.rs @@ -72,8 +72,6 @@ pub struct ConfigResponse { pub proposed_new_owner: Option, /// The contract's emergency owner pub emergency_owner: Option, - /// The contract's proposed emergency owner - pub proposed_new_emergency_owner: Option, /// Address provider returns addresses for all protocol contracts pub address_provider: String, /// Maximum percentage of outstanding debt that can be covered by a liquidator diff --git a/schemas/mars-address-provider/mars-address-provider.json b/schemas/mars-address-provider/mars-address-provider.json index e3967e1b3..e3c3cea06 100644 --- a/schemas/mars-address-provider/mars-address-provider.json +++ b/schemas/mars-address-provider/mars-address-provider.json @@ -146,6 +146,35 @@ "enum": [ "abolish_owner_role" ] + }, + { + "description": "A separate entity managed by Owner that can be used for granting specific emergency powers.", + "type": "object", + "required": [ + "set_emergency_owner" + ], + "properties": { + "set_emergency_owner": { + "type": "object", + "required": [ + "emergency_owner" + ], + "properties": { + "emergency_owner": { + "type": "string" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Remove the entity in the Emergency Owner role", + "type": "string", + "enum": [ + "clear_emergency_owner" + ] } ] } diff --git a/schemas/mars-incentives/mars-incentives.json b/schemas/mars-incentives/mars-incentives.json index f72b53ec6..373dde4cb 100644 --- a/schemas/mars-incentives/mars-incentives.json +++ b/schemas/mars-incentives/mars-incentives.json @@ -238,6 +238,35 @@ "enum": [ "abolish_owner_role" ] + }, + { + "description": "A separate entity managed by Owner that can be used for granting specific emergency powers.", + "type": "object", + "required": [ + "set_emergency_owner" + ], + "properties": { + "set_emergency_owner": { + "type": "object", + "required": [ + "emergency_owner" + ], + "properties": { + "emergency_owner": { + "type": "string" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Remove the entity in the Emergency Owner role", + "type": "string", + "enum": [ + "clear_emergency_owner" + ] } ] }, diff --git a/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json b/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json index 78bda7d03..01b6a5527 100644 --- a/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json +++ b/schemas/mars-oracle-osmosis/mars-oracle-osmosis.json @@ -391,6 +391,35 @@ "enum": [ "abolish_owner_role" ] + }, + { + "description": "A separate entity managed by Owner that can be used for granting specific emergency powers.", + "type": "object", + "required": [ + "set_emergency_owner" + ], + "properties": { + "set_emergency_owner": { + "type": "object", + "required": [ + "emergency_owner" + ], + "properties": { + "emergency_owner": { + "type": "string" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Remove the entity in the Emergency Owner role", + "type": "string", + "enum": [ + "clear_emergency_owner" + ] } ] } diff --git a/schemas/mars-red-bank/mars-red-bank.json b/schemas/mars-red-bank/mars-red-bank.json index a7972eb0a..4c7b02ce0 100644 --- a/schemas/mars-red-bank/mars-red-bank.json +++ b/schemas/mars-red-bank/mars-red-bank.json @@ -8,7 +8,6 @@ "type": "object", "required": [ "config", - "emergency_owner", "owner" ], "properties": { @@ -20,10 +19,6 @@ } ] }, - "emergency_owner": { - "description": "Contract's emergency owner", - "type": "string" - }, "owner": { "description": "Contract's owner", "type": "string" @@ -76,19 +71,6 @@ }, "additionalProperties": false }, - { - "description": "Manages emergency owner state", - "type": "object", - "required": [ - "update_emergency_owner" - ], - "properties": { - "update_emergency_owner": { - "$ref": "#/definitions/OwnerUpdate" - } - }, - "additionalProperties": false - }, { "description": "Update contract config (only owner can call)", "type": "object", @@ -603,6 +585,35 @@ "enum": [ "abolish_owner_role" ] + }, + { + "description": "A separate entity managed by Owner that can be used for granting specific emergency powers.", + "type": "object", + "required": [ + "set_emergency_owner" + ], + "properties": { + "set_emergency_owner": { + "type": "object", + "required": [ + "emergency_owner" + ], + "properties": { + "emergency_owner": { + "type": "string" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Remove the entity in the Emergency Owner role", + "type": "string", + "enum": [ + "clear_emergency_owner" + ] } ] }, @@ -1040,13 +1051,6 @@ "null" ] }, - "proposed_new_emergency_owner": { - "description": "The contract's proposed emergency owner", - "type": [ - "string", - "null" - ] - }, "proposed_new_owner": { "description": "The contract's proposed owner", "type": [ diff --git a/schemas/mars-rewards-collector-osmosis/mars-rewards-collector-osmosis.json b/schemas/mars-rewards-collector-osmosis/mars-rewards-collector-osmosis.json index c4dc6b7e5..d76cde937 100644 --- a/schemas/mars-rewards-collector-osmosis/mars-rewards-collector-osmosis.json +++ b/schemas/mars-rewards-collector-osmosis/mars-rewards-collector-osmosis.json @@ -303,6 +303,35 @@ "enum": [ "abolish_owner_role" ] + }, + { + "description": "A separate entity managed by Owner that can be used for granting specific emergency powers.", + "type": "object", + "required": [ + "set_emergency_owner" + ], + "properties": { + "set_emergency_owner": { + "type": "object", + "required": [ + "emergency_owner" + ], + "properties": { + "emergency_owner": { + "type": "string" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + { + "description": "Remove the entity in the Emergency Owner role", + "type": "string", + "enum": [ + "clear_emergency_owner" + ] } ] }, diff --git a/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts b/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts index 7d7332706..e47f3d867 100644 --- a/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts +++ b/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts @@ -33,6 +33,12 @@ export type OwnerUpdate = | 'clear_proposed' | 'accept_proposed' | 'abolish_owner_role' + | { + set_emergency_owner: { + emergency_owner: string + } + } + | 'clear_emergency_owner' export type QueryMsg = | { config: {} diff --git a/scripts/types/generated/mars-incentives/MarsIncentives.types.ts b/scripts/types/generated/mars-incentives/MarsIncentives.types.ts index 2e8c10d9a..495f23929 100644 --- a/scripts/types/generated/mars-incentives/MarsIncentives.types.ts +++ b/scripts/types/generated/mars-incentives/MarsIncentives.types.ts @@ -50,6 +50,12 @@ export type OwnerUpdate = | 'clear_proposed' | 'accept_proposed' | 'abolish_owner_role' + | { + set_emergency_owner: { + emergency_owner: string + } + } + | 'clear_emergency_owner' export type QueryMsg = | { config: {} diff --git a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts index 9b65cb2b7..66b92fc55 100644 --- a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts +++ b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts @@ -104,6 +104,12 @@ export type OwnerUpdate = | 'clear_proposed' | 'accept_proposed' | 'abolish_owner_role' + | { + set_emergency_owner: { + emergency_owner: string + } + } + | 'clear_emergency_owner' export interface DowntimeDetector { downtime: Downtime recovery: number diff --git a/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts b/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts index a6e0b0afb..87cc28d65 100644 --- a/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts +++ b/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts @@ -314,11 +314,6 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { memo?: string, funds?: Coin[], ) => Promise - updateEmergencyOwner: ( - fee?: number | StdFee | 'auto', - memo?: string, - funds?: Coin[], - ) => Promise updateConfig: ( { config, @@ -453,7 +448,6 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed this.sender = sender this.contractAddress = contractAddress this.updateOwner = this.updateOwner.bind(this) - this.updateEmergencyOwner = this.updateEmergencyOwner.bind(this) this.updateConfig = this.updateConfig.bind(this) this.initAsset = this.initAsset.bind(this) this.updateAsset = this.updateAsset.bind(this) @@ -482,22 +476,6 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed funds, ) } - updateEmergencyOwner = async ( - fee: number | StdFee | 'auto' = 'auto', - memo?: string, - funds?: Coin[], - ): Promise => { - return await this.client.execute( - this.sender, - this.contractAddress, - { - update_emergency_owner: {}, - }, - fee, - memo, - funds, - ) - } updateConfig = async ( { config, diff --git a/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts b/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts index 74e68fa99..cd1bcc2d9 100644 --- a/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts +++ b/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts @@ -673,26 +673,6 @@ export function useMarsRedBankUpdateConfigMutation( options, ) } -export interface MarsRedBankUpdateEmergencyOwnerMutation { - client: MarsRedBankClient - args?: { - fee?: number | StdFee | 'auto' - memo?: string - funds?: Coin[] - } -} -export function useMarsRedBankUpdateEmergencyOwnerMutation( - options?: Omit< - UseMutationOptions, - 'mutationFn' - >, -) { - return useMutation( - ({ client, msg, args: { fee, memo, funds } = {} }) => - client.updateEmergencyOwner(msg, fee, memo, funds), - options, - ) -} export interface MarsRedBankUpdateOwnerMutation { client: MarsRedBankClient args?: { diff --git a/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts b/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts index 1e671af88..df95006e0 100644 --- a/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts +++ b/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts @@ -8,7 +8,6 @@ export type Decimal = string export interface InstantiateMsg { config: CreateOrUpdateConfig - emergency_owner: string owner: string } export interface CreateOrUpdateConfig { @@ -19,9 +18,6 @@ export type ExecuteMsg = | { update_owner: OwnerUpdate } - | { - update_emergency_owner: OwnerUpdate - } | { update_config: { config: CreateOrUpdateConfig @@ -92,6 +88,12 @@ export type OwnerUpdate = | 'clear_proposed' | 'accept_proposed' | 'abolish_owner_role' + | { + set_emergency_owner: { + emergency_owner: string + } + } + | 'clear_emergency_owner' export type Uint128 = string export interface InitOrUpdateAssetParams { borrow_enabled?: boolean | null @@ -197,7 +199,6 @@ export interface ConfigResponse { close_factor: Decimal emergency_owner?: string | null owner?: string | null - proposed_new_emergency_owner?: string | null proposed_new_owner?: string | null } export interface Market { diff --git a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts index 6a1edecc9..92dfe51c0 100644 --- a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts +++ b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts @@ -62,6 +62,12 @@ export type OwnerUpdate = | 'clear_proposed' | 'accept_proposed' | 'abolish_owner_role' + | { + set_emergency_owner: { + emergency_owner: string + } + } + | 'clear_emergency_owner' export type OsmosisRoute = SwapAmountInRoute[] export type Uint128 = string export interface UpdateConfig { From c1434c5a029dc46009bea60a91b028090ae855d0 Mon Sep 17 00:00:00 2001 From: piobab Date: Tue, 28 Mar 2023 21:03:18 +0200 Subject: [PATCH 2/4] Mp 2460 reject unexpected payment (#186) * reject unexpected payments * fix a borrow unit test * add license to package.json * Update schema. --------- Co-authored-by: larry <26318510+larry0x@users.noreply.github.com> --- contracts/red-bank/src/contract.rs | 15 ++++-- contracts/red-bank/tests/test_borrow.rs | 2 +- contracts/red-bank/tests/test_payment.rs | 62 ++++++++++++++++++++++++ scripts/package.json | 1 + 4 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 contracts/red-bank/tests/test_payment.rs diff --git a/contracts/red-bank/src/contract.rs b/contracts/red-bank/src/contract.rs index e467c5c76..cbbb0687b 100644 --- a/contracts/red-bank/src/contract.rs +++ b/contracts/red-bank/src/contract.rs @@ -51,12 +51,18 @@ pub fn execute( denom, amount, recipient, - } => execute::withdraw(deps, env, info, denom, amount, recipient), + } => { + cw_utils::nonpayable(&info)?; + execute::withdraw(deps, env, info, denom, amount, recipient) + } ExecuteMsg::Borrow { denom, amount, recipient, - } => execute::borrow(deps, env, info, denom, amount, recipient), + } => { + cw_utils::nonpayable(&info)?; + execute::borrow(deps, env, info, denom, amount, recipient) + } ExecuteMsg::Repay { on_behalf_of, } => { @@ -84,7 +90,10 @@ pub fn execute( ExecuteMsg::UpdateAssetCollateralStatus { denom, enable, - } => execute::update_asset_collateral_status(deps, env, info, denom, enable), + } => { + cw_utils::nonpayable(&info)?; + execute::update_asset_collateral_status(deps, env, info, denom, enable) + } } } diff --git a/contracts/red-bank/tests/test_borrow.rs b/contracts/red-bank/tests/test_borrow.rs index cb83f7bc8..bef237ba9 100644 --- a/contracts/red-bank/tests/test_borrow.rs +++ b/contracts/red-bank/tests/test_borrow.rs @@ -945,7 +945,7 @@ fn cannot_borrow_if_market_not_enabled() { // Check error when borrowing not allowed on market let env = mock_env(MockEnvParams::default()); - let info = cosmwasm_std::testing::mock_info("borrower", &[coin(110000, "somecoin")]); + let info = cosmwasm_std::testing::mock_info("borrower", &[]); let msg = ExecuteMsg::Borrow { denom: "somecoin".to_string(), amount: Uint128::new(1000), diff --git a/contracts/red-bank/tests/test_payment.rs b/contracts/red-bank/tests/test_payment.rs new file mode 100644 index 000000000..588997c7a --- /dev/null +++ b/contracts/red-bank/tests/test_payment.rs @@ -0,0 +1,62 @@ +mod helpers; + +use cosmwasm_std::{ + coins, + testing::{mock_env, mock_info}, + Uint128, +}; +use cw_utils::PaymentError; +use helpers::th_setup; +use mars_red_bank::contract; +use mars_red_bank_types::red_bank::ExecuteMsg; + +/// The Red Bank contract has 6 user-facing functions: deposit, withdraw, borrow, +/// repay, liquidate, and update_asset_collateral_status; amount these, 3 do not +/// expect the user to send any payment. This test verifies that they properly +/// reject if a user sends an expected payment. +/// +/// This is in response to this mainnet tx, where a user sends a payment with a +/// `withdraw` msg: +/// https://www.mintscan.io/osmosis/txs/2F214EE3A22DC93E61DE9A49BE616B317EB28AFC5E43B0AF07800AC7E6435522 +#[test] +fn rejecting_unexpected_payments() { + let mut deps = th_setup(&[]); + + let err = contract::execute( + deps.as_mut(), + mock_env(), + mock_info("larry", &coins(123, "uosmo")), + ExecuteMsg::Withdraw { + denom: "".into(), + amount: None, + recipient: None, + }, + ) + .unwrap_err(); + assert_eq!(err, PaymentError::NonPayable {}.into()); + + let err = contract::execute( + deps.as_mut(), + mock_env(), + mock_info("larry", &coins(234, "umars")), + ExecuteMsg::Borrow { + denom: "".into(), + amount: Uint128::zero(), + recipient: None, + }, + ) + .unwrap_err(); + assert_eq!(err, PaymentError::NonPayable {}.into()); + + let err = contract::execute( + deps.as_mut(), + mock_env(), + mock_info("larry", &coins(345, "uluna")), + ExecuteMsg::UpdateAssetCollateralStatus { + denom: "".into(), + enable: false, + }, + ) + .unwrap_err(); + assert_eq!(err, PaymentError::NonPayable {}.into()); +} diff --git a/scripts/package.json b/scripts/package.json index c20fcf870..70eac465e 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -1,6 +1,7 @@ { "name": "scripts", "version": "1.0.0", + "license": "GPL-3.0-or-later", "scripts": { "deploy:osmosis-testnet": "yarn build && node build/deploy/osmosis/testIndex.js", "deploy:osmosis-mainnet": "yarn build && node build/deploy/osmosis/mainIndex.js", From 4329538722decce907ebbf0e67e23de3eb57473b Mon Sep 17 00:00:00 2001 From: larry <26318510+larry0x@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:49:11 +0100 Subject: [PATCH 3/4] Compute utilization rate using internally-tracked parameters (#180) * compute utilization using internal params * fix admin tests * Fix tests. --------- Co-authored-by: Piotr Babel --- contracts/red-bank/src/error.rs | 3 -- contracts/red-bank/src/execute.rs | 36 +++++----------------- contracts/red-bank/src/interest_rates.rs | 27 ++++++---------- contracts/red-bank/tests/helpers.rs | 23 +++++++++----- contracts/red-bank/tests/test_admin.rs | 35 ++++++++++++++------- contracts/red-bank/tests/test_borrow.rs | 20 +----------- contracts/red-bank/tests/test_deposit.rs | 29 ++++------------- contracts/red-bank/tests/test_liquidate.rs | 15 ++------- contracts/red-bank/tests/test_misc.rs | 1 - contracts/red-bank/tests/test_withdraw.rs | 8 ----- integration-tests/tests/test_user_flow.rs | 4 +-- 11 files changed, 68 insertions(+), 133 deletions(-) diff --git a/contracts/red-bank/src/error.rs b/contracts/red-bank/src/error.rs index daf042ff1..e7f3d553f 100644 --- a/contracts/red-bank/src/error.rs +++ b/contracts/red-bank/src/error.rs @@ -111,9 +111,6 @@ pub enum ContractError { #[error("Failed to encode asset reference into string")] CannotEncodeAssetReferenceIntoString {}, - #[error("Contract current asset balance cannot be less than liquidity taken")] - OperationExceedsAvailableLiquidity {}, - #[error("Deposit for {denom:?} is not enabled")] DepositNotEnabled { denom: String, diff --git a/contracts/red-bank/src/execute.rs b/contracts/red-bank/src/execute.rs index 3a6046aee..c66212c55 100644 --- a/contracts/red-bank/src/execute.rs +++ b/contracts/red-bank/src/execute.rs @@ -274,14 +274,7 @@ fn update_asset_by_owner( updated_market.validate()?; if should_update_interest_rates { - response = update_interest_rates( - &deps, - env, - &mut updated_market, - Uint128::zero(), - denom, - response, - )?; + response = update_interest_rates(env, &mut updated_market, response)?; } MARKETS.save(deps.storage, denom, &updated_market)?; @@ -412,7 +405,7 @@ pub fn deposit( response, )?; - response = update_interest_rates(&deps, &env, &mut market, Uint128::zero(), &denom, response)?; + response = update_interest_rates(&env, &mut market, response)?; if market.liquidity_index.is_zero() { return Err(ContractError::InvalidLiquidityIndex {}); @@ -524,7 +517,7 @@ pub fn withdraw( response, )?; - response = update_interest_rates(&deps, &env, &mut market, withdraw_amount, &denom, response)?; + response = update_interest_rates(&env, &mut market, response)?; // reduce the withdrawer's scaled collateral amount let withdrawer_balance_after = withdrawer_balance_before.checked_sub(withdraw_amount)?; @@ -656,8 +649,7 @@ pub fn borrow( borrow_market.increase_debt(borrow_amount_scaled)?; borrower.increase_debt(deps.storage, &denom, borrow_amount_scaled, uncollateralized_debt)?; - response = - update_interest_rates(&deps, &env, &mut borrow_market, borrow_amount, &denom, response)?; + response = update_interest_rates(&env, &mut borrow_market, response)?; MARKETS.save(deps.storage, &denom, &borrow_market)?; // Send borrow amount to borrower or another recipient @@ -751,7 +743,7 @@ pub fn repay( market.decrease_debt(debt_amount_scaled_delta)?; user.decrease_debt(deps.storage, &denom, debt_amount_scaled_delta)?; - response = update_interest_rates(&deps, &env, &mut market, refund_amount, &denom, response)?; + response = update_interest_rates(&env, &mut market, response)?; MARKETS.save(deps.storage, &denom, &market)?; Ok(response @@ -917,14 +909,7 @@ pub fn liquidate( asset_market_after.debt_total_scaled = debt_market_debt_total_scaled_after; - response = update_interest_rates( - &deps, - &env, - &mut asset_market_after, - refund_amount, - denom, - response, - )?; + response = update_interest_rates(&env, &mut asset_market_after, response)?; MARKETS.save(deps.storage, denom, &asset_market_after)?; } else { @@ -941,14 +926,7 @@ pub fn liquidate( debt_market_after.debt_total_scaled = debt_market_debt_total_scaled_after; - response = update_interest_rates( - &deps, - &env, - &mut debt_market_after, - refund_amount, - &debt_denom, - response, - )?; + response = update_interest_rates(&env, &mut debt_market_after, response)?; MARKETS.save(deps.storage, &debt_denom, &debt_market_after)?; } diff --git a/contracts/red-bank/src/interest_rates.rs b/contracts/red-bank/src/interest_rates.rs index 4ad947cd8..ce01a6a4f 100644 --- a/contracts/red-bank/src/interest_rates.rs +++ b/contracts/red-bank/src/interest_rates.rs @@ -1,8 +1,6 @@ use std::str; -use cosmwasm_std::{ - Addr, Decimal, DepsMut, Env, Event, Response, StdError, StdResult, Storage, Uint128, -}; +use cosmwasm_std::{Addr, Decimal, Env, Event, Response, StdError, StdResult, Storage, Uint128}; use mars_red_bank_types::red_bank::Market; use mars_utils::math; @@ -278,31 +276,26 @@ pub fn get_updated_liquidity_index(market: &Market, timestamp: u64) -> StdResult /// NOTE: For a given block, interest rates should not be updated before updating indexes first /// as it should result in wrong indexes pub fn update_interest_rates( - deps: &DepsMut, env: &Env, market: &mut Market, - liquidity_taken: Uint128, - denom: &str, response: Response, ) -> Result { - // compute utilization rate - let contract_current_balance = deps.querier.query_balance(&env.contract.address, denom)?.amount; - if contract_current_balance < liquidity_taken { - return Err(ContractError::OperationExceedsAvailableLiquidity {}); - } - let available_liquidity = contract_current_balance - liquidity_taken; + let current_timestamp = env.block.time.seconds(); + + let total_collateral = + get_underlying_liquidity_amount(market.collateral_total_scaled, market, current_timestamp)?; let total_debt = - get_underlying_debt_amount(market.debt_total_scaled, market, env.block.time.seconds())?; - let current_utilization_rate = if !total_debt.is_zero() { - let liquidity_and_debt = available_liquidity.checked_add(total_debt)?; - Decimal::from_ratio(total_debt, liquidity_and_debt) + get_underlying_debt_amount(market.debt_total_scaled, market, current_timestamp)?; + + let current_utilization_rate = if !total_collateral.is_zero() { + Decimal::from_ratio(total_debt, total_collateral) } else { Decimal::zero() }; market.update_interest_rates(current_utilization_rate)?; - Ok(response.add_event(build_interests_updated_event(denom, market))) + Ok(response.add_event(build_interests_updated_event(&market.denom, market))) } pub fn build_interests_updated_event(denom: &str, market: &Market) -> Event { diff --git a/contracts/red-bank/tests/helpers.rs b/contracts/red-bank/tests/helpers.rs index 7a940a0ce..143bc09e8 100644 --- a/contracts/red-bank/tests/helpers.rs +++ b/contracts/red-bank/tests/helpers.rs @@ -138,7 +138,6 @@ pub struct TestUtilizationDeltaInfo { pub fn th_get_expected_indices_and_rates( market: &Market, block_time: u64, - initial_liquidity: Uint128, delta_info: TestUtilizationDeltaInfo, ) -> TestInterestResults { if !delta_info.more_debt.is_zero() && !delta_info.less_debt.is_zero() { @@ -194,17 +193,27 @@ pub fn th_get_expected_indices_and_rates( } else { Uint128::zero() }; - let dec_debt_total = compute_underlying_amount( + let debt_total = compute_underlying_amount( new_debt_total_scaled, expected_indices.borrow, ScalingOperation::Ceil, ) .unwrap(); - let contract_current_balance = initial_liquidity; - let liquidity_taken = delta_info.less_liquidity; - let dec_liquidity_total = contract_current_balance - liquidity_taken; - let expected_utilization_rate = - Decimal::from_ratio(dec_debt_total, dec_liquidity_total + dec_debt_total); + + let total_collateral = compute_underlying_amount( + market.collateral_total_scaled, + expected_indices.liquidity, + ScalingOperation::Truncate, + ) + .unwrap(); + + // Total collateral increased by accured protocol rewards + let total_collateral = total_collateral + expected_protocol_rewards_to_distribute; + let expected_utilization_rate = if !total_collateral.is_zero() { + Decimal::from_ratio(debt_total, total_collateral) + } else { + Decimal::zero() + }; // interest rates (make a copy and update those values to get the expeted irs) let mut market_copy = market.clone(); diff --git a/contracts/red-bank/tests/test_admin.rs b/contracts/red-bank/tests/test_admin.rs index 314f7616f..0aa0dc9bb 100644 --- a/contracts/red-bank/tests/test_admin.rs +++ b/contracts/red-bank/tests/test_admin.rs @@ -816,6 +816,8 @@ fn update_asset_new_reserve_factor_accrues_interest_rate() { let asset_liquidity = Uint128::from(10_000_000_000_000_u128); let mut deps = th_setup(&[coin(asset_liquidity.into(), "somecoin")]); + let reserve_factor = Decimal::from_ratio(1_u128, 10_u128); + let ir_model = InterestRateModel { optimal_utilization_rate: Decimal::from_ratio(80u128, 100u128), base: Decimal::zero(), @@ -824,22 +826,31 @@ fn update_asset_new_reserve_factor_accrues_interest_rate() { }; let asset_initial_debt = Uint128::new(2_000_000_000_000); + let debt_total_scaled = + compute_scaled_amount(asset_initial_debt, Decimal::one(), ScalingOperation::Ceil).unwrap(); + + let asset_initial_collateral = asset_liquidity + asset_initial_debt; + let collateral_total_scaled = + compute_scaled_amount(asset_initial_collateral, Decimal::one(), ScalingOperation::Ceil) + .unwrap(); + + let initial_utilization_rate = Decimal::from_ratio(debt_total_scaled, collateral_total_scaled); + let borrow_rate = ir_model.get_borrow_rate(initial_utilization_rate).unwrap(); + let liquidity_rate = + ir_model.get_liquidity_rate(borrow_rate, initial_utilization_rate, reserve_factor).unwrap(); + let market_before = th_init_market( deps.as_mut(), "somecoin", &Market { - reserve_factor: Decimal::from_ratio(1_u128, 10_u128), + reserve_factor, borrow_index: Decimal::one(), liquidity_index: Decimal::one(), indexes_last_updated: 1_000_000, - borrow_rate: Decimal::from_ratio(12u128, 100u128), - liquidity_rate: Decimal::from_ratio(12u128, 100u128), - debt_total_scaled: compute_scaled_amount( - asset_initial_debt, - Decimal::one(), - ScalingOperation::Ceil, - ) - .unwrap(), + borrow_rate, + liquidity_rate, + collateral_total_scaled, + debt_total_scaled, interest_rate_model: ir_model.clone(), ..Default::default() }, @@ -879,8 +890,10 @@ fn update_asset_new_reserve_factor_accrues_interest_rate() { ) .unwrap(); let expected_liquidity = asset_liquidity; - let expected_utilization_rate = - Decimal::from_ratio(expected_debt, expected_liquidity + expected_debt); + // in this particular example, we have to subtract 1 from the total underlying + // collateral amount here, because of rounding error. + let expected_collateral = expected_liquidity + expected_debt - Uint128::new(1); + let expected_utilization_rate = Decimal::from_ratio(expected_debt, expected_collateral); let expected_borrow_rate = ir_model.get_borrow_rate(expected_utilization_rate).unwrap(); diff --git a/contracts/red-bank/tests/test_borrow.rs b/contracts/red-bank/tests/test_borrow.rs index bef237ba9..fb886b9bb 100644 --- a/contracts/red-bank/tests/test_borrow.rs +++ b/contracts/red-bank/tests/test_borrow.rs @@ -102,7 +102,6 @@ fn borrow_and_repay() { let expected_params_uosmo = th_get_expected_indices_and_rates( &market_1_initial, block_time, - available_liquidity_uosmo, TestUtilizationDeltaInfo { less_liquidity: borrow_amount, more_debt: borrow_amount, @@ -174,7 +173,6 @@ fn borrow_and_repay() { let expected_params_uosmo = th_get_expected_indices_and_rates( &market_1_after_borrow, block_time, - available_liquidity_uosmo, TestUtilizationDeltaInfo { less_liquidity: borrow_amount, more_debt: borrow_amount, @@ -221,7 +219,6 @@ fn borrow_and_repay() { let expected_params_uusd = th_get_expected_indices_and_rates( &market_2_initial, block_time, - available_liquidity_uusd, TestUtilizationDeltaInfo { less_liquidity: borrow_amount, more_debt: borrow_amount, @@ -304,7 +301,6 @@ fn borrow_and_repay() { let expected_params_uusd = th_get_expected_indices_and_rates( &market_2_after_borrow_2, block_time, - available_liquidity_uusd, TestUtilizationDeltaInfo { less_debt: repay_amount, user_current_debt_scaled: expected_debt_scaled_2_after_borrow_2, @@ -358,7 +354,6 @@ fn borrow_and_repay() { let expected_params_uusd = th_get_expected_indices_and_rates( &market_2_after_repay_some_2, block_time, - available_liquidity_uusd, TestUtilizationDeltaInfo { less_debt: Uint128::from(9999999999999_u128), // hack: Just do a big number to repay all debt, user_current_debt_scaled: expected_debt_scaled_2_after_repay_some_2, @@ -422,7 +417,6 @@ fn borrow_and_repay() { let expected_params_uosmo = th_get_expected_indices_and_rates( &market_1_after_borrow_again, block_time, - available_liquidity_uosmo, TestUtilizationDeltaInfo { less_debt: repay_amount, user_current_debt_scaled: expected_debt_scaled_1_after_borrow_again, @@ -781,7 +775,7 @@ fn borrow_full_liquidity_and_then_repay() { amount: initial_liquidity.into(), recipient: None, }; - let _res = execute(deps.as_mut(), env, info.clone(), msg).unwrap(); + let _res = execute(deps.as_mut(), env, info, msg).unwrap(); let market_after_borrow = MARKETS.load(&deps.storage, "uusd").unwrap(); let debt_total = compute_underlying_amount( @@ -797,18 +791,6 @@ fn borrow_full_liquidity_and_then_repay() { // We need to update balance after borrowing deps.querier.set_contract_balances(&[coin(0, "uusd")]); - // Try to borrow more than available liquidity - { - let env = mock_env_at_block_time(new_block_time); - let msg = ExecuteMsg::Borrow { - denom: "uusd".to_string(), - amount: 100u128.into(), - recipient: None, - }; - let error_res = execute(deps.as_mut(), env, info, msg).unwrap_err(); - assert_eq!(error_res, ContractError::OperationExceedsAvailableLiquidity {}); - } - // Repay part of the debt { let env = mock_env_at_block_time(new_block_time); diff --git a/contracts/red-bank/tests/test_deposit.rs b/contracts/red-bank/tests/test_deposit.rs index c2797e6f8..c64a7ecf4 100644 --- a/contracts/red-bank/tests/test_deposit.rs +++ b/contracts/red-bank/tests/test_deposit.rs @@ -29,7 +29,6 @@ struct TestSuite { denom: &'static str, depositor_addr: Addr, initial_market: Market, - initial_liquidity: Uint128, } fn setup_test() -> TestSuite { @@ -60,7 +59,6 @@ fn setup_test() -> TestSuite { denom, depositor_addr: Addr::unchecked("larry"), initial_market: market, - initial_liquidity, } } @@ -219,19 +217,14 @@ fn depositing_without_existing_position() { denom, depositor_addr, initial_market, - initial_liquidity, } = setup_test(); let block_time = 10000100; let deposit_amount = 110000; // compute expected market parameters - let expected_params = th_get_expected_indices_and_rates( - &initial_market, - block_time, - initial_liquidity, - Default::default(), - ); + let expected_params = + th_get_expected_indices_and_rates(&initial_market, block_time, Default::default()); let expected_mint_amount = compute_scaled_amount( Uint128::from(deposit_amount), expected_params.liquidity_index, @@ -310,7 +303,6 @@ fn depositing_with_existing_position() { denom, depositor_addr, initial_market, - initial_liquidity, } = setup_test(); // create a collateral position for the user, with the `enabled` parameter as false @@ -321,12 +313,8 @@ fn depositing_with_existing_position() { let deposit_amount = 110000; // compute expected market parameters - let expected_params = th_get_expected_indices_and_rates( - &initial_market, - block_time, - initial_liquidity, - Default::default(), - ); + let expected_params = + th_get_expected_indices_and_rates(&initial_market, block_time, Default::default()); let expected_mint_amount = compute_scaled_amount( Uint128::from(deposit_amount), expected_params.liquidity_index, @@ -383,7 +371,6 @@ fn depositing_on_behalf_of() { denom, depositor_addr, initial_market, - initial_liquidity, } = setup_test(); let deposit_amount = 123456u128; @@ -391,12 +378,8 @@ fn depositing_on_behalf_of() { // compute expected market parameters let block_time = 10000300; - let expected_params = th_get_expected_indices_and_rates( - &initial_market, - block_time, - initial_liquidity, - Default::default(), - ); + let expected_params = + th_get_expected_indices_and_rates(&initial_market, block_time, Default::default()); let expected_mint_amount = compute_scaled_amount( Uint128::from(deposit_amount), expected_params.liquidity_index, diff --git a/contracts/red-bank/tests/test_liquidate.rs b/contracts/red-bank/tests/test_liquidate.rs index b92095dcc..b1a218fe2 100644 --- a/contracts/red-bank/tests/test_liquidate.rs +++ b/contracts/red-bank/tests/test_liquidate.rs @@ -69,7 +69,7 @@ fn setup_test() -> TestSuite { // for the test to pass, we need an interest rate model that gives non-zero rates let mock_ir_model = InterestRateModel { - optimal_utilization_rate: Decimal::one(), + optimal_utilization_rate: Decimal::percent(80), base: Decimal::percent(5), slope_1: Decimal::zero(), slope_2: Decimal::zero(), @@ -93,7 +93,7 @@ fn setup_test() -> TestSuite { let debt_market = Market { max_loan_to_value: Decimal::from_ratio(6u128, 10u128), - collateral_total_scaled: Uint128::zero(), // can be any number, but just using zero for now for convenience + collateral_total_scaled: Uint128::new(3_500_000_000) * SCALING_FACTOR, debt_total_scaled: Uint128::new(1_800_000_000) * SCALING_FACTOR, liquidity_index: Decimal::from_ratio(12u128, 10u128), borrow_index: Decimal::from_ratio(14u128, 10u128), @@ -172,7 +172,6 @@ fn expected_amounts( let expected_debt_rates = th_get_expected_indices_and_rates( &test_suite.debt_market, block_time, - test_suite.debt_coin.amount, TestUtilizationDeltaInfo { less_debt: amount_to_repay, user_current_debt_scaled: user_debt_scaled, @@ -192,7 +191,6 @@ fn expected_amounts( let expected_collateral_rates = th_get_expected_indices_and_rates( &test_suite.collateral_market, block_time, - test_suite.collateral_coin.amount, TestUtilizationDeltaInfo { less_liquidity: expected_liquidated_collateral_amount, ..Default::default() @@ -621,7 +619,6 @@ fn liquidate_up_to_close_factor_with_refund() { fn liquidate_fully() { let TestSuite { mut deps, - debt_coin, collateral_price, debt_price, collateral_market, @@ -681,7 +678,6 @@ fn liquidate_fully() { let expected_debt_rates = th_get_expected_indices_and_rates( &debt_market, block_time, - debt_coin.amount, TestUtilizationDeltaInfo { less_debt: expected_less_debt, user_current_debt_scaled: user_debt_scaled_before, @@ -754,12 +750,10 @@ fn liquidate_fully() { fn liquidate_partially_if_same_asset_for_debt_and_collateral() { let TestSuite { mut deps, - collateral_coin, collateral_price, collateral_market, .. } = setup_test(); - let debt_coin = collateral_coin; let debt_price = collateral_price; let debt_market = collateral_market.clone(); @@ -802,7 +796,6 @@ fn liquidate_partially_if_same_asset_for_debt_and_collateral() { let expected_debt_rates = th_get_expected_indices_and_rates( &debt_market, block_time, - debt_coin.amount, TestUtilizationDeltaInfo { less_debt: debt_to_repay, user_current_debt_scaled: user_debt_scaled_before, @@ -902,13 +895,11 @@ fn liquidate_partially_if_same_asset_for_debt_and_collateral() { fn liquidate_with_refund_if_same_asset_for_debt_and_collateral() { let TestSuite { mut deps, - collateral_coin, collateral_price, close_factor, collateral_market, .. } = setup_test(); - let debt_coin = collateral_coin.clone(); let debt_price = collateral_price; let debt_market = collateral_market.clone(); @@ -963,7 +954,6 @@ fn liquidate_with_refund_if_same_asset_for_debt_and_collateral() { let expected_debt_rates = th_get_expected_indices_and_rates( &debt_market, block_time, - debt_coin.amount, TestUtilizationDeltaInfo { less_debt: expected_less_debt, user_current_debt_scaled: user_debt_scaled_before, @@ -981,7 +971,6 @@ fn liquidate_with_refund_if_same_asset_for_debt_and_collateral() { let expected_collateral_rates = th_get_expected_indices_and_rates( &collateral_market, block_time, - collateral_coin.amount, TestUtilizationDeltaInfo { less_liquidity: expected_liquidated_collateral_amount, ..Default::default() diff --git a/contracts/red-bank/tests/test_misc.rs b/contracts/red-bank/tests/test_misc.rs index 19e1cc4f3..d2660a0d6 100644 --- a/contracts/red-bank/tests/test_misc.rs +++ b/contracts/red-bank/tests/test_misc.rs @@ -103,7 +103,6 @@ fn uncollateralized_loan_limits() { let expected_params = th_get_expected_indices_and_rates( &market_initial, block_time, - available_liquidity, TestUtilizationDeltaInfo { less_liquidity: initial_borrow_amount, more_debt: initial_borrow_amount, diff --git a/contracts/red-bank/tests/test_withdraw.rs b/contracts/red-bank/tests/test_withdraw.rs index 541ad58b4..03aa82c30 100644 --- a/contracts/red-bank/tests/test_withdraw.rs +++ b/contracts/red-bank/tests/test_withdraw.rs @@ -31,7 +31,6 @@ struct TestSuite { denom: &'static str, withdrawer_addr: Addr, initial_market: Market, - initial_liquidity: Uint128, } fn setup_test() -> TestSuite { @@ -60,7 +59,6 @@ fn setup_test() -> TestSuite { denom, withdrawer_addr: Addr::unchecked("larry"), initial_market: market, - initial_liquidity, } } @@ -102,7 +100,6 @@ fn withdrawing_partially() { denom, withdrawer_addr, initial_market, - initial_liquidity, } = setup_test(); let block_time = initial_market.indexes_last_updated + 2000; @@ -138,7 +135,6 @@ fn withdrawing_partially() { let expected_params = th_get_expected_indices_and_rates( &initial_market, block_time, - initial_liquidity, TestUtilizationDeltaInfo { less_liquidity: withdraw_amount, ..Default::default() @@ -246,7 +242,6 @@ fn withdrawing_completely() { denom, withdrawer_addr, initial_market, - initial_liquidity, } = setup_test(); let block_time = initial_market.indexes_last_updated + 2000; @@ -279,7 +274,6 @@ fn withdrawing_completely() { let expected_params = th_get_expected_indices_and_rates( &initial_market, block_time, - initial_liquidity, TestUtilizationDeltaInfo { less_liquidity: withdrawer_balance, ..Default::default() @@ -354,7 +348,6 @@ fn withdrawing_to_another_user() { denom, withdrawer_addr, initial_market, - initial_liquidity, } = setup_test(); let block_time = initial_market.indexes_last_updated + 2000; @@ -388,7 +381,6 @@ fn withdrawing_to_another_user() { let expected_params = th_get_expected_indices_and_rates( &initial_market, block_time, - initial_liquidity, TestUtilizationDeltaInfo { less_liquidity: withdraw_amount, ..Default::default() diff --git a/integration-tests/tests/test_user_flow.rs b/integration-tests/tests/test_user_flow.rs index 0f4c89067..aa4df532a 100644 --- a/integration-tests/tests/test_user_flow.rs +++ b/integration-tests/tests/test_user_flow.rs @@ -192,11 +192,11 @@ fn interest_rates_after_repayment() { let exact_debt_repayment_result = red_bank.query_market(&mut mock_env, "uusdc"); assert_eq!( exact_debt_repayment_result.borrow_rate, - Decimal::from_ratio(716667701657739867u128, 1000000000000000000u128) + Decimal::from_ratio(716667703657732987u128, 1000000000000000000u128) ); assert_eq!( exact_debt_repayment_result.liquidity_rate, - Decimal::from_ratio(344002276982931938u128, 1000000000000000000u128) + Decimal::from_ratio(344002281382926748u128, 1000000000000000000u128) ); // 2. Repay full debt with refund From 74a98c9ec1e2568455e2d6a07b643963395d1225 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 8 Jun 2023 12:25:48 +0200 Subject: [PATCH 4/4] Update owner pkg to 1.2.0 (#198) * Update owner pkg to 1.2.0 * Update test tube * Fix build. * Update schema. --------- Co-authored-by: Piotr Babel --- .github/workflows/coverage.yml | 7 +- Cargo.lock | 1147 ++++++++++++++--- Cargo.toml | 4 +- Makefile.toml | 2 +- contracts/red-bank/tests/test_liquidate.rs | 4 + integration-tests/tests/test_oracles.rs | 4 +- .../tests/test_rewards_collector.rs | 9 +- packages/testing/src/incentives_querier.rs | 2 +- scripts/deploy/base/deployer.ts | 4 +- scripts/package.json | 25 +- scripts/tsconfig.json | 1 - .../MarsAddressProvider.client.ts | 24 +- .../MarsAddressProvider.react-query.ts | 3 +- .../MarsAddressProvider.types.ts | 2 +- .../generated/mars-address-provider/bundle.ts | 2 +- .../mars-incentives/MarsIncentives.client.ts | 36 +- .../MarsIncentives.react-query.ts | 3 +- .../mars-incentives/MarsIncentives.types.ts | 2 +- .../types/generated/mars-incentives/bundle.ts | 2 +- .../MarsOracleOsmosis.client.ts | 24 +- .../MarsOracleOsmosis.react-query.ts | 3 +- .../MarsOracleOsmosis.types.ts | 2 +- .../generated/mars-oracle-osmosis/bundle.ts | 2 +- .../mars-red-bank/MarsRedBank.client.ts | 72 +- .../mars-red-bank/MarsRedBank.react-query.ts | 3 +- .../mars-red-bank/MarsRedBank.types.ts | 2 +- .../types/generated/mars-red-bank/bundle.ts | 2 +- .../MarsRewardsCollectorOsmosis.client.ts | 48 +- ...MarsRewardsCollectorOsmosis.react-query.ts | 3 +- .../MarsRewardsCollectorOsmosis.types.ts | 2 +- .../mars-rewards-collector-osmosis/bundle.ts | 2 +- scripts/yarn.lock | 460 +++---- 32 files changed, 1374 insertions(+), 534 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 0c7d6e83c..37794260a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -30,9 +30,12 @@ jobs: - name: Install cargo make uses: davidB/rust-cargo-make@v1 - # artifacts used by tests + # Artifacts used by tests. + # Change owner of the current directory (rust-optimizer set root for artifacts / target). - name: Compile workspace - run: cargo make build + run: | + cargo make rust-optimizer + sudo chown -R $USER . - name: Run test coverage run: cargo make coverage-lcov diff --git a/Cargo.lock b/Cargo.lock index 16831a5d1..2505cba5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,28 +15,34 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.18", ] [[package]] @@ -45,7 +51,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -156,9 +162,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -172,6 +178,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + [[package]] name = "cexpr" version = "0.6.0" @@ -189,19 +201,19 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ - "num-integer", + "android-tzdata", "num-traits", ] [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -210,9 +222,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", @@ -238,13 +250,29 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "cosmos-sdk-proto" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20b42021d8488665b1a0d9748f1f81df7235362d194f44481e2e61bf376b77b4" dependencies = [ - "prost 0.11.8", + "prost 0.11.9", "prost-types", "tendermint-proto", ] @@ -266,16 +294,17 @@ dependencies = [ "serde_json", "subtle-encoding", "tendermint", + "tendermint-rpc", "thiserror", ] [[package]] name = "cosmwasm-crypto" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22add0f9b2a5416df98c1d0248a8d8eedb882c38fbf0c5052b64eebe865df6d" +checksum = "75836a10cb9654c54e77ee56da94d592923092a10b369cdb0dbd56acefc16340" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "ed25519-zebra", "k256", "rand_core 0.6.4", @@ -284,18 +313,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e64f710a18ef90d0a632cf27842e98ffc2d005a38a6f76c12fd0bc03bc1a2d" +checksum = "1c9f7f0e51bfc7295f7b2664fe8513c966428642aa765dad8a74acdab5e0c773" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5ad2e23a971b9e4cd57b20cee3e2e79c33799bed4b128e473aca3702bfe5dd" +checksum = "0f00b363610218eea83f24bbab09e1a7c3920b79f068334fdfcc62f6129ef9fc" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -306,9 +335,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2926d159a9bb1a716a592b40280f1663f2491a9de3b6da77c0933cee2a2655b8" +checksum = "ae38f909b2822d32b275c9e2db9728497aa33ffe67dd463bc67c6a3b7092785c" dependencies = [ "proc-macro2", "quote", @@ -317,9 +346,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fee88ff5bf7bef55bd37ac0619974701b99bf6bd4b16cf56ee8810718abd71" +checksum = "a49b85345e811c8e80ec55d0d091e4fcb4f00f97ab058f9be5f614c444a730cb" dependencies = [ "base64", "cosmwasm-crypto", @@ -337,9 +366,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -372,6 +401,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "ct-logs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" +dependencies = [ + "sct", +] + [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -387,9 +425,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "0.16.2" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2eb84554bbfa6b66736abcd6a9bfdf237ee0ecb83910f746dff7f799093c80a" +checksum = "2a18afd2e201221c6d72a57f0886ef2a22151bbc9e6db7af276fde8a91081042" dependencies = [ "anyhow", "cosmwasm-std", @@ -488,9 +526,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -566,7 +604,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.6", + "digest 0.10.7", "ff", "generic-array", "group", @@ -620,6 +658,21 @@ dependencies = [ "paste", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + [[package]] name = "forward_ref" version = "1.0.0" @@ -628,12 +681,13 @@ checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", + "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -642,9 +696,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -652,46 +706,73 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ + "futures-channel", "futures-core", + "futures-io", + "futures-macro", "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", + "slab", ] [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -699,9 +780,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "js-sys", @@ -727,6 +808,25 @@ dependencies = [ "subtle", ] +[[package]] +name = "h2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -736,6 +836,31 @@ dependencies = [ "ahash", ] +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -745,6 +870,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -757,15 +891,120 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", ] +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +dependencies = [ + "bytes", + "futures", + "headers", + "http", + "hyper", + "hyper-rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", + "tower-service", + "webpki", +] + +[[package]] +name = "hyper-rustls" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +dependencies = [ + "ct-logs", + "futures-util", + "hyper", + "log", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", + "webpki", + "webpki-roots", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "indenter" version = "0.3.3" @@ -774,9 +1013,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -799,9 +1038,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -821,9 +1060,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -842,9 +1081,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libloading" @@ -858,12 +1097,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "mars-address-provider" @@ -972,9 +1208,9 @@ dependencies = [ [[package]] name = "mars-owner" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca010da465b4a5ea7274f59132d22b7c10765295c73d5744add2c1fea6c5e38" +checksum = "acd53908ffc561da878ce5ff4f5ec9f25a193af28ec0b6e7c8e6d1a0866d9dfc" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1061,7 +1297,7 @@ dependencies = [ "mars-red-bank-types", "mars-rewards-collector-osmosis", "osmosis-std 0.14.0", - "prost 0.11.8", + "prost 0.11.9", "schemars", "serde", "thiserror", @@ -1081,12 +1317,29 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + [[package]] name = "nom" version = "7.1.3" @@ -1109,22 +1362,22 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-traits" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "num-traits", ] [[package]] -name = "num-traits" -version = "0.2.15" +name = "num_cpus" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "autocfg", + "hermit-abi 0.2.6", + "libc", ] [[package]] @@ -1138,9 +1391,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "opaque-debug" @@ -1148,6 +1401,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + [[package]] name = "os_str_bytes" version = "6.5.0" @@ -1156,14 +1415,14 @@ checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "osmosis-std" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6fe6ac7fcba45ed61d738091d33c838c4cabbcf4892dc7aa56d19d39cc976" +checksum = "2fc0a9075efd64ed5a8be3bf134cbf1080570d68384f2ad58ffaac6c00d063fd" dependencies = [ "chrono", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.11.8", + "osmosis-std-derive 0.13.2", + "prost 0.11.9", "prost-types", "schemars", "serde", @@ -1172,14 +1431,14 @@ dependencies = [ [[package]] name = "osmosis-std" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc0a9075efd64ed5a8be3bf134cbf1080570d68384f2ad58ffaac6c00d063fd" +checksum = "87725a7480b98887167edf878daa52201a13322ad88e34355a7f2ddc663e047e" dependencies = [ "chrono", "cosmwasm-std", - "osmosis-std-derive", - "prost 0.11.8", + "osmosis-std-derive 0.15.3", + "prost 0.11.9", "prost-types", "schemars", "serde", @@ -1198,18 +1457,30 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "osmosis-std-derive" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d482a16be198ee04e0f94e10dd9b8d02332dcf33bc5ea4b255e7e25eedc5df" +dependencies = [ + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "osmosis-test-tube" -version = "14.1.1" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e7d470a607f4016906fee20ff51275b399ffad9903240dc462c0f5226650c7" +checksum = "b6aba931600343de65be9cbf9ed5a98a611bbf1fc9c45994eb980cc5afb18404" dependencies = [ "base64", "bindgen", "cosmrs", "cosmwasm-std", - "osmosis-std 0.13.2", - "prost 0.11.8", + "osmosis-std 0.15.3", + "prost 0.11.9", "serde", "serde_json", "test-tube", @@ -1228,7 +1499,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1237,6 +1508,59 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +[[package]] +name = "peg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1261,9 +1585,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -1280,12 +1604,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.11.8", + "prost-derive 0.11.9", ] [[package]] @@ -1303,9 +1627,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", @@ -1316,18 +1640,18 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost 0.11.8", + "prost 0.11.9", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1349,9 +1673,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", @@ -1360,9 +1684,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rfc6979" @@ -1375,13 +1699,28 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "ripemd" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1401,12 +1740,55 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +dependencies = [ + "openssl-probe", + "rustls", + "schannel", + "security-framework", +] + [[package]] name = "ryu" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + [[package]] name = "schemars" version = "0.8.12" @@ -1432,10 +1814,20 @@ dependencies = [ ] [[package]] -name = "sec1" -version = "0.3.0" +name = "sct" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", "der", @@ -1445,6 +1837,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.17" @@ -1453,9 +1868,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -1471,9 +1886,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15bee9b04dd165c3f4e142628982ddde884c2022a89e8ddf99c4829bf2c3a58" +checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137" dependencies = [ "serde", ] @@ -1489,13 +1904,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.18", ] [[package]] @@ -1511,9 +1926,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1528,7 +1943,18 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.18", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", ] [[package]] @@ -1552,16 +1978,16 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -1577,10 +2003,35 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spki" version = "0.6.0" @@ -1605,9 +2056,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subtle-encoding" @@ -1631,27 +2082,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.8" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "tendermint" version = "0.23.9" @@ -1667,7 +2106,7 @@ dependencies = [ "k256", "num-traits", "once_cell", - "prost 0.11.8", + "prost 0.11.9", "prost-types", "ripemd160", "serde", @@ -1683,6 +2122,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tendermint-config" +version = "0.23.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d42ee0abc27ef5fc34080cce8d43c189950d331631546e7dfb983b6274fa327" +dependencies = [ + "flex-error", + "serde", + "serde_json", + "tendermint", + "toml", + "url", +] + [[package]] name = "tendermint-proto" version = "0.23.9" @@ -1693,7 +2146,7 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.8", + "prost 0.11.9", "prost-types", "serde", "serde_bytes", @@ -1701,6 +2154,39 @@ dependencies = [ "time", ] +[[package]] +name = "tendermint-rpc" +version = "0.23.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f14aafe3528a0f75e9f3f410b525617b2de16c4b7830a21f717eee62882ec60" +dependencies = [ + "async-trait", + "bytes", + "flex-error", + "futures", + "getrandom", + "http", + "hyper", + "hyper-proxy", + "hyper-rustls", + "peg", + "pin-project", + "serde", + "serde_bytes", + "serde_json", + "subtle-encoding", + "tendermint", + "tendermint-config", + "tendermint-proto", + "thiserror", + "time", + "tokio", + "tracing", + "url", + "uuid", + "walkdir", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -1712,15 +2198,14 @@ dependencies = [ [[package]] name = "test-tube" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791215b77f72c219df4d3e95d78539ee66950a0449961ba6d0ab1c7b538673f" +checksum = "b4807f0de0b84340e20a6ef1353a5c9db4543e1c74cd507aedd8b52e35d80020" dependencies = [ "base64", "cosmrs", "cosmwasm-std", - "osmosis-std 0.13.2", - "prost 0.11.8", + "prost 0.11.9", "serde", "serde_json", "thiserror", @@ -1749,7 +2234,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.8", + "syn 2.0.18", ] [[package]] @@ -1769,6 +2254,115 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + [[package]] name = "typenum" version = "1.16.0" @@ -1787,17 +2381,49 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] -name = "unicode-xid" -version = "0.2.4" +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "untrusted" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "version_check" @@ -1805,6 +2431,26 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1813,9 +2459,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1823,24 +2469,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1848,22 +2494,51 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" + +[[package]] +name = "web-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +dependencies = [ + "webpki", +] [[package]] name = "which" @@ -1907,23 +2582,145 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.18", ] diff --git a/Cargo.toml b/Cargo.toml index b9e801f02..03c62e688 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,9 +38,9 @@ cw2 = { git = "https://github.com/mars-protocol/cw-plus", rev = "4 cw-multi-test = "0.16.1" cw-storage-plus = "1.0.1" cw-utils = "1.0.1" -mars-owner = { version = "1.0.0", features = ["emergency-owner"] } +mars-owner = { version = "1.2.0", features = ["emergency-owner"] } osmosis-std = "0.14.0" -osmosis-test-tube = "14.1.1" +osmosis-test-tube = "15.1.0" prost = { version = "0.11.5", default-features = false, features = ["prost-derive"] } schemars = "0.8.11" serde = { version = "1.0.152", default-features = false, features = ["derive"] } diff --git a/Makefile.toml b/Makefile.toml index 0f036e8d7..16a21b35e 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -8,7 +8,7 @@ default_to_workspace = false [env] # Directory with wasm files used by integration tests (another directory can be used instead, for example 'artifacts' from rust-optimizer) -ARTIFACTS_DIR_PATH = "target/wasm32-unknown-unknown/release" +ARTIFACTS_DIR_PATH = "artifacts" [tasks.build] toolchain = "stable" diff --git a/contracts/red-bank/tests/test_liquidate.rs b/contracts/red-bank/tests/test_liquidate.rs index b1a218fe2..875fc32b1 100644 --- a/contracts/red-bank/tests/test_liquidate.rs +++ b/contracts/red-bank/tests/test_liquidate.rs @@ -746,6 +746,8 @@ fn liquidate_fully() { ); } +/// FIXME: new clippy version warns to remove clone() from "collateral_market.clone()" but then it breaks compilation +#[allow(clippy::redundant_clone)] #[test] fn liquidate_partially_if_same_asset_for_debt_and_collateral() { let TestSuite { @@ -891,6 +893,8 @@ fn liquidate_partially_if_same_asset_for_debt_and_collateral() { ); } +/// FIXME: new clippy version warns to remove clone() from "collateral_market.clone()" but then it breaks compilation +#[allow(clippy::redundant_clone)] #[test] fn liquidate_with_refund_if_same_asset_for_debt_and_collateral() { let TestSuite { diff --git a/integration-tests/tests/test_oracles.rs b/integration-tests/tests/test_oracles.rs index 819185231..b98a251d0 100644 --- a/integration-tests/tests/test_oracles.rs +++ b/integration-tests/tests/test_oracles.rs @@ -880,8 +880,8 @@ fn compare_spot_and_twap_price() { .unwrap(); let tolerance = Decimal::percent(1); - assert!(arithmetic_twap_price.price - spot_price.price < tolerance); - assert!(spot_price.price - geometric_twap_price.price < tolerance); + assert!(spot_price.price.abs_diff(arithmetic_twap_price.price) < tolerance); + assert!(spot_price.price.abs_diff(geometric_twap_price.price) < tolerance); } // execute borrow action in red bank with an asset not in the oracle - should fail when attempting to query oracle diff --git a/integration-tests/tests/test_rewards_collector.rs b/integration-tests/tests/test_rewards_collector.rs index 0598ece94..6b56ddef9 100644 --- a/integration-tests/tests/test_rewards_collector.rs +++ b/integration-tests/tests/test_rewards_collector.rs @@ -236,7 +236,14 @@ fn distribute_rewards_if_ibc_channel_invalid() { let wasm = Wasm::new(&app); let accs = app - .init_accounts(&[coin(1_000_000_000_000, "uusdc"), coin(1_000_000_000_000, "umars")], 2) + .init_accounts( + &[ + coin(1_000_000_000_000, "uusdc"), + coin(1_000_000_000_000, "umars"), + coin(1_000_000_000_000, "uosmo"), + ], + 2, + ) .unwrap(); let signer = &accs[0]; let user = &accs[1]; diff --git a/packages/testing/src/incentives_querier.rs b/packages/testing/src/incentives_querier.rs index 7ff6f7914..827d75245 100644 --- a/packages/testing/src/incentives_querier.rs +++ b/packages/testing/src/incentives_querier.rs @@ -21,7 +21,7 @@ impl Default for IncentivesQuerier { impl IncentivesQuerier { pub fn handle_query(&self, contract_addr: &Addr, query: QueryMsg) -> QuerierResult { - if contract_addr != &self.incentives_addr { + if contract_addr != self.incentives_addr { panic!( "[mock]: made an incentives query but incentive contract address is incorrect, was: {}, should be {}", contract_addr, diff --git a/scripts/deploy/base/deployer.ts b/scripts/deploy/base/deployer.ts index 91a113b3b..ca738320f 100644 --- a/scripts/deploy/base/deployer.ts +++ b/scripts/deploy/base/deployer.ts @@ -155,7 +155,7 @@ export class Deployer { } async updateAddressProvider() { - if (this.storage.execute['address-provider-updated']) { + if (this.storage.execute.addressProviderUpdated) { printBlue('Addresses already updated.') return } @@ -199,7 +199,7 @@ export class Deployer { ) } printYellow('Address Provider update completed') - this.storage.execute['address-provider-updated'] = true + this.storage.execute.addressProviderUpdated = true } async initializeAsset(assetConfig: AssetConfig) { diff --git a/scripts/package.json b/scripts/package.json index 70eac465e..ba6217026 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -14,22 +14,21 @@ "format-check": "prettier --ignore-path .gitignore --check ." }, "dependencies": { - "@cosmjs/cosmwasm-stargate": "^0.29.5", - "@cosmjs/proto-signing": "^0.29.5", - "@cosmjs/stargate": "^0.29.5", - "@cosmwasm/ts-codegen": "^0.24.0", + "@cosmjs/cosmwasm-stargate": "^0.30.1", + "@cosmjs/proto-signing": "^0.30.1", + "@cosmjs/stargate": "^0.30.1", + "@cosmwasm/ts-codegen": "^0.30.0", "chalk": "4.1.2", - "cosmjs-types": "^0.6.1", "prepend-file": "^2.0.1" }, "devDependencies": { - "@types/node": "^18.11.18", - "@typescript-eslint/eslint-plugin": "^5.49.0", - "@typescript-eslint/parser": "^5.49.0", - "cosmjs-types": "^0.6.1", - "eslint": "^8.32.0", - "eslint-config-prettier": "^8.6.0", - "prettier": "^2.8.3", - "typescript": "^4.9.4" + "@types/node": "^20.2.5", + "@typescript-eslint/eslint-plugin": "^5.59.8", + "@typescript-eslint/parser": "^5.59.8", + "cosmjs-types": "^0.8.0", + "eslint": "^8.41.0", + "eslint-config-prettier": "^8.8.0", + "prettier": "^2.8.8", + "typescript": "^5.0.4" } } diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 7b3570c4a..be7ea699b 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -23,7 +23,6 @@ "noImplicitReturns": true, "noImplicitThis": true, "strictNullChecks": true, - "suppressImplicitAnyIndexErrors": true, "allowSyntheticDefaultImports": true, "skipLibCheck": true }, diff --git a/scripts/types/generated/mars-address-provider/MarsAddressProvider.client.ts b/scripts/types/generated/mars-address-provider/MarsAddressProvider.client.ts index 991cb5319..3eb3e0a30 100644 --- a/scripts/types/generated/mars-address-provider/MarsAddressProvider.client.ts +++ b/scripts/types/generated/mars-address-provider/MarsAddressProvider.client.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -20,7 +20,7 @@ import { export interface MarsAddressProviderReadOnlyInterface { contractAddress: string config: () => Promise - address: () => Promise + address: (marsAddressType: MarsAddressType) => Promise addresses: () => Promise allAddresses: ({ limit, @@ -48,9 +48,9 @@ export class MarsAddressProviderQueryClient implements MarsAddressProviderReadOn config: {}, }) } - address = async (): Promise => { + address = async (marsAddressType: MarsAddressType): Promise => { return this.client.queryContractSmart(this.contractAddress, { - address: {}, + address: marsAddressType, }) } addresses = async (): Promise => { @@ -86,12 +86,13 @@ export interface MarsAddressProviderInterface extends MarsAddressProviderReadOnl }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateOwner: ( + ownerUpdate: OwnerUpdate, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise } export class MarsAddressProviderClient @@ -121,7 +122,7 @@ export class MarsAddressProviderClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -134,23 +135,24 @@ export class MarsAddressProviderClient }, fee, memo, - funds, + _funds, ) } updateOwner = async ( + ownerUpdate: OwnerUpdate, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, this.contractAddress, { - update_owner: {}, + update_owner: ownerUpdate, }, fee, memo, - funds, + _funds, ) } } diff --git a/scripts/types/generated/mars-address-provider/MarsAddressProvider.react-query.ts b/scripts/types/generated/mars-address-provider/MarsAddressProvider.react-query.ts index 97eb6da0a..6abfb97e1 100644 --- a/scripts/types/generated/mars-address-provider/MarsAddressProvider.react-query.ts +++ b/scripts/types/generated/mars-address-provider/MarsAddressProvider.react-query.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -122,6 +122,7 @@ export function useMarsAddressProviderConfigQuery({ } export interface MarsAddressProviderUpdateOwnerMutation { client: MarsAddressProviderClient + msg: OwnerUpdate args?: { fee?: number | StdFee | 'auto' memo?: string diff --git a/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts b/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts index e47f3d867..a2b24513f 100644 --- a/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts +++ b/scripts/types/generated/mars-address-provider/MarsAddressProvider.types.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-address-provider/bundle.ts b/scripts/types/generated/mars-address-provider/bundle.ts index 3ac8d90a8..56aec5393 100644 --- a/scripts/types/generated/mars-address-provider/bundle.ts +++ b/scripts/types/generated/mars-address-provider/bundle.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-incentives/MarsIncentives.client.ts b/scripts/types/generated/mars-incentives/MarsIncentives.client.ts index 66d4c0a4b..05c545e85 100644 --- a/scripts/types/generated/mars-incentives/MarsIncentives.client.ts +++ b/scripts/types/generated/mars-incentives/MarsIncentives.client.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -96,7 +96,7 @@ export interface MarsIncentivesInterface extends MarsIncentivesReadOnlyInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise balanceChange: ( { @@ -112,12 +112,12 @@ export interface MarsIncentivesInterface extends MarsIncentivesReadOnlyInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise claimRewards: ( fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateConfig: ( { @@ -129,12 +129,13 @@ export interface MarsIncentivesInterface extends MarsIncentivesReadOnlyInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateOwner: ( + ownerUpdate: OwnerUpdate, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise } export class MarsIncentivesClient @@ -171,7 +172,7 @@ export class MarsIncentivesClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -186,7 +187,7 @@ export class MarsIncentivesClient }, fee, memo, - funds, + _funds, ) } balanceChange = async ( @@ -203,7 +204,7 @@ export class MarsIncentivesClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -218,13 +219,13 @@ export class MarsIncentivesClient }, fee, memo, - funds, + _funds, ) } claimRewards = async ( fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -234,7 +235,7 @@ export class MarsIncentivesClient }, fee, memo, - funds, + _funds, ) } updateConfig = async ( @@ -247,7 +248,7 @@ export class MarsIncentivesClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -260,23 +261,24 @@ export class MarsIncentivesClient }, fee, memo, - funds, + _funds, ) } updateOwner = async ( + ownerUpdate: OwnerUpdate, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, this.contractAddress, { - update_owner: {}, + update_owner: ownerUpdate, }, fee, memo, - funds, + _funds, ) } } diff --git a/scripts/types/generated/mars-incentives/MarsIncentives.react-query.ts b/scripts/types/generated/mars-incentives/MarsIncentives.react-query.ts index 42373ead7..bbdf620f0 100644 --- a/scripts/types/generated/mars-incentives/MarsIncentives.react-query.ts +++ b/scripts/types/generated/mars-incentives/MarsIncentives.react-query.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -139,6 +139,7 @@ export function useMarsIncentivesConfigQuery({ } export interface MarsIncentivesUpdateOwnerMutation { client: MarsIncentivesClient + msg: OwnerUpdate args?: { fee?: number | StdFee | 'auto' memo?: string diff --git a/scripts/types/generated/mars-incentives/MarsIncentives.types.ts b/scripts/types/generated/mars-incentives/MarsIncentives.types.ts index 495f23929..f1328167e 100644 --- a/scripts/types/generated/mars-incentives/MarsIncentives.types.ts +++ b/scripts/types/generated/mars-incentives/MarsIncentives.types.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-incentives/bundle.ts b/scripts/types/generated/mars-incentives/bundle.ts index ce89228a2..96ab4693e 100644 --- a/scripts/types/generated/mars-incentives/bundle.ts +++ b/scripts/types/generated/mars-incentives/bundle.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.client.ts b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.client.ts index da96b3af3..a457d942b 100644 --- a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.client.ts +++ b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.client.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -117,7 +117,7 @@ export interface MarsOracleOsmosisInterface extends MarsOracleOsmosisReadOnlyInt }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise removePriceSource: ( { @@ -127,12 +127,13 @@ export interface MarsOracleOsmosisInterface extends MarsOracleOsmosisReadOnlyInt }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateOwner: ( + ownerUpdate: OwnerUpdate, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise } export class MarsOracleOsmosisClient @@ -163,7 +164,7 @@ export class MarsOracleOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -176,7 +177,7 @@ export class MarsOracleOsmosisClient }, fee, memo, - funds, + _funds, ) } removePriceSource = async ( @@ -187,7 +188,7 @@ export class MarsOracleOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -199,23 +200,24 @@ export class MarsOracleOsmosisClient }, fee, memo, - funds, + _funds, ) } updateOwner = async ( + ownerUpdate: OwnerUpdate, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, this.contractAddress, { - update_owner: {}, + update_owner: ownerUpdate, }, fee, memo, - funds, + _funds, ) } } diff --git a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.react-query.ts b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.react-query.ts index ca1a977ae..32e75cf64 100644 --- a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.react-query.ts +++ b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.react-query.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -166,6 +166,7 @@ export function useMarsOracleOsmosisConfigQuery({ } export interface MarsOracleOsmosisUpdateOwnerMutation { client: MarsOracleOsmosisClient + msg: OwnerUpdate args?: { fee?: number | StdFee | 'auto' memo?: string diff --git a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts index 66b92fc55..3203abe77 100644 --- a/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts +++ b/scripts/types/generated/mars-oracle-osmosis/MarsOracleOsmosis.types.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-oracle-osmosis/bundle.ts b/scripts/types/generated/mars-oracle-osmosis/bundle.ts index aaf9bb266..4703314d3 100644 --- a/scripts/types/generated/mars-oracle-osmosis/bundle.ts +++ b/scripts/types/generated/mars-oracle-osmosis/bundle.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts b/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts index 87cc28d65..0fa75b98c 100644 --- a/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts +++ b/scripts/types/generated/mars-red-bank/MarsRedBank.client.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -310,9 +310,10 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { contractAddress: string sender: string updateOwner: ( + ownerUpdate: OwnerUpdate, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateConfig: ( { @@ -322,7 +323,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise initAsset: ( { @@ -334,7 +335,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateAsset: ( { @@ -346,7 +347,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateUncollateralizedLoanLimit: ( { @@ -360,7 +361,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise deposit: ( { @@ -370,7 +371,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise withdraw: ( { @@ -384,7 +385,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise borrow: ( { @@ -398,7 +399,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise repay: ( { @@ -408,7 +409,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise liquidate: ( { @@ -422,7 +423,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateAssetCollateralStatus: ( { @@ -434,7 +435,7 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface { }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise } export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRedBankInterface { @@ -461,19 +462,20 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed } updateOwner = async ( + ownerUpdate: OwnerUpdate, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, this.contractAddress, { - update_owner: {}, + update_owner: ownerUpdate, }, fee, memo, - funds, + _funds, ) } updateConfig = async ( @@ -484,7 +486,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -496,7 +498,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } initAsset = async ( @@ -509,7 +511,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -522,7 +524,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } updateAsset = async ( @@ -535,7 +537,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -548,7 +550,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } updateUncollateralizedLoanLimit = async ( @@ -563,7 +565,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -577,7 +579,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } deposit = async ( @@ -588,7 +590,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -600,7 +602,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } withdraw = async ( @@ -615,7 +617,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -629,7 +631,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } borrow = async ( @@ -644,7 +646,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -658,7 +660,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } repay = async ( @@ -669,7 +671,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -681,7 +683,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } liquidate = async ( @@ -696,7 +698,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -710,7 +712,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } updateAssetCollateralStatus = async ( @@ -723,7 +725,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -736,7 +738,7 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed }, fee, memo, - funds, + _funds, ) } } diff --git a/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts b/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts index cd1bcc2d9..957c0a369 100644 --- a/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts +++ b/scripts/types/generated/mars-red-bank/MarsRedBank.react-query.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -675,6 +675,7 @@ export function useMarsRedBankUpdateConfigMutation( } export interface MarsRedBankUpdateOwnerMutation { client: MarsRedBankClient + msg: OwnerUpdate args?: { fee?: number | StdFee | 'auto' memo?: string diff --git a/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts b/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts index df95006e0..bb67c5aa6 100644 --- a/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts +++ b/scripts/types/generated/mars-red-bank/MarsRedBank.types.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-red-bank/bundle.ts b/scripts/types/generated/mars-red-bank/bundle.ts index 177f4c4fa..cc3fed4dc 100644 --- a/scripts/types/generated/mars-red-bank/bundle.ts +++ b/scripts/types/generated/mars-red-bank/bundle.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.client.ts b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.client.ts index b584dcd8d..5a5ec0463 100644 --- a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.client.ts +++ b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.client.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -92,9 +92,10 @@ export interface MarsRewardsCollectorOsmosisInterface contractAddress: string sender: string updateOwner: ( + ownerUpdate: OwnerUpdate, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise updateConfig: ( { @@ -104,7 +105,7 @@ export interface MarsRewardsCollectorOsmosisInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise setRoute: ( { @@ -118,7 +119,7 @@ export interface MarsRewardsCollectorOsmosisInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise withdrawFromRedBank: ( { @@ -130,7 +131,7 @@ export interface MarsRewardsCollectorOsmosisInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise distributeRewards: ( { @@ -142,7 +143,7 @@ export interface MarsRewardsCollectorOsmosisInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise swapAsset: ( { @@ -154,12 +155,12 @@ export interface MarsRewardsCollectorOsmosisInterface }, fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise claimIncentiveRewards: ( fee?: number | StdFee | 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ) => Promise } export class MarsRewardsCollectorOsmosisClient @@ -185,19 +186,20 @@ export class MarsRewardsCollectorOsmosisClient } updateOwner = async ( + ownerUpdate: OwnerUpdate, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, this.contractAddress, { - update_owner: {}, + update_owner: ownerUpdate, }, fee, memo, - funds, + _funds, ) } updateConfig = async ( @@ -208,7 +210,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -220,7 +222,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee, memo, - funds, + _funds, ) } setRoute = async ( @@ -235,7 +237,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -249,7 +251,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee, memo, - funds, + _funds, ) } withdrawFromRedBank = async ( @@ -262,7 +264,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -275,7 +277,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee, memo, - funds, + _funds, ) } distributeRewards = async ( @@ -288,7 +290,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -301,7 +303,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee, memo, - funds, + _funds, ) } swapAsset = async ( @@ -314,7 +316,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -327,13 +329,13 @@ export class MarsRewardsCollectorOsmosisClient }, fee, memo, - funds, + _funds, ) } claimIncentiveRewards = async ( fee: number | StdFee | 'auto' = 'auto', memo?: string, - funds?: Coin[], + _funds?: Coin[], ): Promise => { return await this.client.execute( this.sender, @@ -343,7 +345,7 @@ export class MarsRewardsCollectorOsmosisClient }, fee, memo, - funds, + _funds, ) } } diff --git a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.react-query.ts b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.react-query.ts index 01f189f22..3f0b033a9 100644 --- a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.react-query.ts +++ b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.react-query.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ @@ -279,6 +279,7 @@ export function useMarsRewardsCollectorOsmosisUpdateConfigMutation( } export interface MarsRewardsCollectorOsmosisUpdateOwnerMutation { client: MarsRewardsCollectorOsmosisClient + msg: OwnerUpdate args?: { fee?: number | StdFee | 'auto' memo?: string diff --git a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts index 92dfe51c0..6919e190f 100644 --- a/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts +++ b/scripts/types/generated/mars-rewards-collector-osmosis/MarsRewardsCollectorOsmosis.types.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/types/generated/mars-rewards-collector-osmosis/bundle.ts b/scripts/types/generated/mars-rewards-collector-osmosis/bundle.ts index e2d52102f..a45c593ec 100644 --- a/scripts/types/generated/mars-rewards-collector-osmosis/bundle.ts +++ b/scripts/types/generated/mars-rewards-collector-osmosis/bundle.ts @@ -1,6 +1,6 @@ // @ts-nocheck /** - * This file was automatically generated by @cosmwasm/ts-codegen@0.24.0. + * This file was automatically generated by @cosmwasm/ts-codegen@0.30.0. * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file, * and run the @cosmwasm/ts-codegen generate command to regenerate this file. */ diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 2deefce00..3d171fd5a 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -1035,143 +1035,143 @@ "@noble/hashes" "^1.0.0" protobufjs "^6.8.8" -"@cosmjs/amino@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.29.5.tgz#053b4739a90b15b9e2b781ccd484faf64bd49aec" - integrity sha512-Qo8jpC0BiziTSUqpkNatBcwtKNhCovUnFul9SlT/74JUCdLYaeG5hxr3q1cssQt++l4LvlcpF+OUXL48XjNjLw== - dependencies: - "@cosmjs/crypto" "^0.29.5" - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/utils" "^0.29.5" - -"@cosmjs/cosmwasm-stargate@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.29.5.tgz#3f257da682658833e0f4eb9e8ff758e4d927663a" - integrity sha512-TNdSvm2tEE3XMCuxHxquzls56t40hC8qnLeYJWHsY2ECZmRK3KrnpRReEr7N7bLtODToK7X/riYrV0JaYxjrYA== - dependencies: - "@cosmjs/amino" "^0.29.5" - "@cosmjs/crypto" "^0.29.5" - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/proto-signing" "^0.29.5" - "@cosmjs/stargate" "^0.29.5" - "@cosmjs/tendermint-rpc" "^0.29.5" - "@cosmjs/utils" "^0.29.5" - cosmjs-types "^0.5.2" +"@cosmjs/amino@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.30.1.tgz#7c18c14627361ba6c88e3495700ceea1f76baace" + integrity sha512-yNHnzmvAlkETDYIpeCTdVqgvrdt1qgkOXwuRVi8s27UKI5hfqyE9fJ/fuunXE6ZZPnKkjIecDznmuUOMrMvw4w== + dependencies: + "@cosmjs/crypto" "^0.30.1" + "@cosmjs/encoding" "^0.30.1" + "@cosmjs/math" "^0.30.1" + "@cosmjs/utils" "^0.30.1" + +"@cosmjs/cosmwasm-stargate@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.30.1.tgz#6f9ca310f75433a3e30d683bc6aa24eadb345d79" + integrity sha512-W/6SLUCJAJGBN+sJLXouLZikVgmqDd9LCdlMzQaxczcCHTWeJAmRvOiZGSZaSy3shw/JN1qc6g6PKpvTVgj10A== + dependencies: + "@cosmjs/amino" "^0.30.1" + "@cosmjs/crypto" "^0.30.1" + "@cosmjs/encoding" "^0.30.1" + "@cosmjs/math" "^0.30.1" + "@cosmjs/proto-signing" "^0.30.1" + "@cosmjs/stargate" "^0.30.1" + "@cosmjs/tendermint-rpc" "^0.30.1" + "@cosmjs/utils" "^0.30.1" + cosmjs-types "^0.7.1" long "^4.0.0" pako "^2.0.2" -"@cosmjs/crypto@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.29.5.tgz#ab99fc382b93d8a8db075780cf07487a0f9519fd" - integrity sha512-2bKkaLGictaNL0UipQCL6C1afaisv6k8Wr/GCLx9FqiyFkh9ZgRHDyetD64ZsjnWV/N/D44s/esI+k6oPREaiQ== +"@cosmjs/crypto@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.30.1.tgz#21e94d5ca8f8ded16eee1389d2639cb5c43c3eb5" + integrity sha512-rAljUlake3MSXs9xAm87mu34GfBLN0h/1uPPV6jEwClWjNkAMotzjC0ab9MARy5FFAvYHL3lWb57bhkbt2GtzQ== dependencies: - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/utils" "^0.29.5" + "@cosmjs/encoding" "^0.30.1" + "@cosmjs/math" "^0.30.1" + "@cosmjs/utils" "^0.30.1" "@noble/hashes" "^1" bn.js "^5.2.0" elliptic "^6.5.4" libsodium-wrappers "^0.7.6" -"@cosmjs/encoding@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.29.5.tgz#009a4b1c596cdfd326f30ccfa79f5e56daa264f2" - integrity sha512-G4rGl/Jg4dMCw5u6PEZHZcoHnUBlukZODHbm/wcL4Uu91fkn5jVo5cXXZcvs4VCkArVGrEj/52eUgTZCmOBGWQ== +"@cosmjs/encoding@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058" + integrity sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ== dependencies: base64-js "^1.3.0" bech32 "^1.1.4" readonly-date "^1.0.0" -"@cosmjs/json-rpc@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.29.5.tgz#5e483a9bd98a6270f935adf0dfd8a1e7eb777fe4" - integrity sha512-C78+X06l+r9xwdM1yFWIpGl03LhB9NdM1xvZpQHwgCOl0Ir/WV8pw48y3Ez2awAoUBRfTeejPe4KvrE6NoIi/w== +"@cosmjs/json-rpc@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.30.1.tgz#16f21305fc167598c8a23a45549b85106b2372bc" + integrity sha512-pitfC/2YN9t+kXZCbNuyrZ6M8abnCC2n62m+JtU9vQUfaEtVsgy+1Fk4TRQ175+pIWSdBMFi2wT8FWVEE4RhxQ== dependencies: - "@cosmjs/stream" "^0.29.5" + "@cosmjs/stream" "^0.30.1" xstream "^11.14.0" -"@cosmjs/math@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.29.5.tgz#722c96e080d6c2b62215ce9f4c70da7625b241b6" - integrity sha512-2GjKcv+A9f86MAWYLUkjhw1/WpRl2R1BTb3m9qPG7lzMA7ioYff9jY5SPCfafKdxM4TIQGxXQlYGewQL16O68Q== +"@cosmjs/math@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.30.1.tgz#8b816ef4de5d3afa66cb9fdfb5df2357a7845b8a" + integrity sha512-yaoeI23pin9ZiPHIisa6qqLngfnBR/25tSaWpkTm8Cy10MX70UF5oN4+/t1heLaM6SSmRrhk3psRkV4+7mH51Q== dependencies: bn.js "^5.2.0" -"@cosmjs/proto-signing@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.29.5.tgz#af3b62a46c2c2f1d2327d678b13b7262db1fe87c" - integrity sha512-QRrS7CiKaoETdgIqvi/7JC2qCwCR7lnWaUsTzh/XfRy3McLkEd+cXbKAW3cygykv7IN0VAEIhZd2lyIfT8KwNA== - dependencies: - "@cosmjs/amino" "^0.29.5" - "@cosmjs/crypto" "^0.29.5" - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/utils" "^0.29.5" - cosmjs-types "^0.5.2" +"@cosmjs/proto-signing@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.30.1.tgz#f0dda372488df9cd2677150b89b3e9c72b3cb713" + integrity sha512-tXh8pPYXV4aiJVhTKHGyeZekjj+K9s2KKojMB93Gcob2DxUjfKapFYBMJSgfKPuWUPEmyr8Q9km2hplI38ILgQ== + dependencies: + "@cosmjs/amino" "^0.30.1" + "@cosmjs/crypto" "^0.30.1" + "@cosmjs/encoding" "^0.30.1" + "@cosmjs/math" "^0.30.1" + "@cosmjs/utils" "^0.30.1" + cosmjs-types "^0.7.1" long "^4.0.0" -"@cosmjs/socket@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.29.5.tgz#a48df6b4c45dc6a6ef8e47232725dd4aa556ac2d" - integrity sha512-5VYDupIWbIXq3ftPV1LkS5Ya/T7Ol/AzWVhNxZ79hPe/mBfv1bGau/LqIYOm2zxGlgm9hBHOTmWGqNYDwr9LNQ== +"@cosmjs/socket@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.30.1.tgz#00b22f4b5e2ab01f4d82ccdb7b2e59536bfe5ce0" + integrity sha512-r6MpDL+9N+qOS/D5VaxnPaMJ3flwQ36G+vPvYJsXArj93BjgyFB7BwWwXCQDzZ+23cfChPUfhbINOenr8N2Kow== dependencies: - "@cosmjs/stream" "^0.29.5" + "@cosmjs/stream" "^0.30.1" isomorphic-ws "^4.0.1" ws "^7" xstream "^11.14.0" -"@cosmjs/stargate@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.29.5.tgz#d597af1c85a3c2af7b5bdbec34d5d40692cc09e4" - integrity sha512-hjEv8UUlJruLrYGJcUZXM/CziaINOKwfVm2BoSdUnNTMxGvY/jC1ABHKeZUYt9oXHxEJ1n9+pDqzbKc8pT0nBw== +"@cosmjs/stargate@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.30.1.tgz#e1b22e1226cffc6e93914a410755f1f61057ba04" + integrity sha512-RdbYKZCGOH8gWebO7r6WvNnQMxHrNXInY/gPHPzMjbQF6UatA6fNM2G2tdgS5j5u7FTqlCI10stNXrknaNdzog== dependencies: "@confio/ics23" "^0.6.8" - "@cosmjs/amino" "^0.29.5" - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/proto-signing" "^0.29.5" - "@cosmjs/stream" "^0.29.5" - "@cosmjs/tendermint-rpc" "^0.29.5" - "@cosmjs/utils" "^0.29.5" - cosmjs-types "^0.5.2" + "@cosmjs/amino" "^0.30.1" + "@cosmjs/encoding" "^0.30.1" + "@cosmjs/math" "^0.30.1" + "@cosmjs/proto-signing" "^0.30.1" + "@cosmjs/stream" "^0.30.1" + "@cosmjs/tendermint-rpc" "^0.30.1" + "@cosmjs/utils" "^0.30.1" + cosmjs-types "^0.7.1" long "^4.0.0" protobufjs "~6.11.3" xstream "^11.14.0" -"@cosmjs/stream@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.29.5.tgz#350981cac496d04939b92ee793b9b19f44bc1d4e" - integrity sha512-TToTDWyH1p05GBtF0Y8jFw2C+4783ueDCmDyxOMM6EU82IqpmIbfwcdMOCAm0JhnyMh+ocdebbFvnX/sGKzRAA== +"@cosmjs/stream@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.30.1.tgz#ba038a2aaf41343696b1e6e759d8e03a9516ec1a" + integrity sha512-Fg0pWz1zXQdoxQZpdHRMGvUH5RqS6tPv+j9Eh7Q953UjMlrwZVo0YFLC8OTf/HKVf10E4i0u6aM8D69Q6cNkgQ== dependencies: xstream "^11.14.0" -"@cosmjs/tendermint-rpc@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.29.5.tgz#f205c10464212bdf843f91bb2e4a093b618cb5c2" - integrity sha512-ar80twieuAxsy0x2za/aO3kBr2DFPAXDmk2ikDbmkda+qqfXgl35l9CVAAjKRqd9d+cRvbQyb5M4wy6XQpEV6w== - dependencies: - "@cosmjs/crypto" "^0.29.5" - "@cosmjs/encoding" "^0.29.5" - "@cosmjs/json-rpc" "^0.29.5" - "@cosmjs/math" "^0.29.5" - "@cosmjs/socket" "^0.29.5" - "@cosmjs/stream" "^0.29.5" - "@cosmjs/utils" "^0.29.5" +"@cosmjs/tendermint-rpc@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.30.1.tgz#c16378892ba1ac63f72803fdf7567eab9d4f0aa0" + integrity sha512-Z3nCwhXSbPZJ++v85zHObeUggrEHVfm1u18ZRwXxFE9ZMl5mXTybnwYhczuYOl7KRskgwlB+rID0WYACxj4wdQ== + dependencies: + "@cosmjs/crypto" "^0.30.1" + "@cosmjs/encoding" "^0.30.1" + "@cosmjs/json-rpc" "^0.30.1" + "@cosmjs/math" "^0.30.1" + "@cosmjs/socket" "^0.30.1" + "@cosmjs/stream" "^0.30.1" + "@cosmjs/utils" "^0.30.1" axios "^0.21.2" readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/utils@^0.29.5": - version "0.29.5" - resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.29.5.tgz#3fed1b3528ae8c5f1eb5d29b68755bebfd3294ee" - integrity sha512-m7h+RXDUxOzEOGt4P+3OVPX7PuakZT3GBmaM/Y2u+abN3xZkziykD/NvedYFvvCCdQo714XcGl33bwifS9FZPQ== +"@cosmjs/utils@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.30.1.tgz#6d92582341be3c2ec8d82090253cfa4b7f959edb" + integrity sha512-KvvX58MGMWh7xA+N+deCfunkA/ZNDvFLw4YbOmX3f/XBIkqrVY7qlotfy2aNb1kgp6h4B6Yc8YawJPDTfvWX7g== -"@cosmwasm/ts-codegen@^0.24.0": - version "0.24.0" - resolved "https://registry.yarnpkg.com/@cosmwasm/ts-codegen/-/ts-codegen-0.24.0.tgz#61015220a9dccfd35dec46bcb67786441111f096" - integrity sha512-g5ufDroLzOzsMvnKyAz7i5M3Z3k8XYetRv9PnGW0Zbgj4sziw6jDimPJ3Ubnput+i380day7LnCwVT7zLIEzCQ== +"@cosmwasm/ts-codegen@^0.30.0": + version "0.30.0" + resolved "https://registry.yarnpkg.com/@cosmwasm/ts-codegen/-/ts-codegen-0.30.0.tgz#9910c87471801e05475806b18428400444830160" + integrity sha512-BR2HuHUx+PgMj6KNLTwH1HNVQ5SYveJst5XxkeAGMuOSe4Rbe+0XDmq+jEbrLXK0ZRkCFY0OwcLKMhjsJOo4jA== dependencies: "@babel/core" "7.18.10" "@babel/generator" "7.18.12" @@ -1199,16 +1199,28 @@ parse-package-name "1.0.0" rimraf "3.0.2" shelljs "0.8.5" - wasm-ast-types "^0.17.0" + wasm-ast-types "^0.23.0" -"@eslint/eslintrc@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" - integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== +"@eslint-community/eslint-utils@^4.2.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.4.0": + version "4.5.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" + integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== + +"@eslint/eslintrc@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331" + integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.4.0" + espree "^9.5.2" globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -1216,6 +1228,11 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@eslint/js@8.41.0": + version "8.41.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3" + integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA== + "@humanwhocodes/config-array@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" @@ -1503,11 +1520,16 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== -"@types/node@*", "@types/node@>=13.7.0", "@types/node@^18.11.18": +"@types/node@*", "@types/node@>=13.7.0": version "18.11.18" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== +"@types/node@^20.2.5": + version "20.2.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.2.5.tgz#26d295f3570323b2837d322180dfbf1ba156fefb" + integrity sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ== + "@types/prettier@^2.6.1": version "2.7.2" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" @@ -1530,87 +1552,88 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz#d0b4556f0792194bf0c2fb297897efa321492389" - integrity sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q== +"@typescript-eslint/eslint-plugin@^5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz#1e7a3e5318ece22251dfbc5c9c6feeb4793cc509" + integrity sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ== dependencies: - "@typescript-eslint/scope-manager" "5.49.0" - "@typescript-eslint/type-utils" "5.49.0" - "@typescript-eslint/utils" "5.49.0" + "@eslint-community/regexpp" "^4.4.0" + "@typescript-eslint/scope-manager" "5.59.8" + "@typescript-eslint/type-utils" "5.59.8" + "@typescript-eslint/utils" "5.59.8" debug "^4.3.4" + grapheme-splitter "^1.0.4" ignore "^5.2.0" natural-compare-lite "^1.4.0" - regexpp "^3.2.0" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.49.0.tgz#d699734b2f20e16351e117417d34a2bc9d7c4b90" - integrity sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg== +"@typescript-eslint/parser@^5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.8.tgz#60cbb00671d86cf746044ab797900b1448188567" + integrity sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw== dependencies: - "@typescript-eslint/scope-manager" "5.49.0" - "@typescript-eslint/types" "5.49.0" - "@typescript-eslint/typescript-estree" "5.49.0" + "@typescript-eslint/scope-manager" "5.59.8" + "@typescript-eslint/types" "5.59.8" + "@typescript-eslint/typescript-estree" "5.59.8" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz#81b5d899cdae446c26ddf18bd47a2f5484a8af3e" - integrity sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ== +"@typescript-eslint/scope-manager@5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz#ff4ad4fec6433647b817c4a7d4b4165d18ea2fa8" + integrity sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig== dependencies: - "@typescript-eslint/types" "5.49.0" - "@typescript-eslint/visitor-keys" "5.49.0" + "@typescript-eslint/types" "5.59.8" + "@typescript-eslint/visitor-keys" "5.59.8" -"@typescript-eslint/type-utils@5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz#8d5dcc8d422881e2ccf4ebdc6b1d4cc61aa64125" - integrity sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA== +"@typescript-eslint/type-utils@5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz#aa6c029a9d7706d26bbd25eb4666398781df6ea2" + integrity sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA== dependencies: - "@typescript-eslint/typescript-estree" "5.49.0" - "@typescript-eslint/utils" "5.49.0" + "@typescript-eslint/typescript-estree" "5.59.8" + "@typescript-eslint/utils" "5.59.8" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.49.0.tgz#ad66766cb36ca1c89fcb6ac8b87ec2e6dac435c3" - integrity sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg== +"@typescript-eslint/types@5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.8.tgz#212e54414733618f5d0fd50b2da2717f630aebf8" + integrity sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w== -"@typescript-eslint/typescript-estree@5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz#ebd6294c0ea97891fce6af536048181e23d729c8" - integrity sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA== +"@typescript-eslint/typescript-estree@5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz#801a7b1766481629481b3b0878148bd7a1f345d7" + integrity sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg== dependencies: - "@typescript-eslint/types" "5.49.0" - "@typescript-eslint/visitor-keys" "5.49.0" + "@typescript-eslint/types" "5.59.8" + "@typescript-eslint/visitor-keys" "5.59.8" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.49.0.tgz#1c07923bc55ff7834dfcde487fff8d8624a87b32" - integrity sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ== +"@typescript-eslint/utils@5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.8.tgz#34d129f35a2134c67fdaf024941e8f96050dca2b" + integrity sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg== dependencies: + "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.49.0" - "@typescript-eslint/types" "5.49.0" - "@typescript-eslint/typescript-estree" "5.49.0" + "@typescript-eslint/scope-manager" "5.59.8" + "@typescript-eslint/types" "5.59.8" + "@typescript-eslint/typescript-estree" "5.59.8" eslint-scope "^5.1.1" - eslint-utils "^3.0.0" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.49.0": - version "5.49.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz#2561c4da3f235f5c852759bf6c5faec7524f90fe" - integrity sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg== +"@typescript-eslint/visitor-keys@5.59.8": + version "5.59.8" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz#aa6a7ef862add919401470c09e1609392ef3cc40" + integrity sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ== dependencies: - "@typescript-eslint/types" "5.49.0" + "@typescript-eslint/types" "5.59.8" eslint-visitor-keys "^3.3.0" acorn-jsx@^5.3.2: @@ -1967,18 +1990,18 @@ core-js-compat@^3.21.0, core-js-compat@^3.22.1: dependencies: browserslist "^4.21.4" -cosmjs-types@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.5.2.tgz#2d42b354946f330dfb5c90a87fdc2a36f97b965d" - integrity sha512-zxCtIJj8v3Di7s39uN4LNcN3HIE1z0B9Z0SPE8ZNQR0oSzsuSe1ACgxoFkvhkS7WBasCAFcglS11G2hyfd5tPg== +cosmjs-types@^0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.7.2.tgz#a757371abd340949c5bd5d49c6f8379ae1ffd7e2" + integrity sha512-vf2uLyktjr/XVAgEq0DjMxeAWh1yYREe7AMHDKd7EiHVqxBPCaBS+qEEQUkXbR9ndnckqr1sUG8BQhazh4X5lA== dependencies: long "^4.0.0" protobufjs "~6.11.2" -cosmjs-types@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.6.1.tgz#4944e83d0fa87880243a11813bdff0e313d39a68" - integrity sha512-fRz6yzElHHBULDyLArF/G1UkkTWW4r3RondBUGnmSsZWYI5NpfDn32MVa5aRmpaaf4tJI2cbnXHs9fykwU7Ttg== +cosmjs-types@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.8.0.tgz#2ed78f3e990f770229726f95f3ef5bf9e2b6859b" + integrity sha512-Q2Mj95Fl0PYMWEhA2LuGEIhipF7mQwd9gTQ85DdP9jjjopeoGaDxvmPa5nakNzsq7FnO1DMTatXTAx6bxMH7Lg== dependencies: long "^4.0.0" protobufjs "~6.11.2" @@ -2118,10 +2141,10 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-config-prettier@^8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207" - integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA== +eslint-config-prettier@^8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348" + integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA== eslint-scope@^5.1.1: version "5.1.1" @@ -2131,37 +2154,33 @@ eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== +eslint-scope@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" + integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - eslint-visitor-keys@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.32.0: - version "8.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861" - integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ== +eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== + +eslint@^8.41.0: + version "8.41.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c" + integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q== dependencies: - "@eslint/eslintrc" "^1.4.1" + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.4.0" + "@eslint/eslintrc" "^2.0.3" + "@eslint/js" "8.41.0" "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -2171,24 +2190,22 @@ eslint@^8.32.0: debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-utils "^3.0.0" - eslint-visitor-keys "^3.3.0" - espree "^9.4.0" - esquery "^1.4.0" + eslint-scope "^7.2.0" + eslint-visitor-keys "^3.4.1" + espree "^9.5.2" + esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" globals "^13.19.0" - grapheme-splitter "^1.0.4" + graphemer "^1.4.0" ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" - js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" @@ -2196,29 +2213,28 @@ eslint@^8.32.0: minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.1" - regexpp "^3.2.0" strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" -espree@^9.4.0: - version "9.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" - integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== +espree@^9.5.2: + version "9.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" + integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== +esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== dependencies: estraverse "^5.1.0" @@ -2501,6 +2517,11 @@ grapheme-splitter@^1.0.4: resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -2778,11 +2799,6 @@ jest-worker@^28.1.3: merge-stream "^2.0.0" supports-color "^8.0.0" -js-sdsl@^4.1.4: - version "4.3.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" - integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -3190,11 +3206,16 @@ prepend-file@^2.0.1: dependencies: temp-write "^4.0.0" -prettier@^2.6.2, prettier@^2.8.3: +prettier@^2.6.2: version "2.8.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632" integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw== +prettier@^2.8.8: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== + protobufjs@^6.8.8, protobufjs@~6.11.2, protobufjs@~6.11.3: version "6.11.3" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" @@ -3260,11 +3281,6 @@ regenerator-transform@^0.15.1: dependencies: "@babel/runtime" "^7.8.4" -regexpp@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - regexpu-core@^5.2.1: version "5.2.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc" @@ -3604,10 +3620,10 @@ type@^2.7.2: resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== -typescript@^4.9.4: - version "4.9.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" - integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== +typescript@^5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" + integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" @@ -3666,10 +3682,10 @@ walker@^1.0.8: dependencies: makeerror "1.0.12" -wasm-ast-types@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/wasm-ast-types/-/wasm-ast-types-0.17.0.tgz#417280a61d60ea9964667cf2edb8f5281dc295d7" - integrity sha512-WeriXPbG67iI51Mf/5qRR0xcpEaTO/Wyjpl+vsmjZ5K6q/0W6iO03zHsESNIH/hpc5FPTpb0Y0L9xAtnnNe9Ow== +wasm-ast-types@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/wasm-ast-types/-/wasm-ast-types-0.23.0.tgz#fa4f674d9b9c7141d685d70f7adcd52a6f20c68c" + integrity sha512-WNGOmIBgIQefGOJWZQ4dKpASpnb7+SNnJNlyvcXpYel7ozjhpgIhWw0+udCquNHzRAA6KApMFBHMa4k2HIzbUw== dependencies: "@babel/runtime" "^7.18.9" "@babel/types" "7.18.10"