Merge pull request #685 from valory-xyz/fix/ledger-connection

Release `1.41.0.post1`

.spelling

@@ -378,4 +378,5 @@ cosmpy
 tomte
 pyyaml
 1.36.0
-1.39.0.post1
+1.39.0.post1
+1.41.0.post1

HISTORY.md

@@ -1,7 +1,12 @@
 # Release History - open AEA
 
 
-## 1.40.0 (2023-09-26)
+## 1.41.0.post1 (2023-10-23)
+
+Packages:
+- Use `kwargs.pop` instead of `kwargs.get` to avoid extra argument error on ledger connection
+
+## 1.41.0 (2023-10-10)
 
 AEA:
 - Fixes the source repository validation regex

Pipfile

@@ -38,7 +38,7 @@ pytest-custom-exit-code = "==0.3.0"
 GitPython = "==3.1.27"
 requests = "==2.28.1"
 idna = "<=3.3"
-open-aea-cosmpy = "==0.6.6"
+open-aea-cosmpy = "==0.6.7"
 web3 = ">=6.0.0,<7"
 semver = "<3.0.0,>=2.9.1"
 py-multibase = ">=1.0.0"

aea/__version__.py

@@ -23,7 +23,7 @@
 __title__ = "open-aea"
 __description__ = "Open Autonomous Economic Agent framework (without vendor lock-in)"
 __url__ = "https://github.com/valory-xyz/open-aea.git"
-__version__ = "1.41.0"
+__version__ = "1.41.0.post1"
 __author__ = "Valory AG"
 __license__ = "Apache-2.0"
 __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited"

deploy-image/Dockerfile

@@ -16,7 +16,7 @@ RUN apk add --no-cache go
 
 # aea installation
 RUN pip install --upgrade pip
-RUN pip install --upgrade --force-reinstall open-aea[all]==1.41.0 "open-aea-cli-ipfs<2.0.0,>=1.41.0"
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.41.0.post1 "open-aea-cli-ipfs<2.0.0,>=1.41.0.post1"
 
 # directories and aea cli config
 WORKDIR /home/agents

deploy-image/README.md

@@ -11,7 +11,7 @@ The example uses the `fetchai/my_first_aea` project. You will likely want to mod
 Install subversion, then download the example directory to your local working directory
 
 ``` bash
-svn checkout https://github.com/valory-xyz/open-aea/tags/v1.41.0/packages packages
+svn checkout https://github.com/valory-xyz/open-aea/tags/v1.41.0.post1/packages packages
 ```
 
 ### Modify scripts

develop-image/docker-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=valory/open-aea-develop:1.41.0
+DOCKER_IMAGE_TAG=valory/open-aea-develop:1.41.0.post1
 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..

docs/upgrading.md

@@ -9,6 +9,10 @@ Below we describe the additional manual steps required to upgrade between differ
 
 ### Upgrade guide
 
+## `v1.41.0` to `v1.41.0.post1`
+
+- No backwards incompatible changes
+
 ## `v1.40.0` to `v1.41.0`
 
 - The way the dependencies will be selected for installation when running `aea install` has changed. Before this version, the versions were being merging all of the versions for a python package and using the most compatible version specifier possible. With this release, this behaviour will be replaced by overriding the dependencies in the following order `extra dependencies provided by flag > agent > skill > connection > contract > protocol` what this means is, let's say you have 3 packages with a same python package as a dependency

examples/tac_deploy/Dockerfile

@@ -19,7 +19,7 @@ RUN apk add --no-cache go
 
 # aea installation
 RUN python -m pip install --upgrade pip
