Skip to content

Commit

Permalink
Merge pull request #2753 from fetchai/develop
Browse files Browse the repository at this point in the history
Release 1.2.1
  • Loading branch information
solarw authored Jul 14, 2022
2 parents 0ef5816 + fbf953e commit 9d50b14
Show file tree
Hide file tree
Showing 388 changed files with 3,011 additions and 2,893 deletions.
34 changes: 29 additions & 5 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-python@v3
with:
python-version: 3.7
python-version: 3.9
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install pipenv
sudo pip install pipenv
- name: Pipenv install requirements and check it can be locked
run: |
pipenv install --dev --skip-lock --clear
Expand Down Expand Up @@ -61,6 +62,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand Down Expand Up @@ -106,6 +108,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand All @@ -128,6 +131,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand Down Expand Up @@ -179,6 +183,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand All @@ -196,14 +201,21 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python_version: [3.6]
python_version: [3.7]
timeout-minutes: 10
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@master
- uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python_version }}
- if: matrix.os == 'ubuntu-latest'
name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
- name: Install tox
run : |
pip install tox
Expand All @@ -226,7 +238,7 @@ jobs:
- { os: windows-latest, shell: 'msys2 {0}' }
- { os: ubuntu-latest, shell: bash }
- { os: macos-latest, shell: bash }
python_version: [3.6]
python_version: [3.7]
timeout-minutes: 10
steps:
- uses: actions/checkout@master
Expand All @@ -235,6 +247,13 @@ jobs:
- uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python_version }}
- if: matrix.os == 'ubuntu-latest'
name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
- name: Install tox
run : |
pip install tox
Expand Down Expand Up @@ -300,6 +319,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand Down Expand Up @@ -368,7 +388,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python_version: [3.6, 3.7, 3.8, 3.9, '3.10']
python_version: [3.7, 3.8, 3.9, '3.10']
timeout-minutes: 90
steps:
- uses: actions/checkout@master
Expand All @@ -382,6 +402,7 @@ jobs:
name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand Down Expand Up @@ -455,6 +476,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand Down Expand Up @@ -519,6 +541,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
sudo apt-get install make -y
Expand Down Expand Up @@ -554,6 +577,7 @@ jobs:
- name: Install dependencies (ubuntu-latest)
run: |
sudo apt-get update --fix-missing
sudo apt-get install libmbedtls-dev
sudo apt-get autoremove
sudo apt-get autoclean
pip install tox
Expand Down
13 changes: 13 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# Release History


## 1.2.1 (2022-07-12)

AEA:
- Protocol generator uses int64 instead of int32
- Dependencies versions updates

Plugins:
- Upgrades fetchai plugin to use cosmpy>=0.5.0
- Upgrades cosmos plugin to use cosmpy>=0.5.0

Packages:
- Fixes for skills to work with dorado testnet (tx fee adjusted)

## 1.2.0 (2022-05-05)

AEA:
Expand Down
20 changes: 12 additions & 8 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ name = "test-pypi"

