Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add atomic swap to docs #968

Merged
merged 18 commits into from
Sep 2, 2019
Merged

Add atomic swap to docs #968

merged 18 commits into from
Sep 2, 2019

Conversation

imestin
Copy link
Contributor

@imestin imestin commented Jul 16, 2019

Closes #964

@imestin imestin changed the title Add atomic swap to docs (#967) Add atomic swap to docs Jul 16, 2019
@imestin imestin mentioned this pull request Jul 16, 2019
Copy link
Member

@dajohi dajohi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the unneeded files

@imestin imestin force-pushed the feature/atomic-swap branch from acddc15 to 15013fe Compare July 18, 2019 09:34
@imestin
Copy link
Contributor Author

imestin commented Jul 18, 2019

OK, I removed them.

Copy link
Contributor

@s-ben s-ben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@imestin looking better. Have made a few suggestions on the wording. I'm not a Subject Matter Expert (SME) on atomic swaps by any means, so can't verify the accuracy of the technical statements (someone else will need to do that), but the technical explanation is already teaching me a bit about atomic swaps :)

docs/advanced/atomic-swap.md Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
@imestin imestin force-pushed the feature/atomic-swap branch from da3bd23 to 2390785 Compare July 25, 2019 08:04
@imestin imestin force-pushed the feature/atomic-swap branch from 2390785 to 75d9a4b Compare July 25, 2019 08:07
@imestin
Copy link
Contributor Author

imestin commented Jul 25, 2019

I corrected the above mentioned mistakes. I think now is good.

mkdocs.yml Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
@imestin imestin force-pushed the feature/atomic-swap branch from 9178fc8 to ad8fcb3 Compare July 27, 2019 07:42
@s-ben
Copy link
Contributor

s-ben commented Jul 29, 2019

@imestin just reviewed the latest. Looking much better. The grammar is technically correct, and I think you've added some good technical details. However, comparing this page to the rest of the docs, the style and sentence structure are still quite different. This could be jarring to some readers, and keep the page from getting merged (the bar for advanced technical documentation is high). Also, after digging into the blog @jholdstock linked to and the atomicswap README, I've realized that we already have a lot of content that can be reused. This content has the style and sentence structure we want, so I think the fastest way to complete this page is to redo it reusing existing content where possible, and incorporating the good technical details you've uncovered (e.g. the required opcodes and supported hash functions). Below is a rough outline for how I would do this.

  • Basic definition (short paragraph) of atomic swap (borrow from blog)
  • Decred-compatible cross-chain atomic swapping (borrow from atomicswap README)
  • Theory (borrow from atomicswap README, shorten/summarize if possible, remove any out-of-date statements)
  • Use cases (borrow from blog)
  • Prerequisites (borrow from blog, make sure info up-to-date)
  • Privacy(borrow from blog)
  • Integration (check if needs updating)
  • Link to atomicswap README for further instructions on using CLI tools.

@imestin imestin force-pushed the feature/atomic-swap branch from c5619f6 to 60731c9 Compare August 1, 2019 08:17
@imestin
Copy link
Contributor Author

imestin commented Aug 1, 2019

@s-ben if I would write about integration, I would write about future promises again.
The other points I edited.

dajohi
dajohi previously requested changes Aug 1, 2019
docs/advanced/atomic-swap.md Show resolved Hide resolved
@dajohi dajohi dismissed their stale review August 6, 2019 15:18

review items resolved

@imestin
Copy link
Contributor Author

imestin commented Aug 12, 2019

Is there anything else to correct?

@s-ben
Copy link
Contributor

s-ben commented Aug 15, 2019

Hey @imestin. I'm still seeing a few issues:

  • In my review, my main concern was that the style and sentence structure of the new text was not consistent with the rest of the docs. I see that you have kept most of this new text, including three paragraphs for the basic definition (which in my outline is a single "short paragraph"). To give you an example, I'm imagining something more like this, which is the 1st google hit for 'atomic swaps definition'.
  • The 'Using Decred’s atomicswap tool' section was left, but this is not in the outline. In the outline I say 'Link to atomicswap README for further instructions on using CLI tools.' at the end of the page.
  • The integration section you removed from the outline, but I think it's relevant info to include. The list of major coins is relatively stable, and we can avoid the problem of new coins being added with a disclaimer telling the reader to check the GitHub README for new integrations (or for instruction on adding coins).
  • In the 'Prerequisites' section, the bullets need to be capitalized.

@imestin
Copy link
Contributor Author

imestin commented Aug 21, 2019

hi @s-ben
I removed 'Using Decred’s atomicswap tool', because it's in the end of the page, in the 'Further Information' section. I wasn't sure whether to have that link 2 times in the docs.

So if I go back to my original version, you think it is good? ("An Atomic Swap is a smart contract technology which makes possible to exchange coins from two different blockchains without having to trust any third party, for example a centralized exchange.")

The other 2 things I edited.

docs/advanced/atomic-swap.md Outdated Show resolved Hide resolved
@jholdstock jholdstock dismissed their stale review August 26, 2019 16:16

My suggestions were implemented

@s-ben
Copy link
Contributor

s-ben commented Aug 26, 2019

@imestin, perhaps I'm confused about the state of this PR, but when I pull this branch feature/atomic-swap, I'm only seeing some of the changes.

I removed 'Using Decred’s atomicswap tool', because it's in the end of the page, in the 'Further Information' section. I wasn't sure whether to have that link 2 times in the docs.

When I run this locally, I still see the Using Decred’s atomicswap tool section.

So if I go back to my original version, you think it is good? ("An Atomic Swap is a smart contract technology which makes possible to exchange coins from two different blockchains without having to trust any third party, for example a centralized exchange.")

I think this is a good short description, but when I run locally I still see the old definition. If this change is not in the current branch, please put it in.

As for @dajohi's suggestion of removing the list of supported coins and just linking to the atomicswap GitHub documentation, I think this makes sense. I was on the fence about this myself. I do think we should have a link to the GitHub here though.

@imestin
Copy link
Contributor Author

imestin commented Aug 28, 2019

Ok, I edited it.

@s-ben
Copy link
Contributor

s-ben commented Aug 28, 2019

Just see one minor change and the rest looks good to me.

GitHub repo: https://github.com/decred/atomicswap should be turned into a link: GitHub repo.

@imestin
Copy link
Contributor Author

imestin commented Aug 28, 2019

ok, done.

@s-ben
Copy link
Contributor

s-ben commented Aug 28, 2019

@imestin is there some reason you changed the link text from what I suggested to this?

image

This is not consistent with the rest of the docs. For repo links, we typically have link text such as repo or GitHub repo. Also, Atomic Swaps on Decred's blog isn't a sentence. I would suggest something like below. Feel free to tweak as you wish, but it needs to be consistent with the style in the rest of the docs.

For more technical information, see the Atomic Swaps Github repo and this technical blog post.

@imestin
Copy link
Contributor Author

imestin commented Aug 28, 2019

I edited it.

@s-ben
Copy link
Contributor

s-ben commented Aug 28, 2019

lgtm

Copy link
Member

@jholdstock jholdstock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just given this another look and it has really improved a lot. Great job

@dajohi dajohi merged commit bacfb9c into decred:master Sep 2, 2019
@imestin imestin deleted the feature/atomic-swap branch September 6, 2019 11:40
@imestin imestin restored the feature/atomic-swap branch September 7, 2019 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add atomic swaps to docs
5 participants