block: swap withdrawal/opts in constructor (ethereumjs#2715)

* block: swap withdrawal/opts in constructor

* blockchain: fix pkg

* vm: fix test runner

---------

Co-authored-by: Holger Drewes <[email protected]>

Author: jochem-brouwer

packages/block/src/block.ts

@@ -127,7 +127,7 @@ export class Block {
 
     const withdrawals = withdrawalsData?.map(Withdrawal.fromWithdrawalData)
 
-    return new Block(header, transactions, uncleHeaders, opts, withdrawals)
+    return new Block(header, transactions, uncleHeaders, withdrawals, opts)
   }
 
   /**
@@ -212,7 +212,7 @@ export class Block {
       }))
       ?.map(Withdrawal.fromWithdrawalData)
 
-    return new Block(header, transactions, uncleHeaders, opts, withdrawals)
+    return new Block(header, transactions, uncleHeaders, withdrawals, opts)
   }
 
   /**
@@ -370,8 +370,8 @@ export class Block {
     header?: BlockHeader,
     transactions: TypedTransaction[] = [],
     uncleHeaders: BlockHeader[] = [],
-    opts: BlockOptions = {},
-    withdrawals?: Withdrawal[]
+    withdrawals?: Withdrawal[],
+    opts: BlockOptions = {}
   ) {
     this.header = header ?? BlockHeader.fromHeaderData({}, opts)
     this._common = this.header._common

packages/block/test/mergeBlock.spec.ts

@@ -40,7 +40,7 @@ tape('[Header]: Casper PoS / The Merge Functionality', function (t) {
     const header = BlockHeader.fromHeaderData({}, { common })
     validateMergeHeader(st, header)
 
-    const block = new Block(undefined, undefined, undefined, { common })
+    const block = new Block(undefined, undefined, undefined, undefined, { common })
     validateMergeHeader(st, block.header)
 
     st.end()
@@ -106,9 +106,15 @@ tape('[Header]: Casper PoS / The Merge Functionality', function (t) {
 
   t.test('test that a PoS block with uncles cannot be produced', function (st) {
     try {
-      new Block(undefined, undefined, [BlockHeader.fromHeaderData(undefined, { common })], {
-        common,
-      })
+      new Block(
+        undefined,
+        undefined,
+        [BlockHeader.fromHeaderData(undefined, { common })],
+        undefined,
+        {
+          common,
+        }
+      )
       st.fail('should have thrown')
     } catch (e: any) {
       st.pass('should throw')

packages/blockchain/src/blockchain.ts

@@ -418,7 +418,7 @@ export class Blockchain implements BlockchainInterface {
       try {
         const block =
           item instanceof BlockHeader
-            ? new Block(item, undefined, undefined, {
+            ? new Block(item, undefined, undefined, undefined, {
                 common: item._common,
               })
             : item

packages/blockchain/test/util.ts

@@ -98,7 +98,7 @@ export const generateConsecutiveBlock = (
     }
   )
 
-  const block = new Block(header, undefined, undefined, { common })
+  const block = new Block(header, undefined, undefined, undefined, { common })
 
   return block
 }

packages/vm/test/tester/runners/GeneralStateTestsRunner.ts

@@ -79,7 +79,7 @@ async function runTestCase(options: any, testData: any, t: tape.Test) {
 
   // Have to create a blockchain with empty block as genesisBlock for Merge
   // Otherwise mainnet genesis will throw since this has difficulty nonzero
-  const genesisBlock = new Block(undefined, undefined, undefined, { common })
+  const genesisBlock = new Block(undefined, undefined, undefined, undefined, { common })
   const blockchain = await Blockchain.create({ genesisBlock, common })
   const state = new Trie({ useKeyHashing: true })
   const stateManager = new DefaultStateManager({