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 compatible to rampup (30 jan 2024) #15001

Merged
merged 11 commits into from
Jan 30, 2024
Merged

Merge compatible to rampup (30 jan 2024) #15001

merged 11 commits into from
Jan 30, 2024

Conversation

georgeee
Copy link
Member

Simple merge of compatible to rampup, no conflicts happened when merging.

Checklist:

  • Dependency versions are unchanged
    • Notify Velocity team if dependencies must change in CI
  • Modified the current draft of release notes with details on what is completed or incomplete within this project
  • Document code purpose, how to use it
    • Mention expected invariants, implicit constraints
  • Tests were added for the new behavior
    • Document test purpose, significance of failures
    • Test names should reflect their purpose
  • All tests pass (CI will check this if you didn't)
  • Serialized types are in stable-versioned modules
  • Does this close issues? None

mrmr1993 and others added 11 commits January 17, 2024 15:25
@mrmr1993
Add Mina_stdlib
7e591d6
@mrmr1993
Add opam file
35fc55a
@georgeee
Add prepare test ledger script
2781d5e 
Adds a script that downloads staking ledger for the current epoch in
mainnet and updates keys in it to delegate to a defined set of
delegates.

USAGE:

```
KEY_BALANCE=100 NUM_GHOST_KEYS=2 ./scripts/prepare-test-ledger.sh B62qiy32p8kAKnny8ZFwoMhYpBppM1DWVCqAPBYNcXnsAHhnfAAuXgg B62qmqMrgPshhHKLJ7DqWn1KeizEgga5MuGmWb2bXajUnyivfeMW6JE B62qmVHmj3mNhouDf1hyQFCSt3ATuttrxozMunxYMLctMvnk5y7nas1 > /tmp/new_ledger.json
```

Command above generates a ledger with three keys specified as arguments
being delegates, each holding balance of 100 MINA. Parameter
NUM_GHOST_KEYS controls how many keys are not re-delegated. With three
delegate keys and NUM_GHOST_KEYS=2, 2/5 keys in ledger are unaltered.

Defaults:

  * `NUM_GHOST_KEYS = 2`
  * `KEY_BALANCE = 100000`
@georgeee
Update prepare-test-ledger.sh
7fcf8a1 
Run shell check, update error message
@georgeee
Rewrite script slightly
f5f863b
@georgeee
Simplify the script
e328313
@georgeee
fixup! Simplify the script
de209ea
@georgeee
Merge pull request #14941 from MinaProtocol/georgeee/prepare-test-led…
5b7fc02 
…ger-script

Add prepare test ledger script
@mrmr1993
Merge pull request #14895 from MinaProtocol/merges-cleanly-to-rampup
7c4b2a9 
[compatible] Add 'merges cleanly to rampup' CI job
@mrmr1993
Merge pull request #14893 from MinaProtocol/feature/stdlib
aeca8b8 
Add Mina_stdlib
@georgeee
Merge remote-tracking branch 'origin/compatible' into HEAD
8ee2625
@georgeee georgeee requested review from a team as code owners January 30, 2024 14:04
@georgeee
Copy link
Member Author

!ci-build-me

@amc-ie amc-ie self-requested a review January 30, 2024 16:46
@deepthiskumar
Copy link
Member

!approved-for-mainnet

@deepthiskumar deepthiskumar merged commit 9235347 into rampup Jan 30, 2024
14 of 15 checks passed
@deepthiskumar deepthiskumar deleted the georgeee/merge-compatible-to-rampup-30-jan-2024 branch January 30, 2024 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkijania dkijania dkijania approved these changes

@amc-ie amc-ie Awaiting requested review from amc-ie

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@georgeee @deepthiskumar @dkijania @mrmr1993