Skip to content

Commit

Permalink
Merge branch 'release/5.0.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
straumat committed Jan 8, 2022
2 parents ec80c60 + 5062778 commit 08aacf0
Show file tree
Hide file tree
Showing 78 changed files with 845 additions and 247 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
open_collective: cassandre-tech
20 changes: 4 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,17 @@ updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: "weekly"
day: "thursday"
interval: "daily"
time: "18:00"
timezone: Europe/Paris
open-pull-requests-limit: 9
target-branch: development

- package-ecosystem: maven
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: Europe/Paris
timezone: "Europe/Paris"
open-pull-requests-limit: 9
target-branch: development

- package-ecosystem: npm
directory: "/docs"
schedule:
interval: "weekly"
day: "sunday"
interval: "daily"
time: "18:00"
timezone: Europe/Paris
timezone: "Europe/Paris"
open-pull-requests-limit: 9
target-branch: development
1 change: 1 addition & 0 deletions .github/workflows/branch-push-or-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
# ================================================================================================================
- name: Upload codacy coverage results
continue-on-error: true
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
--project-token ${{ secrets.CODACY_API_TOKEN }} \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: CodeQL analysis

on:
schedule:
- cron: '0 18 * * MON'
- cron: '0 18 * * THU'
- cron: '0 18 * * SUN'

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Integration tests

