2021-02-04 19:15:23 +01:00
|
|
|
import EventEmitter from 'safe-event-emitter';
|
|
|
|
import { ObservableStore } from '@metamask/obs-store';
|
2021-07-12 19:54:39 +02:00
|
|
|
import { bufferToHex, keccak, toBuffer, isHexString } from 'ethereumjs-util';
|
2021-02-04 19:15:23 +01:00
|
|
|
import EthQuery from 'ethjs-query';
|
|
|
|
import { ethErrors } from 'eth-rpc-errors';
|
2021-06-16 22:40:17 +02:00
|
|
|
import Common from '@ethereumjs/common';
|
|
|
|
import { TransactionFactory } from '@ethereumjs/tx';
|
2021-02-04 19:15:23 +01:00
|
|
|
import NonceTracker from 'nonce-tracker';
|
|
|
|
import log from 'loglevel';
|
|
|
|
import BigNumber from 'bignumber.js';
|
2022-02-24 19:26:58 +01:00
|
|
|
import { merge, pickBy } from 'lodash';
|
2021-02-04 19:15:23 +01:00
|
|
|
import cleanErrorStack from '../../lib/cleanErrorStack';
|
2020-11-06 22:18:00 +01:00
|
|
|
import {
|
|
|
|
hexToBn,
|
|
|
|
bnToHex,
|
|
|
|
BnMultiplyByFraction,
|
|
|
|
addHexPrefix,
|
2021-07-02 17:31:27 +02:00
|
|
|
getChainType,
|
2021-02-04 19:15:23 +01:00
|
|
|
} from '../../lib/util';
|
2020-11-03 23:57:51 +01:00
|
|
|
import {
|
|
|
|
TRANSACTION_STATUSES,
|
|
|
|
TRANSACTION_TYPES,
|
2022-08-18 15:49:50 +02:00
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE,
|
|
|
|
TOKEN_STANDARDS,
|
2021-07-12 22:26:53 +02:00
|
|
|
TRANSACTION_ENVELOPE_TYPES,
|
2022-01-20 17:26:39 +01:00
|
|
|
TRANSACTION_EVENTS,
|
2021-02-04 19:15:23 +01:00
|
|
|
} from '../../../../shared/constants/transaction';
|
2021-02-09 00:22:30 +01:00
|
|
|
import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
|
2021-07-31 02:45:18 +02:00
|
|
|
import {
|
|
|
|
GAS_LIMITS,
|
|
|
|
GAS_ESTIMATE_TYPES,
|
2021-11-06 01:59:23 +01:00
|
|
|
GAS_RECOMMENDATIONS,
|
|
|
|
CUSTOM_GAS_ESTIMATE,
|
2021-11-29 18:40:48 +01:00
|
|
|
PRIORITY_LEVELS,
|
2021-07-31 02:45:18 +02:00
|
|
|
} from '../../../../shared/constants/gas';
|
|
|
|
import { decGWEIToHexWEI } from '../../../../shared/modules/conversion.utils';
|
2022-06-08 16:32:04 +02:00
|
|
|
import { isSwapsDefaultTokenAddress } from '../../../../shared/modules/swaps.utils';
|
2022-04-22 18:09:10 +02:00
|
|
|
import { EVENT } from '../../../../shared/constants/metametrics';
|
2021-06-16 22:40:17 +02:00
|
|
|
import {
|
2021-06-30 16:39:00 +02:00
|
|
|
HARDFORKS,
|
2021-07-02 17:31:27 +02:00
|
|
|
CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP,
|
2022-09-14 16:55:31 +02:00
|
|
|
NETWORK_TYPES,
|
2021-06-16 22:40:17 +02:00
|
|
|
} from '../../../../shared/constants/network';
|
2022-03-07 19:54:36 +01:00
|
|
|
import {
|
2022-03-16 23:15:03 +01:00
|
|
|
determineTransactionAssetType,
|
2022-09-06 11:08:32 +02:00
|
|
|
determineTransactionContractCode,
|
2022-03-07 19:54:36 +01:00
|
|
|
determineTransactionType,
|
|
|
|
isEIP1559Transaction,
|
|
|
|
} from '../../../../shared/modules/transaction.utils';
|
2022-04-26 19:07:39 +02:00
|
|
|
import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
|
2022-09-16 21:05:21 +02:00
|
|
|
import {
|
|
|
|
calcGasTotal,
|
|
|
|
decimalToHex,
|
|
|
|
getSwapsTokensReceivedFromTxMeta,
|
|
|
|
hexWEIToDecETH,
|
|
|
|
hexWEIToDecGWEI,
|
|
|
|
TRANSACTION_ENVELOPE_TYPE_NAMES,
|
|
|
|
} from '../../../../shared/lib/transactions-controller-utils';
|
2021-02-04 19:15:23 +01:00
|
|
|
import TransactionStateManager from './tx-state-manager';
|
|
|
|
import TxGasUtil from './tx-gas-utils';
|
|
|
|
import PendingTransactionTracker from './pending-tx-tracker';
|
|
|
|
import * as txUtils from './lib/util';
|
2018-09-09 19:07:23 +02:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
const MAX_MEMSTORE_TX_LIST_SIZE = 100; // Number of transactions (by unique nonces) to keep in memory
|
2022-06-08 16:32:04 +02:00
|
|
|
const UPDATE_POST_TX_BALANCE_TIMEOUT = 5000;
|
2018-04-13 21:38:07 +02:00
|
|
|
|
2022-02-14 20:07:46 +01:00
|
|
|
const SWAP_TRANSACTION_TYPES = [
|
|
|
|
TRANSACTION_TYPES.SWAP,
|
|
|
|
TRANSACTION_TYPES.SWAP_APPROVAL,
|
|
|
|
];
|
|
|
|
|
2022-04-26 19:07:39 +02:00
|
|
|
// Only certain types of transactions should be allowed to be specified when
|
|
|
|
// adding a new unapproved transaction.
|
|
|
|
const VALID_UNAPPROVED_TRANSACTION_TYPES = [
|
|
|
|
...SWAP_TRANSACTION_TYPES,
|
|
|
|
TRANSACTION_TYPES.SIMPLE_SEND,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
|
2022-08-03 21:35:34 +02:00
|
|
|
TRANSACTION_TYPES.CONTRACT_INTERACTION,
|
2022-04-26 19:07:39 +02:00
|
|
|
];
|
|
|
|
|
2022-01-20 17:26:39 +01:00
|
|
|
/**
|
|
|
|
* @typedef {import('../../../../shared/constants/transaction').TransactionMeta} TransactionMeta
|
|
|
|
* @typedef {import('../../../../shared/constants/transaction').TransactionMetaMetricsEventString} TransactionMetaMetricsEventString
|
|
|
|
*/
|
2021-06-24 21:00:54 +02:00
|
|
|
|
2022-02-18 17:48:38 +01:00
|
|
|
const METRICS_STATUS_FAILED = 'failed on-chain';
|
|
|
|
|
2021-07-08 20:48:23 +02:00
|
|
|
/**
|
2022-07-27 15:28:05 +02:00
|
|
|
* @typedef {object} CustomGasSettings
|
2021-07-08 20:48:23 +02:00
|
|
|
* @property {string} [gas] - The gas limit to use for the transaction
|
|
|
|
* @property {string} [gasPrice] - The gasPrice to use for a legacy transaction
|
|
|
|
* @property {string} [maxFeePerGas] - The maximum amount to pay per gas on a
|
|
|
|
* EIP-1559 transaction
|
|
|
|
* @property {string} [maxPriorityFeePerGas] - The maximum amount of paid fee
|
|
|
|
* to be distributed to miner in an EIP-1559 transaction
|
|
|
|
*/
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Transaction Controller is an aggregate of sub-controllers and trackers
|
|
|
|
* composing them in a way to be exposed to the metamask controller
|
|
|
|
*
|
|
|
|
* - `txStateManager
|
|
|
|
* responsible for the state of a transaction and
|
|
|
|
* storing the transaction
|
|
|
|
* - pendingTxTracker
|
|
|
|
* watching blocks for transactions to be include
|
|
|
|
* and emitting confirmed events
|
|
|
|
* - txGasUtil
|
|
|
|
* gas calculations and safety buffering
|
|
|
|
* - nonceTracker
|
|
|
|
* calculating nonces
|
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} opts
|
|
|
|
* @param {object} opts.initState - initial transaction list default is an empty array
|
|
|
|
* @param {object} opts.networkStore - an observable store for network number
|
|
|
|
* @param {object} opts.blockTracker - An instance of eth-blocktracker
|
|
|
|
* @param {object} opts.provider - A network provider.
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param {Function} opts.signTransaction - function the signs an @ethereumjs/tx
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} opts.getPermittedAccounts - get accounts that an origin has permissions for
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param {Function} opts.signTransaction - ethTx signer that returns a rawTx
|
|
|
|
* @param {number} [opts.txHistoryLimit] - number *optional* for limiting how many transactions are in state
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} opts.preferencesStore
|
2022-01-07 16:57:33 +01:00
|
|
|
*/
|
2016-12-14 21:55:41 +01:00
|
|
|
|
2020-04-27 16:45:00 +02:00
|
|
|
export default class TransactionController extends EventEmitter {
|
2020-11-03 00:41:28 +01:00
|
|
|
constructor(opts) {
|
2021-02-04 19:15:23 +01:00
|
|
|
super();
|
|
|
|
this.networkStore = opts.networkStore || new ObservableStore({});
|
|
|
|
this._getCurrentChainId = opts.getCurrentChainId;
|
2021-06-16 22:40:17 +02:00
|
|
|
this.getProviderConfig = opts.getProviderConfig;
|
2021-07-28 01:13:48 +02:00
|
|
|
this._getCurrentNetworkEIP1559Compatibility =
|
|
|
|
opts.getCurrentNetworkEIP1559Compatibility;
|
|
|
|
this._getCurrentAccountEIP1559Compatibility =
|
|
|
|
opts.getCurrentAccountEIP1559Compatibility;
|
2021-02-04 19:15:23 +01:00
|
|
|
this.preferencesStore = opts.preferencesStore || new ObservableStore({});
|
|
|
|
this.provider = opts.provider;
|
|
|
|
this.getPermittedAccounts = opts.getPermittedAccounts;
|
|
|
|
this.blockTracker = opts.blockTracker;
|
|
|
|
this.signEthTx = opts.signTransaction;
|
|
|
|
this.inProcessOfSigning = new Set();
|
|
|
|
this._trackMetaMetricsEvent = opts.trackMetaMetricsEvent;
|
|
|
|
this._getParticipateInMetrics = opts.getParticipateInMetrics;
|
2021-07-31 02:45:18 +02:00
|
|
|
this._getEIP1559GasFeeEstimates = opts.getEIP1559GasFeeEstimates;
|
2022-01-20 17:26:39 +01:00
|
|
|
this.createEventFragment = opts.createEventFragment;
|
|
|
|
this.updateEventFragment = opts.updateEventFragment;
|
|
|
|
this.finalizeEventFragment = opts.finalizeEventFragment;
|
|
|
|
this.getEventFragmentById = opts.getEventFragmentById;
|
2022-02-23 16:15:41 +01:00
|
|
|
this.getDeviceModel = opts.getDeviceModel;
|
|
|
|
this.getAccountType = opts.getAccountType;
|
2022-03-16 23:15:03 +01:00
|
|
|
this.getTokenStandardAndDetails = opts.getTokenStandardAndDetails;
|
2021-02-04 19:15:23 +01:00
|
|
|
|
|
|
|
this.memStore = new ObservableStore({});
|
|
|
|
this.query = new EthQuery(this.provider);
|
|
|
|
|
|
|
|
this.txGasUtil = new TxGasUtil(this.provider);
|
|
|
|
this._mapMethods();
|
2018-03-14 15:15:04 +01:00
|
|
|
this.txStateManager = new TransactionStateManager({
|
2017-09-12 18:59:59 +02:00
|
|
|
initState: opts.initState,
|
2017-08-11 23:19:35 +02:00
|
|
|
txHistoryLimit: opts.txHistoryLimit,
|
|
|
|
getNetwork: this.getNetwork.bind(this),
|
2021-03-01 16:15:42 +01:00
|
|
|
getCurrentChainId: opts.getCurrentChainId,
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
|
|
|
this._onBootCleanUp();
|
2018-01-18 01:49:38 +01:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
this.store = this.txStateManager.store;
|
2017-06-15 08:44:02 +02:00
|
|
|
this.nonceTracker = new NonceTracker({
|
|
|
|
provider: this.provider,
|
2018-05-17 05:46:34 +02:00
|
|
|
blockTracker: this.blockTracker,
|
2022-02-18 17:48:38 +01:00
|
|
|
getPendingTransactions: (...args) => {
|
|
|
|
const pendingTransactions = this.txStateManager.getPendingTransactions(
|
|
|
|
...args,
|
|
|
|
);
|
|
|
|
const externalPendingTransactions = opts.getExternalPendingTransactions(
|
|
|
|
...args,
|
|
|
|
);
|
|
|
|
return [...pendingTransactions, ...externalPendingTransactions];
|
|
|
|
},
|
2022-07-31 20:26:40 +02:00
|
|
|
getConfirmedTransactions:
|
|
|
|
this.txStateManager.getConfirmedTransactions.bind(this.txStateManager),
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2017-08-04 20:41:35 +02:00
|
|
|
|
2017-08-09 00:30:49 +02:00
|
|
|
this.pendingTxTracker = new PendingTransactionTracker({
|
2017-08-04 20:41:35 +02:00
|
|
|
provider: this.provider,
|
|
|
|
nonceTracker: this.nonceTracker,
|
2017-09-12 21:19:26 +02:00
|
|
|
publishTransaction: (rawTx) => this.query.sendRawTransaction(rawTx),
|
2018-11-14 22:34:07 +01:00
|
|
|
getPendingTransactions: () => {
|
2021-02-04 19:15:23 +01:00
|
|
|
const pending = this.txStateManager.getPendingTransactions();
|
|
|
|
const approved = this.txStateManager.getApprovedTransactions();
|
|
|
|
return [...pending, ...approved];
|
2018-11-14 22:34:07 +01:00
|
|
|
},
|
|
|
|
approveTransaction: this.approveTransaction.bind(this),
|
2022-07-31 20:26:40 +02:00
|
|
|
getCompletedTransactions:
|
|
|
|
this.txStateManager.getConfirmedTransactions.bind(this.txStateManager),
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2017-08-04 20:41:35 +02:00
|
|
|
|
2021-02-09 00:22:30 +01:00
|
|
|
this.txStateManager.store.subscribe(() =>
|
|
|
|
this.emit(METAMASK_CONTROLLER_EVENTS.UPDATE_BADGE),
|
|
|
|
);
|
2021-02-04 19:15:23 +01:00
|
|
|
this._setupListeners();
|
2017-02-03 06:09:17 +01:00
|
|
|
// memstore is computed from a few different stores
|
2021-02-04 19:15:23 +01:00
|
|
|
this._updateMemstore();
|
|
|
|
this.txStateManager.store.subscribe(() => this._updateMemstore());
|
Fixed Vivek's bug (#5860)
* Fixed Vivek's bug
Fixes #5850
What was happening:
It seems that his MetaMask had crashed while some new transactions had
been loading defaults. He probably had a network connectivity issue to
Infura (which we are working with Infura to address).
As a result of this network cutout, his three unapproved transactions
were not marked failed, and were not marked as `loadingDefaults =
false`, as their gas prices had not yet been estimated.
Normally this behavior is supposed to clean itself up when the
transaction controller starts up, via the
`TransactionController._onBootCleanUp()` function, but in this case,
during unlock, that function was unable to do its job because when it
requested the transaction list, the current network was in the `loading`
state, making it proceed as if there were no pending transactions.
To fix this, I am doing two things:
- Setting transactions to loadingDefaults = false in more catch blocks.
- Calling `onBootCleanUp()` when the network store's status changes, so
that it will re-trigger when loading completes.
* Fixed reference
* Fixed infinite loop bug
Was refreshing the tx list on every tx state change instead of just
network changes, creating an infinite loop.
* Add notes to tx updates to clarify logs
2018-11-30 01:08:03 +01:00
|
|
|
this.networkStore.subscribe(() => {
|
2021-02-04 19:15:23 +01:00
|
|
|
this._onBootCleanUp();
|
|
|
|
this._updateMemstore();
|
|
|
|
});
|
2018-05-29 09:53:44 +02:00
|
|
|
|
|
|
|
// request state update to finalize initialization
|
2021-02-04 19:15:23 +01:00
|
|
|
this._updatePendingTxsAfterFirstBlock();
|
2016-12-16 19:33:36 +01:00
|
|
|
}
|
2018-05-29 09:53:44 +02:00
|
|
|
|
2020-07-08 23:05:09 +02:00
|
|
|
/**
|
|
|
|
* Gets the current chainId in the network store as a number, returning 0 if
|
|
|
|
* the chainId parses to NaN.
|
|
|
|
*
|
|
|
|
* @returns {number} The numerical chainId.
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
getChainId() {
|
2021-02-04 19:15:23 +01:00
|
|
|
const networkState = this.networkStore.getState();
|
|
|
|
const chainId = this._getCurrentChainId();
|
|
|
|
const integerChainId = parseInt(chainId, 16);
|
2020-10-06 22:18:24 +02:00
|
|
|
if (networkState === 'loading' || Number.isNaN(integerChainId)) {
|
2021-02-04 19:15:23 +01:00
|
|
|
return 0;
|
2017-09-06 06:50:36 +02:00
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
return integerChainId;
|
2017-07-26 20:56:52 +02:00
|
|
|
}
|
|
|
|
|
2021-07-28 01:13:48 +02:00
|
|
|
async getEIP1559Compatibility(fromAddress) {
|
2022-07-31 20:26:40 +02:00
|
|
|
const currentNetworkIsCompatible =
|
|
|
|
await this._getCurrentNetworkEIP1559Compatibility();
|
|
|
|
const fromAccountIsCompatible =
|
|
|
|
await this._getCurrentAccountEIP1559Compatibility(fromAddress);
|
2021-07-28 01:13:48 +02:00
|
|
|
return currentNetworkIsCompatible && fromAccountIsCompatible;
|
|
|
|
}
|
|
|
|
|
2021-06-16 22:40:17 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* `@ethereumjs/tx` uses `@ethereumjs/common` as a configuration tool for
|
2021-06-16 22:40:17 +02:00
|
|
|
* specifying which chain, network, hardfork and EIPs to support for
|
|
|
|
* a transaction. By referencing this configuration, and analyzing the fields
|
2022-01-07 16:57:33 +01:00
|
|
|
* specified in txParams, `@ethereumjs/tx` is able to determine which EIP-2718
|
2021-06-16 22:40:17 +02:00
|
|
|
* transaction type to use.
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
|
|
|
* @param fromAddress
|
2021-06-16 22:40:17 +02:00
|
|
|
* @returns {Common} common configuration object
|
|
|
|
*/
|
2021-07-28 01:13:48 +02:00
|
|
|
async getCommonConfiguration(fromAddress) {
|
2021-06-16 22:40:17 +02:00
|
|
|
const { type, nickname: name } = this.getProviderConfig();
|
2021-07-28 01:13:48 +02:00
|
|
|
const supportsEIP1559 = await this.getEIP1559Compatibility(fromAddress);
|
2021-06-30 16:39:00 +02:00
|
|
|
|
|
|
|
// This logic below will have to be updated each time a hardfork happens
|
|
|
|
// that carries with it a new Transaction type. It is inconsequential for
|
|
|
|
// hardforks that do not include new types.
|
|
|
|
const hardfork = supportsEIP1559 ? HARDFORKS.LONDON : HARDFORKS.BERLIN;
|
2021-06-16 22:40:17 +02:00
|
|
|
|
|
|
|
// type will be one of our default network names or 'rpc'. the default
|
|
|
|
// network names are sufficient configuration, simply pass the name as the
|
|
|
|
// chain argument in the constructor.
|
2022-09-19 15:17:40 +02:00
|
|
|
if (type !== NETWORK_TYPES.RPC && type !== NETWORK_TYPES.SEPOLIA) {
|
2021-06-30 16:39:00 +02:00
|
|
|
return new Common({
|
|
|
|
chain: type,
|
|
|
|
hardfork,
|
|
|
|
});
|
2021-06-16 22:40:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// For 'rpc' we need to use the same basic configuration as mainnet,
|
|
|
|
// since we only support EVM compatible chains, and then override the
|
|
|
|
// name, chainId and networkId properties. This is done using the
|
|
|
|
// `forCustomChain` static method on the Common class.
|
|
|
|
const chainId = parseInt(this._getCurrentChainId(), 16);
|
|
|
|
const networkId = this.networkStore.getState();
|
|
|
|
|
|
|
|
const customChainParams = {
|
|
|
|
name,
|
|
|
|
chainId,
|
|
|
|
// It is improbable for a transaction to be signed while the network
|
|
|
|
// is loading for two reasons.
|
|
|
|
// 1. Pending, unconfirmed transactions are wiped on network change
|
|
|
|
// 2. The UI is unusable (loading indicator) when network is loading.
|
|
|
|
// setting the networkId to 0 is for type safety and to explicity lead
|
|
|
|
// the transaction to failing if a user is able to get to this branch
|
|
|
|
// on a custom network that requires valid network id. I have not ran
|
|
|
|
// into this limitation on any network I have attempted, even when
|
|
|
|
// hardcoding networkId to 'loading'.
|
|
|
|
networkId: networkId === 'loading' ? 0 : parseInt(networkId, 10),
|
|
|
|
};
|
|
|
|
|
2022-09-14 16:55:31 +02:00
|
|
|
return Common.forCustomChain(
|
|
|
|
NETWORK_TYPES.MAINNET,
|
|
|
|
customChainParams,
|
|
|
|
hardfork,
|
|
|
|
);
|
2021-06-16 22:40:17 +02:00
|
|
|
}
|
|
|
|
|
2019-07-31 22:17:11 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Adds a tx to the txlist
|
|
|
|
*
|
|
|
|
* @param txMeta
|
|
|
|
* @fires ${txMeta.id}:unapproved
|
|
|
|
*/
|
2021-03-30 16:54:05 +02:00
|
|
|
addTransaction(txMeta) {
|
|
|
|
this.txStateManager.addTransaction(txMeta);
|
2021-02-04 19:15:23 +01:00
|
|
|
this.emit(`${txMeta.id}:unapproved`, txMeta);
|
2022-09-16 19:04:14 +02:00
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.ADDED,
|
|
|
|
txMeta.actionId,
|
|
|
|
);
|
2016-12-14 21:55:41 +01:00
|
|
|
}
|
|
|
|
|
2018-04-23 18:43:18 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Wipes the transactions for a given account
|
|
|
|
*
|
|
|
|
* @param {string} address - hex string of the from address for txs being removed
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
wipeTransactions(address) {
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.wipeTransactions(address);
|
2018-04-12 21:24:16 +02:00
|
|
|
}
|
|
|
|
|
2018-04-23 18:43:18 +02:00
|
|
|
/**
|
2020-11-03 00:41:28 +01:00
|
|
|
* Add a new unapproved transaction to the pipeline
|
|
|
|
*
|
2020-11-10 18:30:41 +01:00
|
|
|
* @returns {Promise<string>} the hash of the transaction after being submitted to the network
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txParams - txParams for the transaction
|
|
|
|
* @param {object} opts - with the key origin to put the origin on the txMeta
|
2020-11-03 00:41:28 +01:00
|
|
|
*/
|
|
|
|
async newUnapprovedTransaction(txParams, opts = {}) {
|
|
|
|
log.debug(
|
|
|
|
`MetaMaskController newUnapprovedTransaction ${JSON.stringify(txParams)}`,
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
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
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
const initialTxMeta = await this.addUnapprovedTransaction(
|
|
|
|
txParams,
|
|
|
|
opts.origin,
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
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
|
|
|
|
2017-08-03 00:58:05 +02:00
|
|
|
// listen for tx completion (success, fail)
|
|
|
|
return new Promise((resolve, reject) => {
|
2020-11-03 00:41:28 +01:00
|
|
|
this.txStateManager.once(
|
|
|
|
`${initialTxMeta.id}:finished`,
|
|
|
|
(finishedTxMeta) => {
|
|
|
|
switch (finishedTxMeta.status) {
|
2020-11-07 08:38:12 +01:00
|
|
|
case TRANSACTION_STATUSES.SUBMITTED:
|
2021-02-04 19:15:23 +01:00
|
|
|
return resolve(finishedTxMeta.hash);
|
2020-11-07 08:38:12 +01:00
|
|
|
case TRANSACTION_STATUSES.REJECTED:
|
2020-11-03 00:41:28 +01:00
|
|
|
return reject(
|
|
|
|
cleanErrorStack(
|
|
|
|
ethErrors.provider.userRejectedRequest(
|
|
|
|
'MetaMask Tx Signature: User denied transaction signature.',
|
|
|
|
),
|
|
|
|
),
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2020-11-07 08:38:12 +01:00
|
|
|
case TRANSACTION_STATUSES.FAILED:
|
2020-11-03 00:41:28 +01:00
|
|
|
return reject(
|
|
|
|
cleanErrorStack(
|
|
|
|
ethErrors.rpc.internal(finishedTxMeta.err.message),
|
|
|
|
),
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2020-11-03 00:41:28 +01:00
|
|
|
default:
|
|
|
|
return reject(
|
|
|
|
cleanErrorStack(
|
|
|
|
ethErrors.rpc.internal(
|
|
|
|
`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(
|
|
|
|
finishedTxMeta.txParams,
|
|
|
|
)}`,
|
|
|
|
),
|
|
|
|
),
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2020-11-03 00:41:28 +01:00
|
|
|
}
|
|
|
|
},
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
|
|
|
});
|
2017-08-03 00:58:05 +02:00
|
|
|
}
|
|
|
|
|
2022-02-24 19:26:58 +01:00
|
|
|
// ====================================================================================================================================================
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param {number} txId
|
|
|
|
* @returns {TransactionMeta} the txMeta who matches the given id if none found
|
|
|
|
* for the network returns undefined
|
|
|
|
*/
|
|
|
|
_getTransaction(txId) {
|
|
|
|
const { transactions } = this.store.getState();
|
|
|
|
return transactions[txId];
|
|
|
|
}
|
|
|
|
|
2022-03-30 16:13:25 +02:00
|
|
|
/**
|
|
|
|
* @param {number} txId
|
|
|
|
* @returns {boolean}
|
|
|
|
*/
|
|
|
|
_isUnapprovedTransaction(txId) {
|
2022-02-24 19:26:58 +01:00
|
|
|
return (
|
|
|
|
this.txStateManager.getTransaction(txId).status ===
|
|
|
|
TRANSACTION_STATUSES.UNAPPROVED
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-03-30 16:13:25 +02:00
|
|
|
/**
|
|
|
|
* @param {number} txId
|
|
|
|
* @param {string} fnName
|
|
|
|
*/
|
|
|
|
_throwErrorIfNotUnapprovedTx(txId, fnName) {
|
|
|
|
if (!this._isUnapprovedTransaction(txId)) {
|
|
|
|
throw new Error(
|
|
|
|
`TransactionsController: Can only call ${fnName} on an unapproved transaction.
|
|
|
|
Current tx status: ${this.txStateManager.getTransaction(txId).status}`,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-24 19:26:58 +01:00
|
|
|
_updateTransaction(txId, proposedUpdate, note) {
|
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
|
|
|
const updated = merge(txMeta, proposedUpdate);
|
|
|
|
this.txStateManager.updateTransaction(updated, note);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2022-03-24 14:46:51 +01:00
|
|
|
* updates the params that are editible in the send edit flow
|
2022-02-24 19:26:58 +01:00
|
|
|
*
|
|
|
|
* @param {string} txId - transaction id
|
2022-03-25 18:11:04 +01:00
|
|
|
* @param {object} previousGasParams - holds the parameter to update
|
|
|
|
* @param {string} previousGasParams.maxFeePerGas
|
|
|
|
* @param {string} previousGasParams.maxPriorityFeePerGas
|
|
|
|
* @param {string} previousGasParams.gasLimit
|
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
|
|
|
*/
|
|
|
|
updatePreviousGasParams(
|
|
|
|
txId,
|
|
|
|
{ maxFeePerGas, maxPriorityFeePerGas, gasLimit },
|
|
|
|
) {
|
|
|
|
const previousGasParams = {
|
|
|
|
previousGas: {
|
|
|
|
maxFeePerGas,
|
|
|
|
maxPriorityFeePerGas,
|
|
|
|
gasLimit,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
// only update what is defined
|
|
|
|
previousGasParams.previousGas = pickBy(previousGasParams.previousGas);
|
|
|
|
const note = `Update Previous Gas for ${txId}`;
|
|
|
|
this._updateTransaction(txId, previousGasParams, note);
|
|
|
|
return this._getTransaction(txId);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
* @param {string} txId - transaction id
|
|
|
|
* @param {object} editableParams - holds the eip1559 fees parameters
|
2022-03-07 20:14:48 +01:00
|
|
|
* @param {object} editableParams.data
|
|
|
|
* @param {string} editableParams.from
|
|
|
|
* @param {string} editableParams.to
|
|
|
|
* @param {string} editableParams.value
|
2022-03-25 18:11:04 +01:00
|
|
|
* @param {string} editableParams.gas
|
|
|
|
* @param {string} editableParams.gasPrice
|
2022-03-24 14:46:51 +01:00
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
2022-02-24 19:26:58 +01:00
|
|
|
*/
|
2022-05-27 18:31:31 +02:00
|
|
|
async updateEditableParams(txId, { data, from, to, value, gas, gasPrice }) {
|
2022-03-30 16:13:25 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(txId, 'updateEditableParams');
|
2022-02-24 19:26:58 +01:00
|
|
|
|
|
|
|
const editableParams = {
|
|
|
|
txParams: {
|
|
|
|
data,
|
|
|
|
from,
|
|
|
|
to,
|
|
|
|
value,
|
2022-03-25 18:11:04 +01:00
|
|
|
gas,
|
|
|
|
gasPrice,
|
2022-02-24 19:26:58 +01:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
// only update what is defined
|
2022-07-21 01:03:23 +02:00
|
|
|
editableParams.txParams = pickBy(
|
|
|
|
editableParams.txParams,
|
|
|
|
(prop) => prop !== undefined,
|
|
|
|
);
|
2022-05-27 18:31:31 +02:00
|
|
|
|
|
|
|
// update transaction type in case it has changes
|
|
|
|
const transactionBeforeEdit = this._getTransaction(txId);
|
|
|
|
const { type } = await determineTransactionType(
|
|
|
|
{
|
|
|
|
...transactionBeforeEdit.txParams,
|
|
|
|
...editableParams.txParams,
|
|
|
|
},
|
|
|
|
this.query,
|
|
|
|
);
|
|
|
|
editableParams.type = type;
|
|
|
|
|
2022-02-24 19:26:58 +01:00
|
|
|
const note = `Update Editable Params for ${txId}`;
|
2022-05-27 18:31:31 +02:00
|
|
|
|
2022-02-24 19:26:58 +01:00
|
|
|
this._updateTransaction(txId, editableParams, note);
|
2022-03-24 14:46:51 +01:00
|
|
|
return this._getTransaction(txId);
|
2022-02-24 19:26:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* updates the gas fees of the transaction with id if the transaction state is unapproved
|
|
|
|
*
|
|
|
|
* @param {string} txId - transaction id
|
|
|
|
* @param {object} txGasFees - holds the gas fees parameters
|
2022-03-07 20:14:48 +01:00
|
|
|
* @param {string} txGasFees.gasLimit
|
|
|
|
* @param {string} txGasFees.gasPrice
|
|
|
|
* @param {string} txGasFees.maxPriorityFeePerGas
|
|
|
|
* @param {string} txGasFees.maxFeePerGas
|
|
|
|
* @param {string} txGasFees.estimateUsed
|
|
|
|
* @param {string} txGasFees.estimateSuggested
|
|
|
|
* @param {string} txGasFees.defaultGasEstimates
|
|
|
|
* @param {string} txGasFees.gas
|
|
|
|
* @param {string} txGasFees.originalGasEstimate
|
2022-03-25 18:11:04 +01:00
|
|
|
* @param {string} txGasFees.userEditedGasLimit
|
|
|
|
* @param {string} txGasFees.userFeeLevel
|
2022-03-24 14:46:51 +01:00
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
2022-02-24 19:26:58 +01:00
|
|
|
*/
|
|
|
|
updateTransactionGasFees(
|
|
|
|
txId,
|
|
|
|
{
|
|
|
|
gas,
|
|
|
|
gasLimit,
|
|
|
|
gasPrice,
|
|
|
|
maxPriorityFeePerGas,
|
|
|
|
maxFeePerGas,
|
|
|
|
estimateUsed,
|
|
|
|
estimateSuggested,
|
|
|
|
defaultGasEstimates,
|
|
|
|
originalGasEstimate,
|
2022-03-25 18:11:04 +01:00
|
|
|
userEditedGasLimit,
|
|
|
|
userFeeLevel,
|
2022-02-24 19:26:58 +01:00
|
|
|
},
|
|
|
|
) {
|
2022-03-30 16:13:25 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(txId, 'updateTransactionGasFees');
|
2022-02-24 19:26:58 +01:00
|
|
|
|
|
|
|
let txGasFees = {
|
|
|
|
txParams: {
|
|
|
|
gas,
|
|
|
|
gasLimit,
|
|
|
|
gasPrice,
|
|
|
|
maxPriorityFeePerGas,
|
|
|
|
maxFeePerGas,
|
|
|
|
},
|
|
|
|
estimateUsed,
|
|
|
|
estimateSuggested,
|
|
|
|
defaultGasEstimates,
|
|
|
|
originalGasEstimate,
|
2022-03-25 18:11:04 +01:00
|
|
|
userEditedGasLimit,
|
|
|
|
userFeeLevel,
|
2022-02-24 19:26:58 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
// only update what is defined
|
|
|
|
txGasFees.txParams = pickBy(txGasFees.txParams);
|
|
|
|
txGasFees = pickBy(txGasFees);
|
|
|
|
const note = `Update Transaction Gas Fees for ${txId}`;
|
|
|
|
this._updateTransaction(txId, txGasFees, note);
|
2022-03-24 14:46:51 +01:00
|
|
|
return this._getTransaction(txId);
|
2022-02-24 19:26:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* updates the estimate base fees of the transaction with id if the transaction state is unapproved
|
|
|
|
*
|
|
|
|
* @param {string} txId - transaction id
|
|
|
|
* @param {object} txEstimateBaseFees - holds the estimate base fees parameters
|
2022-03-07 20:14:48 +01:00
|
|
|
* @param {string} txEstimateBaseFees.estimatedBaseFee
|
|
|
|
* @param {string} txEstimateBaseFees.decEstimatedBaseFee
|
2022-03-24 14:46:51 +01:00
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
2022-02-24 19:26:58 +01:00
|
|
|
*/
|
|
|
|
updateTransactionEstimatedBaseFee(
|
|
|
|
txId,
|
|
|
|
{ estimatedBaseFee, decEstimatedBaseFee },
|
|
|
|
) {
|
2022-03-30 16:13:25 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(
|
|
|
|
txId,
|
|
|
|
'updateTransactionEstimatedBaseFee',
|
|
|
|
);
|
2022-02-24 19:26:58 +01:00
|
|
|
|
|
|
|
let txEstimateBaseFees = { estimatedBaseFee, decEstimatedBaseFee };
|
|
|
|
// only update what is defined
|
|
|
|
txEstimateBaseFees = pickBy(txEstimateBaseFees);
|
|
|
|
|
|
|
|
const note = `Update Transaction Estimated Base Fees for ${txId}`;
|
|
|
|
this._updateTransaction(txId, txEstimateBaseFees, note);
|
2022-03-24 14:46:51 +01:00
|
|
|
return this._getTransaction(txId);
|
2022-02-24 19:26:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* updates a swap approval transaction with provided metadata and source token symbol
|
|
|
|
* if the transaction state is unapproved.
|
|
|
|
*
|
|
|
|
* @param {string} txId
|
|
|
|
* @param {object} swapApprovalTransaction - holds the metadata and token symbol
|
2022-03-07 20:14:48 +01:00
|
|
|
* @param {string} swapApprovalTransaction.type
|
|
|
|
* @param {string} swapApprovalTransaction.sourceTokenSymbol
|
2022-03-24 14:46:51 +01:00
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
2022-02-24 19:26:58 +01:00
|
|
|
*/
|
|
|
|
updateSwapApprovalTransaction(txId, { type, sourceTokenSymbol }) {
|
2022-03-30 16:13:25 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(txId, 'updateSwapApprovalTransaction');
|
2022-02-24 19:26:58 +01:00
|
|
|
|
|
|
|
let swapApprovalTransaction = { type, sourceTokenSymbol };
|
|
|
|
// only update what is defined
|
|
|
|
swapApprovalTransaction = pickBy(swapApprovalTransaction);
|
|
|
|
|
|
|
|
const note = `Update Swap Approval Transaction for ${txId}`;
|
|
|
|
this._updateTransaction(txId, swapApprovalTransaction, note);
|
2022-03-24 14:46:51 +01:00
|
|
|
return this._getTransaction(txId);
|
2022-02-24 19:26:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* updates a swap transaction with provided metadata and source token symbol
|
|
|
|
* if the transaction state is unapproved.
|
|
|
|
*
|
|
|
|
* @param {string} txId
|
|
|
|
* @param {object} swapTransaction - holds the metadata
|
2022-03-07 20:14:48 +01:00
|
|
|
* @param {string} swapTransaction.sourceTokenSymbol
|
|
|
|
* @param {string} swapTransaction.destinationTokenSymbol
|
|
|
|
* @param {string} swapTransaction.type
|
|
|
|
* @param {string} swapTransaction.destinationTokenDecimals
|
|
|
|
* @param {string} swapTransaction.destinationTokenAddress
|
|
|
|
* @param {string} swapTransaction.swapMetaData
|
|
|
|
* @param {string} swapTransaction.swapTokenValue
|
|
|
|
* @param {string} swapTransaction.estimatedBaseFee
|
|
|
|
* @param {string} swapTransaction.approvalTxId
|
2022-03-24 14:46:51 +01:00
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
2022-02-24 19:26:58 +01:00
|
|
|
*/
|
|
|
|
updateSwapTransaction(
|
|
|
|
txId,
|
|
|
|
{
|
|
|
|
sourceTokenSymbol,
|
|
|
|
destinationTokenSymbol,
|
|
|
|
type,
|
|
|
|
destinationTokenDecimals,
|
|
|
|
destinationTokenAddress,
|
|
|
|
swapMetaData,
|
|
|
|
swapTokenValue,
|
|
|
|
estimatedBaseFee,
|
|
|
|
approvalTxId,
|
|
|
|
},
|
|
|
|
) {
|
2022-03-30 16:13:25 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(txId, 'updateSwapTransaction');
|
2022-03-25 18:11:04 +01:00
|
|
|
|
2022-02-24 19:26:58 +01:00
|
|
|
let swapTransaction = {
|
|
|
|
sourceTokenSymbol,
|
|
|
|
destinationTokenSymbol,
|
|
|
|
type,
|
|
|
|
destinationTokenDecimals,
|
|
|
|
destinationTokenAddress,
|
|
|
|
swapMetaData,
|
|
|
|
swapTokenValue,
|
|
|
|
estimatedBaseFee,
|
|
|
|
approvalTxId,
|
|
|
|
};
|
|
|
|
|
|
|
|
// only update what is defined
|
|
|
|
swapTransaction = pickBy(swapTransaction);
|
|
|
|
|
|
|
|
const note = `Update Swap Transaction for ${txId}`;
|
|
|
|
this._updateTransaction(txId, swapTransaction, note);
|
2022-03-24 14:46:51 +01:00
|
|
|
return this._getTransaction(txId);
|
2022-02-24 19:26:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* updates a transaction's user settings only if the transaction state is unapproved
|
|
|
|
*
|
|
|
|
* @param {string} txId
|
|
|
|
* @param {object} userSettings - holds the metadata
|
2022-03-07 20:14:48 +01:00
|
|
|
* @param {string} userSettings.userEditedGasLimit
|
|
|
|
* @param {string} userSettings.userFeeLevel
|
2022-03-24 14:46:51 +01:00
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
2022-02-24 19:26:58 +01:00
|
|
|
*/
|
|
|
|
updateTransactionUserSettings(txId, { userEditedGasLimit, userFeeLevel }) {
|
2022-03-30 16:13:25 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(txId, 'updateTransactionUserSettings');
|
2022-02-24 19:26:58 +01:00
|
|
|
|
|
|
|
let userSettings = { userEditedGasLimit, userFeeLevel };
|
|
|
|
// only update what is defined
|
|
|
|
userSettings = pickBy(userSettings);
|
|
|
|
|
|
|
|
const note = `Update User Settings for ${txId}`;
|
|
|
|
this._updateTransaction(txId, userSettings, note);
|
2022-03-24 14:46:51 +01:00
|
|
|
return this._getTransaction(txId);
|
2022-02-24 19:26:58 +01:00
|
|
|
}
|
|
|
|
|
2022-05-04 18:54:46 +02:00
|
|
|
/**
|
|
|
|
* append new sendFlowHistory to the transaction with id if the transaction
|
|
|
|
* state is unapproved. Returns the updated transaction.
|
|
|
|
*
|
|
|
|
* @param {string} txId - transaction id
|
2022-09-06 11:09:12 +02:00
|
|
|
* @param {number} currentSendFlowHistoryLength - sendFlowHistory entries currently
|
2022-05-04 18:54:46 +02:00
|
|
|
* @param {Array<{ entry: string, timestamp: number }>} sendFlowHistory -
|
|
|
|
* history to add to the sendFlowHistory property of txMeta.
|
|
|
|
* @returns {TransactionMeta} the txMeta of the updated transaction
|
|
|
|
*/
|
2022-09-06 11:09:12 +02:00
|
|
|
updateTransactionSendFlowHistory(
|
|
|
|
txId,
|
|
|
|
currentSendFlowHistoryLength,
|
|
|
|
sendFlowHistory,
|
|
|
|
) {
|
2022-05-04 18:54:46 +02:00
|
|
|
this._throwErrorIfNotUnapprovedTx(txId, 'updateTransactionSendFlowHistory');
|
|
|
|
const txMeta = this._getTransaction(txId);
|
|
|
|
|
2022-09-06 11:09:12 +02:00
|
|
|
if (
|
|
|
|
currentSendFlowHistoryLength === (txMeta?.sendFlowHistory?.length || 0)
|
|
|
|
) {
|
|
|
|
// only update what is defined
|
|
|
|
const note = `Update sendFlowHistory for ${txId}`;
|
|
|
|
|
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
{
|
|
|
|
...txMeta,
|
|
|
|
sendFlowHistory: [
|
|
|
|
...(txMeta?.sendFlowHistory ?? []),
|
|
|
|
...sendFlowHistory,
|
|
|
|
],
|
|
|
|
},
|
|
|
|
note,
|
|
|
|
);
|
|
|
|
}
|
2022-05-04 18:54:46 +02:00
|
|
|
return this._getTransaction(txId);
|
|
|
|
}
|
|
|
|
|
2022-09-06 11:08:32 +02:00
|
|
|
async addTransactionGasDefaults(txMeta) {
|
|
|
|
const contractCode = await determineTransactionContractCode(
|
|
|
|
txMeta.txParams,
|
|
|
|
this.query,
|
|
|
|
);
|
|
|
|
|
|
|
|
let updateTxMeta = txMeta;
|
|
|
|
try {
|
|
|
|
updateTxMeta = await this.addTxGasDefaults(txMeta, contractCode);
|
|
|
|
} catch (error) {
|
|
|
|
log.warn(error);
|
|
|
|
updateTxMeta = this.txStateManager.getTransaction(txMeta.id);
|
|
|
|
updateTxMeta.loadingDefaults = false;
|
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
txMeta,
|
|
|
|
'Failed to calculate gas defaults.',
|
|
|
|
);
|
|
|
|
throw error;
|
|
|
|
}
|
|
|
|
|
|
|
|
updateTxMeta.loadingDefaults = false;
|
|
|
|
|
|
|
|
// The history note used here 'Added new unapproved transaction.' is confusing update call only updated the gas defaults.
|
|
|
|
// We need to improve `this.addTransaction` to accept history note and change note here.
|
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
updateTxMeta,
|
|
|
|
'Added new unapproved transaction.',
|
|
|
|
);
|
|
|
|
|
|
|
|
return updateTxMeta;
|
|
|
|
}
|
|
|
|
|
2022-02-24 19:26:58 +01:00
|
|
|
// ====================================================================================================================================================
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
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
|
|
|
* Validates and generates a txMeta with defaults and puts it in txStateManager
|
|
|
|
* store.
|
|
|
|
*
|
2022-09-06 11:08:32 +02:00
|
|
|
* actionId is used to uniquely identify a request to create a transaction.
|
|
|
|
* Only 1 transaction will be created for multiple requests with same actionId.
|
|
|
|
* actionId is fix used for making this action idempotent to deal with scenario when
|
|
|
|
* action is invoked multiple times with same parameters in MV3 due to service worker re-activation.
|
|
|
|
*
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param txParams
|
|
|
|
* @param origin
|
2022-02-14 20:07:46 +01:00
|
|
|
* @param transactionType
|
2022-05-04 18:54:46 +02:00
|
|
|
* @param sendFlowHistory
|
2022-09-06 11:08:32 +02:00
|
|
|
* @param actionId
|
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
|
|
|
* @returns {txMeta}
|
|
|
|
*/
|
2022-05-04 18:54:46 +02:00
|
|
|
async addUnapprovedTransaction(
|
|
|
|
txParams,
|
|
|
|
origin,
|
|
|
|
transactionType,
|
|
|
|
sendFlowHistory = [],
|
2022-09-06 11:08:32 +02:00
|
|
|
actionId,
|
2022-05-04 18:54:46 +02:00
|
|
|
) {
|
2022-02-14 20:07:46 +01:00
|
|
|
if (
|
|
|
|
transactionType !== undefined &&
|
2022-04-26 19:07:39 +02:00
|
|
|
!VALID_UNAPPROVED_TRANSACTION_TYPES.includes(transactionType)
|
2022-02-14 20:07:46 +01:00
|
|
|
) {
|
|
|
|
throw new Error(
|
|
|
|
`TransactionController - invalid transactionType value: ${transactionType}`,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-09-13 14:43:38 +02:00
|
|
|
// If a transaction is found with the same actionId, do not create a new speed-up transaction.
|
2022-09-06 11:08:32 +02:00
|
|
|
if (actionId) {
|
|
|
|
let existingTxMeta =
|
|
|
|
this.txStateManager.getTransactionWithActionId(actionId);
|
|
|
|
if (existingTxMeta) {
|
|
|
|
this.emit('newUnapprovedTx', existingTxMeta);
|
|
|
|
existingTxMeta = await this.addTransactionGasDefaults(existingTxMeta);
|
|
|
|
return existingTxMeta;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-26 20:56:52 +02:00
|
|
|
// validate
|
2021-02-04 19:15:23 +01:00
|
|
|
const normalizedTxParams = txUtils.normalizeTxParams(txParams);
|
2021-08-02 17:38:01 +02:00
|
|
|
const eip1559Compatibility = await this.getEIP1559Compatibility();
|
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
|
|
|
|
2021-08-02 17:38:01 +02:00
|
|
|
txUtils.validateTxParams(normalizedTxParams, eip1559Compatibility);
|
2020-08-19 18:27:05 +02:00
|
|
|
|
2019-11-27 13:58:03 +01:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* `generateTxMeta` adds the default txMeta properties to the passed object.
|
|
|
|
* These include the tx's `id`. As we use the id for determining order of
|
|
|
|
* txes in the tx-state-manager, it is necessary to call the asynchronous
|
2022-03-07 19:54:36 +01:00
|
|
|
* method `determineTransactionType` after `generateTxMeta`.
|
2022-01-07 16:57:33 +01:00
|
|
|
*/
|
2018-09-09 19:07:23 +02:00
|
|
|
let txMeta = this.txStateManager.generateTxMeta({
|
|
|
|
txParams: normalizedTxParams,
|
2021-06-29 22:08:16 +02:00
|
|
|
origin,
|
2022-05-04 18:54:46 +02:00
|
|
|
sendFlowHistory,
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
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
|
|
|
|
2022-09-06 11:08:32 +02:00
|
|
|
// Add actionId to txMeta to check if same actionId is seen again
|
|
|
|
// IF request to create transaction with same actionId is submitted again, new transaction will not be added for it.
|
|
|
|
if (actionId) {
|
|
|
|
txMeta.actionId = actionId;
|
|
|
|
}
|
|
|
|
|
2022-04-26 19:07:39 +02:00
|
|
|
if (origin === ORIGIN_METAMASK) {
|
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
|
|
|
// Assert the from address is the selected address
|
|
|
|
if (normalizedTxParams.from !== this.getSelectedAddress()) {
|
|
|
|
throw ethErrors.rpc.internal({
|
|
|
|
message: `Internally initiated transaction is using invalid account.`,
|
|
|
|
data: {
|
|
|
|
origin,
|
|
|
|
fromAddress: normalizedTxParams.from,
|
|
|
|
selectedAddress: this.getSelectedAddress(),
|
|
|
|
},
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
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
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Assert that the origin has permissions to initiate transactions from
|
|
|
|
// the specified address
|
2021-02-04 19:15:23 +01:00
|
|
|
const permittedAddresses = await this.getPermittedAccounts(origin);
|
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
|
|
|
if (!permittedAddresses.includes(normalizedTxParams.from)) {
|
2021-02-04 19:15:23 +01:00
|
|
|
throw ethErrors.provider.unauthorized({ data: { origin } });
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-09-06 11:08:32 +02:00
|
|
|
const { type } = await determineTransactionType(txParams, this.query);
|
2022-02-14 20:07:46 +01:00
|
|
|
txMeta.type = transactionType || type;
|
2020-05-01 02:50:44 +02:00
|
|
|
|
|
|
|
// ensure value
|
|
|
|
txMeta.txParams.value = txMeta.txParams.value
|
2020-11-06 22:18:00 +01:00
|
|
|
? addHexPrefix(txMeta.txParams.value)
|
2021-02-04 19:15:23 +01:00
|
|
|
: '0x0';
|
2020-05-01 02:50:44 +02:00
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
this.addTransaction(txMeta);
|
2021-02-04 19:15:23 +01:00
|
|
|
this.emit('newUnapprovedTx', txMeta);
|
2018-05-30 15:53:18 +02:00
|
|
|
|
2022-09-06 11:08:32 +02:00
|
|
|
txMeta = await this.addTransactionGasDefaults(txMeta);
|
2018-01-18 00:42:01 +01:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
return txMeta;
|
2016-12-16 19:33:36 +01:00
|
|
|
}
|
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
|
|
|
|
2019-07-31 22:17:11 +02:00
|
|
|
/**
|
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
|
|
|
* Adds the tx gas defaults: gas && gasPrice
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txMeta - the txMeta object
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param getCodeResponse
|
2020-11-10 18:30:41 +01:00
|
|
|
* @returns {Promise<object>} resolves with txMeta
|
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
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
async addTxGasDefaults(txMeta, getCodeResponse) {
|
2021-10-06 20:29:57 +02:00
|
|
|
const eip1559Compatibility =
|
|
|
|
txMeta.txParams.type !== TRANSACTION_ENVELOPE_TYPES.LEGACY &&
|
|
|
|
(await this.getEIP1559Compatibility());
|
2021-07-31 02:45:18 +02:00
|
|
|
const {
|
|
|
|
gasPrice: defaultGasPrice,
|
|
|
|
maxFeePerGas: defaultMaxFeePerGas,
|
|
|
|
maxPriorityFeePerGas: defaultMaxPriorityFeePerGas,
|
|
|
|
} = await this._getDefaultGasFees(txMeta, eip1559Compatibility);
|
2022-07-31 20:26:40 +02:00
|
|
|
const { gasLimit: defaultGasLimit, simulationFails } =
|
|
|
|
await this._getDefaultGasLimit(txMeta, getCodeResponse);
|
2020-05-01 00:50:12 +02:00
|
|
|
|
2020-08-15 13:58:11 +02:00
|
|
|
// eslint-disable-next-line no-param-reassign
|
2021-03-30 16:54:05 +02:00
|
|
|
txMeta = this.txStateManager.getTransaction(txMeta.id);
|
2020-05-01 17:25:45 +02:00
|
|
|
if (simulationFails) {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.simulationFails = simulationFails;
|
2018-01-08 22:19:18 +01:00
|
|
|
}
|
2021-07-31 02:45:18 +02:00
|
|
|
|
|
|
|
if (eip1559Compatibility) {
|
2022-01-11 20:17:56 +01:00
|
|
|
const { eip1559V2Enabled } = this.preferencesStore.getState();
|
2022-01-31 06:51:43 +01:00
|
|
|
const advancedGasFeeDefaultValues = this.getAdvancedGasFee();
|
2022-02-14 20:07:46 +01:00
|
|
|
if (
|
|
|
|
eip1559V2Enabled &&
|
|
|
|
Boolean(advancedGasFeeDefaultValues) &&
|
|
|
|
!SWAP_TRANSACTION_TYPES.includes(txMeta.type)
|
|
|
|
) {
|
2022-01-10 20:34:54 +01:00
|
|
|
txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
|
|
|
|
txMeta.txParams.maxFeePerGas = decGWEIToHexWEI(
|
|
|
|
advancedGasFeeDefaultValues.maxBaseFee,
|
|
|
|
);
|
|
|
|
txMeta.txParams.maxPriorityFeePerGas = decGWEIToHexWEI(
|
|
|
|
advancedGasFeeDefaultValues.priorityFee,
|
|
|
|
);
|
|
|
|
} else if (
|
2021-07-31 02:45:18 +02:00
|
|
|
txMeta.txParams.gasPrice &&
|
|
|
|
!txMeta.txParams.maxFeePerGas &&
|
|
|
|
!txMeta.txParams.maxPriorityFeePerGas
|
|
|
|
) {
|
2022-01-10 20:34:54 +01:00
|
|
|
// If the dapp has suggested a gas price, but no maxFeePerGas or maxPriorityFeePerGas
|
|
|
|
// then we set maxFeePerGas and maxPriorityFeePerGas to the suggested gasPrice.
|
2021-07-31 02:45:18 +02:00
|
|
|
txMeta.txParams.maxFeePerGas = txMeta.txParams.gasPrice;
|
|
|
|
txMeta.txParams.maxPriorityFeePerGas = txMeta.txParams.gasPrice;
|
2022-04-26 19:07:39 +02:00
|
|
|
if (eip1559V2Enabled && txMeta.origin !== ORIGIN_METAMASK) {
|
2021-11-29 18:40:48 +01:00
|
|
|
txMeta.userFeeLevel = PRIORITY_LEVELS.DAPP_SUGGESTED;
|
|
|
|
} else {
|
|
|
|
txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
|
|
|
|
}
|
2021-07-31 02:45:18 +02:00
|
|
|
} else {
|
2021-08-06 21:31:30 +02:00
|
|
|
if (
|
|
|
|
(defaultMaxFeePerGas &&
|
|
|
|
defaultMaxPriorityFeePerGas &&
|
|
|
|
!txMeta.txParams.maxFeePerGas &&
|
|
|
|
!txMeta.txParams.maxPriorityFeePerGas) ||
|
2022-04-26 19:07:39 +02:00
|
|
|
txMeta.origin === ORIGIN_METAMASK
|
2021-08-06 21:31:30 +02:00
|
|
|
) {
|
2021-11-06 01:59:23 +01:00
|
|
|
txMeta.userFeeLevel = GAS_RECOMMENDATIONS.MEDIUM;
|
2022-01-11 20:17:56 +01:00
|
|
|
} else if (eip1559V2Enabled) {
|
2021-11-29 18:40:48 +01:00
|
|
|
txMeta.userFeeLevel = PRIORITY_LEVELS.DAPP_SUGGESTED;
|
2021-08-06 21:31:30 +02:00
|
|
|
} else {
|
2021-11-06 01:59:23 +01:00
|
|
|
txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
|
2021-08-06 21:31:30 +02:00
|
|
|
}
|
|
|
|
|
2021-07-31 02:45:18 +02:00
|
|
|
if (defaultMaxFeePerGas && !txMeta.txParams.maxFeePerGas) {
|
|
|
|
// If the dapp has not set the gasPrice or the maxFeePerGas, then we set maxFeePerGas
|
|
|
|
// with the one returned by the gasFeeController, if that is available.
|
|
|
|
txMeta.txParams.maxFeePerGas = defaultMaxFeePerGas;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (
|
|
|
|
defaultMaxPriorityFeePerGas &&
|
|
|
|
!txMeta.txParams.maxPriorityFeePerGas
|
|
|
|
) {
|
|
|
|
// If the dapp has not set the gasPrice or the maxPriorityFeePerGas, then we set maxPriorityFeePerGas
|
|
|
|
// with the one returned by the gasFeeController, if that is available.
|
|
|
|
txMeta.txParams.maxPriorityFeePerGas = defaultMaxPriorityFeePerGas;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (defaultGasPrice && !txMeta.txParams.maxFeePerGas) {
|
|
|
|
// If the dapp has not set the gasPrice or the maxFeePerGas, and no maxFeePerGas is available
|
|
|
|
// from the gasFeeController, then we set maxFeePerGas to the defaultGasPrice, assuming it is
|
|
|
|
// available.
|
|
|
|
txMeta.txParams.maxFeePerGas = defaultGasPrice;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (
|
|
|
|
txMeta.txParams.maxFeePerGas &&
|
|
|
|
!txMeta.txParams.maxPriorityFeePerGas
|
|
|
|
) {
|
|
|
|
// If the dapp has not set the gasPrice or the maxPriorityFeePerGas, and no maxPriorityFeePerGas is
|
|
|
|
// available from the gasFeeController, then we set maxPriorityFeePerGas to
|
|
|
|
// txMeta.txParams.maxFeePerGas, which will either be the gasPrice from the controller, the maxFeePerGas
|
|
|
|
// set by the dapp, or the maxFeePerGas from the controller.
|
|
|
|
txMeta.txParams.maxPriorityFeePerGas = txMeta.txParams.maxFeePerGas;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We remove the gasPrice param entirely when on an eip1559 compatible network
|
|
|
|
|
|
|
|
delete txMeta.txParams.gasPrice;
|
|
|
|
} else {
|
|
|
|
// We ensure that maxFeePerGas and maxPriorityFeePerGas are not in the transaction params
|
|
|
|
// when not on a EIP1559 compatible network
|
|
|
|
|
|
|
|
delete txMeta.txParams.maxPriorityFeePerGas;
|
|
|
|
delete txMeta.txParams.maxFeePerGas;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we have gotten to this point, and none of gasPrice, maxPriorityFeePerGas or maxFeePerGas are
|
|
|
|
// set on txParams, it means that either we are on a non-EIP1559 network and the dapp didn't suggest
|
|
|
|
// a gas price, or we are on an EIP1559 network, and none of gasPrice, maxPriorityFeePerGas or maxFeePerGas
|
|
|
|
// were available from either the dapp or the network.
|
2021-06-28 17:22:59 +02:00
|
|
|
if (
|
|
|
|
defaultGasPrice &&
|
|
|
|
!txMeta.txParams.gasPrice &&
|
|
|
|
!txMeta.txParams.maxPriorityFeePerGas &&
|
|
|
|
!txMeta.txParams.maxFeePerGas
|
|
|
|
) {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.txParams.gasPrice = defaultGasPrice;
|
2020-05-01 17:25:45 +02:00
|
|
|
}
|
2021-07-31 02:45:18 +02:00
|
|
|
|
2020-05-01 17:25:45 +02:00
|
|
|
if (defaultGasLimit && !txMeta.txParams.gas) {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.txParams.gas = defaultGasLimit;
|
2022-01-21 16:58:59 +01:00
|
|
|
txMeta.originalGasEstimate = defaultGasLimit;
|
2020-05-01 17:25:45 +02:00
|
|
|
}
|
2022-01-31 18:27:46 +01:00
|
|
|
txMeta.defaultGasEstimates = {
|
|
|
|
estimateType: txMeta.userFeeLevel,
|
|
|
|
gas: txMeta.txParams.gas,
|
|
|
|
gasPrice: txMeta.txParams.gasPrice,
|
|
|
|
maxFeePerGas: txMeta.txParams.maxFeePerGas,
|
|
|
|
maxPriorityFeePerGas: txMeta.txParams.maxPriorityFeePerGas,
|
|
|
|
};
|
2021-02-04 19:15:23 +01:00
|
|
|
return txMeta;
|
2020-05-01 17:25:45 +02:00
|
|
|
}
|
2020-05-01 00:50:12 +02:00
|
|
|
|
2020-05-01 17:25:45 +02:00
|
|
|
/**
|
2021-07-31 02:45:18 +02:00
|
|
|
* Gets default gas fees, or returns `undefined` if gas fees are already set
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txMeta - The txMeta object
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param eip1559Compatibility
|
2020-08-12 21:06:57 +02:00
|
|
|
* @returns {Promise<string|undefined>} The default gas price
|
2020-05-01 17:25:45 +02:00
|
|
|
*/
|
2021-07-31 02:45:18 +02:00
|
|
|
async _getDefaultGasFees(txMeta, eip1559Compatibility) {
|
2021-06-28 17:22:59 +02:00
|
|
|
if (
|
2021-07-31 02:45:18 +02:00
|
|
|
(!eip1559Compatibility && txMeta.txParams.gasPrice) ||
|
2021-08-03 00:52:18 +02:00
|
|
|
(eip1559Compatibility &&
|
|
|
|
txMeta.txParams.maxFeePerGas &&
|
|
|
|
txMeta.txParams.maxPriorityFeePerGas)
|
2021-06-28 17:22:59 +02:00
|
|
|
) {
|
2021-07-31 02:45:18 +02:00
|
|
|
return {};
|
2020-05-01 17:25:45 +02:00
|
|
|
}
|
2021-07-31 02:45:18 +02:00
|
|
|
|
|
|
|
try {
|
2022-07-31 20:26:40 +02:00
|
|
|
const { gasFeeEstimates, gasEstimateType } =
|
|
|
|
await this._getEIP1559GasFeeEstimates();
|
2021-07-31 02:45:18 +02:00
|
|
|
if (
|
|
|
|
eip1559Compatibility &&
|
|
|
|
gasEstimateType === GAS_ESTIMATE_TYPES.FEE_MARKET
|
|
|
|
) {
|
|
|
|
const {
|
|
|
|
medium: { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = {},
|
|
|
|
} = gasFeeEstimates;
|
|
|
|
|
|
|
|
if (suggestedMaxPriorityFeePerGas && suggestedMaxFeePerGas) {
|
|
|
|
return {
|
|
|
|
maxFeePerGas: decGWEIToHexWEI(suggestedMaxFeePerGas),
|
|
|
|
maxPriorityFeePerGas: decGWEIToHexWEI(
|
|
|
|
suggestedMaxPriorityFeePerGas,
|
|
|
|
),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
} else if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
|
|
|
|
// The LEGACY type includes low, medium and high estimates of
|
|
|
|
// gas price values.
|
|
|
|
return {
|
|
|
|
gasPrice: decGWEIToHexWEI(gasFeeEstimates.medium),
|
|
|
|
};
|
|
|
|
} else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
|
|
|
|
// The ETH_GASPRICE type just includes a single gas price property,
|
|
|
|
// which we can assume was retrieved from eth_gasPrice
|
|
|
|
return {
|
|
|
|
gasPrice: decGWEIToHexWEI(gasFeeEstimates.gasPrice),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
} catch (e) {
|
|
|
|
console.error(e);
|
|
|
|
}
|
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
const gasPrice = await this.query.gasPrice();
|
2020-05-01 00:50:12 +02:00
|
|
|
|
2021-07-31 02:45:18 +02:00
|
|
|
return { gasPrice: gasPrice && addHexPrefix(gasPrice.toString(16)) };
|
2020-05-01 17:25:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Gets default gas limit, or debug information about why gas estimate failed.
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txMeta - The txMeta object
|
2022-07-25 18:26:02 +02:00
|
|
|
* @returns {Promise<object>} Object containing the default gas limit, or the simulation failure object
|
2020-05-01 17:25:45 +02:00
|
|
|
*/
|
2022-08-03 02:44:21 +02:00
|
|
|
async _getDefaultGasLimit(txMeta) {
|
2021-07-02 17:31:27 +02:00
|
|
|
const chainId = this._getCurrentChainId();
|
|
|
|
const customNetworkGasBuffer = CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId];
|
|
|
|
const chainType = getChainType(chainId);
|
|
|
|
|
2020-05-01 17:25:45 +02:00
|
|
|
if (txMeta.txParams.gas) {
|
2021-02-04 19:15:23 +01:00
|
|
|
return {};
|
2020-05-01 01:53:35 +02:00
|
|
|
} else if (
|
2020-05-01 17:25:45 +02:00
|
|
|
txMeta.txParams.to &&
|
2021-09-15 23:54:51 +02:00
|
|
|
txMeta.type === TRANSACTION_TYPES.SIMPLE_SEND &&
|
2022-08-03 02:44:21 +02:00
|
|
|
chainType !== 'custom' &&
|
|
|
|
!txMeta.txParams.data
|
2020-05-01 00:50:12 +02:00
|
|
|
) {
|
|
|
|
// This is a standard ether simple send, gas requirement is exactly 21k
|
2021-06-08 17:25:48 +02:00
|
|
|
return { gasLimit: GAS_LIMITS.SIMPLE };
|
2020-05-01 00:50:12 +02:00
|
|
|
}
|
2020-05-01 02:44:51 +02:00
|
|
|
|
2022-07-31 20:26:40 +02:00
|
|
|
const { blockGasLimit, estimatedGasHex, simulationFails } =
|
|
|
|
await this.txGasUtil.analyzeGasUsage(txMeta);
|
2020-05-01 17:25:45 +02:00
|
|
|
|
|
|
|
// add additional gas buffer to our estimation for safety
|
2020-11-03 00:41:28 +01:00
|
|
|
const gasLimit = this.txGasUtil.addGasBuffer(
|
2020-11-06 22:18:00 +01:00
|
|
|
addHexPrefix(estimatedGasHex),
|
2020-11-03 00:41:28 +01:00
|
|
|
blockGasLimit,
|
2021-07-02 17:31:27 +02:00
|
|
|
customNetworkGasBuffer,
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2022-09-22 17:04:24 +02:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
return { gasLimit, simulationFails };
|
2017-01-10 20:52:25 +01:00
|
|
|
}
|
|
|
|
|
2021-07-08 20:48:23 +02:00
|
|
|
/**
|
|
|
|
* Given a TransactionMeta object, generate new gas params such that if the
|
|
|
|
* transaction was an EIP1559 transaction, it only has EIP1559 gas fields,
|
|
|
|
* otherwise it only has gasPrice. Will use whatever custom values are
|
|
|
|
* specified in customGasSettings, or falls back to incrementing by a percent
|
|
|
|
* which is defined by specifying a numerator. 11 is a 10% bump, 12 would be
|
|
|
|
* a 20% bump, and so on.
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2022-01-20 17:26:39 +01:00
|
|
|
* @param {TransactionMeta} originalTxMeta - Original transaction to use as
|
|
|
|
* base
|
2021-07-08 20:48:23 +02:00
|
|
|
* @param {CustomGasSettings} [customGasSettings] - overrides for the gas
|
|
|
|
* fields to use instead of the multiplier
|
|
|
|
* @param {number} [incrementNumerator] - Numerator from which to generate a
|
|
|
|
* percentage bump of gas price. E.g 11 would be a 10% bump over base.
|
|
|
|
* @returns {{ newGasParams: CustomGasSettings, previousGasParams: CustomGasSettings }}
|
|
|
|
*/
|
|
|
|
generateNewGasParams(
|
|
|
|
originalTxMeta,
|
|
|
|
customGasSettings = {},
|
|
|
|
incrementNumerator = 11,
|
|
|
|
) {
|
|
|
|
const { txParams } = originalTxMeta;
|
|
|
|
const previousGasParams = {};
|
|
|
|
const newGasParams = {};
|
|
|
|
if (customGasSettings.gasLimit) {
|
|
|
|
newGasParams.gas = customGasSettings?.gas ?? GAS_LIMITS.SIMPLE;
|
|
|
|
}
|
|
|
|
|
2021-10-22 22:42:20 +02:00
|
|
|
if (customGasSettings.estimateSuggested) {
|
|
|
|
newGasParams.estimateSuggested = customGasSettings.estimateSuggested;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (customGasSettings.estimateUsed) {
|
|
|
|
newGasParams.estimateUsed = customGasSettings.estimateUsed;
|
|
|
|
}
|
|
|
|
|
2021-07-08 20:48:23 +02:00
|
|
|
if (isEIP1559Transaction(originalTxMeta)) {
|
|
|
|
previousGasParams.maxFeePerGas = txParams.maxFeePerGas;
|
|
|
|
previousGasParams.maxPriorityFeePerGas = txParams.maxPriorityFeePerGas;
|
|
|
|
newGasParams.maxFeePerGas =
|
|
|
|
customGasSettings?.maxFeePerGas ||
|
|
|
|
bnToHex(
|
|
|
|
BnMultiplyByFraction(
|
|
|
|
hexToBn(txParams.maxFeePerGas),
|
|
|
|
incrementNumerator,
|
|
|
|
10,
|
|
|
|
),
|
|
|
|
);
|
|
|
|
newGasParams.maxPriorityFeePerGas =
|
|
|
|
customGasSettings?.maxPriorityFeePerGas ||
|
|
|
|
bnToHex(
|
|
|
|
BnMultiplyByFraction(
|
|
|
|
hexToBn(txParams.maxPriorityFeePerGas),
|
|
|
|
incrementNumerator,
|
|
|
|
10,
|
|
|
|
),
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
previousGasParams.gasPrice = txParams.gasPrice;
|
|
|
|
newGasParams.gasPrice =
|
|
|
|
customGasSettings?.gasPrice ||
|
|
|
|
bnToHex(
|
|
|
|
BnMultiplyByFraction(
|
|
|
|
hexToBn(txParams.gasPrice),
|
|
|
|
incrementNumerator,
|
|
|
|
10,
|
|
|
|
),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
return { previousGasParams, newGasParams };
|
|
|
|
}
|
|
|
|
|
2018-09-09 19:07:23 +02:00
|
|
|
/**
|
|
|
|
* Creates a new approved transaction to attempt to cancel a previously submitted transaction. The
|
|
|
|
* new transaction contains the same nonce as the previous, is a basic ETH transfer of 0x value to
|
|
|
|
* the sender's address, and has a higher gasPrice than that of the previous transaction.
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2018-09-09 19:07:23 +02:00
|
|
|
* @param {number} originalTxId - the id of the txMeta that you want to attempt to cancel
|
2021-07-08 20:48:23 +02:00
|
|
|
* @param {CustomGasSettings} [customGasSettings] - overrides to use for gas
|
|
|
|
* params instead of allowing this method to generate them
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param options
|
|
|
|
* @param options.estimatedBaseFee
|
2022-09-09 13:50:31 +02:00
|
|
|
* @param options.actionId
|
2018-09-09 19:07:23 +02:00
|
|
|
* @returns {txMeta}
|
|
|
|
*/
|
2021-08-07 00:18:53 +02:00
|
|
|
async createCancelTransaction(
|
|
|
|
originalTxId,
|
|
|
|
customGasSettings,
|
2022-09-09 13:50:31 +02:00
|
|
|
{ estimatedBaseFee, actionId } = {},
|
2021-08-07 00:18:53 +02:00
|
|
|
) {
|
2022-09-09 13:50:31 +02:00
|
|
|
// If transaction is found for same action id, do not create a new cancel transaction.
|
|
|
|
if (actionId) {
|
|
|
|
const existingTxMeta =
|
|
|
|
this.txStateManager.getTransactionWithActionId(actionId);
|
|
|
|
if (existingTxMeta) {
|
|
|
|
return existingTxMeta;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
const originalTxMeta = this.txStateManager.getTransaction(originalTxId);
|
2021-02-04 19:15:23 +01:00
|
|
|
const { txParams } = originalTxMeta;
|
2021-07-08 20:48:23 +02:00
|
|
|
const { from, nonce } = txParams;
|
|
|
|
|
|
|
|
const { previousGasParams, newGasParams } = this.generateNewGasParams(
|
|
|
|
originalTxMeta,
|
|
|
|
{
|
|
|
|
...customGasSettings,
|
|
|
|
// We want to override the previous transactions gasLimit because it
|
|
|
|
// will now be a simple send instead of whatever it was before such
|
|
|
|
// as a token transfer or contract call.
|
|
|
|
gasLimit: customGasSettings.gasLimit || GAS_LIMITS.SIMPLE,
|
|
|
|
},
|
|
|
|
);
|
2018-09-17 19:34:29 +02:00
|
|
|
|
2018-09-09 19:07:23 +02:00
|
|
|
const newTxMeta = this.txStateManager.generateTxMeta({
|
|
|
|
txParams: {
|
|
|
|
from,
|
|
|
|
to: from,
|
|
|
|
nonce,
|
|
|
|
value: '0x0',
|
2021-07-08 20:48:23 +02:00
|
|
|
...newGasParams,
|
2018-09-09 19:07:23 +02:00
|
|
|
},
|
2021-07-08 20:48:23 +02:00
|
|
|
previousGasParams,
|
2018-09-09 19:07:23 +02:00
|
|
|
loadingDefaults: false,
|
2020-11-03 23:57:51 +01:00
|
|
|
status: TRANSACTION_STATUSES.APPROVED,
|
|
|
|
type: TRANSACTION_TYPES.CANCEL,
|
2022-09-09 13:50:31 +02:00
|
|
|
actionId,
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2018-09-09 19:07:23 +02:00
|
|
|
|
2021-08-07 00:18:53 +02:00
|
|
|
if (estimatedBaseFee) {
|
|
|
|
newTxMeta.estimatedBaseFee = estimatedBaseFee;
|
|
|
|
}
|
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
this.addTransaction(newTxMeta);
|
2022-09-16 19:04:14 +02:00
|
|
|
await this.approveTransaction(newTxMeta.id, actionId);
|
2021-02-04 19:15:23 +01:00
|
|
|
return newTxMeta;
|
2018-09-09 19:07:23 +02:00
|
|
|
}
|
|
|
|
|
2020-03-12 15:33:11 +01:00
|
|
|
/**
|
|
|
|
* Creates a new approved transaction to attempt to speed up a previously submitted transaction. The
|
|
|
|
* new transaction contains the same nonce as the previous. By default, the new transaction will use
|
|
|
|
* the same gas limit and a 10% higher gas price, though it is possible to set a custom value for
|
|
|
|
* each instead.
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2020-03-12 15:33:11 +01:00
|
|
|
* @param {number} originalTxId - the id of the txMeta that you want to speed up
|
2021-07-08 20:48:23 +02:00
|
|
|
* @param {CustomGasSettings} [customGasSettings] - overrides to use for gas
|
|
|
|
* params instead of allowing this method to generate them
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param options
|
|
|
|
* @param options.estimatedBaseFee
|
2022-09-13 14:43:38 +02:00
|
|
|
* @param options.actionId
|
2020-03-12 15:33:11 +01:00
|
|
|
* @returns {txMeta}
|
|
|
|
*/
|
2021-08-07 00:18:53 +02:00
|
|
|
async createSpeedUpTransaction(
|
|
|
|
originalTxId,
|
|
|
|
customGasSettings,
|
2022-09-13 14:43:38 +02:00
|
|
|
{ estimatedBaseFee, actionId } = {},
|
2021-08-07 00:18:53 +02:00
|
|
|
) {
|
2022-09-13 14:43:38 +02:00
|
|
|
// If transaction is found for same action id, do not create a new speed-up transaction.
|
|
|
|
if (actionId) {
|
|
|
|
const existingTxMeta =
|
|
|
|
this.txStateManager.getTransactionWithActionId(actionId);
|
|
|
|
if (existingTxMeta) {
|
|
|
|
return existingTxMeta;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
const originalTxMeta = this.txStateManager.getTransaction(originalTxId);
|
2021-02-04 19:15:23 +01:00
|
|
|
const { txParams } = originalTxMeta;
|
2018-10-26 06:42:59 +02:00
|
|
|
|
2021-07-08 20:48:23 +02:00
|
|
|
const { previousGasParams, newGasParams } = this.generateNewGasParams(
|
|
|
|
originalTxMeta,
|
|
|
|
customGasSettings,
|
|
|
|
);
|
2018-10-26 06:42:59 +02:00
|
|
|
|
|
|
|
const newTxMeta = this.txStateManager.generateTxMeta({
|
|
|
|
txParams: {
|
|
|
|
...txParams,
|
2021-07-08 20:48:23 +02:00
|
|
|
...newGasParams,
|
2018-10-26 06:42:59 +02:00
|
|
|
},
|
2021-07-08 20:48:23 +02:00
|
|
|
previousGasParams,
|
2018-10-26 06:42:59 +02:00
|
|
|
loadingDefaults: false,
|
2020-11-03 23:57:51 +01:00
|
|
|
status: TRANSACTION_STATUSES.APPROVED,
|
|
|
|
type: TRANSACTION_TYPES.RETRY,
|
2022-07-28 15:46:20 +02:00
|
|
|
originalType: originalTxMeta.type,
|
2022-09-13 14:43:38 +02:00
|
|
|
actionId,
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2018-10-26 06:42:59 +02:00
|
|
|
|
2021-08-07 00:18:53 +02:00
|
|
|
if (estimatedBaseFee) {
|
|
|
|
newTxMeta.estimatedBaseFee = estimatedBaseFee;
|
|
|
|
}
|
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
this.addTransaction(newTxMeta);
|
2022-09-16 19:04:14 +02:00
|
|
|
await this.approveTransaction(newTxMeta.id, actionId);
|
2021-02-04 19:15:23 +01:00
|
|
|
return newTxMeta;
|
2018-10-26 06:42:59 +02:00
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* updates the txMeta in the txStateManager
|
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txMeta - the updated txMeta
|
2022-01-07 16:57:33 +01:00
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
async updateTransaction(txMeta) {
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
txMeta,
|
|
|
|
'confTx: user updated transaction',
|
|
|
|
);
|
2017-12-20 18:17:16 +01:00
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* updates and approves the transaction
|
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txMeta
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {string} actionId
|
2022-01-07 16:57:33 +01:00
|
|
|
*/
|
2022-09-16 19:04:14 +02:00
|
|
|
async updateAndApproveTransaction(txMeta, actionId) {
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
txMeta,
|
|
|
|
'confTx: user approved transaction',
|
|
|
|
);
|
2022-09-16 19:04:14 +02:00
|
|
|
await this.approveTransaction(txMeta.id, actionId);
|
2016-12-14 21:55:41 +01:00
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* sets the tx status to approved
|
|
|
|
* auto fills the nonce
|
|
|
|
* signs the transaction
|
|
|
|
* publishes the transaction
|
|
|
|
* if any of these steps fails the tx status will be set to failed
|
|
|
|
*
|
|
|
|
* @param {number} txId - the tx's Id
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {string} actionId - actionId passed from UI
|
2022-01-07 16:57:33 +01:00
|
|
|
*/
|
2022-09-16 19:04:14 +02:00
|
|
|
async approveTransaction(txId, actionId) {
|
2019-07-19 05:37:51 +02:00
|
|
|
// TODO: Move this safety out of this function.
|
|
|
|
// Since this transaction is async,
|
|
|
|
// we need to keep track of what is currently being signed,
|
|
|
|
// So that we do not increment nonce + resubmit something
|
2020-07-23 22:31:13 +02:00
|
|
|
// that is already being incremented & signed.
|
2022-09-09 13:50:31 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2019-07-19 05:37:51 +02:00
|
|
|
if (this.inProcessOfSigning.has(txId)) {
|
2021-02-04 19:15:23 +01:00
|
|
|
return;
|
2019-07-19 05:37:51 +02:00
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
this.inProcessOfSigning.add(txId);
|
|
|
|
let nonceLock;
|
2017-06-15 08:44:02 +02:00
|
|
|
try {
|
|
|
|
// approve
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.setTxStatusApproved(txId);
|
2017-06-15 08:44:02 +02:00
|
|
|
// get next nonce
|
2021-02-04 19:15:23 +01:00
|
|
|
const fromAddress = txMeta.txParams.from;
|
2017-07-26 19:40:08 +02:00
|
|
|
// wait for a nonce
|
2021-02-04 19:15:23 +01:00
|
|
|
let { customNonceValue } = txMeta;
|
|
|
|
customNonceValue = Number(customNonceValue);
|
|
|
|
nonceLock = await this.nonceTracker.getNonceLock(fromAddress);
|
2017-07-26 19:40:08 +02:00
|
|
|
// add nonce to txParams
|
2021-07-08 20:48:23 +02:00
|
|
|
// if txMeta has previousGasParams then it is a retry at same nonce with
|
|
|
|
// higher gas settings and therefor the nonce should not be recalculated
|
|
|
|
const nonce = txMeta.previousGasParams
|
2020-11-03 00:41:28 +01:00
|
|
|
? txMeta.txParams.nonce
|
2021-02-04 19:15:23 +01:00
|
|
|
: nonceLock.nextNonce;
|
2020-11-03 00:41:28 +01:00
|
|
|
const customOrNonce =
|
2021-02-04 19:15:23 +01:00
|
|
|
customNonceValue === 0 ? customNonceValue : customNonceValue || nonce;
|
2019-09-27 06:30:36 +02:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.txParams.nonce = addHexPrefix(customOrNonce.toString(16));
|
2017-07-26 19:40:08 +02:00
|
|
|
// add nonce debugging information to txMeta
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.nonceDetails = nonceLock.nonceDetails;
|
2019-09-27 06:30:36 +02:00
|
|
|
if (customNonceValue) {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.nonceDetails.customNonceValue = customNonceValue;
|
2019-09-27 06:30:36 +02:00
|
|
|
}
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
txMeta,
|
|
|
|
'transactions#approveTransaction',
|
|
|
|
);
|
2017-06-15 08:44:02 +02:00
|
|
|
// sign transaction
|
2021-02-04 19:15:23 +01:00
|
|
|
const rawTx = await this.signTransaction(txId);
|
2022-09-16 19:04:14 +02:00
|
|
|
await this.publishTransaction(txId, rawTx, actionId);
|
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.APPROVED,
|
|
|
|
actionId,
|
|
|
|
);
|
2017-06-15 08:44:02 +02:00
|
|
|
// must set transaction to submitted/failed before releasing lock
|
2021-02-04 19:15:23 +01:00
|
|
|
nonceLock.releaseLock();
|
2017-06-15 08:44:02 +02:00
|
|
|
} catch (err) {
|
2018-06-12 20:51:35 +02:00
|
|
|
// this is try-catch wrapped so that we can guarantee that the nonceLock is released
|
|
|
|
try {
|
2022-09-16 19:04:14 +02:00
|
|
|
this._failTransaction(txId, err, actionId);
|
2020-08-18 18:36:45 +02:00
|
|
|
} catch (err2) {
|
2021-02-04 19:15:23 +01:00
|
|
|
log.error(err2);
|
2018-06-12 20:51:35 +02:00
|
|
|
}
|
2017-06-15 08:44:02 +02:00
|
|
|
// must set transaction to submitted/failed before releasing lock
|
2019-11-20 01:03:20 +01:00
|
|
|
if (nonceLock) {
|
2021-02-04 19:15:23 +01:00
|
|
|
nonceLock.releaseLock();
|
2019-11-20 01:03:20 +01:00
|
|
|
}
|
2017-06-15 08:44:02 +02:00
|
|
|
// continue with error chain
|
2021-02-04 19:15:23 +01:00
|
|
|
throw err;
|
2019-07-19 05:37:51 +02:00
|
|
|
} finally {
|
2021-02-04 19:15:23 +01:00
|
|
|
this.inProcessOfSigning.delete(txId);
|
2017-06-15 08:44:02 +02:00
|
|
|
}
|
2016-12-16 19:33:36 +01:00
|
|
|
}
|
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
|
|
|
|
2022-02-18 17:48:38 +01:00
|
|
|
async approveTransactionsWithSameNonce(listOfTxParams = []) {
|
|
|
|
if (listOfTxParams.length === 0) {
|
|
|
|
return '';
|
|
|
|
}
|
|
|
|
|
|
|
|
const initialTx = listOfTxParams[0];
|
|
|
|
const common = await this.getCommonConfiguration(initialTx.from);
|
|
|
|
const initialTxAsEthTx = TransactionFactory.fromTxData(initialTx, {
|
|
|
|
common,
|
|
|
|
});
|
|
|
|
const initialTxAsSerializedHex = bufferToHex(initialTxAsEthTx.serialize());
|
|
|
|
|
|
|
|
if (this.inProcessOfSigning.has(initialTxAsSerializedHex)) {
|
|
|
|
return '';
|
|
|
|
}
|
|
|
|
this.inProcessOfSigning.add(initialTxAsSerializedHex);
|
|
|
|
let rawTxes, nonceLock;
|
|
|
|
try {
|
|
|
|
// TODO: we should add a check to verify that all transactions have the same from address
|
|
|
|
const fromAddress = initialTx.from;
|
|
|
|
nonceLock = await this.nonceTracker.getNonceLock(fromAddress);
|
|
|
|
const nonce = nonceLock.nextNonce;
|
|
|
|
|
|
|
|
rawTxes = await Promise.all(
|
|
|
|
listOfTxParams.map((txParams) => {
|
|
|
|
txParams.nonce = addHexPrefix(nonce.toString(16));
|
|
|
|
return this.signExternalTransaction(txParams);
|
|
|
|
}),
|
|
|
|
);
|
|
|
|
} catch (err) {
|
|
|
|
log.error(err);
|
|
|
|
// must set transaction to submitted/failed before releasing lock
|
|
|
|
// continue with error chain
|
|
|
|
throw err;
|
|
|
|
} finally {
|
|
|
|
if (nonceLock) {
|
|
|
|
nonceLock.releaseLock();
|
|
|
|
}
|
|
|
|
this.inProcessOfSigning.delete(initialTxAsSerializedHex);
|
|
|
|
}
|
|
|
|
return rawTxes;
|
|
|
|
}
|
|
|
|
|
|
|
|
async signExternalTransaction(_txParams) {
|
|
|
|
const normalizedTxParams = txUtils.normalizeTxParams(_txParams);
|
|
|
|
// add network/chain id
|
|
|
|
const chainId = this.getChainId();
|
|
|
|
const type = isEIP1559Transaction({ txParams: normalizedTxParams })
|
|
|
|
? TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
|
|
|
|
: TRANSACTION_ENVELOPE_TYPES.LEGACY;
|
|
|
|
const txParams = {
|
|
|
|
...normalizedTxParams,
|
|
|
|
type,
|
|
|
|
gasLimit: normalizedTxParams.gas,
|
|
|
|
chainId: addHexPrefix(decimalToHex(chainId)),
|
|
|
|
};
|
|
|
|
// sign tx
|
|
|
|
const fromAddress = txParams.from;
|
|
|
|
const common = await this.getCommonConfiguration(fromAddress);
|
|
|
|
const unsignedEthTx = TransactionFactory.fromTxData(txParams, { common });
|
|
|
|
const signedEthTx = await this.signEthTx(unsignedEthTx, fromAddress);
|
|
|
|
|
|
|
|
const rawTx = bufferToHex(signedEthTx.serialize());
|
|
|
|
return rawTx;
|
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* adds the chain id and signs the transaction and set the status to signed
|
|
|
|
*
|
|
|
|
* @param {number} txId - the tx's Id
|
|
|
|
* @returns {string} rawTx
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
async signTransaction(txId) {
|
2021-03-30 16:54:05 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2017-03-30 23:23:23 +02:00
|
|
|
// add network/chain id
|
2021-02-04 19:15:23 +01:00
|
|
|
const chainId = this.getChainId();
|
2021-07-12 22:26:53 +02:00
|
|
|
const type = isEIP1559Transaction(txMeta)
|
|
|
|
? TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
|
|
|
|
: TRANSACTION_ENVELOPE_TYPES.LEGACY;
|
2021-06-16 22:40:17 +02:00
|
|
|
const txParams = {
|
|
|
|
...txMeta.txParams,
|
2021-08-03 00:52:18 +02:00
|
|
|
type,
|
2021-06-16 22:40:17 +02:00
|
|
|
chainId,
|
|
|
|
gasLimit: txMeta.txParams.gas,
|
|
|
|
};
|
2018-03-28 08:55:18 +02:00
|
|
|
// sign tx
|
2021-02-04 19:15:23 +01:00
|
|
|
const fromAddress = txParams.from;
|
2021-07-28 01:13:48 +02:00
|
|
|
const common = await this.getCommonConfiguration(txParams.from);
|
2021-06-16 22:40:17 +02:00
|
|
|
const unsignedEthTx = TransactionFactory.fromTxData(txParams, { common });
|
|
|
|
const signedEthTx = await this.signEthTx(unsignedEthTx, fromAddress);
|
2019-10-30 23:15:54 +01:00
|
|
|
|
|
|
|
// add r,s,v values for provider request purposes see createMetamaskMiddleware
|
|
|
|
// and JSON rpc standard for further explanation
|
2021-06-16 22:40:17 +02:00
|
|
|
txMeta.r = bufferToHex(signedEthTx.r);
|
|
|
|
txMeta.s = bufferToHex(signedEthTx.s);
|
|
|
|
txMeta.v = bufferToHex(signedEthTx.v);
|
2019-10-30 23:15:54 +01:00
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions#signTransaction: add r, s, v values',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2019-10-30 23:15:54 +01:00
|
|
|
|
2018-03-28 08:55:18 +02:00
|
|
|
// set state to signed
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.setTxStatusSigned(txMeta.id);
|
2021-06-16 22:40:17 +02:00
|
|
|
const rawTx = bufferToHex(signedEthTx.serialize());
|
2021-02-04 19:15:23 +01:00
|
|
|
return rawTx;
|
2017-01-13 11:00:11 +01:00
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* publishes the raw tx and sets the txMeta to submitted
|
|
|
|
*
|
|
|
|
* @param {number} txId - the tx's Id
|
|
|
|
* @param {string} rawTx - the hex string of the serialized signed transaction
|
|
|
|
* @returns {Promise<void>}
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {number} actionId - actionId passed from UI
|
2022-01-07 16:57:33 +01:00
|
|
|
*/
|
2022-09-16 19:04:14 +02:00
|
|
|
async publishTransaction(txId, rawTx, actionId) {
|
2021-03-30 16:54:05 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.rawTx = rawTx;
|
2021-03-10 21:16:44 +01:00
|
|
|
if (txMeta.type === TRANSACTION_TYPES.SWAP) {
|
2021-02-04 19:15:23 +01:00
|
|
|
const preTxBalance = await this.query.getBalance(txMeta.txParams.from);
|
|
|
|
txMeta.preTxBalance = preTxBalance.toString(16);
|
2020-10-06 20:28:38 +02:00
|
|
|
}
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
txMeta,
|
|
|
|
'transactions#publishTransaction',
|
|
|
|
);
|
2021-02-04 19:15:23 +01:00
|
|
|
let txHash;
|
2019-10-30 22:40:33 +01:00
|
|
|
try {
|
2021-02-04 19:15:23 +01:00
|
|
|
txHash = await this.query.sendRawTransaction(rawTx);
|
2019-10-30 22:40:33 +01:00
|
|
|
} catch (error) {
|
|
|
|
if (error.message.toLowerCase().includes('known transaction')) {
|
2021-04-16 17:05:13 +02:00
|
|
|
txHash = keccak(toBuffer(addHexPrefix(rawTx), 'hex')).toString('hex');
|
2021-02-04 19:15:23 +01:00
|
|
|
txHash = addHexPrefix(txHash);
|
2019-10-30 22:40:33 +01:00
|
|
|
} else {
|
2021-02-04 19:15:23 +01:00
|
|
|
throw error;
|
2019-10-30 22:40:33 +01:00
|
|
|
}
|
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
this.setTxHash(txId, txHash);
|
2019-10-30 22:40:33 +01:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.setTxStatusSubmitted(txId);
|
2021-06-24 21:00:54 +02:00
|
|
|
|
2022-09-16 19:04:14 +02:00
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.SUBMITTED,
|
|
|
|
actionId,
|
|
|
|
);
|
2017-01-13 11:00:11 +01:00
|
|
|
}
|
|
|
|
|
2022-06-08 16:32:04 +02:00
|
|
|
async updatePostTxBalance({ txMeta, txId, numberOfAttempts = 6 }) {
|
|
|
|
const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
|
|
|
|
const latestTxMeta = this.txStateManager.getTransaction(txId);
|
|
|
|
const approvalTxMeta = latestTxMeta.approvalTxId
|
|
|
|
? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
|
|
|
|
: null;
|
|
|
|
latestTxMeta.postTxBalance = postTxBalance.toString(16);
|
|
|
|
const isDefaultTokenAddress = isSwapsDefaultTokenAddress(
|
|
|
|
txMeta.destinationTokenAddress,
|
|
|
|
txMeta.chainId,
|
|
|
|
);
|
|
|
|
if (
|
|
|
|
isDefaultTokenAddress &&
|
|
|
|
txMeta.preTxBalance === latestTxMeta.postTxBalance &&
|
|
|
|
numberOfAttempts > 0
|
|
|
|
) {
|
|
|
|
setTimeout(() => {
|
|
|
|
// If postTxBalance is the same as preTxBalance, try it again.
|
|
|
|
this.updatePostTxBalance({
|
|
|
|
txMeta,
|
|
|
|
txId,
|
|
|
|
numberOfAttempts: numberOfAttempts - 1,
|
|
|
|
});
|
|
|
|
}, UPDATE_POST_TX_BALANCE_TIMEOUT);
|
|
|
|
} else {
|
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
latestTxMeta,
|
|
|
|
'transactions#confirmTransaction - add postTxBalance',
|
|
|
|
);
|
|
|
|
this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-16 00:00:47 +02:00
|
|
|
/**
|
|
|
|
* Sets the status of the transaction to confirmed and sets the status of nonce duplicates as
|
|
|
|
* dropped if the txParams have data it will fetch the txReceipt
|
2022-01-07 16:57:33 +01:00
|
|
|
*
|
2018-10-16 00:00:47 +02:00
|
|
|
* @param {number} txId - The tx's ID
|
2022-01-07 16:57:33 +01:00
|
|
|
* @param txReceipt
|
|
|
|
* @param baseFeePerGas
|
|
|
|
* @param blockTimestamp
|
2018-10-16 00:00:47 +02:00
|
|
|
* @returns {Promise<void>}
|
|
|
|
*/
|
2021-12-07 19:16:40 +01:00
|
|
|
async confirmTransaction(txId, txReceipt, baseFeePerGas, blockTimestamp) {
|
2018-10-16 00:00:47 +02:00
|
|
|
// get the txReceipt before marking the transaction confirmed
|
|
|
|
// to ensure the receipt is gotten before the ui revives the tx
|
2021-03-30 16:54:05 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2018-10-16 00:00:47 +02:00
|
|
|
|
2020-10-12 12:22:51 +02:00
|
|
|
if (!txMeta) {
|
2021-02-04 19:15:23 +01:00
|
|
|
return;
|
2018-10-16 00:00:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
2022-02-18 17:48:38 +01:00
|
|
|
const gasUsed = txUtils.normalizeTxReceiptGasUsed(txReceipt.gasUsed);
|
2018-10-16 00:00:47 +02:00
|
|
|
|
2020-10-12 12:22:51 +02:00
|
|
|
txMeta.txReceipt = {
|
2018-10-16 00:00:47 +02:00
|
|
|
...txReceipt,
|
|
|
|
gasUsed,
|
2021-02-04 19:15:23 +01:00
|
|
|
};
|
2021-07-28 19:30:34 +02:00
|
|
|
|
|
|
|
if (baseFeePerGas) {
|
|
|
|
txMeta.baseFeePerGas = baseFeePerGas;
|
|
|
|
}
|
2021-12-07 19:16:40 +01:00
|
|
|
if (blockTimestamp) {
|
|
|
|
txMeta.blockTimestamp = blockTimestamp;
|
|
|
|
}
|
2021-07-28 19:30:34 +02:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.setTxStatusConfirmed(txId);
|
|
|
|
this._markNonceDuplicatesDropped(txId);
|
2020-10-08 20:31:35 +02:00
|
|
|
|
2021-06-24 21:00:54 +02:00
|
|
|
const { submittedTime } = txMeta;
|
|
|
|
const metricsParams = { gas_used: gasUsed };
|
|
|
|
|
2021-07-12 19:14:54 +02:00
|
|
|
if (submittedTime) {
|
2022-07-31 20:26:40 +02:00
|
|
|
metricsParams.completion_time =
|
|
|
|
this._getTransactionCompletionTime(submittedTime);
|
2021-06-24 21:00:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (txReceipt.status === '0x0') {
|
2022-02-18 17:48:38 +01:00
|
|
|
metricsParams.status = METRICS_STATUS_FAILED;
|
|
|
|
// metricsParams.error = TODO: figure out a way to get the on-chain failure reason
|
|
|
|
}
|
|
|
|
|
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.FINALIZED,
|
2022-09-16 19:04:14 +02:00
|
|
|
undefined,
|
2022-02-18 17:48:38 +01:00
|
|
|
metricsParams,
|
|
|
|
);
|
|
|
|
|
|
|
|
this.txStateManager.updateTransaction(
|
|
|
|
txMeta,
|
|
|
|
'transactions#confirmTransaction - add txReceipt',
|
|
|
|
);
|
|
|
|
|
|
|
|
if (txMeta.type === TRANSACTION_TYPES.SWAP) {
|
2022-06-08 16:32:04 +02:00
|
|
|
await this.updatePostTxBalance({
|
|
|
|
txMeta,
|
|
|
|
txId,
|
|
|
|
});
|
2022-02-18 17:48:38 +01:00
|
|
|
}
|
|
|
|
} catch (err) {
|
|
|
|
log.error(err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
async confirmExternalTransaction(txMeta, txReceipt, baseFeePerGas) {
|
|
|
|
// add external transaction
|
|
|
|
await this.txStateManager.addExternalTransaction(txMeta);
|
|
|
|
|
|
|
|
if (!txMeta) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const txId = txMeta.id;
|
|
|
|
|
|
|
|
try {
|
|
|
|
const gasUsed = txUtils.normalizeTxReceiptGasUsed(txReceipt.gasUsed);
|
|
|
|
|
|
|
|
txMeta.txReceipt = {
|
|
|
|
...txReceipt,
|
|
|
|
gasUsed,
|
|
|
|
};
|
|
|
|
|
|
|
|
if (baseFeePerGas) {
|
|
|
|
txMeta.baseFeePerGas = baseFeePerGas;
|
|
|
|
}
|
|
|
|
|
|
|
|
this.txStateManager.setTxStatusConfirmed(txId);
|
|
|
|
this._markNonceDuplicatesDropped(txId);
|
|
|
|
|
|
|
|
const { submittedTime } = txMeta;
|
|
|
|
const metricsParams = { gas_used: gasUsed };
|
|
|
|
|
|
|
|
if (submittedTime) {
|
2022-07-31 20:26:40 +02:00
|
|
|
metricsParams.completion_time =
|
|
|
|
this._getTransactionCompletionTime(submittedTime);
|
2022-02-18 17:48:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (txReceipt.status === '0x0') {
|
|
|
|
metricsParams.status = METRICS_STATUS_FAILED;
|
2021-06-24 21:00:54 +02:00
|
|
|
// metricsParams.error = TODO: figure out a way to get the on-chain failure reason
|
|
|
|
}
|
|
|
|
|
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.FINALIZED,
|
2022-09-16 19:04:14 +02:00
|
|
|
undefined,
|
2021-06-24 21:00:54 +02:00
|
|
|
metricsParams,
|
|
|
|
);
|
|
|
|
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions#confirmTransaction - add txReceipt',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2018-10-16 00:00:47 +02:00
|
|
|
|
2021-03-10 21:16:44 +01:00
|
|
|
if (txMeta.type === TRANSACTION_TYPES.SWAP) {
|
2022-06-08 16:32:04 +02:00
|
|
|
await this.updatePostTxBalance({
|
|
|
|
txMeta,
|
|
|
|
txId,
|
|
|
|
});
|
2020-10-06 20:28:38 +02:00
|
|
|
}
|
2018-10-16 00:00:47 +02:00
|
|
|
} catch (err) {
|
2021-02-04 19:15:23 +01:00
|
|
|
log.error(err);
|
2018-10-16 00:00:47 +02:00
|
|
|
}
|
2018-05-23 01:40:01 +02:00
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Convenience method for the ui thats sets the transaction to rejected
|
|
|
|
*
|
|
|
|
* @param {number} txId - the tx's Id
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {string} actionId - actionId passed from UI
|
2022-01-07 16:57:33 +01:00
|
|
|
* @returns {Promise<void>}
|
|
|
|
*/
|
2022-09-16 19:04:14 +02:00
|
|
|
async cancelTransaction(txId, actionId) {
|
2021-06-24 21:00:54 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.setTxStatusRejected(txId);
|
2022-09-16 19:04:14 +02:00
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.REJECTED,
|
|
|
|
actionId,
|
|
|
|
);
|
2017-07-26 20:56:52 +02:00
|
|
|
}
|
|
|
|
|
2018-04-13 21:38:07 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Sets the txHas on the txMeta
|
|
|
|
*
|
|
|
|
* @param {number} txId - the tx's Id
|
|
|
|
* @param {string} txHash - the hash for the txMeta
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
setTxHash(txId, txHash) {
|
2016-12-20 22:12:14 +01:00
|
|
|
// Add the tx hash to the persisted meta-tx object
|
2021-03-30 16:54:05 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.hash = txHash;
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(txMeta, 'transactions#setTxHash');
|
2016-12-14 21:55:41 +01:00
|
|
|
}
|
|
|
|
|
2022-01-20 17:26:39 +01:00
|
|
|
/**
|
|
|
|
* Convenience method for the UI to easily create event fragments when the
|
|
|
|
* fragment does not exist in state.
|
|
|
|
*
|
|
|
|
* @param {number} transactionId - The transaction id to create the event
|
|
|
|
* fragment for
|
|
|
|
* @param {valueOf<TRANSACTION_EVENTS>} event - event type to create
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {string} actionId - actionId passed from UI
|
2022-01-20 17:26:39 +01:00
|
|
|
*/
|
2022-09-16 19:04:14 +02:00
|
|
|
async createTransactionEventFragment(transactionId, event, actionId) {
|
2022-01-20 17:26:39 +01:00
|
|
|
const txMeta = this.txStateManager.getTransaction(transactionId);
|
2022-07-31 20:26:40 +02:00
|
|
|
const { properties, sensitiveProperties } =
|
|
|
|
await this._buildEventFragmentProperties(txMeta);
|
2022-01-20 17:26:39 +01:00
|
|
|
this._createTransactionEventFragment(
|
|
|
|
txMeta,
|
|
|
|
event,
|
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2019-07-31 22:17:11 +02:00
|
|
|
//
|
|
|
|
// PRIVATE METHODS
|
|
|
|
//
|
2018-04-13 21:38:07 +02:00
|
|
|
/** maps methods for convenience*/
|
2020-11-03 00:41:28 +01:00
|
|
|
_mapMethods() {
|
2022-07-27 15:28:05 +02:00
|
|
|
/** @returns {object} the state in transaction controller */
|
2021-02-04 19:15:23 +01:00
|
|
|
this.getState = () => this.memStore.getState();
|
2020-08-19 18:27:05 +02:00
|
|
|
|
2020-11-10 18:30:41 +01:00
|
|
|
/** @returns {string|number} the network number stored in networkStore */
|
2021-02-04 19:15:23 +01:00
|
|
|
this.getNetwork = () => this.networkStore.getState();
|
2020-08-19 18:27:05 +02:00
|
|
|
|
2020-11-10 18:30:41 +01:00
|
|
|
/** @returns {string} the user selected address */
|
2020-11-03 00:41:28 +01:00
|
|
|
this.getSelectedAddress = () =>
|
2021-02-04 19:15:23 +01:00
|
|
|
this.preferencesStore.getState().selectedAddress;
|
2020-08-19 18:27:05 +02:00
|
|
|
|
2020-11-10 18:30:41 +01:00
|
|
|
/** @returns {Array} transactions whos status is unapproved */
|
2020-11-03 00:41:28 +01:00
|
|
|
this.getUnapprovedTxCount = () =>
|
2021-02-04 19:15:23 +01:00
|
|
|
Object.keys(this.txStateManager.getUnapprovedTxList()).length;
|
2020-08-19 18:27:05 +02:00
|
|
|
|
2018-04-25 20:13:51 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* @returns {number} number of transactions that have the status submitted
|
|
|
|
* @param {string} account - hex prefixed account
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
this.getPendingTxCount = (account) =>
|
2021-02-04 19:15:23 +01:00
|
|
|
this.txStateManager.getPendingTransactions(account).length;
|
2020-08-19 18:27:05 +02:00
|
|
|
|
2022-01-07 16:57:33 +01:00
|
|
|
/**
|
|
|
|
* see txStateManager
|
|
|
|
*
|
|
|
|
* @param opts
|
|
|
|
*/
|
2021-03-30 16:54:05 +02:00
|
|
|
this.getTransactions = (opts) => this.txStateManager.getTransactions(opts);
|
2022-01-10 20:34:54 +01:00
|
|
|
|
|
|
|
/** @returns {object} the saved default values for advancedGasFee */
|
|
|
|
this.getAdvancedGasFee = () =>
|
|
|
|
this.preferencesStore.getState().advancedGasFee;
|
2018-04-13 21:38:07 +02:00
|
|
|
}
|
2017-02-03 05:20:13 +01:00
|
|
|
|
2018-05-29 09:53:44 +02:00
|
|
|
// called once on startup
|
2020-11-03 00:41:28 +01:00
|
|
|
async _updatePendingTxsAfterFirstBlock() {
|
2018-05-29 09:53:44 +02:00
|
|
|
// wait for first block so we know we're ready
|
2021-02-04 19:15:23 +01:00
|
|
|
await this.blockTracker.getLatestBlock();
|
2018-05-29 09:53:44 +02:00
|
|
|
// get status update for all pending transactions (for the current network)
|
2021-02-04 19:15:23 +01:00
|
|
|
await this.pendingTxTracker.updatePendingTxs();
|
2018-05-29 09:53:44 +02:00
|
|
|
}
|
|
|
|
|
2018-04-25 20:13:51 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* If transaction controller was rebooted with transactions that are uncompleted
|
|
|
|
* in steps of the transaction signing or user confirmation process it will either
|
|
|
|
* transition txMetas to a failed state or try to redo those tasks.
|
|
|
|
*/
|
2018-04-25 20:13:51 +02:00
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
_onBootCleanUp() {
|
|
|
|
this.txStateManager
|
2021-03-30 16:54:05 +02:00
|
|
|
.getTransactions({
|
|
|
|
searchCriteria: {
|
|
|
|
status: TRANSACTION_STATUSES.UNAPPROVED,
|
|
|
|
loadingDefaults: true,
|
|
|
|
},
|
2020-11-03 00:41:28 +01:00
|
|
|
})
|
|
|
|
.forEach((tx) => {
|
|
|
|
this.addTxGasDefaults(tx)
|
|
|
|
.then((txMeta) => {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.loadingDefaults = false;
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions: gas estimation for tx on boot',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2020-11-03 00:41:28 +01:00
|
|
|
})
|
|
|
|
.catch((error) => {
|
2021-03-30 16:54:05 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(tx.id);
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.loadingDefaults = false;
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'failed to estimate gas during boot cleanup.',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2021-06-24 21:00:54 +02:00
|
|
|
this._failTransaction(txMeta.id, error);
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
|
|
|
});
|
2018-04-12 21:24:16 +02:00
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
this.txStateManager
|
2021-03-30 16:54:05 +02:00
|
|
|
.getTransactions({
|
|
|
|
searchCriteria: {
|
|
|
|
status: TRANSACTION_STATUSES.APPROVED,
|
|
|
|
},
|
2020-11-03 00:41:28 +01:00
|
|
|
})
|
|
|
|
.forEach((txMeta) => {
|
2022-09-09 13:50:31 +02:00
|
|
|
// Line below will try to publish transaction which is in
|
|
|
|
// APPROVED state at the time of controller bootup
|
|
|
|
this.approveTransaction(txMeta);
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2018-04-12 21:24:16 +02:00
|
|
|
}
|
|
|
|
|
2018-04-13 22:18:45 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* is called in constructor applies the listeners for pendingTxTracker txStateManager
|
|
|
|
* and blockTracker
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
_setupListeners() {
|
|
|
|
this.txStateManager.on(
|
|
|
|
'tx:status-update',
|
|
|
|
this.emit.bind(this, 'tx:status-update'),
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
|
|
|
this._setupBlockTrackerListener();
|
2018-04-12 21:24:16 +02:00
|
|
|
this.pendingTxTracker.on('tx:warning', (txMeta) => {
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions/pending-tx-tracker#event: tx:warning',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
|
|
|
});
|
2021-06-24 21:00:54 +02:00
|
|
|
this.pendingTxTracker.on('tx:failed', (txId, error) => {
|
|
|
|
this._failTransaction(txId, error);
|
|
|
|
});
|
2021-07-28 19:30:34 +02:00
|
|
|
this.pendingTxTracker.on(
|
|
|
|
'tx:confirmed',
|
2021-12-07 19:16:40 +01:00
|
|
|
(txId, transactionReceipt, baseFeePerGas, blockTimestamp) =>
|
|
|
|
this.confirmTransaction(
|
|
|
|
txId,
|
|
|
|
transactionReceipt,
|
|
|
|
baseFeePerGas,
|
|
|
|
blockTimestamp,
|
|
|
|
),
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2021-06-24 21:00:54 +02:00
|
|
|
this.pendingTxTracker.on('tx:dropped', (txId) => {
|
|
|
|
this._dropTransaction(txId);
|
|
|
|
});
|
2018-04-12 21:24:16 +02:00
|
|
|
this.pendingTxTracker.on('tx:block-update', (txMeta, latestBlockNumber) => {
|
|
|
|
if (!txMeta.firstRetryBlockNumber) {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.firstRetryBlockNumber = latestBlockNumber;
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions/pending-tx-tracker#event: tx:block-update',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2018-04-12 21:24:16 +02:00
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2018-04-12 21:24:16 +02:00
|
|
|
this.pendingTxTracker.on('tx:retry', (txMeta) => {
|
2019-11-20 01:03:20 +01:00
|
|
|
if (!('retryCount' in txMeta)) {
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.retryCount = 0;
|
2019-11-20 01:03:20 +01:00
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
txMeta.retryCount += 1;
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions/pending-tx-tracker#event: tx:retry',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
|
|
|
});
|
2018-04-12 21:24:16 +02:00
|
|
|
}
|
|
|
|
|
2018-04-25 20:13:51 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Sets other txMeta statuses to dropped if the txMeta that has been confirmed has other transactions
|
|
|
|
* in the list have the same nonce
|
|
|
|
*
|
|
|
|
* @param {number} txId - the txId of the transaction that has been confirmed in a block
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
_markNonceDuplicatesDropped(txId) {
|
2018-03-08 07:01:14 +01:00
|
|
|
// get the confirmed transactions nonce and from address
|
2021-03-30 16:54:05 +02:00
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2021-02-04 19:15:23 +01:00
|
|
|
const { nonce, from } = txMeta.txParams;
|
2021-03-30 16:54:05 +02:00
|
|
|
const sameNonceTxs = this.txStateManager.getTransactions({
|
|
|
|
searchCriteria: { nonce, from },
|
|
|
|
});
|
2019-11-20 01:03:20 +01:00
|
|
|
if (!sameNonceTxs.length) {
|
2021-02-04 19:15:23 +01:00
|
|
|
return;
|
2019-11-20 01:03:20 +01:00
|
|
|
}
|
2018-03-08 07:01:14 +01:00
|
|
|
// mark all same nonce transactions as dropped and give i a replacedBy hash
|
|
|
|
sameNonceTxs.forEach((otherTxMeta) => {
|
2019-11-20 01:03:20 +01:00
|
|
|
if (otherTxMeta.id === txId) {
|
2021-02-04 19:15:23 +01:00
|
|
|
return;
|
2019-11-20 01:03:20 +01:00
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
otherTxMeta.replacedBy = txMeta.hash;
|
2022-08-02 17:53:09 +02:00
|
|
|
otherTxMeta.replacedById = txMeta.id;
|
2021-03-30 16:54:05 +02:00
|
|
|
this.txStateManager.updateTransaction(
|
2020-11-03 00:41:28 +01:00
|
|
|
txMeta,
|
|
|
|
'transactions/pending-tx-tracker#event: tx:confirmed reference to confirmed txHash with same nonce',
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2022-04-25 21:39:34 +02:00
|
|
|
// Drop any transaction that wasn't previously failed (off chain failure)
|
|
|
|
if (otherTxMeta.status !== TRANSACTION_STATUSES.FAILED) {
|
|
|
|
this._dropTransaction(otherTxMeta.id);
|
|
|
|
}
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2018-03-08 07:01:14 +01:00
|
|
|
}
|
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
_setupBlockTrackerListener() {
|
2021-02-04 19:15:23 +01:00
|
|
|
let listenersAreActive = false;
|
|
|
|
const latestBlockHandler = this._onLatestBlock.bind(this);
|
|
|
|
const { blockTracker, txStateManager } = this;
|
2018-05-28 23:29:31 +02:00
|
|
|
|
2021-02-04 19:15:23 +01:00
|
|
|
txStateManager.on('tx:status-update', updateSubscription);
|
|
|
|
updateSubscription();
|
2018-05-28 23:29:31 +02:00
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
function updateSubscription() {
|
2021-02-04 19:15:23 +01:00
|
|
|
const pendingTxs = txStateManager.getPendingTransactions();
|
2018-05-28 23:29:31 +02:00
|
|
|
if (!listenersAreActive && pendingTxs.length > 0) {
|
2021-02-04 19:15:23 +01:00
|
|
|
blockTracker.on('latest', latestBlockHandler);
|
|
|
|
listenersAreActive = true;
|
2018-05-28 23:29:31 +02:00
|
|
|
} else if (listenersAreActive && !pendingTxs.length) {
|
2021-02-04 19:15:23 +01:00
|
|
|
blockTracker.removeListener('latest', latestBlockHandler);
|
|
|
|
listenersAreActive = false;
|
2018-05-28 23:29:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
async _onLatestBlock(blockNumber) {
|
2018-05-28 23:29:31 +02:00
|
|
|
try {
|
2021-02-04 19:15:23 +01:00
|
|
|
await this.pendingTxTracker.updatePendingTxs();
|
2018-05-28 23:29:31 +02:00
|
|
|
} catch (err) {
|
2021-02-04 19:15:23 +01:00
|
|
|
log.error(err);
|
2018-05-28 23:29:31 +02:00
|
|
|
}
|
|
|
|
try {
|
2021-02-04 19:15:23 +01:00
|
|
|
await this.pendingTxTracker.resubmitPendingTxs(blockNumber);
|
2018-05-28 23:29:31 +02:00
|
|
|
} catch (err) {
|
2021-02-04 19:15:23 +01:00
|
|
|
log.error(err);
|
2018-05-28 23:29:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-25 20:13:51 +02:00
|
|
|
/**
|
2022-01-07 16:57:33 +01:00
|
|
|
* Updates the memStore in transaction controller
|
|
|
|
*/
|
2020-11-03 00:41:28 +01:00
|
|
|
_updateMemstore() {
|
2021-02-04 19:15:23 +01:00
|
|
|
const unapprovedTxs = this.txStateManager.getUnapprovedTxList();
|
2021-03-30 16:54:05 +02:00
|
|
|
const currentNetworkTxList = this.txStateManager.getTransactions({
|
|
|
|
limit: MAX_MEMSTORE_TX_LIST_SIZE,
|
|
|
|
});
|
2021-02-04 19:15:23 +01:00
|
|
|
this.memStore.updateState({ unapprovedTxs, currentNetworkTxList });
|
2016-12-20 22:12:14 +01:00
|
|
|
}
|
2020-07-17 03:37:56 +02:00
|
|
|
|
2022-05-09 18:48:14 +02:00
|
|
|
_calculateTransactionsCost(txMeta, approvalTxMeta) {
|
|
|
|
let approvalGasCost = '0x0';
|
|
|
|
if (approvalTxMeta?.txReceipt) {
|
|
|
|
approvalGasCost = calcGasTotal(
|
|
|
|
approvalTxMeta.txReceipt.gasUsed,
|
|
|
|
approvalTxMeta.txReceipt.effectiveGasPrice,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
const tradeGasCost = calcGasTotal(
|
|
|
|
txMeta.txReceipt.gasUsed,
|
|
|
|
txMeta.txReceipt.effectiveGasPrice,
|
|
|
|
);
|
|
|
|
const tradeAndApprovalGasCost = new BigNumber(tradeGasCost, 16)
|
|
|
|
.plus(approvalGasCost, 16)
|
|
|
|
.toString(16);
|
|
|
|
return {
|
|
|
|
approvalGasCostInEth: Number(hexWEIToDecETH(approvalGasCost)),
|
|
|
|
tradeGasCostInEth: Number(hexWEIToDecETH(tradeGasCost)),
|
|
|
|
tradeAndApprovalGasCostInEth: Number(
|
|
|
|
hexWEIToDecETH(tradeAndApprovalGasCost),
|
|
|
|
),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2020-11-03 00:41:28 +01:00
|
|
|
_trackSwapsMetrics(txMeta, approvalTxMeta) {
|
2020-10-08 18:41:23 +02:00
|
|
|
if (this._getParticipateInMetrics() && txMeta.swapMetaData) {
|
|
|
|
if (txMeta.txReceipt.status === '0x0') {
|
2020-10-21 23:10:55 +02:00
|
|
|
this._trackMetaMetricsEvent({
|
2020-10-08 18:41:23 +02:00
|
|
|
event: 'Swap Failed',
|
2020-12-02 22:41:30 +01:00
|
|
|
sensitiveProperties: { ...txMeta.swapMetaData },
|
2022-04-22 18:09:10 +02:00
|
|
|
category: EVENT.CATEGORIES.SWAPS,
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2020-10-08 18:41:23 +02:00
|
|
|
} else {
|
|
|
|
const tokensReceived = getSwapsTokensReceivedFromTxMeta(
|
|
|
|
txMeta.destinationTokenSymbol,
|
|
|
|
txMeta,
|
|
|
|
txMeta.destinationTokenAddress,
|
|
|
|
txMeta.txParams.from,
|
|
|
|
txMeta.destinationTokenDecimals,
|
2020-10-12 21:56:53 +02:00
|
|
|
approvalTxMeta,
|
2021-03-18 11:20:06 +01:00
|
|
|
txMeta.chainId,
|
2021-02-04 19:15:23 +01:00
|
|
|
);
|
2020-10-08 18:41:23 +02:00
|
|
|
|
2021-07-30 13:35:30 +02:00
|
|
|
const quoteVsExecutionRatio = tokensReceived
|
|
|
|
? `${new BigNumber(tokensReceived, 10)
|
|
|
|
.div(txMeta.swapMetaData.token_to_amount, 10)
|
|
|
|
.times(100)
|
|
|
|
.round(2)}%`
|
|
|
|
: null;
|
2020-11-03 00:41:28 +01:00
|
|
|
|
2022-02-18 17:48:38 +01:00
|
|
|
const estimatedVsUsedGasRatio =
|
|
|
|
txMeta.txReceipt.gasUsed && txMeta.swapMetaData.estimated_gas
|
|
|
|
? `${new BigNumber(txMeta.txReceipt.gasUsed, 16)
|
|
|
|
.div(txMeta.swapMetaData.estimated_gas, 10)
|
|
|
|
.times(100)
|
|
|
|
.round(2)}%`
|
|
|
|
: null;
|
2020-10-13 20:41:26 +02:00
|
|
|
|
2022-05-09 18:48:14 +02:00
|
|
|
const transactionsCost = this._calculateTransactionsCost(
|
|
|
|
txMeta,
|
|
|
|
approvalTxMeta,
|
|
|
|
);
|
|
|
|
|
2020-10-21 23:10:55 +02:00
|
|
|
this._trackMetaMetricsEvent({
|
2020-10-08 18:41:23 +02:00
|
|
|
event: 'Swap Completed',
|
2022-04-22 18:09:10 +02:00
|
|
|
category: EVENT.CATEGORIES.SWAPS,
|
2020-12-02 22:41:30 +01:00
|
|
|
sensitiveProperties: {
|
2020-10-08 18:41:23 +02:00
|
|
|
...txMeta.swapMetaData,
|
|
|
|
token_to_amount_received: tokensReceived,
|
|
|
|
quote_vs_executionRatio: quoteVsExecutionRatio,
|
2020-10-13 20:41:26 +02:00
|
|
|
estimated_vs_used_gasRatio: estimatedVsUsedGasRatio,
|
2022-05-09 18:48:14 +02:00
|
|
|
approval_gas_cost_in_eth: transactionsCost.approvalGasCostInEth,
|
|
|
|
trade_gas_cost_in_eth: transactionsCost.tradeGasCostInEth,
|
|
|
|
trade_and_approval_gas_cost_in_eth:
|
|
|
|
transactionsCost.tradeAndApprovalGasCostInEth,
|
2020-10-08 18:41:23 +02:00
|
|
|
},
|
2021-02-04 19:15:23 +01:00
|
|
|
});
|
2020-10-08 18:41:23 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-24 21:00:54 +02:00
|
|
|
|
2022-08-18 15:49:50 +02:00
|
|
|
/**
|
|
|
|
* The allowance amount in relation to the dapp proposed amount for specific token
|
|
|
|
*
|
|
|
|
* @param {string} transactionApprovalAmountType - The transaction approval amount type
|
|
|
|
* @param {string} originalApprovalAmount - The original approval amount is the originally dapp proposed token amount
|
|
|
|
* @param {string} finalApprovalAmount - The final approval amount is the chosen amount which will be the same as the
|
|
|
|
* originally dapp proposed token amount if the user does not edit the amount or will be a custom token amount set by the user
|
|
|
|
*/
|
|
|
|
_allowanceAmountInRelationToDappProposedValue(
|
|
|
|
transactionApprovalAmountType,
|
|
|
|
originalApprovalAmount,
|
|
|
|
finalApprovalAmount,
|
|
|
|
) {
|
|
|
|
if (
|
|
|
|
transactionApprovalAmountType ===
|
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE.CUSTOM &&
|
|
|
|
originalApprovalAmount &&
|
|
|
|
finalApprovalAmount
|
|
|
|
) {
|
|
|
|
return `${new BigNumber(originalApprovalAmount, 10)
|
|
|
|
.div(finalApprovalAmount, 10)
|
|
|
|
.times(100)
|
|
|
|
.round(2)}`;
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The allowance amount in relation to the balance for that specific token
|
|
|
|
*
|
|
|
|
* @param {string} transactionApprovalAmountType - The transaction approval amount type
|
|
|
|
* @param {string} dappProposedTokenAmount - The dapp proposed token amount
|
|
|
|
* @param {string} currentTokenBalance - The balance of the token that is being send
|
|
|
|
*/
|
|
|
|
_allowanceAmountInRelationToTokenBalance(
|
|
|
|
transactionApprovalAmountType,
|
|
|
|
dappProposedTokenAmount,
|
|
|
|
currentTokenBalance,
|
|
|
|
) {
|
|
|
|
if (
|
|
|
|
(transactionApprovalAmountType ===
|
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE.CUSTOM ||
|
|
|
|
transactionApprovalAmountType ===
|
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE.DAPP_PROPOSED) &&
|
|
|
|
dappProposedTokenAmount &&
|
|
|
|
currentTokenBalance
|
|
|
|
) {
|
|
|
|
return `${new BigNumber(dappProposedTokenAmount, 16)
|
|
|
|
.div(currentTokenBalance, 10)
|
|
|
|
.times(100)
|
|
|
|
.round(2)}`;
|
|
|
|
}
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
2022-01-31 18:27:46 +01:00
|
|
|
async _buildEventFragmentProperties(txMeta, extraParams) {
|
2021-06-24 21:00:54 +02:00
|
|
|
const {
|
|
|
|
type,
|
|
|
|
time,
|
|
|
|
status,
|
|
|
|
chainId,
|
|
|
|
origin: referrer,
|
2021-10-22 22:42:20 +02:00
|
|
|
txParams: {
|
|
|
|
gasPrice,
|
|
|
|
gas: gasLimit,
|
|
|
|
maxFeePerGas,
|
|
|
|
maxPriorityFeePerGas,
|
|
|
|
estimateSuggested,
|
|
|
|
estimateUsed,
|
|
|
|
},
|
2022-01-31 18:27:46 +01:00
|
|
|
defaultGasEstimates,
|
2022-07-28 15:46:20 +02:00
|
|
|
originalType,
|
2022-08-02 17:53:09 +02:00
|
|
|
replacedById,
|
2021-06-24 21:00:54 +02:00
|
|
|
metamaskNetworkId: network,
|
2022-09-28 13:38:22 +02:00
|
|
|
customTokenAmount,
|
|
|
|
dappProposedTokenAmount,
|
|
|
|
currentTokenBalance,
|
|
|
|
originalApprovalAmount,
|
|
|
|
finalApprovalAmount,
|
|
|
|
contractMethodName,
|
2021-06-24 21:00:54 +02:00
|
|
|
} = txMeta;
|
2022-09-28 13:38:22 +02:00
|
|
|
|
2022-04-26 19:07:39 +02:00
|
|
|
const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp';
|
2021-06-24 21:00:54 +02:00
|
|
|
|
2022-03-16 23:15:03 +01:00
|
|
|
const { assetType, tokenStandard } = await determineTransactionAssetType(
|
|
|
|
txMeta,
|
|
|
|
this.query,
|
|
|
|
this.getTokenStandardAndDetails,
|
|
|
|
);
|
|
|
|
|
2021-06-29 23:54:42 +02:00
|
|
|
const gasParams = {};
|
|
|
|
|
|
|
|
if (isEIP1559Transaction(txMeta)) {
|
|
|
|
gasParams.max_fee_per_gas = maxFeePerGas;
|
|
|
|
gasParams.max_priority_fee_per_gas = maxPriorityFeePerGas;
|
|
|
|
} else {
|
|
|
|
gasParams.gas_price = gasPrice;
|
|
|
|
}
|
|
|
|
|
2022-01-31 18:27:46 +01:00
|
|
|
if (defaultGasEstimates) {
|
|
|
|
const { estimateType } = defaultGasEstimates;
|
|
|
|
if (estimateType) {
|
|
|
|
gasParams.default_estimate = estimateType;
|
|
|
|
let defaultMaxFeePerGas = txMeta.defaultGasEstimates.maxFeePerGas;
|
|
|
|
let defaultMaxPriorityFeePerGas =
|
|
|
|
txMeta.defaultGasEstimates.maxPriorityFeePerGas;
|
|
|
|
|
|
|
|
if (
|
|
|
|
[
|
|
|
|
GAS_RECOMMENDATIONS.LOW,
|
|
|
|
GAS_RECOMMENDATIONS.MEDIUM,
|
|
|
|
GAS_RECOMMENDATIONS.MEDIUM.HIGH,
|
|
|
|
].includes(estimateType)
|
|
|
|
) {
|
|
|
|
const { gasFeeEstimates } = await this._getEIP1559GasFeeEstimates();
|
|
|
|
if (gasFeeEstimates?.[estimateType]?.suggestedMaxFeePerGas) {
|
|
|
|
defaultMaxFeePerGas =
|
|
|
|
gasFeeEstimates[estimateType]?.suggestedMaxFeePerGas;
|
|
|
|
gasParams.default_max_fee_per_gas = defaultMaxFeePerGas;
|
|
|
|
}
|
|
|
|
if (gasFeeEstimates?.[estimateType]?.suggestedMaxPriorityFeePerGas) {
|
|
|
|
defaultMaxPriorityFeePerGas =
|
|
|
|
gasFeeEstimates[estimateType]?.suggestedMaxPriorityFeePerGas;
|
2022-07-31 20:26:40 +02:00
|
|
|
gasParams.default_max_priority_fee_per_gas =
|
|
|
|
defaultMaxPriorityFeePerGas;
|
2022-01-31 18:27:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (txMeta.defaultGasEstimates.gas) {
|
|
|
|
gasParams.default_gas = txMeta.defaultGasEstimates.gas;
|
|
|
|
}
|
|
|
|
if (txMeta.defaultGasEstimates.gasPrice) {
|
|
|
|
gasParams.default_gas_price = txMeta.defaultGasEstimates.gasPrice;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-22 22:42:20 +02:00
|
|
|
if (estimateSuggested) {
|
|
|
|
gasParams.estimate_suggested = estimateSuggested;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (estimateUsed) {
|
|
|
|
gasParams.estimate_used = estimateUsed;
|
|
|
|
}
|
|
|
|
|
2022-05-18 23:54:38 +02:00
|
|
|
if (extraParams?.gas_used) {
|
|
|
|
gasParams.gas_used = extraParams.gas_used;
|
|
|
|
}
|
|
|
|
|
2021-07-12 19:54:39 +02:00
|
|
|
const gasParamsInGwei = this._getGasValuesInGWEI(gasParams);
|
|
|
|
|
2022-01-31 18:27:46 +01:00
|
|
|
let eip1559Version = '0';
|
|
|
|
if (txMeta.txParams.maxFeePerGas) {
|
|
|
|
const { eip1559V2Enabled } = this.preferencesStore.getState();
|
|
|
|
eip1559Version = eip1559V2Enabled ? '2' : '1';
|
|
|
|
}
|
|
|
|
|
2022-07-22 19:45:04 +02:00
|
|
|
const contractInteractionTypes = [
|
|
|
|
TRANSACTION_TYPES.CONTRACT_INTERACTION,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
|
|
|
|
TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
|
|
|
|
TRANSACTION_TYPES.SMART,
|
|
|
|
TRANSACTION_TYPES.SWAP,
|
|
|
|
TRANSACTION_TYPES.SWAP_APPROVAL,
|
|
|
|
].includes(type);
|
|
|
|
|
2022-08-18 15:49:50 +02:00
|
|
|
const contractMethodNames = {
|
|
|
|
APPROVE: 'Approve',
|
|
|
|
};
|
|
|
|
|
|
|
|
let transactionApprovalAmountType;
|
2022-07-25 18:26:02 +02:00
|
|
|
let transactionContractMethod;
|
2022-08-18 15:49:50 +02:00
|
|
|
let transactionApprovalAmountVsProposedRatio;
|
|
|
|
let transactionApprovalAmountVsBalanceRatio;
|
|
|
|
let transactionType = TRANSACTION_TYPES.SIMPLE_SEND;
|
2022-07-22 19:45:04 +02:00
|
|
|
if (type === TRANSACTION_TYPES.CANCEL) {
|
|
|
|
transactionType = TRANSACTION_TYPES.CANCEL;
|
|
|
|
} else if (type === TRANSACTION_TYPES.RETRY) {
|
2022-07-28 15:46:20 +02:00
|
|
|
transactionType = originalType;
|
2022-07-22 19:45:04 +02:00
|
|
|
} else if (type === TRANSACTION_TYPES.DEPLOY_CONTRACT) {
|
|
|
|
transactionType = TRANSACTION_TYPES.DEPLOY_CONTRACT;
|
|
|
|
} else if (contractInteractionTypes) {
|
|
|
|
transactionType = TRANSACTION_TYPES.CONTRACT_INTERACTION;
|
2022-09-28 13:38:22 +02:00
|
|
|
transactionContractMethod = contractMethodName;
|
2022-08-18 15:49:50 +02:00
|
|
|
if (
|
|
|
|
transactionContractMethod === contractMethodNames.APPROVE &&
|
|
|
|
tokenStandard === TOKEN_STANDARDS.ERC20
|
|
|
|
) {
|
|
|
|
if (dappProposedTokenAmount === '0' || customTokenAmount === '0') {
|
|
|
|
transactionApprovalAmountType =
|
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE.REVOKE;
|
|
|
|
} else if (customTokenAmount) {
|
|
|
|
transactionApprovalAmountType =
|
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE.CUSTOM;
|
|
|
|
} else if (dappProposedTokenAmount) {
|
|
|
|
transactionApprovalAmountType =
|
|
|
|
TRANSACTION_APPROVAL_AMOUNT_TYPE.DAPP_PROPOSED;
|
|
|
|
}
|
|
|
|
transactionApprovalAmountVsProposedRatio =
|
|
|
|
this._allowanceAmountInRelationToDappProposedValue(
|
|
|
|
transactionApprovalAmountType,
|
|
|
|
originalApprovalAmount,
|
|
|
|
finalApprovalAmount,
|
|
|
|
);
|
|
|
|
transactionApprovalAmountVsBalanceRatio =
|
|
|
|
this._allowanceAmountInRelationToTokenBalance(
|
|
|
|
transactionApprovalAmountType,
|
|
|
|
dappProposedTokenAmount,
|
|
|
|
currentTokenBalance,
|
|
|
|
);
|
|
|
|
}
|
2022-07-22 19:45:04 +02:00
|
|
|
}
|
|
|
|
|
2022-08-02 17:53:09 +02:00
|
|
|
const replacedTxMeta = this._getTransaction(replacedById);
|
|
|
|
|
|
|
|
const TRANSACTION_REPLACEMENT_METHODS = {
|
|
|
|
RETRY: TRANSACTION_TYPES.RETRY,
|
|
|
|
CANCEL: TRANSACTION_TYPES.CANCEL,
|
|
|
|
SAME_NONCE: 'other',
|
|
|
|
};
|
|
|
|
|
|
|
|
let transactionReplaced;
|
|
|
|
if (extraParams?.dropped) {
|
|
|
|
transactionReplaced = TRANSACTION_REPLACEMENT_METHODS.SAME_NONCE;
|
|
|
|
if (replacedTxMeta?.type === TRANSACTION_TYPES.CANCEL) {
|
|
|
|
transactionReplaced = TRANSACTION_REPLACEMENT_METHODS.CANCEL;
|
|
|
|
} else if (replacedTxMeta?.type === TRANSACTION_TYPES.RETRY) {
|
|
|
|
transactionReplaced = TRANSACTION_REPLACEMENT_METHODS.RETRY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-18 15:49:50 +02:00
|
|
|
let properties = {
|
2022-01-20 17:26:39 +01:00
|
|
|
chain_id: chainId,
|
|
|
|
referrer,
|
|
|
|
source,
|
|
|
|
network,
|
2022-01-31 18:27:46 +01:00
|
|
|
eip_1559_version: eip1559Version,
|
2022-02-01 18:53:03 +01:00
|
|
|
gas_edit_type: 'none',
|
|
|
|
gas_edit_attempted: 'none',
|
2022-02-23 16:15:41 +01:00
|
|
|
account_type: await this.getAccountType(this.getSelectedAddress()),
|
|
|
|
device_model: await this.getDeviceModel(this.getSelectedAddress()),
|
2022-03-16 23:15:03 +01:00
|
|
|
asset_type: assetType,
|
|
|
|
token_standard: tokenStandard,
|
2022-07-22 19:45:04 +02:00
|
|
|
transaction_type: transactionType,
|
2022-07-28 15:46:20 +02:00
|
|
|
transaction_speed_up: type === TRANSACTION_TYPES.RETRY,
|
2022-01-20 17:26:39 +01:00
|
|
|
};
|
|
|
|
|
2022-08-18 15:49:50 +02:00
|
|
|
if (transactionContractMethod === contractMethodNames.APPROVE) {
|
|
|
|
properties = {
|
|
|
|
...properties,
|
|
|
|
transaction_approval_amount_type: transactionApprovalAmountType,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
let sensitiveProperties = {
|
2022-01-20 17:26:39 +01:00
|
|
|
status,
|
|
|
|
transaction_envelope_type: isEIP1559Transaction(txMeta)
|
|
|
|
? TRANSACTION_ENVELOPE_TYPE_NAMES.FEE_MARKET
|
|
|
|
: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
|
|
|
|
first_seen: time,
|
|
|
|
gas_limit: gasLimit,
|
2022-07-22 19:45:04 +02:00
|
|
|
transaction_contract_method: transactionContractMethod,
|
2022-08-02 17:53:09 +02:00
|
|
|
transaction_replaced: transactionReplaced,
|
2022-01-20 17:26:39 +01:00
|
|
|
...extraParams,
|
2022-05-18 23:54:38 +02:00
|
|
|
...gasParamsInGwei,
|
2022-01-20 17:26:39 +01:00
|
|
|
};
|
|
|
|
|
2022-08-18 15:49:50 +02:00
|
|
|
if (transactionContractMethod === contractMethodNames.APPROVE) {
|
|
|
|
sensitiveProperties = {
|
|
|
|
...sensitiveProperties,
|
|
|
|
transaction_approval_amount_vs_balance_ratio:
|
|
|
|
transactionApprovalAmountVsBalanceRatio,
|
|
|
|
transaction_approval_amount_vs_proposed_ratio:
|
|
|
|
transactionApprovalAmountVsProposedRatio,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2022-01-20 17:26:39 +01:00
|
|
|
return { properties, sensitiveProperties };
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Helper method that checks for the presence of an existing fragment by id
|
|
|
|
* appropriate for the type of event that triggered fragment creation. If the
|
|
|
|
* appropriate fragment exists, then nothing is done. If it does not exist a
|
|
|
|
* new event fragment is created with the appropriate payload.
|
|
|
|
*
|
|
|
|
* @param {TransactionMeta} txMeta - Transaction meta object
|
|
|
|
* @param {TransactionMetaMetricsEventString} event - The event type that
|
|
|
|
* triggered fragment creation
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} properties - properties to include in the fragment
|
|
|
|
* @param {object} [sensitiveProperties] - sensitive properties to include in
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {object} [actionId] - actionId passed from UI
|
2022-01-20 17:26:39 +01:00
|
|
|
* the fragment
|
|
|
|
*/
|
|
|
|
_createTransactionEventFragment(
|
|
|
|
txMeta,
|
|
|
|
event,
|
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
) {
|
|
|
|
const isSubmitted = [
|
|
|
|
TRANSACTION_EVENTS.FINALIZED,
|
|
|
|
TRANSACTION_EVENTS.SUBMITTED,
|
|
|
|
].includes(event);
|
|
|
|
const uniqueIdentifier = `transaction-${
|
|
|
|
isSubmitted ? 'submitted' : 'added'
|
|
|
|
}-${txMeta.id}`;
|
|
|
|
|
|
|
|
const fragment = this.getEventFragmentById(uniqueIdentifier);
|
|
|
|
if (typeof fragment !== 'undefined') {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
// When a transaction is added to the controller, we know that the user
|
|
|
|
// will be presented with a confirmation screen. The user will then
|
|
|
|
// either confirm or reject that transaction. Each has an associated
|
|
|
|
// event we want to track. While we don't necessarily need an event
|
|
|
|
// fragment to model this, having one allows us to record additional
|
|
|
|
// properties onto the event from the UI. For example, when the user
|
|
|
|
// edits the transactions gas params we can record that property and
|
|
|
|
// then get analytics on the number of transactions in which gas edits
|
|
|
|
// occur.
|
|
|
|
case TRANSACTION_EVENTS.ADDED:
|
|
|
|
this.createEventFragment({
|
2022-04-22 18:09:10 +02:00
|
|
|
category: EVENT.CATEGORIES.TRANSACTIONS,
|
2022-01-20 17:26:39 +01:00
|
|
|
initialEvent: TRANSACTION_EVENTS.ADDED,
|
|
|
|
successEvent: TRANSACTION_EVENTS.APPROVED,
|
|
|
|
failureEvent: TRANSACTION_EVENTS.REJECTED,
|
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
|
|
|
persist: true,
|
|
|
|
uniqueIdentifier,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
});
|
|
|
|
break;
|
|
|
|
// If for some reason an approval or rejection occurs without the added
|
|
|
|
// fragment existing in memory, we create the added fragment but without
|
|
|
|
// the initialEvent firing. This is to prevent possible duplication of
|
|
|
|
// events. A good example why this might occur is if the user had
|
|
|
|
// unapproved transactions in memory when updating to the version that
|
|
|
|
// includes this change. A migration would have also helped here but this
|
|
|
|
// implementation hardens against other possible bugs where a fragment
|
|
|
|
// does not exist.
|
|
|
|
case TRANSACTION_EVENTS.APPROVED:
|
|
|
|
case TRANSACTION_EVENTS.REJECTED:
|
|
|
|
this.createEventFragment({
|
2022-04-22 18:09:10 +02:00
|
|
|
category: EVENT.CATEGORIES.TRANSACTIONS,
|
2022-01-20 17:26:39 +01:00
|
|
|
successEvent: TRANSACTION_EVENTS.APPROVED,
|
|
|
|
failureEvent: TRANSACTION_EVENTS.REJECTED,
|
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
|
|
|
persist: true,
|
|
|
|
uniqueIdentifier,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
});
|
|
|
|
break;
|
|
|
|
// When a transaction is submitted it will always result in updating
|
|
|
|
// to a finalized state (dropped, failed, confirmed) -- eventually.
|
|
|
|
// However having a fragment started at this stage allows augmenting
|
|
|
|
// analytics data with user interactions such as speeding up and
|
|
|
|
// canceling the transactions. From this controllers perspective a new
|
|
|
|
// transaction with a new id is generated for speed up and cancel
|
|
|
|
// transactions, but from the UI we could augment the previous ID with
|
|
|
|
// supplemental data to show user intent. Such as when they open the
|
|
|
|
// cancel UI but don't submit. We can record that this happened and add
|
|
|
|
// properties to the transaction event.
|
|
|
|
case TRANSACTION_EVENTS.SUBMITTED:
|
|
|
|
this.createEventFragment({
|
2022-04-22 18:09:10 +02:00
|
|
|
category: EVENT.CATEGORIES.TRANSACTIONS,
|
2022-01-20 17:26:39 +01:00
|
|
|
initialEvent: TRANSACTION_EVENTS.SUBMITTED,
|
|
|
|
successEvent: TRANSACTION_EVENTS.FINALIZED,
|
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
|
|
|
persist: true,
|
|
|
|
uniqueIdentifier,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
});
|
|
|
|
break;
|
|
|
|
// If for some reason a transaction is finalized without the submitted
|
|
|
|
// fragment existing in memory, we create the submitted fragment but
|
|
|
|
// without the initialEvent firing. This is to prevent possible
|
|
|
|
// duplication of events. A good example why this might occur is if th
|
|
|
|
// user had pending transactions in memory when updating to the version
|
|
|
|
// that includes this change. A migration would have also helped here but
|
|
|
|
// this implementation hardens against other possible bugs where a
|
|
|
|
// fragment does not exist.
|
|
|
|
case TRANSACTION_EVENTS.FINALIZED:
|
|
|
|
this.createEventFragment({
|
2022-04-22 18:09:10 +02:00
|
|
|
category: EVENT.CATEGORIES.TRANSACTIONS,
|
2022-01-20 17:26:39 +01:00
|
|
|
successEvent: TRANSACTION_EVENTS.FINALIZED,
|
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
|
|
|
persist: true,
|
|
|
|
uniqueIdentifier,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
});
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Extracts relevant properties from a transaction meta
|
|
|
|
* object and uses them to create and send metrics for various transaction
|
|
|
|
* events.
|
|
|
|
*
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} txMeta - the txMeta object
|
2022-01-20 17:26:39 +01:00
|
|
|
* @param {TransactionMetaMetricsEventString} event - the name of the transaction event
|
2022-09-16 19:04:14 +02:00
|
|
|
* @param {string} actionId - actionId passed from UI
|
2022-07-27 15:28:05 +02:00
|
|
|
* @param {object} extraParams - optional props and values to include in sensitiveProperties
|
2022-01-20 17:26:39 +01:00
|
|
|
*/
|
2022-09-16 19:04:14 +02:00
|
|
|
async _trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
event,
|
|
|
|
actionId,
|
|
|
|
extraParams = {},
|
|
|
|
) {
|
2022-01-20 17:26:39 +01:00
|
|
|
if (!txMeta) {
|
|
|
|
return;
|
|
|
|
}
|
2022-07-31 20:26:40 +02:00
|
|
|
const { properties, sensitiveProperties } =
|
|
|
|
await this._buildEventFragmentProperties(txMeta, extraParams);
|
2022-01-20 17:26:39 +01:00
|
|
|
|
|
|
|
// Create event fragments for event types that spawn fragments, and ensure
|
|
|
|
// existence of fragments for event types that act upon them.
|
|
|
|
this._createTransactionEventFragment(
|
|
|
|
txMeta,
|
2021-06-24 21:00:54 +02:00
|
|
|
event,
|
2022-01-20 17:26:39 +01:00
|
|
|
properties,
|
|
|
|
sensitiveProperties,
|
2022-09-16 19:04:14 +02:00
|
|
|
actionId,
|
2022-01-20 17:26:39 +01:00
|
|
|
);
|
|
|
|
|
|
|
|
let id;
|
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
// If the user approves a transaction, finalize the transaction added
|
|
|
|
// event fragment.
|
|
|
|
case TRANSACTION_EVENTS.APPROVED:
|
|
|
|
id = `transaction-added-${txMeta.id}`;
|
|
|
|
this.updateEventFragment(id, { properties, sensitiveProperties });
|
|
|
|
this.finalizeEventFragment(id);
|
|
|
|
break;
|
|
|
|
// If the user rejects a transaction, finalize the transaction added
|
|
|
|
// event fragment. with the abandoned flag set.
|
|
|
|
case TRANSACTION_EVENTS.REJECTED:
|
|
|
|
id = `transaction-added-${txMeta.id}`;
|
|
|
|
this.updateEventFragment(id, { properties, sensitiveProperties });
|
|
|
|
this.finalizeEventFragment(id, {
|
|
|
|
abandoned: true,
|
|
|
|
});
|
|
|
|
break;
|
|
|
|
// When a transaction is finalized, also finalize the transaction
|
|
|
|
// submitted event fragment.
|
|
|
|
case TRANSACTION_EVENTS.FINALIZED:
|
|
|
|
id = `transaction-submitted-${txMeta.id}`;
|
|
|
|
this.updateEventFragment(id, { properties, sensitiveProperties });
|
|
|
|
this.finalizeEventFragment(`transaction-submitted-${txMeta.id}`);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2021-06-24 21:00:54 +02:00
|
|
|
}
|
|
|
|
|
2021-07-12 19:14:54 +02:00
|
|
|
_getTransactionCompletionTime(submittedTime) {
|
|
|
|
return Math.round((Date.now() - submittedTime) / 1000).toString();
|
2021-06-24 21:00:54 +02:00
|
|
|
}
|
|
|
|
|
2021-07-12 19:54:39 +02:00
|
|
|
_getGasValuesInGWEI(gasParams) {
|
|
|
|
const gasValuesInGwei = {};
|
|
|
|
for (const param in gasParams) {
|
|
|
|
if (isHexString(gasParams[param])) {
|
|
|
|
gasValuesInGwei[param] = hexWEIToDecGWEI(gasParams[param]);
|
2021-10-22 22:42:20 +02:00
|
|
|
} else {
|
|
|
|
gasValuesInGwei[param] = gasParams[param];
|
2021-07-12 19:54:39 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return gasValuesInGwei;
|
|
|
|
}
|
|
|
|
|
2022-09-16 19:04:14 +02:00
|
|
|
_failTransaction(txId, error, actionId) {
|
2021-06-24 21:00:54 +02:00
|
|
|
this.txStateManager.setTxStatusFailed(txId, error);
|
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2022-09-16 19:04:14 +02:00
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.FINALIZED,
|
|
|
|
actionId,
|
|
|
|
{
|
|
|
|
error: error.message,
|
|
|
|
},
|
|
|
|
);
|
2021-06-24 21:00:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
_dropTransaction(txId) {
|
|
|
|
this.txStateManager.setTxStatusDropped(txId);
|
|
|
|
const txMeta = this.txStateManager.getTransaction(txId);
|
2022-09-16 19:04:14 +02:00
|
|
|
this._trackTransactionMetricsEvent(
|
|
|
|
txMeta,
|
|
|
|
TRANSACTION_EVENTS.FINALIZED,
|
|
|
|
undefined,
|
|
|
|
{
|
|
|
|
dropped: true,
|
|
|
|
},
|
|
|
|
);
|
2021-06-24 21:00:54 +02:00
|
|
|
}
|
2018-04-13 22:18:45 +02:00
|
|
|
}
|