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.

Sign up for GitHub

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

Jump to bottom

feat: add types for bridge txs #4714

Merged
merged 7 commits into from
Oct 3, 2024
Merged

feat: add types for bridge txs #4714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
431700a
feat: add types for bridge txs
infiniteflower Sep 18, 2024
3acf0e4
fix: broken tests
infiniteflower Sep 26, 2024
6d2b34c
Update packages/transaction-controller/src/types.ts
infiniteflower Sep 26, 2024
4da8e75
chore: make types in alphabetical order
infiniteflower Sep 26, 2024
5c98d7b
fix: failing test
infiniteflower Sep 26, 2024
a8c143b
Merge branch 'main' into feat/bridge-tx-type
infiniteflower Oct 2, 2024
53c4b9f
Merge branch 'main' into feat/bridge-tx-type
infiniteflower Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/transaction-controller/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,23 @@ export enum WalletDevice {
* The type of the transaction.
*/
export enum TransactionType {
/**
* A transaction that bridges tokens to a different chain through Metamask Bridge.
*/
// TODO: Either fix this lint violation or explain why it's necessary to ignore.
// eslint-disable-next-line @typescript-eslint/naming-convention
bridge = 'bridge',

/**
* Similar to the approve type, a bridge approval is a special case of ERC20
* approve method that requests an allowance of the token to spend on behalf
* of the user for the MetaMask Bridge contract. The first bridge for any token
* will have an accompanying bridgeApproval transaction.
*/
// TODO: Either fix this lint violation or explain why it's necessary to ignore.
// eslint-disable-next-line @typescript-eslint/naming-convention
bridgeApproval = 'bridgeApproval',

/**
* A transaction sending a network's native asset to a recipient.
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/user-operation-controller/src/utils/validation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ describe('validation', () => {
'type',
'wrong type',
123,
'Expected one of `"cancel","contractInteraction","contractDeployment","eth_decrypt","eth_getEncryptionPublicKey","incoming","personal_sign","retry","simpleSend","eth_signTypedData","smart","swap","swapAndSend","swapApproval","approve","safetransferfrom","transfer","transferfrom","setapprovalforall","increaseAllowance"`, but received: 123',
'Expected one of `"bridge","bridgeApproval","cancel","contractInteraction","contractDeployment","eth_decrypt","eth_getEncryptionPublicKey","incoming","personal_sign","retry","simpleSend","eth_signTypedData","smart","swap","swapAndSend","swapApproval","approve","safetransferfrom","transfer","transferfrom","setapprovalforall","increaseAllowance"`, but received: 123',
],
])(
'throws if %s is %s',
Expand Down
Loading