m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-01 13:47:06 +01:00
Code
9,765 Commits 2 Branches 0 Tags 265 MiB
02329541e5
Commit Graph

971 Commits

Author SHA1 Message Date
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
kumavis
a88e436b7d lint fix 2018-03-08 14:55:35 -08:00
kumavis
455faece9e Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-08 14:14:49 -08:00
kumavis
98efca0a97 background - storage - cleanup storage wiring 2018-03-08 14:10:28 -08:00
Jeffrey Tong
aaef2aeefd fixed multiple notification windows when executing batch 2018-03-07 20:09:40 -08:00
frankiebee
8adb03074c Merge branch 'master' into retry-tx-refractor 2018-03-07 17:16:35 -08:00
frankiebee
62febac876 refactor retrytx with higher gas price: 
- create a new tx instead of overwriting the tx hash
- add a new state 'dropped' to the txStateManager
- mark duplicate txs as dropped when one gets confirmed in a block
 2018-03-07 17:16:16 -08:00
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification 
Add seed phrase verification script into background process
 2018-03-07 16:47:13 -08:00
Jeffrey Tong
40b1688c67 removed check for width & height on multiple popup windows 2018-03-07 14:19:27 -08:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
Jeffrey Tong
cad5f5f000 fix typo in tests and tx-state-manager 2018-03-07 10:24:36 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Csaba Solya
f7d4a1080d add documentation 2018-03-04 08:47:46 +01:00
Csaba Solya
3e05b693db verify addresses regardless case 2018-03-03 14:11:02 +01:00
Csaba Solya
4bd7f1a37a fix lint issues 2018-03-03 00:40:40 +01:00
Csaba Solya
92453f8715 seed phrase verifier 2018-03-03 00:32:57 +01:00
kumavis
c3bd27c965 sentry - extractErrorMessage - fix comment formatting 2018-02-28 10:57:54 -08:00
kumavis
8e5bcf8935 sentry - failed tx - improve ethjs-rpc error formating 2018-02-28 10:53:54 -08:00
kumavis
fca2cbc8ef sentry - clean - move setupRaven to lib 2018-02-28 10:37:53 -08:00
Dan Finlay
716acc088e Merge branch 'master' into uat-master 2018-02-21 10:56:23 -08:00
Dan Finlay
98d3fba3ef Fix promise construction 2018-02-20 15:45:48 -08:00
kumavis
c0893f2bcc
Merge pull request #3250 from MetaMask/i#3136 
fix - hex prefix estimatedGas on txMeta
 2018-02-16 15:59:20 +00:00
Dan Finlay
73e5ae6e29 Fix incorrect promise instantiation 2018-02-15 15:32:48 -08:00
frankiebee
dc3f3e79ca fix - hex prefix estimatedGas on txMeta 2018-02-14 14:37:02 -08:00
kumavis
94cd5b9df4 metamask mesh - inject mesh testing container 2018-02-10 19:33:33 +00:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201) 
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
 2018-02-07 21:08:55 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Bruno Barbieri
c1b7cfe91d preserve other networks TXs 2018-01-31 13:29:02 -05:00
Bruno Barbieri
7dc1b09f94 use txMeta.txParams 2018-01-31 04:40:32 -05:00
Bruno Barbieri
03d17c75ae wipe only transactions for current account 2018-01-31 04:25:32 -05:00
Bruno Barbieri
5f39844382 clean up 2018-01-31 03:36:04 -05:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Dan Finlay
76521cf739 Fix retrieval of object 2018-01-24 15:03:16 -08:00
Dan Finlay
cd5eaa4393 Remove redundant async modifiers 2018-01-24 13:05:13 -08:00
Dan Finlay
f09d72fa2a Remove extension-store since we aren't using it yet 2018-01-24 11:36:42 -08:00
Dan
b7ae77f57a Check that extension.storage exists before attempting to call methods on it. 2018-01-24 09:43:20 -03:30
Dan Finlay
7c4a9c32fa Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInstead 2018-01-23 16:33:37 -08:00
Dan Finlay
456dfdb9fd Modify @heyellieday's work to use storage.local to replace main storage 2018-01-23 16:26:50 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
kumavis
d7c8ec22a4 test - tx controller - fix txGasUtil reference 2018-01-17 20:09:13 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Dan Finlay
8fb62b97c5 Create new flag for simple sends to avoid overloading other flag 2018-01-16 11:05:11 -08:00
Dan Finlay
cd7eaaa735 Set gas limit to 21k for recipients with no code 
Fixes #2907
 2018-01-15 15:08:07 -08:00
