refactor: generate V1 transactions by default (#337)

StellarCN · Jun 18, 2020 · c5d4511 · c5d4511
1 parent d8fd380
commit c5d4511
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/stellar_sdk/transaction.py b/stellar_sdk/transaction.py
@@ -47,8 +47,8 @@ class Transaction:
     :param memo: The memo being sent with the transaction, being
           represented as one of the subclasses of the
           :class:`Memo <stellar_sdk.memo.Memo>` object.
-    :param v1: Temporary feature flag to allow alpha testing of Stellar Protocol 13 transactions.
-        We will remove this once all transactions are supposed to be v1.
+    :param v1: When this value is set to True, V1 transactions will be generated,
+        otherwise V0 transactions will be generated.
         See `CAP-0015 <https://github.com/stellar/stellar-protocol/blob/master/core/cap-0015.md>`_ for more information.
     """
 
@@ -60,7 +60,7 @@ def __init__(
         operations: List[Operation],
         memo: Memo = None,
         time_bounds: TimeBounds = None,
-        v1: bool = False,
+        v1: bool = True,
     ) -> None:
 
         # if not operations:

diff --git a/stellar_sdk/transaction_builder.py b/stellar_sdk/transaction_builder.py
@@ -42,8 +42,8 @@ class TransactionBuilder:
         Defaults to **Test SDF Network ; September 2015**.
     :param base_fee: Base fee in stroops. The network base fee is obtained by default from the latest ledger.
         Transaction fee is equal to base fee times number of operations in this transaction.
-    :param v1: Temporary feature flag to allow alpha testing of Stellar Protocol 13 transactions.
-        We will remove this once all transactions are supposed to be v1.
+    :param v1: When this value is set to True, V1 transactions will be generated,
+        otherwise V0 transactions will be generated.
         See `CAP-0015 <https://github.com/stellar/stellar-protocol/blob/master/core/cap-0015.md>`_ for more information.
     """
 
@@ -53,7 +53,7 @@ def __init__(
         source_account: Account,
         network_passphrase: str = Network.TESTNET_NETWORK_PASSPHRASE,
         base_fee: int = 100,
-        v1: bool = False,
+        v1: bool = True,
     ):
         self.source_account: Account = source_account
         self.base_fee: int = base_fee

diff --git a/tests/test_transaction_builder.py b/tests/test_transaction_builder.py
@@ -25,7 +25,7 @@ def test_to_xdr_v0(self):
             "GDF5O4OWEMVBY5FLDHWA5RZTYSV2U276XGKZZ6VSHDDR3THSQ6OQS7UM", sequence
         )
         builder = TransactionBuilder(
-            source, Network.TESTNET_NETWORK_PASSPHRASE, base_fee=150
+            source, Network.TESTNET_NETWORK_PASSPHRASE, base_fee=150, v1=False
         )
         builder.add_text_memo("Stellar Python SDK")
         builder.add_time_bounds(1565590000, 1565600000)

diff --git a/tests/test_transaction_envelope.py b/tests/test_transaction_envelope.py
@@ -26,7 +26,7 @@ def test_to_xdr_v0(self):
         asset = Asset.native()
         time_bounds = TimeBounds(12345, 56789)
         ops = [Payment(destination, asset, amount), ManageData("hello", "world")]
-        tx = Transaction(source, sequence, fee, ops, memo, time_bounds)
+        tx = Transaction(source, sequence, fee, ops, memo, time_bounds, False)
         te = TransactionEnvelope(tx, Network.PUBLIC_NETWORK_PASSPHRASE)
         assert binascii.hexlify(te.hash()).decode() == te.hash_hex()
         te.sign(source)