eth: supplement eth swap receipt #1464
Merged
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
Feb 2, 2022
| txHash: txHash, | ||
| secretHash: secretHash, | ||
| ver: swaps.AssetVersion, | ||
| contractAddr: dexeth.ContractAddresses[swaps.AssetVersion][eth.net].String(), |
There was a problem hiding this comment.
Could also give ethFetcher (eth.node) a contractAddr method...
JoeGruffins
approved these changes
Feb 3, 2022
There was a problem hiding this comment.
[INF] CORE: Broadcasted transaction with 1 swap contracts for order d0b2f897fc9a9710e62c9f34704a07392355d8670106db7601e3212db9f56154. Assigned fee rate = 1. Receipts (eth): [{ tx hash: 2908851c46882fa5d1c01aa6d1300edc0be497160517178580e13fe10a51f9ed, contract address: 0x2f68E723b8989BA1C6a9F03E42F33cb7Dc9D606f, secret hash: abc8dd390f2c827d44a64993075a8b64ca76df02429e04ace5a9f37286b34cf0 }].
chappjc
force-pushed
the
no-signed-refund
branch
from
0029bac
to
0063ee6
Compare
This supplements the swapRecipt String method with the contract address, which in addition to the secret hash makes performing a manual refund more straightforward. This also omits the raw refund transaction logging in (*Core).swapMatchGroup when the Receipt.SignedRefund provides no such data, as is the case with ETH. The swap Receipt's Stringer is still used here to log the secret hash and contract address for ETH swapReceipts.
chappjc
force-pushed
the
no-signed-refund
branch
from
0063ee6
to
4f01419
Compare
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.
Further work on #1311
This supplements the
swapReciptStringmethod with the contract address, which in addition to the secret hash makes performing a manual refund more straightforward.This also omits the raw refund transaction logging in
(*Core).swapMatchGroupwhen theReceipt.SignedRefundprovides no such data, as is the case with ETH. The swapReceipt'sStringeris still used here to log the secret hash and contract address for ETHswapReceipts.