Backend: rename .OriginAddress to .OriginMainAddress

This way, if a non-segwit capable version of geewallet tries to deserialize a transaction proposal, it will error out complaining about version mismatch instead of crashing with a weird error.
nblockchain · Feb 12, 2024 · a51dec9 · a51dec9
1 parent b8c6bf4
commit a51dec9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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