Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

fix(transaction): remove charge fee flag from the transaction executo… #1970

Merged

Conversation

meship-starkware
Copy link
Contributor

@meship-starkware meship-starkware commented Jun 9, 2024

…r execute


This change is Reviewable

@codecov-commenter
Copy link

codecov-commenter commented Jun 9, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 4 lines in your changes missing coverage. Please review.

Project coverage is 78.38%. Comparing base (cefb2a2) to head (99df797).

Files Patch % Lines
crates/native_blockifier/src/py_block_executor.rs 0.00% 2 Missing ⚠️
...es/blockifier/src/blockifier/stateful_validator.rs 0.00% 0 Missing and 1 partial ⚠️
.../blockifier/src/blockifier/transaction_executor.rs 75.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1970      +/-   ##
==========================================
+ Coverage   78.35%   78.38%   +0.03%     
==========================================
  Files          62       62              
  Lines        8861     8855       -6     
  Branches     8861     8855       -6     
==========================================
- Hits         6943     6941       -2     
+ Misses       1479     1475       -4     
  Partials      439      439              

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

OriStarkware
OriStarkware previously approved these changes Jun 9, 2024
Copy link
Contributor

@OriStarkware OriStarkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @noaov1)

Copy link
Collaborator

@noaov1 noaov1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @meship-starkware)


crates/blockifier/src/blockifier/transaction_executor.rs line 113 at r1 (raw file):

        &mut self,
        txs: &[Transaction],
        charge_fee: bool,

Can be removed.

Code quote:

        charge_fee: bool,

crates/blockifier/src/blockifier/transaction_executor.rs line 120 at r1 (raw file):

            txs.chunks(self.config.concurrency_config.chunk_size)
                .fold_while(Vec::new(), |mut results, chunk| {
                    let chunk_results = self.execute_chunk(chunk, charge_fee);

Suggestion:

 let chunk_results = self.execute_chunk(chunk);

crates/blockifier/src/blockifier/transaction_executor.rs line 137 at r1 (raw file):

        &mut self,
        _chunk: &[Transaction],
        _charge_fee: bool,

Copy link
Collaborator

@noaov1 noaov1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @meship-starkware)


crates/blockifier/src/blockifier/transaction_executor.rs line 113 at r1 (raw file):

Previously, noaov1 (Noa Oved) wrote…

Can be removed.

I think that this requires a python PR

Copy link
Collaborator

@noaov1 noaov1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @meship-starkware)


crates/blockifier/src/blockifier/transaction_executor.rs line 113 at r1 (raw file):

Previously, noaov1 (Noa Oved) wrote…

I think that this requires a python PR

It does not, my bad.

Copy link
Contributor Author

@meship-starkware meship-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 3 of 4 files reviewed, 3 unresolved discussions (waiting on @noaov1 and @OriStarkware)


crates/blockifier/src/blockifier/transaction_executor.rs line 113 at r1 (raw file):

Previously, noaov1 (Noa Oved) wrote…

It does not, my bad.

Done.


crates/blockifier/src/blockifier/transaction_executor.rs line 120 at r1 (raw file):

            txs.chunks(self.config.concurrency_config.chunk_size)
                .fold_while(Vec::new(), |mut results, chunk| {
                    let chunk_results = self.execute_chunk(chunk, charge_fee);

Done.


crates/blockifier/src/blockifier/transaction_executor.rs line 137 at r1 (raw file):

        &mut self,
        _chunk: &[Transaction],
        _charge_fee: bool,

Done.

noaov1
noaov1 previously approved these changes Jun 10, 2024
Copy link
Collaborator

@noaov1 noaov1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @meship-starkware)

@meship-starkware meship-starkware force-pushed the meship/remove_cahrge_fee_flag_from_tx_execute branch 2 times, most recently from 88b1683 to 4dcc3e5 Compare June 10, 2024 08:54
@meship-starkware meship-starkware force-pushed the meship/remove_cahrge_fee_flag_from_tx_execute branch from 4dcc3e5 to 99df797 Compare June 10, 2024 08:57
Copy link
Collaborator

@noaov1 noaov1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @meship-starkware)

