diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml index 3f6c517dbd..df10c253e7 100644 --- a/packages/fetchai/skills/erc1155_client/skill.yaml +++ b/packages/fetchai/skills/erc1155_client/skill.yaml @@ -21,7 +21,7 @@ fingerprint: tests/test_strategy.py: bafybeicbxie3v6vue3gcnru6vsvggcgy3shxwrldis5gppizbuhooslcqa fingerprint_ignore_patterns: [] connections: -- valory/ledger:0.19.0:bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu +- valory/ledger:0.19.0:bafybeidphjapndobkcgoq7swwroeumkfzpz5ap4xqbdvyg6kgfb655bwtm contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml index dd6bcc8f05..c06a246242 100644 --- a/packages/fetchai/skills/erc1155_deploy/skill.yaml +++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml @@ -21,7 +21,7 @@ fingerprint: tests/test_strategy.py: bafybeigxtw2j2c7vl6xhdwos62jbtmx62xfgdyadptm5eewmkesmcooyea fingerprint_ignore_patterns: [] connections: -- valory/ledger:0.19.0:bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu +- valory/ledger:0.19.0:bafybeidphjapndobkcgoq7swwroeumkfzpz5ap4xqbdvyg6kgfb655bwtm contracts: - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4 protocols: diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml index f49861c484..9d17fbf437 100644 --- a/packages/fetchai/skills/generic_buyer/skill.yaml +++ b/packages/fetchai/skills/generic_buyer/skill.yaml @@ -19,7 +19,7 @@ fingerprint: tests/test_models.py: bafybeibh72j3n72yseqvmpppucpu5wtidf6ebxbxkfnmrnlh4zv5y5apei fingerprint_ignore_patterns: [] connections: -- valory/ledger:0.19.0:bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu +- valory/ledger:0.19.0:bafybeidphjapndobkcgoq7swwroeumkfzpz5ap4xqbdvyg6kgfb655bwtm contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml index b1420a35f2..7e29e64c3a 100644 --- a/packages/fetchai/skills/generic_seller/skill.yaml +++ b/packages/fetchai/skills/generic_seller/skill.yaml @@ -20,7 +20,7 @@ fingerprint: tests/test_models.py: bafybeihabrc22zqssit3fmqhxptosy6qz6mx65ukhf5iayvirfv42xrhoq fingerprint_ignore_patterns: [] connections: -- valory/ledger:0.19.0:bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu +- valory/ledger:0.19.0:bafybeidphjapndobkcgoq7swwroeumkfzpz5ap4xqbdvyg6kgfb655bwtm contracts: [] protocols: - fetchai/default:1.0.0:bafybeihdvtmnz7fzy7kwi3wlo6rfl27f6q3g5entplgvq7y23i3v5uoz24 diff --git a/packages/packages.json b/packages/packages.json index 01ea3c0cfb..755f96183d 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -14,7 +14,7 @@ "contract/fetchai/erc1155/0.22.0": "bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4", "connection/fetchai/gym/0.19.0": "bafybeicqqvl4tt3qbulnkoffciagmfd6p3hxxi3i2mrrqtnbycv757pn6y", "connection/fetchai/stub/0.21.0": "bafybeibybboiwgklfiqpkkcw6rwj65s5jalzfzf6mh6fstxdlt6habzwvy", - "connection/valory/ledger/0.19.0": "bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu", + "connection/valory/ledger/0.19.0": "bafybeidphjapndobkcgoq7swwroeumkfzpz5ap4xqbdvyg6kgfb655bwtm", "connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m", "connection/valory/p2p_libp2p/0.1.0": "bafybeic2u7azbwjny2nhaltqnbohlvysx3x6ectzbege7sxwrbzcz4lcma", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e", @@ -26,12 +26,12 @@ "skill/fetchai/error_test_skill/0.1.0": "bafybeihsbtlpe7h6fsvoxban5rilkmwviwkokul5cqym6atoolirontiyu", "skill/fetchai/gym/0.20.0": "bafybeie7y2fsxfuhsqxqcaluo5exskmrm5q3a6e2hfcskcuvzvxjjhijh4", "skill/fetchai/http_echo/0.20.0": "bafybeicfiri2juaqh3azeit3z3rf44kgxdo6oj4lgxjgvnowq6m7j47qrm", - "skill/fetchai/erc1155_client/0.28.0": "bafybeigwh2lnnvaimjhrf6eibhy7wohfokvkwoabjr5t2vhyrzqmlu4tg4", - "skill/fetchai/erc1155_deploy/0.30.0": "bafybeiepibtz2uioupucjtmo4n6dyxnx2m26bausegojmw6su6mtjxkvpe", + "skill/fetchai/erc1155_client/0.28.0": "bafybeierh232oqd3zs7lpuald4ouusjrohf6wz2k4y2edk3nrgkp37y6ye", + "skill/fetchai/erc1155_deploy/0.30.0": "bafybeia7bufb3sil6pqogextbcjq7zudm6dqpvsynytuwzml5k7mm3fasi", "skill/fetchai/error/0.17.0": "bafybeicboomvykqhel3otyv4qg5t3hzpo6kmn5bk4ljluithhuieu7flsm", "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeidgso7lo5ay44mbxsp3lxilrgeek3ye44e6wus2ayq6kyxfvc3vjm", - "skill/fetchai/generic_buyer/0.26.0": "bafybeidnlxecybia3nkvakemei74z7vnuszql4pmne5xiuxypjmklb27ei", - "skill/fetchai/generic_seller/0.27.0": "bafybeihs37oub5qnwybyrkfxlqnjbjcfjqfwtwmdogtsbexo3nguhdsnc4", + "skill/fetchai/generic_buyer/0.26.0": "bafybeiaqa4esiwtru3t2xfgicwa4vdds4ol5mpgwq6v5kpyv2jptffz6lm", + "skill/fetchai/generic_seller/0.27.0": "bafybeia6lnprzuc2xinxrfzfoufasltwdxs5qb2nh7cvoq75i4evr3g56i", "skill/fetchai/task_test_skill/0.1.0": "bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble", "agent/fetchai/error_test/0.1.0": "bafybeiecm675ndzbh35jkejtxn4ughoutztltjhgwzfbp57okabedjmnpq", "agent/fetchai/gym_aea/0.25.0": "bafybeibzn3qomqmkaksgpd3gn6aijffvvw7rojswhoytiovohuc737fvfm", diff --git a/packages/valory/connections/ledger/connection.yaml b/packages/valory/connections/ledger/connection.yaml index 4c7b71d915..7ec1057c3d 100644 --- a/packages/valory/connections/ledger/connection.yaml +++ b/packages/valory/connections/ledger/connection.yaml @@ -104,6 +104,13 @@ config: gas_price_strategies: *id001 is_gas_estimation_enabled: true poa_chain: true + optimism: + address: http://127.0.0.1:8545 + chain_id: 10 + default_gas_price_strategy: eip1559 + gas_price_strategies: *id001 + is_gas_estimation_enabled: true + poa_chain: false retry_attempts: 240 retry_timeout: 3 excluded_protocols: [] diff --git a/tox.ini b/tox.ini index e28107fbc1..8a286a8c86 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ envlist = bandit, safety, black, black-check, isort, isort-check, fix-copyright, skip_missing_interpreters = true [packages-deps] -deps = +deps = gym==0.15.6 aiohttp<4.0.0,>=3.8.5 gym==0.15.6 @@ -60,9 +60,9 @@ deps = construct<=2.10.61 defusedxml==0.6.0 semver<3.0.0,>=2.9.1 - + [extra-deps] -deps = +deps = memory-profiler==0.57.0 multidict pytest-asyncio @@ -78,7 +78,7 @@ deps = setuptools==59.6.0 [commands-local-install] -commands = +commands = pip install {toxinidir}[all] python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-ethereum python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-cosmos @@ -87,7 +87,7 @@ commands = [test-framework] -deps = +deps = {[tests-common]deps} commands = ; for some reason tox installs aea without respect to the dependencies version specified in seetup.py. at least in CI env @@ -96,7 +96,7 @@ commands = pytest -rfE --doctest-modules aea tests/ --durations=0 --cov=aea --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov-config=.coveragerc --cov-append {posargs} [test-packages] -deps = +deps = {[tests-common]deps} commands = ; for some reason tox installs aea without respect to the dependencies version specified in setup.py. at least in CI env @@ -105,7 +105,7 @@ commands = aea test --cov --append packages --durations=0 {posargs} [test-plugins] -deps = +deps = {[tests-common]deps} pytest-custom-exit-code==0.3.0 hexbytes==0.3.0 @@ -115,7 +115,7 @@ commands = pytest -rfE plugins/aea-ledger-ethereum/tests --durations=0 --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_ethereum --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} pytest -rfE plugins/aea-ledger-cosmos/tests --durations=0 --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_cosmos --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} pytest -rfE plugins/aea-cli-ipfs/tests --durations=0 --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_cli_ipfs --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} - + python -m pip install --no-deps file://{toxinidir}/plugins/aea-ledger-ethereum-hwi pytest -rfE plugins/aea-ledger-ethereum-hwi/tests --durations=0 --cov-report=html --cov-report=xml --cov-report=term --cov-report=term-missing --cov=aea_ledger_ethereum_hwi --cov-config=.coveragerc --suppress-no-test-exit-code --cov-append {posargs} @@ -158,7 +158,7 @@ usedevelop = True deps = {[test-plugins-lte-3.9]deps} commands = {[test-plugins-lte-3.9]commands} ; Since the ledgerwallet still uses protobufs compiled using protoc<=3.20 -setenv = +setenv = PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python [testenv:py3.11] @@ -178,7 +178,7 @@ usedevelop = True deps = {[test-plugins-lte-3.9]deps} commands = {[test-plugins-lte-3.9]commands} ; Since the ledgerwallet still uses protobufs compiled using protoc<=3.20 -setenv = +setenv = PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python [testenv:bandit] @@ -265,7 +265,7 @@ commands = {toxinidir}/scripts/check_package_versions_in_docs.py [testenv:package-dependencies-checks] skipsdist = True usedevelop = True -deps = +deps = {[testenv]deps} {[packages-deps]deps} commands = @@ -338,7 +338,7 @@ skipsdist = True skip_install = True deps = tomte[safety]==0.2.13 -commands = safety check -i 37524 -i 38038 -i 37776 -i 38039 -i 39621 -i 40291 -i 39706 -i 51358 -i 51499 -i 67599 +commands = safety check -i 37524 -i 38038 -i 37776 -i 38039 -i 39621 -i 40291 -i 39706 -i 51358 -i 51499 -i 67599 -i 70612 [testenv:vulture] skipsdist = True @@ -444,12 +444,12 @@ commands = {[test-packages]commands} [testenv:plugins-py3.8] basepython = python3.8 -deps = +deps = {[testenv_multi]deps} pytest-custom-exit-code==0.3.0 commands = {[test-plugins]commands} ; Since the ledgerwallet still uses protobufs compiled using protoc<=3.20 -setenv = +setenv = PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python [testenv:plugins-py3.9] @@ -457,7 +457,7 @@ basepython = python3.9 deps = {[test-plugins-lte-3.9]deps} commands = {[test-plugins-lte-3.9]commands} ; Since the ledgerwallet still uses protobufs compiled using protoc<=3.20 -setenv = +setenv = PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python [testenv:check-api-docs]