Thomas
39b700bf87 Account for 0x/empty string address and contract creation 2018-01-08 03:16:20 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
Ellie Day
3c6a5b16ad conditionally use extension store if supported or enabled 2018-01-02 21:53:11 -08:00
Ellie Day
7184db7632 handle situation where storage.sync is disabled in certain versions of firefox 2018-01-02 21:31:17 -08:00
kumavis
313b3c087a
Merge pull request #2783 from MetaMask/tx-param-vaalidation 
transactions - throw error if txParams.value contains a decimal
 2018-01-02 14:30:39 -08:00
kumavis
3f6cef0b3f
tx-gas-utils - tx-param-validation - use more intuitive check 2018-01-02 14:22:44 -08:00
Frankie
b2e4f913ba
Merge pull request #2817 from MetaMask/i#2810 
only check nonces of transactions who's from address match the txMeta
 2017-12-28 16:34:24 -08:00
Kevin Serrano
414f89668e
Fix some silly linting issues. 2017-12-27 17:27:48 -08:00
frankiebee
5efb0044d8 transactions:pending - only check nonces of transactions who's from adress match the txMeta 2017-12-27 16:50:15 -08:00
Ellie Day
a76324f6d3 Add ExtensionStore and add basic store instance syncing to main controller 2017-12-23 08:23:34 -06:00
Alexander Tseung
06410381d4 Merge branch 'NewUI-flat' into merge-master 2017-12-22 11:00:46 -08:00
Dan Finlay
75b8baafb6 Stop failing pending transactions after any period of time 2017-12-21 13:41:08 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
frankiebee
f47e81e493 transactions - throw error if dapp provides txParams whos value has a decimal 2017-12-20 14:09:59 -08:00
frankiebee
828734b977 transactions:gas-utils - handle new type of estimateGas error 2017-12-15 01:31:48 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
frankiebee
da209a9cfd dont aggresively query account data 2017-12-13 11:19:18 -08:00
kumavis
a91200fd08 tx-controller - failed state is a finished state 2017-12-07 18:04:14 -05:00
Chi Kei Chan
373f8b72d0
Merge branch 'master' into NewUI-flat 2017-12-06 21:13:29 -08:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
Dan
f58aae3f2b firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx 2017-12-06 13:21:09 -03:30
Dan
871d9fd9fb Fix undefined latestBlockNumber in _resubmitTx 2017-12-06 13:02:38 -03:30
Dan
ae2a4d78e8 Exponentional backoff on transaction retry in pending-tx-tracker 2017-12-05 17:21:14 -03:30
kumavis
f64bc3c01a deps - obs-store@3 + migrate stream plumbing 2017-11-28 11:09:18 -10:00
Chi Kei Chan
fa95303e1e Sign Typed Request styling fixes 2017-10-25 18:05:52 -07:00
Dan
ddf11011c9 Signature request fixes. 2017-10-25 17:40:48 -07:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings 
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
 2017-10-21 21:06:39 +02:00
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Dan Finlay
a10a600cce Linted 2017-10-19 12:33:43 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan Finlay
bbe2c9f48d Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault 2017-10-18 17:07:25 -07:00
Dan Finlay
d89394a7c9 Make account tracking much more reactive 2017-10-18 17:07:22 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Dan Finlay
75177ce34c Make account tracking more reactive 
We were doing a lot of conditional observation & updating.
Pulled out a bunch of that for generic observer/syncers.
 2017-10-18 15:08:34 -07:00
