DLC Funding Update #2026
Merged
DLC Funding Update #2026
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
benthecarman
requested changes
Sep 16, 2020
app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/dlc/DLCFundingInput.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
Outdated
Show resolved
Hide resolved
app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/dlc/DLCSignatures.scala
Show resolved
Hide resolved
benthecarman
approved these changes
Sep 17, 2020
app-commons/src/main/scala/org/bitcoins/commons/jsonmodels/dlc/DLCFundingInput.scala
Outdated
Show resolved
Hide resolved
dlc-wallet-test/src/test/scala/org/bitcoins/dlc/wallet/DLCDAOTest.scala
Outdated
Show resolved
Hide resolved
Comment on lines
+110
to
+114
| val fundingInputs = if (isInitiator) { | ||
| offer.fundingInputs | ||
| } else { | ||
| accept.fundingInputs | ||
| } |
There was a problem hiding this comment.
We do this so much everywhere might be nice to have a function like:
chooseDLCData[A](isInitiator: Boolean, offer: DLCOffer, accept: DLCAccept, f: (DLCSetupMessage => A)): A
There was a problem hiding this comment.
Probably for a future PR tho
testkit/src/main/scala/org/bitcoins/testkit/core/gen/TLVGen.scala
Outdated
Show resolved
Hide resolved
benthecarman
force-pushed
the
funding_update
branch
from
60533f7 to
4a14cf4
Compare
benthecarman
force-pushed
the
funding_update
branch
from
c459940 to
0daa2da
Compare
benthecarman
approved these changes
Sep 17, 2020
nkohen
added a commit
that referenced
this pull request
Sep 17, 2020
* Defined FundingInputV0TLV * Defined FundingSignaturesV0TLV * Introduced DLCFundingInput to replace OutputReference in internal DLC datatypes * Recovered correspondence between internal dlc datatypes and TLVs * Fixed a couple silly bugs * Regenerated test vectors (and made regeneration code more robust) * Removed old TLV types * Responded to Ben's review * Cleaned up test stuff * Fix tests and migrations * Fix rebase issue * Resonded to nits * Fix test Co-authored-by: Ben Carman <[email protected]>
nkohen
added a commit
that referenced
this pull request
Sep 29, 2020
* Defined FundingInputV0TLV * Defined FundingSignaturesV0TLV * Introduced DLCFundingInput to replace OutputReference in internal DLC datatypes * Recovered correspondence between internal dlc datatypes and TLVs * Fixed a couple silly bugs * Regenerated test vectors (and made regeneration code more robust) * Removed old TLV types * Responded to Ben's review * Cleaned up test stuff * Fix tests and migrations * Fix rebase issue * Resonded to nits * Fix test Co-authored-by: Ben Carman <[email protected]>
benthecarman
added a commit
to benthecarman/bitcoin-s
that referenced
this pull request
Sep 30, 2020
* Defined FundingInputV0TLV * Defined FundingSignaturesV0TLV * Introduced DLCFundingInput to replace OutputReference in internal DLC datatypes * Recovered correspondence between internal dlc datatypes and TLVs * Fixed a couple silly bugs * Regenerated test vectors (and made regeneration code more robust) * Removed old TLV types * Responded to Ben's review * Cleaned up test stuff * Fix tests and migrations * Fix rebase issue * Resonded to nits * Fix test Co-authored-by: Ben Carman <[email protected]>
nkohen
added a commit
that referenced
this pull request
Oct 1, 2020
* Defined FundingInputV0TLV * Defined FundingSignaturesV0TLV * Introduced DLCFundingInput to replace OutputReference in internal DLC datatypes * Recovered correspondence between internal dlc datatypes and TLVs * Fixed a couple silly bugs * Regenerated test vectors (and made regeneration code more robust) * Removed old TLV types * Responded to Ben's review * Cleaned up test stuff * Fix tests and migrations * Fix rebase issue * Resonded to nits * Fix test Co-authored-by: Ben Carman <[email protected]>
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.
Updated DLC funding input and funding signature communication (as per the most recent changes on discreetlogcontracts/dlcspecs#81) and followed through with the necessary structural changes in our dlc implementation.