From 2a18e7a6af9ae2ea195b8eedfe3c16dcd8b54242 Mon Sep 17 00:00:00 2001
From: 4tochka <admin@bitaps.com>
Date: Fri, 29 Jun 2018 23:39:57 +0400
Subject: [PATCH] Block class

---
 pybtc/block.py                        | 100 +++++++++++++++++++++-----
 pybtc/blockchain.py                   |   5 ++
 pybtc/transaction.py                  |  13 ++--
 tests/test/__init__.py                |  17 +++--
 tests/test/address_class.py           |   2 +-
 tests/test/block.py                   |  12 ++--
 tests/test/transaction_constructor.py |  83 +++++++++++++++++++--
 tests/test/transaction_deserialize.py |   2 +-
 8 files changed, 192 insertions(+), 42 deletions(-)

diff --git a/pybtc/block.py b/pybtc/block.py
index de899f5..a810dd0 100644
--- a/pybtc/block.py
+++ b/pybtc/block.py
@@ -4,25 +4,91 @@ from struct import pack, unpack
 
 
 class Block(dict):
-    def __init__(self, block):
-        s = get_stream(block)
-        self["header"] = s.read(80)
-        self["hash"] = double_sha256(self["header"])
-        self["version"] = unpack("<L", s.read(4))
+    def __init__(self, raw_block=None, format="decoded", version=536870912, testnet=False):
+        if format not in ("decoded", "raw"):
+            raise ValueError("tx_format error, raw or decoded allowed")
+        self["format"] = format
+        self["testnet"] = testnet
+        self["header"] = None
+        self["hash"] = None
+        self["version"] = version
+        self["versionHex"] = hexlify(struct.pack(">L", version)).decode()
+        self["previousBlockHash"] = None
+        self["merkleRoot"] = None
+        self["tx"] = dict()
+        self["time"] = None
+        self["bits"] = None
+        self["nonce"] = None
+        self["weight"] = 0
+        self["size"] = 80
+        self["strippedSize"] = 80
+        self["amount"] = 0
+        self["height"] = None
+        self["difficulty"] = None
+        self["targetDifficulty"] = None
+        self["target"] = None
+        if raw_block is None:
+            return
+        self["size"] = len(raw_block) if isinstance(raw_block, bytes) else int(len(raw_block)/2)
+        s = self.get_stream(raw_block)
+        self["format"] = "raw"
+        self["version"] = unpack("<L", s.read(4))[0]
+        self["versionHex"] = hexlify(struct.pack(">L", self["version"])).decode()
         self["previousBlockHash"] = s.read(32)
         self["merkleRoot"] = s.read(32)
-        self["time"] = unpack("<L", s.read(4))
-        self["bits"] = s.read(4),
-        self["nonce"] = unpack("<L", s.read(4))
+        self["time"] = unpack("<L", s.read(4))[0]
+        self["bits"] = s.read(4)
+
+        self["target"] = bits_to_target(unpack("<L", self["bits"])[0])
+        self["targetDifficulty"] = target_to_difficulty(self["target"])
+        self["target"] = self["target"].to_bytes(32, byteorder="little")
+        self["nonce"] = unpack("<L", s.read(4))[0]
         s.seek(-80, 1)
-        # self["tx"] = {i: Transaction(s)
-        #               for i in range(var_int_to_int(read_var_int(s)))}
-        self["weight"] = 0
-        self["size"] = 0
-        self["strippedSize"] = 0
-        self["height"] = 0
-        self["difficulty"] = 0
-        self["targetDifficulty"] = 0
-        self["target"] = 0
+        self["header"] = s.read(80)
+        self["hash"] = double_sha256(self["header"])
+        block_target = int.from_bytes(self["hash"], byteorder="little")
+        self["difficulty"] = target_to_difficulty(block_target)
+        tx_count = var_int_to_int(read_var_int(s))
+        self["tx"] = {i: Transaction(s, format="raw")
+                      for i in range(tx_count)}
+        for t in self["tx"].values():
+            self["amount"] += t["amount"]
+            self["strippedSize"] += t["bSize"]
+        self["strippedSize"] += var_int_len(tx_count)
+        self["weight"] = self["strippedSize"] * 3 + self["size"]
+        if format == "decoded":
+            self.decode(testnet=testnet)
 
+    def decode(self, testnet=None):
+        self["format"] = "decoded"
+        if testnet is not None:
+            self["testnet"] = testnet
+        if isinstance(self["hash"], bytes):
+            self["hash"] = rh2s(self["hash"])
+        if isinstance(self["target"], bytes):
+            self["target"] = rh2s(self["target"])
+        if isinstance(self["previousBlockHash"], bytes):
+            self["previousBlockHash"] = rh2s(self["previousBlockHash"])
+        if "nextBlockHash" in self:
+            if isinstance(self["nextBlockHash"], bytes):
+                self["nextBlockHash"] = rh2s(self["nextBlockHash"])
+        if isinstance(self["merkleRoot"], bytes):
+            self["merkleRoot"] = rh2s(self["merkleRoot"])
+        if isinstance(self["header"], bytes):
+            self["header"] = hexlify(self["header"]).decode()
+        if isinstance(self["bits"], bytes):
+            self["bits"] = rh2s(self["bits"])
+        for i in self["tx"]:
+            self["tx"][i].decode(testnet=testnet)
+
+    @staticmethod
+    def get_stream(stream):
+        if type(stream) != io.BytesIO:
+            if type(stream) == str:
+                stream = unhexlify(stream)
+            if type(stream) == bytes:
+                stream = io.BytesIO(stream)
+            else:
+                raise TypeError
+        return stream
 
