more genesis (bp #7291)

[mergify]

This is an automated backport of pull request #7291 done by Mergify.io

Cherry-pick of d8e1a19 has failed:

On branch mergify/bp/v0.21/pr-7291
Your branch is up to date with 'origin/v0.21'.

You are currently cherry-picking commit d8e1a196b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   genesis/src/unlocks.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   genesis/src/genesis_accounts.rs
	both modified:   genesis/src/stakes.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the [documention](https://doc.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio rebase will rebase this PR
• @Mergifyio backports <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

[codecov]

Codecov Report

Merging #7293 into v0.21 will decrease coverage by 4.5%.
The diff coverage is 78.9%.

@@           Coverage Diff           @@
##           v0.21   #7293     +/-   ##
=======================================
- Coverage   79.4%   74.8%   -4.6%     
=======================================
  Files        239     240      +1     
  Lines      45628   49389   +3761     
=======================================
+ Hits       36232   36958    +726     
- Misses      9396   12431   +3035

[garious]

@rob-solana

[mvines]

#7252 is needed too

[mvines]

commit dfc48705a40754e4963d7a209606b5d0836bcd45 (HEAD -> v0.21, origin/v0.21)
Author: Rob Walker <rob@solana.com>
Date:   Thu Dec 5 08:30:34 2019 -0800

    more genesis (#7291)

commit f59115b503dc545490b1a9142d54d38ded9a356e
Author: Rob Walker <rob@solana.com>
Date:   Tue Dec 3 22:18:12 2019 -0800

    bs58 (#7252)