Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate TransactionController to BaseController v2 #3827

Merged
merged 28 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
aecf377
Migrate TransactionController to BaseController v2
mcmire Jan 9, 2024
a20638b
Move setupController to the top of the test file
mcmire Feb 29, 2024
a471219
Convert another instance of transactionStatusUpdated back to onTransa…
mcmire Feb 29, 2024
7dacf8e
Add back or remove whitespace changes
mcmire Feb 29, 2024
981b33c
Bring back removed test
mcmire Feb 29, 2024
71ccbc8
Bring back this merge call
mcmire Feb 29, 2024
62c198c
Address one more merge
mcmire Feb 29, 2024
867b00e
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Feb 29, 2024
d64e96f
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Feb 29, 2024
60cb169
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Feb 29, 2024
5a49f71
Remove all `: TransactionMeta` annotations that are not part of a fun…
MajorLift Feb 29, 2024
45fba26
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Mar 4, 2024
55dd546
Rename incomingTransactionBlock to incomingTransactionBlockReceived
mcmire Mar 5, 2024
07b1a68
Tweak test names to reflect new name of messenger events, and that th…
mcmire Mar 5, 2024
06fae6d
No need to be _so_ explicit
mcmire Mar 5, 2024
de1f551
Tweak JSDoc
mcmire Mar 5, 2024
07b4147
Rename txHistoryLimit to transactionHistoryLimit
mcmire Mar 5, 2024
5cc6411
Alphabetize options (minus hooks)
mcmire Mar 5, 2024
563ec54
PendingTransactionTracker doesn't use the return value of approveTran…
mcmire Mar 5, 2024
38824a3
Keep early return
mcmire Mar 6, 2024
3d930c3
Fix index.ts
mcmire Mar 6, 2024
53232c5
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Mar 6, 2024
40f49f3
Fix e2e test failures on extension by deep cloning
mcmire Mar 6, 2024
d8339f7
Update security code scanner file (#4025)
metamaskbot Mar 6, 2024
98e0bae
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Mar 6, 2024
5b928d0
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Mar 7, 2024
c680c66
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Mar 7, 2024
b99411a
Merge branch 'main' into upgrade-transaction-controller-to-base-contr…
mcmire Mar 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/transaction-controller/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ module.exports = merge(baseConfig, {
// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
global: {
branches: 91.89,
functions: 98.86,
lines: 98.96,
statements: 98.97,
branches: 91.79,
functions: 98.37,
lines: 98.83,
statements: 98.84,
},
},

Expand Down
1 change: 1 addition & 0 deletions packages/transaction-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"@types/jest": "^27.4.1",
"@types/node": "^16.18.54",
"deepmerge": "^4.2.2",
"immer": "^9.0.6",
"jest": "^27.5.1",
"nock": "^13.3.1",
"sinon": "^9.2.4",
Expand Down