Merge pull request #29 from ElrondNetwork/main

merge main into development
multiversx · Nov 8, 2021 · bba4aac · bba4aac
2 parents d384f8a + 53ffc26
commit bba4aac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/data/indexer/dtos.go b/data/indexer/dtos.go
@@ -21,6 +21,7 @@ type ArgsSaveBlockData struct {
 type HeaderGasConsumption struct {
 	GasConsumed    uint64
 	GasRefunded    uint64
+	GasPenalized   uint64
 	MaxGasPerBlock uint64
 }
 

diff --git a/data/vm/callType.go b/data/vm/callType.go
@@ -18,4 +18,8 @@ const (
 	// ESDTTransferAndExecute means that there is a smart contract execution after the ESDT transfer
 	// this is needed in order to skip the check whether a contract is payable or not
 	ESDTTransferAndExecute
+
+	// ExecOnDestByCaller means that the call is an invocation of a built in function / smart contract from
+	// another smart contract but the caller is from the previous caller
+	ExecOnDestByCaller
 )