-
Notifications
You must be signed in to change notification settings - Fork 231
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 ethatomicswap and Ethereum AtomicSwap smart contract #76
Open
GlenDC
wants to merge
13
commits into
decred:master
Choose a base branch
from
GlenDC:ethatomicswap
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
71b4cff
add smart contract for the Ethereum atomic swaps
GlenDC 43e0960
update travis.yml to also unit test the EVM smart contract
GlenDC e3c27ae
move ethatomicswap contract src and add generated Go contract
GlenDC 6773b2f
ensure that contracts are created with refundTime and value
GlenDC 3043d6b
include binary contract code in generated Go code
GlenDC 0c31e0e
add initial version of ethatomicswap
GlenDC ab14a4e
ask permission before deploying eth contract
GlenDC e5b2d8a
improve ethatomiswap tool
GlenDC 5dd2b39
Merge branch 'master' into ethatomicswap
GlenDC d2be324
add ethereum to the list of supported chains
GlenDC aa4bd41
fix go linter reported errors
GlenDC fd6cfb2
fix truffle.js as to ensure truffle test works again
GlenDC 2f6679b
fix order of utility list and copyright headers
GlenDC File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,27 @@ | ||
| language: go | ||
| go: | ||
| - 1.9.x | ||
| - 1.10.x | ||
| sudo: false | ||
| install: | ||
| - go get -v github.com/golang/dep/cmd/dep | ||
| - dep ensure | ||
| - go install ./cmd/... | ||
| - go get -v github.com/alecthomas/gometalinter | ||
| - gometalinter --install | ||
| script: | ||
| - export PATH=$PATH:$HOME/gopath/bin | ||
| - ./goclean.sh | ||
| jobs: | ||
| include: | ||
| - stage: test | ||
| language: go | ||
| go: | ||
| - 1.9.x | ||
| - 1.10.x | ||
| sudo: false | ||
| install: | ||
| - go get -v github.com/golang/dep/cmd/dep | ||
| - dep ensure | ||
| - go install ./cmd/... | ||
| - go get -v github.com/alecthomas/gometalinter | ||
| - gometalinter --install | ||
| script: | ||
| - export PATH=$PATH:$HOME/gopath/bin | ||
| - ./goclean.sh | ||
| - go test -v -race ./cmd/ethatomicswap | ||
| - stage: test | ||
| language: node_js | ||
| node_js: | ||
| - "node" | ||
| install: | ||
| - npm install -g truffle | ||
| script: | ||
| - cd cmd/ethatomicswap/contract/src | ||
| - truffle test |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| *.abi | ||
| *.bin |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keep this list alphabetized
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, didn't notice there was a specific order to it, will put it in its correct place.