status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: fetch comunity token metadata during handling community description (#4562)

This commit is contained in:
Mykhailo Prakhov 2024-01-16 09:08:56 +01:00 committed by GitHub
parent 3d7ab79d91
commit 94bee02ef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
protocol/communities/manager.go
View File

@ -1643,7 +1643,7 @@ func (m *Manager) handleCommunityDescriptionMessageCommon(community *Community,
return nil, err
}
if err = m.HandleCommunityTokensMetadataByPrivilegedMembers(community); err != nil {
if err = m.handleCommunityTokensMetadata(community); err != nil {
return nil, err
}
@ -1814,7 +1814,7 @@ func (m *Manager) HandleCommunityEventsMessage(signer *ecdsa.PublicKey, message
return nil, err
}
if err = m.HandleCommunityTokensMetadataByPrivilegedMembers(community); err != nil {
if err = m.handleCommunityTokensMetadata(community); err != nil {
return nil, err
}
@ -2858,7 +2858,7 @@ func (m *Manager) HandleCommunityRequestToJoinResponse(signer *ecdsa.PublicKey,
return nil, err
}
if err = m.HandleCommunityTokensMetadataByPrivilegedMembers(community); err != nil {
if err = m.handleCommunityTokensMetadata(community); err != nil {
return nil, err
}
@ -4721,16 +4721,7 @@ func (m *Manager) ReevaluatePrivilegedMember(community *Community, tokenPermissi
return alreadyHasPrivilegedRole, nil
}
func (m *Manager) HandleCommunityTokensMetadataByPrivilegedMembers(community *Community) error {
if community.HasPermissionToSendCommunityEvents() || community.IsControlNode() {
if err := m.HandleCommunityTokensMetadata(community); err != nil {
return err
}
}
return nil
}
func (m *Manager) HandleCommunityTokensMetadata(community *Community) error {
func (m *Manager) handleCommunityTokensMetadata(community *Community) error {
communityID := community.IDString()
communityTokens := community.CommunityTokensMetadata()

8
protocol/communities_events_utils_test.go
View File

@ -1887,10 +1887,10 @@ func testAddAndSyncTokenFromControlNode(base CommunityEventsTestsInterface, comm
s.Require().Len(syncTokens, 1)
s.Require().Equal(syncTokens[0].PrivilegesLevel, privilegesLvl)
// check CommunityToken was not added to the DB
// check CommunityToken was added to the DB
syncTokens, err = base.GetMember().communitiesManager.GetAllCommunityTokens()
s.Require().NoError(err)
s.Require().Len(syncTokens, 0)
s.Require().Len(syncTokens, 1)
}
func testAddAndSyncOwnerTokenFromControlNode(base CommunityEventsTestsInterface, community *communities.Community,
@ -2002,7 +2002,7 @@ func testAddAndSyncTokenFromEventSenderByControlNode(base CommunityEventsTestsIn
s.Require().NoError(err)
// check member did not receive sync message with the token
// check member received sync message with the token
_, err = WaitOnMessengerResponse(
base.GetMember(),
func(r *MessengerResponse) bool {
@ -2012,7 +2012,7 @@ func testAddAndSyncTokenFromEventSenderByControlNode(base CommunityEventsTestsIn
"no token sync message from event sender",
)
s.Require().Error(err)
s.Require().NoError(err)
}
func testEventSenderAddTokenMasterAndOwnerToken(base CommunityEventsTestsInterface, community *communities.Community) {

16
protocol/communities_messenger_helpers_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/status-im/status-go/params"
"github.com/status-im/status-go/protocol/common"
"github.com/status-im/status-go/protocol/communities"
"github.com/status-im/status-go/protocol/communities/token"
"github.com/status-im/status-go/protocol/protobuf"
"github.com/status-im/status-go/protocol/requests"
"github.com/status-im/status-go/services/communitytokens"
@ -121,6 +122,21 @@ func (c *CollectiblesServiceMock) SetMockCollectibleContractData(chainID uint64,
c.Collectibles[chainID][contractAddress] = collectible
}
func (c *CollectiblesServiceMock) SetMockCommunityTokenData(token *token.CommunityToken) {
if c.Collectibles == nil {
c.Collectibles = make(map[uint64]map[string]*communitytokens.CollectibleContractData)
}
data := &communitytokens.CollectibleContractData{
TotalSupply: token.Supply,
Transferable: token.Transferable,
RemoteBurnable: token.RemoteSelfDestruct,
InfiniteSupply: token.InfiniteSupply,
}
c.SetMockCollectibleContractData(uint64(token.ChainID), token.Address, data)
}
func (c *CollectiblesServiceMock) SafeGetSignerPubKey(ctx context.Context, chainID uint64, communityID string) (string, error) {
if c.Signers == nil {
c.Signers = make(map[string]string)

12
protocol/communities_messenger_signers_test.go
View File

@ -617,7 +617,6 @@ func (s *MessengerCommunitiesSignersSuite) forceCommunityChange(community *commu
}
func (s *MessengerCommunitiesSignersSuite) testSyncCommunity(mintOwnerToken bool) {
community := s.createCommunity(s.john)
s.advertiseCommunityTo(s.john, community, s.alice)
s.joinCommunity(s.john, community, s.alice)
@ -636,7 +635,7 @@ func (s *MessengerCommunitiesSignersSuite) testSyncCommunity(mintOwnerToken bool
tokenAddress := "token-address"
tokenName := "tokenName"
tokenSymbol := "TSM"
_, err := s.john.SaveCommunityToken(&token.CommunityToken{
communityToken := &token.CommunityToken{
TokenType: protobuf.CommunityTokenType_ERC721,
CommunityID: community.IDString(),
Address: tokenAddress,
@ -645,7 +644,9 @@ func (s *MessengerCommunitiesSignersSuite) testSyncCommunity(mintOwnerToken bool
Supply: &bigint.BigInt{},
Symbol: tokenSymbol,
PrivilegesLevel: token.OwnerLevel,
}, nil)
}
_, err := s.john.SaveCommunityToken(communityToken, nil)
s.Require().NoError(err)
// john adds minted owner token to community
@ -654,8 +655,7 @@ func (s *MessengerCommunitiesSignersSuite) testSyncCommunity(mintOwnerToken bool
// update mock - the signer for the community returned by the contracts should be john
s.collectiblesServiceMock.SetSignerPubkeyForCommunity(community.ID(), common.PubkeyToHex(&s.john.identity.PublicKey))
s.collectiblesServiceMock.SetMockCollectibleContractData(chainID, tokenAddress,
&communitytokens.CollectibleContractData{TotalSupply: &bigint.BigInt{}})
s.collectiblesServiceMock.SetMockCommunityTokenData(communityToken)
// alice accepts community update
_, err = WaitOnSignaledMessengerResponse(
@ -673,7 +673,7 @@ func (s *MessengerCommunitiesSignersSuite) testSyncCommunity(mintOwnerToken bool
s.shh,
s.alice.identity,
s.logger.With(zap.String("name", "alice-2")),
nil)
[]Option{WithCommunityTokensService(s.collectiblesServiceMock)})
s.Require().NoError(err)

4
protocol/messenger_communities.go
View File

@ -3663,10 +3663,6 @@ func (m *Messenger) RemoveCommunityToken(chainID int, contractAddress string) er
return m.communitiesManager.RemoveCommunityToken(chainID, contractAddress)
}
func (m *Messenger) FetchMissingCommunityTokens(community *communities.Community) error {
return m.communitiesManager.HandleCommunityTokensMetadata(community)
}
func (m *Messenger) CheckPermissionsToJoinCommunity(request *requests.CheckPermissionToJoinCommunity) (*communities.CheckPermissionToJoinResponse, error) {
if err := request.Validate(); err != nil {
return nil, err

8
services/ext/service.go
View File

@ -674,14 +674,6 @@ func (s *Service) fetchCommunity(communityID string, fetchLatest bool) (*communi
return nil, err
}
if community != nil {
// Call this to ensure CommunityTokens are stored to DB
err = s.messenger.FetchMissingCommunityTokens(community)
if err != nil {
return nil, err
}
}
return community, nil
}