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 queue: embarking main (e95a70d) and #8413 together #8467

Closed
wants to merge 57 commits into from
Closed

merge queue: embarking main (e95a70d) and #8413 together #8467

wants to merge 57 commits into from

Commits on Apr 2, 2024

  1. minor cleanup and rename

    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9db4762 View commit details
    Browse the repository at this point in the history

  2. Adds an empty NetworkParameters struct to Network::Testnet variant, u… 

    …pdates production code.
    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    4b86bd6 View commit details
    Browse the repository at this point in the history

  3. Updates tests

    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7533e2f View commit details
    Browse the repository at this point in the history

  4. Adds NetworkKind and uses it instead of Network in `HistoryTreePa… 

    …rts` and `transparent::Address`
    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    06cf947 View commit details
    Browse the repository at this point in the history

  5. Adds a [network.testnet_parameters] section to the config, uses `Netw… 

    …orkKind` as zebra_network::Config::network field type, and converts 'Network' to `NetworkKind` before serializing
    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    4900a20 View commit details
    Browse the repository at this point in the history

  6. Applies some suggestions from code review

    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    cb8726b View commit details
    Browse the repository at this point in the history

  7. Applies suggestions from code review

    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    d5a807a View commit details
    Browse the repository at this point in the history

  8. returns b58 prefix constants directly to remove From<NetworkKind> imp… 

    …l for zcash_primitives::consensus::Network
    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    d108ec6 View commit details
    Browse the repository at this point in the history

  9. Applies more suggestions from code review.

    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    574b1f9 View commit details
    Browse the repository at this point in the history

  10. moves conversions to zcash_primitives::consensus::Network to where th… 

    …ey're used.
    @arya2
    arya2 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    05e41a2 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Apply suggestions from code review 

    Co-authored-by: Marek <[email protected]>
    @arya2 @upbqdn
    arya2 and upbqdn authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    fd3d505 View commit details
    Browse the repository at this point in the history

  2. rename network variables and method names typed as NetworkKind to `… 

    …network_kind`
    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    f04b94b View commit details
    Browse the repository at this point in the history

  3. use only test block heights for the network associated with them

    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ea2d001 View commit details
    Browse the repository at this point in the history

  4. Applies more suggestions from code review.

    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    86cd919 View commit details
    Browse the repository at this point in the history

  5. Rename NetworkParameters to Parameters and move it a new `testnet… 

    …` module
    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    365b58e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into network-params

    @arya2
    arya2 authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    eca7f6b View commit details
    Browse the repository at this point in the history

  7. adds activation heights field

    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    60248e3 View commit details
    Browse the repository at this point in the history

  8. updates stored test config, adds a quicker test for checking that sto… 

    …red configs can be parsed, adds an intermediate representation of activation heights
    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    b9bdf05 View commit details
    Browse the repository at this point in the history

  9. implement Parameters for Network

    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    ad4e7dc View commit details
    Browse the repository at this point in the history

  10. Passes &Network directly instead of converting to zp_consensus::Netwo… 

    …rk where there were conversions
    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4347a80 View commit details
    Browse the repository at this point in the history

  11. fixes a bad merge (removes a network conversion in zcash_note_encrypt… 

    …ion)
    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    080affd View commit details
    Browse the repository at this point in the history

  12. Adds a test for the Parameters impl for zebra_chain::Network

    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    2493e7e View commit details
    Browse the repository at this point in the history

  13. fixes doc links

    @arya2
    arya2 committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    997e265 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. - Makes the activation_heights config field optional by adding a #[… 

    …serde(default)]

