Merge pull request #74 from KasarLabs/deoxys/dev

Deoxys/dev

.vscode/settings.json

@@ -1,3 +1,9 @@
 {
-  "eslint.workingDirectories": ["tests"]
-}
+  "eslint.workingDirectories": [
+    "tests"
+  ],
+  "editor.formatOnSave": false,
+  "[rust]": {
+    "editor.formatOnSave": false
+  }
+}

Cargo.toml

@@ -23,7 +23,6 @@ members = [
   "crates/client/storage",
   "crates/client/transaction-pool",
   "crates/client/deoxys",
-  "crates/client/starknet_client",
   "starknet-rpc-test",
 ]
 # All previous except for `starknet-rpc-test`
@@ -181,7 +180,7 @@ cairo-vm = { git = "https://github.com/keep-starknet-strange/cairo-rs", branch =
 ] }
 starknet-crypto = { version = "0.6.0", default-features = false }
 starknet-core = { version = "0.6.0", default-features = false }
-starknet-providers = { version = "0.6.0", default-features = false }
+starknet-gateway = { version = "0.6.0", default-features = false }
 starknet-ff = { version = "0.3.4", default-features = false }
 starknet-signers = { version = "0.4.0" }
 starknet-accounts = { version = "0.5.0" }
@@ -236,7 +235,6 @@ phf = { version = "0.11", default-features = false }
 
 # Deoxys
 mc-deoxys = { path = "crates/client/deoxys" }
-starknet_client = { path = "crates/client/starknet_client" }
 tokio = "1.24.2"
 assert_matches = "1.5.0"
 mockito = "0.31.0"

crates/client/deoxys/Cargo.toml

@@ -16,23 +16,24 @@ repository = "https://github.com/KasarLabs/deoxys"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+starknet-gateway = "0.6"
+reqwest = "0.11"
+serde_json = "1"
+
 blockifier = { workspace = true, default-features = false, features = [
     "testing",
 ] }
 env_logger = "0.9.0"
 log = { version = "0.4.14" }
 mockito = { workspace = true }
 pallet-starknet = { workspace = true }
-reqwest = { workspace = true }
-serde_json = { workspace = true }
 sp-core = { workspace = true, features = ["std"] }
 starknet-core = { workspace = true }
 starknet-ff = { workspace = true, default-features = false, features = [
     "alloc",
     "serde",
 ] }
 starknet_api = { workspace = true, default-features = false }
-starknet_client = { workspace = true }
 tokio = { workspace = true, features = ["macros", "test-util"] }
 # test_utils = { path = "./test_utils", optional = true }
 hex = "0.4"