client, vm -> vm execution: removed stateDB from LightEthereumService…

…, removed checkpointing exception for zero tx blocks in VM.runBlocks()
ethereumjs · Jan 6, 2021 · dc2c99e · dc2c99e
1 parent bd32047
commit dc2c99e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/packages/client/lib/client.ts b/packages/client/lib/client.ts
@@ -64,7 +64,6 @@ export default class EthereumClient extends events.EventEmitter {
         : new LightEthereumService({
             config: this.config,
             chainDB: options.chainDB,
-            stateDB: options.stateDB,
           }),
     ]
     this.opened = false

diff --git a/packages/vm/lib/runBlock.ts b/packages/vm/lib/runBlock.ts
@@ -149,26 +149,19 @@ export default async function runBlock(this: VM, opts: RunBlockOpts): Promise<Ru
   }
 
   // Checkpoint state
-  // (only do checkpointing when txs are executed)
-  // TODO: determine if checkpointing is needed in a block
-  // context at all or CPs in runTx() are sufficient
-  if (block.transactions.length > 0) {
-    await state.checkpoint()
-  }
+  await state.checkpoint()
+
   let result
   try {
     result = await applyBlock.bind(this)(block, opts)
   } catch (err) {
-    if (block.transactions.length > 0) {
-      await state.revert()
-    }
+    await state.revert()
     throw err
   }
 
   // Persist state
-  if (block.transactions.length > 0) {
-    await state.commit()
-  }
+  await state.commit()
+
   const stateRoot = await state.getStateRoot(false)
 
   // Given the generate option, either set resulting header