trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

PT2.2 WIP Changes

This commit is contained in:
JackTerok 2019-01-07 15:33:02 +01:00
parent e1de3ebb74
commit 8e3a1a43fe
23 changed files with 154 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Core/DataObjects/PTMagicData.cs
View File

@ -35,9 +35,9 @@ namespace Core.Main.DataObjects.PTMagicData
public bool IsEnabled { get; set; } = true; public bool IsEnabled { get; set; } = true;
public bool TestMode { get; set; } = true; public bool TestMode { get; set; } = true;
public bool EnableBetaFeatures { get; set; } = false; public bool EnableBetaFeatures { get; set; } = false;
public int ProfitTrailerMajorVersion { get; set; } = 1;
public string ProfitTrailerPath { get; set; } public string ProfitTrailerPath { get; set; }
public string ProfitTrailerLicense { get; set; } = ""; public string ProfitTrailerLicense { get; set; } = "";
public string ProfitTrailerServerAPIToken { get; set; }
public string ProfitTrailerMonitorURL { get; set; } = "http://localhost:8081/"; public string ProfitTrailerMonitorURL { get; set; } = "http://localhost:8081/";
public string ProfitTrailerDefaultSettingName { get; set; } = "default"; public string ProfitTrailerDefaultSettingName { get; set; } = "default";
public bool AlwaysLoadDefaultBeforeSwitch { get; set; } = true; public bool AlwaysLoadDefaultBeforeSwitch { get; set; } = true;
@ -316,7 +316,6 @@ namespace Core.Main.DataObjects.PTMagicData
public double MainMarketPrice { get; set; } = 0; public double MainMarketPrice { get; set; } = 0;
public string MainFiatCurrency { get; set; } = "USD"; public string MainFiatCurrency { get; set; } = "USD";
public double MainFiatCurrencyExchangeRate { get; set; } = 1; public double MainFiatCurrencyExchangeRate { get; set; } = 1;
public int ProfitTrailerMajorVersion { get; set; } = 1;
public List<StrategySummary> BuyStrategies { get; set; } = new List<StrategySummary>(); public List<StrategySummary> BuyStrategies { get; set; } = new List<StrategySummary>();
public List<StrategySummary> SellStrategies { get; set; } = new List<StrategySummary>(); public List<StrategySummary> SellStrategies { get; set; } = new List<StrategySummary>();
public List<StrategySummary> DCABuyStrategies { get; set; } = new List<StrategySummary>(); public List<StrategySummary> DCABuyStrategies { get; set; } = new List<StrategySummary>();
@ -408,12 +407,13 @@ namespace Core.Main.DataObjects.PTMagicData
public class sellLogData public class sellLogData
{ {
public double soldAmount { get; set; } public double soldAmount { get; set; }
public SoldDate soldDate { get; set; } public double soldDate { get; set; }
public int boughtTimes { get; set; } public int boughtTimes { get; set; }
public string market { get; set; } public string market { get; set; }
public double profit { get; set; } public double profit { get; set; }
public AverageCalculator averageCalculator { get; set; } public AverageCalculator averageCalculator { get; set; }
public double currentPrice { get; set; } public double currentPrice { get; set; }
public double fee { get; set; }
} }
public class SellLogData public class SellLogData
@ -430,33 +430,6 @@ namespace Core.Main.DataObjects.PTMagicData
public double SoldValue { get; set; } public double SoldValue { get; set; }
} }
public class SoldDate
{
public Date date { get; set; }
public Time time { get; set; }
}
public class FirstBoughtDate
{
public Date date { get; set; }
public Time time { get; set; }
}
public class Date
{
public int year { get; set; }
public int month { get; set; }
public int day { get; set; }
}
public class Time
{
public int hour { get; set; }
public int minute { get; set; }
public int second { get; set; }
public int nano { get; set; }
}
public class AverageCalculator public class AverageCalculator
{ {
public double totalCost { get; set; } public double totalCost { get; set; }
@ -464,10 +437,7 @@ namespace Core.Main.DataObjects.PTMagicData
public double totalAmountWithSold { get; set; } public double totalAmountWithSold { get; set; }
public double avgPrice { get; set; } public double avgPrice { get; set; }
public double avgCost { get; set; } public double avgCost { get; set; }
public FirstBoughtDate firstBoughtDate { get; set; }
public double totalWeightedPrice { get; set; } public double totalWeightedPrice { get; set; }
public double orderNumber { get; set; }
public double fee { get; set; }
} }
public class PTStrategy public class PTStrategy
@ -494,6 +464,7 @@ namespace Core.Main.DataObjects.PTMagicData
public double highbb { get; set; } public double highbb { get; set; }
public double profit { get; set; } public double profit { get; set; }
public AverageCalculator averageCalculator { get; set; } public AverageCalculator averageCalculator { get; set; }
public int firstBoughtDate { get; set; }
public double currentPrice { get; set; } public double currentPrice { get; set; }
public string sellStrategy { get; set; } public string sellStrategy { get; set; }
public string buyStrategy { get; set; } public string buyStrategy { get; set; }

63
Core/DataObjects/ProfitTrailerData.cs
View File