[dev-packages]
# we fix exact versions as it's sufficient to have at least one set of compatible dependencies for development
aiohttp = "==3.7.4"
aiohttp = ">=3.7.4,<3.8"
asn1crypto = "==1.4.0"
aioprometheus = "==20.0.1"
aioprometheus = ">=20.0.0,<21.0.0"
bandit = "==1.7.0"
bech32 = "==1.2.0"
black = "==19.10b0"
bs4 = "==0.0.1"
colorlog = "==4.1.0"
darglint = "==1.8.0"
defusedxml = "==0.6.0"
darglint = "==1.8.1"
defusedxml = "==0.7.1"
docker = "==4.2.0"
ecdsa = ">=0.15"
ecdsa = "==0.17.0"
eth-account = "==0.5.2"
flake8 = "==3.7.9"
flake8-bugbear = "==20.1.4"
Expand All @@ -48,7 +48,7 @@ openapi-spec-validator = "==0.2.8"
packaging = ">=20.4,<=21.5"
pexpect = "==4.8.0"
psutil = "==5.7.0"
pycryptodome = ">=3.10.1"
pycryptodome = "==3.15.0"
pydoc-markdown = "==3.10.3"
pydocstyle = "==3.0.0"
pygments = "==2.7.4"
Expand All @@ -65,13 +65,17 @@ safety = "==1.10.3"
scikit-image = ">=0.17.2"
sqlalchemy = "==1.4.17"
temper-py = "==0.0.3"
tensorflow = "==2.8.0"
tensorflow = "==2.8.1"
tox = "==3.15.1"
vulture = "==2.3"
isort = "==5.7.0"
web3 = "==5.12.0"
yoti = "==2.14.0"
cosmpy = ">=0.4.1,<0.5.0"
blspy = "==1.0.14"
bip-utils = "==2.5.1"
python-mbedtls = "==2.2.0"
py-sr25519-bindings = "==0.1.4"
cosmpy = ">=0.5.0,<0.6.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
Expand Down
2 changes: 1 addition & 1 deletion aea/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
__title__ = "aea"
__description__ = "Autonomous Economic Agent framework"
__url__ = "https://github.com/fetchai/agents-aea.git"
__version__ = "1.2.0"
__version__ = "1.2.1"
__author__ = "Fetch.AI Limited"
__license__ = "Apache-2.0"
__copyright__ = "2022 Fetch.AI Limited"
2 changes: 1 addition & 1 deletion aea/protocols/generator/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

