Merge main into sovereign 29 ian

data/api/options.go

@@ -17,4 +17,5 @@ type AccountQueryOptions struct {
 type BlockQueryOptions struct {
 	WithTransactions bool
 	WithLogs         bool
+	ForHyperblock    bool
 }

data/interface.go

@@ -391,6 +391,14 @@ type GuardedTransactionHandler interface {
 	GetDataForSigning(encoder Encoder, marshaller Marshaller, hasher Hasher) ([]byte, error)
 }
 
+// RelayedTransactionHandler defines functionality for the relayed transactions
+type RelayedTransactionHandler interface {
+	GetRelayerAddr() []byte
+	GetRelayerSignature() []byte
+	GetSignature() []byte
+	GetDataForSigning(encoder Encoder, marshaller Marshaller, hasher Hasher) ([]byte, error)
+}
+
 // LogHandler defines the type for a log resulted from executing a transaction or smart contract call
 type LogHandler interface {
 	// GetAddress returns the address of the sc that was originally called by the user

data/outport/feeInfo.go

@@ -16,3 +16,13 @@ func (f *FeeInfo) SetGasUsed(gasUsed uint64) {
 func (f *FeeInfo) SetFee(fee *big.Int) {
 	f.Fee = fee
 }
+
+// SetGasRefunded sets the gas units refunded
+func (f *FeeInfo) SetGasRefunded(gasRefunded uint64) {
+	f.GasRefunded = gasRefunded
+}
+
+// SetHadRefund sets hadRefund field with true
+func (f *FeeInfo) SetHadRefund() {
+	f.HadRefund = true
+}

data/outport/outportBlock.proto

@@ -51,6 +51,8 @@ message FeeInfo {
   uint64 GasUsed        = 1 [(gogoproto.jsontag) = "gasUsed"];
   bytes  Fee            = 2 [(gogoproto.jsontag) = "fee,omitempty", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
   bytes  InitialPaidFee = 3 [(gogoproto.jsontag) = "initialPaidFee,omitempty", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+  uint64 GasRefunded    = 4 [(gogoproto.jsontag) = "gasRefunded,omitempty"];
+  bool   HadRefund      = 5 [(gogoproto.jsontag) = "hadRefund,omitempty"];
 }
 
 message TxInfo {

data/transaction/apiTransactionResult.go

@@ -63,6 +63,7 @@ type ApiTransactionResult struct {
 	IsRefund                          bool                      `json:"isRefund,omitempty"`
 	CallType                          string                    `json:"callType,omitempty"`
 	RelayerAddress                    string                    `json:"relayerAddress,omitempty"`
+	RelayerSignature                  string                    `json:"relayerSignature,omitempty"`
 	RelayedValue                      string                    `json:"relayedValue,omitempty"`
 	ChainID                           string                    `json:"chainID,omitempty"`
 	Version                           uint32                    `json:"version,omitempty"`

data/transaction/frontendTransaction.go

@@ -17,4 +17,6 @@ type FrontendTransaction struct {
 	Options           uint32 `json:"options,omitempty"`
 	GuardianAddr      string `json:"guardian,omitempty"`
 	GuardianSignature string `json:"guardianSignature,omitempty"`
+	RelayerAddr       string `json:"relayer,omitempty"`
+	RelayerSignature  string `json:"relayerSignature,omitempty"`
 }

data/transaction/transaction.go

@@ -102,6 +102,15 @@ func (tx *Transaction) GetDataForSigning(encoder data.Encoder, marshaller data.M
 		ftx.GuardianAddr = guardianAddr
 	}
 
+	if len(tx.RelayerAddr) > 0 {
+		relayerAddr, errRelayer := encoder.Encode(tx.RelayerAddr)
+		if errRelayer != nil {
+			return nil, errRelayer
+		}
+
+		ftx.RelayerAddr = relayerAddr
+	}
+
 	ftxBytes, err := marshaller.Marshal(ftx)
 	if err != nil {
 		return nil, err

data/transaction/transaction.proto

@@ -30,4 +30,6 @@ message Transaction {
 	uint32                  Options            = 13 [(gogoproto.jsontag) = "options,omitempty"];
 	bytes                   GuardianAddr       = 14 [(gogoproto.jsontag) = "guardian,omitempty"];
 	bytes                   GuardianSignature  = 15 [(gogoproto.jsontag) = "guardianSignature,omitempty"];
+	bytes                   RelayerAddr        = 16 [(gogoproto.jsontag) = "relayer,omitempty"];
+	bytes                   RelayerSignature   = 17 [(gogoproto.jsontag) = "relayerSignature,omitempty"];
 }