server/{db,swap},client/core: no maker redemption ack, no redeem confs #706
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chappjc
commented
Sep 30, 2020
Comment on lines
58
to
70
| bRedeemTime INT8, -- server time stamp | ||
| aSigAckOfBRedeem BYTEA -- counterparty's (initiator) sig with ack of participant REDEEM data | ||
| bRedeemTime INT8 -- server time stamp | ||
| )` | ||
|
|
||
| RetrieveSwapData = `SELECT status, sigMatchAckMaker, sigMatchAckTaker, | ||
| aContractCoinID, aContract, aContractTime, bSigAckOfAContract, | ||
| bContractCoinID, bContract, bContractTime, aSigAckOfBContract, | ||
| aRedeemCoinID, aRedeemSecret, aRedeemTime, bSigAckOfARedeem, | ||
| bRedeemCoinID, bRedeemTime, aSigAckOfBRedeem |
There was a problem hiding this comment.
Fortunately an explicit upgrade is not required since there are no select * queries where the number of columns is implicit.
chappjc
commented
Sep 30, 2020
Comment on lines
-270
to
-298
| RedeemAAckTime int64 // time that B's signature of redeem A data was received | ||
| RedeemBCoinID []byte | ||
| RedeemBTime int64 | ||
| RedeemBAckSig []byte // A's signature of redeem B data | ||
| RedeemBAckTime int64 // time that A's signature of redeem B data was received |
There was a problem hiding this comment.
The AckTimes were never stored.
chappjc
force-pushed
the
no-redeem-ack-match-complete
branch
2 times, most recently
from
3d666a5 to
d7f8e2d
Compare
|
I have no further changes in mind for this PR. It has the potential to break stuff since it redefines match "completion" on both client and server, but it also fixes issues noted in #692 |
chappjc
force-pushed
the
no-redeem-ack-match-complete
branch
from
480a90a to
51c7927
Compare
chappjc
changed the title
chappjc
force-pushed
the
no-redeem-ack-match-complete
branch
from
51c7927 to
0bf6beb
Compare
buck54321
approved these changes
Oct 8, 2020
chappjc
force-pushed
the
no-redeem-ack-match-complete
branch
from
0bf6beb to
4abca25
Compare
chappjc
commented
Oct 8, 2020
Comment on lines
+1748
to
+1757
| if dbMatch.Side == order.Taker { | ||
| err = t.processMakersRedemption(match, redemption.CoinID, redemption.Secret) | ||
| if err != nil { | ||
| errs.addErr(err) | ||
| } | ||
| } | ||
| // The server does not send a redemption request to the maker for the | ||
| // taker's redeem since match negotiation is complete server-side when the | ||
| // taker redeems, and it is complete client-side when we redeem. If we are | ||
| // both sides, there is another trackedTrade and matchTracker for that side. |
There was a problem hiding this comment.
Now client will not even respond if it gets a redemption request as maker. We'll have to updated server pronto when this is merged.
There was a problem hiding this comment.
Correction, it still responds (t.dc.ack above), it just doesn't record the TakerRedeem coin anymore. No server update urgency.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NOTE: This PR is now targeting on the
status-integ.server/db
aSigAckOfBRedeemcolumn from matches table.active = FALSE. Previously this was set when both redemption acks were received.Now any match in the table with status
MatchCompletewill also be inactive. Previously matches could be (and often were)MatchCompletebut also active. This was not great.server/swap
processBlockno longer checks the redeem txns for their confirmations. We were checking against swapConf, but confirmations on the redeem txns never were important, only that both parties could author and bcast their redeem txns (the secret was shared and both parties used it to spend the respective contract outputs).processBlockjust checks swap txns against swapConf, and it now unlocks the order funding coins for the order when the swap txn that spent them reaches swapConf (previously it waited to do this when the entire match was completed). This reflects the "event-based" and "block-based" inaction check distinction.processRedeemis now the spot where a match is deleted, when the taker's redeem is validated (whenMatchCompleteandactive=FALSEare set). Note that this means there will no longer be matches inSwappermemory withMatchCompletestatus.processRedeemnow does the cancellation rate accounting that was previously done inprocessAcksince it is the'redeem'validation that marks the end of the match for the user, not the redemption ack.processRedeemno longer sends a'redemption'request to the maker.processAckno longer processes'redemption'acks from the maker.UPDATE for
status-integrebase:client/core
'redemption'request following taker's redeem to move toMatchComplete.MakerRedeemedif their'redeem'request following the actual broadcast fails, otherwise they jump straight toMatchComplete. This is switched byauth.RedeemSig.MatchProof.IsRevokedin logging statements not being called as a function.