From 49ae2d09810ea39eb09975fb044b5dbdd5b9e2d1 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Tue, 23 Jan 2024 12:38:46 +0530 Subject: [PATCH 1/4] feat: add ledger specifier when writing keys in a JSON file --- aea/cli/generate_key.py | 5 ++++- aea/configurations/constants.py | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/aea/cli/generate_key.py b/aea/cli/generate_key.py index 4281b770df..a52fcd96a1 100644 --- a/aea/cli/generate_key.py +++ b/aea/cli/generate_key.py @@ -29,6 +29,7 @@ from aea.cli.utils.decorators import _check_aea_project from aea.configurations.constants import ( ADDRESS, + LEDGER, MULTIKEY_FILENAME, PRIVATE_KEY, PRIVATE_KEY_PATH_SCHEMA, @@ -165,7 +166,9 @@ def _generate_multiple_keys( if password is not None else crypto.private_key ) - key_pairs.append({ADDRESS: crypto.address, PRIVATE_KEY: priv_key}) + key_pairs.append( + {ADDRESS: crypto.address, PRIVATE_KEY: priv_key, LEDGER: type_} + ) file = file or MULTIKEY_FILENAME if _can_write(file): diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py index ae5a14430f..9f14c0da32 100644 --- a/aea/configurations/constants.py +++ b/aea/configurations/constants.py @@ -37,6 +37,7 @@ MULTIKEY_FILENAME = "keys.json" PRIVATE_KEY = "private_key" ADDRESS = "address" +LEDGER = "ledger" DEFAULT_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(DEFAULT_LEDGER) DEFAULT_LICENSE = "Apache-2.0" DISTRIBUTED_PACKAGES: List[str] = [] From 128e768c985f310d73c23b0cf349ee6ebe3a026e Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Tue, 23 Jan 2024 12:43:17 +0530 Subject: [PATCH 2/4] fix: copyright --- aea/cli/generate_key.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aea/cli/generate_key.py b/aea/cli/generate_key.py index a52fcd96a1..e668544aae 100644 --- a/aea/cli/generate_key.py +++ b/aea/cli/generate_key.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2023 Valory AG +# Copyright 2021-2024 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); From 09173a44d8351169cb555a4ddbd617ab057091be Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Tue, 23 Jan 2024 12:46:24 +0530 Subject: [PATCH 3/4] feat: bump open-aea@v1.46.0 --- aea/__version__.py | 2 +- deploy-image/Dockerfile | 2 +- deploy-image/README.md | 2 +- develop-image/docker-env.sh | 2 +- examples/tac_deploy/Dockerfile | 2 +- plugins/aea-cli-benchmark/setup.py | 2 +- plugins/aea-cli-ipfs/setup.py | 2 +- plugins/aea-ledger-cosmos/setup.py | 2 +- plugins/aea-ledger-ethereum-flashbots/setup.py | 4 ++-- plugins/aea-ledger-ethereum-hwi/setup.py | 4 ++-- plugins/aea-ledger-ethereum/setup.py | 2 +- plugins/aea-ledger-fetchai/setup.py | 4 ++-- plugins/aea-ledger-solana/setup.py | 2 +- scripts/install.ps1 | 2 +- scripts/install.sh | 2 +- skaffold.yaml | 4 ++-- user-image/Dockerfile | 2 +- user-image/docker-env.sh | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aea/__version__.py b/aea/__version__.py index 7b7dd2f6ff..ae219f00f0 100644 --- a/aea/__version__.py +++ b/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.45.0" +__version__ = "1.46.0" __author__ = "Valory AG" __license__ = "Apache-2.0" __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited" diff --git a/deploy-image/Dockerfile b/deploy-image/Dockerfile index cb0cd6f75b..d7d9e385a8 100644 --- a/deploy-image/Dockerfile +++ b/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.45.0 "open-aea-cli-ipfs<2.0.0,>=1.45.0" +RUN pip install --upgrade --force-reinstall open-aea[all]==1.46.0 "open-aea-cli-ipfs<2.0.0,>=1.46.0" # directories and aea cli config WORKDIR /home/agents diff --git a/deploy-image/README.md b/deploy-image/README.md index d122742834..c22743fcb5 100644 --- a/deploy-image/README.md +++ b/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.45.0/packages packages +svn checkout https://github.com/valory-xyz/open-aea/tags/v1.46.0/packages packages ``` ### Modify scripts diff --git a/develop-image/docker-env.sh b/develop-image/docker-env.sh index 2edae04ed3..1511b4d4ed 100755 --- a/develop-image/docker-env.sh +++ b/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.45.0 +DOCKER_IMAGE_TAG=valory/open-aea-develop:1.46.0 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest DOCKER_BUILD_CONTEXT_DIR=.. diff --git a/examples/tac_deploy/Dockerfile b/examples/tac_deploy/Dockerfile index 63091aaff6..c0e91440c4 100644 --- a/examples/tac_deploy/Dockerfile +++ b/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.45.0 +RUN pip install --upgrade --force-reinstall open-aea[all]==1.46.0 # directories and aea cli config COPY /.aea /home/.aea diff --git a/plugins/aea-cli-benchmark/setup.py b/plugins/aea-cli-benchmark/setup.py index c24756c11c..e088c13fdb 100755 --- a/plugins/aea-cli-benchmark/setup.py +++ b/plugins/aea-cli-benchmark/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-cli-benchmark", - version="1.45.0", + version="1.46.0", author="Valory AG", license="Apache-2.0", description="CLI extension for AEA framework benchmarking.", diff --git a/plugins/aea-cli-ipfs/setup.py b/plugins/aea-cli-ipfs/setup.py index 61835c8b63..c724a03035 100755 --- a/plugins/aea-cli-ipfs/setup.py +++ b/plugins/aea-cli-ipfs/setup.py @@ -28,7 +28,7 @@ setup( name="open-aea-cli-ipfs", - version="1.45.0", + version="1.46.0", author="Valory AG", license="Apache-2.0", description="CLI extension for open AEA framework wrapping IPFS functionality.", diff --git a/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py index 0de0ebbb48..ba979fcd2d 100644 --- a/plugins/aea-ledger-cosmos/setup.py +++ b/plugins/aea-ledger-cosmos/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-ledger-cosmos", - version="1.45.0", + version="1.46.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.", diff --git a/plugins/aea-ledger-ethereum-flashbots/setup.py b/plugins/aea-ledger-ethereum-flashbots/setup.py index 9d840caace..b159170fc3 100644 --- a/plugins/aea-ledger-ethereum-flashbots/setup.py +++ b/plugins/aea-ledger-ethereum-flashbots/setup.py @@ -25,7 +25,7 @@ setup( name="open-aea-ledger-ethereum-flashbots", - version="1.45.0", + version="1.46.0", 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.45.0", + "open-aea-ledger-ethereum~=1.46.0", "open-aea-flashbots==1.4.0", ], tests_require=["pytest"], diff --git a/plugins/aea-ledger-ethereum-hwi/setup.py b/plugins/aea-ledger-ethereum-hwi/setup.py index 9495427b23..57e908a8fc 100644 --- a/plugins/aea-ledger-ethereum-hwi/setup.py +++ b/plugins/aea-ledger-ethereum-hwi/setup.py @@ -25,7 +25,7 @@ setup( name="open-aea-ledger-ethereum-hwi", - version="1.45.0", + version="1.46.0", 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.45.0", + "open-aea-ledger-ethereum~=1.46.0", "ledgerwallet==0.1.3", "protobuf<4.25.0,>=4.21.6", "construct<=2.10.61", diff --git a/plugins/aea-ledger-ethereum/setup.py b/plugins/aea-ledger-ethereum/setup.py index e7760468d9..4c0de87d25 100644 --- a/plugins/aea-ledger-ethereum/setup.py +++ b/plugins/aea-ledger-ethereum/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-ledger-ethereum", - version="1.45.0", + version="1.46.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Ethereum.", diff --git a/plugins/aea-ledger-fetchai/setup.py b/plugins/aea-ledger-fetchai/setup.py index 00e7ce85f4..ac82ce9367 100644 --- a/plugins/aea-ledger-fetchai/setup.py +++ b/plugins/aea-ledger-fetchai/setup.py @@ -31,7 +31,7 @@ setup( name="open-aea-ledger-fetchai", - version="1.45.0", + version="1.46.0", 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.45.0"], + install_requires=["open-aea-ledger-cosmos~=1.46.0"], tests_require=["pytest"], entry_points={ "aea.cryptos": ["fetchai = aea_ledger_fetchai:FetchAICrypto"], diff --git a/plugins/aea-ledger-solana/setup.py b/plugins/aea-ledger-solana/setup.py index 135dfc919b..888dd364e0 100644 --- a/plugins/aea-ledger-solana/setup.py +++ b/plugins/aea-ledger-solana/setup.py @@ -25,7 +25,7 @@ setup( name="open-aea-ledger-solana", - version="1.45.0", + version="1.46.0", author="dassy23", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of solana.", diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 9794bd8e15..e7b270a988 100644 --- a/scripts/install.ps1 +++ b/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.45.0 --force --no-cache-dir 2>&1 |out-string; + $output=pip install open-aea[all]==1.46.0 --force --no-cache-dir 2>&1 |out-string; if ($LastExitCode -ne 0) { echo $output echo "AEA install failed!" diff --git a/scripts/install.sh b/scripts/install.sh index 07e6d22339..02be252b5a 100755 --- a/scripts/install.sh +++ b/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.45.0 --force --no-cache-dir) + output=$(pip3 install --user open-aea[all]==1.46.0 --force --no-cache-dir) if [[ $? -ne 0 ]]; then echo "$output" diff --git a/skaffold.yaml b/skaffold.yaml index c5fb84a2d9..159b9de7bc 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -5,7 +5,7 @@ metadata: build: tagPolicy: envTemplate: - template: "1.45.0" + template: "1.46.0" artifacts: - image: valory/open-aea-develop docker: @@ -24,7 +24,7 @@ profiles: build: tagPolicy: envTemplate: - template: "1.45.0" + template: "1.46.0" artifacts: - image: valory/open-aea-docs docker: diff --git a/user-image/Dockerfile b/user-image/Dockerfile index d564f56077..c62288fd47 100644 --- a/user-image/Dockerfile +++ b/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.45.0" open-aea-cli-ipfs==1.45.0 +RUN pip3 install "open-aea[all]==1.46.0" open-aea-cli-ipfs==1.46.0 COPY user-image/openssl.cnf /etc/ssl diff --git a/user-image/docker-env.sh b/user-image/docker-env.sh index 5583d58a6e..403351dc88 100644 --- a/user-image/docker-env.sh +++ b/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.45.0 +DOCKER_IMAGE_TAG=valory/open-aea-user:1.46.0 # DOCKER_IMAGE_TAG=valory/open-aea-user:latest DOCKER_BUILD_CONTEXT_DIR=.. From 364838ef646283abc939f9f39bda628be4a76e70 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Tue, 23 Jan 2024 12:50:31 +0530 Subject: [PATCH 4/4] chore: release notes --- HISTORY.md | 5 +++++ SECURITY.md | 4 ++-- docs/upgrading.md | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 08e83c4429..5862c01338 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,11 @@ ## 1.45.0 (2024-01-11) +AEA: +- Updates the `generate-key` command to include ledger specifier when writing keys in a JSON file + +## 1.45.0 (2024-01-11) + Plugins: - Fixes transaction deserialisation for adding nonce on the solana ledger - Increases the number of retries for fetching transaction receipt diff --git a/SECURITY.md b/SECURITY.md index 24507d5835..5e0d5b4e29 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,8 +8,8 @@ The following table shows which versions of `open-aea` are currently being suppo | Version | Supported | | --------- | ------------------ | -| `1.45.x` | :white_check_mark: | -| `< 1.45.0` | :x: | +| `1.46.x` | :white_check_mark: | +| `< 1.46.0` | :x: | ## Reporting a Vulnerability diff --git a/docs/upgrading.md b/docs/upgrading.md index 004ac7ec7a..5569ad038b 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -9,6 +9,11 @@ Below we describe the additional manual steps required to upgrade between differ ### Upgrade guide + +## `v1.45.0` to `v1.46.0` + +- No backwards incompatible changes + ## `v1.44.0` to `v1.45.0` - No backwards incompatible changes