Skip to content

Commit

Permalink
Merge pull request #323 from multiversx/new-epoch-field-tx-structure
Browse files Browse the repository at this point in the history 
Epoch field in transactions and scresult structure
  • Loading branch information
@miiu96
miiu96 authored Jan 31, 2025
2 parents 5da79ce + 330a184 commit f11d862
Show file tree
Hide file tree
Showing 42 changed files with 84 additions and 43 deletions.
1 change: 1 addition & 0 deletions data/scresult.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type ScResult struct {
CanBeIgnored bool `json:"canBeIgnored,omitempty"`
OriginalSender string `json:"originalSender,omitempty"`
HasLogs bool `json:"hasLogs,omitempty"`
Epoch uint32 `json:"epoch"`
ExecutionOrder int `json:"-"`
SenderAddressBytes []byte `json:"-"`
InitialTxGasUsed uint64 `json:"-"`
Expand Down
1 change: 1 addition & 0 deletions data/transaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type Transaction struct {
RelayedAddr string `json:"relayer,omitempty"`
RelayedSignature string `json:"relayerSignature,omitempty"`
HadRefund bool `json:"hadRefund,omitempty"`
Epoch uint32 `json:"epoch"`
ExecutionOrder int `json:"-"`
SmartContractResults []*ScResult `json:"-"`
Hash string `json:"-"`
Expand Down
3 changes: 2 additions & 1 deletion integrationtests/testdata/claimRewards/tx-claim-rewards.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"operation": "transfer",
"function": "claimRewards",
"isScCall": true,
"hasLogs": true
"hasLogs": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/esdtTransfer/esdt-transfer-cross-shard-on-destination.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
1e-17
],
"type": "normal",
"operation": "ESDTTransfer"
"operation": "ESDTTransfer",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/esdtTransfer/esdt-transfer-cross-shard-on-source.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
1e-17
],
"type": "normal",
"operation": "ESDTTransfer"
"operation": "ESDTTransfer",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/esdtTransfer/esdt-transfer-first-on-destination.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"receiverShard": 1,
"operation": "ESDTTransfer",
"status": "success",
"searchOrder": 0
"searchOrder": 0,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/esdtTransfer/esdt-transfer-second-on-source.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"receiverShard": 1,
"operation": "ESDTTransfer",
"status": "success",
"searchOrder": 0
"searchOrder": 0,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/esdtTransfer/esdt-transfer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
"esdtValuesNum": [
1e-17
],
"operation": "ESDTTransfer"
"operation": "ESDTTransfer",
"epoch": 0
}
3 changes: 2 additions & 1 deletion ...iTransferWithScCallAndErrorSignaledBySC/transaction-after-execution-of-scr-dst-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"operation": "MultiESDTNFTTransfer",
"status": "fail",
"searchOrder": 0,
"errorEvent": true
"errorEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion .../testdata/multiTransferWithScCallAndErrorSignaledBySC/transaction-executed-on-source.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"receiverShard": 0,
"operation": "MultiESDTNFTTransfer",
"status": "success",
"searchOrder": 0
"searchOrder": 0,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/op-nft-transfer-sc-call-after-refund.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
],
"operation": "ESDTNFTTransfer",
"type": "normal",
"function": "compoundRewardsProxy"
"function": "compoundRewardsProxy",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-complete-with-status.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
"status": "fail",
"initialPaidFee": "595490000000000",
"searchOrder": 0,
"errorEvent": true
"errorEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-nft-transfer-failed-on-dst.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
2
],
"operation": "ESDTNFTTransfer",
"errorEvent": true
"errorEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-nft-transfer-sc-call-after-refund.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
1
],
"operation": "ESDTNFTTransfer",
"function": "compoundRewardsProxy"
"function": "compoundRewardsProxy",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-nft-transfer-sc-call-source.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
"timestamp": 5040,
"status": "success",
"initialPaidFee": "1904415000000000",
"searchOrder": 0
"searchOrder": 0,
"epoch": 0
}
3 changes: 2 additions & 1 deletion ...rationtests/testdata/nftTransferCrossShard/tx-nft-transfer-success-destination-first.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
"timestamp": 0,
"status": "",
"searchOrder": 0,
"completedEvent": true
"completedEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-nft-transfer-success-source-second.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
"receiverShard": 0,
"operation": "ESDTNFTTransfer",
"status": "success",
"searchOrder": 0
"searchOrder": 0,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-nft-transfer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@
"gasPrice": 1000000000,
"timestamp": 5040,
"status": "success",
"searchOrder": 0
"searchOrder": 0,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/nftTransferCrossShard/tx-with-status-only.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
"timestamp": 0,
"status": "fail",
"searchOrder": 0,
"errorEvent": true
"errorEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion ...tiontests/testdata/nftTransferCrossShardWithScCall/cross-shard-transfer-with-sc-call.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@
2
],
"operation": "ESDTNFTTransfer",
"function": "claimRewards"
"function": "claimRewards",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/relayedTx/relayed-tx-after-refund.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
],
"operation": "transfer",
"function": "saveAttestation",
"isRelayed": true
"isRelayed": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/relayedTx/relayed-tx-intra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@
1
],
"operation": "SaveKeyValue",
"isRelayed": true
"isRelayed": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/relayedTx/relayed-tx-source.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
],
"operation": "transfer",
"function": "saveAttestation",
"isRelayed": true
"isRelayed": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/relayedTxV3/relayed-v3-no-refund.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"function": "doSomething",
"isRelayed": true,
"relayer": "erd10ksryjr065ad5475jcg82pnjfg9j9qtszjsrp24anl6ym7cmeddshwnru8",
"relayerSignature": "61"
"relayerSignature": "61",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/relayedTxV3/relayed-v3-with-one-refund.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"isRelayed": true,
"relayer": "erd10ksryjr065ad5475jcg82pnjfg9j9qtszjsrp24anl6ym7cmeddshwnru8",
"relayerSignature": "61",
"hadRefund": true
"hadRefund": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/relayedTxV3/relayed-v3-with-two-refunds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"isRelayed": true,
"relayer": "erd10ksryjr065ad5475jcg82pnjfg9j9qtszjsrp24anl6ym7cmeddshwnru8",
"relayerSignature": "61",
"hadRefund": true
"hadRefund": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scCallIntraShard/claim-rewards.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
"hasScResults": true,
"operation": "transfer",
"isScCall": true,
"function": "claimRewards"
"function": "claimRewards",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scCallIntraShard/sc-call-fail.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"function": "delegate",
"errorEvent": true,
"hasLogs": true,
"hasOperations": true
"hasOperations": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion ...ontests/testdata/scCallWithIssueEsdt/scr-with-callback-executed-on-destination-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
"type": "unsigned",
"status": "success",
"operation": "transfer",
"hasLogs": true
"hasLogs": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scCallWithIssueEsdt/scr-with-callback-executed-on-source.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"timestamp": 5040,
"type": "unsigned",
"status": "pending",
"operation": "transfer"
"operation": "transfer",
"epoch": 0
}
3 changes: 2 additions & 1 deletion ...ationtests/testdata/scCallWithIssueEsdt/scr-with-issue-executed-on-destination-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"type": "unsigned",
"status": "success",
"operation": "transfer",
"function": "issueNonFungible"
"function": "issueNonFungible",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scCallWithIssueEsdt/scr-with-issue-executed-on-source-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
"type": "unsigned",
"status": "pending",
"operation": "transfer",
"function": "issueNonFungible"
"function": "issueNonFungible",
"epoch": 0
}
3 changes: 2 additions & 1 deletion ...sts/testdata/scCallWithIssueEsdt/tx-after-execution-of-callback-on-destination-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
"isScCall": true,
"operation": "transfer",
"function": "issueToken",
"errorEvent": true
"errorEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scCallWithIssueEsdt/tx-after-execution-on-source-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"hasScResults": true,
"isScCall": true,
"operation": "transfer",
"function": "issueToken"
"function": "issueToken",
"epoch": 0
}

