Merge branch 'master' into istanbul/eip-2200

holgerd77 · web-flow · commit f2215c002cc3 · 2019-09-10T23:13:39.000+02:00
diff --git a/lib/index.ts b/lib/index.ts
@@ -40,7 +40,14 @@ export interface VMOpts {
    */
   blockchain?: Blockchain
   /**
-   * If true, create entries in the state tree for the precompiled contracts
+   * If true, create entries in the state tree for the precompiled contracts, saving some gas the
+   * first time each of them is called.
+   *
+   * If this parameter is false, the first call to each of them has to pay an extra 25000 gas
+   * for creating the account.
+   *
+   * Setting this to true has the effect of precompiled contracts' gas costs matching mainnet's from
+   * the very first call, which is intended for testing networks.
    */
   activatePrecompiles?: boolean
   /**
diff --git a/lib/state/stateManager.ts b/lib/state/stateManager.ts
@@ -526,7 +526,11 @@ export default class StateManager {
       addresses,
       (address: string, done: any) => {
         const account = new Account()
-        account.balance = new BN(initState[address]).toArrayLike(Buffer)
+        if (initState[address].slice(0, 2) === '0x') {
+          account.balance = new BN(initState[address].slice(2), 16).toArrayLike(Buffer)
+        } else {
+          account.balance = new BN(initState[address]).toArrayLike(Buffer)
+        }
         const addressBuffer = utils.toBuffer(address)
         this._trie.put(addressBuffer, account.serialize(), done)
       },
diff --git a/tests/api/state/stateManager.js b/tests/api/state/stateManager.js
@@ -138,6 +138,25 @@ tape('StateManager', (t) => {
     st.end()
   })
 
+  t.test('should generate correct genesis state root for all chains', async (st) => {
+    const chains = ['mainnet', 'ropsten', 'rinkeby', 'kovan', 'goerli']
+    for (const chain of chains) {
+      const common = new Common(chain, 'petersburg')
+      const expectedStateRoot = Buffer.from(common.genesis().stateRoot.slice(2), 'hex')
+      const stateManager = new StateManager({ common: common })
+
+      const generateCanonicalGenesis = promisify((...args) => stateManager.generateCanonicalGenesis(...args))
+      const getStateRoot = promisify((...args) => stateManager.getStateRoot(...args))
+
+      await generateCanonicalGenesis()
+      let stateRoot = await getStateRoot()
+
+      st.true(stateRoot.equals(expectedStateRoot), `generateCanonicalGenesis should produce correct state root for ${chain}`)
+    }
+
+    st.end()
+  })
+
   t.test('should dump storage', async st => {
     const stateManager = new StateManager()
     const addressBuffer = Buffer.from('a94f5374fce5edbc8e2a8697c15331677e6ebf0b', 'hex')