-RUN pip install --upgrade --force-reinstall open-aea[all]==1.41.0
+RUN pip install --upgrade --force-reinstall open-aea[all]==1.41.0.post1
 
 # directories and aea cli config
 COPY /.aea /home/.aea

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:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu
+- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

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:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu
+- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm
 contracts:
 - fetchai/erc1155:0.22.0:bafybeiff7a6xncyad53o2r7lekpnhexcspze6ocy55xtpzqeuacnlpunm4
 protocols:

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:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu
+- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeibtqp56jkijwjsohk4z5vqp6pfkiexmnmk5uleteotbsgrypy6gxm

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:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu
+- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm
 contracts: []
 protocols:
 - fetchai/default:1.0.0:bafybeibtqp56jkijwjsohk4z5vqp6pfkiexmnmk5uleteotbsgrypy6gxm

packages/packages.json

@@ -8,7 +8,7 @@
         "protocol/valory/http/1.0.0": "bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe",
         "protocol/valory/ledger_api/1.0.0": "bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru",
         "connection/fetchai/stub/0.21.0": "bafybeictgpdqbpyppmoxn2g7jkaxvulihew7zaszv4xyhgvsntq7tqs7wi",
-        "connection/valory/ledger/0.19.0": "bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu",
+        "connection/valory/ledger/0.19.0": "bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm",
         "connection/valory/http_server/0.22.0": "bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom",
         "connection/valory/p2p_libp2p/0.1.0": "bafybeiaykya7tvir7k5scovjzuagpfcftvptxoi2od5qqqvukwglsrrtzy",
         "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq",
@@ -32,12 +32,12 @@
         "connection/valory/http_client/0.23.0": "bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny",
         "connection/valory/test_libp2p/0.1.0": "bafybeih4vz7pprbjhe5g4tnf52ttkooii66woxbhifjc7wk5xdt6b6asiu",
         "protocol/fetchai/tac/1.0.0": "bafybeiaukfwe7wbpikztprlmrfpphsxqpdzgamkbhvqyz54tl3k73kzsvi",
-        "skill/fetchai/erc1155_client/0.28.0": "bafybeibffkywiuz5gwm6yn4v2fhkz35i77zl5ya4tzq4wksvga2mvkeojm",
-        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeif6dmam4pvsdesvgb6n3ga4uf7dxikaynbqomxpswmhqlvcuz7vti",
+        "skill/fetchai/erc1155_client/0.28.0": "bafybeid3npgiuvgjyocxtxl6ovihrnicd5ezlim4aq4ytl3atnm5yywxmu",
+        "skill/fetchai/erc1155_deploy/0.30.0": "bafybeie2lqwsqgpv35uy7nztohtukvogntsxqi74x37qsbsx7drgeajtau",
         "skill/fetchai/error/0.17.0": "bafybeignei6feootyjzrqdt5j5yx7r4nrzuy6tdgdgsmrncldt5bud2dri",
         "skill/fetchai/fipa_dummy_buyer/0.2.0": "bafybeid7rzqruvc3fkesueig2mbzy2qsfplieircyjzwbdl7c6q5eauiky",
-        "skill/fetchai/generic_buyer/0.26.0": "bafybeiebwhfzs7vbdrnm7cqu5dc4r3wqdaeirmps5pfwexjd3ms5ss7xk4",
-        "skill/fetchai/generic_seller/0.27.0": "bafybeiapnkdtn3qrh36cxpbhalv2yaunnauieo7sxori46a7ohsp7xuzlq",
+        "skill/fetchai/generic_buyer/0.26.0": "bafybeibiplanh6h2biy27wt26jnzwftfsji77ajp26hcule5q2acjq3fjy",
+        "skill/fetchai/generic_seller/0.27.0": "bafybeiboyk6q2sl6rdqvcksbg4gnfb766vpexrdcgjmxzm3kjmcsjnsvia",
         "skill/fetchai/task_test_skill/0.1.0": "bafybeidv77u2xl52mnxakwvh7fuh46aiwfpteyof4eaptfd4agoi6cdble"
     },
     "third_party": {}

packages/valory/connections/ledger/connection.yaml

@@ -10,8 +10,8 @@ fingerprint:
   __init__.py: bafybeia3purd7y4b7tkdt2fcaxkdazos32criq5hx6fhufaislrdefe674
   base.py: bafybeifuoq2oqlcjlgeg2fg5l2ijiylb23v65xghv7u422helief2cjjuy
   connection.py: bafybeicydkymhz2feqmihtkiwdfg7pp4pww2elqv4tijuhjcplyvawdk74
