From 7cb4a13c4f630749e09b37445459dc268a762b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Zaj=C4=85c?= Date: Sat, 20 Jan 2024 11:34:22 +0000 Subject: [PATCH] results aftere rebase --- Cargo.lock | 113 ++++++++++++++------------ crates/benches/bench_results.txt | 14 ++-- crates/benches/tests/heavy.rs | 12 +-- crates/katana/runner/Cargo.toml | 1 + crates/katana/runner/src/prefunded.rs | 4 +- crates/torii/types-test/Scarb.lock | 2 +- 6 files changed, 81 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf29e4e62e..f0756c3775 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -465,7 +465,7 @@ dependencies = [ "proc-macro2", "quote", "strum 0.25.0", - "syn 2.0.47", + "syn 2.0.48", "thiserror", ] @@ -572,7 +572,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -620,7 +620,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -637,7 +637,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -856,7 +856,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1172,7 +1172,7 @@ dependencies = [ "quote", "serde_json", "starknet", - "syn 2.0.47", + "syn 2.0.48", "thiserror", ] @@ -1184,7 +1184,7 @@ dependencies = [ "quote", "serde_json", "starknet", - "syn 2.0.47", + "syn 2.0.48", "thiserror", ] @@ -1200,7 +1200,7 @@ dependencies = [ "quote", "serde_json", "starknet", - "syn 2.0.47", + "syn 2.0.48", "thiserror", ] @@ -1216,7 +1216,7 @@ dependencies = [ "quote", "serde_json", "starknet", - "syn 2.0.47", + "syn 2.0.48", "thiserror", ] @@ -1457,7 +1457,7 @@ checksum = "c8cc59c40344194d2cc825071080d887826dcf0df37de71e58fc8aa4c344bb84" dependencies = [ "cairo-lang-debug", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1982,7 +1982,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -2382,7 +2382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -2449,7 +2449,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -2471,7 +2471,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -3208,7 +3208,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn 2.0.47", + "syn 2.0.48", "toml 0.8.8", "walkdir", ] @@ -3226,7 +3226,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -3252,7 +3252,7 @@ dependencies = [ "serde", "serde_json", "strum 0.25.0", - "syn 2.0.47", + "syn 2.0.48", "tempfile", "thiserror", "tiny-keccak", @@ -3714,7 +3714,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -3785,7 +3785,7 @@ checksum = "d4cf186fea4af17825116f72932fe52cce9a13bae39ff63b4dc0cfdb3fb4bde1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -4205,7 +4205,7 @@ checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -5661,7 +5661,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -5865,6 +5865,7 @@ dependencies = [ "chrono", "home", "katana-core", + "katana-primitives", "lazy_static", "runner-macro", "starknet", @@ -6215,7 +6216,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -6646,7 +6647,7 @@ dependencies = [ "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -6739,7 +6740,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7020,7 +7021,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7084,7 +7085,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7128,7 +7129,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7329,7 +7330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7510,7 +7511,7 @@ dependencies = [ "prost 0.12.3", "prost-types 0.12.3", "regex", - "syn 2.0.47", + "syn 2.0.48", "tempfile", "which 4.4.2", ] @@ -7538,7 +7539,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7970,7 +7971,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.47", + "syn 2.0.48", "unicode-ident", ] @@ -7983,7 +7984,15 @@ dependencies = [ "quote", "rand", "rustc_version", - "syn 2.0.47", + "syn 2.0.48", +] + +[[package]] +name = "runner-macro" +version = "0.1.0" +dependencies = [ + "quote", + "syn 2.0.48", ] [[package]] @@ -8472,7 +8481,7 @@ checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -8516,7 +8525,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -8565,7 +8574,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -8600,7 +8609,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9252,7 +9261,7 @@ checksum = "af6527b845423542c8a16e060ea1bc43f67229848e7cd4c4d80be994a84220ce" dependencies = [ "starknet-curve 0.4.0", "starknet-ff", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9295,7 +9304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "840be1a7eb5735863eee47d3a3f26df45b9be2c519e8da294e74b4d0524d77d1" dependencies = [ "starknet-core", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9428,7 +9437,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9470,9 +9479,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.47" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -9592,7 +9601,7 @@ checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9612,7 +9621,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9747,7 +9756,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -9974,7 +9983,7 @@ dependencies = [ "proc-macro2", "prost-build 0.12.3", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -10347,7 +10356,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -10376,7 +10385,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -10495,7 +10504,7 @@ checksum = "982ee4197351b5c9782847ef5ec1fdcaf50503fb19d68f9771adae314e72b492" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -10793,7 +10802,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -10827,7 +10836,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11267,7 +11276,7 @@ checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -11287,7 +11296,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] diff --git a/crates/benches/bench_results.txt b/crates/benches/bench_results.txt index e386b731a6..6e9dd59ea5 100644 --- a/crates/benches/bench_results.txt +++ b/crates/benches/bench_results.txt @@ -1,5 +1,9 @@ -{"name":"Benchmark: 1 accounts, is_prime transactions, 1 calls","sending_time":14,"responses_span":0,"longest_confirmation_difference":0,"stats":{"estimated_tps":0.33344448149383127,"estimated_sps":293892.2974324775,"relevant_blocks":[[1,2999]],"relevant_time":2999},"block_times":[0,2999,2999,3000,3000,2999,3000,3000,3000,3000,3000,2999,2999,3000,2999,2999,3000,2999,3001,2999,2999,3001],"block_sizes":[2,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,0,0],"steps":881383} -{"name":"Benchmark: 100 accounts, is_prime transactions, 1 calls","sending_time":719,"responses_span":78,"longest_confirmation_difference":5,"stats":{"estimated_tps":4.108969881250771,"estimated_sps":3621559.436249332,"relevant_blocks":[[100,24337]],"relevant_time":24337},"block_times":[0,2999,2999,3000,2999,2999,3000,2999,3000,3000,2999,2999,2999,3000,3038,3001,3001,2998,3000,24337,3000,2999,2999,2999,2999,3000,2999,2999,2999,2999,2999,3000,3000,2999,2999,3000,2999,3002,2996,3000,2999],"block_sizes":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"steps":88137892} -{"name":"Benchmark: 1000 accounts, is_prime transactions, 1 calls","sending_time":6888,"responses_span":416,"longest_confirmation_difference":1,"stats":{"estimated_tps":4.309323220788175,"estimated_sps":3798146.853116718,"relevant_blocks":[[602,139734],[398,92321]],"relevant_time":232055},"block_times":[0,2999,2999,3000,3000,2998,3000,3000,3000,3001,2998,3000,2999,2999,3000,2999,3000,3000,2998,3001,2999,2999,2999,2999,3000,2999,139734,92321,2999],"block_sizes":[0,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,0,0,0,0,0,0,602,398,0],"steps":881378968} -{"name":"Benchmark: 1000 accounts, is_prime transactions, 1 calls","sending_time":6818,"responses_span":412,"longest_confirmation_difference":1,"stats":{"estimated_tps":4.308840447947053,"estimated_sps":3797721.3472882314,"relevant_blocks":[[671,155971],[329,76110]],"relevant_time":232081},"block_times":[0,2999,2999,3000,2999,3000,3000,3000,2999,3000,3000,2999,2999,3000,2999,3000,3000,3000,2998,3000,2999,2999,2999,3000,2999,2999,155971,76110,2998],"block_sizes":[0,1,1,1,0,2,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,0,0,0,0,0,671,329,0],"steps":881378968} -{"name":"Benchmark: 1000 accounts, is_prime transactions, 1 calls","sending_time":6870,"responses_span":446,"longest_confirmation_difference":6,"stats":{"estimated_tps":4.318796265104989,"estimated_sps":3806496.1951404903,"relevant_blocks":[[37,9193],[963,222353]],"relevant_time":231546},"block_times":[0,2998,3000,3000,3000,2999,3000,2999,3000,3000,2999,2999,3002,2998,2999,2999,3000,3000,2999,3000,3000,2999,3000,2999,2999,3000,9193,222353,2995],"block_sizes":[0,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,0,0,0,0,0,37,963,0],"steps":881378968} +{"name":"Benchmark: 1 accounts, is_prime transactions, 1 calls","sending_time":14,"responses_span":0,"longest_confirmation_difference":0,"stats":{"estimated_tps":0.3333333333333333,"estimated_sps":293794.3333333333,"relevant_blocks":[[1,3000]],"relevant_time":3000},"block_times":[0,2998,3000,3000,3000,2999,3000,2999,2999,2999,3000,2999,3000,3000,2998,3001,2998,3000,3000,3000,2999,2999],"block_sizes":[2,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,0,0],"steps":881383} +{"name":"Benchmark: 100 accounts, is_prime transactions, 1 calls","sending_time":714,"responses_span":73,"longest_confirmation_difference":1,"stats":{"estimated_tps":4.12609341475491,"estimated_sps":3636651.7577157947,"relevant_blocks":[[100,24236]],"relevant_time":24236},"block_times":[0,2998,3000,3001,2998,3000,3000,2999,3000,2999,3000,2999,3001,2999,2999,3000,2998,2999,3000,24236,2999,2999,3000,2999,2999,3000,3000,3000,3000,3000,3000,2999,2999,2999,2999,2999,2999,3000,2999,3000,2999],"block_sizes":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"steps":88137892} +{"name":"Benchmark: 1000 accounts, is_prime transactions, 1 calls","sending_time":6834,"responses_span":399,"longest_confirmation_difference":1,"stats":{"estimated_tps":4.36898718139161,"estimated_sps":3850733.4131401656,"relevant_blocks":[[591,135688],[409,93198]],"relevant_time":228886},"block_times":[0,2998,3002,2997,2998,3000,3000,3000,2999,3000,2999,3001,2998,3000,3000,3000,3000,2998,3001,2998,2999,2999,3000,2999,2999,3000,135688,93198,2998],"block_sizes":[0,1,1,1,0,2,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,0,0,0,0,0,591,409,0],"steps":881378968} +{"name":"Benchmark: 1000 accounts, is_prime transactions, 1 calls","sending_time":6861,"responses_span":394,"longest_confirmation_difference":1,"stats":{"estimated_tps":4.370896820609652,"estimated_sps":3852416.528983417,"relevant_blocks":[[598,137135],[402,91651]],"relevant_time":228786},"block_times":[0,2999,3001,2999,3000,2999,3000,2999,2999,3000,2999,3000,2999,2999,3000,3000,3000,2999,3000,2999,2999,2999,3000,2999,3000,2999,137135,91651,2998],"block_sizes":[0,1,1,1,0,2,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,0,0,0,0,0,598,402,0],"steps":881378968} +{"name":"Benchmark: 1000 accounts, is_prime transactions, 1 calls","sending_time":6843,"responses_span":396,"longest_confirmation_difference":1,"stats":{"estimated_tps":4.357678229039568,"estimated_sps":3840765.940386962,"relevant_blocks":[[497,114574],[503,114906]],"relevant_time":229480},"block_times":[0,2999,3002,2997,2999,2999,3001,2999,2999,3000,2999,3001,2998,2999,2999,3000,3000,3000,3000,2999,2999,2999,2999,2999,2999,3000,114574,114906,2999],"block_sizes":[0,1,1,1,0,2,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,0,0,0,0,0,497,503,0],"steps":881378968} +{"name":"Benchmark: 2000 accounts, is_prime transactions, 1 calls","sending_time":13653,"responses_span":726,"longest_confirmation_difference":4,"stats":{"estimated_tps":4.387773906786131,"estimated_sps":3867291.7255359665,"relevant_blocks":[[669,154310],[1331,301502]],"relevant_time":455812},"block_times":[0,2999,2998,3001,2999,3000,3000,2999,3000,2999,3000,3000,2998,3000,3000,2999,3000,3000,3000,3000,2999,2999,2999,3000,2999,3000,2999,3001,2998,2999,3000,3000,154310,301502,2993],"block_sizes":[0,0,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,669,1331,0],"steps":1762757976} +{"name":"Benchmark: 2000 accounts, is_prime transactions, 1 calls","sending_time":13649,"responses_span":783,"longest_confirmation_difference":9,"stats":{"estimated_tps":4.386705649857541,"estimated_sps":3866350.1863253224,"relevant_blocks":[[538,125111],[1462,330812]],"relevant_time":455923},"block_times":[0,3000,2999,3000,2998,3001,3000,3000,2999,3000,3000,3000,2998,3001,2998,3000,3001,2997,3000,2999,2999,2999,3000,2999,3000,2999,3000,2999,3000,3000,2999,3000,125111,330812,2993],"block_sizes":[0,0,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,538,1462,0],"steps":1762757976} +{"name":"Benchmark: 2000 accounts, is_prime transactions, 1 calls","sending_time":13638,"responses_span":765,"longest_confirmation_difference":6,"stats":{"estimated_tps":4.378465829358052,"estimated_sps":3859087.78167218,"relevant_blocks":[[685,158378],[1315,298403]],"relevant_time":456781},"block_times":[0,2999,2999,3001,2999,2999,3000,3000,2999,2999,3000,3000,3007,3002,2999,3000,3000,2998,3003,2996,2999,3000,3000,2999,2999,3000,2998,3001,2999,3000,2999,2999,158378,298403,2993],"block_sizes":[0,0,1,1,1,0,1,1,1,1,1,1,2,0,1,1,1,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,685,1315,0],"steps":1762757976} +{"name":"Benchmark: 2000 accounts, is_prime transactions, 23 calls","sending_time":78297,"responses_span":5477,"longest_confirmation_difference":10,"stats":{"estimated_tps":4.1648532201603885,"estimated_sps":4441395.259147579,"relevant_blocks":[[85,21448],[1915,458761]],"relevant_time":480209},"block_times":[0,2999,3000,2999,2999,3000,2999,3000,3000,2999,2999,3000,2998,3000,3000,2999,3000,2999,3001,3000,2998,3000,3001,2998,3000,3000,2999,3000,3000,3000,2999,3001,2999,2999,3000,2999,3000,3000,2999,3000,2999,2999,2999,3000,2999,3000,2999,3001,2999,2999,3000,2999,21448,458761,2982],"block_sizes":[0,0,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,1915,0],"steps":2132797976} diff --git a/crates/benches/tests/heavy.rs b/crates/benches/tests/heavy.rs index 96ddfc5532..acaafd8619 100644 --- a/crates/benches/tests/heavy.rs +++ b/crates/benches/tests/heavy.rs @@ -31,7 +31,7 @@ async fn katana_heavy_prime_1000_a() { let arg = FieldElement::from_dec_str(&(2111u64 * 2111u64).to_string()).unwrap(); let result = - spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 160000, true) + spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 180000, true) .await; assert!(result.steps > 800000000); @@ -43,7 +43,7 @@ async fn katana_heavy_prime_1000_b() { let arg = FieldElement::from_dec_str(&(2111u64 * 2111u64).to_string()).unwrap(); let result = - spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 160000, true) + spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 180000, true) .await; assert!(result.steps > 800000000); @@ -55,7 +55,7 @@ async fn katana_heavy_prime_1000_c() { let arg = FieldElement::from_dec_str(&(2111u64 * 2111u64).to_string()).unwrap(); let result = - spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 160000, true) + spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 180000, true) .await; assert!(result.steps > 800000000); @@ -67,7 +67,7 @@ async fn katana_heavy_prime_2000_a() { let arg = FieldElement::from_dec_str(&(2111u64 * 2111u64).to_string()).unwrap(); let result = - spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 200000, true) + spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 250000, true) .await; assert!(result.steps > 1600000000); @@ -79,7 +79,7 @@ async fn katana_heavy_prime_2000_b() { let arg = FieldElement::from_dec_str(&(2111u64 * 2111u64).to_string()).unwrap(); let result = - spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 200000, true) + spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 250000, true) .await; assert!(result.steps > 1600000000); @@ -91,7 +91,7 @@ async fn katana_heavy_prime_2000_c() { let arg = FieldElement::from_dec_str(&(2111u64 * 2111u64).to_string()).unwrap(); let result = - spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 200000, true) + spam_katana(runner, contract_address, vec![BenchCall("is_prime", vec![arg])], 250000, true) .await; assert!(result.steps > 1600000000); diff --git a/crates/katana/runner/Cargo.toml b/crates/katana/runner/Cargo.toml index 376c6fa554..07465fa770 100644 --- a/crates/katana/runner/Cargo.toml +++ b/crates/katana/runner/Cargo.toml @@ -8,6 +8,7 @@ version.workspace = true [dependencies] runner-macro = { path = "./runner-macro" } katana-core = { path = "../core" } +katana-primitives = { path = "../primitives" } anyhow.workspace = true home = "0.5.5" lazy_static.workspace = true diff --git a/crates/katana/runner/src/prefunded.rs b/crates/katana/runner/src/prefunded.rs index 920a51eaa8..8f18705fbb 100644 --- a/crates/katana/runner/src/prefunded.rs +++ b/crates/katana/runner/src/prefunded.rs @@ -1,4 +1,6 @@ use katana_core::accounts::Account; +use katana_core::backend::config::Environment; +use katana_primitives::chain::ChainId; use starknet::accounts::{ExecutionEncoding, SingleOwnerAccount}; use starknet::macros::felt; use starknet::providers::jsonrpc::HttpTransport; @@ -30,7 +32,7 @@ impl KatanaRunner { let private_key = SigningKey::from_secret_scalar(account.private_key); let signer = LocalWallet::from_signing_key(private_key); - debug_assert_eq!(katana_core::backend::config::Environment::default().chain_id, "KATANA"); + debug_assert_eq!(Environment::default().chain_id, ChainId::parse("KATANA").unwrap()); let chain_id = felt!("82743958523457"); let provider = self.owned_provider(); diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock index 5cb79dfe8e..86f181d66b 100644 --- a/crates/torii/types-test/Scarb.lock +++ b/crates/torii/types-test/Scarb.lock @@ -15,7 +15,7 @@ source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7 [[package]] name = "types_test" -version = "0.4.4" +version = "0.5.0" dependencies = [ "dojo", ]