kumavis
dcf10f3d75 nonce-tracker - use blockTracker directly 2017-10-11 18:33:36 -07:00
kumavis
7d50a56198 util - add obj-proxy 2017-10-10 17:15:52 -07:00
kumavis
e32d75965f events-proxy - clean up 2017-10-10 17:15:14 -07:00
Dan Finlay
7f70c866c3 Merge pull request #2223 from ukstv/master 
Add eth_signTypedData handler
 2017-10-09 12:18:43 -07:00
Dan
bbe893a0d8 UI for send screen container without form rows. 2017-10-08 17:48:09 -07:00
Sergey Ukustov
a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Frankie
4a4338c1f4 Merge pull request #2305 from MetaMask/nodeify 
nodeify - allow callback to be optional
 2017-10-06 14:08:58 -07:00
Dan Finlay
0c61695656 Merge branch 'master' into SignTypedData 2017-10-06 14:03:04 -07:00
kumavis
fa11bbf996 Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit 
Update status of pending transactions on startup
 2017-10-06 13:40:43 -07:00
kumavis
bc396a7417 lint fix - nodeify 2017-10-06 13:02:34 -07:00
Dan Finlay
a417fab0eb When checking pending txs, check for successful txs with same nonce. 
If a successful tx with the same nonce exists, transition tx to the failed state.

Fixes #2294
 2017-10-06 12:51:13 -07:00
Dan Finlay
94513cae7b Provide method for tx tracker to refer to all txs 2017-10-06 12:50:33 -07:00
kumavis
be4f7b33f4 nodeify - allow callback to be optional 2017-10-06 12:36:08 -07:00
Dan Finlay
0146b55d6d Check status of pending transactions on startup 
Fixes #1531
 2017-10-06 11:41:28 -07:00
Dan Finlay
cf178341c1 Merge branch 'master' into SignTypedData 2017-10-05 14:50:19 -07:00
Dan Finlay
9bc80d998e Add signTypedData input validations 2017-10-05 14:39:35 -07:00
Dan Finlay
c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
frankiebee
3cb9da2ae5 "fix" hours for message 2017-10-05 11:42:01 -07:00
frankiebee
ec9c528313 pending-tx - check time stamp instead of block number for resubmit 2017-10-05 11:07:22 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Sergey Ukustov
e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
kumavis
062eaa6a82 pending tx tracker - on tx:warn append error message instead of error obj 2017-10-02 15:39:11 -07:00
kumavis
ed77304e73 pending tx tracker - tx:warning event includes err obj 2017-10-02 15:20:01 -07:00
kumavis
22eaf92ec2 pending tx tracker - resubmit - warn dont error on unknown error 2017-10-02 15:00:23 -07:00
kumavis
7af696bfbe pending tx tracker - dont throw on load failure 2017-10-02 14:56:59 -07:00
kumavis
167ad729fd Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes 2017-10-02 13:45:47 -07:00
frankiebee
e08a727d44 Merge branch 'master' into history-notes 2017-10-02 13:44:15 -07:00
kumavis
df59ef9942 tx state history - append note to first op of diff 2017-10-02 13:44:11 -07:00
frankiebee
833da191c3 transaction - provide notes for history 2017-10-02 13:41:29 -07:00
kumavis
d29b5f10ef tx state history - fix bug where initial snapshot was mutated on updateTx 2017-10-02 13:14:42 -07:00
frankiebee
ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Sergey Ukustov
c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis
7d499df8e3 account-tracker - remove unused import 2017-09-27 14:12:45 -07:00
kumavis
4404dfc5d3 Merge branch 'master' into direct-block-tracker 2017-09-27 13:58:54 -07:00
kumavis
5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 
Transaction controller refractor pt3
 2017-09-27 13:57:04 -07:00
