Merge pull request #130 from Virtual-Protocol/chore/yang-add-tx-hashes-to-memo

Chore/yang add tx hashes to memo

Author: Ang-dot

virtuals_acp/alchemy.py

@@ -238,7 +238,7 @@ def wait_for_call_status(self, prepared_call_id: str) -> Dict[str, Any]:
             try:
                 status = self.rpc_client.wallet_get_calls_status(prepared_call_id)
 
-                if status["status"] == 200 or status["status"] == 110:
+                if status["status"] == 200:
                     return status
 
                 raise Exception("Retrying...")
@@ -251,8 +251,11 @@ def wait_for_call_status(self, prepared_call_id: str) -> Dict[str, Any]:
             time.sleep(0.1 * (MAX_RETRIES - retries))
 
     def handle_user_operation(
-        self, calls: List[OperationPayload], capabilities: Dict[str, Any] = {}
+        self, calls: List[OperationPayload], capabilities=None
     ) -> Dict[str, Any]:
+        if capabilities is None:
+            capabilities = {}
+
         retries = MAX_RETRIES
 
         # Increase the max fee per gas by 10%

virtuals_acp/client.py

@@ -158,6 +158,8 @@ def handle_new_task(self, data) -> None:
                     else None
                 ),
                 payable_details=memo.get("payableDetails"),
+                txn_hash=memo.get("txHash"),
+                signed_txn_hash=memo.get("signedTxHash"),
             )
             for memo in data["memos"]
         ]
@@ -210,6 +212,8 @@ def handle_evaluate(self, data) -> None:
                     else None
                 ),
                 payable_details=memo.get("payableDetails"),
+                txn_hash=memo.get("txHash"),
+                signed_txn_hash=memo.get("signedTxHash"),
             )
             for memo in data["memos"]
         ]
@@ -555,6 +559,8 @@ def get_active_jobs(self, page: int = 1, pageSize: int = 10) -> List["ACPJob"]:
                                 else None
                             ),
                             payable_details=memo.get("payableDetails"),
+                            txn_hash=memo.get("txHash"),
+                            signed_txn_hash=memo.get("signedTxHash"),
                         )
                     )
 
@@ -613,6 +619,8 @@ def get_completed_jobs(self, page: int = 1, pageSize: int = 10) -> List["ACPJob"
                                 else None
                             ),
                             payable_details=memo.get("payableDetails"),
+                            txn_hash=memo.get("txHash"),
+                            signed_txn_hash=memo.get("signedTxHash"),
                         )
                     )
 
@@ -671,6 +679,8 @@ def get_cancelled_jobs(self, page: int = 1, pageSize: int = 10) -> List["ACPJob"
                                 else None
                             ),
                             payable_details=memo.get("payableDetails"),
+                            txn_hash=memo.get("txHash"),
+                            signed_txn_hash=memo.get("signedTxHash"),
                         )
                     )
 
@@ -730,6 +740,8 @@ def get_job_by_onchain_id(self, onchain_job_id: int) -> "ACPJob":
                             else None
                         ),
                         payable_details=memo.get("payableDetails"),
+                        txn_hash=memo.get("txHash"),
+                        signed_txn_hash=memo.get("signedTxHash"),
                     )
                 )
 
@@ -785,6 +797,8 @@ def get_memo_by_id(self, onchain_job_id: int, memo_id: int) -> "ACPMemo":
                     else None
                 ),
                 payable_details=memo.get("payableDetails"),
+                txn_hash=memo.get("txHash"),
+                signed_txn_hash=memo.get("signedTxHash"),
             )
 
         except Exception as e:

virtuals_acp/job_offering.py

@@ -79,7 +79,7 @@ def initiate_job(
             "priceValue": self.price,
             "priceType": self.price_type,
         }
-        
+
         eval_addr = (
             Web3.to_checksum_address(evaluator_address)
             if evaluator_address
@@ -104,7 +104,6 @@ def initiate_job(
             BASE_SEPOLIA_ACP_X402_CONFIG.contract_address.lower(),
             BASE_MAINNET_CONFIG.contract_address.lower(),
             BASE_MAINNET_ACP_X402_CONFIG.contract_address.lower(),
-            
         }
 
         use_simple_create = (

virtuals_acp/memo.py

@@ -31,6 +31,8 @@ class ACPMemo(BaseModel):
     signed_reason: Optional[str] = None
     expiry: Optional[datetime] = None
     payable_details: Optional[Dict[str, Any]] = None
+    txn_hash: Optional[str] = None
+    signed_txn_hash: Optional[str] = None
 
     structured_content: Optional[GenericPayload] = None