olas-operate-middleware 0.13.2__tar.gz → 0.13.3__tar.gz

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/PKG-INFO

@@ -1,50 +1,31 @@
 Metadata-Version: 2.4
 Name: olas-operate-middleware
-Version: 0.13.2
+Version: 0.13.3
 Summary: 
 License-File: LICENSE
 Author: David Vilela
 Author-email: dvilelaf@gmail.com
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.10,<3.12
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: aiohttp (==3.9.5)
 Requires-Dist: argon2-cffi (==23.1.0)
 Requires-Dist: clea (==0.1.0rc4)
+Requires-Dist: cryptography (>=46.0.3,<47.0.0)
 Requires-Dist: cytoolz (==0.12.3)
 Requires-Dist: deepdiff (>=8.6.1,<9.0.0)
-Requires-Dist: docker (==6.1.2)
-Requires-Dist: eth-abi (==4.0.0)
-Requires-Dist: eth-account (==0.8.0)
-Requires-Dist: eth-hash (==0.7.0)
-Requires-Dist: eth-keyfile (==0.6.1)
-Requires-Dist: eth-keys (==0.4.0)
-Requires-Dist: eth-rlp (==0.3.0)
-Requires-Dist: eth-typing (==3.5.2)
-Requires-Dist: eth-utils (==2.2.0)
 Requires-Dist: fastapi (==0.110.3)
-Requires-Dist: frozenlist (==1.4.1)
 Requires-Dist: halo (==0.0.31)
-Requires-Dist: hexbytes (==0.3.1)
-Requires-Dist: ipfshttpclient (==0.8.0a2)
-Requires-Dist: jsonschema (==4.3.3)
 Requires-Dist: multiaddr (==0.0.9)
-Requires-Dist: multidict (==6.0.5)
-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.20.2,<0.21.0)
+Requires-Dist: open-aea-cli-ipfs (>=2.0.6,<3.0.0)
+Requires-Dist: open-aea-ledger-cosmos (>=2.0.6,<3.0.0)
+Requires-Dist: open-aea-ledger-ethereum (>=2.0.6,<3.0.0)
+Requires-Dist: open-aea-ledger-ethereum-flashbots (>=2.0.6,<3.0.0)
+Requires-Dist: open-autonomy (>=0.21.4,<0.22.0)
 Requires-Dist: psutil (>=5.9.8,<6.0.0)
 Requires-Dist: pyinstaller (>=6.8.0,<7.0.0)
 Requires-Dist: requests-mock (>=1.12.1,<2.0.0)
-Requires-Dist: requests-toolbelt (==1.0.0)
-Requires-Dist: starlette (==0.37.2)
-Requires-Dist: twikit (==2.2.0)
 Requires-Dist: uvicorn (==0.27.0)
-Requires-Dist: web3 (==6.20.4)
 Description-Content-Type: text/markdown
 
 <h1 align="center">

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/bridge/providers/provider.py

@@ -27,11 +27,13 @@ import time
 import typing as t
 import uuid
 from abc import ABC, abstractmethod
+from contextlib import suppress
 from dataclasses import dataclass
 
 from aea.crypto.base import LedgerApi
 from autonomy.chain.tx import TxSettler
 from web3 import Web3
