olas-operate-middleware 0.10.2__py3-none-any.whl → 0.10.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/METADATA +2 -2
- {olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/RECORD +10 -10
- operate/bridge/providers/relay_provider.py +7 -1
- operate/quickstart/reset_staking.py +2 -1
- operate/quickstart/stop_service.py +1 -1
- operate/services/manage.py +6 -2
- operate/services/protocol.py +3 -3
- {olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/LICENSE +0 -0
- {olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/WHEEL +0 -0
- {olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/entry_points.txt +0 -0
{olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/METADATA
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: olas-operate-middleware
|
|
3
|
-
Version: 0.10.
|
|
3
|
+
Version: 0.10.4
|
|
4
4
|
Summary:
|
|
5
5
|
Author: David Vilela
|
|
6
6
|
Author-email: dvilelaf@gmail.com
|
|
@@ -34,7 +34,7 @@ Requires-Dist: open-aea-cli-ipfs (==1.65.0)
|
|
|
34
34
|
Requires-Dist: open-aea-ledger-cosmos (==1.65.0)
|
|
35
35
|
Requires-Dist: open-aea-ledger-ethereum (==1.65.0)
|
|
36
36
|
Requires-Dist: open-aea-ledger-ethereum-flashbots (==1.65.0)
|
|
37
|
-
Requires-Dist: open-autonomy (>=0.20.
|
|
37
|
+
Requires-Dist: open-autonomy (>=0.20.2,<0.21.0)
|
|
38
38
|
Requires-Dist: psutil (>=5.9.8,<6.0.0)
|
|
39
39
|
Requires-Dist: pyinstaller (>=6.8.0,<7.0.0)
|
|
40
40
|
Requires-Dist: requests-toolbelt (==1.0.0)
|
{olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/RECORD
RENAMED
|
@@ -5,7 +5,7 @@ operate/bridge/bridge_manager.py,sha256=sUfhB1pZvBrF-kBfDOfFVoNeesCe7wd4_YahUF3F
|
|
|
5
5
|
operate/bridge/providers/lifi_provider.py,sha256=FpAlBAA_gOt-oOHKhGaOQhhTZIL-hgYYo4IIw1FN7mo,14153
|
|
6
6
|
operate/bridge/providers/native_bridge_provider.py,sha256=gG8bSyxUoAVEF6_J9tn1qKRv1PnXuMJdMwUAVJ4GJz8,24647
|
|
7
7
|
operate/bridge/providers/provider.py,sha256=i54RL7m4wMSADM_D_V_quQump_ipPTmByUc-c-AOLPQ,19687
|
|
8
|
-
operate/bridge/providers/relay_provider.py,sha256=
|
|
8
|
+
operate/bridge/providers/relay_provider.py,sha256=L7D-PKepsuBadarJmrNneZk0bsrh88u05uD6_2MSss4,17341
|
|
9
9
|
operate/cli.py,sha256=EalpBA15TXX5i3tD-2KIQOxkFwEOqOEiGMbjh36cOHw,51168
|
|
10
10
|
operate/constants.py,sha256=syGWEVyw07zK50gPS4OSSwyAbt9R6P8IttDimDt9vCY,2746
|
|
11
11
|
operate/data/README.md,sha256=jGPyZTvg2LCGdllvmYxmFMkkkiXb6YWatbqIkcX3kv4,879
|
|
@@ -65,9 +65,9 @@ operate/quickstart/analyse_logs.py,sha256=K11AWWevkddUIUzTe75J3fYVS6aLfi6kT_dAI9
|
|
|
65
65
|
operate/quickstart/claim_staking_rewards.py,sha256=AqfLMRef2YijQtWPaTuGwX2sOItNEkoyoi6Q9SICp_I,4026
|
|
66
66
|
operate/quickstart/reset_configs.py,sha256=ipPpbYyB9gQ4KOKS-xBrRi8fT5LvwctSkQi-8XiUMig,3341
|
|
67
67
|
operate/quickstart/reset_password.py,sha256=p_gNmhWD4hb-QXUAiQRalPtVTVyB5TEPhs7GnScYzqs,2535
|
|
68
|
-
operate/quickstart/reset_staking.py,sha256=
|
|
68
|
+
operate/quickstart/reset_staking.py,sha256=SB5LZq9EctG4SYn2M6oPZ7R7ARHSFLRGzAqfKkpRcy0,5111
|
|
69
69
|
operate/quickstart/run_service.py,sha256=6opWEeedraCsPb6jEd44oV34jVQZJSNH8WOr-Kmo2LM,27116
|
|
70
|
-
operate/quickstart/stop_service.py,sha256=
|
|
70
|
+
operate/quickstart/stop_service.py,sha256=CNcCucI4sqfZG0wTxxh-k14xGcbOh50UGyXqTZVQJP0,2048
|
|
71
71
|
operate/quickstart/terminate_on_chain_service.py,sha256=5ENU8_mkj06i80lKUX-v1QbLU0YzKeOZDUL1e_jzySE,2914
|
|
72
72
|
operate/quickstart/utils.py,sha256=rmd9e7whQIsYpRKqWBEQxMA_SHrivBg6DppFY5ECtQQ,9135
|
|
73
73
|
operate/resource.py,sha256=E59oIVqf6B6nN4LTmf_o2iCgLFAogTLPjm_cK6kMVxg,6305
|
|
@@ -75,8 +75,8 @@ operate/services/__init__.py,sha256=isrThS-Ccu5Sc15JZgkN4uTAVaSg-NwUUSDeTyJEqLk,
|
|
|
75
75
|
operate/services/agent_runner.py,sha256=6tJePUJmlRxlIugT2fDaCJHSrQlDnl1t9pbg3-7EmCQ,7560
|
|
76
76
|
operate/services/deployment_runner.py,sha256=Su73o7cdH6fkQfj468K77J04a_TWiokJwbMyVQ25xko,27067
|
|
77
77
|
operate/services/health_checker.py,sha256=2KSEDxG3YmGolUDU--648ny0UJpTAAKvxkcr_VZQv-I,9654
|
|
78
|
-
operate/services/manage.py,sha256=
|
|
79
|
-
operate/services/protocol.py,sha256=
|
|
78
|
+
operate/services/manage.py,sha256=JNlPy59rvf8qL4QkYo9BaBugHZnwjruEGSE6zLqgiLQ,108126
|
|
79
|
+
operate/services/protocol.py,sha256=n3lmNCYvAES3oh1OKk4GZeKrvOeNevag_dkP6DFwa1U,60154
|
|
80
80
|
operate/services/service.py,sha256=ltKox10YC1VINGqdlVqy2nPXkR7XCHoysSGKMngPTSU,39669
|
|
81
81
|
operate/services/utils/__init__.py,sha256=TvioaZ1mfTRUSCtrQoLNAp4WMVXyqEJqFJM4PxSQCRU,24
|
|
82
82
|
operate/services/utils/mech.py,sha256=W2x4dqodivNKXjWU-Brp40QhoUHsIMyNAO7-caMoR0Q,3821
|
|
@@ -86,8 +86,8 @@ operate/utils/gnosis.py,sha256=CS07ZqvrO7uelkFe09VMyPBcLzKONUI1ZqFvi41BDhc,17924
|
|
|
86
86
|
operate/utils/ssl.py,sha256=O5DrDoZD4T4qQuHP8GLwWUVxQ-1qXeefGp6uDJiF2lM,4308
|
|
87
87
|
operate/wallet/__init__.py,sha256=NGiozD3XhvkBi7_FaOWQ8x1thZPK4uGpokJaeDY_o2w,813
|
|
88
88
|
operate/wallet/master.py,sha256=MGXynIV0LQU3n28AceK7RlaxAtfsVowsXzisesG4iJM,30760
|
|
89
|
-
olas_operate_middleware-0.10.
|
|
90
|
-
olas_operate_middleware-0.10.
|
|
91
|
-
olas_operate_middleware-0.10.
|
|
92
|
-
olas_operate_middleware-0.10.
|
|
93
|
-
olas_operate_middleware-0.10.
|
|
89
|
+
olas_operate_middleware-0.10.4.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
|
|
90
|
+
olas_operate_middleware-0.10.4.dist-info/METADATA,sha256=ilo3bS1ts-e151-Crhss7SPRmj0rmN4Y6j4qRfbp0fo,2034
|
|
91
|
+
olas_operate_middleware-0.10.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
|
92
|
+
olas_operate_middleware-0.10.4.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
|
|
93
|
+
olas_operate_middleware-0.10.4.dist-info/RECORD,,
|
|
@@ -103,6 +103,7 @@ RELAY_DEFAULT_GAS = {
|
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
|
|
106
|
+
# https://docs.relay.link/guides/bridging#status-values
|
|
106
107
|
class RelayExecutionStatus(str, enum.Enum):
|
|
107
108
|
"""Relay execution status."""
|
|
108
109
|
|
|
@@ -366,7 +367,6 @@ class RelayProvider(Provider):
|
|
|
366
367
|
provider_request.status = ProviderRequestStatus.EXECUTION_FAILED
|
|
367
368
|
return
|
|
368
369
|
|
|
369
|
-
relay_status = RelayExecutionStatus.WAITING
|
|
370
370
|
url = "https://api.relay.link/requests/v2"
|
|
371
371
|
headers = {"accept": "application/json"}
|
|
372
372
|
params = {
|
|
@@ -384,11 +384,16 @@ class RelayProvider(Provider):
|
|
|
384
384
|
"status", str(RelayExecutionStatus.WAITING)
|
|
385
385
|
)
|
|
386
386
|
execution_data.message = str(relay_status)
|
|
387
|
+
else:
|
|
388
|
+
provider_request.status = ProviderRequestStatus.EXECUTION_UNKNOWN
|
|
389
|
+
return
|
|
387
390
|
response.raise_for_status()
|
|
388
391
|
except Exception as e:
|
|
389
392
|
self.logger.error(
|
|
390
393
|
f"[RELAY PROVIDER] Failed to update status for request {provider_request.id}: {e}"
|
|
391
394
|
)
|
|
395
|
+
provider_request.status = ProviderRequestStatus.EXECUTION_UNKNOWN
|
|
396
|
+
return
|
|
392
397
|
|
|
393
398
|
if relay_status == RelayExecutionStatus.SUCCESS:
|
|
394
399
|
self.logger.info(
|
|
@@ -422,6 +427,7 @@ class RelayProvider(Provider):
|
|
|
422
427
|
elif relay_status in (
|
|
423
428
|
RelayExecutionStatus.PENDING,
|
|
424
429
|
RelayExecutionStatus.DELAYED,
|
|
430
|
+
RelayExecutionStatus.WAITING,
|
|
425
431
|
):
|
|
426
432
|
provider_request.status = ProviderRequestStatus.EXECUTION_PENDING
|
|
427
433
|
else:
|
|
@@ -137,8 +137,9 @@ def reset_staking(operate: "OperateApp", config_path: str) -> None:
|
|
|
137
137
|
config.staking_program_id = None
|
|
138
138
|
config.store()
|
|
139
139
|
config = configure_local_config(template, operate)
|
|
140
|
+
service = get_service(manager, template)
|
|
140
141
|
manager.update(
|
|
141
|
-
service_config_id=
|
|
142
|
+
service_config_id=service.service_config_id,
|
|
142
143
|
service_template=template,
|
|
143
144
|
)
|
|
144
145
|
print("\nStaking preference has been reset successfully.")
|
|
@@ -58,7 +58,7 @@ def stop_service(operate: "OperateApp", config_path: str) -> None:
|
|
|
58
58
|
manager = operate.service_manager()
|
|
59
59
|
service = get_service(manager, template)
|
|
60
60
|
manager.stop_service_locally(
|
|
61
|
-
service_config_id=service.service_config_id, use_docker=True
|
|
61
|
+
service_config_id=service.service_config_id, use_docker=True, force=True
|
|
62
62
|
)
|
|
63
63
|
|
|
64
64
|
print()
|
operate/services/manage.py
CHANGED
|
@@ -2133,7 +2133,11 @@ class ServiceManager:
|
|
|
2133
2133
|
return deployment
|
|
2134
2134
|
|
|
2135
2135
|
def stop_service_locally(
|
|
2136
|
-
self,
|
|
2136
|
+
self,
|
|
2137
|
+
service_config_id: str,
|
|
2138
|
+
delete: bool = False,
|
|
2139
|
+
use_docker: bool = False,
|
|
2140
|
+
force: bool = False,
|
|
2137
2141
|
) -> Deployment:
|
|
2138
2142
|
"""
|
|
2139
2143
|
Stop service locally
|
|
@@ -2145,7 +2149,7 @@ class ServiceManager:
|
|
|
2145
2149
|
service = self.load(service_config_id=service_config_id)
|
|
2146
2150
|
service.remove_latest_healthcheck()
|
|
2147
2151
|
deployment = service.deployment
|
|
2148
|
-
deployment.stop(use_docker)
|
|
2152
|
+
deployment.stop(use_docker=use_docker, force=force)
|
|
2149
2153
|
if delete:
|
|
2150
2154
|
deployment.delete()
|
|
2151
2155
|
return deployment
|
operate/services/protocol.py
CHANGED
|
@@ -45,7 +45,7 @@ from autonomy.chain.constants import (
|
|
|
45
45
|
from autonomy.chain.metadata import publish_metadata
|
|
46
46
|
from autonomy.chain.service import (
|
|
47
47
|
get_agent_instances,
|
|
48
|
-
|
|
48
|
+
get_deployment_payload,
|
|
49
49
|
get_reuse_multisig_payload,
|
|
50
50
|
get_service_info,
|
|
51
51
|
get_token_deposit_amount,
|
|
@@ -1331,7 +1331,7 @@ class EthSafeTxBuilder(_ChainUtil):
|
|
|
1331
1331
|
GNOSIS_SAFE_SAME_ADDRESS_MULTISIG_CONTRACT.name
|
|
1332
1332
|
).contracts[self.chain_type]
|
|
1333
1333
|
else:
|
|
1334
|
-
deployment_payload =
|
|
1334
|
+
deployment_payload = get_deployment_payload()
|
|
1335
1335
|
gnosis_safe_multisig = ContractConfigs.get(
|
|
1336
1336
|
GNOSIS_SAFE_PROXY_FACTORY_CONTRACT.name
|
|
1337
1337
|
).contracts[self.chain_type]
|
|
@@ -1381,7 +1381,7 @@ class EthSafeTxBuilder(_ChainUtil):
|
|
|
1381
1381
|
GNOSIS_SAFE_SAME_ADDRESS_MULTISIG_CONTRACT.name
|
|
1382
1382
|
).contracts[self.chain_type]
|
|
1383
1383
|
else:
|
|
1384
|
-
deployment_payload =
|
|
1384
|
+
deployment_payload = get_deployment_payload()
|
|
1385
1385
|
gnosis_safe_multisig = ContractConfigs.get(
|
|
1386
1386
|
GNOSIS_SAFE_PROXY_FACTORY_CONTRACT.name
|
|
1387
1387
|
).contracts[self.chain_type]
|
{olas_operate_middleware-0.10.2.dist-info → olas_operate_middleware-0.10.4.dist-info}/LICENSE
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|