kumavis
b41aad6d1a style - small whitespace nitpick 2017-09-27 12:33:46 -07:00
kumavis
89e690fc79 account-tracker - use new block-tracker block format 2017-09-27 12:33:00 -07:00
Dan Finlay
8d3fec42d0 Fix bug where block gas limit was incorrectly parsed. 2017-09-27 12:09:32 -07:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
frankiebee
0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
frankiebee
80c98b1653 transactions: make evnt names pretty and eaiser to read 2017-09-26 16:55:11 -07:00
frankiebee
9fd5458112 transactions: lint fixes and reveal status-update event for balance controller 2017-09-26 16:54:04 -07:00
frankiebee
8ab23c713d Merge branch 'master' into transactionControllerRefractorPt3 2017-09-26 16:24:43 -07:00
Dan Finlay
2eca5455c0 Move obs store into account-tracker instead of inheriting 2017-09-26 14:15:16 -07:00
frankiebee
b654eb9b1f wrap block tracker in events proxy 2017-09-26 13:38:27 -07:00
Dan Finlay
3bedcd3582 Restore blockGasLimit to account-tracker 2017-09-26 13:36:41 -07:00
Dan Finlay
8cd7329c91 Implemented feedback 2017-09-25 14:36:49 -07:00
Dan Finlay
f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan Finlay
11c8c07bfc Refactor eth-store into account-tracker 
EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.
 2017-09-22 13:59:25 -07:00
Dan Finlay
977405fc7d Remove dead code from eth-store 2017-09-22 13:33:53 -07:00
Chi Kei Chan
a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Dan Finlay
2b7b1db851 Do not mark a retry tx failed that has been broadcast successfully 
Fixes #2115

If a tx has been braodcast, the only failures we should accept are:
- Never mined
- On chain failure

We had a section of code that would mark a tx failed during any unknown error during a retry.

Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
 2017-09-18 14:34:25 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
kumavis
d7097db022 createOriginMiddleware - fix var name 2017-09-13 15:29:44 -07:00
kumavis
245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
Dan Finlay
a01921758b Add computed balance to account detail view 2017-09-13 15:06:04 -07:00
frankiebee
77a48fb0b1 ensure that values written to txParams are hex strings 2017-09-13 14:27:27 -07:00
frankiebee
9e0c0745ab linting && format fixing 2017-09-12 12:19:26 -07:00
frankiebee
3ad67d1b14 match other controller patterns 2017-09-12 09:59:59 -07:00
Dan Finlay
4738746968 Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController 2017-09-11 15:19:17 -07:00
kumavis
41164f61db Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-11 14:21:09 -07:00
frankiebee
62f26c5ba8 fix miss type 2017-09-08 15:02:36 -07:00
frankiebee
9b9df41724 more tests and craete a getPendingTransactions function 2017-09-08 14:24:40 -07:00
kumavis
d03b0547bb inpage provider - define sendAsync on the prototype 2017-09-08 11:52:00 -07:00
kumavis
ef3bf810bf inpage - use obj-multiplex module 2017-09-07 22:47:08 -07:00
kumavis
671dafea9e Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-07 22:37:44 -07:00
kumavis
70401626e2 lint - remove dead code 2017-09-07 22:35:38 -07:00
kumavis
0e8e655fdb inpage - distinguish pump vs pipe 2017-09-07 21:19:24 -07:00
kumavis
57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
Dan Finlay
d4d7c6d89e Linted 2017-09-07 12:54:28 -07:00
Dan Finlay
fadc0617df Make tx calculations account for gas prices 2017-09-07 12:52:49 -07:00
Dan Finlay
c616581001 Remove logs 2017-09-07 12:47:52 -07:00
Dan Finlay
a95a3c7e4f Fix balance calc test 2017-09-07 12:47:27 -07:00
Dan Finlay
74c6de7d23 Add constructor comment 2017-09-07 12:45:00 -07:00
Dan Finlay
7b92268428 Fix valueFor test 2017-09-07 12:43:10 -07:00
Dan Finlay
4058574436 Add basic test for valueFor 2017-09-07 12:30:25 -07:00
Dan Finlay
b6e8791bc2 test not passing 2017-09-07 11:59:15 -07:00
kumavis
440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
frankiebee
00fca4f1f2 remove unused variable 2017-09-06 14:38:39 -07:00
Dan Finlay
74f7fc4613 Check balances in parallel 2017-09-06 14:37:46 -07:00
Dan Finlay
f9a052deed Add first passing balance calc test 2017-09-06 14:36:15 -07:00
frankiebee
a73aecc796 fix merge and errors disaperaing on update 2017-09-06 14:01:07 -07:00
frankiebee
6c83ba762e Merge branch 'master' into transactionControllerRefractorPt3 2017-09-06 13:45:03 -07:00
frankiebee
15c12ca4bb add better comments 2017-09-05 21:50:36 -07:00
frankiebee
00bd5b143f rename tx-utils.js -> tx-gas-utils.js 2017-09-05 20:33:50 -07:00
frankiebee
4c554f32ec remove #buildEthTxFromParams 2017-09-05 20:13:43 -07:00
kumavis
ea7e46ed38 inpage - bug fix 
prevents mutation of original message object which causes problems with web3 1.0
 2017-09-05 16:46:21 -07:00
