ethereumjs · holgerd77 · Oct 8, 2020 · Oct 7, 2020 · evertonfraga · Oct 7, 2020
diff --git a/packages/block/src/block.ts b/packages/block/src/block.ts
@@ -14,7 +14,7 @@ export class Block {
   public readonly uncleHeaders: BlockHeader[] = []
   public readonly txTrie = new Trie()
 
-  private readonly _common: Common
+  public readonly _common: Common
 
   /**
    * Creates a new block object

diff --git a/packages/block/src/header.ts b/packages/block/src/header.ts
@@ -34,7 +34,7 @@ export class BlockHeader {
   public mixHash!: Buffer
   public nonce!: Buffer
 
-  readonly _common: Common
+  public readonly _common: Common
 
   /**
    * Creates a new block header.

diff --git a/packages/block/src/types.ts b/packages/block/src/types.ts
@@ -12,7 +12,9 @@ export interface BlockOptions {
    * A Common object defining the chain and the hardfork a block/block header belongs to.
    *
    * Default: `Common` object set to `mainnet` and the HF currently defined as the default
-   * hardfork in the `Common` class
+   * hardfork in the `Common` class.
+   *
+   * Current default hardfork: `istanbul`
    */
   common?: Common
   /**

diff --git a/packages/block/test/block.spec.ts b/packages/block/test/block.spec.ts
@@ -13,7 +13,12 @@ tape('[Block]: block functions', function (t) {
 
   t.test('should initialize with undefined parameters without throwing', function (st) {
     st.doesNotThrow(function () {
-      new Block()
+      const block = new Block()
+      st.equal(
+        block._common.hardfork(),
+        'istanbul',
+        'should initialize with the current default HF',
+      )
       st.end()
     })
   })

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -25,7 +25,7 @@ A new function `setHardforkByBlockNumber()` has been added, PR [#863](https://gi
 
 ### Default hardfork
 
-The default hardfork has been added as an accessible readonly property `DEFAULT_HARDFORK`, PR [#863](https://github.com/ethereumjs/ethereumjs-vm/pull/863)
+The default hardfork has been added as an accessible readonly property `DEFAULT_HARDFORK`, PR [#863](https://github.com/ethereumjs/ethereumjs-vm/pull/863). Current default hardfork is set to `istanbul`, PR [#906](https://github.com/ethereumjs/ethereumjs-vm/pull/906).
 
 ## [1.5.1] - 2020-05-04
 

diff --git a/packages/common/README.md b/packages/common/README.md
@@ -77,7 +77,7 @@ library supported:
 - `byzantium`
 - `constantinople`
 - `petersburg` (aka `constantinopleFix`, apply together with `constantinople`)
-- `istanbul`
+- `istanbul` (`DEFAULT_HARDFORK`)
 - `muirGlacier`
 
 ## Future Hardforks

diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -15,7 +15,7 @@ export interface CommonOpts {
   /**
    * String identifier ('byzantium') for hardfork
    *
-   * Default: `petersburg`
+   * Default: `istanbul`
    */
   hardfork?: string
   /**
@@ -44,7 +44,7 @@ interface hardforkOptions {
  * Common class to access chain and hardfork parameters
  */
 export default class Common {
-  readonly DEFAULT_HARDFORK: string = 'petersburg'
+  readonly DEFAULT_HARDFORK: string = 'istanbul'
 
   private _chainParams: Chain
   private _hardfork: string

diff --git a/packages/common/tests/chains.ts b/packages/common/tests/chains.ts
@@ -7,7 +7,12 @@ tape('[Common]: Initialization / Chain params', function (t: tape.Test) {
     st.equal(c.chainName(), 'mainnet', 'should initialize with chain name')
     st.equal(c.chainId(), 1, 'should return correct chain Id')
     st.equal(c.networkId(), 1, 'should return correct network Id')
-    st.equal(c.hardfork(), 'petersburg', 'should set hardfork to the default hardfork')
+    st.equal(c.hardfork(), 'istanbul', 'should set hardfork to current default hardfork')
+    st.equal(
+      c.hardfork(),
+      c.DEFAULT_HARDFORK,
+      'should set hardfork to hardfork set as DEFAULT_HARDFORK',
+    )
     st.equal(c._isSupportedHardfork('constantinople'), true, 'should not restrict supported HFs')
 
     c = new Common({ chain: 1 })

diff --git a/packages/tx/CHANGELOG.md b/packages/tx/CHANGELOG.md
@@ -68,6 +68,12 @@ const tx = Transaction.fromValuesArray(arr)
 
 Learn more about the full API in the [docs](./docs/README.md).
 
+#### New Default Hardfork
+
+The default HF on the library has been updated from `petersburg` to `instanbul`.
+The HF setting is now automatically taken from the HF set for `Common.DEAULT_HARDFORK`,
+see PR [#906](https://github.com/ethereumjs/ethereumjs-vm/pull/906).
+
 #### Immutability
 
 The returned transaction is now frozen and immutable. To work with a maliable transaction, copy it with `const fakeTx = Object.create(tx)`.

diff --git a/packages/tx/src/types.ts b/packages/tx/src/types.ts
@@ -9,6 +9,8 @@ export interface TxOptions {
    * A Common object defining the chain and hardfork for the transaction.
    *
    * Default: `Common` object set to `mainnet` and the default hardfork as defined in the `Common` class.
+   *
+   * Current default hardfork: `istanbul`
    */
   common?: Common
 }

diff --git a/packages/tx/test/api.ts b/packages/tx/test/api.ts
@@ -19,6 +19,12 @@ const txFixturesEip155: VitaliksTestsDataEntry[] = require('./json/ttTransaction
 tape('[Transaction]: Basic functions', function (t) {
   const transactions: Transaction[] = []
 
+  t.test('should initialize correctly', function (st) {
+    const tx = Transaction.fromTxData({})
+    st.equal(tx.common.hardfork(), 'istanbul', 'should initialize with correct default HF')
+    st.end()
+  })
+
   t.test('should decode transactions', function (st) {
     txFixtures.slice(0, 4).forEach(function (tx: any) {
       const txData = tx.raw.map(toBuffer)
@@ -190,7 +196,7 @@ tape('[Transaction]: Basic functions', function (t) {
     st.equals(tx.getDataFee().toNumber(), 0)
 
     tx = Transaction.fromValuesArray(txFixtures[3].raw.map(toBuffer))
-    st.equals(tx.getDataFee().toNumber(), 2496)
+    st.equals(tx.getDataFee().toNumber(), 1716)
 
     st.end()
   })

diff --git a/packages/vm/CHANGELOG.md b/packages/vm/CHANGELOG.md
@@ -50,6 +50,10 @@ const common = new Common({ chain: 'mainnet', hardfork: 'spuriousDragon' })
 const vm = new VM({ common })
 ```
 
+The default HF from the VM has been updated from `petersburg` to `instanbul`.
+The HF setting is now automatically taken from the HF set for `Common.DEAULT_HARDFORK`,
+see PR [#906](https://github.com/ethereumjs/ethereumjs-vm/pull/906).
+
 **Breaking**: Please note that the options to directly pass in
 `chain` and `hardfork` strings have been removed to simplify the API.
 Providing a `Common` instance is now the only way to change

diff --git a/packages/vm/lib/index.ts b/packages/vm/lib/index.ts
@@ -51,7 +51,7 @@ export interface VMOpts {
    * Default setup if no `Common` instance is provided:
    *
    * - `chain`: `mainnet`
-   * - `hardfork`: `petersburg`
+   * - `hardfork`: `istanbul`
    * - `eips`: `[]`
    */
   common?: Common

diff --git a/packages/vm/tests/api/index.spec.ts b/packages/vm/tests/api/index.spec.ts
@@ -23,6 +23,7 @@ tape('VM with default blockchain', (t) => {
       KECCAK256_RLP,
       'it has default trie',
     )
+    st.equal(vm._common.hardfork(), 'istanbul', 'it has correct default HF')
     st.end()
   })