Merge `dev/katana` branch #1697

kariy · 2024-03-25T10:03:41Z

Merging katana development branch with breaking changes due to huge rework on katana-executor

refactor(katana): change stored compiled class (refactor(katana): change stored compiled class #1559)
refactor(katana-primitives): move class related types to a separate module (refactor(katana-primitives): move class related types to a separate module #1560)
Katana executor traits (Katana executor traits #1561)
feat(katana-executor): add blockifier executor implementations (feat(katana-executor): add blockifier executor implementations #1562)
Refactor Katana to using the new executor traits (Refactor Katana to using the new executor traits #1563)
feat(katana-executor): add starknet_in_rust executor (feat(katana-executor): add starknet_in_rust executor #1564)
doc(katana-executor): add README
test(katana-executor): add test for transaction simulation (test(katana-executor): add test for transaction simulation #1593)
test(katana-executor): refactor simulate tests (test(katana-executor): refactor simulate tests #1606)
refactor(katana): decouple katana-primitives from any executor impls (refactor(katana): decouple katana-primitives from any executor impls #1637)
test(katana-executor): improve tests and add test for state (test(katana-executor): improve tests and add test for state #1649)
feat(saya): load data from Katana to run SNOS (feat(saya): load data from Katana to run SNOS #1535)
feat(katana-primitives): add fee info type
Refactor executor output

Both `blockifier` and `starknet_in_rust` use their own proprietary contract class types. So need to have a type where the types from those two crates can be derived from.

…odule (#1560)

implement the executor traits introduced in #1561 based on `blockifier`

integrate the new executor traits introduced in #1561 to katana

refactor tests

#1637)

- add tests for each executor's CachedState - improve test in executor.rs - fix sir not enough gas error - fix test in simulate.rs

* chore: bump dependencies * fix: update cairo-lang * fix: add missing run_profiler * fix: fmt * update cairo-vm rev * wip * wip * fmt * fix: ensure semantics analyzer plugin is registered * chore(katana): make ethers non optional since U256 is used outside messaging * fix: run CAIRO_FIX_TESTS * fix(dojo-core): remove compiler warnings * git: add sozo generated bindings to gitignore * fix: fix class hash * fix: class hash generated code * fix(dojo-core): fix tests and compilation warnings * chore: integrate snos on cairo2.5 * chore: update Cargo.lock * wip: work on integration of katana types * wip: fetch strategy * fix * feat: add parsing of state diff for genesis block * wip * wip * fix: rework provider for saya and RPC implem * wip * wip: snos types * wip txs * wip: fix snos parsing need to complete inputs * chore: switch back to git snos * chore: bump blockifier to use Serde on TransactionExecutionInfo * feat: add saya RPC namespace * feat: add transaction execution info to in memory db * fix: remove unused code covered by other test * fix: add logic for small requests to get transactions executions info * fix: fetch transactions executions info instead of running blockifier * fix: fmt and clippy * docs: fix unused type * fix: add tests for new transactions execution retrieval * fix: add correct test to check no pending support * fix: restore unchanged file * fix: rename new provider trait to TransactionTraceProvider * refactor(katana): change stored compiled class (#1559) Both `blockifier` and `starknet_in_rust` use their own proprietary contract class types. So need to have a type where the types from those two crates can be derived from. * refactor(katana-primitives): move class related types to a separate module (#1560) * Katana executor traits (#1561) * feat(katana-executor): add `blockifier` executor implementations (#1562) implement the executor traits introduced in #1561 based on `blockifier` * Refactor Katana to using the new executor traits (#1563) integrate the new executor traits introduced in #1561 to katana * feat(katana-executor): add starknet_in_rust executor (#1564) * doc(katana-executor): add README * test(katana-executor): add test for transaction simulation (#1593) * test(katana-executor): refactor simulate tests (#1606) refactor tests * adjust new types for Katana blockchain and SNOS * fix: clippy * refactor(katana): change stored compiled class (#1559) Both `blockifier` and `starknet_in_rust` use their own proprietary contract class types. So need to have a type where the types from those two crates can be derived from. * refactor(katana-primitives): move class related types to a separate module (#1560) * Katana executor traits (#1561) * feat(katana-executor): add `blockifier` executor implementations (#1562) implement the executor traits introduced in #1561 based on `blockifier` * Refactor Katana to using the new executor traits (#1563) integrate the new executor traits introduced in #1561 to katana * feat(katana-executor): add starknet_in_rust executor (#1564) * doc(katana-executor): add README * test(katana-executor): add test for transaction simulation (#1593) * test(katana-executor): refactor simulate tests (#1606) refactor tests * feat: add new primitive for trace and blockifier conversions * feat: add TransactionExecutionInfo convert from blockifier * feat: add executor trait method to retrieve the execution info * fix: ensure tx execution info is passed in block producer * chore: restore dependency on blockifier as we use TxExecInfo primitive * refactor(katana): decouple `katana-primitives` from any executor impls (#1637) * fix: clippy / fmt * merge * fix: clippy --------- Co-authored-by: Kariy <[email protected]> Co-authored-by: Ammar Arif <[email protected]>

glihm · 2024-03-25T19:29:40Z

I didn't manage to have the CI passed, trying locally.

These are the issues I have on running the CI command for testing:

--- STDOUT:              katana-executor::executor sir::test_executor_with_valid_blocks ---

running 1 test
test sir::test_executor_with_valid_blocks ... FAILED

failures:

failures:
    sir::test_executor_with_valid_blocks

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 1 filtered out; finished in 3.04s


--- STDERR:              katana-executor::executor sir::test_executor_with_valid_blocks ---
thread 'sir::test_executor_with_valid_blocks' panicked at /home/g2p/.cargo/git/checkouts/cairo_native-0bad8506281b7281/baf57d2/src/libfuncs.rs:299:51:
index out of bounds: the len is 0 but the index is 0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

   Canceling due to test failure: 11 tests still running
        PASS [   0.008s] katana-primitives event::test::parse_should_fail
        FAIL [   1.745s] katana-executor::simulate sir::test_simulate_tx::case_1_tx

--- STDOUT:              katana-executor::simulate sir::test_simulate_tx::case_1_tx ---

running 1 test
test sir::test_simulate_tx::case_1_tx ... FAILED

failures:

failures:
    sir::test_simulate_tx::case_1_tx

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 7 filtered out; finished in 1.72s


--- STDERR:              katana-executor::simulate sir::test_simulate_tx::case_1_tx ---
thread 'sir::test_simulate_tx::case_1_tx' panicked at /home/g2p/.cargo/git/checkouts/cairo_native-0bad8506281b7281/baf57d2/src/libfuncs.rs:299:51:
index out of bounds: the len is 0 but the index is 0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

        PASS [   3.523s] katana-executor::executor blockifier::test_executor_with_valid_blocks
        PASS [   0.531s] katana-primitives conversion::rpc::tests::legacy_rpc_to_inner_and_back
        PASS [   7.766s] dojo-lang semantics::tests::dojo_semantics::set
        FAIL [   1.989s] katana-executor::simulate sir::test_simulate_tx::case_3_tx_no_signature_skip_validate

--- STDOUT:              katana-executor::simulate sir::test_simulate_tx::case_3_tx_no_signature_skip_validate ---

running 1 test
test sir::test_simulate_tx::case_3_tx_no_signature_skip_validate ... FAILED

failures:

failures:
    sir::test_simulate_tx::case_3_tx_no_signature_skip_validate

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 7 filtered out; finished in 1.97s


--- STDERR:              katana-executor::simulate sir::test_simulate_tx::case_3_tx_no_signature_skip_validate ---
thread 'sir::test_simulate_tx::case_3_tx_no_signature_skip_validate' panicked at /home/g2p/.cargo/git/checkouts/cairo_native-0bad8506281b7281/baf57d2/src/libfuncs.rs:299:51:
index out of bounds: the len is 0 but the index is 0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

        PASS [   1.858s] katana-executor::simulate sir::test_simulate_tx::case_4_tx_no_signature
        FAIL [   2.037s] katana-executor::simulate sir::test_simulate_tx::case_2_tx_skip_validate

--- STDOUT:              katana-executor::simulate sir::test_simulate_tx::case_2_tx_skip_validate ---

running 1 test
test sir::test_simulate_tx::case_2_tx_skip_validate ... FAILED

failures:

failures:
    sir::test_simulate_tx::case_2_tx_skip_validate

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 7 filtered out; finished in 2.01s


--- STDERR:              katana-executor::simulate sir::test_simulate_tx::case_2_tx_skip_validate ---
thread 'sir::test_simulate_tx::case_2_tx_skip_validate' panicked at /home/g2p/.cargo/git/checkouts/cairo_native-0bad8506281b7281/baf57d2/src/libfuncs.rs:299:51:
index out of bounds: the len is 0 but the index is 0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

        PASS [   2.195s] katana-primitives conversion::rpc::tests::flattened_sierra_class_to_compiled_class
        PASS [  47.953s] dojo-world contracts::world::test::test_world_contract_reader
        PASS [  48.195s] dojo-world contracts::model::model_test::test_model
        FAIL [  48.256s] dojo-world manifest::test::fetch_remote_manifest

--- STDOUT:              dojo-world manifest::test::fetch_remote_manifest ---

running 1 test
test manifest::test::fetch_remote_manifest ... FAILED

failures:

failures:
    manifest::test::fetch_remote_manifest

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 17 filtered out; finished in 48.24s


--- STDERR:              dojo-world manifest::test::fetch_remote_manifest ---
thread 'manifest::test::fetch_remote_manifest' panicked at crates/dojo-world/src/manifest_test.rs:383:5:
assertion `left == right` failed
  left: 2
 right: 3
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

------------
     Summary [  48.284s] 100/318 tests run: 95 passed, 5 failed, 1 skipped
        FAIL [  48.256s] dojo-world manifest::test::fetch_remote_manifest
        FAIL [   3.062s] katana-executor::executor sir::test_executor_with_valid_blocks
        FAIL [   1.745s] katana-executor::simulate sir::test_simulate_tx::case_1_tx
        FAIL [   2.037s] katana-executor::simulate sir::test_simulate_tx::case_2_tx_skip_validate
        FAIL [   1.989s] katana-executor::simulate sir::test_simulate_tx::case_3_tx_no_signature_skip_validate
error: test run failed

codecov · 2024-03-25T22:29:20Z

Codecov Report

Attention: Patch coverage is 60.69029% with 1697 lines in your changes are missing coverage. Please review.

Project coverage is 62.33%. Comparing base (810b0f4) to head (0c67745).
Report is 3 commits behind head on main.

Files	Patch %	Lines
...es/katana/executor/src/implementation/sir/utils.rs	55.02%	273 Missing ⚠️
...na/executor/src/implementation/blockifier/utils.rs	63.31%	197 Missing ⚠️
crates/katana/rpc/rpc/src/starknet.rs	29.09%	156 Missing ⚠️
crates/saya/provider/src/rpc/transaction.rs	0.00%	132 Missing ⚠️
crates/katana/executor/src/implementation/noop.rs	17.75%	88 Missing ⚠️
crates/saya/provider/src/rpc/mod.rs	0.00%	88 Missing ⚠️
crates/katana/core/src/service/block_producer.rs	68.72%	76 Missing ⚠️
...na/executor/src/implementation/blockifier/state.rs	84.98%	68 Missing ⚠️
crates/katana/rpc/rpc-types/src/trace.rs	0.00%	58 Missing ⚠️
crates/katana/executor/src/abstraction/mod.rs	39.75%	50 Missing ⚠️
... and 44 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1697      +/-   ##
==========================================
- Coverage   68.09%   62.33%   -5.77%     
==========================================
  Files         273      295      +22     
  Lines       29509    33803    +4294     
==========================================
+ Hits        20095    21072     +977     
- Misses       9414    12731    +3317

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

glihm

Awesome work man. 🚀

Could you just open an issue or let somewhere a trace on why we have cairo native commented out for now? Thanks a lot mate.

kariy and others added 16 commits March 18, 2024 21:28

refactor(katana): change stored compiled class (#1559)

ee4ad9c

Both `blockifier` and `starknet_in_rust` use their own proprietary contract class types. So need to have a type where the types from those two crates can be derived from.

refactor(katana-primitives): move class related types to a separate m…

337b654

…odule (#1560)

Katana executor traits (#1561)

38230c2

feat(katana-executor): add blockifier executor implementations (#1562)

7cee1ca

implement the executor traits introduced in #1561 based on `blockifier`

Refactor Katana to using the new executor traits (#1563)

5dd94a8

integrate the new executor traits introduced in #1561 to katana

feat(katana-executor): add starknet_in_rust executor (#1564)

22ff4a5

doc(katana-executor): add README

bce0197

test(katana-executor): add test for transaction simulation (#1593)

96e928f

test(katana-executor): refactor simulate tests (#1606)

4196d7f

refactor tests

refactor(katana): decouple katana-primitives from any executor impls (

2262892

#1637)

test(katana-executor): improve tests and add test for state (#1649)

8e79558

- add tests for each executor's CachedState - improve test in executor.rs - fix sir not enough gas error - fix test in simulate.rs

feat(katana-primitives): add fee info type

0b9ed9b

Refactor executor output

51752e2

Merge branch 'main' into dev/katana

4e855a5

fix(katana): add missing contract address in CallInfo

7fff40c

Remove native feature for now

e3fb97c

kariy force-pushed the dev/katana branch from 3e9bf5a to 0fd14dd Compare March 25, 2024 22:43

glihm added the katana This issue is related to Katana label Mar 26, 2024

kariy force-pushed the dev/katana branch from 0fd14dd to 94cd788 Compare March 26, 2024 02:16

Limit nextest build jobs

cac2d19

kariy force-pushed the dev/katana branch from 94cd788 to cac2d19 Compare March 26, 2024 02:43

kariy added 2 commits March 26, 2024 12:09

refactor(katana-executor): add logs for transaction events and resources

3636462

fix(katana-executor): return reverted tx as error in estimate fee

0c67745

glihm approved these changes Mar 26, 2024

View reviewed changes

kariy mentioned this pull request Mar 26, 2024

Add support for cairo-native #1705

Closed

kariy merged commit 5340720 into main Mar 26, 2024
10 of 12 checks passed

kariy deleted the dev/katana branch March 26, 2024 15:44

This was referenced Mar 27, 2024

fix(katana-rpc): use tx rpc type instead of primitive for torii api #1709

Closed

fix(katana-core): dont use optional dep in non-feature specific code #1746

Merged

kariy mentioned this pull request Apr 4, 2024

katana: bump gas for contract calls to 1B #1766

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge `dev/katana` branch #1697

Merge `dev/katana` branch #1697

kariy commented Mar 25, 2024

glihm commented Mar 25, 2024

codecov bot commented Mar 25, 2024 •

edited

Loading

glihm left a comment

Merge dev/katana branch #1697

Merge dev/katana branch #1697

Conversation

kariy commented Mar 25, 2024

glihm commented Mar 25, 2024

codecov bot commented Mar 25, 2024 • edited Loading

Codecov Report

glihm left a comment

Choose a reason for hiding this comment

Merge `dev/katana` branch #1697

Merge `dev/katana` branch #1697

codecov bot commented Mar 25, 2024 •

edited

Loading