diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2f0b05147..8c722fd09 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -116,7 +116,7 @@ jobs: - name: Download exo run: | - wget https://github.com/appaquet/exocore/releases/download/v0.1.19/exo.x86_64-unknown-linux-gnu.tar.gz -O - | tar -zx + wget https://github.com/appaquet/exocore/releases/download/v0.1.20/exo.x86_64-unknown-linux-gnu.tar.gz -O - | tar -zx echo `pwd` >> $GITHUB_PATH - name: Build app package diff --git a/.github/workflows/push-tester.yml b/.github/workflows/push-tester.yml index c2d52d91c..6cdc3f598 100644 --- a/.github/workflows/push-tester.yml +++ b/.github/workflows/push-tester.yml @@ -187,7 +187,7 @@ jobs: - name: Download exo run: | - wget https://github.com/appaquet/exocore/releases/download/v0.1.19/exo.x86_64-unknown-linux-gnu.tar.gz -O - | tar -zx + wget https://github.com/appaquet/exocore/releases/download/v0.1.20/exo.x86_64-unknown-linux-gnu.tar.gz -O - | tar -zx echo `pwd` >> $GITHUB_PATH - name: Build & package app diff --git a/Cargo.lock b/Cargo.lock index b4502b4cd..2b2d68beb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,13 +166,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "crypto-mac", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.3", ] [[package]] @@ -281,9 +279,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1" +checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" dependencies = [ "cfg-if", "cipher", @@ -293,9 +291,9 @@ dependencies = [ [[package]] name = "chacha20poly1305" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2" +checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" dependencies = [ "aead", "chacha20", @@ -469,6 +467,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc3116fe595d7847c701796ac1b189bd86b81f4f593c6f775f9d80fb2e29f4" +dependencies = [ + "byteorder", + "digest 0.10.3", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -503,13 +514,14 @@ checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ "block-buffer 0.10.2", "crypto-common", + "subtle", ] [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "ed25519" @@ -526,7 +538,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.1", "ed25519", "rand 0.7.3", "serde", @@ -576,9 +588,9 @@ dependencies = [ [[package]] name = "exocore" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e635d13cdf48035587624fe3d29d507f2c2f3b8c72602f7d02b7e7e5962588" +checksum = "2ff16397b8271d900f16aa8f435ae3636331139c010dfad8e6b92d589922c97a" dependencies = [ "anyhow", "exocore-apps-sdk", @@ -591,9 +603,9 @@ dependencies = [ [[package]] name = "exocore-apps-macros" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c58cee7c4aeec70fd721c1f8557e345a851da00d558fdf7416b21eda3d098c" +checksum = "60c756624a379948e1721ce00ab4bbb3f036cbabd8b7642724ab322db1d3ae34" dependencies = [ "anyhow", "futures", @@ -605,9 +617,9 @@ dependencies = [ [[package]] name = "exocore-apps-sdk" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05c615acf9476bc7787f4397661a867ee27650a4a17cf3f35773dbe53ab0ec0" +checksum = "08f0f2a1860cf86f10e137a3329a095d15f914ba7cfbcde0d7df897829507a22" dependencies = [ "anyhow", "chrono", @@ -623,9 +635,9 @@ dependencies = [ [[package]] name = "exocore-core" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21795c56eb1a047d512658e52c77e254e3e6e444c660a50d0c62c4e1f256c4f" +checksum = "ecc23d5799c909c843e94495079f4217b81a833a908ad3c0ed31635ecc932f0a" dependencies = [ "anyhow", "bs58", @@ -638,7 +650,7 @@ dependencies = [ "libp2p", "log 0.4.14", "log4rs", - "multihash 0.16.1", + "multihash", "petname", "rand 0.8.5", "serde", @@ -657,9 +669,9 @@ dependencies = [ [[package]] name = "exocore-protos" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68c7c965fb509f444622ae5c0ac36b2b878811f6fadbc8d9a1f57a1d5cb9775" +checksum = "86afa0d14cfc4601a712c31722ac8884f53947327ebd1a8b7994e68595314c55" dependencies = [ "anyhow", "base64", @@ -672,14 +684,15 @@ dependencies = [ "protobuf", "serde", "serde_derive", + "serde_json", "thiserror", ] [[package]] name = "exocore-store" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad02aa837b883e3f2f2e1860c39de97a560ded57664ec494ea471a019ee4034" +checksum = "d7cc0d7a0e17a03dbea554d95855024dd34e89ef9b0c499022f887c84bc80fa0" dependencies = [ "anyhow", "async-trait", @@ -697,9 +710,9 @@ dependencies = [ [[package]] name = "exocore-transport" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f6a3f08841e51f37579be4911936fc808c9041020948010be450179afb57f8" +checksum = "da5647f0163522b5dbb1acb6116db92c98fe0294681e142fe12d64b88dd450c2" dependencies = [ "anyhow", "byteorder", @@ -1067,7 +1080,7 @@ checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] @@ -1114,7 +1127,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.1", + "itoa", "pin-project-lite 0.2.8", "socket2 0.4.4", "tokio", @@ -1164,25 +1177,14 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ - "if-addrs-sys", "libc", "winapi", ] -[[package]] -name = "if-addrs-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "indexmap" version = "1.8.0" @@ -1235,12 +1237,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.1" @@ -1276,9 +1272,9 @@ checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" [[package]] name = "libp2p" -version = "0.41.1" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ec5b70fc23ed1b1b1169ce0d1116260a343f67cf7088b498b8d99255cd68c32" +checksum = "4e8570e25fa03d4385405dbeaf540ba00e3ee50942f03d84e1a8928a029f35f9" dependencies = [ "atomic", "bytes", @@ -1300,7 +1296,7 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "smallvec", @@ -1308,9 +1304,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.30.2" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86aad7d54df283db817becded03e611137698a6509d4237a96881976a162340c" +checksum = "9164ec41455856e8187addc870bb4fe1ea2ee28e1a9244831d449a2429b32c1a" dependencies = [ "asn1_der", "bs58", @@ -1324,16 +1320,16 @@ dependencies = [ "libsecp256k1", "log 0.4.14", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", - "parking_lot", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", "rand 0.8.5", "ring", "rw-stream-sink", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", "thiserror", "unsigned-varint", @@ -1343,9 +1339,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" +checksum = "7838647d33978b77f943687412f4a39e74234c8342cbfdad14282b465b272cb4" dependencies = [ "futures", "libp2p-core", @@ -1356,9 +1352,9 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32329181638a103321c05ef697f406abbccc695780b7c7d3dc34206758e9eb09" +checksum = "1f219b4d4660fe3a04bf5fe6b5970902b7c1918e25b2536be8c70efc480f88f8" dependencies = [ "futures", "futures-timer", @@ -1373,22 +1369,22 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59f3be49edeecff13ef0d0dc28295ba4a33910611715f04236325d08e4119e0" +checksum = "d29e4e5e4c5aa567fe1ee3133afe088dc2d2fd104e20c5c2c5c2649f75129677" dependencies = [ "libp2p-core", "libp2p-identify", "libp2p-ping", "libp2p-swarm", - "open-metrics-client", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" +checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" dependencies = [ "asynchronous-codec", "bytes", @@ -1396,7 +1392,7 @@ dependencies = [ "libp2p-core", "log 0.4.14", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "unsigned-varint", @@ -1404,12 +1400,12 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" +checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" dependencies = [ "bytes", - "curve25519-dalek", + "curve25519-dalek 3.2.1", "futures", "lazy_static", "libp2p-core", @@ -1417,7 +1413,7 @@ dependencies = [ "prost", "prost-build", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "snow", "static_assertions", "x25519-dalek", @@ -1426,9 +1422,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d210cc0774142575a6a95f2c3590f9009cb838652cd295110a12a5d032ac07e0" +checksum = "9ab44a12d372d6abdd326c468c1d5b002be06fbd923c5a799d6a9d3b36646ca3" dependencies = [ "futures", "futures-timer", @@ -1442,26 +1438,29 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb84d40627cd109bbbf43da9269d4ef75903f42356c88d98b2b55c47c430c792" +checksum = "53ab2d4eb8ef2966b10fdf859245cdd231026df76d3c6ed2cf9e418a8f688ec9" dependencies = [ "either", + "fnv", "futures", "futures-timer", "instant", "libp2p-core", "log 0.4.14", + "pin-project 1.0.10", "rand 0.7.3", "smallvec", + "thiserror", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.26.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b4d0acd47739fe0b570728d8d11bbb535050d84c0cf05d6477a4891fceae10" +checksum = "daf2fe8c80b43561355f4d51875273b5b6dfbac37952e8f64b1270769305c9d7" dependencies = [ "quote", "syn", @@ -1469,9 +1468,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" +checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" dependencies = [ "futures", "futures-timer", @@ -1486,9 +1485,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa92005fbd67695715c821e1acfe4d7be9fd2d88738574e93d645c49ec2831c8" +checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" dependencies = [ "either", "futures", @@ -1504,13 +1503,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" +checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" dependencies = [ "futures", "libp2p-core", - "parking_lot", + "parking_lot 0.12.0", "thiserror", "yamux", ] @@ -1629,7 +1628,7 @@ dependencies = [ "libc", "log 0.4.14", "log-mdc", - "parking_lot", + "parking_lot 0.11.2", "regex", "serde", "serde-value", @@ -1732,15 +1731,15 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", + "multihash", "percent-encoding 2.1.0", "serde", "static_assertions", @@ -1748,19 +1747,6 @@ dependencies = [ "url 2.2.2", ] -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "digest 0.9.0", - "generic-array", - "multihash-derive 0.7.2", - "sha2 0.9.9", - "unsigned-varint", -] - [[package]] name = "multihash" version = "0.16.1" @@ -1772,26 +1758,12 @@ dependencies = [ "blake3", "core2", "digest 0.10.3", - "multihash-derive 0.8.0", + "multihash-derive", "sha2 0.10.2", "sha3", "unsigned-varint", ] -[[package]] -name = "multihash-derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" -dependencies = [ - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "multihash-derive" version = "0.8.0" @@ -1814,9 +1786,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" +checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ "bytes", "futures", @@ -1882,29 +1854,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "open-metrics-client" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "open-metrics-client-derive-text-encode", - "owning_ref", -] - -[[package]] -name = "open-metrics-client-derive-text-encode" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl-probe" version = "0.1.5" @@ -1937,7 +1886,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.1", ] [[package]] @@ -1954,6 +1913,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.11", + "smallvec", + "windows-sys", +] + [[package]] name = "percent-encoding" version = "1.0.1" @@ -1966,15 +1938,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - [[package]] name = "petgraph" version = "0.6.0" @@ -2132,6 +2095,29 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "prometheus-client" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +dependencies = [ + "dtoa", + "itoa", + "owning_ref", + "prometheus-client-derive-text-encode", +] + +[[package]] +name = "prometheus-client-derive-text-encode" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost" version = "0.9.0" @@ -2362,9 +2348,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] @@ -2490,21 +2476,9 @@ dependencies = [ [[package]] name = "semver" -version = "0.11.0" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" [[package]] name = "serde" @@ -2542,7 +2516,7 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -2608,9 +2582,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8935e920eb80ff8f5a5bced990325d12f6cc1015154a3852c6a23cf5bd71c447" +checksum = "38aacac9d96bfdac3f00d2149fc2235f99b839f54f0bb18bea39c7749c97f709" dependencies = [ "chrono", "is_debug", @@ -2636,20 +2610,19 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "snow" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" +checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "rand 0.8.5", + "curve25519-dalek 4.0.0-pre.2", "rand_core 0.6.3", "ring", "rustc_version", - "sha2 0.9.9", + "sha2 0.10.2", "subtle", - "x25519-dalek", ] [[package]] @@ -2976,7 +2949,7 @@ dependencies = [ "lazy_static", "log 0.4.14", "lru-cache", - "parking_lot", + "parking_lot 0.11.2", "resolv-conf", "smallvec", "thiserror", @@ -3005,12 +2978,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - [[package]] name = "unicode-bidi" version = "0.3.7" @@ -3237,7 +3204,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures", "js-sys", - "parking_lot", + "parking_lot 0.11.2", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -3322,6 +3289,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + [[package]] name = "winreg" version = "0.6.2" @@ -3337,7 +3347,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.1", "rand_core 0.5.1", "zeroize", ] @@ -3353,14 +3363,14 @@ dependencies = [ [[package]] name = "yamux" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" +checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ "futures", "log 0.4.14", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.0", "rand 0.8.5", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index ecebcfa70..08d963b68 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,5 +31,5 @@ lto = "thin" # [patch.crates-io] # exocore = {path = "../exocore"} -# exocore = { git = "https://github.com/appaquet/exocore.git", tag = "v0.1.19" } +# exocore = { git = "https://github.com/appaquet/exocore.git", tag = "v0.1.20" } # exocore = {git = "https://github.com/appaquet/exocore.git"} diff --git a/app/Cargo.toml b/app/Cargo.toml index 347bfe981..226f7f372 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ['cdylib'] [dependencies] anyhow = "1.0" -exocore = {version = "0.1.19", default-features = false, features = ["apps-sdk"]} +exocore = {version = "0.1.20", default-features = false, features = ["apps-sdk"]} exomind-protos = {version = "0.1.12", path = "../protos"} futures = "0.3" log = "0.4" diff --git a/exm/Cargo.toml b/exm/Cargo.toml index 1e0292253..3dd6c50cb 100644 --- a/exm/Cargo.toml +++ b/exm/Cargo.toml @@ -11,7 +11,7 @@ version = "0.1.12" [dependencies] anyhow = "1.0" -exocore = {version = "0.1.19", default-features = false, features = ["client", "logger"]} +exocore = {version = "0.1.20", default-features = false, features = ["client", "logger"]} exomind-protos = {version = "0.1.12", path = "../protos"} exomind-gmail = {version = "0.1.12", path = "../integrations/gmail"} log = "0.4" @@ -19,4 +19,4 @@ structopt = "0.3" tokio = {version = "1.17", features = ["macros", "rt-multi-thread", "time"]} [dev-dependencies] -exocore = {version = "0.1.19", default-features = false, features = ["client", "logger", "tests-utils"]} +exocore = {version = "0.1.20", default-features = false, features = ["client", "logger", "tests-utils"]} diff --git a/integrations/gmail/Cargo.toml b/integrations/gmail/Cargo.toml index 996d5bd32..908c9521a 100644 --- a/integrations/gmail/Cargo.toml +++ b/integrations/gmail/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0" base64 = "0.13" chardetng = "0.1" charset = "0.1" -exocore = {version = "0.1.19", default-features = false, features = ["client", "logger"]} +exocore = {version = "0.1.20", default-features = false, features = ["client", "logger"]} exomind-protos = {version = "0.1.12", path = "../../protos"} google-gmail1 = "3.0" hyper = "^0.14" @@ -28,4 +28,4 @@ serde_yaml = "0.8" structopt = "0.3" [dev-dependencies] -exocore = {version = "0.1.19", default-features = false, features = ["client", "logger", "tests-utils"]} +exocore = {version = "0.1.20", default-features = false, features = ["client", "logger", "tests-utils"]} diff --git a/ios/Podfile b/ios/Podfile index 0976a0ccb..09477ab00 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -14,27 +14,27 @@ target 'Exomind' do pod 'AppCenter' pod 'Introspect' - pod 'Exocore', '0.1.19' + pod 'Exocore', '0.1.20' # pod 'Exocore', :path => '../../exocore' - # pod 'Exocore', :http => 'https://github.com/appaquet/exocore/releases/download/v0.1.19/exocore-ios.tar.gz' + # pod 'Exocore', :http => 'https://github.com/appaquet/exocore/releases/download/v0.1.20/exocore-ios.tar.gz' end target 'ExomindActionExt' do pod 'KeychainSwift', '~> 19.0' pod 'SwiftProtobuf', '~> 1.10' - pod 'Exocore', '0.1.19' + pod 'Exocore', '0.1.20' # pod 'Exocore' , :path => '../../exocore' - # pod 'Exocore', :http => 'https://github.com/appaquet/exocore/releases/download/v0.1.19/exocore-ios.tar.gz' + # pod 'Exocore', :http => 'https://github.com/appaquet/exocore/releases/download/v0.1.20/exocore-ios.tar.gz' end target 'ExomindTests' do pod 'SwiftyJSON', '~> 4.2' pod 'SwiftProtobuf', '~> 1.10' - pod 'Exocore', '0.1.19' + pod 'Exocore', '0.1.20' # pod 'Exocore', :path => '../../exocore' - # pod 'Exocore', :http => 'https://github.com/appaquet/exocore/releases/download/v0.1.19/exocore-ios.tar.gz' + # pod 'Exocore', :http => 'https://github.com/appaquet/exocore/releases/download/v0.1.20/exocore-ios.tar.gz' end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fecd8554d..5e460460b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -8,7 +8,7 @@ PODS: - AppCenter/Crashes (4.1.1): - AppCenter/Core - CLTokenInputView (2.3.0) - - Exocore (0.1.19): + - Exocore (0.1.20): - SwiftProtobuf (~> 1.10) - FontAwesome.swift (1.9.1) - Introspect (0.1.3) @@ -22,7 +22,7 @@ PODS: DEPENDENCIES: - AppCenter - CLTokenInputView - - Exocore (= 0.1.19) + - Exocore (= 0.1.20) - FontAwesome.swift (from `https://github.com/thii/FontAwesome.swift.git`) - Introspect - KeychainSwift (~> 19.0) @@ -57,7 +57,7 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: AppCenter: cd53e3ed3563cc720bcb806c9731a12389b40d44 CLTokenInputView: 9dc1ffb7c9d2d81787e69a63c75bd97b0b2d1e76 - Exocore: 4cc5f43760ca793dc53d529d0b66e86f5df3010e + Exocore: acd2d67bd391a7fc78b1931a484e04d3bdcefd13 FontAwesome.swift: 6b52cb7be66eacd28cbfaa0ca7ffd0de4a186a1d Introspect: 2be020f30f084ada52bb4387fff83fa52c5c400e KeychainSwift: a06190cf933ad46b1e0abc3d77d29c06331715c7 @@ -67,6 +67,6 @@ SPEC CHECKSUMS: SwiftyJSON: 6faa0040f8b59dead0ee07436cbf76b73c08fd08 UIColor_Hex_Swift: bc07fc197421ee896b9ed6dcfa2054b7fbf75145 -PODFILE CHECKSUM: d50ebd887ae3900685f00d4d80a68fd2cebc1ab0 +PODFILE CHECKSUM: 0cc65a4db56dce16c8c6e939c62c86eba5ec0959 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/protos/protobuf/exocore/test/test.proto b/protos/protobuf/exocore/test/test.proto index 6bc2ad06c..f747eb711 100644 --- a/protos/protobuf/exocore/test/test.proto +++ b/protos/protobuf/exocore/test/test.proto @@ -13,7 +13,7 @@ message TestMessage { string string3 = 12 [(exocore.indexed) = true]; - TestStruct struct1 = 3; + TestStruct struct1 = 3 [(exocore.indexed) = true]; oneof fields { string oneof_string1 = 4; @@ -45,10 +45,12 @@ message TestMessage { string grouped1 = 20 [(exocore.field_group) = 1]; string grouped2 = 21 [(exocore.field_group) = 1, (exocore.field_group) = 2]; + + map map1 = 22; } message TestStruct { - string string1 = 1; + string string1 = 1 [(exocore.text) = true]; } message TestMessage2 { diff --git a/web/package.json b/web/package.json index b7acf9d90..fe3b7cf4b 100644 --- a/web/package.json +++ b/web/package.json @@ -92,10 +92,10 @@ "clipboard-copy": "^4.0.1", "core-js": "^3.21.1", "dom-serializer": "1.3.2", - "domhandler": "^4.3.0", + "domhandler": "^4.2.0", "domutils": "^2.4.2", "emoji-regex": "^10.0.0", - "exocore": "^0.1.19", + "exocore": "^0.1.20", "font-awesome": "^4.4.0", "htmlparser2": "^7.2.0", "less": "^4.1.2", @@ -118,7 +118,6 @@ "@babel/preset-react": "^7.16.5", "@babel/preset-typescript": "^7.16.5", "@types/classnames": "^2.3.1", - "@types/domhandler": "^2.4.2", "@types/jest": "^27.4.1", "@types/linkifyjs": "^2.1.4", "@types/lodash": "^4.14.178", diff --git a/web/yarn.lock b/web/yarn.lock index fa409281e..3925549f4 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -58,17 +58,17 @@ semver "^6.3.0" "@babel/core@^7.17.5": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.7.tgz#f7c28228c83cdf2dbd1b9baa06eaf9df07f0c2f9" - integrity sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" "@babel/generator" "^7.17.7" "@babel/helper-compilation-targets" "^7.17.7" "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.7" - "@babel/parser" "^7.17.7" + "@babel/helpers" "^7.17.8" + "@babel/parser" "^7.17.8" "@babel/template" "^7.16.7" "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" @@ -312,7 +312,7 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.17.2", "@babel/helpers@^7.17.7": +"@babel/helpers@^7.17.2": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.7.tgz#6fc0a24280fd00026e85424bbfed4650e76d7127" integrity sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w== @@ -321,6 +321,15 @@ "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" +"@babel/helpers@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" + integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== + dependencies: + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" + "@babel/highlight@^7.16.7": version "7.16.10" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" @@ -335,10 +344,10 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA== -"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800" - integrity sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA== +"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" + integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -1599,27 +1608,27 @@ "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" - resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= "@protobufjs/base64@^1.1.2": version "1.1.2" - resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== "@protobufjs/codegen@^2.0.4": version "2.0.4" - resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== "@protobufjs/eventemitter@^1.1.0": version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= "@protobufjs/fetch@^1.1.0": version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= dependencies: "@protobufjs/aspromise" "^1.1.1" @@ -1627,27 +1636,27 @@ "@protobufjs/float@^1.0.2": version "1.0.2" - resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= "@protobufjs/inquire@^1.1.0": version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= "@protobufjs/path@^1.1.2": version "1.1.2" - resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= "@protobufjs/pool@^1.1.0": version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= "@protobufjs/utf8@^1.1.0": version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= "@sindresorhus/is@^0.14.0": @@ -1733,11 +1742,6 @@ dependencies: "@types/ms" "*" -"@types/domhandler@^2.4.2": - version "2.4.2" - resolved "https://registry.npmjs.org/@types/domhandler/-/domhandler-2.4.2.tgz" - integrity sha512-T6Fx2wcgCMGYAgXsWuc73FJe10QiBdfb0T9abSAMNYYJfxZpVNVlLvwpCuY71OMA0IdZhxpEwjhJpOUVmIEgnQ== - "@types/fs-extra@^9.0.11": version "9.0.13" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" @@ -1816,7 +1820,7 @@ "@types/long@^4.0.1": version "4.0.1" - resolved "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== "@types/minimatch@*": @@ -1954,9 +1958,9 @@ "@types/prosemirror-transform" "*" "@types/react-dom@^17.0.13": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.13.tgz#a3323b974ee4280070982b3112351bb1952a7809" - integrity sha512-wEP+B8hzvy6ORDv1QBhcQia4j6ea4SFIBttHYpXKPFZRviBvknq0FRh3VrIxeXUmsPkwuXVZrVGG7KUVONmXCQ== + version "17.0.14" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" + integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== dependencies: "@types/react" "*" @@ -1969,9 +1973,9 @@ flatpickr "^4.0.6" "@types/react@*", "@types/react@^17.0.40": - version "17.0.40" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.40.tgz#dc010cee6254d5239a138083f3799a16638e6bad" - integrity sha512-UrXhD/JyLH+W70nNSufXqMZNuUD2cXHu6UjCllC6pmOQgBX4SGXOH8fjRka0O0Ee0HrFxapDD8Bwn81Kmiz6jQ== + version "17.0.41" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.41.tgz#6e179590d276394de1e357b3f89d05d7d3da8b85" + integrity sha512-chYZ9ogWUodyC7VUTRBfblysKLjnohhFY9bGLwvnUFFy48+vB9DikmB3lW0qTFmBcKSzmdglcvkHK71IioOlDA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -3085,12 +3089,12 @@ browserify-zlib@^0.2.0: pako "~1.0.5" browserslist@^4.17.5: - version "4.20.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.0.tgz#35951e3541078c125d36df76056e94738a52ebe9" - integrity sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ== + version "4.20.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== dependencies: - caniuse-lite "^1.0.30001313" - electron-to-chromium "^1.4.76" + caniuse-lite "^1.0.30001317" + electron-to-chromium "^1.4.84" escalade "^3.1.1" node-releases "^2.0.2" picocolors "^1.0.0" @@ -3330,11 +3334,16 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001313: +caniuse-lite@^1.0.30001286: version "1.0.30001316" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001316.tgz#b44a1f419f82d2e119aa0bbdab5ec15471796358" integrity sha512-JgUdNoZKxPZFzbzJwy4hDSyGuH/gXz2rN51QmoR8cBQsVo58llD3A0vlRKKRt8FGf5u69P9eQyIH8/z9vN/S0Q== +caniuse-lite@^1.0.30001317: + version "1.0.30001319" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" + integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== + chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -3955,9 +3964,9 @@ cssstyle@^2.3.0: cssom "~0.3.6" csstype@^3.0.2: - version "3.0.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" - integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== + version "3.0.11" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== cyclist@^1.0.1: version "1.0.1" @@ -3985,7 +3994,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -3999,6 +4008,13 @@ debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.1.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" @@ -4279,7 +4295,7 @@ domhandler@^3.0.0: dependencies: domelementtype "^2.0.1" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.2.2, domhandler@^4.3.0: +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.2.2: version "4.3.0" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== @@ -4405,11 +4421,16 @@ electron-publish@22.14.13: lazy-val "^1.0.5" mime "^2.5.2" -electron-to-chromium@^1.4.17, electron-to-chromium@^1.4.76: +electron-to-chromium@^1.4.17: version "1.4.83" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.83.tgz#24a2a7687786896c758e7dd22f218fd3f0ad1e67" integrity sha512-Wm15TA5pLMOHtsik6uQTVyzXG8IpkVxnXAoAqV4+6zbJH3n5qnVz3iNAW+65r6WSrrYo0w6B8JJ0lcv2NhSmXQ== +electron-to-chromium@^1.4.84: + version "1.4.88" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.88.tgz#ebe6a2573b563680c7a7bf3a51b9e465c9c501db" + integrity sha512-oA7mzccefkvTNi9u7DXmT0LqvhnOiN2BhSrKerta7HeUC1cLoIwtbf2wL+Ah2ozh5KQd3/1njrGrwDBXx6d14Q== + electron-webpack-js@~2.4.1: version "2.4.1" resolved "https://registry.npmjs.org/electron-webpack-js/-/electron-webpack-js-2.4.1.tgz" @@ -4915,10 +4936,10 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -exocore@^0.1.19: - version "0.1.19" - resolved "https://registry.yarnpkg.com/exocore/-/exocore-0.1.19.tgz#e66865182094e7940c5e42116fc80de3184877ba" - integrity sha512-fbdGYgv4DIc1s6o5NEDnYZ2VfAC6/Gh+STZxCmvATJ6BtJ36swBYCF8wPFbU+uaPuVY+TVhDWWakQ15zgyqTkQ== +exocore@^0.1.20: + version "0.1.20" + resolved "https://registry.yarnpkg.com/exocore/-/exocore-0.1.20.tgz#e62c6c6634052cfc2265cc0d9f934f955bccf3fa" + integrity sha512-oA17nKmscI6L1KDdcLtr0uSWZbjbY/eN3RuxvTQK/2cWDoJ2TW5mPwjKUhWvPK7XYmUfm+6CX5aWvH6ThoTjtg== dependencies: protobufjs "^6.11.2" @@ -7244,7 +7265,7 @@ loglevel@^1.6.8: long@^4.0.0: version "4.0.0" - resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== loose-envify@^1.1.0, loose-envify@^1.4.0: @@ -8581,7 +8602,7 @@ proto-list@~1.2.1: protobufjs@^6.10.2, protobufjs@^6.11.2: version "6.11.2" - resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== dependencies: "@protobufjs/aspromise" "^1.1.2"