Merge pull request #874 from onflow/mpeter/tx-with-evm-error-code

Include `errorCode` from EVM `txResult` in Cadence assert message

Author: m-Peter

services/requester/cadence/batch_run.cdc

@@ -28,7 +28,7 @@ transaction(hexEncodedTxs: [String], coinbase: String) {
         for txResult in txResults {
             assert(
                 txResult.status == EVM.Status.failed || txResult.status == EVM.Status.successful,
-                message: "evm_error=".concat(txResult.errorMessage).concat("\n")
+                message: "evm_error=\(txResult.errorMessage);evm_error_code=\(txResult.errorCode)"
             )
         }
     }

services/requester/cadence/run.cdc

@@ -8,7 +8,7 @@ transaction(hexEncodedTx: String, coinbase: String) {
         )
         assert(
             txResult.status == EVM.Status.failed || txResult.status == EVM.Status.successful,
-            message: "evm_error=".concat(txResult.errorMessage).concat("\n")
+            message: "evm_error=\(txResult.errorMessage);evm_error_code=\(txResult.errorCode)"
         )
     }
 }

services/requester/tx_pool.go

@@ -9,9 +9,7 @@ import (
 	errs "github.com/onflow/flow-evm-gateway/models/errors"
 )
 
-const (
-	evmErrorRegex = `evm_error=(.*)\n`
-)
+const evmErrorRegex = `evm_error=(.*);`
 
 // TxPool is the minimum interface that needs to be implemented by
 // the various transaction pool strategies.