@metamask/transaction-controller 4.0.1 → 6.0.0

package/CHANGELOG.md

@@ -6,6 +6,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.0.0]
+### Added
+- Update transaction controller to automatically initiate, finalize, and cancel approval requests as transactions move through states ([#1241](https://github.com/MetaMask/core/pull/1241))
+  - The `ApprovalController:addRequest` action will be called when a new transaction is initiated
+  - The `ApprovalController:rejectRequest` action will be called if a transaction fails
+  - The `ApprovalController:acceptRequest` action will be called when a transaction is approved 
+
+### Changed
+- **BREAKING:** Bump to Node 16 ([#1262](https://github.com/MetaMask/core/pull/1262))
+- **BREAKING:** Update `@metamask/network-controller` dependency and peer dependency ([#1367](https://github.com/MetaMask/core/pull/1367))
+  - This affects the `getNetworkState` and `onNetworkStateChange` constructor parameters
+- **BREAKING:** Change format of chain ID in state to `Hex` ([#1367](https://github.com/MetaMask/core/pull/1367))
+  - The `chainId` property of the `Transaction` type has been changed from `number` to `Hex`
+  - The `chainId` property of the `TransactionMeta` type has been changed from a decimal `string` to `Hex`, and the `transaction` property has been updated along with the `Transaction` type (as described above).
+  - The state property `transactions` is an array of `TransactionMeta` objects, so it has changed according to the description above.
+    - This requires a state migration: each entry should have the `chainId` property converted from a decimal `string` to `Hex`, and the `transaction.chainId` property changed from `number` to `Hex`.
+  - The `addTransaction` and `estimateGas` methods now expect the first parameter (`transaction`) to use type `Hex` for the `chainId` property.
+  - The `updateTransaction` method now expects the `transactionMeta` parameter to use type `Hex` for the `chainId` property (and for the nested `transaction.chainId` property)
+- **BREAKING:** Add `messenger` as required constructor parameter ([#1241](https://github.com/MetaMask/core/pull/1241))
+- **BREAKING:** Add `@metamask/approval-controller` as a dependency and peer dependency ([#1241](https://github.com/MetaMask/core/pull/1241), [#1393](https://github.com/MetaMask/core/pull/1393))
+- Add `@metamask/utils` dependency ([#1367](https://github.com/MetaMask/core/pull/1367))
+
+### Fixed
+- Fix inaccurate hard-coded `chainId` on incoming token transactions ([#1366](https://github.com/MetaMask/core/pull/1366))
+
+## [5.0.0]
+### Changed
+- **BREAKING**: peerDeps: @metamask/network-controller@6.0.0->8.0.0 ([#1196](https://github.com/MetaMask/core/pull/1196))
+- deps: eth-rpc-errors@4.0.0->4.0.2 ([#1215](https://github.com/MetaMask/core/pull/1215))
+- Add nonce tracker to transactions controller ([#1147](https://github.com/MetaMask/core/pull/1147))
+  - Previously this controller would get the next nonce by calling `eth_getTransactionCount` with a block reference of `pending`.  The next nonce would then be returned from our middleware (within `web3-provider-engine`).
+  - Instead we're now using the nonce tracker to get the next nonce, dropping our reliance on this `eth_getTransactionCount` middleware. This will let us drop that middleware in a future update without impacting the transaction controller.
+  - This should result in no functional changes, except that the nonce middleware is no longer required.
+
 ## [4.0.1]
 ### Changed
 - Use `NetworkType` enum for chain configuration ([#1132](https://github.com/MetaMask/core/pull/1132))
@@ -23,7 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - **BREAKING**: Drop Etherscan API support for Ropsten, Rinkeby, and Kovan ([#1041](https://github.com/MetaMask/controllers/pull/1041))
 - Rename this repository to `core` ([#1031](https://github.com/MetaMask/controllers/pull/1031))
-- Update `@metamask/controller-utils` package ([#1041](https://github.com/MetaMask/controllers/pull/1041)) 
+- Update `@metamask/controller-utils` package ([#1041](https://github.com/MetaMask/controllers/pull/1041))
 
 ## [2.0.0]
 ### Changed
@@ -39,7 +73,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@4.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@6.0.0...HEAD
+[6.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@5.0.0...@metamask/transaction-controller@6.0.0
+[5.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@4.0.1...@metamask/transaction-controller@5.0.0
 [4.0.1]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@4.0.0...@metamask/transaction-controller@4.0.1
 [4.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@3.0.0...@metamask/transaction-controller@4.0.0
 [3.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@2.0.0...@metamask/transaction-controller@3.0.0

package/dist/TransactionController.d.ts

@@ -2,8 +2,10 @@
 import { EventEmitter } from 'events';
 import Common from '@ethereumjs/common';
 import { TypedTransaction } from '@ethereumjs/tx';
-import { BaseController, BaseConfig, BaseState } from '@metamask/base-controller';
-import type { NetworkState, ProviderProxy } from '@metamask/network-controller';
+import type { Hex } from '@metamask/utils';
+import { BaseController, BaseConfig, BaseState, RestrictedControllerMessenger } from '@metamask/base-controller';
+import type { NetworkState, ProviderProxy, BlockTrackerProxy } from '@metamask/network-controller';
+import { AcceptRequest as AcceptApprovalRequest, AddApprovalRequest, RejectRequest as RejectApprovalRequest } from '@metamask/approval-controller';
 /**
  * @type Result
  * @property result - Promise resolving to a new transaction hash
@@ -37,7 +39,7 @@ export interface FetchAllOptions {
  * @property value - Value associated with this transaction
  */
 export interface Transaction {
-    chainId?: number;
+    chainId?: Hex;
     data?: string;
     from: string;
     gas?: string;
@@ -90,7 +92,7 @@ declare type TransactionMetaBase = {
     };
     id: string;
     networkID?: string;
-    chainId?: string;
+    chainId?: Hex;
     origin?: string;
     rawTransaction?: string;
     time: number;
@@ -212,15 +214,30 @@ export declare const CANCEL_RATE = 1.5;
  * Multiplier used to determine a transaction's increased gas fee during speed up
  */
 export declare const SPEED_UP_RATE = 1.1;
+/**
+ * The name of the {@link TransactionController}.
+ */
+declare const controllerName = "TransactionController";
+/**
+ * The external actions available to the {@link TransactionController}.
+ */
+declare type AllowedActions = AddApprovalRequest | AcceptApprovalRequest | RejectApprovalRequest;
+/**
+ * The messenger of the {@link TransactionController}.
+ */
+export declare type TransactionControllerMessenger = RestrictedControllerMessenger<typeof controllerName, AllowedActions, never, AllowedActions['type'], never>;
 /**
  * Controller responsible for submitting and managing transactions.
  */
 export declare class TransactionController extends BaseController<TransactionConfig, TransactionState> {
     private ethQuery;
+    private nonceTracker;
     private registry;
+    private provider;
     private handle?;
     private mutex;
     private getNetworkState;
+    private messagingSystem;
     private failTransaction;
     private registryLookup;
     /**
@@ -252,14 +269,18 @@ export declare class TransactionController extends BaseController<TransactionCon
      * @param options - The controller options.
      * @param options.getNetworkState - Gets the state of the network controller.
      * @param options.onNetworkStateChange - Allows subscribing to network controller state changes.
-     * @param options.getProvider - Returns a provider for the current network.
+     * @param options.provider - The provider used to create the underlying EthQuery instance.
+     * @param options.blockTracker - The block tracker used to poll for new blocks data.
+     * @param options.messenger - The controller messenger.
      * @param config - Initial options used to configure this controller.
      * @param state - Initial state to set on this controller.
      */
-    constructor({ getNetworkState, onNetworkStateChange, getProvider, }: {
+    constructor({ getNetworkState, onNetworkStateChange, provider, blockTracker, messenger, }: {
         getNetworkState: () => NetworkState;
         onNetworkStateChange: (listener: (state: NetworkState) => void) => void;
-        getProvider: () => ProviderProxy;
+        provider: ProviderProxy;
+        blockTracker: BlockTrackerProxy;
+        messenger: TransactionControllerMessenger;
     }, config?: Partial<TransactionConfig>, state?: Partial<TransactionState>);
     /**
      * Starts a new polling interval.
@@ -317,7 +338,7 @@ export declare class TransactionController extends BaseController<TransactionCon
      * and emitting a `<tx.id>:finished` hub event.
      *
      * @param transactionID - The ID of the transaction to cancel.
-     * @param gasValues - The gas values to use for the cancellation transation.
+     * @param gasValues - The gas values to use for the cancellation transaction.
      */
     stopTransaction(transactionID: string, gasValues?: GasPriceValue | FeeMarketEIP1559Values): Promise<void>;
     /**
@@ -462,5 +483,10 @@ export declare class TransactionController extends BaseController<TransactionCon
      * @returns Whether the gas data is outdated.
      */
     private isGasDataOutdated;
+    private requestApproval;
+    private acceptApproval;
+    private rejectApproval;
+    private getApprovalId;
 }
 export default TransactionController;
+//# sourceMappingURL=TransactionController.d.ts.map

package/dist/TransactionController.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TransactionController.d.ts","sourceRoot":"","sources":["../src/TransactionController.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAKtC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAsB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,cAAc,EACd,UAAU,EACV,SAAS,EACT,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AActC,OAAO,EACL,aAAa,IAAI,qBAAqB,EACtC,kBAAkB,EAClB,aAAa,IAAI,qBAAqB,EACvC,MAAM,+BAA+B,CAAC;AAkBvC;;;;GAIG;AACH,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;CAClC;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED;;;;GAIG;AACH,oBAAY,iBAAiB;IAC3B,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,UAAU,eAAe;CAC1B;AAED;;GAEG;AACH,oBAAY,YAAY;IACtB,SAAS,oBAAoB;IAC7B,YAAY,uBAAuB;IACnC,KAAK,iBAAiB;CACvB;AAED,aAAK,mBAAmB,GAAG;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mBAAmB,CAAC,EAAE;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,EAAE,MAAM,CAAC;QACxB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,YAAY,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,oBAAY,eAAe,GACvB,CAAC;IACC,MAAM,EAAE,OAAO,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;CAC9D,GAAG,mBAAmB,CAAC,GACxB,CAAC;IAAE,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAAG,mBAAmB,CAAC,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChE,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;CAC3C;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,MAAM,CAAC;AAE/B;;GAEG;AACH,eAAO,MAAM,aAAa,MAAM,CAAC;AAEjC;;GAEG;AACH,QAAA,MAAM,cAAc,0BAA0B,CAAC;AAE/C;;GAEG;AACH,aAAK,cAAc,GACf,kBAAkB,GAClB,qBAAqB,GACrB,qBAAqB,CAAC;AAE1B;;GAEG;AACH,oBAAY,8BAA8B,GAAG,6BAA6B,CACxE,OAAO,cAAc,EACrB,cAAc,EACd,KAAK,EACL,cAAc,CAAC,MAAM,CAAC,EACtB,KAAK,CACN,CAAC;AAEF;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,cAAc,CACvD,iBAAiB,EACjB,gBAAgB,CACjB;IACC,OAAO,CAAC,QAAQ,CAAW;IAE3B,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,QAAQ,CAAM;IAEtB,OAAO,CAAC,QAAQ,CAAgB;IAEhC,OAAO,CAAC,MAAM,CAAC,CAAgC;IAE/C,OAAO,CAAC,KAAK,CAAe;IAE5B,OAAO,CAAC,eAAe,CAAqB;IAE5C,OAAO,CAAC,eAAe,CAAiC;IAExD,OAAO,CAAC,eAAe;YAUT,cAAc;IAM5B;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW;IA0CnB,OAAO,CAAC,gBAAgB,CA0CtB;IAEF;;OAEG;IACH,GAAG,eAAsB;IAEzB;;OAEG;IACM,IAAI,SAA2B;IAExC;;OAEG;IACH,IAAI,CAAC,EAAE,CACL,WAAW,EAAE,gBAAgB,EAC7B,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE/B;;;;;;;;;;;OAWG;gBAED,EACE,eAAe,EACf,oBAAoB,EACpB,QAAQ,EACR,YAAY,EACZ,SAAS,GACV,EAAE;QACD,eAAe,EAAE,MAAM,YAAY,CAAC;QACpC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,KAAK,IAAI,CAAC;QACxE,QAAQ,EAAE,aAAa,CAAC;QACxB,YAAY,EAAE,iBAAiB,CAAC;QAChC,SAAS,EAAE,8BAA8B,CAAC;KAC3C,EACD,MAAM,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,EACnC,KAAK,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;IA0CnC;;;;OAIG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5C;;;;;OAKG;IACG,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAoBnE;;;;;;;;;OASG;IACG,cAAc,CAClB,WAAW,EAAE,WAAW,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,iBAAiB,CAAC,EAAE,YAAY,GAC/B,OAAO,CAAC,MAAM,CAAC;IAmElB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,gBAAgB;IAOzE;;;;;;;;OAQG;IAEH,sBAAsB,IAAI,MAAM;IAuBhC;;;;;;;OAOG;IACG,kBAAkB,CAAC,aAAa,EAAE,MAAM;IA4F9C;;;;;OAKG;IACH,iBAAiB,CAAC,aAAa,EAAE,MAAM;IAgBvC;;;;;;OAMG;IACG,eAAe,CACnB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,aAAa,GAAG,sBAAsB;IA6FpD;;;;;OAKG;IACG,kBAAkB,CACtB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,aAAa,GAAG,sBAAsB;IAoHpD;;;;;OAKG;IACG,WAAW,CAAC,WAAW,EAAE,WAAW;;;;;;;;;IA6E1C;;;OAGG;IACG,wBAAwB;IAmC9B;;;;OAIG;IACH,iBAAiB,CAAC,eAAe,EAAE,eAAe;IAWlD;;;;;OAKG;IACH,gBAAgB,CAAC,aAAa,CAAC,EAAE,OAAO;IAwBxC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAoFzB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,wBAAwB;IA0BhC;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IASpB;;;;;OAKG;YACW,oCAAoC;IA4DlD;;;;;;;;OAQG;YACW,4BAA4B;IAa1C;;;;;;OAMG;IACH,OAAO,CAAC,mCAAmC;IA0B3C;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB;IAY1B;;;;;;;;OAQG;IACH,OAAO,CAAC,sBAAsB;IAe9B;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;;;;OAQG;IACH,OAAO,CAAC,gBAAgB;IASxB;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;YAOX,eAAe;IAyB7B,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,aAAa;CAGtB;AAED,eAAe,qBAAqB,CAAC"}

package/dist/TransactionController.js

@@ -24,6 +24,7 @@ const uuid_1 = require("uuid");
 const async_mutex_1 = require("async-mutex");
 const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
+const nonce_tracker_1 = __importDefault(require("nonce-tracker"));
 const utils_1 = require("./utils");
 const HARDFORK = 'london';
 /**
@@ -59,6 +60,10 @@ exports.CANCEL_RATE = 1.5;
  * Multiplier used to determine a transaction's increased gas fee during speed up
  */
 exports.SPEED_UP_RATE = 1.1;
+/**
+ * The name of the {@link TransactionController}.
+ */
+const controllerName = 'TransactionController';
 /**
  * Controller responsible for submitting and managing transactions.
  */
@@ -69,11 +74,13 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options - The controller options.
      * @param options.getNetworkState - Gets the state of the network controller.
      * @param options.onNetworkStateChange - Allows subscribing to network controller state changes.
-     * @param options.getProvider - Returns a provider for the current network.
+     * @param options.provider - The provider used to create the underlying EthQuery instance.
+     * @param options.blockTracker - The block tracker used to poll for new blocks data.
+     * @param options.messenger - The controller messenger.
      * @param config - Initial options used to configure this controller.
      * @param state - Initial state to set on this controller.
      */
-    constructor({ getNetworkState, onNetworkStateChange, getProvider, }, config, state) {
+    constructor({ getNetworkState, onNetworkStateChange, provider, blockTracker, messenger, }, config, state) {
         super(config, state);
         this.mutex = new async_mutex_1.Mutex();
         this.normalizeTokenTx = (txMeta, currentNetworkID, currentChainId) => {
@@ -87,7 +94,7 @@ class TransactionController extends base_controller_1.BaseController {
                 status: TransactionStatus.confirmed,
                 time,
                 transaction: {
-                    chainId: 1,
+                    chainId: currentChainId,
                     from,
                     gas,
                     gasPrice,
@@ -121,14 +128,20 @@ class TransactionController extends base_controller_1.BaseController {
             transactions: [],
         };
         this.initialize();
-        const provider = getProvider();
+        this.provider = provider;
+        this.messagingSystem = messenger;
         this.getNetworkState = getNetworkState;
         this.ethQuery = new eth_query_1.default(provider);
         this.registry = new eth_method_registry_1.default({ provider });
+        this.nonceTracker = new nonce_tracker_1.default({
+            provider,
+            blockTracker,
+            getPendingTransactions: (address) => (0, utils_1.getAndFormatTransactionsForNonceTracker)(address, TransactionStatus.submitted, this.state.transactions),
+            getConfirmedTransactions: (address) => (0, utils_1.getAndFormatTransactionsForNonceTracker)(address, TransactionStatus.confirmed, this.state.transactions),
+        });
         onNetworkStateChange(() => {
-            const newProvider = getProvider();
-            this.ethQuery = new eth_query_1.default(newProvider);
-            this.registry = new eth_method_registry_1.default({ provider: newProvider });
+            this.ethQuery = new eth_query_1.default(this.provider);
+            this.registry = new eth_method_registry_1.default({ provider: this.provider });
         });
         this.poll();
     }
@@ -234,13 +247,13 @@ class TransactionController extends base_controller_1.BaseController {
      */
     addTransaction(transaction, origin, deviceConfirmedOn) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { providerConfig, network } = this.getNetworkState();
+            const { providerConfig, networkId } = this.getNetworkState();
             const { transactions } = this.state;
             transaction = (0, utils_1.normalizeTransaction)(transaction);
             (0, utils_1.validateTransaction)(transaction);
             const transactionMeta = {
                 id: (0, uuid_1.v1)(),
-                networkID: network,
+                networkID: networkId !== null && networkId !== void 0 ? networkId : undefined,
                 chainId: providerConfig.chainId,
                 origin,
                 status: TransactionStatus.unapproved,
@@ -278,6 +291,7 @@ class TransactionController extends base_controller_1.BaseController {
             transactions.push(transactionMeta);
             this.update({ transactions: this.trimTransactionsForState(transactions) });
             this.hub.emit(`unapprovedTransaction`, transactionMeta);
+            this.requestApproval(transactionMeta);
             return { result, transactionMeta };
         });
     }
@@ -297,14 +311,14 @@ class TransactionController extends base_controller_1.BaseController {
      * @returns {Common} common configuration object
      */
     getCommonConfiguration() {
-        const { network: networkId, providerConfig: { type: chain, chainId, nickname: name }, } = this.getNetworkState();
+        const { networkId, providerConfig: { type: chain, chainId, nickname: name }, } = this.getNetworkState();
         if (chain !== controller_utils_1.RPC) {
             return new common_1.default({ chain, hardfork: HARDFORK });
         }
         const customChainParams = {
             name,
-            chainId: parseInt(chainId, undefined),
-            networkId: parseInt(networkId, undefined),
+            chainId: parseInt(chainId, 16),
+            networkId: networkId === null ? NaN : parseInt(networkId, undefined),
         };
         return common_1.default.forCustomChain(controller_utils_1.NetworkType.mainnet, customChainParams, HARDFORK);
     }
@@ -321,30 +335,36 @@ class TransactionController extends base_controller_1.BaseController {
             const { transactions } = this.state;
             const releaseLock = yield this.mutex.acquire();
             const { providerConfig } = this.getNetworkState();
-            const { chainId: currentChainId } = providerConfig;
+            const { chainId } = providerConfig;
             const index = transactions.findIndex(({ id }) => transactionID === id);
             const transactionMeta = transactions[index];
-            const { nonce } = transactionMeta.transaction;
+            const { transaction: { nonce, from }, } = transactionMeta;
+            let nonceLock;
             try {
-                const { from } = transactionMeta.transaction;
                 if (!this.sign) {
                     releaseLock();
                     this.failTransaction(transactionMeta, new Error('No sign method defined.'));
+                    this.rejectApproval(transactionMeta);
                     return;
                 }
-                else if (!currentChainId) {
+                else if (!chainId) {
                     releaseLock();
                     this.failTransaction(transactionMeta, new Error('No chainId defined.'));
+                    this.rejectApproval(transactionMeta);
                     return;
                 }
-                const chainId = parseInt(currentChainId, undefined);
                 const { approved: status } = TransactionStatus;
-                const txNonce = nonce ||
-                    (yield (0, controller_utils_1.query)(this.ethQuery, 'getTransactionCount', [from, 'pending']));
+                let nonceToUse = nonce;
+                // if a nonce already exists on the transactionMeta it means this is a speedup or cancel transaction
+                // so we want to reuse that nonce and hope that it beats the previous attempt to chain. Otherwise use a new locked nonce
+                if (!nonceToUse) {
+                    nonceLock = yield this.nonceTracker.getNonceLock(from);
+                    nonceToUse = (0, ethereumjs_util_1.addHexPrefix)(nonceLock.nextNonce.toString(16));
+                }
                 transactionMeta.status = status;
-                transactionMeta.transaction.nonce = txNonce;
+                transactionMeta.transaction.nonce = nonceToUse;
                 transactionMeta.transaction.chainId = chainId;
-                const baseTxParams = Object.assign(Object.assign({}, transactionMeta.transaction), { gasLimit: transactionMeta.transaction.gas, chainId, nonce: txNonce, status });
+                const baseTxParams = Object.assign(Object.assign({}, transactionMeta.transaction), { gasLimit: transactionMeta.transaction.gas });
                 const isEIP1559 = (0, utils_1.isEIP1559Transaction)(transactionMeta.transaction);
                 const txParams = isEIP1559
                     ? Object.assign(Object.assign({}, baseTxParams), { maxFeePerGas: transactionMeta.transaction.maxFeePerGas, maxPriorityFeePerGas: transactionMeta.transaction.maxPriorityFeePerGas, estimatedBaseFee: transactionMeta.transaction.estimatedBaseFee, 
@@ -368,11 +388,17 @@ class TransactionController extends base_controller_1.BaseController {
                 transactionMeta.status = TransactionStatus.submitted;
                 this.updateTransaction(transactionMeta);
                 this.hub.emit(`${transactionMeta.id}:finished`, transactionMeta);
+                this.acceptApproval(transactionMeta);
             }
             catch (error) {
                 this.failTransaction(transactionMeta, error);
+                this.rejectApproval(transactionMeta);
             }
             finally {
+                // must set transaction to submitted/failed before releasing lock
+                if (nonceLock) {
+                    nonceLock.releaseLock();
+                }
                 releaseLock();
             }
         });
@@ -392,13 +418,14 @@ class TransactionController extends base_controller_1.BaseController {
         this.hub.emit(`${transactionMeta.id}:finished`, transactionMeta);
         const transactions = this.state.transactions.filter(({ id }) => id !== transactionID);
         this.update({ transactions: this.trimTransactionsForState(transactions) });
+        this.rejectApproval(transactionMeta);
     }
     /**
      * Attempts to cancel a transaction based on its ID by setting its status to "rejected"
      * and emitting a `<tx.id>:finished` hub event.
      *
      * @param transactionID - The ID of the transaction to cancel.
-     * @param gasValues - The gas values to use for the cancellation transation.
+     * @param gasValues - The gas values to use for the cancellation transaction.
      */
     stopTransaction(transactionID, gasValues) {
         var _a, _b;
@@ -458,6 +485,7 @@ class TransactionController extends base_controller_1.BaseController {
             yield (0, controller_utils_1.query)(this.ethQuery, 'sendRawTransaction', [rawTransaction]);
             transactionMeta.status = TransactionStatus.cancelled;
             this.hub.emit(`${transactionMeta.id}:finished`, transactionMeta);
+            this.rejectApproval(transactionMeta);
         });
     }
     /**
@@ -531,7 +559,8 @@ class TransactionController extends base_controller_1.BaseController {
             const gasPrice = typeof providedGasPrice === 'undefined'
                 ? yield (0, controller_utils_1.query)(this.ethQuery, 'gasPrice')
                 : providedGasPrice;
-            const { isCustomNetwork } = this.getNetworkState();
+            const { providerConfig } = this.getNetworkState();
+            const isCustomNetwork = providerConfig.type === controller_utils_1.NetworkType.rpc;
             // 1. If gas is already defined on the transaction, use it
             if (typeof gas !== 'undefined') {
                 return { gas, gasPrice };
@@ -595,7 +624,7 @@ class TransactionController extends base_controller_1.BaseController {
     queryTransactionStatuses() {
         return __awaiter(this, void 0, void 0, function* () {
             const { transactions } = this.state;
-            const { providerConfig, network: currentNetworkID } = this.getNetworkState();
+            const { providerConfig, networkId: currentNetworkID } = this.getNetworkState();
             const { chainId: currentChainId } = providerConfig;
             let gotUpdates = false;
             yield (0, controller_utils_1.safelyExecute)(() => Promise.all(transactions.map((meta, index) => __awaiter(this, void 0, void 0, function* () {
@@ -644,7 +673,7 @@ class TransactionController extends base_controller_1.BaseController {
             this.update({ transactions: [] });
             return;
         }
-        const { providerConfig, network: currentNetworkID } = this.getNetworkState();
+        const { providerConfig, networkId: currentNetworkID } = this.getNetworkState();
         const { chainId: currentChainId } = providerConfig;
         const newTransactions = this.state.transactions.filter(({ networkID, chainId }) => {
             // Using fallback to networkID only when there is no chainId present. Should be removed when networkID is completely removed.
@@ -667,12 +696,13 @@ class TransactionController extends base_controller_1.BaseController {
      */
     fetchAll(address, opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { providerConfig, network: currentNetworkID } = this.getNetworkState();
+            const { providerConfig, networkId: currentNetworkID } = this.getNetworkState();
             const { chainId: currentChainId, type: networkType } = providerConfig;
             const { transactions } = this.state;
             const supportedNetworkIds = ['1', '5', '11155111'];
             /* istanbul ignore next */
-            if (supportedNetworkIds.indexOf(currentNetworkID) === -1) {
+            if (currentNetworkID === null ||
+                supportedNetworkIds.indexOf(currentNetworkID) === -1) {
                 return undefined;
             }
             const [etherscanTxResponse, etherscanTokenResponse] = yield (0, utils_1.handleTransactionFetch)(networkType, address, this.config.txHistoryLimit, opt);
@@ -738,7 +768,7 @@ class TransactionController extends base_controller_1.BaseController {
         const txsToKeep = transactions.reverse().filter((tx) => {
             const { chainId, networkID, status, transaction, time } = tx;
             if (transaction) {
-                const key = `${transaction.nonce}-${chainId !== null && chainId !== void 0 ? chainId : networkID}-${new Date(time).toDateString()}`;
+                const key = `${transaction.nonce}-${chainId ? (0, controller_utils_1.convertHexToDecimal)(chainId) : networkID}-${new Date(time).toDateString()}`;
                 if (nonceNetworkSet.has(key)) {
                     return true;
                 }
@@ -921,6 +951,46 @@ class TransactionController extends base_controller_1.BaseController {
     isGasDataOutdated(remoteGasUsed, localGasUsed) {
         return remoteGasUsed !== localGasUsed;
     }
+    requestApproval(txMeta, { shouldShowRequest } = { shouldShowRequest: true }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const id = this.getApprovalId(txMeta);
+            const { origin } = txMeta;
+            const type = controller_utils_1.ApprovalType.Transaction;
+            const requestData = { txId: txMeta.id };
+            try {
+                yield this.messagingSystem.call('ApprovalController:addRequest', {
+                    id,
+                    origin: origin || controller_utils_1.ORIGIN_METAMASK,
+                    type,
+                    requestData,
+                }, shouldShowRequest);
+            }
+            catch (error) {
+                console.info('Failed to request transaction approval', error);
+            }
+        });
+    }
+    acceptApproval(txMeta) {
+        const id = this.getApprovalId(txMeta);
+        try {
+            this.messagingSystem.call('ApprovalController:acceptRequest', id);
+        }
+        catch (error) {
+            console.info('Failed to accept transaction approval request', error);
+        }
+    }
+    rejectApproval(txMeta) {
+        const id = this.getApprovalId(txMeta);
+        try {
+            this.messagingSystem.call('ApprovalController:rejectRequest', id, new Error('Rejected'));
+        }
+        catch (error) {
+            console.info('Failed to reject transaction approval request', error);
+        }
+    }
+    getApprovalId(txMeta) {
+        return String(txMeta.id);
+    }
 }
 exports.TransactionController = TransactionController;
 exports.default = TransactionController;