Skip to content

Commit

Permalink
Merge branch 'c9s:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
chendagan authored Jan 14, 2024
2 parents 069cf76 + 03449d0 commit a25f4e7
Show file tree
Hide file tree
Showing 348 changed files with 24,357 additions and 3,777 deletions.
13 changes: 13 additions & 0 deletions .env.local.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
SLACK_TOKEN=YOUR_TOKEN
SLACK_CHANNEL=CHANNEL_NAME

# DB_DRIVER="sqlite3"
# DB_DSN="bbgo.sqlite3"
DB_DRIVER=mysql
DB_DSN=root@tcp(127.0.0.1:3306)/bbgo

MAX_API_KEY=YOUR_API_KEY
MAX_API_SECRET=YOUR_API_SECRET

BINANCE_API_KEY=YOUR_API_KEY
BINANCE_API_SECRET=YOUR_API_SECRET
8 changes: 4 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
strategy:
matrix:
redis-version:
- 6.2
- "6.2"
go-version:
- 1.18
- "1.20"
env:
MYSQL_DATABASE: bbgo
MYSQL_USER: "root"
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
# auto-start: "false"

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
sed -i -e '/_requestgen.go/d' coverage_dnum.txt
- name: Revive Check
uses: morphy2k/revive-action@v2
uses: morphy2k/revive-action@v2.5.4 # https://github.com/mgechev/revive/issues/956
with:
reporter: github-pr-review
fail_on_error: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/golang-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: 1.21
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.46.2
version: v1.54
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version: "1.20"
- name: Install Node
uses: actions/setup-node@v2
with:
Expand Down
15 changes: 7 additions & 8 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
We as members, contributors, and leaders pledge to participate in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
Expand All @@ -15,7 +15,7 @@ diverse, inclusive, and healthy community.
## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:
community includes:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
Expand All @@ -33,7 +33,7 @@ Examples of unacceptable behavior include:
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
* Other conduct that could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand All @@ -50,7 +50,7 @@ decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
This Code of Conduct applies within all community spaces and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
Expand Down Expand Up @@ -82,12 +82,11 @@ behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.
**Community Impact**: This violation occurs through a single incident or a series of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
those enforcing the Code of Conduct, for a specified period. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
Expand All @@ -98,7 +97,7 @@ permanent ban.
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
communication with the community for a specified period. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ Install pre-commit to check your changes before you commit:

See <https://pre-commit.com/> for more details.

For new large features, such as integrating binance futures contracts, please propose a discussion first before you start working on it.
For new large features, such as integrating Binance futures contracts, please propose a discussion first before you start working on it.

For new small features, you could open a pull request directly.

For each contributor, you have chance to receive the BBG token through the polygon network.

Each issue has its BBG label, by completing the issue with a pull request, you can get correspond amount of BBG.
Each issue has its BBG label, by completing the issue with a pull request, you can get corresponding amount of BBG.

## Support

### By contributing pull requests

Any pull request is welcome, documentation, format fixing, testing, features.
Any pull request is welcome, documentation, format fixing, testing, and features.

### By registering account with referral ID

Expand All @@ -52,7 +52,7 @@ You may register your exchange account with my referral ID to support this proje
- For MAX Exchange: <https://max.maicoin.com/signup?r=c7982718> (default commission rate to your account)
- For Binance Exchange: <https://www.binancezh.com/en/register?ref=VGDGLT80> (5% commission back to your account)

### By small amount cryptos
### By small amount of cryptos

- BTC address `3J6XQJNWT56amqz9Hz2BEVQ7W4aNmb5kiU`
- USDT ERC20 address `0xeBcf7887A5b767DEb2e0C77E46A22c6Adc64E427`
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# First stage container
FROM golang:1.18.10-alpine3.17 AS builder
FROM golang:1.20-alpine3.18 AS builder
RUN apk add --no-cache git ca-certificates gcc musl-dev libc-dev pkgconfig
# gcc is for github.com/mattn/go-sqlite3
# ADD . $GOPATH/src/github.com/c9s/bbgo
Expand All @@ -18,7 +18,7 @@ RUN go get github.com/mattn/go-sqlite3
RUN go build -o $GOPATH_ORIG/bin/bbgo ./cmd/bbgo

# Second stage container
FROM alpine:3.17
FROM alpine:3.18

# Create the default user 'bbgo' and assign to env 'USER'
ENV USER=bbgo
Expand Down
Loading

0 comments on commit a25f4e7

Please sign in to comment.