bugFix/change reward address #1749
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
| @@ -183,13 +183,15 @@ func (s *stakingAuctionSC) changeRewardAddress(args *vmcommon.ContractCallInput) | |||
| return vmcommon.UserError | |||
| } | |||
|
|
|||
| txData := "changeRewardAddress@" + hex.EncodeToString(registrationData.RewardAddress) | |||
There was a problem hiding this comment.
for this, I have used something like this in genesis package
arguments := make([]string, 0, len(registrationData.BlsPubKeys) + 2)
arguments = append(arguments, changeRewardAddressFunction)
arguments = append(arguments, hex.EncodeToString(registrationData.RewardAddress))
for _, blsKey := range registrationData.BlsPubKeys {
arguments = append(arguments, hex.EncodeToString(blsKey))
}
txData := strings.Join(arguments, "@")As can be seen, "changeRewardAddress" might be a const for this.
There was a problem hiding this comment.
i would leave it like this. it is the same.
There was a problem hiding this comment.
I know, just it was clearer what you add to the arguments list.
| vmOutput, err := s.executeOnStakingSC([]byte(txData)) | ||
| isError := err != nil || vmOutput.ReturnCode != vmcommon.Ok | ||
| if isError { | ||
| log.LogIfError(err) |
There was a problem hiding this comment.
maybe log at debug level the original error from vmOutput
There was a problem hiding this comment.
vmOutput cannot is only userError.
There was a problem hiding this comment.
yeah, could have used vmOutput.ReturnMessage but I'm guessing the system SC does not write that.
| @@ -276,8 +276,7 @@ func (r *stakingSC) changeRewardAddress(args *vmcommon.ContractCallInput) vmcomm | |||
| return vmcommon.UserError | |||
| } | |||
|
|
|||
| for i := 1; i < len(args.Arguments); i++ { | |||
| blsKey := args.Arguments[i] | |||
| for _, blsKey := range args.Arguments[1:] { | |||
SebastianMarian
approved these changes
May 15, 2020
iulianpascalau
approved these changes
May 15, 2020
LucianMincu
approved these changes
May 16, 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.
Change reward address fix - auction smart contract was calling in the wrong order the staking smart contract.