+from web3.exceptions import TimeExhausted
 
 from operate.constants import (
     ON_CHAIN_INTERACT_RETRIES,
@@ -58,7 +60,7 @@ MESSAGE_EXECUTION_FAILED_SETTLEMENT = (
 )
 MESSAGE_REQUIREMENTS_QUOTE_FAILED = "Cannot compute requirements for failed quote."
 
-ERC20_APPROVE_SELECTOR = "0x095ea7b3"  # First 4 bytes of Web3.keccak(text='approve(address,uint256)').hex()[:10]
+ERC20_APPROVE_SELECTOR = "0x095ea7b3"  # First 4 bytes of Web3.keccak(text='approve(address,uint256)').to_0x_hex()[:10]
 
 
 @dataclass
@@ -370,48 +372,38 @@ class Provider(ABC):
             from_address = provider_request.params["from"]["address"]
             wallet = self.wallet_manager.load(chain.ledger_type)
             from_ledger_api = self._from_ledger_api(provider_request)
-            tx_settler = TxSettler(
-                ledger_api=from_ledger_api,
-                crypto=wallet.crypto,
-                chain_type=Chain(provider_request.params["from"]["chain"]),
-                timeout=ON_CHAIN_INTERACT_TIMEOUT,
-                retries=ON_CHAIN_INTERACT_RETRIES,
-                sleep=ON_CHAIN_INTERACT_SLEEP,
-            )
-            tx_hashes = []
 
             for tx_label, tx in txs:
                 self.logger.info(f"[PROVIDER] Executing transaction {tx_label}.")
-                nonce = from_ledger_api.api.eth.get_transaction_count(from_address)
-                tx["nonce"] = nonce  # TODO: backport to TxSettler
-                setattr(  # noqa: B010
-                    tx_settler, "build", lambda *args, **kwargs: tx  # noqa: B023
-                )
-                tx_receipt = tx_settler.transact(
-                    method=lambda: {},
-                    contract="",
-                    kwargs={},
-                    dry_run=False,
-                )
-                self.logger.info(f"[PROVIDER] Transaction {tx_label} settled.")
-                tx_hashes.append(tx_receipt.get("transactionHash", "").hex())
+                tx_settler = TxSettler(
+                    ledger_api=from_ledger_api,
+                    crypto=wallet.crypto,
+                    chain_type=Chain(provider_request.params["from"]["chain"]),
+                    timeout=ON_CHAIN_INTERACT_TIMEOUT,
+                    retries=ON_CHAIN_INTERACT_RETRIES,
+                    sleep=ON_CHAIN_INTERACT_SLEEP,
+                    tx_builder=lambda: {
+                        **tx,  # noqa: B023
+                        "nonce": from_ledger_api.api.eth.get_transaction_count(
+                            from_address
+                        ),
+                    },
+                ).transact()
+
+                with suppress(TimeExhausted):
+                    tx_settler.settle()
+                    self.logger.info(f"[PROVIDER] Transaction {tx_label} settled.")
 
             execution_data = ExecutionData(
                 elapsed_time=time.time() - timestamp,
                 message=None,
                 timestamp=int(timestamp),
-                from_tx_hash=tx_hashes[-1],
+                from_tx_hash=tx_settler.tx_hash,
                 to_tx_hash=None,
                 provider_data=None,
             )
             provider_request.execution_data = execution_data
-            if len(tx_hashes) == len(txs):
-                provider_request.status = ProviderRequestStatus.EXECUTION_PENDING
-            else:
-                provider_request.execution_data.message = (
-                    MESSAGE_EXECUTION_FAILED_SETTLEMENT
-                )
-                provider_request.status = ProviderRequestStatus.EXECUTION_FAILED
+            provider_request.status = ProviderRequestStatus.EXECUTION_PENDING
 
         except Exception as e:  # pylint: disable=broad-except
             self.logger.error(f"[PROVIDER] Error executing request: {e}")

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/cli.py

@@ -101,22 +101,7 @@ from operate.wallet.wallet_recovery_manager import (
 
 
 # TODO Backport to Open Autonomy
-def should_rebuild(error: str) -> bool:
-    """Check if we should rebuild the transaction."""
-    for _error in (
-        "wrong transaction nonce",
-        "OldNonce",
-        "nonce too low",
-        "replacement transaction underpriced",
-    ):
-        if _error in error:
-            return True
-    return False
-
-
-autonomy.chain.tx.ERRORS_TO_RETRY += ("replacement transaction underpriced",)
-autonomy.chain.tx.should_rebuild = should_rebuild
-# End backport to Open Autonomy
+autonomy.chain.tx.ERRORS_TO_RETRY |= {"replacement transaction underpriced"}
 
 
 DEFAULT_MAX_RETRIES = 3
@@ -414,7 +399,9 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
             return
 
         status = funding_job.cancel()
-        if not status:
+        if status:
+            funding_job = None
+        else:
             logger.info("Funding job cancellation failed")
 
     def pause_all_services_on_startup() -> None:

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/constants.py

@@ -53,6 +53,7 @@ AGENT_RUNNER_PREFIX = "agent_runner"
 
 ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
 
+DEFAULT_TIMEOUT = 30
 MIN_AGENT_BOND = 1
 MIN_SECURITY_DEPOSIT = 1
 

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/dual_staking_token/contract.py

@@ -39,7 +39,7 @@ class DualStakingTokenContract(Contract):
     ) -> JSONLike:
         """Build stake tx."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("stake", args=[service_id])
+        data = contract_instance.encode_abi("stake", args=[service_id])
         return dict(data=bytes.fromhex(data[2:]))
 
     @classmethod
@@ -50,7 +50,7 @@ class DualStakingTokenContract(Contract):
     ) -> JSONLike:
         """Build checkpoint tx."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("checkpoint")
+        data = contract_instance.encode_abi("checkpoint")
         return dict(data=bytes.fromhex(data[2:]))
 
     @classmethod
@@ -62,7 +62,7 @@ class DualStakingTokenContract(Contract):
     ) -> JSONLike:
         """Build unstake tx."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("unstake", args=[service_id])
+        data = contract_instance.encode_abi("unstake", args=[service_id])
         return dict(data=bytes.fromhex(data[2:]))
 
     @classmethod

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/dual_staking_token/contract.yaml

@@ -4,11 +4,11 @@ version: 0.1.0
 type: contract
 description: Dual staking token contract
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeickx6ot3syhywbaewl3mmnowa75dd5rogqy7pmmc5ctk4yd74pvoa
   build/DualStakingToken.json: bafybeibvh3lcvo242jqtyrfrbezgziedlymjlr7bmttvezhgjjxlgklcxa
-  contract.py: bafybeiftspqmbq23cjifektsgwtxfcf7uaeywwdbsdvp67a7yi3wqc3pnm
+  contract.py: bafybeihkaxtx36c2yka2bzisj72zsmugbpyse2g7snq3shokjerr35rpse
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: DualStakingTokenContract

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/foreign_omnibridge/contract.yaml

@@ -4,7 +4,7 @@ version: 0.1.0
 type: contract
 description: ForeignOmnibridge
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeibsmumov3s36vfo24xp2niilcp3ywju2d4yqfadllyjncqtgtndly
   build/ForeignOmnibridge.json: bafybeibmcflt7w5p5szgii7glbtrvjahweclowz2k7e6qjq7yfbvszy6em

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/home_omnibridge/contract.py

@@ -50,7 +50,7 @@ class HomeOmnibridge(Contract):
         """Return the transaction hash of the matching TokensBridged event in the given block range."""
         ledger_api = cast(EthereumApi, ledger_api)
         event_signature = "TokensBridged(address,address,uint256,bytes32)"
-        event_signature_hash = Web3.keccak(text=event_signature).hex()
+        event_signature_hash = Web3.keccak(text=event_signature).to_0x_hex()
 
         topics = [
             event_signature_hash,  # TokensBridged
@@ -75,6 +75,6 @@ class HomeOmnibridge(Contract):
         for log in logs:
             decoded = eth_abi.decode(non_indexed_types, log["data"])
             if all(a == b for a, b in zip(decoded, non_indexed_values)):
-                return log["transactionHash"].hex()
+                return log["transactionHash"].to_0x_hex()
 
         return None

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/home_omnibridge/contract.yaml

@@ -4,11 +4,11 @@ version: 0.1.0
 type: contract
 description: HomeOmnibridge
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeigrlrmwk3dhnoe4o5ovygtmudik7ybhsx2etqqjpvdi65rtlfpuhe
   build/HomeOmnibridge.json: bafybeihm4ff4mhoca2iwcogg5srqe2x6p674uxxc3v5dcci4emxfgc7qpm
-  contract.py: bafybeifitn7z4oqvycixw56lvrzvifydqyhwtph3nlaivzcm22ogn4rmfq
+  contract.py: bafybeickvhwco3ccqfe3usnzvvxayvbpuhv2aoiryroehqqpfylap7h2f4
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: HomeOmnibridge

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/l1_standard_bridge/contract.yaml

@@ -4,7 +4,7 @@ version: 0.1.0
 type: contract
 description: Optimism L1 Standard Bridge
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeifsbxn6hlccnpgqnpvaz3ph6ajl4is4mcyerr6aqp7heggagcphye
   build/L1StandardBridge.json: bafybeidq6jt7zmedtuxbbyggiqhu7w6543bunyd2vrbibg6y2svxsi2q5m

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/l2_standard_bridge/contract.py

@@ -50,7 +50,7 @@ class L2StandardBridge(Contract):
         """Return the transaction hash of the matching ETHBridgeFinalized event in the given block range."""
         ledger_api = cast(EthereumApi, ledger_api)
         event_signature = "ETHBridgeFinalized(address,address,uint256,bytes)"
-        event_signature_hash = Web3.keccak(text=event_signature).hex()
+        event_signature_hash = Web3.keccak(text=event_signature).to_0x_hex()
 
         topics = [
             event_signature_hash,  # ETHBridgeFinalized
@@ -75,7 +75,7 @@ class L2StandardBridge(Contract):
         for log in logs:
             decoded = eth_abi.decode(non_indexed_types, log["data"])
             if all(a == b for a, b in zip(decoded, non_indexed_values)):
-                return log["transactionHash"].hex()
+                return log["transactionHash"].to_0x_hex()
 
         return None
 
@@ -98,7 +98,7 @@ class L2StandardBridge(Contract):
         event_signature = (
             "ERC20BridgeFinalized(address,address,address,address,uint256,bytes)"
         )
-        event_signature_hash = Web3.keccak(text=event_signature).hex()
+        event_signature_hash = Web3.keccak(text=event_signature).to_0x_hex()
 
         topics = [
             event_signature_hash,  # ERC20BridgeFinalized
@@ -125,6 +125,6 @@ class L2StandardBridge(Contract):
         for log in logs:
             decoded = eth_abi.decode(non_indexed_types, log["data"])
             if all(a == b for a, b in zip(decoded, non_indexed_values)):
-                return log["transactionHash"].hex()
+                return log["transactionHash"].to_0x_hex()
 
         return None

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/l2_standard_bridge/contract.yaml

@@ -4,11 +4,11 @@ version: 0.1.0
 type: contract
 description: Optimism L2 Standard Bridge
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeihp3ucqaxnuozotqcmvm6bjdds4rfbtr56sj7jeb6sbxlzikvtxyq
   build/L2StandardBridge.json: bafybeid2zqptx4awocztkhmifqsdnqrqcib73hbsp53snmfd24u7k3q6me
-  contract.py: bafybeifah3y4wr4mkqdu4yuv364gxssdybuqf32wcszvrgwc33lucrjdw4
+  contract.py: bafybeiehyezv2ijyt5onme6ttbp5bmncarcoktsk3f3qxwmedjbhknjifi
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: L2StandardBridge

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/mech_activity/contract.yaml

@@ -4,7 +4,7 @@ version: 0.1.0
 type: contract
 description: Mech activity checker contract
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeid4hg5rx75ltdjmekmxdddwqzbvblygmvlhws5samjxfirnkp666i
   build/MechActivity.json: bafybeiagrufcoljrlo2zklc7kxwh7eyrf67usos2bqnf7hss47hgm6low4

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/optimism_mintable_erc20/contract.yaml

@@ -4,7 +4,7 @@ version: 0.1.0
 type: contract
 description: Optimism Mintable ERC20
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeiffqotbwpjde3htgfuplg62x4btoekvitqrkrlx2vkjpciwzov6sy
   build/OptimismMintableERC20.json: bafybeieuzn55dh5zlg4ygtuifqso6hwbhsjvidxkjkh2vnah5psxqup62i

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/recovery_module/contract.yaml

@@ -4,7 +4,7 @@ version: 0.1.0
 type: contract
 description: Recovery module
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeicjlkmxs5ikpgdtgndifstpmmpaixwcbgouvmt6gowuhf5dy3dpgu
   build/RecoveryModule.json: bafybeifsyjdbprcp4kxpijlpqfovxcf7cv2ujapt3d5zn34wby26ldv4ky

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/requester_activity_checker/contract.yaml

@@ -4,7 +4,7 @@ version: 0.1.0
 type: contract
 description: Requester activity checker contract
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeihibyzldqy5ecqvxdhnpejol5hkophsu53slyfmtpobts55zvyoba
   build/RequesterActivityChecker.json: bafybeiaaklcnrqr3tmxq3vdf3hqqbodknqaa2xfx7ltnp22bcjcfaj2yku

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/staking_token/contract.py

@@ -53,7 +53,7 @@ class StakingTokenContract(Contract):
     ) -> JSONLike:
         """Build stake tx."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("stake", args=[service_id])