Dan Finlay
70a61f8712 Make web3 deprecation notice more useful 
Linking to a descriptive & precriptive article on a path forward.
 2017-09-05 11:35:33 -07:00
kumavis
76de053b0b Merge branch 'master' into inpage-provider-fixes 2017-08-28 11:29:47 -07:00
kumavis
e294aa7e0d inpage - lint fix 2017-08-28 10:41:01 -07:00
kumavis
cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -07:00
kumavis
9ce82640f2 Merge pull request #1973 from MetaMask/hotfix-migration019 
hotfix - fail submitted txs whos nonce is out of bound
 2017-08-24 00:15:24 -07:00
frankiebee
c2624dd1a0 fall back to latest if blockNumber is null 2017-08-24 00:02:06 -07:00
Dan Finlay
0ad310e096 Fail transactions after a day of retries 2017-08-23 22:29:08 -07:00
Dan Finlay
c620123fab Enforce nonces as type string 2017-08-23 21:50:28 -07:00
Dan Finlay
a122ec1f8b Use toNumber method 2017-08-23 21:37:07 -07:00
Dan Finlay
55c1a259b1 Fix network nonce parsing 2017-08-23 21:14:46 -07:00
Dan Finlay
855f4eeacb Pass nonce tests 2017-08-23 20:43:47 -07:00
Dan Finlay
04d40b114d Got all tests but one passing 2017-08-23 20:11:37 -07:00
Dan Finlay
221575a191 Fix new test, break an older maybe wrong one 2017-08-23 20:04:03 -07:00
Dan Finlay
c4ab7a5779 Linted 2017-08-23 19:35:49 -07:00
Dan Finlay
1f0223d0a0 Simplify nonce calculation 2017-08-23 19:34:20 -07:00
kumavis
4019f318fe inpage provider - autoreload - improve readability 2017-08-23 16:44:57 -07:00
kumavis
44dc2ba712 inpage provider - only warn web3 usage once per session 2017-08-23 16:26:55 -07:00
kumavis
53e410167b inpage provider - sync rpc - default to null values 2017-08-23 16:13:33 -07:00
Dan Finlay
b3b62d97a3 Merge branch 'master' into useLocalNonce 2017-08-23 11:12:46 -07:00
kumavis
247965ebbe nonce-tracker - more debugging numbers for nonceDetails 2017-08-22 15:34:30 -07:00
kumavis
0a93b65a3d remove unused code 2017-08-22 15:06:54 -07:00
kumavis
fb2c6cc8ac nonce-tracker - use ethjs-query 2017-08-22 14:33:54 -07:00
kumavis
dc3e8d60ef nonce-tracker - fix var name 2017-08-22 14:24:09 -07:00
kumavis
6d596bd9e6 nonce-tracker - getlocalNextNonce - add entry to nonceDetails 2017-08-22 14:17:00 -07:00
kumavis
a7e3dc8327 nonce-tracker - simplify _getlocalNextNonce 2017-08-22 14:15:56 -07:00
kumavis
e43da3e4aa nonce-tracker - simplify getHighestNonce 2017-08-22 14:04:31 -07:00
kumavis
b191649ef5 nonce-tracker - getHighestNonce doesnt need uniqued input 2017-08-22 13:58:26 -07:00
kumavis
98bc9b6656 nonce-tracker - make nonce strategy api and naming more symmetical 2017-08-22 13:52:15 -07:00
frankiebee
604c91f7b2 nonce-tracker - pass tests 2017-08-21 18:04:05 -07:00
frankiebee
7d34b22d78 clean up code 2017-08-21 17:04:47 -07:00
frankiebee
5c74f316a8 nonce-tracker - pass tests 2017-08-21 16:45:10 -07:00
frankiebee
fbba3a1ac8 Merge branch 'master' into transactionControllerRefractorPt3 2017-08-21 11:35:22 -07:00
frankiebee
7ea83b6bae Create TxStateManager 2017-08-21 10:29:10 -07:00
frankiebee
1ffb406480 break out network nonce calc. 2017-08-18 16:05:21 -07:00
frankiebee
37f86e874f fix 0x0 nonce calc. 2017-08-18 15:44:32 -07:00
frankiebee
f8eca95ca5 include pendingTxs in localNonce 2017-08-18 15:01:05 -07:00
frankiebee
e9712a13ec Create tests for TxStateManager 2017-08-18 14:11:18 -07:00
frankiebee
a5a32f3d57 use "localNonce" when the network returns a nonce that is lower then a known confirmed tx 2017-08-18 13:54:16 -07:00
kumavis
1af797b1b3 tx controller - tx state history various small fixes 2017-08-14 19:15:36 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
sdtsui
dbc539ac55 Merge remote-tracking branch 'mm/master' into NewUI-flat 2017-08-14 11:06:14 +02:00
frankiebee
66a012550e fix wording 2017-08-11 15:54:52 -07:00
frankiebee
ac9e84ff40 add deprecation warning for web3 2017-08-11 15:52:03 -07:00
kumavis
b4052cd5e6 tx utils - detect estimateGas err and set simulationFailed 2017-08-08 23:34:18 -07:00
kumavis
0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis
5418813ed1 util - sufficientBalance - validate input 2017-08-08 21:05:59 -07:00
frankiebee
5bb84f6e21 fix getPendingTransactions function for pendingTxTracker 2017-08-08 21:49:48 -04:00
frankiebee
a13643bdb5 fix class names 2017-08-08 18:30:49 -04:00
frankiebee
59124eb6fd remove logging of the message and log the error 2017-08-07 14:45:43 -04:00
frankiebee
fb9866b4e1 fix spelling 2017-08-07 14:37:20 -04:00
sdtsui
02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
frankiebee
89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee
087cd9fb1a break out tx status pendding watchers 2017-08-04 14:41:35 -04:00
frankiebee
caee2a9e35 move util functions to util.js 2017-08-04 13:55:00 -04:00
kumavis
c4cb371ce8 Merge pull request #1857 from MetaMask/hotFixCancleTx 
fix cancelTransaction not receiving a callback
 2017-08-03 21:01:13 -07:00
