grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for ConsenSys multisig wallet (#6153)

Browse Source 
* First draft of ConsenSys wallet

* Fix transfer store // WIP Consensys Wallet

* Rename walletABI JSON file

* Fix linting

* Fix wrong daylimit in wallet modal

* Confirm/Revoke ConsensysWallet txs

* Linting

* Change of settings for the Multisig Wallet
This commit is contained in:
Nicolas Gotchac
2017-08-09 19:06:14 +02:00
committed by Gav Wood
parent a8a11e56db
commit d6eb053826
15 changed files with 1818 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/modals/CreateWallet/createWalletStore.js
View File

@@ -21,7 +21,7 @@ import { FormattedMessage } from 'react-intl';
import Contract from '~/api/contract';
import Contracts from '~/contracts';
import { wallet as walletAbi } from '~/contracts/abi';
import { foundationWallet as walletAbi } from '~/contracts/abi';
import { wallet as walletCode, walletLibrary as walletLibraryCode, walletLibraryRegKey, fullWalletCode } from '~/contracts/code/wallet';
import { validateUint, validateAddress, validateName } from '~/util/validation';
@@ -163,11 +163,11 @@ export default class CreateWalletStore {
WalletsUtils.fetchOwners(walletContract),
WalletsUtils.fetchDailylimit(walletContract)
])
.then(([ require, owners, dailylimit ]) => {
.then(([ require, owners, daylimit ]) => {
transaction(() => {
this.wallet.owners = owners;
this.wallet.required = require.toNumber();
this.wallet.dailylimit = dailylimit.limit;
this.wallet.daylimit = daylimit.limit;
this.wallet = this.getWalletWithMeta(this.wallet);
});