Merge pull request #62 from ElrondNetwork/receipts-in-mb

receipts in mb
multiversx · Feb 9, 2022 · ebfa738 · ebfa738
2 parents 088e9a9 + 8183f2e
commit ebfa738
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/data/api/apiBlock.go b/data/api/apiBlock.go
@@ -54,6 +54,7 @@ type MiniBlock struct {
 	SourceShard      uint32                              `json:"sourceShard"`
 	DestinationShard uint32                              `json:"destinationShard"`
 	Transactions     []*transaction.ApiTransactionResult `json:"transactions,omitempty"`
+	Receipts         []*transaction.ApiReceipt           `json:"receipts,omitempty"`
 }
 
 // StakeValues is the structure that contains the total staked value and the total top up value

diff --git a/data/transaction/apiTransactionResult.go b/data/transaction/apiTransactionResult.go
@@ -45,28 +45,42 @@ type ApiTransactionResult struct {
 	SmartContractResults              []*ApiSmartContractResult `json:"smartContractResults,omitempty"`
 	Logs                              *ApiLogs                  `json:"logs,omitempty"`
 	Status                            TxStatus                  `json:"status,omitempty"`
+	Tokens                            []string                  `json:"tokens,omitempty"`
+	ESDTValues                        []string                  `json:"esdtValues,omitempty"`
+	Receivers                         []string                  `json:"receivers,omitempty"`
+	ReceiversShardIDs                 []uint32                  `json:"receiversShardIDs,omitempty"`
+	Operation                         string                    `json:"operation,omitempty"`
+	Function                          string                    `json:"function,omitempty"`
+	IsRelayed                         bool                      `json:"isRelayed,omitempty"`
 }
 
 // ApiSmartContractResult represents a smart contract result with changed fields' types in order to make it friendly for API's json
 type ApiSmartContractResult struct {
-	Hash           string      `json:"hash,omitempty"`
-	Nonce          uint64      `json:"nonce"`
-	Value          *big.Int    `json:"value"`
-	RcvAddr        string      `json:"receiver"`
-	SndAddr        string      `json:"sender"`
-	RelayerAddr    string      `json:"relayerAddress,omitempty"`
-	RelayedValue   *big.Int    `json:"relayedValue,omitempty"`
-	Code           string      `json:"code,omitempty"`
-	Data           string      `json:"data,omitempty"`
-	PrevTxHash     string      `json:"prevTxHash"`
-	OriginalTxHash string      `json:"originalTxHash"`
-	GasLimit       uint64      `json:"gasLimit"`
-	GasPrice       uint64      `json:"gasPrice"`
-	CallType       vm.CallType `json:"callType"`
-	CodeMetadata   string      `json:"codeMetadata,omitempty"`
-	ReturnMessage  string      `json:"returnMessage,omitempty"`
-	OriginalSender string      `json:"originalSender,omitempty"`
-	Logs           *ApiLogs    `json:"logs,omitempty"`
+	Hash              string      `json:"hash,omitempty"`
+	Nonce             uint64      `json:"nonce"`
+	Value             *big.Int    `json:"value"`
+	RcvAddr           string      `json:"receiver"`
+	SndAddr           string      `json:"sender"`
+	RelayerAddr       string      `json:"relayerAddress,omitempty"`
+	RelayedValue      *big.Int    `json:"relayedValue,omitempty"`
+	Code              string      `json:"code,omitempty"`
+	Data              string      `json:"data,omitempty"`
+	PrevTxHash        string      `json:"prevTxHash"`
+	OriginalTxHash    string      `json:"originalTxHash"`
+	GasLimit          uint64      `json:"gasLimit"`
+	GasPrice          uint64      `json:"gasPrice"`
+	CallType          vm.CallType `json:"callType"`
+	CodeMetadata      string      `json:"codeMetadata,omitempty"`
+	ReturnMessage     string      `json:"returnMessage,omitempty"`
+	OriginalSender    string      `json:"originalSender,omitempty"`
+	Logs              *ApiLogs    `json:"logs,omitempty"`
+	Tokens            []string    `json:"tokens,omitempty"`
+	ESDTValues        []string    `json:"esdtValues,omitempty"`
+	Receivers         []string    `json:"receivers,omitempty"`
+	ReceiversShardIDs []uint32    `json:"receiversShardIDs,omitempty"`
+	Operation         string      `json:"operation,omitempty"`
+	Function          string      `json:"function,omitempty"`
+	IsRelayed         bool        `json:"isRelayed,omitempty"`
 }
 
 // ApiReceipt represents a receipt with changed fields' types in order to make it friendly for API's json