frankiebee
7de58c8709 fix cancelTransaction not reciving a callback 2017-08-03 21:22:08 -04:00
kumavis
d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
kumavis
8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor 
Transaction controller refractor part 1: promises for everyone and more tests!
 2017-08-02 19:57:16 -07:00
sdtsui
dd4586ee84 Adjust sidebar transition using @cjeria\'s feedback 2017-08-02 19:26:46 -07:00
sdtsui
61b4b1f947 Ensure app-header is rendered in responsive layout 2017-08-02 19:13:17 -07:00
frankiebee
340dbe75fc use async with #publishTransaction 2017-08-02 19:09:37 -04:00
frankiebee
b80c7e417b move newUnapprovedTransaction to transactions.js 2017-08-02 18:59:34 -04:00
kumavis
8c6f01b910 blacklist controller - breakout from metamask and infura controllers 2017-08-02 15:54:59 -07:00
kumavis
ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
kumavis
aea5735b29 obj-multiplex - missing name error + prefer const over var 2017-08-02 14:25:28 -07:00
frankiebee
25bc15ba17 lint fixes 2017-08-02 11:47:13 -04:00
frankiebee
25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee
3a4726018e fix addTxDefaults 2017-08-02 11:35:35 -04:00
frankiebee
432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
Dan Finlay
6675241fa9 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 16:46:59 -07:00
kumavis
35a128db1e nonce-tracker - hotfix for provider proxying 2017-07-26 11:37:00 -07:00
kumavis
b15a2baaf3 nonce-tracker - add raw baseNonceHex to nonceDetails 2017-07-26 11:09:02 -07:00
kumavis
0ef90fb1f0 tx controller + nonce tracker - record nonce components on txMeta 2017-07-26 10:40:08 -07:00
kumavis
39d28922de nonce-tracker - validation - add validation failing value type to error message 2017-07-26 10:16:08 -07:00
kumavis
f16802e2d4 nonce-tracker - validation - add validation failing value to error message 2017-07-26 10:15:35 -07:00
frankiebee
ab01358a48 Add stack traces both in errors and as a way to track txMetas 2017-07-25 16:08:31 -04:00
kumavis
12d6f21627 transactions - block nonce-tracker while updating pending transactions 2017-07-18 15:27:15 -07:00
kumavis
aa48ed34c4 nonce-tracker - fix lock mechanism to be a real mutex 2017-07-18 15:11:29 -07:00
kumavis
d249da77d7 nonce-tracker - return nonce as integer 2017-07-18 13:59:56 -07:00
kumavis
4f9fc8014a nonce-tracker - validate nonce calc components 2017-07-18 12:48:16 -07:00
frankiebee
948f3880a3 turn off auto faucet and remove file 2017-07-17 17:37:01 -04:00
frankiebee
7eccf5905a make publishTransaction and signTransaction async methods 2017-07-13 15:25:43 -04:00
frankiebee
aeefcbd75b Fix test to match behavior 2017-07-12 15:10:52 -07:00
frankiebee
da35f6744e use new nodeify 2017-07-12 15:06:49 -07:00
frankiebee
231ad48564 Use txParams 2017-07-11 12:52:56 -07:00
frankiebee
971d25a8ab Merge branch 'master' into nonce-tracker 2017-07-11 12:41:03 -07:00
Dan Finlay
c7b9e3fb18 Improve insufficient balance checking in retry loop 2017-07-11 12:19:01 -07:00
frankiebee
6d2cddaac9 fix nonce calculation order 2017-07-05 12:00:42 -07:00
frankiebee
690685d20d nonce-tracker: only check transactions that are not supposed to be ignored 2017-06-27 16:46:33 -07:00
frankiebee
92df9965eb fix nonceTracker 2017-06-21 19:51:00 -07:00
frankiebee
fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
kumavis
dab2fccc78 introduce nonce-tracker 2017-06-14 22:16:14 -07:00
Thomas Huang
13e6672028 Linting 2017-06-12 11:08:32 -07:00
Kevin Serrano
2b7d842498
Update gasblocklimit params with every block. 2017-06-02 15:18:14 -07:00
Kevin Serrano
82cbfaa826
Convert gasLimit to not use muln in BN 2017-06-01 12:53:16 -07:00
Thomas Huang
8f9a230d8d Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider 
Remove streaming subprovider
 2017-05-25 15:04:50 -07:00
