Skip to content

Commit

Permalink
Merge branch 'master' into engine
Browse files Browse the repository at this point in the history
  • Loading branch information
thrasher- committed Aug 9, 2019
2 parents e8c9a9a + 2078ba9 commit 8ecd8a0
Show file tree
Hide file tree
Showing 353 changed files with 4,922 additions and 4,152 deletions.
10 changes: 5 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
build: off

clone_folder: c:\gopath\src\github.com\thrasher-\gocryptotrader
clone_folder: c:\gopath\src\github.com\thrasher-corp\gocryptotrader

cache:
- '%APPDATA%\npm-cache'
- '%GOPATH%\pkg\mod'
- '%LOCALAPPDATA%\go-build'
- c:\gopath\src\github.com\thrasher-\gocryptotrader\web\node_modules
- c:\gopath\src\github.com\thrasher-corp\gocryptotrader\web\node_modules

environment:
GOPATH: c:\gopath
Expand All @@ -19,11 +19,11 @@ stack: go 1.12.3
install:
- set Path=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%Path%
- ps: Install-Product node $env:NODEJS_VER
- cd c:\gopath\src\github.com\thrasher-\gocryptotrader\web
- cd c:\gopath\src\github.com\thrasher-corp\gocryptotrader\web
- npm install

before_test:
- cd c:\gopath\src\github.com\thrasher-\gocryptotrader
- cd c:\gopath\src\github.com\thrasher-corp\gocryptotrader
- go get