diff --git a/pybtc/blockchain.py b/pybtc/blockchain.py
index 13bc6ed..224968e 100644
--- a/pybtc/blockchain.py
+++ b/pybtc/blockchain.py
@@ -1,3 +1,8 @@
+"""
+Old code will be removed
+"""
+
+
 import io
 import json
 import math
diff --git a/pybtc/transaction.py b/pybtc/transaction.py
index b10eb5b..72b29f5 100644
--- a/pybtc/transaction.py
+++ b/pybtc/transaction.py
@@ -21,10 +21,10 @@ class Transaction(dict):
     :param boolean testnet: address type for "decoded" transaction representation.
 
     """
-    def __init__(self, raw_tx=None, tx_format="decoded", version=1, lock_time=0, testnet=False):
-        if tx_format not in ("decoded", "raw"):
-            raise TypeError("tx_format error, raw or decoded allowed")
-        self["format"] = tx_format
+    def __init__(self, raw_tx=None, format="decoded", version=1, lock_time=0, testnet=False):
+        if format not in ("decoded", "raw"):
+            raise ValueError("format error, raw or decoded allowed")
+        self["format"] = format
         self["testnet"] = testnet
         self["segwit"] = False
         self["txId"] = None
@@ -94,7 +94,7 @@ class Transaction(dict):
             for k in range(ic):
                 self["vIn"][k]["txInWitness"] = [stream.read(var_int_to_int(read_var_int(stream))) \
                                                  for c in range(var_int_to_int(read_var_int(stream)))]
-            sw_len = stream.tell() - sw + 2
+            sw_len = (stream.tell() - start) - sw + 2
 
         self["lockTime"] = unpack('<L', stream.read(4))[0]
 
@@ -282,7 +282,8 @@ class Transaction(dict):
         self["format"] = "raw"
         return self
 
-    def get_stream(self, stream):
+    @staticmethod
+    def get_stream(stream):
         if type(stream) != io.BytesIO:
             if type(stream) == str:
                 stream = unhexlify(stream)
diff --git a/tests/test/__init__.py b/tests/test/__init__.py
index bd347b0..3349e0c 100644
--- a/tests/test/__init__.py
+++ b/tests/test/__init__.py
@@ -1,13 +1,12 @@
-# from .hash_functions import *
-# from .integer import *
-# from .address_functions import *
-# from .address_class import *
-# from .ecdsa import *
-# from .transaction_deserialize import *
+from .hash_functions import *
+from .integer import *
+from .address_functions import *
+from .address_class import *
+from .ecdsa import *
+from .transaction_deserialize import *
 from .transaction_constructor import *
-
+from .sighash import *
 
 # from .script_deserialize import *
 # from .create_transaction import *
-from .sighash import *
-# from .block import *
\ No newline at end of file
+from .block import *
\ No newline at end of file
diff --git a/tests/test/address_class.py b/tests/test/address_class.py
index 6c5d384..295fa31 100644
--- a/tests/test/address_class.py
+++ b/tests/test/address_class.py
@@ -104,7 +104,7 @@ class AddressClassTests(unittest.TestCase):
         redeem = "5221032bfc25cf7cccc278b26473e2967b8fd403b4b544b836e71abdfebb08d8c96d6921032bfc25cf7cccc278b2" \
                  "6473e2967b8fd403b4b544b836e71abdfebb08d8c96d6921032bfc25cf7cccc278b26473e2967b8fd403b4b544b8" \
                  "36e71abdfebb08d8c96d6953ae"
-        a = address.ScriptAddress(redeem)
+        a = address.ScriptAddress(redeem, witness_version=None)
         self.assertEqual(a.address, '3KCqqS6eznp3ucVPxtNkiYcVg6kQKNX9sg')
 
 
diff --git a/tests/test/block.py b/tests/test/block.py
index 27b9cc9..353ac37 100644
--- a/tests/test/block.py
+++ b/tests/test/block.py
@@ -587,17 +587,21 @@ block_a = """00000020358d4156e298db6a1158e7796d511e7c3076ab64fd10bed03c160000000
 # }
 #
 
