feat: add chain id to base fares

Author: Ang-dot

virtuals_acp/configs/configs.py

@@ -60,7 +60,11 @@ def __init__(
     rpc_url="https://alchemy-proxy.virtuals.io/api/proxy/rpc",
     chain_id=84532,
     contract_address="0x8Db6B1c839Fc8f6bd35777E194677B67b4D51928",
-    base_fare=Fare("0x036CbD53842c5426634e7929541eC2318f3dCF7e", 6),
+    base_fare=Fare(
+        "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+        6,
+        84532
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.gg/api",
@@ -74,7 +78,11 @@ def __init__(
     rpc_url="https://alchemy-proxy.virtuals.io/api/proxy/rpc",
     chain_id=84532,
     contract_address="0x8Db6B1c839Fc8f6bd35777E194677B67b4D51928",
-    base_fare=Fare("0x036CbD53842c5426634e7929541eC2318f3dCF7e", 6),
+    base_fare=Fare(
+        "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+        6,
+        84532
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.gg/api",
@@ -91,7 +99,11 @@ def __init__(
     rpc_url="https://alchemy-proxy.virtuals.io/api/proxy/rpc",
     chain_id=84532,
     contract_address="0xdf54E6Ed6cD1d0632d973ADECf96597b7e87893c",
-    base_fare=Fare("0x036CbD53842c5426634e7929541eC2318f3dCF7e", 6),
+    base_fare=Fare(
+        "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+        6,
+        84532
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.gg/api",
@@ -105,7 +117,11 @@ def __init__(
     rpc_url="https://alchemy-proxy.virtuals.io/api/proxy/rpc",
     chain_id=84532,
     contract_address="0xdf54E6Ed6cD1d0632d973ADECf96597b7e87893c",
-    base_fare=Fare("0x036CbD53842c5426634e7929541eC2318f3dCF7e", 6),
+    base_fare=Fare(
+        "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+        6,
+        84532
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.gg/api",
@@ -122,7 +138,11 @@ def __init__(
     rpc_url="https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
     chain_id=8453,
     contract_address="0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
-    base_fare=Fare("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", 6),
+    base_fare=Fare(
+        "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+        6,
+        8453
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.io/api",
@@ -136,7 +156,11 @@ def __init__(
     rpc_url="https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
     chain_id=8453,
     contract_address="0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
-    base_fare=Fare("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", 6),
+    base_fare=Fare(
+        "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+        6,
+        8453
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.io/api",
@@ -154,7 +178,11 @@ def __init__(
     rpc_url="https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
     chain_id=8453,
     contract_address="0xa6C9BA866992cfD7fd6460ba912bfa405adA9df0",
-    base_fare=Fare("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", 6),
+    base_fare=Fare(
+        "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+        6,
+        8453
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.io/api",
@@ -168,7 +196,11 @@ def __init__(
     rpc_url="https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
     chain_id=8453,
     contract_address="0xa6C9BA866992cfD7fd6460ba912bfa405adA9df0",
-    base_fare=Fare("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", 6),
+    base_fare=Fare(
+        "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+        6,
+        8453
+    ),
     alchemy_base_url="https://alchemy-proxy.virtuals.io/api/proxy/wallet",
     alchemy_policy_id="186aaa4a-5f57-4156-83fb-e456365a8820",
     acp_api_url="https://acpx.virtuals.io/api",

virtuals_acp/job.py

@@ -246,7 +246,12 @@ def pay_and_accept_requirement(self, reason: Optional[str] = "") -> str | None:
         if not memo:
             raise Exception("No negotiation memo found")
 
-        if memo.type == MemoType.PAYABLE_REQUEST and memo.state != ACPMemoState.PENDING and memo.payable_details is not None and memo.payable_details['lzDstEid'] is not None:
+        if (
+            memo.type == MemoType.PAYABLE_REQUEST and
+            memo.state != ACPMemoState.PENDING and
+            memo.payable_details is not None and
+            memo.payable_details.get('lzDstEid') is not None
+        ):
             print(f"Memo not ready to be signed, state: {memo.state}, payable_details: {memo.payable_details}")
             return