@meship-starkware meship-starkware merged commit 4505d16 into main Jun 10, 2024
9 checks passed
@meship-starkware meship-starkware deleted the meship/remove_cahrge_fee_flag_from_tx_execute branch June 10, 2024 12:14
gswirski pushed a commit to reilabs/blockifier that referenced this pull request Jun 26, 2024
* Use name hash for model identifiers

* Dojo layout rework

* support nested tuple/array/bytearray

* new Layout::Enum to support enum with different variant data

* merge from storage-layout branch

* cleaning

* support direct array/span introspect instead of generating it during code compilation

* fix Copy trait implementation for Array<u64>

* generate the model/field selector value instead of selector!(...)

* feat: start implementing new layout on torii wip

* update: cainome for serde & serialize layout

* feat: handle bytearray in ty

* feat: add new layout types (tuple/array/bytearray) to types & grpc

* fix: gql

* fix: model id for processors

* featr: start handling sql new tytpes

* feat: make tuple and bytearray work

* feat: store set record for tuples

* feat: start working on array

* feat: set support for bytearray & tuples

* feat: primitive arrays working

* feat: complex array types

* feat: start work on graphql for arrays

* fix: tuples for graphql

* fix: sanitize member type names gql

* feat: remove tuple from scalar types

* chore: fetch row by idx

* feat: add new type data for array

* feat: add updated_at for entity models data

* feat: start handle array type datalogic

* refactor: use list typedata

* refactor: modela data recursive

* feat: get list with new type data correctly

* feat: finished array support with nested types ✨

* fix: schema

* feat: torii packing

* integrates scarb nightly (starkware-libs#1971)

wip with scarb nightly

* fix: fmt + regenerate world bindings

* fix: remove serialization workaround

* fix: remove cairo warnings for build

* Storage layout improvement (starkware-libs#1965)

* Finalize the storage layout rework

- As the type recursion issue was fixed by Starkware, Layout/FieldLayout
  can be simplified.
- Update introspect size() and ty() methods
- Remove old model layout parsing in model.rs
- Split and reorganize introspect.rs code

* fix fmt+clippy

* update ABI binding

* fix cairo fmt

* feat: new parse schema function using cainome for model

* feat: complex enum supported ✨

* chore: bump blockifier and patch deps to use scarb nightly

* fix: run CAIRO_FIX tests and rebuild artifacts

* fix: use Tricks for dojo language server

* fix: remove async for language server

* wip: fix tests

* feat: add union type data for enums

* feat: continue work on type unions for enums

* feat: refactor complex enums

* feat: completely switch to using nested types for enums

* fmt

* clippy

* chore

* Automatically add Introspect derive attribute for Dojo models (starkware-libs#1982)

* Automatically add Introspect derive attribute for Dojo models

* fix fmt+clippy

* fix warning about trait path in Impl

* update dojo-lang tests

* fix dojo-lang system

* fix dojo-world model test

* fix option<T> introspect

* fix: ensure all models are correctly derived

---------

Co-authored-by: glihm <dev@glihm.net>

* fix: adjust tests with missing model

* wip: auth tests debug

* fix: ensure auth is using selector

* fix: fix some tests

* fix: models tests enum

* fix: other tests

* chore: tuple for u256

* refactor: u256 struct

* feat: simple enum types non nested + fix texts

* fmt

* fix: filtering by enum type name

* chore: clippy

* fmt

* fix: sql test

* refactor: packed size in tests &  simply functions

* fix: switch back u256 to primitive

* feat: use correct primitive u256 type & filtering

* wip

* chore: subscription test

* migration clippy

* wip

* feat: add new example with more types

* fix: strip enum variant type inf

* fix: nested tuples

* chore

* chore: remove debug logs

* fix: fix tests with new model

* fix: add missing manifests

* fix: fix cairo fmt

* fix: arrays

* fix: add tests and enhance error messages

* fix: fix build test and disable typescript for now

* fix: avoid race on manifest file for sql test

* feat: refactor schema deser from db & handle nested arrays

* chore: delete array elements on update

* fmt

* feat: add sozo prefix parsing for calldata

* fix: ensure migration for sql test waits for transactions

* fix: ensure build test works on a copy project

* fix: add missing transaction wait

* temp-fix: arrays

---------

Co-authored-by: Tarrence van As <tarrence@vanas.family>
Co-authored-by: remy.baranx@gmail.com <remy.baranx@gmail.com>
Co-authored-by: glihm <dev@glihm.net>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants