client: Babysit refund transactions. #3082

JoeGruffins · 2024-11-17T09:46:47Z

core: Confirm refund txs.

client/asset: Add confirm tx.

client/db: Upgrade to version seven.

closes #3063

client/asset/interface.go

client/db/types.go

dev-warrior777 · 2024-11-26T10:02:17Z

Looks good!

client/asset/btc/btc.go

client/asset/interface.go

martonp · 2024-11-28T10:49:54Z

client/db/bolt/upgrades.go

+	amb := []byte("matches") // archived matches
+
+	var nRefunded int
+
+	defer func() {
+		upgradeLog.Infof("%d inactive refunded matches set to confirmed status", nRefunded)
+	}()
+
+	archivedMatchesBkt := dbtx.Bucket(amb)


Suggested change

amb := []byte("matches") // archived matches

var nRefunded int

defer func() {

upgradeLog.Infof("%d inactive refunded matches set to confirmed status", nRefunded)

}()

archivedMatchesBkt := dbtx.Bucket(amb)

var nRefunded int

defer func() {

upgradeLog.Infof("%d inactive refunded matches set to confirmed status", nRefunded)

}()

archivedMatchesBkt := dbtx.Bucket(activeMatchesBucket)

I want to avoid using any outside variables in the upgrade, that way changes to surrounding code will not affect it.

I guess I should also apply this to matchKey and proofKey...

Or did you mean to change to activeMatchesBucket? I don't think those can be revoked yet?

client/db/bolt/upgrades.go

client/core/notification.go

martonp · 2024-11-28T11:30:43Z

client/core/trade.go

+	if _, is := t.accountRefunder(); is {
+		feeSuggestion = t.metaData.MaxFeeRate
+	} else {
+		feeSuggestion = t.redeemFeeSuggestion.get()


This case would be incorrect, since it's using the fee suggestion for the redeem asset.

Oh yeah... I think I meant to come back to this. I guess doing the same as for redeems.

client/core/trade.go

JoeGruffins · 2024-11-29T09:01:19Z

marton review fixes https://github.com/decred/dcrdex/compare/5a4b56a74a5394c0113ce543491fb24fecf05761..358a1bb86d500748e189738b2808244a3618e1e6

martonp

I've been testing and I see a few issues:

When I do ETH/BTC swap, the side that is redeeming BTC cannot confirm the redemption:

When force a refund for eth, and then replace the transaction with another one with the same nonce, the popup for resubmitting the refund does not show up. If I restart bisonw, it shows up though. I tested this by using the test which I updated here: 0fe42e5 . You can update the seed and the nonce of the transaction that you want to have replaced, then run the test while waiting for the refund. Then you press enter right as the refund is submitted, and it will send a transaction with the same nonce, but a higher fee.

client/db/bolt/upgrades.go

JoeGruffins · 2024-12-01T07:44:46Z

@martonp Sorry I didnt rebase before pushing changes. The first point is probably fixed by the change in trade.go here https://github.com/decred/dcrdex/compare/358a1bb86d500748e189738b2808244a3618e1e6..39ee55b05b201f3c2d85c9558ed8624c1bd56e6c

I tried testing the replace transactions but I'm not sure if I'm blocking something bisonw needs for popups... I'll try some more.

JoeGruffins · 2024-12-04T08:50:16Z

Oh yeah, I'm only seeing the popup after restarting. hmmm...

JoeGruffins · 2024-12-05T02:47:58Z

@martonp it is based on this timeout for a running instance

dcrdex/client/asset/eth/eth.go

Lines 108 to 110 in 0030e49

    
           // txAgeOut is the amount of time after which we forego any tx 
        
           // synchronization efforts for unconfirmed pending txs. 
        
           txAgeOut = 2 * time.Hour

The tx should become stale and you will see the popup after that interval. You can reduce it ofc to check.

martonp · 2024-12-07T08:58:48Z

client/core/notification.go

 	ActionIDRedeemRejected = "redeemRejected"
 	TopicRedeemRejected    = "RedeemRejected"
+	ActionIDRefundRejected = "refundRejected"
+	TopicRefundRejected    = "RefundRejected"


In the UI the action was updated to txRejected, so when these actions are sent, there is a UI error.

Oh yeah, thanks. I guess keeping two here as handleCoreAction needs them to be different. Reverting the js change and adding refundRejected

JoeGruffins · 2024-12-09T07:00:12Z

Adding refundRejected to js switch https://github.com/decred/dcrdex/compare/2eedfb3da5ea45204465d030c8fa63274c536489..aef18891dd3d51ffc43a56a16479c674bc0d8275

martonp

Something is broken with both redemption and refund resubmission on ETH, even after I fix the bugs in the comments. Either the wrong nonce is used, or the transactions fail (status of transaction in receipt is 1).

martonp · 2024-12-13T08:35:05Z

client/webserver/site/src/js/app.ts

-    const div = this.page.rejectedRedemptionTmpl.cloneNode(true) as PageElement
+  txRejectedAction (req: ActionRequiredNote) {
+    const { orderID, coinID, coinFmt, assetID, txType } = req.payload as RejectedTxData
+    const div = this.page.rejectedTxTmpl.cloneNode(true) as PageElement


This is updated to rejectedTxTmpl, but the html is not updated. Also the tx type label below needs to be added to the html.

I'm sure I updated this but it looks like I didn't commit changes.

martonp · 2024-12-13T09:02:47Z

client/core/core.go

@@ -10712,23 +10712,31 @@ func (c *Core) handleRetryRedemptionAction(actionB []byte) error {
 			coinID = match.MetaData.Proof.MakerRedeem


coinID needs to be the refund coin if this is retrying a refund.

JoeGruffins · 2024-12-16T09:08:55Z

It's asking me twice now to replace. Something is off.

client/asset/eth/eth.go

JoeGruffins · 2024-12-17T08:38:38Z

transactions fail (status of transaction in receipt is 1).

Failure is 0x00 status I think?

martonp · 2024-12-23T18:06:17Z

This should fix the issue: 8d03288

JoeGruffins · 2024-12-24T09:30:26Z

Trying with the new harness changes and the thing mines a block if there is any transaction without telling it to. So, unable to get the replacement transaction in now.

JoeGruffins · 2024-12-24T09:34:57Z

Fixing nonce error, but hard to test for me now https://github.com/decred/dcrdex/compare/15ae0091376ae4ea1d539f735778ea09fad51159..9c5d74bab7ceb582f6f12772a83458241c9d2204

JoeGruffins changed the title ~~Babysitrefund~~ client: Babysit refund transactions. Nov 17, 2024

JoeGruffins force-pushed the babysitrefund branch from bee4875 to 9491c14 Compare November 17, 2024 10:00

dev-warrior777 approved these changes Nov 18, 2024

View reviewed changes

client/asset/interface.go Outdated Show resolved Hide resolved

JoeGruffins force-pushed the babysitrefund branch 5 times, most recently from 31a4c6b to c6f14c0 Compare November 23, 2024 02:58

JoeGruffins commented Nov 25, 2024

View reviewed changes

client/db/types.go Show resolved Hide resolved

JoeGruffins force-pushed the babysitrefund branch 3 times, most recently from a50edc8 to 5a4b56a Compare November 26, 2024 08:47

JoeGruffins marked this pull request as ready for review November 26, 2024 08:47

buck54321 requested a review from martonp November 28, 2024 00:25

martonp reviewed Nov 28, 2024

View reviewed changes

JoeGruffins force-pushed the babysitrefund branch 2 times, most recently from 9dbd211 to 358a1bb Compare November 29, 2024 08:58

martonp reviewed Nov 30, 2024

View reviewed changes

client/db/bolt/upgrades.go Show resolved Hide resolved

JoeGruffins force-pushed the babysitrefund branch from 358a1bb to 39ee55b Compare December 1, 2024 07:32

JoeGruffins force-pushed the babysitrefund branch from 39ee55b to 2eedfb3 Compare December 4, 2024 03:05

martonp reviewed Dec 7, 2024

View reviewed changes

JoeGruffins force-pushed the babysitrefund branch from 2eedfb3 to aef1889 Compare December 9, 2024 06:59

martonp reviewed Dec 13, 2024

View reviewed changes

JoeGruffins force-pushed the babysitrefund branch from aef1889 to 15ae009 Compare December 16, 2024 08:22

JoeGruffins commented Dec 17, 2024

View reviewed changes

client/asset/eth/eth.go Show resolved Hide resolved

JoeGruffins and others added 5 commits December 24, 2024 18:33

client/asset: Add confirm tx.

7336ceb

core: Confirm refund txs.

0f12dae

client/db: Upgrade to version seven.

2038d45

Reduce confirm tx duplication

f964b50

client/eth: Fix nonce err.

9c5d74b

JoeGruffins force-pushed the babysitrefund branch from 15ae009 to 9c5d74b Compare December 24, 2024 09:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

client: Babysit refund transactions. #3082

client: Babysit refund transactions. #3082

JoeGruffins commented Nov 17, 2024 •

edited

Loading

dev-warrior777 commented Nov 26, 2024

martonp Nov 28, 2024

JoeGruffins Nov 29, 2024

JoeGruffins Nov 29, 2024

JoeGruffins Nov 29, 2024

martonp Nov 28, 2024

JoeGruffins Nov 29, 2024

JoeGruffins commented Nov 29, 2024

martonp left a comment

JoeGruffins commented Dec 1, 2024

JoeGruffins commented Dec 4, 2024 •

edited

Loading

JoeGruffins commented Dec 5, 2024

martonp Dec 7, 2024

JoeGruffins Dec 9, 2024

JoeGruffins commented Dec 9, 2024

martonp left a comment

martonp Dec 13, 2024

JoeGruffins Dec 16, 2024

martonp Dec 13, 2024

JoeGruffins commented Dec 16, 2024

JoeGruffins commented Dec 17, 2024

martonp commented Dec 23, 2024 •

edited

Loading

JoeGruffins commented Dec 24, 2024 •

edited

Loading

JoeGruffins commented Dec 24, 2024

		@@ -10712,23 +10712,31 @@ func (c *Core) handleRetryRedemptionAction(actionB []byte) error {
		coinID = match.MetaData.Proof.MakerRedeem

client: Babysit refund transactions. #3082

Are you sure you want to change the base?

client: Babysit refund transactions. #3082

Conversation

JoeGruffins commented Nov 17, 2024 • edited Loading

dev-warrior777 commented Nov 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JoeGruffins commented Nov 29, 2024

martonp left a comment

Choose a reason for hiding this comment

JoeGruffins commented Dec 1, 2024

JoeGruffins commented Dec 4, 2024 • edited Loading

JoeGruffins commented Dec 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JoeGruffins commented Dec 9, 2024

martonp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JoeGruffins commented Dec 16, 2024

JoeGruffins commented Dec 17, 2024

martonp commented Dec 23, 2024 • edited Loading

JoeGruffins commented Dec 24, 2024 • edited Loading

JoeGruffins commented Dec 24, 2024

JoeGruffins commented Nov 17, 2024 •

edited

Loading

JoeGruffins commented Dec 4, 2024 •

edited

Loading

martonp commented Dec 23, 2024 •

edited

Loading

JoeGruffins commented Dec 24, 2024 •

edited

Loading