Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

First draft of the MultiSig Wallet #3700

Merged
merged 26 commits into from
Dec 6, 2016
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
19dbe3f
Wallet Creation Modal #3282
ngotchac Nov 22, 2016
5d2aa44
Name and description to Wallet #3282
ngotchac Nov 22, 2016
fbedccc
Merge branch 'master' into ng-mutisig-wallet
ngotchac Nov 28, 2016
13383cf
Add Wallet to the Account Page and Wallet Page #3282
ngotchac Nov 29, 2016
dea3816
Fix Linting
ngotchac Nov 29, 2016
95cf245
Merge branch 'master' into ng-mutisig-wallet
ngotchac Nov 29, 2016
8d93af8
Crete MobX store for Transfer modal
ngotchac Nov 29, 2016
aeb85a0
WIP Wallet Redux Store
ngotchac Nov 29, 2016
8d45509
Merge branch 'master' into ng-mutisig-wallet
ngotchac Nov 30, 2016
4f39eab
Basic Details for Wallet #3282
ngotchac Nov 30, 2016
e62e683
Fixing linting
ngotchac Nov 30, 2016
889bd48
Refactoring Transfer store for Wallet
ngotchac Nov 30, 2016
88df273
Working wallet init transfer #3282
ngotchac Nov 30, 2016
4a9623b
Optional gas in MethodDecoding + better input
ngotchac Nov 30, 2016
152b31d
Show confirmations for Wallet #3282
ngotchac Nov 30, 2016
388dfa9
Order confirmations
ngotchac Nov 30, 2016
693b5da
Merge branch 'master' into ng-mutisig-wallet
ngotchac Dec 1, 2016
7e0f02b
Method Decoding selections
ngotchac Dec 1, 2016
124f534
MultiSig txs and confirm pending #3282
ngotchac Dec 1, 2016
f200fa2
MultiSig Wallet Revoke #3282
ngotchac Dec 1, 2016
bc8ce41
Confirmations and Txs Update #3282
ngotchac Dec 1, 2016
83d4d8a
Feedback for Confirmations #3282
ngotchac Dec 1, 2016
e49fff7
Merge branch 'master' into ng-mutisig-wallet
ngotchac Dec 5, 2016
61751a9
Merging master fixes...
ngotchac Dec 5, 2016
4be5bdf
Merge branch 'master' into ng-mutisig-wallet
ngotchac Dec 5, 2016
d8f8820
Remove unused CSS
ngotchac Dec 5, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion js/src/api/contract/contract.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,10 @@ export default class Contract {

_bindFunction = (func) => {
func.call = (options, values = []) => {
const callData = this._encodeOptions(func, this._addOptionsTo(options), values);

return this._api.eth
.call(this._encodeOptions(func, this._addOptionsTo(options), values))
.call(callData)
.then((encoded) => func.decodeOutput(encoded))
.then((tokens) => tokens.map((token) => token.value))
.then((returns) => returns.length === 1 ? returns[0] : returns);
Expand Down
21 changes: 21 additions & 0 deletions js/src/contracts/code/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.

// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import wallet from './wallet';

export {
wallet
};
23 changes: 23 additions & 0 deletions js/src/contracts/code/wallet.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading