diff --git a/rust/main/Cargo.lock b/rust/main/Cargo.lock index c14e211f03..4fae483a3c 100644 --- a/rust/main/Cargo.lock +++ b/rust/main/Cargo.lock @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "gimli", ] @@ -179,6 +179,55 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys 0.59.0", +] + [[package]] name = "anyhow" version = "1.0.86" @@ -389,7 +438,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] @@ -399,7 +448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "261803dcc39ba9e72760ba6e16d0199b1eef9fc44e81bffabbebb9f5aea3906c" dependencies = [ "async-mutex", - "event-listener", + "event-listener 2.5.3", ] [[package]] @@ -448,9 +497,9 @@ dependencies = [ [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] @@ -555,15 +604,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide 0.4.4", "object", "rustc-demangle", "serde", @@ -577,19 +626,6 @@ dependencies = [ "derive-new", ] -[[package]] -name = "bae" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b8de67cc41132507eeece2584804efcb15f85ba516e34c944b7667f480397a" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 1.0.109", -] - [[package]] name = "base16ct" version = "0.1.1" @@ -666,17 +702,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" -[[package]] -name = "bigdecimal" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" -dependencies = [ - "num-bigint 0.4.6", - "num-integer", - "num-traits", -] - [[package]] name = "bigdecimal" version = "0.4.5" @@ -688,6 +713,7 @@ dependencies = [ "num-bigint 0.4.6", "num-integer", "num-traits", + "serde", ] [[package]] @@ -1093,12 +1119,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.94" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -1181,8 +1208,7 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", - "clap_derive", - "clap_lex", + "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", "strsim 0.10.0", @@ -1190,17 +1216,38 @@ dependencies = [ "textwrap 0.16.1", ] +[[package]] +name = "clap" +version = "4.5.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.7.3", + "strsim 0.11.1", +] + [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck 0.4.1", - "proc-macro-error", + "heck 0.5.0", "proc-macro2 1.0.86", "quote 1.0.37", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -1212,6 +1259,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" + [[package]] name = "cloudabi" version = "0.0.3" @@ -1363,6 +1416,12 @@ dependencies = [ "tracing-error", ] +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + [[package]] name = "combine" version = "3.8.1" @@ -1376,6 +1435,15 @@ dependencies = [ "unreachable", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "config" version = "0.13.4" @@ -1734,6 +1802,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -2192,6 +2275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid 0.9.6", + "pem-rfc7468", "zeroize", ] @@ -2376,15 +2460,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - [[package]] name = "dirs-next" version = "2.0.0" @@ -2395,17 +2470,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -2634,6 +2698,9 @@ name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -2792,6 +2859,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "eth-keystore" version = "0.5.0" @@ -3142,6 +3220,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "eventsource-client" version = "0.12.2" @@ -3277,6 +3366,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -3797,13 +3897,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot 0.12.3", ] [[package]] @@ -3937,9 +4037,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" [[package]] name = "glob" @@ -4056,9 +4156,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -4123,23 +4223,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -4413,6 +4501,7 @@ dependencies = [ "backtrace", "backtrace-oneline", "bs58 0.5.1", + "cc", "color-eyre", "config", "console-subscriber", @@ -4468,7 +4557,7 @@ dependencies = [ "async-rwlock", "async-trait", "auto_impl 1.2.0", - "bigdecimal 0.4.5", + "bigdecimal", "borsh 0.9.3", "bs58 0.5.1", "bytes", @@ -4957,6 +5046,17 @@ dependencies = [ "regex", ] +[[package]] +name = "inherent" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + [[package]] name = "injective-protobuf" version = "0.2.2" @@ -5022,6 +5122,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -5048,9 +5154,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -5131,6 +5237,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin 0.9.8", +] [[package]] name = "lazycell" @@ -5244,6 +5353,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "libz-sys" version = "1.1.16" @@ -5424,11 +5544,12 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", + "autocfg", ] [[package]] @@ -5643,6 +5764,23 @@ dependencies = [ "serde", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-complex" version = "0.2.4" @@ -5742,6 +5880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -5834,9 +5973,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ "memchr", ] @@ -5937,6 +6076,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-multimap" version = "0.4.3" @@ -5967,25 +6115,27 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.15.6" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", + "static_assertions 1.1.0", ] [[package]] name = "ouroboros_macro" -version = "0.15.6" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ - "Inflector", - "proc-macro-error", + "heck 0.4.1", + "itertools 0.12.1", "proc-macro2 1.0.86", + "proc-macro2-diagnostics", "quote 1.0.37", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -6038,6 +6188,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.11.2" @@ -6182,6 +6338,15 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -6284,6 +6449,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der 0.7.9", + "pkcs8 0.10.2", + "spki 0.7.3", +] + [[package]] name = "pkcs8" version = "0.8.0" @@ -6485,6 +6661,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + [[package]] name = "proc-macro2" version = "0.4.30" @@ -6503,6 +6701,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", + "version_check", + "yansi", +] + [[package]] name = "prometheus" version = "0.13.4" @@ -7225,6 +7436,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "rsa" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" +dependencies = [ + "const-oid 0.9.6", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8 0.10.2", + "rand_core 0.6.4", + "signature 2.2.0", + "spki 0.7.3", + "subtle", + "zeroize", +] + [[package]] name = "run-locally" version = "0.1.0" @@ -7723,15 +7954,28 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "sea-bae" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25" +dependencies = [ + "heck 0.4.1", + "proc-macro-error2", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + [[package]] name = "sea-orm" -version = "0.11.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fade86e8d41fd1a4721f84cb834f4ca2783f973cc30e6212b7fafc134f169214" +checksum = "d5680a8b686985116607ef5f5af2b1f9e1cc2c228330e93101816a0baa279afa" dependencies = [ "async-stream", "async-trait", - "bigdecimal 0.3.1", + "bigdecimal", "chrono", "futures", "log", @@ -7740,10 +7984,10 @@ dependencies = [ "sea-orm-macros", "sea-query", "sea-query-binder", - "sea-strum", "serde", "serde_json", "sqlx", + "strum 0.26.3", "thiserror", "time", "tracing", @@ -7753,13 +7997,14 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "0.11.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbf34a2caf70c2e3be9bb1e674e9540f6dfd7c8f40f6f05daf3b9740e476005" +checksum = "70a157f42d291ccbd6e913b9d9b12dbe2ccbcf0472efc60c8715dd1254083aec" dependencies = [ "chrono", - "clap 3.2.25", + "clap 4.5.21", "dotenvy", + "glob", "regex", "sea-schema", "tracing", @@ -7769,25 +8014,26 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.11.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28936f26d62234ff0be16f80115dbdeb3237fe9c25cf18fbcd1e3b3592360f20" +checksum = "3a239e3bb1b566ad4ec2654d0d193d6ceddfd733487edc9c21a64d214c773910" dependencies = [ - "bae", - "heck 0.3.3", + "heck 0.4.1", "proc-macro2 1.0.86", "quote 1.0.37", - "syn 1.0.109", + "sea-bae", + "syn 2.0.77", + "unicode-ident", ] [[package]] name = "sea-orm-migration" -version = "0.11.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278d3adfd0832b6ffc17d3cfbc574d3695a5c1b38814e0bc8ac238d33f3d87cf" +checksum = "63ba07e9f2479cc671758fcb1edee42ff2e32c34b3e67ab41d0af1e41f73c74e" dependencies = [ "async-trait", - "clap 3.2.25", + "clap 4.5.21", "dotenvy", "futures", "sea-orm", @@ -7799,12 +8045,14 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.28.5" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbab99b8cd878ab7786157b7eb8df96333a6807cc6e45e8888c85b51534b401a" +checksum = "ff504d13b5e4b52fffcf2fb203d0352a5722fa5151696db768933e41e1e591bb" dependencies = [ - "bigdecimal 0.3.1", + "bigdecimal", "chrono", + "inherent", + "ordered-float", "rust_decimal", "sea-query-derive", "serde_json", @@ -7814,11 +8062,11 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.3.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cea85029985b40dfbf18318d85fe985c04db7c1b4e5e8e0a0a0cdff5f1e30f9" +checksum = "b0019f47430f7995af63deda77e238c17323359af241233ec768aba1faea7608" dependencies = [ - "bigdecimal 0.3.1", + "bigdecimal", "chrono", "rust_decimal", "sea-query", @@ -7830,22 +8078,23 @@ dependencies = [ [[package]] name = "sea-query-derive" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f62030c60f3a691f5fe251713b4e220b306e50a71e1d6f9cce1f24bb781978" +checksum = "9834af2c4bd8c5162f00c89f1701fb6886119a88062cf76fe842ea9e232b9839" dependencies = [ + "darling 0.20.10", "heck 0.4.1", "proc-macro2 1.0.86", "quote 1.0.37", - "syn 1.0.109", + "syn 2.0.77", "thiserror", ] [[package]] name = "sea-schema" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb2940bb5a10bc6cd05b450ce6cd3993e27fddd7eface2becb97fc5af3a040e" +checksum = "aab1592d17860a9a8584d9b549aebcd06f7bdc3ff615f71752486ba0b05b1e6e" dependencies = [ "futures", "sea-query", @@ -7854,36 +8103,14 @@ dependencies = [ [[package]] name = "sea-schema-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56821b7076f5096b8f726e2791ad255a99c82498e08ec477a65a96c461ff1927" -dependencies = [ - "heck 0.3.3", - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 1.0.109", -] - -[[package]] -name = "sea-strum" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391d06a6007842cfe79ac6f7f53911b76dfd69fc9a6769f1cf6569d12ce20e1b" -dependencies = [ - "sea-strum_macros", -] - -[[package]] -name = "sea-strum_macros" -version = "0.23.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b4397b825df6ccf1e98bcdabef3bbcfc47ff5853983467850eeab878384f21" +checksum = "debdc8729c37fdbf88472f97fd470393089f997a909e535ff67c544d18cfccf0" dependencies = [ - "heck 0.3.3", + "heck 0.4.1", "proc-macro2 1.0.86", "quote 1.0.37", - "rustversion", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -8331,6 +8558,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -9066,98 +9296,216 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ - "ahash 0.7.8", "atoi", - "base64 0.13.1", - "bigdecimal 0.3.1", - "bitflags 1.3.2", + "bigdecimal", "byteorder", "bytes", "chrono", + "crc", "crossbeam-queue", - "dirs", - "dotenvy", "either", - "event-listener", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", + "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex 0.4.3", - "hkdf", - "hmac 0.12.1", - "indexmap 1.9.3", - "itoa", - "libc", + "indexmap 2.5.0", "log", - "md-5 0.10.6", "memchr", - "num-bigint 0.4.6", + "native-tls", "once_cell", "paste", "percent-encoding", - "rand 0.8.5", "rust_decimal", "serde", "serde_json", - "sha1", "sha2 0.10.8", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror", "time", + "tokio", "tokio-stream", + "tracing", "url", "uuid 1.10.0", - "whoami", ] [[package]] name = "sqlx-macros" -version = "0.6.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.77", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", + "hex 0.4.3", "once_cell", "proc-macro2 1.0.86", "quote 1.0.37", + "serde", "serde_json", + "sha2 0.10.8", "sqlx-core", - "sqlx-rt", - "syn 1.0.109", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.77", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.3" +name = "sqlx-mysql" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ - "native-tls", + "atoi", + "base64 0.22.1", + "bigdecimal", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array 0.14.7", + "hex 0.4.3", + "hkdf", + "hmac 0.12.1", + "itoa", + "log", + "md-5 0.10.6", + "memchr", "once_cell", - "tokio", - "tokio-native-tls", + "percent-encoding", + "rand 0.8.5", + "rsa", + "rust_decimal", + "serde", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "uuid 1.10.0", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" +dependencies = [ + "atoi", + "base64 0.22.1", + "bigdecimal", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex 0.4.3", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5 0.10.6", + "memchr", + "num-bigint 0.4.6", + "once_cell", + "rand 0.8.5", + "rust_decimal", + "serde", + "serde_json", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time", + "tracing", + "uuid 1.10.0", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "time", + "tracing", + "url", + "uuid 1.10.0", ] [[package]] @@ -10350,6 +10698,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "0.8.2" @@ -10678,7 +11032,6 @@ checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ "redox_syscall 0.5.3", "wasite", - "web-sys", ] [[package]] @@ -10990,6 +11343,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yasna" version = "0.5.2" diff --git a/rust/main/Cargo.toml b/rust/main/Cargo.toml index 55cfc1573a..05f390f006 100644 --- a/rust/main/Cargo.toml +++ b/rust/main/Cargo.toml @@ -34,6 +34,7 @@ async-rwlock = "1.3" auto_impl = "1.0" axum = "0.6.1" backtrace = "0.3" +cc = "1.2.2" base64 = "0.21.2" bigdecimal = "0.4.2" bincode = "1.3" @@ -80,7 +81,7 @@ hyperlane-cosmwasm-interface = "=0.0.6-rc6" injective-protobuf = "0.2.2" injective-std = "=0.1.5" itertools = "*" -jobserver = "=0.1.26" +jobserver = "0.1.32" jsonrpc-core = "18.0" k256 = { version = "0.13.4", features = ["arithmetic", "std", "ecdsa"] } lazy_static = "1.5.0" @@ -106,14 +107,14 @@ reqwest = "0.11" ripemd = "0.1.3" rlp = "=0.5.2" rocksdb = "0.21.0" -sea-orm = { version = "0.11.1", features = [ +sea-orm = { version = "1.1.1", features = [ "sqlx-postgres", "runtime-tokio-native-tls", "with-bigdecimal", "with-time", "macros", ] } -sea-orm-migration = { version = "0.11.1", features = [ +sea-orm-migration = { version = "1.1.1", features = [ "sqlx-postgres", "runtime-tokio-native-tls", ] } diff --git a/rust/main/agents/scraper/migration/bin/generate_entities.rs b/rust/main/agents/scraper/migration/bin/generate_entities.rs index 9481ece179..b8276e659d 100644 --- a/rust/main/agents/scraper/migration/bin/generate_entities.rs +++ b/rust/main/agents/scraper/migration/bin/generate_entities.rs @@ -7,7 +7,7 @@ mod common; const RAW_DB_PATH: &str = "./agents/scraper/src/db/generated"; const DOCKER_NAME: &str = "scraper-entity-generator"; -const CLI_VERSION: &str = "0.12.3"; +const CLI_VERSION: &str = "1.1.1"; struct PostgresDockerContainer; diff --git a/rust/main/agents/scraper/migration/bin/init_db.rs b/rust/main/agents/scraper/migration/bin/init_db.rs index 661080336f..2d51a7c83f 100644 --- a/rust/main/agents/scraper/migration/bin/init_db.rs +++ b/rust/main/agents/scraper/migration/bin/init_db.rs @@ -4,7 +4,7 @@ use common::*; mod common; -#[tokio::main] +#[tokio::main(flavor = "current_thread")] async fn main() -> Result<(), DbErr> { let db = init().await?; diff --git a/rust/main/agents/scraper/migration/bin/recreate_db.rs b/rust/main/agents/scraper/migration/bin/recreate_db.rs index ed6b0ac48f..1bcbed04dd 100644 --- a/rust/main/agents/scraper/migration/bin/recreate_db.rs +++ b/rust/main/agents/scraper/migration/bin/recreate_db.rs @@ -3,7 +3,7 @@ use common::*; mod common; -#[tokio::main] +#[tokio::main(flavor = "current_thread")] async fn main() -> Result<(), DbErr> { let db = init().await?; diff --git a/rust/main/agents/scraper/migration/src/l20230309_types.rs b/rust/main/agents/scraper/migration/src/l20230309_types.rs index 06c22bf913..39cf811185 100644 --- a/rust/main/agents/scraper/migration/src/l20230309_types.rs +++ b/rust/main/agents/scraper/migration/src/l20230309_types.rs @@ -2,10 +2,10 @@ use sea_orm_migration::prelude::*; /// Hashes are to be stored as binary. #[allow(non_upper_case_globals)] -pub const Hash: ColumnType = ColumnType::Binary(BlobSize::Tiny); +pub const Hash: ColumnType = ColumnType::Blob; /// Addresses are to be stored as binary. #[allow(non_upper_case_globals)] -pub const Address: ColumnType = ColumnType::Binary(BlobSize::Tiny); +pub const Address: ColumnType = ColumnType::Blob; /// 256-bit integer as base-10 digits: ceil(log_10(2^256)) const SIGNIFICANT_DIGITS_IN_256_BIT_INTEGER: u32 = 78; diff --git a/rust/main/agents/scraper/migration/src/m20230309_000003_create_table_transaction.rs b/rust/main/agents/scraper/migration/src/m20230309_000003_create_table_transaction.rs index 283968c6d6..b797c31118 100644 --- a/rust/main/agents/scraper/migration/src/m20230309_000003_create_table_transaction.rs +++ b/rust/main/agents/scraper/migration/src/m20230309_000003_create_table_transaction.rs @@ -53,11 +53,8 @@ impl MigrationTrait for Migration { .col(ColumnDef::new_with_type(Transaction::GasUsed, Wei).not_null()) .col(ColumnDef::new_with_type(Transaction::CumulativeGasUsed, Wei).not_null()) .col( - ColumnDef::new_with_type( - Transaction::RawInputData, - ColumnType::Binary(BlobSize::Blob(None)), - ) - .borrow_mut(), + ColumnDef::new_with_type(Transaction::RawInputData, ColumnType::Blob) + .borrow_mut(), ) .foreign_key( ForeignKey::create() diff --git a/rust/main/agents/scraper/src/db/generated/block.rs b/rust/main/agents/scraper/src/db/generated/block.rs index 098cb839c2..772cf64569 100644 --- a/rust/main/agents/scraper/src/db/generated/block.rs +++ b/rust/main/agents/scraper/src/db/generated/block.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; @@ -56,7 +56,7 @@ impl ColumnTrait for Column { Self::Id => ColumnType::BigInteger.def(), Self::TimeCreated => ColumnType::DateTime.def(), Self::Domain => ColumnType::Integer.def(), - Self::Hash => ColumnType::Binary(BlobSize::Blob(None)).def().unique(), + Self::Hash => ColumnType::VarBinary(StringLen::None).def().unique(), Self::Height => ColumnType::BigInteger.def(), Self::Timestamp => ColumnType::DateTime.def(), } diff --git a/rust/main/agents/scraper/src/db/generated/cursor.rs b/rust/main/agents/scraper/src/db/generated/cursor.rs index f04b47428c..0db99f422f 100644 --- a/rust/main/agents/scraper/src/db/generated/cursor.rs +++ b/rust/main/agents/scraper/src/db/generated/cursor.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; diff --git a/rust/main/agents/scraper/src/db/generated/delivered_message.rs b/rust/main/agents/scraper/src/db/generated/delivered_message.rs index a3da2fe6de..0de9bde96a 100644 --- a/rust/main/agents/scraper/src/db/generated/delivered_message.rs +++ b/rust/main/agents/scraper/src/db/generated/delivered_message.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; @@ -57,9 +57,9 @@ impl ColumnTrait for Column { match self { Self::Id => ColumnType::BigInteger.def(), Self::TimeCreated => ColumnType::DateTime.def(), - Self::MsgId => ColumnType::Binary(BlobSize::Blob(None)).def().unique(), + Self::MsgId => ColumnType::VarBinary(StringLen::None).def().unique(), Self::Domain => ColumnType::Integer.def(), - Self::DestinationMailbox => ColumnType::Binary(BlobSize::Blob(None)).def(), + Self::DestinationMailbox => ColumnType::VarBinary(StringLen::None).def(), Self::DestinationTxId => ColumnType::BigInteger.def(), Self::Sequence => ColumnType::BigInteger.def().null(), } diff --git a/rust/main/agents/scraper/src/db/generated/domain.rs b/rust/main/agents/scraper/src/db/generated/domain.rs index cf1aaa2a7c..3015d99750 100644 --- a/rust/main/agents/scraper/src/db/generated/domain.rs +++ b/rust/main/agents/scraper/src/db/generated/domain.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; @@ -52,7 +52,6 @@ pub enum Relation { Block, Cursor, DeliveredMessage, - GasPayment, Message, } @@ -78,7 +77,6 @@ impl RelationTrait for Relation { Self::Block => Entity::has_many(super::block::Entity).into(), Self::Cursor => Entity::has_many(super::cursor::Entity).into(), Self::DeliveredMessage => Entity::has_many(super::delivered_message::Entity).into(), - Self::GasPayment => Entity::has_many(super::gas_payment::Entity).into(), Self::Message => Entity::has_many(super::message::Entity).into(), } } @@ -102,12 +100,6 @@ impl Related for Entity { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::GasPayment.def() - } -} - impl Related for Entity { fn to() -> RelationDef { Relation::Message.def() diff --git a/rust/main/agents/scraper/src/db/generated/gas_payment.rs b/rust/main/agents/scraper/src/db/generated/gas_payment.rs index 5df74b084a..859bbb2df2 100644 --- a/rust/main/agents/scraper/src/db/generated/gas_payment.rs +++ b/rust/main/agents/scraper/src/db/generated/gas_payment.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; @@ -11,6 +11,8 @@ impl EntityName for Entity { } } +/// @NOTE: Replaced all occurrences of `Decimal` with `BigDecimal` +/// due to the following issue: https://github.com/SeaQL/sea-orm/issues/1530 #[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel, Eq)] pub struct Model { pub id: i64, @@ -57,8 +59,8 @@ impl PrimaryKeyTrait for PrimaryKey { #[derive(Copy, Clone, Debug, EnumIter)] pub enum Relation { - Domain, - Origin, + Domain2, + Domain1, Transaction, } @@ -69,16 +71,14 @@ impl ColumnTrait for Column { Self::Id => ColumnType::BigInteger.def(), Self::TimeCreated => ColumnType::DateTime.def(), Self::Domain => ColumnType::Integer.def(), - Self::MsgId => ColumnType::Binary(BlobSize::Blob(None)).def(), + Self::MsgId => ColumnType::VarBinary(StringLen::None).def(), Self::Payment => ColumnType::Decimal(Some((78u32, 0u32))).def(), Self::GasAmount => ColumnType::Decimal(Some((78u32, 0u32))).def(), Self::TxId => ColumnType::BigInteger.def(), Self::LogIndex => ColumnType::BigInteger.def(), Self::Origin => ColumnType::Integer.def(), Self::Destination => ColumnType::Integer.def(), - Self::InterchainGasPaymaster => { - ColumnType::Binary(sea_orm::sea_query::BlobSize::Blob(None)).def() - } + Self::InterchainGasPaymaster => ColumnType::VarBinary(StringLen::None).def(), Self::Sequence => ColumnType::BigInteger.def().null(), } } @@ -87,11 +87,11 @@ impl ColumnTrait for Column { impl RelationTrait for Relation { fn def(&self) -> RelationDef { match self { - Self::Domain => Entity::belongs_to(super::domain::Entity) + Self::Domain2 => Entity::belongs_to(super::domain::Entity) .from(Column::Domain) .to(super::domain::Column::Id) .into(), - Self::Origin => Entity::belongs_to(super::domain::Entity) + Self::Domain1 => Entity::belongs_to(super::domain::Entity) .from(Column::Origin) .to(super::domain::Column::Id) .into(), @@ -103,12 +103,6 @@ impl RelationTrait for Relation { } } -impl Related for Entity { - fn to() -> RelationDef { - Relation::Domain.def() - } -} - impl Related for Entity { fn to() -> RelationDef { Relation::Transaction.def() diff --git a/rust/main/agents/scraper/src/db/generated/message.rs b/rust/main/agents/scraper/src/db/generated/message.rs index e06ea5de15..dbb11661fb 100644 --- a/rust/main/agents/scraper/src/db/generated/message.rs +++ b/rust/main/agents/scraper/src/db/generated/message.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; @@ -65,14 +65,14 @@ impl ColumnTrait for Column { match self { Self::Id => ColumnType::BigInteger.def(), Self::TimeCreated => ColumnType::DateTime.def(), - Self::MsgId => ColumnType::Binary(BlobSize::Blob(None)).def(), + Self::MsgId => ColumnType::VarBinary(StringLen::None).def(), Self::Origin => ColumnType::Integer.def(), Self::Destination => ColumnType::Integer.def(), Self::Nonce => ColumnType::Integer.def(), - Self::Sender => ColumnType::Binary(BlobSize::Blob(None)).def(), - Self::Recipient => ColumnType::Binary(BlobSize::Blob(None)).def(), - Self::MsgBody => ColumnType::Binary(BlobSize::Blob(None)).def().null(), - Self::OriginMailbox => ColumnType::Binary(BlobSize::Blob(None)).def(), + Self::Sender => ColumnType::VarBinary(StringLen::None).def(), + Self::Recipient => ColumnType::VarBinary(StringLen::None).def(), + Self::MsgBody => ColumnType::VarBinary(StringLen::None).def().null(), + Self::OriginMailbox => ColumnType::VarBinary(StringLen::None).def(), Self::OriginTxId => ColumnType::BigInteger.def(), } } diff --git a/rust/main/agents/scraper/src/db/generated/mod.rs b/rust/main/agents/scraper/src/db/generated/mod.rs index 929adca9d6..8617f9e8c5 100644 --- a/rust/main/agents/scraper/src/db/generated/mod.rs +++ b/rust/main/agents/scraper/src/db/generated/mod.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 pub mod prelude; diff --git a/rust/main/agents/scraper/src/db/generated/prelude.rs b/rust/main/agents/scraper/src/db/generated/prelude.rs index 1280bf70da..db1f04aa1f 100644 --- a/rust/main/agents/scraper/src/db/generated/prelude.rs +++ b/rust/main/agents/scraper/src/db/generated/prelude.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 #[allow(unused_imports)] pub use super::{ block::Entity as Block, cursor::Entity as Cursor, diff --git a/rust/main/agents/scraper/src/db/generated/transaction.rs b/rust/main/agents/scraper/src/db/generated/transaction.rs index 4f1139c8c9..fd5ad5e529 100644 --- a/rust/main/agents/scraper/src/db/generated/transaction.rs +++ b/rust/main/agents/scraper/src/db/generated/transaction.rs @@ -1,4 +1,4 @@ -//! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.3 +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.1 use sea_orm::entity::prelude::*; @@ -11,6 +11,8 @@ impl EntityName for Entity { } } +/// @NOTE: Replaced all occurrences of `Decimal` with `BigDecimal` +/// due to the following issue: https://github.com/SeaQL/sea-orm/issues/1530 #[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel, Eq)] pub struct Model { pub id: i64, @@ -75,7 +77,7 @@ impl ColumnTrait for Column { match self { Self::Id => ColumnType::BigInteger.def(), Self::TimeCreated => ColumnType::DateTime.def(), - Self::Hash => ColumnType::Binary(BlobSize::Blob(None)).def().unique(), + Self::Hash => ColumnType::VarBinary(StringLen::None).def().unique(), Self::BlockId => ColumnType::BigInteger.def(), Self::GasLimit => ColumnType::Decimal(Some((78u32, 0u32))).def(), Self::MaxPriorityFeePerGas => ColumnType::Decimal(Some((78u32, 0u32))).def().null(), @@ -83,11 +85,11 @@ impl ColumnTrait for Column { Self::GasPrice => ColumnType::Decimal(Some((78u32, 0u32))).def().null(), Self::EffectiveGasPrice => ColumnType::Decimal(Some((78u32, 0u32))).def().null(), Self::Nonce => ColumnType::BigInteger.def(), - Self::Sender => ColumnType::Binary(BlobSize::Blob(None)).def(), - Self::Recipient => ColumnType::Binary(BlobSize::Blob(None)).def().null(), + Self::Sender => ColumnType::VarBinary(StringLen::None).def(), + Self::Recipient => ColumnType::VarBinary(StringLen::None).def().null(), Self::GasUsed => ColumnType::Decimal(Some((78u32, 0u32))).def(), Self::CumulativeGasUsed => ColumnType::Decimal(Some((78u32, 0u32))).def(), - Self::RawInputData => ColumnType::Binary(BlobSize::Blob(None)).def().null(), + Self::RawInputData => ColumnType::VarBinary(StringLen::None).def().null(), } } } diff --git a/rust/main/hyperlane-base/Cargo.toml b/rust/main/hyperlane-base/Cargo.toml index ef25d99405..cbffa8a05f 100644 --- a/rust/main/hyperlane-base/Cargo.toml +++ b/rust/main/hyperlane-base/Cargo.toml @@ -44,6 +44,7 @@ warp.workspace = true ya-gcp.workspace = true backtrace = { workspace = true, optional = true } +cc = { workspace = true, optional = true } backtrace-oneline = { path = "../utils/backtrace-oneline", optional = true } ethers-prometheus = { path = "../ethers-prometheus", features = ["serde"] } @@ -73,6 +74,6 @@ vergen = { version = "8.3.2", features = ["build", "git", "gitcl"] } [features] default = ["oneline-errors", "color-eyre"] -oneline-eyre = ["backtrace-oneline", "backtrace"] +oneline-eyre = ["backtrace-oneline", "backtrace", "cc"] oneline-errors = ["oneline-eyre"] test-utils = ["dep:tempfile"] diff --git a/rust/main/rust-toolchain b/rust/main/rust-toolchain index 7f466bd2df..bbf217f21b 100644 --- a/rust/main/rust-toolchain +++ b/rust/main/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "1.80.1" +channel = "1.81.0" profile = "default" diff --git a/rust/sealevel/Cargo.toml b/rust/sealevel/Cargo.toml index 145b9bfcc2..2beb4bd3d5 100644 --- a/rust/sealevel/Cargo.toml +++ b/rust/sealevel/Cargo.toml @@ -48,7 +48,6 @@ borsh = "0.9" bs58 = "0.5.0" bytes = "1" clap = "4" -color-eyre = "0.6" config = "0.13.3" console-subscriber = "0.2.0" convert_case = "0.6" @@ -94,17 +93,6 @@ reqwest = "0.11" ripemd = "0.1.3" rlp = "=0.5.2" rocksdb = "0.21.0" -sea-orm = { version = "0.11.1", features = [ - "sqlx-postgres", - "runtime-tokio-native-tls", - "with-bigdecimal", - "with-time", - "macros", -] } -sea-orm-migration = { version = "0.11.1", features = [ - "sqlx-postgres", - "runtime-tokio-native-tls", -] } semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_bytes = "0.11"