Caches the contract code and ABI inputs

.gitignore

@@ -3,7 +3,7 @@ app/packages/*
 app/public/i18n/*.json
 build/
 packages/
-
 app/public/i18n/tap-i18n.json
 app/public/i18n/de.json
 app/public/i18n/es.json
+

app/.meteor/versions

@@ -34,7 +34,7 @@ ejson@1.0.11
 ethereum:accounts@0.3.10
 ethereum:blocks@0.3.1
 ethereum:dapp-styles@0.5.4
-ethereum:elements@0.7.2
+ethereum:elements@0.7.3
 ethereum:tools@0.5.2
 ethereum:web3@0.15.3
 fastclick@1.0.11

app/client/templates/elements/compileContract.html

@@ -53,11 +53,11 @@ <h3>{{i18n 'wallet.contracts.selectContract'}}</h3>
                             <select class="compiled-contracts">
                                 <option disabled selected>{{i18n "wallet.contracts.pickContract"}}</option>
                                 {{#each this}}
-                                    <option value="{{name}}">{{toSentence name true}}</option>
+                                    <option value="{{name}}" selected="{{selected}}">{{toSentence name true}}</option>
                                 {{/each}}    
                             </select>
                         {{else}}
-                        {{{i18n "wallet.contracts.noContract"}}}
+                            {{{i18n "wallet.contracts.noContract"}}}
                         {{/with}}
 
                         {{#with selectedContractInputs}}

app/client/templates/elements/compileContract.js

@@ -21,6 +21,8 @@ Template['elements_compileContract'].onCreated(function() {
     TemplateVar.set('value', '');
     TemplateVar.set('constructorInputs', []);
     TemplateVar.set('selectedType', this.data.onlyByteCode ? 'byte-code' : 'source-code');
+    TemplateVar.set('compiledContracts', JSON.parse(localStorage['compiledContracts'] || null));
+    TemplateVar.set('selectedContract', JSON.parse(localStorage['selectedContract'] || null));
 
     // focus the editors
     this.autorun(function(c) {
@@ -54,6 +56,10 @@ Template['elements_compileContract'].onCreated(function() {
         // generate new contract code
         TemplateVar.set('value', web3.eth.contract(selectedContract.jsonInterface).new.getData.apply(null, constructorInputs));
         TemplateVar.set('contract', selectedContract);
+
+        // Save data to localstorage
+        localStorage.setItem('selectedContract', JSON.stringify(selectedContract));
+
     });
 });
 
@@ -73,12 +79,9 @@ Template['elements_compileContract'].onRendered(function() {
     this.aceEditor.$blockScrolling = Infinity;
     this.aceEditor.focus();
 
-    this.aceEditor.setValue("contract MyContract {\n"+
-"    /* Constructor */\n"+
-"    function MyContract() {\n"+
-" \n"+
-"    }\n"+
-"}");
+    var defaultCode = localStorage['contractSource'] || "contract MyContract {\n    /* Constructor */\n    function MyContract() {\n \n    }\n}";
+
+    this.aceEditor.setValue(defaultCode);
     this.aceEditor.selection.selectTo(0);
 
     editor = this.aceEditor;
