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

Merge main contract segmentation into main #1331

Merged
merged 8 commits into from
Jan 14, 2024
Merged

Merge main contract segmentation into main #1331

merged 8 commits into from
Jan 14, 2024

Commits on Dec 21, 2023

  1. Collect the set of visited PCs in the block. (#1233) 

    Collect the set of visited PCs in the block.
    @liorgold2
    liorgold2 committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    6eeb3d8 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Merge remote-tracking branch 'origin/main' into HEAD (no conflicts).

    @liorgold2
    liorgold2 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    c29756e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1291 from starkware-libs/lior/merge-main-into-mai… 

    …n-contract-segmentation

Merge main into main contract segmentation
    @liorgold2
    liorgold2 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    4e8e7b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. Merge 'origin/main' into main-contract-segmentation (with conflicts).

    @liorgold2
    liorgold2 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    d07fca1 View commit details
    Browse the repository at this point in the history

  2. Add updated version of estimate_casm_hash_computation_resources(). (#… 

    …1314)
    @liorgold2
    liorgold2 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    0cf233b View commit details
    Browse the repository at this point in the history

  3. Resolve conflicts.

    @liorgold2
    liorgold2 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    4a4094d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1317 from starkware-libs/lior/merge-main-into-mai… 

    …n-contract-segmentation

Merge main into main contract segmentation
    @liorgold2
    liorgold2 committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    2bcaa27 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. Merge remote-tracking branch 'origin/main-contract-segmentation' into… 

    … HEAD (no conflicts).
    @liorgold2
    liorgold2 committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    5e429f2 View commit details
    Browse the repository at this point in the history