Merge pull request ethereumjs#445 from davidmurdoch/storage-trie-cache-fix

holgerd77 · web-flow · commit 49d62cc796e9 · 2019-02-26T10:04:17.000+01:00
Ensure contract storage cache is cleared when state root is updated
diff --git a/lib/state/stateManager.js b/lib/state/stateManager.js
@@ -399,6 +399,7 @@ proto.setStateRoot = function (stateRoot, cb) {
     if (stateRoot === self._trie.EMPTY_TRIE_ROOT) {
       self._trie.root = stateRoot
       self._cache.clear()
+      self._storageTries = {}
       return cb()
     }
     self._trie.checkRoot(stateRoot, function (err, hasRoot) {
@@ -407,6 +408,7 @@ proto.setStateRoot = function (stateRoot, cb) {
       } else {
         self._trie.root = stateRoot
         self._cache.clear()
+        self._storageTries = {}
         cb()
       }
     })
diff --git a/tests/api/state/stateManager.js b/tests/api/state/stateManager.js
@@ -29,7 +29,10 @@ tape('StateManager', (t) => {
     const getAccount = promisify((...args) => stateManager.getAccount(...args))
     const commit = promisify((...args) => stateManager.commit(...args))
     const setStateRoot = promisify((...args) => stateManager.setStateRoot(...args))
+    const putContractStorage = promisify((...args) => stateManager.putContractStorage(...args))
+    const getContractStorage = promisify((...args) => stateManager.getContractStorage(...args))
 
+    // test account storage cache
     const initialStateRoot = await getStateRoot()
     await checkpoint()
     await putAccount(addressBuffer, account)
@@ -45,6 +48,20 @@ tape('StateManager', (t) => {
     const account2 = await getAccount(addressBuffer)
     st.equal(account2.balance.toString('hex'), '', 'account value is set to 0 in original state root')
 
+    // test contract storage cache
+    await checkpoint()
+    const key = Buffer.from('0x1234')
+    const value = Buffer.from('0x1234')
+    await putContractStorage(addressBuffer, key, value)
+
+    const contract0 = await getContractStorage(addressBuffer, key)
+    st.equal(contract0.toString('hex'), value.toString('hex'), 'contract key\'s value is set in the _storageTries cache')
+
+    await commit()
+    await setStateRoot(initialStateRoot)
+    const contract1 = await getContractStorage(addressBuffer, key)
+    st.equal(contract1.toString('hex'), '', 'contract key\'s value is unset in the _storageTries cache')
+
     st.end()
   })
 
