Merge pull request #931 from ethereum/settings

src/app.js

@@ -109,6 +109,7 @@ class App {
     self._api = {}
     var fileStorage = new Storage('sol:')
     self._api.config = new Config(fileStorage)
+    executionContext.init(self._api.config)
     self._api.filesProviders = {}
     self._api.filesProviders['browser'] = new Browserfiles(fileStorage)
     self._api.filesProviders['localhost'] = new SharedFolder(new Remixd())

src/app/tabs/settings-tab.js

@@ -43,6 +43,7 @@ function SettingsTab (container, appAPI, appEvents, opts) {
 
   var queryParams = new QueryParams()
 
+  var optionVM = yo`<input class="${css.col1}" id="alwaysUseVM" type="checkbox">`
   var el = yo`
     <div class="${css.settingsTabView} "id="settingsView">
       <div class="${css.info}">
@@ -57,6 +58,10 @@ function SettingsTab (container, appAPI, appEvents, opts) {
         <span class="${css.checkboxText}">Text Wrap</span>
       </div>
       <div class="${css.crow}">
+        <div>${optionVM}</div>
+        <span class="${css.checkboxText}">Always use VM at Load</span>
+      </div>
+      <div class="${css.crow}">
         <div><input class="${css.col1}" id="optimize" type="checkbox"></div>
         <span class="${css.checkboxText}">Enable Optimization</span>
       </div>
@@ -67,6 +72,11 @@ function SettingsTab (container, appAPI, appEvents, opts) {
     setVersionText(version, el)
   })
 
+  optionVM.checked = appAPI.config.get('settings/always-use-vm') || false
+  optionVM.addEventListener('change', event => {
+    appAPI.config.set('settings/always-use-vm', !appAPI.config.get('settings/always-use-vm'))
+  })
+
   var optimize = el.querySelector('#optimize')
   if ((queryParams.get().optimize === 'true')) {
     optimize.setAttribute('checked', true)

src/execution-context.js

@@ -82,7 +82,16 @@ var mainNetGenesisHash = '0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec
 function ExecutionContext () {
   var self = this
   this.event = new EventManager()
-  var executionContext = 'vm'
+
+  var executionContext = null
+
+  this.init = function (config) {
+    if (config.get('settings/always-use-vm')) {
+      executionContext = 'vm'
+    } else {
+      executionContext = injectedProvider ? 'injected' : 'vm'
+    }
+  }
 
   this.getProvider = function () {
     return executionContext