+        data = contract_instance.encode_abi("stake", args=[service_id])
         return dict(data=bytes.fromhex(data[2:]))
 
     @classmethod
@@ -64,7 +64,7 @@ class StakingTokenContract(Contract):
     ) -> JSONLike:
         """Build checkpoint tx."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("checkpoint")
+        data = contract_instance.encode_abi("checkpoint")
         return dict(data=bytes.fromhex(data[2:]))
 
     @classmethod
@@ -76,7 +76,7 @@ class StakingTokenContract(Contract):
     ) -> JSONLike:
         """Build unstake tx."""
         contract_instance = cls.get_instance(ledger_api, contract_address)
-        data = contract_instance.encodeABI("unstake", args=[service_id])
+        data = contract_instance.encode_abi("unstake", args=[service_id])
         return dict(data=bytes.fromhex(data[2:]))
 
     @classmethod

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/staking_token/contract.yaml

@@ -4,11 +4,11 @@ version: 0.1.0
 type: contract
 description: Service staking token contract
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeicmgkagyhgwn2ktcdjbprijalbdyj26cvza4d3b7uvmehvy4mmr3i
   build/StakingToken.json: bafybeibhcwyawq377innrpq4ytpw5kotufjqo7cyd2rjhyit34mnbks5b4
-  contract.py: bafybeigjt7a2biiorp4vmj4d3qkm3xbbohnawoetywojye5akhavlvkrxm
+  contract.py: bafybeickf3qfsscyieceoxxjoqkmecymkgkeqnarmcblprsowvubbqf7am
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: StakingTokenContract

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/uniswap_v2_erc20/contract.yaml

@@ -4,13 +4,13 @@ version: 0.1.0
 type: contract
 description: Uniswap V2 ERC20 contract
 license: Apache-2.0
-aea_version: '>=1.0.0, <2.0.0'
+aea_version: '>=2.0.0, <3.0.0'
 fingerprint:
   __init__.py: bafybeia75xbvf6zogcloppdcu2zrwcl6d46ebj2zmm6dkge6eno3k6ysw4
   build/IUniswapV2ERC20.json: bafybeid45gy6x5ah5ub5p2obdhph36skpoy5qdhikwwfso7f3655iqnpc4
-  contract.py: bafybeidxnb72n5xz4fvvxogbk2xk2vz4jvtsqa3berolr34v7cug3snism
+  contract.py: bafybeiarfpumhdmxh24xuiv6jprjq5f6qlrfrlxisz5enbvvbhotafp37e
   tests/__init__.py: bafybeigj3ngmfmyy4nw4xipxbqnx4nd42aqidqmmduwpx6hurssjqqkirq
-  tests/test_contract.py: bafybeigaf7kyhuy4qn5dww2r62hffhytab3uhmjummsaiazzvqetvomyi4
+  tests/test_contract.py: bafybeic6ttl2zbcr5tfrfw6mwdumjw7lwjdy5pgeafacp6ch2sxstwd3lm
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: UniswapV2ERC20Contract

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/data/contracts/uniswap_v2_erc20/tests/test_contract.py

@@ -68,7 +68,7 @@ class TestUniswapV2ERC20Contract(BaseContractTestCase):
         approval_value = 100
         data = self.contract.get_instance(
             self.ledger_api, self.contract_address
-        ).encodeABI(fn_name="approve", args=[spender_address, approval_value])
+        ).encode_abi(abi_element_identifier="approve", args=[spender_address, approval_value])
         with mock.patch.object(
             self.ledger_api.api.eth, "get_transaction_count", return_value=NONCE
         ):
@@ -102,7 +102,7 @@ class TestUniswapV2ERC20Contract(BaseContractTestCase):
         value = 100
         data = self.contract.get_instance(
             self.ledger_api, self.contract_address
-        ).encodeABI(fn_name="transfer", args=[spender_address, value])
+        ).encode_abi(abi_element_identifier="transfer", args=[spender_address, value])
         with mock.patch.object(
             self.ledger_api.api.eth, "get_transaction_count", return_value=NONCE
         ):
@@ -137,7 +137,7 @@ class TestUniswapV2ERC20Contract(BaseContractTestCase):
         value = 100
         data = self.contract.get_instance(
             self.ledger_api, self.contract_address
-        ).encodeABI(fn_name="transferFrom", args=[from_address, to_address, value])
+        ).encode_abi(abi_element_identifier="transferFrom", args=[from_address, to_address, value])
         with mock.patch.object(
             self.ledger_api.api.eth, "get_transaction_count", return_value=NONCE
         ):
@@ -177,8 +177,8 @@ class TestUniswapV2ERC20Contract(BaseContractTestCase):
         s = b""
         data = self.contract.get_instance(
             self.ledger_api, self.contract_address
-        ).encodeABI(
-            fn_name="permit",
+        ).encode_abi(
+            abi_element_identifier="permit",
             args=[owner_address, spender_address, value, deadline, v, r, s],
         )
         with mock.patch.object(

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/keys.py

@@ -144,9 +144,11 @@ class KeysManager:
         key = Key(
             ledger=LedgerType.ETHEREUM,
             address=crypto.address,
-            private_key=crypto.encrypt(password=self.password)
-            if self.password is not None
-            else crypto.private_key,
+            private_key=(
+                crypto.encrypt(password=self.password)
+                if self.password is not None
+                else crypto.private_key
+            ),
         )
         for path in (
             self.path / f"{crypto.address}.bak",

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/ledger/__init__.py

@@ -27,7 +27,6 @@ from math import ceil
 from aea.crypto.base import LedgerApi
 from aea.crypto.registries import make_ledger_api
 from aea_ledger_ethereum import DEFAULT_GAS_PRICE_STRATEGIES, EIP1559, GWEI, to_wei
-from web3.middleware import geth_poa_middleware
 
 from operate.operate_types import Chain
 
@@ -133,12 +132,9 @@ def make_chain_ledger_api(
         address=rpc or get_default_rpc(chain=chain),
         chain_id=chain.id,
         gas_price_strategies=gas_price_strategies,
-        poa_chain=chain == Chain.POLYGON,
+        poa_chain=chain in (Chain.OPTIMISM, Chain.POLYGON),
     )
 
-    if chain == Chain.OPTIMISM:
-        ledger_api.api.middleware_onion.inject(geth_poa_middleware, layer=0)
-
     return ledger_api
 
 
@@ -183,7 +179,6 @@ def update_tx_with_gas_pricing(tx: t.Dict, ledger_api: LedgerApi) -> None:
 # TODO This gas management should be done at a lower level in the library
 def update_tx_with_gas_estimate(tx: t.Dict, ledger_api: LedgerApi) -> None:
     """Update transaction with gas estimate."""
-    print(f"[LEDGER] Trying to update transaction gas {tx['from']=} {tx['gas']=}.")
     original_from = tx["from"]
     original_gas = tx.get("gas", 1)
 
@@ -192,7 +187,6 @@ def update_tx_with_gas_estimate(tx: t.Dict, ledger_api: LedgerApi) -> None:
         tx["gas"] = 1
         ledger_api.update_with_gas_estimate(tx)
         if tx["gas"] > 1:
-            print(f"[LEDGER] Gas estimated successfully {tx['from']=} {tx['gas']=}.")
             break
 
     tx["from"] = original_from

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/ledger/profiles.py

@@ -46,7 +46,6 @@ for _chain in CHAINS:
                 "service_registry_token_utility": profile[
                     "service_registry_token_utility"
                 ],
-                "service_manager": profile["service_manager_token"],
                 "gnosis_safe_proxy_factory": profile["gnosis_safe_proxy_factory"],
                 "gnosis_safe_same_address_multisig": profile[
                     "gnosis_safe_same_address_multisig"

{olas_operate_middleware-0.13.2 → olas_operate_middleware-0.13.3}/operate/operate_http/__init__.py

@@ -32,8 +32,6 @@ from starlette.types import Receive, Scope, Send
 from operate.operate_http.exceptions import NotAllowed, ResourceException
 
 
-# pylint: disable=no-self-use
-
 GenericResource = t.TypeVar("GenericResource")
 PostPayload = t.TypeVar("PostPayload")
 PostResponse = t.TypeVar("PostResponse")