Dan Finlay
ad40e4d260 Remove stream subprovider 
Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root.
 2017-05-25 12:37:04 -07:00
frankiebee
717dceede8 fix spelling 2017-05-24 23:36:10 -04:00
frankiebee
3b06a29e1b Merge branch 'master' into reloadDapp 2017-05-24 23:10:58 -04:00
frankiebee
473b88f399 Reload the page when switching networks for sites that use web3 2017-05-24 23:00:58 -04:00
Dan Finlay
764806d211 Merge pull request #1494 from MetaMask/1472-gasceiling 
Add Max GasLimit Ceiling
 2017-05-24 16:36:00 -07:00
Kevin Serrano
26fd016b63
Add new blockGasLimit property to txMeta object. 2017-05-24 16:17:03 -07:00
kumavis
e6b278569e inpage-provider - disable polling after first block 2017-05-24 11:34:26 -07:00
Frankie
97ea7454b3 Merge branch 'master' into networkController 2017-05-23 20:36:11 -04:00
frankiebee
243eeff7cb Fix for tests 2017-05-23 19:49:57 -04:00
frankiebee
529304c005 Wrap the provider in a proxy 2017-05-23 01:56:10 -04:00
frankiebee
13a41f3129 Merge branch 'master' into networkController 2017-05-22 19:48:10 -04:00
kumavis
b217ad1ae8 clean - remove console logs 2017-05-22 16:06:22 -07:00
kumavis
1c1400b584 deps - use stream-subprovider from provider-engine 2017-05-22 15:59:07 -07:00
Dan Finlay
cbfaa6f56f Rename stream to streamSubprovider 2017-05-22 15:41:13 -07:00
Dan Finlay
48d9a21071 Use filter subprovider in-page to avoid filter leaks 2017-05-22 15:23:29 -07:00
Dan Finlay
c5432da567 Add new streaming subprovider but getting a loop 
Regarding #1458

