Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge SFCLib and SFC contracts #82

Merged
merged 12 commits into from
Oct 31, 2024
Merged

Merge SFCLib and SFC contracts #82

merged 12 commits into from
Oct 31, 2024

Commits on Oct 25, 2024

  1. Move interfaces into separate directory

    Mike-CZ committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    883717f View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. Rename interfaces

    Mike-CZ committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    5815adb View commit details
    Browse the repository at this point in the history

  2. Merge SFCLib and SFC contracts

    Mike-CZ committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    97aef3d View commit details
    Browse the repository at this point in the history

  3. Fix lint errors

    Mike-CZ committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    892017d View commit details
    Browse the repository at this point in the history

  4. Fix solhint warning

    Mike-CZ committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    998e2ad View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge branch 'sonic_sfc' into mike/sfc_merge 

    # Conflicts:
#	contracts/sfc/SFC.sol
#	contracts/sfc/SFCBase.sol
#	contracts/sfc/SFCLib.sol
#	contracts/sfc/SFCState.sol
#	contracts/test/UnitTestSFC.sol
    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    3314c46 View commit details
    Browse the repository at this point in the history

  2. Merge removed lock

    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0715895 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sonic_sfc' into mike/iface_refactor

    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    b4c6585 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'mike/iface_refactor' into mike/sfc_merge

    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    d7c12b1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'sonic_sfc' into mike/sfc_merge 

    # Conflicts:
#	contracts/sfc/NetworkInitializer.sol
#	contracts/sfc/Updater.sol
    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    f2cf506 View commit details
    Browse the repository at this point in the history

  6. Reorganize Validator struct fields

    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5e22990 View commit details
    Browse the repository at this point in the history

  7. Reorganize Validator struct fields

    Mike-CZ committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    c236915 View commit details
    Browse the repository at this point in the history