Detect if transaction version is part of signature payload

polkascan · Jun 15, 2020 · da44e45 · da44e45
1 parent f886d46
commit da44e45
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ call = substrate.compose_call(
 extrinsic = substrate.create_signed_extrinsic(call=call, keypair=keypair)
 
 try:
-    result = substrate.send_extrinsic(extrinsic, wait_for_inclusion=True)
+    result = substrate.submit_extrinsic(extrinsic, wait_for_inclusion=True)
     print("Extrinsic '{}' sent and included in block '{}'".format(result['extrinsic_hash'], result['block_hash']))
 
 except SubstrateRequestException as e:

diff --git a/substrateinterface/__init__.py b/substrateinterface/__init__.py
@@ -910,16 +910,20 @@ def generate_signature_payload(self, call, era=None, nonce=0, tip=0, include_cal
         else:
             call_data = str(call.data)
 
-        signature_payload.encode({
+        payload_dict = {
             'call': call_data,
             'era': era,
             'nonce': nonce,
             'tip': tip,
             'specVersion': self.runtime_version,
-            'transactionVersion': self.transaction_version,
             'genesisHash': genesis_hash,
             'blockHash': genesis_hash
-        })
+        }
+
+        if self.transaction_version:
+            payload_dict['transactionVersion'] = self.transaction_version
+
+        signature_payload.encode(payload_dict)
 
         return signature_payload.data
 

diff --git a/test/fixtures.py b/test/fixtures.py
diff --git a/test/test_runtime_state.py b/test/test_runtime_state.py