From ec078ce638464996cfe61ceece7ccabf2ee456a2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 12 Dec 2016 12:36:56 +0100
Subject: [PATCH] add extractStatesDefinitions to SolidityProxy (in order to
 cache it)

---
 src/solidity/solidityProxy.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/solidity/solidityProxy.js b/src/solidity/solidityProxy.js
index 54237be7c0..c1afa2187f 100644
--- a/src/solidity/solidityProxy.js
+++ b/src/solidity/solidityProxy.js
@@ -1,6 +1,7 @@
 'use strict'
 var traceHelper = require('../helpers/traceHelper')
 var stateDecoder = require('./stateDecoder')
+var astHelper = require('./astHelper')
 
 class SolidityProxy {
   constructor (traceManager, codeManager) {
@@ -59,6 +60,22 @@ class SolidityProxy {
     })
   }
 
+  /**
+    * extract the state variables of the given compiled @arg contractName (cached)
+    *
+    * @param {String} contractName  - name of the contract to retrieve state variables from
+    * @return {Object} - returns state variables of @args contractName
+    */
+  extractStatesDefinitions () {
+    if (!this.cache.contractDeclarations) {
+      this.cache.contractDeclarations = astHelper.extractContractDefinitions(this.sources)
+    }
+    if (!this.cache.statesDefinitions) {
+      this.cache.statesDefinitions = astHelper.extractStatesDefinitions(this.sources, this.cache.contractDeclarations)
+    }
+    return this.cache.statesDefinitions
+  }
+
   /**
     * extract the state variables of the given compiled @arg contractName (cached)
     *
@@ -118,6 +135,8 @@ class Cache {
   reset () {
     this.contractNameByAddress = {}
     this.stateVariablesByContractName = {}
+    this.contractDeclarations = null
+    this.statesDefinitions = null
   }
 }