From 4cbcd851c0f9eb7957af414140f12a8c155fb8fd Mon Sep 17 00:00:00 2001 From: Dan Gould Date: Tue, 17 Jul 2018 15:41:53 +0800 Subject: [PATCH 1/3] set Breeze StandardCycle denomination --- .../Server/TumblerConfiguration.cs | 2 +- NTumbleBit/ClassicTumbler/StandardCycles.cs | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs b/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs index 22910838..f8c184a9 100644 --- a/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs +++ b/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs @@ -155,7 +155,7 @@ public TumblerConfiguration LoadArgs(String[] args) } var standardCycles = new StandardCycles(Network); - var cycleName = "kotori"; //config.GetOrDefault("cycle", standardCycles.Debug ? "shorty2x" : "shorty2x"); + var cycleName = "breeze"; //config.GetOrDefault("cycle", standardCycles.Debug ? "shorty2x" : "shorty2x"); Logs.Configuration.LogInformation($"Using cycle {cycleName}"); diff --git a/NTumbleBit/ClassicTumbler/StandardCycles.cs b/NTumbleBit/ClassicTumbler/StandardCycles.cs index 1df45ab9..08041801 100644 --- a/NTumbleBit/ClassicTumbler/StandardCycles.cs +++ b/NTumbleBit/ClassicTumbler/StandardCycles.cs @@ -68,7 +68,32 @@ public StandardCycles(Consensus consensus, bool debug) { _Debug = debug; - _Shorty = new StandardCycle() + // Kotori with higher denomination + _Breeze = new StandardCycle() + { + FriendlyName = "Breeze", + Consensus = consensus, + Denomination = Money.Coins(0.01m), + Generator = new OverlappedCycleGenerator() + { + RegistrationOverlap = 1, + FirstCycle = new CycleParameters() + { + Start = 0, + //one cycle per day + RegistrationDuration = GetBlocksCount(consensus, 60 * 4) + 1, + //make sure tor circuit get renewed + SafetyPeriodDuration = GetBlocksCount(consensus, 20), + ClientChannelEstablishmentDuration = GetBlocksCount(consensus, 120), + TumblerChannelEstablishmentDuration = GetBlocksCount(consensus, 120), + PaymentPhaseDuration = GetBlocksCount(consensus, 30), + TumblerCashoutDuration = GetBlocksCount(consensus, 5 * 60), + ClientCashoutDuration = GetBlocksCount(consensus, 5 * 60) + } + } + }; + + _Shorty = new StandardCycle() { FriendlyName = "Shorty", Consensus = consensus, From 8c5439f9f268bd0edd424bba4fcd94743dea6529 Mon Sep 17 00:00:00 2001 From: Dan Gould Date: Tue, 17 Jul 2018 15:42:45 +0800 Subject: [PATCH 2/3] 5x tumbler fee | user should still set --- NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs b/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs index f8c184a9..2ec4816e 100644 --- a/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs +++ b/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs @@ -241,7 +241,7 @@ public string GetDefaultConfigurationFile(Network network) builder.AppendLine("####Tumbler settings####"); builder.AppendLine("## The fees in BTC"); - builder.AppendLine("#tumbler.fee=0.001"); + builder.AppendLine("#tumbler.fee=0.005"); builder.AppendLine("## The cycle used can be one of: " + string.Join(",", new StandardCycles(Network).ToEnumerable().Select(c => c.FriendlyName))); builder.AppendLine("#cycle=shorty2x"); From 6ccc297bd43e5e82ba61cf2f694bb127efdd5925 Mon Sep 17 00:00:00 2001 From: Dan Gould Date: Mon, 23 Jul 2018 17:27:22 +0800 Subject: [PATCH 3/3] alter kotori def rather than define one for Breeze --- .../Server/TumblerConfiguration.cs | 2 +- NTumbleBit/ClassicTumbler/StandardCycles.cs | 27 +------------------ 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs b/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs index 2ec4816e..952f48bd 100644 --- a/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs +++ b/NTumbleBit/ClassicTumbler/Server/TumblerConfiguration.cs @@ -155,7 +155,7 @@ public TumblerConfiguration LoadArgs(String[] args) } var standardCycles = new StandardCycles(Network); - var cycleName = "breeze"; //config.GetOrDefault("cycle", standardCycles.Debug ? "shorty2x" : "shorty2x"); + var cycleName = "kotori"; //config.GetOrDefault("cycle", standardCycles.Debug ? "shorty2x" : "shorty2x"); Logs.Configuration.LogInformation($"Using cycle {cycleName}"); diff --git a/NTumbleBit/ClassicTumbler/StandardCycles.cs b/NTumbleBit/ClassicTumbler/StandardCycles.cs index 08041801..0b403392 100644 --- a/NTumbleBit/ClassicTumbler/StandardCycles.cs +++ b/NTumbleBit/ClassicTumbler/StandardCycles.cs @@ -68,31 +68,6 @@ public StandardCycles(Consensus consensus, bool debug) { _Debug = debug; - // Kotori with higher denomination - _Breeze = new StandardCycle() - { - FriendlyName = "Breeze", - Consensus = consensus, - Denomination = Money.Coins(0.01m), - Generator = new OverlappedCycleGenerator() - { - RegistrationOverlap = 1, - FirstCycle = new CycleParameters() - { - Start = 0, - //one cycle per day - RegistrationDuration = GetBlocksCount(consensus, 60 * 4) + 1, - //make sure tor circuit get renewed - SafetyPeriodDuration = GetBlocksCount(consensus, 20), - ClientChannelEstablishmentDuration = GetBlocksCount(consensus, 120), - TumblerChannelEstablishmentDuration = GetBlocksCount(consensus, 120), - PaymentPhaseDuration = GetBlocksCount(consensus, 30), - TumblerCashoutDuration = GetBlocksCount(consensus, 5 * 60), - ClientCashoutDuration = GetBlocksCount(consensus, 5 * 60) - } - } - }; - _Shorty = new StandardCycle() { FriendlyName = "Shorty", @@ -141,7 +116,7 @@ public StandardCycles(Consensus consensus, bool debug) { FriendlyName = "Kotori", Consensus = consensus, - Denomination = Money.Coins(0.001m), + Denomination = Money.Coins(0.01m), Generator = new OverlappedCycleGenerator() { RegistrationOverlap = 1,