scripts,Backend(Tests): default to native segwit

Make native segwit default by always adding NATIVE_SEGWIT to defined constants in configure.fsx. To make tests work properly with native segwit, rename deprecated OriginAddress property to OriginMainAddress in test data.
nblockchain · Jul 24, 2024 · bc88cdc · bc88cdc
1 parent 9feb545
commit bc88cdc
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 20 deletions.
diff --git a/scripts/configure.fsx b/scripts/configure.fsx
@@ -217,14 +217,9 @@ let configFileToBeWritten =
         | None -> configFileStageTwo
 
     let finalConfigFile =
-        let nativeSegwitEnabled =
-            argsToThisFsxScript
-            |> List.contains "--native-segwit"
-        if nativeSegwitEnabled then
-            configFileStageThree
-            |> AddToDefinedConstants "NATIVE_SEGWIT"
-        else
-            configFileStageThree
+        // native segwit is enabled by default
+        configFileStageThree
+        |> AddToDefinedConstants "NATIVE_SEGWIT"
 
     finalConfigFile
 

diff --git a/src/GWallet.Backend.Tests/data/signedAndFormattedBtcTransaction.json b/src/GWallet.Backend.Tests/data/signedAndFormattedBtcTransaction.json
@@ -4,7 +4,7 @@
   "Value": {
     "TransactionInfo": {
       "Proposal": {
-        "OriginAddress": "16pKBjGGZkUXo1afyBNf5ttFvV9hauS1kR",
+        "OriginMainAddress": "16pKBjGGZkUXo1afyBNf5ttFvV9hauS1kR",
         "Amount": {
           "ValueToSend": 10.01,
           "BalanceAtTheMomentOfSending": 12.02,

diff --git a/src/GWallet.Backend.Tests/data/signedAndFormattedEtherTransaction.json b/src/GWallet.Backend.Tests/data/signedAndFormattedEtherTransaction.json
@@ -4,7 +4,7 @@
   "Value": {
     "TransactionInfo": {
       "Proposal": {
-        "OriginAddress": "0xf3j4m0rjx94sushh03j",
+        "OriginMainAddress": "0xf3j4m0rjx94sushh03j",
         "Amount": {
           "ValueToSend": 10.01,
           "BalanceAtTheMomentOfSending": 12.02,

diff --git a/src/GWallet.Backend.Tests/data/signedAndFormattedSaiTransaction.json b/src/GWallet.Backend.Tests/data/signedAndFormattedSaiTransaction.json
@@ -4,7 +4,7 @@
   "Value": {
     "TransactionInfo": {
       "Proposal": {
-        "OriginAddress": "0xba766d6d13E2Cc921Bf6e896319D32502af9e37E",
+        "OriginMainAddress": "0xba766d6d13E2Cc921Bf6e896319D32502af9e37E",
         "Amount": {
           "ValueToSend": 1.0,
           "BalanceAtTheMomentOfSending": 7.08,

diff --git a/src/GWallet.Backend.Tests/data/unsignedAndFormattedBtcTransaction.json b/src/GWallet.Backend.Tests/data/unsignedAndFormattedBtcTransaction.json
@@ -3,7 +3,7 @@
   "TypeName": "GWallet.Backend.UnsignedTransaction`1[GWallet.Backend.UtxoCoin.TransactionMetadata]",
   "Value": {
     "Proposal": {
-      "OriginAddress": "16pKBjGGZkUXo1afyBNf5ttFvV9hauS1kR",
+      "OriginMainAddress": "16pKBjGGZkUXo1afyBNf5ttFvV9hauS1kR",
       "Amount": {
         "ValueToSend": 10.01,
         "BalanceAtTheMomentOfSending": 12.02,

diff --git a/src/GWallet.Backend.Tests/data/unsignedAndFormattedEtherTransaction.json b/src/GWallet.Backend.Tests/data/unsignedAndFormattedEtherTransaction.json
@@ -3,7 +3,7 @@
   "TypeName": "GWallet.Backend.UnsignedTransaction`1[GWallet.Backend.Ether.TransactionMetadata]",
   "Value": {
     "Proposal": {
-      "OriginAddress": "0xf3j4m0rjx94sushh03j",
+      "OriginMainAddress": "0xf3j4m0rjx94sushh03j",
       "Amount": {
         "ValueToSend": 10.01,
         "BalanceAtTheMomentOfSending": 12.02,

diff --git a/src/GWallet.Backend.Tests/data/unsignedAndFormattedSaiTransaction.json b/src/GWallet.Backend.Tests/data/unsignedAndFormattedSaiTransaction.json
@@ -3,7 +3,7 @@
   "TypeName": "GWallet.Backend.UnsignedTransaction`1[GWallet.Backend.Ether.TransactionMetadata]",
   "Value": {
     "Proposal": {
-      "OriginAddress": "0xba766d6d13E2Cc921Bf6e896319D32502af9e37E",
+      "OriginMainAddress": "0xba766d6d13E2Cc921Bf6e896319D32502af9e37E",
       "Amount": {
         "ValueToSend": 1.0,
         "BalanceAtTheMomentOfSending": 7.08,

diff --git a/src/GWallet.Backend/Transaction.fs b/src/GWallet.Backend/Transaction.fs
@@ -10,9 +10,6 @@ type ITransactionDetails =
 
 type internal SignedTransactionDetails =
     {
-#if !NATIVE_SEGWIT
-        [<JsonProperty(PropertyName = "OriginAddress")>]
-#endif
         OriginMainAddress: string
 
         Amount: decimal
@@ -27,9 +24,6 @@ type internal SignedTransactionDetails =
 
 type UnsignedTransactionProposal =
     {
-#if !NATIVE_SEGWIT
-        [<JsonProperty(PropertyName = "OriginAddress")>]
-#endif
         OriginMainAddress: string
 
         Amount: TransferAmount;