Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use internal keys to collect coordinator's fee #12907

Closed
wants to merge 2 commits into from
Closed

Use internal keys to collect coordinator's fee #12907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2efa1c
derive internal keys for coordinator
adamPetho Apr 19, 2024
9ce05eb
add test
adamPetho Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 30 additions & 0 deletions WalletWasabi.Tests/UnitTests/Blockchain/Keys/InternalKeysTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WalletWasabi.WabiSabi.Backend;
using Xunit;

namespace WalletWasabi.Tests.UnitTests.Blockchain.Keys;

public class InternalKeysTest
{
[Fact]
public void InternalKeys()
{
var rpc = new MockRpcClient();
var testWallet = new TestWallet("random-wallet", rpc);

WabiSabiConfig config = new();
config.CoordinatorExtPubKey = testWallet.GetSegwitAccountExtPubKey();

for (int index = 0; index < 10; index++)
{
var coordinatorInternalScript = config.DeriveCoordinatorScript(index);
var walletInternalScript = testWallet.CreateNewAddress(isInternal: true).ScriptPubKey;

Assert.Equal(coordinatorInternalScript, walletInternalScript);
}
}
}
12 changes: 6 additions & 6 deletions WalletWasabi/WabiSabi/Backend/WabiSabiConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public WabiSabiConfig(string filePath) : base(filePath)
public CoordinationFeeRate CoordinationFeeRate { get; set; } = new CoordinationFeeRate(0.003m, Money.Coins(0.01m));

[JsonProperty(PropertyName = "CoordinatorExtPubKey")]
public ExtPubKey CoordinatorExtPubKey { get; private set; } = NBitcoinHelpers.BetterParseExtPubKey(Constants.WabiSabiFallBackCoordinatorExtPubKey);
public ExtPubKey CoordinatorExtPubKey { get; set; } = NBitcoinHelpers.BetterParseExtPubKey(Constants.WabiSabiFallBackCoordinatorExtPubKey);

[DefaultValue(1)]
[JsonProperty(PropertyName = "CoordinatorExtPubKeyCurrentDepth", DefaultValueHandling = DefaultValueHandling.Populate)]
Expand Down Expand Up @@ -245,7 +245,7 @@ public WabiSabiConfig(string filePath) : base(filePath)

public Script GetNextCleanCoordinatorScript() => DeriveCoordinatorScript(CoordinatorExtPubKeyCurrentDepth);

public Script DeriveCoordinatorScript(int index) => CoordinatorExtPubKey.Derive(0, false).Derive(index, false).PubKey.GetScriptPubKey(ScriptPubKeyType.Segwit);
public Script DeriveCoordinatorScript(int index) => CoordinatorExtPubKey.Derive(1, false).Derive(index, false).PubKey.GetScriptPubKey(ScriptPubKeyType.Segwit);

public void MakeNextCoordinatorScriptDirty()
{
Expand All @@ -261,10 +261,10 @@ public void MakeNextCoordinatorScriptDirty()
SeverityInBitcoinsPerHour: DoSSeverity.ToDecimal(MoneyUnit.BTC),
MinTimeForFailedToVerify: DoSMinTimeForFailedToVerify,
MinTimeForCheating: DoSMinTimeForCheating,
PenaltyFactorForDisruptingConfirmation: (decimal) DoSPenaltyFactorForDisruptingConfirmation,
PenaltyFactorForDisruptingSignalReadyToSign: (decimal) DoSPenaltyFactorForDisruptingSignalReadyToSign,
PenaltyFactorForDisruptingSigning: (decimal) DoSPenaltyFactorForDisruptingSigning,
PenaltyFactorForDisruptingByDoubleSpending: (decimal) DoSPenaltyFactorForDisruptingByDoubleSpending,
PenaltyFactorForDisruptingConfirmation: (decimal)DoSPenaltyFactorForDisruptingConfirmation,
PenaltyFactorForDisruptingSignalReadyToSign: (decimal)DoSPenaltyFactorForDisruptingSignalReadyToSign,
PenaltyFactorForDisruptingSigning: (decimal)DoSPenaltyFactorForDisruptingSigning,
PenaltyFactorForDisruptingByDoubleSpending: (decimal)DoSPenaltyFactorForDisruptingByDoubleSpending,
MinTimeInPrison: DoSMinTimeInPrison);

private static ImmutableSortedSet<ScriptType> GetScriptTypes(bool p2wpkh, bool p2tr, bool p2pkh, bool p2sh, bool p2wsh)
Expand Down