add extra fields on prepare transaction

multiversx · Apr 5, 2023 · b1d3b3a · b1d3b3a
1 parent be41a4a
commit b1d3b3a
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/node/external/transactionAPI/unmarshaller.go b/node/external/transactionAPI/unmarshaller.go
@@ -102,7 +102,7 @@ func (tu *txUnmarshaller) unmarshalTransaction(txBytes []byte, txType transactio
 }
 
 func (tu *txUnmarshaller) prepareNormalTx(tx *transaction.Transaction) (*transaction.ApiTransactionResult, error) {
-	return &transaction.ApiTransactionResult{
+	apiTx := &transaction.ApiTransactionResult{
 		Tx:               tx,
 		Type:             string(transaction.TxTypeNormal),
 		Nonce:            tx.Nonce,
@@ -118,11 +118,18 @@ func (tu *txUnmarshaller) prepareNormalTx(tx *transaction.Transaction) (*transac
 		Options:          tx.Options,
 		Version:          tx.Version,
 		ChainID:          string(tx.ChainID),
-	}, nil
+	}
+
+	if len(tx.GuardianAddr) > 0 {
+		apiTx.GuardianAddr = tu.addressPubKeyConverter.Encode(tx.GuardianAddr)
+		apiTx.GuardianSignature = hex.EncodeToString(tx.GuardianSignature)
+	}
+
+	return apiTx, nil
 }
 
 func (tu *txUnmarshaller) prepareInvalidTx(tx *transaction.Transaction) (*transaction.ApiTransactionResult, error) {
-	return &transaction.ApiTransactionResult{
+	apiTx := &transaction.ApiTransactionResult{
 		Tx:               tx,
 		Type:             string(transaction.TxTypeInvalid),
 		Nonce:            tx.Nonce,
@@ -135,7 +142,17 @@ func (tu *txUnmarshaller) prepareInvalidTx(tx *transaction.Transaction) (*transa
 		GasLimit:         tx.GasLimit,
 		Data:             tx.Data,
 		Signature:        hex.EncodeToString(tx.Signature),
-	}, nil
+		Options:          tx.Options,
+		Version:          tx.Version,
+		ChainID:          string(tx.ChainID),
+	}
+
+	if len(tx.GuardianAddr) > 0 {
+		apiTx.GuardianAddr = tu.addressPubKeyConverter.Encode(tx.GuardianAddr)
+		apiTx.GuardianSignature = hex.EncodeToString(tx.GuardianSignature)
+	}
+
+	return apiTx, nil
 }
 
 func (tu *txUnmarshaller) prepareRewardTx(tx *rewardTxData.RewardTx) (*transaction.ApiTransactionResult, error) {