feat: executedSurplusFee removal #5262
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Skipped Deployments
|
| // TODO: get rid of this once https://github.com/cowprotocol/services/pull/3184 is complete | ||
| const HAS_BACKEND_MIGRATED = false | ||
|
|
||
| function getFeeToken(order: ParsedOrder) { | ||
| if (!HAS_BACKEND_MIGRATED) { | ||
| return order.inputToken | ||
| } |
There was a problem hiding this comment.
Until a migration is done, the fee will continue being returned in SELL token
There was a problem hiding this comment.
Actually, decided to default to inputToken when the feeToken is not set.
This flag is not needed then.
| const { inputToken, outputToken } = order | ||
| const { executedFeeToken } = order.executionData | ||
|
|
||
| if (inputToken?.address.toLowerCase() === executedFeeToken?.toLowerCase()) { | ||
| return inputToken | ||
| } | ||
| if (outputToken?.address.toLowerCase() === executedFeeToken?.toLowerCase()) { | ||
| return outputToken | ||
| } | ||
| return undefined | ||
| } |
There was a problem hiding this comment.
I had already implemented it assuming it would be in the surplus, but that's not the case yet.
| // TODO: use the value from SDK | ||
| const totalFee = CurrencyAmount.fromRawAmount(inputToken, (executedSurplusFee ?? executedFeeAmount) || 0) | ||
| const quoteSymbol = inputToken.symbol | ||
| const totalFeeAmount = CurrencyAmount.fromRawAmount(feeToken, totalFee || 0) |
There was a problem hiding this comment.
Use the totalFee available from the API
| executedSurplusFee: BigNumber | null | ||
| executedFee: BigNumber | null |
There was a problem hiding this comment.
Basically renaming the field everywhere else.
|
Report too large to display inline |
apps/cowswap-frontend/src/modules/ordersTable/pure/ReceiptModal/FeeField.tsx
Outdated
Show resolved
Hide resolved
alfetopito
force-pushed
the
feat/executedSurplusFee-removal
branch
from
d822798 to
4e351ce
Compare
|
🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎ To accept the risk, merge this PR and you will not be notified again.
Next stepsWhat is protestware?This package is a joke, parody, or includes undocumented or hidden behavior unrelated to its primary function. Consider that consuming this package may come along with functionality unrelated to its primary purpose. What is a critical CVE?Contains a Critical Common Vulnerability and Exposure (CVE). Remove or replace dependencies that include known critical CVEs. Consumers can use dependency overrides or npm audit fix --force to remove vulnerable dependencies. Take a deeper look at the dependencyTake a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev. Remove the packageIf you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency. Mark a package as acceptable riskTo ignore an alert, reply with a comment starting with
|
Summary
Remove usages of
executedSurplusFeewithexecutedFee.Everything should remain as is, no functional changes.
SDK related changes: cowprotocol/cow-sdk#229
Backend changes depending on this: cowprotocol/services#3184
To Test
network costssectionnetwork costssection