dev: general cleanup, bumping of library versions, etc... (#1939)

* bump versions of starknet and cainome

* use rev instead of tag for cainome version

* bump more libraries

* bump reqwest

* bump futures-util

* move more dependencies to workspace and bump where possible

* more updates

Cargo.toml

@@ -54,7 +54,7 @@ inherits = "release"
 lto = "fat"
 
 [workspace.dependencies]
-cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.2.5", features = [ "abigen-rs" ] }
+cainome = { git = "https://github.com/cartridge-gg/cainome", rev = "29f44929", features = [ "abigen-rs" ] }
 common = { path = "crates/common" }
 
 # metrics
@@ -100,9 +100,12 @@ sozo-ops = { path = "crates/sozo/ops" }
 sozo-signers = { path = "crates/sozo/signers" }
 
 anyhow = "1.0.80"
+assert_fs = "1.1"
 assert_matches = "1.5.0"
-async-trait = "0.1.68"
+async-trait = "0.1.77"
+auto_impl = "1.2.0"
 base64 = "0.21.2"
+bytes = "1.6"
 cairo-lang-compiler = "=2.6.3"
 cairo-lang-debug = "=2.6.3"
 cairo-lang-defs = "=2.6.3"
@@ -130,45 +133,55 @@ cairo-vm = "0.9.2"
 camino = { version = "1.1.2", features = [ "serde1" ] }
 chrono = { version = "0.4.24", features = [ "serde" ] }
 clap = { version = "4.5.4", features = [ "derive" ] }
+clap-verbosity-flag = "2.0.1"
 clap_complete = "4.3"
 console = "0.15.7"
 convert_case = "0.6.0"
 crypto-bigint = { version = "0.5.3", features = [ "serde" ] }
 derive_more = "0.99.17"
 flate2 = "1.0.24"
-futures = "0.3.28"
+futures = "0.3.30"
+futures-util = "0.3.30"
 hex = "0.4.3"
+http = "0.2.9"
+indexmap = "2.2.5"
 indoc = "1.0.7"
 itertools = "0.12.1"
 jsonrpsee = { version = "0.16.2", default-features = false }
 lazy_static = "1.4.0"
+log = "0.4.21"
 metrics = "0.21.1"
 num-traits = { version = "0.2", default-features = false }
 once_cell = "1.0"
 parking_lot = "0.12.1"
 pretty_assertions = "1.2.1"
+rand = "0.8.5"
 rayon = "1.8.0"
 regex = "1.10.3"
+reqwest = { version = "0.12", features = [ "blocking", "rustls-tls" ], default-features = false }
 rpassword = "7.2.0"
 salsa = "0.16.1"
 scarb = { git = "https://github.com/software-mansion/scarb", tag = "v2.6.4" }
 scarb-ui = { git = "https://github.com/software-mansion/scarb", tag = "v2.6.4" }
 semver = "1.0.5"
-serde = { version = "1.0.197", features = [ "derive" ] }
+serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
-serde_with = "2.3.1"
+serde_with = "2.3"
 similar-asserts = "1.5.0"
 smol_str = { version = "0.2.0", features = [ "serde" ] }
 sqlx = { version = "0.7.2", features = [ "chrono", "macros", "regexp", "runtime-async-std", "runtime-tokio", "sqlite", "uuid" ] }
-starknet = "0.9.0"
-starknet-crypto = "0.6.1"
+starknet = "0.10.0"
+starknet-crypto = "0.6.2"
 starknet_api = "0.10.0"
 strum = "0.25"
 strum_macros = "0.25"
+tempfile = "3.9.0"
 test-log = "0.2.11"
 thiserror = "1.0.32"
 tokio = { version = "1.32.0", features = [ "full" ] }
-toml = "0.8.12"
+toml = "0.8"
+tower = "0.4.13"
+tower-http = "0.4.4"
 tracing = "0.1.34"
 tracing-subscriber = { version = "0.3.16", features = [ "env-filter", "json" ] }
 url = { version = "2.4.0", features = [ "serde" ] }

bin/dojo-language-server/Cargo.toml

@@ -17,8 +17,8 @@ cairo-lang-test-plugin.workspace = true
 cairo-lang-utils.workspace = true
 clap.workspace = true
 dojo-lang.workspace = true
-log = "0.4.14"
-salsa = "0.16.1"
+log.workspace = true
+salsa.workspace = true
 smol_str.workspace = true
 tokio = { version = "1.18.2", features = [ "full", "sync" ] }
 tower-lsp = "0.20.0"

bin/katana/Cargo.toml

@@ -29,7 +29,7 @@ tracing.workspace = true
 url.workspace = true
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches.workspace = true
 
 [features]
 default = [ "blockifier", "jemalloc", "messaging" ]

bin/sozo/Cargo.toml

@@ -21,7 +21,7 @@ cairo-lang-test-plugin.workspace = true
 cairo-lang-test-runner.workspace = true
 cairo-lang-utils.workspace = true
 camino.workspace = true
-clap-verbosity-flag = "2.0.1"
+clap-verbosity-flag.workspace = true
 clap.workspace = true
 clap_complete.workspace = true
 console.workspace = true
@@ -48,14 +48,14 @@ starknet.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tracing-log = "0.1.3"
-tracing.workspace = true
 tracing-subscriber.workspace = true
+tracing.workspace = true
 url.workspace = true
 
 cainome.workspace = true
 
 [dev-dependencies]
-assert_fs = "1.0.10"
+assert_fs.workspace = true
 dojo-test-utils = { workspace = true, features = [ "build-examples" ] }
 katana-runner.workspace = true
 snapbox = "0.4.6"

bin/sozo/src/commands/register.rs

@@ -62,8 +62,9 @@ impl RegisterArgs {
             let world =
                 utils::world_from_env_metadata(world, account, starknet, &env_metadata).await?;
             let provider = world.account.provider();
-            let world_reader = WorldContractReader::new(world_address, &provider)
-                .with_block(BlockId::Tag(BlockTag::Pending));
+            let mut world_reader = WorldContractReader::new(world_address, &provider);
+            world_reader.set_block(BlockId::Tag(BlockTag::Pending));
+
             register::model_register(
                 models,
                 &world,

bin/torii/Cargo.toml

@@ -8,7 +8,7 @@ version.workspace = true
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
-base64 = "0.21.2"
+base64.workspace = true
 camino.workspace = true
 chrono.workspace = true
 clap.workspace = true
@@ -19,11 +19,11 @@ dojo-types.workspace = true
 dojo-world.workspace = true
 either = "1.9.0"
 futures.workspace = true
-http = "0.2.9"
 http-body = "0.4.5"
+http.workspace = true
 hyper-reverse-proxy = { git = "https://github.com/tarrencev/hyper-reverse-proxy" }
 hyper.workspace = true
-indexmap = "1.9.3"
+indexmap.workspace = true
 lazy_static.workspace = true
 scarb.workspace = true
 serde.workspace = true
@@ -39,8 +39,9 @@ torii-graphql.workspace = true
 torii-grpc = { workspace = true, features = [ "server" ] }
 torii-relay.workspace = true
 torii-server.workspace = true
-tower = "0.4.13"
-tower-http = "0.4.4"
+tower.workspace = true
+
+tower-http.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true
 url.workspace = true

crates/benches/Cargo.toml

@@ -8,28 +8,28 @@ version.workspace = true
 [dependencies]
 clap_builder = "4.4.6"
 proptest = "1.3.1"
-reqwest = { version = "0.11.18", features = [ "blocking", "json", "rustls-tls" ], default-features = false }
+reqwest = { workspace = true, features = [ "blocking", "json", "rustls-tls" ], default-features = false }
 
 katana-core = { path = "../katana/core" }
 katana-runner.workspace = true
 
 anyhow.workspace = true
+clap.workspace = true
+dojo-lang.workspace = true
+dojo-world.workspace = true
 futures.workspace = true
 hex.workspace = true
 lazy_static.workspace = true
+scarb.workspace = true
+serde = { workspace = true, features = [ "derive" ] }
+serde_json.workspace = true
 sozo = { path = "../../bin/sozo" }
+sozo-ops.workspace = true
 starknet.workspace = true
 tokio.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_json = "1.0.111"
-clap.workspace = true
-scarb.workspace = true
-dojo-lang.workspace = true
-dojo-world.workspace = true
-sozo-ops.workspace = true
 
 [features]
-default = ["skip-benchmarks"]
-skip-benchmarks = ["skip-katana-benchmarks", "skip-gas-benchmarks"]
-skip-katana-benchmarks = []
-skip-gas-benchmarks = []
+default = [ "skip-benchmarks" ]
+skip-benchmarks = [ "skip-gas-benchmarks", "skip-katana-benchmarks" ]
+skip-gas-benchmarks = [  ]
+skip-katana-benchmarks = [  ]

crates/common/Cargo.toml

@@ -7,5 +7,5 @@ version.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-reqwest = { version = "0.11.22", features = [ "blocking", "rustls-tls" ], default-features = false }
+reqwest.workspace = true
 thiserror.workspace = true

crates/dojo-lang/Cargo.toml

@@ -23,8 +23,8 @@ cairo-lang-plugins.workspace = true
 cairo-lang-project.workspace = true
 cairo-lang-semantic.workspace = true
 cairo-lang-sierra-generator.workspace = true
-cairo-lang-starknet.workspace = true
 cairo-lang-starknet-classes.workspace = true
+cairo-lang-starknet.workspace = true
 cairo-lang-syntax.workspace = true
 cairo-lang-test-plugin.workspace = true
 cairo-lang-utils.workspace = true
@@ -43,13 +43,13 @@ scarb.workspace = true
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_with = "2.3.1"
+serde_with.workspace = true
 smol_str.workspace = true
 starknet.workspace = true
-thiserror = "1.0.32"
+thiserror.workspace = true
 toml.workspace = true
 tracing.workspace = true
-url = "2.2.2"
+url.workspace = true
 
 [dev-dependencies]
 cairo-lang-semantic.workspace = true

crates/dojo-test-utils/Cargo.toml

@@ -7,7 +7,7 @@ version.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-assert_fs = "1.0.9"
+assert_fs.workspace = true
 async-trait.workspace = true
 cairo-lang-compiler.workspace = true
 cairo-lang-filesystem.workspace = true
@@ -31,12 +31,12 @@ smol_str.workspace = true
 starknet.workspace = true
 thiserror.workspace = true
 tokio = { version = "1.28.0", features = [ "full" ] }
-toml = "0.7.1"
+toml.workspace = true
 tracing.workspace = true
-url = "2.2.2"
+url.workspace = true
 
 [build-dependencies]
-assert_fs = "1.0.9"
+assert_fs.workspace = true
 camino.workspace = true
 dojo-lang = { path = "../dojo-lang" }
 scarb-ui.workspace = true

crates/dojo-types/Cargo.toml

@@ -6,8 +6,8 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-crypto-bigint = { version = "0.5.3", features = [ "serde" ] }
-hex = "0.4.3"
+crypto-bigint.workspace = true
+hex.workspace = true
 itertools.workspace = true
 serde.workspace = true
 starknet.workspace = true

crates/dojo-world/Cargo.toml

@@ -12,8 +12,8 @@ async-trait.workspace = true
 cainome.workspace = true
 cairo-lang-filesystem.workspace = true
 cairo-lang-project.workspace = true
-cairo-lang-starknet.workspace = true
 cairo-lang-starknet-classes.workspace = true
+cairo-lang-starknet.workspace = true
 camino.workspace = true
 convert_case.workspace = true
 futures.workspace = true
@@ -27,21 +27,21 @@ thiserror.workspace = true
 tracing.workspace = true
 
 dojo-types = { path = "../dojo-types", optional = true }
-http = { version = "0.2.9", optional = true }
+http = { workspace = true, optional = true }
 ipfs-api-backend-hyper = { git = "https://github.com/ferristseng/rust-ipfs-api", rev = "af2c17f7b19ef5b9898f458d97a90055c3605633", features = [ "with-hyper-rustls" ], optional = true }
 scarb = { workspace = true, optional = true }
 tokio = { version = "1.32.0", features = [ "time" ], default-features = false, optional = true }
 toml.workspace = true
-url = { version = "2.2.2", optional = true }
+url = { workspace = true, optional = true }
 
 [dev-dependencies]
-assert_fs = "1.0.9"
+assert_fs.workspace = true
 assert_matches.workspace = true
 dojo-lang.workspace = true
 dojo-test-utils = { path = "../dojo-test-utils" }
 katana-runner.workspace = true
 similar-asserts.workspace = true
-tempfile = "3.3.0"
+tempfile.workspace = true
 tokio.workspace = true
 
 [features]

crates/katana/core/Cargo.toml

@@ -15,20 +15,20 @@ katana-tasks.workspace = true
 
 anyhow.workspace = true
 async-trait.workspace = true
-dojo-metrics.workspace = true
-metrics.workspace = true
 cairo-lang-casm = "2.3.1"
 cairo-lang-starknet = "2.3.1"
 cairo-vm.workspace = true
 convert_case.workspace = true
-k256 = { version = "0.13", default-features = false, features = ["ecdsa", "std"] }
-reqwest = { version = "0.11.22", features = [ "blocking", "rustls-tls" ], default-features = false }
 derive_more.workspace = true
+dojo-metrics.workspace = true
 flate2.workspace = true
 futures.workspace = true
-lazy_static = "1.4.0"
+k256 = { version = "0.13", default-features = false, features = [ "ecdsa", "std" ] }
+lazy_static.workspace = true
+metrics.workspace = true
 parking_lot.workspace = true
-rand = { version = "0.8.5", features = [ "small_rng" ] }
+rand = { workspace = true, features = [ "small_rng" ] }
+reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_with.workspace = true
@@ -39,31 +39,31 @@ tokio.workspace = true
 tracing.workspace = true
 url.workspace = true
 
-alloy-primitives = { workspace = true, features = ["serde"] }
-alloy-sol-types = {  workspace = true, default-features = false, features = ["json"], optional = true }
+alloy-primitives = { workspace = true, features = [ "serde" ] }
+alloy-sol-types = { workspace = true, default-features = false, features = [ "json" ], optional = true }
 
-alloy-transport = { version = "0.1.0", default-features = false, optional = true }
-alloy-provider = { version = "0.1.0", default-features = false, optional = true, features = ["reqwest"]}
-alloy-signer = { version = "0.1.0", default-features = false, optional = true }
+alloy-contract = { version = "0.1.0", default-features = false, optional = true }
 alloy-network = { version = "0.1.0", default-features = false, optional = true }
+alloy-provider = { version = "0.1.0", default-features = false, optional = true, features = [ "reqwest" ] }
 alloy-rpc-types = { version = "0.1.0", default-features = false, optional = true }
+alloy-signer = { version = "0.1.0", default-features = false, optional = true }
 alloy-signer-wallet = { version = "0.1.0", default-features = false, optional = true }
-alloy-contract = { version = "0.1.0", default-features = false, optional = true }
+alloy-transport = { version = "0.1.0", default-features = false, optional = true }
 
 [dev-dependencies]
 assert_matches.workspace = true
-hex = "0.4.3"
-tempfile = "3.8.1"
+hex.workspace = true
+tempfile.workspace = true
 
 [features]
 messaging = [
-    "alloy-sol-types",
-    "alloy-transport",
-    "alloy-provider",
-    "alloy-signer",
+    "alloy-contract",
     "alloy-network",
+    "alloy-provider",
     "alloy-rpc-types",
+    "alloy-signer",
     "alloy-signer-wallet",
-    "alloy-contract"
+    "alloy-sol-types",
+    "alloy-transport",
 ]
-starknet-messaging = [ ]
+starknet-messaging = [  ]