on:
schedule:
- cron: '0 18 * * MON'
- cron: '0 18 * * THU'
- cron: '0 18 * * SUN'

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<img src="https://api.codacy.com/project/badge/Grade/f26dc41008a64bb18dcd404b46b69fc8"
alt="Cassandre trading bot on codacy" />
</a>
<a href="https://www.codacy.com/gh/cassandre-tech/cassandre-trading-bot/dashboard?utm_source=github.com&utm_medium=referral&utm_content=cassandre-tech/cassandre-trading-bot&utm_campaign=Badge_Coverage">
<img src="https://api.codacy.com/project/badge/Coverage/f26dc41008a64bb18dcd404b46b69fc8"
alt="Cassandre trading bot on codacy" />
</a>
<a href="https://github.com/cassandre-tech/cassandre-trading-bot/actions">
<img src="https://github.com/cassandre-tech/cassandre-trading-bot/workflows/Continuous%20integration/badge.svg"
alt="Cassandre trading bot continuous integration" />
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/.vuepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ export default defineUserConfig<DefaultThemeOptions>({
[
'@vuepress/plugin-docsearch',
{
appId: 'BH4D9OD16A',
apiKey: '94f09cface8844077df616a30863e73a',
appId: 'Z5EV5Y49BO',
apiKey: '92c15c16c728a530fc095a798081e674',
indexName: 'cassandre'
},
],
Expand Down
4 changes: 3 additions & 1 deletion docs/docs/ressources/books.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
lang: en-US
title: Books
description: Interesting books on crypto, trading and bots
description: Interesting books on crypto, open source, trading and bots
---
# Books

Expand All @@ -12,3 +12,5 @@ description: Interesting books on crypto, trading and bots
* I bought [Building Trading Bots Using Java](https://amzn.to/33PyJoW) to understand how to build a trading bot from scratch.
* To create an efficient bot, I decided to build it as a Reactive application and to learn it, I bought [Hands-On Reactive Programming in Spring 5](https://amzn.to/36u6qP8) and [Hands-On Reactive Programming with Reactor](https://amzn.to/2NeW0uT).

## Open Source
* A good book to understand how an Open Source project works and how things are evolving: [Working in Public: The Making and Maintenance of Open Source Software](https://amzn.to/3HSjgcU).
9 changes: 8 additions & 1 deletion docs/docs/ressources/how-tos/how-to-create-a-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ You must be using `ssh` and not `https`. To switch to `ssh`, type :
git remote set-url origin [email protected]:cassandre-tech/cassandre-trading-bot.git
```

Start the release with :
Check that you are on the develop branch and that everything is committed:
```bash
git checkout development
git status
```

Start the release with:
```bash
mvn gitflow:release-start
```
Expand All @@ -28,3 +34,4 @@ mvn gitflow:release-finish
## Update
* Close the corresponding [milestone in Github](https://github.com/cassandre-tech/cassandre-trading-bot/milestones?direction=asc&sort=due_date&state=open).
* Write and send a [substack post](https://cassandre.substack.com/publish?utm_source=menu).
* Update cassandre release number on production trading bots.
18 changes: 16 additions & 2 deletions docs/docs/ressources/how-tos/how-to-fix-common-problems.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: How to fix common Cassandre problems
---
# How to fix common Cassandre problems

## Your strategies specifies a trading account that doesn't exist
## Your strategies specify a trading account that doesn't exist
First thing to check: your configuration. If you are connecting to a real exchange (not a sandbox) with your real credentials, you must have those parameters to `false` in your `application.properties`:

```properties
Expand Down Expand Up @@ -36,4 +36,18 @@ On Binance, you should not ask for data too often, or you will get a `Way too mu
```properties
cassandre.trading.bot.exchange.rates.account=PT30S
cassandre.trading.bot.exchange.rates.ticker=PT30S
cassandre.trading.bot.exchange.rates.trade=PT30S
cassandre.trading.bot.exchange.rates.trade=PT30S
```

## Requested bean is currently in creation: Is there an unresolvable circular reference?
When you have this error message on startup:
```
̀Unknown configuration error: Error creating bean with name 'tech.cassandre.trading.bot.configuration.ExchangeAutoConfiguration': Requested bean is currently in creation: Is there an unresolvable circular reference?
```

Since Spring boot 2.6.0, circular references are prohibited by default and before Cassandre 5.0.7, we had an error circular references we did not notice. So, if you are using a spring boot 2.6.0, you have to use a Cassandre release superior to 5.0.7.

## Kucoin - Your strategies specifies a trading account that doesn't exist
You have assets on your account, and `getTradeAccount(Set<AccountDTO> accounts)` is implemented but when your bot is starting, you get the following error `Your strategies specifies a trading account that doesn't exist`.

You can try this solution: [https://github.com/cassandre-tech/cassandre-trading-bot/issues/786#issuecomment-999503117](https://github.com/cassandre-tech/cassandre-trading-bot/issues/786#issuecomment-999503117).
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Project information -->
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>5.0.6</version>
<version>5.0.7</version>
<packaging>pom</packaging>
<name>Cassandre trading bot</name>
<url>https://github.com/cassandre-tech/cassandre-trading-bot</url>
Expand Down Expand Up @@ -55,7 +55,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.6</version>
<version>2.6.2</version>
<relativePath/>
</parent>
<!-- =========================================================================================================== -->
Expand All @@ -73,11 +73,11 @@
<!-- Libraries releases -->

<!-- Core -->
<spring.version>2.5.5</spring.version>
<spring.version>2.6.1</spring.version>
<reactor.version>Dysprosium-SR25</reactor.version>
<xchange.version>5.0.12</xchange.version>
<bucket4j.version>6.4.0</bucket4j.version>
<liquibase.version>4.6.1</liquibase.version>
<bucket4j.version>6.4.1</bucket4j.version>
<liquibase.version>4.6.2</liquibase.version>
<opencsv.version>5.5.2</opencsv.version>

<!-- Core utils -->
Expand All @@ -93,14 +93,14 @@
<junit-pioneer.version>1.5.0</junit-pioneer.version>
<awaitility.version>4.1.1</awaitility.version>
<hsqldb.version>2.6.0</hsqldb.version>
<jackson.version>2.12.5</jackson.version>
<jackson.version>2.12.6</jackson.version>

<!-- GraphQL API -->
<graphql-dgs.version>4.9.7</graphql-dgs.version>
<graphql-dgs.version>4.9.15</graphql-dgs.version>

<!-- Maven -->
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
<puppycrawl.checkstyle.version>9.1</puppycrawl.checkstyle.version>
<maven.puppycrawl.checkstyle.version>9.2.1</maven.puppycrawl.checkstyle.version>
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
Expand All @@ -110,7 +110,7 @@
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
<maven.archetype-packaging.version>3.2.0</maven.archetype-packaging.version>
<maven.archetype-packaging.version>3.2.1</maven.archetype-packaging.version>
</properties>
<!-- =========================================================================================================== -->

Expand Down Expand Up @@ -141,7 +141,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.16.0</version>
<version>1.17.0</version>
<configuration>
<gitFlowConfig>
<developmentBranch>development</developmentBranch>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.checkstyle.version}</version>
<version>${maven.puppycrawl.checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -219,7 +219,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>5.0.6</version>
<version>5.0.7</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,16 @@ spring.datasource.username=sa
spring.datasource.password=
#
# GraphQL API configuration.
cassandre.trading.bot.api.graphql.key=667341fd-d4c2-4bc2-99af-0a2a697aa134
cassandre.trading.bot.api.graphql.key=667341fd-d4c2-4bc2-99af-0a2a697aa134
#
# ======================================================================================================================
# Parameters for tests.
#
# For JPA.
spring.jpa.hibernate.ddl-auto=none
#
# Console logging pattern.
logging.pattern.console=%d{HH:mm:ss} - %msg%n
#
# File logging pattern.
logging.pattern.file=%d{HH:mm:ss} - %msg%n
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.checkstyle.version}</version>
<version>${maven.puppycrawl.checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -106,7 +106,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>5.0.6</version>
<version>5.0.7</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-starter-test/autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.checkstyle.version}</version>
<version>${maven.puppycrawl.checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -222,7 +222,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>5.0.6</version>
<version>5.0.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"1601596800","0.8494","0.85652","0.87","0.82001","6402298.90377638","5396388.7386519256337"
"1601683200","0.85653","0.84261","0.88888","0.82","7349493.47425826","6292644.8212960955051"
"1601769600","0.84251","0.83751","0.8506","0.823","7306874.10063719","6158682.638871191526"
"1601769600","0.84251","0.83751","0.8506","0.823",8078919516.06535988,"6158682.638871191526"
4 changes: 2 additions & 2 deletions spring-boot-starter-test/starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.checkstyle.version}</version>
<version>${maven.puppycrawl.checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -116,7 +116,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>5.0.6</version>
<version>5.0.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-starter/autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.checkstyle.version}</version>
<version>${maven.puppycrawl.checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -398,7 +398,7 @@
<parent>
<groupId>tech.cassandre.trading.bot</groupId>
<artifactId>cassandre-trading-bot-project</artifactId>
<version>5.0.6</version>
<version>5.0.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<!-- =========================================================================================================== -->
Expand Down
Loading

0 comments on commit 08aacf0

Please sign in to comment.