-  contract_dispatcher.py: bafybeifm5n2nh3z7cr47h2ejs4zu47s6uxliuvaacndxwt6sdcvbqwmpqa
-  ledger_dispatcher.py: bafybeigeziwsrriamjycjwu6qri2vervgbta7xkludnae2fzqqegwp6d5e
+  contract_dispatcher.py: bafybeidf2wu3rsp5pm45qwjlievbpmueeaj6hjw3kdyn67xhbocylwg3d4
+  ledger_dispatcher.py: bafybeicartiu3mcavtyd3eveonrbak3uaowqzymtaza6gqtoi5msid75ci
   tests/__init__.py: bafybeifku7ttsmbj4gfx6dkgjvwypx7v5ysfqlzof6vh4p7gujakjtuwhe
   tests/conftest.py: bafybeid7vo7e2m76ey5beeadtbxywxx5ukefd5slwbc362rwmhht6i45ou
   tests/test_contract_dispatcher.py: bafybeiag5lnpc7h25w23ash4hk4cowxsy5buxgpr474l3tfewnhf56eqyq

packages/valory/connections/ledger/contract_dispatcher.py

@@ -431,7 +431,7 @@ def get_chain_id(self, message: Message) -> str:
         kwargs = cast(JSONLike, message.kwargs.body)
         # if the chain id is specified in the message, use it.
         # otherwise, use the ledger id.
-        chain_id = cast(str, kwargs.get("chain_id", self.get_ledger_id(message)))
+        chain_id = cast(str, kwargs.pop("chain_id", self.get_ledger_id(message)))
         return chain_id
 
     def set_extra_kwargs(self, message: Message) -> None:

packages/valory/connections/ledger/ledger_dispatcher.py

@@ -470,5 +470,5 @@ def get_chain_id(self, message: Message) -> str:
             kwargs = cast(JSONLike, message.kwargs.body)
         # if the chain id is specified in the message, use it.
         # otherwise, use the ledger id.
-        chain_id = cast(str, kwargs.get("chain_id", self.get_ledger_id(message)))
+        chain_id = cast(str, kwargs.pop("chain_id", self.get_ledger_id(message)))
         return chain_id

plugins/aea-cli-benchmark/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-cli-benchmark",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="CLI extension for AEA framework benchmarking.",

plugins/aea-cli-ipfs/setup.py

@@ -28,7 +28,7 @@
 
 setup(
     name="open-aea-cli-ipfs",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="CLI extension for open AEA framework wrapping IPFS functionality.",

plugins/aea-ledger-cosmos/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-ledger-cosmos",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.",
@@ -43,7 +43,7 @@
         "ecdsa>=0.15,<0.17.0",
         "bech32==1.2.0",
         "pycryptodome>=3.10.1,<4.0.0",
-        "open-aea-cosmpy==0.6.6",
+        "open-aea-cosmpy==0.6.7",
     ],
     tests_require=["pytest"],
     entry_points={

plugins/aea-ledger-ethereum-flashbots/setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name="open-aea-ledger-ethereum-flashbots",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package extending the default open-aea ethereum ledger plugin to add support for flashbots.",
@@ -41,7 +41,7 @@
     },
     python_requires=">=3.9,<4.0",
     install_requires=[
-        "open-aea-ledger-ethereum~=1.41.0",
+        "open-aea-ledger-ethereum~=1.41.0.post1",
         "open-aea-flashbots==1.4.0",
     ],
     tests_require=["pytest"],

plugins/aea-ledger-ethereum-hwi/setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name="open-aea-ledger-ethereum-hwi",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and support for hardware wallet interactions.",
@@ -42,7 +42,7 @@
         "web3>=6.0.0,<7",
         "ipfshttpclient==0.8.0a2",
         "eth-account>=0.8.0,<0.9.0",
