ethereum
diff --git a/‎.travis.yml
Lines changed: 15 additions & 0 deletions b/‎.travis.yml
Lines changed: 15 additions & 0 deletions
diff --git a/‎README.md
Lines changed: 3 additions & 1 deletion b/‎README.md
Lines changed: 3 additions & 1 deletion
diff --git a/‎app/.meteor/packages
Lines changed: 3 additions & 1 deletion b/‎app/.meteor/packages
Lines changed: 3 additions & 1 deletion
diff --git a/‎app/.meteor/versions
Lines changed: 4 additions & 2 deletions b/‎app/.meteor/versions
Lines changed: 4 additions & 2 deletions
diff --git a/‎app/client/index.js
Lines changed: 7 additions & 3 deletions b/‎app/client/index.js
Lines changed: 7 additions & 3 deletions
diff --git a/‎app/client/lib/ethereum/observeBlocks.js
Lines changed: 35 additions & 16 deletions b/‎app/client/lib/ethereum/observeBlocks.js
Lines changed: 35 additions & 16 deletions
diff --git a/‎app/client/lib/ethereum/observeTransactions.js
Lines changed: 22 additions & 13 deletions b/‎app/client/lib/ethereum/observeTransactions.js
Lines changed: 22 additions & 13 deletions
diff --git a/‎app/client/lib/ethereum/walletConnector.js
Lines changed: 8 additions & 6 deletions b/‎app/client/lib/ethereum/walletConnector.js
Lines changed: 8 additions & 6 deletions
diff --git a/‎app/client/lib/ethereum/walletInterface.js
Lines changed: 6 additions & 6 deletions b/‎app/client/lib/ethereum/walletInterface.js
Lines changed: 6 additions & 6 deletions
@@ -0,0 +1,15 @@
+language: node_js
+
+node_js: "7"
+
+sudo: required
+
+install:
+  - npm install -g meteor-build-client
+  - curl https://install.meteor.com/ | sh
+
+script:
+  - cd app
+  - echo `pwd`
+  - meteor-build-client ../build --path ""
+
@@ -2,6 +2,8 @@
 
 The Ethereum wallet.
 
+[![Build Status](https://travis-ci.org/ethereum/meteor-dapp-wallet.svg?branch=master)](https://travis-ci.org/ethereum/meteor-dapp-wallet)
+
 **NOTE** The wallet is not yet official released,
 can contain severe bugs!
 
@@ -12,7 +14,7 @@ Start an `geth` node and and the app using meteor and open http://localhost:3000
 
     $ geth --rpccorsdomain "http://localhost:3000" --rpc --unlock <your account>
 
-Starting the wallet dapp using [Meteor](http://meteor.com/install)
+Starting the wallet dapp using [Meteor](https://meteor.com/install)
 
     $ cd meteor-dapp-wallet/app
     $ meteor
 
@@ -44,6 +44,8 @@ ethereum:web3
 ethereum:blocks
 ethereum:accounts
 ethereum:dapp-styles
-numeral:numeral
 jrudio:bluebird
 tap:i18n-bundler
+numeral:numeral
+numeral:languages
+hashanp:geopattern
@@ -34,8 +34,8 @@ [email protected]
 ethereum:[email protected]
 ethereum:[email protected]
 ethereum:[email protected]
-ethereum:[email protected].10
-ethereum:tools@0.6.0
+ethereum:[email protected].17
+ethereum:tools@0.7.0
 ethereum:[email protected]
 [email protected]
 frozeman:[email protected]
@@ -48,6 +48,7 @@ frozeman:[email protected]
 frozeman:[email protected]
 frozeman:[email protected]
 [email protected]
+hashanp:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -78,6 +79,7 @@ [email protected]
 [email protected]
 mrt:[email protected]
 [email protected]
+numeral:[email protected]
 numeral:[email protected]_1
 [email protected]
 [email protected]
 
@@ -21,7 +21,11 @@ Meteor.startup(function() {
         if(_.isString(TAPi18n.getLanguage())) {
             var lang = TAPi18n.getLanguage().substr(0,2);
             moment.locale(lang);
-            numeral.language(lang);
+            try {
+                numeral.language(lang);
+            } catch (err) {
+                console.warn('numeral.js couldn\'t set number formating: ', err.message);
+            }
             EthTools.setLocale(lang);
         }
 
@@ -39,10 +43,10 @@ Meteor.startup(function() {
                     symbol: '🦄',
                     balances: {},
                     decimals: 0
-                }});    
+                }});
             }, 5000);
         }
     });
 
 
