From adaac38af151f5e52e23b9f01015a0f804898aee Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 21 Apr 2021 10:11:04 +0200
Subject: [PATCH] using fromBlockData

---
 libs/remix-debug/test/decoder/vmCall.ts  | 14 +++++++-------
 libs/remix-debug/test/vmCall.ts          | 14 +++++++-------
 libs/remix-lib/src/execution/txRunner.ts | 19 ++++++++++---------
 libs/remix-simulator/src/genesis.ts      | 19 ++++++++++---------
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/libs/remix-debug/test/decoder/vmCall.ts b/libs/remix-debug/test/decoder/vmCall.ts
index b797797699..91d6810dd3 100644
--- a/libs/remix-debug/test/decoder/vmCall.ts
+++ b/libs/remix-debug/test/decoder/vmCall.ts
@@ -1,7 +1,7 @@
 'use strict'
 var utileth = require('ethereumjs-util')
 var Tx = require('@ethereumjs/tx').Transaction
-import { Block, BlockHeader } from '@ethereumjs/block'
+import { Block } from '@ethereumjs/block'
 var BN = require('ethereumjs-util').BN
 var remixLib = require('@remix-project/remix-lib')
 import VM from '@ethereumjs/vm'
@@ -18,12 +18,12 @@ export function sendTx (vm, from, to, value, data, cb) {
   })
   tx.sign(from.privateKey)
 
-  var header = BlockHeader.fromHeaderData({
-    timestamp: new Date().getTime() / 1000 | 0,
-    number: 0
-  })
-
-  var block = new Block(header, [], [])
+  var block = Block.fromBlockData({
+    header: {
+      timestamp: new Date().getTime() / 1000 | 0,
+      number: 0
+    }
+  }) // still using default common
 
   try {
     vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}).then(function (result) {
diff --git a/libs/remix-debug/test/vmCall.ts b/libs/remix-debug/test/vmCall.ts
index 57d9a960ff..912ed68fd0 100644
--- a/libs/remix-debug/test/vmCall.ts
+++ b/libs/remix-debug/test/vmCall.ts
@@ -1,5 +1,5 @@
 'use strict'
-import { Block, BlockHeader } from '@ethereumjs/block'
+import { Block } from '@ethereumjs/block'
 import VM from '@ethereumjs/vm'
 var utileth = require('ethereumjs-util')
 var Tx = require('@ethereumjs/tx').Transaction
@@ -17,12 +17,12 @@ function sendTx (vm, from, to, value, data, cb) {
   })
   tx.sign(from.privateKey)
 
-  var header = BlockHeader.fromHeaderData({
-    timestamp: new Date().getTime() / 1000 | 0,
-    number: 0
-  })
-
-  var block = new Block(header, [], [])
+  var block = Block.fromBlockData({
+    header: {
+      timestamp: new Date().getTime() / 1000 | 0,
+      number: 0
+    }
+  }) // still using default common
   vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}).then(function (result) {
     setTimeout(() => {
       cb(null, utileth.bufferToHex(tx.hash()))
diff --git a/libs/remix-lib/src/execution/txRunner.ts b/libs/remix-lib/src/execution/txRunner.ts
index f8835cb6ee..e3b66e6ef6 100644
--- a/libs/remix-lib/src/execution/txRunner.ts
+++ b/libs/remix-lib/src/execution/txRunner.ts
@@ -1,6 +1,6 @@
 'use strict'
 import { Transaction } from '@ethereumjs/tx'
-import { Block, BlockHeader } from '@ethereumjs/block'
+import { Block } from '@ethereumjs/block'
 import { BN, bufferToHex, Address } from 'ethereumjs-util'
 import { ExecutionContext } from './execution-context'
 import { EventManager } from '../eventManager'
@@ -127,15 +127,16 @@ export class TxRunner {
       const coinbases = ['0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a', '0x8945a1288dc78a6d8952a92c77aee6730b414778', '0x94d76e24f818426ae84aa404140e8d5f60e10e7e']
       const difficulties = [new BN('69762765929000', 10), new BN('70762765929000', 10), new BN('71762765929000', 10)]
 
-      const header: BlockHeader = BlockHeader.fromHeaderData({
-        timestamp: timestamp || (new Date().getTime() / 1000 | 0),
-        number: self.blockNumber,
-        coinbase: coinbases[self.blockNumber % coinbases.length],
-        difficulty: difficulties[self.blockNumber % difficulties.length],
-        gasLimit: new BN(gasLimit.replace('0x', ''), 16).imuln(2)
+      var block = Block.fromBlockData({
+        header: {
+          timestamp: timestamp || (new Date().getTime() / 1000 | 0),
+          number: self.blockNumber,
+          coinbase: coinbases[self.blockNumber % coinbases.length],
+          difficulty: difficulties[self.blockNumber % difficulties.length],
+          gasLimit: new BN(gasLimit.replace('0x', ''), 16).imuln(2)
+        }
       }, { common: this.commonContext })
-
-      const block = new Block(header, [tx], [])
+      
       if (!useCall) {
         ++self.blockNumber
         this.runBlockInVm(tx, block, callback)
diff --git a/libs/remix-simulator/src/genesis.ts b/libs/remix-simulator/src/genesis.ts
index b8e99af54e..a0a20cec78 100644
--- a/libs/remix-simulator/src/genesis.ts
+++ b/libs/remix-simulator/src/genesis.ts
@@ -1,15 +1,16 @@
-import { Block, BlockHeader } from '@ethereumjs/block'
+import { Block } from '@ethereumjs/block'
 import { BN } from 'ethereumjs-util'
 
 export function generateBlock (executionContext) {
-  const header: BlockHeader = BlockHeader.fromHeaderData({
-    timestamp: (new Date().getTime() / 1000 | 0),
-    number: 0,
-    coinbase: '0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a',
-    difficulty: new BN('69762765929000', 10),
-    gasLimit: new BN('8000000').imuln(1)
-  })
-  const block: Block = new Block(header, [], [])
+  const block: Block = Block.fromBlockData({
+    header: {
+      timestamp: (new Date().getTime() / 1000 | 0),
+      number: 0,
+      coinbase: '0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a',
+      difficulty: new BN('69762765929000', 10),
+      gasLimit: new BN('8000000').imuln(1)
+    }
+  }, { common: executionContext.vmObject().common })
 
   executionContext.vm().runBlock({ block: block, generate: true, skipBlockValidation: true, skipBalance: false }).then(() => {
     executionContext.addBlock(block)