fix: thor token repayments by gomesalexandre · Pull Request #6676 · shapeshift/web

gomesalexandre · 2024-04-12T15:50:04Z

Description

Handles token repayments using depositWithExpiry().

Note this is an immediate "fix the bug and make this work" fix, and is to be directly follow-up on top of this stack with

approvals handling - this will not work in and by itself without calling approve() first
correct estimations, vs. estimations with the wrong send input previously
handling tokens at borrow time too - which is currently unsupported, but we should be prepared for it as things will similarly fail there

Once the 3 above are tackled, a final PR should be expected with a proper switch case on Tx type, similar to THORChain LP:

web/src/pages/ThorChainLP/components/ReusableLpStatus/TransactionRow.tsx

Line 466 in c4c9f4f

const handleSignTx = useCallback(() => {

Pull Request Type

🐛 Bug fix (Non-breaking Change: Fixes an issue)
🛠️ Chore (Non-breaking Change: Doc updates, pkg upgrades, typos, etc..)
💅 New Feature (Breaking/Non-breaking Change)

Issue (if applicable)

N/A for this specific issue, but tickets have been written for 1. and 3. above:
#6677
#6678

Risk

High Risk PRs Require 2 approvals

What protocols, transaction types or contract interactions might be affected by this PR?

This has been tested with Tenderly only and not at runtime: https://www.tdly.co/shared/simulation/63e57243-06a3-42b0-bc6d-2f070bbe1d05

And is not confirmed working e2e yet, engineering to confirm the Tx build payload looks sane

Once approvals are implemented as a follow-up PR, anyone with a repayable position will be able to test this

Testing

None just yet

Engineering

Custom Tx input looks sane
If you have a repayable position, this is testable end-to-end by manually broadcasting a Tx to approve the THOR router first

Operations

None just yet

Screenshots (if applicable)

N/A

kaladinlight

unable to test, but code looks sane

* feat: regenerate asset data 04/02/2024 (#6620) * feat: disable sym deposits after RUNE (#6622) * fix: don't bork asset generation on idle API failures (#6619) * feat: collect 0x trade surplus (#6625) * feat: bottom sheet dialog (#6623) * add bottom sheet dialog * try out vaul * hook up send * Create SubPage.tsx * adjusting dialog header * Update DialogCloseButton.tsx * add new action menu * updates * update more height stuff * use 100dvh instead of vh * use 100vh * anchor footer at the bottom of the screen * update new asset search * Update SelectAssets.tsx * add min height for regular modals * Update MobileNavBar.tsx * remove extra stuff not needed for PR * remove more stuff not for this PR * Update AddressInput.tsx * Update AddressInput.tsx * Update Dialog.tsx * Update SelectAssets.tsx * fix for dialog height * Update AssetSearch.tsx --------- Co-authored-by: gomes <17035424+gomesalexandre@users.noreply.github.com> * chore: use unchained proxy endpoints over nownodes proxy (#6606) * feat: use proxy validation endpoint (#6626) * feat: use proxy validation endpoint * chore: improve fn name * update endpoint * fix: csp * fix: tests * chore: use shapeshift proxy csp * chore: fail open --------- Co-authored-by: kaladinlight <35275952+kaladinlight@users.noreply.github.com> * feat: many migrations (#6631) * fix: remove portal on account dropdown (#6635) * account down remove portal * Update StepRow.tsx * feat: cow affiliate fees (#6621) * chore: update app translations (#6638) * chore: invalidate outdated translations * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize * Translate main.json via GitLocalize --------- Co-authored-by: Hellhound13 <hellhound13@gmx.at> Co-authored-by: Jpanam <jorgepana26@hotmail.com> Co-authored-by: yuki <yuki@beyondclub.xyz> Co-authored-by: guiribabrb <guilherme.rb.barbosa@gmail.com> Co-authored-by: Markus Meyer <djarmy@gmail.com> Co-authored-by: Romko <29romko29@gmail.com> Co-authored-by: tonyjiang12399 <327904087@qq.com> * feat: cow quote/unsigned order build cleanup (#6639) * feat: getFullAppData tests * feat: cow quote/unsigned order build cleanup * fix: deep merge opportunities accounts (#6627) * feat: regenerate asset data 04/04/2024 (#6636) Co-authored-by: GitHub Action <action@github.com> * fix: defi aggregated opportunities uniqBy id first (#6628) * fix: zapperAssetToMaybeAssetId handle base-token as native asset * fix: filter unique opportunities by id first * Revert "fix: zapperAssetToMaybeAssetId handle base-token as native asset" This reverts commit 1ed1a59. * feat: lending loan summary repayment lock (#6642) * fix: mobile dashboard routing (#6637) * feat: thorchain lp disable max deposits (#6645) * feat: uni-v2 pools static generation (#6629) * feat: uni-v2 pools static generation * feat: revert DynamicLpAssets flag * feat: regen * feat: cleanup asset upserty bits * feat: regen * feat: regenerate asset data 04/08/2024 (#6648) * feat: thorchain LP charts (#6624) * feat: tag foxy as expired opportunity (#6651) * fix: empty my position pools page (#6656) Update YourPositions.tsx * feat: add first pass WarningAcknowledgement component * chore: use translations * chore: wire up savers deposit * chore: tidy * feat: use warningAcknowledgement in trade quote confirm * feat: use warningAcknowledgement in trade quote confirm * feat: use warningAcknowledgement in trade lp deposit * fix: trade quote input warning logic * chore: use dimmed background * chore: component a little closer to mock * chore: component tweaks * chore: style fixes * chore: use cancel translation * fix: trade confirm warning * Update WarningAcknowledgement.tsx * Update WarningAcknowledgement.tsx * feat: chart styles and loading state (#6655) * fix: thor token repayments (#6676) * fix: don't render back button on modals initial routes (#6675) * chore: use translations & constants * chore: address review feedback * fix: unbork trade widget size * fix: show minimum trade amount when unsafe * fix: trade confirm width * chore: trigger CI * fix: typo * chore: extract motion style to constant * fix: add no min fallback message --------- Co-authored-by: woodenfurniture <125113430+woodenfurniture@users.noreply.github.com> Co-authored-by: gomes <17035424+gomesalexandre@users.noreply.github.com> Co-authored-by: reallybeard <89934888+reallybeard@users.noreply.github.com> Co-authored-by: kevin <35275952+kaladinlight@users.noreply.github.com> Co-authored-by: firebomb1 <88804546+firebomb1@users.noreply.github.com> Co-authored-by: Hellhound13 <hellhound13@gmx.at> Co-authored-by: Jpanam <jorgepana26@hotmail.com> Co-authored-by: yuki <yuki@beyondclub.xyz> Co-authored-by: guiribabrb <guilherme.rb.barbosa@gmail.com> Co-authored-by: Markus Meyer <djarmy@gmail.com> Co-authored-by: Romko <29romko29@gmail.com> Co-authored-by: tonyjiang12399 <327904087@qq.com> Co-authored-by: GitHub Action <action@github.com>

0xApotheosis · 2024-04-17T03:01:03Z

        confirmedQuote?.repaymentAmountCryptoPrecision &&
-        repaymentAccountNumber !== undefined
+        repaymentAccountNumber !== undefined &&
+        inboundAddressData


Debugging the current release: this is undefined when we attempt to repay in Rune, which results in a dead click (the return below is hit).

This reverts commit 1dbc26c.

fix: thor token repayments

d877de3

gomesalexandre requested a review from a team as a code owner April 12, 2024 15:50

gomesalexandre commented Apr 12, 2024

View reviewed changes

Comment thread src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx

gomesalexandre commented Apr 12, 2024

View reviewed changes

Comment thread src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx

gomesalexandre commented Apr 12, 2024

View reviewed changes

Comment thread src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx

gomesalexandre commented Apr 12, 2024

View reviewed changes

Comment thread src/pages/Lending/Pool/components/Repay/RepayConfirm.tsx

This was referenced Apr 12, 2024

THORChain Lending - Approval step #6677

Closed

THORChain Lending - Token collaterals #6678

Closed

kaladinlight approved these changes Apr 12, 2024

View reviewed changes

gomesalexandre merged commit 1dbc26c into develop Apr 12, 2024

gomesalexandre deleted the fix_thor_token_repayments branch April 12, 2024 18:27

0xApotheosis pushed a commit that referenced this pull request Apr 15, 2024

fix: thor token repayments (#6676)

ff32121

0xApotheosis mentioned this pull request Apr 16, 2024

chore: release v1.574.0 #6694

Merged

gomesalexandre mentioned this pull request Apr 16, 2024

fix: thor token repayments regression #6698

Merged

3 tasks

0xApotheosis mentioned this pull request Apr 16, 2024

chore: release v1.575.0 #6701

Merged

0xApotheosis reviewed Apr 17, 2024

View reviewed changes

0xApotheosis added a commit that referenced this pull request Apr 17, 2024

revert: fix: thor token repayments (#6676)

7f36bcb

This reverts commit 1dbc26c.

gomesalexandre mentioned this pull request Apr 17, 2024

feat: revert of the revert of thor token repayments #6702

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: thor token repayments#6676

fix: thor token repayments#6676
gomesalexandre merged 1 commit intodevelopfrom
fix_thor_token_repayments

gomesalexandre commented Apr 12, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kaladinlight left a comment

Uh oh!

0xApotheosis Apr 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

gomesalexandre commented Apr 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull Request Type

Issue (if applicable)

Risk

Testing

Engineering

Operations

Screenshots (if applicable)

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kaladinlight left a comment

Choose a reason for hiding this comment

Uh oh!

0xApotheosis Apr 17, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

gomesalexandre commented Apr 12, 2024 •

edited

Loading