Commit f15c67e
committed
fix(transaction-controller): allow nested batch transactions with duplicate batchId when requireApproval is false
When a dapp triggers addTransactionBatch with a gas fee token, the nested
ERC-20 fee-payment transaction is submitted via addTransaction with the same
batchId as the parent batch and requireApproval: false. The existing duplicate-
batch-ID guard was incorrectly throwing DuplicateBundleId (error code 5720)
for these nested transactions.
Guard now only applies when requireApproval is not false, since nested batch
transactions always pass requireApproval: false to distinguish them from
top-level dapp duplicate attempts.1 parent 7c30d1d commit f15c67e
3 files changed
Lines changed: 35 additions & 1 deletion
File tree
- packages/transaction-controller
- src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
10 | 15 | | |
11 | 16 | | |
12 | 17 | | |
| |||
Lines changed: 29 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3739 | 3739 | | |
3740 | 3740 | | |
3741 | 3741 | | |
| 3742 | + | |
| 3743 | + | |
| 3744 | + | |
| 3745 | + | |
| 3746 | + | |
| 3747 | + | |
| 3748 | + | |
| 3749 | + | |
| 3750 | + | |
| 3751 | + | |
| 3752 | + | |
| 3753 | + | |
| 3754 | + | |
| 3755 | + | |
| 3756 | + | |
| 3757 | + | |
| 3758 | + | |
| 3759 | + | |
| 3760 | + | |
| 3761 | + | |
| 3762 | + | |
| 3763 | + | |
| 3764 | + | |
| 3765 | + | |
| 3766 | + | |
| 3767 | + | |
| 3768 | + | |
| 3769 | + | |
| 3770 | + | |
3742 | 3771 | | |
3743 | 3772 | | |
3744 | 3773 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1270 | 1270 | | |
1271 | 1271 | | |
1272 | 1272 | | |
1273 | | - | |
| 1273 | + | |
1274 | 1274 | | |
1275 | 1275 | | |
1276 | 1276 | | |
| |||
0 commit comments