Skip to content

add ethatomicswap and Ethereum AtomicSwap smart contract #76

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.

Sign up for GitHub

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

Open
GlenDC wants to merge 13 commits into
base: master
Choose a base branch
from
Open

add ethatomicswap and Ethereum AtomicSwap smart contract #76

Show file tree
Hide file tree
Changes from all 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 Jun 17, 2018
43e0960
update travis.yml to also unit test the EVM smart contract
GlenDC Jun 22, 2018
e3c27ae
move ethatomicswap contract src and add generated Go contract
GlenDC Jun 23, 2018
6773b2f
ensure that contracts are created with refundTime and value
GlenDC Jun 25, 2018
3043d6b
include binary contract code in generated Go code
GlenDC Jul 16, 2018
0c31e0e
add initial version of ethatomicswap
GlenDC Jul 18, 2018
ab14a4e
ask permission before deploying eth contract
GlenDC Jul 19, 2018
e5b2d8a
improve ethatomiswap tool
GlenDC Jul 19, 2018
5dd2b39
Merge branch 'master' into ethatomicswap
GlenDC Jul 20, 2018
d2be324
add ethereum to the list of supported chains
GlenDC Jul 20, 2018
aa4bd41
fix go linter reported errors
GlenDC Jul 20, 2018
fd6cfb2
fix truffle.js as to ensure truffle test works again
GlenDC Jul 20, 2018
2f6679b
fix order of utility list and copyright headers
GlenDC Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions .travis.yml
View file
Open in desktop
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
125 changes: 123 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ exists for the following coins and wallets:
* Bitcoin ([Bitcoin Core](https://github.com/bitcoin/bitcoin))
* Bitcoin Cash ([Bitcoin ABC](https://github.com/Bitcoin-ABC/bitcoin-abc), [Bitcoin Unlimited](https://github.com/BitcoinUnlimited/BitcoinUnlimited), [Bitcoin XT](https://github.com/bitcoinxt/bitcoinxt))
* Decred ([dcrwallet](https://github.com/decred/dcrwallet))
* Ethereum ([Go Ethereum](https://github.com/ethereum/go-ethereum))
* Litecoin ([Litecoin Core](https://github.com/litecoin-project/litecoin))
* Monacoin ([Monacoin Core](https://github.com/monacoinproject/monacoin))
* Particl ([Particl Core](https://github.com/particl/particl-core))
Expand Down
2 changes: 2 additions & 0 deletions cmd/ethatomicswap/contract/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.abi
*.bin
Loading