TransactionController networkClientId updates #3652
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jiexi
changed the title
…FeeEstimates options
jiexi
changed the title
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
| @@ -1912,7 +1958,7 @@ export class TransactionController extends BaseControllerV1< | |||
| /** | |||
| * Create approvals for all unapproved transactions on current chain. | |||
| */ | |||
| private createApprovalsForUnapprovedTransactions() { | |||
| private createApprovalsForUnapprovedTransactions() { // NOTE(JL): this doesn't seem to be used anywhere. Can we remove it? | |||
jiexi
reviewed
Dec 13, 2023
| @@ -2109,7 +2155,7 @@ export class TransactionController extends BaseControllerV1< | |||
|
|
|||
| transactionMeta.status = TransactionStatus.approved; | |||
| transactionMeta.txParams.nonce = nonce; | |||
| transactionMeta.txParams.chainId = chainId; | |||
| transactionMeta.txParams.chainId = chainId; // NOTE(JL): should this be coming from txMeta instead of the currentChainId? | |||
There was a problem hiding this comment.
Probably can come from txMeta. Update this in another branch against main
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
jiexi
reviewed
Dec 13, 2023
shanejonas
pushed a commit
that referenced
this pull request
Dec 15, 2023
* Update `getCurrentNetworkEIP1559Compatibility` hook type to accept optional networkClientId param * It already does this in networkController, but perhaps it should be renamed getEIP1559Compatibility? * Update `getExternalPendingTransactions` hook type to accept optional chainId param * SmartTransactionController and extension need to be updated * Add `getNetworkClientIdForDomain` hook to constructor param * Add `getEthQuery` method that accepts optional networkClientId and returns the correct EthQuery instance * Update `addTransaction` * Add optional `networkClientId` to options object param * Use correct networkClientId/chainId * Update `stopTransaction` to use correct networkClientId/chainId * Update `estimateGas` * Add optional `networkClientId` param * Use correct networkClientId/chainId * Update `estimateGasBuffered` to accept optional networkClientId * SmartTransactionController and extension need to be updated * Update `updateGasProperties` to use correct networkClientId (from txMeta) * Update `approveTransaction` to use correct networkClientId (from txMeta) * Update `publishTransaction` to accept required ethQuery * Update `getEIP1559Compatibility` to accept optional networkClientId * GasFeeController has a similar method of it's own that we may need to update * Update `getNonceTrackerPendingTransactions` to pass `chainId` to `getExternalPendingTransactions` * Add optional `networkClientId` to `TransactionMeta` type * Update `UpdateGasRequest` to accept either providerConfig or NetworkClientConfiguration * Probably should rename the arg from `providerConfig` Questions: * should `wipeTransactions` be updated to filter by optional chainId? * should `getNonceLock` take in chainId (non-optional) to get correct nonceTracker nonceLock? * should `getTransactions` accept chainId and/or networkClientId param for filtering? * `createApprovalsForUnapprovedTransactions` isn't used anywhere in our repos? Remove it? * `approveTransaction` sets txMeta.txParams.chainId to the currentChainId. Shouldn't it read the value from txMeta instead? * shouldn't `addExternalTransaction` filter against the txMeta chainId, not the currentChainId? * shouldn't `markNonceDuplicatesDropped ` filter against the txMeta chainId, not the currentChainId? --------- Co-authored-by: Jiexi Luan <[email protected]>
shanejonas
pushed a commit
that referenced
this pull request
Dec 15, 2023
* Update `getCurrentNetworkEIP1559Compatibility` hook type to accept optional networkClientId param * It already does this in networkController, but perhaps it should be renamed getEIP1559Compatibility? * Update `getExternalPendingTransactions` hook type to accept optional chainId param * SmartTransactionController and extension need to be updated * Add `getNetworkClientIdForDomain` hook to constructor param * Add `getEthQuery` method that accepts optional networkClientId and returns the correct EthQuery instance * Update `addTransaction` * Add optional `networkClientId` to options object param * Use correct networkClientId/chainId * Update `stopTransaction` to use correct networkClientId/chainId * Update `estimateGas` * Add optional `networkClientId` param * Use correct networkClientId/chainId * Update `estimateGasBuffered` to accept optional networkClientId * SmartTransactionController and extension need to be updated * Update `updateGasProperties` to use correct networkClientId (from txMeta) * Update `approveTransaction` to use correct networkClientId (from txMeta) * Update `publishTransaction` to accept required ethQuery * Update `getEIP1559Compatibility` to accept optional networkClientId * GasFeeController has a similar method of it's own that we may need to update * Update `getNonceTrackerPendingTransactions` to pass `chainId` to `getExternalPendingTransactions` * Add optional `networkClientId` to `TransactionMeta` type * Update `UpdateGasRequest` to accept either providerConfig or NetworkClientConfiguration * Probably should rename the arg from `providerConfig` Questions: * should `wipeTransactions` be updated to filter by optional chainId? * should `getNonceLock` take in chainId (non-optional) to get correct nonceTracker nonceLock? * should `getTransactions` accept chainId and/or networkClientId param for filtering? * `createApprovalsForUnapprovedTransactions` isn't used anywhere in our repos? Remove it? * `approveTransaction` sets txMeta.txParams.chainId to the currentChainId. Shouldn't it read the value from txMeta instead? * shouldn't `addExternalTransaction` filter against the txMeta chainId, not the currentChainId? * shouldn't `markNonceDuplicatesDropped ` filter against the txMeta chainId, not the currentChainId? --------- Co-authored-by: Jiexi Luan <[email protected]>
shanejonas
pushed a commit
that referenced
this pull request
Jan 8, 2024
* Update `getCurrentNetworkEIP1559Compatibility` hook type to accept optional networkClientId param * It already does this in networkController, but perhaps it should be renamed getEIP1559Compatibility? * Update `getExternalPendingTransactions` hook type to accept optional chainId param * SmartTransactionController and extension need to be updated * Add `getNetworkClientIdForDomain` hook to constructor param * Add `getEthQuery` method that accepts optional networkClientId and returns the correct EthQuery instance * Update `addTransaction` * Add optional `networkClientId` to options object param * Use correct networkClientId/chainId * Update `stopTransaction` to use correct networkClientId/chainId * Update `estimateGas` * Add optional `networkClientId` param * Use correct networkClientId/chainId * Update `estimateGasBuffered` to accept optional networkClientId * SmartTransactionController and extension need to be updated * Update `updateGasProperties` to use correct networkClientId (from txMeta) * Update `approveTransaction` to use correct networkClientId (from txMeta) * Update `publishTransaction` to accept required ethQuery * Update `getEIP1559Compatibility` to accept optional networkClientId * GasFeeController has a similar method of it's own that we may need to update * Update `getNonceTrackerPendingTransactions` to pass `chainId` to `getExternalPendingTransactions` * Add optional `networkClientId` to `TransactionMeta` type * Update `UpdateGasRequest` to accept either providerConfig or NetworkClientConfiguration * Probably should rename the arg from `providerConfig` Questions: * should `wipeTransactions` be updated to filter by optional chainId? * should `getNonceLock` take in chainId (non-optional) to get correct nonceTracker nonceLock? * should `getTransactions` accept chainId and/or networkClientId param for filtering? * `createApprovalsForUnapprovedTransactions` isn't used anywhere in our repos? Remove it? * `approveTransaction` sets txMeta.txParams.chainId to the currentChainId. Shouldn't it read the value from txMeta instead? * shouldn't `addExternalTransaction` filter against the txMeta chainId, not the currentChainId? * shouldn't `markNonceDuplicatesDropped ` filter against the txMeta chainId, not the currentChainId? --------- Co-authored-by: Jiexi Luan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
getCurrentNetworkEIP1559Compatibilityhook type to accept optional networkClientId paramgetExternalPendingTransactionshook type to accept optional chainId paramgetNetworkClientIdForDomainhook to constructor paramgetEthQuerymethod that accepts optional networkClientId and returns the correct EthQuery instanceaddTransactionnetworkClientIdto options object paramstopTransactionto use correct networkClientId/chainIdestimateGasnetworkClientIdparamestimateGasBufferedto accept optional networkClientIdupdateGasPropertiesto use correct networkClientId (from txMeta)approveTransactionto use correct networkClientId (from txMeta)publishTransactionto accept required ethQuerygetEIP1559Compatibilityto accept optional networkClientIdgetNonceTrackerPendingTransactionsto passchainIdtogetExternalPendingTransactionsnetworkClientIdtoTransactionMetatypeUpdateGasRequestto accept either providerConfig or NetworkClientConfigurationproviderConfigQuestions:
wipeTransactionsbe updated to filter by optional chainId?getNonceLocktake in chainId (non-optional) to get correct nonceTracker nonceLock?getTransactionsaccept chainId and/or networkClientId param for filtering?createApprovalsForUnapprovedTransactionsisn't used anywhere in our repos? Remove it?approveTransactionsets txMeta.txParams.chainId to the currentChainId. Shouldn't it read the value from txMeta instead?addExternalTransactionfilter against the txMeta chainId, not the currentChainId?markNonceDuplicatesDroppedfilter against the txMeta chainId, not the currentChainId?