@ -3,6 +3,8 @@ using System.IO;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -20,27 +22,31 @@ namespace Core.Main.DataObjects
private PTMagicConfiguration _systemConfiguration = null; private PTMagicConfiguration _systemConfiguration = null;
private TransactionData _transactionData = null; private TransactionData _transactionData = null;
private DateTimeOffset _dateTimeNow = Constants.confMinDate; private DateTimeOffset _dateTimeNow = Constants.confMinDate;
public ProfitTrailerData(string ptmBasePath, PTMagicConfiguration systemConfiguration) public ProfitTrailerData(PTMagicConfiguration systemConfiguration)
{ {
_ptmBasePath = ptmBasePath; string html = "";
_systemConfiguration = systemConfiguration; string url = systemConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL + "api/data?token=" + systemConfiguration.GeneralSettings.Application.ProfitTrailerServerAPIToken;
// Find the path to the Profit Trailer data file try
string ptDataFilePath = Path.Combine(systemConfiguration.GeneralSettings.Application.ProfitTrailerPath, "data", "ProfitTrailerData.json");
if (!File.Exists(ptDataFilePath))
{ {
// Try the older location for PT 1.x and PT 2.0.x HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
ptDataFilePath = Path.Combine(systemConfiguration.GeneralSettings.Application.ProfitTrailerPath, "ProfitTrailerData.json"); request.AutomaticDecompression = DecompressionMethods.GZip;
if (!File.Exists(ptDataFilePath))
{ WebResponse response = request.GetResponse();
// Can't find the Profit Trailer Data Stream dataStream = response.GetResponseStream();
throw new Exception("Unable to load Profit Trailer data file at: " + ptDataFilePath); StreamReader reader = new StreamReader(dataStream);
} html = reader.ReadToEnd();
reader.Close();
response.Close();
}
catch (System.Exception)
{
throw;
} }
PTData rawPTData = JsonConvert.DeserializeObject<PTData>(File.ReadAllText(ptDataFilePath)); PTData rawPTData = JsonConvert.DeserializeObject<PTData>(html);
if (rawPTData.SellLogData != null) if (rawPTData.SellLogData != null)
{ {
this.BuildSellLogData(rawPTData.SellLogData, _systemConfiguration); this.BuildSellLogData(rawPTData.SellLogData, _systemConfiguration);
@ -147,12 +153,16 @@ namespace Core.Main.DataObjects
sellLogData.TotalCost = sellLogData.SoldAmount * sellLogData.AverageBuyPrice; sellLogData.TotalCost = sellLogData.SoldAmount * sellLogData.AverageBuyPrice;
double soldValueRaw = (sellLogData.SoldAmount * sellLogData.SoldPrice); double soldValueRaw = (sellLogData.SoldAmount * sellLogData.SoldPrice);
double soldValueAfterFees = soldValueRaw - (soldValueRaw * (rsld.averageCalculator.fee / 100)); double soldValueAfterFees = soldValueRaw - (soldValueRaw * (rsld.fee / 100));
sellLogData.SoldValue = soldValueAfterFees; sellLogData.SoldValue = soldValueAfterFees;
sellLogData.Profit = Math.Round(sellLogData.SoldValue - sellLogData.TotalCost, 8); sellLogData.Profit = Math.Round(sellLogData.SoldValue - sellLogData.TotalCost, 8);
//Convert Unix Timestamp to Datetime
System.DateTime dtDateTime = new DateTime(1970,1,1,0,0,0,System.DateTimeKind.Utc);
dtDateTime = dtDateTime.AddSeconds(rsld.soldDate).ToLocalTime();
// Profit Trailer sales are saved in UTC // Profit Trailer sales are saved in UTC
DateTimeOffset ptSoldDate = DateTimeOffset.Parse(rsld.soldDate.date.year.ToString() + "-" + rsld.soldDate.date.month.ToString("00") + "-" + rsld.soldDate.date.day.ToString("00") + "T" + rsld.soldDate.time.hour.ToString("00") + ":" + rsld.soldDate.time.minute.ToString("00") + ":" + rsld.soldDate.time.second.ToString("00"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal); DateTimeOffset ptSoldDate = DateTimeOffset.Parse(dtDateTime.Year.ToString() + "-" + dtDateTime.Month.ToString("00") + "-" + dtDateTime.Day.ToString("00") + "T" + dtDateTime.Hour.ToString("00") + ":" + dtDateTime.Minute.ToString("00") + ":" + dtDateTime.Second.ToString("00"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
// Convert UTC sales time to local offset time // Convert UTC sales time to local offset time
TimeSpan offsetTimeSpan = TimeSpan.Parse(systemConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", "")); TimeSpan offsetTimeSpan = TimeSpan.Parse(systemConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", ""));
@ -235,11 +245,14 @@ namespace Core.Main.DataObjects
} }
} }
//Convert Unix Timestamp to Datetime
System.DateTime rdldDateTime = new DateTime(1970,1,1,0,0,0,System.DateTimeKind.Utc);
rdldDateTime = rdldDateTime.AddSeconds(rdld.firstBoughtDate).ToLocalTime();
// Profit Trailer bought times are saved in UTC // Profit Trailer bought times are saved in UTC
if (rdld.averageCalculator.firstBoughtDate != null) if (rdld.firstBoughtDate != null)
{ {
DateTimeOffset ptFirstBoughtDate = DateTimeOffset.Parse(rdld.averageCalculator.firstBoughtDate.date.year.ToString() + "-" + rdld.averageCalculator.firstBoughtDate.date.month.ToString("00") + "-" + rdld.averageCalculator.firstBoughtDate.date.day.ToString("00") + "T" + rdld.averageCalculator.firstBoughtDate.time.hour.ToString("00") + ":" + rdld.averageCalculator.firstBoughtDate.time.minute.ToString("00") + ":" + rdld.averageCalculator.firstBoughtDate.time.second.ToString("00"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal); DateTimeOffset ptFirstBoughtDate = DateTimeOffset.Parse(rdldDateTime.Year.ToString() + "-" + rdldDateTime.Month.ToString("00") + "-" + rdldDateTime.Day.ToString("00") + "T" + rdldDateTime.Hour.ToString("00") + ":" + rdldDateTime.Minute.ToString("00") + ":" + rdldDateTime.Second.ToString("00"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
// Convert UTC bought time to local offset time // Convert UTC bought time to local offset time
TimeSpan offsetTimeSpan = TimeSpan.Parse(systemConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", "")); TimeSpan offsetTimeSpan = TimeSpan.Parse(systemConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", ""));
@ -294,10 +307,14 @@ namespace Core.Main.DataObjects
} }
} }
//Convert Unix Timestamp to Datetime
System.DateTime rpldDateTime = new DateTime(1970,1,1,0,0,0,System.DateTimeKind.Utc);
rpldDateTime = rpldDateTime.AddSeconds(rpld.firstBoughtDate).ToLocalTime();
// Profit Trailer bought times are saved in UTC // Profit Trailer bought times are saved in UTC
if (rpld.averageCalculator.firstBoughtDate != null) if (rpld.firstBoughtDate != null)
{ {
DateTimeOffset ptFirstBoughtDate = DateTimeOffset.Parse(rpld.averageCalculator.firstBoughtDate.date.year.ToString() + "-" + rpld.averageCalculator.firstBoughtDate.date.month.ToString("00") + "-" + rpld.averageCalculator.firstBoughtDate.date.day.ToString("00") + "T" + rpld.averageCalculator.firstBoughtDate.time.hour.ToString("00") + ":" + rpld.averageCalculator.firstBoughtDate.time.minute.ToString("00") + ":" + rpld.averageCalculator.firstBoughtDate.time.second.ToString("00"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal); DateTimeOffset ptFirstBoughtDate = DateTimeOffset.Parse(rpldDateTime.Year.ToString() + "-" + rpldDateTime.Month.ToString("00") + "-" + rpldDateTime.Day.ToString("00") + "T" + rpldDateTime.Hour.ToString("00") + ":" + rpldDateTime.Minute.ToString("00") + ":" + rpldDateTime.Second.ToString("00"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
// Convert UTC bought time to local offset time // Convert UTC bought time to local offset time
TimeSpan offsetTimeSpan = TimeSpan.Parse(systemConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", "")); TimeSpan offsetTimeSpan = TimeSpan.Parse(systemConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", ""));

264
Core/Main/PTMagic.cs
View File

@ -31,7 +31,6 @@ namespace Core.Main
private int _state = 0; private int _state = 0;
private int _runCount = 0; private int _runCount = 0;
private int _totalElapsedSeconds = 0; private int _totalElapsedSeconds = 0;
private int _profitTrailerMajorVersion = 0;
private int _configCheckRetryCount = 0; private int _configCheckRetryCount = 0;
private bool _configCheckResult = true; private bool _configCheckResult = true;
private bool _globalSettingWritten = false; private bool _globalSettingWritten = false;
@ -149,18 +148,6 @@ namespace Core.Main
} }
} }
public int ProfitTrailerMajorVersion
{
get
{
return _profitTrailerMajorVersion;
}
set
{
_profitTrailerMajorVersion = value;
}
}
public bool GlobalSettingWritten public bool GlobalSettingWritten
{ {
get get
@ -622,6 +609,9 @@ namespace Core.Main
{ {
bool result = true; bool result = true;
//Import Initial ProfitTrailer Information
SettingsAPI.GetInitialProfitTrailerSettings(this.PTMagicConfiguration);
// Check for valid default setting // Check for valid default setting
GlobalSetting defaultSetting = this.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Find(s => s.SettingName.Equals("default", StringComparison.InvariantCultureIgnoreCase)); GlobalSetting defaultSetting = this.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Find(s => s.SettingName.Equals("default", StringComparison.InvariantCultureIgnoreCase));
if (defaultSetting == null) if (defaultSetting == null)
@ -662,17 +652,7 @@ namespace Core.Main
if (ptRoot.Exists) if (ptRoot.Exists)
{ {
this.Log.DoLogInfo("Profit Trailer directory found"); this.Log.DoLogInfo("Profit Trailer directory found");
result = RunProfitTrailerSettingsAPIChecks();
// Run checks dependant on PT version
this.ProfitTrailerMajorVersion = this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMajorVersion;
if (this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMajorVersion < 2)
{
result = RunProfitTrailerTradingFilesChecks();
}
else
{
result = RunProfitTrailerSettingsAPIChecks();
}
} }
else else
{ {
@ -700,153 +680,74 @@ namespace Core.Main
return result; return result;
} }
private bool RunProfitTrailerTradingFilesChecks()
{
bool result = true;
this.Log.DoLogInfo("========== STARTING CHECKS FOR Profit Trailer 1.x ==========");
// Check for settings directory "trading"
string ptTradingPath = this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar;
DirectoryInfo ptTrading = new DirectoryInfo(ptTradingPath);
if (ptTrading.Exists)
{
this.Log.DoLogInfo("Profit Trailer 1.x check: Trading directory found");
#region File Checks
this.Log.DoLogInfo("Profit Trailer 1.x check: Checking for Pairs Properties file");
if (File.Exists(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + this.PairsFileName))
{
this.Log.DoLogInfo("Profit Trailer 1.x check: PAIRS.PROPERTIES found!");
}
else
{
this.PairsFileName = "PAIRS.properties";
if (File.Exists(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + this.PairsFileName))
{
this.Log.DoLogInfo("Profit Trailer 1.x check: PAIRS.properties found!");
}
else
{
this.Log.DoLogError("Profit Trailer 1.x check: No 'PAIRS.properties' found in " + this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar);
result = false;
}
}
this.Log.DoLogInfo("Profit Trailer 1.x check: Checking for DCA Properties file");
if (File.Exists(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + this.DCAFileName))
{
this.Log.DoLogInfo("Profit Trailer 1.x check: DCA.PROPERTIES found!");
}
else
{
this.DCAFileName = "DCA.properties";
if (File.Exists(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + this.DCAFileName))
{
this.Log.DoLogInfo("Profit Trailer 1.x check: DCA.properties found!");
}
else
{
this.Log.DoLogError("Profit Trailer 1.x check: No 'DCA.properties' found in " + this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar);
result = false;
}
}
this.Log.DoLogInfo("Profit Trailer 1.x check: Checking for Indicators Properties file");
if (File.Exists(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + this.IndicatorsFileName))
{
this.Log.DoLogInfo("Profit Trailer 1.x check: INDICATORS.PROPERTIES found!");
}
else
{
this.IndicatorsFileName = "INDICATORS.properties";
if (File.Exists(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + this.IndicatorsFileName))
{
this.Log.DoLogInfo("Profit Trailer 1.x check: INDICATORS.properties found!");
}
else
{
this.Log.DoLogError("Profit Trailer 1.x check: No 'INDICATORS.properties' found in " + this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar);
result = false;
}
}
#endregion
}
else
{
this.Log.DoLogError("Profit Trailer 1.x check: Trading settings directory not found (" + ptTradingPath + ")");
result = false;
}
if (result)
{
this.Log.DoLogInfo("========== CHECKS FOR Profit Trailer 1.x COMPLETED! ==========");
}
else
{
this.Log.DoLogInfo("========== CHECKS FOR Profit Trailer 1.x FAILED! ==========");
}
return result;
}
private bool RunProfitTrailerSettingsAPIChecks() private bool RunProfitTrailerSettingsAPIChecks()
{ {
bool result = true; bool result = true;
this.Log.DoLogInfo("========== STARTING CHECKS FOR Profit Trailer 2.x =========="); this.Log.DoLogInfo("========== STARTING CHECKS FOR Profit Trailer ==========");
// Check for PT license key // Check for PT license key
if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerLicense.Equals("")) if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerLicense.Equals(""))
{ {
this.Log.DoLogInfo("Profit Trailer 2.x check: Profit Trailer license found"); this.Log.DoLogInfo("Profit Trailer check: Profit Trailer license found");
} }
else else
{ {
this.Log.DoLogError("Profit Trailer 2.x check: No Profit Trailer license key specified! The license key is necessary to adjust your Profit Trailer settings since 2.0"); this.Log.DoLogError("Profit Trailer check: No Profit Trailer license key specified! The license key is necessary to adjust your Profit Trailer settings");
result = false;
}
//Check for ptServerAPIToken
if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerServerAPIToken.Equals(""))
{
this.Log.DoLogInfo("Profit Trailer check: Profit Trailer Server API Token Specified");
}
else
{
this.Log.DoLogError("Profit Trailer check: No Server API Token specified. It has to be the same Token as in the Profit Trailer Config File");
result = false; result = false;
} }
// Check for PT default setting key // Check for PT default setting key
if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerDefaultSettingName.Equals("")) if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerDefaultSettingName.Equals(""))
{ {
this.Log.DoLogInfo("Profit Trailer 2.x check: Profit Trailer default setting name specified"); this.Log.DoLogInfo("Profit Trailer check: Profit Trailer default setting name specified");
} }
else else
{ {
this.Log.DoLogError("Profit Trailer 2.x check: No Profit Trailer default setting name specified! The default setting name is necessary to adjust your Profit Trailer settings since 2.0"); this.Log.DoLogError("Profit Trailer check: No Profit Trailer default setting name specified! The default setting name is necessary to adjust your Profit Trailer settings since 2.0");
result = false; result = false;
} }
// Check for PT monitor // Check for PT monitor
if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL.Equals("")) if (!this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL.Equals(""))
{ {
this.Log.DoLogInfo("Profit Trailer 2.x check: Profit Trailer monitor URL found"); this.Log.DoLogInfo("Profit Trailer check: Profit Trailer monitor URL found");
} }
else else
{ {
this.Log.DoLogError("Profit Trailer 2.x check: No Profit Trailer monitor URL specified! The monitor URL is necessary to adjust your Profit Trailer settings since 2.0"); this.Log.DoLogError("Profit Trailer check: No Profit Trailer monitor URL specified! The monitor URL is necessary to adjust your Profit Trailer settings since 2.0");
result = false; result = false;
} }
// Check if PT monitor is reachable // Check if PT monitor is reachable
if (SystemHelper.UrlIsReachable(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL)) if (SystemHelper.UrlIsReachable(this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL))
{ {
this.Log.DoLogInfo("Profit Trailer 2.x check: Profit Trailer monitor connection test succeeded"); this.Log.DoLogInfo("Profit Trailer check: Profit Trailer monitor connection test succeeded");
} }
else else
{ {
this.Log.DoLogError("Profit Trailer 2.x check: Your Profit Trailer monitor (" + this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL + ") is not available! Make sure your Profit Trailer bot is up and running and your monitor is accessible."); this.Log.DoLogError("Profit Trailer check: Your Profit Trailer monitor (" + this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL + ") is not available! Make sure your Profit Trailer bot is up and running and your monitor is accessible.");
result = false; result = false;
} }
if (result) if (result)
{ {
this.Log.DoLogInfo("========== CHECKS FOR Profit Trailer 2.x COMPLETED! =========="); this.Log.DoLogInfo("========== CHECKS FOR Profit Trailer COMPLETED! ==========");
} }
else else
{ {
this.Log.DoLogInfo("========== CHECKS FOR Profit Trailer 2.x FAILED! =========="); this.Log.DoLogInfo("========== CHECKS FOR Profit Trailer FAILED! ==========");
} }
return result; return result;
@ -1137,24 +1038,12 @@ namespace Core.Main
private void LoadCurrentProfitTrailerProperties(string pairsPropertiesPath, string dcaPropertiesPath, string indicatorsPropertiesPath) private void LoadCurrentProfitTrailerProperties(string pairsPropertiesPath, string dcaPropertiesPath, string indicatorsPropertiesPath)
{ {
if (this.ProfitTrailerMajorVersion == 1) // Load current PT properties from API (Valid for PT 2.x and above)
{ this.Log.DoLogInfo("Loading current Profit Trailer properties from API...");
// Load current PT properties from files (Valid for PT 1.x)
this.Log.DoLogInfo("Loading current Profit Trailer properties from files...");
this.PairsLines = File.ReadLines(pairsPropertiesPath).ToList(); this.PairsLines = SettingsAPI.GetPropertyLinesFromAPI("PAIRS", this.PTMagicConfiguration, this.Log);
this.DCALines = File.ReadLines(dcaPropertiesPath).ToList(); this.DCALines = SettingsAPI.GetPropertyLinesFromAPI("DCA", this.PTMagicConfiguration, this.Log);
this.IndicatorsLines = File.ReadLines(indicatorsPropertiesPath).ToList(); this.IndicatorsLines = SettingsAPI.GetPropertyLinesFromAPI("INDICATORS", this.PTMagicConfiguration, this.Log);
}
else
{
// Load current PT properties from API (Valid for PT 2.x and above)
this.Log.DoLogInfo("Loading current Profit Trailer properties from API...");
this.PairsLines = SettingsAPI.GetPropertyLinesFromAPI("PAIRS", this.PTMagicConfiguration, this.Log);
this.DCALines = SettingsAPI.GetPropertyLinesFromAPI("DCA", this.PTMagicConfiguration, this.Log);
this.IndicatorsLines = SettingsAPI.GetPropertyLinesFromAPI("INDICATORS", this.PTMagicConfiguration, this.Log);
}
if (this.PairsLines != null && this.DCALines != null && this.IndicatorsLines != null) if (this.PairsLines != null && this.DCALines != null && this.IndicatorsLines != null)
{ {
@ -1170,8 +1059,6 @@ namespace Core.Main
// Get market from PT properties // Get market from PT properties
this.LastRuntimeSummary.MainMarket = SettingsHandler.GetMainMarket(this.PTMagicConfiguration, this.PairsLines, this.Log); this.LastRuntimeSummary.MainMarket = SettingsHandler.GetMainMarket(this.PTMagicConfiguration, this.PairsLines, this.Log);
this.LastRuntimeSummary.ProfitTrailerMajorVersion = this.ProfitTrailerMajorVersion;
} }
private void LoadSMSSummaries() private void LoadSMSSummaries()
@ -1269,18 +1156,11 @@ namespace Core.Main
} }
else else
{ {
if (this.ProfitTrailerMajorVersion == 1) // Since PT 2.0 the main market is no longer included in the market list so we need to rebuild the list
List<string> originalMarketList = SystemHelper.ConvertTokenStringToList(marketPairs, ",");
foreach (string market in originalMarketList)
{ {
this.MarketList = SystemHelper.ConvertTokenStringToList(marketPairs, ","); this.MarketList.Add(SystemHelper.GetFullMarketName(this.LastRuntimeSummary.MainMarket, market, this.PTMagicConfiguration.GeneralSettings.Application.Exchange));
}
else
{
// Since PT 2.0 the main market is no longer included in the market list so we need to rebuild the list
List<string> originalMarketList = SystemHelper.ConvertTokenStringToList(marketPairs, ",");
foreach (string market in originalMarketList)
{
this.MarketList.Add(SystemHelper.GetFullMarketName(this.LastRuntimeSummary.MainMarket, market, this.PTMagicConfiguration.GeneralSettings.Application.Exchange));
}
} }
} }
} }
@ -2068,38 +1948,13 @@ namespace Core.Main
{ {
if (headerLinesAdded || this.GlobalSettingWritten || this.SingleMarketSettingWritten) if (headerLinesAdded || this.GlobalSettingWritten || this.SingleMarketSettingWritten)
{ {
if (this.ProfitTrailerMajorVersion == 1) // Save current PT properties to API (Valid for PT 2.x and above)
{ this.Log.DoLogInfo("Saving properties using API...");
// Save current PT properties to files (Valid for PT 1.x)
this.Log.DoLogInfo("Saving properties files...");
// Write Pairs.properties // Send all Properties
if (this.PTMagicConfiguration.GeneralSettings.Backup.IsEnabled) FileHelper.CreateBackup(pairsPropertiesPath, this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + "_backups" + Path.DirectorySeparatorChar); if (!this.PTMagicConfiguration.GeneralSettings.Application.TestMode) SettingsAPI.SendPropertyLinesToAPI(this.PairsLines, this.DCALines, this.IndicatorsLines, this.PTMagicConfiguration, this.Log);
this.Log.DoLogInfo("Writing Pairs.properties...");
if (!this.PTMagicConfiguration.GeneralSettings.Application.TestMode) File.WriteAllLines(pairsPropertiesPath, this.PairsLines);
// Write DCA.properties this.Log.DoLogInfo("Properties saved!");
if (this.PTMagicConfiguration.GeneralSettings.Backup.IsEnabled) FileHelper.CreateBackup(dcaPropertiesPath, this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + "_backups" + Path.DirectorySeparatorChar);
this.Log.DoLogInfo("Writing DCA.properties...");
if (!this.PTMagicConfiguration.GeneralSettings.Application.TestMode) File.WriteAllLines(dcaPropertiesPath, this.DCALines);
// Write Indicators.properties
if (this.PTMagicConfiguration.GeneralSettings.Backup.IsEnabled) FileHelper.CreateBackup(indicatorsPropertiesPath, this.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerPath + Constants.PTPathTrading + Path.DirectorySeparatorChar + "_backups" + Path.DirectorySeparatorChar);
this.Log.DoLogInfo("Writing Indicators.properties...");
if (!this.PTMagicConfiguration.GeneralSettings.Application.TestMode) File.WriteAllLines(indicatorsPropertiesPath, this.IndicatorsLines);
this.Log.DoLogInfo("All properties files saved!");
}
else
{
// Save current PT properties to API (Valid for PT 2.x and above)
this.Log.DoLogInfo("Saving properties using API...");
// Send all Properties
if (!this.PTMagicConfiguration.GeneralSettings.Application.TestMode) SettingsAPI.SendPropertyLinesToAPI(this.PairsLines, this.DCALines, this.IndicatorsLines, this.PTMagicConfiguration, this.Log);
this.Log.DoLogInfo("Properties saved!");
}
} }
else else
{ {
@ -2315,32 +2170,26 @@ namespace Core.Main
} }
// Get configured DCA percentages // Get configured DCA percentages
if (this.ProfitTrailerMajorVersion >= 2)
string dcaDefaultPercentageString = SettingsHandler.GetCurrentPropertyValue(dcaProperties, "DEFAULT_DCA_buy_percentage", "");
double dcaDefaultPercentage = SystemHelper.TextToDouble(dcaDefaultPercentageString, 0, "en-US");
this.LastRuntimeSummary.DCAPercentage = dcaDefaultPercentage;
for (int dca = 1; dca <= maxDCALevel; dca++)
{ {
string dcaDefaultPercentageString = SettingsHandler.GetCurrentPropertyValue(dcaProperties, "DEFAULT_DCA_buy_percentage", ""); string dcaPercentageString = SettingsHandler.GetCurrentPropertyValue(dcaProperties, "DEFAULT_DCA_buy_percentage_" + dca.ToString(), "");
double dcaDefaultPercentage = SystemHelper.TextToDouble(dcaDefaultPercentageString, 0, "en-US"); if (!dcaPercentageString.Equals(""))
this.LastRuntimeSummary.DCAPercentage = dcaDefaultPercentage;
for (int dca = 1; dca <= maxDCALevel; dca++)
{ {
string dcaPercentageString = SettingsHandler.GetCurrentPropertyValue(dcaProperties, "DEFAULT_DCA_buy_percentage_" + dca.ToString(), ""); double dcaPercentage = SystemHelper.TextToDouble(dcaPercentageString, 0, "en-US");
if (!dcaPercentageString.Equals(""))
{
double dcaPercentage = SystemHelper.TextToDouble(dcaPercentageString, 0, "en-US");
this.LastRuntimeSummary.DCAPercentages.Add(dca, dcaPercentage); this.LastRuntimeSummary.DCAPercentages.Add(dca, dcaPercentage);
} }
else else
{ {
if (this.LastRuntimeSummary.DCALevels == 0) this.LastRuntimeSummary.DCALevels = dca - 1; if (this.LastRuntimeSummary.DCALevels == 0) this.LastRuntimeSummary.DCALevels = dca - 1;
break; break;
}
} }
}
else
{
this.LastRuntimeSummary.DCAPercentage = 100;
} }
// Get configured Buy Strategies // Get configured Buy Strategies
@ -2588,7 +2437,6 @@ namespace Core.Main
{ {
this.Log.DoLogWarn("+ Your version is out of date! The most recent version is " + this.LatestVersion); this.Log.DoLogWarn("+ Your version is out of date! The most recent version is " + this.LatestVersion);
} }
this.Log.DoLogInfo("+ Proft Trailer Major Version: " + PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMajorVersion.ToString());
this.Log.DoLogInfo("+ Instance name: " + PTMagicConfiguration.GeneralSettings.Application.InstanceName); this.Log.DoLogInfo("+ Instance name: " + PTMagicConfiguration.GeneralSettings.Application.InstanceName);
this.Log.DoLogInfo("+ Time spent: " + SystemHelper.GetProperDurationTime(elapsedSeconds)); this.Log.DoLogInfo("+ Time spent: " + SystemHelper.GetProperDurationTime(elapsedSeconds));
this.Log.DoLogInfo("+ Active setting: " + this.LastRuntimeSummary.CurrentGlobalSetting.SettingName); this.Log.DoLogInfo("+ Active setting: " + this.LastRuntimeSummary.CurrentGlobalSetting.SettingName);

3
Core/MarketAnalyzer/CoinMarketCap.cs
View File

@ -17,7 +17,7 @@ namespace Core.MarketAnalyzer
string result = ""; string result = "";
try try
{ {
string baseUrl = "https://pro-api.coinmarketcap.com/v1/cryptocurrency/listings/latest?limit=200"; string baseUrl = "https://sandbox-api.coinmarketcap.com/v1/cryptocurrency/listings/latest?limit=200";
string cmcAPI = systemConfiguration.GeneralSettings.Application.CoinMarketCapAPIKey; string cmcAPI = systemConfiguration.GeneralSettings.Application.CoinMarketCapAPIKey;
log.DoLogInfo("CoinMarketCap - Getting market data..."); log.DoLogInfo("CoinMarketCap - Getting market data...");
@ -34,7 +34,6 @@ namespace Core.MarketAnalyzer
for (int i = 0; i < jsonObject["data"].Count; i++) for (int i = 0; i < jsonObject["data"].Count; i++)
{ {
if (jsonObject["data"][i]["quote"]["USD"] != null) if (jsonObject["data"][i]["quote"]["USD"] != null)
{ {
Market market = new Market(); Market market = new Market();

30
Core/ProfitTrailer/SettingsAPI.cs
View File

@ -17,6 +17,36 @@ namespace Core.ProfitTrailer
{ {
public static class SettingsAPI public static class SettingsAPI
{ {
public static void GetInitialProfitTrailerSettings(PTMagicConfiguration systemConfiguration)
{
string html = "";
string url = systemConfiguration.GeneralSettings.Application.ProfitTrailerMonitorURL + "api/data?token=" + systemConfiguration.GeneralSettings.Application.ProfitTrailerServerAPIToken;
try
{
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.AutomaticDecompression = DecompressionMethods.GZip;
WebResponse response = request.GetResponse();
Stream dataStream = response.GetResponseStream();
StreamReader reader = new StreamReader(dataStream);
html = reader.ReadToEnd();
reader.Close();
response.Close();
}
catch (System.Exception)
{
throw;
}
dynamic json = JsonConvert.DeserializeObject(html);
systemConfiguration.GeneralSettings.Application.Exchange = json.exchange;
systemConfiguration.GeneralSettings.Application.TimezoneOffset = json.timeZoneOffset;
systemConfiguration.GeneralSettings.Application.StartBalance = json.startBalance;
systemConfiguration.GeneralSettings.Application.MainFiatCurrency = json.settings.currency;
}
public static List<string> GetPropertyLinesFromAPI(string ptFileName, PTMagicConfiguration systemConfiguration, LogHelper log) public static List<string> GetPropertyLinesFromAPI(string ptFileName, PTMagicConfiguration systemConfiguration, LogHelper log)
{ {
List<string> result = null; List<string> result = null;

16
Core/ProfitTrailer/SettingsHandler.cs
View File

@ -436,9 +436,9 @@ namespace Core.ProfitTrailer
ptmagicInstance.Log.DoLogInfo("Built single market settings '" + setting.SettingName + "' for '" + marketPair + "'."); ptmagicInstance.Log.DoLogInfo("Built single market settings '" + setting.SettingName + "' for '" + marketPair + "'.");
} }
newPairsLines = SettingsHandler.BuildPropertyLinesForSingleMarketSetting(ptmagicInstance.ProfitTrailerMajorVersion, ptmagicInstance.LastRuntimeSummary.MainMarket, marketPair, ptmagicInstance.TriggeredSingleMarketSettings[marketPair], pairsPropertiesToApply, matchedTriggers, globalPairsProperties, newPairsLines, ptmagicInstance.PTMagicConfiguration, ptmagicInstance.Log); newPairsLines = SettingsHandler.BuildPropertyLinesForSingleMarketSetting(ptmagicInstance.LastRuntimeSummary.MainMarket, marketPair, ptmagicInstance.TriggeredSingleMarketSettings[marketPair], pairsPropertiesToApply, matchedTriggers, globalPairsProperties, newPairsLines, ptmagicInstance.PTMagicConfiguration, ptmagicInstance.Log);
newDCALines = SettingsHandler.BuildPropertyLinesForSingleMarketSetting(ptmagicInstance.ProfitTrailerMajorVersion, ptmagicInstance.LastRuntimeSummary.MainMarket, marketPair, ptmagicInstance.TriggeredSingleMarketSettings[marketPair], dcaPropertiesToApply, matchedTriggers, globalDCAProperties, newDCALines, ptmagicInstance.PTMagicConfiguration, ptmagicInstance.Log); newDCALines = SettingsHandler.BuildPropertyLinesForSingleMarketSetting(ptmagicInstance.LastRuntimeSummary.MainMarket, marketPair, ptmagicInstance.TriggeredSingleMarketSettings[marketPair], dcaPropertiesToApply, matchedTriggers, globalDCAProperties, newDCALines, ptmagicInstance.PTMagicConfiguration, ptmagicInstance.Log);
newIndicatorsLines = SettingsHandler.BuildPropertyLinesForSingleMarketSetting(ptmagicInstance.ProfitTrailerMajorVersion, ptmagicInstance.LastRuntimeSummary.MainMarket, marketPair, ptmagicInstance.TriggeredSingleMarketSettings[marketPair], indicatorsPropertiesToApply, matchedTriggers, globalIndicatorsProperties, newIndicatorsLines, ptmagicInstance.PTMagicConfiguration, ptmagicInstance.Log); newIndicatorsLines = SettingsHandler.BuildPropertyLinesForSingleMarketSetting(ptmagicInstance.LastRuntimeSummary.MainMarket, marketPair, ptmagicInstance.TriggeredSingleMarketSettings[marketPair], indicatorsPropertiesToApply, matchedTriggers, globalIndicatorsProperties, newIndicatorsLines, ptmagicInstance.PTMagicConfiguration, ptmagicInstance.Log);
} }
// Combine global settings lines with single market settings lines // Combine global settings lines with single market settings lines
@ -457,7 +457,7 @@ namespace Core.ProfitTrailer
} }
} }
public static List<string> BuildPropertyLinesForSingleMarketSetting(int ptMajorVersion, string mainMarket, string marketPair, List<SingleMarketSetting> appliedSettings, Dictionary<string, object> properties, Dictionary<string, List<string>> matchedTriggers, Dictionary<string, string> fullProperties, List<string> newPropertyLines, PTMagicConfiguration systemConfiguration, LogHelper log) public static List<string> BuildPropertyLinesForSingleMarketSetting(string mainMarket, string marketPair, List<SingleMarketSetting> appliedSettings, Dictionary<string, object> properties, Dictionary<string, List<string>> matchedTriggers, Dictionary<string, string> fullProperties, List<string> newPropertyLines, PTMagicConfiguration systemConfiguration, LogHelper log)
{ {
if (properties.Keys.Count > 0) if (properties.Keys.Count > 0)
{ {
@ -499,11 +499,9 @@ namespace Core.ProfitTrailer
} }
string propertyMarketName = marketPair; string propertyMarketName = marketPair;
if (ptMajorVersion > 1)
{ // Adjust market pair name
// Adjust market pair name for PT 2.0 and above propertyMarketName = propertyMarketName.Replace(mainMarket, "").Replace("_", "").Replace("-", "");
propertyMarketName = propertyMarketName.Replace(mainMarket, "").Replace("_", "").Replace("-", "");
}
string propertyKeyString = ""; string propertyKeyString = "";
if (propertyKey.StartsWith("ALL", StringComparison.InvariantCultureIgnoreCase)) if (propertyKey.StartsWith("ALL", StringComparison.InvariantCultureIgnoreCase))

2
Monitor/Pages/BagAnalyzer.cshtml.cs
View File

@ -21,7 +21,7 @@ namespace Monitor.Pages
private void BindData() private void BindData()
{ {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
} }
} }
} }

2
Monitor/Pages/BuyAnalyzer.cshtml.cs
View File

@ -21,7 +21,7 @@ namespace Monitor.Pages
private void BindData() private void BindData()
{ {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
} }
} }
} }

