Replace --wpkh with --addr-type
MODIFY
WalletWasabi.Tests/UnitTests/Hwi/HwiProcessBridgeMock.cs
WalletWasabi.Tests/UnitTests/Hwi/HwiProcessBridgeMock.cs
@@ -210,7 +210,7 @@ namespace WalletWasabi.Tests.UnitTests.Hwi
response = $"{{\"xpub\": \"{xpub}\"}}\r\n";
}
}
- else if (CompareArguments(out bool t1, arguments, $"{devicePathAndTypeArgumentString} displayaddress --path m/84h/0h/0h --wpkh", false))
+ else if (CompareArguments(out bool t1, arguments, $"{devicePathAndTypeArgumentString} displayaddress --path m/84h/0h/0h --addr-type wit", false))
{
if (Model is HardwareWalletModels.Trezor_T or HardwareWalletModels.Coldcard or HardwareWalletModels.Trezor_1 or HardwareWalletModels.Ledger_Nano_S or HardwareWalletModels.Ledger_Nano_X)
{
@@ -219,7 +219,7 @@ namespace WalletWasabi.Tests.UnitTests.Hwi
: "{\"address\": \"bc1q7zqqsmqx5ymhd7qn73lm96w5yqdkrmx7fdevah\"}\r\n";
}
}
- else if (CompareArguments(out bool t2, arguments, $"{devicePathAndTypeArgumentString} displayaddress --path m/84h/0h/0h/1 --wpkh", false))
+ else if (CompareArguments(out bool t2, arguments, $"{devicePathAndTypeArgumentString} displayaddress --path m/84h/0h/0h/1 --addr-type wit", false))
{
if (Model is HardwareWalletModels.Trezor_T or HardwareWalletModels.Coldcard or HardwareWalletModels.Trezor_1 or HardwareWalletModels.Ledger_Nano_S or HardwareWalletModels.Ledger_Nano_X)
{

MODIFY
WalletWasabi/Hwi/HwiClient.cs
WalletWasabi/Hwi/HwiClient.cs
@@ -147,7 +147,7 @@ namespace WalletWasabi.Hwi
var response = await SendCommandAsync(
options: BuildOptions(deviceType, devicePath, fingerprint),
command: HwiCommands.DisplayAddress,
- commandArguments: $"--path {keyPath.ToString(true, "h")} --wpkh",
+ commandArguments: $"--path {keyPath.ToString(true, "h")} --addr-type wit",
openConsole: false,
cancel).ConfigureAwait(false);

MODIFY
WalletWasabi/Hwi/Models/HwiCommands.cs
WalletWasabi/Hwi/Models/HwiCommands.cs
@@ -56,7 +56,7 @@ namespace WalletWasabi.Hwi.Models
/// <remarks>
/// Notable arguments:
/// <list type="table">
- /// <item><c>--path</c> - Derivation path, default follows BIP43 convention, e.g. m/84h/0h/0h/1/* with --wpkh --internal. If this argument and --internal is not given, both internal and external keypools will be returned.</item>
+ /// <item><c>--path</c> - Derivation path, default follows BIP43 convention, e.g. m/84h/0h/0h/1/* with --addr-type wit --internal. If this argument and --internal is not given, both internal and external keypools will be returned.</item>
/// <item><c>start</c> - The index to start at.</item>
/// <item><c>end</c> - The index to end at.</item>
/// </list>

Replace --wpkh with --addr-type