test_script:
Expand All @@ -35,6 +35,6 @@ test_script:
# test front-end
- node --version
- npm --version
- cd c:\gopath\src\github.com\thrasher-\gocryptotrader\web
- cd c:\gopath\src\github.com\thrasher-corp\gocryptotrader\web
- npm run lint
- npm run build
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.12 as build
WORKDIR /go/src/github.com/thrasher-/gocryptotrader
WORKDIR /go/src/github.com/thrasher-corp/gocryptotrader
COPY . .
RUN GO111MODULE=on go mod vendor
RUN mv -vn config_example.json config.json \
Expand All @@ -9,6 +9,6 @@ RUN mv -vn config_example.json config.json \
FROM alpine:latest
RUN apk update && apk add --no-cache ca-certificates
COPY --from=build /go/bin/gocryptotrader /app/
COPY --from=build /go/src/github.com/thrasher-/gocryptotrader/config.json /app/
COPY --from=build /go/src/github.com/thrasher-corp/gocryptotrader/config.json /app/
EXPOSE 9050-9053
CMD ["/app/gocryptotrader"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LDFLAGS = -ldflags "-w -s"
GCTPKG = github.com/thrasher-/gocryptotrader
GCTPKG = github.com/thrasher-corp/gocryptotrader
LINTPKG = github.com/golangci/golangci-lint/cmd/[email protected]
LINTBIN = $(GOPATH)/bin/golangci-lint
GCTLISTENPORT=9050
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">
<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">

[![Build Status](https://travis-ci.com/thrasher-/gocryptotrader.svg?branch=master)](https://travis-ci.com/thrasher-/gocryptotrader)
[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-/gocryptotrader/blob/master/LICENSE)
[![GoDoc](https://godoc.org/github.com/thrasher-/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-/gocryptotrader)
[![Coverage Status](http://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-/gocryptotrader?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-/gocryptotrader)
[![Build Status](https://travis-ci.com/thrasher-corp/gocryptotrader.svg?branch=master)](https://travis-ci.com/thrasher-corp/gocryptotrader)
[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-corp/gocryptotrader/blob/master/LICENSE)
[![GoDoc](https://godoc.org/github.com/thrasher-corp/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-corp/gocryptotrader)
[![Coverage Status](http://codecov.io/github/thrasher-corp/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-corp/gocryptotrader?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-corp/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-corp/gocryptotrader)

A cryptocurrency trading bot supporting multiple exchanges written in Golang.

Expand Down Expand Up @@ -79,7 +79,7 @@ When submitting a PR, please abide by our coding guidelines:

+ Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
+ Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
+ Code must adhere to our [coding style](https://github.com/thrasher-/gocryptotrader/blob/master/.github/CONTRIBUTING.md).
+ Code must adhere to our [coding style](https://github.com/thrasher-corp/gocryptotrader/blob/master/.github/CONTRIBUTING.md).
+ Pull requests need to be based on and opened against the `master` branch.

## Compiling instructions
Expand All @@ -93,7 +93,7 @@ GoCryptoTrader is built using [Go Modules](https://github.com/golang/go/wiki/Mod
Using Go Modules you now clone this repository **outside** your GOPATH

```bash
git clone https://github.com/thrasher-/gocryptotrader.git
git clone https://github.com/thrasher-corp/gocryptotrader.git
cd gocryptotrader
go build
mkdir ~/.gocryptotrader
Expand All @@ -103,7 +103,7 @@ cp config_example.json ~/.gocryptotrader/config.json
### Windows

```bash
git clone https://github.com/thrasher-/gocryptotrader.git
git clone https://github.com/thrasher-corp/gocryptotrader.git
cd gocryptotrader
go build
copy config_example.json %APPDATA%\GoCryptoTrader\config.json
Expand All @@ -114,7 +114,7 @@ copy config_example.json %APPDATA%\GoCryptoTrader\config.json

## Donations

<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">
<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">

If this framework helped you in any way, or you would like to support the developers working on it, please donate Bitcoin to:

Expand Down
4 changes: 2 additions & 2 deletions cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io/ioutil"
"log"

"github.com/thrasher-/gocryptotrader/common"
"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/config"
)

// EncryptOrDecrypt returns a string from a boolean
Expand Down
6 changes: 3 additions & 3 deletions cmd/config_builder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"log"
"sync"

"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-/gocryptotrader/engine"
exchange "github.com/thrasher-/gocryptotrader/exchanges"
"github.com/thrasher-corp/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/engine"
exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
)

func main() {
Expand Down
14 changes: 7 additions & 7 deletions cmd/documentation/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# GoCryptoTrader package Documentation

<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">
<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">


[![Build Status](https://travis-ci.org/thrasher-/gocryptotrader.svg?branch=master)](https://travis-ci.org/thrasher-/gocryptotrader)
[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-/gocryptotrader/blob/master/LICENSE)
[![GoDoc](https://godoc.org/github.com/thrasher-/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-/gocryptotrader/cmd/documentation)
[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-corp/gocryptotrader/blob/master/LICENSE)
[![GoDoc](https://godoc.org/github.com/thrasher-corp/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-corp/gocryptotrader/cmd/documentation)
[![Coverage Status](http://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-/gocryptotrader?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-/gocryptotrader)
[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-corp/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-corp/gocryptotrader)


This documentation package is part of the GoCryptoTrader codebase.
Expand Down Expand Up @@ -62,7 +62,7 @@ Be aware, this tool will:
#### A concise blurb about the package or tool system
+ Coding examples
import "github.com/thrasher-/gocryptotrader/something"
import "github.com/thrasher-corp/gocryptotrader/something"
testString := "aAaAa"
upper := strings.ToUpper(testString)
// upper == "AAAAA"
Expand All @@ -85,12 +85,12 @@ When submitting a PR, please abide by our coding guidelines:

+ Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
+ Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
+ Code must adhere to our [coding style](https://github.com/thrasher-/gocryptotrader/blob/master/doc/coding_style.md).
+ Code must adhere to our [coding style](https://github.com/thrasher-corp/gocryptotrader/blob/master/doc/coding_style.md).
+ Pull requests need to be based on and opened against the `master` branch.

## Donations

<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">
<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">

If this framework helped you in any way, or you would like to support the developers working on it, please donate Bitcoin to:

Expand Down
2 changes: 1 addition & 1 deletion cmd/documentation/cmd_templates/documentation.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Be aware, this tool will:
#### A concise blurb about the package or tool system

+ Coding examples
import "github.com/thrasher-/gocryptotrader/something"
import "github.com/thrasher-corp/gocryptotrader/something"
testString := "aAaAa"
upper := strings.ToUpper(testString)
// upper == "AAAAA"
Expand Down
2 changes: 1 addition & 1 deletion cmd/documentation/common_templates/common_readme.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
+ Coding example

```go
import "github.com/thrasher-/gocryptotrader/common"
import "github.com/thrasher-corp/gocryptotrader/common"

testString := "aAaAa"

Expand Down
6 changes: 3 additions & 3 deletions cmd/documentation/communications_templates/slack.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ app and share different types of data

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-communications-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-communications-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/communications/slack"
"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/communications/slack"
"github.com/thrasher-corp/gocryptotrader/config"
)

s := new(slack.Slack)
Expand Down
6 changes: 3 additions & 3 deletions cmd/documentation/communications_templates/smsglobal.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-communications-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-communications-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/communications/smsglobal"
"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/communications/smsglobal"
"github.com/thrasher-corp/gocryptotrader/config"
)

s := new(smsglobal.SMSGlobal)
Expand Down
6 changes: 3 additions & 3 deletions cmd/documentation/communications_templates/smtp.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-communications-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-communications-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/communications/smtpservice"
"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/communications/smtpservice"
"github.com/thrasher-corp/gocryptotrader/config"
)

s := new(smtpservice.SMTPservice)
Expand Down
6 changes: 3 additions & 3 deletions cmd/documentation/communications_templates/telegram.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ developed by Telegram Messenger LLP

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-communications-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-communications-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/communications/telegram"
"github.com/thrasher-/gocryptotrader/config"
"github.com/thrasher-corp/gocryptotrader/communications/telegram"
"github.com/thrasher-corp/gocryptotrader/config"
)

t := new(telegram.Telegram)
Expand Down
9 changes: 5 additions & 4 deletions cmd/documentation/config_templates/config_readme.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

+ Linux example for quickly creating and testing configuration file
```sh
cd ~/go/src/github.com/thrasher-/gocryptotrader
cd ~/go/src/github.com/thrasher-corp/gocryptotrader
cp config_example.json config.json
# Test config
go build
Expand All @@ -38,7 +38,7 @@ go build
+ or custom config, can also pass in absolute path to "configuration".json file.

```sh
cd ~/go/src/github.com/thrasher-/gocryptotrader
cd ~/go/src/github.com/thrasher-corp/gocryptotrader
cp config_example.json custom.json
# Test config
go build
Expand All @@ -64,8 +64,9 @@ have multiple deposit accounts for different FIAT deposit currencies.
"Websocket": false,
"UseSandbox": false,
"RESTPollingDelay": 10,
"HTTPTimeout": 15000000000,
"AuthenticatedAPISupport": false,
"websocketResponseCheckTimeout": 30000000,
"websocketResponseMaxLimit": 7000000000,
"httpTimeout": 15000000000,
"APIKey": "Key",
"APISecret": "Secret",
"AvailablePairs": "ATENC_GBP,ATENC_NZD,BTC_AUD,BTC_SGD,LTC_BTC,START_GBP,...",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

+ Example below:
```go
import "github.com/thrasher-/gocryptotrader/currency/pair"
import "github.com/thrasher-corp/gocryptotrader/currency/pair"

// Create new pair
newPair := currency.NewPairFromStrings("BTC", "USD")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

+ Example below:
```go
import "github.com/thrasher-/gocryptotrader/currency/symbol"
import "github.com/thrasher-corp/gocryptotrader/currency/symbol"

// Get the string of the symbol by the currency
chineseYen := "CNY"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

+ Example below:
```go
import "github.com/thrasher-/gocryptotrader/currency/translation"
import "github.com/thrasher-corp/gocryptotrader/currency/translation"

// Is translatable
b := translation.HasTranslation("BTC")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-currency-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-currency-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-/gocryptotrader/currency/forexprovider/currencyconverter"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/currencyconverter"
)

c := currencyconverter.CurrencyConverter{}
Expand Down
6 changes: 3 additions & 3 deletions cmd/documentation/currency_templates/fx_currencylayer.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-currency-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-currency-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-/gocryptotrader/currency/forexprovider/currencylayer"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/currencylayer"
)

c := currencylayer.CurrencyLayer{}
Expand Down
6 changes: 3 additions & 3 deletions cmd/documentation/currency_templates/fx_fixer.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-currency-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-currency-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-/gocryptotrader/currency/forexprovider/fixer.io"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/fixer.io"
)

c := fixer.Fixer{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

### How to enable

+ [Enable via configuration](https://github.com/thrasher-/gocryptotrader/tree/master/config#enable-currency-via-config-example)
+ [Enable via configuration](https://github.com/thrasher-corp/gocryptotrader/tree/master/config#enable-currency-via-config-example)

+ Individual package example below:
```go
import (
"github.com/thrasher-/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-/gocryptotrader/currency/forexprovider/openexchangerates"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/base"
"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/openexchangerates"
)

c := openexchangerates.OXR{}
Expand Down
4 changes: 2 additions & 2 deletions cmd/documentation/documentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"time"

"github.com/thrasher-/gocryptotrader/common"
"github.com/thrasher-/gocryptotrader/core"
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/core"
)

const (
Expand Down
Loading

0 comments on commit 8ecd8a0

Please sign in to comment.