5
Monitor/Pages/DCACalculator.cshtml
View File

@ -9,10 +9,7 @@
} }
@{ @{
string maxCostCaption = "Max"; string maxCostCaption = "Initial";
if (Model.Summary.ProfitTrailerMajorVersion > 1) {
maxCostCaption = "Initial";
}
} }
<div class="row"> <div class="row">

2
Monitor/Pages/DCACalculator.cshtml.cs
View File

@ -19,7 +19,7 @@ namespace Monitor.Pages
private void BindData() private void BindData()
{ {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
} }
} }
} }

2
Monitor/Pages/SalesAnalyzer.cshtml.cs
View File

@ -29,7 +29,7 @@ namespace Monitor.Pages
private void BindData() private void BindData()
{ {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
// Convert local offset time to UTC // Convert local offset time to UTC
TimeSpan offsetTimeSpan = TimeSpan.Parse(PTMagicConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", "")); TimeSpan offsetTimeSpan = TimeSpan.Parse(PTMagicConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", ""));

34
Monitor/Pages/SettingsGeneral.cshtml
View File

@ -61,13 +61,6 @@
</div> </div>
</div> </div>
<div class="form-group row">
<label class="col-md-4 col-form-label">Profit Trailer Major Version <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Major version of your Profit Trailer."></i></label>
<div class="col-md-8">
@Model.PTMagicConfiguration.GeneralSettings.Application.ProfitTrailerMajorVersion
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-4 col-form-label">Profit Trailer Path <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Path to your Profit Trailer main directory."></i></label> <label class="col-md-4 col-form-label">Profit Trailer Path <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Path to your Profit Trailer main directory."></i></label>
<div class="col-md-8"> <div class="col-md-8">
@ -96,33 +89,6 @@
</div> </div>
</div> </div>
<div class="form-group row">
<label class="col-md-4 col-form-label">Exchange <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="The exchange your are running Profit Trailer on."></i></label>
<div class="col-md-8">
<select name="Application_Exchange" class="form-control">
<option selected="@(Model.PTMagicConfiguration.GeneralSettings.Application.Exchange.Equals("Binance", StringComparison.InvariantCultureIgnoreCase))">Binance</option>
<option selected="@(Model.PTMagicConfiguration.GeneralSettings.Application.Exchange.Equals("Bittrex", StringComparison.InvariantCultureIgnoreCase))">Bittrex</option>
<option selected="@(Model.PTMagicConfiguration.GeneralSettings.Application.Exchange.Equals("Poloniex", StringComparison.InvariantCultureIgnoreCase))">Poloniex</option>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-md-4 col-form-label">Start Balance <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="The balance you had in your wallet when you started working with Profit Trailer."></i></label>
<div class="col-md-8">
<input type="text" class="form-control" name="Application_StartBalance" value="@Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance.ToString(new System.Globalization.CultureInfo("en-US"))">
</div>
</div>
<div class="form-group row">
<label class="col-md-4 col-form-label">Timezone Offset <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Your timezone offset from GMT."></i></label>
<div class="col-md-8">
<select name="Application_TimezoneOffset" class="form-control">
@Html.Raw(Model.GetTimezoneSelection())
</select>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-4 col-form-label">Always Load Default Before Switch <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="If this is enabled, PTMagic will always load default settings before switching to another setting."></i></label> <label class="col-md-4 col-form-label">Always Load Default Before Switch <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="If this is enabled, PTMagic will always load default settings before switching to another setting."></i></label>
<div class="col-md-8"> <div class="col-md-8">

5
Monitor/Pages/StatusSummary.cshtml
View File

@ -69,10 +69,7 @@
<div class="card-box"> <div class="card-box">
<h4 class="m-t-0 header-title">Active Settings</h4> <h4 class="m-t-0 header-title">Active Settings</h4>
@{ @{
string maxCostCaption = "Max"; string maxCostCaption = "Initial";
if (Model.Summary.ProfitTrailerMajorVersion > 1) {
maxCostCaption = "Initial";
}
} }
<table class="table table-striped table-sm"> <table class="table table-striped table-sm">

2
Monitor/Pages/_get/BagDetails.cshtml.cs
View File

@ -24,7 +24,7 @@ namespace Monitor.Pages {
private void BindData() { private void BindData() {
DCAMarket = GetStringParameter("m", ""); DCAMarket = GetStringParameter("m", "");
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
DCALogData = PTData.DCALog.Find(d => d.Market == DCAMarket); DCALogData = PTData.DCALog.Find(d => d.Market == DCAMarket);

2
Monitor/Pages/_get/BagList.cshtml.cs
View File

@ -23,7 +23,7 @@ namespace Monitor.Pages {
SortFieldId = GetStringParameter("s", "ProfitPercent"); SortFieldId = GetStringParameter("s", "ProfitPercent");
SortDirection = GetStringParameter("d", "DESC"); SortDirection = GetStringParameter("d", "DESC");
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
} }
} }
} }

