ratio1 3.4.53__tar.gz → 3.4.55__tar.gz

{ratio1-3.4.53 → ratio1-3.4.55}/PKG-INFO

@@ -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 → ratio1-3.4.55}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.53"
+version = "3.4.55"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.53 → ratio1-3.4.55}/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-3.4.53 → ratio1-3.4.55}/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.55/xperimental/eth/allocate_rewards.py

@@ -0,0 +1,22 @@
+import os
+from copy import deepcopy
+
+from ratio1 import Logger, const
+from ratio1.bc import DefaultBlockEngine
+
+
+
+if __name__ == '__main__' :
+  l = Logger("ENC", base_folder=".", app_folder="_local_cache")
+  eng = DefaultBlockEngine(
+    log=l, name="default", 
+    verbosity=2,
+  )
+
+  eng.reset_network("devnet")
+
+  l.P(f"Allocate rewards across all escrows on Ratio1:{eng.evm_network}")
+  
+  l.P(f"Src  {eng.eth_address} has {eng.web3_get_balance_eth():.4f} ETH")
+  tx_hash = eng.web3_allocate_rewards_across_all_escrows(wait_for_tx=True, return_receipt=True)
+  l.P(f"Executed tx: {tx_hash}", color='g')

{ratio1-3.4.53 → ratio1-3.4.55}/xperimental/eth/send.py

@@ -1,3 +1,4 @@
+import time
 import os
 from copy import deepcopy
 
@@ -12,6 +13,10 @@ if __name__ == '__main__' :
     log=l, name="default", 
     verbosity=2,
   )
+  eng.reset_network("testnet")
+  
+  assert eng.evm_network in ['testnet', 'devnet']
+    
   with open("xperimental/eth/addrs.txt", "rt") as fd:
     lines = fd.readlines()
     addresses = [line.strip() for line in lines]
@@ -19,13 +24,15 @@ if __name__ == '__main__' :
   dest = addresses[0]
   
   l.P(f"ETH and $R1 transfer test on Ratio1:{eng.evm_network}")
-  
+  amount = 0.01
   l.P("ETH Test")
   l.P(f"Src  {eng.eth_address} has {eng.web3_get_balance_eth():.4f} ETH")
   l.P(f"Dest {dest} has {eng.web3_get_balance_eth(dest):.4f} ETH")
-  l.P(f"Sending 0.1 ETH to {dest}", color='b')
-  tx_hash = eng.web3_send_eth(dest, 0.1, wait_for_tx=True, return_receipt=False)
+  l.P(f"Sending {amount} ETH to {dest}", color='b')
+  tx_hash = eng.web3_send_eth(dest, amount, wait_for_tx=True, return_receipt=False)  
   l.P(f"Executed tx: {tx_hash}", color='g')
+  l.P("Sleeping 5 seconds to let the tx propagate")
+  time.sleep(5)
   l.P(f"Src  {eng.eth_address} has {eng.web3_get_balance_eth():.4f} ETH")
   l.P(f"Dest {dest} has {eng.web3_get_balance_eth(dest):.4f} ETH")
 
@@ -35,6 +42,11 @@ if __name__ == '__main__' :
   l.P(f"Sending 100 $R1 to {dest}", color='b')
   tx_hash = eng.web3_send_r1(dest, 100, wait_for_tx=True, return_receipt=False)
   l.P(f"Executed tx: {tx_hash}", color='g')
-  l.P(f"Src  {eng.eth_address} has {eng.web3_get_balance_r1():.4f} $R1")
-  l.P(f"Dest {dest} has {eng.web3_get_balance_r1(dest):.4f} $R1")
+  if tx_hash is not None:
+    l.P("Sleeping 5 seconds to let the tx propagate")
+    time.sleep(5)
+    l.P(f"Src  {eng.eth_address} has {eng.web3_get_balance_r1():.4f} $R1")
+    l.P(f"Dest {dest} has {eng.web3_get_balance_r1(dest):.4f} $R1")
+  else:
+    l.P("No $R1 transfer executed, check the logs for details", color='r')