Merge master into feat sovereign 9 oct 2024

.github/workflows/deploy-docker.yml

@@ -0,0 +1,54 @@
+name: Publish Docker image
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.20.7
+        id: go
+
+      - name: Get dependencies
+        run: |
+          go mod download
+          if [ -f Gopkg.toml ]; then
+              curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+              dep ensure
+          fi
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: multiversx/elastic-indexer
+
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20.5 as builder
+FROM golang:1.20.7 as builder
 
 RUN apt-get update && apt-get install -y
 

client/elasticClient.go

@@ -3,6 +3,7 @@ package client
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -84,6 +85,23 @@ func (ec *elasticClient) CheckAndCreateIndex(indexName string) error {
 	return ec.createIndex(indexName)
 }
 
+// PutMappings will put the provided mappings to a given index
+func (ec *elasticClient) PutMappings(indexName string, mappings *bytes.Buffer) error {
+	res, err := ec.client.Indices.PutMapping(
+		mappings,
+		ec.client.Indices.PutMapping.WithIndex(indexName),
+	)
+	if err != nil {
+		return err
+	}
+
+	if res.IsError() {
+		return errors.New(res.String())
+	}
+
+	return nil
+}
+
 // CheckAndCreateAlias creates a new alias if it does not already exist
 func (ec *elasticClient) CheckAndCreateAlias(alias string, indexName string) error {
 	if ec.aliasExists(alias) {

data/tokens.go

@@ -2,20 +2,26 @@ package data
 
 import (
 	"time"
+
+	"github.com/multiversx/mx-chain-core-go/core"
 )
 
 const metaESDT = "MetaESDT"
 
 // NFTDataUpdate will contain the update information for an NFT or SFT
 type NFTDataUpdate struct {
 	Identifier    string
+	Address       string
+	NewCreator    string
 	URIsToAdd     [][]byte
 	NewAttributes []byte
-	Address       string
 	Freeze        bool
 	UnFreeze      bool
 	Pause         bool
 	UnPause       bool
+	SetURIs       bool
+	NewRoyalties  core.OptionalUint32
+	NewMetaData   *TokenMetaData
 }
 
 // ResponseTokens is the structure for the tokens response
@@ -51,6 +57,7 @@ type TokenInfo struct {
 	Data              *TokenMetaData   `json:"data,omitempty"`
 	OwnersHistory     []*OwnerData     `json:"ownersHistory,omitempty"`
 	TransferOwnership bool             `json:"-"`
+	ChangeToDynamic   bool             `json:"-"`
 	Properties        *TokenProperties `json:"properties,omitempty"`
 }
 

data/transaction.go

@@ -2,57 +2,61 @@ package data
 
 import (
 	"time"
+
+	"github.com/multiversx/mx-chain-core-go/data/transaction"
 )
 
 // Transaction is a structure containing all the fields that need
 // to be saved for a transaction. It has all the default fields
 // plus some extra information for ease of search and filter
 type Transaction struct {
-	MBHash               string        `json:"miniBlockHash"`
-	Nonce                uint64        `json:"nonce"`
-	Round                uint64        `json:"round"`
-	Value                string        `json:"value"`
-	ValueNum             float64       `json:"valueNum"`
-	Receiver             string        `json:"receiver"`
-	Sender               string        `json:"sender"`
-	ReceiverShard        uint32        `json:"receiverShard"`
-	SenderShard          uint32        `json:"senderShard"`
-	GasPrice             uint64        `json:"gasPrice"`
-	GasLimit             uint64        `json:"gasLimit"`
-	GasUsed              uint64        `json:"gasUsed"`
-	Fee                  string        `json:"fee"`
-	FeeNum               float64       `json:"feeNum"`
-	InitialPaidFee       string        `json:"initialPaidFee,omitempty"`
-	Data                 []byte        `json:"data"`
-	Signature            string        `json:"signature"`
-	Timestamp            time.Duration `json:"timestamp"`
-	Status               string        `json:"status"`
-	SearchOrder          uint32        `json:"searchOrder"`
-	SenderUserName       []byte        `json:"senderUserName,omitempty"`
-	ReceiverUserName     []byte        `json:"receiverUserName,omitempty"`
-	HasSCR               bool          `json:"hasScResults,omitempty"`
-	IsScCall             bool          `json:"isScCall,omitempty"`
-	HasOperations        bool          `json:"hasOperations,omitempty"`
-	HasLogs              bool          `json:"hasLogs,omitempty"`
-	Tokens               []string      `json:"tokens,omitempty"`
-	ESDTValues           []string      `json:"esdtValues,omitempty"`
-	ESDTValuesNum        []float64     `json:"esdtValuesNum,omitempty"`
-	Receivers            []string      `json:"receivers,omitempty"`
-	ReceiversShardIDs    []uint32      `json:"receiversShardIDs,omitempty"`
-	Type                 string        `json:"type,omitempty"`
-	Operation            string        `json:"operation,omitempty"`
-	Function             string        `json:"function,omitempty"`
-	IsRelayed            bool          `json:"isRelayed,omitempty"`
-	Version              uint32        `json:"version,omitempty"`
-	GuardianAddress      string        `json:"guardian,omitempty"`
-	GuardianSignature    string        `json:"guardianSignature,omitempty"`
-	ErrorEvent           bool          `json:"errorEvent,omitempty"`
-	CompletedEvent       bool          `json:"completedEvent,omitempty"`
-	ExecutionOrder       int           `json:"-"`
-	SmartContractResults []*ScResult   `json:"-"`
-	Hash                 string        `json:"-"`
-	BlockHash            string        `json:"-"`
-	HadRefund            bool          `json:"-"`
+	MBHash               string                             `json:"miniBlockHash"`
+	Nonce                uint64                             `json:"nonce"`
+	Round                uint64                             `json:"round"`
+	Value                string                             `json:"value"`
+	ValueNum             float64                            `json:"valueNum"`
+	Receiver             string                             `json:"receiver"`
+	Sender               string                             `json:"sender"`
+	ReceiverShard        uint32                             `json:"receiverShard"`
+	SenderShard          uint32                             `json:"senderShard"`
+	GasPrice             uint64                             `json:"gasPrice"`
+	GasLimit             uint64                             `json:"gasLimit"`
+	GasUsed              uint64                             `json:"gasUsed"`
+	Fee                  string                             `json:"fee"`
+	FeeNum               float64                            `json:"feeNum"`
+	InitialPaidFee       string                             `json:"initialPaidFee,omitempty"`
+	Data                 []byte                             `json:"data"`
+	Signature            string                             `json:"signature"`
+	Timestamp            time.Duration                      `json:"timestamp"`
+	Status               string                             `json:"status"`
+	SearchOrder          uint32                             `json:"searchOrder"`
+	SenderUserName       []byte                             `json:"senderUserName,omitempty"`
+	ReceiverUserName     []byte                             `json:"receiverUserName,omitempty"`
+	HasSCR               bool                               `json:"hasScResults,omitempty"`
+	IsScCall             bool                               `json:"isScCall,omitempty"`
+	HasOperations        bool                               `json:"hasOperations,omitempty"`
+	HasLogs              bool                               `json:"hasLogs,omitempty"`
+	Tokens               []string                           `json:"tokens,omitempty"`
+	ESDTValues           []string                           `json:"esdtValues,omitempty"`
+	ESDTValuesNum        []float64                          `json:"esdtValuesNum,omitempty"`
+	Receivers            []string                           `json:"receivers,omitempty"`
+	ReceiversShardIDs    []uint32                           `json:"receiversShardIDs,omitempty"`
+	Type                 string                             `json:"type,omitempty"`
+	Operation            string                             `json:"operation,omitempty"`
+	Function             string                             `json:"function,omitempty"`
+	IsRelayed            bool                               `json:"isRelayed,omitempty"`
+	Version              uint32                             `json:"version,omitempty"`
+	GuardianAddress      string                             `json:"guardian,omitempty"`
+	GuardianSignature    string                             `json:"guardianSignature,omitempty"`
+	ErrorEvent           bool                               `json:"errorEvent,omitempty"`
+	CompletedEvent       bool                               `json:"completedEvent,omitempty"`
+	RelayedAddr          string                             `json:"relayed,omitempty"`
+	InnerTransactions    []*transaction.FrontendTransaction `json:"innerTransactions,omitempty"`
+	ExecutionOrder       int                                `json:"-"`
+	SmartContractResults []*ScResult                        `json:"-"`
+	Hash                 string                             `json:"-"`
+	BlockHash            string                             `json:"-"`
+	HadRefund            bool                               `json:"-"`
 }
 
 // Receipt is a structure containing all the fields that need to be safe for a Receipt

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/elastic/go-elasticsearch/v7 v7.12.0
 	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/multiversx/mx-chain-communication-go v1.0.15-0.20240508074652-e128a1c05c8e
-	github.com/multiversx/mx-chain-core-go v1.2.21-0.20240514102932-72b1cac83784
-	github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240508072523-3f00a726af57
-	github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240514104734-6dc768a4c5aa
+	github.com/multiversx/mx-chain-communication-go v1.1.0
+	github.com/multiversx/mx-chain-core-go v1.2.23-0.20241007113300-50ac1ae23824
+	github.com/multiversx/mx-chain-logger-go v1.0.15
+	github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241008143259-334f3a5bafe0
 	github.com/prometheus/client_model v0.4.0
 	github.com/prometheus/common v0.37.0
 	github.com/stretchr/testify v1.8.4

go.sum

@@ -247,15 +247,15 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/multiversx/mx-chain-communication-go v1.0.15-0.20240508074652-e128a1c05c8e h1:Tsmwhu+UleE+l3buPuqXSKTqfu5FbPmzQ4MjMoUvCWA=
-github.com/multiversx/mx-chain-communication-go v1.0.15-0.20240508074652-e128a1c05c8e/go.mod h1:2yXl18wUbuV3cRZr7VHxM1xo73kTaC1WUcu2kx8R034=
-github.com/multiversx/mx-chain-core-go v1.2.21-0.20240514102932-72b1cac83784 h1:Dxm8MIIbEQW9hUIjfiVFm7mR+UbOSkb7xhMtXHP7dmk=
-github.com/multiversx/mx-chain-core-go v1.2.21-0.20240514102932-72b1cac83784/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0=
-github.com/multiversx/mx-chain-crypto-go v1.2.12-0.20240508074452-cc21c1b505df h1:clihfi78bMEOWk/qw6WA4uQbCM2e2NGliqswLAvw19k=
-github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240508072523-3f00a726af57 h1:g9t410dqjcb7UUptbVd/H6Ua12sEzWU4v7VplyNvRZ0=
-github.com/multiversx/mx-chain-logger-go v1.0.15-0.20240508072523-3f00a726af57/go.mod h1:cY6CIXpndW5g5PTPn4WzPwka/UBEf+mgw+PSY5pHGAU=
-github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240514104734-6dc768a4c5aa h1:CJyBXV0PHDE3/bjJU3quoNBjOmGjrn/EBqU7wBdcqhk=
-github.com/multiversx/mx-chain-vm-common-go v1.5.13-0.20240514104734-6dc768a4c5aa/go.mod h1:/scqfBjA912V3Z2sPlkRVxWAE3puVNS2adQegm4LjCc=
+github.com/multiversx/mx-chain-communication-go v1.1.0 h1:J7bX6HoN3HiHY7cUeEjG8AJWgQDDPcY+OPDOsSUOkRE=
+github.com/multiversx/mx-chain-communication-go v1.1.0/go.mod h1:WK6bP4pGEHGDDna/AYRIMtl6G9OA0NByI1Lw8PmOnRM=
+github.com/multiversx/mx-chain-core-go v1.2.23-0.20241007113300-50ac1ae23824 h1:OHYcWOeTNwSaTMRAfusu6/1zoTWGEtHKPBig4dbRAwM=
+github.com/multiversx/mx-chain-core-go v1.2.23-0.20241007113300-50ac1ae23824/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0=
+github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk=
+github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc=
+github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ=
+github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241008143259-334f3a5bafe0 h1:WpfFe6ueS+nRIq2RzVaeF1/TJStyYH/YLYPCmN8kdDM=
+github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241008143259-334f3a5bafe0/go.mod h1:IOE+gYAtTEKZJwUr9ZhOnjdf4vFKrZdZ9RVEyuFsEP4=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=