Make Wallet first-class citizens

js/src/api/api.js

@@ -114,7 +114,11 @@ export default class Api {
             }
           })
           .catch((error) => {
-            console.error('pollMethod', error);
+            // Don't print if the request is rejected: that's ok
+            if (error.type !== 'REQUEST_REJECTED') {
+              console.error('pollMethod', error);
+            }
+
             reject(error);
           });
       };

js/src/api/contract/contract.js

@@ -14,8 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import Abi from '../../abi';
+import BigNumber from 'bignumber.js';
+import { intersection } from 'lodash';
 
+import Abi from '~/abi';
+import WalletAbi from '~/contracts/abi/wallet.json';
+import WalletsUtils from '~/util/wallets';
+
+const _cachedWalletLookup = {};
 let nextSubscriptionId = 0;
 
 export default class Contract {
@@ -90,8 +96,11 @@ export default class Contract {
   }
 
   deployEstimateGas (options, values) {
-    return this._api.eth
-      .estimateGas(this._encodeOptions(this.constructors[0], options, values))
+    return this
+      ._encodeOptions(this.constructors[0], options, values, false)
+      .then((_options) => {
+        return this._api.eth.estimateGas(_options);
+      })
       .then((gasEst) => {
         return [gasEst, gasEst.mul(1.2)];
       });
@@ -115,8 +124,11 @@ export default class Contract {
 
         setState({ state: 'postTransaction', gas });
 
-        return this._api.parity
-          .postTransaction(this._encodeOptions(this.constructors[0], options, values))
+        return this
+          ._encodeOptions(this.constructors[0], options, values, false)
+          .then((_options) => {
+            return this._api.parity.postTransaction(_options);
+          })
           .then((requestId) => {
             setState({ state: 'checkRequest', requestId });
             return this._pollCheckRequest(requestId);
@@ -209,9 +221,93 @@ export default class Contract {
     return `0x${data || ''}${call || ''}`;
   }
 
-  _encodeOptions (func, options, values) {
+  /**
+   * Check whether the given address could be
+   * a Wallet. The result is cached in order not
+   * to make unnecessary calls on non wallet accounts
+   */
+  _isWallet (address) {
+    if (!_cachedWalletLookup[address]) {
+      const walletContract = new Contract(this._api, WalletAbi);
+
+      _cachedWalletLookup[address] = walletContract
+        .at(address)
+        .instance
+        .m_numOwners
+        .call()
+        .then((result) => {
+          if (!result || result.equals(0)) {
+            return false;
+          }
+
+          return true;
+        })
+        .then((bool) => {
+          _cachedWalletLookup[address] = Promise.resolve(bool);
+          return bool;
+        });
+    }
+
+    return _cachedWalletLookup[address];
+  }
+
+  _encodeOptions (func, options, values, tryWallet = true) {
     options.data = this.getCallData(func, options, values);
-    return options;
+
+    if (!tryWallet || !options.from) {
+      return Promise.resolve(options);
+    }
+
+    // Try to find out if the `from` field is a Wallet
+    // And if one of the owners is in the accounts
+    return this
+      ._isWallet(options.from)
+      .then((isWallet) => {
+        if (!isWallet) {
+          return options;
+        }
+
+        const walletContract = new Contract(this._api, WalletAbi);
+
+        const promises = [
+          this._api.parity.accountsInfo(),
+          WalletsUtils.fetchOwners(walletContract.at(options.from))
+        ];
+
+        return Promise
+          .all(promises)
+          .then(([ accounts, owners ]) => {
+            const addresses = Object.keys(accounts);
+            const owner = intersection(addresses, owners).pop();
+
+            if (!owner) {
+              return false;
+            }
+
+            return owner;
+          })
+          .then((owner) => {
+            if (!owner) {
+              return options;
+            }
+
+            const _options = Object.assign({}, options);
+            const { from, to, value = new BigNumber(0), data } = options;
+
+            delete _options.data;
+
+            const nextValues = [ to, value, data ];
+            const nextOptions = {
+              ..._options,
+              from: owner,
+              to: from
+            };
+
+            const execFunc = walletContract.instance.execute;
+
+            return this._encodeOptions(execFunc, nextOptions, nextValues, tryWallet);
+          });
+      });
   }
 
   _addOptionsTo (options = {}) {
@@ -222,24 +318,31 @@ export default class Contract {
 
   _bindFunction = (func) => {
     func.call = (options, values = []) => {
-      const callParams = this._encodeOptions(func, this._addOptionsTo(options), values);
-
-      return this._api.eth
-        .call(callParams)
+      return this
+        ._encodeOptions(func, this._addOptionsTo(options), values, false)
+        .then((callParams) => {
+          return this._api.eth.call(callParams);
+        })
         .then((encoded) => func.decodeOutput(encoded))
         .then((tokens) => tokens.map((token) => token.value))
         .then((returns) => returns.length === 1 ? returns[0] : returns);
     };
 
     if (!func.constant) {
       func.postTransaction = (options, values = []) => {
-        return this._api.parity
-          .postTransaction(this._encodeOptions(func, this._addOptionsTo(options), values));
+        return this
+          ._encodeOptions(func, this._addOptionsTo(options), values)
+          .then((_options) => {
+            return this._api.parity.postTransaction(_options);
+          });
       };
 
       func.estimateGas = (options, values = []) => {
-        return this._api.eth
-          .estimateGas(this._encodeOptions(func, this._addOptionsTo(options), values));
+        return this
+          ._encodeOptions(func, this._addOptionsTo(options), values)
+          .then((_options) => {
+            return this._api.eth.estimateGas(_options);
+          });
       };
     }
 

js/src/api/transport/ws/ws.js

@@ -209,7 +209,10 @@ export default class Ws extends JsonRpcBase {
       if (result.error) {
         this.error(event.data);
 
-        console.error(`${method}(${JSON.stringify(params)}): ${result.error.code}: ${result.error.message}`);
+        // Don't print error if request rejected...
+        if (!/rejected/.test(result.error.message)) {
+          console.error(`${method}(${JSON.stringify(params)}): ${result.error.code}: ${result.error.message}`);
+        }
 
         const error = new TransportError(method, result.error.code, result.error.message);
         reject(error);

js/src/modals/CreateWallet/WalletDetails/walletDetails.js

@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { omitBy } from 'lodash';
 
 import { Form, TypedInput, Input, AddressSelect, InputAddress } from '~/ui';
 
@@ -73,6 +74,9 @@ export default class WalletDetails extends Component {
   renderMultisigDetails () {
     const { accounts, wallet, errors } = this.props;
 
+    // Wallets cannot create contracts
+    const _accounts = omitBy(accounts, (a) => a.wallet);
+
     return (
       <Form>
         <AddressSelect
@@ -81,7 +85,7 @@ export default class WalletDetails extends Component {
           value={ wallet.account }
           error={ errors.account }
           onChange={ this.onAccoutChange }
-          accounts={ accounts }
+          accounts={ _accounts }
         />
 
         <Input

js/src/modals/DeployContract/deployContract.js

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { pick } from 'lodash';
+import { pick, omitBy } from 'lodash';
 import { observer } from 'mobx-react';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
@@ -552,13 +552,19 @@ class DeployContract extends Component {
 }
 
 function mapStateToProps (initState, initProps) {
-  const fromAddresses = Object.keys(initProps.accounts);
+  const { accounts } = initProps;
+
+  // Skip Wallet accounts : they can't create Contracts
+  const _accounts = omitBy(accounts, (a) => a.wallet);
+
+  const fromAddresses = Object.keys(_accounts);
 
   return (state) => {
     const balances = pick(state.balances.balances, fromAddresses);
     const { gasLimit } = state.nodeStatus;
 
     return {
+      accounts: _accounts,
       balances,
       gasLimit
     };

js/src/modals/ExecuteContract/executeContract.js

@@ -384,6 +384,7 @@ class ExecuteContract extends Component {
     const { advancedOptions, amount, func, minBlock, values } = this.state;
     const steps = advancedOptions ? STAGES_ADVANCED : STAGES_BASIC;
     const finalstep = steps.length - 1;
+
     const options = {
       gas: this.gasStore.gas,
       gasPrice: this.gasStore.price,

js/src/modals/Transfer/store.js

@@ -383,9 +383,7 @@ export default class TransferStore {
 
     const senderBalance = this.balance.tokens.find((b) => tag === b.token.tag);
     const format = new BigNumber(senderBalance.token.format || 1);
-    const available = isWallet
-      ? this.api.util.fromWei(new BigNumber(senderBalance.value))
-      : (new BigNumber(senderBalance.value)).div(format);
+    const available = new BigNumber(senderBalance.value).div(format);
 
     let { value, valueError } = this;
     let totalEth = gasTotal;
@@ -428,7 +426,6 @@ export default class TransferStore {
 
   send () {
     const { options, values } = this._getTransferParams();
-
     options.minBlock = new BigNumber(this.minBlock || 0).gt(0) ? this.minBlock : null;
 
     return this._getTransferMethod().postTransaction(options, values);
@@ -440,16 +437,7 @@ export default class TransferStore {
   }
 
   estimateGas () {
-    if (this.isEth || !this.isWallet) {
-      return this._estimateGas();
-    }
-
-    return Promise
-      .all([
-        this._estimateGas(true),
-        this._estimateGas()
-      ])
-      .then((results) => results[0].plus(results[1]));
+    return this._estimateGas();
   }
 
   _getTransferMethod (gas = false, forceToken = false) {

js/src/modals/WalletSettings/walletSettings.js

@@ -36,7 +36,7 @@ class WalletSettings extends Component {
   };
 
   static propTypes = {
-    accounts: PropTypes.object.isRequired,
+    accountsInfo: PropTypes.object.isRequired,
     wallet: PropTypes.object.isRequired,
     onClose: PropTypes.func.isRequired,
     senders: PropTypes.object.isRequired
@@ -113,7 +113,7 @@ class WalletSettings extends Component {
       default:
       case 'EDIT':
         const { wallet, errors } = this.store;
-        const { accounts, senders } = this.props;
+        const { accountsInfo, senders } = this.props;
 
         return (
           <Form>
@@ -137,7 +137,7 @@ class WalletSettings extends Component {
               label='other wallet owners'
               value={ wallet.owners.slice() }
               onChange={ this.store.onOwnersChange }
-              accounts={ accounts }
+              accounts={ accountsInfo }
               param='address[]'
             />
 
@@ -190,7 +190,7 @@ class WalletSettings extends Component {
   }
 
   renderChange (change) {
-    const { accounts } = this.props;
+    const { accountsInfo } = this.props;
 
     switch (change.type) {
       case 'dailylimit':
@@ -229,7 +229,7 @@ class WalletSettings extends Component {
               <InputAddress
                 disabled
                 value={ change.value }
-                accounts={ accounts }
+                accounts={ accountsInfo }
               />
             </div>
           </div>
@@ -243,7 +243,7 @@ class WalletSettings extends Component {
               <InputAddress
                 disabled
                 value={ change.value }
-                accounts={ accounts }
+                accounts={ accountsInfo }
               />
             </div>
           </div>
@@ -329,7 +329,7 @@ function mapStateToProps (initState, initProps) {
   const senders = pick(accounts, owners);
 
   return () => {
-    return { accounts: accountsInfo, senders };
+    return { accountsInfo, senders };
   };
 }
 

js/src/modals/WalletSettings/walletSettingsStore.js

@@ -28,6 +28,8 @@ const STEPS = {
 };
 
 export default class WalletSettingsStore {
+  accounts = {};
+
   @observable step = null;
   @observable requests = [];
   @observable deployState = '';

js/src/redux/providers/balancesActions.js

@@ -175,15 +175,15 @@ export function fetchBalances (_addresses) {
     const { api, personal } = getState();
     const { visibleAccounts, accounts } = personal;
 
-    const addresses = uniq(_addresses || visibleAccounts || []);
+    const addresses = uniq((_addresses || visibleAccounts || []).concat(Object.keys(accounts)));
 
     if (addresses.length === 0) {
       return Promise.resolve();
     }
 
     const fullFetch = addresses.length === 1;
 
-    const addressesToFetch = uniq(addresses.concat(Object.keys(accounts)));
+    const addressesToFetch = uniq(addresses);
 
     return Promise
       .all(addressesToFetch.map((addr) => fetchAccount(addr, api, fullFetch)))