Huhu

.circleci/config.yml

@@ -0,0 +1,19 @@
+# Javascript Node CircleCI 2.0 configuration file
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:7.10
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/mongo:3.4.4
+
+    steps:
+      - checkout
+      - run: curl https://install.meteor.com/ | sh
+      - run: cd app && npm install && npm run build
+
+

.gitignore

@@ -3,4 +3,5 @@ app/packages
 app/packages/*
 packages/
 app/public/i18n/*.json
-app/.meteor/dev_bundle
+app/.meteor/dev_bundle
+app/node_modules

.pullapprove.yml

@@ -0,0 +1,14 @@
+version: 2
+groups:
+  code-review:
+    required: 2
+    reset_on_push:
+      enabled: true
+    users:
+    - alexvandesande
+    - evertonfraga
+    - frozeman
+    - marcgarreau
+    - PhilippLgh
+    - ryanio
+

.travis.yml

@@ -5,11 +5,10 @@ node_js: "7"
 sudo: required
 
 install:
-  - npm install -g meteor-build-client
+  - cd app
+  - npm install
   - curl https://install.meteor.com/ | sh
 
 script:
-  - cd app
-  - echo `pwd`
-  - meteor-build-client ../build --path ""
+  - npm run build
 

README.md

@@ -4,57 +4,64 @@ 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!
+**PLEASE NOTE:** This wallet is not yet officially released,
+and can contain severe bugs! Please use at your own risk.
+
+## Install
+
+If you don't have [Meteor](https://www.meteor.com/install):
+
+    $ curl https://install.meteor.com/ | sh
+
+Install npm dependencies:
+
+    $ cd meteor-dapp-wallet/app
+    $ npm install
 
 ## Development
 
-Start an `geth` node and the app using meteor and open http://localhost:3000 in your browser:
+Start a `geth` node:
 
-    $ geth --rpc --ws --wsorigins "http://localhost:3000" --unlock <your account>
+    $ geth --ws --wsorigins "http://localhost:3000" --unlock <your account>
 
-Starting the wallet dapp using [Meteor](https://meteor.com/install)
+Run dev server:
 
     $ cd meteor-dapp-wallet/app
     $ meteor
 
-Go to http://localhost:3000
+Navigate to http://localhost:3000
 
 ## Deployment
 
-To create a build version of your app run:
+To create a build:
 
-// install meteor-build-client
-$ npm install -g meteor-build-client
-
-    // bundle dapp
+    $ npm install -g meteor-build-client
     $ cd meteor-dapp-wallet/app
+    $ npm install
     $ meteor-build-client ../build --path ""
 
-This will generate the files in the `../build` folder. Double click the index.html to start the app.
-To make routing work properly you need to build it using:
+This will generate the files in the `../build` folder.
 
-    $ meteor-build-client ../build
+Navigating to `index.html` will start the app, but you will need to serve it over a local server like [MAMP](https://www.mamp.info).
 
-And start a local server which points with its document root into the `../build` folder,
-so that you can open the app using `http://localhost:80/`
+---
 
-To deploy them to the **wallet.ethereum.org** site, execute these commands (from the app folder):
+To deploy to the **wallet.ethereum.org** site, execute these commands:
 
-    git checkout gh-pages
-    git merge develop
-    cd app
-    meteor-build-client ../build --path "/"
+    $ git checkout gh-pages
+    $ git merge develop
+    $ cd app
+    $ meteor-build-client ../build --path "/"
 
-And push (or PR) your changes to the gh-pages branch.
+And push (or PR) your changes to the `gh-pages` branch.
 
 ---
 
 ## Gas usage statistics
 
-* Deploy original wallet: 1 230 162
-* Deploy wallet stub: 184 280
-* Simple Wallet transaction: 64 280
-* Multisig Wallet transaction below daily limit: 79 280
-* Multisig Wallet transaction above daily limit: 171 096
-* 1 Multisig confirmation: 48 363
+- Deploy original wallet: 1 230 162
+- Deploy wallet stub: 184 280
+- Simple Wallet transaction: 64 280
+- Multisig Wallet transaction below daily limit: 79 280
+- Multisig Wallet transaction above daily limit: 171 096
+- 1 Multisig confirmation: 48 363

app/client/lib/appStart.js

@@ -89,7 +89,7 @@ var showModal = function() {
     // if in mist, tell to start geth, otherwise start with RPC
     var gethRPC = window.mist
       ? 'geth'
-      : 'geth --rpc --ws --wsorigins "' +
+      : 'geth --ws --wsorigins "' +
         window.location.protocol +
         '//' +
         window.location.host +

app/client/lib/ethereum/observeTokens.js

@@ -38,7 +38,6 @@ var setupContractSubscription = function(newDocument) {
     }
   );
 
-  // SETUP FILTERS
   Helpers.eventLogs(
     'Checking Token Transfers for ' +
       newDocument.address +
@@ -52,6 +51,7 @@ var setupContractSubscription = function(newDocument) {
     fromBlock: blockToCheckBack,
     toBlock: 'latest'
   });
+
   events.push(subscription);
 
   // get past logs, to set the new blockNumber

app/client/lib/ethereum/observeTransactions.js

@@ -10,17 +10,18 @@ addTransactionAfterSend = function(
   to,
   gasPrice,
   estimatedGas,
-  data,
+  rawData,
   tokenId
 ) {
   var jsonInterface = undefined,
     contractName = undefined,
+    data = undefined,
     txId = Helpers.makeId('tx', txHash);
 
   if (_.isObject(data)) {
     contractName = data.contract.name.replace(/([A-Z])/g, ' $1');
     jsonInterface = data.contract.jsonInterface;
-    data = data.data;
+    data = rawData.data;
   }
 
   Transactions.upsert(txId, {

app/client/lib/ethereum/walletInterface.js

@@ -452,91 +452,84 @@ checkWalletOwners = function(address) {
       info: ''
     };
 
-    if (web3.utils.isAddress(address)) {
-      address = address.toLowerCase();
-      WalletContract.options.address = address;
-      var myContract = WalletContract;
-
-      myContract.m_numOwners(function(e, numberOfOwners) {
-        if (!e) {
-          numberOfOwners = numberOfOwners.toNumber();
-
-          if (numberOfOwners > 0) {
-            var owners = [];
-
-            // go through the number of owners we stop
-            P.all(
-              _.map(_.range(100), function(i) {
-                return new P(function(resolve, reject) {
-                  web3.eth.getStorageAt(address, 2 + i, function(
-                    e,
-                    ownerAddress
+    if (!web3.utils.isAddress(address)) return;
+    address = address.toLowerCase();
+    WalletContract.options.address = address;
+    var myContract = WalletContract;
+
+    myContract.methods.m_numOwners().call(function(e, numberOfOwners) {
+      if (e) reject(e);
+
+      numberOfOwners = Number(numberOfOwners);
+      if (numberOfOwners > 0) {
+        var owners = [];
+
+        // go through the number of owners we stop
+        P.all(
+          _.map(_.range(numberOfOwners), function(i) {
+            return new P(function(resolve, reject) {
+              web3.eth.getStorageAt(address, 2 + i, function(e, ownerAddress) {
+                if (!e) {
+                  ownerAddress = ownerAddress.replace(
+                    '0x000000000000000000000000',
+                    '0x'
+                  );
+
+                  ownerAddress = web3.utils.toChecksumAddress(ownerAddress);
+
+                  if (owners.length > numberOfOwners) return resolve();
+
+                  if (
+                    web3.utils.isAddress(ownerAddress) &&
+                    ownerAddress !==
+                      '0x0000000000000000000000000000000000000000'
                   ) {
-                    if (!e) {
-                      ownerAddress = ownerAddress.replace(
-                        '0x000000000000000000000000',
-                        '0x'
-                      );
-
-                      if (owners.length > numberOfOwners) return resolve();
-
-                      if (
-                        web3.utils.isAddress(ownerAddress) &&
-                        ownerAddress !==
-                          '0x0000000000000000000000000000000000000000'
-                      ) {
-                        myContract.isOwner.call(
-                          ownerAddress,
-                          { from: ownerAddress },
-                          function(e, isOwner) {
-                            if (!e && isOwner) {
-                              owners.push(ownerAddress);
-                              owners = _.uniq(owners);
-                              owners.sort();
-                            }
-
-                            resolve();
-                          }
-                        );
-                      } else {
+                    myContract.methods
+                      .isOwner(ownerAddress)
+                      .call({ from: ownerAddress }, function(e, isOwner) {
+                        if (!e && isOwner) {
+                          owners.push(ownerAddress);
+                          owners = _.uniq(owners);
+                          owners.sort();
+                        }
+
                         resolve();
-                      }
-                    }
-                  });
-                });
-              })
-            ).then(
-              function() {
-                returnValue.owners = owners;
-
-                if ((account = Helpers.getAccountByAddress({ $in: owners }))) {
-                  returnValue.info = TAPi18n.__(
-                    'wallet.newWallet.accountType.import.youreOwner',
-                    { account: account.name }
-                  );
-                } else {
-                  returnValue.info = TAPi18n.__(
-                    'wallet.newWallet.accountType.import.watchOnly'
-                  );
+                      });
+                  } else {
+                    resolve();
+                  }
                 }
+              });
+            });
+          })
+        ).then(
+          function() {
+            returnValue.owners = owners;
+
+            if ((account = Helpers.getAccountByAddress({ $in: owners }))) {
+              returnValue.info = TAPi18n.__(
+                'wallet.newWallet.accountType.import.youreOwner',
+                { account: account.name }
+              );
+            } else {
+              returnValue.info = TAPi18n.__(
+                'wallet.newWallet.accountType.import.watchOnly'
+              );
+            }
 
-                resolve(returnValue);
-                return null;
-              },
-              function() {
-                reject();
-              }
-            );
-          } else {
-            returnValue.info = TAPi18n.__(
-              'wallet.newWallet.accountType.import.notWallet'
-            );
             resolve(returnValue);
+            return null;
+          },
+          function() {
+            reject();
           }
-        } else {
-          reject(e);
-        }
-      });
-    }
+        );
+      } else {
+        returnValue.info = TAPi18n.__(
+          'wallet.newWallet.accountType.import.notWallet'
+        );
+        resolve(returnValue);
+      }
+    });
   });
 };