-
Notifications
You must be signed in to change notification settings - Fork 369
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.
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
Fix elect validators migration, deploy integration #1847
Merged
Merged
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
ad680fd
First rev
45e66f4
Fix bug in assigning val 0 balance in genesis
de54a6c
Update val 0 balance for group 1
4f27db6
Fix sources for funds for validator migration
de7a1bd
Migrations working
c95e3d8
Update celo-blockchain commit for integration
0ed1eed
Cleanup
8c71e7c
Add debug messages to governance e2e test
15bac28
Fix governance e2e test, walletkit build
fe6e55e
Address comments
8be1721
Update blockscout, review issues
27e4ccc
Merge branch 'timmoreton/integration-fun' of github.com:celo-org/celo…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -91,7 +91,7 @@ export const privateKeyToStrippedAddress = (privateKey: string) => | |
|
||
const validatorZeroBalance = fetchEnvOrFallback( | ||
envVar.VALIDATOR_ZERO_GENESIS_BALANCE, | ||
'100010011000000000000000000' | ||
'103010030000000000000000000' | ||
) // 100,010,011 CG | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this comment still valid then? |
||
const validatorBalance = fetchEnvOrFallback( | ||
envVar.VALIDATOR_GENESIS_BALANCE, | ||
|
@@ -109,12 +109,12 @@ export const getStrippedAddressesFor = (accountType: AccountType, mnemonic: stri | |
getAddressesFor(accountType, mnemonic, n).map(strip0x) | ||
|
||
export const getValidators = (mnemonic: string, n: number) => { | ||
return getPrivateKeysFor(AccountType.VALIDATOR, mnemonic, n).map((key) => { | ||
return getPrivateKeysFor(AccountType.VALIDATOR, mnemonic, n).map((key, i) => { | ||
const blsKeyBytes = blsPrivateKeyToProcessedPrivateKey(key) | ||
return { | ||
address: strip0x(privateKeyToAddress(key)), | ||
blsPublicKey: bls12377js.BLS.privateToPublicBytes(blsKeyBytes).toString('hex'), | ||
balance: n === 0 ? validatorZeroBalance : validatorBalance, | ||
balance: i === 0 ? validatorZeroBalance : validatorBalance, | ||
} | ||
}) | ||
} | ||
|
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
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
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
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
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 a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we move back to 3?