diff --git a/HISTORY.md b/HISTORY.md index b81cd98153..ba36d97887 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -12,7 +12,6 @@ Packages: Plugins: - Removes unused dependencies from `solana` plugin - Adds the new plugin the the `new_env` target on the `Makefile` -- Fixes dependency conflicts on the `solana` and the `hwi` plugins - Adds support for raising on a simulation failure on the `flashbots` plugin - Makes `recursive` and `wrap_with_directory` parameters configurable on the IPFS client - Attaches the plugin loggers to the correct namespace diff --git a/Pipfile b/Pipfile index b72bf5e58b..6ad0753c2e 100644 --- a/Pipfile +++ b/Pipfile @@ -50,7 +50,7 @@ tomte = {version = "==0.2.4", extras = ["tox", "tests"]} docspec = "==2.0.2" docspec-python = "==2.0.2" hexbytes = "==0.3.0" -apduboy = {git = "https://github.com/LedgerHQ/apduboy.git@d167f620430afeed313edc9fc1315d6d9c50234e"} +apduboy = ">=0.5.0" [packages] # we don't specify dependencies for the library here for intallation as per: https://pipenv-fork.readthedocs.io/en/latest/advanced.html#pipfile-vs-setuppy diff --git a/plugins/aea-ledger-ethereum-hwi/setup.py b/plugins/aea-ledger-ethereum-hwi/setup.py index 101c5fffba..1c44fd4bb4 100644 --- a/plugins/aea-ledger-ethereum-hwi/setup.py +++ b/plugins/aea-ledger-ethereum-hwi/setup.py @@ -43,7 +43,7 @@ "ipfshttpclient==0.8.0a2", "eth-account==0.5.6", "open-aea-ledger-ethereum~=1.32.0", - "apduboy @ git+https://github.com/LedgerHQ/apduboy.git@d167f620430afeed313edc9fc1315d6d9c50234e", + "apduboy>=0.5.0", "protobuf>=3.20,<4", ], tests_require=["pytest"], diff --git a/plugins/aea-ledger-solana/setup.py b/plugins/aea-ledger-solana/setup.py index 71c69ef88b..eb40d8de6e 100644 --- a/plugins/aea-ledger-solana/setup.py +++ b/plugins/aea-ledger-solana/setup.py @@ -35,11 +35,11 @@ package_data={}, install_requires=[ "open-aea>=1.0.0, <2.0.0", - "solders==0.14.0", "cryptography", "PyNaCl==1.5.0", - "anchorpy @ git+https://github.com/kevinheavey/anchorpy.git@a3cc292574679bae1610e01ab69161b6614bca92", - "solana==0.29.2", + "solana==0.28.1", + "solders==0.10.0", + "anchorpy==0.14.0", ], tests_require=["pytest"], entry_points={ diff --git a/tox.ini b/tox.ini index 58113abf08..d961e29075 100644 --- a/tox.ini +++ b/tox.ini @@ -58,7 +58,7 @@ deps = psutil==5.7.0 setuptools==59.6.0 protobuf>=3.20,<=3.20.1 - apduboy @ git+https://github.com/LedgerHQ/apduboy.git@d167f620430afeed313edc9fc1315d6d9c50234e + apduboy>=0.5.0 defusedxml==0.6.0 semver>=2.9.1,<3.0.0