From 8050f699f35d41017e433af35d0993c0bc78efc0 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Mon, 11 Sep 2023 11:33:10 -0700 Subject: [PATCH] cargo upgrade and cargo update --- Cargo.lock | 225 +++++++++--------- payment-contracts/Cargo.toml | 4 +- payment-contracts/src/contracts/ierc20.rs | 50 ++-- .../src/contracts/payment_factory.rs | 156 ++++++------ .../src/contracts/payment_sweeper.rs | 24 +- redis-rate-limiter/Cargo.toml | 2 +- web3_proxy/Cargo.toml | 18 +- web3_proxy_cli/Cargo.toml | 4 +- 8 files changed, 240 insertions(+), 243 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c124c76..8b5b0200 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -188,7 +188,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -350,7 +350,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -438,7 +438,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -480,7 +480,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -555,7 +555,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.3", + "base64 0.21.4", "bitflags 1.3.2", "bytes", "futures-util", @@ -586,9 +586,9 @@ dependencies = [ [[package]] name = "axum-client-ip" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e81eacc93f36480825da5f46a33b5fb2246ed024eacc9e8933425b80c5807" +checksum = "1ef117890a418b7832678d9ea1e1c08456dd7b2fd1dadb9676cd6f0fe7eb4b21" dependencies = [ "axum", "forwarded-header-value", @@ -622,7 +622,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -654,9 +654,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -856,9 +856,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -975,16 +975,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", "windows-targets", ] @@ -1069,7 +1068,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -1134,7 +1133,7 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bech32", "bs58", "digest", @@ -1747,7 +1746,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0be7b2ac146c1f99fe245c02d16af0696450d8e06c135db75e10eeb9e642c20d" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "hex", "k256", @@ -1762,7 +1761,7 @@ dependencies = [ [[package]] name = "entities" -version = "0.42.0" +version = "0.43.0" dependencies = [ "ethers", "sea-orm", @@ -1914,9 +1913,9 @@ dependencies = [ [[package]] name = "ethers" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba3fd516c15a9a587135229466dbbfc85796de55c5660afbbb1b1c78517d85c" +checksum = "1ad13497f6e0a24292fc7b408e30d22fe9dc262da1f40d7b542c3a44e7fc0476" dependencies = [ "ethers-addressbook", "ethers-contract", @@ -1930,9 +1929,9 @@ dependencies = [ [[package]] name = "ethers-addressbook" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0245617f11b8178fa50b52e433e2c34ac69f39116b62c8be2437decf2edf1986" +checksum = "c6e9e8acd0ed348403cc73a670c24daba3226c40b98dc1a41903766b3ab6240a" dependencies = [ "ethers-core", "once_cell", @@ -1942,9 +1941,9 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bb80fd2c22631a5eb8a02cbf373cc5fd86937fc966bb670b9a884580c8e71c" +checksum = "d79269278125006bb0552349c03593ffa9702112ca88bc7046cc669f148fb47c" dependencies = [ "const-hex", "ethers-contract-abigen", @@ -1961,9 +1960,9 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22c54db0d393393e732a5b20273e4f8ab89f0cce501c84e75fab9c126799a6e6" +checksum = "ce95a43c939b2e4e2f3191c5ad4a1f279780b8a39139c9905b43a7433531e2ab" dependencies = [ "Inflector", "const-hex", @@ -1978,16 +1977,16 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn 2.0.31", - "toml 0.7.6", + "syn 2.0.32", + "toml 0.7.8", "walkdir", ] [[package]] name = "ethers-contract-derive" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ee4f216184a1304b707ed258f4f70aa40bf7e1522ab8963d127a8d516eaa1a" +checksum = "8e9ce44906fc871b3ee8c69a695ca7ec7f70e50cb379c9b9cb5e532269e492f6" dependencies = [ "Inflector", "const-hex", @@ -1996,14 +1995,14 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] name = "ethers-core" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c29523f73c12753165781c6e5dc11c84d3e44c080a15f7c6cfbd70b514cb6f1" +checksum = "c0a17f0708692024db9956b31d7a20163607d2745953f5ae8125ab368ba280ad" dependencies = [ "arrayvec", "bytes", @@ -2022,7 +2021,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.31", + "syn 2.0.32", "tempfile", "thiserror", "tiny-keccak", @@ -2031,9 +2030,9 @@ dependencies = [ [[package]] name = "ethers-etherscan" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aab5af432b3fe5b7756b60df5c9ddeb85a13414575ad8a9acd707c24f0a77a5" +checksum = "0e53451ea4a8128fbce33966da71132cf9e1040dcfd2a2084fd7733ada7b2045" dependencies = [ "ethers-core", "reqwest", @@ -2046,9 +2045,9 @@ dependencies = [ [[package]] name = "ethers-middleware" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356151d5ded56d4918146366abc9dfc9df367cf0096492a7a5477b21b7693615" +checksum = "473f1ccd0c793871bbc248729fa8df7e6d2981d6226e4343e3bbaa9281074d5d" dependencies = [ "async-trait", "auto_impl", @@ -2073,13 +2072,13 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c84664b294e47fc2860d6db0db0246f79c4c724e552549631bb9505b834bee" +checksum = "6838fa110e57d572336178b7c79e94ff88ef976306852d8cb87d9e5b1fc7c0b5" dependencies = [ "async-trait", "auto_impl", - "base64 0.21.3", + "base64 0.21.4", "bytes", "const-hex", "enr", @@ -2111,9 +2110,9 @@ dependencies = [ [[package]] name = "ethers-signers" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170b299698702ef1f53d2275af7d6d97409cfa4f9398ee9ff518f6bc9102d0ad" +checksum = "5ea44bec930f12292866166f9ddbea6aa76304850e4d8dcd66dc492b43d00ff1" dependencies = [ "async-trait", "coins-bip32", @@ -2130,9 +2129,9 @@ dependencies = [ [[package]] name = "ethers-solc" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66559c8f774712df303c907d087275a52a2046b256791aaa566d5abc8ea66731" +checksum = "de34e484e7ae3cab99fbfd013d6c5dc7f9013676a4e0e414d8b12e1213e8b3ba" dependencies = [ "cfg-if", "const-hex", @@ -2454,7 +2453,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -2689,7 +2688,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "headers-core", "http", @@ -3052,7 +3051,7 @@ name = "influxdb2" version = "0.4.2" source = "git+https://github.com/llamanodes/influxdb2?rev=2d125128696a29d7e0b9abc052c928937e7c0579#2d125128696a29d7e0b9abc052c928937e7c0579" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "chrono", "csv", @@ -3103,7 +3102,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -3141,7 +3140,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.4", "widestring", "windows-sys", "winreg", @@ -3174,7 +3173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.11", + "rustix 0.38.13", "windows-sys", ] @@ -3226,7 +3225,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "pem", "ring", "serde", @@ -3374,9 +3373,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "listenfd" @@ -3495,7 +3494,7 @@ dependencies = [ [[package]] name = "migration" -version = "0.42.0" +version = "0.43.0" dependencies = [ "chrono", "sea-orm", @@ -3775,7 +3774,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -3841,7 +3840,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -3927,7 +3926,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -3956,9 +3955,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.6" +version = "3.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4a26fb934017f2e774ad9a16b40cca8faec288e0233496c6a47f266d49f024" +checksum = "f88eaac72ead1b9bd4ce747d577dbd2ad31fb0a56a9a20c611bf27bd1b97fbed" dependencies = [ "arrayvec", "bitvec", @@ -3970,9 +3969,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.6" +version = "3.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65cebc1b089c96df6203a76279a82b4bbf04fa23659c4093cac6fd245c25d1f" +checksum = "33bdcd446e9400b6ad9fc85b4aea68846c258b07c3efb994679ae82707b133f0" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -4120,7 +4119,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -4184,7 +4183,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -4222,7 +4221,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -4300,12 +4299,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8832c0f9be7e3cae60727e6256cfd2cd3c3e2b6cd5dad4190ecb2fd658c9030b" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -4783,7 +4782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", - "base64 0.21.3", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -5028,14 +5027,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.7", "windows-sys", ] @@ -5081,7 +5080,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] @@ -5238,7 +5237,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -5296,7 +5295,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.31", + "syn 2.0.32", "unicode-ident", ] @@ -5609,7 +5608,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -5625,9 +5624,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa", "ryu", @@ -5655,9 +5654,9 @@ dependencies = [ [[package]] name = "serde_prometheus" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0aecf898386263b0605829138f6f9c85c66ceefe9d6b28f57a846e03a3470f0" +checksum = "81df2fae45c63ec1ee4c4f4ec451a7715fa98d70577684fda8e7b31325878b09" dependencies = [ "heapless", "nom", @@ -5936,9 +5935,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys", @@ -5946,11 +5945,11 @@ dependencies = [ [[package]] name = "solang-parser" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c792fe9fae2a2f716846f214ca10d5a1e21133e0bf36cef34bcc4a852467b21" +checksum = "7cb9fa2fa2fa6837be8a2495486ff92e3ffe68a99b6eeba288e139efdd842457" dependencies = [ - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop", "lalrpop-util", "phf", @@ -6101,7 +6100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ "atoi", - "base64 0.21.3", + "base64 0.21.4", "bigdecimal", "bitflags 2.4.0", "byteorder", @@ -6148,7 +6147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" dependencies = [ "atoi", - "base64 0.21.3", + "base64 0.21.4", "bigdecimal", "bitflags 2.4.0", "byteorder", @@ -6272,7 +6271,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -6314,9 +6313,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -6350,7 +6349,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.11", + "rustix 0.38.13", "windows-sys", ] @@ -6408,7 +6407,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -6508,7 +6507,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "tracing", "windows-sys", @@ -6562,7 +6561,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -6660,9 +6659,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -6681,9 +6680,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -6700,7 +6699,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.3", + "base64 0.21.4", "bytes", "futures-core", "futures-util", @@ -6792,7 +6791,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] @@ -6957,9 +6956,9 @@ dependencies = [ [[package]] name = "ulid" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9d3475df4ff8a8f7804c0fc3394b44fdcfc4fb635717bf05fbb7c41c83a376" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", "serde", @@ -7041,7 +7040,7 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "log", "once_cell", "rustls 0.21.7", @@ -7184,7 +7183,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -7218,7 +7217,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7266,7 +7265,7 @@ dependencies = [ [[package]] name = "web3_proxy" -version = "1.42.18" +version = "1.43.0" dependencies = [ "anyhow", "arc-swap", @@ -7276,7 +7275,7 @@ dependencies = [ "axum", "axum-client-ip", "axum-macros", - "base64 0.21.3", + "base64 0.21.4", "check-if-email-exists", "chrono", "console-subscriber", @@ -7335,7 +7334,7 @@ dependencies = [ "tokio", "tokio-console", "tokio-stream", - "toml 0.7.6", + "toml 0.7.8", "tower", "tower-http", "tracing", @@ -7347,7 +7346,7 @@ dependencies = [ [[package]] name = "web3_proxy_cli" -version = "1.42.18" +version = "1.43.0" dependencies = [ "env_logger", "parking_lot", @@ -7584,7 +7583,7 @@ checksum = "56097d5b91d711293a42be9289403896b68654625021732067eac7a4ca388a1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.32", ] [[package]] diff --git a/payment-contracts/Cargo.toml b/payment-contracts/Cargo.toml index dfba868e..bd170e69 100644 --- a/payment-contracts/Cargo.toml +++ b/payment-contracts/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -ethers = { version = "2.0.9", default-features = false } +ethers = { version = "2.0.10", default-features = false } glob = "0.3.1" [dependencies] -ethers = { version = "2.0.9", default-features = false } +ethers = { version = "2.0.10", default-features = false } diff --git a/payment-contracts/src/contracts/ierc20.rs b/payment-contracts/src/contracts/ierc20.rs index 85653d13..811baad3 100644 --- a/payment-contracts/src/contracts/ierc20.rs +++ b/payment-contracts/src/contracts/ierc20.rs @@ -759,44 +759,54 @@ pub mod ierc20 { data: impl AsRef<[u8]>, ) -> ::core::result::Result { let data = data.as_ref(); - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::MintForTesting(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Allowance(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Approve(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::BalanceOf(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Decimals(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Name(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Symbol(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::TotalSupply(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Transfer(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::TransferFrom(decoded)); } Err(::ethers::core::abi::Error::InvalidData.into()) diff --git a/payment-contracts/src/contracts/payment_factory.rs b/payment-contracts/src/contracts/payment_factory.rs index bd0b1103..df711c8a 100644 --- a/payment-contracts/src/contracts/payment_factory.rs +++ b/payment-contracts/src/contracts/payment_factory.rs @@ -1748,136 +1748,124 @@ pub mod payment_factory { data: impl AsRef<[u8]>, ) -> ::core::result::Result { let data = data.as_ref(); - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::ProxyImplementation(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::AcceptTransferOwnership(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::AccountToPaymentAddress(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::CommitNewReceiver(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::CommitNewSweeperImplementation(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::CommitTransferOwnership(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::CreatePaymentAddress(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::CreatePaymentAddressWithAccount(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::FinalizeNewReceiver(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::FinalizeNewSweeperImplementation(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::FutureOwner(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::FutureReceiver(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::FutureSweeperImplementation(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::GetApprovedTokens(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::IsApprovedToken(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::NewReceiverTimestamp(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::NewSweeperTimestamp(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Owner(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::PaymentAddressToAccount(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::PaymentReceived(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Receiver(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::SetTokenApprovals(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::SweeperImplementation(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::TransferOwnershipTimestamp(decoded)); } Err(::ethers::core::abi::Error::InvalidData.into()) diff --git a/payment-contracts/src/contracts/payment_sweeper.rs b/payment-contracts/src/contracts/payment_sweeper.rs index da4931e8..e13e8ea8 100644 --- a/payment-contracts/src/contracts/payment_sweeper.rs +++ b/payment-contracts/src/contracts/payment_sweeper.rs @@ -344,24 +344,24 @@ pub mod payment_sweeper { data: impl AsRef<[u8]>, ) -> ::core::result::Result { let data = data.as_ref(); - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::Factory(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::RecoverTokenBalance(decoded)); } - if let Ok(decoded) - = ::decode(data) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::SendToken(decoded)); } - if let Ok(decoded) - = ::decode( - data, - ) { + if let Ok(decoded) = ::decode( + data, + ) { return Ok(Self::SweepTokenBalance(decoded)); } Err(::ethers::core::abi::Error::InvalidData.into()) diff --git a/redis-rate-limiter/Cargo.toml b/redis-rate-limiter/Cargo.toml index ab95ec8a..0dc6bd06 100644 --- a/redis-rate-limiter/Cargo.toml +++ b/redis-rate-limiter/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" [dependencies] anyhow = "1.0.75" -chrono = "0.4.29" +chrono = "0.4.30" deadpool-redis = { version = "0.12.0", features = ["rt_tokio_1", "serde"] } tokio = "1.32.0" diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index 27a005c0..b0d26559 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_proxy" -version = "1.42.18" +version = "1.43.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -40,17 +40,17 @@ argh = "0.1.12" async-stripe = { version = "0.22.2", default-features = false, features = ["billing", "checkout", "connect", "runtime-tokio-hyper-rustls", "webhook-events"] } async-trait = "0.1.73" axum = { version = "0.6.20", features = ["headers", "tracing", "ws"] } -axum-client-ip = "0.4.1" +axum-client-ip = "0.4.2" axum-macros = "0.3.8" -base64 = "0.21.3" +base64 = "0.21.4" check-if-email-exists = "0.9.0" -chrono = { version = "0.4.29" } +chrono = { version = "0.4.30" } console-subscriber = { version = "0.1.10", features = ["env-filter", "parking_lot"], optional = true } counter = "0.5.7" derivative = "2.2.0" derive_more = { version = "0.99.17", features = ["nightly"] } ethbloom = { version = "0.13.0" } -ethers = { version = "2.0.9", default-features = false, features = ["rustls", "ws"] } +ethers = { version = "2.0.10", default-features = false, features = ["rustls", "ws"] } fdlimit = "0.2.1" fstrings = "0.2" futures = { version = "0.3.28" } @@ -82,19 +82,19 @@ sentry = { version = "0.31.6", default-features = false, features = ["anyhow", " sentry-tracing = "0.31.6" serde = { version = "1.0.188" } serde-inline-default = "0.1.1" -serde_json = { version = "1.0.105", default-features = false, features = ["raw_value"] } -serde_prometheus = "0.2.3" +serde_json = { version = "1.0.106", default-features = false, features = ["raw_value"] } +serde_prometheus = "0.2.4" strum = { version = "0.25.0", features = ["derive"] } time_01 = { package = "time", version = "0.1.45" } time_03 = { package = "time", version = "0.3" } tokio = { version = "1.32.0", features = ["full", "tracing"] } tokio-console = { version = "0.1.9", optional = true } tokio-stream = { version = "0.1.14", features = ["sync"] } -toml = "0.7.6" +toml = "0.7.8" tower = { version = "0.4.13", features = ["timeout", "tracing"] } tower-http = { version = "0.4.4", features = ["cors", "normalize-path", "sensitive-headers", "trace"] } tracing = "0.1" -ulid = { version = "1.0.1", features = ["rand", "uuid", "serde"] } +ulid = { version = "1.1.0", features = ["rand", "uuid", "serde"] } url = { version = "2.4.1" } uuid = { version = "1.4.1", default-features = false, features = ["fast-rng", "v4", "zerocopy"] } diff --git a/web3_proxy_cli/Cargo.toml b/web3_proxy_cli/Cargo.toml index c700ddab..21b2f1f6 100644 --- a/web3_proxy_cli/Cargo.toml +++ b/web3_proxy_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "web3_proxy_cli" -version = "1.42.18" +version = "1.43.0" edition = "2021" default-run = "web3_proxy_cli" @@ -21,7 +21,7 @@ web3_proxy = { path = "../web3_proxy" } parking_lot = { version = "0.12.1", features = ["arc_lock", "nightly"] } prettytable = "0.10.0" serde = { version = "1.0.188" } -serde_json = { version = "1.0.105", default-features = false, features = ["raw_value"] } +serde_json = { version = "1.0.106", default-features = false, features = ["raw_value"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] }