From a69f21f8d24d77d6cb0f41940571ab767f94495c Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Thu, 20 Jan 2022 14:09:26 +0200 Subject: [PATCH 1/3] receipts in mb --- data/api/apiBlock.go | 1 + 1 file changed, 1 insertion(+) diff --git a/data/api/apiBlock.go b/data/api/apiBlock.go index 933bb399a..84170cbc3 100644 --- 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:"receipt,omitempty"` } // StakeValues is the structure that contains the total staked value and the total top up value From d8cf911b09e388be50d045ddfa7679381117fd4f Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Thu, 27 Jan 2022 11:38:43 +0200 Subject: [PATCH 2/3] extend transaction structure and smart contract result --- data/transaction/apiTransactionResult.go | 50 +++++++++++++++--------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/data/transaction/apiTransactionResult.go b/data/transaction/apiTransactionResult.go index cd258b1a2..fe110978f 100644 --- 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 From 8183f2e3f4a4e24dc5c7c43e02b96b0851aec6ca Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Wed, 9 Feb 2022 14:25:21 +0200 Subject: [PATCH 3/3] small fix --- data/api/apiBlock.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/api/apiBlock.go b/data/api/apiBlock.go index 84170cbc3..556e91517 100644 --- a/data/api/apiBlock.go +++ b/data/api/apiBlock.go @@ -54,7 +54,7 @@ type MiniBlock struct { SourceShard uint32 `json:"sourceShard"` DestinationShard uint32 `json:"destinationShard"` Transactions []*transaction.ApiTransactionResult `json:"transactions,omitempty"` - Receipts []*transaction.ApiReceipt `json:"receipt,omitempty"` + Receipts []*transaction.ApiReceipt `json:"receipts,omitempty"` } // StakeValues is the structure that contains the total staked value and the total top up value