-});
+});
@@ -19,48 +19,67 @@ Update wallet balances
 @method updateBalances
 */
 updateBalances = function() {
-
+    // UPDATE ALL BALANCES (incl. Tokens)
     var walletsAndContracts = Wallets.find().fetch().concat(CustomContracts.find().fetch());
 
-    // UPDATE WALLETS ACCOUNTS balance
-    _.each(walletsAndContracts, function(wallet){
-        if(wallet.address) {
-            web3.eth.getBalance(wallet.address, function(err, res){
+    // go through all existing accounts, for each token
+    _.each(walletsAndContracts, function(account){
+
+        if(account.address) {
+            web3.eth.getBalance(account.address, function(err, res){
                 if(!err) {
                     // is of type wallet
-                    if(wallet.creationBlock) {
-                        Wallets.update(wallet._id, {$set: {
+                    if(account.creationBlock) {
+                        Wallets.update(account._id, {$set: {
                             balance: res.toString(10)
                         }});
                     } else {
-                        CustomContracts.update(wallet._id, {$set: {
+                        CustomContracts.update(account._id, {$set: {
                             balance: res.toString(10)
                         }});
                     }
                 }
             });
 
             // update dailylimit spent, etc, if wallet type
-            if(wallet.creationBlock) {
+            if(account.creationBlock) {
                 Meteor.setTimeout(function() {
-                    updateContractData(wallet);
+                    updateContractData(account);
                 }, 1000);
             }
         }
+
+
+        // Only check ENS names every N minutes
+        var now = Date.now();
+        if (!account.ensCheck || (account.ensCheck && now - account.ensCheck > 10*60*1000)) {
+            Helpers.getENSName(account.address, function(err, name, returnedAddr) {
+
+                if (!err && account.address.toLowerCase() == returnedAddr){
+                    EthAccounts.update({address: account.address}, {$set:{ name: name, ens: true, ensCheck: now}});
+                    CustomContracts.update({address: account.address}, {$set:{ name: name, ens: true, ensCheck: now}});
+                    Wallets.update({address: account.address}, {$set:{ name: name, ens: true, ensCheck: now}});
+                } else {
+                    EthAccounts.update({address: account.address}, {$set:{ens: false, ensCheck: now}});
+                    CustomContracts.update({address: account.address}, {$set:{ens: false, ensCheck: now}});
+                    Wallets.update({address: account.address}, {$set:{ens: false, ensCheck: now}});
+
+                }
+            });
+        }
+
     });
 
 
-    
     // UPDATE TOKEN BALANCES
-    var walletsContractsAndAccounts = EthAccounts.find().fetch().concat(walletsAndContracts);
+    var walletsContractsAndAccounts = EthAccounts.find().fetch().concat(Wallets.find().fetch());
 
     _.each(Tokens.find().fetch(), function(token){
         if(!token.address)
             return;
 
         var tokenInstance = TokenContract.at(token.address);
 
-        // go through all existing accounts, for each token
         _.each(walletsContractsAndAccounts, function(account){
             tokenInstance.balanceOf(account.address, function(e, balance){
                 var currentBalance = (token && token.balances) ? token.balances[account._id] : 0;
@@ -74,7 +93,7 @@ updateBalances = function() {
                         set['balances.'+ account._id] = '';
                         Tokens.update(token._id, {$unset: set});
                     }
-                    
+
                 }
             });
         });
@@ -88,13 +107,13 @@ Observe the latest blocks
 @method observeLatestBlocks
 */
 observeLatestBlocks = function(){
-    // update balances on start 
+
+    // update balances on start
     updateBalances();
 
     // GET the latest blockchain information
     web3.eth.filter('latest').watch(function(e, res){
         if(!e) {
-            // console.log('Block arrived ', res);
             updateBalances();
         }
     });
 
@@ -160,7 +160,7 @@ var updateTransaction = function(newDocument, transaction, receipt){
                         console.log("isToken: ",isToken)
 
                         if(isToken) {
-                            
+
                             tokenId = Helpers.makeId('token', receipt.contractAddress);
 
                             Tokens.upsert(tokenId, {$set: {
@@ -171,7 +171,7 @@ var updateTransaction = function(newDocument, transaction, receipt){
                                 decimals: 0
                             }});
 
-                            
+
                             // check if the token has information about itself asynchrounously
                             var tokenInstance = TokenContract.at(receipt.contractAddress);
 
@@ -183,7 +183,7 @@ var updateTransaction = function(newDocument, transaction, receipt){
                                     name: TAPi18n.__('wallet.tokens.admin', { name: i } )
                                 }});
                             });
-                            
+
                             tokenInstance.decimals(function(e, i){
                                 Tokens.upsert(tokenId, {$set: {
                                     decimals: Number(i)
@@ -272,8 +272,10 @@ observeTransactions = function(){
 
         // check for confirmations
         if(!tx.confirmed && tx.transactionHash) {
-            var filter = web3.eth.filter('latest');
-            filter.watch(function(e, blockHash){
+
+            var updateTransactions = function(e, blockHash){
+                console.log('updateTransactions', e, blockHash);
+
                 if(!e) {
                     var confirmations = (tx.blockNumber && EthBlocks.latest.number) ? (EthBlocks.latest.number + 1) - tx.blockNumber : 0;
                     confCount++;
@@ -370,6 +372,10 @@ observeTransactions = function(){
                         });
                     }
                 }
+            };
+
+            var filter = web3.eth.filter('latest').watch(function(e, blockHash) {
+                updateTransactions(e, blockHash);
             });
         }
     };
@@ -408,13 +414,16 @@ observeTransactions = function(){
                 checkTransactionConfirmations(newDocument);
             }
 
-            // add price data
-            if(newDocument.timestamp && 
-               (!newDocument.exchangeRates || 
+            // If on main net, add price data
+            if( Session.get('network') == 'main' && 
+                newDocument.timestamp &&
+               (!newDocument.exchangeRates ||
                !newDocument.exchangeRates.btc ||
                !newDocument.exchangeRates.usd ||
-               !newDocument.exchangeRates.eur)) {
-                var url = 'https://min-api.cryptocompare.com/data/pricehistorical?fsym=ETH&tsyms=BTC,USD,EUR&ts='+ newDocument.timestamp;
+               !newDocument.exchangeRates.eur ||
+               !newDocument.exchangeRates.gbp ||
+               !newDocument.exchangeRates.brl)) {
+                var url = 'https://min-api.cryptocompare.com/data/pricehistorical?fsym=ETH&tsyms=BTC,USD,EUR,GBP,BRL&ts='+ newDocument.timestamp;
 
                 if(typeof mist !== 'undefined')
                     url += '&extraParams=Mist-'+ mist.version;
@@ -424,7 +433,7 @@ observeTransactions = function(){
                     if(!e && res && res.statusCode === 200) {
                         var content = JSON.parse(res.content);
 
-                        if(content){
+                        if(content && content.Response !== "Error"){
                             _.each(content, function(price, key){
                                 if(price && _.isFinite(price)) {
                                     var name = key.toLowerCase();
@@ -445,7 +454,7 @@ observeTransactions = function(){
             }
         },
         /**
-        Will check if the transaction is confirmed 
+        Will check if the transaction is confirmed
 
         @method changed
         */
@@ -484,4 +493,4 @@ observeTransactions = function(){
         }
     });
 
-};
+};
@@ -61,15 +61,18 @@ connectToNode = function(){
 
     EthAccounts.init();
     EthBlocks.init();
-    EthTools.ticker.start({extraParams: (typeof mist !== 'undefined') ? 'Mist-'+ mist.version : ''});
+    EthTools.ticker.start({
+      extraParams: (typeof mist !== 'undefined') ? 'Mist-'+ mist.version : '',
+      currencies: ['BTC', 'USD', 'EUR', 'BRL', 'GBP']
+    });
 
     if (EthAccounts.find().count() > 0) {
         checkForOriginalWallet();
     }
 
     // EthBlocks.detectFork(function(oldBlock, block){
     //     console.log('FORK detected from Block #'+ oldBlock.number + ' -> #'+ block.number +', rolling back!');
-        
+
     //     // Go through all accounts and re-run
     //     _.each(Wallets.find({}).fetch(), function(wallet){
     //         // REMOVE ADDRESS for YOUNG ACCOUNTS, so that it tries to get the Created event and correct address again
@@ -107,15 +110,15 @@ resetWallet = function function_name (argument) {
     _.each(Transactions.find().fetch(), function(tx) {
         console.log(tx._id);
         try {
-            Transactions.remove(tx._id); 
+            Transactions.remove(tx._id);
         } catch(e){
             console.error(e);
         }
     });
 
     _.each(PendingConfirmations.find().fetch(), function(pc) {
         try {
-            PendingConfirmations.remove(pc._id); 
+            PendingConfirmations.remove(pc._id);
         } catch(e){
             console.error(e);
         }
@@ -133,7 +136,6 @@ resetWallet = function function_name (argument) {
 
     setTimeout(function() {
         console.log('Fetching logs...');
-        connectToNode();    
+        connectToNode();
     }, 1000 * 6);
 }
-