fix-log-message-double-stake #2540
Merged
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
…in the same stake call.
| @@ -178,7 +179,9 @@ func (stp *stakingToPeer) UpdateProtocol(body *block.Body, nonce uint64) error { | |||
| // no data under key -> peer can be deleted from trie | |||
| if len(data) == 0 { | |||
| err = stp.peerState.RemoveAccount(blsPubKey) | |||
| log.LogIfError(err, "staking to protocol RemoveAccount blsPubKey", blsPubKey) | |||
| if err != nil { | |||
| log.Debug("staking to protocol RemoveAccount", "error", err, "blsPubKey", hex.EncodeToString(blsPubKey)) | |||
There was a problem hiding this comment.
Please use stp.pubkeyConv.Encode instead of hex.EncodeToString(blsPubKey)
There was a problem hiding this comment.
this is bls key, not bech32.
There was a problem hiding this comment.
pubkeyConv is of type hexPkConverter. Can be left as it is
| func checkDoubleBLSKeys(blsKeys [][]byte) bool { | ||
| mapKeys := make(map[string]struct{}) | ||
| for _, blsKey := range blsKeys { | ||
| _, found := mapKeys[string(blsKey)] |
| @@ -178,7 +179,9 @@ func (stp *stakingToPeer) UpdateProtocol(body *block.Body, nonce uint64) error { | |||
| // no data under key -> peer can be deleted from trie | |||
| if len(data) == 0 { | |||
| err = stp.peerState.RemoveAccount(blsPubKey) | |||
| log.LogIfError(err, "staking to protocol RemoveAccount blsPubKey", blsPubKey) | |||
| if err != nil { | |||
| log.Debug("staking to protocol RemoveAccount", "error", err, "blsPubKey", hex.EncodeToString(blsPubKey)) | |||
There was a problem hiding this comment.
all logs here are with staking to protocol.
| @@ -776,6 +792,11 @@ func (s *stakingAuctionSC) stake(args *vmcommon.ContractCallInput) vmcommon.Retu | |||
| return vmcommon.UserError | |||
| } | |||
|
|
|||
| if s.flagDoubleKey.IsSet() && checkDoubleBLSKeys(blsKeys) { | |||
| s.eei.AddReturnMessage("invalid arguments, found same bls key twice") | |||
There was a problem hiding this comment.
more than ones/many times ?
There was a problem hiding this comment.
it stops at found twice.
iulianpascalau
previously approved these changes
Dec 2, 2020
SebastianMarian
previously approved these changes
Dec 2, 2020
sasurobert
dismissed stale reviews from SebastianMarian and iulianpascalau
via
ffb961a
iulianpascalau
previously approved these changes
Dec 3, 2020
vm/systemSmartContracts/auction.go
Outdated
| newList := make([][]byte, 0) | ||
| mapExistingKeys := make(map[string]struct{}) | ||
| for _, blsKey := range registrationData.BlsPubKeys { | ||
| if _, found := mapExistingKeys[string(blsKey)]; found { |
| return vmcommon.UserError | ||
| } | ||
|
|
||
| err := s.eei.UseGas(s.gasCost.MetaChainSystemSCsCost.Stake) |
There was a problem hiding this comment.
So the cost for cleaning is s.gasCost.MetaChainSystemSCsCost.Stake?
vm/systemSmartContracts/auction.go
Outdated
| return vmcommon.UserError | ||
| } | ||
|
|
||
| if len(registrationData.BlsPubKeys) == 0 { |
| mapExistingKeys[string(blsKey)] = struct{}{} | ||
| newList = append(newList, blsKey) | ||
| } | ||
|
|
There was a problem hiding this comment.
You can add here:
if !changesMade {
return vmcommon.Ok
}
To avoid useless make and set with the same content, and remove L775 and L781
SebastianMarian
approved these changes
Dec 3, 2020
iulianpascalau
approved these changes
Dec 4, 2020
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.
fix log message. added protection against staking same key two times in the same stake call.