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

feat(zk_toolbox): Add external_node consensus support #2821

Merged
merged 42 commits into from
Sep 12, 2024
Merged

feat(zk_toolbox): Add external_node consensus support #2821

merged 42 commits into from
Sep 12, 2024

Commits on Sep 6, 2024

  1. Copy consensus secrets

    @matias-gonz
    matias-gonz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    6e0d8a5 View commit details
    Browse the repository at this point in the history

  2. Copy consensus config

    @matias-gonz
    matias-gonz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    8049f39 View commit details
    Browse the repository at this point in the history

  3. Add consensus to external_node::run

    @matias-gonz
    matias-gonz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    f0c0dc2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into matias-zki-consensus

    @matias-gonz
    matias-gonz authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    068f191 View commit details
    Browse the repository at this point in the history

  5. Fix consensus secrets

    @matias-gonz
    matias-gonz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    f277585 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'matias-zki-consensus' of github.com:matter-labs/zksync-… 

    …era into matias-zki-consensus
    @matias-gonz
    matias-gonz committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    15b1a54 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Add generate_consensus_secrets

    @matias-gonz
    matias-gonz committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    a51a3e3 View commit details
    Browse the repository at this point in the history

  2. Add consensus config

    @matias-gonz
    matias-gonz committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    e5bf82f View commit details
    Browse the repository at this point in the history

  3. Set en consensus config

    @matias-gonz
    matias-gonz committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    c0b6053 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. impl SaveConfig for ConsensusConfig

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b3866ba View commit details
    Browse the repository at this point in the history

  2. Generate consensus_secrets

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ecae56e View commit details
    Browse the repository at this point in the history

  3. Remove unused CONSENSUS_SECRETS_PATH

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    a1bb148 View commit details
    Browse the repository at this point in the history

  4. Fix public addr parse

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b6a99e1 View commit details
    Browse the repository at this point in the history

  5. set correct key configs 

    Signed-off-by: Danil <deniallugo@gmail.com>
    @Deniallugo
    Deniallugo committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    f54c1cf View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2831 from matter-labs/deniallugo-set-correct-key-… 

    …configs

fix(zk_toolbox): set correct key configs
    @matias-gonz
    matias-gonz authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    7892527 View commit details
    Browse the repository at this point in the history

  7. remove unused params

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b8523bf View commit details
    Browse the repository at this point in the history

  8. Switch order

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    8f5b3aa View commit details
    Browse the repository at this point in the history

  9. Update public and server address

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    a3bafe3 View commit details
    Browse the repository at this point in the history

  10. move consensus keys

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ec7dbb4 View commit details
    Browse the repository at this point in the history

  11. Fix main node server and public address ports

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    149fafb View commit details
    Browse the repository at this point in the history

  12. Make consensus config optional

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b580b11 View commit details
    Browse the repository at this point in the history

  13. Add update_port_in_host

    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    9b4fb26 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' of github.com:matter-labs/zksync-era into matias-… 

    …zki-consensus
    @matias-gonz
    matias-gonz committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ace46fa View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge branch 'main' into matias-zki-consensus

    @matias-gonz
    matias-gonz authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    90d6305 View commit details
    Browse the repository at this point in the history

  2. Add consensus to ci

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    1a1c47a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'matias-zki-consensus' of github.com:matter-labs/zksync-… 

    …era into matias-zki-consensus
    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    ef57ee7 View commit details
    Browse the repository at this point in the history

  4. Add basic_witness_input_producer to RocksDbs

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    36b46e6 View commit details
    Browse the repository at this point in the history

  5. Create consensus chain with custom token

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    69bf960 View commit details
    Browse the repository at this point in the history

  6. Create consensus utils

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    318b240 View commit details
    Browse the repository at this point in the history

  7. Update consensus utils

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    5ed80d7 View commit details
    Browse the repository at this point in the history

  8. Add get_consensus_config

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    82068e0 View commit details
    Browse the repository at this point in the history

  9. Make strucs pub

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    c3fe95e View commit details
    Browse the repository at this point in the history

  10. Use Url::parse in update_port_in_host

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    5a2a394 View commit details
    Browse the repository at this point in the history

  11. Use SocketAddr instead of strings

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e3b4052 View commit details
    Browse the repository at this point in the history

  12. Update constants

    @matias-gonz
    matias-gonz committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    fabd6b9 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into matias-zki-consensus

    @Deniallugo
    Deniallugo authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    43bcc1a View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Update constants

    @matias-gonz
    matias-gonz committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    76d5574 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'matias-zki-consensus' of github.com:matter-labs/zksync-… 

    …era into matias-zki-consensus
    @matias-gonz
    matias-gonz committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    fc4bd6a View commit details
    Browse the repository at this point in the history

  3. Change SecretKeys to ConsensusSecretKeys

    @matias-gonz
    matias-gonz committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    7df30b6 View commit details
    Browse the repository at this point in the history

  4. Change let if to map

    @matias-gonz
    matias-gonz committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3ee92a1 View commit details
    Browse the repository at this point in the history

  5. fmt

    @matias-gonz
    matias-gonz committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    8c1c48d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into matias-zki-consensus

    @Deniallugo
    Deniallugo authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    729388e View commit details
    Browse the repository at this point in the history