2020-01-09 04:34:58 +01:00
|
|
|
import assert from 'assert'
|
|
|
|
import ObservableStore from 'obs-store'
|
|
|
|
import PreferencesController from '../../../../app/scripts/controllers/preferences'
|
|
|
|
import { addInternalMethodPrefix } from '../../../../app/scripts/controllers/permissions'
|
|
|
|
import sinon from 'sinon'
|
2017-12-19 00:49:55 +01:00
|
|
|
|
|
|
|
describe('preferences controller', function () {
|
|
|
|
let preferencesController
|
2018-07-27 02:04:57 +02:00
|
|
|
let network
|
2017-12-19 00:49:55 +01:00
|
|
|
|
2020-02-11 17:51:13 +01:00
|
|
|
beforeEach(function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
network = { providerStore: new ObservableStore({ type: 'mainnet' }) }
|
2018-07-27 02:04:57 +02:00
|
|
|
preferencesController = new PreferencesController({ network })
|
2017-12-19 00:49:55 +01:00
|
|
|
})
|
|
|
|
|
2018-04-19 05:33:51 +02:00
|
|
|
describe('setAddresses', function () {
|
|
|
|
it('should keep a map of addresses to names and addresses in the store', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
|
2019-12-03 21:50:55 +01:00
|
|
|
const { identities } = preferencesController.store.getState()
|
2018-04-19 05:33:51 +02:00
|
|
|
assert.deepEqual(identities, {
|
|
|
|
'0xda22le': {
|
|
|
|
name: 'Account 1',
|
|
|
|
address: '0xda22le',
|
|
|
|
},
|
|
|
|
'0x7e57e2': {
|
|
|
|
name: 'Account 2',
|
|
|
|
address: '0x7e57e2',
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2018-07-31 01:09:17 +02:00
|
|
|
it('should create account tokens for each account in the store', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
|
|
|
|
const accountTokens = preferencesController.store.getState().accountTokens
|
|
|
|
|
|
|
|
assert.deepEqual(accountTokens, {
|
|
|
|
'0xda22le': {},
|
|
|
|
'0x7e57e2': {},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2018-04-19 05:33:51 +02:00
|
|
|
it('should replace its list of addresses', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le77',
|
|
|
|
'0x7e57e277',
|
|
|
|
])
|
|
|
|
|
2019-12-03 21:50:55 +01:00
|
|
|
const { identities } = preferencesController.store.getState()
|
2018-04-19 05:33:51 +02:00
|
|
|
assert.deepEqual(identities, {
|
|
|
|
'0xda22le77': {
|
|
|
|
name: 'Account 1',
|
|
|
|
address: '0xda22le77',
|
|
|
|
},
|
|
|
|
'0x7e57e277': {
|
|
|
|
name: 'Account 2',
|
|
|
|
address: '0x7e57e277',
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2018-07-16 22:08:19 +02:00
|
|
|
describe('removeAddress', function () {
|
|
|
|
it('should remove an address from state', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
|
|
|
|
preferencesController.removeAddress('0xda22le')
|
|
|
|
|
|
|
|
assert.equal(preferencesController.store.getState().identities['0xda22le'], undefined)
|
|
|
|
})
|
|
|
|
|
2018-07-31 01:09:17 +02:00
|
|
|
it('should remove an address from state and respective tokens', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
|
|
|
|
preferencesController.removeAddress('0xda22le')
|
|
|
|
|
|
|
|
assert.equal(preferencesController.store.getState().accountTokens['0xda22le'], undefined)
|
|
|
|
})
|
|
|
|
|
2018-07-16 22:08:19 +02:00
|
|
|
it('should switch accounts if the selected address is removed', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
|
|
|
|
preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
preferencesController.removeAddress('0x7e57e2')
|
|
|
|
|
|
|
|
assert.equal(preferencesController.getSelectedAddress(), '0xda22le')
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2018-04-19 05:33:51 +02:00
|
|
|
describe('setAccountLabel', function () {
|
|
|
|
it('should update a label for the given account', function () {
|
|
|
|
preferencesController.setAddresses([
|
|
|
|
'0xda22le',
|
|
|
|
'0x7e57e2',
|
|
|
|
])
|
|
|
|
|
|
|
|
assert.deepEqual(preferencesController.store.getState().identities['0xda22le'], {
|
|
|
|
name: 'Account 1',
|
|
|
|
address: '0xda22le',
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
preferencesController.setAccountLabel('0xda22le', 'Dazzle')
|
|
|
|
assert.deepEqual(preferencesController.store.getState().identities['0xda22le'], {
|
|
|
|
name: 'Dazzle',
|
|
|
|
address: '0xda22le',
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2018-04-19 05:33:51 +02:00
|
|
|
describe('getTokens', function () {
|
|
|
|
it('should return an empty list initially', async function () {
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
|
|
|
|
const tokens = preferencesController.getTokens()
|
|
|
|
assert.equal(tokens.length, 0, 'empty list of tokens')
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2017-12-19 00:49:55 +01:00
|
|
|
describe('addToken', function () {
|
|
|
|
it('should add that token to its state', async function () {
|
|
|
|
const address = '0xabcdef1234567'
|
|
|
|
const symbol = 'ABBR'
|
|
|
|
const decimals = 5
|
|
|
|
|
2018-04-19 05:33:51 +02:00
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
2017-12-19 00:49:55 +01:00
|
|
|
await preferencesController.addToken(address, symbol, decimals)
|
|
|
|
|
|
|
|
const tokens = preferencesController.getTokens()
|
|
|
|
assert.equal(tokens.length, 1, 'one token added')
|
|
|
|
|
|
|
|
const added = tokens[0]
|
|
|
|
assert.equal(added.address, address, 'set address correctly')
|
|
|
|
assert.equal(added.symbol, symbol, 'set symbol correctly')
|
|
|
|
assert.equal(added.decimals, decimals, 'set decimals correctly')
|
|
|
|
})
|
|
|
|
|
|
|
|
it('should allow updating a token value', async function () {
|
|
|
|
const address = '0xabcdef1234567'
|
|
|
|
const symbol = 'ABBR'
|
|
|
|
const decimals = 5
|
|
|
|
|
2018-04-19 05:33:51 +02:00
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
2017-12-19 00:49:55 +01:00
|
|
|
await preferencesController.addToken(address, symbol, decimals)
|
|
|
|
|
|
|
|
const newDecimals = 6
|
|
|
|
await preferencesController.addToken(address, symbol, newDecimals)
|
|
|
|
|
|
|
|
const tokens = preferencesController.getTokens()
|
|
|
|
assert.equal(tokens.length, 1, 'one token added')
|
|
|
|
|
|
|
|
const added = tokens[0]
|
|
|
|
assert.equal(added.address, address, 'set address correctly')
|
|
|
|
assert.equal(added.symbol, symbol, 'set symbol correctly')
|
|
|
|
assert.equal(added.decimals, newDecimals, 'updated decimals correctly')
|
|
|
|
})
|
2018-04-19 05:33:51 +02:00
|
|
|
|
|
|
|
it('should allow adding tokens to two separate addresses', async function () {
|
|
|
|
const address = '0xabcdef1234567'
|
|
|
|
const symbol = 'ABBR'
|
|
|
|
const decimals = 5
|
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.addToken(address, symbol, decimals)
|
|
|
|
assert.equal(preferencesController.getTokens().length, 1, 'one token added for 1st address')
|
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0xda22le')
|
|
|
|
await preferencesController.addToken(address, symbol, decimals)
|
|
|
|
assert.equal(preferencesController.getTokens().length, 1, 'one token added for 2nd address')
|
|
|
|
})
|
2018-07-27 23:41:47 +02:00
|
|
|
|
|
|
|
it('should add token per account', async function () {
|
|
|
|
const addressFirst = '0xabcdef1234567'
|
|
|
|
const addressSecond = '0xabcdef1234568'
|
|
|
|
const symbolFirst = 'ABBR'
|
|
|
|
const symbolSecond = 'ABBB'
|
|
|
|
const decimals = 5
|
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.addToken(addressFirst, symbolFirst, decimals)
|
|
|
|
const tokensFirstAddress = preferencesController.getTokens()
|
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0xda22le')
|
|
|
|
await preferencesController.addToken(addressSecond, symbolSecond, decimals)
|
|
|
|
const tokensSeconAddress = preferencesController.getTokens()
|
|
|
|
|
|
|
|
assert.notEqual(tokensFirstAddress, tokensSeconAddress, 'add different tokens for two account and tokens are equal')
|
|
|
|
})
|
|
|
|
|
|
|
|
it('should add token per network', async function () {
|
|
|
|
const addressFirst = '0xabcdef1234567'
|
|
|
|
const addressSecond = '0xabcdef1234568'
|
|
|
|
const symbolFirst = 'ABBR'
|
|
|
|
const symbolSecond = 'ABBB'
|
|
|
|
const decimals = 5
|
|
|
|
|
|
|
|
network.providerStore.updateState({ type: 'mainnet' })
|
|
|
|
await preferencesController.addToken(addressFirst, symbolFirst, decimals)
|
|
|
|
const tokensFirstAddress = preferencesController.getTokens()
|
|
|
|
|
|
|
|
network.providerStore.updateState({ type: 'rinkeby' })
|
|
|
|
await preferencesController.addToken(addressSecond, symbolSecond, decimals)
|
|
|
|
const tokensSeconAddress = preferencesController.getTokens()
|
|
|
|
|
|
|
|
assert.notEqual(tokensFirstAddress, tokensSeconAddress, 'add different tokens for two networks and tokens are equal')
|
|
|
|
})
|
2018-04-19 05:33:51 +02:00
|
|
|
})
|
|
|
|
|
|
|
|
describe('removeToken', function () {
|
|
|
|
it('should remove the only token from its state', async function () {
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.addToken('0xa', 'A', 5)
|
|
|
|
await preferencesController.removeToken('0xa')
|
|
|
|
|
|
|
|
const tokens = preferencesController.getTokens()
|
|
|
|
assert.equal(tokens.length, 0, 'one token removed')
|
|
|
|
})
|
|
|
|
|
|
|
|
it('should remove a token from its state', async function () {
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
await preferencesController.removeToken('0xa')
|
|
|
|
|
|
|
|
const tokens = preferencesController.getTokens()
|
|
|
|
assert.equal(tokens.length, 1, 'one token removed')
|
|
|
|
|
|
|
|
const [token1] = tokens
|
2019-12-03 21:50:55 +01:00
|
|
|
assert.deepEqual(token1, { address: '0xb', symbol: 'B', decimals: 5 })
|
2018-04-19 05:33:51 +02:00
|
|
|
})
|
2018-07-27 23:41:47 +02:00
|
|
|
|
|
|
|
it('should remove a token from its state on corresponding address', async function () {
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e3')
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
const initialTokensSecond = preferencesController.getTokens()
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.removeToken('0xa')
|
|
|
|
|
|
|
|
const tokensFirst = preferencesController.getTokens()
|
|
|
|
assert.equal(tokensFirst.length, 1, 'one token removed in account')
|
|
|
|
|
|
|
|
const [token1] = tokensFirst
|
2019-12-03 21:50:55 +01:00
|
|
|
assert.deepEqual(token1, { address: '0xb', symbol: 'B', decimals: 5 })
|
2018-07-27 23:41:47 +02:00
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e3')
|
|
|
|
const tokensSecond = preferencesController.getTokens()
|
|
|
|
assert.deepEqual(tokensSecond, initialTokensSecond, 'token deleted for account')
|
|
|
|
})
|
|
|
|
|
|
|
|
it('should remove a token from its state on corresponding network', async function () {
|
|
|
|
network.providerStore.updateState({ type: 'mainnet' })
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
network.providerStore.updateState({ type: 'rinkeby' })
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
const initialTokensSecond = preferencesController.getTokens()
|
|
|
|
network.providerStore.updateState({ type: 'mainnet' })
|
|
|
|
await preferencesController.removeToken('0xa')
|
|
|
|
|
|
|
|
const tokensFirst = preferencesController.getTokens()
|
|
|
|
assert.equal(tokensFirst.length, 1, 'one token removed in network')
|
|
|
|
|
|
|
|
const [token1] = tokensFirst
|
2019-12-03 21:50:55 +01:00
|
|
|
assert.deepEqual(token1, { address: '0xb', symbol: 'B', decimals: 5 })
|
2018-07-27 23:41:47 +02:00
|
|
|
|
|
|
|
network.providerStore.updateState({ type: 'rinkeby' })
|
|
|
|
const tokensSecond = preferencesController.getTokens()
|
|
|
|
assert.deepEqual(tokensSecond, initialTokensSecond, 'token deleted for network')
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
describe('on setSelectedAddress', function () {
|
|
|
|
it('should update tokens from its state on corresponding address', async function () {
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e3')
|
|
|
|
await preferencesController.addToken('0xa', 'C', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'D', 5)
|
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
const initialTokensFirst = preferencesController.getTokens()
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e3')
|
|
|
|
const initialTokensSecond = preferencesController.getTokens()
|
|
|
|
|
|
|
|
assert.notDeepEqual(initialTokensFirst, initialTokensSecond, 'tokens not equal for different accounts and tokens')
|
|
|
|
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e2')
|
|
|
|
const tokensFirst = preferencesController.getTokens()
|
|
|
|
await preferencesController.setSelectedAddress('0x7e57e3')
|
|
|
|
const tokensSecond = preferencesController.getTokens()
|
|
|
|
|
|
|
|
assert.deepEqual(tokensFirst, initialTokensFirst, 'tokens equal for same account')
|
|
|
|
assert.deepEqual(tokensSecond, initialTokensSecond, 'tokens equal for same account')
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
describe('on updateStateNetworkType', function () {
|
|
|
|
it('should remove a token from its state on corresponding network', async function () {
|
|
|
|
network.providerStore.updateState({ type: 'mainnet' })
|
|
|
|
await preferencesController.addToken('0xa', 'A', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'B', 5)
|
|
|
|
const initialTokensFirst = preferencesController.getTokens()
|
|
|
|
network.providerStore.updateState({ type: 'rinkeby' })
|
|
|
|
await preferencesController.addToken('0xa', 'C', 4)
|
|
|
|
await preferencesController.addToken('0xb', 'D', 5)
|
|
|
|
const initialTokensSecond = preferencesController.getTokens()
|
|
|
|
|
|
|
|
assert.notDeepEqual(initialTokensFirst, initialTokensSecond, 'tokens not equal for different networks and tokens')
|
|
|
|
|
|
|
|
network.providerStore.updateState({ type: 'mainnet' })
|
|
|
|
const tokensFirst = preferencesController.getTokens()
|
|
|
|
network.providerStore.updateState({ type: 'rinkeby' })
|
|
|
|
const tokensSecond = preferencesController.getTokens()
|
|
|
|
assert.deepEqual(tokensFirst, initialTokensFirst, 'tokens equal for same network')
|
|
|
|
assert.deepEqual(tokensSecond, initialTokensSecond, 'tokens equal for same network')
|
|
|
|
})
|
2017-12-19 00:49:55 +01:00
|
|
|
})
|
2018-08-22 00:17:57 +02:00
|
|
|
|
|
|
|
describe('on watchAsset', function () {
|
2019-12-03 15:52:01 +01:00
|
|
|
let stubNext, stubEnd, stubHandleWatchAssetERC20, asy, req, res
|
2018-08-22 00:17:57 +02:00
|
|
|
const sandbox = sinon.createSandbox()
|
|
|
|
|
2020-02-11 17:51:13 +01:00
|
|
|
beforeEach(function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
req = { params: {} }
|
2018-08-22 00:17:57 +02:00
|
|
|
res = {}
|
2019-12-03 21:50:55 +01:00
|
|
|
asy = { next: () => {}, end: () => {} }
|
2018-08-22 00:17:57 +02:00
|
|
|
stubNext = sandbox.stub(asy, 'next')
|
|
|
|
stubEnd = sandbox.stub(asy, 'end').returns(0)
|
|
|
|
stubHandleWatchAssetERC20 = sandbox.stub(preferencesController, '_handleWatchAssetERC20')
|
|
|
|
})
|
2020-02-11 17:51:13 +01:00
|
|
|
after(function () {
|
2018-08-22 00:17:57 +02:00
|
|
|
sandbox.restore()
|
|
|
|
})
|
|
|
|
|
2018-08-28 03:10:14 +02:00
|
|
|
it('shouldn not do anything if method not corresponds', async function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
const asy = { next: () => {}, end: () => {} }
|
2019-12-03 15:52:01 +01:00
|
|
|
const stubNext = sandbox.stub(asy, 'next')
|
|
|
|
const stubEnd = sandbox.stub(asy, 'end').returns(0)
|
2018-08-22 00:17:57 +02:00
|
|
|
req.method = 'metamask'
|
|
|
|
await preferencesController.requestWatchAsset(req, res, asy.next, asy.end)
|
|
|
|
sandbox.assert.notCalled(stubEnd)
|
|
|
|
sandbox.assert.called(stubNext)
|
|
|
|
})
|
|
|
|
it('should do something if method is supported', async function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
const asy = { next: () => {}, end: () => {} }
|
2019-12-03 15:52:01 +01:00
|
|
|
const stubNext = sandbox.stub(asy, 'next')
|
|
|
|
const stubEnd = sandbox.stub(asy, 'end').returns(0)
|
2018-08-22 00:17:57 +02:00
|
|
|
req.method = 'metamask_watchAsset'
|
|
|
|
req.params.type = 'someasset'
|
|
|
|
await preferencesController.requestWatchAsset(req, res, asy.next, asy.end)
|
|
|
|
sandbox.assert.called(stubEnd)
|
|
|
|
sandbox.assert.notCalled(stubNext)
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
2019-12-03 18:35:56 +01:00
|
|
|
req.method = addInternalMethodPrefix('watchAsset')
|
2018-10-19 18:57:11 +02:00
|
|
|
req.params.type = 'someasset'
|
|
|
|
await preferencesController.requestWatchAsset(req, res, asy.next, asy.end)
|
|
|
|
sandbox.assert.calledTwice(stubEnd)
|
|
|
|
sandbox.assert.notCalled(stubNext)
|
2018-08-22 00:17:57 +02:00
|
|
|
})
|
|
|
|
it('should through error if method is supported but asset type is not', async function () {
|
|
|
|
req.method = 'metamask_watchAsset'
|
|
|
|
req.params.type = 'someasset'
|
|
|
|
await preferencesController.requestWatchAsset(req, res, asy.next, asy.end)
|
|
|
|
sandbox.assert.called(stubEnd)
|
|
|
|
sandbox.assert.notCalled(stubHandleWatchAssetERC20)
|
|
|
|
sandbox.assert.notCalled(stubNext)
|
|
|
|
assert.deepEqual(res, {})
|
|
|
|
})
|
|
|
|
it('should trigger handle add asset if type supported', async function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
const asy = { next: () => {}, end: () => {} }
|
2018-08-22 00:17:57 +02:00
|
|
|
req.method = 'metamask_watchAsset'
|
|
|
|
req.params.type = 'ERC20'
|
|
|
|
await preferencesController.requestWatchAsset(req, res, asy.next, asy.end)
|
|
|
|
sandbox.assert.called(stubHandleWatchAssetERC20)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
describe('on watchAsset of type ERC20', function () {
|
2019-12-03 15:52:01 +01:00
|
|
|
let req
|
2018-08-22 00:17:57 +02:00
|
|
|
|
|
|
|
const sandbox = sinon.createSandbox()
|
2020-02-11 17:51:13 +01:00
|
|
|
beforeEach(function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
req = { params: { type: 'ERC20' } }
|
2018-08-22 00:17:57 +02:00
|
|
|
})
|
2020-02-11 17:51:13 +01:00
|
|
|
after(function () {
|
2018-08-22 00:17:57 +02:00
|
|
|
sandbox.restore()
|
|
|
|
})
|
|
|
|
|
|
|
|
it('should add suggested token', async function () {
|
|
|
|
const address = '0xabcdef1234567'
|
|
|
|
const symbol = 'ABBR'
|
|
|
|
const decimals = 5
|
2018-08-23 20:54:40 +02:00
|
|
|
const image = 'someimage'
|
|
|
|
req.params.options = { address, symbol, decimals, image }
|
2018-08-22 00:17:57 +02:00
|
|
|
|
|
|
|
sandbox.stub(preferencesController, '_validateERC20AssetParams').returns(true)
|
2018-09-27 20:19:09 +02:00
|
|
|
preferencesController.openPopup = async () => {}
|
2018-08-22 00:17:57 +02:00
|
|
|
|
|
|
|
await preferencesController._handleWatchAssetERC20(req.params.options)
|
|
|
|
const suggested = preferencesController.getSuggestedTokens()
|
|
|
|
assert.equal(Object.keys(suggested).length, 1, `one token added ${Object.keys(suggested)}`)
|
|
|
|
|
|
|
|
assert.equal(suggested[address].address, address, 'set address correctly')
|
|
|
|
assert.equal(suggested[address].symbol, symbol, 'set symbol correctly')
|
|
|
|
assert.equal(suggested[address].decimals, decimals, 'set decimals correctly')
|
2018-08-23 20:54:40 +02:00
|
|
|
assert.equal(suggested[address].image, image, 'set image correctly')
|
2018-08-22 00:17:57 +02:00
|
|
|
})
|
|
|
|
|
|
|
|
it('should add token correctly if user confirms', async function () {
|
|
|
|
const address = '0xabcdef1234567'
|
|
|
|
const symbol = 'ABBR'
|
|
|
|
const decimals = 5
|
2018-08-23 20:54:40 +02:00
|
|
|
const image = 'someimage'
|
|
|
|
req.params.options = { address, symbol, decimals, image }
|
2018-08-22 00:17:57 +02:00
|
|
|
|
|
|
|
sandbox.stub(preferencesController, '_validateERC20AssetParams').returns(true)
|
2018-09-27 20:19:09 +02:00
|
|
|
preferencesController.openPopup = async () => {
|
2018-08-23 20:54:40 +02:00
|
|
|
await preferencesController.addToken(address, symbol, decimals, image)
|
2018-08-22 00:17:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
await preferencesController._handleWatchAssetERC20(req.params.options)
|
|
|
|
const tokens = preferencesController.getTokens()
|
|
|
|
assert.equal(tokens.length, 1, `one token added`)
|
|
|
|
const added = tokens[0]
|
|
|
|
assert.equal(added.address, address, 'set address correctly')
|
|
|
|
assert.equal(added.symbol, symbol, 'set symbol correctly')
|
|
|
|
assert.equal(added.decimals, decimals, 'set decimals correctly')
|
|
|
|
|
|
|
|
const assetImages = preferencesController.getAssetImages()
|
2018-08-23 20:54:40 +02:00
|
|
|
assert.ok(assetImages[address], `set image correctly`)
|
2018-08-22 00:17:57 +02:00
|
|
|
})
|
2018-11-05 20:06:34 +01:00
|
|
|
it('should validate ERC20 asset correctly', async function () {
|
|
|
|
const validateSpy = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpy({ rawAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07', symbol: 'ABC', decimals: 0 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpy.threw(), false, 'correct options object')
|
|
|
|
const validateSpyAddress = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpyAddress({ symbol: 'ABC', decimals: 0 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpyAddress.threw(), true, 'options object with no address')
|
|
|
|
const validateSpySymbol = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpySymbol({ rawAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07', decimals: 0 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpySymbol.threw(), true, 'options object with no symbol')
|
|
|
|
const validateSpyDecimals = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpyDecimals({ rawAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07', symbol: 'ABC' })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpyDecimals.threw(), true, 'options object with no decimals')
|
|
|
|
const validateSpyInvalidSymbol = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpyInvalidSymbol({ rawAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07', symbol: 'ABCDEFGHI', decimals: 0 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpyInvalidSymbol.threw(), true, 'options object with invalid symbol')
|
|
|
|
const validateSpyInvalidDecimals1 = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpyInvalidDecimals1({ rawAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07', symbol: 'ABCDEFGHI', decimals: -1 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpyInvalidDecimals1.threw(), true, 'options object with decimals less than zero')
|
|
|
|
const validateSpyInvalidDecimals2 = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpyInvalidDecimals2({ rawAddress: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07', symbol: 'ABCDEFGHI', decimals: 38 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpyInvalidDecimals2.threw(), true, 'options object with decimals more than 36')
|
|
|
|
const validateSpyInvalidAddress = sandbox.spy(preferencesController._validateERC20AssetParams)
|
2019-11-20 01:03:20 +01:00
|
|
|
try {
|
2019-12-03 21:50:55 +01:00
|
|
|
validateSpyInvalidAddress({ rawAddress: '0x123', symbol: 'ABC', decimals: 0 })
|
2019-11-20 01:03:20 +01:00
|
|
|
} catch (e) {}
|
2018-11-05 20:06:34 +01:00
|
|
|
assert.equal(validateSpyInvalidAddress.threw(), true, 'options object with address invalid')
|
|
|
|
})
|
2018-08-22 00:17:57 +02:00
|
|
|
})
|
2018-09-11 02:01:15 +02:00
|
|
|
|
|
|
|
describe('setPasswordForgotten', function () {
|
|
|
|
it('should default to false', function () {
|
|
|
|
const state = preferencesController.store.getState()
|
|
|
|
assert.equal(state.forgottenPassword, false)
|
|
|
|
})
|
|
|
|
|
|
|
|
it('should set the forgottenPassword property in state', function () {
|
|
|
|
assert.equal(preferencesController.store.getState().forgottenPassword, false)
|
|
|
|
|
|
|
|
preferencesController.setPasswordForgotten(true)
|
|
|
|
|
|
|
|
assert.equal(preferencesController.store.getState().forgottenPassword, true)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2019-01-29 19:13:51 +01:00
|
|
|
describe('#updateRpc', function () {
|
2020-02-11 17:51:13 +01:00
|
|
|
it('should update the rpcDetails properly', function () {
|
2019-12-03 21:50:55 +01:00
|
|
|
preferencesController.store.updateState({ frequentRpcListDetail: [{}, { rpcUrl: 'test' }, {}] })
|
2019-01-29 19:13:51 +01:00
|
|
|
preferencesController.updateRpc({ rpcUrl: 'test', chainId: 1 })
|
|
|
|
preferencesController.updateRpc({ rpcUrl: 'test/1', chainId: 1 })
|
|
|
|
preferencesController.updateRpc({ rpcUrl: 'test/2', chainId: 1 })
|
|
|
|
preferencesController.updateRpc({ rpcUrl: 'test/3', chainId: 1 })
|
|
|
|
const list = preferencesController.getFrequentRpcListDetail()
|
|
|
|
assert.deepEqual(list[1], { rpcUrl: 'test', chainId: 1 })
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
2018-10-19 22:20:54 +02:00
|
|
|
describe('on updateFrequentRpcList', function () {
|
|
|
|
it('should add custom RPC url to state', function () {
|
2018-10-26 10:26:43 +02:00
|
|
|
preferencesController.addToFrequentRpcList('rpc_url', 1)
|
|
|
|
preferencesController.addToFrequentRpcList('http://localhost:8545', 1)
|
2019-05-09 19:27:14 +02:00
|
|
|
assert.deepEqual(preferencesController.store.getState().frequentRpcListDetail, [{ rpcUrl: 'rpc_url', chainId: 1, ticker: 'ETH', nickname: '', rpcPrefs: {} }])
|
2018-10-26 10:26:43 +02:00
|
|
|
preferencesController.addToFrequentRpcList('rpc_url', 1)
|
2019-05-09 19:27:14 +02:00
|
|
|
assert.deepEqual(preferencesController.store.getState().frequentRpcListDetail, [{ rpcUrl: 'rpc_url', chainId: 1, ticker: 'ETH', nickname: '', rpcPrefs: {} }])
|
2018-10-19 22:20:54 +02:00
|
|
|
})
|
|
|
|
|
|
|
|
it('should remove custom RPC url from state', function () {
|
2018-10-26 10:26:43 +02:00
|
|
|
preferencesController.addToFrequentRpcList('rpc_url', 1)
|
2019-05-09 19:27:14 +02:00
|
|
|
assert.deepEqual(preferencesController.store.getState().frequentRpcListDetail, [{ rpcUrl: 'rpc_url', chainId: 1, ticker: 'ETH', nickname: '', rpcPrefs: {} }])
|
2018-10-19 22:20:54 +02:00
|
|
|
preferencesController.removeFromFrequentRpcList('other_rpc_url')
|
|
|
|
preferencesController.removeFromFrequentRpcList('http://localhost:8545')
|
|
|
|
preferencesController.removeFromFrequentRpcList('rpc_url')
|
2018-10-26 10:26:43 +02:00
|
|
|
assert.deepEqual(preferencesController.store.getState().frequentRpcListDetail, [])
|
2018-10-19 22:20:54 +02:00
|
|
|
})
|
|
|
|
})
|
2017-12-19 00:49:55 +01:00
|
|
|
})
|
|
|
|
|