chore: improve error reporting when joining community #7178
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -1263,29 +1263,36 @@ func (m *Messenger) generateCommunityRequestsForSigning(memberPubKey string, com | |
| return nil, err | ||
| } | ||
|
|
||
| if len(addressesToReveal) == 0 { | ||
| return nil, errors.New("no addresses to reveal") | ||
| } | ||
|
|
||
| walletAccountsMap := make(map[string]*accsmanagementtypes.Account, len(walletAccounts)) | ||
| for _, walletAccount := range walletAccounts { | ||
| addressHex := strings.ToLower(walletAccount.Address.Hex()) | ||
| walletAccountsMap[addressHex] = walletAccount | ||
| } | ||
|
|
||
| msgsToSign := make([]personal.SignParams, 0) | ||
| for _, address := range addressesToReveal { | ||
| walletAccount, ok := walletAccountsMap[strings.ToLower(address)] | ||
| if !ok { | ||
| return nil, fmt.Errorf("address %s not found in wallet", address) | ||
| } | ||
|
|
||
|
Collaborator
Author
There was a problem hiding this comment. Hmm, this condition A few tests were relying on this behaviour, passing empty list of addresses: status-go/protocol/communities_messenger_shared_member_address_test.go Lines 207 to 208 in c0f75d6
Collaborator
Author
There was a problem hiding this comment. Maybe we should explicitly return an error when an empty
Collaborator
Author
There was a problem hiding this comment. Added explicit error return here |
||
| if walletAccount.Chat { | ||
| return nil, fmt.Errorf("address %s is a chat account", address) | ||
| } | ||
|
|
||
| if walletAccount.Type == accsmanagementtypes.AccountTypeWatch { | ||
| return nil, fmt.Errorf("address %s is a watch account", address) | ||
| } | ||
|
|
||
| requestID := []byte{} | ||
| if !isEdit { | ||
| requestID = communities.CalculateRequestID(memberPubKey, communityID) | ||
| } | ||
|
|
||
| msgsToSign = append(msgsToSign, personal.SignParams{ | ||
| Data: types.EncodeHex(crypto.Keccak256(m.IdentityPublicKeyCompressed(), communityID, requestID)), | ||
| Address: walletAccount.Address.Hex(), | ||
|
|
@@ -1354,7 +1361,7 @@ func (m *Messenger) RequestToJoinCommunity(request *requests.RequestToJoinCommun | |
| // TODO: Because of changes that need to be done in tests, calling this function and providing `request` without `AddressesToReveal` | ||
| // is not an error, but it should be. | ||
| logger := m.logger.Named("RequestToJoinCommunity") | ||
| logger.Debug("addresses to reveal", zap.Strings("addresses", request.AddressesToReveal)) | ||
|
|
||
| if err := request.Validate(); err != nil { | ||
| logger.Debug("request failed to validate", zap.Error(err), zap.Any("request", request)) | ||
|
|
@@ -1371,7 +1378,10 @@ func (m *Messenger) RequestToJoinCommunity(request *requests.RequestToJoinCommun | |
| return nil, communities.ErrAlreadyJoined | ||
| } | ||
|
|
||
| requestToJoin, err := m.communitiesManager.CreateRequestToJoin(request, m.account.GetCustomizationColor()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if len(request.AddressesToReveal) > 0 { | ||
| revealedAddresses := make([]gethcommon.Address, 0) | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Do we call
CreateRequestToJoinfor an open community also?If so the list of signatures is empty in that case and this will always return.
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.
Or
AddressesToRevealis also empty in that case? I really don't remember.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.
I've tested with Status Desktop.
Created a simplest community (auto accept, no permissions, no minted tokens). Member was still required to reveal addresses and input password for signatures. So it's the same flow, we should be good.