chore: add a arg for afterApply and update version

Author: samlior

packages/vm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gxchain2-ethereumjs/vm",
-  "version": "5.5.7",
+  "version": "5.5.8",
   "description": "An Ethereum VM implementation",
   "license": "MPL-2.0",
   "author": "mjbecze <[email protected]>",

packages/vm/src/evm/evm.ts

@@ -166,7 +166,7 @@ export default class EVM {
       )
     }
 
-    // If receive `contractAddress` option, it must be update
+    // If receive `contractAddress` option, it must be a update message
     if (message.contractAddress) {
       result = await this._executeUpdate(message)
     } else if (message.to) {

packages/vm/src/runBlock.ts

@@ -13,6 +13,8 @@ import type { TxReceipt, IDebug } from './types'
 import { InterpreterStep } from './evm/interpreter'
 import * as DAOConfig from './config/dao_fork_accounts_config.json'
 
+type PromisResultType<T> = T extends PromiseLike<infer U> ? U : T
+
 // For backwards compatibility from v5.3.0,
 // TxReceipts are exported. These exports are
 // deprecated and may be removed soon, please
@@ -78,7 +80,10 @@ export interface RunBlockOpts {
   /**
    * After apply block callback
    */
-  afterApply?: (stateManager: StateManager) => Promise<void>
+  afterApply?: (
+    stateManager: StateManager,
+    result: PromisResultType<ReturnType<typeof applyBlock>>
+  ) => Promise<void>
 }
 
 /**
@@ -189,6 +194,8 @@ export default async function runBlock(this: VM, opts: RunBlockOpts): Promise<Ru
         } txResults=${result.results.length}`
       )
     }
+    // Call after apply if exists
+    opts.afterApply && (await opts.afterApply(state, result))
   } catch (err) {
     await state.revert()
     if (this.DEBUG) {
@@ -197,9 +204,6 @@ export default async function runBlock(this: VM, opts: RunBlockOpts): Promise<Ru
     throw err
   }
 
-  // Call after apply if exists
-  opts.afterApply && (await opts.afterApply(state))
-
   // Persist state
   await state.commit()
   if (this.DEBUG) {