From 34b8a2e72dec0297c175fa5a34c5494fabc28aea Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 10 Apr 2018 11:28:01 +0200 Subject: [PATCH] Added CashAddr support to Logic; some refactoring to reflect this --- .../Types/Financial/BasicHotBitcoinAddress.cs | 11 +- Database/Database-HotBitcoinAddresses.cs | 2 +- Logic/Financial/BitcoinUtility.cs | 4 +- Logic/Financial/HotBitcoinAddress.cs | 15 + Logic/Financial/HotBitcoinAddressUnspent.cs | 2 +- Logic/Logic.csproj | 1 + Logic/Support/SharpCashAddr.cs | 269 ++++++++++++++++++ Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs | 8 +- Site/Pages/v5/Financial/Donate.aspx.cs | 10 +- .../Ledgers/Json-BitcoinHotwalletData.aspx.cs | 6 +- 10 files changed, 306 insertions(+), 22 deletions(-) create mode 100644 Logic/Support/SharpCashAddr.cs diff --git a/Basic/Types/Financial/BasicHotBitcoinAddress.cs b/Basic/Types/Financial/BasicHotBitcoinAddress.cs index 18912c76..78a78a9a 100644 --- a/Basic/Types/Financial/BasicHotBitcoinAddress.cs +++ b/Basic/Types/Financial/BasicHotBitcoinAddress.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Security.Policy; using System.Text; using System.Threading.Tasks; using Swarmops.Common.Enums; @@ -11,15 +12,14 @@ namespace Swarmops.Basic.Types.Financial public class BasicHotBitcoinAddress: IHasIdentity { public BasicHotBitcoinAddress (int hotBitcoinAddressId, int organizationId, BitcoinChain chain, string derivationPath, - int uniqueDerive, string address, string addressFallback, Int64 balanceSatoshis, Int64 throughputSatoshis) + int uniqueDerive, string address, Int64 balanceSatoshis, Int64 throughputSatoshis) { this.HotBitcoinAddressId = hotBitcoinAddressId; this.OrganizationId = organizationId; this.Chain = chain; this.DerivationPath = derivationPath; this.UniqueDerive = uniqueDerive; - this.Address = address; - this.AddressFallback = addressFallback; + this.MachineAddress = address; this.BalanceSatoshis = balanceSatoshis; this.ThroughputSatoshis = throughputSatoshis; } @@ -27,7 +27,7 @@ namespace Swarmops.Basic.Types.Financial public BasicHotBitcoinAddress (BasicHotBitcoinAddress original) : this ( original.HotBitcoinAddressId, original.OrganizationId, original.Chain, original.DerivationPath, - original.UniqueDerive, original.Address, original.AddressFallback, original.BalanceSatoshis, original.ThroughputSatoshis) + original.UniqueDerive, original.MachineAddress, original.BalanceSatoshis, original.ThroughputSatoshis) { // copy ctor } @@ -37,8 +37,7 @@ namespace Swarmops.Basic.Types.Financial public BitcoinChain Chain { get; private set; } public string DerivationPath { get; private set; } public int UniqueDerive { get; private set; } - public string Address { get; private set; } - public string AddressFallback { get; private set; } + public string MachineAddress { get; private set; } public Int64 BalanceSatoshis { get; protected set; } public Int64 ThroughputSatoshis { get; protected set; } diff --git a/Database/Database-HotBitcoinAddresses.cs b/Database/Database-HotBitcoinAddresses.cs index 1e3512f1..28e23d87 100644 --- a/Database/Database-HotBitcoinAddresses.cs +++ b/Database/Database-HotBitcoinAddresses.cs @@ -38,7 +38,7 @@ namespace Swarmops.Database Int64 balanceSatoshis = reader.GetInt64 (7); Int64 throughputSatoshis = reader.GetInt64 (8); - return new BasicHotBitcoinAddress (hotBitcoinAddressId, organizationId, chain, derivationPath, uniqueDerive, addressString, addressStringFallback, balanceSatoshis, throughputSatoshis); + return new BasicHotBitcoinAddress (hotBitcoinAddressId, organizationId, chain, derivationPath, uniqueDerive, addressString, balanceSatoshis, throughputSatoshis); } private BasicHotBitcoinAddressUnspent ReadHotBitcoinAddressUnspentFromDataReader(IDataRecord reader) diff --git a/Logic/Financial/BitcoinUtility.cs b/Logic/Financial/BitcoinUtility.cs index 76a2d589..fe36770d 100644 --- a/Logic/Financial/BitcoinUtility.cs +++ b/Logic/Financial/BitcoinUtility.cs @@ -775,7 +775,7 @@ namespace Swarmops.Logic.Financial HotBitcoinAddresses hotAddresses = HotBitcoinAddresses.ForOrganization (organization); foreach (HotBitcoinAddress hotAddress in hotAddresses) { - result[hotAddress.Address] = organization.FinancialAccounts.AssetsBitcoinHot.Identity; + result[hotAddress.ProtocolLevelAddress] = organization.FinancialAccounts.AssetsBitcoinHot.Identity; } return result; @@ -982,7 +982,7 @@ namespace Swarmops.Logic.Financial // Set change address to wallet slush - txBuilder.SetChange(new BitcoinPubKeyAddress(changeAddress.Address)); + txBuilder.SetChange(new BitcoinPubKeyAddress(changeAddress.ProtocolLevelAddress)); // Add fee diff --git a/Logic/Financial/HotBitcoinAddress.cs b/Logic/Financial/HotBitcoinAddress.cs index 0e5f8416..fdf5443e 100644 --- a/Logic/Financial/HotBitcoinAddress.cs +++ b/Logic/Financial/HotBitcoinAddress.cs @@ -190,6 +190,21 @@ namespace Swarmops.Logic.Financial } } + public string HumanAddress + { + get + { + bool dummy1, dummy2; + + return Swarmops.Logic.Support.BitcoinCashAddressConversion.LegacyAddressToCashAddress(this.MachineAddress, out dummy1, out dummy2); + } + } + + public string ProtocolLevelAddress + { + get { return base.MachineAddress; } + } + public void UpdateTotal() { SwarmDb.GetDatabaseForWriting().UpdateHotBitcoinAddressUnspentTotal(this.Identity); diff --git a/Logic/Financial/HotBitcoinAddressUnspent.cs b/Logic/Financial/HotBitcoinAddressUnspent.cs index 77fd28b0..5d01028c 100644 --- a/Logic/Financial/HotBitcoinAddressUnspent.cs +++ b/Logic/Financial/HotBitcoinAddressUnspent.cs @@ -34,7 +34,7 @@ namespace Swarmops.Logic.Financial return new BitcoinTransactionInput() { AmountSatoshis = this.AmountSatoshis, - BitcoinAddress = address.Address, + BitcoinAddress = address.ProtocolLevelAddress, PrivateKey = address.PrivateKey, TransactionHash = this.TransactionHash, TransactionOutputIndex = this.TransactionOutputIndex, diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index b48ad397..a7d3f1a4 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -224,6 +224,7 @@ + diff --git a/Logic/Support/SharpCashAddr.cs b/Logic/Support/SharpCashAddr.cs new file mode 100644 index 00000000..168399bc --- /dev/null +++ b/Logic/Support/SharpCashAddr.cs @@ -0,0 +1,269 @@ +using System; +using System.Collections.Generic; +using System.Numerics; +using System.Security.Cryptography; + +// Public domain code by Reddit user /u/mMCCCS, https://github.com/cashaddress/SharpCashAddr, slightly modified for namespace and naming conventions + +namespace Swarmops.Logic.Support +{ + class CashAddressConversionException: Exception + { + public CashAddressConversionException() + : base() { + } + public CashAddressConversionException(String message) + : base(message) { + } + } + + static class BitcoinCashAddressConversion + { + private const string CHARSET_BASE58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; + private const string CHARSET_CASHADDR = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"; + // https://play.golang.org/p/zZhIxabo-AQ + private static readonly sbyte[] DICT_CASHADDR = new sbyte[128]{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 15, -1, 10, 17, 21, 20, 26, 30, 7, 5, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 29, -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1, + 1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1 + }; + private static readonly sbyte[] DICT_BASE58 = new sbyte[128]{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, -1, -1, -1, -1, -1, -1, + -1, 9, 10, 11, 12, 13, 14, 15, 16, -1, 17, 18, 19, 20, 21, -1, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, -1, -1, -1, + -1, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, -1, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, -1 + }; + + private static ulong PolyMod(byte[] input, ulong startValue = 1) { + for (uint i = 0; i < 42; i++) { + ulong c0 = startValue >> 35; + startValue = ((startValue & 0x07ffffffff) << 5) ^ ((ulong) input[i]); + if ((c0 & 0x01) != 0) { + startValue ^= 0x98f2bc8e61; + } + if ((c0 & 0x02) != 0) { + startValue ^= 0x79b76d99e2; + } + if ((c0 & 0x04) != 0) { + startValue ^= 0xf33e5fb3c4; + } + if ((c0 & 0x08) != 0) { + startValue ^= 0xae2eabe2a8; + } + if ((c0 & 0x10) != 0) { + startValue ^= 0x1e4f43e470; + } + } + return startValue ^ 1; + } + private static byte[] convertBitsEightToFive(byte[] bytes) { + // 34 + 8 + byte[] converted = new byte[42]; + int a1 = 0, a2 = 0; + for (; a1 < 32; a1 += 8, a2 += 5) { + converted[a1] = (byte) (bytes[a2] >> 3); + converted[a1 + 1] = (byte) (bytes[a2] % 8 << 2 | bytes[a2 + 1] >> 6); + converted[a1 + 2] = (byte) (bytes[a2 + 1] % 64 >> 1); + converted[a1 + 3] = (byte) (bytes[a2 + 1] % 2 << 4 | bytes[a2 + 2] >> 4); + converted[a1 + 4] = (byte) (bytes[a2 + 2] % 16 << 1 | bytes[a2 + 3] >> 7); + converted[a1 + 5] = (byte) (bytes[a2 + 3] % 128 >> 2); + converted[a1 + 6] = (byte) (bytes[a2 + 3] % 4 << 3 | bytes[a2 + 4] >> 5); + converted[a1 + 7] = (byte) (bytes[a2 + 4] % 32); + } + converted[a1] = (byte) (bytes[a2] >> 3); + converted[a1 + 1] = (byte) (bytes[a2] % 8 << 2); + return converted; + } + private static byte[] convertBitsFiveToEight(byte[] bytes) { + // (1 + 20) + 4 + byte[] converted = new byte[25]; + int a1 = 0, a2 = 0; + for (; a2 < 32; a1 += 5, a2 += 8) { + converted[a1] = (byte) (bytes[a2] << 3 | bytes[a2 + 1] >> 2); + converted[a1 + 1] = (byte) (bytes[a2 + 1] % 4 << 6 | bytes[a2 + 2] << 1 | bytes[a2 + 3] >> 4); + converted[a1 + 2] = (byte) (bytes[a2 + 3] % 16 << 4 | bytes[a2 + 4] >> 1); + converted[a1 + 3] = (byte) (bytes[a2 + 4] % 2 << 7 | bytes[a2 + 5] << 2 | bytes[a2 + 6] >> 3); + converted[a1 + 4] = (byte) (bytes[a2 + 6] % 8 << 5 | bytes[a2 + 7]); + } + converted[a1] = (byte) (bytes[a2] << 3 | bytes[a2 + 1] >> 2); + if (bytes[a2 + 1] % 4 != 0) + throw new CashAddressConversionException("Invalid CashAddr."); + return converted; + } + + public static string LegacyAddressToCashAddress(string legacyAddress, out bool isP2PKH, out bool mainnet) + { + // BigInteger wouldn't be needed, but that would result in the use a MIT License + BigInteger address = new BigInteger(0); + BigInteger baseFiftyEight = new BigInteger(58); + for (int x = 0; x < legacyAddress.Length; x++) { + int value = DICT_BASE58[legacyAddress[x]]; + if (value != -1) { + address = BigInteger.Multiply(address, baseFiftyEight); + address = BigInteger.Add(address, new BigInteger(value)); + } else { + throw new CashAddressConversionException("Address contains unexpected character."); + } + } + int numZeros = 0; + for (; (numZeros < legacyAddress.Length) && (legacyAddress[numZeros] == Convert.ToChar("1")); numZeros++){} + byte[] addrBytes = address.ToByteArray(); + Array.Reverse(addrBytes); + // Reminder, addrBytes was converted from BigInteger. So the first byte, + // the sign byte should be skipped, **if exists** + if (addrBytes[0] == 0) { + // because of 0xc4 + var temp = new List(addrBytes); + temp.RemoveAt(0); + addrBytes = temp.ToArray(); + } + if (numZeros > 0) { + var temp = new List(addrBytes); + for (; numZeros != 0; numZeros--) + temp.Insert(0, 0); + addrBytes = temp.ToArray(); + } + if (addrBytes.Length != 25) { + throw new CashAddressConversionException("Address to be decoded is shorter or longer than expected!"); + } + switch(addrBytes[0]) + { + case 0x00: + isP2PKH = true; + mainnet = true; + break; + case 0x05: + isP2PKH = false; + mainnet = true; + break; + case 0x6f: + isP2PKH = true; + mainnet = false; + break; + case 0xc4: + isP2PKH = false; + mainnet = false; + break; + case 0x1c: + // BitPay P2PKH, obsolete! + case 0x28: + // BitPay P2SH, obsolete! + default: + //Console.WriteLine(value: addrBytes[0]); + throw new CashAddressConversionException("Unexpected address byte."); + } + if (addrBytes.Length != 25) { + throw new CashAddressConversionException("Old address is longer or shorter than expected."); + } + SHA256 hasher = SHA256Managed.Create(); + byte[] checksum = hasher.ComputeHash(hasher.ComputeHash(addrBytes, 0, 21)); + if (addrBytes[21] != checksum[0] || addrBytes[22] != checksum[1] || addrBytes[23] != checksum[2] || addrBytes[24] != checksum[3]) + throw new CashAddressConversionException("Address checksum doesn't match. Have you made a mistake while typing it?"); + addrBytes[0] = (byte) (isP2PKH ? 0x00 : 0x08); + byte[] cashAddr = convertBitsEightToFive(addrBytes); + var ret = new System.Text.StringBuilder(mainnet ? "bitcoincash:" : "bchtest:"); + // https://play.golang.org/p/sM_CE4AQ7Vp + ulong mod = PolyMod(cashAddr, (ulong) (mainnet ? 1058337025301 : 584719417569)); + for (int i = 0; i < 8; ++i) { + cashAddr[i + 34] = (byte) ((mod >> (5 * (7 - i))) & 0x1f); + } + for (int i = 0; i < cashAddr.Length; i++) { + ret.Append(CHARSET_CASHADDR[cashAddr[i]]); + } + return ret.ToString(); + } + public static string CashAddressToLegacyAddresss(string cashAddress, out bool isP2PKH, out bool mainnet) { + cashAddress = cashAddress.ToLower(); + if (cashAddress.Length != 54 && cashAddress.Length != 42 && cashAddress.Length != 50) { + if (cashAddress.StartsWith("bchreg:")) + throw new CashAddressConversionException("Decoding RegTest addresses is not implemented."); + throw new CashAddressConversionException("Address to be decoded is longer or shorter than expected."); + } + int afterPrefix; + if (cashAddress.StartsWith("bitcoincash:")) + { + mainnet = true; + afterPrefix = 12; + } else if (cashAddress.StartsWith("bchtest:")) + { + mainnet = false; + afterPrefix = 8; + } else if (cashAddress.StartsWith("bchreg:")) + throw new CashAddressConversionException("Decoding RegTest addresses is not implemented."); + else { + if (cashAddress.IndexOf(":") == -1) { + mainnet = true; + afterPrefix = 0; + } else + throw new CashAddressConversionException("Unexpected colon character."); + } + int max = afterPrefix + 42; + if (max != cashAddress.Length) { + throw new CashAddressConversionException("Address to be decoded is longer or shorter than expected."); + } + byte[] decodedBytes = new byte[42]; + for (int i = afterPrefix; i < max; i++) { + int value = DICT_CASHADDR[cashAddress[i]]; + if (value != -1) { + decodedBytes[i - afterPrefix] = (byte) value; + } else { + throw new CashAddressConversionException("Address contains unexpected character."); + } + } + if (PolyMod(decodedBytes, (ulong) (mainnet ? 1058337025301 : 584719417569)) != 0) + throw new CashAddressConversionException("Address checksum doesn't match. Have you made a mistake while typing it?"); + decodedBytes = convertBitsFiveToEight(decodedBytes); + switch(decodedBytes[0]) { + case 0x00: + isP2PKH = true; + break; + case 0x08: + isP2PKH = false; + break; + default: + throw new CashAddressConversionException("Unexpected address byte."); + } + if (mainnet && isP2PKH) + decodedBytes[0] = 0x00; + else if (mainnet && !isP2PKH) + decodedBytes[0] = 0x05; + else if (!mainnet && isP2PKH) + decodedBytes[0] = 0x6f; + else + decodedBytes[0] = 0xc4; + SHA256 hasher = SHA256Managed.Create(); + byte[] checksum = hasher.ComputeHash(hasher.ComputeHash(decodedBytes, 0, 21)); + decodedBytes[21] = checksum[0]; + decodedBytes[22] = checksum[1]; + decodedBytes[23] = checksum[2]; + decodedBytes[24] = checksum[3]; + System.Text.StringBuilder ret = new System.Text.StringBuilder(36); + for (int numZeros = 0; numZeros < 25 && decodedBytes[numZeros] == 0; numZeros++) + ret.Append("1"); + Array.Reverse(decodedBytes); + + byte[] retArr = new byte[36]; + int retIdx = 0; + BigInteger baseChanger = BigInteger.Abs(new BigInteger(decodedBytes)); + BigInteger baseFiftyEight = new BigInteger(58); + BigInteger modulo = new BigInteger(); + Console.WriteLine(baseChanger); + while (!baseChanger.IsZero) { + baseChanger = BigInteger.DivRem(baseChanger, baseFiftyEight, out modulo); + retArr[retIdx++] = (byte) modulo; + } + for (retIdx--; retIdx >= 0; retIdx--) + ret.Append(CHARSET_BASE58[retArr[retIdx]]); + return ret.ToString(); + } + } +} diff --git a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs index 1dd4a310..d0fd3820 100644 --- a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs +++ b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs @@ -46,9 +46,9 @@ namespace Swarmops.Frontend.Pages.v5.Admin HotBitcoinAddress address = HotBitcoinAddress.CreateUnique(this.CurrentOrganization, BitcoinChain.Cash, BitcoinUtility.BitcoinEchoTestIndex, this.CurrentUser.Identity, utcNow.Year, utcNow.Month, utcNow.Day); - this.BitcoinCashAddressUsed = address.Address; + this.BitcoinCashAddressUsed = address.ProtocolLevelAddress; string guid = Guid.NewGuid().ToString("N"); - GuidCache.Set(guid, address.Address); + GuidCache.Set(guid, address.ProtocolLevelAddress); this.TransactionGuid = guid; // Calculate conversion rate (satoshi-cents to unit-cents, so we're good, even if the conversion rate @@ -62,11 +62,11 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.BoxTitle.Text = Resources.Pages.Admin.BitcoinEchoTest_PageTitle; this.LabelExplainBitcoinEchoTest.Text = String.Format (Resources.Pages.Admin.BitcoinEchoTest_Explain, - CurrentOrganization.Name, address.Address, BitcoinUtility.EchoFeeSatoshis / 100.0); + CurrentOrganization.Name, address.ProtocolLevelAddress, BitcoinUtility.EchoFeeSatoshis / 100.0); this.ImageBitcoinQr.ImageUrl = "https://chart.googleapis.com/chart?cht=qr&chs=400x400&chl=bitcoincash:" + - HttpUtility.UrlEncode (address.Address + "?label=" + + HttpUtility.UrlEncode (address.ProtocolLevelAddress + "?label=" + Uri.EscapeDataString ("Swarmops Bitcoin Echo Test")); // URI scheme doesn't like &, = } diff --git a/Site/Pages/v5/Financial/Donate.aspx.cs b/Site/Pages/v5/Financial/Donate.aspx.cs index 31fecb43..7d3a80d2 100644 --- a/Site/Pages/v5/Financial/Donate.aspx.cs +++ b/Site/Pages/v5/Financial/Donate.aspx.cs @@ -54,9 +54,9 @@ namespace Swarmops.Frontend.Pages.v5.Financial HotBitcoinAddress address = HotBitcoinAddress.Create (this.CurrentOrganization, BitcoinChain.Cash, BitcoinUtility.BitcoinDonationsIndex, this.CurrentUser.Identity); - this.BitcoinCashAddressUsed = address.Address; + this.BitcoinCashAddressUsed = address.ProtocolLevelAddress; string guid = Guid.NewGuid().ToString ("N"); - GuidCache.Set (guid, address.Address); + GuidCache.Set (guid, address.ProtocolLevelAddress); this.TransactionGuid = guid; // Calculate conversion rate (satoshi-cents to unit-cents, so we're good, even if the conversion rate @@ -75,7 +75,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial JObject data = new JObject(); data ["ServerRequest"] = "AddBitcoinAddress"; - data["Address"] = address.Address; + data["Address"] = address.ProtocolLevelAddress; socket.Send(data.ToString()); socket.Ping(); // wait a little little while for send to work socket.Close(); @@ -83,13 +83,13 @@ namespace Swarmops.Frontend.Pages.v5.Financial this.BoxTitle.Text = Resources.Pages.Financial.Donate_PageTitle; this.LabelExplainBitcoinDonation.Text = String.Format (Resources.Pages.Financial.Donate_Explain, - CurrentOrganization.Name, address.Address); + CurrentOrganization.Name, address.ProtocolLevelAddress); this.LabelReceivedFunds.Text = String.Format(Resources.Pages.Financial.Donate_FundsReceivedLabel, CurrentOrganization.Currency.DisplayCode); this.ImageBitcoinQr.ImageUrl = "https://chart.googleapis.com/chart?cht=qr&chs=400x400&chl=bitcoincash:" + - HttpUtility.UrlEncode (address.Address + "?label=" + + HttpUtility.UrlEncode (address.ProtocolLevelAddress + "?label=" + Uri.EscapeDataString (String.Format (Resources.Pages.Financial.Donate_TxLabel, CurrentOrganization.Name))); // URI scheme doesn't like &, = } diff --git a/Site/Pages/v5/Ledgers/Json-BitcoinHotwalletData.aspx.cs b/Site/Pages/v5/Ledgers/Json-BitcoinHotwalletData.aspx.cs index 8d0cd02d..aff37fde 100644 --- a/Site/Pages/v5/Ledgers/Json-BitcoinHotwalletData.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-BitcoinHotwalletData.aspx.cs @@ -28,12 +28,12 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers // These shouldn't exist much, so make sure that we have the equivalent Cash address registered try { - HotBitcoinAddress.FromAddress(BitcoinChain.Cash, address.Address); + HotBitcoinAddress.FromAddress(BitcoinChain.Cash, address.ProtocolLevelAddress); } catch (ArgumentException) { // We didn't have it, so create it - BitcoinUtility.TestUnspents(BitcoinChain.Cash, address.Address); + BitcoinUtility.TestUnspents(BitcoinChain.Cash, address.ProtocolLevelAddress); } } @@ -103,7 +103,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers "\"balanceFiat\":\"{4}\",", address.Identity, address.Chain.ToString() + " " + address.DerivationPath, - address.Address, + address.ProtocolLevelAddress, JsonExpandingString (address.Identity, satoshisUnspentAddress), JsonExpandingString (address.Identity, (Int64) (satoshisUnspentAddress * conversionRateLookup[address.Chain])) );