+
 class BlockDeserializeTests(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         print("\nTesting Block class deserialization:\n")
+
     def test_block_class(self):
         block_c = "2000000000000000000029a1a0390376afd72db120d698c2d8ebc41c545c7d4bc2b9033c303dd3d09d455da1c587406820a4dd77c5aa3fcc546dcceb1becc639829c4fe6535e815a1a372b405cc0829701010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff2303f88e130068747470733a5c6170692e6269746170732e636f6d20f251bec0cb000000ffffffff02c817a804000000001976a914d4e49947b9f545218cd20389244c249d3520545d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000"
         block_e = "2000000000000000000029a1a0390376afd72db120d698c2d8ebc41c545c7d4bc2b9033c303dd3d09d455da1c587406820a4dd77c5aa3fcc546dcceb1becc639829c4fe65a815e531a372b405cc0829701010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff2303f88e130068747470733a5c6170692e6269746170732e636f6d20f251bec0cb000000ffffffff02c817a804000000001976a914d4e49947b9f545218cd20389244c249d3520545d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf90120000000000000000000000000000000000000000000000000000000000000000000000000"
-        l = block.Block(block_a)
-        print(l)
-        assert 0
-
+        l = block.Block(block_a, format="decoded")
+        f = open('./test/raw_block.txt')
+        fc = f.readline()
+        qt = time.time()
+        bt = block.Block(fc[:-1], format="decoded")
+        # self.assertEqual(time.time() - qt < 1, 1)
 
         # print(">>>",block.bits)
         # print(">>>",block.hash)
diff --git a/tests/test/transaction_constructor.py b/tests/test/transaction_constructor.py
index d075cae..c60810a 100644
--- a/tests/test/transaction_constructor.py
+++ b/tests/test/transaction_constructor.py
@@ -53,7 +53,7 @@ class TransactionConstructorTests(unittest.TestCase):
                  "eae1319c91fd9583bb93a6441621c39085789b354569e1ffffffff02204e00000000000017a9143e6f15" \
                  "908582f42917ec31e39bf8722fc9d5db3f87763d0900000000001976a914a52dc1cff692810dfe9a918f" \
                  "6d2dbd3504fb3ffb88ac00000000"
-        tx = Transaction(tx_format="raw")
+        tx = Transaction(format="raw")
         tx.add_input("005d7d3571d5a1feb3a968861da72e8a168c4a4d628013a42f00ed318bd35c7a",
                      script_sig="483045022100bf7c75ec4c40d2fd1072567c31079ea96666b03f00cb8573f9d81818fb"
                                 "2a612f02204db07e03825f2d8a123682b53afdd7671fa31e34e2689b591d667ec6cc8c"
@@ -129,7 +129,7 @@ class TransactionConstructorTests(unittest.TestCase):
         self.assertEqual(tx["txId"], "4e3895de573305e08b09926f410836ae30e9e3e909b92beea6a4dd7eb096609e")
 
         # from raw
-        tx = Transaction(tx_format="raw")
+        tx = Transaction(format="raw")
         tx.add_input("772fab1c69d9d39bb15a27f546e2fe137c423a3625481cdff0baf3361b1bf831", 1,
                      tx_in_witness=["",
                                     "304402206bc09c33588b92f245e18d70538c0eb350bfe3861cec518be85e4268eb1740b"
@@ -358,7 +358,82 @@ class TransactionConstructorTests(unittest.TestCase):
         tx.sign_input(0, private_key="cSimowS3sa1eD762ZtRJUmQ7f9EqpqJa8qieXs4hKjkao2nipoTq",
                       sighash_type=SIGHASH_SINGLE)
         self.assertEqual(result, tx.serialize())
-        t = "0100000000010ae86eef67d8c6a4fa42c8d1ba56095cfd580675f5e23d4c3eb4e0cd94f749e76e0d00000023220020836874e10976a55b3797305458e5062f610ef36d965ae90a2a6e1cf2b82196d6ffffffff490f6350a3dea457086e34431c9376f810d2cc1345d80b6ca13774336b4a6d430c000000232200205f074989fce0d834b6d5f0f7458fd784c3fef6edf220d286f609572b351af544ffffffffb9d80c9a4c46950ca456a99ba8f332072ca8fc77283896bc515315ee3659b0b40000000023220020f0ebbea7b0628d9deb464f8dff4a13ab600a9d152babd55397b935a15e69c6eaffffffff5e17c16acf59553c4f12e155b0c2ed890bc30305eea517e95b96aa56602e1e2d0100000023220020d41098b592f0444588603f6317fa221071a431488a43412e1947d17fd8cf08e7ffffffffe6bb632279123095c9c20cfa475dedc652ed9a145df8dbb97629713d5ea9360b14000000232200209e2cfbe506e1f4069d8a210065977d5084942736620237689a505c00af3b0be5fffffffff6fabc0398da61b54655a5570c636c195cb7b430629c65480664c247772a81a5a500000023220020eff46382a9e523f43b486fd9bcdca1b05283ffd821b942eb84eda4a6c9049c77ffffffffeb7f7d50ee09fa1de8a9ad94e20a35afd568b724bda5e88bd95b9293c1d092200400000023220020aad3f8ee6f95dd7c3b18df80aa0ce15cbd95119805460c5f2087af68b0576cb6ffffffff413956ecb16eb70a611a87af4308487b66ec2b24914fececb31cdd265629490c00000000232200203acbfd4896a9d6f1e80e0baceec00ca9053ebb0b414a431863e86bea40bcb8d7ffffffffbb81e5985a904055bdd5056b94716595d64e7c557a19f7e210173134923582720100000023220020af64a9d1f1faf501dd97d934aae2aa3463750dc7ffc843433392d61173447b1affffffff4d0b29f52473088a0877a5d324639d11be4292e8ae7869803f57494b7e255083c002000023220020c07933f89277461f4aa8292c82f90f51d5c08efaf85ee0a128862ee1c1f964a0ffffffff12b0ba677d000000001976a9142b94a5696f8414810804910a53e0d42d469cc68888acb0693001000000001976a91449c8bc27c91b6da008142d59b391b71241241fe188ac4059940e0000000017a914fa671ec312a6acd9a890bfc9b8e42e6d379dd26687509731000000000017a9140476a4bb4062634cc88efec6faa8f67367c8517687001d10000000000017a914aec4c31d0266ab952f8e333f475724199c1b20c08768051f000000000017a91490348215c703df48a8b5f27b6edf4e7328a8eb8f87281f54000000000017a914ed11adb24433a7bbeb86add7b305e00a461c7060877053f0000000000017a9145c82025b4aedd1e5c1ffb9787fbee925b2b23e4e87506b6200000000001976a9147293926f5d57e79d2fb23e45150e00f9011716b888ace86df4050000000017a914129506924b8ee99bdfafe905f6dc8aefd5582f0387a0db5b00000000001976a9145d608186223ef77bfda8ef29eb7c118a5c49be8788ac7007bb040000000017a914a14e4df199b84dc7bb2e1512c2b53bb9ccc3d6ad873847bc00000000001976a9143b10f41f5bb8123f388838cacac30e25a1335cbb88ac20a58f05000000001976a914aa6f6e369c0ece0fa308afe230b8a090cf3dc22988ac709894030000000017a91428725337b726536e770d9e2ff9c42e28aa3c183e8718f55c09000000001976a914ca7369dc4f594d93b71f98e8272d41ae4db24d3988ac90ebba00000000001976a9143981663e21bd94c88b5c1c762fb7bae44af1449b88acd1c051b80000000017a914ac6f85e29c73fe144e9cb4df66c3918a00d03c73870400473044022061ddd2863acb41f754067891991ffa8166391156b1a179ac2c96f03c6868224102205be713dfdf859bf73f0e298066e2b4cea8a921eae048953e4f9b08216f4f348401463043021f32be97e483265a3cea779a3e7b418c366c87ed19c0eea0687f24f83075bc58022048a9c9264077a48b9c5e869dd483b9682cc19743ec90538d6be4990412729ac90169522102bf32cdf437f8af4ec8705ff9bd9d394d95dbc17d4b0801d38167a32b5af59db721027de8616c9e0a52189ab52411b098610a996531f40b6369d066f809a0427e9bb8210268d5f41dba5d8fa19a1fde213d902f31f3513ba56502810ba8192d33c87b1c5d53ae040047304402206c11e7f30f743d4db157cb626afbf9f22d9e87926b006ca03f1122db5a7da4b8022053df5a6641dee8f1513bc27a702e4c64995ed297a034a8700a5ff4f9716a383e014830450221008cb3903927db38377ade7eae0c496084616f59ed7e0ac40df101bf2137d7368802201aa96ca4c6feba0257a780250be3addf789ed59cd772da26a680d481386d288b0169522102127eaf8c2ffc2fcab5342b9670cd7f81fe5909a6a68e5ec48f2a4526bb055c492102ba49de2128d2aa98525ac45183c1c9b1d4cb5b490ca2c814de2ca9e1606e9f3e21020d9cd35f18382a88e0784900763bf2bdadc54ce972a1bace934aa366e1fde6b353ae0400483045022100ee01fec412c5fc8df06b0f7eb13666b8fd209021a14a6514b57006fca31e0dfe02200842c2689ec7fa86428a92408bf2a10174d3611cd2b0af104b36dbc453e05a860147304402204a5c38d17e4e3e3cb4c738f983ecc7e7ab9f8640bda8b2ae563b44d487d6fd19022025d9f523c0b6879ba06dcac11f466d345670573f016b85d550b4960ab8b7f124016952210338e8b783d0d6d1d8b30adbd214eb0549c5f06349dad0ce1e962c25630a025b7e21029ff6bff81992bc7ee875aa380c6d7e246c7650c2e0cb27f92e1caaa6eb362be12103e5f2e69b19cc9ffce3f466982075a9a7ff521b10ab3b7be4c55d55851341fa7153ae040047304402206fc8313bf245c5f670b1269e6db62304715a9ea8a0eb58cb8fd0beec4a2c966102204512f61e6646634498d74fd5ed58b25d9accc961f307888a7d3ed2366d3b46b101483045022100cc5ed821dde97f29afbad747cbef27f30d29d2bdf5cf6ff5bfb08964ec042487022052429189e819e1096c7a8a6a00af3b5c3d11104ff98382164bc86ed02aa2b46d0169522102497d2370e03cef2f476c4ed98475d45d35a4ba2c6d0999d7b47af0b897fff19b210283044c82fbda2789d06b1a70afab9a47b8b0a6be4ffc86c778ce55400e169a48210356d36f4a13c143e122ea76b586d7d8d79ec9ef65b092471b7d1d78acefa2fb5d53ae0400483045022100ee66c86ece64814ea61bcbbd429047361c9d4f7653e36d3f558afc088808dd4402203d96a1a87b6fe65a9443ae2b6601531f24b7cf54058ac84273bdbbc26b60c50a014830450221008e68ad34519549184aaa549a356bb8be7bd82b9594eda0094124c0712d262a76022040129a89f28e9656f1496b8d1ef1510ca8819133f2959d7f4eb5433fb2d024ac0169522102d5809edd69535048caefafb7e1bbfc31dd3a8119fa027c06ac4fff7c47cc5c992102e843efa57b829404c090ec568630e04956fb704491433092f2e5cbe5c6ea443d2102d6ea08ba5bf4756d8926f186e8ef47ebcbf41a115b068789401aa4de0c64644953ae040047304402202aac4fd3456f838d62dc050066937a8627a2e7c05bc6c82713f315f3ab63c94602201477eb1ac5e54a77c3a54890f29728ed65d205edd376041a6ab0fdd22a37ba1b01473044022028ce2682c1abe60b1256d6fd1b76f18f39a5046d2caf2d2c8f559d399810f71202205c3d3ec147bb4a42f945f19548fcaa4668d4c7a9b12a00724243cb2e24b9daa901695221029904a08ded03303a3f88d260d4c22ac71f246da63458cb6e7a5441cc9b194c6a21027dc59859ba222701fd1a582e6e58cc35d3229effc72d3f98b9832364ac20ca13210221d250c0b6c7dad36e6af341091be754bebadaed5a5f024e5b4bbd3cf08c46e053ae0400483045022100b2bd905daef9777adecbf52a73b64eca6475401bf1a5e9a392b1858315a09897022053f44b586eaba0c58b6629e6ff047e237b338483c13980bc3caf9e3ed69b14e001483045022100dcdc4edf79acacdda43ffbc3f585572013ab331b237bf04798874b4cca4e4801022042fb1b77e48acb3c7047ba020443e611d760d2b6cc544bf721d3dabf2e3fa3d201695221036bcd992017b6613195d33ad328d9ea158b3f55a21f1fffffe31b31771f75f3f12103244b19fb816b23fa2292eb552f2e9877c0f409386d34fa93c11e9cf7c9f70308210292a9db72e379443012a33e832c89dbe34dfa521686466451ce3d320885ce8f4153ae04004830450221009987ece026511cf9afdd46d1de4bde25d55c2b4c82a761cedfce656cc6fc55f9022038e99c9607b131110c25363a366ce3724a796b2df201ba71d74b3debef7062c301483045022100ed38faf5ab45cde2621f63bc08670dc4e4c33cb8117a488764fd77ab45a2c4850220792b72f562c0d21d5f697f760267410e3e41203455faef3c73519b32abd26e7401695221023c4ea281bbf7d5edbda342ef63a210bd4f29491d4132850233b84b8e8d00d12521021f69d49af87b294f22dc1093f4b83dc640e5731f8e4cea2788e9f610eb86c31c21023e1110e93cb0f47e22be40fedbcc0a44411f1167817cde6c55c8dc21c039ed1e53ae0400463043021f689bb6058b3e2b5db0f83c53291e090dbd653ad64c7dc967fd3b88fed201ef022010db0c1741b9dcd8da21fce909e2753125b96e43da5fa6c3e4abab4834648c3a0147304402206dd1c33cfa870f865bf62690cb99ac059171c59753942b47c64989df0fd9f52d022001e057a08bc5aa22260508424f1b3fa67fad3e365b67c27aeb8c592946b671930169522102add3216135f7e64cf4f391b3930bf36a18ae63cdb7d2df49caaf1454975c757621036f5fcbd63200e086629e21f2e22cadcb4164a4cc3c889ed575a5ca7530c21a622102df9a83c15a3cd69a2f1787cbbfc41da8557268dec6e37d0647838ed4fde79adf53ae04004730440220389b3a4b11682a43524d10623e8707303533dd772f063e39cc07660e0b31472c02206732c70619ee40f0af5fb7add47a3aa8b7cc7aa9d6df5344803c8d48e1cfc2bb01483045022100df530268f3c9f243a89e22ef6f24bc80ae6642b483598d7ee0a6b4b79f2a8b9a02207fb4ec71b84df08d97fd087b8e15e8107cf7c9e63f1961ec96c9aa33a88c43910169522102a8c6438e2f6ec0c5702b55c5f1ea54f9356dc999a9c035c0f0443a54d124c3262103e06283c613593286b3bffae9a3d5b890fe225617481d7e6572fadfc38513345b2103cd7fcf98e0640739a298165e72bad79cbb3434d74649ab3a064d8631cf93f96c53ae00000000"
+        t = "0100000000010ae86eef67d8c6a4fa42c8d1ba56095cfd580675f5e23d4c3eb4e0cd94f749e76e0d00000023220020836874e10" \
+            "976a55b3797305458e5062f610ef36d965ae90a2a6e1cf2b82196d6ffffffff490f6350a3dea457086e34431c9376f810d2cc13" \
+            "45d80b6ca13774336b4a6d430c000000232200205f074989fce0d834b6d5f0f7458fd784c3fef6edf220d286f609572b351af54" \
+            "4ffffffffb9d80c9a4c46950ca456a99ba8f332072ca8fc77283896bc515315ee3659b0b40000000023220020f0ebbea7b0628d" \
+            "9deb464f8dff4a13ab600a9d152babd55397b935a15e69c6eaffffffff5e17c16acf59553c4f12e155b0c2ed890bc30305eea51" \
+            "7e95b96aa56602e1e2d0100000023220020d41098b592f0444588603f6317fa221071a431488a43412e1947d17fd8cf08e7ffff" \
+            "ffffe6bb632279123095c9c20cfa475dedc652ed9a145df8dbb97629713d5ea9360b14000000232200209e2cfbe506e1f4069d8" \
+            "a210065977d5084942736620237689a505c00af3b0be5fffffffff6fabc0398da61b54655a5570c636c195cb7b430629c654806" \
+            "64c247772a81a5a500000023220020eff46382a9e523f43b486fd9bcdca1b05283ffd821b942eb84eda4a6c9049c77ffffffffe" \
+            "b7f7d50ee09fa1de8a9ad94e20a35afd568b724bda5e88bd95b9293c1d092200400000023220020aad3f8ee6f95dd7c3b18df80" \
+            "aa0ce15cbd95119805460c5f2087af68b0576cb6ffffffff413956ecb16eb70a611a87af4308487b66ec2b24914fececb31cdd2" \
+            "65629490c00000000232200203acbfd4896a9d6f1e80e0baceec00ca9053ebb0b414a431863e86bea40bcb8d7ffffffffbb81e5" \
+            "985a904055bdd5056b94716595d64e7c557a19f7e210173134923582720100000023220020af64a9d1f1faf501dd97d934aae2a" \
+            "a3463750dc7ffc843433392d61173447b1affffffff4d0b29f52473088a0877a5d324639d11be4292e8ae7869803f57494b7e25" \
+            "5083c002000023220020c07933f89277461f4aa8292c82f90f51d5c08efaf85ee0a128862ee1c1f964a0ffffffff12b0ba677d0" \
+            "00000001976a9142b94a5696f8414810804910a53e0d42d469cc68888acb0693001000000001976a91449c8bc27c91b6da00814" \
+            "2d59b391b71241241fe188ac4059940e0000000017a914fa671ec312a6acd9a890bfc9b8e42e6d379dd26687509731000000000" \
+            "017a9140476a4bb4062634cc88efec6faa8f67367c8517687001d10000000000017a914aec4c31d0266ab952f8e333f47572419" \
+            "9c1b20c08768051f000000000017a91490348215c703df48a8b5f27b6edf4e7328a8eb8f87281f54000000000017a914ed11adb" \
+            "24433a7bbeb86add7b305e00a461c7060877053f0000000000017a9145c82025b4aedd1e5c1ffb9787fbee925b2b23e4e87506b" \
+            "6200000000001976a9147293926f5d57e79d2fb23e45150e00f9011716b888ace86df4050000000017a914129506924b8ee99bd" \
+            "fafe905f6dc8aefd5582f0387a0db5b00000000001976a9145d608186223ef77bfda8ef29eb7c118a5c49be8788ac7007bb0400" \
+            "00000017a914a14e4df199b84dc7bb2e1512c2b53bb9ccc3d6ad873847bc00000000001976a9143b10f41f5bb8123f388838cac" \
+            "ac30e25a1335cbb88ac20a58f05000000001976a914aa6f6e369c0ece0fa308afe230b8a090cf3dc22988ac7098940300000000" \
+            "17a91428725337b726536e770d9e2ff9c42e28aa3c183e8718f55c09000000001976a914ca7369dc4f594d93b71f98e8272d41a" \
+            "e4db24d3988ac90ebba00000000001976a9143981663e21bd94c88b5c1c762fb7bae44af1449b88acd1c051b80000000017a914" \
+            "ac6f85e29c73fe144e9cb4df66c3918a00d03c73870400473044022061ddd2863acb41f754067891991ffa8166391156b1a179a" \
+            "c2c96f03c6868224102205be713dfdf859bf73f0e298066e2b4cea8a921eae048953e4f9b08216f4f348401463043021f32be97" \
+            "e483265a3cea779a3e7b418c366c87ed19c0eea0687f24f83075bc58022048a9c9264077a48b9c5e869dd483b9682cc19743ec9" \
+            "0538d6be4990412729ac90169522102bf32cdf437f8af4ec8705ff9bd9d394d95dbc17d4b0801d38167a32b5af59db721027de8" \
+            "616c9e0a52189ab52411b098610a996531f40b6369d066f809a0427e9bb8210268d5f41dba5d8fa19a1fde213d902f31f3513ba" \
+            "56502810ba8192d33c87b1c5d53ae040047304402206c11e7f30f743d4db157cb626afbf9f22d9e87926b006ca03f1122db5a7d" \
+            "a4b8022053df5a6641dee8f1513bc27a702e4c64995ed297a034a8700a5ff4f9716a383e014830450221008cb3903927db38377" \
+            "ade7eae0c496084616f59ed7e0ac40df101bf2137d7368802201aa96ca4c6feba0257a780250be3addf789ed59cd772da26a680" \
+            "d481386d288b0169522102127eaf8c2ffc2fcab5342b9670cd7f81fe5909a6a68e5ec48f2a4526bb055c492102ba49de2128d2a" \
+            "a98525ac45183c1c9b1d4cb5b490ca2c814de2ca9e1606e9f3e21020d9cd35f18382a88e0784900763bf2bdadc54ce972a1bace" \
+            "934aa366e1fde6b353ae0400483045022100ee01fec412c5fc8df06b0f7eb13666b8fd209021a14a6514b57006fca31e0dfe022" \
+            "00842c2689ec7fa86428a92408bf2a10174d3611cd2b0af104b36dbc453e05a860147304402204a5c38d17e4e3e3cb4c738f983" \
+            "ecc7e7ab9f8640bda8b2ae563b44d487d6fd19022025d9f523c0b6879ba06dcac11f466d345670573f016b85d550b4960ab8b7f" \
+            "124016952210338e8b783d0d6d1d8b30adbd214eb0549c5f06349dad0ce1e962c25630a025b7e21029ff6bff81992bc7ee875aa" \
+            "380c6d7e246c7650c2e0cb27f92e1caaa6eb362be12103e5f2e69b19cc9ffce3f466982075a9a7ff521b10ab3b7be4c55d55851" \
+            "341fa7153ae040047304402206fc8313bf245c5f670b1269e6db62304715a9ea8a0eb58cb8fd0beec4a2c966102204512f61e66" \
+            "46634498d74fd5ed58b25d9accc961f307888a7d3ed2366d3b46b101483045022100cc5ed821dde97f29afbad747cbef27f30d2" \
+            "9d2bdf5cf6ff5bfb08964ec042487022052429189e819e1096c7a8a6a00af3b5c3d11104ff98382164bc86ed02aa2b46d016952" \
+            "2102497d2370e03cef2f476c4ed98475d45d35a4ba2c6d0999d7b47af0b897fff19b210283044c82fbda2789d06b1a70afab9a4" \
+            "7b8b0a6be4ffc86c778ce55400e169a48210356d36f4a13c143e122ea76b586d7d8d79ec9ef65b092471b7d1d78acefa2fb5d53" \
+            "ae0400483045022100ee66c86ece64814ea61bcbbd429047361c9d4f7653e36d3f558afc088808dd4402203d96a1a87b6fe65a9" \
+            "443ae2b6601531f24b7cf54058ac84273bdbbc26b60c50a014830450221008e68ad34519549184aaa549a356bb8be7bd82b9594" \
+            "eda0094124c0712d262a76022040129a89f28e9656f1496b8d1ef1510ca8819133f2959d7f4eb5433fb2d024ac0169522102d58" \
+            "09edd69535048caefafb7e1bbfc31dd3a8119fa027c06ac4fff7c47cc5c992102e843efa57b829404c090ec568630e04956fb70" \
+            "4491433092f2e5cbe5c6ea443d2102d6ea08ba5bf4756d8926f186e8ef47ebcbf41a115b068789401aa4de0c64644953ae04004" \
+            "7304402202aac4fd3456f838d62dc050066937a8627a2e7c05bc6c82713f315f3ab63c94602201477eb1ac5e54a77c3a54890f2" \
+            "9728ed65d205edd376041a6ab0fdd22a37ba1b01473044022028ce2682c1abe60b1256d6fd1b76f18f39a5046d2caf2d2c8f559" \
+            "d399810f71202205c3d3ec147bb4a42f945f19548fcaa4668d4c7a9b12a00724243cb2e24b9daa901695221029904a08ded0330" \
+            "3a3f88d260d4c22ac71f246da63458cb6e7a5441cc9b194c6a21027dc59859ba222701fd1a582e6e58cc35d3229effc72d3f98b" \
+            "9832364ac20ca13210221d250c0b6c7dad36e6af341091be754bebadaed5a5f024e5b4bbd3cf08c46e053ae0400483045022100" \
+            "b2bd905daef9777adecbf52a73b64eca6475401bf1a5e9a392b1858315a09897022053f44b586eaba0c58b6629e6ff047e237b3" \
+            "38483c13980bc3caf9e3ed69b14e001483045022100dcdc4edf79acacdda43ffbc3f585572013ab331b237bf04798874b4cca4e" \
+            "4801022042fb1b77e48acb3c7047ba020443e611d760d2b6cc544bf721d3dabf2e3fa3d201695221036bcd992017b6613195d33" \
+            "ad328d9ea158b3f55a21f1fffffe31b31771f75f3f12103244b19fb816b23fa2292eb552f2e9877c0f409386d34fa93c11e9cf7" \
+            "c9f70308210292a9db72e379443012a33e832c89dbe34dfa521686466451ce3d320885ce8f4153ae04004830450221009987ece" \
+            "026511cf9afdd46d1de4bde25d55c2b4c82a761cedfce656cc6fc55f9022038e99c9607b131110c25363a366ce3724a796b2df2" \
+            "01ba71d74b3debef7062c301483045022100ed38faf5ab45cde2621f63bc08670dc4e4c33cb8117a488764fd77ab45a2c485022" \
+            "0792b72f562c0d21d5f697f760267410e3e41203455faef3c73519b32abd26e7401695221023c4ea281bbf7d5edbda342ef63a2" \
+            "10bd4f29491d4132850233b84b8e8d00d12521021f69d49af87b294f22dc1093f4b83dc640e5731f8e4cea2788e9f610eb86c31" \
+            "c21023e1110e93cb0f47e22be40fedbcc0a44411f1167817cde6c55c8dc21c039ed1e53ae0400463043021f689bb6058b3e2b5d" \
+            "b0f83c53291e090dbd653ad64c7dc967fd3b88fed201ef022010db0c1741b9dcd8da21fce909e2753125b96e43da5fa6c3e4aba" \
+            "b4834648c3a0147304402206dd1c33cfa870f865bf62690cb99ac059171c59753942b47c64989df0fd9f52d022001e057a08bc5" \
+            "aa22260508424f1b3fa67fad3e365b67c27aeb8c592946b671930169522102add3216135f7e64cf4f391b3930bf36a18ae63cdb" \
+            "7d2df49caaf1454975c757621036f5fcbd63200e086629e21f2e22cadcb4164a4cc3c889ed575a5ca7530c21a622102df9a83c1" \
+            "5a3cd69a2f1787cbbfc41da8557268dec6e37d0647838ed4fde79adf53ae04004730440220389b3a4b11682a43524d10623e870" \
+            "7303533dd772f063e39cc07660e0b31472c02206732c70619ee40f0af5fb7add47a3aa8b7cc7aa9d6df5344803c8d48e1cfc2bb" \
+            "01483045022100df530268f3c9f243a89e22ef6f24bc80ae6642b483598d7ee0a6b4b79f2a8b9a02207fb4ec71b84df08d97fd0" \
+            "87b8e15e8107cf7c9e63f1961ec96c9aa33a88c43910169522102a8c6438e2f6ec0c5702b55c5f1ea54f9356dc999a9c035c0f0" \
+            "443a54d124c3262103e06283c613593286b3bffae9a3d5b890fe225617481d7e6572fadfc38513345b2103cd7fcf98e0640739a" \
+            "298165e72bad79cbb3434d74649ab3a064d8631cf93f96c53ae00000000"
         tx = Transaction(t)
         self.assertEqual(t, tx.serialize())
 
@@ -916,7 +991,7 @@ class TransactionConstructorTests(unittest.TestCase):
         self.assertEqual(r, tx.serialize())
 
         # sign same P2SH-P2WSH-MULTISIG random sign order with raw Transaction representatiob
-        tx = Transaction(t, tx_format="raw")
+        tx = Transaction(t, format="raw")
         tx.sign_input(0, private_key="428a7aee9f0c2af0cd19af3cf1c78149951ea528726989b2e83e4778d2c3f890",
                       redeem_script=redeem, amount=987654321, p2sh_p2wsh=1,
                       sighash_type=SIGHASH_SINGLE | SIGHASH_ANYONECANPAY)
diff --git a/tests/test/transaction_deserialize.py b/tests/test/transaction_deserialize.py
index 6725329..6b60dd5 100644
--- a/tests/test/transaction_deserialize.py
+++ b/tests/test/transaction_deserialize.py
@@ -16,7 +16,7 @@ from pybtc import address_to_hash as address2hash160
 def decode_block_tx(block):
     stream = get_stream(block)
     stream.seek(80)
-    return {i: Transaction(stream, tx_format="raw") for i in range(var_int_to_int(read_var_int(stream)))}
+    return {i: Transaction(stream, format="raw") for i in range(var_int_to_int(read_var_int(stream)))}
 
 
 class TransactionDeserializeTests(unittest.TestCase):