@@ -87,10 +90,10 @@ Template['elements_compileContract'].onRendered(function() {
     this.aceEditor.getSession().on('change', _.debounce(function(e) {
         var sourceCode = template.aceEditor.getValue();
 
+        localStorage.setItem('contractSource', sourceCode);
+
         TemplateVar.set(template, 'compiling', true);
         TemplateVar.set(template, 'compileError', false);
-        // TemplateVar.set(template, 'compiledContracts', false);
-        // TemplateVar.set(template, 'selectedContract', false);
 
         Meteor.setTimeout(function(argument) {
             web3.eth.compile.solidity(sourceCode, function(error, compiledContracts){
@@ -133,7 +136,8 @@ Template['elements_compileContract'].onRendered(function() {
 
                     TemplateVar.set(template, 'selectedContract', null);
                     TemplateVar.set(template, 'compiledContracts', compiledContracts);
-                    TemplateVar.set(template, 'constructorInputs', []);
+                    localStorage.setItem('compiledContracts', JSON.stringify(compiledContracts));
+
 
                 } else {
                     console.log(error);
@@ -179,7 +183,7 @@ Template['elements_compileContract'].helpers({
     @method (selectedContractInputs)
     */
     'selectedContractInputs' : function(){
-        selectedContract = TemplateVar.get('selectedContract');
+        selectedContract = TemplateVar.get('selectedContract');        
         return selectedContract ? selectedContract.constructorInputs : [];
     }
 });
@@ -218,13 +222,24 @@ Template['elements_compileContract'].events({
     @event 'change .contract-functions
     */
     'change .compiled-contracts': function(e, template){
+        // set a contract as selected
+        var compiledContracts = TemplateVar.get('compiledContracts');
+
+        _.each(compiledContracts, function(contract){
+            contract.selected = contract.name == e.currentTarget.value;
+        })
+
         // get the correct contract
-        var selectedContract = _.find(TemplateVar.get('compiledContracts'), function(contract){
-            return contract.name == e.currentTarget.value;
+        var selectedContract = _.find(compiledContracts, function(contract){
+            return contract.selected;
         })
 
         // change the inputs and data field
         TemplateVar.set('selectedContract', selectedContract);
+        TemplateVar.set('compiledContracts', compiledContracts);
+        localStorage.setItem('compiledContracts', JSON.stringify(compiledContracts));
+
+        console.log(compiledContracts);
 
         Tracker.afterFlush(function(){
             // Run all inputs through formatter to catch bools

app/client/templates/elements/inputs/address.js

@@ -22,6 +22,7 @@ Template['elements_input_address'].helpers({
         var attr = _.clone(this);
         attr.class =  this.class ? this.class + ' abi-input' : 'abi-input';
         attr.placeholder = this.placeholder || '0x123456...';
+        attr.value = this.value;
         return attr;
     }
 })

app/client/templates/elements/inputs/bool.html

@@ -2,6 +2,6 @@
     <h4>
         {{#if name}}{{{toSentence name}}} <em>-</em> {{/if}}<em>Boolean</em>
     </h4>
-    <input type="checkbox" id="input-bool-{{class}}-{{name}}" name="elements_input_bool" class="abi-input {{class}}">
+    <input type="checkbox" id="input-bool-{{class}}-{{name}}" name="elements_input_bool" class="abi-input {{class}}" checked="{{value}}"> 
     <label for="input-bool-{{class}}-{{name}}">{{i18n "wallet.contracts.buttons.yes"}}</label>
 </template>

app/client/templates/elements/inputs/bytes.html

@@ -2,5 +2,5 @@
     <h4>
         {{#if name}}{{{toSentence name}}} <em>-</em> {{/if}}<em>{{bits}} Bytes</em>
     </h4>
-    <input type="text" pattern="^(0x)?[0-9a-fA-F]+$" placeholder="0x1234af..." name="elements_input_bytes" class="abi-input {{class}}">
+    <input type="text" pattern="^(0x)?[0-9a-fA-F]+$" placeholder="0x1234af..." name="elements_input_bytes" class="abi-input {{class}}" value="{{value}}">
 </template>

app/client/templates/elements/inputs/int.html

@@ -2,5 +2,5 @@
     <h4>
         {{#if name}}{{{toSentence name}}} <em>-</em> {{/if}}<em>{{#if bits}}{{bits}} bits{{/if}} signed integer</em>
     </h4>
-    <input type="number" step="1" placeholder="-123" name="elements_input_int" class="abi-input {{class}}">
+    <input type="number" step="1" placeholder="-123" name="elements_input_int" class="abi-input {{class}}" value="{{value}}">
 </template>

app/client/templates/elements/inputs/json.html

@@ -2,5 +2,5 @@
     <h4>
         {{#if name}}{{{toSentence name}}} <em>-</em> {{/if}}<em>{{type}}</em>
     </h4>
-    <textarea name="elements_input_json" cols="20" rows="5" class="abi-input {{class}}" placeholder="['my text', 12345]"></textarea>
+    <textarea name="elements_input_json" cols="20" rows="5" class="abi-input {{class}}" placeholder="['my text', 12345]">{{value}}</textarea>
 </template>

app/client/templates/elements/inputs/string.html

@@ -2,5 +2,5 @@
     <h4>
         {{#if name}}{{{toSentence name}}} <em>-</em> {{/if}}<em>String</em>
     </h4>
-    <input type="text" placeholder="MyString" name="elements_input_string" class="abi-input {{class}}">
+    <input type="text" placeholder="MyString" name="elements_input_string" class="abi-input {{class}}" value="{{value}}">
 </template>

app/client/templates/elements/inputs/uint.html

@@ -2,5 +2,5 @@
     <h4>
         {{#if name}}{{{toSentence name}}} <em>-</em> {{/if}}<em>{{#if bits}}{{bits}} bits{{/if}} unsigned integer</em>
     </h4>
-    <input type="number" step="1" min="0" placeholder="1234" name="elements_input_uint" class="abi-input {{class}}">
+    <input type="number" step="1" min="0" placeholder="1234" name="elements_input_uint" class="abi-input {{class}}" value="{{value}}">
 </template>

app/client/templates/views/send.js

@@ -609,6 +609,10 @@ Template['views_send'].events({
 
                                 addTransactionAfterSend(txHash, amount, selectedAccount.address, to, gasPrice, estimatedGas, data);
 
+                                localStorage.setItem('contractSource', 'contract MyContract {\n    /* Constructor */\n    function MyContract() {\n \n    }\n}');
+                                localStorage.setItem('compiledContracts', null);
+                                localStorage.setItem('selectedContract', null);
+
                                 FlowRouter.go('dashboard');
 
                             } else {
@@ -647,6 +651,10 @@ Template['views_send'].events({
                                     : data;
 
                                 addTransactionAfterSend(txHash, amount, selectedAccount.address, to, gasPrice, estimatedGas, data);
+
+                                localStorage.setItem('contractSource', 'contract MyContract {\n    /* Constructor */\n    function MyContract() {\n \n    }\n}');
+                                localStorage.setItem('compiledContracts', null);
+                                localStorage.setItem('selectedContract', null);
 
                                 FlowRouter.go('dashboard');
                             } else {