PYTHON_TYPE_TO_PROTO_TYPE = {
"bytes": "bytes",
"int": "int32",
"int": "int64",
"float": "float",
"bool": "bool",
"str": "string",
Expand Down
26 changes: 13 additions & 13 deletions docs/aggregation-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Repeat the following process four times in four different terminals (for each {`
Fetch the aggregator AEA:
``` bash
agent_name="agg$i"
aea fetch fetchai/simple_aggregator:0.5.0 --alias $agent_name
aea fetch fetchai/simple_aggregator:0.5.1 --alias $agent_name
cd $agent_name
aea install
aea build
Expand All @@ -34,15 +34,15 @@ Create the AEA.
agent_name="agg$i"
aea create agent_name
cd agent_name
aea add connection fetchai/http_client:0.24.1
aea add connection fetchai/http_server:0.23.1
aea add connection fetchai/p2p_libp2p:0.27.0
aea add connection fetchai/soef:0.27.1
aea add connection fetchai/prometheus:0.9.1
aea add skill fetchai/advanced_data_request:0.7.1
aea add skill fetchai/simple_aggregation:0.3.1

aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0
aea add connection fetchai/http_client:0.24.2
aea add connection fetchai/http_server:0.23.2
aea add connection fetchai/p2p_libp2p:0.27.1
aea add connection fetchai/soef:0.27.2
aea add connection fetchai/prometheus:0.9.2
aea add skill fetchai/advanced_data_request:0.7.2
aea add skill fetchai/simple_aggregation:0.3.2

aea config set agent.default_connection fetchai/p2p_libp2p:0.27.1
aea install
aea build
```
Expand All @@ -64,7 +64,7 @@ aea config set --type bool vendor.fetchai.skills.advanced_data_request.models.ad
Set the cert requests for the peer-to-peer connection:
``` bash
aea config set --type list vendor.fetchai.connections.p2p_libp2p.cert_requests \
'[{"identifier": "acn", "ledger_id": "fetchai", "not_after": "2022-01-01", "not_before": "2021-01-01", "public_key": "fetchai", "message_format": "{public_key}", "save_path": ".certs/conn_cert.txt"}]'
'[{"identifier": "acn", "ledger_id": "fetchai", "not_after": "2023-01-01", "not_before": "2022-01-01", "public_key": "fetchai", "message_format": "{public_key}", "save_path": ".certs/conn_cert.txt"}]'
```

Match the agent index `i` to the `COIN_URL` and `JSON_PATH` below:
Expand Down Expand Up @@ -126,8 +126,8 @@ aea config set vendor.fetchai.connections.http_server.config.port $((8000+i))

To publish the aggregated value to an oracle smart contract, add the ledger connection and simple oracle skill to one of the aggregators:
``` bash
aea add connection fetchai/ledger:0.21.0
aea add skill fetchai/simple_oracle:0.16.0
aea add connection fetchai/ledger:0.21.1
aea add skill fetchai/simple_oracle:0.16.1
```

Configure the simple oracle skill for the `fetchai` ledger:
Expand Down
26 changes: 13 additions & 13 deletions docs/aries-cloud-agent-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Now you can create **Alice_AEA** and **Faber_AEA** in terminals 3 and 4 respecti
In the third terminal, fetch **Alice_AEA** and move into its project folder:

``` bash
aea fetch fetchai/aries_alice:0.32.0
aea fetch fetchai/aries_alice:0.32.1
cd aries_alice
```

Expand All @@ -191,11 +191,11 @@ The following steps create <b>Alice_AEA</b> from scratch:
``` bash
aea create aries_alice
cd aries_alice
aea add connection fetchai/p2p_libp2p:0.27.0
aea add connection fetchai/soef:0.27.1
aea add connection fetchai/http_client:0.24.1
aea add connection fetchai/webhook:0.20.1
aea add skill fetchai/aries_alice:0.26.1
aea add connection fetchai/p2p_libp2p:0.27.1
aea add connection fetchai/soef:0.27.2
aea add connection fetchai/http_client:0.24.2
aea add connection fetchai/webhook:0.20.2
aea add skill fetchai/aries_alice:0.26.2
```
</p>
</details>
Expand Down Expand Up @@ -257,14 +257,14 @@ Finally run **Alice_AEA**:
aea run
```

Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.27.0 -u public_uri` to retrieve the address.) We will refer to this as **Alice_AEA's P2P address**.
Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of the address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.27.1 -u public_uri` to retrieve the address.) We will refer to this as **Alice_AEA's P2P address**.

### Faber_AEA

In the fourth terminal, fetch **Faber_AEA** and move into its project folder:

``` bash
aea fetch fetchai/aries_faber:0.32.0
aea fetch fetchai/aries_faber:0.32.1
cd aries_faber
```

Expand All @@ -275,11 +275,11 @@ The following steps create <b>Faber_AEA</b> from scratch:
``` bash
aea create aries_faber
cd aries_faber
aea add connection fetchai/p2p_libp2p:0.27.0
aea add connection fetchai/soef:0.27.1
aea add connection fetchai/http_client:0.24.1
aea add connection fetchai/webhook:0.20.1
aea add skill fetchai/aries_faber:0.24.0
aea add connection fetchai/p2p_libp2p:0.27.1
aea add connection fetchai/soef:0.27.2
aea add connection fetchai/http_client:0.24.2
aea add connection fetchai/webhook:0.20.2
aea add skill fetchai/aries_faber:0.24.1
```
</p>
</details>
Expand Down
Binary file added docs/assets/logo.webp
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build-aea-programmatically.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ We will use the stub connection to pass envelopes in and out of the AEA. Ensure
```

## Initialise the AEA
We use the <a href="../api/aea_builder#aeabuilder-objects">`AEABuilder`</a> to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:1.1.1`, `fetchai/state_update:1.1.1` and `fetchai/signing:1.1.1` protocols.
We use the <a href="../api/aea_builder#aeabuilder-objects">`AEABuilder`</a> to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:1.1.2`, `fetchai/state_update:1.1.2` and `fetchai/signing:1.1.2` protocols.
``` python
# Instantiate the builder and build the AEA
# By default, the default protocol, error skill and stub connection are added
Expand Down
Loading

0 comments on commit 9d50b14

Please sign in to comment.