3 changes: 2 additions & 1 deletion ...stdata/scCallWithIssueEsdt/tx-in-op-index-execution-of-callback-on-destination-shard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"operation": "transfer",
"function": "issueToken",
"errorEvent": true,
"type": "normal"
"type": "normal",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scDeploy/tx-deploy-with-error-event.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
"type": "normal",
"operation": "scDeploy",
"errorEvent": true,
"completedEvent": true
"completedEvent": true,
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/scDeploy/tx-sc-deploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
"status": "success",
"searchOrder": 0,
"isScCall": true,
"operation": "scDeploy"
"operation": "scDeploy",
"epoch": 0
}
3 changes: 2 additions & 1 deletion integrationtests/testdata/transactions/move-balance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
"timestamp": 5040,
"status": "success",
"searchOrder": 0,
"operation": "transfer"
"operation": "transfer",
"epoch": 0
}
4 changes: 2 additions & 2 deletions process/elasticproc/operations/serialize_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ func TestOperationsProcessor_SerializeSCRS(t *testing.T) {
err := op.SerializeSCRs(scrs, buffSlice, "operations", 0)
require.Nil(t, err)
require.Equal(t, `{"update":{"_index":"operations","_id":""}}
{"script":{"source":"return"},"upsert":{"uuid":"","nonce":0,"gasLimit":0,"gasPrice":0,"value":"","valueNum":0,"sender":"","receiver":"","senderShard":0,"receiverShard":1,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0}}
{"script":{"source":"return"},"upsert":{"uuid":"","nonce":0,"gasLimit":0,"gasPrice":0,"value":"","valueNum":0,"sender":"","receiver":"","senderShard":0,"receiverShard":1,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0,"epoch":0}}
{ "index" : { "_index":"operations","_id" : "" } }
{"uuid":"","nonce":0,"gasLimit":0,"gasPrice":0,"value":"","valueNum":0,"sender":"","receiver":"","senderShard":2,"receiverShard":0,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0}
{"uuid":"","nonce":0,"gasLimit":0,"gasPrice":0,"value":"","valueNum":0,"sender":"","receiver":"","senderShard":2,"receiverShard":0,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0,"epoch":0}
`, buffSlice.Buffers()[0].String())
}
10 changes: 5 additions & 5 deletions process/elasticproc/transactions/serialize_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func TestSerializeScResults(t *testing.T) {
require.Equal(t, 1, len(buffSlice.Buffers()))

expectedRes := `{ "index" : { "_index": "transactions", "_id" : "hash1" } }
{"uuid":"","nonce":1,"gasLimit":50,"gasPrice":10,"value":"100","valueNum":1e-16,"sender":"","receiver":"","senderShard":0,"receiverShard":1,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0}
{"uuid":"","nonce":1,"gasLimit":50,"gasPrice":10,"value":"100","valueNum":1e-16,"sender":"","receiver":"","senderShard":0,"receiverShard":1,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0,"epoch":0}
{ "index" : { "_index": "transactions", "_id" : "hash2" } }
{"uuid":"","nonce":2,"gasLimit":50,"gasPrice":10,"value":"20","valueNum":2e-17,"sender":"","receiver":"","senderShard":2,"receiverShard":3,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0}
{"uuid":"","nonce":2,"gasLimit":50,"gasPrice":10,"value":"20","valueNum":2e-17,"sender":"","receiver":"","senderShard":2,"receiverShard":3,"prevTxHash":"","originalTxHash":"","callType":"","timestamp":0,"epoch":0}
`
require.Equal(t, expectedRes, buffSlice.Buffers()[0].String())
}
Expand Down Expand Up @@ -86,7 +86,7 @@ func TestSerializeTransactionsIntraShardTx(t *testing.T) {
require.Nil(t, err)

expectedBuff := `{ "index" : { "_index":"transactions", "_id" : "txHash" } }
{"uuid":"","miniBlockHash":"","nonce":0,"round":0,"value":"","valueNum":0,"receiver":"","sender":"","receiverShard":0,"senderShard":0,"gasPrice":0,"gasLimit":0,"gasUsed":0,"fee":"","feeNum":0,"data":null,"signature":"","timestamp":0,"status":"","searchOrder":0}
{"uuid":"","miniBlockHash":"","nonce":0,"round":0,"value":"","valueNum":0,"receiver":"","sender":"","receiverShard":0,"senderShard":0,"gasPrice":0,"gasLimit":0,"gasUsed":0,"fee":"","feeNum":0,"data":null,"signature":"","timestamp":0,"status":"","searchOrder":0,"epoch":0}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Expand All @@ -105,7 +105,7 @@ func TestSerializeTransactionCrossShardTxSource(t *testing.T) {
require.Nil(t, err)

expectedBuff := `{"update":{ "_index":"transactions", "_id":"txHash"}}
{"script":{"source":"return"},"upsert":{"uuid":"","miniBlockHash":"","nonce":0,"round":0,"value":"","valueNum":0,"receiver":"","sender":"","receiverShard":1,"senderShard":0,"gasPrice":0,"gasLimit":0,"gasUsed":0,"fee":"","feeNum":0,"data":null,"signature":"","timestamp":0,"status":"","searchOrder":0,"version":1}}
{"script":{"source":"return"},"upsert":{"uuid":"","miniBlockHash":"","nonce":0,"round":0,"value":"","valueNum":0,"receiver":"","sender":"","receiverShard":1,"senderShard":0,"gasPrice":0,"gasLimit":0,"gasUsed":0,"fee":"","feeNum":0,"data":null,"signature":"","timestamp":0,"status":"","searchOrder":0,"version":1,"epoch":0}}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Expand All @@ -124,7 +124,7 @@ func TestSerializeTransactionsCrossShardTxDestination(t *testing.T) {
require.Nil(t, err)

expectedBuff := `{ "index" : { "_index":"transactions", "_id" : "txHash" } }
{"uuid":"","miniBlockHash":"","nonce":0,"round":0,"value":"","valueNum":0,"receiver":"","sender":"","receiverShard":0,"senderShard":1,"gasPrice":0,"gasLimit":0,"gasUsed":0,"fee":"","feeNum":0,"data":null,"signature":"","timestamp":0,"status":"","searchOrder":0,"version":1}
{"uuid":"","miniBlockHash":"","nonce":0,"round":0,"value":"","valueNum":0,"receiver":"","sender":"","receiverShard":0,"senderShard":1,"gasPrice":0,"gasLimit":0,"gasUsed":0,"fee":"","feeNum":0,"data":null,"signature":"","timestamp":0,"status":"","searchOrder":0,"version":1,"epoch":0}
`
require.Equal(t, expectedBuff, buffSlice.Buffers()[0].String())
}
Expand Down
1 change: 1 addition & 0 deletions process/elasticproc/transactions/smartContractResultsProcessor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ func (proc *smartContractResultsProcessor) prepareSmartContractResult(
GasRefunded: feeInfo.GasRefunded,
ExecutionOrder: int(scrInfo.ExecutionOrder),
UUID: converters.GenerateBase64UUID(),
Epoch: header.GetEpoch(),
}
}

Expand Down
2 changes: 2 additions & 0 deletions process/elasticproc/transactions/transactionDBBuilder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func (dtb *dbTransactionBuilder) prepareTransaction(
RelayedAddr: relayedAddress,
HadRefund: feeInfo.HadRefund,
UUID: converters.GenerateBase64UUID(),
Epoch: header.GetEpoch(),
}

hasValidRelayer := len(eTx.RelayedAddr) == len(eTx.Sender) && len(eTx.RelayedAddr) > 0
Expand Down Expand Up @@ -178,6 +179,7 @@ func (dtb *dbTransactionBuilder) prepareRewardTransaction(
Operation: rewardsOperation,
ExecutionOrder: int(rTxInfo.ExecutionOrder),
UUID: converters.GenerateBase64UUID(),
Epoch: header.GetEpoch(),
}
}

Expand Down

0 comments on commit f11d862

Please sign in to comment.