- Panics if a non-zero activation height is provided for the `Genesis` network upgrade
- Always sets the `Genesis` and `BeforeOverwinter` network upgrade activation heights to 0 and 1, `BeforeOverwinter` could be overwritten by a later network upgrade
- Makes the `activation_heights` field on `Parameters` private, adds/uses an accessor method instead, and adds a builder struct and `build()` method
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    93c7a58 View commit details
    Browse the repository at this point in the history

  2. small refactor of activation_heights() method

    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    0fd4158 View commit details
    Browse the repository at this point in the history

  3. check that activation heights are in the right order

    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    3952caa View commit details
    Browse the repository at this point in the history

  4. Updates NetworkUpgrade::activation_height() to return the height of… 

    … the next NetworkUpgrade if it doesn't find the activation height of `&self`
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    e697d36 View commit details
    Browse the repository at this point in the history

  5. checks that the miner address is of TestnetKind on Regtest and update… 

    … assertion message
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    325a6c6 View commit details
    Browse the repository at this point in the history

  6. Adds a DNetworkUpgradeActivationHeights struct for better control ove… 

    …r how activation heights can be configured
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f724c01 View commit details
    Browse the repository at this point in the history

  7. moves all ordered network upgrades to a constant, adds a no_duplicate… 

    …s test, moves struct with activation heights outside deserialization impl and accepts it in `ParametersBuilder::activation_heights()` instead of a Vec
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    a37510a View commit details
    Browse the repository at this point in the history

  8. panics if any network upgrades are configured to activate at Height(0… 

    …) because it's reserved for Genesis
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    0abe873 View commit details
    Browse the repository at this point in the history

  9. Simplifies the ParametersBuilder::activation_heights() method and r… 

    …emoves an unnecessary test.
    @arya2
    arya2 committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1dfad53 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge branch 'main' into activ-heights-param-impl

    @arya2
    arya2 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    868535b View commit details
    Browse the repository at this point in the history

  2. Adds Sapling HRPs as fields on testnet params. (#8398)

    @arya2
    arya2 authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    0b835f1 View commit details
    Browse the repository at this point in the history

  3. Applies suggestions from code review.

    @arya2
    arya2 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    fb2d13a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Update zebra-chain/src/parameters/network_upgrade.rs 

    Co-authored-by: Marek <[email protected]>
    @arya2 @upbqdn
    arya2 and upbqdn authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    fea2162 View commit details
    Browse the repository at this point in the history

  2. Adds network_name field and accessor method on Parameters, uses i… 

    …t in the `Display` impl for `Network`
    @arya2
    arya2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a94dcab View commit details
    Browse the repository at this point in the history

  3. Removes unnecessary .filter()

    @arya2
    arya2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1173faf View commit details
    Browse the repository at this point in the history

  4. adds constraints on valid network names and a test

    @arya2
    arya2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1608472 View commit details
    Browse the repository at this point in the history

  5. adds config field for setting network name, adds "with_" prefix to Pa… 

    …rameterBuilder setter methods
    @arya2
    arya2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    08f0838 View commit details
    Browse the repository at this point in the history

  6. Adds MainnetKind, TestnetKind, and RegtestKind to reserved netw… 

    …ork names
    @arya2
    arya2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0e97b53 View commit details
    Browse the repository at this point in the history

  7. updates stored test configs and fixes network_name() docs

    @arya2
    arya2 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a842c12 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge remote-tracking branch 'origin/main' into params-network-name

    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    c79e06f View commit details
    Browse the repository at this point in the history

  2. Adds a new_regtest() method on Network and testnet::Parameters,… 

    … updates config deserialization to return an error if the initial_testnet_peers include any default initial peers AND contain configured activation heights
    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    6e29727 View commit details
    Browse the repository at this point in the history

  3. Updates activates_network_upgrades_correctly test to check Regtest … 

    …activation heights (and default Mainnet/Testnet)
    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    32d0758 View commit details
    Browse the repository at this point in the history

  4. Refactors if-let & match statement into general match statement, remo… 

    …ves constraint against including `testnet_parameters` field/section in the config when using `Mainnet` or `Regtest`
    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    e816c66 View commit details
    Browse the repository at this point in the history

  5. Removes outdated TODO

    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    32e4fbb View commit details
    Browse the repository at this point in the history

  6. Restores testnet_parameters section of the latest stored config.

    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    63623ae View commit details
    Browse the repository at this point in the history

  7. Adds with_sapling_hrps() method and uses it to set the Regtest HRPs… 

    … in `new_regtest()`.

Adds a test for Sapling HRP validation
    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    d871590 View commit details
    Browse the repository at this point in the history

  8. Checks that default Mainnet/Testnet/Regtest Sapling HRPs pass validat… 

    …ion in `with_sapling_hrps()`
    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    4671efe View commit details
    Browse the repository at this point in the history

  9. Uses the correct constant in test

    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9b41cba View commit details
    Browse the repository at this point in the history

  10. Adds is_regtest() methods

    @arya2
    arya2 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    b38dbfd View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge remote-tracking branch 'origin/main' into params-new-regtest

    @arya2
    arya2 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    b7957e9 View commit details
    Browse the repository at this point in the history

  2. Updates test docs

    @arya2
    arya2 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    13d59ad View commit details
    Browse the repository at this point in the history

  3. drop custom panic hooks after expected panics

    @arya2
    arya2 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    3b5a7f5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into params-new-regtest

    @arya2
    arya2 authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ace7f19 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Merge of #8413

    @mergify
    mergify[bot] authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    07a4f89 View commit details
    Browse the repository at this point in the history