brunobar79
e44b750f0f
Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5
2018-11-15 00:29:06 -05:00
Dan Finlay
22ba0b0c2d
Resubmit approved transactions on new block ( #5752 )
...
* Add beginning of test
* Resubmit approved transactions on new block
May fix #4343 and related issues, where an error could leave
transactions stranded in the approved state.
* Remove unused test
* Re-approve transactions when retrying approved
* Add retry approved test
* Include approved in pending tx count
* Fix getPendingTxs()
* Linted
* Only throw hash error in submitted state
* Only check submitted txs for block inclusion
* Fix test expectations
2018-11-14 11:34:07 -10:00
brunobar79
18f39ef69e
Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5
2018-11-14 15:42:45 -05:00
Paul Bouchon
f6e042b7b1
1102: use meta title if it exists before title
2018-11-14 10:43:10 -08:00
brunobar79
484aa6801e
Merge branch 'develop' into trezor-v5
2018-11-13 17:21:15 -05:00
Paul Bouchon
0549782595
Update Balanc3 API ( #5744 )
...
* Update balanc3 API used in TokenRatesController
* Remove demo URL and use nativeCurrency when fetching token rates
2018-11-13 14:57:43 -05:00
PaddyMc
7ce2cf4572
Fixes #3425 : Better support for batch transactions ( #5437 )
2018-11-13 13:49:12 -03:30
Paul Bouchon
c317624854
EIP-1102: Update publicConfig store concurrently with approval
2018-11-09 18:21:59 -08:00
Noah I
8bed073f20
1102: Fix inpage listener syntax ( #5708 ) ( #5709 )
2018-11-09 07:14:32 -05:00
bitpshr
718393f89a
Cleanup
2018-11-07 08:47:25 -08:00
bitpshr
a224b71837
1102: use postMessage instead of injected scripts to bypass CSP
2018-11-07 08:47:25 -08:00
bitpshr
1ce3591c8e
wip
2018-11-07 08:47:25 -08:00
brunobar79
c651212025
fix merge conflicts
2018-11-06 20:21:19 -05:00
bitpshr
896ae0ab89
Fix lint errors
2018-11-06 14:30:50 -05:00
bitpshr
d7b1cacabc
Remove injected script tags after use
2018-11-06 14:26:02 -05:00
bitpshr
34d80f21e2
Clear cached approval after rejection
2018-11-06 14:13:27 -05:00
bitpshr
b3f428fd1f
Move experimental provider augmentation
2018-11-05 15:07:09 -08:00
bitpshr
879997af51
Add experimental RPC method support
2018-11-05 15:07:09 -08:00
Whymarrh Whitby
26ada8a828
Update Connect Request screen design ( #5644 )
...
* Parameterize NetworkDisplay background colour
* Update design for login request screen
* Pass siteTitle, siteImage through for calls to ethereum.enable()
* Bring the site images closer together
2018-11-05 15:07:09 -08:00
bitpshr
31cb111d2e
Do not modify isApproved when locked
2018-11-05 15:07:09 -08:00
bitpshr
9984f7edeb
Mark origins as unapproved if user explicitly locks MetaMask
2018-11-05 15:07:09 -08:00
Paul Bouchon
f557d33718
Enable caching
2018-11-05 15:07:09 -08:00
bitpshr
991e08e346
isApproved should return false
2018-11-05 15:07:09 -08:00
bitpshr
72730b3929
Remove internal listeners
2018-11-05 15:07:09 -08:00
bitpshr
cc27a09a1a
rebase
2018-11-05 15:07:09 -08:00
bitpshr
d4171ccea5
Disable approval caching
2018-11-05 15:07:09 -08:00
bitpshr
cc1bab6ebb
Differentiate locked and enabled
2018-11-05 15:07:09 -08:00
bitpshr
d7618bd5c6
Code bath
2018-11-05 15:07:09 -08:00
bitpshr
ba40fcbcb4
Handle logout gracefully
2018-11-05 15:07:09 -08:00
bitpshr
f02e18dd80
Fix lint issues
2018-11-05 15:07:09 -08:00
bitpshr
ace7cfa065
Only filter selectedAddress from publicConfig store
2018-11-05 15:07:09 -08:00
bitpshr
f35466a247
Fix race condition with publicConfigStore
2018-11-05 15:07:09 -08:00
bitpshr
32630b68df
Move convenience methods to _metamask namespace
2018-11-05 15:07:09 -08:00
bitpshr
504f4a50f1
Fix lint issues
2018-11-05 15:07:09 -08:00
bitpshr
84874a639d
Add isUnlocked provider hook
2018-11-05 15:07:09 -08:00
bitpshr
573139b935
Differentiate isEnabled and isApproved hook
2018-11-05 15:07:09 -08:00
bitpshr
3a2ade4e84
Update isEnabled check
2018-11-05 15:07:09 -08:00
bitpshr
226601a956
EIP-1102: add user privacy option
2018-11-05 15:07:09 -08:00
bitpshr
bfcb73ad53
EIP-1102: add isEnabled convenience method to provider
2018-11-05 15:07:09 -08:00
bitpshr
89b4aa5d62
EIP-1102: Add option to force-enable provider
2018-11-05 15:07:09 -08:00
bitpshr
c76c9ca2c8
EIP-1102: updated implementation
2018-11-05 15:07:09 -08:00
kumavis
86f09e6bb5
network - infura - hardcode net_version and eth_chainId ( #5670 )
...
* network - infura - hardcode net_version and eth_chainId
* network - infura - add rinkeby handling
* lint fix
2018-11-05 14:13:37 -05:00
Esteban Miño
4489a57f2f
Update watchAsset ERC20 validation ( #5653 )
...
* update ERC20 token valodation for watchAsset
* update ERC20 validation test descriptions
2018-11-05 15:36:34 -03:30
kumavis
14852669ac
Merge pull request #5659 from MetaMask/token-rates-bugfix
...
token-rates - protect against bad token data
2018-11-03 21:57:21 -04:00
Thomas Huang
ed4f612bdc
Revert "support eth_chainId"
2018-11-03 14:21:41 -07:00
kumavis
2c1bca1ab0
token-rates - protect against bad token data
2018-11-02 22:14:40 -04:00
kumavis
73eeeda215
Merge pull request #5560 from MetaMask/sentry-enhancements2
...
Sentry - various enhancements to help debugging (alternate)
2018-10-29 21:57:51 -04:00
kumavis
310229d22e
Merge pull request #5567 from MetaMask/HowardBraham-develop
...
Feature: Warn when attempting to send tx with data to non-contract
2018-10-29 21:47:07 -04:00
kumavis
7ae5a23b6c
Merge branch 'sentry-enhancements2' of github.com:MetaMask/metamask-extension into sentry-enhancements2
2018-10-29 20:28:02 -04:00
kumavis
ccbc233282
Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2
2018-10-29 20:25:05 -04:00
kumavis
1bb4a8428c
Merge pull request #5596 from MetaMask/validateSignTypedData
...
Validate signTypedData signer/address in eth-json-rpc-middleware
2018-10-29 20:11:04 -04:00
kumavis
ad009a4606
Merge branch 'develop' into sentry-enhancements2
2018-10-29 19:49:53 -04:00
kumavis
18e530221b
Merge pull request #5552 from EthersocialNetwork/eth_chainid
...
network - check eth_chainId and fallback to net_version
2018-10-29 19:43:25 -04:00
kumavis
986f8b4c21
preferences - fix typo
2018-10-29 18:56:29 -04:00
hackyminer
bc7f8d0a5b
Merge branch 'develop' into eth_chainid
2018-10-26 20:37:35 +09:00
HackyMiner
54a8ade266
Add support for RPC endpoints with custom chain IDs ( #5134 )
2018-10-26 10:26:43 +02:00
kumavis
9b42416fc0
Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardBraham-develop
2018-10-25 22:24:30 -04:00
Thomas
8c0e5e97e5
Add version to unapprovedMessage
2018-10-24 20:24:42 -07:00
Thomas
95b92a1ddc
Remove commented out/unused methods
2018-10-24 20:13:40 -07:00
Thomas
1d65687ce4
Validate signTypedData in eth-json-rpc-middleware
2018-10-24 20:03:55 -07:00
kumavis
6d09f60bbf
ens-ipfs - refactor for readability ( #5568 )
...
* ens-ipfs - refactor for readability
* ens-ipfs - use official ipfs gateway for better performance
* lint - remove unused code
* ens-ipfs - support path and search
* lint - gotta love that linter
* ens-ipfs - improve loading page formatting
* ens-ipfs - loading - redirect to 404 after 1 min timeout
* ens-ipfs - destructure for cleaner code
2018-10-21 05:48:15 -04:00
kumavis
b62d07f3a5
Update network.js
2018-10-21 04:32:07 -04:00
brunobar79
9c1b2108f6
fix merge conflicts
2018-10-21 01:59:53 -04:00
kumavis
b0c649a4e3
Merge pull request #5555 from MetaMask/support-wallet-watch-asset
...
Support for prefix wallet_watchAsset
2018-10-21 01:27:08 -04:00
kumavis
61c7bbb1c1
network - improve logging and type conversion
2018-10-21 01:20:08 -04:00
kumavis
31e5cad1e3
tx-gas-util - set error message when invalidating tx based on tx data but no contract code
2018-10-21 01:01:21 -04:00
kumavis
f0602ca354
Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2
2018-10-20 23:51:00 -04:00
kumavis
3b46478024
Merge branch 'develop' into develop
2018-10-20 23:48:10 -04:00
kumavis
73ec4e66cb
sentry - include app state in ui errors
2018-10-20 03:14:59 -04:00
kumavis
e3fda83ab2
sentry - replace raven-js with sentry/browser
2018-10-20 02:22:50 -04:00
Esteban Miño
7c4f98ffd6
specific add and remove methods for frequentRpcList ( #5554 )
2018-10-19 17:50:54 -02:30
Esteban MIno
75661673e5
add support for wallet_watchAsset
2018-10-19 13:57:11 -03:00
hackyminer
2f6530a494
support both eth_chainId and net_version
...
get the real chainId using eth_chainId and use net_version as a fallback
2018-10-20 01:08:46 +09:00
kumavis
31175dcb24
blacklist + currency - report error via log instead of throw
2018-10-19 07:18:16 -04:00
kumavis
a57d267dcb
lint fix
2018-10-19 07:08:04 -04:00
kumavis
b85ae55cd5
fetch debugger - only append source stack if no stack is present
2018-10-19 06:42:53 -04:00
kumavis
3e3d4b9dde
sentry - failed txs - namespace txMeta for better readability
2018-10-19 05:30:21 -04:00
kumavis
2394881511
currency - throw errors on failure
2018-10-19 04:58:19 -04:00
kumavis
65aa0a1d14
blacklist - throw errors on request/parse failure
2018-10-19 04:51:03 -04:00
kumavis
26b30a031d
sentry - move isBrave decoration to insides of try-catch
2018-10-19 04:36:36 -04:00
kumavis
fa36dbf981
inpage - increase provider max listeners to avoid warnings
2018-10-17 19:17:39 -04:00
kumavis
c289baa17a
Merge pull request #5127 from MetaMask/account-tracker-network-change
...
Bug Fix: Force AccountTracker to update balances on network change
2018-10-17 18:56:54 -04:00
Whymarrh Whitby
0d0bb4afd7
Merge pull request #5522 from MetaMask/fetch-debugging
...
debugging - enable fetch debugging
2018-10-17 17:38:55 -02:30
Alexander Tseung
badebe017f
Adds toggle for primary currency ( #5421 )
...
* Add UnitInput component
* Add CurrencyInput component
* Add UserPreferencedCurrencyInput component
* Add UserPreferencedCurrencyDisplay component
* Add updatePreferences action
* Add styles for CurrencyInput, CurrencyDisplay, and UnitInput
* Update SettingsTab page with Primary Currency toggle
* Refactor currency displays and inputs to use UserPreferenced displays and inputs
* Add TokenInput component
* Add UserPreferencedTokenInput component
* Use TokenInput in the send screen
* Fix unit tests
* Fix e2e and integration tests
* Remove send/CurrencyDisplay component
* Replace diamond unicode character with Eth logo. Fix typos
2018-10-17 07:03:29 +08:00
brunobar79
13820b6cc1
fix conflicts
2018-10-16 14:01:54 -04:00
Whymarrh Whitby
d44b7ef3da
Fix document extension check when injecting web3
2018-10-16 11:08:48 -02:30
Alexander Tseung
c821a8354c
Add txReceipt data to transaction details ( #5513 )
2018-10-16 06:00:47 +08:00
kumavis
70c45ae8be
enable fetch debugging
2018-10-15 01:14:25 -04:00
Whymarrh Whitby
af43b7d6c9
Ensure that new transactions added are using the selected address
2018-10-10 16:16:20 -02:30
Whymarrh Whitby
428a7cacdf
Revert "transactions - add txReceipt to the txMeta body for confirmed txs ( #5375 )"
...
This reverts commit ff67293a8e
2018-10-10 15:30:12 -02:30
Frankie
ff67293a8e
transactions - add txReceipt to the txMeta body for confirmed txs ( #5375 )
2018-10-10 10:26:38 -04:00
Bruno Barbieri
ccab4ee1a4
tests - integration - Add Drizzle tests ( #5467 )
...
* added drizzle app for testing
* working
* clean up
* clean up script
* make build step required
* add drizzle-tests to .eslintignore
* clean up drizzle run script
* lint
* use truffle unbox
* undo eslintignore changes
* revert change
* dont use global
* dont need this steps
* use the new account flow
* restore package-lock.json
2018-10-10 01:12:43 -04:00
kumavis
600f755dbf
tx-gas-utils - improve format + comments
2018-10-09 23:17:05 -04:00
Howard Braham
4cc0b1ef01
ganache-core merged my PR, so I changed some comments to clarify that ganache-core v2.2.1 and below will return the non-standard '0x0'
2018-10-09 15:31:25 -07:00
Howard Braham
222e62d7f1
Bug Fix : #1789 and #4525 eth.getCode() with no contract
2018-10-09 15:31:25 -07:00
Bruno Barbieri
17b9f4c0db
Merge pull request #5458 from MetaMask/provider-subs
...
Feature: Subscription support
2018-10-09 13:25:13 -04:00
Noel Yoo
ebdefe81a1
Refactor buffer constructor ( #5468 )
2018-10-09 09:32:48 -02:30
kumavis
45feb43f30
workaround - fix for drizzle
2018-10-08 16:54:13 -04:00
Eduardo Antuña Díez
8279916ee4
Added webRequest.RequestFilter to filter main_frame .eth requests
2018-10-08 21:50:15 +02:00
kumavis
fe82c4a9fb
provider - network - restore block-ref-rewrite middleware references
2018-10-08 12:39:18 -04:00
