diff --git a/src/GWallet.Backend/Account.fs b/src/GWallet.Backend/Account.fs index e2c21ebc7..ddc2255fd 100644 --- a/src/GWallet.Backend/Account.fs +++ b/src/GWallet.Backend/Account.fs @@ -223,7 +223,7 @@ module Account = else transactionProposal.Amount.ValueToSend + fee.FeeValue Caching.Instance.StoreOutgoingTransaction - transactionProposal.OriginAddress + transactionProposal.OriginMainAddress transactionProposal.Amount.Currency fee.Currency txId @@ -445,7 +445,7 @@ module Account = let transactionProposal = { - OriginAddress = baseAccount.PublicAddress + OriginMainAddress = baseAccount.PublicAddress Amount = amount DestinationAddress = destination } diff --git a/src/GWallet.Backend/Ether/EtherAccount.fs b/src/GWallet.Backend/Ether/EtherAccount.fs index ec4fe860c..0daff27d7 100644 --- a/src/GWallet.Backend/Ether/EtherAccount.fs +++ b/src/GWallet.Backend/Ether/EtherAccount.fs @@ -487,7 +487,7 @@ module internal Account = let txDetails = { - OriginAddress = signer.GetSenderAddress signedTransaction.RawTransaction + OriginMainAddress = signer.GetSenderAddress signedTransaction.RawTransaction Amount = UnitConversion.Convert.FromWei (IntTypeDecoder().DecodeBigInteger tx.Value) Currency = getTransactionCurrency tx DestinationAddress = destAddress diff --git a/src/GWallet.Backend/Transaction.fs b/src/GWallet.Backend/Transaction.fs index 6f1764e69..eb02bacab 100644 --- a/src/GWallet.Backend/Transaction.fs +++ b/src/GWallet.Backend/Transaction.fs @@ -1,32 +1,32 @@ namespace GWallet.Backend type ITransactionDetails = - abstract member OriginAddress: string + abstract member OriginMainAddress: string abstract member Amount: decimal abstract member Currency: Currency abstract member DestinationAddress: string type internal SignedTransactionDetails = { - OriginAddress: string + OriginMainAddress: string Amount: decimal Currency: Currency DestinationAddress: string } interface ITransactionDetails with - member self.OriginAddress = self.OriginAddress + member self.OriginMainAddress = self.OriginMainAddress member self.Amount = self.Amount member self.Currency = self.Currency member self.DestinationAddress = self.DestinationAddress type UnsignedTransactionProposal = { - OriginAddress: string; + OriginMainAddress: string Amount: TransferAmount; DestinationAddress: string; } interface ITransactionDetails with - member self.OriginAddress = self.OriginAddress + member self.OriginMainAddress = self.OriginMainAddress member self.Amount = self.Amount.ValueToSend member self.Currency = self.Amount.Currency member self.DestinationAddress = self.DestinationAddress diff --git a/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs b/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs index 47043b4f5..42f6143da 100644 --- a/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs +++ b/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs @@ -759,7 +759,7 @@ module Account = failwith "expected a single destination address" { - OriginAddress = (account :> IAccount).PublicAddress + OriginMainAddress = (account :> IAccount).PublicAddress DestinationAddress = destinationAddress.ToString() Amount = value.ToDecimal MoneyUnit.BTC Currency = currency