Merge berkeley into rampup #14278
Merged
Merge berkeley into rampup #14278
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cycle Fix bootstrap long async cycle
…tta_int_tests [CI] hardfail on rosetta int tests
The query returns the chain-agnostic identifier of the network conforming with the standard https://github.com/ChainAgnostic/namespaces.
…n_fix [Compatible] nightly tear down fix
waiting for deb fix
…rchive_node_changes [CI] Expanded RosettaIntegrationTests dirtyWhen attribute [Berk]
|
!ci-nightly-me |
…again Remove duplicated build for Lucy in CI
|
!ci-build-me |
|
!ci-nightly-me |
1. Use memo and fee range 2. Make max_account_updates configurable 3. Change type string of zkapp in internal logging to `zkapp:<num acc upds>:<num proofs>` 4. Reduce checking interval in `wait_until_zkapps_deployed`
|
!approved-for-mainnet |
…ements Zkapp generator improvements
|
@deepthiskumar did you want to also approve the PR (or just merge it)? |
…-logs hardcode number of oversized logs
…height-6 Update account_subtree_height to 6
…k-pool-summury-to-status-graphql
…k-pool-summury-to-status-graphql
…ummury-to-status-graphql Add snark pool information to the status metrics query results
|
!ci-nightly-me |
Raise balances 10x in berkeley ledger
…into-rampup-2023-10-05
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was one conflict, the timestamp on the berkeley genesis ledger. The later timestamp from the
rampupbranch was chosen.