Catch up to root master

.travis.yml

@@ -0,0 +1,17 @@
+language: go
+
+go_import_path: github.com/lightyeario/kelp
+
+go:
+- "1.10.x"
+- "1.11"
+
+before_install:
+- curl https://glide.sh/get | sh
+
+install:
+- glide install
+
+script:
+- ./scripts/build.sh
+- ./bin/kelp version

CHANGELOG.md

@@ -4,23 +4,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+
 ## [Unreleased]
 
 ### Added
-- This CHANGELOG file
 
 ### Changed
-- Updated dependency `github.com/stellar/go` to latest version `5bbd27814a3ffca9aeffcbd75a09a6164959776a`, run `glide up` to update this dependency
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
-- If `SOURCE_SECRET_SEED` is missing or empty then the bot will not crash now.
 
 ### Security
 
+## [v1.0.0-rc3] - 2018-09-29
+
+### Added
+- support for all currencies available on Kraken
+
+## [v1.0.0-rc2] - 2018-09-28
+
+### Added
+- This CHANGELOG file
+
+### Changed
+- Updated dependency `github.com/stellar/go` to latest version `5bbd27814a3ffca9aeffcbd75a09a6164959776a`, run `glide up` to update this dependency
+
+### Fixed
+- If `SOURCE_SECRET_SEED` is missing or empty then the bot will not crash now.
+- support for [CAP-0003](https://github.com/stellar/stellar-protocol/blob/master/core/cap-0003.md) introduced in stellar-core protocol v10 ([issue #2](https://github.com/lightyeario/kelp/issues/2))
+
 
 ## v1.0.0-rc1 - 2018-08-13
 
@@ -31,4 +46,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Configuration file based approach to setting up a bot
 - Documentation on existing capabilities
 
-[Unreleased]: https://github.com/lightyeario/kelp/compare/v1.0.0-rc1...HEAD
+[Unreleased]: https://github.com/lightyeario/kelp/compare/v1.0.0-rc3...HEAD
+[v1.0.0-rc3]: https://github.com/lightyeario/kelp/compare/v1.0.0-rc2...v1.0.0-rc3
+[v1.0.0-rc2]: https://github.com/lightyeario/kelp/compare/v1.0.0-rc1...v1.0.0-rc2

README.md

@@ -4,6 +4,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/lightyeario/kelp/total.svg?style=for-the-badge)][github-releases]
 [![license](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=for-the-badge&longCache=true)][license-apache]
 
