m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Make EIP1559 compatibility in tx controller also require account type support (#11616)

Browse Source
This commit is contained in:
Dan J Miller 2021-07-27 20:43:48 -02:30 committed by GitHub
parent 9a81b826c5
commit 7c86727c16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/scripts/controllers/transactions/index.js
View File

@ -95,7 +95,10 @@ export default class TransactionController extends EventEmitter {
this.networkStore = opts.networkStore || new ObservableStore({}); this.networkStore = opts.networkStore || new ObservableStore({});
this._getCurrentChainId = opts.getCurrentChainId; this._getCurrentChainId = opts.getCurrentChainId;
this.getProviderConfig = opts.getProviderConfig; this.getProviderConfig = opts.getProviderConfig;
this.getEIP1559Compatibility = opts.getEIP1559Compatibility; this._getCurrentNetworkEIP1559Compatibility =
opts.getCurrentNetworkEIP1559Compatibility;
this._getCurrentAccountEIP1559Compatibility =
opts.getCurrentAccountEIP1559Compatibility;
this.preferencesStore = opts.preferencesStore || new ObservableStore({}); this.preferencesStore = opts.preferencesStore || new ObservableStore({});
this.provider = opts.provider; this.provider = opts.provider;
this.getPermittedAccounts = opts.getPermittedAccounts; this.getPermittedAccounts = opts.getPermittedAccounts;
@ -177,6 +180,14 @@ export default class TransactionController extends EventEmitter {
return integerChainId; return integerChainId;
} }
async getEIP1559Compatibility(fromAddress) {
const currentNetworkIsCompatible = await this._getCurrentNetworkEIP1559Compatibility();
const fromAccountIsCompatible = this._getCurrentAccountEIP1559Compatibility(
fromAddress,
);
return currentNetworkIsCompatible && fromAccountIsCompatible;
}
/** /**
* @ethereumjs/tx uses @ethereumjs/common as a configuration tool for * @ethereumjs/tx uses @ethereumjs/common as a configuration tool for
* specifying which chain, network, hardfork and EIPs to support for * specifying which chain, network, hardfork and EIPs to support for
@ -185,9 +196,9 @@ export default class TransactionController extends EventEmitter {
* transaction type to use. * transaction type to use.
* @returns {Common} common configuration object * @returns {Common} common configuration object
*/ */
async getCommonConfiguration() { async getCommonConfiguration(fromAddress) {
const { type, nickname: name } = this.getProviderConfig(); const { type, nickname: name } = this.getProviderConfig();
const supportsEIP1559 = await this.getEIP1559Compatibility(); const supportsEIP1559 = await this.getEIP1559Compatibility(fromAddress);
// This logic below will have to be updated each time a hardfork happens // 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 // that carries with it a new Transaction type. It is inconsequential for
@ -739,7 +750,7 @@ export default class TransactionController extends EventEmitter {
}; };
// sign tx // sign tx
const fromAddress = txParams.from; const fromAddress = txParams.from;
const common = await this.getCommonConfiguration(); const common = await this.getCommonConfiguration(txParams.from);
const unsignedEthTx = TransactionFactory.fromTxData(txParams, { common }); const unsignedEthTx = TransactionFactory.fromTxData(txParams, { common });
const signedEthTx = await this.signEthTx(unsignedEthTx, fromAddress); const signedEthTx = await this.signEthTx(unsignedEthTx, fromAddress);

2
app/scripts/controllers/transactions/index.test.js
View File

@ -51,6 +51,8 @@ describe('Transaction Controller', function () {
}, },
networkStore: new ObservableStore(currentNetworkId), networkStore: new ObservableStore(currentNetworkId),
getEIP1559Compatibility: () => Promise.resolve(true), getEIP1559Compatibility: () => Promise.resolve(true),
getCurrentNetworkEIP1559Compatibility: () => Promise.resolve(true),
getCurrentAccountEIP1559Compatibility: () => true,
txHistoryLimit: 10, txHistoryLimit: 10,
blockTracker: blockTrackerStub, blockTracker: blockTrackerStub,
signTransaction: (ethTx) => signTransaction: (ethTx) =>

14
app/scripts/metamask-controller.js
View File

@ -401,9 +401,12 @@ export default class MetamaskController extends EventEmitter {
getProviderConfig: this.networkController.getProviderConfig.bind( getProviderConfig: this.networkController.getProviderConfig.bind(
this.networkController, this.networkController,
), ),
getEIP1559Compatibility: this.networkController.getEIP1559Compatibility.bind( getCurrentNetworkEIP1559Compatibility: this.networkController.getEIP1559Compatibility.bind(
this.networkController, this.networkController,
), ),
getCurrentAccountEIP1559Compatibility: this.getCurrentAccountEIP1559Compatibility.bind(
this,
),
networkStore: this.networkController.networkStore, networkStore: this.networkController.networkStore,
getCurrentChainId: this.networkController.getCurrentChainId.bind( getCurrentChainId: this.networkController.getCurrentChainId.bind(
this.networkController, this.networkController,
@ -2037,11 +2040,10 @@ export default class MetamaskController extends EventEmitter {
* client utilities for EIP-1559 * client utilities for EIP-1559
* @returns {boolean} true if the keyring type supports EIP-1559 * @returns {boolean} true if the keyring type supports EIP-1559
*/ */
getCurrentAccountEIP1559Compatibility() { getCurrentAccountEIP1559Compatibility(fromAddress) {
const selectedAddress = this.preferencesController.getSelectedAddress(); const address =
const keyring = this.keyringController.getKeyringForAccount( fromAddress || this.preferencesController.getSelectedAddress();
selectedAddress, const keyring = this.keyringController.getKeyringForAccount(address);
);
return ( return (
keyring.type !== KEYRING_TYPES.LEDGER && keyring.type !== KEYRING_TYPES.LEDGER &&
keyring.type !== KEYRING_TYPES.TREZOR keyring.type !== KEYRING_TYPES.TREZOR