Skip to content
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

ESDTWipe fixies #174

Merged
merged 2 commits into from
Oct 4, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/elasticClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (ec *elasticClient) DoMultiGet(ids []string, index string, withSource bool,
// DoQueryRemove will do a query remove to elasticsearch server
func (ec *elasticClient) DoQueryRemove(index string, body *bytes.Buffer) error {
if err := ec.doRefresh(index); err != nil {
log.Warn("elasticClient.doRefresh", "cannot to refresh", err.Error())
log.Warn("elasticClient.doRefresh", "cannot do refresh", err.Error())
}

res, err := ec.client.DeleteByQuery(
Expand Down
1 change: 1 addition & 0 deletions process/elasticProcessor.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"encoding/hex"
"fmt"

elasticIndexer "github.com/ElrondNetwork/elastic-indexer-go"
"github.com/ElrondNetwork/elastic-indexer-go/converters"
"github.com/ElrondNetwork/elastic-indexer-go/data"
Expand Down
38 changes: 38 additions & 0 deletions process/logsevents/fungibleESDTProcessor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,41 @@ func TestProcessLogsAndEventsESDT_CrossShardOnDestination(t *testing.T) {
_, ok = altered.Get("61646472")
require.False(t, ok)
}

func TestNftsProcessor_processLogAndEventsFungibleESDT_Wipe(t *testing.T) {
t.Parallel()

nftsProc := newFungibleESDTProcessor(&mock.PubkeyConverterMock{}, &mock.ShardCoordinatorMock{})

events := &transaction.Event{
Address: []byte("addr"),
Identifier: []byte(core.BuiltInFunctionESDTWipe),
Topics: [][]byte{[]byte("esdt-0123"), big.NewInt(0).SetUint64(0).Bytes(), big.NewInt(0).Bytes(), []byte("receiver")},
}

altered := data.NewAlteredAccounts()

res := nftsProc.processEvent(&argsProcessEvent{
event: events,
accounts: altered,
timestamp: 10000,
tokensSupply: data.NewTokensInfo(),
})
require.Equal(t, "esdt-0123", res.identifier)
require.Equal(t, "0", res.value)
require.Equal(t, true, res.processed)

alteredAddrSender, ok := altered.Get("61646472")
require.True(t, ok)
require.Equal(t, &data.AlteredAccount{
TokenIdentifier: "esdt-0123",
IsESDTOperation: true,
}, alteredAddrSender[0])

alteredAddrReceiver, ok := altered.Get("7265636569766572")
require.True(t, ok)
require.Equal(t, &data.AlteredAccount{
TokenIdentifier: "esdt-0123",
IsESDTOperation: true,
}, alteredAddrReceiver[0])
}
2 changes: 1 addition & 1 deletion process/logsevents/nftsProcessor.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (np *nftsProcessor) processEvent(args *argsProcessEvent) argOutputProcessEv
func (np *nftsProcessor) shouldAddReceiverData(args *argsProcessEvent) bool {
eventIdentifier := string(args.event.GetIdentifier())
isWrongIdentifier := eventIdentifier != core.BuiltInFunctionESDTNFTTransfer &&
eventIdentifier != core.BuiltInFunctionMultiESDTNFTTransfer
eventIdentifier != core.BuiltInFunctionMultiESDTNFTTransfer && eventIdentifier != core.BuiltInFunctionESDTWipe

if isWrongIdentifier || len(args.event.GetTopics()) < numTopicsWithReceiverAddress {
return false
Expand Down
8 changes: 8 additions & 0 deletions process/logsevents/nftsProcessor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,12 @@ func TestNftsProcessor_processLogAndEventsNFTs_Wipe(t *testing.T) {
TokenIdentifier: "nft-0123",
NFTNonce: 20,
}, alteredAddrSender[0])

alteredAddrReceiver, ok := altered.Get("7265636569766572")
require.True(t, ok)
require.Equal(t, &data.AlteredAccount{
IsNFTOperation: true,
TokenIdentifier: "nft-0123",
NFTNonce: 20,
}, alteredAddrReceiver[0])
}