Uses a new streaming subprovider architecture on an experimental branch of StreamProvider:
https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider
 2017-05-20 20:38:38 -07:00
frankiebee
f87ea49b5a Create a network controller to manage switcing networks an updating the provider 2017-05-19 00:14:10 +02:00
Thomas Huang
3367363b12 Remove all traces of testnet 2017-05-15 19:11:16 -07:00
Thomas Huang
4c10e2021a Change default network to rinkeby 2017-05-15 18:05:11 -07:00
kumavis
2c8bbe3b25 migrator - fix typo 2017-05-12 12:27:40 -07:00
kumavis
70a328e028 migrator - cleaner migration runner with es7 2017-05-11 18:15:59 -07:00
frankiebee
6c01b26845 use asyncQ.waterfall instead of asyncQ.eachSeries 2017-05-11 23:25:33 +02:00
frankiebee
1772d34e94 fix migrator 2017-05-11 10:10:50 +02:00
Kevin Serrano
833b9f183f
Minor lint 2017-05-03 07:22:36 -07:00
kumavis
6ace0c9afb notification-manager - remove promise listener 
seems chrome changed their API?
MDN suggests that a Promise should be returned but getting `undefined`
https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create

Chrome docs suggest its a callback API lolwut
https://developer.chrome.com/extensions/windows#method-create
 2017-04-28 16:04:00 -07:00
Dan Finlay
d1a1069180 Merge branch 'master' into rinkeby 2017-04-27 14:50:19 -07:00
Thomas Huang
6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -07:00
Kevin Serrano
242dc1e99f
Add missing changes. Create unique style for rinkeby icon. 2017-04-25 14:39:01 -07:00
Nickyg
e9aa37b699 add rinkeby network 2017-04-26 01:40:33 +05:30
kumavis
9b9570fd2b auto-faucet - only skip faucet on explicit test environment 2017-04-04 18:48:33 -07:00
kumavis
5a91adf7d8 add platforms to mascara + move buyEther window open to ui 2017-04-04 18:23:46 -07:00
frankiebee
f80d1ce3e6 Switch auto-faucet from XMLHttpRequest to fetch 2017-04-04 14:55:48 +02:00
kumavis
86e882c51a notification-manager - rename show -> showPoup + make getPopup private 2017-03-31 18:41:51 -07:00