dex/networks,server/eth: decode swap data message blob #1320
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
This was referenced Dec 1, 2021
Merged
buck54321
reviewed
Dec 5, 2021
This was referenced Dec 6, 2021
Merged
chappjc
force-pushed
the
eth-server-contract-ver
branch
from
cd2d8ab to
360e6d7
Compare
|
Not quite ready, but rebased and slightly updated. live_test.go needs the lgpl build flag now. |
chappjc
force-pushed
the
eth-server-contract-ver
branch
from
360e6d7 to
e7f2edc
Compare
chappjc
commented
Dec 7, 2021
Comment on lines
-280
to
-282
| // Contract is the contract script. | ||
| // Contract is the unique swap contract data. This may be a redeem script | ||
| // for UTXO assets, or other information that uniquely identifies the swap | ||
| // for account-based assets e.g. a contract version and secret hash for ETH. | ||
| Contract dex.Bytes | ||
| // SecretHash is the contract's secret hash. |
There was a problem hiding this comment.
It's interesting that these two fields were already redundant. The SecretHash field is basically a convenience, or possibly useful in a future asset if the Contract bytes is distinct, but I don't see that happening. Either way, I'm not inclined to remove it.
chappjc
commented
Dec 7, 2021
| // from redemption.Spends.Contract. Even for scriptable UTXO assets, the | ||
| // redeem script in this Contract field is redundant with the SecretHash | ||
| // field as ExtractSwapDetails can be applied to extract the hash. | ||
| ver, secretHash, err := dexeth.DecodeContractData(redemption.Spends.Contract) |
There was a problem hiding this comment.
Note that AuditContract is still in PR, but see also my comment: https://github.com/decred/dcrdex/pull/1319/files#r764101981
chappjc
commented
Dec 7, 2021
chappjc
commented
Dec 7, 2021
buck54321
reviewed
Dec 8, 2021
buck54321
approved these changes
Dec 8, 2021
chappjc
force-pushed
the
eth-server-contract-ver
branch
from
5dc6d61 to
8181c18
Compare
The msgjson.Init.Contract and server/asset.Contract.RedeemScript fields contain an encoding of the ETH contract version concatenated with the swap's secret hash that is the unique key for the swap. This updates server/asset/eth's ValidateContract and Contract methods to decode and check this data. This also adds the dexeth.EncodeSwapData and DecodeSwapData functions. Arrayify swapReceipt.secretHash.
chappjc
force-pushed
the
eth-server-contract-ver
branch
from
8181c18 to
01d24bf
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.
The
msgjson.Init.Contractandserver/asset.Contract.RedeemScriptfieldscontain an encoding of the ETH contract version concatenated with the
swap's secret hash that is the unique key for the swap.
This updates server/asset/eth's
ValidateContractandContractmethodsto decode and check this data.
This also adds the
dexeth.EncodeContractDataandDecodeContractDatafunctions.