+[![Build Status](https://travis-ci.com/lightyeario/kelp.svg?branch=master)](https://travis-ci.com/lightyeario/kelp)
 [![GitHub issues](https://img.shields.io/github/issues/lightyeario/kelp.svg?style=flat-square&longCache=true)][github-issues]
 [![GitHub closed issues](https://img.shields.io/github/issues-closed/lightyeario/kelp.svg?style=flat-square&longCache=true)][github-issues-closed]
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/lightyeario/kelp.svg?style=flat-square&longCache=true)][github-pulls]
@@ -54,24 +55,24 @@ There is **one** binary associated with this project: `kelp`. Once the binary is
 
 You can find the pre-compiled binary for your platform from the [Github Releases Page][github-releases].
 
-Here is a list of binaries for the most recent release **v1.0.0-rc1**:
+Here is a list of binaries for the most recent release **v1.0.0-rc3**:
 
 | Platform       | Architecture | Binary File Name |
 | -------------- | ------------ | ---------------- |
-| MacOS (Darwin) | 64-bit       | [kelp-v1.0.0-rc1-darwin-amd64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-darwin-amd64.tar) |
-| Windows        | 64-bit       | [kelp-v1.0.0-rc1-windows-amd64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-windows-amd64.tar) |
-| Linux          | 64-bit       | [kelp-v1.0.0-rc1-linux-amd64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-linux-amd64.tar) |
-| Linux          | 64-bit arm   | [kelp-v1.0.0-rc1-linux-arm64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-linux-arm64.tar) |
-| Linux          | 32-bit arm5  | [kelp-v1.0.0-rc1-linux-arm5.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-linux-arm5.tar) |
-| Linux          | 32-bit arm6  | [kelp-v1.0.0-rc1-linux-arm6.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-linux-arm6.tar) |
-| Linux          | 32-bit arm7  | [kelp-v1.0.0-rc1-linux-arm7.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc1/kelp-v1.0.0-rc1-linux-arm7.tar) |
+| MacOS (Darwin) | 64-bit       | [kelp-v1.0.0-rc3-darwin-amd64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-darwin-amd64.tar) |
+| Windows        | 64-bit       | [kelp-v1.0.0-rc3-windows-amd64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-windows-amd64.tar) |
+| Linux          | 64-bit       | [kelp-v1.0.0-rc3-linux-amd64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-linux-amd64.tar) |
+| Linux          | 64-bit arm   | [kelp-v1.0.0-rc3-linux-arm64.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-linux-arm64.tar) |
+| Linux          | 32-bit arm5  | [kelp-v1.0.0-rc3-linux-arm5.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-linux-arm5.tar) |
+| Linux          | 32-bit arm6  | [kelp-v1.0.0-rc3-linux-arm6.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-linux-arm6.tar) |
+| Linux          | 32-bit arm7  | [kelp-v1.0.0-rc3-linux-arm7.tar](https://github.com/lightyeario/kelp/releases/download/v1.0.0-rc3/kelp-v1.0.0-rc3-linux-arm7.tar) |
 
-After you _untar_ the downloaded file, change to the generated directory (`kelp-v1.0.0-rc1`) and invoke the `kelp` binary.
+After you _untar_ the downloaded file, change to the generated directory (`kelp-v1.0.0-rc3`) and invoke the `kelp` binary.
 
 Here's an example to get you started (replace `filename` with the name of the file that you download):
 
     tar xvf filename
-    cd kelp-v1.0.0-rc1
+    cd kelp-v1.0.0-rc3
     ./kelp
 
 To run the bot in simulation mode, try this command:
@@ -107,13 +108,13 @@ These are the following commands available from the `kelp` binary:
 
 The `trade` command has three parameters which are:
 
-- **botConf**: _.cfg_ file with the account details, [sample file here](examples/configs/trader/sample_trader.cfg).
+- **botConf**: full path to the _.cfg_ file with the account details, [sample file here](examples/configs/trader/sample_trader.cfg).
 - **strategy**: the strategy you want to run (_sell_, _buysell_, _balanced_, _mirror_, _delete_).
-- **stratConf**: _.cfg_ file specific to your chosen strategy, [sample files here](examples/configs/trader/).
+- **stratConf**: full path to the _.cfg_ file specific to your chosen strategy, [sample files here](examples/configs/trader/).
 
 Here's an example of how to start the trading bot with the _buysell_ strategy:
 
-`kelp trade --botConf trader.cfg --strategy buysell --stratConf buysell.cfg`
+`kelp trade --botConf ./path/trader.cfg --strategy buysell --stratConf ./path/buysell.cfg`
 
 If you are ever stuck, just invoke the `kelp` binary directly or type `kelp help [command]` for help with a specific command.
 

cmd/terminate.go

@@ -46,7 +46,6 @@ func init() {
 			*configFile.TradingAccount,
 			utils.ParseNetwork(configFile.HORIZON_URL),
 			-1, // not needed here
-			-1, // not needed here
 			false,
 		)
 		terminator := terminator.MakeTerminator(client, sdex, *configFile.TradingAccount, configFile.TICK_INTERVAL_SECONDS, configFile.ALLOW_INACTIVE_MINUTES)

cmd/trade.go

@@ -14,8 +14,8 @@ import (
 	"github.com/stellar/go/support/config"
 )
 
-const tradeExamples = `  kelp trade --botConf trader.cfg --strategy buysell --stratConf buysell.cfg
-  kelp trade --botConf trader.cfg --strategy buysell --stratConf buysell.cfg --sim`
+const tradeExamples = `  kelp trade --botConf ./path/trader.cfg --strategy buysell --stratConf ./path/buysell.cfg
+  kelp trade --botConf ./path/trader.cfg --strategy buysell --stratConf ./path/buysell.cfg --sim`
 
 var tradeCmd = &cobra.Command{
 	Use:     "trade",
@@ -43,13 +43,11 @@ func init() {
 	strategy := tradeCmd.Flags().StringP("strategy", "s", "", "(required) type of strategy to run")
 	stratConfigPath := tradeCmd.Flags().StringP("stratConf", "f", "", "strategy config file path")
 	// long-only flags
-	fractionalReserveMultiplier := tradeCmd.Flags().Int8("fractionalReserveMultiplier", 1, "fractional multiplier for XLM reserves")
 	operationalBuffer := tradeCmd.Flags().Float64("operationalBuffer", 20, "buffer of native XLM to maintain beyond minimum account balance requirement")
 	simMode := tradeCmd.Flags().Bool("sim", false, "simulate the bot's actions without placing any trades")
 
 	requiredFlag("botConf")
 	requiredFlag("strategy")
-	hiddenFlag("fractionalReserveMultiplier")
 	hiddenFlag("operationalBuffer")
 	tradeCmd.Flags().SortFlags = false
 
@@ -70,6 +68,9 @@ func init() {
 		}
 		log.Printf("Trading %s:%s for %s:%s\n", botConfig.ASSET_CODE_A, botConfig.ISSUER_A, botConfig.ASSET_CODE_B, botConfig.ISSUER_B)
 
+		//Add current strategy to the log
+		log.Printf("Current strategy: %s\n", *strategy)
+
 		client := &horizon.Client{
 			URL:  botConfig.HORIZON_URL,
 			HTTP: http.DefaultClient,
@@ -84,7 +85,6 @@ func init() {
 			botConfig.SourceAccount(),
 			botConfig.TradingAccount(),
 			utils.ParseNetwork(botConfig.HORIZON_URL),
-			*fractionalReserveMultiplier,
 			*operationalBuffer,
 			*simMode,
 		)

examples/configs/trader/sample_buysell.cfg

@@ -37,7 +37,7 @@ AMOUNT_TOLERANCE=0.001
 # how much percent to offset your rates by, specified as a decimal (ex: 0.05 = 5%). Can be used in conjunction with RATE_OFFSET below.
 # A positive value indicates that your base asset (ASSET_A) has a higher rate than the rate received from your price feed
 # A negative value indicates that your base asset (ASSET_A) has a lower rate than the rate received from your price feed
-RATE_OFFSET_PERCENT=0.05
+RATE_OFFSET_PERCENT=0.0
 # how much to offset your rates by, specified in number of units of the quote asset (ASSET_B) as a decimal.
 # Can be used in conjunction with RATE_OFFSET_PERCENT above.
 # A positive value indicates that your base asset (ASSET_A) has a higher rate than the rate received from your price feed

examples/configs/trader/sample_sell.cfg

@@ -39,7 +39,7 @@ AMOUNT_TOLERANCE=0.001
 # how much percent to offset your rates by, specified as a decimal (ex: 0.05 = 5%). Can be used in conjunction with RATE_OFFSET below.
 # A positive value indicates that your base asset (ASSET_A) has a higher rate than the rate received from your price feed
 # A negative value indicates that your base asset (ASSET_A) has a lower rate than the rate received from your price feed
-RATE_OFFSET_PERCENT=0.05
+RATE_OFFSET_PERCENT=0.0
 # how much to offset your rates by, specified in number of units of the quote asset (ASSET_B) as a decimal.
 # Can be used in conjunction with RATE_OFFSET_PERCENT above.
 # A positive value indicates that your base asset (ASSET_A) has a higher rate than the rate received from your price feed

examples/walkthroughs/trader/balanced.md

@@ -64,7 +64,7 @@ The virtual balance combined with the actual balance the bot has in its account
 Assuming your botConfig is called `trader.cfg` and your strategy config is called `balanced.cfg`, you can run `kelp` with the following command:
 
 ```
-kelp trade --botConf trader.cfg --strategy balanced --stratConf balanced.cfg
+kelp trade --botConf ./path/trader.cfg --strategy balanced --stratConf ./path/balanced.cfg
 ```
 
 # Above and Beyond

examples/walkthroughs/trader/buysell.md

@@ -43,7 +43,7 @@ A level defines a [layer](https://en.wikipedia.org/wiki/Layering_(finance)) that
 
 Assuming your botConfig is called `trader.cfg` and your strategy config is called `buysell.cfg`, you can run `kelp` with the following command:
 ```
-kelp trade --botConf trader.cfg --strategy buysell --stratConf buysell.cfg
+kelp trade --botConf ./path/trader.cfg --strategy buysell --stratConf ./path/buysell.cfg
 ```
 
 # Above and Beyond

examples/walkthroughs/trader/sell.md

@@ -48,7 +48,7 @@ A level defines a [layer](https://en.wikipedia.org/wiki/Layering_(finance)) that
 Assuming your botConfig is called `trader.cfg` and your strategy config is called `sell.cfg`, you can run `kelp`  with the following command:
 
 ```
-kelp trade --botConf trader.cfg --strategy sell --stratConf sell.cfg
+kelp trade --botConf ./path/trader.cfg --strategy sell --stratConf ./path/sell.cfg
 ```
 
 # Above and Beyond

model/assets.go

@@ -11,12 +11,35 @@ type Asset string
 // this is the list of assets understood by the bot.
 // This string can be converted by the specific exchange adapter as is needed by the exchange's API
 const (
-	XLM Asset = "XLM"
-	BTC Asset = "BTC"
-	USD Asset = "USD"
-	ETH Asset = "ETH"
-	LTC Asset = "LTC"
-	REP Asset = "REP"
+	XLM  Asset = "XLM"
+	BTC  Asset = "BTC"
+	USD  Asset = "USD"
+	ETH  Asset = "ETH"
+	LTC  Asset = "LTC"
+	REP  Asset = "REP"
+	ADA  Asset = "ADA"
+	BCH  Asset = "BCH"
+	DASH Asset = "DASH"
+	EOS  Asset = "EOS"
+	GNO  Asset = "GNO"
+	FEE  Asset = "FEE"
+	QTUM Asset = "QTUM"
+	USDT Asset = "USDT"
+	DAO  Asset = "DAO"
+	ETC  Asset = "ETC"
+	ICN  Asset = "ICN"
+	MLN  Asset = "MLN"
+	NMC  Asset = "NMC"
+	XDG  Asset = "XDG"
+	XMR  Asset = "XMR"
+	XRP  Asset = "XRP"
+	XVN  Asset = "XVN"
+	ZEC  Asset = "ZEC"
+	CAD  Asset = "CAD"
+	EUR  Asset = "EUR"
+	GBP  Asset = "GBP"
+	JPY  Asset = "JPY"
+	KRW  Asset = "KRW"
 )
 
 // AssetConverter converts to and from the asset type, it is specific to an exchange
@@ -67,20 +90,66 @@ func (c AssetConverter) MustFromString(s string) Asset {
 
 // Display is a basic converter for display purposes
 var Display = makeAssetConverter(map[Asset]string{
-	XLM: string(XLM),
-	BTC: string(BTC),
-	USD: string(USD),
-	ETH: string(ETH),
-	LTC: string(LTC),
-	REP: string(REP),
+	XLM:  string(XLM),
+	BTC:  string(BTC),
+	USD:  string(USD),
+	ETH:  string(ETH),
+	LTC:  string(LTC),
+	REP:  string(REP),
+	ADA:  string(ADA),
+	BCH:  string(BCH),
+	DASH: string(DASH),
+	EOS:  string(EOS),
+	GNO:  string(GNO),
+	FEE:  string(FEE),
+	QTUM: string(QTUM),
+	USDT: string(USDT),
+	DAO:  string(DAO),
+	ETC:  string(ETC),
+	ICN:  string(ICN),
+	MLN:  string(MLN),
+	NMC:  string(NMC),
+	XDG:  string(XDG),
+	XMR:  string(XMR),
+	XRP:  string(XRP),
+	XVN:  string(XVN),
+	ZEC:  string(ZEC),
+	CAD:  string(CAD),
+	EUR:  string(EUR),
+	GBP:  string(GBP),
+	JPY:  string(JPY),
+	KRW:  string(KRW),
 })
 
 // KrakenAssetConverter is the asset converter for the Kraken exchange
 var KrakenAssetConverter = makeAssetConverter(map[Asset]string{
-	XLM: "XXLM",
-	BTC: "XXBT",
-	USD: "ZUSD",
-	ETH: "XETH",
-	LTC: "XLTC",
-	REP: "XREP",
+	XLM:  "XXLM",
+	BTC:  "XXBT",
+	USD:  "ZUSD",
+	ETH:  "XETH",
+	LTC:  "XLTC",
+	REP:  "XREP",
+	ADA:  "ADA",
+	BCH:  "BCH",
+	DASH: "DASH",
+	EOS:  "EOS",
+	GNO:  "GNO",
+	FEE:  "KFEE",
+	QTUM: "QTUM",
+	USDT: "USDT",
+	DAO:  "XDAO",
+	ETC:  "XETC",
+	ICN:  "XICN",
+	MLN:  "XMLN",
+	NMC:  "XNMC",
+	XDG:  "XXDG",
+	XMR:  "XXMR",
+	XRP:  "XXRP",
+	XVN:  "XXVN",
+	ZEC:  "XZEC",
+	CAD:  "ZCAD",
+	EUR:  "ZEUR",
+	GBP:  "ZGBP",
+	JPY:  "ZJPY",
+	KRW:  "ZKRW",
 })

model/number.go

@@ -66,6 +66,14 @@ func InvertNumber(n *Number) *Number {
 	return NumberFromFloat(1/n.AsFloat(), n.Precision())
 }
 
+// NumberByCappingPrecision returns a number with a precision that is at max the passed in precision
+func NumberByCappingPrecision(n *Number, precision int8) *Number {
+	if n.Precision() > precision {
+		return NumberFromFloat(n.AsFloat(), precision)
+	}
+	return n
+}
+
 func round(num float64) int {
 	return int(num + math.Copysign(0.5, num))
 }