diff --git a/Cargo.lock b/Cargo.lock index 146608d..4da35c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -495,7 +495,7 @@ dependencies = [ "clap_lex", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] @@ -506,7 +506,7 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -847,6 +847,41 @@ dependencies = [ "subtle", ] +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.48", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.48", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -907,12 +942,24 @@ version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" dependencies = [ - "bigdecimal 0.1.2", - "bitflags 1.3.1", + "byteorder", + "diesel_derives 1.4.1", +] + +[[package]] +name = "diesel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb300b92bb5f1a44ce412aeb36a7387931bf7a5238b4570bc1d0b9c8a78fde4e" +dependencies = [ + "bigdecimal 0.3.1", + "bitflags 2.4.0", "byteorder", "chrono", - "diesel_derives", - "num-bigint 0.2.6", + "diesel_derives 2.3.2", + "downcast-rs", + "itoa", + "num-bigint 0.4.4", "num-integer", "num-traits", "pq-sys", @@ -926,7 +973,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8910921b014e2af16298f006de12aa08af894b71f0f49a486ab6d74b17bbed" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.107", @@ -937,7 +984,7 @@ name = "diesel-dynamic-schema" version = "1.0.0" source = "git+https://github.com/diesel-rs/diesel-dynamic-schema?rev=a8ec4fb1#a8ec4fb11de6242488ba3698d74406f4b5073dc4" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -951,6 +998,19 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "diesel_derives" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dc7010a1e9f98f10c746da308c3da09416a87498731cc18cc666f55b5fc53d" +dependencies = [ + "diesel_table_macro_syntax", + "dsl_auto_type", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "diesel_migrations" version = "1.4.0" @@ -961,6 +1021,15 @@ dependencies = [ "migrations_macros", ] +[[package]] +name = "diesel_table_macro_syntax" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c" +dependencies = [ + "syn 2.0.48", +] + [[package]] name = "diff" version = "0.1.12" @@ -1043,6 +1112,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "downcast-rs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc" + +[[package]] +name = "dsl_auto_type" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd122633e4bef06db27737f21d3738fb89c8f6d5360d6d9d7635dda142a7757e" +dependencies = [ + "darling", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "either" version = "1.9.0" @@ -1457,8 +1546,8 @@ dependencies = [ "cid", "clap", "defer", - "diesel", - "diesel_derives", + "diesel 2.3.1", + "diesel_derives 1.4.1", "envconfig", "ethabi", "futures 0.1.31", @@ -1516,7 +1605,7 @@ name = "graph-chain-arweave" version = "0.34.0" dependencies = [ "base64-url", - "diesel", + "diesel 2.3.1", "graph", "graph-runtime-derive", "graph-runtime-wasm", @@ -1532,7 +1621,7 @@ name = "graph-chain-common" version = "0.34.0" dependencies = [ "anyhow", - "heck", + "heck 0.4.1", "protobuf 3.3.0", "protobuf-parse", ] @@ -1585,7 +1674,7 @@ version = "0.34.0" dependencies = [ "anyhow", "base64 0.20.0", - "diesel", + "diesel 2.3.1", "graph", "graph-runtime-derive", "graph-runtime-wasm", @@ -1677,7 +1766,7 @@ name = "graph-node" version = "0.34.0" dependencies = [ "clap", - "diesel", + "diesel 2.3.1", "env_logger", "futures 0.3.16", "git-testament", @@ -1711,7 +1800,7 @@ dependencies = [ name = "graph-runtime-derive" version = "0.34.0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.107", @@ -1829,10 +1918,10 @@ dependencies = [ "blake3 1.5.0", "clap", "derive_more", - "diesel", + "diesel 2.3.1", "diesel-derive-enum", "diesel-dynamic-schema", - "diesel_derives", + "diesel_derives 1.4.1", "diesel_migrations", "fallible-iterator 0.3.0", "git-testament", @@ -1986,6 +2075,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2187,6 +2282,12 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -2667,7 +2768,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -3275,9 +3376,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] @@ -3316,7 +3417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", @@ -4162,13 +4263,19 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum_macros" version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4361,7 +4468,7 @@ dependencies = [ name = "test-store" version = "0.34.0" dependencies = [ - "diesel", + "diesel 2.3.1", "graph", "graph-chain-ethereum", "graph-graphql", @@ -5488,7 +5595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b804dfd3d0c0d6d37aa21026fe7772ba1a769c89ee4f5c4f13b82d91d75216f" dependencies = [ "anyhow", - "heck", + "heck 0.4.1", "indexmap 2.1.0", "wit-parser", ] diff --git a/chain/arweave/Cargo.toml b/chain/arweave/Cargo.toml index f8b2014..8669cca 100644 --- a/chain/arweave/Cargo.toml +++ b/chain/arweave/Cargo.toml @@ -18,4 +18,4 @@ graph-runtime-wasm = { path = "../../runtime/wasm" } graph-runtime-derive = { path = "../../runtime/derive" } [dev-dependencies] -diesel = { version = "1.4.7", features = ["postgres", "serde_json", "numeric", "r2d2"] } +diesel = { version = "2.3.1", features = ["postgres", "serde_json", "numeric", "r2d2"] } diff --git a/chain/near/Cargo.toml b/chain/near/Cargo.toml index 9f43c90..4511415 100644 --- a/chain/near/Cargo.toml +++ b/chain/near/Cargo.toml @@ -18,5 +18,5 @@ graph-runtime-wasm = { path = "../../runtime/wasm" } graph-runtime-derive = { path = "../../runtime/derive" } [dev-dependencies] -diesel = { version = "1.4.7", features = ["postgres", "serde_json", "numeric", "r2d2"] } +diesel = { version = "2.3.1", features = ["postgres", "serde_json", "numeric", "r2d2"] } trigger-filters.path = "../../substreams/trigger-filters" diff --git a/graph/Cargo.toml b/graph/Cargo.toml index 21f522d..4fb597c 100644 --- a/graph/Cargo.toml +++ b/graph/Cargo.toml @@ -11,7 +11,7 @@ atomic_refcell = "0.1.13" bigdecimal = { version = "0.1.0", features = ["serde"] } bytes = "1.0.1" cid = "0.11.0" -diesel = { version = "1.4.8", features = [ +diesel = { version = "2.3.1", features = [ "postgres", "serde_json", "numeric", diff --git a/node/Cargo.toml b/node/Cargo.toml index 6dace8c..604083b 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -38,7 +38,7 @@ graph-store-postgres = { path = "../store/postgres" } serde = { version = "1.0.126", features = ["derive", "rc"] } shellexpand = "3.1.0" termcolor = "1.4.1" -diesel = "1.4.8" +diesel = "2.3.1" http = "0.2.5" # must be compatible with the version rust-web3 uses prometheus = { version = "0.13.3", features = ["push"] } json-structural-diff = { version = "0.1", features = ["colorize"] } diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml index 9201425..4b032ff 100644 --- a/store/postgres/Cargo.toml +++ b/store/postgres/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true async-trait = "0.1.50" blake3 = "1.5" derive_more = { version = "0.99.17" } -diesel = { version = "1.4.8", features = [ +diesel = { version = "2.3.1", features = [ "postgres", "serde_json", "numeric", diff --git a/store/test-store/Cargo.toml b/store/test-store/Cargo.toml index 23abac8..9197004 100644 --- a/store/test-store/Cargo.toml +++ b/store/test-store/Cargo.toml @@ -14,7 +14,7 @@ graph-store-postgres = { path = "../postgres" } graph-chain-ethereum = { path = "../../chain/ethereum" } lazy_static = "1.1" hex-literal = "0.4" -diesel = { version = "1.4.8", features = ["postgres", "serde_json", "numeric", "r2d2"] } +diesel = { version = "2.3.1", features = ["postgres", "serde_json", "numeric", "r2d2"] } prost-types = { workspace = true } [dev-dependencies]