ratio1 3.4.53__py3-none-any.whl → 3.4.55__py3-none-any.whl

ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.53"
+__VER__ = "3.4.55"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

ratio1/bc/evm.py

@@ -945,7 +945,7 @@ class _EVMMixin:
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, self.eth_account.key)
       
       # Broadcast the signed transaction.
-      tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
+      tx_hash = w3vars.w3.eth.send_raw_transaction(self.get_raw_transaction(signed_tx))
       
       if wait_for_tx:
         # Wait for the transaction receipt with the specified timeout.
@@ -1109,7 +1109,7 @@ class _EVMMixin:
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
       
       # Broadcast the transaction.
-      tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
+      tx_hash = w3vars.w3.eth.send_raw_transaction(self.get_raw_transaction(signed_tx))
       
       if wait_for_tx:
         # Wait for the transaction receipt if required.
@@ -1339,18 +1339,19 @@ class _EVMMixin:
       details = {
         "network": network,
         "jobId": result_tuple[0],
-        "requestTimestamp": result_tuple[1],
-        "startTimestamp": result_tuple[2],
-        "lastNodesChangeTimestamp": result_tuple[3],
-        "jobType": result_tuple[4],
-        "pricePerEpoch": result_tuple[5],
-        "lastExecutionEpoch": result_tuple[6],
-        "numberOfNodesRequested": result_tuple[7],
-        "balance": result_tuple[8],
-        "lastAllocatedEpoch": result_tuple[9],
-        "activeNodes": result_tuple[10],
-        "escrowAddress": result_tuple[11],
-        "escrowOwner": result_tuple[12],
+        "projectHash": "0x" + result_tuple[1].hex(),
+        "requestTimestamp": result_tuple[2],
+        "startTimestamp": result_tuple[3],
+        "lastNodesChangeTimestamp": result_tuple[4],
+        "jobType": result_tuple[5],
+        "pricePerEpoch": result_tuple[6],
+        "lastExecutionEpoch": result_tuple[7],
+        "numberOfNodesRequested": result_tuple[8],
+        "balance": result_tuple[9],
+        "lastAllocatedEpoch": result_tuple[10],
+        "activeNodes": result_tuple[11],
+        "escrowAddress": result_tuple[12],
+        "escrowOwner": result_tuple[13],
       }
       self.P(f"Job Details:\n{json.dumps(details, indent=2)}", verbosity=2)
 
@@ -1431,7 +1432,7 @@ class _EVMMixin:
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
       
       # Broadcast the transaction.
-      tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
+      tx_hash = w3vars.w3.eth.send_raw_transaction(self.get_raw_transaction(signed_tx))
       
       if wait_for_tx:
         # Wait for the transaction receipt if required.
@@ -1508,7 +1509,7 @@ class _EVMMixin:
       signed_tx = w3vars.w3.eth.account.sign_transaction(tx, eth_account.key)
       
       # Broadcast the transaction.
-      tx_hash = w3vars.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
+      tx_hash = w3vars.w3.eth.send_raw_transaction(self.get_raw_transaction(signed_tx))
       
       if wait_for_tx:
         # Wait for the transaction receipt if required.
@@ -1604,4 +1605,13 @@ class _EVMMixin:
     """
     current_network = self.current_evm_network
     deeploy_api_base_url = EVM_NET_DATA[current_network][EvmNetData.EE_DEEPLOY_API_URL_KEY]
-    return deeploy_api_base_url
+    return deeploy_api_base_url
+
+  def get_raw_transaction(self, signed_tx):
+    """
+    Web3 7.x changed the name of the raw_transaction attribute from rawTransaction to raw_transaction
+    """
+    if hasattr(signed_tx, 'rawTransaction'):
+      return signed_tx.rawTransaction
+    else:
+      return signed_tx.raw_transaction

{ratio1-3.4.53.dist-info → ratio1-3.4.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.53
+Version: 3.4.55
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.53.dist-info → ratio1-3.4.55.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=epalyun16wNffDlGP2Ne2BpGbElRDwOkcK182S7o9QQ,331
+ratio1/_ver.py,sha256=zaLXxh0k6voIEc54-N4b0za_LYv37Y_Y5Y-_D5gV6gM,331
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -17,7 +17,7 @@ ratio1/bc/__init__.py,sha256=BI5pcqHdhwnMdbWTYDLW1cVP_844VtLra-lz7xprgsk,171
 ratio1/bc/base.py,sha256=g7tARNgi_0N1p9HpvqRDWDVYxuqU7W6S0q3ARC6oxKk,45870
 ratio1/bc/chain.py,sha256=HCTQGnmuKqTvUo95OKdg8rL2jhKfSMwrich2e_7Nyms,2336
 ratio1/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
-ratio1/bc/evm.py,sha256=SUyx1qPaUVgDiuWS1WvHWdXECHAZ5wwVSO2WpuuKgIY,51320
+ratio1/bc/evm.py,sha256=bzTSskv1rORKV-00jJJSLFVMNmzC57h3LnNcQK704f4,51709
 ratio1/certs/51.15.142.167.crt,sha256=rLxkwDIQm-u6Kw570NmdSFgjSChcdSJvXPxr4Mj-EU8,1167
 ratio1/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ratio1/certs/a0d9818f.ala.eu-central-1.emqxsl.com.crt,sha256=y-6io0tseyx9-a4Pmde1z1gPULtJNSYUpG_YFkYaMKU,1337
@@ -103,8 +103,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=IMXAN9bpHePKEuTFGRRqFJXz_vBa-wi7s9gLhFEheRY,9953
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.53.dist-info/METADATA,sha256=VCplx7Q6vIktIOeWy6v8FU943996TjYu3wpRh4NNxhE,12248
-ratio1-3.4.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ratio1-3.4.53.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.53.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.53.dist-info/RECORD,,
+ratio1-3.4.55.dist-info/METADATA,sha256=13EVvxi4lsA4qCUjuXv2hP1I-uFXctNCTW8jvLBYm5s,12248
+ratio1-3.4.55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ratio1-3.4.55.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.55.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.55.dist-info/RECORD,,