2
Monitor/Pages/_get/BuyList.cshtml.cs
View File

@ -23,7 +23,7 @@ namespace Monitor.Pages {
SortFieldId = GetStringParameter("s", "ProfitPercent"); SortFieldId = GetStringParameter("s", "ProfitPercent");
SortDirection = GetStringParameter("d", "DESC"); SortDirection = GetStringParameter("d", "DESC");
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
} }
} }
} }

2
Monitor/Pages/_get/DashboardBottom.cshtml.cs
View File

@ -25,7 +25,7 @@ namespace Monitor.Pages {
} }
private void BindData() { private void BindData() {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
// Cleanup temp files // Cleanup temp files
FileHelper.CleanupFilesMinutes(PTMagicMonitorBasePath + "wwwroot" + System.IO.Path.DirectorySeparatorChar + "assets" + System.IO.Path.DirectorySeparatorChar + "tmp" + System.IO.Path.DirectorySeparatorChar, 5); FileHelper.CleanupFilesMinutes(PTMagicMonitorBasePath + "wwwroot" + System.IO.Path.DirectorySeparatorChar + "assets" + System.IO.Path.DirectorySeparatorChar + "tmp" + System.IO.Path.DirectorySeparatorChar, 5);

2
Monitor/Pages/_get/DashboardTop.cshtml.cs
View File

@ -20,7 +20,7 @@ namespace Monitor.Pages {
} }
private void BindData() { private void BindData() {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
// Convert local offset time to UTC // Convert local offset time to UTC
TimeSpan offsetTimeSpan = TimeSpan.Parse(PTMagicConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", "")); TimeSpan offsetTimeSpan = TimeSpan.Parse(PTMagicConfiguration.GeneralSettings.Application.TimezoneOffset.Replace("+", ""));

2
Monitor/Pages/_get/SalesList.cshtml.cs
View File

@ -29,7 +29,7 @@ namespace Monitor.Pages {
salesDateString = GetStringParameter("d", ""); salesDateString = GetStringParameter("d", "");
salesMonthString = GetStringParameter("m", ""); salesMonthString = GetStringParameter("m", "");
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
if (!salesDateString.Equals("")) { if (!salesDateString.Equals("")) {
SalesDate = SystemHelper.TextToDateTime(salesDateString, Constants.confMinDate); SalesDate = SystemHelper.TextToDateTime(salesDateString, Constants.confMinDate);

2
Monitor/Pages/_get/TickerWidgets.cshtml.cs
View File

@ -20,7 +20,7 @@ namespace Monitor.Pages {
} }
private void BindData() { private void BindData() {
PTData = new ProfitTrailerData(PTMagicBasePath, PTMagicConfiguration); PTData = new ProfitTrailerData(PTMagicConfiguration);
// Get markets with active single settings // Get markets with active single settings
foreach (string key in Summary.MarketSummary.Keys) { foreach (string key in Summary.MarketSummary.Keys) {

6
PTMagic/_defaults/_default settings PT 2.x/_default settings BTC or ETH/settings.general.json
View File

@ -3,15 +3,11 @@
"Application": { "Application": {
"IsEnabled": true, // Enables the PTMagic bot (needs restart to take effect) "IsEnabled": true, // Enables the PTMagic bot (needs restart to take effect)
"TestMode": false, // If TestMode is active, no properties files will be changed "TestMode": false, // If TestMode is active, no properties files will be changed
"ProfitTrailerMajorVersion": 2, // Major version of your Profit Trailer (If you are using 1.2.x the major version is "1", if you are using 2.x the major version is "2" and so on)
"ProfitTrailerPath": "YOUR PROFIT TRAILER PATH", // Path to your Profit Trailer main directory (use double backslashes for windows like C:\\ProfitTrailer\\) "ProfitTrailerPath": "YOUR PROFIT TRAILER PATH", // Path to your Profit Trailer main directory (use double backslashes for windows like C:\\ProfitTrailer\\)
"ProfitTrailerLicense": "YOUR PROFIT TRAILER LICENSE KEY", // Your Profit Trailer license key (needed to change your settings for PT 2.0 and above) "ProfitTrailerLicense": "YOUR PROFIT TRAILER LICENSE KEY", // Your Profit Trailer license key (needed to change your settings for PT 2.0 and above)
"ProfitTrailerServerAPIToken": "", //Your Profit Trailer Server API Token
"ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above) "ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above)
"ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above) "ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above)
"Exchange": "Bittrex", // The exchange your are running Profit Trailer on
"StartBalance": 0, // The balance you had in your wallet when you started working with Profit Trailer
"TimezoneOffset": "+0:00", // Your timezone offset from UTC time
"MainFiatCurrency": "USD", // Your main fiat currency that will be used in the monitor
"AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting "AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting
"FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute "FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute
"InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them "InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them

6
PTMagic/_defaults/_default settings PT 2.x/_default settings USDT/settings.general.json
View File

@ -3,15 +3,11 @@
"Application": { "Application": {
"IsEnabled": true, // Enables the PTMagic bot (needs restart to take effect) "IsEnabled": true, // Enables the PTMagic bot (needs restart to take effect)
"TestMode": false, // If TestMode is active, no properties files will be changed "TestMode": false, // If TestMode is active, no properties files will be changed
"ProfitTrailerMajorVersion": 2, // Major version of your Profit Trailer (If you are using 1.2.x the major version is "1", if you are using 2.x the major version is "2" and so on)
"ProfitTrailerPath": "YOUR PROFIT TRAILER PATH", // Path to your Profit Trailer main directory (use double backslashes for windows like C:\\ProfitTrailer\\) "ProfitTrailerPath": "YOUR PROFIT TRAILER PATH", // Path to your Profit Trailer main directory (use double backslashes for windows like C:\\ProfitTrailer\\)
"ProfitTrailerLicense": "YOUR PROFIT TRAILER LICENSE KEY", // Your Profit Trailer license key (needed to change your settings for PT 2.0 and above) "ProfitTrailerLicense": "YOUR PROFIT TRAILER LICENSE KEY", // Your Profit Trailer license key (needed to change your settings for PT 2.0 and above)
"ProfitTrailerServerAPIToken": "", //Your Profit Trailer Server API Token
"ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above) "ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above)
"ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above) "ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above)
"Exchange": "Bittrex", // The exchange your are running Profit Trailer on
"StartBalance": 0, // The balance you had in your wallet when you started working with Profit Trailer
"TimezoneOffset": "+0:00", // Your timezone offset from UTC time
"MainFiatCurrency": "USD", // Your main fiat currency that will be used in the monitor
"AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting "AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting
"FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute "FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute
"InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them "InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them

6
_Development/DevSettings/settings.general.json
View File

@ -3,15 +3,11 @@
"Application": { "Application": {
"IsEnabled": true, // Enables the PTMagic bot (needs restart to take effect) "IsEnabled": true, // Enables the PTMagic bot (needs restart to take effect)
"TestMode": false, // If TestMode is active, no properties files will be changed "TestMode": false, // If TestMode is active, no properties files will be changed
"ProfitTrailerMajorVersion": 2, // Major version of your Profit Trailer (If you are using 1.2.x the major version is "1", if you are using 2.x the major version is "2" and so on)
"ProfitTrailerPath": "YOUR PROFIT TRAILER PATH", // Path to your Profit Trailer main directory (use double backslashes for windows like C:\\ProfitTrailer\\) "ProfitTrailerPath": "YOUR PROFIT TRAILER PATH", // Path to your Profit Trailer main directory (use double backslashes for windows like C:\\ProfitTrailer\\)
"ProfitTrailerLicense": "YOUR PROFIT TRAILER LICENSE KEY", // Your Profit Trailer license key (needed to change your settings for PT 2.0 and above) "ProfitTrailerLicense": "YOUR PROFIT TRAILER LICENSE KEY", // Your Profit Trailer license key (needed to change your settings for PT 2.0 and above)
"ProfitTrailerServerAPIToken": "", //Your Profit Trailer Server API Token
"ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above) "ProfitTrailerMonitorURL": "http://localhost:8081/", // The URL to your profit trailer monitor (needed to change your settings for PT 2.0 and above)
"ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above) "ProfitTrailerDefaultSettingName": "default", // Your Profit Trailer default setting name (needed to change your settings for PT 2.0 and above)
"Exchange": "Bittrex", // The exchange your are running Profit Trailer on
"StartBalance": 0, // The balance you had in your wallet when you started working with Profit Trailer
"TimezoneOffset": "+0:00", // Your timezone offset from UTC time
"MainFiatCurrency": "USD", // Your main fiat currency that will be used in the monitor
"AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting "AlwaysLoadDefaultBeforeSwitch": true, // If this is enabled, PTMagic will always load default settings before switching to another setting
"FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute "FloodProtectionMinutes": 15, // If a price trend is just zig-zagging around its trigger, you may want to protect your settings from getting switched back and forth every minute
"InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them "InstanceName": "PT Magic", // The name of the instance of this bot. This will be used in your monitor and your Telegram messages. In case you are running more than one bot, you may set different names to separate them