Merge pull request #303 from multiversx/merge-rc-1-7-next-into-sovere…

…ign-11-nov Merge rc 1 7 next into sovereign 11 nov
multiversx · Nov 11, 2024 · cbffebf · cbffebf
2 parents e1ddfdb + 8f3ff23
commit cbffebf
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 1,026 deletions.
diff --git a/data/transaction.go b/data/transaction.go
@@ -2,61 +2,58 @@ 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"`
-	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:"-"`
+	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"`
+	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