diff --git a/.firebaserc b/.firebaserc new file mode 100644 index 0000000000..d6710a4d9b --- /dev/null +++ b/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "fetch-docs-preview" + } +} diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 935d156789..d82b10200f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,7 +19,7 @@ _Put an `x` in the boxes that apply_ _Put an `x` in the boxes that apply._ -- [ ] I have read the [CONTRIBUTING](../CONTRIBUTING.md) doc +- [ ] I have read the [CONTRIBUTING](https://github.com/fetchai/agents-aea/blob/main/CONTRIBUTING.md) doc - [ ] I am making a pull request against the `develop` branch (left side). Also you should start your branch off our `develop`. - [ ] Lint and unit tests pass locally with my changes and CI passes too - [ ] I have added tests that prove my fix is effective or that my feature works @@ -47,7 +47,7 @@ Describe in short the main changes with the new release. _Put an `x` in the boxes that apply._ -- [ ] I have read the [CONTRIBUTING](../CONTRIBUTING.md) doc +- [ ] I have read the [CONTRIBUTING](https://github.com/fetchai/agents-aea/blob/master/CONTRIBUTING.md) doc - [ ] I am making a pull request against the `main` branch (left side), from `develop` - [ ] Lint and unit tests pass locally and in CI - [ ] I have checked the fingerprint hashes are correct by running (`scripts/generate_ipfs_hashes.py`) @@ -56,8 +56,8 @@ _Put an `x` in the boxes that apply._ - [ ] I have added an item in `HISTORY.md` for this release - [ ] I bumped the version number in the `aea/__version__.py` file. - [ ] I bumped the version number in every Docker image of the repo and published it. Also, I built and published them with tag `latest` - (check the READMEs of [`aea-develop`](../develop-image/README.md#publish) - and [`aea-user`](../user-image/README.md#publish)) + (check the READMEs of [`aea-develop`](https://github.com/fetchai/agents-aea/blob/master/develop-image/README.md#publish) + and [`aea-user`](https://github.com/fetchai/agents-aea/blob/master/develop-image/user-image/README.md#publish)) - [ ] I have pushed the latest packages to the registry. - [ ] I have uploaded the latest `aea` to PyPI. - [ ] I have uploaded the latest plugins to PyPI. diff --git a/.github/workflows/docs_pr_preview.yml b/.github/workflows/docs_pr_preview.yml new file mode 100644 index 0000000000..45c0d6f129 --- /dev/null +++ b/.github/workflows/docs_pr_preview.yml @@ -0,0 +1,57 @@ +name: Documentation Preview + +on: + pull_request: + branches: + - master + - develop + paths: + - 'docs/**' + +jobs: + build: + name: Docs Ephemerial Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Use python 3.7 + uses: actions/setup-python@v2 + with: + python-version: '3.7' + + - name: Install Dependencies + run: cd docs && pip3 install pipenv && pipenv install -d --skip-lock --python python3 + + - name: Build + run: cd docs && pipenv run mkdocs build -f ../mkdocs.yml + + - name: Archive Production Artifact + uses: actions/upload-artifact@master + with: + name: dist + path: site + + + deploy: + name: Docs Ephemerial Deploy + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Download Artifact + uses: actions/download-artifact@master + with: + name: dist + path: site + + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: "${{ secrets.GITHUB_TOKEN }}" + firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT }}" + expires: 2d + projectId: fetch-docs-preview + # entryPoint: docs/ diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 1bfd1ff945..62496cc7a9 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -14,9 +14,9 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: - python-version: 3.6 + python-version: 3.7 - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -52,12 +52,12 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.6 - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: - go-version: '^1.14.0' + go-version: '^1.17.0' - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -80,18 +80,18 @@ jobs: - name: Static type check run: tox -e mypy - name: Golang code style check (libp2p_node) - uses: golangci/golangci-lint-action@v1 + uses: golangci/golangci-lint-action@v3.1.0 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true with: - version: v1.28 + version: v1.45.2 working-directory: libs/go/libp2p_node - name: Golang code style check (aealite) - uses: golangci/golangci-lint-action@v1 + uses: golangci/golangci-lint-action@v3.1.0 env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true with: - version: v1.28 + version: v1.45.2 working-directory: libs/go/aealite common_checks_3: @@ -100,7 +100,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.6 - name: Install dependencies (ubuntu-latest) @@ -119,9 +119,12 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.6 + - uses: actions/setup-go@v3 + with: + go-version: '^1.17.0' - name: Install dependencies (ubuntu-latest) run: | sudo apt-get update --fix-missing @@ -130,8 +133,8 @@ jobs: pip install tox pip install --user --upgrade setuptools # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip + unzip protoc-3.19.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc # install IPFS sudo apt-get install -y wget @@ -154,6 +157,11 @@ jobs: run: tox -e check_generate_all_protocols - name: Generate Documentation run: tox -e docs + - name: Check copyright year is up to date + run: | + ./scripts/bump_year.sh $(date +%Y) + git diff --quiet||(echo "Some files have the incorrect year in their copyright header. Run ./scripts/bump_year.sh!"; exit 1) + echo "all good" common_checks_5: continue-on-error: False @@ -162,7 +170,7 @@ jobs: if: github.base_ref == 'main' steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.7 - uses: actions/setup-node@v1 @@ -193,7 +201,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python_version }} - name: Install tox @@ -224,7 +232,7 @@ jobs: - uses: actions/checkout@master - if: matrix.sys.os == 'windows-latest' uses: msys2/setup-msys2@v2 - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python_version }} - name: Install tox @@ -249,10 +257,10 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.6 - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: '^1.14.0' - name: Install protolint (ubuntu-latest) @@ -275,17 +283,17 @@ jobs: - dependencies_checks - plugins_install_check runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 60 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.8 - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: '^1.14.0' - name: Setup GCloud - production - uses: google-github-actions/setup-gcloud@master + uses: google-github-actions/setup-gcloud@v0 with: project_id: ${{ secrets.GCLOUD_FETCH_AI_PROD_PROJECT }} service_account_key: ${{ secrets.GCLOUD_FETCH_AI_PROD_KEY }} @@ -296,8 +304,8 @@ jobs: sudo apt-get autoclean pip install tox # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip + unzip protoc-3.19.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc - name: Configure Docker run: | @@ -321,14 +329,14 @@ jobs: - dependencies_checks - plugins_install_check runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 60 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.8 - name: Setup GCloud - production - uses: google-github-actions/setup-gcloud@master + uses: google-github-actions/setup-gcloud@v0 with: project_id: ${{ secrets.GCLOUD_FETCH_AI_PROD_PROJECT }} service_account_key: ${{ secrets.GCLOUD_FETCH_AI_PROD_KEY }} @@ -360,14 +368,14 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python_version: [3.6, 3.7, 3.8, 3.9] + python_version: [3.6, 3.7, 3.8, 3.9, '3.10'] timeout-minutes: 90 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python_version }} - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: '^1.14.0' - if: matrix.os == 'ubuntu-latest' @@ -378,8 +386,8 @@ jobs: sudo apt-get autoclean pip install tox # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip + unzip protoc-3.19.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc make protolint_install # sudo apt-get install -y protobuf-compiler @@ -392,8 +400,8 @@ jobs: brew install gcc # brew install protobuf # brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/72457f0166d5619a83f508f2345b22d0617b5021/Formula/protobuf.rb - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-osx-x86_64.zip - unzip protoc-3.11.4-osx-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-osx-x86_64.zip + unzip protoc-3.19.4-osx-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc brew tap yoheimuta/protolint brew install protolint @@ -404,14 +412,14 @@ jobs: run: | python -m pip install -U pip echo "::add-path::C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64" - choco install protoc --version 3.11.4 + choco install protoc --version 3.19.4 choco install mingw -y choco install make -y # to check make was installed make --version pip install tox - # wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-win64.zip - # unzip protoc-3.11.4-win64.zip -d protoc + # wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-win64.zip + # unzip protoc-3.19.4-win64.zip -d protoc # sudo mv protoc/bin/protoc /usr/local/bin/protoc python scripts/update_symlinks_cross_platform.py make protolint_install_win @@ -435,13 +443,13 @@ jobs: - dependencies_checks - plugins_install_check runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 60 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.8 - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: '^1.14.0' - name: Install dependencies (ubuntu-latest) @@ -450,8 +458,8 @@ jobs: sudo apt-get autoremove sudo apt-get autoclean pip install tox - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip + unzip protoc-3.19.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc make protolint_install - name: Unit tests with sync agent loop @@ -475,16 +483,16 @@ jobs: timeout-minutes: 45 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: '^1.14.0' - if: matrix.os == 'macos-latest' working-directory: ./libs/go/libp2p_node run: | - export LINKPATH=$GOROOT/pkg/tool/darwin_amd64/link + export LINKPATH=`go env GOTOOLDIR`/link echo $LINKPATH sudo cp $LINKPATH ${LINKPATH}_orig sudo cp link $LINKPATH @@ -537,10 +545,10 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@master - - uses: actions/setup-python@master + - uses: actions/setup-python@v3 with: python-version: 3.7 - - uses: actions/setup-go@master + - uses: actions/setup-go@v3 with: go-version: '^1.14.0' - name: Install dependencies (ubuntu-latest) @@ -551,8 +559,8 @@ jobs: pip install tox pip install coverage # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip + unzip protoc-3.19.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc make protolint_install # sudo apt-get install -y protobuf-compiler diff --git a/.spelling b/.spelling index 09a04fa247..0bbcde41d1 100644 --- a/.spelling +++ b/.spelling @@ -215,7 +215,7 @@ utc-0 docstring utils kademlia -StargateWorld +Capricorn stargateworld-3 v0.8.x fetch.ai @@ -279,3 +279,10 @@ oef_search handlers.py skill.yaml packages.fetchai.skills.my_search.dialogues +capricorn-1 +dorado +dorado-1 + - acapy-alice-bob/AdminAPI.md +ACA-Py +ACA-Py-based +prover diff --git a/HISTORY.md b/HISTORY.md index 3071011c22..654b770121 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,34 @@ # Release History + +## 1.2.0 (2022-05-05) + +AEA: +- Adds support for Python 3.10 +- Updates protobuf dependency +- Updates asyncio dependency +- Updates golang modules +- Updates many dependencies to their latest versions +- Fixes dependency issues + +Plugins: +- Upgrades fetchai plugin to be compatible with Dorado networks +- Upgrades cosmos plugin to be compatible with Dorado networks + +Packages: +- Adds more logging to the p2p_libp2p packages (vanilla, client, mailbox) +- Aries demo updated to cover the full base scenario +- Protocols were regenerated with newer protobuf + +Chores: +- Fixed various tests +- Fixed docker container issue in tests +- Added automated script to add support for new versions of the Fetchai network +- Added automated script to update copyright headers and check their validity +- Apply the above script on all packages +- Adds tests for BaseContractTestTool +- Improves the script that automatically updates package versions + ## 1.1.1 (2021-12-15) AEA: diff --git a/Makefile b/Makefile index 6528f3681d..7edb845b72 100644 --- a/Makefile +++ b/Makefile @@ -149,10 +149,10 @@ new_env: clean echo "In a virtual environment! Exit first: 'exit'.";\ fi protolint_install: - GO111MODULE=on GOPATH=~/go go get -u -v github.com/yoheimuta/protolint/cmd/protolint@v0.27.0 + GO111MODULE=on GOPATH=~/go go install github.com/yoheimuta/protolint/cmd/protolint@v0.27.0 protolint: PATH=${PATH}:${GOPATH}/bin/:~/go/bin protolint lint -config_path=./protolint.yaml -fix ./aea/mail ./packages/fetchai/protocols protolint_install_win: - powershell -command '$$env:GO111MODULE="on"; go get -u -v github.com/yoheimuta/protolint/cmd/protolint@v0.27.0' + powershell -command '$$env:GO111MODULE="on"; go install github.com/yoheimuta/protolint/cmd/protolint@v0.27.0' protolint_win: protolint lint -config_path=./protolint.yaml -fix ./aea/mail ./packages/fetchai/protocols diff --git a/Pipfile b/Pipfile index e8242b07f2..09cea963e3 100644 --- a/Pipfile +++ b/Pipfile @@ -31,20 +31,21 @@ flake8-isort = "==4.0.0" gitpython = ">=3.1.14" gym = "==0.15.6" ipfshttpclient = "==0.6.1" +jinja2 = "==3.0.3" liccheck = "==0.6.0" -markdown = "==3.2.1" +markdown = "==3.3.6" matplotlib = ">=3.3.0,<3.4" memory-profiler = "==0.57.0" mistune = "==2.0.0a4" mkdocs = "==1.1" -mkdocs-material = "==4.6.3" +mkdocs-material = "==6.2.8" mkdocs-mermaid-plugin = {git = "https://github.com/pugong/mkdocs-mermaid-plugin.git"} mypy = "==0.761" numpy = ">=1.18.1" oef = "==0.8.1" openapi-core = "==0.13.2" openapi-spec-validator = "==0.2.8" -packaging = "==20.4" +packaging = ">=20.4,<=21.5" pexpect = "==4.8.0" psutil = "==5.7.0" pycryptodome = ">=3.10.1" @@ -52,25 +53,25 @@ pydoc-markdown = "==3.10.3" pydocstyle = "==3.0.0" pygments = "==2.7.4" pylint = "==2.6.0" -pymdown-extensions = "==6.3" -pytest = "==5.4.3" -pytest-asyncio = "==0.12.0" -pytest-cov = "==2.9.0" +pymdown-extensions = "==9.1" +pytest = "==7.0.0" +pytest-asyncio = "==0.16.0" +pytest-cov = "==3.0.0" pytest-custom-exit-code = "==0.3.0" -pytest-randomly = "==3.4.0" -pytest-rerunfailures = "==9.0" +pytest-randomly = "==3.10.3" +pytest-rerunfailures = "==10.2" requests = ">=2.22.0" safety = "==1.10.3" scikit-image = ">=0.17.2" sqlalchemy = "==1.4.17" temper-py = "==0.0.3" -tensorflow = "==2.4.0" +tensorflow = "==2.8.0" tox = "==3.15.1" vulture = "==2.3" isort = "==5.7.0" web3 = "==5.12.0" yoti = "==2.14.0" -cosmpy = ">=0.1.4" +cosmpy = ">=0.4.1,<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/SECURITY.md b/SECURITY.md index 9adec5d2c2..d347def524 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,8 +8,8 @@ The following table shows which versions of `aea` are currently being supported | Version | Supported | | --------- | ------------------ | -| `1.1.x` | :white_check_mark: | -| `< 1.1.0` | :x: | +| `1.2.x` | :white_check_mark: | +| `< 1.2.0` | :x: | ## Reporting a Vulnerability diff --git a/aea/__init__.py b/aea/__init__.py index 2ee575b9cd..5ab2162076 100644 --- a/aea/__init__.py +++ b/aea/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/__version__.py b/aea/__version__.py index 33ef4e5322..59dfa971e9 100644 --- a/aea/__version__.py +++ b/aea/__version__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ __title__ = "aea" __description__ = "Autonomous Economic Agent framework" __url__ = "https://github.com/fetchai/agents-aea.git" -__version__ = "1.1.1" +__version__ = "1.2.0" __author__ = "Fetch.AI Limited" __license__ = "Apache-2.0" -__copyright__ = "2019 Fetch.AI Limited" +__copyright__ = "2022 Fetch.AI Limited" diff --git a/aea/abstract_agent.py b/aea/abstract_agent.py index 37b756ac18..78c328f466 100644 --- a/aea/abstract_agent.py +++ b/aea/abstract_agent.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/aea.py b/aea/aea.py index 97e74064dd..10bfd7fd7a 100644 --- a/aea/aea.py +++ b/aea/aea.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/aea_builder.py b/aea/aea_builder.py index 3969de6dd2..0947afa4ef 100644 --- a/aea/aea_builder.py +++ b/aea/aea_builder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/agent.py b/aea/agent.py index d87c66d3f2..b16d6127a2 100644 --- a/aea/agent.py +++ b/aea/agent.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/agent_loop.py b/aea/agent_loop.py index 5ca2fe96b4..da3acb925e 100644 --- a/aea/agent_loop.py +++ b/aea/agent_loop.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/__init__.py b/aea/cli/__init__.py index 234d16c4f6..6c8385e227 100644 --- a/aea/cli/__init__.py +++ b/aea/cli/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/__main__.py b/aea/cli/__main__.py index b67db019ec..af9c2e8ab9 100755 --- a/aea/cli/__main__.py +++ b/aea/cli/__main__.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/add.py b/aea/cli/add.py index bcb2c79581..ad1b747be7 100644 --- a/aea/cli/add.py +++ b/aea/cli/add.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/add_key.py b/aea/cli/add_key.py index 167d65a00a..46c842e74d 100644 --- a/aea/cli/add_key.py +++ b/aea/cli/add_key.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/build.py b/aea/cli/build.py index 40480c0a5d..6e08f6672d 100644 --- a/aea/cli/build.py +++ b/aea/cli/build.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/config.py b/aea/cli/config.py index 0c3385e002..aebf4fe7de 100644 --- a/aea/cli/config.py +++ b/aea/cli/config.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/core.py b/aea/cli/core.py index 0d3b11e9c6..005c121ff9 100644 --- a/aea/cli/core.py +++ b/aea/cli/core.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/create.py b/aea/cli/create.py index 877a03a1da..608730b959 100644 --- a/aea/cli/create.py +++ b/aea/cli/create.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/delete.py b/aea/cli/delete.py index 1125d5fb8f..a7556efd86 100644 --- a/aea/cli/delete.py +++ b/aea/cli/delete.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/eject.py b/aea/cli/eject.py index 1b3d175101..aecbfc27ac 100644 --- a/aea/cli/eject.py +++ b/aea/cli/eject.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/fetch.py b/aea/cli/fetch.py index d94df2a4fc..5daed397a2 100644 --- a/aea/cli/fetch.py +++ b/aea/cli/fetch.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/fingerprint.py b/aea/cli/fingerprint.py index 676391ff03..eac813b5b9 100644 --- a/aea/cli/fingerprint.py +++ b/aea/cli/fingerprint.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/freeze.py b/aea/cli/freeze.py index 9abab5295a..1e351be0e6 100644 --- a/aea/cli/freeze.py +++ b/aea/cli/freeze.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/generate.py b/aea/cli/generate.py index d96821576c..89f7bbe72e 100644 --- a/aea/cli/generate.py +++ b/aea/cli/generate.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/generate_key.py b/aea/cli/generate_key.py index 8ee55a5688..9b7a817958 100644 --- a/aea/cli/generate_key.py +++ b/aea/cli/generate_key.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/generate_wealth.py b/aea/cli/generate_wealth.py index 3c011f90b0..8671777cc4 100644 --- a/aea/cli/generate_wealth.py +++ b/aea/cli/generate_wealth.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/get_address.py b/aea/cli/get_address.py index 3c575f2a55..292e4b8e04 100644 --- a/aea/cli/get_address.py +++ b/aea/cli/get_address.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/get_multiaddress.py b/aea/cli/get_multiaddress.py index 090a64e4fc..bdb844f59b 100644 --- a/aea/cli/get_multiaddress.py +++ b/aea/cli/get_multiaddress.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/get_public_key.py b/aea/cli/get_public_key.py index 6b4a8f4f6e..2f28b36812 100644 --- a/aea/cli/get_public_key.py +++ b/aea/cli/get_public_key.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2021 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/get_wealth.py b/aea/cli/get_wealth.py index c62c1b266e..521b7d1b03 100644 --- a/aea/cli/get_wealth.py +++ b/aea/cli/get_wealth.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/init.py b/aea/cli/init.py index a057d43369..77f015aeda 100644 --- a/aea/cli/init.py +++ b/aea/cli/init.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/install.py b/aea/cli/install.py index 11acab0ea6..01cf89ff07 100644 --- a/aea/cli/install.py +++ b/aea/cli/install.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/interact.py b/aea/cli/interact.py index 7164870355..1e2cebb325 100644 --- a/aea/cli/interact.py +++ b/aea/cli/interact.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/issue_certificates.py b/aea/cli/issue_certificates.py index 40695fd449..6e72801451 100644 --- a/aea/cli/issue_certificates.py +++ b/aea/cli/issue_certificates.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/launch.py b/aea/cli/launch.py index af87233084..7563444d20 100644 --- a/aea/cli/launch.py +++ b/aea/cli/launch.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/list.py b/aea/cli/list.py index 45ab1de9e0..1d8be3d26b 100644 --- a/aea/cli/list.py +++ b/aea/cli/list.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/local_registry_sync.py b/aea/cli/local_registry_sync.py index d113c28771..a1e6c6f375 100644 --- a/aea/cli/local_registry_sync.py +++ b/aea/cli/local_registry_sync.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/login.py b/aea/cli/login.py index 5843549b10..c7813ed86e 100644 --- a/aea/cli/login.py +++ b/aea/cli/login.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/logout.py b/aea/cli/logout.py index d8c7ff0c78..d9536fdf43 100644 --- a/aea/cli/logout.py +++ b/aea/cli/logout.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/plugin.py b/aea/cli/plugin.py index e0478387a8..e4d4fe7185 100644 --- a/aea/cli/plugin.py +++ b/aea/cli/plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/publish.py b/aea/cli/publish.py index dd835a6988..81f94aa91f 100644 --- a/aea/cli/publish.py +++ b/aea/cli/publish.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/push.py b/aea/cli/push.py index 26aee4aafd..6842c0a44b 100644 --- a/aea/cli/push.py +++ b/aea/cli/push.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/register.py b/aea/cli/register.py index 1331a46d2c..6570d09e7e 100644 --- a/aea/cli/register.py +++ b/aea/cli/register.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/__init__.py b/aea/cli/registry/__init__.py index e2bea78385..0e0ec5577d 100644 --- a/aea/cli/registry/__init__.py +++ b/aea/cli/registry/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/add.py b/aea/cli/registry/add.py index a44a59bed9..824a46a889 100644 --- a/aea/cli/registry/add.py +++ b/aea/cli/registry/add.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/fetch.py b/aea/cli/registry/fetch.py index ade9194ba1..9a85b03555 100644 --- a/aea/cli/registry/fetch.py +++ b/aea/cli/registry/fetch.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/login.py b/aea/cli/registry/login.py index 8b650c75ee..bfeb74c5da 100644 --- a/aea/cli/registry/login.py +++ b/aea/cli/registry/login.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/logout.py b/aea/cli/registry/logout.py index de9dbb4093..a45c178da3 100644 --- a/aea/cli/registry/logout.py +++ b/aea/cli/registry/logout.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/publish.py b/aea/cli/registry/publish.py index ee588e798b..ab37670797 100644 --- a/aea/cli/registry/publish.py +++ b/aea/cli/registry/publish.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/push.py b/aea/cli/registry/push.py index 7bedd5325d..b97bbdce43 100644 --- a/aea/cli/registry/push.py +++ b/aea/cli/registry/push.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/registration.py b/aea/cli/registry/registration.py index fdc0950ff5..42a9ee14fa 100644 --- a/aea/cli/registry/registration.py +++ b/aea/cli/registry/registration.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/settings.py b/aea/cli/registry/settings.py index eb8aca20d4..e663ad09e3 100644 --- a/aea/cli/registry/settings.py +++ b/aea/cli/registry/settings.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/registry/utils.py b/aea/cli/registry/utils.py index 43960f13b7..d747448202 100644 --- a/aea/cli/registry/utils.py +++ b/aea/cli/registry/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/remove.py b/aea/cli/remove.py index 8549ee342d..5eebe8d331 100644 --- a/aea/cli/remove.py +++ b/aea/cli/remove.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/remove_key.py b/aea/cli/remove_key.py index e6feafe4c4..54d471c499 100644 --- a/aea/cli/remove_key.py +++ b/aea/cli/remove_key.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/reset_password.py b/aea/cli/reset_password.py index 6633ed3c88..604392e3a7 100644 --- a/aea/cli/reset_password.py +++ b/aea/cli/reset_password.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/run.py b/aea/cli/run.py index 932256c8fa..72037bb946 100644 --- a/aea/cli/run.py +++ b/aea/cli/run.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/scaffold.py b/aea/cli/scaffold.py index 88d38ff2f4..093780c2d8 100644 --- a/aea/cli/scaffold.py +++ b/aea/cli/scaffold.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/search.py b/aea/cli/search.py index 75daf76cf9..2c5e29385c 100644 --- a/aea/cli/search.py +++ b/aea/cli/search.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/transfer.py b/aea/cli/transfer.py index dbca1279d5..6eb23b29c9 100644 --- a/aea/cli/transfer.py +++ b/aea/cli/transfer.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/upgrade.py b/aea/cli/upgrade.py index bea6b09f65..a1c87a2fdc 100644 --- a/aea/cli/upgrade.py +++ b/aea/cli/upgrade.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/__init__.py b/aea/cli/utils/__init__.py index c34eb7e76c..2899638156 100644 --- a/aea/cli/utils/__init__.py +++ b/aea/cli/utils/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/click_utils.py b/aea/cli/utils/click_utils.py index 05a2063e53..a7d49ab5e5 100644 --- a/aea/cli/utils/click_utils.py +++ b/aea/cli/utils/click_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/config.py b/aea/cli/utils/config.py index 6c91db88c0..4a0564bb25 100644 --- a/aea/cli/utils/config.py +++ b/aea/cli/utils/config.py @@ -1,25 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/constants.py b/aea/cli/utils/constants.py index 21dbda5b12..244ca2e28b 100644 --- a/aea/cli/utils/constants.py +++ b/aea/cli/utils/constants.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/context.py b/aea/cli/utils/context.py index 669aa0a2d5..2773972b2a 100644 --- a/aea/cli/utils/context.py +++ b/aea/cli/utils/context.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/decorators.py b/aea/cli/utils/decorators.py index 59098da02f..6c0c6640f6 100644 --- a/aea/cli/utils/decorators.py +++ b/aea/cli/utils/decorators.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/exceptions.py b/aea/cli/utils/exceptions.py index 66c08addf5..0d42d5727e 100644 --- a/aea/cli/utils/exceptions.py +++ b/aea/cli/utils/exceptions.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/formatting.py b/aea/cli/utils/formatting.py index 4f72fe87f0..21e57d3d04 100644 --- a/aea/cli/utils/formatting.py +++ b/aea/cli/utils/formatting.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/generic.py b/aea/cli/utils/generic.py index 592e4e55d8..0a5f247f29 100644 --- a/aea/cli/utils/generic.py +++ b/aea/cli/utils/generic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/loggers.py b/aea/cli/utils/loggers.py index bb904bbb4d..9ec8cf890c 100644 --- a/aea/cli/utils/loggers.py +++ b/aea/cli/utils/loggers.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py index 6eed192b7c..f82cb642e0 100644 --- a/aea/cli/utils/package_utils.py +++ b/aea/cli/utils/package_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/common.py b/aea/common.py index 09a18b530b..a688e1b73b 100644 --- a/aea/common.py +++ b/aea/common.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/components/__init__.py b/aea/components/__init__.py index bb8b2421b6..9b94dd8fa5 100644 --- a/aea/components/__init__.py +++ b/aea/components/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/components/base.py b/aea/components/base.py index 603211caab..178ddb9895 100644 --- a/aea/components/base.py +++ b/aea/components/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/components/loader.py b/aea/components/loader.py index 8e6e3c913d..3bca734944 100644 --- a/aea/components/loader.py +++ b/aea/components/loader.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/components/utils.py b/aea/components/utils.py index 44177c1fd7..3f6c0348e9 100644 --- a/aea/components/utils.py +++ b/aea/components/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2021 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/__init__.py b/aea/configurations/__init__.py index 71a25ed012..f6282c36f3 100644 --- a/aea/configurations/__init__.py +++ b/aea/configurations/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/base.py b/aea/configurations/base.py index cd9b74da73..c6aa7a58a0 100644 --- a/aea/configurations/base.py +++ b/aea/configurations/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py index 2adedca545..ed4a9eada6 100644 --- a/aea/configurations/constants.py +++ b/aea/configurations/constants.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/data_types.py b/aea/configurations/data_types.py index acad4879b8..6a6aed5392 100644 --- a/aea/configurations/data_types.py +++ b/aea/configurations/data_types.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py index 782fa39937..e44c277801 100644 --- a/aea/configurations/loader.py +++ b/aea/configurations/loader.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/manager.py b/aea/configurations/manager.py index c065c8e653..a24e175ab4 100644 --- a/aea/configurations/manager.py +++ b/aea/configurations/manager.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/pypi.py b/aea/configurations/pypi.py index a741571f16..e46a81cecc 100644 --- a/aea/configurations/pypi.py +++ b/aea/configurations/pypi.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/utils.py b/aea/configurations/utils.py index eba7cfcc05..54b88c8032 100644 --- a/aea/configurations/utils.py +++ b/aea/configurations/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/configurations/validation.py b/aea/configurations/validation.py index 2719ff6de0..d901fd061f 100644 --- a/aea/configurations/validation.py +++ b/aea/configurations/validation.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/connections/__init__.py b/aea/connections/__init__.py index 3fed8c9efb..f4ac95384d 100644 --- a/aea/connections/__init__.py +++ b/aea/connections/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/connections/base.py b/aea/connections/base.py index 00320db9e8..96871a7af0 100644 --- a/aea/connections/base.py +++ b/aea/connections/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/connections/scaffold/__init__.py b/aea/connections/scaffold/__init__.py index 6bd5e5aafa..a936e7d121 100644 --- a/aea/connections/scaffold/__init__.py +++ b/aea/connections/scaffold/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/connections/scaffold/connection.py b/aea/connections/scaffold/connection.py index 9db19b8c33..890dd0ec66 100644 --- a/aea/connections/scaffold/connection.py +++ b/aea/connections/scaffold/connection.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/connections/scaffold/connection.yaml b/aea/connections/scaffold/connection.yaml index 0e20859d00..008eceac4e 100644 --- a/aea/connections/scaffold/connection.yaml +++ b/aea/connections/scaffold/connection.yaml @@ -7,8 +7,8 @@ description: The scaffold connection provides a scaffold for a connection to be license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj - connection.py: QmPSdUNVTdgcoS8VFXQPZyjX8DjywLiK4Gt5Z64ekVWcqh + __init__.py: QmY7cPhXj7suon5jahiWCZgsCtQr5zfwYtR7yu5CJ6y5nD + connection.py: Qmf6kTmh5SpN6Ho9VyjCJZ3FyjqrdWFb9649zmjm21WDZK readme.md: Qmdt71SaCCwAG1c24VktXDm4pxgUBiPMg4bWfUTiqorypf fingerprint_ignore_patterns: [] connections: [] diff --git a/aea/context/__init__.py b/aea/context/__init__.py index ed4e3f3a1d..157c66fd19 100644 --- a/aea/context/__init__.py +++ b/aea/context/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/context/base.py b/aea/context/base.py index c9aa875498..c1f900d2c7 100644 --- a/aea/context/base.py +++ b/aea/context/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/contracts/__init__.py b/aea/contracts/__init__.py index 2491ebefb3..a03465bcc9 100644 --- a/aea/contracts/__init__.py +++ b/aea/contracts/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/contracts/base.py b/aea/contracts/base.py index b22d69a26b..53d24b7ab2 100644 --- a/aea/contracts/base.py +++ b/aea/contracts/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -241,7 +241,7 @@ def _load_contract_interfaces( full_path = Path(configuration.directory, path) if identifier not in ledger_apis_registry.supported_ids: raise ValueError( # pragma: nocover - "No ledger api registered for identifier {}." + f"No ledger api registered for identifier {identifier}." ) ledger_api = make_ledger_api_cls(identifier) contract_interface = ledger_api.load_contract_interface(full_path) diff --git a/aea/contracts/scaffold/__init__.py b/aea/contracts/scaffold/__init__.py index c0a3855c0a..3ae5b64509 100644 --- a/aea/contracts/scaffold/__init__.py +++ b/aea/contracts/scaffold/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/contracts/scaffold/contract.py b/aea/contracts/scaffold/contract.py index 39cffd238f..465e813035 100644 --- a/aea/contracts/scaffold/contract.py +++ b/aea/contracts/scaffold/contract.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/contracts/scaffold/contract.yaml b/aea/contracts/scaffold/contract.yaml index 7715132bfa..b2a48cb828 100644 --- a/aea/contracts/scaffold/contract.yaml +++ b/aea/contracts/scaffold/contract.yaml @@ -6,8 +6,8 @@ description: The scaffold contract scaffolds a contract to be implemented by the license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: QmPBwWhEg3wcH1q9612srZYAYdANVdWLDFWKs7TviZmVj6 - contract.py: QmbZsDupLbK3dSN8H3nxPRvK7ReQcGzuvd4ZQmzz6LphK7 + __init__.py: QmapxaGbaFWWoo66bumd5dbFjbwiCoi7wy5EYigGSTUtFc + contract.py: QmQd4SZNb3737B9NQkBj8uxEYHHfrZf3SytT7uDtzfCDp2 fingerprint_ignore_patterns: [] class_name: MyScaffoldContract contract_interface_paths: {} diff --git a/aea/crypto/__init__.py b/aea/crypto/__init__.py index e82693d2c0..4e34234411 100644 --- a/aea/crypto/__init__.py +++ b/aea/crypto/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/crypto/base.py b/aea/crypto/base.py index 832d2892cc..b8f8af3a3a 100644 --- a/aea/crypto/base.py +++ b/aea/crypto/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/crypto/helpers.py b/aea/crypto/helpers.py index 78438770e0..9e8e893e47 100644 --- a/aea/crypto/helpers.py +++ b/aea/crypto/helpers.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/crypto/ledger_apis.py b/aea/crypto/ledger_apis.py index 459bb9acae..c8e614abeb 100644 --- a/aea/crypto/ledger_apis.py +++ b/aea/crypto/ledger_apis.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -42,9 +42,9 @@ ETHEREUM_DEFAULT_ADDRESS = "http://127.0.0.1:8545" ETHEREUM_DEFAULT_CHAIN_ID = 1337 ETHEREUM_DEFAULT_CURRENCY_DENOM = "wei" -FETCHAI_DEFAULT_ADDRESS = "https://rest-stargateworld.fetch.ai:443" +FETCHAI_DEFAULT_ADDRESS = "https://rest-dorado.fetch.ai:443" FETCHAI_DEFAULT_CURRENCY_DENOM = "atestfet" -FETCHAI_DEFAULT_CHAIN_ID = "stargateworld-3" +FETCHAI_DEFAULT_CHAIN_ID = "dorado-1" DEFAULT_LEDGER_CONFIGS: Dict[str, Dict[str, Union[str, int]]] = { diff --git a/aea/crypto/plugin.py b/aea/crypto/plugin.py index daabb22c9b..62131319af 100644 --- a/aea/crypto/plugin.py +++ b/aea/crypto/plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/crypto/registries/__init__.py b/aea/crypto/registries/__init__.py index 0087cc6fe7..35c37aa35a 100644 --- a/aea/crypto/registries/__init__.py +++ b/aea/crypto/registries/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/crypto/registries/base.py b/aea/crypto/registries/base.py index 3ed81f2ace..580848eb22 100644 --- a/aea/crypto/registries/base.py +++ b/aea/crypto/registries/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/crypto/wallet.py b/aea/crypto/wallet.py index 9a242d5cd7..29dc4ca0a5 100644 --- a/aea/crypto/wallet.py +++ b/aea/crypto/wallet.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/decision_maker/__init__.py b/aea/decision_maker/__init__.py index 8fbd68d34e..3d887426f6 100644 --- a/aea/decision_maker/__init__.py +++ b/aea/decision_maker/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/decision_maker/base.py b/aea/decision_maker/base.py index db9402c10a..b9c1dc2a1a 100644 --- a/aea/decision_maker/base.py +++ b/aea/decision_maker/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/decision_maker/default.py b/aea/decision_maker/default.py index 3eb534682b..fbfae68b87 100644 --- a/aea/decision_maker/default.py +++ b/aea/decision_maker/default.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/decision_maker/gop.py b/aea/decision_maker/gop.py index 4a171cf498..43940741d0 100644 --- a/aea/decision_maker/gop.py +++ b/aea/decision_maker/gop.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/decision_maker/scaffold.py b/aea/decision_maker/scaffold.py index 5232f51929..33bc9b18ae 100644 --- a/aea/decision_maker/scaffold.py +++ b/aea/decision_maker/scaffold.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/error_handler/__init__.py b/aea/error_handler/__init__.py index 4c72d3b51b..c5d9690eb3 100644 --- a/aea/error_handler/__init__.py +++ b/aea/error_handler/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/error_handler/base.py b/aea/error_handler/base.py index c2dfd059ca..19b6708ec9 100644 --- a/aea/error_handler/base.py +++ b/aea/error_handler/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/error_handler/default.py b/aea/error_handler/default.py index a8bc9d05be..6502983218 100644 --- a/aea/error_handler/default.py +++ b/aea/error_handler/default.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/error_handler/scaffold.py b/aea/error_handler/scaffold.py index 5d8a94f138..af56314b11 100644 --- a/aea/error_handler/scaffold.py +++ b/aea/error_handler/scaffold.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/exceptions.py b/aea/exceptions.py index bdf6a5b502..a2a880795b 100644 --- a/aea/exceptions.py +++ b/aea/exceptions.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/__init__.py b/aea/helpers/__init__.py index ac3e5d55f5..159779d8a0 100644 --- a/aea/helpers/__init__.py +++ b/aea/helpers/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/acn/__init__.py b/aea/helpers/acn/__init__.py index 18773f4f42..efa8ffb81d 100644 --- a/aea/helpers/acn/__init__.py +++ b/aea/helpers/acn/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/acn/agent_record.py b/aea/helpers/acn/agent_record.py index 37e8a25b20..9d71f2a8d9 100644 --- a/aea/helpers/acn/agent_record.py +++ b/aea/helpers/acn/agent_record.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/acn/uri.py b/aea/helpers/acn/uri.py index 58ffc93e40..c3d91329ef 100644 --- a/aea/helpers/acn/uri.py +++ b/aea/helpers/acn/uri.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/async_friendly_queue.py b/aea/helpers/async_friendly_queue.py index 7c2e4f541d..f1f17f1427 100644 --- a/aea/helpers/async_friendly_queue.py +++ b/aea/helpers/async_friendly_queue.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py index 854c330572..a96dee61a6 100644 --- a/aea/helpers/async_utils.py +++ b/aea/helpers/async_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,10 +22,11 @@ import logging import time from abc import ABC, abstractmethod +from asyncio import CancelledError from asyncio.events import AbstractEventLoop, TimerHandle from asyncio.futures import Future from collections.abc import Iterable -from contextlib import contextmanager, suppress +from contextlib import contextmanager from threading import Thread from typing import ( Any, @@ -387,7 +388,6 @@ def __init__( self._threaded = threaded self._task: Optional[asyncio.Task] = None self._thread: Optional[Thread] = None - self._completed_event: Optional[asyncio.Event] = None self._got_result = False self._was_cancelled = False self._is_running: bool = False @@ -406,7 +406,6 @@ def start(self) -> bool: self._is_running = False self._got_result = False self._set_loop() - self._completed_event = asyncio.Event(loop=self._loop) self._was_cancelled = False if self._stop_called > 0: @@ -459,14 +458,15 @@ def _set_task(self) -> None: async def _run_wrapper(self) -> None: """Wrap run() method.""" - if not self._completed_event or not self._loop: # pragma: nocover + if not self._loop: # pragma: nocover raise ValueError("Start was not called!") self._is_running = True try: - with suppress(asyncio.CancelledError): - return await self.run() + return await self.run() + except CancelledError: + if not self._was_cancelled: + raise finally: - self._loop.call_soon_threadsafe(self._completed_event.set) self._is_running = False @property @@ -500,8 +500,7 @@ def wait_completed( if sync: self._wait_sync(timeout) return ready_future - - return self._wait_async(timeout) + return asyncio.wait_for(self._wait_async(timeout), timeout=timeout) def _wait_sync(self, timeout: Optional[float] = None) -> None: """Wait task completed in sync manner.""" @@ -560,13 +559,14 @@ def done(task: Future) -> None: async def _wait(self) -> None: """Wait internal method.""" - if not self._task or not self._completed_event: # pragma: nocover + if not self._task: # pragma: nocover raise ValueError("Not started") - await self._completed_event.wait() - try: await self._task + except CancelledError: + if not self._was_cancelled: + raise finally: self._got_result = True diff --git a/aea/helpers/base.py b/aea/helpers/base.py index 9dc2ca3915..b011e11568 100644 --- a/aea/helpers/base.py +++ b/aea/helpers/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/constants.py b/aea/helpers/constants.py index 2bff32f0bd..46decc5a3f 100644 --- a/aea/helpers/constants.py +++ b/aea/helpers/constants.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/env_vars.py b/aea/helpers/env_vars.py index 460aeeed1f..26d6180c72 100644 --- a/aea/helpers/env_vars.py +++ b/aea/helpers/env_vars.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/exception_policy.py b/aea/helpers/exception_policy.py index 30511ebd9d..9f9c48f3a9 100644 --- a/aea/helpers/exception_policy.py +++ b/aea/helpers/exception_policy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/exec_timeout.py b/aea/helpers/exec_timeout.py index 3ef99be12c..d709b997b6 100644 --- a/aea/helpers/exec_timeout.py +++ b/aea/helpers/exec_timeout.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -161,6 +161,7 @@ class ExecTimeoutThreadGuard(BaseExecTimeout): _stopped_future: Optional[Future] = None _start_count: int = 0 _lock: Lock = Lock() + _thread_started_event = threading.Event() def __init__(self, timeout: float = 0.0) -> None: """ @@ -187,11 +188,11 @@ def start(cls) -> None: return cls._loop = asyncio.new_event_loop() - cls._stopped_future = Future(loop=cls._loop) cls._supervisor_thread = threading.Thread( target=cls._supervisor_event_loop, daemon=True, name="ExecTimeout" ) cls._supervisor_thread.start() + cls._thread_started_event.wait() @classmethod def stop(cls, force: bool = False) -> None: @@ -227,6 +228,8 @@ def _supervisor_event_loop(cls) -> None: """Start supervisor thread to execute asyncio task controlling execution time.""" # pydocstyle: noqa # cause black reformats with pydocstyle conflict # noqa: E800 async def wait_stopped() -> None: + cls._stopped_future = Future() + cls._thread_started_event.set() await cls._stopped_future # type: ignore cls._loop.run_until_complete(wait_stopped()) # type: ignore diff --git a/aea/helpers/file_io.py b/aea/helpers/file_io.py index d498fb9780..da6207bfe5 100644 --- a/aea/helpers/file_io.py +++ b/aea/helpers/file_io.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/file_lock.py b/aea/helpers/file_lock.py index 28b104e655..e2d2f249d1 100644 --- a/aea/helpers/file_lock.py +++ b/aea/helpers/file_lock.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/http_requests.py b/aea/helpers/http_requests.py index 21d90ead0a..98f4df8e67 100644 --- a/aea/helpers/http_requests.py +++ b/aea/helpers/http_requests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/install_dependency.py b/aea/helpers/install_dependency.py index e0f15a38b2..48fc94e73b 100644 --- a/aea/helpers/install_dependency.py +++ b/aea/helpers/install_dependency.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/io.py b/aea/helpers/io.py index 1418218830..9a649fc754 100644 --- a/aea/helpers/io.py +++ b/aea/helpers/io.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/ipfs/__init__.py b/aea/helpers/ipfs/__init__.py index ace5bc9e04..bf4c75feaf 100644 --- a/aea/helpers/ipfs/__init__.py +++ b/aea/helpers/ipfs/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/ipfs/base.py b/aea/helpers/ipfs/base.py index e682967d91..baf365263d 100644 --- a/aea/helpers/ipfs/base.py +++ b/aea/helpers/ipfs/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/ipfs/pb/__init__.py b/aea/helpers/ipfs/pb/__init__.py index ac3e5d55f5..159779d8a0 100644 --- a/aea/helpers/ipfs/pb/__init__.py +++ b/aea/helpers/ipfs/pb/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/ipfs/pb/merkledag_pb2.py b/aea/helpers/ipfs/pb/merkledag_pb2.py index e58b9a94c8..9f44386907 100644 --- a/aea/helpers/ipfs/pb/merkledag_pb2.py +++ b/aea/helpers/ipfs/pb/merkledag_pb2.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: merkledag.proto - -import sys - -_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1")) +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -20,9 +17,8 @@ package="merkledag.pb", syntax="proto2", serialized_options=None, - serialized_pb=_b( - '\n\x0fmerkledag.proto\x12\x0cmerkledag.pb"3\n\x06PBLink\x12\x0c\n\x04Hash\x18\x01 \x01(\x0c\x12\x0c\n\x04Name\x18\x02 \x01(\t\x12\r\n\x05Tsize\x18\x03 \x01(\x04";\n\x06PBNode\x12#\n\x05Links\x18\x02 \x03(\x0b\x32\x14.merkledag.pb.PBLink\x12\x0c\n\x04\x44\x61ta\x18\x01 \x01(\x0c' - ), + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0fmerkledag.proto\x12\x0cmerkledag.pb"3\n\x06PBLink\x12\x0c\n\x04Hash\x18\x01 \x01(\x0c\x12\x0c\n\x04Name\x18\x02 \x01(\t\x12\r\n\x05Tsize\x18\x03 \x01(\x04";\n\x06PBNode\x12#\n\x05Links\x18\x02 \x03(\x0b\x32\x14.merkledag.pb.PBLink\x12\x0c\n\x04\x44\x61ta\x18\x01 \x01(\x0c', ) @@ -32,6 +28,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="Hash", @@ -42,7 +39,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=_b(""), + default_value=b"", message_type=None, enum_type=None, containing_type=None, @@ -50,6 +47,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="Name", @@ -60,7 +58,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=_b("").decode("utf-8"), + default_value=b"".decode("utf-8"), message_type=None, enum_type=None, containing_type=None, @@ -68,6 +66,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="Tsize", @@ -86,6 +85,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -107,6 +107,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="Links", @@ -125,6 +126,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="Data", @@ -135,7 +137,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=_b(""), + default_value=b"", message_type=None, enum_type=None, containing_type=None, @@ -143,6 +145,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -165,22 +168,22 @@ PBLink = _reflection.GeneratedProtocolMessageType( "PBLink", (_message.Message,), - dict( - DESCRIPTOR=_PBLINK, - __module__="merkledag_pb2" + { + "DESCRIPTOR": _PBLINK, + "__module__": "merkledag_pb2" # @@protoc_insertion_point(class_scope:merkledag.pb.PBLink) - ), + }, ) _sym_db.RegisterMessage(PBLink) PBNode = _reflection.GeneratedProtocolMessageType( "PBNode", (_message.Message,), - dict( - DESCRIPTOR=_PBNODE, - __module__="merkledag_pb2" + { + "DESCRIPTOR": _PBNODE, + "__module__": "merkledag_pb2" # @@protoc_insertion_point(class_scope:merkledag.pb.PBNode) - ), + }, ) _sym_db.RegisterMessage(PBNode) diff --git a/aea/helpers/ipfs/pb/unixfs_pb2.py b/aea/helpers/ipfs/pb/unixfs_pb2.py index 08d096b3c5..5e6ccb71c3 100644 --- a/aea/helpers/ipfs/pb/unixfs_pb2.py +++ b/aea/helpers/ipfs/pb/unixfs_pb2.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: unixfs.proto - -import sys - -_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1")) +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -20,9 +17,8 @@ package="unixfs.pb", syntax="proto2", serialized_options=None, - serialized_pb=_b( - '\n\x0cunixfs.proto\x12\tunixfs.pb"\xdc\x01\n\x04\x44\x61ta\x12&\n\x04Type\x18\x01 \x02(\x0e\x32\x18.unixfs.pb.Data.DataType\x12\x0c\n\x04\x44\x61ta\x18\x02 \x01(\x0c\x12\x10\n\x08\x66ilesize\x18\x03 \x01(\x04\x12\x12\n\nblocksizes\x18\x04 \x03(\x04\x12\x10\n\x08hashType\x18\x05 \x01(\x04\x12\x0e\n\x06\x66\x61nout\x18\x06 \x01(\x04"V\n\x08\x44\x61taType\x12\x07\n\x03Raw\x10\x00\x12\r\n\tDirectory\x10\x01\x12\x08\n\x04\x46ile\x10\x02\x12\x0c\n\x08Metadata\x10\x03\x12\x0b\n\x07Symlink\x10\x04\x12\r\n\tHAMTShard\x10\x05"\x1c\n\x08Metadata\x12\x10\n\x08MimeType\x18\x01 \x01(\t' - ), + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0cunixfs.proto\x12\tunixfs.pb"\xdc\x01\n\x04\x44\x61ta\x12&\n\x04Type\x18\x01 \x02(\x0e\x32\x18.unixfs.pb.Data.DataType\x12\x0c\n\x04\x44\x61ta\x18\x02 \x01(\x0c\x12\x10\n\x08\x66ilesize\x18\x03 \x01(\x04\x12\x12\n\nblocksizes\x18\x04 \x03(\x04\x12\x10\n\x08hashType\x18\x05 \x01(\x04\x12\x0e\n\x06\x66\x61nout\x18\x06 \x01(\x04"V\n\x08\x44\x61taType\x12\x07\n\x03Raw\x10\x00\x12\r\n\tDirectory\x10\x01\x12\x08\n\x04\x46ile\x10\x02\x12\x0c\n\x08Metadata\x10\x03\x12\x0b\n\x07Symlink\x10\x04\x12\r\n\tHAMTShard\x10\x05"\x1c\n\x08Metadata\x12\x10\n\x08MimeType\x18\x01 \x01(\t', ) @@ -31,24 +27,55 @@ full_name="unixfs.pb.Data.DataType", filename=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( - name="Raw", index=0, number=0, serialized_options=None, type=None + name="Raw", + index=0, + number=0, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="Directory", index=1, number=1, serialized_options=None, type=None + name="Directory", + index=1, + number=1, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="File", index=2, number=2, serialized_options=None, type=None + name="File", + index=2, + number=2, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="Metadata", index=3, number=3, serialized_options=None, type=None + name="Metadata", + index=3, + number=3, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="Symlink", index=4, number=4, serialized_options=None, type=None + name="Symlink", + index=4, + number=4, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="HAMTShard", index=5, number=5, serialized_options=None, type=None + name="HAMTShard", + index=5, + number=5, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), ], containing_type=None, @@ -65,6 +92,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="Type", @@ -83,6 +111,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="Data", @@ -93,7 +122,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=_b(""), + default_value=b"", message_type=None, enum_type=None, containing_type=None, @@ -101,6 +130,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="filesize", @@ -119,6 +149,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="blocksizes", @@ -137,6 +168,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="hashType", @@ -155,6 +187,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="fanout", @@ -173,6 +206,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -194,6 +228,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="MimeType", @@ -204,7 +239,7 @@ cpp_type=9, label=1, has_default_value=False, - default_value=_b("").decode("utf-8"), + default_value=b"".decode("utf-8"), message_type=None, enum_type=None, containing_type=None, @@ -212,6 +247,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -235,22 +271,22 @@ Data = _reflection.GeneratedProtocolMessageType( "Data", (_message.Message,), - dict( - DESCRIPTOR=_DATA, - __module__="unixfs_pb2" + { + "DESCRIPTOR": _DATA, + "__module__": "unixfs_pb2" # @@protoc_insertion_point(class_scope:unixfs.pb.Data) - ), + }, ) _sym_db.RegisterMessage(Data) Metadata = _reflection.GeneratedProtocolMessageType( "Metadata", (_message.Message,), - dict( - DESCRIPTOR=_METADATA, - __module__="unixfs_pb2" + { + "DESCRIPTOR": _METADATA, + "__module__": "unixfs_pb2" # @@protoc_insertion_point(class_scope:unixfs.pb.Metadata) - ), + }, ) _sym_db.RegisterMessage(Metadata) diff --git a/aea/helpers/ipfs/utils.py b/aea/helpers/ipfs/utils.py index a0b8e9bbd8..efaa2986aa 100644 --- a/aea/helpers/ipfs/utils.py +++ b/aea/helpers/ipfs/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2021 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/logging.py b/aea/helpers/logging.py index 897d439caf..bc92d6bd79 100644 --- a/aea/helpers/logging.py +++ b/aea/helpers/logging.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/multiaddr/__init__.py b/aea/helpers/multiaddr/__init__.py index 02dadfea86..469275834f 100644 --- a/aea/helpers/multiaddr/__init__.py +++ b/aea/helpers/multiaddr/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/multiaddr/base.py b/aea/helpers/multiaddr/base.py index 6d94aee9c5..79d1c03c23 100644 --- a/aea/helpers/multiaddr/base.py +++ b/aea/helpers/multiaddr/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/multiaddr/crypto_pb2.py b/aea/helpers/multiaddr/crypto_pb2.py index 9094243b4c..0cedc7ebc7 100644 --- a/aea/helpers/multiaddr/crypto_pb2.py +++ b/aea/helpers/multiaddr/crypto_pb2.py @@ -1,10 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: libp2p/crypto/pb/crypto.proto - -import sys - -_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1")) +# source: crypto.proto +"""Generated protocol buffer code.""" from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message @@ -17,13 +14,12 @@ DESCRIPTOR = _descriptor.FileDescriptor( - name="libp2p/crypto/pb/crypto.proto", + name="crypto.proto", package="crypto.pb", syntax="proto2", serialized_options=None, - serialized_pb=_b( - '\n\x1dlibp2p/crypto/pb/crypto.proto\x12\tcrypto.pb"?\n\tPublicKey\x12$\n\x08key_type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c"@\n\nPrivateKey\x12$\n\x08key_type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c*9\n\x07KeyType\x12\x07\n\x03RSA\x10\x00\x12\x0b\n\x07\x45\x64\x32\x35\x35\x31\x39\x10\x01\x12\r\n\tSecp256k1\x10\x02\x12\t\n\x05\x45\x43\x44SA\x10\x03' - ), + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0c\x63rypto.proto\x12\tcrypto.pb"?\n\tPublicKey\x12$\n\x08key_type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c"@\n\nPrivateKey\x12$\n\x08key_type\x18\x01 \x02(\x0e\x32\x12.crypto.pb.KeyType\x12\x0c\n\x04\x64\x61ta\x18\x02 \x02(\x0c*9\n\x07KeyType\x12\x07\n\x03RSA\x10\x00\x12\x0b\n\x07\x45\x64\x32\x35\x35\x31\x39\x10\x01\x12\r\n\tSecp256k1\x10\x02\x12\t\n\x05\x45\x43\x44SA\x10\x03', ) _KEYTYPE = _descriptor.EnumDescriptor( @@ -31,24 +27,45 @@ full_name="crypto.pb.KeyType", filename=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( - name="RSA", index=0, number=0, serialized_options=None, type=None + name="RSA", + index=0, + number=0, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="Ed25519", index=1, number=1, serialized_options=None, type=None + name="Ed25519", + index=1, + number=1, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="Secp256k1", index=2, number=2, serialized_options=None, type=None + name="Secp256k1", + index=2, + number=2, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="ECDSA", index=3, number=3, serialized_options=None, type=None + name="ECDSA", + index=3, + number=3, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), ], containing_type=None, serialized_options=None, - serialized_start=175, - serialized_end=232, + serialized_start=158, + serialized_end=215, ) _sym_db.RegisterEnumDescriptor(_KEYTYPE) @@ -65,6 +82,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="key_type", @@ -83,6 +101,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="data", @@ -93,7 +112,7 @@ cpp_type=9, label=2, has_default_value=False, - default_value=_b(""), + default_value=b"", message_type=None, enum_type=None, containing_type=None, @@ -101,6 +120,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -111,8 +131,8 @@ syntax="proto2", extension_ranges=[], oneofs=[], - serialized_start=44, - serialized_end=107, + serialized_start=27, + serialized_end=90, ) @@ -122,6 +142,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="key_type", @@ -140,6 +161,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="data", @@ -150,7 +172,7 @@ cpp_type=9, label=2, has_default_value=False, - default_value=_b(""), + default_value=b"", message_type=None, enum_type=None, containing_type=None, @@ -158,6 +180,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -168,8 +191,8 @@ syntax="proto2", extension_ranges=[], oneofs=[], - serialized_start=109, - serialized_end=173, + serialized_start=92, + serialized_end=156, ) _PUBLICKEY.fields_by_name["key_type"].enum_type = _KEYTYPE @@ -184,7 +207,7 @@ (_message.Message,), { "DESCRIPTOR": _PUBLICKEY, - "__module__": "libp2p.crypto.pb.crypto_pb2" + "__module__": "crypto_pb2" # @@protoc_insertion_point(class_scope:crypto.pb.PublicKey) }, ) @@ -195,7 +218,7 @@ (_message.Message,), { "DESCRIPTOR": _PRIVATEKEY, - "__module__": "libp2p.crypto.pb.crypto_pb2" + "__module__": "crypto_pb2" # @@protoc_insertion_point(class_scope:crypto.pb.PrivateKey) }, ) diff --git a/aea/helpers/multiple_executor.py b/aea/helpers/multiple_executor.py index 89dc98e878..2f17e4e969 100644 --- a/aea/helpers/multiple_executor.py +++ b/aea/helpers/multiple_executor.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/pipe.py b/aea/helpers/pipe.py index 6785745e95..b5cc50acc7 100644 --- a/aea/helpers/pipe.py +++ b/aea/helpers/pipe.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -571,7 +571,7 @@ async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool: async def _open_connection(self) -> TCPSocketProtocol: reader, writer = await asyncio.open_connection( - self._host, self._port, loop=self._loop, # pylint: disable=protected-access + self._host, self._port, # pylint: disable=protected-access ) return TCPSocketProtocol(reader, writer, logger=self.logger, loop=self._loop) diff --git a/aea/helpers/preference_representations/__init__.py b/aea/helpers/preference_representations/__init__.py index e1e1ea50e9..e112fb0362 100644 --- a/aea/helpers/preference_representations/__init__.py +++ b/aea/helpers/preference_representations/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/preference_representations/base.py b/aea/helpers/preference_representations/base.py index a0cf3f0546..0bb05ae6f6 100644 --- a/aea/helpers/preference_representations/base.py +++ b/aea/helpers/preference_representations/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/profiling.py b/aea/helpers/profiling.py index 31ac404f06..f3269eb36f 100644 --- a/aea/helpers/profiling.py +++ b/aea/helpers/profiling.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/search/__init__.py b/aea/helpers/search/__init__.py index 6436b560e0..d9b0f9e633 100644 --- a/aea/helpers/search/__init__.py +++ b/aea/helpers/search/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/search/generic.py b/aea/helpers/search/generic.py index 9aa341db71..5e8188af0e 100644 --- a/aea/helpers/search/generic.py +++ b/aea/helpers/search/generic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/search/models.py b/aea/helpers/search/models.py index b79d9d88c4..70a7d1ac8c 100644 --- a/aea/helpers/search/models.py +++ b/aea/helpers/search/models.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/search/models_pb2.py b/aea/helpers/search/models_pb2.py index c66e9aadf1..16109f809a 100644 --- a/aea/helpers/search/models_pb2.py +++ b/aea/helpers/search/models_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: models.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -17,6 +17,7 @@ package="aea.helpers.search.models", syntax="proto3", serialized_options=b"H\001", + create_key=_descriptor._internal_create_key, serialized_pb=b'\n\x0cmodels.proto\x12\x19\x61\x65\x61.helpers.search.models"\xc1\x19\n\x05Query\x1a\xc0\x01\n\tAttribute\x12\x0c\n\x04name\x18\x01 \x01(\t\x12=\n\x04type\x18\x02 \x01(\x0e\x32/.aea.helpers.search.models.Query.Attribute.Type\x12\x10\n\x08required\x18\x03 \x01(\x08\x12\x13\n\x0b\x64\x65scription\x18\x04 \x01(\t"?\n\x04Type\x12\n\n\x06\x44OUBLE\x10\x00\x12\x07\n\x03INT\x10\x01\x12\x08\n\x04\x42OOL\x10\x02\x12\n\n\x06STRING\x10\x03\x12\x0c\n\x08LOCATION\x10\x04\x1an\n\tDataModel\x12\x0c\n\x04name\x18\x01 \x01(\t\x12>\n\nattributes\x18\x02 \x03(\x0b\x32*.aea.helpers.search.models.Query.Attribute\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x1a$\n\x08Location\x12\x0b\n\x03lon\x18\x01 \x01(\x01\x12\x0b\n\x03lat\x18\x02 \x01(\x01\x1a\x99\x01\n\x05Value\x12\x10\n\x06string\x18\x01 \x01(\tH\x00\x12\x10\n\x06\x64ouble\x18\x02 \x01(\x01H\x00\x12\x11\n\x07\x62oolean\x18\x03 \x01(\x08H\x00\x12\x11\n\x07integer\x18\x04 \x01(\x03H\x00\x12=\n\x08location\x18\x05 \x01(\x0b\x32).aea.helpers.search.models.Query.LocationH\x00\x42\x07\n\x05value\x1aN\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.aea.helpers.search.models.Query.Value\x1a\x80\x01\n\x08Instance\x12\x39\n\x05model\x18\x01 \x01(\x0b\x32*.aea.helpers.search.models.Query.DataModel\x12\x39\n\x06values\x18\x02 \x03(\x0b\x32).aea.helpers.search.models.Query.KeyValue\x1a+\n\nStringPair\x12\r\n\x05\x66irst\x18\x01 \x01(\t\x12\x0e\n\x06second\x18\x02 \x01(\t\x1a(\n\x07IntPair\x12\r\n\x05\x66irst\x18\x01 \x01(\x03\x12\x0e\n\x06second\x18\x02 \x01(\x03\x1a+\n\nDoublePair\x12\r\n\x05\x66irst\x18\x01 \x01(\x01\x12\x0e\n\x06second\x18\x02 \x01(\x01\x1a\x83\x01\n\x0cLocationPair\x12\x38\n\x05\x66irst\x18\x01 \x01(\x0b\x32).aea.helpers.search.models.Query.Location\x12\x39\n\x06second\x18\x02 \x01(\x0b\x32).aea.helpers.search.models.Query.Location\x1a\xa1\x02\n\x05Range\x12\x42\n\x0bstring_pair\x18\x01 \x01(\x0b\x32+.aea.helpers.search.models.Query.StringPairH\x00\x12@\n\x0cinteger_pair\x18\x02 \x01(\x0b\x32(.aea.helpers.search.models.Query.IntPairH\x00\x12\x42\n\x0b\x64ouble_pair\x18\x03 \x01(\x0b\x32+.aea.helpers.search.models.Query.DoublePairH\x00\x12\x46\n\rlocation_pair\x18\x04 \x01(\x0b\x32-.aea.helpers.search.models.Query.LocationPairH\x00\x42\x06\n\x04pair\x1aW\n\x08\x44istance\x12\x39\n\x06\x63\x65nter\x18\x01 \x01(\x0b\x32).aea.helpers.search.models.Query.Location\x12\x10\n\x08\x64istance\x18\x02 \x01(\x01\x1a\xca\x01\n\x08Relation\x12\x44\n\x08operator\x18\x01 \x01(\x0e\x32\x32.aea.helpers.search.models.Query.Relation.Operator\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.aea.helpers.search.models.Query.Value"A\n\x08Operator\x12\x06\n\x02\x45Q\x10\x00\x12\x06\n\x02LT\x10\x01\x12\x08\n\x04LTEQ\x10\x02\x12\x06\n\x02GT\x10\x03\x12\x08\n\x04GTEQ\x10\x04\x12\t\n\x05NOTEQ\x10\x05\x1a\xca\x05\n\x03Set\x12?\n\x08operator\x18\x01 \x01(\x0e\x32-.aea.helpers.search.models.Query.Set.Operator\x12;\n\x06values\x18\x02 \x01(\x0b\x32+.aea.helpers.search.models.Query.Set.Values\x1a\xa5\x04\n\x06Values\x12\x45\n\x06string\x18\x01 \x01(\x0b\x32\x33.aea.helpers.search.models.Query.Set.Values.StringsH\x00\x12\x45\n\x06\x64ouble\x18\x02 \x01(\x0b\x32\x33.aea.helpers.search.models.Query.Set.Values.DoublesH\x00\x12\x44\n\x07\x62oolean\x18\x03 \x01(\x0b\x32\x31.aea.helpers.search.models.Query.Set.Values.BoolsH\x00\x12\x43\n\x07integer\x18\x04 \x01(\x0b\x32\x30.aea.helpers.search.models.Query.Set.Values.IntsH\x00\x12I\n\x08location\x18\x05 \x01(\x0b\x32\x35.aea.helpers.search.models.Query.Set.Values.LocationsH\x00\x1a\x16\n\x04Ints\x12\x0e\n\x06values\x18\x01 \x03(\x03\x1a\x19\n\x07\x44oubles\x12\x0e\n\x06values\x18\x01 \x03(\x01\x1a\x19\n\x07Strings\x12\x0e\n\x06values\x18\x01 \x03(\t\x1a\x17\n\x05\x42ools\x12\x0e\n\x06values\x18\x01 \x03(\x08\x1a\x46\n\tLocations\x12\x39\n\x06values\x18\x01 \x03(\x0b\x32).aea.helpers.search.models.Query.LocationB\x08\n\x06values"\x1d\n\x08Operator\x12\x06\n\x02IN\x10\x00\x12\t\n\x05NOTIN\x10\x01\x1a\xc3\x06\n\x0e\x43onstraintExpr\x12\x41\n\x03or_\x18\x01 \x01(\x0b\x32\x32.aea.helpers.search.models.Query.ConstraintExpr.OrH\x00\x12\x43\n\x04\x61nd_\x18\x02 \x01(\x0b\x32\x33.aea.helpers.search.models.Query.ConstraintExpr.AndH\x00\x12\x43\n\x04not_\x18\x03 \x01(\x0b\x32\x33.aea.helpers.search.models.Query.ConstraintExpr.NotH\x00\x12P\n\nconstraint\x18\x04 \x01(\x0b\x32:.aea.helpers.search.models.Query.ConstraintExpr.ConstraintH\x00\x1aI\n\x02Or\x12\x43\n\nexpression\x18\x01 \x03(\x0b\x32/.aea.helpers.search.models.Query.ConstraintExpr\x1aJ\n\x03\x41nd\x12\x43\n\nexpression\x18\x01 \x03(\x0b\x32/.aea.helpers.search.models.Query.ConstraintExpr\x1aJ\n\x03Not\x12\x43\n\nexpression\x18\x01 \x01(\x0b\x32/.aea.helpers.search.models.Query.ConstraintExpr\x1a\xa0\x02\n\nConstraint\x12\x16\n\x0e\x61ttribute_name\x18\x01 \x01(\t\x12\x34\n\x04set_\x18\x02 \x01(\x0b\x32$.aea.helpers.search.models.Query.SetH\x00\x12\x38\n\x06range_\x18\x03 \x01(\x0b\x32&.aea.helpers.search.models.Query.RangeH\x00\x12=\n\x08relation\x18\x04 \x01(\x0b\x32).aea.helpers.search.models.Query.RelationH\x00\x12=\n\x08\x64istance\x18\x05 \x01(\x0b\x32).aea.helpers.search.models.Query.DistanceH\x00\x42\x0c\n\nconstraintB\x0c\n\nexpression\x1a\x88\x01\n\x05Model\x12\x44\n\x0b\x63onstraints\x18\x01 \x03(\x0b\x32/.aea.helpers.search.models.Query.ConstraintExpr\x12\x39\n\x05model\x18\x02 \x01(\x0b\x32*.aea.helpers.search.models.Query.DataModelB\x02H\x01\x62\x06proto3', ) @@ -26,21 +27,47 @@ full_name="aea.helpers.search.models.Query.Attribute.Type", filename=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( - name="DOUBLE", index=0, number=0, serialized_options=None, type=None + name="DOUBLE", + index=0, + number=0, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="INT", index=1, number=1, serialized_options=None, type=None + name="INT", + index=1, + number=1, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="BOOL", index=2, number=2, serialized_options=None, type=None + name="BOOL", + index=2, + number=2, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="STRING", index=3, number=3, serialized_options=None, type=None + name="STRING", + index=3, + number=3, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="LOCATION", index=4, number=4, serialized_options=None, type=None + name="LOCATION", + index=4, + number=4, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), ], containing_type=None, @@ -55,24 +82,55 @@ full_name="aea.helpers.search.models.Query.Relation.Operator", filename=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( - name="EQ", index=0, number=0, serialized_options=None, type=None + name="EQ", + index=0, + number=0, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="LT", index=1, number=1, serialized_options=None, type=None + name="LT", + index=1, + number=1, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="LTEQ", index=2, number=2, serialized_options=None, type=None + name="LTEQ", + index=2, + number=2, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="GT", index=3, number=3, serialized_options=None, type=None + name="GT", + index=3, + number=3, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="GTEQ", index=4, number=4, serialized_options=None, type=None + name="GTEQ", + index=4, + number=4, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="NOTEQ", index=5, number=5, serialized_options=None, type=None + name="NOTEQ", + index=5, + number=5, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), ], containing_type=None, @@ -87,12 +145,23 @@ full_name="aea.helpers.search.models.Query.Set.Operator", filename=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, values=[ _descriptor.EnumValueDescriptor( - name="IN", index=0, number=0, serialized_options=None, type=None + name="IN", + index=0, + number=0, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), _descriptor.EnumValueDescriptor( - name="NOTIN", index=1, number=1, serialized_options=None, type=None + name="NOTIN", + index=1, + number=1, + serialized_options=None, + type=None, + create_key=_descriptor._internal_create_key, ), ], containing_type=None, @@ -109,6 +178,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="name", @@ -127,6 +197,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="type", @@ -145,6 +216,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="required", @@ -163,6 +235,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="description", @@ -181,6 +254,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -201,6 +275,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="name", @@ -219,6 +294,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="attributes", @@ -237,6 +313,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="description", @@ -255,6 +332,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -275,6 +353,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="lon", @@ -293,6 +372,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="lat", @@ -311,6 +391,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -331,6 +412,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="string", @@ -349,6 +431,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="double", @@ -367,6 +450,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="boolean", @@ -385,6 +469,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="integer", @@ -403,6 +488,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="location", @@ -421,6 +507,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -436,6 +523,7 @@ full_name="aea.helpers.search.models.Query.Value.value", index=0, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], ), ], @@ -449,6 +537,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="key", @@ -467,6 +556,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="value", @@ -485,6 +575,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -505,6 +596,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="model", @@ -523,6 +615,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="values", @@ -541,6 +634,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -561,6 +655,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="first", @@ -579,6 +674,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="second", @@ -597,6 +693,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -617,6 +714,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="first", @@ -635,6 +733,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="second", @@ -653,6 +752,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -673,6 +773,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="first", @@ -691,6 +792,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="second", @@ -709,6 +811,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -729,6 +832,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="first", @@ -747,6 +851,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="second", @@ -765,6 +870,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -785,6 +891,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="string_pair", @@ -803,6 +910,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="integer_pair", @@ -821,6 +929,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="double_pair", @@ -839,6 +948,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="location_pair", @@ -857,6 +967,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -872,6 +983,7 @@ full_name="aea.helpers.search.models.Query.Range.pair", index=0, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], ), ], @@ -885,6 +997,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="center", @@ -903,6 +1016,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="distance", @@ -921,6 +1035,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -941,6 +1056,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="operator", @@ -959,6 +1075,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="value", @@ -977,6 +1094,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -997,6 +1115,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="values", @@ -1015,6 +1134,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1035,6 +1155,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="values", @@ -1053,6 +1174,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1073,6 +1195,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="values", @@ -1091,6 +1214,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1111,6 +1235,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="values", @@ -1129,6 +1254,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1149,6 +1275,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="values", @@ -1167,6 +1294,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1187,6 +1315,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="string", @@ -1205,6 +1334,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="double", @@ -1223,6 +1353,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="boolean", @@ -1241,6 +1372,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="integer", @@ -1259,6 +1391,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="location", @@ -1277,6 +1410,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1298,6 +1432,7 @@ full_name="aea.helpers.search.models.Query.Set.Values.values", index=0, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], ), ], @@ -1311,6 +1446,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="operator", @@ -1329,6 +1465,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="values", @@ -1347,6 +1484,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1367,6 +1505,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="expression", @@ -1385,6 +1524,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1405,6 +1545,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="expression", @@ -1423,6 +1564,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1443,6 +1585,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="expression", @@ -1461,6 +1604,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1481,6 +1625,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="attribute_name", @@ -1499,6 +1644,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="set_", @@ -1517,6 +1663,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="range_", @@ -1535,6 +1682,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="relation", @@ -1553,6 +1701,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="distance", @@ -1571,6 +1720,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1586,6 +1736,7 @@ full_name="aea.helpers.search.models.Query.ConstraintExpr.Constraint.constraint", index=0, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], ), ], @@ -1599,6 +1750,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="or_", @@ -1617,6 +1769,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="and_", @@ -1635,6 +1788,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="not_", @@ -1653,6 +1807,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="constraint", @@ -1671,6 +1826,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1691,6 +1847,7 @@ full_name="aea.helpers.search.models.Query.ConstraintExpr.expression", index=0, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], ), ], @@ -1704,6 +1861,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="constraints", @@ -1722,6 +1880,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="model", @@ -1740,6 +1899,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -1760,6 +1920,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[ diff --git a/aea/helpers/serializers.py b/aea/helpers/serializers.py index d7aed23c34..28bd0c8a45 100644 --- a/aea/helpers/serializers.py +++ b/aea/helpers/serializers.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/storage/__init__.py b/aea/helpers/storage/__init__.py index 3de6e123d2..0e7c44c239 100644 --- a/aea/helpers/storage/__init__.py +++ b/aea/helpers/storage/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/storage/backends/__init__.py b/aea/helpers/storage/backends/__init__.py index 44571706f0..f64430dd79 100644 --- a/aea/helpers/storage/backends/__init__.py +++ b/aea/helpers/storage/backends/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/storage/backends/base.py b/aea/helpers/storage/backends/base.py index cb0c46b20c..3e4f59d1a0 100644 --- a/aea/helpers/storage/backends/base.py +++ b/aea/helpers/storage/backends/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/storage/backends/sqlite.py b/aea/helpers/storage/backends/sqlite.py index 75fdb1c182..abbbee5f20 100644 --- a/aea/helpers/storage/backends/sqlite.py +++ b/aea/helpers/storage/backends/sqlite.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/storage/generic_storage.py b/aea/helpers/storage/generic_storage.py index 0c59f16bdc..84d1e19b06 100644 --- a/aea/helpers/storage/generic_storage.py +++ b/aea/helpers/storage/generic_storage.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/sym_link.py b/aea/helpers/sym_link.py index 52e330dd63..d3011d77d0 100644 --- a/aea/helpers/sym_link.py +++ b/aea/helpers/sym_link.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/transaction/__init__.py b/aea/helpers/transaction/__init__.py index 23d1a274f7..a512fbf65b 100644 --- a/aea/helpers/transaction/__init__.py +++ b/aea/helpers/transaction/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/transaction/base.py b/aea/helpers/transaction/base.py index 86d71ac2c3..15511f68f1 100644 --- a/aea/helpers/transaction/base.py +++ b/aea/helpers/transaction/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/win32.py b/aea/helpers/win32.py index dcbaaf1853..72560b32ba 100644 --- a/aea/helpers/win32.py +++ b/aea/helpers/win32.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/helpers/yaml_utils.py b/aea/helpers/yaml_utils.py index e776ec3f84..3036d72145 100644 --- a/aea/helpers/yaml_utils.py +++ b/aea/helpers/yaml_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/identity/__init__.py b/aea/identity/__init__.py index be9c6a9c13..d059f3eb55 100644 --- a/aea/identity/__init__.py +++ b/aea/identity/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/identity/base.py b/aea/identity/base.py index fea4b57399..2776618f97 100644 --- a/aea/identity/base.py +++ b/aea/identity/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/launcher.py b/aea/launcher.py index 995a246696..2df3850e9d 100644 --- a/aea/launcher.py +++ b/aea/launcher.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -98,6 +98,10 @@ def _run_agent( selector = selectors.SelectSelector() loop = asyncio.SelectorEventLoop(selector) # type: ignore asyncio.set_event_loop(loop) + try: + asyncio.get_event_loop() + except Exception: # pylint: disable=broad-except + asyncio.set_event_loop(asyncio.new_event_loop()) _set_logger(log_level=log_level) diff --git a/aea/mail/__init__.py b/aea/mail/__init__.py index eab7f351a1..c70fcf54e9 100644 --- a/aea/mail/__init__.py +++ b/aea/mail/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/mail/base.py b/aea/mail/base.py index 4b6de700ae..eb11e2225b 100644 --- a/aea/mail/base.py +++ b/aea/mail/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/mail/base_pb2.py b/aea/mail/base_pb2.py index 281d3b9f77..3c819cf87f 100644 --- a/aea/mail/base_pb2.py +++ b/aea/mail/base_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: base.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -20,6 +20,7 @@ package="aea.base.v0_1_0", syntax="proto3", serialized_options=None, + create_key=_descriptor._internal_create_key, serialized_pb=b'\n\nbase.proto\x12\x0f\x61\x65\x61.base.v0_1_0\x1a\x1cgoogle/protobuf/struct.proto"\x90\x01\n\x0f\x44ialogueMessage\x12\x12\n\nmessage_id\x18\x01 \x01(\x05\x12"\n\x1a\x64ialogue_starter_reference\x18\x02 \x01(\t\x12$\n\x1c\x64ialogue_responder_reference\x18\x03 \x01(\t\x12\x0e\n\x06target\x18\x04 \x01(\x05\x12\x0f\n\x07\x63ontent\x18\x05 \x01(\x0c"{\n\x07Message\x12\'\n\x04\x62ody\x18\x01 \x01(\x0b\x32\x17.google.protobuf.StructH\x00\x12<\n\x10\x64ialogue_message\x18\x02 \x01(\x0b\x32 .aea.base.v0_1_0.DialogueMessageH\x00\x42\t\n\x07message"Y\n\x08\x45nvelope\x12\n\n\x02to\x18\x01 \x01(\t\x12\x0e\n\x06sender\x18\x02 \x01(\t\x12\x13\n\x0bprotocol_id\x18\x03 \x01(\t\x12\x0f\n\x07message\x18\x04 \x01(\x0c\x12\x0b\n\x03uri\x18\x05 \x01(\tb\x06proto3', dependencies=[google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,], ) @@ -31,6 +32,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="message_id", @@ -49,6 +51,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="dialogue_starter_reference", @@ -67,6 +70,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="dialogue_responder_reference", @@ -85,6 +89,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="target", @@ -103,6 +108,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="content", @@ -121,6 +127,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -142,6 +149,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="body", @@ -160,6 +168,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="dialogue_message", @@ -178,6 +187,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], @@ -193,6 +203,7 @@ full_name="aea.base.v0_1_0.Message.message", index=0, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[], ), ], @@ -207,6 +218,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name="to", @@ -225,6 +237,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="sender", @@ -243,6 +256,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="protocol_id", @@ -261,6 +275,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="message", @@ -279,6 +294,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), _descriptor.FieldDescriptor( name="uri", @@ -297,6 +313,7 @@ extension_scope=None, serialized_options=None, file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, ), ], extensions=[], diff --git a/aea/manager/__init__.py b/aea/manager/__init__.py index a49ba9a54d..f42ec6cc43 100644 --- a/aea/manager/__init__.py +++ b/aea/manager/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/manager/manager.py b/aea/manager/manager.py index 4ac41b6008..0f5968a606 100644 --- a/aea/manager/manager.py +++ b/aea/manager/manager.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -130,8 +130,8 @@ def create_run_loop(self) -> None: def start(self) -> None: """Start task.""" self.create_run_loop() + self._done_future = asyncio.Future() self.task = self.run_loop.create_task(self._run_wrapper()) - self._done_future = asyncio.Future(loop=self.caller_loop) def wait(self) -> asyncio.Future: """Return future to wait task completed.""" @@ -436,13 +436,11 @@ def projects(self) -> Dict[PublicId, Project]: def _run_thread(self) -> None: """Run internal thread with own event loop.""" self._loop = asyncio.new_event_loop() - self._event = asyncio.Event(loop=self._loop) self._loop.run_until_complete(self._manager_loop()) async def _manager_loop(self) -> None: """Await and control running manager.""" - if not self._event: # pragma: nocover - raise ValueError("Do not use this method directly, use start_manager.") + self._event = asyncio.Event() self._started_event.set() @@ -451,7 +449,10 @@ async def _manager_loop(self) -> None: task.wait(): agent_name for agent_name, task in self._agents_tasks.items() } - wait_tasks = list(agents_run_tasks_futures.keys()) + [self._event.wait()] # type: ignore + wait_tasks = [ + asyncio.ensure_future(i) + for i in [*agents_run_tasks_futures.keys(), self._event.wait()] + ] done, _ = await asyncio.wait(wait_tasks, return_when=FIRST_COMPLETED) if self._event.is_set(): @@ -467,7 +468,7 @@ async def _manager_loop(self) -> None: self._agents_tasks.pop(agent_name) if task.exception(): for callback in self._error_callbacks: - callback(agent_name, task.exception()) + callback(agent_name, task.exception()) # type: ignore else: await task @@ -871,6 +872,20 @@ def start_agent(self, agent_name: str) -> "MultiAgentManager": if self._is_agent_running(agent_name): raise ValueError(f"{agent_name} is already started!") + event = threading.Event() + self._loop.call_soon_threadsafe( + self._make_agent_task, agent_name, agent_alias, event + ) + event.wait(30) # if something goes wrong + del event + + self._loop.call_soon_threadsafe(self._event.set) + return self + + def _make_agent_task( + self, agent_name: str, agent_alias: AgentAlias, event: threading.Event + ) -> None: + """Create and start agent task.""" task_cls = self._MODE_TASK_CLASS[self._mode] if self._mode == MULTIPROCESS_MODE: task = task_cls(agent_alias, self._loop) @@ -878,12 +893,9 @@ def start_agent(self, agent_name: str) -> "MultiAgentManager": agent = agent_alias.get_aea_instance() task = task_cls(agent, self._loop) - task.start() - self._agents_tasks[agent_name] = task - - self._loop.call_soon_threadsafe(self._event.set) - return self + task.start() + event.set() def _is_agent_running(self, agent_name: str) -> bool: """Return is agent task in running state.""" diff --git a/aea/manager/project.py b/aea/manager/project.py index d46e1484cb..052ec2aa69 100644 --- a/aea/manager/project.py +++ b/aea/manager/project.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/manager/utils.py b/aea/manager/utils.py index f28c117d1d..6e837ed86e 100644 --- a/aea/manager/utils.py +++ b/aea/manager/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2021 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/multiplexer.py b/aea/multiplexer.py index 87cf4c7a11..cc88fd1820 100644 --- a/aea/multiplexer.py +++ b/aea/multiplexer.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,6 +86,8 @@ class AsyncMultiplexer(Runnable, WithLogger): CONNECT_TIMEOUT = 60 SEND_TIMEOUT = 60 + _lock: asyncio.Lock + def __init__( self, connections: Optional[Sequence[Connection]] = None, @@ -158,7 +160,6 @@ def __init__( self._send_loop_task = None # type: Optional[asyncio.Task] self._loop: asyncio.AbstractEventLoop = loop if loop is not None else asyncio.new_event_loop() - self._lock: asyncio.Lock = asyncio.Lock(loop=self._loop) self.set_loop(self._loop) @property @@ -239,7 +240,7 @@ def set_loop(self, loop: AbstractEventLoop) -> None: :param loop: asyncio event loop. """ self._loop = loop - self._lock = asyncio.Lock(loop=self._loop) + self._lock = asyncio.Lock() def _handle_exception(self, fn: Callable, exc: Exception) -> None: """ diff --git a/aea/protocols/__init__.py b/aea/protocols/__init__.py index afb35bc2a9..43fb466153 100644 --- a/aea/protocols/__init__.py +++ b/aea/protocols/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/base.py b/aea/protocols/base.py index 2217cae1e1..c6133dc40d 100644 --- a/aea/protocols/base.py +++ b/aea/protocols/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/dialogue/__init__.py b/aea/protocols/dialogue/__init__.py index 5de85137b2..41d3e3f2c4 100644 --- a/aea/protocols/dialogue/__init__.py +++ b/aea/protocols/dialogue/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/dialogue/base.py b/aea/protocols/dialogue/base.py index f5d9bd4983..53d472a38a 100644 --- a/aea/protocols/dialogue/base.py +++ b/aea/protocols/dialogue/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/generator/__init__.py b/aea/protocols/generator/__init__.py index b27f8a4910..fd51681ebe 100644 --- a/aea/protocols/generator/__init__.py +++ b/aea/protocols/generator/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/generator/base.py b/aea/protocols/generator/base.py index 792c21c5ad..136b0ea5e2 100644 --- a/aea/protocols/generator/base.py +++ b/aea/protocols/generator/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import shutil # pylint: skip-file -from datetime import date from pathlib import Path from typing import Optional, Tuple @@ -105,6 +104,9 @@ def _type_check(variable_name: str, variable_type: str) -> str: return f"type({variable_name}) is {variable_type}" +copy_right_str = "# -*- coding: utf-8 -*-\n" + + def _copyright_header_str(author: str) -> str: """ Produce the copyright header text for a protocol. @@ -112,28 +114,6 @@ def _copyright_header_str(author: str) -> str: :param author: the author of the protocol. :return: The copyright header text. """ - copy_right_str = ( - "# -*- coding: utf-8 -*-\n" - "# ------------------------------------------------------------------------------\n" - "#\n" - ) - copy_right_str += "# Copyright {} {}\n".format(date.today().year, author) - copy_right_str += ( - "#\n" - '# Licensed under the Apache License, Version 2.0 (the "License");\n' - "# you may not use this file except in compliance with the License.\n" - "# You may obtain a copy of the License at\n" - "#\n" - "# http://www.apache.org/licenses/LICENSE-2.0\n" - "#\n" - "# Unless required by applicable law or agreed to in writing, software\n" - '# distributed under the License is distributed on an "AS IS" BASIS,\n' - "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" - "# See the License for the specific language governing permissions and\n" - "# limitations under the License.\n" - "#\n" - "# ------------------------------------------------------------------------------\n" - ) return copy_right_str diff --git a/aea/protocols/generator/common.py b/aea/protocols/generator/common.py index e56e376cdd..f11b3fa8a3 100644 --- a/aea/protocols/generator/common.py +++ b/aea/protocols/generator/common.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/generator/extract_specification.py b/aea/protocols/generator/extract_specification.py index 0e06dfc33c..1d33292770 100644 --- a/aea/protocols/generator/extract_specification.py +++ b/aea/protocols/generator/extract_specification.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/generator/validate.py b/aea/protocols/generator/validate.py index 4f418bca62..bcae8364ba 100644 --- a/aea/protocols/generator/validate.py +++ b/aea/protocols/generator/validate.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/scaffold/__init__.py b/aea/protocols/scaffold/__init__.py index 8529f6170f..3ce52e6a1c 100644 --- a/aea/protocols/scaffold/__init__.py +++ b/aea/protocols/scaffold/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/scaffold/message.py b/aea/protocols/scaffold/message.py index 5e3c071232..af12aa4cf6 100644 --- a/aea/protocols/scaffold/message.py +++ b/aea/protocols/scaffold/message.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/protocols/scaffold/protocol.yaml b/aea/protocols/scaffold/protocol.yaml index b115d47377..63c8bafc01 100644 --- a/aea/protocols/scaffold/protocol.yaml +++ b/aea/protocols/scaffold/protocol.yaml @@ -7,8 +7,8 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' protocol_specification_id: fetchai/scaffold:0.1.0 fingerprint: - __init__.py: Qmc9Ln8THrWmwou4nr3Acag7vcZ1fv8v5oRSkCWtv1aH6t - message.py: QmSTvkiRCT9SEvKkNsMHABM1L2i88tFeKBdVaQDV8ntxBz - serialization.py: QmZbSDKy54EuhX8QN5BFP8pgZyUYMZWwPKRkdiqHudRcVL + __init__.py: QmYkkue6aaMZGWWTScCtpnP2M1bB9VnBe7qfc6AFxFdjhR + message.py: QmfNTLAPpPczf9Vvz9Q9Pbu92fi7YbV4Rfcmc3VanhxWvX + serialization.py: QmbczbN3YRTF9hY2VnWy2PdPsyirwPM9Spkk65NAtWL45Q fingerprint_ignore_patterns: [] dependencies: {} diff --git a/aea/protocols/scaffold/serialization.py b/aea/protocols/scaffold/serialization.py index 9c5256739d..553a3e79ba 100644 --- a/aea/protocols/scaffold/serialization.py +++ b/aea/protocols/scaffold/serialization.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/registries/__init__.py b/aea/registries/__init__.py index b54ba1c104..988a675638 100644 --- a/aea/registries/__init__.py +++ b/aea/registries/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/registries/base.py b/aea/registries/base.py index a8ae739aef..20b50a64df 100644 --- a/aea/registries/base.py +++ b/aea/registries/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/registries/filter.py b/aea/registries/filter.py index 435e47ca7f..21c3abb951 100644 --- a/aea/registries/filter.py +++ b/aea/registries/filter.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/registries/resources.py b/aea/registries/resources.py index 3c07ecd5e5..636e69a59d 100644 --- a/aea/registries/resources.py +++ b/aea/registries/resources.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/runner.py b/aea/runner.py index 069090bfce..5bd49555a9 100644 --- a/aea/runner.py +++ b/aea/runner.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/runtime.py b/aea/runtime.py index 4873d8261c..27d91577ff 100644 --- a/aea/runtime.py +++ b/aea/runtime.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/__init__.py b/aea/skills/__init__.py index 0a2b69380c..6d4a843b06 100644 --- a/aea/skills/__init__.py +++ b/aea/skills/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/base.py b/aea/skills/base.py index b804c3191d..3ad0b96cdd 100644 --- a/aea/skills/base.py +++ b/aea/skills/base.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/behaviours.py b/aea/skills/behaviours.py index b1663a6d60..1a0deac251 100644 --- a/aea/skills/behaviours.py +++ b/aea/skills/behaviours.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/scaffold/__init__.py b/aea/skills/scaffold/__init__.py index 3ceb7ee7ef..f95627947f 100644 --- a/aea/skills/scaffold/__init__.py +++ b/aea/skills/scaffold/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/scaffold/behaviours.py b/aea/skills/scaffold/behaviours.py index fd5247b44b..b5cb4c4840 100644 --- a/aea/skills/scaffold/behaviours.py +++ b/aea/skills/scaffold/behaviours.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/scaffold/handlers.py b/aea/skills/scaffold/handlers.py index fc796ac0aa..f314dfd98f 100644 --- a/aea/skills/scaffold/handlers.py +++ b/aea/skills/scaffold/handlers.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/scaffold/my_model.py b/aea/skills/scaffold/my_model.py index e22ad275cd..fda1c79332 100644 --- a/aea/skills/scaffold/my_model.py +++ b/aea/skills/scaffold/my_model.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/skills/scaffold/skill.yaml b/aea/skills/scaffold/skill.yaml index febe33a3c0..db89950edc 100644 --- a/aea/skills/scaffold/skill.yaml +++ b/aea/skills/scaffold/skill.yaml @@ -6,10 +6,10 @@ description: The scaffold skill is a scaffold for your own skill implementation. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: QmYRssFqDqb3uWDvfoXy93avisjKRx2yf9SbAQXnkRj1QB - behaviours.py: QmW5Qngr5LFj5XBi9d71sNRG29G6NKgbq6swv5XQRt11va - handlers.py: QmPVNnZCXu2LgJZoMiSLj3qe7EAeJqDEM3CV75JvNGiwCM - my_model.py: QmPaZ6G37Juk63mJj88nParaEp71XyURts8AmmX1axs24V + __init__.py: QmcvsRz9pVCQyuLMtYDZQMtMWvPFETaEEjU8uxj89bCJ8e + behaviours.py: QmPQ9Kpi5D9YzBjAyDJCYFgpEV3woK96r5XoWeEjCg7ykY + handlers.py: QmR3r66fxGKgjx3sCfFbbqMZFwFYcookmvSxpbEVgfEjqX + my_model.py: QmPtP2C6iqNpvtRMDrLgr9NVwnunm4MzVzB68Xdktw6Cfr fingerprint_ignore_patterns: [] connections: [] contracts: [] diff --git a/aea/skills/tasks.py b/aea/skills/tasks.py index 21b9ee2057..939b054511 100644 --- a/aea/skills/tasks.py +++ b/aea/skills/tasks.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/__init__.py b/aea/test_tools/__init__.py index 52aeffc090..2f4d052c2e 100644 --- a/aea/test_tools/__init__.py +++ b/aea/test_tools/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/click_testing.py b/aea/test_tools/click_testing.py index d20f3badb3..73f7d6b796 100644 --- a/aea/test_tools/click_testing.py +++ b/aea/test_tools/click_testing.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/constants.py b/aea/test_tools/constants.py index c1957cfeed..a8a4c4a60e 100644 --- a/aea/test_tools/constants.py +++ b/aea/test_tools/constants.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/exceptions.py b/aea/test_tools/exceptions.py index 797e90c1e0..b6eb22c95c 100644 --- a/aea/test_tools/exceptions.py +++ b/aea/test_tools/exceptions.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/generic.py b/aea/test_tools/generic.py index feee92ffa0..ca6e0a14cd 100644 --- a/aea/test_tools/generic.py +++ b/aea/test_tools/generic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py index 55f005d844..da93c624d7 100644 --- a/aea/test_tools/test_cases.py +++ b/aea/test_tools/test_cases.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/aea/test_tools/test_contract.py b/aea/test_tools/test_contract.py index 3e23b07302..7dfd4fefbb 100644 --- a/aea/test_tools/test_contract.py +++ b/aea/test_tools/test_contract.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -116,8 +116,9 @@ def setup(cls, **kwargs: Any) -> None: # deploy contract cls.deployment_tx_receipt = cls._deploy_contract( - cls._contract, cls.ledger_api, cls.deployer_crypto, gas=cls._deployment_gas + cls._contract, cls.ledger_api, cls.deployer_crypto, gas=cls._deployment_gas, ) + cls.contract_address = cls.finish_contract_deployment() @classmethod diff --git a/aea/test_tools/test_skill.py b/aea/test_tools/test_skill.py index 18bccc2e04..4bc403cf05 100644 --- a/aea/test_tools/test_skill.py +++ b/aea/test_tools/test_skill.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/__init__.py b/benchmark/__init__.py index 786506f460..9b72f74277 100644 --- a/benchmark/__init__.py +++ b/benchmark/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/__init__.py b/benchmark/cases/__init__.py index 53c7d2fad2..a861766963 100644 --- a/benchmark/cases/__init__.py +++ b/benchmark/cases/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/cpu_burn.py b/benchmark/cases/cpu_burn.py index a143306485..5916290c1d 100644 --- a/benchmark/cases/cpu_burn.py +++ b/benchmark/cases/cpu_burn.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/helpers/__init__.py b/benchmark/cases/helpers/__init__.py index 0440997f93..ada06e4ffd 100644 --- a/benchmark/cases/helpers/__init__.py +++ b/benchmark/cases/helpers/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/helpers/dummy_handler.py b/benchmark/cases/helpers/dummy_handler.py index b6a8179a10..954d038cd3 100644 --- a/benchmark/cases/helpers/dummy_handler.py +++ b/benchmark/cases/helpers/dummy_handler.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/react_multi_agents_fake_connection.py b/benchmark/cases/react_multi_agents_fake_connection.py index 042a6faaa9..9df8941e68 100644 --- a/benchmark/cases/react_multi_agents_fake_connection.py +++ b/benchmark/cases/react_multi_agents_fake_connection.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/react_speed_in_loop.py b/benchmark/cases/react_speed_in_loop.py index fe710f0bbe..2405a899fe 100644 --- a/benchmark/cases/react_speed_in_loop.py +++ b/benchmark/cases/react_speed_in_loop.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/cases/react_speed_multi_agents.py b/benchmark/cases/react_speed_multi_agents.py index 490ef33efe..78ed74132e 100644 --- a/benchmark/cases/react_speed_multi_agents.py +++ b/benchmark/cases/react_speed_multi_agents.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/__init__.py b/benchmark/checks/__init__.py index e7b908d536..9a06507217 100644 --- a/benchmark/checks/__init__.py +++ b/benchmark/checks/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_agent_construction_time.py b/benchmark/checks/check_agent_construction_time.py index 4c79c34818..2856f8ad38 100755 --- a/benchmark/checks/check_agent_construction_time.py +++ b/benchmark/checks/check_agent_construction_time.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2021 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_decision_maker.py b/benchmark/checks/check_decision_maker.py index 538aeeb795..b629134020 100755 --- a/benchmark/checks/check_decision_maker.py +++ b/benchmark/checks/check_decision_maker.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2021 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_dialogues_memory_usage.py b/benchmark/checks/check_dialogues_memory_usage.py index 06e1175082..fde5e9fb05 100755 --- a/benchmark/checks/check_dialogues_memory_usage.py +++ b/benchmark/checks/check_dialogues_memory_usage.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_mem_usage.py b/benchmark/checks/check_mem_usage.py index 00be8c1939..3a74c1d521 100755 --- a/benchmark/checks/check_mem_usage.py +++ b/benchmark/checks/check_mem_usage.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_messages_memory_usage.py b/benchmark/checks/check_messages_memory_usage.py index 0a2510710e..b1e9b74eab 100755 --- a/benchmark/checks/check_messages_memory_usage.py +++ b/benchmark/checks/check_messages_memory_usage.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_multiagent.py b/benchmark/checks/check_multiagent.py index 69451a01c5..ebaecfc4c6 100755 --- a/benchmark/checks/check_multiagent.py +++ b/benchmark/checks/check_multiagent.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_multiagent_http_dialogues.py b/benchmark/checks/check_multiagent_http_dialogues.py index a8211c7614..a32348ed3c 100755 --- a/benchmark/checks/check_multiagent_http_dialogues.py +++ b/benchmark/checks/check_multiagent_http_dialogues.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_proactive.py b/benchmark/checks/check_proactive.py index 8e805952d2..ff305cdaee 100755 --- a/benchmark/checks/check_proactive.py +++ b/benchmark/checks/check_proactive.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/check_reactive.py b/benchmark/checks/check_reactive.py index 68d85b907e..6ef9dee6a6 100755 --- a/benchmark/checks/check_reactive.py +++ b/benchmark/checks/check_reactive.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2020 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/checks/utils.py b/benchmark/checks/utils.py index f96c199b34..d8b9cd2f99 100644 --- a/benchmark/checks/utils.py +++ b/benchmark/checks/utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/__init__.py b/benchmark/framework/__init__.py index 786506f460..9b72f74277 100644 --- a/benchmark/framework/__init__.py +++ b/benchmark/framework/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/aea_test_wrapper.py b/benchmark/framework/aea_test_wrapper.py index 2263dc57f0..59be795479 100644 --- a/benchmark/framework/aea_test_wrapper.py +++ b/benchmark/framework/aea_test_wrapper.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/benchmark.py b/benchmark/framework/benchmark.py index e3e021cbc5..a847e50fcd 100644 --- a/benchmark/framework/benchmark.py +++ b/benchmark/framework/benchmark.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/cli.py b/benchmark/framework/cli.py index c81e81808c..b6c8ff5e39 100644 --- a/benchmark/framework/cli.py +++ b/benchmark/framework/cli.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/executor.py b/benchmark/framework/executor.py index fde0eaf808..d018abda24 100644 --- a/benchmark/framework/executor.py +++ b/benchmark/framework/executor.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/fake_connection.py b/benchmark/framework/fake_connection.py index 89187138d0..29c5368960 100644 --- a/benchmark/framework/fake_connection.py +++ b/benchmark/framework/fake_connection.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/func_details.py b/benchmark/framework/func_details.py index ff13cfe9d7..ac6d3ee9e4 100644 --- a/benchmark/framework/func_details.py +++ b/benchmark/framework/func_details.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmark/framework/report_printer.py b/benchmark/framework/report_printer.py index 022acc2a75..5e3d77ada3 100644 --- a/benchmark/framework/report_printer.py +++ b/benchmark/framework/report_printer.py @@ -1,6 +1,6 @@ # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/deploy-image/packages/__init__.py b/deploy-image/packages/__init__.py index a16d3dd981..8a394679c2 100644 --- a/deploy-image/packages/__init__.py +++ b/deploy-image/packages/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2018-2019 Fetch.AI Limited +# Copyright 2018-2022 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docs/Pipfile b/docs/Pipfile new file mode 100644 index 0000000000..6890315983 --- /dev/null +++ b/docs/Pipfile @@ -0,0 +1,15 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +mkdocs = "*" +mkdocs-material = "*" +mkdocs-material-extensions = "*" +mkdocs-mermaid-plugin = {git = "https://github.com/pugong/mkdocs-mermaid-plugin.git"} + +[requires] +python_version = "3.7" diff --git a/docs/aggregation-demo.md b/docs/aggregation-demo.md index ac439cbd4c..750ea7464d 100644 --- a/docs/aggregation-demo.md +++ b/docs/aggregation-demo.md @@ -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.0 -aea add connection fetchai/http_server:0.23.0 -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/prometheus:0.9.0 -aea add skill fetchai/advanced_data_request:0.7.0 -aea add skill fetchai/simple_aggregation:0.3.0 - -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +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 install aea build ``` @@ -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.20.0 -aea add skill fetchai/simple_oracle:0.15.0 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/simple_oracle:0.16.0 ``` Configure the simple oracle skill for the `fetchai` ledger: diff --git a/docs/api/plugins/aea_ledger_cosmos/cosmos.md b/docs/api/plugins/aea_ledger_cosmos/cosmos.md index 34e09a4e47..53f0db8850 100644 --- a/docs/api/plugins/aea_ledger_cosmos/cosmos.md +++ b/docs/api/plugins/aea_ledger_cosmos/cosmos.md @@ -83,8 +83,8 @@ True if the transaction has been settled, False o/w. #### get`_`code`_`id ```python - | @staticmethod - | get_code_id(tx_receipt: JSONLike) -> Optional[int] + | @classmethod + | get_code_id(cls, tx_receipt: JSONLike) -> Optional[int] ``` Retrieve the `code_id` from a transaction receipt. @@ -97,12 +97,30 @@ Retrieve the `code_id` from a transaction receipt. the code id, if present + +#### get`_`event`_`attributes + +```python + | @staticmethod + | get_event_attributes(tx_receipt: JSONLike) -> Dict +``` + +Retrieve events attributes from tx receipt. + +**Arguments**: + +- `tx_receipt`: the receipt of the transaction. + +**Returns**: + +dict + #### get`_`contract`_`address ```python - | @staticmethod - | get_contract_address(tx_receipt: JSONLike) -> Optional[str] + | @classmethod + | get_contract_address(cls, tx_receipt: JSONLike) -> Optional[str] ``` Retrieve the `contract_address` from a transaction receipt. diff --git a/docs/api/plugins/aea_ledger_fetchai/_cosmos.md b/docs/api/plugins/aea_ledger_fetchai/_cosmos.md index 5cc2a82610..fe8aed6d37 100644 --- a/docs/api/plugins/aea_ledger_fetchai/_cosmos.md +++ b/docs/api/plugins/aea_ledger_fetchai/_cosmos.md @@ -83,8 +83,8 @@ True if the transaction has been settled, False o/w. #### get`_`code`_`id ```python - | @staticmethod - | get_code_id(tx_receipt: JSONLike) -> Optional[int] + | @classmethod + | get_code_id(cls, tx_receipt: JSONLike) -> Optional[int] ``` Retrieve the `code_id` from a transaction receipt. @@ -97,12 +97,30 @@ Retrieve the `code_id` from a transaction receipt. the code id, if present + +#### get`_`event`_`attributes + +```python + | @staticmethod + | get_event_attributes(tx_receipt: JSONLike) -> Dict +``` + +Retrieve events attributes from tx receipt. + +**Arguments**: + +- `tx_receipt`: the receipt of the transaction. + +**Returns**: + +dict + #### get`_`contract`_`address ```python - | @staticmethod - | get_contract_address(tx_receipt: JSONLike) -> Optional[str] + | @classmethod + | get_contract_address(cls, tx_receipt: JSONLike) -> Optional[str] ``` Retrieve the `contract_address` from a transaction receipt. diff --git a/docs/aries-cloud-agent-demo.md b/docs/aries-cloud-agent-demo.md index bef714059a..d5c1b1311c 100644 --- a/docs/aries-cloud-agent-demo.md +++ b/docs/aries-cloud-agent-demo.md @@ -191,11 +191,11 @@ The following steps create Alice_AEA from scratch: ``` bash aea create aries_alice cd aries_alice -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/http_client:0.24.0 -aea add connection fetchai/webhook:0.20.0 -aea add skill fetchai/aries_alice:0.25.0 +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 ```

@@ -257,7 +257,7 @@ 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.26.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.0 -u public_uri` to retrieve the address.) We will refer to this as **Alice_AEA's P2P address**. ### Faber_AEA @@ -275,11 +275,11 @@ The following steps create Faber_AEA from scratch: ``` bash aea create aries_faber cd aries_faber -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/http_client:0.24.0 -aea add connection fetchai/webhook:0.20.0 -aea add skill fetchai/aries_faber:0.23.0 +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 ```

diff --git a/docs/build-aea-programmatically.md b/docs/build-aea-programmatically.md index f879961ca1..e5795ede3e 100644 --- a/docs/build-aea-programmatically.md +++ b/docs/build-aea-programmatically.md @@ -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 `AEABuilder` to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:1.1.0`, `fetchai/state_update:1.1.0` and `fetchai/signing:1.1.0` protocols. +We use the `AEABuilder` 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. ``` python # Instantiate the builder and build the AEA # By default, the default protocol, error skill and stub connection are added diff --git a/docs/car-park-skills.md b/docs/car-park-skills.md index 2ad975d79a..26128f3117 100644 --- a/docs/car-park-skills.md +++ b/docs/car-park-skills.md @@ -61,7 +61,7 @@ The following steps assume you have launched the AEA Manager Desktop app. 2. Add another new AEA called `car_data_buyer` with public id `fetchai/car_data_buyer:0.33.0`. -3. Copy the address from the `car_data_buyer` into your clip board. Then go to the StargateWorld block explorer and request some test tokens via `Get Funds`. +3. Copy the address from the `car_data_buyer` into your clip board. Then go to the Dorado block explorer and request some test tokens via `Get Funds`. 4. Run the `car_detector` AEA. Navigate to its logs and copy the multiaddress displayed. @@ -110,19 +110,19 @@ The following steps create the car detector from scratch: ``` bash aea create car_detector cd car_detector -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add skill fetchai/carpark_detection:0.27.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/carpark_detection:0.27.1 aea config set --type dict agent.dependencies \ '{ "aea-ledger-fetchai": {"version": "<2.0.0,>=1.0.0"} }' -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea config set --type dict agent.default_routing \ '{ - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' aea install aea build @@ -148,19 +148,19 @@ The following steps create the car data client from scratch: ``` bash aea create car_data_buyer cd car_data_buyer -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add skill fetchai/carpark_client:0.27.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/carpark_client:0.27.1 aea config set --type dict agent.dependencies \ '{ "aea-ledger-fetchai": {"version": "<2.0.0,>=1.0.0"} }' -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea config set --type dict agent.default_routing \ '{ - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' aea install aea build @@ -172,7 +172,7 @@ aea build #### Add keys for the car data seller AEA -First, create the private key for the car data seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use: +First, create the private key for the car data seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `Dorado` use: ``` bash aea generate-key fetchai aea add-key fetchai fetchai_private_key.txt @@ -193,13 +193,13 @@ aea issue-certificates The buyer needs to have some wealth to purchase the service from the seller. -First, create the private key for the car data buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use: +First, create the private key for the car data buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `Dorado` use: ``` bash aea generate-key fetchai aea add-key fetchai fetchai_private_key.txt ``` -Then, create some wealth for your car data buyer based on the network you want to transact with. On the Fetch.ai `StargateWorld` network: +Then, create some wealth for your car data buyer based on the network you want to transact with. On the Fetch.ai `Dorado` network: ``` bash aea generate-wealth fetchai ``` @@ -225,7 +225,7 @@ First, run the car data seller 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.26.0 -u public_uri` to retrieve the 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.0 -u public_uri` to retrieve the address.) This is the entry peer address for the local agent communication network created by the car data seller. Then, in the car data buyer, run this command (replace `SOME_ADDRESS` with the correct value as described above): diff --git a/docs/config.md b/docs/config.md index 84320e2043..62e3132244 100644 --- a/docs/config.md +++ b/docs/config.md @@ -21,13 +21,13 @@ aea_version: '>=1.0.0, <2.0.0' # AEA framework version(s) compatib fingerprint: {} # Fingerprint of AEA project components. fingerprint_ignore_patterns: [] # Ignore pattern for the fingerprinting tool. connections: # The list of connection public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX) -- fetchai/stub:0.21.0 +- fetchai/stub:0.21.1 contracts: [] # The list of contract public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX). protocols: # The list of protocol public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX). -- fetchai/default:1.1.0 +- fetchai/default:1.1.1 skills: # The list of skill public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX). -- fetchai/error:0.18.0 -default_connection: fetchai/p2p_libp2p:0.26.0 # The default connection used for envelopes sent by the AEA (must satisfy PUBLIC_ID_REGEX). +- fetchai/error:0.18.1 +default_connection: fetchai/p2p_libp2p:0.27.0 # The default connection used for envelopes sent by the AEA (must satisfy PUBLIC_ID_REGEX). default_ledger: fetchai # The default ledger identifier the AEA project uses (must satisfy LEDGER_ID_REGEX) required_ledgers: [fetchai] # the list of identifiers of ledgers that the AEA project requires key pairs for (each item must satisfy LEDGER_ID_REGEX) default_routing: {} # The default routing scheme applied to envelopes sent by the AEA, it maps from protocol public ids to connection public ids (both keys and values must satisfy PUBLIC_ID_REGEX) diff --git a/docs/connect-a-frontend.md b/docs/connect-a-frontend.md index 0d085719db..f82d2d7877 100644 --- a/docs/connect-a-frontend.md +++ b/docs/connect-a-frontend.md @@ -3,7 +3,7 @@ This page lays out two options for connecting a front-end to an AEA. The followi How to connect front-end to your AEA ## Case 1 -The first option is to create a `HTTP Server` connection that handles incoming requests from a REST API. In this scenario, the REST API communicates with the AEA and requests are handled by the `HTTP Server` connection package. The REST API should send CRUD requests to the `HTTP Server` connection (`fetchai/http_server:0.23.0`) which translates these into Envelopes to be consumed by the correct skill. +The first option is to create a `HTTP Server` connection that handles incoming requests from a REST API. In this scenario, the REST API communicates with the AEA and requests are handled by the `HTTP Server` connection package. The REST API should send CRUD requests to the `HTTP Server` connection (`fetchai/http_server:0.23.1`) which translates these into Envelopes to be consumed by the correct skill. ## Case 2 -The second option is to create a front-end comprising a stand-alone `Multiplexer` with a `P2P` connection (`fetchai/p2p_libp2p:0.26.0`). In this scenario the Agent Communication Network can be used to send Envelopes from the AEA to the front-end. \ No newline at end of file +The second option is to create a front-end comprising a stand-alone `Multiplexer` with a `P2P` connection (`fetchai/p2p_libp2p:0.27.0`). In this scenario the Agent Communication Network can be used to send Envelopes from the AEA to the front-end. \ No newline at end of file diff --git a/docs/connection.md b/docs/connection.md index 07a2366a06..f760b1e3ec 100644 --- a/docs/connection.md +++ b/docs/connection.md @@ -36,7 +36,7 @@ The developer needs to implement four public coroutines: - The `receive` coroutine is continuously called by the AEA framework. It either returns `None` or an envelope. The `receive` coroutine must implement the logic of data being received by the agent, and if necessary, its translation into a relevant protocol. -The framework provides a demo `stub` connection which implements an I/O reader and writer to send and receive messages between the agent and a local file. To gain inspiration and become familiar with the structure of connection packages, you may find it useful to check out `fetchai/stub:0.21.0`, `fetchai/http_server:0.23.0` or `fetchai/http_client:0.24.0` connections. The latter two connections are for external clients to connect with an agent, and for the agent to connect with external servers, respectively. +The framework provides a demo `stub` connection which implements an I/O reader and writer to send and receive messages between the agent and a local file. To gain inspiration and become familiar with the structure of connection packages, you may find it useful to check out `fetchai/stub:0.21.1`, `fetchai/http_server:0.23.1` or `fetchai/http_client:0.24.1` connections. The latter two connections are for external clients to connect with an agent, and for the agent to connect with external servers, respectively. ### Primary methods to develop - sync connection interface diff --git a/docs/contract.md b/docs/contract.md index ad1035c674..8b92e03799 100644 --- a/docs/contract.md +++ b/docs/contract.md @@ -18,16 +18,16 @@ Interacting with contracts in almost all cases requires network access. Therefor Message flow for contract and ledger interactions -In particular, the `fetchai/ledger:0.20.0` connection can be used to execute contract related logic. The skills communicate with the `fetchai/ledger:0.20.0` connection via the `fetchai/contract_api:1.0.0` protocol. This protocol implements a request-response pattern to serve the four types of methods listed above: +In particular, the `fetchai/ledger:0.21.0` connection can be used to execute contract related logic. The skills communicate with the `fetchai/ledger:0.21.0` connection via the `fetchai/contract_api:1.0.0` protocol. This protocol implements a request-response pattern to serve the four types of methods listed above: -- the `get_deploy_transaction` message is used to request a deploy transaction for a specific contract. For instance, to request a deploy transaction for the deployment of the smart contract wrapped in the `fetchai/erc1155:0.22.0` package, we send the following message to the `fetchai/ledger:0.20.0`: +- the `get_deploy_transaction` message is used to request a deploy transaction for a specific contract. For instance, to request a deploy transaction for the deployment of the smart contract wrapped in the `fetchai/erc1155:0.23.1` package, we send the following message to the `fetchai/ledger:0.21.0`: ``` python contract_api_msg = ContractApiMessage( performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION, dialogue_reference=contract_api_dialogues.new_self_initiated_dialogue_reference(), ledger_id=strategy.ledger_id, - contract_id="fetchai/erc1155:0.22.0", + contract_id="fetchai/erc1155:0.23.1", callable="get_deploy_transaction", kwargs=ContractApiMessage.Kwargs( {"deployer_address": self.context.agent_address} @@ -37,22 +37,22 @@ contract_api_msg = ContractApiMessage( Any additional arguments needed by the contract's constructor method should be added to `kwargs`. -This message will be handled by the `fetchai/ledger:0.20.0` connection and then a `raw_transaction` message will be returned with the matching raw transaction. To send this transaction to the ledger for processing, we first sign the message with the decision maker and then send the signed transaction to the `fetchai/ledger:0.20.0` connection using the `fetchai/ledger_api:1.0.0` protocol. For details on how to implement the message handling, see the handlers in the `erc1155_deploy` skill. +This message will be handled by the `fetchai/ledger:0.21.0` connection and then a `raw_transaction` message will be returned with the matching raw transaction. To send this transaction to the ledger for processing, we first sign the message with the decision maker and then send the signed transaction to the `fetchai/ledger:0.21.0` connection using the `fetchai/ledger_api:1.0.0` protocol. For details on how to implement the message handling, see the handlers in the `erc1155_deploy` skill.