-        "open-aea-ledger-ethereum~=1.41.0",
+        "open-aea-ledger-ethereum~=1.41.0.post1",
         "ledgerwallet==0.1.3",
         "protobuf>=4.21.6,<5.0.0",
         "construct<=2.10.61",

plugins/aea-ledger-ethereum/setup.py

@@ -26,7 +26,7 @@
 
 setup(
     name="open-aea-ledger-ethereum",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of Ethereum.",

plugins/aea-ledger-fetchai/setup.py

@@ -31,7 +31,7 @@
 
 setup(
     name="open-aea-ledger-fetchai",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="Valory AG",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger API of Fetch.AI.",
@@ -44,7 +44,7 @@
             "test_tools/data/*",
         ]
     },
-    install_requires=["open-aea-ledger-cosmos~=1.41.0"],
+    install_requires=["open-aea-ledger-cosmos~=1.41.0.post1"],
     tests_require=["pytest"],
     entry_points={
         "aea.cryptos": ["fetchai = aea_ledger_fetchai:FetchAICrypto"],

plugins/aea-ledger-solana/setup.py

@@ -25,7 +25,7 @@
 
 setup(
     name="open-aea-ledger-solana",
-    version="1.41.0",
+    version="1.41.0.post1",
     author="dassy23",
     license="Apache-2.0",
     description="Python package wrapping the public and private key cryptography and ledger api of solana.",

scripts/install.ps1

@@ -34,7 +34,7 @@ function instal_choco_golang_gcc {
 }
 function install_aea {
 	echo "Install aea"
-    $output=pip install open-aea[all]==1.41.0 --force --no-cache-dir 2>&1 |out-string;
+    $output=pip install open-aea[all]==1.41.0.post1 --force --no-cache-dir 2>&1 |out-string;
     if ($LastExitCode -ne 0) {
         echo $output
         echo "AEA install failed!"

scripts/install.sh

@@ -42,7 +42,7 @@ function is_python_version_ok() {
 
 function install_aea (){
 	echo "Install AEA"
-	output=$(pip3 install --user open-aea[all]==1.41.0 --force --no-cache-dir)
+	output=$(pip3 install --user open-aea[all]==1.41.0.post1 --force --no-cache-dir)
 	if [[  $? -ne 0 ]];
 	then
 		echo "$output"

skaffold.yaml

@@ -5,7 +5,7 @@ metadata:
 build:
   tagPolicy:
     envTemplate:
-      template: "1.41.0"
+      template: "1.41.0.post1"
   artifacts:
   - image: valory/open-aea-develop
     docker:
@@ -24,7 +24,7 @@ profiles:
     build:
       tagPolicy:
         envTemplate:
-          template: "1.41.0"
+          template: "1.41.0.post1"
       artifacts:
       - image: valory/open-aea-docs
         docker:

tox.ini

@@ -49,7 +49,7 @@ deps =
     eth-account>=0.8.0,<0.9.0
     ; for password encryption in cosmos
     pycryptodome>=3.10.1
-    open-aea-cosmpy==0.6.6
+    open-aea-cosmpy==0.6.7
     certifi<=2022.6.15.1
     google-api-python-client<=2.60.0
     idna<=3.3

user-image/Dockerfile

@@ -7,7 +7,7 @@ ENV LANG C.UTF-8
 RUN apt update && apt install -y python3.11-dev python3-pip -y && apt autoremove && apt autoclean
 
 RUN pip3 install --upgrade pip
-RUN pip3 install "open-aea[all]==1.41.0" open-aea-cli-ipfs==1.41.0
+RUN pip3 install "open-aea[all]==1.41.0.post1" open-aea-cli-ipfs==1.41.0.post1
 
 COPY user-image/openssl.cnf /etc/ssl
 

user-image/docker-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=valory/open-aea-user:1.41.0
+DOCKER_IMAGE_TAG=valory/open-aea-user:1.41.0.post1
 # DOCKER_IMAGE_TAG=valory/open-aea-user:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..