|
|
|
@ -63,7 +63,6 @@ import accountImporter from './account-import-strategies' |
|
|
|
import selectChainId from './lib/select-chain-id' |
|
|
|
import selectChainId from './lib/select-chain-id' |
|
|
|
import seedPhraseVerifier from './lib/seed-phrase-verifier' |
|
|
|
import seedPhraseVerifier from './lib/seed-phrase-verifier' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import backgroundMetaMetricsEvent from './lib/background-metametrics' |
|
|
|
import backgroundMetaMetricsEvent from './lib/background-metametrics' |
|
|
|
|
|
|
|
|
|
|
|
export default class MetamaskController extends EventEmitter { |
|
|
|
export default class MetamaskController extends EventEmitter { |
|
|
|
@ -274,7 +273,6 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
this.encryptionPublicKeyManager = new EncryptionPublicKeyManager() |
|
|
|
this.encryptionPublicKeyManager = new EncryptionPublicKeyManager() |
|
|
|
this.typedMessageManager = new TypedMessageManager({ networkController: this.networkController }) |
|
|
|
this.typedMessageManager = new TypedMessageManager({ networkController: this.networkController }) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.store.updateStructure({ |
|
|
|
this.store.updateStructure({ |
|
|
|
AppStateController: this.appStateController.store, |
|
|
|
AppStateController: this.appStateController.store, |
|
|
|
TransactionController: this.txController.store, |
|
|
|
TransactionController: this.txController.store, |
|
|
|
@ -407,7 +405,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
getState () { |
|
|
|
getState () { |
|
|
|
const { vault } = this.keyringController.store.getState() |
|
|
|
const { vault } = this.keyringController.store.getState() |
|
|
|
const isInitialized = !!vault |
|
|
|
const isInitialized = Boolean(vault) |
|
|
|
|
|
|
|
|
|
|
|
return { |
|
|
|
return { |
|
|
|
...{ isInitialized }, |
|
|
|
...{ isInitialized }, |
|
|
|
@ -929,7 +927,6 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return { ...keyState, identities } |
|
|
|
return { ...keyState, identities } |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Account Management
|
|
|
|
// Account Management
|
|
|
|
//
|
|
|
|
//
|
|
|
|
@ -1029,7 +1026,6 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return address |
|
|
|
return address |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Imports an account with the specified import strategy. |
|
|
|
* Imports an account with the specified import strategy. |
|
|
|
* These are defined in app/scripts/account-import-strategies |
|
|
|
* These are defined in app/scripts/account-import-strategies |
|
|
|
@ -1041,7 +1037,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
async importAccountWithStrategy (strategy, args) { |
|
|
|
async importAccountWithStrategy (strategy, args) { |
|
|
|
const privateKey = await accountImporter.importAccount(strategy, args) |
|
|
|
const privateKey = await accountImporter.importAccount(strategy, args) |
|
|
|
const keyring = await this.keyringController.addNewKeyring('Simple Key Pair', [ privateKey ]) |
|
|
|
const keyring = await this.keyringController.addNewKeyring('Simple Key Pair', [privateKey]) |
|
|
|
const accounts = await keyring.getAccounts() |
|
|
|
const accounts = await keyring.getAccounts() |
|
|
|
// update accounts in preferences controller
|
|
|
|
// update accounts in preferences controller
|
|
|
|
const allAccounts = await this.keyringController.getAccounts() |
|
|
|
const allAccounts = await this.keyringController.getAccounts() |
|
|
|
@ -1116,10 +1112,10 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
cancelMessage (msgId, cb) { |
|
|
|
cancelMessage (msgId, cb) { |
|
|
|
const { messageManager } = this |
|
|
|
const { messageManager } = this |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
if (cb && typeof cb === 'function') { |
|
|
|
if (!cb || typeof cb !== 'function') { |
|
|
|
cb(null, this.getState()) |
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
cb(null, this.getState()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// personal_sign methods:
|
|
|
|
// personal_sign methods:
|
|
|
|
@ -1175,10 +1171,10 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
cancelPersonalMessage (msgId, cb) { |
|
|
|
cancelPersonalMessage (msgId, cb) { |
|
|
|
const messageManager = this.personalMessageManager |
|
|
|
const messageManager = this.personalMessageManager |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
if (cb && typeof cb === 'function') { |
|
|
|
if (!cb || typeof cb !== 'function') { |
|
|
|
cb(null, this.getState()) |
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
cb(null, this.getState()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// eth_decrypt methods
|
|
|
|
// eth_decrypt methods
|
|
|
|
@ -1260,10 +1256,10 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
cancelDecryptMessage (msgId, cb) { |
|
|
|
cancelDecryptMessage (msgId, cb) { |
|
|
|
const messageManager = this.decryptMessageManager |
|
|
|
const messageManager = this.decryptMessageManager |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
if (cb && typeof cb === 'function') { |
|
|
|
if (!cb || typeof cb !== 'function') { |
|
|
|
cb(null, this.getState()) |
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
cb(null, this.getState()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// eth_getEncryptionPublicKey methods
|
|
|
|
// eth_getEncryptionPublicKey methods
|
|
|
|
@ -1318,10 +1314,10 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
cancelEncryptionPublicKey (msgId, cb) { |
|
|
|
cancelEncryptionPublicKey (msgId, cb) { |
|
|
|
const messageManager = this.encryptionPublicKeyManager |
|
|
|
const messageManager = this.encryptionPublicKeyManager |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
if (cb && typeof cb === 'function') { |
|
|
|
if (!cb || typeof cb !== 'function') { |
|
|
|
cb(null, this.getState()) |
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
cb(null, this.getState()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// eth_signTypedData methods
|
|
|
|
// eth_signTypedData methods
|
|
|
|
@ -1379,10 +1375,10 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
cancelTypedMessage (msgId, cb) { |
|
|
|
cancelTypedMessage (msgId, cb) { |
|
|
|
const messageManager = this.typedMessageManager |
|
|
|
const messageManager = this.typedMessageManager |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
messageManager.rejectMsg(msgId) |
|
|
|
if (cb && typeof cb === 'function') { |
|
|
|
if (!cb || typeof cb !== 'function') { |
|
|
|
cb(null, this.getState()) |
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
cb(null, this.getState()) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
//=============================================================================
|
|
|
|
@ -1872,6 +1868,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1892,7 +1889,6 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return rpcUrl |
|
|
|
return rpcUrl |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* A method for selecting a custom URL for an ethereum RPC provider. |
|
|
|
* A method for selecting a custom URL for an ethereum RPC provider. |
|
|
|
* @param {string} rpcTarget - A URL for a valid Ethereum RPC API. |
|
|
|
* @param {string} rpcTarget - A URL for a valid Ethereum RPC API. |
|
|
|
@ -1938,6 +1934,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1954,6 +1951,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1970,6 +1968,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1986,6 +1985,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2002,6 +2002,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2013,6 +2014,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2029,11 +2031,11 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* A method for setting a user's current locale, affecting the language rendered. |
|
|
|
* A method for setting a user's current locale, affecting the language rendered. |
|
|
|
* @param {string} key - Locale identifier. |
|
|
|
* @param {string} key - Locale identifier. |
|
|
|
@ -2046,6 +2048,7 @@ export default class MetamaskController extends EventEmitter { |
|
|
|
return |
|
|
|
return |
|
|
|
} catch (err) { |
|
|
|
} catch (err) { |
|
|
|
cb(err) |
|
|
|
cb(err) |
|
|
|
|
|
|
|
// eslint-disable-next-line no-useless-return
|
|
|
|
return |
|
|
|
return |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
Whymarrh Whitby
4 years ago
committed by
GitHub