olas-operate-middleware 0.8.1__py3-none-any.whl → 0.9.0__py3-none-any.whl

{olas_operate_middleware-0.8.1.dist-info → olas_operate_middleware-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: olas-operate-middleware
-Version: 0.8.1
+Version: 0.9.0
 Summary: 
 Author: David Vilela
 Author-email: dvilelaf@gmail.com
@@ -34,7 +34,7 @@ Requires-Dist: open-aea-cli-ipfs (==1.65.0)
 Requires-Dist: open-aea-ledger-cosmos (==1.65.0)
 Requires-Dist: open-aea-ledger-ethereum (==1.65.0)
 Requires-Dist: open-aea-ledger-ethereum-flashbots (==1.65.0)
-Requires-Dist: open-autonomy (>=0.19.11,<0.20.0)
+Requires-Dist: open-autonomy (>=0.20.0,<0.21.0)
 Requires-Dist: psutil (>=5.9.8,<6.0.0)
 Requires-Dist: pyinstaller (>=6.8.0,<7.0.0)
 Requires-Dist: requests-toolbelt (==1.0.0)

{olas_operate_middleware-0.8.1.dist-info → olas_operate_middleware-0.9.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 operate/__init__.py,sha256=ZQhHXOo_1L9Q5Ub_2FrZ-vu3BvORBrKgK8QcJyAsYa4,870
 operate/account/__init__.py,sha256=suJ_vBMO7hLCvLYe3MVDtLXTNDd6P03og7bvUN7fZsE,804
 operate/account/user.py,sha256=y7DqqDpqgHjbVmnfL_cN0Me_JWl3Dh6GSVt2-9FdRVw,3044
-operate/bridge/bridge_manager.py,sha256=ZLUqrjB78F8skaGTz43WDzM3i7UQod60b19OCczlfmI,17242
+operate/bridge/bridge_manager.py,sha256=n6dZoG-mtegES_EqVraSW1LHhPPZ1Idhm2v7lrBMbJo,17236
 operate/bridge/providers/lifi_provider.py,sha256=FpAlBAA_gOt-oOHKhGaOQhhTZIL-hgYYo4IIw1FN7mo,14153
 operate/bridge/providers/native_bridge_provider.py,sha256=ZTLBdh9ttPWpX8IYvHyVU5y3pg1B1DG_vQ9DHVquDfw,24666
-operate/bridge/providers/provider.py,sha256=U-mgf02lS9g4tGgmDJZ4GQKX9kbf4bPQY-oNWsp3kUk,19813
-operate/bridge/providers/relay_provider.py,sha256=krwui645N-Q0xmc3goDSUxJSpJYfxX18st_GQGKlF_A,16750
-operate/cli.py,sha256=lhX4eViV1lKx6jlLr7pmbGiNLeq2pkqlYXupZRRh9X0,47862
-operate/constants.py,sha256=oFkCw3p3fPA4MDft61e_tSIxNhpqWBauUpQF3ZSn9QI,2662
+operate/bridge/providers/provider.py,sha256=YGvTqp2wNgw4E35Gov8vidwbNcoaCmEOuFn20FK-QgI,19809
+operate/bridge/providers/relay_provider.py,sha256=qfFiD655qZ9MK7duwOTRYCVTv1mD8u-XbqmcJMlm_ls,16748
+operate/cli.py,sha256=H6Y3ewfE_96WyV8ldXJ9C9r1LrbXEUNyVVSZFptwHzY,47886
+operate/constants.py,sha256=CWH2pw8YzCbl44HzbvKSaAAWgNB2-5yUgUP1VmlyNm8,2546
 operate/data/README.md,sha256=jGPyZTvg2LCGdllvmYxmFMkkkiXb6YWatbqIkcX3kv4,879
 operate/data/__init__.py,sha256=ttC51Yqk9c4ehpIgs1Qbe7aJvzkrbbdZ1ClaCxJYByE,864
 operate/data/contracts/__init__.py,sha256=_th54_WvL0ibGy-b6St0Ne9DX-fyjsh-tNOKDn-cWrg,809
@@ -54,40 +54,40 @@ operate/data/contracts/uniswap_v2_erc20/contract.yaml,sha256=XUdz-XtKtmZgLfItbO8
 operate/data/contracts/uniswap_v2_erc20/tests/__init__.py,sha256=3Arw8dsCsJz6hVOl0t9UjFASHXbV9yp3hw6x4HqgXpU,847
 operate/data/contracts/uniswap_v2_erc20/tests/test_contract.py,sha256=FzZbw9OTcr_yvjOXpk9YcO-K40eyDARyybcfSHDg2Ps,13392
 operate/keys.py,sha256=soJfdXJvHo8ytWH6ShIndjUpkShPg3KzirLs7MoFe8I,3764
-operate/ledger/__init__.py,sha256=kC-SYcdOQcX-v4TIWpwkSdM8L0yimEmbaL33XNY4S7Q,3361
-operate/ledger/profiles.py,sha256=9o_04W6rjv3Dr73PUuDOfhFM1Sn4JrmHjEBwhVdHepE,12374
-operate/migration.py,sha256=asWzYYSLhp0QmWov1eyEb9iGjzwZNOPDed01Z3Jnnn8,1819
+operate/ledger/__init__.py,sha256=ksyctDd5PU_SToN9e-_N9fAap9ZNCHw48j5hHep-erA,3353
+operate/ledger/profiles.py,sha256=Mvz2D-qoXmLzM0lBmPJGLmyNfrtXPdg_QjUeVfxLRBA,12358
+operate/migration.py,sha256=yeNI6OZwuvJcnqdRTrRNMutyo9mj2gb0vRW0hTV9EFU,3659
 operate/operate_http/__init__.py,sha256=dxCIVSUos23M4R-PFZZG6k5QrOlEiK0SxhCYSFNxh7U,4711
 operate/operate_http/exceptions.py,sha256=4UFzrn-GyDD71RhkaOyFPBynL6TrrtP3eywaaU3o4fc,1339
-operate/operate_types.py,sha256=Ff6rpJIgoJ-wludFtW7nufAVkUyZ3_1TShCcn2KS8GQ,8228
+operate/operate_types.py,sha256=x4OHOGNFCRctTdGsq7WS_d5CzQ5Lfg75qHkfgaUOivc,7895
 operate/pearl.py,sha256=yrTpSXLu_ML3qT-uNxq3kScOyo31JyxBujiSMfMUbcg,1690
-operate/quickstart/analyse_logs.py,sha256=18y0JRGEryLILM_Aj2nINyMlUodA42DaypjWLev1ENs,4297
-operate/quickstart/claim_staking_rewards.py,sha256=VVRhYQmWJ9xWigWA6vABugIllzC1VCoehnA_Wpg4DG4,4135
+operate/quickstart/analyse_logs.py,sha256=ss9BdhNs2Yo_A5NUuXpfki_j-u53YklxidBecfDQJ1k,4305
+operate/quickstart/claim_staking_rewards.py,sha256=i9vwUGFiFBlPMZHsRYbXj-lkf4fUpBotLQuFcQAPGyI,4135
 operate/quickstart/reset_configs.py,sha256=t-gVt0_-Th-LADfVmjxxKXjE2if5w-MuEscGFyMw2u0,3450
 operate/quickstart/reset_password.py,sha256=_HHnwX032WKNja5koegQIy4By0rFXGcdQRgVlusf5GA,2644
-operate/quickstart/reset_staking.py,sha256=f1_cM7QJWrCySpGJyHaDvpHbd_we39fHzBAlGLfHB_M,5157
-operate/quickstart/run_service.py,sha256=b2194M2TRi5Me4gZnC-TpWpajeh5eAgkNGwKpHpOK1A,27292
-operate/quickstart/stop_service.py,sha256=ENuFBd3KaTs0NFTy-6ECrp5XI8MRJcIOUevWF82WSt4,2094
-operate/quickstart/terminate_on_chain_service.py,sha256=ZsUSZp-xiAaUipU3nXqZzIiu-KIX_x0r2baFdgFTeQE,3023
-operate/quickstart/utils.py,sha256=rv70bktB31q6uw5hNkT6u5yo0kdpG5DCQQrQ7000W80,9172
-operate/resource.py,sha256=iuLlUepc18XTk1rEeC3Skt1R0v6cHST9rQxR6h4Ldg0,5179
+operate/quickstart/reset_staking.py,sha256=yb293RdnVRWvFlglaG_DnMCBMY0lPKMzhpOdbXKjdvY,5157
+operate/quickstart/run_service.py,sha256=16mw9oUR5Vx-Q5jwLvxs3eyl9fGrWqf1mOX8dwI9u30,27334
+operate/quickstart/stop_service.py,sha256=V-0htRKo_P8zdI7Vk2FJEWmez8GDLbyAHKF1hREr_BI,2145
+operate/quickstart/terminate_on_chain_service.py,sha256=X96p-0dCS-cDEduQnIboOLWaSjdvDU2ec_21nNkxJSk,3023
+operate/quickstart/utils.py,sha256=rmd9e7whQIsYpRKqWBEQxMA_SHrivBg6DppFY5ECtQQ,9135
+operate/resource.py,sha256=E59oIVqf6B6nN4LTmf_o2iCgLFAogTLPjm_cK6kMVxg,6305
 operate/services/__init__.py,sha256=isrThS-Ccu5Sc15JZgkN4uTAVaSg-NwUUSDeTyJEqLk,855
 operate/services/agent_runner.py,sha256=6tJePUJmlRxlIugT2fDaCJHSrQlDnl1t9pbg3-7EmCQ,7560
 operate/services/deployment_runner.py,sha256=eP1bnT3PdkYtPxi-4sZ6-Wopz8u88NkeZx7vOB2vkzc,22217
-operate/services/health_checker.py,sha256=pXtzFTLv4PK1OSbDCZ_RnOnvX31mPYRR16tbC7BsUNw,9754
-operate/services/manage.py,sha256=oDp4kMBAynPYqe3b2LM4kR9xefNxPVmmvO50XwTxFZQ,110310
-operate/services/protocol.py,sha256=0LcZk-zzQ2hYzZAkn_KIQGgT32Bq3_UsbBl7Ert3Ho8,60157
-operate/services/service.py,sha256=O8rEcPBow4bJJBJHB5RkD1fRGagJ843xwrUvFusKe9c,48146
+operate/services/health_checker.py,sha256=bMmEHOUpVgKea9zocOBQdzw154XGztZ-hWB_8HkQoCI,9689
+operate/services/manage.py,sha256=uc9hA3GQ5_Uny6yUv_2jaVYhV4SwqT2YrkOl4h7XNNc,109537
+operate/services/protocol.py,sha256=RQssnJyjHc0k1CyZCj3jxHueyJyS3nmFYw4dVQaKXzA,60157
+operate/services/service.py,sha256=hwc_gTqMig5C-9lNI2EwjNdp0BASTCmb466VhTmJlQg,48809
 operate/services/utils/__init__.py,sha256=TvioaZ1mfTRUSCtrQoLNAp4WMVXyqEJqFJM4PxSQCRU,24
 operate/services/utils/mech.py,sha256=W2x4dqodivNKXjWU-Brp40QhoUHsIMyNAO7-caMoR0Q,3821
 operate/services/utils/tendermint.py,sha256=3h9nDb2Z89T0RwUr_AaVjqtymQmsu3u6DAVCfL_k1U0,25591
 operate/utils/__init__.py,sha256=cFNP2XFpjJmDLskN0SzAk5FPdqaeN2Jn4MyVbFHmH2M,3075
-operate/utils/gnosis.py,sha256=Z1IgGfQgKIrI7EyBpGFbJ2RFaeD4Fk_7D4P-_ZQfH6Q,17705
+operate/utils/gnosis.py,sha256=OxWq5zMW0fuShLZS6JAOlgB_TEsNvsZECa6EfzC4_SY,17678
 operate/utils/ssl.py,sha256=O5DrDoZD4T4qQuHP8GLwWUVxQ-1qXeefGp6uDJiF2lM,4308
 operate/wallet/__init__.py,sha256=NGiozD3XhvkBi7_FaOWQ8x1thZPK4uGpokJaeDY_o2w,813
-operate/wallet/master.py,sha256=FQrchjWhJKgif3IXztxS0SHm7aVaAJYFQ-FEXQgxQes,31021
-olas_operate_middleware-0.8.1.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
-olas_operate_middleware-0.8.1.dist-info/METADATA,sha256=ltgyVCZTG7zZpoM8KGWVUvkZdf-XMhirfwXlSGl4Xy0,2034
-olas_operate_middleware-0.8.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-olas_operate_middleware-0.8.1.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
-olas_operate_middleware-0.8.1.dist-info/RECORD,,
+operate/wallet/master.py,sha256=lKtTHi278UWuATGSM3c2VdWHUEYg8pmvw7VzxGZ8u9I,31003
+olas_operate_middleware-0.9.0.dist-info/LICENSE,sha256=mdBDB-mWKV5Cz4ejBzBiKqan6Z8zVLAh9xwM64O2FW4,11339
+olas_operate_middleware-0.9.0.dist-info/METADATA,sha256=sFzHUFX9CCvAfzVtbZi00_IWsF-MxVQS5xPuhIcZmeQ,2033
+olas_operate_middleware-0.9.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+olas_operate_middleware-0.9.0.dist-info/entry_points.txt,sha256=dM1g2I7ODApKQFcgl5J4NGA7pfBTo6qsUTXM-j2OLlw,44
+olas_operate_middleware-0.9.0.dist-info/RECORD,,

operate/bridge/bridge_manager.py

@@ -77,7 +77,7 @@ NATIVE_BRIDGE_PROVIDER_CONFIGS: t.Dict[str, t.Any] = {
     "native-ethereum-to-optimism": {
         "from_chain": "ethereum",
         "from_bridge": "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1",
-        "to_chain": "optimistic",
+        "to_chain": "optimism",
         "to_bridge": "0x4200000000000000000000000000000000000010",
         "bridge_eta": 300,
         "bridge_contract_adaptor_class": OptimismContractAdaptor,
@@ -97,8 +97,8 @@ ROUTES = {
     (
         Chain.ETHEREUM,  # from_chain
         USDC[Chain.ETHEREUM],  # from_token
-        Chain.OPTIMISTIC,  # to_chain
-        USDC[Chain.OPTIMISTIC],  # to_token
+        Chain.OPTIMISM,  # to_chain
+        USDC[Chain.OPTIMISM],  # to_token
     ): LIFI_PROVIDER_ID,
     (
         Chain.ETHEREUM,  # from_chain

operate/bridge/providers/provider.py

@@ -231,7 +231,7 @@ class Provider(ABC):
         ledger_api = wallet.ledger_api(chain)
 
         # TODO: Backport to open aea/autonomy
-        if chain == Chain.OPTIMISTIC:
+        if chain == Chain.OPTIMISM:
             ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
 
         return ledger_api
@@ -244,7 +244,7 @@ class Provider(ABC):
         ledger_api = wallet.ledger_api(chain)
 
         # TODO: Backport to open aea/autonomy
-        if chain == Chain.OPTIMISTIC:
+        if chain == Chain.OPTIMISM:
             ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
 
         return ledger_api

operate/bridge/providers/relay_provider.py

@@ -91,7 +91,7 @@ RELAY_DEFAULT_GAS = {
         "swap": 1_500_000,
         "send": 1,
     },
-    Chain.OPTIMISTIC: {
+    Chain.OPTIMISM: {
         "deposit": 50_000,
         "approve": 200_000,
         "authorize": 1,

operate/cli.py

@@ -47,11 +47,10 @@ from operate import services
 from operate.account.user import UserAccount
 from operate.bridge.bridge_manager import BridgeManager
 from operate.constants import (
-    KEY,
-    KEYS,
+    KEYS_DIR,
     MIN_PASSWORD_LENGTH,
     OPERATE_HOME,
-    SERVICES,
+    SERVICES_DIR,
     ZERO_ADDRESS,
 )
 from operate.ledger.profiles import (
@@ -104,9 +103,8 @@ class OperateApp:
         """Initialize object."""
         super().__init__()
         self._path = (home or OPERATE_HOME).resolve()
-        self._services = self._path / SERVICES
-        self._keys = self._path / KEYS
-        self._master_key = self._path / KEY
+        self._services = self._path / SERVICES_DIR
+        self._keys = self._path / KEYS_DIR
         self.setup()
 
         self.logger = logger or setup_logger(name="operate")
@@ -118,6 +116,8 @@ class OperateApp:
 
         mm = MigrationManager(self._path, self.logger)
         mm.migrate_user_account()
+        mm.migrate_wallets()
+        mm.migrate_qs_configs()
 
     def create_user_account(self, password: str) -> UserAccount:
         """Create a user account."""

operate/constants.py

@@ -24,16 +24,11 @@ from pathlib import Path
 
 OPERATE = ".operate"
 OPERATE_HOME = Path.cwd() / OPERATE
-CONFIG = "config.json"
-SERVICES = "services"
-KEYS = "keys"
-DEPLOYMENT = "deployment"
+SERVICES_DIR = "services"
+KEYS_DIR = "keys"
+DEPLOYMENT_DIR = "deployment"
 DEPLOYMENT_JSON = "deployment.json"
-CONFIG = "config.json"
-KEY = "key"
-KEYS_JSON = "keys.json"
-DOCKER_COMPOSE_YAML = "docker-compose.yaml"
-SERVICE_YAML = "service.yaml"
+CONFIG_JSON = "config.json"
 ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
 
 ON_CHAIN_INTERACT_TIMEOUT = 120.0

operate/ledger/__init__.py

@@ -46,7 +46,7 @@ PUBLIC_RPCS = {
     Chain.SOLANA: SOLANA_PUBLIC_RPC,
     Chain.BASE: BASE_PUBLIC_RPC,
     Chain.CELO: CELO_PUBLIC_RPC,
-    Chain.OPTIMISTIC: OPTIMISM_PUBLIC_RPC,
+    Chain.OPTIMISM: OPTIMISM_PUBLIC_RPC,
     Chain.MODE: MODE_PUBLIC_RPC,
 }
 
@@ -56,7 +56,7 @@ DEFAULT_RPCS = {
     Chain.SOLANA: SOLANA_RPC,
     Chain.BASE: BASE_RPC,
     Chain.CELO: CELO_RPC,
-    Chain.OPTIMISTIC: OPTIMISM_RPC,
+    Chain.OPTIMISM: OPTIMISM_RPC,
     Chain.MODE: MODE_RPC,
 }
 
@@ -67,7 +67,7 @@ CURRENCY_DENOMS = {
     Chain.SOLANA: "SOL",
     Chain.BASE: "ETH",
     Chain.CELO: "CELO",
-    Chain.OPTIMISTIC: "ETH",
+    Chain.OPTIMISM: "ETH",
     Chain.MODE: "ETH",
 }
 
@@ -78,7 +78,7 @@ CURRENCY_SMALLEST_UNITS = {
     Chain.SOLANA: "Lamport",
     Chain.BASE: "Wei",
     Chain.CELO: "Wei",
-    Chain.OPTIMISTIC: "Wei",
+    Chain.OPTIMISM: "Wei",
     Chain.MODE: "Wei",
 }
 

operate/ledger/profiles.py

@@ -38,7 +38,7 @@ CONTRACTS: t.Dict[Chain, ContractAddresses] = {
             "multisend": "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D",
         }
     ),
-    Chain.OPTIMISTIC: ContractAddresses(
+    Chain.OPTIMISM: ContractAddresses(
         {
             "service_manager": "0xFbBEc0C8b13B38a9aC0499694A69a10204c5E2aB",
             "service_registry": "0x3d77596beb0f130a4415df3D2D8232B3d3D31e44",
@@ -123,7 +123,7 @@ STAKING: t.Dict[Chain, t.Dict[str, str]] = {
         "marketplace_demand_alpha_1": "0x9d6e7aB0B5B48aE5c146936147C639fEf4575231",
         "marketplace_demand_alpha_2": "0x9fb17E549FefcCA630dd92Ea143703CeE4Ea4340",
     },
-    Chain.OPTIMISTIC: {
+    Chain.OPTIMISM: {
         "optimus_alpha_1": "0x88996bbdE7f982D93214881756840cE2c77C4992",
         "optimus_alpha_2": "0xBCA056952D2A7a8dD4A002079219807CFDF9fd29",
         "optimus_alpha_3": "0x0f69f35652B1acdbD769049334f1AC580927E139",
@@ -170,7 +170,7 @@ DEFAULT_PRIORITY_MECH = {  # maps mech marketplace address to its default priori
 # ERC20 token addresses
 OLAS: t.Dict[Chain, str] = {
     Chain.GNOSIS: "0xcE11e14225575945b8E6Dc0D4F2dD4C570f79d9f",
-    Chain.OPTIMISTIC: "0xFC2E6e6BCbd49ccf3A5f029c79984372DcBFE527",
+    Chain.OPTIMISM: "0xFC2E6e6BCbd49ccf3A5f029c79984372DcBFE527",
     Chain.BASE: "0x54330d28ca3357F294334BDC454a032e7f353416",
     Chain.ETHEREUM: "0x0001A500A6B18995B03f44bb040A5fFc28E45CB0",
     Chain.MODE: "0xcfD1D50ce23C46D3Cf6407487B2F8934e96DC8f9",
@@ -178,7 +178,7 @@ OLAS: t.Dict[Chain, str] = {
 
 USDC: t.Dict[Chain, str] = {
     Chain.GNOSIS: "0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83",
-    Chain.OPTIMISTIC: "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+    Chain.OPTIMISM: "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
     Chain.BASE: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
     Chain.ETHEREUM: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
     Chain.MODE: "0xd988097fb8612cc24eeC14542bC03424c656005f",
@@ -186,7 +186,7 @@ USDC: t.Dict[Chain, str] = {
 
 WRAPPED_NATIVE_ASSET = {
     Chain.GNOSIS: "0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d",
-    Chain.OPTIMISTIC: "0x4200000000000000000000000000000000000006",
+    Chain.OPTIMISM: "0x4200000000000000000000000000000000000006",
     Chain.BASE: "0x4200000000000000000000000000000000000006",
     Chain.ETHEREUM: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
     Chain.MODE: "0x4200000000000000000000000000000000000006",
@@ -209,7 +209,7 @@ DEFAULT_NEW_SAFE_FUNDS: t.Dict[Chain, t.Dict[str, int]] = {
     Chain.MODE: {
         ZERO_ADDRESS: int(1e15 / 4),
     },
-    Chain.OPTIMISTIC: {
+    Chain.OPTIMISM: {
         ZERO_ADDRESS: int(1e15 / 4),
     },
 }
@@ -219,7 +219,7 @@ DEFAULT_MASTER_EOA_FUNDS = {
     Chain.ETHEREUM: {ZERO_ADDRESS: 20_000_000_000_000_000},
     Chain.GNOSIS: {ZERO_ADDRESS: 1_500_000_000_000_000_000},
     Chain.MODE: {ZERO_ADDRESS: 500_000_000_000_000},
-    Chain.OPTIMISTIC: {ZERO_ADDRESS: 5_000_000_000_000_000},
+    Chain.OPTIMISM: {ZERO_ADDRESS: 5_000_000_000_000_000},
 }
 
 EXPLORER_URL = {
@@ -239,7 +239,7 @@ EXPLORER_URL = {
         "tx": "https://modescan.io/tx/{tx_hash}",
         "address": "https://modescan.io/address/{address}",
     },
-    Chain.OPTIMISTIC: {
+    Chain.OPTIMISM: {
         "tx": "https://optimistic.etherscan.io/tx/{tx_hash}",
         "address": "https://optimistic.etherscan.io/address/{address}",
     },

operate/migration.py

@@ -61,3 +61,62 @@ class MigrationManager:
             json.dump(new_data, f, indent=4)
 
         self.logger.info("[MIGRATION MANAGER] Migrated user.json.")
+
+    def migrate_wallets(self) -> None:
+        """Migrates wallets."""
+
+        path = self._path / "wallets" / "ethereum.json"
+        if not path.exists():
+            return
+
+        migrated = False
+        with open(path, "r", encoding="utf-8") as f:
+            data = json.load(f)
+
+        if "optimistic" in data.get("safes", {}):
+            data["safes"]["optimism"] = data["safes"].pop("optimistic")
+            migrated = True
+
+        if "optimistic" in data.get("safe_chains"):
+            data["safe_chains"] = [
+                "optimism" if chain == "optimistic" else chain
+                for chain in data["safe_chains"]
+            ]
+            migrated = True
+
+        if not migrated:
+            return
+
+        with open(path, "w", encoding="utf-8") as f:
+            json.dump(data, f, indent=4)
+
+        self.logger.info("[MIGRATION MANAGER] Migrated wallets.")
+
+    def migrate_qs_configs(self) -> None:
+        """Migrates quickstart configs."""
+
+        for qs_config in self._path.glob("*-quickstart-config.json"):
+            if not qs_config.exists():
+                continue
+
+            migrated = False
+            with open(qs_config, "r", encoding="utf-8") as f:
+                data = json.load(f)
+
+            if "optimistic" in data.get("rpc", {}):
+                data["rpc"]["optimism"] = data["rpc"].pop("optimistic")
+                migrated = True
+
+            if "optimistic" == data.get("principal_chain", ""):
+                data["principal_chain"] = "optimism"
+                migrated = True
+
+            if not migrated:
+                continue
+
+            with open(qs_config, "w", encoding="utf-8") as f:
+                json.dump(data, f, indent=2)
+
+            self.logger.info(
+                "[MIGRATION MANAGER] Migrated quickstart config: %s.", qs_config.name
+            )

operate/operate_types.py

@@ -31,13 +31,6 @@ from typing_extensions import TypedDict
 from operate.resource import LocalResource
 
 
-_ACTIONS = {
-    "status": 0,
-    "build": 1,
-    "deploy": 2,
-    "stop": 3,
-}
-
 CHAIN_NAME_TO_CHAIN_ID["solana"] = 900
 
 _CHAIN_ID_TO_CHAIN_NAME = {
@@ -127,20 +120,6 @@ for name in dir(ChainMixin):
         setattr(Chain, name, getattr(ChainMixin, name))
 
 
-class Action(enum.IntEnum):
-    """Action payload."""
-
-    STATUS = 0
-    BUILD = 1
-    DEPLOY = 2
-    STOP = 3
-
-    @classmethod
-    def from_string(cls, action: str) -> "Action":
-        """Load from string."""
-        return cls(_ACTIONS[action])
-
-
 class DeploymentStatus(enum.IntEnum):
     """Status payload."""
 

operate/quickstart/analyse_logs.py

@@ -25,7 +25,7 @@ import sys
 from pathlib import Path
 from typing import List, TYPE_CHECKING, Union
 
-from operate.constants import DEPLOYMENT
+from operate.constants import DEPLOYMENT_DIR
 
 
 if TYPE_CHECKING:
@@ -41,7 +41,7 @@ def find_build_directory(config_file: Path, operate: "OperateApp") -> Path:
     services = operate.service_manager()._get_all_services()
     for service in services:
         if service.hash == config_service_hash:
-            build_dir = service.path / DEPLOYMENT
+            build_dir = service.path / DEPLOYMENT_DIR
             if not build_dir.exists():
                 print(f"{config.get('name')} not deployed.")
                 sys.exit(1)

operate/quickstart/claim_staking_rewards.py

@@ -70,10 +70,10 @@ def claim_staking_rewards(operate: "OperateApp", config_path: str) -> None:
 
     print("")
 
+    ask_password_if_needed(operate)
     config = configure_local_config(template, operate)
     manager = operate.service_manager()
     service = get_service(manager, template)
-    ask_password_if_needed(operate)
 
     # reload manger and config after setting operate.password
     manager = operate.service_manager()

operate/quickstart/reset_staking.py

@@ -57,6 +57,7 @@ def reset_staking(operate: "OperateApp", config_path: str) -> None:
         print("No previous agent setup found. Exiting.")
         return
 
+    ask_password_if_needed(operate)
     config = configure_local_config(template, operate)
     assert (  # nosec
         config.principal_chain is not None
@@ -82,7 +83,6 @@ def reset_staking(operate: "OperateApp", config_path: str) -> None:
         print("Cancelled.")
         return
 
-    ask_password_if_needed(operate)
     manager = operate.service_manager()
     service = get_service(manager, template)
 

operate/quickstart/run_service.py

@@ -100,7 +100,7 @@ QS_STAKING_PROGRAMS: t.Dict[Chain, t.Dict[str, str]] = {
         "mech_marketplace": "mech",
         "marketplace_supply_alpha": "mech",
     },
-    Chain.OPTIMISTIC: {
+    Chain.OPTIMISM: {
         "optimus_alpha_2": "optimus",
         "optimus_alpha_3": "optimus",
         "optimus_alpha_4": "optimus",
@@ -414,7 +414,7 @@ def configure_local_config(
 
             if env_var_name not in config.user_provided_args:
                 print(f"Description: {env_var_data['description']}")
-                if env_var_data["value"]:
+                if env_var_data["value"] is not None and env_var_data["value"] != "":
                     print(f"Default: {env_var_data['value']}")
 
                 user_provided_arg = ask_or_get_from_env(

operate/quickstart/stop_service.py

@@ -23,6 +23,7 @@ import warnings
 from typing import TYPE_CHECKING, cast
 
 from operate.quickstart.run_service import (
+    ask_password_if_needed,
     configure_local_config,
     get_service,
     load_local_config,
@@ -55,11 +56,12 @@ def stop_service(operate: "OperateApp", config_path: str) -> None:
         print("No previous agent setup found. Exiting.")
         return
 
+    ask_password_if_needed(operate)
     configure_local_config(template, operate)
     manager = operate.service_manager()
     service = get_service(manager, template)
     manager.stop_service_locally(
-        service_config_id=service.service_config_id, delete=True, use_docker=True
+        service_config_id=service.service_config_id, use_docker=True
     )
 
     print()

operate/quickstart/terminate_on_chain_service.py

@@ -61,8 +61,8 @@ def terminate_service(operate: "OperateApp", config_path: str) -> None:
         print("Cancelled.")
         return
 
-    config = configure_local_config(template, operate)
     ask_password_if_needed(operate)
+    config = configure_local_config(template, operate)
     manager = operate.service_manager()
     service = get_service(manager, template)
     ensure_enough_funds(operate, service)

operate/quickstart/utils.py

@@ -35,9 +35,6 @@ from operate.operate_types import Chain
 from operate.resource import LocalResource, deserialize
 
 
-MAX_QUICKSTART_VERSION = 1
-
-
 def print_box(text: str, margin: int = 1, character: str = "=") -> None:
     """Print text centered within a box."""
 
@@ -119,20 +116,20 @@ CHAIN_TO_METADATA = {
             "MAX_FEE_PER_GAS": "",
         },
     },
-    "optimistic": {
+    "optimism": {
         "name": "Optimism",
         "gasFundReq": unit_to_wei(0.005),  # fund for master EOA
-        "staking_bonding_token": OLAS[Chain.OPTIMISTIC],
+        "staking_bonding_token": OLAS[Chain.OPTIMISM],
         "token_data": {
             ZERO_ADDRESS: {
                 "symbol": "ETH",
                 "decimals": 18,
             },
-            USDC[Chain.OPTIMISTIC]: {
+            USDC[Chain.OPTIMISM]: {
                 "symbol": "USDC",
                 "decimals": 6,
             },
-            OLAS[Chain.OPTIMISTIC]: {
+            OLAS[Chain.OPTIMISM]: {
                 "symbol": "OLAS",
                 "decimals": 18,
             },

operate/resource.py

@@ -22,7 +22,9 @@
 import enum
 import json
 import os
+import platform
 import shutil
+import time
 import types
 import typing as t
 from dataclasses import asdict, is_dataclass
@@ -92,6 +94,23 @@ def deserialize(obj: t.Any, otype: t.Any) -> t.Any:
     return obj
 
 
+def _safe_file_operation(operation: t.Callable, *args: t.Any, **kwargs: t.Any) -> None:
+    """Safely perform file operation with retries on Windows."""
+    max_retries = 3 if platform.system() == "Windows" else 1
+
+    for attempt in range(max_retries):
+        try:
+            operation(*args, **kwargs)
+            return
+        except (PermissionError, FileNotFoundError, OSError) as e:
+            if attempt == max_retries - 1:
+                raise e
+
+            if platform.system() == "Windows":
+                # On Windows, wait a bit and retry
+                time.sleep(0.1)
+
+
 class LocalResource:
     """Initialize local resource."""
 
@@ -144,9 +163,14 @@ class LocalResource:
         bak0 = path.with_name(f"{path.name}.0.bak")
 
         if path.exists() and not bak0.exists():
-            shutil.copy2(path, bak0)
+            _safe_file_operation(shutil.copy2, path, bak0)
 
         tmp_path = path.parent / f".{path.name}.tmp"
+
+        # Clean up any existing tmp file
+        if tmp_path.exists():
+            _safe_file_operation(tmp_path.unlink)
+
         tmp_path.write_text(
             json.dumps(
                 self.json,
@@ -155,15 +179,23 @@ class LocalResource:
             encoding="utf-8",
         )
 
-        os.replace(tmp_path, path)  # atomic replace to avoid corruption
+        # Atomic replace to avoid corruption
+        try:
+            _safe_file_operation(os.replace, tmp_path, path)
+        except (PermissionError, FileNotFoundError):
+            # On Windows, if the replace fails, clean up and skip
+            if platform.system() == "Windows":
+                _safe_file_operation(tmp_path.unlink)
+
         self.load(self.path)  # Validate before making backup
 
+        # Rotate backup files
         for i in reversed(range(N_BACKUPS - 1)):
             newer = path.with_name(f"{path.name}.{i}.bak")
             older = path.with_name(f"{path.name}.{i + 1}.bak")
             if newer.exists():
                 if older.exists():
-                    older.unlink()
-                newer.rename(older)
+                    _safe_file_operation(older.unlink)
+                _safe_file_operation(newer.rename, older)
 
-        shutil.copy2(path, bak0)
+        _safe_file_operation(shutil.copy2, path, bak0)

operate/services/health_checker.py

@@ -33,9 +33,6 @@ from operate.constants import HEALTH_CHECK_URL
 from operate.services.manage import ServiceManager  # type: ignore
 
 
-HTTP_OK = HTTPStatus.OK
-
-
 class HealthChecker:
     """Health checker manager."""
 
@@ -43,7 +40,6 @@ class HealthChecker:
     PORT_UP_TIMEOUT_DEFAULT = 300  # seconds
     REQUEST_TIMEOUT_DEFAULT = 90
     NUMBER_OF_FAILS_DEFAULT = 10
-    HEALTH_CHECK_URL = HEALTH_CHECK_URL
 
     def __init__(
         self,
@@ -95,11 +91,11 @@ class HealthChecker:
         del service_config_id
         timeout = aiohttp.ClientTimeout(total=self.REQUEST_TIMEOUT_DEFAULT)
         async with aiohttp.ClientSession(timeout=timeout) as session:
-            async with session.get(self.HEALTH_CHECK_URL) as resp:
+            async with session.get(HEALTH_CHECK_URL) as resp:
                 try:
                     status = resp.status
 
-                    if status != HTTP_OK:
+                    if status != HTTPStatus.OK:
                         # not HTTP OK -> not healthy for sure
                         content = await resp.text()
                         self.logger.warning(

operate/services/manage.py

@@ -23,7 +23,6 @@ import asyncio
 import json
 import logging
 import os
-import shutil
 import time
 import traceback
 import typing as t
@@ -39,8 +38,9 @@ from aea.helpers.logging import setup_logger
 from aea_ledger_ethereum import EthereumCrypto, LedgerApi
 from autonomy.chain.base import registry_contracts
 from autonomy.chain.config import CHAIN_PROFILES, ChainType
+from autonomy.chain.metadata import IPFS_URI_PREFIX
 
-from operate.constants import ZERO_ADDRESS
+from operate.constants import IPFS_ADDRESS, ZERO_ADDRESS
 from operate.data import DATA_DIR
 from operate.data.contracts.mech_activity.contract import MechActivityContract
 from operate.data.contracts.requester_activity_checker.contract import (
@@ -71,7 +71,6 @@ from operate.operate_types import (
 from operate.services.protocol import EthSafeTxBuilder, OnChainManager, StakingState
 from operate.services.service import (
     ChainConfig,
-    DELETE_PREFIX,
     Deployment,
     NON_EXISTENT_MULTISIG,
     NON_EXISTENT_TOKEN,
@@ -80,32 +79,13 @@ from operate.services.service import (
     Service,
 )
 from operate.services.utils.mech import deploy_mech
-from operate.utils.gnosis import (
-    NULL_ADDRESS,
-    drain_eoa,
-    get_asset_balance,
-    get_assets_balances,
-)
+from operate.utils.gnosis import drain_eoa, get_asset_balance, get_assets_balances
 from operate.utils.gnosis import transfer as transfer_from_safe
 from operate.utils.gnosis import transfer_erc20_from_safe
 from operate.wallet.master import MasterWalletManager
 
 
 # pylint: disable=redefined-builtin
-
-OPERATE = ".operate"
-CONFIG = "config.json"
-SERVICES = "services"
-KEYS = "keys"
-DEPLOYMENT = "deployment"
-CONFIG = "config.json"
-KEY = "master-key.txt"
-KEYS_JSON = "keys.json"
-DOCKER_COMPOSE_YAML = "docker-compose.yaml"
-SERVICE_YAML = "service.yaml"
-HTTP_OK = 200
-URI_HASH_POSITION = 7
-IPFS_GATEWAY = "https://gateway.autonolas.tech/ipfs/"
 DEFAULT_TOPUP_THRESHOLD = 0.5
 # At the moment, we only support running one agent per service locally on a machine.
 # If multiple agents are provided in the service.yaml file, only the 0th index config will be used.
@@ -297,7 +277,7 @@ class ServiceManager:
         sftxb = self.get_eth_safe_tx_builder(ledger_config=ledger_config)
         info = sftxb.info(token_id=chain_data.token)
         config_hash = info["config_hash"]
-        url = f"{IPFS_GATEWAY}f01701220{config_hash}"
+        url = IPFS_ADDRESS.format(hash=config_hash)
         self.logger.info(f"Fetching {url=}...")
         res = requests.get(url, timeout=30)
         if res.status_code == HTTPStatus.OK:
@@ -403,7 +383,7 @@ class ServiceManager:
                 )
 
         on_chain_metadata = self._get_on_chain_metadata(chain_config=chain_config)
-        on_chain_hash = on_chain_metadata.get("code_uri", "")[URI_HASH_POSITION:]
+        on_chain_hash = on_chain_metadata.get("code_uri", "")[len(IPFS_URI_PREFIX) :]
         on_chain_description = on_chain_metadata.get("description")
 
         current_agent_bond = staking_params[
@@ -653,13 +633,13 @@ class ServiceManager:
 
         current_staking_program = self._get_current_staking_program(service, chain)
         fallback_params = dict(  # nosec
-            staking_contract=NULL_ADDRESS,
+            staking_contract=ZERO_ADDRESS,
             agent_ids=[user_params.agent_id],
             service_registry="0x9338b5153AE39BB89f50468E608eD9d764B755fD",  # nosec
-            staking_token=NULL_ADDRESS,  # nosec
+            staking_token=ZERO_ADDRESS,  # nosec
             service_registry_token_utility="0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8",  # nosec
             min_staking_deposit=20000000000000000000,
-            activity_checker=NULL_ADDRESS,  # nosec
+            activity_checker=ZERO_ADDRESS,  # nosec
         )
 
         current_staking_params = sftxb.get_staking_params(
@@ -710,7 +690,7 @@ class ServiceManager:
                     "GNOSIS_LEDGER_RPC": PUBLIC_RPCS[Chain.GNOSIS],
                     "BASE_LEDGER_RPC": PUBLIC_RPCS[Chain.BASE],
                     "CELO_LEDGER_RPC": PUBLIC_RPCS[Chain.CELO],
-                    "OPTIMISM_LEDGER_RPC": PUBLIC_RPCS[Chain.OPTIMISTIC],
+                    "OPTIMISM_LEDGER_RPC": PUBLIC_RPCS[Chain.OPTIMISM],
                     "MODE_LEDGER_RPC": PUBLIC_RPCS[Chain.MODE],
                     f"{chain.upper()}_LEDGER_RPC": ledger_config.rpc,
                     "STAKING_CONTRACT_ADDRESS": target_staking_params.get(
@@ -792,7 +772,7 @@ class ServiceManager:
         target_staking_params["agent_ids"] = [agent_id]
 
         on_chain_metadata = self._get_on_chain_metadata(chain_config=chain_config)
-        on_chain_hash = on_chain_metadata.get("code_uri", "")[URI_HASH_POSITION:]
+        on_chain_hash = on_chain_metadata.get("code_uri", "")[len(IPFS_URI_PREFIX) :]
         on_chain_description = on_chain_metadata.get("description")
 
         current_agent_bond = sftxb.get_agent_bond(
@@ -1067,7 +1047,7 @@ class ServiceManager:
 
             reuse_multisig = True
             info = sftxb.info(token_id=chain_data.token)
-            if info["multisig"] == NULL_ADDRESS:
+            if info["multisig"] == ZERO_ADDRESS:
                 reuse_multisig = False
 
             self.logger.info(f"{reuse_multisig=}")
@@ -1135,9 +1115,7 @@ class ServiceManager:
         staking_chain = None
         for chain_, config in service.chain_configs.items():
             if config.chain_data.user_params.use_staking:
-                staking_chain = chain_.replace(
-                    "optimistic", "optimism"
-                )  # TODO: remove this hack, when it's renamed in open-autonomy
+                staking_chain = chain_
                 break
 
         service.update_env_variables_values(
@@ -1148,9 +1126,7 @@ class ServiceManager:
                         for chain, config in service.chain_configs.items()
                     },
                     separators=(",", ":"),
-                ).replace(
-                    "optimistic", "optimism"
-                ),  # TODO: remove this hack, when it's renamed in open-autonomy
+                ),
                 "STAKING_CHAIN": staking_chain,
             }
         )
@@ -2210,10 +2186,6 @@ class ServiceManager:
         paths = list(self.path.iterdir())
         for path in paths:
             try:
-                if path.name.startswith(DELETE_PREFIX):
-                    shutil.rmtree(path)
-                    self.logger.info(f"Deleted folder: {path.name}")
-
                 if path.name.startswith(SERVICE_CONFIG_PREFIX) or path.name.startswith(
                     "bafybei"
                 ):

operate/services/protocol.py

@@ -61,6 +61,7 @@ from operate.constants import (
     ON_CHAIN_INTERACT_RETRIES,
     ON_CHAIN_INTERACT_SLEEP,
     ON_CHAIN_INTERACT_TIMEOUT,
+    ZERO_ADDRESS,
 )
 from operate.data import DATA_DIR
 from operate.data.contracts.dual_staking_token.contract import DualStakingTokenContract
@@ -69,7 +70,6 @@ from operate.operate_types import Chain as OperateChain
 from operate.operate_types import ContractAddresses
 from operate.utils.gnosis import (
     MultiSendOperation,
-    NULL_ADDRESS,
     SafeOperation,
     hash_payload_to_hex,
     skill_input_hex_to_payload,
@@ -710,7 +710,7 @@ class _ChainUtil:
             token_id=service_id,
         )
 
-        if multisig_address == NULL_ADDRESS:
+        if multisig_address == ZERO_ADDRESS:
             return []
 
         return registry_contracts.gnosis_safe.get_owners(
@@ -1605,7 +1605,7 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
         chain_type=chain_type,
         token_id=service_id,
     )
-    if multisig_address == NULL_ADDRESS:
+    if multisig_address == ZERO_ADDRESS:
         return None, None, "Cannot reuse multisig, No previous deployment exist!"
 
     multisend_address = ContractConfigs.get(MULTISEND_CONTRACT.name).contracts[
@@ -1723,8 +1723,8 @@ def get_reuse_multisig_from_safe_payload(  # pylint: disable=too-many-locals
             0,  # safe tx gas
             0,  # bas gas
             0,  # safe gas price
-            NULL_ADDRESS,  # gas token
-            NULL_ADDRESS,  # refund receiver
+            ZERO_ADDRESS,  # gas token
+            ZERO_ADDRESS,  # refund receiver
             signature_bytes,  # signatures
         ],
     )

operate/services/service.py

@@ -45,7 +45,9 @@ from aea.configurations.constants import (
 from aea.helpers.yaml_utils import yaml_dump, yaml_load, yaml_load_all
 from aea_cli_ipfs.ipfs_utils import IPFSTool
 from autonomy.cli.helpers.deployment import run_deployment, stop_deployment
+from autonomy.configurations.constants import DEFAULT_SERVICE_CONFIG_FILE
 from autonomy.configurations.loader import apply_env_variables, load_service_config
+from autonomy.constants import DEFAULT_KEYS_FILE, DOCKER_COMPOSE_YAML
 from autonomy.deploy.base import BaseDeploymentGenerator
 from autonomy.deploy.base import ServiceBuilder as BaseServiceBuilder
 from autonomy.deploy.constants import (
@@ -61,13 +63,7 @@ from autonomy.deploy.generators.docker_compose.base import DockerComposeGenerato
 from autonomy.deploy.generators.kubernetes.base import KubernetesGenerator
 from docker import from_env
 
-from operate.constants import (
-    DEPLOYMENT,
-    DEPLOYMENT_JSON,
-    DOCKER_COMPOSE_YAML,
-    KEYS_JSON,
-    ZERO_ADDRESS,
-)
+from operate.constants import CONFIG_JSON, DEPLOYMENT_DIR, DEPLOYMENT_JSON, ZERO_ADDRESS
 from operate.keys import Keys
 from operate.operate_http.exceptions import NotAllowed
 from operate.operate_types import (
@@ -96,8 +92,7 @@ from operate.utils.ssl import create_ssl_certificate
 SAFE_CONTRACT_ADDRESS = "safe_contract_address"
 ALL_PARTICIPANTS = "all_participants"
 CONSENSUS_THRESHOLD = "consensus_threshold"
-DELETE_PREFIX = "delete_"
-SERVICE_CONFIG_VERSION = 6
+SERVICE_CONFIG_VERSION = 7
 SERVICE_CONFIG_PREFIX = "sc-"
 
 NON_EXISTENT_MULTISIG = "0xm"
@@ -410,7 +405,7 @@ class Deployment(LocalResource):
     nodes: DeployedNodes
     path: Path
 
-    _file = "deployment.json"
+    _file = DEPLOYMENT_JSON
 
     @staticmethod
     def new(path: Path) -> "Deployment":
@@ -435,14 +430,14 @@ class Deployment(LocalResource):
 
     def copy_previous_agent_run_logs(self) -> None:
         """Copy previous agent logs."""
-        source_path = self.path / DEPLOYMENT / "agent" / "log.txt"
+        source_path = self.path / DEPLOYMENT_DIR / "agent" / "log.txt"
         destination_path = self.path / "prev_log.txt"
         if source_path.exists():
             shutil.copy(source_path, destination_path)
 
     def _build_kubernetes(self, force: bool = True) -> None:
         """Build kubernetes deployment."""
-        k8s_build = self.path / DEPLOYMENT / "abci_build_k8s"
+        k8s_build = self.path / DEPLOYMENT_DIR / "abci_build_k8s"
         if k8s_build.exists() and force:
             shutil.rmtree(k8s_build)
         mkdirs(build_dir=k8s_build)
@@ -450,7 +445,7 @@ class Deployment(LocalResource):
         service = Service.load(path=self.path)
         builder = ServiceBuilder.from_dir(
             path=service.package_absolute_path,
-            keys_file=self.path / KEYS_JSON,
+            keys_file=self.path / DEFAULT_KEYS_FILE,
             number_of_agents=len(service.keys),
         )
         builder.deplopyment_type = KubernetesGenerator.deployment_type
@@ -482,7 +477,7 @@ class Deployment(LocalResource):
             force=force,
         )
 
-        build = self.path / DEPLOYMENT
+        build = self.path / DEPLOYMENT_DIR
         if build.exists() and not force:
             return
         if build.exists() and force:
@@ -490,7 +485,7 @@ class Deployment(LocalResource):
             shutil.rmtree(build)
         mkdirs(build_dir=build)
 
-        keys_file = self.path / KEYS_JSON
+        keys_file = self.path / DEFAULT_KEYS_FILE
         keys_file.write_text(
             json.dumps(
                 [
@@ -588,7 +583,7 @@ class Deployment(LocalResource):
 
     def _build_host(self, force: bool = True, chain: t.Optional[str] = None) -> None:
         """Build host depployment."""
-        build = self.path / DEPLOYMENT
+        build = self.path / DEPLOYMENT_DIR
         if build.exists() and not force:
             return
 
@@ -617,7 +612,7 @@ class Deployment(LocalResource):
         chain_config = service.chain_configs[chain]
         chain_data = chain_config.chain_data
 
-        keys_file = self.path / KEYS_JSON
+        keys_file = self.path / DEFAULT_KEYS_FILE
         keys_file.write_text(
             json.dumps(
                 [
@@ -708,7 +703,7 @@ class Deployment(LocalResource):
                 self._build_kubernetes(force=force)
         else:
             ssl_key_path, ssl_cert_path = create_ssl_certificate(
-                ssl_dir=service.path / DEPLOYMENT / "ssl"
+                ssl_dir=service.path / DEPLOYMENT_DIR / "ssl"
             )
             service.update_env_variables_values(
                 {
@@ -734,7 +729,11 @@ class Deployment(LocalResource):
 
         try:
             if use_docker:
-                run_deployment(build_dir=self.path / "deployment", detach=True)
+                run_deployment(
+                    build_dir=self.path / "deployment",
+                    detach=True,
+                    project_name=self.path.name,
+                )
             else:
                 run_host_deployment(build_dir=self.path / "deployment")
         except Exception:
@@ -754,7 +753,10 @@ class Deployment(LocalResource):
         self.store()
 
         if use_docker:
-            stop_deployment(build_dir=self.path / "deployment")
+            stop_deployment(
+                build_dir=self.path / "deployment",
+                project_name=self.path.name,
+            )
         else:
             stop_host_deployment(build_dir=self.path / "deployment")
 
@@ -763,7 +765,7 @@ class Deployment(LocalResource):
 
     def delete(self) -> None:
         """Delete the deployment."""
-        build = self.path / DEPLOYMENT
+        build = self.path / DEPLOYMENT_DIR
         shutil.rmtree(build)
         self.status = DeploymentStatus.DELETED
         self.store()
@@ -791,7 +793,7 @@ class Service(LocalResource):
     _helper: t.Optional[ServiceHelper] = None
     _deployment: t.Optional[Deployment] = None
 
-    _file = "config.json"
+    _file = CONFIG_JSON
 
     @staticmethod
     def _determine_agent_id(service_name: str) -> int:
@@ -933,7 +935,7 @@ class Service(LocalResource):
                 "goerli",
                 "gnosis",
                 "solana",
-                "optimistic",
+                "optimism",
                 "base",
                 "mode",
             ]
@@ -969,6 +971,19 @@ class Service(LocalResource):
                 new_chain_configs[chain] = chain_data  # type: ignore
             data["chain_configs"] = new_chain_configs
 
+        if version < 7:
+            if data["home_chain"] == "optimistic":
+                data["home_chain"] = Chain.OPTIMISM.value
+
+            if "optimistic" in data["chain_configs"]:
+                data["chain_configs"]["optimism"] = data["chain_configs"].pop(
+                    "optimistic"
+                )
+
+            for _, chain_config in data["chain_configs"].items():
+                if chain_config["ledger_config"]["chain"] == "optimistic":
+                    chain_config["ledger_config"]["chain"] = Chain.OPTIMISM.value
+
         data["version"] = SERVICE_CONFIG_VERSION
 
         # Redownload service path
@@ -1028,7 +1043,7 @@ class Service(LocalResource):
         package_absolute_path = self.path / self.package_path
         if (
             not package_absolute_path.exists()
-            or not (package_absolute_path / "service.yaml").exists()
+            or not (package_absolute_path / DEFAULT_SERVICE_CONFIG_FILE).exists()
         ):
             with tempfile.TemporaryDirectory(dir=self.path) as temp_dir:
                 package_temp_path = Path(
@@ -1103,7 +1118,7 @@ class Service(LocalResource):
 
     def service_public_id(self, include_version: bool = True) -> str:
         """Get the public id (based on the service hash)."""
-        with (self.package_absolute_path / "service.yaml").open(
+        with (self.package_absolute_path / DEFAULT_SERVICE_CONFIG_FILE).open(
             "r", encoding="utf-8"
         ) as fp:
             service_yaml, *_ = yaml_load_all(fp)
@@ -1135,7 +1150,9 @@ class Service(LocalResource):
                 )
             )
 
-            with (package_path / "service.yaml").open("r", encoding="utf-8") as fp:
+            with (package_path / DEFAULT_SERVICE_CONFIG_FILE).open(
+                "r", encoding="utf-8"
+            ) as fp:
                 service_yaml, *_ = yaml_load_all(fp)
 
             public_id = f"{service_yaml['author']}/{service_yaml['name']}"
@@ -1321,10 +1338,3 @@ class Service(LocalResource):
 
         if updated:
             self.store()
-
-    def delete(self) -> None:
-        """Delete a service."""
-        parent_directory = self.path.parent
-        new_path = parent_directory / f"{DELETE_PREFIX}{self.path.name}"
-        shutil.move(self.path, new_path)
-        shutil.rmtree(new_path)

operate/utils/gnosis.py

@@ -43,9 +43,7 @@ from operate.operate_types import Chain
 
 
 logger = setup_logger(name="operate.manager")
-NULL_ADDRESS: str = "0x" + "0" * 40
 MAX_UINT256 = 2**256 - 1
-ZERO_ETH = 0
 SENTINEL_OWNERS = "0x0000000000000000000000000000000000000001"
 
 
@@ -73,8 +71,8 @@ def hash_payload_to_hex(  # pylint: disable=too-many-arguments,too-many-locals
     operation: int = SafeOperation.CALL.value,
     base_gas: int = 0,
     safe_gas_price: int = 0,
-    gas_token: str = NULL_ADDRESS,
-    refund_receiver: str = NULL_ADDRESS,
+    gas_token: str = ZERO_ADDRESS,
+    refund_receiver: str = ZERO_ADDRESS,
     use_flashbots: bool = False,
     gas_limit: int = 0,
     raise_on_failed_simulation: bool = False,
@@ -525,7 +523,8 @@ def drain_eoa(
         if Chain.from_id(chain_id) in (
             Chain.ARBITRUM_ONE,
             Chain.BASE,
-            Chain.OPTIMISTIC,
+            Chain.OPTIMISM,
+            Chain.MODE,
         ):
             chain_fee += ledger_api.get_l1_data_fee(tx)
 

operate/wallet/master.py

@@ -48,7 +48,7 @@ from operate.ledger.profiles import ERC20_TOKENS, OLAS, USDC
 from operate.operate_types import Chain, LedgerType
 from operate.resource import LocalResource
 from operate.utils import create_backup
-from operate.utils.gnosis import NULL_ADDRESS, add_owner
+from operate.utils.gnosis import add_owner
 from operate.utils.gnosis import create_safe as create_gnosis_safe
 from operate.utils.gnosis import (
     drain_eoa,
@@ -110,7 +110,7 @@ class MasterWallet(LocalResource):
     ) -> LedgerApi:
         """Get ledger api object."""
         gas_price_strategies = deepcopy(DEFAULT_GAS_PRICE_STRATEGIES)
-        if chain in (Chain.BASE, Chain.MODE, Chain.OPTIMISTIC):
+        if chain in (Chain.BASE, Chain.MODE, Chain.OPTIMISM):
             gas_price_strategies[EIP1559]["fallback_estimate"]["maxFeePerGas"] = to_wei(
                 5, GWEI
             )
@@ -717,7 +717,7 @@ class EthereumMasterWallet(MasterWallet):
             owners.remove(self.address)
 
             balances: t.Dict[str, int] = {}
-            balances[NULL_ADDRESS] = ledger_api.get_balance(safe) or 0
+            balances[ZERO_ADDRESS] = ledger_api.get_balance(safe) or 0
             for token in tokens:
                 balance = (
                     registry_contracts.erc20.get_instance(
@@ -781,7 +781,7 @@ class EthereumMasterWallet(MasterWallet):
             "goerli",
             "gnosis",
             "solana",
-            "optimistic",
+            "optimism",
             "base",
             "mode",
         ]