CosmWasm based smart contract deployments

-

When using CosmWasm based smart contracts two types of deployment transactions exist. The first transaction stores the code on the chain. The second transaction initialises the code. This way, the same contract code can be initialised many times.
Both the store and init messages use the ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION performative. The ledger API automatically detects the type of transactions based on the provided keyword arguments. In particular, an init transaction requires the keyword arguments code_id (integer), label (string), amount (integer) and init_msg (JSON).
For an example look at the fetchai/erc1155:0.22.0 package. +

When using CosmWasm based smart contracts two types of deployment transactions exist. The first transaction stores the code on the chain. The second transaction initialises the code. This way, the same contract code can be initialised many times.
Both the store and init messages use the ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION performative. The ledger API automatically detects the type of transactions based on the provided keyword arguments. In particular, an init transaction requires the keyword arguments code_id (integer), label (string), amount (integer) and init_msg (JSON).
For an example look at the fetchai/erc1155:0.23.1 package.

-- the `get_raw_transaction` message is used to request any transaction for a specific contract which changes state in the contract. For instance, to request a transaction for the creation of token in the deployed `erc1155` smart contract wrapped in the `fetchai/erc1155:0.22.0` package, we send the following message to the `fetchai/ledger:0.20.0`: +- the `get_raw_transaction` message is used to request any transaction for a specific contract which changes state in the contract. For instance, to request a transaction for the creation of token in the deployed `erc1155` smart contract wrapped in the `fetchai/erc1155:0.23.1` package, we send the following message to the `fetchai/ledger:0.21.0`: ``` python contract_api_msg = ContractApiMessage( performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION, dialogue_reference=contract_api_dialogues.new_self_initiated_dialogue_reference(), ledger_id=strategy.ledger_id, - contract_id="fetchai/erc1155:0.22.0", + contract_id="fetchai/erc1155:0.23.1", contract_address=strategy.contract_address, callable="get_create_batch_transaction", kwargs=ContractApiMessage.Kwargs( @@ -64,16 +64,16 @@ contract_api_msg = ContractApiMessage( ) ``` -This message will be handled by the `fetchai/ledger:0.20.0` connection and then a `raw_transaction` message will be returned with the matching raw transaction. For this to be executed correctly, the `fetchai/erc1155:0.22.0` contract package needs to implement the `get_create_batch_transaction` method with the specified key word arguments (see example in *Deploy your own*, below). Similarly to above, to send this transaction to the ledger for processing, we first sign the message with the decision maker and then send the signed transaction to the `fetchai/ledger:0.20.0` connection using the `fetchai/ledger_api:1.0.0` protocol. +This message will be handled by the `fetchai/ledger:0.21.0` connection and then a `raw_transaction` message will be returned with the matching raw transaction. For this to be executed correctly, the `fetchai/erc1155:0.23.1` contract package needs to implement the `get_create_batch_transaction` method with the specified key word arguments (see example in *Deploy your own*, below). Similarly to above, to send this transaction to the ledger for processing, we first sign the message with the decision maker and then send the signed transaction to the `fetchai/ledger:0.21.0` connection using the `fetchai/ledger_api:1.0.0` protocol. -- the `get_raw_message` message is used to request any contract method call for a specific contract which does not change state in the contract. For instance, to request a call to get a hash from some input data in the deployed `erc1155` smart contract wrapped in the `fetchai/erc1155:0.22.0` package, we send the following message to the `fetchai/ledger:0.20.0`: +- the `get_raw_message` message is used to request any contract method call for a specific contract which does not change state in the contract. For instance, to request a call to get a hash from some input data in the deployed `erc1155` smart contract wrapped in the `fetchai/erc1155:0.23.1` package, we send the following message to the `fetchai/ledger:0.21.0`: ``` python contract_api_msg = ContractApiMessage( performative=ContractApiMessage.Performative.GET_RAW_MESSAGE, dialogue_reference=contract_api_dialogues.new_self_initiated_dialogue_reference(), ledger_id=strategy.ledger_id, - contract_id="fetchai/erc1155:0.22.0", + contract_id="fetchai/erc1155:0.23.1", contract_address=strategy.contract_address, callable="get_hash_single", kwargs=ContractApiMessage.Kwargs( @@ -89,17 +89,17 @@ contract_api_msg = ContractApiMessage( ), ) ``` -This message will be handled by the `fetchai/ledger:0.20.0` connection and then a `raw_message` message will be returned with the matching raw message. For this to be executed correctly, the `fetchai/erc1155:0.22.0` contract package needs to implement the `get_hash_single` method with the specified key word arguments. We can then send the raw message to the `fetchai/ledger:0.20.0` connection using the `fetchai/ledger_api:1.0.0` protocol. In this case, signing is not required. +This message will be handled by the `fetchai/ledger:0.21.0` connection and then a `raw_message` message will be returned with the matching raw message. For this to be executed correctly, the `fetchai/erc1155:0.23.1` contract package needs to implement the `get_hash_single` method with the specified key word arguments. We can then send the raw message to the `fetchai/ledger:0.21.0` connection using the `fetchai/ledger_api:1.0.0` protocol. In this case, signing is not required. -- the `get_state` message is used to request any contract method call to query state in the deployed contract. For instance, to request a call to get the balances in the deployed `erc1155` smart contract wrapped in the `fetchai/erc1155:0.22.0` package, we send the following message to the `fetchai/ledger:0.20.0`: +- the `get_state` message is used to request any contract method call to query state in the deployed contract. For instance, to request a call to get the balances in the deployed `erc1155` smart contract wrapped in the `fetchai/erc1155:0.23.1` package, we send the following message to the `fetchai/ledger:0.21.0`: ``` python contract_api_msg = ContractApiMessage( performative=ContractApiMessage.Performative.GET_STATE, dialogue_reference=contract_api_dialogues.new_self_initiated_dialogue_reference(), ledger_id=strategy.ledger_id, - contract_id="fetchai/erc1155:0.22.0", + contract_id="fetchai/erc1155:0.23.1", contract_address=strategy.contract_address, callable="get_balance", kwargs=ContractApiMessage.Kwargs( @@ -107,7 +107,7 @@ contract_api_msg = ContractApiMessage( ), ) ``` -This message will be handled by the `fetchai/ledger:0.20.0` connection and then a `state` message will be returned with the matching state. For this to be executed correctly, the `fetchai/erc1155:0.22.0` contract package needs to implement the `get_balance` method with the specified key word arguments. We can then send the raw message to the `fetchai/ledger:0.20.0` connection using the `fetchai/ledger_api:1.0.0` protocol. In this case, signing is not required. +This message will be handled by the `fetchai/ledger:0.21.0` connection and then a `state` message will be returned with the matching state. For this to be executed correctly, the `fetchai/erc1155:0.23.1` contract package needs to implement the `get_balance` method with the specified key word arguments. We can then send the raw message to the `fetchai/ledger:0.21.0` connection using the `fetchai/ledger_api:1.0.0` protocol. In this case, signing is not required. ## Developing your own @@ -180,6 +180,6 @@ class MyContract(Contract): tx = cls._try_estimate_gas(ledger_api, tx) return tx ``` -Above, we implement a method to create a transaction, in this case a transaction to create a batch of tokens. The method will be called by the framework, specifically the `fetchai/ledger:0.20.0` connection once it receives a message (see bullet point 2 above). The method first gets the latest transaction nonce of the `deployer_address`, then constructs the contract instance, then uses the instance to build the transaction and finally updates the gas on the transaction. +Above, we implement a method to create a transaction, in this case a transaction to create a batch of tokens. The method will be called by the framework, specifically the `fetchai/ledger:0.21.0` connection once it receives a message (see bullet point 2 above). The method first gets the latest transaction nonce of the `deployer_address`, then constructs the contract instance, then uses the instance to build the transaction and finally updates the gas on the transaction. -It helps to look at existing contract packages, like `fetchai/erc1155:0.22.0`, and skills using them, like `fetchai/erc1155_client:0.11.0` and `fetchai/erc1155_deploy:0.31.0`, for inspiration and guidance. +It helps to look at existing contract packages, like `fetchai/erc1155:0.23.1`, and skills using them, like `fetchai/erc1155_client:0.11.0` and `fetchai/erc1155_deploy:0.31.1`, for inspiration and guidance. diff --git a/docs/core-components-1.md b/docs/core-components-1.md index 8b31b6b87f..ff20120f3e 100644 --- a/docs/core-components-1.md +++ b/docs/core-components-1.md @@ -34,7 +34,7 @@ An `Envelope` is the core object * `Dialogues`, which define rules over `Message` sequences. -The framework provides one default `Protocol`, called `default` (current version `fetchai/default:1.1.0`). This `Protocol` provides a bare-bones implementation for an AEA `Protocol` which includes a `DefaultMessage` class and associated `DefaultSerializer` and `DefaultDialogue` classes. +The framework provides one default `Protocol`, called `default` (current version `fetchai/default:1.1.1`). This `Protocol` provides a bare-bones implementation for an AEA `Protocol` which includes a `DefaultMessage` class and associated `DefaultSerializer` and `DefaultDialogue` classes. Additional `Protocols`, for new types of interactions, can be added as packages. For more details on `Protocols` you can read the protocol guide. To learn how you can easily automate protocol definition, head to the guide for the protocol generator. @@ -44,7 +44,7 @@ Protocol specific `Messages`, wrapped in `Envelopes`, are sent and received to o A `Connection` wraps an SDK or API and provides an interface to networks, ledgers or other services. Where necessary, a `Connection` is responsible for translating between the framework specific `Envelope` with its contained `Message` and the external service or third-party protocol (e.g. `HTTP`). -The framework provides one default `Connection`, called `stub` (current version `fetchai/stub:0.21.0`). It implements an I/O reader and writer to send `Messages` to the agent from a local file. +The framework provides one default `Connection`, called `stub` (current version `fetchai/stub:0.21.1`). It implements an I/O reader and writer to send `Messages` to the agent from a local file. Additional `Connections` can be added as packages. For more details on `Connections` read the `Connection` guide . diff --git a/docs/erc1155-skills.md b/docs/erc1155-skills.md index 1f242de23e..20942227c0 100644 --- a/docs/erc1155-skills.md +++ b/docs/erc1155-skills.md @@ -39,22 +39,22 @@ Create the AEA that will deploy the contract. ``` bash aea create erc1155_deployer cd erc1155_deployer -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add skill fetchai/erc1155_deploy:0.31.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/erc1155_deploy:0.31.1 aea config set --type dict agent.dependencies \ '{ "aea-ledger-fetchai": {"version": "<2.0.0,>=1.0.0"}, "aea-ledger-ethereum": {"version": "<2.0.0,>=1.0.0"}, "aea-ledger-cosmos": {"version": "<2.0.0,>=1.0.0"} }' -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea config set --type dict agent.default_routing \ '{ - "fetchai/contract_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/contract_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' aea config set --type list vendor.fetchai.connections.p2p_libp2p.cert_requests \ '[{"identifier": "acn", "ledger_id": "ethereum", "not_after": "2022-01-01", "not_before": "2021-01-01", "public_key": "fetchai", "save_path": ".certs/conn_cert.txt"}]' @@ -109,22 +109,22 @@ Create the AEA that will get some tokens from the deployer. ``` bash aea create erc1155_client cd erc1155_client -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add skill fetchai/erc1155_client:0.29.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/erc1155_client:0.29.1 aea config set --type dict agent.dependencies \ '{ "aea-ledger-fetchai": {"version": "<2.0.0,>=1.0.0"}, "aea-ledger-ethereum": {"version": "<2.0.0,>=1.0.0"}, "aea-ledger-cosmos": {"version": "<2.0.0,>=1.0.0"} }' -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea config set --type dict agent.default_routing \ '{ - "fetchai/contract_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/contract_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' aea config set --type list vendor.fetchai.connections.p2p_libp2p.cert_requests \ '[{"identifier": "acn", "ledger_id": "ethereum", "not_after": "2022-01-01", "not_before": "2021-01-01", "public_key": "fetchai", "save_path": ".certs/conn_cert.txt"}]' @@ -199,7 +199,7 @@ aea run Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of this address. -Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address. The output will be something like `/dns4/127.0.0.1/tcp/9000/p2p/16Uiu2HAm2JPsUX1Su59YVDXJQizYkNSe8JCusqRpLeeTbvY76fE5`. +Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.27.0 -u public_uri` to retrieve the address. The output will be something like `/dns4/127.0.0.1/tcp/9000/p2p/16Uiu2HAm2JPsUX1Su59YVDXJQizYkNSe8JCusqRpLeeTbvY76fE5`. This is the entry peer address for the local agent communication network created by the deployer. diff --git a/docs/generic-skills-step-by-step.md b/docs/generic-skills-step-by-step.md index 8a241ab897..ab77745487 100644 --- a/docs/generic-skills-step-by-step.md +++ b/docs/generic-skills-step-by-step.md @@ -13,14 +13,14 @@ This step-by-step guide goes through the creation of two AEAs which are already ``` bash aea fetch fetchai/generic_seller:0.29.0 cd generic_seller -aea eject skill fetchai/generic_seller:0.28.0 +aea eject skill fetchai/generic_seller:0.28.1 cd .. ``` ``` bash aea fetch fetchai/generic_buyer:0.30.0 cd generic_buyer -aea eject skill fetchai/generic_buyer:0.27.0 +aea eject skill fetchai/generic_buyer:0.27.1 cd .. ``` @@ -1406,13 +1406,13 @@ fingerprint: strategy.py: QmYTUsfv64eRQDevCfMUDQPx2GCtiMLFdacN4sS1E4Fdfx fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.20.0 +- fetchai/ledger:0.21.0 contracts: [] protocols: -- fetchai/default:1.1.0 -- fetchai/fipa:1.1.0 -- fetchai/ledger_api:1.1.0 -- fetchai/oef_search:1.1.0 +- fetchai/default:1.1.1 +- fetchai/fipa:1.1.1 +- fetchai/ledger_api:1.1.1 +- fetchai/oef_search:1.1.1 skills: [] behaviours: service_registration: @@ -3061,14 +3061,14 @@ fingerprint: strategy.py: QmcrwaEWvKHDCNti8QjRhB4utJBJn5L8GpD27Uy9zHwKhY fingerprint_ignore_patterns: [] connections: -- fetchai/ledger:0.20.0 +- fetchai/ledger:0.21.0 contracts: [] protocols: -- fetchai/default:1.1.0 -- fetchai/fipa:1.1.0 -- fetchai/ledger_api:1.1.0 -- fetchai/oef_search:1.1.0 -- fetchai/signing:1.1.0 +- fetchai/default:1.1.1 +- fetchai/fipa:1.1.1 +- fetchai/ledger_api:1.1.1 +- fetchai/oef_search:1.1.1 +- fetchai/signing:1.1.1 skills: [] behaviours: search: @@ -3167,8 +3167,8 @@ In both AEAs run: ``` bash aea config set --type dict agent.default_routing \ '{ - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' ``` @@ -3185,13 +3185,13 @@ aea generate-wealth fetchai --sync Add the remaining packages for the seller AEA, then run it: ``` bash -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add protocol fetchai/fipa:1.1.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add protocol fetchai/fipa:1.1.1 aea install aea build -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea run ``` @@ -3202,14 +3202,14 @@ Once you see a message of the form `To join its network use multiaddr: ['SOME_AD Add the remaining packages for the buyer AEA: ``` bash -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add protocol fetchai/fipa:1.1.0 -aea add protocol fetchai/signing:1.1.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add protocol fetchai/fipa:1.1.1 +aea add protocol fetchai/signing:1.1.1 aea install aea build -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 ``` Then, update the configuration of the buyer AEA's P2P connection: @@ -3232,7 +3232,7 @@ Then run the buyer AEA: aea run ``` -You will see that the AEAs negotiate and then transact using the StargateWorld testnet. +You will see that the AEAs negotiate and then transact using the Dorado testnet. ## Delete the AEAs diff --git a/docs/generic-skills.md b/docs/generic-skills.md index c2d8ab2ee9..4aea54c8ca 100644 --- a/docs/generic-skills.md +++ b/docs/generic-skills.md @@ -71,19 +71,19 @@ The following steps create the seller from scratch: ``` bash aea create my_seller_aea cd my_seller_aea -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add skill fetchai/generic_seller:0.28.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/generic_seller:0.28.1 aea config set --type dict agent.dependencies \ '{ "aea-ledger-fetchai": {"version": "<2.0.0,>=1.0.0"} }' -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea config set --type dict agent.default_routing \ '{ - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' aea install aea build @@ -109,19 +109,19 @@ The following steps create the buyer from scratch: ``` bash aea create my_buyer_aea cd my_buyer_aea -aea add connection fetchai/p2p_libp2p:0.26.0 -aea add connection fetchai/soef:0.27.0 -aea add connection fetchai/ledger:0.20.0 -aea add skill fetchai/generic_buyer:0.27.0 +aea add connection fetchai/p2p_libp2p:0.27.0 +aea add connection fetchai/soef:0.27.1 +aea add connection fetchai/ledger:0.21.0 +aea add skill fetchai/generic_buyer:0.27.1 aea config set --type dict agent.dependencies \ '{ "aea-ledger-fetchai": {"version": "<2.0.0,>=1.0.0"} }' -aea config set agent.default_connection fetchai/p2p_libp2p:0.26.0 +aea config set agent.default_connection fetchai/p2p_libp2p:0.27.0 aea config set --type dict agent.default_routing \ '{ - "fetchai/ledger_api:1.1.0": "fetchai/ledger:0.20.0", - "fetchai/oef_search:1.1.0": "fetchai/soef:0.27.0" + "fetchai/ledger_api:1.1.1": "fetchai/ledger:0.21.0", + "fetchai/oef_search:1.1.1": "fetchai/soef:0.27.1" }' aea install aea build @@ -133,7 +133,7 @@ aea build ### Add keys for the seller AEA -Create the private key for the seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use: +Create the private key for the seller AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `Dorado` use: ``` bash aea generate-key fetchai aea add-key fetchai fetchai_private_key.txt @@ -154,13 +154,13 @@ aea issue-certificates The buyer needs to have some wealth to purchase the data from the seller. -First, create the private key for the buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `StargateWorld` use: +First, create the private key for the buyer AEA based on the network you want to transact. To generate and add a private-public key pair for Fetch.ai `Dorado` use: ``` bash aea generate-key fetchai aea add-key fetchai fetchai_private_key.txt ``` -Then, create some wealth for your buyer based on the network you want to transact with. On the Fetch.ai `StargateWorld` network: +Then, create some wealth for your buyer based on the network you want to transact with. On the Fetch.ai `Dorado` network: ``` bash aea generate-wealth fetchai ``` @@ -252,7 +252,7 @@ First, run the seller AEA: aea run ``` -Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of this address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.26.0 -u public_uri` to retrieve the address.) +Once you see a message of the form `To join its network use multiaddr 'SOME_ADDRESS'` take note of this address. (Alternatively, use `aea get-multiaddress fetchai -c -i fetchai/p2p_libp2p:0.27.0 -u public_uri` to retrieve the address.) This is the entry peer address for the local agent communication network created by the seller. Then, configure the buyer to connect to this same local ACN by running the following command in the buyer terminal, replacing `SOME_ADDRESS` with the value you noted above: diff --git a/docs/gym-skill.md b/docs/gym-skill.md index 283001812a..a44364c3fe 100644 --- a/docs/gym-skill.md +++ b/docs/gym-skill.md @@ -36,12 +36,12 @@ cd my_gym_aea ### Add the gym skill ``` bash -aea add skill fetchai/gym:0.21.0 +aea add skill fetchai/gym:0.21.1 ``` ### Set gym connection as default ``` bash -aea config set agent.default_connection fetchai/gym:0.20.0 +aea config set agent.default_connection fetchai/gym:0.20.1 ``` ### Install the skill dependencies diff --git a/docs/http-connection-and-skill.md b/docs/http-connection-and-skill.md index 17874695fb..c73f67b367 100644 --- a/docs/http-connection-and-skill.md +++ b/docs/http-connection-and-skill.md @@ -8,7 +8,7 @@ The HTTP server connection allows you to run a server inside the connection itse ## HTTP Client -The `fetchai/simple_data_request:0.14.0` skill demonstrates a simple use case of the HTTP Client connection. +The `fetchai/simple_data_request:0.14.1` skill demonstrates a simple use case of the HTTP Client connection. The `HttpRequestBehaviour` in `behaviours.py` periodically sends HTTP envelops to the HTTP client connection. Its `act()` method, periodically called, simply calls `_generate_http_request` which contains the logic for enqueueing an HTTP request envelop. @@ -26,13 +26,13 @@ cd my_aea Add the http server connection package: ``` bash -aea add connection fetchai/http_server:0.23.0 +aea add connection fetchai/http_server:0.23.1 ``` Update the default connection: ``` bash -aea config set agent.default_connection fetchai/http_server:0.23.0 +aea config set agent.default_connection fetchai/http_server:0.23.1 ``` Modify the `api_spec_path`: @@ -315,7 +315,7 @@ models: Run the fingerprinter (note, you will have to replace the author name with your author handle): ``` bash -aea fingerprint skill fetchai/http_echo:0.21.0 +aea fingerprint skill fetchai/http_echo:0.21.1 ``` diff --git a/docs/index.md b/docs/index.md index edefd9b91a..f852eab46f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,4 @@ - The AEA framework provides the tools for creating Autonomous Economic Agents (AEA). ## What are AEAs? diff --git a/docs/language-agnostic-definition.md b/docs/language-agnostic-definition.md index 49d9dbae47..f10cebc5d2 100644 --- a/docs/language-agnostic-definition.md +++ b/docs/language-agnostic-definition.md @@ -71,7 +71,7 @@ message Envelope{
  • It MUST implement protocols according to their specification (see here for details). -
  • It SHOULD implement the fetchai/default:1.1.0 protocol which satisfies the following protobuf schema: +
  • It SHOULD implement the fetchai/default:1.1.1 protocol which satisfies the following protobuf schema: ``` proto syntax = "proto3"; @@ -121,7 +121,7 @@ message DefaultMessage{
  • It MUST have an identity in the form of, at a minimum, an address derived from a public key and its associated private key (where the elliptic curve must be of type SECP256k1).
  • -
  • It SHOULD implement handling of errors using the fetchai/default:1.1.0 protocol. The protobuf schema is given above. +
  • It SHOULD implement handling of errors using the fetchai/default:1.1.1 protocol. The protobuf schema is given above.
  • It MUST implement the following principles when handling messages: