Merge pull request #6 from InjectiveLabs/f/reverting-evm-msg

Feat: reverting EVM messages

.github/workflows/build.yml

@@ -9,14 +9,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  cleanup-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/develop'"
-
   build:
     runs-on: ubuntu-latest
     steps:

.github/workflows/deploy-contract.yml

@@ -9,22 +9,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  cleanup-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/develop'"
-
   deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: "12.x"
       - name: Install dependencies
         run: npm install
       - uses: technote-space/[email protected]

.github/workflows/test.yml

@@ -11,14 +11,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  cleanup-runs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: rokroskar/workflow-run-cleanup-action@master
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
-
   test-unit-cover:
     runs-on: ubuntu-latest
     steps:
@@ -38,192 +30,3 @@ jobs:
         run: |
           make test-unit-cover
         if: env.GIT_DIFF
-      - uses: codecov/codecov-action@v4
-        with:
-          file: ./coverage.txt
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-        if: env.GIT_DIFF
-
-  test-importer:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/setup-go@v4
-        with:
-          go-version: 1.21
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        id: git_diff
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: test-importer
-        run: |
-          make test-import
-        if: env.GIT_DIFF
-
-  test-rpc:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/setup-go@v4
-        with:
-          go-version: 1.21
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.sol
-            **/**.go
-            go.mod
-            go.sum
-      - name: Test rpc endpoint
-        run: |
-          make test-rpc
-        if: env.GIT_DIFF
-
-  integration_tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        tests: [unmarked, upgrade, filter]
-    env:
-      TESTS_TO_RUN: ${{ matrix.tests }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v26
-        with:
-          nix_path: nixpkgs=channel:nixos-23.11
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - uses: cachix/cachix-action@v14
-        with:
-          name: crypto-ethermint
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.sol
-            **/**.go
-            go.mod
-            go.sum
-            tests/integration_tests/**
-      - name: Run integration tests
-        run: make run-integration-tests
-        if: env.GIT_DIFF
-      - name: 'Tar debug files'
-        if: failure()
-        run: tar cfz debug_files.tar.gz -C /tmp/pytest-of-runner .
-      - uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: debug-files
-          path: debug_files.tar.gz
-          if-no-files-found: ignore
-
-  upload-cache:
-    if: github.event_name == 'push'
-    needs: ["integration_tests"]
-    strategy:
-      matrix:
-        os: [macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v26
-        with:
-          nix_path: nixpkgs=channel:nixos-23.11
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-      - uses: cachix/cachix-action@v14
-        with:
-          name: crypto-ethermint
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
-      - name: 'instantiate integration test env'
-        run: nix-store -r $(nix-instantiate tests/integration_tests/shell.nix)
-
-  test-sim-nondeterminism:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.21
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: Test simulation nondeterminism
-        run: |
-          make test-sim-nondeterminism
-        if: env.GIT_DIFF
-
-  test-sim-random-genesis-fast:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.21
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: Test simulation with random genesis
-        run: |
-          make test-sim-random-genesis-fast
-        if: env.GIT_DIFF
-
-  test-sim-import-export:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.21
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: Simulation of import and export genesis
-        run: |
-          make test-sim-import-export
-        if: env.GIT_DIFF
-
-  test-sim-after-import:
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.21
-          check-latest: true
-      - uses: actions/checkout@v3
-      - uses: technote-space/[email protected]
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: Test simulation after import
-        run: |
-          make test-sim-after-import
-        if: env.GIT_DIFF

indexer/kv_indexer.go

@@ -61,8 +61,20 @@ func NewKVIndexer(db dbm.DB, logger log.Logger, clientCtx client.Context) *KVInd
 // - Parses eth Tx infos from cosmos-sdk events for every TxResult
 // - Iterates over all the messages of the Tx
 // - Builds and stores a indexer.TxResult based on parsed events for every message
-func (kv *KVIndexer) IndexBlock(block *tmtypes.Block, txResults []*abci.ExecTxResult) error {
-	height := block.Height
+func (kv *KVIndexer) IndexBlock(block *tmtypes.Block, txResults []*abci.ExecTxResult) (err error) {
+	defer func(err *error) {
+		if e := recover(); e != nil {
+			kv.logger.Debug("panic during parsing block results", "error", e)
+
+			if ee, ok := e.(error); ok {
+				*err = ee
+			} else {
+				*err = fmt.Errorf("panic during parsing block results: %v", e)
+			}
+		}
+	}(&err)
+
+	kv.logger.Debug("(KVIndexer) IndexBlock", "height", block.Height, "txns:", len(block.Txs))
 
 	batch := kv.db.NewBatch()
 	defer batch.Close()
@@ -71,13 +83,10 @@ func (kv *KVIndexer) IndexBlock(block *tmtypes.Block, txResults []*abci.ExecTxRe
 	var ethTxIndex int32
 	for txIndex, tx := range block.Txs {
 		result := txResults[txIndex]
-		if !rpctypes.TxSuccessOrExceedsBlockGasLimit(result) {
-			continue
-		}
 
 		tx, err := kv.clientCtx.TxConfig.TxDecoder()(tx)
 		if err != nil {
-			kv.logger.Error("Fail to decode tx", "err", err, "block", height, "txIndex", txIndex)
+			kv.logger.Error("Fail to decode tx", "err", err, "block", block.Height, "txIndex", txIndex)
 			continue
 		}
 
@@ -87,7 +96,7 @@ func (kv *KVIndexer) IndexBlock(block *tmtypes.Block, txResults []*abci.ExecTxRe
 
 		txs, err := rpctypes.ParseTxResult(result, tx)
 		if err != nil {
-			kv.logger.Error("Fail to parse event", "err", err, "block", height, "txIndex", txIndex)
+			kv.logger.Error("Fail to parse event", "err", err, "block", block.Height, "txIndex", txIndex)
 			continue
 		}
 
@@ -97,21 +106,23 @@ func (kv *KVIndexer) IndexBlock(block *tmtypes.Block, txResults []*abci.ExecTxRe
 			var txHash common.Hash
 
 			txResult := ethermint.TxResult{
-				Height:     height,
+				Height:     block.Height,
 				TxIndex:    uint32(txIndex),
 				MsgIndex:   uint32(msgIndex),
 				EthTxIndex: ethTxIndex,
 			}
-			if result.Code != abci.CodeTypeOK {
+			if result.Code != abci.CodeTypeOK && result.Codespace != evmtypes.ModuleName {
 				// exceeds block gas limit scenario, set gas used to gas limit because that's what's charged by ante handler.
 				// some old versions don't emit any events, so workaround here directly.
 				txResult.GasUsed = ethMsg.GetGas()
 				txResult.Failed = true
 				txHash = ethMsg.Hash()
 			} else {
+				// success or fail due to VM error
+
 				parsedTx := txs.GetTxByMsgIndex(msgIndex)
 				if parsedTx == nil {
-					kv.logger.Error("msg index not found in events", "msgIndex", msgIndex)
+					kv.logger.Error("msg index not found in results", "msgIndex", msgIndex)
 					continue
 				}
 				if parsedTx.EthTxIndex >= 0 && parsedTx.EthTxIndex != ethTxIndex {
@@ -127,7 +138,7 @@ func (kv *KVIndexer) IndexBlock(block *tmtypes.Block, txResults []*abci.ExecTxRe
 			ethTxIndex++
 
 			if err := saveTxResult(kv.clientCtx.Codec, batch, txHash, &txResult); err != nil {
-				return errorsmod.Wrapf(err, "IndexBlock %d", height)
+				return errorsmod.Wrapf(err, "IndexBlock %d", block.Height)
 			}
 		}
 	}