Merge pull request #61 from ElrondNetwork/invalid-meta-tx-not-enough-gas

(Low-impact) handle "meta transaction is invalid: not enough gas"

server/services/constants.go

@@ -18,7 +18,8 @@ var (
 )
 
 var (
-	transactionEventSignalError                 = "signalError"
-	transactionEventTransferValueOnly           = "transferValueOnly"
-	transactionEventTopicInvalidMetaTransaction = "meta transaction is invalid"
+	transactionEventSignalError                             = "signalError"
+	transactionEventTransferValueOnly                       = "transferValueOnly"
+	transactionEventTopicInvalidMetaTransaction             = "meta transaction is invalid"
+	transactionEventTopicInvalidMetaTransactionNotEnoughGas = "meta transaction is invalid: not enough gas"
 )

server/services/transactionEventsController.go

@@ -87,8 +87,10 @@ func (controller *transactionEventsController) hasSignalErrorOfMetaTransactionIs
 			continue
 		}
 
-		hasTopicInvalidMetaTransaction := eventHasTopic(event, transactionEventTopicInvalidMetaTransaction)
-		if hasTopicInvalidMetaTransaction {
+		if eventHasTopic(event, transactionEventTopicInvalidMetaTransaction) {
+			return true
+		}
+		if eventHasTopic(event, transactionEventTopicInvalidMetaTransactionNotEnoughGas) {
 			return true
 		}
 	}

server/services/transactionEventsController_test.go

@@ -46,7 +46,7 @@ func TestTransactionEventsController_HasSignalErrorOfMetaTransactionIsInvalid(t
 		require.False(t, txMatches)
 	})
 
-	t.Run("invalid tx with event 'invalid meta transaction'", func(t *testing.T) {
+	t.Run("invalid tx with event 'meta transaction is invalid'", func(t *testing.T) {
 		tx := &transaction.ApiTransactionResult{
 			Logs: &transaction.ApiLogs{
 
@@ -64,6 +64,25 @@ func TestTransactionEventsController_HasSignalErrorOfMetaTransactionIsInvalid(t
 		txMatches := controller.hasSignalErrorOfMetaTransactionIsInvalid(tx)
 		require.True(t, txMatches)
 	})
+
+	t.Run("invalid tx with event 'meta transaction is invalid: not enough gas'", func(t *testing.T) {
+		tx := &transaction.ApiTransactionResult{
+			Logs: &transaction.ApiLogs{
+
+				Events: []*transaction.Events{
+					{
+						Identifier: transactionEventSignalError,
+						Topics: [][]byte{
+							[]byte(transactionEventTopicInvalidMetaTransactionNotEnoughGas),
+						},
+					},
+				},
+			},
+		}
+
+		txMatches := controller.hasSignalErrorOfMetaTransactionIsInvalid(tx)
+		require.True(t, txMatches)
+	})
 }
 
 func TestEventHasTopic(t *testing.T) {

version/constants.go

@@ -7,5 +7,5 @@ const (
 
 var (
 	// RosettaMiddlewareVersion is the version of this package (application)
-	RosettaMiddlewareVersion = "v0.3.4"
+	RosettaMiddlewareVersion = "v0.3.5"
 )