From f4ffb83c02582efec1c141a7339269587262ec5b Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Fri, 11 Sep 2020 11:49:39 +0300
Subject: [PATCH 001/131] test multiplexer disconnected on agent process
 termination

---
 tests/test_multiplexer.py | 98 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index aba61b06a3..df80ec0154 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -21,7 +21,9 @@
 
 import asyncio
 import logging
+import os
 import shutil
+import sys
 import tempfile
 import time
 import unittest.mock
@@ -30,9 +32,12 @@
 from unittest import mock
 from unittest.mock import patch
 
+from pexpect.exceptions import EOF  # type: ignore
+
 import pytest
 
 import aea
+from aea.cli.core import cli
 from aea.configurations.base import PublicId
 from aea.connections.base import ConnectionStates
 from aea.exceptions import AEAEnforceError
@@ -46,12 +51,19 @@
     OutBox,
 )
 from aea.protocols.default.message import DefaultMessage
+from aea.test_tools.click_testing import CliRunner
 
 from packages.fetchai.connections.local.connection import LocalNode
 
+
+from tests.common.pexpect_popen import PexpectWrapper
 from tests.common.utils import wait_for_condition
 
+
 from .conftest import (
+    AUTHOR,
+    CLI_LOG_OPTION,
+    ROOT_DIR,
     UNKNOWN_CONNECTION_PUBLIC_ID,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
@@ -642,3 +654,89 @@ def test_stop_policy(self):
             wait_for_condition(
                 lambda: self.multiplexer.connection_status.is_disconnected, timeout=5
             )
+
+
+class TestMultiplexerDscionnectsOnTermination:  # pylint: disable=attribute-defined-outside-init
+    """Test multiplexer disconnects on  agent process keyboard interrupted."""
+
+    def setup(self):
+        """Set the test up."""
+        self.proc = None
+        self.runner = CliRunner()
+        self.agent_name = "myagent"
+        self.cwd = os.getcwd()
+        self.t = tempfile.mkdtemp()
+        shutil.copytree(Path(ROOT_DIR, "packages"), Path(self.t, "packages"))
+        os.chdir(self.t)
+
+        result = self.runner.invoke(
+            cli, [*CLI_LOG_OPTION, "init", "--local", "--author", AUTHOR]
+        )
+        assert result.exit_code == 0
+
+        result = self.runner.invoke(
+            cli, [*CLI_LOG_OPTION, "create", "--local", self.agent_name]
+        )
+        assert result.exit_code == 0
+
+        os.chdir(Path(self.t, self.agent_name))
+
+    def test_multiplexer_disconnected_on_early_interruption(self):
+        """Test multiplexer disconnected properly on termination before connected."""
+        result = self.runner.invoke(
+            cli,
+            [
+                *CLI_LOG_OPTION,
+                "add",
+                "--local",
+                "connection",
+                "fetchai/p2p_libp2p:0.8.0",
+            ],
+        )
+        assert result.exit_code == 0, result.stdout_bytes
+
+        self.proc = PexpectWrapper(  # nosec
+            [sys.executable, "-m", "aea.cli", "-v", "DEBUG", "run"],
+            env=os.environ,
+            maxread=10000,
+            encoding="utf-8",
+            logfile=sys.stdout,
+        )
+
+        self.proc.expect_all(
+            ["Finished downloading golang dependencies"], timeout=20,
+        )
+        self.proc.control_c()
+        self.proc.expect_all(
+            ["Multiplexer disconnecting...", "Multiplexer disconnected.", EOF],
+            timeout=20,
+        )
+
+    def test_multiplexer_disconnected_on_termination_after_connected(self):
+        """Test multiplexer disconnected properly on termination after connected."""
+        self.proc = PexpectWrapper(  # nosec
+            [sys.executable, "-m", "aea.cli", "-v", "DEBUG", "run"],
+            env=os.environ,
+            maxread=10000,
+            encoding="utf-8",
+            logfile=sys.stdout,
+        )
+
+        self.proc.expect_all(
+            ["Start processing messages..."], timeout=20,
+        )
+        self.proc.control_c()
+        self.proc.expect_all(
+            ["Multiplexer disconnecting...", "Multiplexer disconnected.", EOF],
+            timeout=20,
+        )
+
+    def teardown(self):
+        """Tear the test down."""
+        if self.proc:
+            self.proc.wait_to_complete(10)
+        os.chdir(self.cwd)
+        try:
+            shutil.rmtree(self.t)
+        except (OSError, IOError):
+            pass

From c510d4e1e9b6a987044768617bc4f8b3595e5037 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 14 Sep 2020 23:37:07 +0200
Subject: [PATCH 002/131] add 'latest' version

---
 aea/configurations/base.py | 73 ++++++++++++++++++++++++++++----------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 1a68f8de41..f76f147196 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -20,6 +20,7 @@
 """Classes to handle AEA configurations."""
 
 import base64
+import functools
 import gzip
 import json
 import pprint
@@ -98,8 +99,47 @@
 We cannot have two items with the same package name since the keys of a YAML object form a set.
 """
 
-PackageVersion = Type[semver.VersionInfo]
-PackageVersionLike = Union[str, semver.VersionInfo]
+VersionInfo = Type[semver.VersionInfo]
+PackageVersionLike = Union[str, VersionInfo]
+
+
+@functools.total_ordering
+class PackageVersion:
+    """A package version."""
+
+    def __init__(self, version_like: PackageVersionLike):
+        """
+        Initialize a package version.
+
+        :param version_like: a string, os a semver.VersionInfo object.
+        """
+        if version_like == "latest":
+            self._version = version_like
+        elif isinstance(version_like, str):
+            self._version = semver.VersionInfo.parse(version_like)
+        else:
+            raise ValueError("Version type not valid.")
+
+    @property
+    def is_latest(self) -> bool:
+        """Check whether the version is 'latest'."""
+        return self._version == "latest"
+
+    def __str__(self) -> str:
+        """Get the string representation."""
+        return str(self._version)
+
+    def __eq__(self, other) -> bool:
+        """Check equality."""
+        return isinstance(other, PackageVersion) and self._version == other._version
+
+    def __lt__(self, other):
+        """Compare with another object."""
+        enforce(
+            isinstance(other, PackageVersion),
+            f"Cannot compare {type(self)} with type {type(other)}.",
+        )
+        return str(self) < str(other)
 
 
 class PackageType(Enum):
@@ -332,11 +372,16 @@ class PublicId(JSONSerializable):
     >>> another_public_id = PublicId("author", "my_package", "0.1.0")
     >>> assert hash(public_id) == hash(another_public_id)
     >>> assert public_id == another_public_id
+    >>> latest_public_id = PublicId("author", "my_package", "latest")
+    >>> latest_public_id
+    <author/my_package:latest>
+    >>> latest_public_id.package_version.is_latest
+    True
     """
 
     AUTHOR_REGEX = r"[a-zA-Z_][a-zA-Z0-9_]*"
     PACKAGE_NAME_REGEX = r"[a-zA-Z_][a-zA-Z0-9_]*"
-    VERSION_REGEX = r"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?"
+    VERSION_REGEX = r"(latest|(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"
     PUBLIC_ID_REGEX = r"^({})/({}):({})$".format(
         AUTHOR_REGEX, PACKAGE_NAME_REGEX, VERSION_REGEX
     )
@@ -348,15 +393,7 @@ def __init__(self, author: str, name: str, version: PackageVersionLike):
         """Initialize the public identifier."""
         self._author = author
         self._name = name
-        self._version, self._version_info = self._process_version(version)
-
-    @staticmethod
-    def _process_version(version_like: PackageVersionLike) -> Tuple[Any, Any]:
-        if isinstance(version_like, str):
-            return version_like, semver.VersionInfo.parse(version_like)
-        if isinstance(version_like, semver.VersionInfo):
-            return str(version_like), version_like
-        raise ValueError("Version type not valid.")
+        self._package_version = PackageVersion(version)
 
     @property
     def author(self) -> str:
@@ -370,13 +407,13 @@ def name(self) -> str:
 
     @property
     def version(self) -> str:
-        """Get the version."""
-        return self._version
+        """Get the version string."""
+        return str(self._package_version)
 
     @property
-    def version_info(self) -> PackageVersion:
-        """Get the package version."""
-        return self._version_info
+    def package_version(self) -> PackageVersion:
+        """Get the package version object."""
+        return self._package_version
 
     @property
     def latest(self) -> str:
@@ -504,7 +541,7 @@ def __lt__(self, other):
             and self.author == other.author
             and self.name == other.name
         ):
-            return self.version_info < other.version_info
+            return self.package_version < other.package_version
         raise ValueError(
             "The public IDs {} and {} cannot be compared. Their author or name attributes are different.".format(
                 self, other

From 597fb46c732d6a591d407f4e549571af3b84d973 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 14 Sep 2020 23:40:50 +0200
Subject: [PATCH 003/131] make 'latest' the default

---
 aea/configurations/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index f76f147196..320adcc3e0 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -389,7 +389,7 @@ class PublicId(JSONSerializable):
         AUTHOR_REGEX, PACKAGE_NAME_REGEX, VERSION_REGEX
     )
 
-    def __init__(self, author: str, name: str, version: PackageVersionLike):
+    def __init__(self, author: str, name: str, version: PackageVersionLike = "latest"):
         """Initialize the public identifier."""
         self._author = author
         self._name = name

From f7cc4ae936eb6a714f74b1bf12cb8a53aed10f9d Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 15 Sep 2020 13:26:59 +0200
Subject: [PATCH 004/131] update public id construction with 'latest'

---
 aea/configurations/base.py             | 38 ++++++++++++++++++--------
 tests/test_configurations/test_base.py | 17 +++++++++++-
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 320adcc3e0..8cbdc43bb2 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -99,24 +99,28 @@
 We cannot have two items with the same package name since the keys of a YAML object form a set.
 """
 
-VersionInfo = Type[semver.VersionInfo]
-PackageVersionLike = Union[str, VersionInfo]
+VersionInfoClass = semver.VersionInfo
+PackageVersionLike = Union[str, semver.VersionInfo]
 
 
 @functools.total_ordering
 class PackageVersion:
     """A package version."""
 
+    _version: PackageVersionLike
+
     def __init__(self, version_like: PackageVersionLike):
         """
         Initialize a package version.
 
         :param version_like: a string, os a semver.VersionInfo object.
         """
-        if version_like == "latest":
+        if isinstance(version_like, str) and version_like == "latest":
             self._version = version_like
         elif isinstance(version_like, str):
-            self._version = semver.VersionInfo.parse(version_like)
+            self._version = VersionInfoClass.parse(version_like)
+        elif isinstance(version_like, VersionInfoClass):
+            self._version = version_like
         else:
             raise ValueError("Version type not valid.")
 
@@ -139,6 +143,9 @@ def __lt__(self, other):
             isinstance(other, PackageVersion),
             f"Cannot compare {type(self)} with type {type(other)}.",
         )
+        other = cast(PackageVersion, other)
+        if self.is_latest or other.is_latest:
+            return self.is_latest < other.is_latest
         return str(self) < str(other)
 
 
@@ -382,18 +389,26 @@ class PublicId(JSONSerializable):
     AUTHOR_REGEX = r"[a-zA-Z_][a-zA-Z0-9_]*"
     PACKAGE_NAME_REGEX = r"[a-zA-Z_][a-zA-Z0-9_]*"
     VERSION_REGEX = r"(latest|(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"
-    PUBLIC_ID_REGEX = r"^({})/({}):({})$".format(
+    PUBLIC_ID_REGEX = r"^({})/({})(:({}))?$".format(
         AUTHOR_REGEX, PACKAGE_NAME_REGEX, VERSION_REGEX
     )
     PUBLIC_ID_URI_REGEX = r"^({})/({})/({})$".format(
         AUTHOR_REGEX, PACKAGE_NAME_REGEX, VERSION_REGEX
     )
 
-    def __init__(self, author: str, name: str, version: PackageVersionLike = "latest"):
+    LATEST_VERSION = "latest"
+
+    def __init__(
+        self, author: str, name: str, version: Optional[PackageVersionLike] = None
+    ):
         """Initialize the public identifier."""
         self._author = author
         self._name = name
-        self._package_version = PackageVersion(version)
+        self._package_version = (
+            PackageVersion(version)
+            if version is not None
+            else PackageVersion(self.LATEST_VERSION)
+        )
 
     @property
     def author(self) -> str:
@@ -438,13 +453,14 @@ def from_str(cls, public_id_string: str) -> "PublicId":
         :return: the public id object.
         :raises ValueError: if the string in input is not well formatted.
         """
-        if not re.match(cls.PUBLIC_ID_REGEX, public_id_string):
+        match = re.match(cls.PUBLIC_ID_REGEX, public_id_string)
+        if match is None:
             raise ValueError(
                 "Input '{}' is not well formatted.".format(public_id_string)
             )
-        username, package_name, version = re.findall(
-            cls.PUBLIC_ID_REGEX, public_id_string
-        )[0][:3]
+        username = match.group(1)
+        package_name = match.group(2)
+        version = match.group(3)[1:] if ":" in public_id_string else None
         return PublicId(username, package_name, version)
 
     @classmethod
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index d9dba67f12..6da2b38d32 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -256,7 +256,7 @@ def test__get_default_configuration_file_name_from_type_positive(self):
 class PublicIdTestCase(TestCase):
     """Test case for PublicId class."""
 
-    @mock.patch("aea.configurations.base.re.match", return_value=False)
+    @mock.patch("aea.configurations.base.re.match", return_value=None)
     def test_public_id_from_str_not_matching(self, *mocks):
         """Test case for from_str method regex not matching."""
         with self.assertRaises(ValueError):
@@ -427,6 +427,21 @@ def test_public_id_invalid_version():
         PublicId("author", "name", object())
 
 
+def test_public_id_from_string():
+    """Test parsing the public id from string."""
+    public_id = PublicId.from_str("author/package:0.1.0")
+    assert public_id.author == "author"
+    assert public_id.name == "package"
+    assert public_id.version == "0.1.0"
+
+
+def test_public_id_from_string_without_version_string():
+    public_id = PublicId.from_str("author/package")
+    assert public_id.author == "author"
+    assert public_id.name == "package"
+    assert public_id.version == "latest"
+
+
 def test_public_id_from_uri_path():
     """Test PublicId.from_uri_path"""
     result = PublicId.from_uri_path("author/package_name/0.1.0")

From ea7c0798365014cb5f93d7efe2a0d8a01fb8680a Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 15 Sep 2020 19:58:55 +0200
Subject: [PATCH 005/131] update registry module to support 'latest' tag

---
 aea/configurations/base.py           |   6 +-
 aea/registries/base.py               | 218 ++++++++++++++++++++-------
 tests/test_registries/test_base.py   |  27 +++-
 tests/test_registries/test_filter.py |   2 +-
 4 files changed, 196 insertions(+), 57 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 8cbdc43bb2..390a572cd0 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -127,7 +127,7 @@ def __init__(self, version_like: PackageVersionLike):
     @property
     def is_latest(self) -> bool:
         """Check whether the version is 'latest'."""
-        return self._version == "latest"
+        return isinstance(self._version, str) and self._version == "latest"
 
     def __str__(self) -> str:
         """Get the string representation."""
@@ -435,6 +435,10 @@ def latest(self) -> str:
         """Get the public id in `latest` form."""
         return "{author}/{name}:*".format(author=self.author, name=self.name)
 
+    def same_prefix(self, other: "PublicId") -> bool:
+        """Check if the other public id has the same author and name of this."""
+        return self.name == other.name and self.author == other.author
+
     @classmethod
     def from_str(cls, public_id_string: str) -> "PublicId":
         """
diff --git a/aea/registries/base.py b/aea/registries/base.py
index 60fce0f86f..dd86426a8a 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -22,6 +22,7 @@
 import copy
 import logging
 from abc import ABC, abstractmethod
+from operator import itemgetter
 from typing import Dict, Generic, List, Optional, Set, Tuple, TypeVar, cast
 
 from aea.components.base import Component
@@ -58,7 +59,7 @@ def register(
 
         :param item_id: the public id of the item.
         :param item: the item.
-        :param is_dynamicall_added: whether or not the item is dynamicall added.
+        :param is_dynamically_added: whether or not the item is dynamically added.
         :return: None
         :raises: ValueError if an item is already registered with that item id.
         """
@@ -90,6 +91,14 @@ def fetch_all(self) -> List[Item]:
         :return: the list of items.
         """
 
+    @abstractmethod
+    def ids(self) -> Set[ItemId]:
+        """
+        Return the set of all the used item ids.
+
+        :return: the set of item ids.
+        """
+
     @abstractmethod
     def setup(self) -> None:
         """
@@ -107,6 +116,71 @@ def teardown(self) -> None:
         """
 
 
+class PublicIdRegistry(Generic[Item], Registry[PublicId, Item]):
+    """
+    This class implement a registry whose keys are public ids.
+
+    In particular, it is able to handle the case when the public id
+    points to the 'latest' version of a package.
+    """
+
+    def __init__(self):
+        """Initialize the registry."""
+        super().__init__()
+        self._public_id_to_item: Dict[PublicId, Item] = {}
+
+    def register(  # pylint: disable=arguments-differ,unused-argument
+        self, public_id: PublicId, item: Item, is_dynamically_added: bool = False
+    ) -> None:
+        """Register an item."""
+        if public_id.package_version.is_latest:
+            raise ValueError(
+                f"Cannot register item with public id 'latest': {public_id}"
+            )
+        if public_id in self._public_id_to_item:
+            raise ValueError(f"Item already registered with item id '{public_id}'")
+        self._public_id_to_item[public_id] = item
+
+    def unregister(self, public_id: PublicId) -> None:
+        """Unregister an item."""
+        if public_id not in self._public_id_to_item:
+            raise ValueError(f"No item registered with item id '{public_id}'")
+        self._public_id_to_item.pop(public_id)
+
+    def fetch(self, public_id: PublicId) -> Optional[Item]:
+        """
+        Fetch an item associated with a public id.
+
+        :param public_id: the public id.
+        :return: an item, or None if the key is not present.
+        """
+        if public_id.package_version.is_latest:
+            filtered_records: List[Tuple[PublicId, Item]] = list(
+                filter(
+                    lambda x: public_id.same_prefix(x[0]),
+                    self._public_id_to_item.items(),
+                )
+            )
+            if len(filtered_records) == 0:
+                return None
+            return max(filtered_records, key=itemgetter(0))[1]
+        return self._public_id_to_item.get(public_id, None)
+
+    def fetch_all(self) -> List[Item]:
+        """Fetch all the items."""
+        return list(self._public_id_to_item.values())
+
+    def ids(self) -> Set[PublicId]:
+        """Get all the item ids."""
+        return set(self._public_id_to_item.keys())
+
+    def setup(self) -> None:
+        """Set up the items."""
+
+    def teardown(self) -> None:
+        """Tear down the items."""
+
+
 class AgentComponentRegistry(Registry[ComponentId, Component]):
     """This class implements a simple dictionary-based registry for agent components."""
 
@@ -131,7 +205,7 @@ def register(  # pylint: disable=arguments-differ,unused-argument
 
         :param component_id: the id of the component.
         :param component: the component object.
-        :param is_dynamicall_added: whether or not the item is dynamicall added.
+        :param is_dynamically_added: whether or not the item is dynamically added.
         """
         if component_id in self._registered_keys:
             raise ValueError(
@@ -222,6 +296,10 @@ def fetch_by_type(self, component_type: ComponentType) -> List[Component]:
         """
         return list(self._components_by_type.get(component_type, {}).values())
 
+    def ids(self) -> Set[ComponentId]:
+        """Get the item ids."""
+        return self._registered_keys
+
     def setup(self) -> None:
         """
         Set up the registry.
@@ -251,8 +329,10 @@ def __init__(self) -> None:
         :return: None
         """
         super().__init__()
-        self._items = {}  # type: Dict[SkillId, Dict[str, SkillComponentType]]
-        self._dynamically_added = {}  # type: Dict[SkillId, Set[str]]
+        self._items: PublicIdRegistry[
+            Dict[str, SkillComponentType]
+        ] = PublicIdRegistry()
+        self._dynamically_added: Dict[SkillId, Set[str]] = {}
 
     def register(
         self,
@@ -265,19 +345,25 @@ def register(
 
         :param item_id: a pair (skill id, item name).
         :param item: the item to register.
-        :param is_dynamicall_added: whether or not the item is dynamicall added.
+        :param is_dynamically_added: whether or not the item is dynamically added.
         :return: None
         :raises: ValueError if an item is already registered with that item id.
         """
         skill_id = item_id[0]
         item_name = item_id[1]
-        if item_name in self._items.get(skill_id, {}).keys():
+        skill_items = self._items.fetch(skill_id)
+        if skill_items is not None and item_name in skill_items.keys():
             raise ValueError(
-                "Item already registered with skill id '{}' and name '{}'".format(
-                    skill_id, item_name
-                )
+                f"Item already registered with skill id '{skill_id}' and name '{item_name}'"
             )
-        self._items.setdefault(skill_id, {})[item_name] = item
+
+        if skill_items is not None:
+            self._items.unregister(skill_id)
+        else:
+            skill_items = {}
+        skill_items[item_name] = item
+        self._items.register(skill_id, skill_items)
+
         if is_dynamically_added:
             self._dynamically_added.setdefault(skill_id, set()).add(item_name)
 
@@ -303,15 +389,18 @@ def _unregister_from_main_index(
         """
         skill_id = item_id[0]
         item_name = item_id[1]
-        name_to_item = self._items.get(skill_id, {})
-        if item_name not in name_to_item:
+        name_to_item = self._items.fetch(skill_id)
+        if name_to_item is None or item_name not in name_to_item:
             raise ValueError(
                 "No item registered with component id '{}'".format(item_id)
             )
         self.logger.debug("Unregistering item with id {}".format(item_id))
         item = name_to_item.pop(item_name)
         if len(name_to_item) == 0:
-            self._items.pop(skill_id, None)
+            self._items.unregister(skill_id)
+        else:
+            self._items.unregister(skill_id)
+            self._items.register(skill_id, name_to_item)
 
         items = self._dynamically_added.get(skill_id, None)
         if items is not None:
@@ -329,27 +418,39 @@ def fetch(self, item_id: Tuple[SkillId, str]) -> Optional[SkillComponentType]:
         """
         skill_id = item_id[0]
         item_name = item_id[1]
-        return self._items.get(skill_id, {}).get(item_name, None)
+        name_to_item = self._items.fetch(skill_id)
+        if name_to_item is None:
+            return None
+        return name_to_item.get(item_name, None)
 
     def fetch_by_skill(self, skill_id: SkillId) -> List[Item]:
         """Fetch all the items of a given skill."""
-        return [*self._items.get(skill_id, {}).values()]
+        temp = self._items.fetch(skill_id)
+        name_to_item = {} if temp is None else temp
+        return list(name_to_item.values())
 
     def fetch_all(self) -> List[SkillComponentType]:
         """Fetch all the items."""
-        return [
-            item for skill_id, items in self._items.items() for item in items.values()
-        ]
+        return [item for items in self._items.fetch_all() for item in items.values()]
 
     def unregister_by_skill(self, skill_id: SkillId) -> None:
         """Unregister all the components by skill."""
-        if skill_id not in self._items:
+        if skill_id not in self._items.ids():
             raise ValueError(
                 "No component of skill {} present in the registry.".format(skill_id)
             )
-        self._items.pop(skill_id, None)
+        self._items.unregister(skill_id)
         self._dynamically_added.pop(skill_id, None)
 
+    def ids(self) -> Set[Tuple[SkillId, str]]:
+        """Get the item ids."""
+        result: Set[Tuple[SkillId, str]] = set()
+        for skill_id in self._items.ids():
+            name_to_item = self._items.fetch(skill_id)
+            for name, _ in name_to_item.items():
+                result.add((skill_id, name))
+        return result
+
     def setup(self) -> None:
         """
         Set up the items in the registry.
@@ -377,14 +478,14 @@ def teardown(self) -> None:
 
         :return: None
         """
-        for skill_id, items in self._items.items():
-            for _, item in items.items():
+        for name_to_items in self._items.fetch_all():
+            for _, item in name_to_items.items():
                 try:
                     item.teardown()
                 except Exception as e:  # pragma: nocover # pylint: disable=broad-except
                     self.logger.warning(
                         "An error occurred while tearing down item {}/{}: {}".format(
-                            skill_id, type(item).__name__, str(e)
+                            item.skill_id, type(item).__name__, str(e)
                         )
                     )
         _dynamically_added = copy.deepcopy(self._dynamically_added)
@@ -403,9 +504,10 @@ def __init__(self) -> None:
         :return: None
         """
         super().__init__()
-        self._items_by_protocol_and_skill = (
-            {}
-        )  # type: Dict[ProtocolId, Dict[SkillId, Handler]]
+        # nested public id registries; one for protocol ids, one for skill ids
+        self._items_by_protocol_and_skill = PublicIdRegistry[
+            PublicIdRegistry[Handler]
+        ]()
 
     def register(
         self,
@@ -418,36 +520,39 @@ def register(
 
         :param item_id: the item id.
         :param item: the handler.
-        :param is_dynamicall_added: whether or not the item is dynamicall added.
+        :param is_dynamically_added: whether or not the item is dynamically added.
         :return: None
         :raises ValueError: if the protocol is None, or an item with pair (skill_id, protocol_id_ already exists.
         """
-        super().register(item_id, item, is_dynamically_added=is_dynamically_added)
-
         skill_id = item_id[0]
 
         protocol_id = item.SUPPORTED_PROTOCOL
         if protocol_id is None:
-            super().unregister(item_id)
             raise ValueError(
                 "Please specify a supported protocol for handler class '{}'".format(
                     item.__class__.__name__
                 )
             )
 
-        protocol_handlers_by_skill = self._items_by_protocol_and_skill.get(
-            protocol_id, {}
+        protocol_handlers_by_skill = self._items_by_protocol_and_skill.fetch(
+            protocol_id
         )
-        if skill_id in protocol_handlers_by_skill:
+        if (
+            protocol_handlers_by_skill is not None
+            and skill_id in protocol_handlers_by_skill.ids()
+        ):
             # clean up previous modifications done by super().register
-            super().unregister(item_id)
             raise ValueError(
                 "A handler already registered with pair of protocol id {} and skill id {}".format(
                     protocol_id, skill_id
                 )
             )
-
-        self._items_by_protocol_and_skill.setdefault(protocol_id, {})[skill_id] = item
+        if protocol_handlers_by_skill is None:
+            # registry from skill ids to handlers.
+            new_registry = PublicIdRegistry()
+            self._items_by_protocol_and_skill.register(protocol_id, new_registry)
+        self._items_by_protocol_and_skill.fetch(protocol_id).register(skill_id, item)
+        super().register(item_id, item, is_dynamically_added=is_dynamically_added)
 
     def unregister(self, item_id: Tuple[SkillId, str]) -> None:
         """
@@ -462,29 +567,34 @@ def unregister(self, item_id: Tuple[SkillId, str]) -> None:
 
         # remove from index by protocol and skill
         protocol_id = cast(ProtocolId, handler.SUPPORTED_PROTOCOL)
-        protocol_handlers_by_skill = self._items_by_protocol_and_skill.get(
-            protocol_id, {}
+        protocol_handlers_by_skill = self._items_by_protocol_and_skill.fetch(
+            protocol_id
         )
-        protocol_handlers_by_skill.pop(skill_id, None)
-        if len(protocol_handlers_by_skill) == 0:
-            self._items_by_protocol_and_skill.pop(protocol_id, None)
+        protocol_handlers_by_skill.unregister(skill_id)
+        if len(protocol_handlers_by_skill.ids()) == 0:
+            self._items_by_protocol_and_skill.unregister(protocol_id)
 
     def unregister_by_skill(self, skill_id: SkillId) -> None:
         """Unregister all the components by skill."""
         # unregister from the main index.
-        if skill_id not in self._items:
+        if skill_id not in self._items.ids():
             raise ValueError(
                 "No component of skill {} present in the registry.".format(skill_id)
             )
 
         self._dynamically_added.pop(skill_id, None)
 
-        handlers = self._items.pop(skill_id).values()
+        handlers = self._items.fetch(skill_id).values()
+        self._items.unregister(skill_id)
 
         # unregister from the protocol-skill index
         for handler in handlers:
             protocol_id = cast(ProtocolId, handler.SUPPORTED_PROTOCOL)
-            self._items_by_protocol_and_skill.get(protocol_id, {}).pop(skill_id, None)
+            if protocol_id in self._items_by_protocol_and_skill.ids():
+                skill_id_to_handler = self._items_by_protocol_and_skill.fetch(
+                    protocol_id
+                )
+                skill_id_to_handler.unregister(skill_id)
 
     def fetch_by_protocol(self, protocol_id: ProtocolId) -> List[Handler]:
         """
@@ -493,12 +603,15 @@ def fetch_by_protocol(self, protocol_id: ProtocolId) -> List[Handler]:
         :param protocol_id: the protocol id
         :return: the handlers registered for the protocol_id and skill_id
         """
-        protocol_handlers_by_skill = self._items_by_protocol_and_skill.get(
-            protocol_id, {}
+        if protocol_id not in self._items_by_protocol_and_skill.ids():
+            return []
+
+        protocol_handlers_by_skill = self._items_by_protocol_and_skill.fetch(
+            protocol_id
         )
         handlers = [
-            protocol_handlers_by_skill[skill_id]
-            for skill_id in protocol_handlers_by_skill
+            protocol_handlers_by_skill.fetch(skill_id)
+            for skill_id in protocol_handlers_by_skill.ids()
         ]
         return handlers
 
@@ -512,6 +625,9 @@ def fetch_by_protocol_and_skill(
         :param skill_id: the skill id.
         :return: the handlers registered for the protocol_id and skill_id
         """
-        return self._items_by_protocol_and_skill.get(protocol_id, {}).get(
-            skill_id, None
-        )
+        if protocol_id not in self._items_by_protocol_and_skill.ids():
+            return None
+        protocols_by_skill_id = self._items_by_protocol_and_skill.fetch(protocol_id)
+        if skill_id not in protocols_by_skill_id.ids():
+            return None
+        return protocols_by_skill_id.fetch(skill_id)
diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index 29f86eacec..5287d409e8 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -639,6 +639,23 @@ def test_setup_with_inactive_skill(self):
                     f"Ignoring setup() of component {mock_item.name} of skill {mock_item.skill_id}, because the skill is not active."
                 )
 
+    def test_fetch_with_latest_version(self):
+        """Test fetch with public id :latest version."""
+        item_id_1 = PublicId("author", "package", "0.1.0")
+        item_id_2 = PublicId("author", "package", "0.2.0")
+        item_id_latest = PublicId("author", "package")
+        name = "name"
+        self.registry.register((item_id_1, name), MagicMock(id=1))
+        self.registry.register((item_id_2, name), MagicMock(id=2))
+
+        latest = self.registry.fetch((item_id_latest, name))
+        assert latest is not None
+        assert latest.id == 2
+
+        # restore previous state
+        self.registry.unregister((item_id_1, name))
+        self.registry.unregister((item_id_2, name))
+
 
 class TestHandlerRegistry:
     """Test handler registry."""
@@ -653,7 +670,7 @@ def test_register_and_unregister_dynamically(self):
         assert len(self.registry._dynamically_added) == 0
         self.registry.register(
             (PublicId.from_str("author/name:0.1.0"), "name"),
-            MagicMock(SUPPORTED_PROTOCOL="author/protocol:0.1.0"),
+            MagicMock(SUPPORTED_PROTOCOL=PublicId.from_str("author/protocol:0.1.0")),
             is_dynamically_added=True,
         )
         assert len(self.registry._dynamically_added) == 1
@@ -665,7 +682,7 @@ def test_register_and_teardown_dynamically(self):
         assert len(self.registry._dynamically_added) == 0
         self.registry.register(
             (PublicId.from_str("author/name:0.1.0"), "name"),
-            MagicMock(SUPPORTED_PROTOCOL="author/protocol:0.1.0"),
+            MagicMock(SUPPORTED_PROTOCOL=PublicId.from_str("author/protocol:0.1.0")),
             is_dynamically_added=True,
         )
         assert len(self.registry._dynamically_added) == 1
@@ -686,7 +703,9 @@ def test_register_when_skill_protocol_id_exist(self):
         """Test register when protocol id is None."""
         skill_id = PublicId.from_str("author/name:0.1.0")
         protocol_id = PublicId.from_str("author/name:0.1.0")
-        self.registry._items_by_protocol_and_skill[protocol_id] = {skill_id: object()}
+        self.registry.register(
+            (skill_id, "name"), MagicMock(SUPPORTED_PROTOCOL=protocol_id)
+        )
         with pytest.raises(
             ValueError,
             match="A handler already registered with pair of protocol id .* and skill id .*",
@@ -694,7 +713,7 @@ def test_register_when_skill_protocol_id_exist(self):
             self.registry.register(
                 (skill_id, "name"), MagicMock(SUPPORTED_PROTOCOL=protocol_id)
             )
-        self.registry._items_by_protocol_and_skill = {}
+        self.registry.unregister((skill_id, "name"))
 
     def test_unregister_when_no_item_is_registered(self):
         """Test unregister when there is no item with that item id."""
diff --git a/tests/test_registries/test_filter.py b/tests/test_registries/test_filter.py
index eb28fd0f12..735d745bc4 100644
--- a/tests/test_registries/test_filter.py
+++ b/tests/test_registries/test_filter.py
@@ -99,7 +99,7 @@ def test_handle_internal_message_when_no_handler(self):
     def test_handle_internal_message_when_invalid_to(self):
         """Test handle internal message when the message has an invalid to."""
         msg = MagicMock()
-        msg.to = "author/name"
+        msg.to = "author!name"
         with unittest.mock.patch.object(
             aea.registries.filter.logger, "warning"
         ) as mock_logger_warning:

From 23eb3825f3269e4f8bcecb88c8126cfc69b44420 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 15 Sep 2020 22:12:18 +0200
Subject: [PATCH 006/131] fix static checks

---
 aea/registries/base.py | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/aea/registries/base.py b/aea/registries/base.py
index dd86426a8a..98ba2fff37 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -423,10 +423,10 @@ def fetch(self, item_id: Tuple[SkillId, str]) -> Optional[SkillComponentType]:
             return None
         return name_to_item.get(item_name, None)
 
-    def fetch_by_skill(self, skill_id: SkillId) -> List[Item]:
+    def fetch_by_skill(self, skill_id: SkillId) -> List[SkillComponentType]:
         """Fetch all the items of a given skill."""
-        temp = self._items.fetch(skill_id)
-        name_to_item = {} if temp is None else temp
+        temp: Optional[Dict[str, SkillComponentType]] = self._items.fetch(skill_id)
+        name_to_item: Dict[str, SkillComponentType] = {} if temp is None else temp
         return list(name_to_item.values())
 
     def fetch_all(self) -> List[SkillComponentType]:
@@ -446,7 +446,9 @@ def ids(self) -> Set[Tuple[SkillId, str]]:
         """Get the item ids."""
         result: Set[Tuple[SkillId, str]] = set()
         for skill_id in self._items.ids():
-            name_to_item = self._items.fetch(skill_id)
+            name_to_item = cast(
+                Dict[str, SkillComponentType], self._items.fetch(skill_id)
+            )
             for name, _ in name_to_item.items():
                 result.add((skill_id, name))
         return result
@@ -549,9 +551,10 @@ def register(
             )
         if protocol_handlers_by_skill is None:
             # registry from skill ids to handlers.
-            new_registry = PublicIdRegistry()
+            new_registry: PublicIdRegistry = PublicIdRegistry()
             self._items_by_protocol_and_skill.register(protocol_id, new_registry)
-        self._items_by_protocol_and_skill.fetch(protocol_id).register(skill_id, item)
+        registry = cast(Registry, self._items_by_protocol_and_skill.fetch(protocol_id))
+        registry.register(skill_id, item)
         super().register(item_id, item, is_dynamically_added=is_dynamically_added)
 
     def unregister(self, item_id: Tuple[SkillId, str]) -> None:
@@ -567,8 +570,8 @@ def unregister(self, item_id: Tuple[SkillId, str]) -> None:
 
         # remove from index by protocol and skill
         protocol_id = cast(ProtocolId, handler.SUPPORTED_PROTOCOL)
-        protocol_handlers_by_skill = self._items_by_protocol_and_skill.fetch(
-            protocol_id
+        protocol_handlers_by_skill = cast(
+            PublicIdRegistry, self._items_by_protocol_and_skill.fetch(protocol_id)
         )
         protocol_handlers_by_skill.unregister(skill_id)
         if len(protocol_handlers_by_skill.ids()) == 0:
@@ -584,15 +587,16 @@ def unregister_by_skill(self, skill_id: SkillId) -> None:
 
         self._dynamically_added.pop(skill_id, None)
 
-        handlers = self._items.fetch(skill_id).values()
+        handlers = cast(Dict[str, Handler], self._items.fetch(skill_id)).values()
         self._items.unregister(skill_id)
 
         # unregister from the protocol-skill index
         for handler in handlers:
             protocol_id = cast(ProtocolId, handler.SUPPORTED_PROTOCOL)
             if protocol_id in self._items_by_protocol_and_skill.ids():
-                skill_id_to_handler = self._items_by_protocol_and_skill.fetch(
-                    protocol_id
+                skill_id_to_handler = cast(
+                    PublicIdRegistry,
+                    self._items_by_protocol_and_skill.fetch(protocol_id),
                 )
                 skill_id_to_handler.unregister(skill_id)
 
@@ -606,11 +610,11 @@ def fetch_by_protocol(self, protocol_id: ProtocolId) -> List[Handler]:
         if protocol_id not in self._items_by_protocol_and_skill.ids():
             return []
 
-        protocol_handlers_by_skill = self._items_by_protocol_and_skill.fetch(
-            protocol_id
+        protocol_handlers_by_skill = cast(
+            PublicIdRegistry, self._items_by_protocol_and_skill.fetch(protocol_id)
         )
         handlers = [
-            protocol_handlers_by_skill.fetch(skill_id)
+            cast(Handler, protocol_handlers_by_skill.fetch(skill_id))
             for skill_id in protocol_handlers_by_skill.ids()
         ]
         return handlers
@@ -627,7 +631,9 @@ def fetch_by_protocol_and_skill(
         """
         if protocol_id not in self._items_by_protocol_and_skill.ids():
             return None
-        protocols_by_skill_id = self._items_by_protocol_and_skill.fetch(protocol_id)
+        protocols_by_skill_id = cast(
+            PublicIdRegistry, self._items_by_protocol_and_skill.fetch(protocol_id)
+        )
         if skill_id not in protocols_by_skill_id.ids():
             return None
         return protocols_by_skill_id.fetch(skill_id)

From 26e4eb29f2f3c2ff937b11a3d90adf03513ef9ff Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 15 Sep 2020 22:35:05 +0200
Subject: [PATCH 007/131] make 'latest' query test more robust

---
 tests/test_registries/test_base.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index 5287d409e8..d198068de4 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -643,18 +643,21 @@ def test_fetch_with_latest_version(self):
         """Test fetch with public id :latest version."""
         item_id_1 = PublicId("author", "package", "0.1.0")
         item_id_2 = PublicId("author", "package", "0.2.0")
+        item_id_3 = PublicId("author", "package", "0.3.0")
         item_id_latest = PublicId("author", "package")
         name = "name"
         self.registry.register((item_id_1, name), MagicMock(id=1))
+        self.registry.register((item_id_3, name), MagicMock(id=3))
         self.registry.register((item_id_2, name), MagicMock(id=2))
 
         latest = self.registry.fetch((item_id_latest, name))
         assert latest is not None
-        assert latest.id == 2
+        assert latest.id == 3
 
         # restore previous state
         self.registry.unregister((item_id_1, name))
         self.registry.unregister((item_id_2, name))
+        self.registry.unregister((item_id_3, name))
 
 
 class TestHandlerRegistry:

From d847a6f907d2dd0b1d369d68b2a2db7e79af34da Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 16 Sep 2020 11:34:22 +0200
Subject: [PATCH 008/131] update add and fetch to deal with 'latest' tag

---
 aea/cli/fetch.py                            | 7 +++++--
 aea/cli/utils/package_utils.py              | 5 ++++-
 aea/configurations/schemas/definitions.json | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/aea/cli/fetch.py b/aea/cli/fetch.py
index f56b4a70ad..05d8a076f7 100644
--- a/aea/cli/fetch.py
+++ b/aea/cli/fetch.py
@@ -57,11 +57,14 @@ def _is_version_correct(ctx: Context, agent_public_id: PublicId) -> bool:
     Compare agent version to the one in public ID.
 
     :param ctx: Context object.
-    :param public_id: public ID of an agent.
+    :param agent_public_id: public ID of an agent.
 
     :return: bool is version correct.
     """
-    return ctx.agent_config.version == agent_public_id.version
+    return (
+        agent_public_id.package_version.is_latest
+        or ctx.agent_config.version == agent_public_id.version
+    )
 
 
 @clean_after
diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py
index 32d0727958..bf3a7b91c2 100644
--- a/aea/cli/utils/package_utils.py
+++ b/aea/cli/utils/package_utils.py
@@ -258,7 +258,10 @@ def find_item_locally(ctx, item_type, item_public_id) -> Path:
     # check that the configuration file of the found package matches the expected author and version.
     version = item_configuration.version
     author = item_configuration.author
-    if item_public_id.author != author or item_public_id.version != version:
+    if item_public_id.author != author or (
+        not item_public_id.package_version.is_latest
+        and item_public_id.version != version
+    ):
         raise click.ClickException(
             "Cannot find {} with author and version specified.".format(item_type)
         )
diff --git a/aea/configurations/schemas/definitions.json b/aea/configurations/schemas/definitions.json
index c723ad8584..6f956b5d10 100644
--- a/aea/configurations/schemas/definitions.json
+++ b/aea/configurations/schemas/definitions.json
@@ -79,7 +79,7 @@
     },
     "public_id": {
       "type": "string",
-      "pattern": "^[a-zA-Z0-9_]*/[a-zA-Z_][a-zA-Z0-9_]*:(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
+      "pattern": "^[a-zA-Z0-9_]*/[a-zA-Z_][a-zA-Z0-9_]*:(latest|(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)$"
     },
     "version_specifiers": {
       "type": "string",

From df9c61cd5b574b1c800cd82530f2302e1e43cf61 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 17 Sep 2020 23:27:07 +0100
Subject: [PATCH 009/131] add more docstring linter options

---
 aea/cli/utils/generic.py                      |   1 +
 aea/cli_gui/__init__.py                       |  12 +-
 aea/crypto/cosmos.py                          |  12 +-
 aea/crypto/fetchai.py                         |   4 +-
 aea/helpers/async_utils.py                    |   4 +-
 aea/helpers/multiaddr/base.py                 |  29 +++--
 aea/helpers/pipe.py                           | 106 +++++++++---------
 aea/helpers/transaction/base.py               |  16 +++
 aea/protocols/generator/base.py               |   3 +
 aea/skills/base.py                            |   3 +-
 docs/agent-vs-aea.md                          |  11 ++
 docs/build-aea-programmatically.md            |   2 +
 docs/cli-vs-programmatic-aeas.md              |   2 +
 docs/decision-maker-transaction.md            |   2 +
 docs/multiplexer-standalone.md                |   2 +
 docs/standalone-transaction.md                |   2 +
 examples/gym_ex/proxy/agent.py                |   6 +
 examples/gym_ex/proxy/env.py                  |   2 -
 .../connections/ledger/connection.yaml        |   2 +-
 .../connections/ledger/contract_dispatcher.py |   6 +-
 .../connections/p2p_libp2p/connection.py      |  18 +--
 .../connections/p2p_libp2p/connection.yaml    |   2 +-
 .../p2p_libp2p_client/connection.py           |  11 +-
 .../p2p_libp2p_client/connection.yaml         |   2 +-
 .../fetchai/contracts/erc1155/contract.py     |   3 +
 .../fetchai/contracts/erc1155/contract.yaml   |   2 +-
 .../protocols/contract_api/custom_types.py    |   2 +
 .../protocols/contract_api/protocol.yaml      |   2 +-
 .../fetchai/protocols/gym/custom_types.py     |   1 +
 packages/fetchai/protocols/gym/protocol.yaml  |   2 +-
 packages/fetchai/skills/ml_train/ml_model.py  |  10 ++
 packages/fetchai/skills/ml_train/skill.yaml   |   2 +-
 .../fetchai/skills/tac_negotiation/skill.yaml |   2 +-
 .../skills/tac_negotiation/strategy.py        |   1 +
 packages/hashes.csv                           |  16 +--
 scripts/acn/run_acn_node_standalone.py        |  28 ++---
 scripts/check_copyright_notice.py             |   1 +
 scripts/check_package_versions_in_docs.py     |   6 +-
 scripts/deploy_to_registry.py                 |   4 +-
 scripts/freeze_dependencies.py                |   4 +-
 scripts/generate_api_docs.py                  |   4 +-
 scripts/generate_ipfs_hashes.py               |   7 +-
 scripts/parse_main_dependencies_from_lock.py  |   5 +-
 scripts/update_package_versions.py            |   3 +-
 scripts/update_symlinks_cross_platform.py     |   4 +-
 setup.cfg                                     |   7 +-
 tests/common/mocks.py                         |   2 +
 tests/data/custom_crypto.py                   |  41 +++++++
 tests/data/dummy_contract/contract.py         |   1 +
 tests/data/dummy_contract/contract.yaml       |   2 +-
 tests/data/hashes.csv                         |   2 +-
 tests/test_aea_builder.py                     |   3 +-
 tests/test_agent.py                           |   1 +
 tests/test_cli/tools_for_testing.py           |   1 +
 tests/test_components/test_base.py            |   1 +
 tests/test_components/test_loader.py          |  19 +---
 tests/test_configurations/test_aea_config.py  |  10 +-
 tests/test_configurations/test_base.py        |   4 +-
 tests/test_contracts/test_base.py             |   1 +
 tests/test_crypto/test_fetchai.py             |   4 +
 .../test_agent_vs_aea/agent_code_block.py     |  11 ++
 .../programmatic_aea.py                       |   2 +
 .../programmatic_aea.py                       |   2 +
 .../decision_maker_transaction.py             |   2 +
 .../test_decision_maker_transaction.py        |   1 +
 .../multiplexer_standalone.py                 |   2 +
 .../test_orm_integration.py                   |   5 +-
 .../standalone_transaction.py                 |   2 +
 ..._client_connection_to_aries_cloud_agent.py |   3 +
 tests/test_helpers/test_multiaddr.py          |   2 +
 tests/test_helpers/test_pipe/test_pipe.py     |   4 +
 .../test_p2p_libp2p/test_aea_cli.py           |   2 +
 .../test_p2p_libp2p/test_communication.py     |  12 ++
 .../test_p2p_libp2p/test_errors.py            |   9 +-
 .../test_p2p_libp2p/test_fault_tolerance.py   |   4 +
 .../test_p2p_libp2p/test_public_dht.py        |   8 ++
 .../test_p2p_libp2p_client/test_aea_cli.py    |   2 +
 .../test_communication.py                     |  12 ++
 .../test_p2p_libp2p_client/test_errors.py     |   3 +
 .../test_soef/test_soef_integration.py        |   1 +
 .../test_erc1155/test_contract.py             |  10 ++
 tests/test_protocols/test_base.py             |   2 +
 .../test_protocols/test_dialogue/test_base.py |   1 +
 tests/test_protocols/test_generator/common.py |   1 +
 .../test_generator/test_common.py             |   3 +
 .../test_extract_specification.py             |   1 +
 .../test_generator/test_generator.py          |   1 +
 tests/test_skills/test_behaviours.py          |  11 ++
 tests/test_task.py                            |   3 +
 89 files changed, 392 insertions(+), 198 deletions(-)

diff --git a/aea/cli/utils/generic.py b/aea/cli/utils/generic.py
index 8e4ba55a10..f7e0e72757 100644
--- a/aea/cli/utils/generic.py
+++ b/aea/cli/utils/generic.py
@@ -73,6 +73,7 @@ def load_yaml(filepath: str) -> Dict:
 def is_readme_present(readme_path: str) -> bool:
     """
     Check is readme file present.
+
     This method is needed for proper testing.
 
     :param readme_path: path to readme file.
diff --git a/aea/cli_gui/__init__.py b/aea/cli_gui/__init__.py
index 9045f97d1d..0917193f44 100644
--- a/aea/cli_gui/__init__.py
+++ b/aea/cli_gui/__init__.py
@@ -23,7 +23,7 @@
 import subprocess  # nosec
 import sys
 import threading
-from typing import Dict, List
+from typing import Any, Dict, List, Tuple
 
 from click import ClickException
 
@@ -232,9 +232,13 @@ def remove_local_item(agent_id: str, item_type: str, item_id: str):
         return agent_id, 201  # 200 (OK)
 
 
-def get_local_items(agent_id: str, item_type: str):
+def get_local_items(agent_id: str, item_type: str) -> Tuple[List[Dict[Any, Any]], int]:
+    """
+    Return a list of protocols, skills or connections supported by a local agent.
 
-    """Return a list of protocols, skills or connections supported by a local agent."""
+    :param agent_id: the id of the agent
+    :param item_type: the type of item
+    """
     if agent_id == "NONE":
         return [], 200  # 200 (Success)
 
@@ -244,7 +248,7 @@ def get_local_items(agent_id: str, item_type: str):
         try_to_load_agent_config(ctx)
         result = cli_list_agent_items(ctx, item_type)
     except ClickException:
-        return {"detail": "Failed to list agent items."}, 400  # 400 Bad request
+        return [{"detail": "Failed to list agent items."}], 400  # 400 Bad request
     else:
         sorted_items = sort_items(result)
         return sorted_items, 200  # 200 (Success)
diff --git a/aea/crypto/cosmos.py b/aea/crypto/cosmos.py
index 0c49fed96a..3534f03a66 100644
--- a/aea/crypto/cosmos.py
+++ b/aea/crypto/cosmos.py
@@ -355,9 +355,7 @@ class _CosmosApi(LedgerApi):
     identifier = _COSMOS
 
     def __init__(self, **kwargs):
-        """
-        Initialize the Cosmos ledger APIs.
-        """
+        """Initialize the Cosmos ledger APIs."""
         self._api = None
         self.network_address = kwargs.pop("address", DEFAULT_ADDRESS)
         self.denom = kwargs.pop("denom", DEFAULT_CURRENCY_DENOM)
@@ -991,16 +989,12 @@ def _try_check_faucet_claim(cls, uid: str) -> Optional[CosmosFaucetStatus]:
 
     @classmethod
     def _faucet_request_uri(cls) -> str:
-        """
-        Generates the request URI derived from `cls.faucet_base_url`
-        """
+        """Generates the request URI derived from `cls.faucet_base_url`."""
         if cls.testnet_faucet_url is None:  # pragma: nocover
             raise ValueError("Testnet faucet url not set.")
         return f"{cls.testnet_faucet_url}/claim/requests"
 
     @classmethod
     def _faucet_status_uri(cls, uid: str) -> str:
-        """
-        Generates the status URI derived from `cls.faucet_base_url`
-        """
+        """Generates the status URI derived from `cls.faucet_base_url`."""
         return f"{cls._faucet_request_uri()}/{uid}"
diff --git a/aea/crypto/fetchai.py b/aea/crypto/fetchai.py
index 2d54b2a2b9..f3f77a1355 100644
--- a/aea/crypto/fetchai.py
+++ b/aea/crypto/fetchai.py
@@ -50,9 +50,7 @@ class FetchAIApi(_CosmosApi, FetchAIHelper):
     identifier = _FETCHAI
 
     def __init__(self, **kwargs):
-        """
-        Initialize the Fetch.ai ledger APIs.
-        """
+        """Initialize the Fetch.ai ledger APIs."""
         if "address" not in kwargs:
             kwargs["address"] = DEFAULT_ADDRESS  # pragma: nocover
         if "denom" not in kwargs:
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index f7360d223b..6e3ca74660 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -378,9 +378,7 @@ def stop(self) -> None:
 
 
 class AwaitableProc:
-    """
-    Async-friendly subprocess.Popen
-    """
+    """Async-friendly subprocess.Popen."""
 
     def __init__(self, *args, **kwargs):
         """Initialise awaitable proc."""
diff --git a/aea/helpers/multiaddr/base.py b/aea/helpers/multiaddr/base.py
index c7275427fe..afbac8afbb 100644
--- a/aea/helpers/multiaddr/base.py
+++ b/aea/helpers/multiaddr/base.py
@@ -45,20 +45,29 @@
 if ENABLE_INLINING:
 
     class IdentityHash:
-        """ Neutral hashing implementation for inline multihashing """
+        """Neutral hashing implementation for inline multihashing."""
 
         _digest: bytes
 
         def __init__(self) -> None:
-            """ Initialize IdentityHash object """
+            """Initialize IdentityHash object."""
             self._digest = bytearray()
 
         def update(self, input_data: bytes) -> None:
-            """ Update data to hash """
+            """
+            Update data to hash.
+
+            :param input_data: the data
+            :return: None
+            """
             self._digest += input_data
 
         def digest(self) -> bytes:
-            """ Hash of input data """
+            """
+            Get hash of input data.
+
+            :return: the hash
+            """
             return self._digest
 
     multihash.FuncReg.register(
@@ -67,26 +76,26 @@ def digest(self) -> bytes:
 
 
 def _pad_scalar(scalar):
+    """Pad scalar."""
     return (ZERO * (KEY_SIZE - len(scalar))) + scalar
 
 
 def _pad_hex(hexed):
-    """ Pad odd-length hex strings """
+    """Pad odd-length hex strings."""
     return hexed if not len(hexed) & 1 else "0" + hexed
 
 
 def _hex_to_bytes(hexed):
+    """Hex to bytes."""
     return _pad_scalar(unhexlify(_pad_hex(hexed)))
 
 
 class MultiAddr:
-    """
-    Protocol Labs' Multiaddress representation of a network address
-    """
+    """Protocol Labs' Multiaddress representation of a network address."""
 
     def __init__(self, host: str, port: int, public_key: str):
         """
-        Initialize a multiaddress
+        Initialize a multiaddress.
 
         :param host: ip host of the address
         :param host: port number of the address
@@ -136,7 +145,7 @@ def peer_id(self) -> str:
         return self._peerid
 
     def format(self) -> str:
-        """ Canonical representation of a multiaddress """
+        """Canonical representation of a multiaddress."""
         return f"/dns4/{self._host}/tcp/{self._port}/p2p/{self._peerid}"
 
     def __str__(self) -> str:
diff --git a/aea/helpers/pipe.py b/aea/helpers/pipe.py
index 2e79f0a27f..f2e19ccf92 100644
--- a/aea/helpers/pipe.py
+++ b/aea/helpers/pipe.py
@@ -42,9 +42,7 @@
 
 
 class IPCChannelClient(ABC):
-    """
-    Multi-platform interprocess communication channel for the client side
-    """
+    """Multi-platform interprocess communication channel for the client side."""
 
     @abstractmethod
     async def connect(self, timeout=PIPE_CONN_TIMEOUT) -> bool:
@@ -58,6 +56,7 @@ async def connect(self, timeout=PIPE_CONN_TIMEOUT) -> bool:
     async def write(self, data: bytes) -> None:
         """
         Write `data` bytes to the other end of the channel
+
         Will first write the size than the actual data
 
         :param data: bytes to write
@@ -67,6 +66,7 @@ async def write(self, data: bytes) -> None:
     async def read(self) -> Optional[bytes]:
         """
         Read bytes from the other end of the channel
+
         Will first read the size than the actual data
 
         :return: read bytes
@@ -75,34 +75,36 @@ async def read(self) -> Optional[bytes]:
     @abstractmethod
     async def close(self) -> None:
         """
-        Close the communication channel
+        Close the communication channel.
+
+        :return: None
         """
 
 
 class IPCChannel(IPCChannelClient):
-    """
-    Multi-platform interprocess communication channel
-    """
+    """Multi-platform interprocess communication channel."""
 
     @property
     @abstractmethod
     def in_path(self) -> str:
         """
-        Rendezvous point for incoming communication
+        Rendezvous point for incoming communication.
+
+        :return: path
         """
 
     @property
     @abstractmethod
     def out_path(self) -> str:
         """
-        Rendezvous point for outgoing communication
+        Rendezvous point for outgoing communication.
+
+        :return: path
         """
 
 
 class PosixNamedPipeProtocol:
-    """
-    Posix named pipes async wrapper communication protocol
-    """
+    """Posix named pipes async wrapper communication protocol."""
 
     def __init__(
         self,
@@ -112,7 +114,7 @@ def __init__(
         loop: Optional[AbstractEventLoop] = None,
     ):
         """
-        Initialize a new posix named pipe
+        Initialize a new posix named pipe.
 
         :param in_path: rendezvous point for incoming data
         :param out_path: rendezvous point for outgoing daa
@@ -228,7 +230,7 @@ async def read(self) -> Optional[bytes]:
             return None
 
     async def close(self) -> None:
-        """ Disconnect pipe """
+        """Disconnect pipe."""
         self.logger.debug("closing pipe (in={})...".format(self._in_path))
         if self._fileobj is None:
             raise ValueError("Pipe not connected")  # pragma: nocover
@@ -245,9 +247,7 @@ async def close(self) -> None:
 
 
 class TCPSocketProtocol:
-    """
-    TCP socket communication protocol
-    """
+    """TCP socket communication protocol."""
 
     def __init__(
         self,
@@ -257,7 +257,7 @@ def __init__(
         loop: Optional[AbstractEventLoop] = None,
     ):
         """
-        Initialize the tcp socket protocol
+        Initialize the tcp socket protocol.
 
         :param reader: established asyncio reader
         :param writer: established asyncio writer
@@ -308,23 +308,21 @@ async def read(self) -> Optional[bytes]:
             return None
 
     async def close(self) -> None:
-        """ Disconnect socket """
+        """Disconnect socket."""
         self._writer.write_eof()
         await self._writer.drain()
         self._writer.close()
 
 
 class TCPSocketChannel(IPCChannel):
-    """
-    Interprocess communication channel implementation using tcp sockets
-    """
+    """Interprocess communication channel implementation using tcp sockets."""
 
     def __init__(
         self,
         logger: logging.Logger = _default_logger,
         loop: Optional[AbstractEventLoop] = None,
     ):
-        """ Initialize tcp socket interprocess communication channel"""
+        """Initialize tcp socket interprocess communication channel."""
         self.logger = logger
         self._loop = loop
         self._server = None  # type: Optional[asyncio.AbstractServer]
@@ -339,7 +337,7 @@ def __init__(
 
     async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
         """
-        Setup communication channel and wait for other end to connect
+        Setup communication channel and wait for other end to connect.
 
         :param timeout: timeout for the connection to be established
         """
@@ -369,6 +367,7 @@ async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
     async def _handle_connection(
         self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter
     ):
+        """Handle connection."""
         if self._connected is None:
             raise ValueError("Connected is None!")  # pragma: nocover
         self._connected.set()
@@ -397,33 +396,31 @@ async def read(self) -> Optional[bytes]:
         return await self._sock.read()
 
     async def close(self) -> None:
-        """ Disconnect from channel and clean it up """
+        """Disconnect from channel and clean it up."""
         if self._sock is None:
             raise ValueError("Socket pipe not connected.")  # pragma: nocover
         await self._sock.close()
 
     @property
     def in_path(self) -> str:
-        """ Rendezvous point for incoming communication """
+        """Rendezvous point for incoming communication."""
         return str(self._port)
 
     @property
     def out_path(self) -> str:
-        """ Rendezvous point for outgoing communication """
+        """Rendezvous point for outgoing communication."""
         return str(self._port)
 
 
 class PosixNamedPipeChannel(IPCChannel):
-    """
-    Interprocess communication channel implementation using Posix named pipes
-    """
+    """Interprocess communication channel implementation using Posix named pipes."""
 
     def __init__(
         self,
         logger: logging.Logger = _default_logger,
         loop: Optional[AbstractEventLoop] = None,
     ):
-        """ Initialize posix named pipe interprocess communication channel """
+        """Initialize posix named pipe interprocess communication channel."""
         self.logger = logger
         self._loop = loop
 
@@ -448,9 +445,10 @@ def __init__(
 
     async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
         """
-        Setup communication channel and wait for other end to connect
+        Setup communication channel and wait for other end to connect.
 
         :param timeout: timeout for connection to be established
+        :return: bool, indicating sucess
         """
 
         if self._loop is None:
@@ -475,27 +473,23 @@ async def read(self) -> Optional[bytes]:
         return await self._pipe.read()
 
     async def close(self) -> None:
-        """
-        Close the channel and clean it up
-        """
+        """Close the channel and clean it up."""
         await self._pipe.close()
         rmtree(self._pipe_dir)
 
     @property
     def in_path(self) -> str:
-        """ Rendezvous point for incoming communication """
+        """Rendezvous point for incoming communication."""
         return self._in_path
 
     @property
     def out_path(self) -> str:
-        """ Rendezvous point for outgoing communication """
+        """Rendezvous point for outgoing communication."""
         return self._out_path
 
 
 class TCPSocketChannelClient(IPCChannelClient):
-    """
-    Interprocess communication channel client using tcp sockets
-    """
+    """Interprocess communication channel client using tcp sockets."""
 
     def __init__(  # pylint: disable=unused-argument
         self,
@@ -505,7 +499,7 @@ def __init__(  # pylint: disable=unused-argument
         loop: Optional[AbstractEventLoop] = None,
     ):
         """
-        Initialize a tcp socket communication channel client
+        Initialize a tcp socket communication channel client.
 
         :param in_path: rendezvous point for incoming data
         :param out_path: rendezvous point for outgoing data
@@ -521,11 +515,10 @@ def __init__(  # pylint: disable=unused-argument
 
     async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
         """
-        Connect to the other end of the communication channel
+        Connect to the other end of the communication channel.
 
         :param timeout: timeout for connection to be established
         """
-
         if self._loop is None:
             self._loop = asyncio.get_event_loop()
 
@@ -558,7 +551,7 @@ async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
 
     async def write(self, data: bytes) -> None:
         """
-        Write data to channel
+        Write data to channel.
 
         :param data: bytes to write
         """
@@ -568,7 +561,7 @@ async def write(self, data: bytes) -> None:
 
     async def read(self) -> Optional[bytes]:
         """
-        Read data from channel
+        Read data from channel.
 
         :return: read bytes
         """
@@ -577,16 +570,14 @@ async def read(self) -> Optional[bytes]:
         return await self._sock.read()
 
     async def close(self) -> None:
-        """ Disconnect from communication channel """
+        """Disconnect from communication channel."""
         if self._sock is None:
             raise ValueError("Socket pipe not connected.")  # pragma: nocover
         await self._sock.close()
 
 
 class PosixNamedPipeChannelClient(IPCChannelClient):
-    """
-    Interprocess communication channel client using Posix named pipes
-    """
+    """Interprocess communication channel client using Posix named pipes."""
 
     def __init__(
         self,
@@ -596,7 +587,7 @@ def __init__(
         loop: Optional[AbstractEventLoop] = None,
     ):
         """
-        Initialize a posix named pipe communication channel client
+        Initialize a posix named pipe communication channel client.
 
         :param in_path: rendezvous point for incoming data
         :param out_path: rendezvous point for outgoing data
@@ -611,7 +602,7 @@ def __init__(
 
     async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
         """
-        Connect to the other end of the communication channel
+        Connect to the other end of the communication channel.
 
         :param timeout: timeout for connection to be established
         """
@@ -626,7 +617,7 @@ async def connect(self, timeout: float = PIPE_CONN_TIMEOUT) -> bool:
 
     async def write(self, data: bytes) -> None:
         """
-        Write data to channel
+        Write data to channel.
 
         :param data: bytes to write
         """
@@ -636,7 +627,7 @@ async def write(self, data: bytes) -> None:
 
     async def read(self) -> Optional[bytes]:
         """
-        Read data from channel
+        Read data from channel.
 
         :return: read bytes
         """
@@ -645,7 +636,7 @@ async def read(self) -> Optional[bytes]:
         return await self._pipe.read()
 
     async def close(self) -> None:
-        """ Disconnect from communication channel """
+        """Disconnect from communication channel."""
         if self._pipe is None:
             raise ValueError("Pipe not connected.")  # pragma: nocover
         return await self._pipe.close()
@@ -656,6 +647,10 @@ def make_ipc_channel(
 ) -> IPCChannel:
     """
     Build a portable bidirectional InterProcess Communication channel
+
+    :param logger: the logger
+    :param loop: the loop
+    :return: IPCChannel
     """
     if os.name == "posix":
         return PosixNamedPipeChannel(logger=logger, loop=loop)
@@ -677,6 +672,9 @@ def make_ipc_channel_client(
 
     :param in_path: rendezvous point for incoming communication
     :param out_path: rendezvous point for outgoing outgoing
+    :param logger: the logger
+    :param loop: the loop
+    :return: IPCChannel
     """
     if os.name == "posix":
         return PosixNamedPipeChannelClient(in_path, out_path, logger=logger, loop=loop)
diff --git a/aea/helpers/transaction/base.py b/aea/helpers/transaction/base.py
index 1814b14fbd..d096b01792 100644
--- a/aea/helpers/transaction/base.py
+++ b/aea/helpers/transaction/base.py
@@ -88,6 +88,7 @@ def decode(cls, raw_transaction_protobuf_object) -> "RawTransaction":
         return raw_transaction
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, RawTransaction)
             and self.ledger_id == other.ledger_id
@@ -95,6 +96,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "RawTransaction: ledger_id={}, body={}".format(
             self.ledger_id, self.body,
         )
@@ -164,6 +166,7 @@ def decode(cls, raw_message_protobuf_object) -> "RawMessage":
         return raw_message
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, RawMessage)
             and self.ledger_id == other.ledger_id
@@ -172,6 +175,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "RawMessage: ledger_id={}, body={}, is_deprecated_mode={}".format(
             self.ledger_id, self.body, self.is_deprecated_mode,
         )
@@ -236,6 +240,7 @@ def decode(cls, signed_transaction_protobuf_object) -> "SignedTransaction":
         return signed_transaction
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, SignedTransaction)
             and self.ledger_id == other.ledger_id
@@ -243,6 +248,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "SignedTransaction: ledger_id={}, body={}".format(
             self.ledger_id, self.body,
         )
@@ -316,6 +322,7 @@ def decode(cls, signed_message_protobuf_object) -> "SignedMessage":
         return signed_message
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, SignedMessage)
             and self.ledger_id == other.ledger_id
@@ -324,6 +331,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "SignedMessage: ledger_id={}, body={}, is_deprecated_mode={}".format(
             self.ledger_id, self.body, self.is_deprecated_mode,
         )
@@ -381,6 +389,7 @@ def decode(cls, state_protobuf_object) -> "State":
         return state
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, State)
             and self.ledger_id == other.ledger_id
@@ -388,6 +397,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "State: ledger_id={}, body={}".format(self.ledger_id, self.body)
 
 
@@ -827,6 +837,7 @@ def decode(cls, terms_protobuf_object) -> "Terms":
         return terms
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, Terms)
             and self.ledger_id == other.ledger_id
@@ -843,6 +854,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "Terms: ledger_id={}, sender_address={}, counterparty_address={}, amount_by_currency_id={}, quantities_by_good_id={}, is_sender_payable_tx_fee={}, nonce={}, fee_by_currency_id={}, kwargs={}".format(
             self.ledger_id,
             self.sender_address,
@@ -913,6 +925,7 @@ def decode(cls, transaction_digest_protobuf_object) -> "TransactionDigest":
         return transaction_digest
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, TransactionDigest)
             and self.ledger_id == other.ledger_id
@@ -920,6 +933,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "TransactionDigest: ledger_id={}, body={}".format(
             self.ledger_id, self.body
         )
@@ -991,6 +1005,7 @@ def decode(cls, transaction_receipt_protobuf_object) -> "TransactionReceipt":
         return transaction_receipt
 
     def __eq__(self, other):
+        """Check equality."""
         return (
             isinstance(other, TransactionReceipt)
             and self.ledger_id == other.ledger_id
@@ -999,6 +1014,7 @@ def __eq__(self, other):
         )
 
     def __str__(self):
+        """Get string representation."""
         return "TransactionReceipt: ledger_id={}, receipt={}, transaction={}".format(
             self.ledger_id, self.receipt, self.transaction
         )
diff --git a/aea/protocols/generator/base.py b/aea/protocols/generator/base.py
index 9468a86200..198a1a0dab 100644
--- a/aea/protocols/generator/base.py
+++ b/aea/protocols/generator/base.py
@@ -1904,6 +1904,7 @@ def _init_str(self) -> str:
     def generate_protobuf_only_mode(self) -> None:
         """
         Run the generator in "protobuf only" mode:
+
         a) validate the protocol specification.
         b) create the protocol buffer schema file.
 
@@ -1936,6 +1937,7 @@ def generate_protobuf_only_mode(self) -> None:
     def generate_full_mode(self) -> None:
         """
         Run the generator in "full" mode:
+
         a) validates the protocol specification.
         b) creates the protocol buffer schema file.
         c) generates python modules.
@@ -1999,6 +2001,7 @@ def generate_full_mode(self) -> None:
     def generate(self, protobuf_only: bool = False) -> None:
         """
         Run the generator. If in "full" mode (protobuf_only is False), it:
+
         a) validates the protocol specification.
         b) creates the protocol buffer schema file.
         c) generates python modules.
diff --git a/aea/skills/base.py b/aea/skills/base.py
index d75ab03320..1e9fff3d96 100644
--- a/aea/skills/base.py
+++ b/aea/skills/base.py
@@ -613,8 +613,7 @@ def parse_module(  # pylint: disable=arguments-differ
 
 def _check_duplicate_classes(name_class_pairs: Sequence[Tuple[str, Type]]):
     """
-    Given a sequence of pairs (class_name, class_obj), check
-    whether there are duplicates in the class names.
+    Given a sequence of pairs (class_name, class_obj), check whether there are duplicates in the class names.
 
     :param name_class_pairs: the sequence of pairs (class_name, class_obj)
     :return: None
diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index 7ec078fb9a..354a7c09ae 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -51,12 +51,20 @@ class MyAgent(Agent):
         super().__init__(identity, connections)
 
     def setup(self):
+        """Setup the agent."""
         pass
 
     def act(self):
+        """Act implementation."""
         print("Act called for tick {}".format(self.tick))
 
     def handle_envelope(self, envelope: Envelope) -> None:
+        """
+        Handle envelope.
+
+        :param envelope: the envelope received
+        :return: None
+        """
         print("React called for tick {}".format(self.tick))
         if envelope is not None and envelope.protocol_id == DefaultMessage.protocol_id:
             sender = envelope.sender
@@ -74,6 +82,7 @@ class MyAgent(Agent):
             self.outbox.put(envelope)
 
     def teardown(self):
+        """Teardown the agent."""
         pass
 ```
 
@@ -204,6 +213,8 @@ class MyAgent(Agent):
 
 
 def run():
+    """Run demo."""
+
     # Ensure the input and output files do not exist initially
     if os.path.isfile(INPUT_FILE):
         os.remove(INPUT_FILE)
diff --git a/docs/build-aea-programmatically.md b/docs/build-aea-programmatically.md
index 4d0b25c748..fb2b593713 100644
--- a/docs/build-aea-programmatically.md
+++ b/docs/build-aea-programmatically.md
@@ -176,6 +176,8 @@ FETCHAI_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(FetchAICrypto.identifi
 
 
 def run():
+    """Run demo."""
+
     # Create a private key
     create_private_key(FetchAICrypto.identifier, FETCHAI_PRIVATE_KEY_FILE)
 
diff --git a/docs/cli-vs-programmatic-aeas.md b/docs/cli-vs-programmatic-aeas.md
index 90e6647806..9542099d7d 100644
--- a/docs/cli-vs-programmatic-aeas.md
+++ b/docs/cli-vs-programmatic-aeas.md
@@ -103,6 +103,8 @@ logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 
 
 def run():
+    """Run demo."""
+
     # Create a private key
     create_private_key(FetchAICrypto.identifier, FETCHAI_PRIVATE_KEY_FILE)
     create_private_key(FetchAICrypto.identifier, FETCHAI_PRIVATE_KEY_FILE_CONNECTION)
diff --git a/docs/decision-maker-transaction.md b/docs/decision-maker-transaction.md
index 9801eef68f..e6a096007c 100644
--- a/docs/decision-maker-transaction.md
+++ b/docs/decision-maker-transaction.md
@@ -319,6 +319,8 @@ FETCHAI_PRIVATE_KEY_FILE_2 = "fetchai_private_key_2.txt"
 
 
 def run():
+    """Run demo."""
+
     # Create a private key
     create_private_key(
         FetchAICrypto.identifier, private_key_file=FETCHAI_PRIVATE_KEY_FILE_1
diff --git a/docs/multiplexer-standalone.md b/docs/multiplexer-standalone.md
index 1c6d91fccc..e27fee3081 100644
--- a/docs/multiplexer-standalone.md
+++ b/docs/multiplexer-standalone.md
@@ -129,6 +129,8 @@ OUTPUT_FILE = "output.txt"
 
 
 def run():
+    """Run demo."""
+
     # Ensure the input and output files do not exist initially
     if os.path.isfile(INPUT_FILE):
         os.remove(INPUT_FILE)
diff --git a/docs/standalone-transaction.md b/docs/standalone-transaction.md
index 1055e2fe47..bf23bb1275 100644
--- a/docs/standalone-transaction.md
+++ b/docs/standalone-transaction.md
@@ -100,6 +100,8 @@ FETCHAI_PRIVATE_KEY_FILE_2 = "fetchai_private_key_2.txt"
 
 
 def run():
+    """Run demo."""
+
     # Create a private keys
     create_private_key(
         FetchAICrypto.identifier, private_key_file=FETCHAI_PRIVATE_KEY_FILE_1
diff --git a/examples/gym_ex/proxy/agent.py b/examples/gym_ex/proxy/agent.py
index 0d62ae1bb0..42b5fbf7b1 100644
--- a/examples/gym_ex/proxy/agent.py
+++ b/examples/gym_ex/proxy/agent.py
@@ -78,6 +78,12 @@ def act(self) -> None:
         pass
 
     def handle_envelope(self, envelope: Envelope) -> None:
+        """
+        Handle envelope.
+
+        :param envelope: the envelope
+        :return: None
+        """
         if envelope is not None:
             self.proxy_env_queue.put(envelope)
 
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index d7f4e3bbe4..b2502868b3 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -219,7 +219,6 @@ def _encode_and_send_action(self, action: Action, step_id: int) -> None:
         self._agent.outbox.put_message(message=gym_msg)
 
     def _decode_percept(self, envelope: Envelope, expected_step_id: int) -> GymMessage:
-
         """
         Receive the response from the gym environment in the form of an envelope and decode it.
 
@@ -250,7 +249,6 @@ def _decode_percept(self, envelope: Envelope, expected_step_id: int) -> GymMessa
         raise ValueError("Missing envelope.")
 
     def _decode_status(self, envelope: Envelope) -> None:
-
         """
         Receive the response from the gym environment in the form of an envelope and decode it.
 
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index 6bc5231225..304703f3a2 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
   base.py: QmP6SiNTCWBW8Bt6wsgP2gp7K2LcV4AeVk2saM7tqyx44S
   connection.py: QmS3CJwjgzZ5SrAeJjCnC5ChZDfTsDuV6ndgMsGV1bidnf
-  contract_dispatcher.py: QmQFEapPMbSn5CLmtkqQTmD5pTgfXDAGc3qo8rc5Jg7Drn
+  contract_dispatcher.py: QmRegSPqqkns7xp5zr6xiuTxjGLiGGG2qLkwunpFCbzEwX
   ledger_dispatcher.py: QmarLEyR2Je6NtXSJmPy9NbGL7J85FVAZJPkFKqCotEKjc
 fingerprint_ignore_patterns: []
 protocols:
diff --git a/packages/fetchai/connections/ledger/contract_dispatcher.py b/packages/fetchai/connections/ledger/contract_dispatcher.py
index c2b87fa046..ca2561ed01 100644
--- a/packages/fetchai/connections/ledger/contract_dispatcher.py
+++ b/packages/fetchai/connections/ledger/contract_dispatcher.py
@@ -266,8 +266,7 @@ def build_response(
     def _get_data(
         self, api: LedgerApi, message: ContractApiMessage, contract: Contract,
     ) -> bytes:
-        """Get the data from the contract method, either from the stub or
-        from the callable specified by the message."""
+        """Get the data from the contract method, either from the stub or from the callable specified by the message."""
         # first, check if the custom handler for this type of request has been implemented.
         data = self._call_stub(api, message, contract)
         if data is not None:
@@ -281,8 +280,7 @@ def _get_data(
     def _call_stub(
         ledger_api: LedgerApi, message: ContractApiMessage, contract: Contract
     ) -> Optional[bytes]:
-        """Try to call stub methods associated to the
-        contract API request performative."""
+        """Try to call stub methods associated to the contract API request performative."""
         try:
             method: Callable = getattr(contract, message.performative.value)
             if message.performative in [
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.py b/packages/fetchai/connections/p2p_libp2p/connection.py
index b12f1e9fa9..edfd302c6c 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p/connection.py
@@ -111,7 +111,13 @@ def _golang_module_run(
     logger: logging.Logger = _default_logger,
 ) -> subprocess.Popen:
     """
-    Runs a built module located at `path`
+    Runs a built module located at `path`.
+
+    :param path: the path to the go module.
+    :param name: the name of the module.
+    :param args: the args
+    :param log_file_desc: the file descriptor of the log file.
+    :param logger: the logger
     """
     cmd = [os.path.join(path, name)]
 
@@ -139,9 +145,7 @@ def _golang_module_run(
 
 
 class Uri:
-    """
-    Holds a node address in format "host:port"
-    """
+    """Holds a node address in format "host:port"."""
 
     def __init__(
         self,
@@ -162,9 +166,11 @@ def __init__(
             self._port = randint(5000, 10000)  # nosec
 
     def __str__(self):
+        """Get string representation."""
         return "{}:{}".format(self._host, self._port)
 
     def __repr__(self):  # pragma: no cover
+        """Get object representation."""
         return self.__str__()
 
     @property
@@ -179,9 +185,7 @@ def port(self) -> int:
 
 
 class Libp2pNode:
-    """
-    Libp2p p2p node as a subprocess with named pipes interface
-    """
+    """Libp2p p2p node as a subprocess with named pipes interface."""
 
     def __init__(
         self,
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.yaml b/packages/fetchai/connections/p2p_libp2p/connection.yaml
index ba1347e3a6..0842a3660f 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p/connection.yaml
@@ -15,7 +15,7 @@ fingerprint:
   aea/envelope.proto: QmSC8EGCKiNFR2vf5bSWymSzYDFMipQW9aQVMwPzQoKb4n
   aea/pipe_unix.go: QmSzbAexrSUSA9ZE6VT6MmcWF5MhEcmceQjAbnfRoK7Ruv
   aea/pipe_windows.go: QmdYpfjgdgFbA6Pothg65NYM45ubfpZeKr8cVQoqbFzgUK
-  connection.py: QmS4uowmVRvQVmmWbXMqevsB5ALi9twopbwXTTPjqBtLLz
+  connection.py: QmVRe5AfSov69zJTGtDDmbjusr1tERsbe4H7Ee4h2ptcem
   dht/dhtclient/dhtclient.go: QmasA3GrgswTnUJoffBzeeqxeT3GjLu6foN6PHJhWNpMMa
   dht/dhtclient/dhtclient_test.go: QmPfnHSHXtbaW5VYuq1QsKQWey64pUEvLEaKKkT9eAcmws
   dht/dhtclient/options.go: QmPorj38wNrxGrzsbFe5wwLmiHzxbTJ2VsgvSd8tLDYS8s
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.py b/packages/fetchai/connections/p2p_libp2p_client/connection.py
index 044114b50d..83355fffde 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.py
@@ -42,9 +42,7 @@
 
 
 class Uri:
-    """
-    Holds a node address in format "host:port"
-    """
+    """Holds a node address in format "host:port"."""
 
     def __init__(
         self,
@@ -65,9 +63,11 @@ def __init__(
             self._port = randint(5000, 10000)  # nosec
 
     def __str__(self):
+        """Get string representation."""
         return "{}:{}".format(self._host, self._port)
 
     def __repr__(self):  # pragma: no cover
+        """Get object representation."""
         return self.__str__()
 
     @property
@@ -84,6 +84,7 @@ def port(self) -> int:
 class P2PLibp2pClientConnection(Connection):
     """
     A libp2p client connection.
+
     Send and receive envelopes to and from agents on the p2p network without deploying a libp2p node.
     Connect to the libp2p node using traffic delegation service.
     """
@@ -91,9 +92,7 @@ class P2PLibp2pClientConnection(Connection):
     connection_id = PUBLIC_ID
 
     def __init__(self, **kwargs):
-        """
-        Initialize a libp2p client connection.
-        """
+        """Initialize a libp2p client connection."""
         super().__init__(**kwargs)
 
         ledger_id = self.configuration.config.get("ledger_id", DEFAULT_LEDGER)
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
index 1a42268bab..c467491e5c 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
@@ -10,7 +10,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmXWbE53xWwPkQiuR16WP8gDS6fDRtWhbeP7gmBDfoUQtc
   __init__.py: QmT1FEHkPGMHV5oiVEfQHHr25N2qdZxydSNRJabJvYiTgf
-  connection.py: QmWYrwBGN3TrnHsMXneD6EpT3C9mo4imqaf2x3bDnnr2Bn
+  connection.py: QmQ78ZURrHYCLbtTpT4WLcKQiXF3gq6cLS2kaCNeDgw6SA
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PLibp2pClientConnection
diff --git a/packages/fetchai/contracts/erc1155/contract.py b/packages/fetchai/contracts/erc1155/contract.py
index 5d70316095..99db581ea3 100644
--- a/packages/fetchai/contracts/erc1155/contract.py
+++ b/packages/fetchai/contracts/erc1155/contract.py
@@ -133,6 +133,7 @@ def get_create_single_transaction(
     ) -> Dict[str, Any]:
         """
         Get the transaction to create a single token.
+
         :param ledger_api: the ledger API
         :param contract_address: the address of the contract
         :param deployer_address: the address of the deployer
@@ -752,6 +753,7 @@ def _try_estimate_gas(ledger_api: LedgerApi, tx: Dict[str, Any]) -> Dict[str, An
     def get_last_code_id(ledger_api: LedgerApi) -> int:
         """
         Uses wasmcli to get ID of latest deployed .wasm bytecode
+
         :param ledger_api: the ledger API
 
         :return: code id of last deployed .wasm bytecode
@@ -765,6 +767,7 @@ def get_last_code_id(ledger_api: LedgerApi) -> int:
     def get_contract_address(ledger_api: LedgerApi, code_id: int) -> str:
         """
         Uses wasmcli to get contract address of latest initialised contract by its ID
+
         :param ledger_api: the ledger API
         :param code_id: the ID of stored contract CosmWasm
 
diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml
index 3359c6aac5..cf9a6b934e 100644
--- a/packages/fetchai/contracts/erc1155/contract.yaml
+++ b/packages/fetchai/contracts/erc1155/contract.yaml
@@ -10,7 +10,7 @@ fingerprint:
   build/Migrations.json: QmfFYYWoq1L1Ni6YPBWWoRPvCZKBLZ7qzN3UDX537mCeuE
   build/erc1155.json: Qma5n7au2NDCg1nLwYfYnmFNwWChFuXtu65w5DV7wAZRvw
   build/erc1155.wasm: Qmc9gthbdwRSywinTHKjRVQdFzrKTxUuLDx2ryNfQp1xqf
-  contract.py: QmYSTxYstk7dmP8TfgiX6HZpegoWTwW8DfBdXpzyBGp9pN
+  contract.py: QmSEfxq6dH53q9qEw3KrtTgUqvyDgCefy59RNpciGGAGi6
   contracts/Migrations.sol: QmbW34mYrj3uLteyHf3S46pnp9bnwovtCXHbdBHfzMkSZx
   contracts/erc1155.vy: QmXwob8G1uX7fDvtuuKW139LALWtQmGw2vvaTRBVAWRxTx
   migrations/1_initial_migration.js: QmcxaWKQ2yPkQBmnpXmcuxPZQUMuUudmPmX3We8Z9vtAf7
diff --git a/packages/fetchai/protocols/contract_api/custom_types.py b/packages/fetchai/protocols/contract_api/custom_types.py
index a1c8cf3f52..430b1dea25 100644
--- a/packages/fetchai/protocols/contract_api/custom_types.py
+++ b/packages/fetchai/protocols/contract_api/custom_types.py
@@ -85,7 +85,9 @@ def decode(cls, kwargs_protobuf_object) -> "Kwargs":
         return kwargs
 
     def __eq__(self, other):
+        """Check equality."""
         return isinstance(other, Kwargs) and self.body == other.body
 
     def __str__(self):
+        """Get string representation."""
         return "Kwargs: body={}".format(self.body)
diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index 6c8c00921c..3c8a6ec990 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmZodYjNqoMgGAGKfkCU4zU9t1Cx9MAownqSy4wyVdwaHF
   contract_api.proto: QmNwngtcYFSuqL8yeTGVXmrHjfebCybdUa9BnTDKXn8odk
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
-  custom_types.py: QmVm4mGsBaLGep1FJMRWEAXBdfPL46LEfJT1eoUHnNYsKo
+  custom_types.py: QmbLjpiTcGNfvdBsu8pgQH6PK5y6ujdNnZ53JSk1GZDRCA
   dialogues.py: QmTjXH8JUtziUFDawKsSTYE5dxn1n1FmMPeWexyxiPYd6k
   message.py: Qmd7r8Zf3jC1uwMRM1dhs1FTEqDMXreHHRiGgViAQkEMXc
   serialization.py: QmdJZ6GBrURgzJCfYSZzLhWirfm5bDJxumz7ieAELC9juw
diff --git a/packages/fetchai/protocols/gym/custom_types.py b/packages/fetchai/protocols/gym/custom_types.py
index 206952b93f..34a412c031 100644
--- a/packages/fetchai/protocols/gym/custom_types.py
+++ b/packages/fetchai/protocols/gym/custom_types.py
@@ -56,4 +56,5 @@ def decode(cls, any_object_protobuf_object) -> "AnyObject":
         return pickle.loads(any_object_protobuf_object.any)  # nosec
 
     def __eq__(self, other):
+        """Check equality."""
         return self.any == other.any
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index 7a14814699..ede670f598 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTCkz4cEUcwuPZVtvrVr8Np5qn1SMwm6foGSY9Y68DhZT
   __init__.py: QmWBvruqGuU2BVCq8cuP1S3mgvuC78yrG4TdtSvKhCT8qX
-  custom_types.py: QmfDaswopanUqsETQXMatKfwwDSSo7q2Edz9MXGimT5jbf
+  custom_types.py: QmT3VKT86xZKR11RR1vQ3myRpmVZNdzY6ELd8HG9U2ngwa
   dialogues.py: QmdCzcFfyPF43U2SoxwshG5p4hd6dK49m6GYKduDHbnNPo
   gym.proto: QmQGF9Xz4Z93wmhdKoztzxjo5pS4SsAWe2TQdvZCLuzdGC
   gym_pb2.py: QmSTz7xrL8ryqzR1Sgu1NpR6PmW7GUhBGnN2qYc8m8NCcN
diff --git a/packages/fetchai/skills/ml_train/ml_model.py b/packages/fetchai/skills/ml_train/ml_model.py
index 0104bf3a31..258cd23e01 100644
--- a/packages/fetchai/skills/ml_train/ml_model.py
+++ b/packages/fetchai/skills/ml_train/ml_model.py
@@ -52,6 +52,11 @@ def __init__(self, **kwargs):
         self.training_thread = threading.Thread(target=self.training_loop)
 
     def setup(self) -> None:
+        """
+        Setup the model.
+
+        :return: None
+        """
         self.training_thread.start()
 
     def training_loop(self):
@@ -128,5 +133,10 @@ def update(self, X, y, epochs):
         self.data_queue.put((X, y, dict(epochs=epochs)))
 
     def teardown(self) -> None:
+        """
+        Teardown the model.
+
+        :return: None
+        """
         self.data_queue.put(None)
         self.training_thread.join()
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index e90e330905..1285241205 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -12,7 +12,7 @@ fingerprint:
   behaviours.py: QmQiBzKV5rEFpMQbSjfjzAJ7SqwwGmso6TozWkjdytucLR
   dialogues.py: QmccMjTxTrTaDyXFTTfAWHmA3xBiPCmKwBfiDSCW428Xie
   handlers.py: QmXxVeXQDjqQ8gC1fwrZvFtSSHuwGERMoj1j5bYuNfAQYp
-  ml_model.py: QmejQUfPnfKDerwzNZFrswUDF7SevBbcvvr9MaeD39ZewE
+  ml_model.py: QmXp667GwVRrGsLxtqricnnyrBUUDn6efem22UCBd2g1y8
   model.json: QmdV2tGrRY6VQ5VLgUa4yqAhPDG6X8tYsWecypq8nox9Td
   strategy.py: QmY8z1DW6PqQuiEpgXAhwasSk1CgvvTNZQH1LtExupif9g
   tasks.py: QmTb7kCt2UheQ8kwPewkzgfX8m2DF4KtnYCugWdmERJnTU
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index 114e0b828f..edefa7e622 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -13,7 +13,7 @@ fingerprint:
   dialogues.py: QmdPAjBTpgrW9qP8SnAjKHWxBQRiGUqmgiiXMdrPKAJUKj
   handlers.py: QmeSaLfQV3rzHuHPhzsBps9z4AbX1MNevTs2YTjnZaWuEA
   helpers.py: QmfRnfpeCtHMEXSH3q3ofWhoSc7pbpRrSFSBVStUK3JWt3
-  strategy.py: QmPSfuF3MMjryq6Gg7JHbk5qcVpDLf1fGD7j2ozGSwxbz2
+  strategy.py: QmYcwqZ9ejjK2zxN8nKoc3kvBoGamTxwGQqXJrWV5s8STx
   transactions.py: Qmc9Re92RLFkfds1NspTRym1wn7XPGSNDRFGtaG6Hrix4E
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/tac_negotiation/strategy.py b/packages/fetchai/skills/tac_negotiation/strategy.py
index 1303bce2cc..23cadbaa3d 100644
--- a/packages/fetchai/skills/tac_negotiation/strategy.py
+++ b/packages/fetchai/skills/tac_negotiation/strategy.py
@@ -203,6 +203,7 @@ def get_location_and_service_query(self) -> Query:
     def get_own_service_description(self, is_supply: bool) -> Description:
         """
         Get the description of the supplied goods (as a seller), or the demanded goods (as a buyer).
+
         :param is_supply: Boolean indicating whether it is supply or demand.
         :return: the description (to advertise on the Service Directory).
         """
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 1cde9f0754..3202b8923f 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -21,23 +21,23 @@ fetchai/agents/weather_station,QmZ3cmNvuSkqWSKJ8VoqwBZaphRZYdZLVm3vsFBkU7aNr2
 fetchai/connections/gym,QmSdnXM6hqJT3JzCmGqas5RPxodWqrhUwGGTinFn3kYpSL
 fetchai/connections/http_client,QmfSuWhrseBCVcmzwKmqFDC6qX3ryFzfx2uuUTb8HPGuEd
 fetchai/connections/http_server,QmU2XNsgEV7zGEgiu4PD2mjXP3fA6Fa7ivrcd7dUzC6PKc
-fetchai/connections/ledger,QmdmiwZGQUN2vFj9McBZyCdjPYzDTHjGTFHvRGYRRLarJq
+fetchai/connections/ledger,QmapEL72QxY2GFJXcrhJAe1YP7jtJSxp4HY8psKkRHNkxZ
 fetchai/connections/local,QmWZPDvqjZjzNDUX4ivHF3kGvkNCUYM449RqNEyyoexFix
 fetchai/connections/oef,QmWpjFr7im4afmsdtmBSYJp2tRzVpeZdYpRvsDYq6q3kg7
-fetchai/connections/p2p_libp2p,QmdhTkGsBwQ7Zrogp5eW1FcC6p1dii7TDpsmy5h9eRMxb9
-fetchai/connections/p2p_libp2p_client,QmU1bNVaYjipA1uwad4CGxMgsMSNaP9n6E11SwvF2in9Jh
+fetchai/connections/p2p_libp2p,QmXBdcmsx2J9rQfEJhmSAg6HdpzjtDLVjMcEnNCeAsD8VM
+fetchai/connections/p2p_libp2p_client,QmTEE3wRLyGhVbm5oGZG819ijM5HxvuZdy1mtJUoo5XwpS
 fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
 fetchai/connections/soef,QmQWyjmHg6HWsLEuighe2vrWQSKBZAXvoXSXF33XhaVyE8
 fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
 fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
 fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
-fetchai/contracts/erc1155,QmTSpeW7JJZaBFwyHUbycPg87nUGW3CkkGchFxn6NtshpQ
+fetchai/contracts/erc1155,QmdhfKcSJR4cpfcNDWyq14LXFCGXVkQ4HxSH4P3NB6EeGs
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,QmVHjRbRGRVyYaav78gc5Sf9ihzRAdVtSk3QLUdfhNvqq2
+fetchai/protocols/contract_api,QmeGEAe7GgLmFtFECQQtaPe5RYEA7EnfHbHToXv5NJSxGy
 fetchai/protocols/default,QmXAdTynqPF8kYFsRZzxigVh3LYZJ8FSGEPEmNPDLoyHmM
 fetchai/protocols/fipa,Qmb3GXxbEQ23sZ1d7HsmrvchLwPfsEcDAbpLLjRTYxdJDm
-fetchai/protocols/gym,QmVLULhH4gn8suFe8Z31X5mVYp3fFSGays5MHDNzKnGA4k
+fetchai/protocols/gym,QmRmnLVMCkDa2LJz4RPjKRQvruhKmhMw4wf2VwaQTv3ggB
 fetchai/protocols/http,QmZJVqY2cxjky6p3o76TUemSsFDws8Dx33voG9WMdrKcry
 fetchai/protocols/ledger_api,Qmak3uKpeSfT5f4oqes3oUcNSg7vy7WKE2tUmSu8CZUNJ5
 fetchai/protocols/ml_trade,QmNVZvbcgERSypYUopKMHvd6F8B81rQqtLVqUvzMeEEwJN
@@ -59,12 +59,12 @@ fetchai/skills/generic_seller,Qmb1KxJxXyxqf5oQjs4rtEDKyjnCgPbVDJijyWGNSpWQdT
 fetchai/skills/gym,QmaiTBVJRwKFgBnL2EJHFgtEWmQ1BDcjGuasVM1D4Na6RT
 fetchai/skills/http_echo,QmZR1VgVb51R2PjuHtBTd8w2ye6rfnMbgi7GJ7BQhDXAPJ
 fetchai/skills/ml_data_provider,QmQke9TmGmC9EXrQbst95Bw4gnTK1gLxH9i1Uv7CTxzhn4
-fetchai/skills/ml_train,QmUD1S3NX7KskaM1LgttW9hmahRXTLfG7ZkbHUdURUGRFm
+fetchai/skills/ml_train,Qmd2abFvxSwhybqQ3zLkZDKNHrMyqoQqhG4mmKX66v4Wyj
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmfSUCJT7szDvpsUYF1emfzNZgHoNM1o9nrEtCchPodBz2
 fetchai/skills/tac_control,QmYCCU6RsvwqmjTRM3Nx8H99HhJXEFuinJSeG3UcjDubYH
 fetchai/skills/tac_control_contract,QmbstL6fn99jFVsZsGQT3Sjy8SBdm1rrW87oHmdyMTJKmd
-fetchai/skills/tac_negotiation,QmeZXcCFTijd6tCAixFGB6dmBdwh66yaJ7QSYofcNQaFJ3
+fetchai/skills/tac_negotiation,Qme9Vcdk1ovguZJTaCrVo5kcJCKw3jBHJgxhQY9QKiDYAW
 fetchai/skills/tac_participation,QmcynKNnEFSM2pNAwkMsBD1c2JEqfqCocv16tk4mRvFFbv
 fetchai/skills/thermometer,Qmaez14AMYqBkkQ1oLHVQUM18RdJu8haz9PacRmJvHEQak
 fetchai/skills/thermometer_client,QmU1fvDdtbv7eLjkMyUx1HJNzFqLh86QpW6kDiSpFqGa89
diff --git a/scripts/acn/run_acn_node_standalone.py b/scripts/acn/run_acn_node_standalone.py
index e9494166d9..36b1493f16 100644
--- a/scripts/acn/run_acn_node_standalone.py
+++ b/scripts/acn/run_acn_node_standalone.py
@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
-""" Run an ACN libp2p node without requiring the agents framework """
+"""Run an ACN libp2p node without requiring the agents framework."""
 
 import argparse
 import os
@@ -34,9 +34,7 @@
 
 
 class AcnNodeConfig:
-    """
-    Store the configuration of an acn node as a dictionary
-    """
+    """Store the configuration of an acn node as a dictionary."""
 
     KEY = "AEA_P2P_ID"
     URI = "AEA_P2P_URI"
@@ -93,7 +91,7 @@ def __init__(
             AcnNodeConfig.check_config(self.config)
 
     def dump(self, file_path: str) -> None:
-        """ Write current configuration to file """
+        """Write current configuration to file."""
         with open(file_path, "w") as f:
             for key, value in self.config.items():
                 f.write("{}={}\n".format(key, value))
@@ -101,7 +99,7 @@ def dump(self, file_path: str) -> None:
     @classmethod
     def from_file(cls, file_path: str, enable_checks: bool = True) -> "AcnNodeConfig":
         """
-        Create a new AcnNodeConfig objet from file
+        Create a new AcnNodeConfig objet from file.
 
         :param file_path: path to the file containing the configuration
         :return: newly created AcnNodeConfig object, if successful
@@ -133,7 +131,7 @@ def from_file(cls, file_path: str, enable_checks: bool = True) -> "AcnNodeConfig
     @staticmethod
     def check_config(config: Dict[str, str]) -> None:
         """
-        Validate an ACN node configuration
+        Validate an ACN node configuration.
 
         :param config: dictionary containing the configuration to check
         """
@@ -156,6 +154,7 @@ def check_config(config: Dict[str, str]) -> None:
 
     @staticmethod
     def _check_uri(uri: str) -> None:
+        """Check uri."""
         if uri == "":
             return
         parts = uri.split(":")
@@ -165,6 +164,7 @@ def _check_uri(uri: str) -> None:
 
     @staticmethod
     def _check_maddr(maddr: str) -> None:
+        """Check multiaddress."""
         if maddr == "":
             return
         parts = maddr.split("/")
@@ -174,13 +174,11 @@ def _check_maddr(maddr: str) -> None:
 
 
 class AcnNodeStandalone:
-    """
-    Deploy an acn node in standalone mode
-    """
+    """Deploy an acn node in standalone mode."""
 
     def __init__(self, config: AcnNodeConfig, libp2p_node_binary: str):
         """
-        Initialize a new AcnNodeStandalone object
+        Initialize a new AcnNodeStandalone object.
 
         :param config: node's configuration
         :param libp2p_node_binary: path to libp2p node binary
@@ -191,8 +189,7 @@ def __init__(self, config: AcnNodeConfig, libp2p_node_binary: str):
         self._proc = None  # type: Optional[subprocess.Popen]
 
     def run(self):
-        """ Run the node """
-
+        """Run the node."""
         config_file = ".acn_config"
         self.config.dump(config_file)
 
@@ -206,15 +203,14 @@ def run(self):
             pass
 
     def stop(self):
-        """ Stop the node """
-
+        """Stop the node."""
         if self._proc is not None:
             self._proc.terminate()
             self._proc.wait()
 
 
 def parse_commandline():
-    """ Parse script cl arguments """
+    """Parse script cl arguments."""
 
     parser = argparse.ArgumentParser()
     parser.add_argument("libp2p_node")
diff --git a/scripts/check_copyright_notice.py b/scripts/check_copyright_notice.py
index d84db306a3..ccb19ed670 100755
--- a/scripts/check_copyright_notice.py
+++ b/scripts/check_copyright_notice.py
@@ -20,6 +20,7 @@
 
 """
 This script checks that all the Python files of the repository have:
+
 - (optional) the Python shebang
 - the encoding header;
 - the copyright notice;
diff --git a/scripts/check_package_versions_in_docs.py b/scripts/check_package_versions_in_docs.py
index 258ec6bb85..2c4ec9965b 100755
--- a/scripts/check_package_versions_in_docs.py
+++ b/scripts/check_package_versions_in_docs.py
@@ -140,8 +140,7 @@ def _checks(
 
 def check_add_commands(file: Path):
     """
-    Check that 'aea add' commands of the documentation file contains
-    known package ids.
+    Check that 'aea add' commands of the documentation file contains known package ids.
 
     :param file: path to the file.
     :return: None
@@ -158,8 +157,7 @@ def extract_package_id(match):
 
 def check_fetch_commands(file: Path):
     """
-    Check that 'aea fetch' commands of the documentation file contains
-    known package ids.
+    Check that 'aea fetch' commands of the documentation file contains known package ids.
 
     :param file: path to the file.
     :return: None
diff --git a/scripts/deploy_to_registry.py b/scripts/deploy_to_registry.py
index 89098c9073..34a2275451 100644
--- a/scripts/deploy_to_registry.py
+++ b/scripts/deploy_to_registry.py
@@ -18,9 +18,7 @@
 #
 # ------------------------------------------------------------------------------
 
-"""
-This script deploys all new packages to registry.
-"""
+"""This script deploys all new packages to registry."""
 
 import os
 import shutil
diff --git a/scripts/freeze_dependencies.py b/scripts/freeze_dependencies.py
index ace5e3e22b..e7d57caf38 100755
--- a/scripts/freeze_dependencies.py
+++ b/scripts/freeze_dependencies.py
@@ -18,9 +18,7 @@
 #
 # ------------------------------------------------------------------------------
 
-"""
-This CLI tool freezes the dependencies
-"""
+"""This CLI tool freezes the dependencies."""
 import re
 import subprocess  # nosec
 
diff --git a/scripts/generate_api_docs.py b/scripts/generate_api_docs.py
index 3eedfe49ac..dffa0d5954 100755
--- a/scripts/generate_api_docs.py
+++ b/scripts/generate_api_docs.py
@@ -18,9 +18,7 @@
 #
 # ------------------------------------------------------------------------------
 
-"""
-This tool generates the API docs.
-"""
+"""This tool generates the API docs."""
 
 import shutil
 import subprocess  # nosec
diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py
index 00ff2cc9ff..faa20c585f 100755
--- a/scripts/generate_ipfs_hashes.py
+++ b/scripts/generate_ipfs_hashes.py
@@ -223,7 +223,7 @@ def __init__(self, timeout: float = 15.0):
         self.process = None  # type: Optional[subprocess.Popen]
 
     def __enter__(self):
-        # run the ipfs daemon
+        """Run the ipfs daemon."""
         self.process = subprocess.Popen(  # nosec
             ["ipfs", "daemon"], stdout=subprocess.PIPE, env=os.environ.copy(),
         )
@@ -231,7 +231,7 @@ def __enter__(self):
         time.sleep(self.timeout)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        # terminate the ipfs daemon
+        """Terminate the ipfs daemon."""
         self.process.send_signal(signal.SIGTERM)
         self.process.wait(timeout=10)
         poll = self.process.poll()
@@ -266,8 +266,7 @@ def assert_hash_consistency(
     fingerprint, path_prefix, client: ipfshttpclient.Client
 ) -> None:
     """
-    Check that our implementation of IPFS hashing for a package is correct
-    against the true IPFS.
+    Check that our implementation of IPFS hashing for a package is correct against the true IPFS.
 
     :param fingerprint: the fingerprint dictionary.
     :param path_prefix: the path prefix to prepend.
diff --git a/scripts/parse_main_dependencies_from_lock.py b/scripts/parse_main_dependencies_from_lock.py
index 423db6af75..0b54533fcf 100755
--- a/scripts/parse_main_dependencies_from_lock.py
+++ b/scripts/parse_main_dependencies_from_lock.py
@@ -18,10 +18,7 @@
 #
 # ------------------------------------------------------------------------------
 
-"""
-This CLI tool takes the main dependencies of the Pipfile.lock
-and prints it to stdout in requirements.txt format.
-"""
+"""This CLI tool takes the main dependencies of the Pipfile.lock and prints it to stdout in requirements.txt format."""
 import json
 
 
diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index ca92cb7927..58528e34e2 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -454,8 +454,7 @@ def replace_aea_add_statements(content, old_string, new_string, type_) -> str:
 
 
 def replace_type_and_public_id_occurrences(line, old_string, new_string, type_) -> str:
-    """Replace the public id whenever the type and the id occur in the same row,
-    and NOT when other type names occur."""
+    """Replace the public id whenever the type and the id occur in the same row, and NOT when other type names occur."""
     if re.match(f"{type_}.*{old_string}", line) and all(
         _type not in line for _type in TYPES.difference({type_})
     ):
diff --git a/scripts/update_symlinks_cross_platform.py b/scripts/update_symlinks_cross_platform.py
index 5a0d5e89cd..0a6f1f5fc0 100755
--- a/scripts/update_symlinks_cross_platform.py
+++ b/scripts/update_symlinks_cross_platform.py
@@ -19,9 +19,7 @@
 # ------------------------------------------------------------------------------
 # pylint: disable=cyclic-import
 
-"""
-This script will update the symlinks of the project, cross-platform compatible.
-"""
+"""This script will update the symlinks of the project, cross-platform compatible."""
 
 import contextlib
 import inspect
diff --git a/setup.cfg b/setup.cfg
index 38128340fa..98c82a39bb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,13 +12,12 @@ exclude=.md,
     scripts/oef/launch.py
 max-line-length = 88
 select = B,C,D,E,F,I,W,
-ignore = E203,E501,W503,D202,B014,D102,D400,D105,D401,D201,D205,D209,D210,D200,D103
+ignore = E203,E501,W503,D202,B014,D400,D401
 application-import-names = aea,packages,tests,scripts
 
-# eventually add:
-# D102,D400,D105,D401,D201,D205,D209,D210,D200,D103 > clean up docstrings
-
 # ignore:
+# D400: First line should end with a period
+# D401: First line should be in imperative mood
 # E501: https://www.flake8rules.com/rules/E501.html (Line too long)
 # E203: https://www.flake8rules.com/rules/E203.html (Whitespace)
 # W503: https://www.flake8rules.com/rules/W503.html (Line break)
diff --git a/tests/common/mocks.py b/tests/common/mocks.py
index f05fe342c1..8f5845adcb 100644
--- a/tests/common/mocks.py
+++ b/tests/common/mocks.py
@@ -32,6 +32,7 @@ class AnyStringWith(str):
     """
 
     def __eq__(self, other):
+        """Check equality."""
         return self in other
 
 
@@ -43,6 +44,7 @@ class RegexComparator(str):
     """
 
     def __eq__(self, other):
+        """Check equality."""
         regex = re.compile(str(self), re.MULTILINE | re.DOTALL)
         s = str(other)
         return bool(regex.match(s))
diff --git a/tests/data/custom_crypto.py b/tests/data/custom_crypto.py
index a0e9650f9a..0f1aa533d6 100644
--- a/tests/data/custom_crypto.py
+++ b/tests/data/custom_crypto.py
@@ -29,38 +29,79 @@ class CustomCrypto(Crypto):
 
     @classmethod
     def generate_private_key(cls) -> EntityClass:
+        """Generare private key."""
         pass
 
     @classmethod
     def load_private_key_from_path(cls, file_name: str) -> EntityClass:
+        """
+        Load private key from path.
+
+        :param file_name: file name
+        """
         pass
 
     @property
     def public_key(self) -> str:
+        """Get public key."""
         pass
 
     @property
     def address(self) -> str:
+        """Get address."""
         pass
 
     @property
     def private_key(self) -> str:
+        """Get private key."""
         pass
 
     @classmethod
     def get_address_from_public_key(cls, public_key: str) -> str:
+        """
+        Get address from public key.
+
+        :param public_key: the public key.
+        :return: the address
+        """
         pass
 
     def sign_message(self, message: bytes, is_deprecated_mode: bool = False) -> str:
+        """
+        Sign message.
+
+        :param message: the message
+        :param is_deprecated_mode: whether or not deprecated signing mode is used.
+        :return: signed message string
+        """
         pass
 
     def sign_transaction(self, transaction: Any) -> Any:
+        """
+        Sign transaction.
+
+        :param transaction: the transaction to be signed
+        :return: the signed transaction
+        """
         pass
 
     def recover_message(
         self, message: bytes, signature: str, is_deprecated_mode: bool = False
     ) -> Tuple[Address, ...]:
+        """
+        Recover message.
+
+        :param message: the message
+        :param signature: the signature
+        :param is_deprecated_mode: whether or not it is deprecated
+        """
         pass
 
     def dump(self, fp: BinaryIO) -> None:
+        """
+        Dump the private key.
+
+        :param fp: the file path
+        :return: None
+        """
         pass
diff --git a/tests/data/dummy_contract/contract.py b/tests/data/dummy_contract/contract.py
index cee201556f..89aef4f502 100644
--- a/tests/data/dummy_contract/contract.py
+++ b/tests/data/dummy_contract/contract.py
@@ -28,4 +28,5 @@ class DummyContract(Contract):
 
     @classmethod
     def some_method(cls, ledger_api: LedgerApi, contract_address: str) -> None:
+        """Some method."""
         pass
diff --git a/tests/data/dummy_contract/contract.yaml b/tests/data/dummy_contract/contract.yaml
index ba3b8be4b1..1c7f62b9f1 100644
--- a/tests/data/dummy_contract/contract.yaml
+++ b/tests/data/dummy_contract/contract.yaml
@@ -9,7 +9,7 @@ fingerprint:
   __init__.py: QmWbNjFh6E5V4n2qBwyZyXZdmmHvcZSVnwKrcM34MAE56S
   build/some.json: Qma5n7au2NDCg1nLwYfYnmFNwWChFuXtu65w5DV7wAZRvw
   build/some.wasm: Qmc9gthbdwRSywinTHKjRVQdFzrKTxUuLDx2ryNfQp1xqf
-  contract.py: QmYBTVD7kwvrzMTfkHdzTUPsg24o1qJfQ7wR5WhKAx9xUY
+  contract.py: QmYfn2V3tXv7MCyhT5Kz5ArtX2FZWHC1jfeRmqCNsRxDL5
 fingerprint_ignore_patterns: []
 class_name: DummyContract
 contract_interface_paths:
diff --git a/tests/data/hashes.csv b/tests/data/hashes.csv
index 7fe00a5120..32219ab32f 100644
--- a/tests/data/hashes.csv
+++ b/tests/data/hashes.csv
@@ -1,6 +1,6 @@
 dummy_author/agents/dummy_aea,QmQRx5aPogjbzyV1GKFByfPpCENu7A1E1GGC9arXCKnzsD
 dummy_author/skills/dummy_skill,QmQpimGAQ56nihemchgE29Mfan57YdGixj3kat69FGkrjK
 fetchai/connections/dummy_connection,QmT7zw62fDK1mmwYqTvw4pWqFg8Fc1DYQHUxcxd7sqZiLu
-fetchai/contracts/dummy_contract,QmQr6BLGQuj45r55S5Bo8xqP8ggr4hbmJBbHUJ14uh1qjD
+fetchai/contracts/dummy_contract,QmPMs9VDGZGF8xJ8XBYLVb1xK5XAgiaJr5Gwcq7Vr3TUyu
 fetchai/skills/dependencies_skill,QmaLBgnwTXdTzue7H3UbVuKmPxaqoK4Azpj85tKTdQi29j
 fetchai/skills/exception_skill,QmT2RiM95EVbXTD31zU6pKKoERkrCLuyxpAJfkm3dTsTp2
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index dcf3151a1c..e9d464538d 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -655,8 +655,7 @@ def test_from_project(self):
 
 
 class TestFromAEAProjectCustomConfigFailsWhenComponentNotDeclared(AEATestCaseEmpty):
-    """Test builder set from project dir with custom component config fails
-    when the component is not declared in the agent configuration."""
+    """Test builder set from project dir with custom component config fails when the component is not declared in the agent configuration."""
 
     def _add_stub_connection_config(self):
         """Add custom stub connection config."""
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 8603db6ba0..35f4ff37a6 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -62,6 +62,7 @@ def teardown(self) -> None:
 
     @property
     def resources(self):
+        """Get resources."""
         return Mock()
 
 
diff --git a/tests/test_cli/tools_for_testing.py b/tests/test_cli/tools_for_testing.py
index 59994fe546..10b95f1543 100644
--- a/tests/test_cli/tools_for_testing.py
+++ b/tests/test_cli/tools_for_testing.py
@@ -75,6 +75,7 @@ def __init__(self, *args, **kwargs):
         self.obj = self
 
     def set_config(self, key, value):
+        """Set config."""
         setattr(self.config, key, value)
 
 
diff --git a/tests/test_components/test_base.py b/tests/test_components/test_base.py
index 9c23b65f25..8fbbaf486c 100644
--- a/tests/test_components/test_base.py
+++ b/tests/test_components/test_base.py
@@ -32,6 +32,7 @@ class TestComponentProperties:
     """Test accessibility of component properties."""
 
     def setup_class(self):
+        """Setup test."""
         self.configuration = ProtocolConfig("name", "author", "0.1.0")
         self.component = Component(configuration=self.configuration)
         self.directory = Path()
diff --git a/tests/test_components/test_loader.py b/tests/test_components/test_loader.py
index e00dfef091..4139b34e7f 100644
--- a/tests/test_components/test_loader.py
+++ b/tests/test_components/test_loader.py
@@ -63,8 +63,7 @@ def test_component_loading_generic_module_not_found_error(component_configuratio
 def test_component_loading_module_not_found_error_non_framework_package(
     component_configuration,
 ):
-    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs
-    for a generic import path (non framework related."""
+    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs for a generic import path (non framework related."""
     with mock.patch.object(
         Protocol,
         "from_config",
@@ -77,9 +76,7 @@ def test_component_loading_module_not_found_error_non_framework_package(
 def test_component_loading_module_not_found_error_framework_package(
     component_configuration,
 ):
-    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs
-    for a framework-related import (starts with 'packages') but for some reason it doesn't
-    contain the author name."""
+    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs for a framework-related import (starts with 'packages') but for some reason it doesn't contain the author name."""
     with mock.patch.object(
         Protocol,
         "from_config",
@@ -92,8 +89,7 @@ def test_component_loading_module_not_found_error_framework_package(
 def test_component_loading_module_not_found_error_framework_package_with_wrong_author(
     component_configuration,
 ):
-    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs
-    for a framework-related import (starts with 'packages') with wrong author."""
+    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs for a framework-related import (starts with 'packages') with wrong author."""
     with mock.patch.object(
         Protocol,
         "from_config",
@@ -109,8 +105,7 @@ def test_component_loading_module_not_found_error_framework_package_with_wrong_a
 def test_component_loading_module_not_found_error_framework_package_with_wrong_type(
     component_configuration,
 ):
-    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs
-    for a framework-related import (starts with 'packages') with correct author but wrong type."""
+    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs for a framework-related import (starts with 'packages') with correct author but wrong type."""
     with mock.patch.object(
         Protocol,
         "from_config",
@@ -128,8 +123,7 @@ def test_component_loading_module_not_found_error_framework_package_with_wrong_t
 def test_component_loading_module_not_found_error_framework_package_with_wrong_name(
     component_configuration,
 ):
-    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs
-    for a framework-related import (starts with 'packages') with correct author and type but wrong name."""
+    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs for a framework-related import (starts with 'packages') with correct author and type but wrong name."""
     with mock.patch.object(
         Protocol,
         "from_config",
@@ -147,8 +141,7 @@ def test_component_loading_module_not_found_error_framework_package_with_wrong_n
 def test_component_loading_module_not_found_error_framework_package_with_wrong_suffix(
     component_configuration,
 ):
-    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs
-    for a framework-related import (starts with 'packages') with correct author and type but wrong suffix."""
+    """Test 'load_component_from_config' method when a "ModuleNotFoundError" occurs for a framework-related import (starts with 'packages') with correct author and type but wrong suffix."""
     with mock.patch.object(
         Protocol,
         "from_config",
diff --git a/tests/test_configurations/test_aea_config.py b/tests/test_configurations/test_aea_config.py
index 151502a121..039b6a3eb6 100644
--- a/tests/test_configurations/test_aea_config.py
+++ b/tests/test_configurations/test_aea_config.py
@@ -320,10 +320,7 @@ def test_agent_configuration_loading_multipage_when_type_not_found():
 
 
 def test_agent_configuration_loading_multipage_when_same_id():
-    """
-    Test agent configuration loading, multi-page case,
-    when there are two components with the same id.
-    """
+    """Test agent configuration loading, multi-page case, when there are two components with the same id."""
     file = Path(CUR_PATH, "data", "aea-config.example_multipage.yaml").open()
     jsons = list(yaml.safe_load_all(file))
     # add twice the last component
@@ -341,10 +338,7 @@ def test_agent_configuration_loading_multipage_when_same_id():
 
 
 def test_agent_configuration_loading_multipage_validation_error():
-    """
-    Test agent configuration loading, multi-page case,
-    when the configuration is invalid.
-    """
+    """Test agent configuration loading, multi-page case, when the configuration is invalid."""
     file = Path(CUR_PATH, "data", "aea-config.example_multipage.yaml").open()
     jsons = list(yaml.safe_load_all(file))
     # make invalid the last component configuration
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 47afd083a1..13d523b9ea 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -436,8 +436,7 @@ def test_public_id_from_uri_path():
 
 
 def test_public_id_from_uri_path_wrong_input():
-    """Test that when a bad formatted path is passed in input of PublicId.from_uri_path
-    an exception is raised."""
+    """Test that when a bad formatted path is passed in input of PublicId.from_uri_path an exception is raised."""
     with pytest.raises(
         ValueError, match="Input 'bad/formatted:input' is not well formatted."
     ):
@@ -634,6 +633,7 @@ def test_agent_config_to_json_with_optional_configurations():
 
 
 def test_protocol_specification_attributes():
+    """Test protocol specification attributes."""
     protocol_specification = ProtocolSpecification("name", "author", "0.1.0")
 
     # test getter and setter for 'protobuf_snippets'
diff --git a/tests/test_contracts/test_base.py b/tests/test_contracts/test_base.py
index 739cabdac2..13e2e10064 100644
--- a/tests/test_contracts/test_base.py
+++ b/tests/test_contracts/test_base.py
@@ -88,6 +88,7 @@ def test_non_implemented_class_methods():
 
 @pytest.fixture()
 def dummy_contract(request):
+    """Dummy contract fixture."""
     directory = Path(ROOT_DIR, "tests", "data", "dummy_contract")
     configuration = load_component_configuration(ComponentType.CONTRACT, directory)
     configuration._directory = directory
diff --git a/tests/test_crypto/test_fetchai.py b/tests/test_crypto/test_fetchai.py
index 2e57c3b8ed..aec465043f 100644
--- a/tests/test_crypto/test_fetchai.py
+++ b/tests/test_crypto/test_fetchai.py
@@ -44,9 +44,11 @@ def __init__(self, data, status_code=None):
 
     @property
     def status_code(self):
+        """Get status code."""
         return 200
 
     def json(self):
+        """Get json."""
         return self._data
 
 
@@ -222,6 +224,7 @@ def test_get_wealth_positive(caplog):
 @mock.patch("requests.get")
 @mock.patch("requests.post")
 def test_successful_faucet_operation(mock_post, mock_get):
+    """Test successful faucet operation."""
     address = "a normal cosmos address would be here"
     mock_post.return_value = MockRequestsResponse({"uid": "a-uuid-v4-would-be-here"})
 
@@ -258,6 +261,7 @@ def test_successful_faucet_operation(mock_post, mock_get):
 @mock.patch("requests.get")
 @mock.patch("requests.post")
 def test_successful_realistic_faucet_operation(mock_post, mock_get):
+    """Test successful realistic faucet operation."""
     address = "a normal cosmos address would be here"
     mock_post.return_value = MockRequestsResponse({"uid": "a-uuid-v4-would-be-here"})
 
diff --git a/tests/test_docs/test_agent_vs_aea/agent_code_block.py b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
index b449261244..e219fd1420 100644
--- a/tests/test_docs/test_agent_vs_aea/agent_code_block.py
+++ b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
@@ -45,12 +45,20 @@ def __init__(self, identity: Identity, connections: List[Connection]):
         super().__init__(identity, connections)
 
     def setup(self):
+        """Setup the agent."""
         pass
 
     def act(self):
+        """Act implementation."""
         print("Act called for tick {}".format(self.tick))
 
     def handle_envelope(self, envelope: Envelope) -> None:
+        """
+        Handle envelope.
+
+        :param envelope: the envelope received
+        :return: None
+        """
         print("React called for tick {}".format(self.tick))
         if envelope is not None and envelope.protocol_id == DefaultMessage.protocol_id:
             sender = envelope.sender
@@ -68,10 +76,13 @@ def handle_envelope(self, envelope: Envelope) -> None:
             self.outbox.put(envelope)
 
     def teardown(self):
+        """Teardown the agent."""
         pass
 
 
 def run():
+    """Run demo."""
+
     # Ensure the input and output files do not exist initially
     if os.path.isfile(INPUT_FILE):
         os.remove(INPUT_FILE)
diff --git a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
index 74edb9b2f8..5d004506d0 100644
--- a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
@@ -37,6 +37,8 @@
 
 
 def run():
+    """Run demo."""
+
     # Create a private key
     create_private_key(FetchAICrypto.identifier, FETCHAI_PRIVATE_KEY_FILE)
 
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
index d2c45d6ce8..737f29fdfa 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
@@ -57,6 +57,8 @@
 
 
 def run():
+    """Run demo."""
+
     # Create a private key
     create_private_key(FetchAICrypto.identifier, FETCHAI_PRIVATE_KEY_FILE)
     create_private_key(FetchAICrypto.identifier, FETCHAI_PRIVATE_KEY_FILE_CONNECTION)
diff --git a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
index 1df4381796..10e9ad3055 100644
--- a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
@@ -47,6 +47,8 @@
 
 
 def run():
+    """Run demo."""
+
     # Create a private key
     create_private_key(
         FetchAICrypto.identifier, private_key_file=FETCHAI_PRIVATE_KEY_FILE_1
diff --git a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
index 7db76bc82e..7c3065ddde 100644
--- a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
@@ -82,5 +82,6 @@ def test_run_end_to_end(self):
 
     @classmethod
     def teardown_class(cls):
+        """Teardown test."""
         BaseAEATestCase.teardown_class()
         cls._unpatch_logger()
diff --git a/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
index 428c061402..b4e1d47dde 100644
--- a/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
@@ -36,6 +36,8 @@
 
 
 def run():
+    """Run demo."""
+
     # Ensure the input and output files do not exist initially
     if os.path.isfile(INPUT_FILE):
         os.remove(INPUT_FILE)
diff --git a/tests/test_docs/test_orm_integration/test_orm_integration.py b/tests/test_docs/test_orm_integration/test_orm_integration.py
index 68d16d5652..b96e8f6c44 100644
--- a/tests/test_docs/test_orm_integration/test_orm_integration.py
+++ b/tests/test_docs/test_orm_integration/test_orm_integration.py
@@ -310,10 +310,7 @@ def test_orm_integration_docs_example(self):
 
 
 def test_strategy_consistency():
-    """
-    Test that the seller strategy specified in the documentation
-    is the same we use in the tests.
-    """
+    """Test that the seller strategy specified in the documentation is the same we use in the tests."""
     markdown_parser = mistune.create_markdown(renderer=mistune.AstRenderer())
 
     skill_doc_file = Path(ROOT_DIR, "docs", "orm-integration.md")
diff --git a/tests/test_docs/test_standalone_transaction/standalone_transaction.py b/tests/test_docs/test_standalone_transaction/standalone_transaction.py
index bee41ae2dc..e137def89f 100644
--- a/tests/test_docs/test_standalone_transaction/standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/standalone_transaction.py
@@ -35,6 +35,8 @@
 
 
 def run():
+    """Run demo."""
+
     # Create a private keys
     create_private_key(
         FetchAICrypto.identifier, private_key_file=FETCHAI_PRIVATE_KEY_FILE_1
diff --git a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
index 0ec4d1e8ba..ac2e07b52f 100644
--- a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
+++ b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
@@ -101,6 +101,7 @@ def setup_class(cls):
 
     @pytest.mark.asyncio
     async def test_connecting_to_aca(self):
+        """Test connecting to aca."""
         configuration = ConnectionConfig(
             host=self.aca_admin_address,
             port=self.aca_admin_port,
@@ -166,6 +167,7 @@ async def test_connecting_to_aca(self):
 
     @pytest.mark.asyncio
     async def test_end_to_end_aea_aca(self):
+        """Test the end to end aea aca interaction."""
         # AEA components
         wallet = Wallet({DEFAULT_LEDGER: DEFAULT_PRIVATE_KEY_FILE})
         identity = Identity(
@@ -266,6 +268,7 @@ async def test_end_to_end_aea_aca(self):
 
     @classmethod
     def teardown_class(cls):
+        """Teardown the aca."""
         # terminate the ACA
         cls.process.terminate()
 
diff --git a/tests/test_helpers/test_multiaddr.py b/tests/test_helpers/test_multiaddr.py
index d8ae14acc4..74218e7134 100644
--- a/tests/test_helpers/test_multiaddr.py
+++ b/tests/test_helpers/test_multiaddr.py
@@ -33,6 +33,7 @@
 
 
 def test_multiaddr_consistency():
+    """Test multiaddress consistency."""
     key = make_crypto(DEFAULT_LEDGER)
     maddr1 = MultiAddr(HOST, PORT, key.public_key)
 
@@ -52,6 +53,7 @@ def test_multiaddr_consistency():
 
 
 def test_multiaddr_correctness():
+    """Test multiaddress correctness."""
     tmpdir = tempfile.mkdtemp()
     key_file = tmpdir + "/key"
     with open(key_file, "w+") as k:
diff --git a/tests/test_helpers/test_pipe/test_pipe.py b/tests/test_helpers/test_pipe/test_pipe.py
index 863b2e35a9..f4e5d95ef5 100644
--- a/tests/test_helpers/test_pipe/test_pipe.py
+++ b/tests/test_helpers/test_pipe/test_pipe.py
@@ -60,6 +60,7 @@ class TestAEAHelperMakePipe:
 
     @pytest.mark.asyncio
     async def test_connection_communication(self):
+        """Test connection communication."""
         pipe = make_ipc_channel()
         assert (
             pipe.in_path is not None and pipe.out_path is not None
@@ -94,6 +95,7 @@ class TestAEAHelperTCPSocketChannel:
 
     @pytest.mark.asyncio
     async def test_connection_communication(self):
+        """Test connection communication."""
         pipe = TCPSocketChannel()
         assert (
             pipe.in_path is not None and pipe.out_path is not None
@@ -123,6 +125,7 @@ async def test_connection_communication(self):
 
     @pytest.mark.asyncio
     async def test_connection_refused(self):
+        """Test connection refused."""
         pipe = TCPSocketChannel()
         assert (
             pipe.in_path is not None and pipe.out_path is not None
@@ -141,6 +144,7 @@ class TestAEAHelperPosixNamedPipeChannel:
 
     @pytest.mark.asyncio
     async def test_connection_communication(self):
+        """Test connection communication."""
         pipe = PosixNamedPipeChannel()
         assert (
             pipe.in_path is not None and pipe.out_path is not None
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
index 3a55f07d72..c1e9f70ea2 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
@@ -43,6 +43,7 @@ def setup_class(cls):
 
     @libp2p_log_on_failure
     def test_agent(self):
+        """Test with aea."""
         self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
 
@@ -87,6 +88,7 @@ def setup_class(cls):
 
     @libp2p_log_on_failure
     def test_agent(self):
+        """Test with aea."""
         self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
 
         # setup a full node: with public uri, relay service, and delegate service
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
index 2fe03587f1..49a08a0be9 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
@@ -56,6 +56,7 @@ def setup_class(cls):
 
     @pytest.mark.asyncio
     async def test_p2plibp2pconnection_connect_disconnect(self):
+        """Test connect then disconnect."""
         assert self.connection.is_connected is False
         try:
             await self.connection.connect()
@@ -113,10 +114,12 @@ def setup_class(cls):
             raise e
 
     def test_connection_is_established(self):
+        """Test connection established."""
         assert self.connection1.is_connected is True
         assert self.connection2.is_connected is True
 
     def test_envelope_routed(self):
+        """Test envelope routed."""
         addr_1 = self.connection1.node.address
         addr_2 = self.connection2.node.address
 
@@ -148,6 +151,7 @@ def test_envelope_routed(self):
         assert envelope.message == msg
 
     def test_envelope_echoed_back(self):
+        """Test envelope echoed back."""
         addr_1 = self.connection1.node.address
         addr_2 = self.connection2.node.address
 
@@ -237,11 +241,13 @@ def setup_class(cls):
             raise e
 
     def test_connection_is_established(self):
+        """Test connection established."""
         assert self.connection_genesis.is_connected is True
         for conn in self.connections:
             assert conn.is_connected is True
 
     def test_star_routing_connectivity(self):
+        """Test star routing connectivity."""
         addrs = [conn.node.address for conn in self.connections]
 
         for source in range(len(self.multiplexers)):
@@ -333,11 +339,13 @@ def setup_class(cls):
             raise e
 
     def test_connection_is_established(self):
+        """Test connection established."""
         assert self.relay.is_connected is True
         assert self.connection1.is_connected is True
         assert self.connection2.is_connected is True
 
     def test_envelope_routed(self):
+        """Test envelope routed."""
         addr_1 = self.connection1.node.address
         addr_2 = self.connection2.node.address
 
@@ -369,6 +377,7 @@ def test_envelope_routed(self):
         assert envelope.message == msg
 
     def test_envelope_echoed_back(self):
+        """Test envelope echoed back."""
         addr_1 = self.connection1.node.address
         addr_2 = self.connection2.node.address
 
@@ -481,12 +490,14 @@ def setup_class(cls):
             raise e
 
     def test_connection_is_established(self):
+        """Test connection established."""
         assert self.connection_relay_1.is_connected is True
         assert self.connection_relay_2.is_connected is True
         for conn in self.connections:
             assert conn.is_connected is True
 
     def test_star_routing_connectivity(self):
+        """Test star routing connectivity."""
         addrs = [conn.node.address for conn in self.connections]
 
         for source in range(len(self.multiplexers)):
@@ -535,6 +546,7 @@ def teardown_class(cls):
 
 
 def test_libp2pconnection_uri():
+    """Test uri."""
     uri = Uri(host="127.0.0.1")
     uri = Uri(host="127.0.0.1", port=10000)
     assert uri.host == "127.0.0.1" and uri.port == 10000
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index cb120af62d..7828bec9ed 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -64,6 +64,7 @@ def setup_class(cls):
 
     @pytest.mark.asyncio
     async def test_timeout(self):
+        """Test the timeout."""
         log_file_desc = open("log", "a", 1)
         with pytest.raises(Exception):
             await _golang_module_build_async(
@@ -72,6 +73,7 @@ async def test_timeout(self):
 
     @pytest.mark.asyncio
     async def test_wrong_path(self):
+        """Test the wrong path."""
         self.connection.node.source = self.wrong_path
         with pytest.raises(Exception):
             await self.connection.connect()
@@ -101,6 +103,7 @@ def setup_class(cls):
         cls.wrong_path = tempfile.mkdtemp()
 
     def test_wrong_path(self):
+        """Test the wrong path."""
         log_file_desc = open("log", "a", 1)
         with pytest.raises(Exception):
             _golang_module_run(
@@ -108,6 +111,7 @@ def test_wrong_path(self):
             )
 
     def test_timeout(self):
+        """Test the timeout."""
         self.connection.node._connection_timeout = 0
         muxer = Multiplexer([self.connection])
         with pytest.raises(Exception):
@@ -138,6 +142,7 @@ def setup_class(cls):
         cls.connection = _make_libp2p_connection()
 
     def test_node_disconnect(self):
+        """Test node disconnect."""
         muxer = Multiplexer([self.connection])
         muxer.connect()
         self.connection.node.proc.terminate()
@@ -174,6 +179,7 @@ def setup_class(cls):
         key_file_desc.close()
 
     def test_entry_peers_when_no_public_uri_provided(self):
+        """Test entry peers when no public uri provided."""
         configuration = ConnectionConfig(
             libp2p_key_file=None,
             local_uri="{}:{}".format(self.host, self.port),
@@ -186,7 +192,7 @@ def test_entry_peers_when_no_public_uri_provided(self):
             P2PLibp2pConnection(configuration=configuration, identity=self.identity)
 
     def test_local_uri_provided_when_public_uri_provided(self):
-
+        """Test local uri provided when public uri provided."""
         configuration = ConnectionConfig(
             node_key_file=self.key_file,
             public_uri="{}:{}".format(self.host, self.port),
@@ -208,6 +214,7 @@ def teardown_class(cls):
 
 
 def test_libp2pconnection_awaitable_proc_cancelled():
+    """Test awaitable proc cancelled."""
     proc = AwaitableProc(["sleep", "100"], shell=False)
     proc_task = asyncio.ensure_future(proc.start())
     proc_task.cancel()
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
index cd781550dc..97553180c5 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
@@ -93,10 +93,12 @@ def setup_class(cls):
             raise e
 
     def test_connection_is_established(self):
+        """Test connection established."""
         assert self.relay.is_connected is True
         assert self.connection.is_connected is True
 
     def test_envelope_routed_after_relay_restart(self):
+        """Test envelope routed after relay restart."""
         addr_1 = self.connection.address
         addr_2 = self.genesis.address
 
@@ -220,10 +222,12 @@ def setup_class(cls):
             raise e
 
     def test_connection_is_established(self):
+        """Test connection established."""
         assert self.connection1.is_connected is True
         assert self.connection2.is_connected is True
 
     def test_envelope_routed_after_peer_changed(self):
+        """Test envelope routed after peer changed."""
         addr_1 = self.connection1.address
         addr_2 = self.connection2.address
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
index 1ba7fd6174..831d56a466 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
@@ -63,6 +63,7 @@ def setup_class(cls):
         cls.log_files = []
 
     def test_connectivity(self):
+        """Test connectivity."""
         for maddr in PUBLIC_DHT_MADDRS:
             connection = _make_libp2p_connection(
                 DEFAULT_PORT + 1, relay=False, entry_peers=[maddr]
@@ -81,6 +82,7 @@ def test_connectivity(self):
                 multiplexer.disconnect()
 
     def test_communication_direct(self):
+        """Test communication direct."""
         for maddr in PUBLIC_DHT_MADDRS:
             multiplexers = []
             try:
@@ -136,6 +138,7 @@ def test_communication_direct(self):
                     mux.disconnect()
 
     def test_communication_indirect(self):
+        """Test communication indirect."""
         assert len(PUBLIC_DHT_MADDRS) > 1, "Test requires at least 2 public dht node"
 
         for i in range(len(PUBLIC_DHT_MADDRS)):
@@ -215,6 +218,7 @@ class TestLibp2pConnectionPublicDHTDelegate:
     """Test that public DHT's delegate service is working properly"""
 
     def test_connectivity(self):
+        """Test connectivity."""
         for uri in PUBLIC_DHT_DELEGATE_URIS:
             connection = _make_libp2p_client_connection(uri=uri)
             multiplexer = Multiplexer([connection])
@@ -230,6 +234,7 @@ def test_connectivity(self):
                 multiplexer.disconnect()
 
     def test_communication_direct(self):
+        """Test communication direct."""
         for uri in PUBLIC_DHT_DELEGATE_URIS:
             multiplexers = []
             try:
@@ -279,6 +284,7 @@ def test_communication_direct(self):
                     mux.disconnect()
 
     def test_communication_indirect(self):
+        """Test communication indirect."""
         assert (
             len(PUBLIC_DHT_DELEGATE_URIS) > 1
         ), "Test requires at least 2 public dht node"
@@ -348,6 +354,7 @@ class TestLibp2pConnectionPublicDHTRelayAEACli(AEATestCaseEmpty):
 
     @libp2p_log_on_failure
     def test_connectivity(self):
+        """Test connectivity."""
         self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
 
@@ -393,6 +400,7 @@ class TestLibp2pConnectionPublicDHTDelegateAEACli(AEATestCaseEmpty):
     """Test that public DHT's delegate service is working properly, using aea cli"""
 
     def test_connectivity(self):
+        """Test connectivity."""
         self.add_item("connection", "fetchai/p2p_libp2p_client:0.6.0")
         config_path = "vendor.fetchai.connections.p2p_libp2p_client.config"
         self.force_set_config(
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
index 349a9bea84..6ad8a42aaa 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
@@ -56,9 +56,11 @@ def setup_class(cls):
         cls.node_multiplexer.connect()
 
     def test_node(self):
+        """Test the node is connected."""
         assert self.node_connection.is_connected is True
 
     def test_connection(self):
+        """Test the connection can be used in an aea."""
         self.add_item("connection", "fetchai/p2p_libp2p_client:0.6.0")
         config_path = "vendor.fetchai.connections.p2p_libp2p_client.config"
         self.force_set_config(
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
index fb6cea9930..308f2b6bd2 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
@@ -61,6 +61,7 @@ def setup_class(cls):
 
     @pytest.mark.asyncio
     async def test_libp2pclientconnection_connect_disconnect(self):
+        """Test connnect then disconnect."""
         assert self.connection.is_connected is False
         try:
             await self.connection_node.connect()
@@ -116,10 +117,12 @@ def setup_class(cls):
             raise
 
     def test_connection_is_established(self):
+        """Test connection is established."""
         assert self.connection_client_1.is_connected is True
         assert self.connection_client_2.is_connected is True
 
     def test_envelope_routed(self):
+        """Test the envelope is routed."""
         addr_1 = self.connection_client_1.address
         addr_2 = self.connection_client_2.address
 
@@ -147,6 +150,7 @@ def test_envelope_routed(self):
         assert delivered_envelope.message == envelope.message
 
     def test_envelope_echoed_back(self):
+        """Test the envelope is echoed back."""
         addr_1 = self.connection_client_1.address
         addr_2 = self.connection_client_2.address
 
@@ -181,6 +185,7 @@ def test_envelope_echoed_back(self):
         assert delivered_envelope.message == original_envelope.message
 
     def test_envelope_echoed_back_node_agent(self):
+        """Test the envelope is echoed back."""
         addr_1 = self.connection_client_1.address
         addr_n = self.connection_node.address
 
@@ -285,12 +290,14 @@ def setup_class(cls):
             raise
 
     def test_connection_is_established(self):
+        """Test the connection is established."""
         assert self.connection_node_1.is_connected is True
         assert self.connection_node_2.is_connected is True
         assert self.connection_client_1.is_connected is True
         assert self.connection_client_2.is_connected is True
 
     def test_envelope_routed(self):
+        """Test the envelope is routed."""
         addr_1 = self.connection_client_1.address
         addr_2 = self.connection_client_2.address
 
@@ -318,6 +325,7 @@ def test_envelope_routed(self):
         assert delivered_envelope.message == envelope.message
 
     def test_envelope_echoed_back(self):
+        """Test the envelope is echoed back."""
         addr_1 = self.connection_client_1.address
         addr_2 = self.connection_client_2.address
 
@@ -352,6 +360,7 @@ def test_envelope_echoed_back(self):
         assert delivered_envelope.message == original_envelope.message
 
     def test_envelope_echoed_back_node_agent(self):
+        """Test the envelope is echoed back node agent."""
         addr_1 = self.connection_client_1.address
         addr_n = self.connection_node_2.address
 
@@ -457,10 +466,12 @@ def setup_class(cls):
             raise
 
     def test_connection_is_established(self):
+        """Test connection is established."""
         for conn in self.connections:
             assert conn.is_connected is True
 
     def test_star_routing_connectivity(self):
+        """Test routing with star connectivity."""
         msg = DefaultMessage(
             dialogue_reference=("", ""),
             message_id=1,
@@ -504,6 +515,7 @@ def teardown_class(cls):
 
 
 def test_libp2pclientconnection_uri():
+    """Test the uri."""
     uri = Uri(host="127.0.0.1")
     uri = Uri(host="127.0.0.1", port=10000)
     assert uri.host == "127.0.0.1" and uri.port == 10000
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
index 12371b86e7..4500e3c166 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
@@ -48,6 +48,7 @@ class TestLibp2pClientConnectionFailureNodeNotConnected:
 
     @pytest.mark.asyncio
     async def test_node_not_running(self):
+        """Test the node is not running."""
         conn = _make_libp2p_client_connection()
         with pytest.raises(Exception):
             await conn.connect()
@@ -73,6 +74,7 @@ def setup_class(cls):
         key_file_desc.close()
 
     def test_empty_nodes(self):
+        """Test empty nodes."""
         configuration = ConnectionConfig(
             client_key_file=self.key_file,
             nodes=[{"uri": "{}:{}".format(self.node_host, self.node_port)}],
@@ -130,6 +132,7 @@ def setup_class(cls):
             raise
 
     def test_node_disconnected(self):
+        """Test node disconnected."""
         assert self.connection_client.is_connected is True
         self.multiplexer_client.disconnect()
         self.multiplexer_node.disconnect()
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index d739796356..46d4405451 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -199,6 +199,7 @@ def search(self, query: Query) -> OefSearchMessage:
         return message
 
     def get(self):
+        """Get an instance."""
         wait_for_condition(lambda: not self.multiplexer.in_queue.empty(), timeout=20)
         return self.multiplexer.get()
 
diff --git a/tests/test_packages/test_contracts/test_erc1155/test_contract.py b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
index 5078801f90..f2e9d58821 100644
--- a/tests/test_packages/test_contracts/test_erc1155/test_contract.py
+++ b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
@@ -51,6 +51,7 @@
 
 @pytest.fixture(params=ledger)
 def ledger_api(request):
+    """Ledger api fixture."""
     ledger_id, config = request.param
     api = ledger_apis_registry.make(ledger_id, **config)
     yield api
@@ -58,6 +59,7 @@ def ledger_api(request):
 
 @pytest.fixture(params=crypto)
 def crypto_api(request):
+    """Crypto api fixture."""
     crypto_id = request.param[0]
     api = crypto_registry.make(crypto_id)
     yield api
@@ -66,6 +68,7 @@ def crypto_api(request):
 @pytest.mark.integration
 @pytest.mark.ledger
 def test_helper_methods_and_get_transactions(ledger_api, erc1155_contract):
+    """Test helper methods and get transactions."""
     expected_a = [
         340282366920938463463374607431768211456,
         340282366920938463463374607431768211457,
@@ -154,6 +157,7 @@ def test_helper_methods_and_get_transactions(ledger_api, erc1155_contract):
 @pytest.mark.integration
 @pytest.mark.ledger
 def test_get_single_atomic_swap(ledger_api, crypto_api, erc1155_contract):
+    """Test get single atomic swap."""
     contract_address = "0x250A2aeb3eB84782e83365b4c42dbE3CDA9920e4"
     from_address = ETHEREUM_ADDRESS_ONE
     to_address = ETHEREUM_ADDRESS_TWO
@@ -201,6 +205,7 @@ def test_get_single_atomic_swap(ledger_api, crypto_api, erc1155_contract):
 @pytest.mark.integration
 @pytest.mark.ledger
 def test_get_batch_atomic_swap(ledger_api, crypto_api, erc1155_contract):
+    """Test get batch atomic swap."""
     contract_address = "0x250A2aeb3eB84782e83365b4c42dbE3CDA9920e4"
     from_address = ETHEREUM_ADDRESS_ONE
     to_address = ETHEREUM_ADDRESS_TWO
@@ -249,6 +254,7 @@ class TestCosmWasmContract:
     """Test the cosmwasm contract."""
 
     def setup(self):
+        """Setup."""
         self.ledger_api = ledger_apis_registry.make(FETCHAI, **FETCHAI_TESTNET_CONFIG)
         self.faucet_api = faucet_apis_registry.make(FETCHAI)
         self.deployer_crypto = crypto_registry.make(FETCHAI)
@@ -281,6 +287,7 @@ def setup(self):
         )
 
     def refill_from_faucet(self, ledger_api, faucet_api, address):
+        """Refill from faucet."""
         start_balance = ledger_api.get_balance(address)
 
         faucet_api.get_wealth(address)
@@ -356,6 +363,7 @@ def sign_send_verify_deploy_init_transaction(
     @pytest.mark.integration
     @pytest.mark.ledger
     def test_cosmwasm_contract_deploy_and_interact(self, erc1155_contract):
+        """Test cosmwasm contract deploy and interact."""
         # Deploy contract
         tx = erc1155_contract.get_deploy_transaction(
             ledger_api=self.ledger_api,
@@ -452,6 +460,7 @@ def test_cosmwasm_contract_deploy_and_interact(self, erc1155_contract):
     def test_cosmwasm_unimplemented_exception_single_atomic_swap(
         self, erc1155_contract
     ):
+        """Test unimplemented exception single atomic swap."""
         pytest.raises(
             NotImplementedError,
             erc1155_contract.get_atomic_swap_single_transaction,
@@ -470,6 +479,7 @@ def test_cosmwasm_unimplemented_exception_single_atomic_swap(
     @pytest.mark.integration
     @pytest.mark.ledger
     def test_cosmwasm_unimplemented_exception_batch_atomic_swap(self, erc1155_contract):
+        """Test unimplemented exception batch atomic swap."""
         pytest.raises(
             NotImplementedError,
             erc1155_contract.get_atomic_swap_batch_transaction,
diff --git a/tests/test_protocols/test_base.py b/tests/test_protocols/test_base.py
index 5a00f11c6a..357b1e9a8e 100644
--- a/tests/test_protocols/test_base.py
+++ b/tests/test_protocols/test_base.py
@@ -92,11 +92,13 @@ class TestMessageProperties:
 
     @classmethod
     def setup_class(cls):
+        """Setup test."""
         cls.body = {"body_1": "1", "body_2": "2"}
         cls.kwarg = 1
         cls.message = Message(cls.body, kwarg=cls.kwarg)
 
     def test_message_properties(self):
+        """Test message properties."""
         for key, value in self.body.items():
             assert self.message.get(key) == value
         assert self.message.get("kwarg") == self.kwarg
diff --git a/tests/test_protocols/test_dialogue/test_base.py b/tests/test_protocols/test_dialogue/test_base.py
index 3355a235b3..272676ca91 100644
--- a/tests/test_protocols/test_dialogue/test_base.py
+++ b/tests/test_protocols/test_dialogue/test_base.py
@@ -1582,6 +1582,7 @@ def test_generate_dialogue_nonce(self):
         assert nonce != second_nonce
 
     def test_get_dialogues_with_counterparty(self):
+        """Test get dialogues with counterparty."""
         assert (
             self.own_dialogues.get_dialogues_with_counterparty(self.opponent_address)
             == []
diff --git a/tests/test_protocols/test_generator/common.py b/tests/test_protocols/test_generator/common.py
index 012c56c1e1..38831b9632 100644
--- a/tests/test_protocols/test_generator/common.py
+++ b/tests/test_protocols/test_generator/common.py
@@ -31,4 +31,5 @@
 
 
 def black_is_not_installed(*args, **kwargs):
+    """Check black is not installed."""
     return not args[0] == "black"
diff --git a/tests/test_protocols/test_generator/test_common.py b/tests/test_protocols/test_generator/test_common.py
index 1513f53a62..0c6a86960e 100644
--- a/tests/test_protocols/test_generator/test_common.py
+++ b/tests/test_protocols/test_generator/test_common.py
@@ -53,10 +53,12 @@
 
 
 def black_is_not_installed_side_effect(*args, **kwargs):
+    """Black not installed."""
     return not args[0] == "black"
 
 
 def protoc_is_not_installed_side_effect(*args, **kwargs):
+    """Protoco not installed."""
     return not args[0] == "protoc"
 
 
@@ -65,6 +67,7 @@ class TestCommon(TestCase):
 
     @classmethod
     def setup_class(cls):
+        """Setup test."""
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
         os.chdir(cls.t)
diff --git a/tests/test_protocols/test_generator/test_extract_specification.py b/tests/test_protocols/test_generator/test_extract_specification.py
index 5aa6382ca2..9f1122363b 100644
--- a/tests/test_protocols/test_generator/test_extract_specification.py
+++ b/tests/test_protocols/test_generator/test_extract_specification.py
@@ -48,6 +48,7 @@ class TestExtractSpecification(TestCase):
 
     @classmethod
     def setup_class(cls):
+        """Setup class."""
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
         os.chdir(cls.t)
diff --git a/tests/test_protocols/test_generator/test_generator.py b/tests/test_protocols/test_generator/test_generator.py
index 19d7a189b9..1d57fcee60 100644
--- a/tests/test_protocols/test_generator/test_generator.py
+++ b/tests/test_protocols/test_generator/test_generator.py
@@ -1074,6 +1074,7 @@ class ProtocolGeneratorTestCase(TestCase):
 
     @classmethod
     def setup_class(cls):
+        """Setup class."""
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
         os.chdir(cls.t)
diff --git a/tests/test_skills/test_behaviours.py b/tests/test_skills/test_behaviours.py
index 2d22d03b62..d0cf7fd4fb 100644
--- a/tests/test_skills/test_behaviours.py
+++ b/tests/test_skills/test_behaviours.py
@@ -41,9 +41,11 @@ class MySequenceBehaviour(SequenceBehaviour):
         """Custom sequence behaviour."""
 
         def setup(self) -> None:
+            """Setup behaviour."""
             pass
 
         def teardown(self) -> None:
+            """Teardown behaviour."""
             pass
 
     class SimpleOneShotBehaviour(OneShotBehaviour):
@@ -53,12 +55,15 @@ def __init__(self, name, **kwargs):
             super().__init__(name=name, **kwargs)
 
         def setup(self) -> None:
+            """Setup behaviour."""
             pass
 
         def teardown(self) -> None:
+            """Teardown behaviour."""
             pass
 
         def act(self) -> None:
+            """Act implementation."""
             outputs.append(self.name)
 
     # TODO let the initialization of a behaviour action from constructor
@@ -96,9 +101,11 @@ class SimpleFSMBehaviour(FSMBehaviour):
     """A Finite-State Machine behaviour for testing purposes."""
 
     def setup(self) -> None:
+        """Setup behaviour."""
         pass
 
     def teardown(self) -> None:
+        """Teardown behaviour."""
         pass
 
 
@@ -113,17 +120,21 @@ def __init__(self, shared_list, event_to_trigger=None, **kwargs):
         self.executed = False
 
     def setup(self) -> None:
+        """Setup behaviour."""
         pass
 
     def teardown(self) -> None:
+        """Teardown behaviour."""
         pass
 
     def act(self) -> None:
+        """Act implementation."""
         self.shared_list.append(self.name)
         self.executed = True
         self._event = self.event_to_trigger
 
     def is_done(self) -> bool:
+        """Get is done."""
         return self.executed
 
 
diff --git a/tests/test_task.py b/tests/test_task.py
index 2b97ae7ede..941dd0e2c6 100644
--- a/tests/test_task.py
+++ b/tests/test_task.py
@@ -38,15 +38,18 @@ def __init__(self, return_value):
         self.return_value = return_value
 
     def setup(self) -> None:
+        """Setup task."""
         self.setup_called = True
 
     def execute(self, *args, **kwargs) -> None:
+        """Execute task."""
         self.execute_called = True
         self.execute_args = args
         self.execute_kwargs = kwargs
         return self.return_value
 
     def teardown(self) -> None:
+        """Teardown task."""
         self.teardown_called = True
 
 

From f925dc93c01a4f7c59ce75fe1870df72c2e6a339 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 17 Sep 2020 23:32:17 +0100
Subject: [PATCH 010/131] bump package versions

---
 docs/aries-cloud-agent-demo.md                |  8 +-
 docs/car-park-skills.md                       | 24 +++---
 docs/cli-vs-programmatic-aeas.md              |  2 +-
 docs/config.md                                |  2 +-
 docs/connect-a-frontend.md                    |  2 +-
 docs/contract.md                              | 32 +++----
 docs/erc1155-skills.md                        | 28 +++---
 docs/generic-skills-step-by-step.md           | 30 +++----
 docs/generic-skills.md                        | 24 +++---
 docs/gym-skill.md                             |  6 +-
 docs/ml-skills.md                             | 24 +++---
 docs/orm-integration.md                       | 26 +++---
 docs/p2p-connection.md                        | 16 ++--
 docs/skill-guide.md                           |  8 +-
 docs/tac-skills-contract.md                   | 34 ++++----
 docs/tac-skills.md                            | 36 ++++----
 docs/thermometer-skills.md                    | 24 +++---
 docs/weather-skills.md                        | 24 +++---
 examples/gym_ex/proxy/env.py                  |  2 +-
 .../agents/aries_alice/aea-config.yaml        |  6 +-
 .../agents/aries_faber/aea-config.yaml        |  4 +-
 .../agents/car_data_buyer/aea-config.yaml     | 14 +--
 .../agents/car_detector/aea-config.yaml       | 14 +--
 .../agents/erc1155_client/aea-config.yaml     | 18 ++--
 .../agents/erc1155_deployer/aea-config.yaml   | 18 ++--
 .../agents/generic_buyer/aea-config.yaml      | 12 +--
 .../agents/generic_seller/aea-config.yaml     | 12 +--
 .../fetchai/agents/gym_aea/aea-config.yaml    | 10 +--
 .../agents/ml_data_provider/aea-config.yaml   | 14 +--
 .../agents/ml_model_trainer/aea-config.yaml   | 14 +--
 .../aea-config.yaml                           |  8 +-
 .../agents/tac_controller/aea-config.yaml     |  6 +-
 .../tac_controller_contract/aea-config.yaml   |  6 +-
 .../agents/tac_participant/aea-config.yaml    | 16 ++--
 .../agents/thermometer_aea/aea-config.yaml    | 14 +--
 .../agents/thermometer_client/aea-config.yaml | 14 +--
 .../agents/weather_client/aea-config.yaml     | 14 +--
 .../agents/weather_station/aea-config.yaml    | 14 +--
 packages/fetchai/connections/gym/README.md    |  2 +-
 .../fetchai/connections/gym/connection.py     |  2 +-
 .../fetchai/connections/gym/connection.yaml   | 10 +--
 packages/fetchai/connections/ledger/README.md |  4 +-
 packages/fetchai/connections/ledger/base.py   |  2 +-
 .../connections/ledger/connection.yaml        | 10 +--
 .../fetchai/connections/p2p_libp2p/README.md  |  4 +-
 .../connections/p2p_libp2p/connection.py      |  2 +-
 .../connections/p2p_libp2p/connection.yaml    |  6 +-
 .../connections/p2p_libp2p_client/README.md   |  2 +-
 .../p2p_libp2p_client/connection.py           |  2 +-
 .../p2p_libp2p_client/connection.yaml         |  6 +-
 .../fetchai/contracts/erc1155/contract.yaml   |  2 +-
 .../fetchai/protocols/contract_api/message.py |  2 +-
 .../protocols/contract_api/protocol.yaml      |  4 +-
 packages/fetchai/protocols/gym/message.py     |  2 +-
 packages/fetchai/protocols/gym/protocol.yaml  |  4 +-
 .../fetchai/skills/carpark_client/skill.yaml  |  4 +-
 .../skills/carpark_detection/skill.yaml       |  4 +-
 .../skills/erc1155_client/behaviours.py       |  2 +-
 .../fetchai/skills/erc1155_client/handlers.py |  4 +-
 .../fetchai/skills/erc1155_client/skill.yaml  | 10 +--
 .../skills/erc1155_deploy/behaviours.py       |  8 +-
 .../fetchai/skills/erc1155_deploy/handlers.py |  4 +-
 .../fetchai/skills/erc1155_deploy/skill.yaml  | 10 +--
 .../skills/generic_buyer/behaviours.py        |  2 +-
 .../fetchai/skills/generic_buyer/handlers.py  |  2 +-
 .../fetchai/skills/generic_buyer/skill.yaml   |  6 +-
 .../skills/generic_seller/behaviours.py       |  2 +-
 .../fetchai/skills/generic_seller/handlers.py |  2 +-
 .../fetchai/skills/generic_seller/skill.yaml  |  6 +-
 packages/fetchai/skills/gym/helpers.py        |  2 +-
 packages/fetchai/skills/gym/skill.yaml        |  6 +-
 .../skills/ml_data_provider/skill.yaml        |  4 +-
 packages/fetchai/skills/ml_train/handlers.py  |  2 +-
 packages/fetchai/skills/ml_train/skill.yaml   |  6 +-
 .../simple_service_registration/handlers.py   |  2 +-
 .../simple_service_registration/skill.yaml    |  4 +-
 .../skills/tac_control_contract/skill.yaml    |  4 +-
 .../fetchai/skills/tac_negotiation/skill.yaml |  6 +-
 .../skills/tac_participation/skill.yaml       |  4 +-
 .../fetchai/skills/thermometer/skill.yaml     |  4 +-
 .../skills/thermometer_client/skill.yaml      |  4 +-
 .../fetchai/skills/weather_client/skill.yaml  |  4 +-
 .../fetchai/skills/weather_station/skill.yaml |  4 +-
 packages/hashes.csv                           | 86 +++++++++----------
 tests/data/dummy_aea/aea-config.yaml          |  2 +-
 tests/data/gym-connection.yaml                |  4 +-
 tests/data/hashes.csv                         |  2 +-
 tests/test_cli/test_add/test_protocol.py      |  8 +-
 tests/test_cli/test_add/test_skill.py         |  2 +-
 tests/test_cli/test_eject.py                  | 14 +--
 tests/test_cli/test_remove/test_protocol.py   |  6 +-
 tests/test_cli/test_remove/test_skill.py      |  6 +-
 .../md_files/bash-aries-cloud-agent-demo.md   |  8 +-
 .../md_files/bash-car-park-skills.md          | 24 +++---
 .../md_files/bash-cli-vs-programmatic-aeas.md |  2 +-
 .../test_bash_yaml/md_files/bash-config.md    |  2 +-
 .../md_files/bash-erc1155-skills.md           | 28 +++---
 .../bash-generic-skills-step-by-step.md       | 22 ++---
 .../md_files/bash-generic-skills.md           | 24 +++---
 .../test_bash_yaml/md_files/bash-gym-skill.md |  6 +-
 .../test_bash_yaml/md_files/bash-ml-skills.md | 24 +++---
 .../md_files/bash-orm-integration.md          | 26 +++---
 .../md_files/bash-p2p-connection.md           | 12 +--
 .../md_files/bash-skill-guide.md              |  6 +-
 .../md_files/bash-tac-skills-contract.md      | 34 ++++----
 .../md_files/bash-tac-skills.md               | 36 ++++----
 .../md_files/bash-thermometer-skills.md       | 24 +++---
 .../md_files/bash-weather-skills.md           | 24 +++---
 .../test_cli_vs_programmatic_aea.py           |  2 +-
 .../test_orm_integration.py                   | 20 ++---
 .../test_skill_guide/test_skill_guide.py      |  6 +-
 .../test_ledger/test_contract_api.py          | 20 ++---
 .../test_p2p_libp2p/test_aea_cli.py           |  6 +-
 .../test_p2p_libp2p/test_public_dht.py        |  6 +-
 .../test_p2p_libp2p_client/test_aea_cli.py    |  2 +-
 .../test_packages/test_skills/test_carpark.py | 40 ++++-----
 .../test_packages/test_skills/test_erc1155.py | 24 +++---
 .../test_packages/test_skills/test_generic.py | 40 ++++-----
 tests/test_packages/test_skills/test_gym.py   |  8 +-
 .../test_skills/test_ml_skills.py             | 40 ++++-----
 tests/test_packages/test_skills/test_tac.py   | 44 +++++-----
 .../test_skills/test_thermometer.py           | 40 ++++-----
 .../test_packages/test_skills/test_weather.py | 44 +++++-----
 tests/test_registries/test_base.py            |  8 +-
 124 files changed, 775 insertions(+), 775 deletions(-)

diff --git a/docs/aries-cloud-agent-demo.md b/docs/aries-cloud-agent-demo.md
index af73e25324..acc6c3e901 100644
--- a/docs/aries-cloud-agent-demo.md
+++ b/docs/aries-cloud-agent-demo.md
@@ -180,7 +180,7 @@ Now you can create **Alice_AEA** and **Faber_AEA** in terminals 3 and 4 respecti
 In the third terminal, fetch **Alice_AEA** and move into its project folder:
 
 ``` bash
-aea fetch fetchai/aries_alice:0.10.0
+aea fetch fetchai/aries_alice:0.11.0
 cd aries_alice
 ```
 
@@ -191,7 +191,7 @@ The following steps create **Alice_AEA** from scratch:
 ``` bash
 aea create aries_alice
 cd aries_alice
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
 aea add connection fetchai/http_client:0.8.0
 aea add connection fetchai/webhook:0.6.0
@@ -265,7 +265,7 @@ Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take
 In the fourth terminal, fetch **Faber_AEA** and move into its project folder:
 
 ``` bash
-aea fetch fetchai/aries_faber:0.10.0
+aea fetch fetchai/aries_faber:0.11.0
 cd aries_faber
 ```
 
@@ -276,7 +276,7 @@ The following steps create **Faber_AEA** from scratch:
 ``` bash
 aea create aries_faber
 cd aries_faber
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
 aea add connection fetchai/http_client:0.8.0
 aea add connection fetchai/webhook:0.6.0
diff --git a/docs/car-park-skills.md b/docs/car-park-skills.md
index 1a49ed93f8..922097bfc9 100644
--- a/docs/car-park-skills.md
+++ b/docs/car-park-skills.md
@@ -55,7 +55,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 First, fetch the car detector AEA:
 ``` bash
-aea fetch fetchai/car_detector:0.12.0
+aea fetch fetchai/car_detector:0.13.0
 cd car_detector
 aea install
 ```
@@ -67,18 +67,18 @@ The following steps create the car detector from scratch:
 ``` bash
 aea create car_detector
 cd car_detector
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/carpark_detection:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/carpark_detection:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `car_detector/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -89,7 +89,7 @@ default_routing:
 
 Then, fetch the car data client AEA:
 ``` bash
-aea fetch fetchai/car_data_buyer:0.12.0
+aea fetch fetchai/car_data_buyer:0.13.0
 cd car_data_buyer
 aea install
 ```
@@ -101,18 +101,18 @@ 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.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/carpark_client:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/carpark_client:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `car_data_buyer/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/docs/cli-vs-programmatic-aeas.md b/docs/cli-vs-programmatic-aeas.md
index 9542099d7d..379e573926 100644
--- a/docs/cli-vs-programmatic-aeas.md
+++ b/docs/cli-vs-programmatic-aeas.md
@@ -28,7 +28,7 @@ If you want to create the weather station AEA step by step you can follow this g
 Fetch the weather station AEA with the following command :
 
 ``` bash
-aea fetch fetchai/weather_station:0.12.0
+aea fetch fetchai/weather_station:0.13.0
 cd weather_station
 ```
 
diff --git a/docs/config.md b/docs/config.md
index 4f52be970d..e95ddab7d8 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -27,7 +27,7 @@ protocols:                                      # The list of protocol public id
 - fetchai/default:0.5.0
 skills:                                         # The list of skill public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX).
 - fetchai/error:0.5.0
-default_connection: fetchai/p2p_libp2p:0.9.0    # The default connection used for envelopes sent by the AEA (must satisfy PUBLIC_ID_REGEX).
+default_connection: fetchai/p2p_libp2p:0.10.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)
 logging_config:                                 # The logging configurations the AEA project uses
   disable_existing_loggers: false
diff --git a/docs/connect-a-frontend.md b/docs/connect-a-frontend.md
index 8473663093..93d5b1a49b 100644
--- a/docs/connect-a-frontend.md
+++ b/docs/connect-a-frontend.md
@@ -6,4 +6,4 @@ This demo discusses the options we have to connect a front-end to the AEA. The f
 The first option we have is to create a `Connection` that will handle the incoming requests from the 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.8.0`) which translates these into Envelopes to be consumed by the correct skill.
 
 ## Case 2
-The other option we have is to create a stand-alone `Multiplexer` with a `P2P` connection (`fetchai/p2p_libp2p:0.9.0`). In this scenario, the front-end needs to incorporate a Multiplexer with an `P2P` Connection. Then the <a href="../acn">Agent Communication Network</a> can be used to send Envelopes from the AEA to the front-end.
\ No newline at end of file
+The other option we have is to create a stand-alone `Multiplexer` with a `P2P` connection (`fetchai/p2p_libp2p:0.10.0`). In this scenario, the front-end needs to incorporate a Multiplexer with an `P2P` Connection. Then the <a href="../acn">Agent Communication Network</a> can be used to send Envelopes from the AEA to the front-end.
\ No newline at end of file
diff --git a/docs/contract.md b/docs/contract.md
index a2717e3b44..48ef8864e9 100644
--- a/docs/contract.md
+++ b/docs/contract.md
@@ -1,4 +1,4 @@
-<a href="../api/contracts/base#contract-objects">`Contracts`</a> wrap smart contracts for Fetch.ai and third-party decentralized ledgers. In particular, they provide wrappers around the API or ABI of a smart contract and its byte code. They implement a translation between framework messages (in the `fetchai/contract_api:0.4.0` protocol) and the implementation specifics of the ABI.
+<a href="../api/contracts/base#contract-objects">`Contracts`</a> wrap smart contracts for Fetch.ai and third-party decentralized ledgers. In particular, they provide wrappers around the API or ABI of a smart contract and its byte code. They implement a translation between framework messages (in the `fetchai/contract_api:0.5.0` protocol) and the implementation specifics of the ABI.
 
 Contracts usually implement four types of methods:
 
@@ -16,32 +16,32 @@ The smart contract wrapped in a AEA contract package might be a third-party smar
 
 Interacting with contracts in almost all cases requires network access. Therefore, the framework executes contract related logic in a <a href="../connection">Connection</a>.
 
-In particular, the `fetchai/ledger:0.5.0` connection can be used to execute contract related logic. The skills communicate with the `fetchai/ledger:0.5.0` connection via the `fetchai/contract_api:0.4.0` protocol. This protocol implements a request-response pattern to serve the four types of methods listed above:
+In particular, the `fetchai/ledger:0.6.0` connection can be used to execute contract related logic. The skills communicate with the `fetchai/ledger:0.6.0` connection via the `fetchai/contract_api:0.5.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.9.0` package, we send the following message to the `fetchai/ledger:0.5.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.10.0` package, we send the following message to the `fetchai/ledger:0.6.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.9.0",
+    contract_id="fetchai/erc1155:0.10.0",
     callable="get_deploy_transaction",
     kwargs=ContractApiMessage.Kwargs(
         {"deployer_address": self.context.agent_address}
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.5.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.5.0` connection using the `fetchai/ledger_api:0.3.0` protocol.
+This message will be handled by the `fetchai/ledger:0.6.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.6.0` connection using the `fetchai/ledger_api:0.3.0` protocol.
 
-- 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.9.0` package, we send the following message to the `fetchai/ledger:0.5.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.10.0` package, we send the following message to the `fetchai/ledger:0.6.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.9.0",
+    contract_id="fetchai/erc1155:0.10.0",
     contract_address=strategy.contract_address,
     callable="get_create_batch_transaction",
     kwargs=ContractApiMessage.Kwargs(
@@ -52,16 +52,16 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.5.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.9.0` contract package needs to implement the `get_create_batch_transaction` method with the specified key word arguments. 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.5.0` connection using the `fetchai/ledger_api:0.3.0` protocol.
+This message will be handled by the `fetchai/ledger:0.6.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.10.0` contract package needs to implement the `get_create_batch_transaction` method with the specified key word arguments. 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.6.0` connection using the `fetchai/ledger_api:0.3.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.9.0` package, we send the following message to the `fetchai/ledger:0.5.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.10.0` package, we send the following message to the `fetchai/ledger:0.6.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.9.0",
+    contract_id="fetchai/erc1155:0.10.0",
     contract_address=strategy.contract_address,
     callable="get_hash_single",
     kwargs=ContractApiMessage.Kwargs(
@@ -77,17 +77,17 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.5.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.9.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.5.0` connection using the `fetchai/ledger_api:0.3.0` protocol. In this case, signing is not required.
+This message will be handled by the `fetchai/ledger:0.6.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.10.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.6.0` connection using the `fetchai/ledger_api:0.3.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.9.0` package, we send the following message to the `fetchai/ledger:0.5.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.10.0` package, we send the following message to the `fetchai/ledger:0.6.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.9.0",
+    contract_id="fetchai/erc1155:0.10.0",
     contract_address=strategy.contract_address,
     callable="get_balance",
     kwargs=ContractApiMessage.Kwargs(
@@ -95,7 +95,7 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.5.0` connection and then a `state` message will be returned with the matching state. For this to be executed correctly, the `fetchai/erc1155:0.9.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.5.0` connection using the `fetchai/ledger_api:0.3.0` protocol. In this case, signing is not required.
+This message will be handled by the `fetchai/ledger:0.6.0` connection and then a `state` message will be returned with the matching state. For this to be executed correctly, the `fetchai/erc1155:0.10.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.6.0` connection using the `fetchai/ledger_api:0.3.0` protocol. In this case, signing is not required.
 
 
 ## Developing your own
@@ -168,6 +168,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.5.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 constracts 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.6.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 constracts 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.9.0`, and skills using them, like `fetchai/erc1155_client:0.11.0` and `fetchai/erc1155_deploy:0.13.0`, for inspiration and guidance.
\ No newline at end of file
+It helps to look at existing contract packages, like `fetchai/erc1155:0.10.0`, and skills using them, like `fetchai/erc1155_client:0.11.0` and `fetchai/erc1155_deploy:0.14.0`, for inspiration and guidance.
\ No newline at end of file
diff --git a/docs/erc1155-skills.md b/docs/erc1155-skills.md
index d3b28743af..6b197156c4 100644
--- a/docs/erc1155-skills.md
+++ b/docs/erc1155-skills.md
@@ -26,7 +26,7 @@ with a one-step atomic swap functionality. That means the trade between the two
 Fetch the AEA that will deploy the contract.
 
 ``` bash
-aea fetch fetchai/erc1155_deployer:0.13.0
+aea fetch fetchai/erc1155_deployer:0.14.0
 cd erc1155_deployer
 aea install
 ```
@@ -39,19 +39,19 @@ Create the AEA that will deploy the contract.
 ``` bash
 aea create erc1155_deployer
 cd erc1155_deployer
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/erc1155_deploy:0.13.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/erc1155_deploy:0.14.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 Then update the agent config (`aea-config.yaml`) with the default routing:
 ``` yaml
 default_routing:
-  fetchai/contract_api:0.4.0: fetchai/ledger:0.5.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -81,7 +81,7 @@ aea add-key cosmos cosmos_private_key.txt --connection
 In another terminal, fetch the AEA that will get some tokens from the deployer.
 
 ``` bash
-aea fetch fetchai/erc1155_client:0.13.0
+aea fetch fetchai/erc1155_client:0.14.0
 cd erc1155_client
 aea install
 ```
@@ -94,19 +94,19 @@ 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.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/erc1155_client:0.12.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/erc1155_client:0.13.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 Then update the agent config (`aea-config.yaml`) with the default routing:
 ``` yaml
 default_routing:
-  fetchai/contract_api:0.4.0: fetchai/ledger:0.5.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/docs/generic-skills-step-by-step.md b/docs/generic-skills-step-by-step.md
index 1cb74a7b87..55d354ed9f 100644
--- a/docs/generic-skills-step-by-step.md
+++ b/docs/generic-skills-step-by-step.md
@@ -41,16 +41,16 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 This step-by-step guide recreates two AEAs already developed by Fetch.ai. You can get the finished AEAs to compare your code against by following the next steps:
 
 ``` bash
-aea fetch fetchai/generic_seller:0.9.0
+aea fetch fetchai/generic_seller:0.10.0
 cd generic_seller
-aea eject skill fetchai/generic_seller:0.12.0
+aea eject skill fetchai/generic_seller:0.13.0
 cd ..
 ```
 
 ``` bash
-aea fetch fetchai/generic_buyer:0.9.0
+aea fetch fetchai/generic_buyer:0.10.0
 cd generic_buyer
-aea eject skill fetchai/generic_buyer:0.11.0
+aea eject skill fetchai/generic_buyer:0.12.0
 cd ..
 ```
 
@@ -105,7 +105,7 @@ from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
 
 DEFAULT_SERVICES_INTERVAL = 60.0
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericServiceRegistrationBehaviour(TickerBehaviour):
@@ -313,7 +313,7 @@ from packages.fetchai.skills.generic_seller.dialogues import (
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericFipaHandler(Handler):
@@ -1420,7 +1420,7 @@ from packages.fetchai.skills.generic_buyer.dialogues import (
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
 DEFAULT_SEARCH_INTERVAL = 5.0
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericSearchBehaviour(TickerBehaviour):
@@ -1512,7 +1512,7 @@ from packages.fetchai.skills.generic_buyer.dialogues import (
 )
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericFipaHandler(Handler):
@@ -2875,7 +2875,7 @@ aea add-key fetchai fetchai_private_key.txt --connection
 Both in `my_generic_seller/aea-config.yaml` and `my_generic_buyer/aea-config.yaml`, and
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -2892,12 +2892,12 @@ aea generate-wealth fetchai --sync
 Add the remaining packages for the seller AEA, then run it:
 
 ``` bash
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
+aea add connection fetchai/ledger:0.6.0
 aea add protocol fetchai/fipa:0.6.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea run
 ```
 
@@ -2908,13 +2908,13 @@ Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take
 Add the remaining packages for the buyer AEA:
 
 ``` bash
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
+aea add connection fetchai/ledger:0.6.0
 aea add protocol fetchai/fipa:0.6.0
 aea add protocol fetchai/signing:0.3.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 Then, update the configuration of the buyer AEA's p2p connection (in `vendor/fetchai/connections/p2p_libp2p/connection.yaml`) replace the following:
diff --git a/docs/generic-skills.md b/docs/generic-skills.md
index 669a2b904f..b76ce18333 100644
--- a/docs/generic-skills.md
+++ b/docs/generic-skills.md
@@ -59,7 +59,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 First, fetch the seller AEA:
 ``` bash
-aea fetch fetchai/generic_seller:0.9.0 --alias my_seller_aea
+aea fetch fetchai/generic_seller:0.10.0 --alias my_seller_aea
 cd my_seller_aea
 aea install
 ```
@@ -71,18 +71,18 @@ 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.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/generic_seller:0.12.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/generic_seller:0.13.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_seller_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -93,7 +93,7 @@ default_routing:
 
 Then, fetch the buyer AEA:
 ``` bash
-aea fetch fetchai/generic_buyer:0.9.0 --alias my_buyer_aea
+aea fetch fetchai/generic_buyer:0.10.0 --alias my_buyer_aea
 cd my_buyer_aea
 aea install
 ```
@@ -105,18 +105,18 @@ 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.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/generic_buyer:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/generic_buyer:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_buyer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/docs/gym-skill.md b/docs/gym-skill.md
index fa3d43af3d..fe54a9dfee 100644
--- a/docs/gym-skill.md
+++ b/docs/gym-skill.md
@@ -19,7 +19,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 First, fetch the gym AEA:
 ``` bash
-aea fetch fetchai/gym_aea:0.10.0 --alias my_gym_aea
+aea fetch fetchai/gym_aea:0.11.0 --alias my_gym_aea
 cd my_gym_aea
 aea install
 ```
@@ -36,12 +36,12 @@ cd my_gym_aea
 
 ### Add the gym skill
 ``` bash
-aea add skill fetchai/gym:0.7.0
+aea add skill fetchai/gym:0.8.0
 ```
 
 ### Add a gym connection
 ``` bash
-aea add connection fetchai/gym:0.7.0
+aea add connection fetchai/gym:0.8.0
 aea config set agent.default_connection fetchai/gym:0.7.0
 ```
 
diff --git a/docs/ml-skills.md b/docs/ml-skills.md
index dda7db9f76..6f34264db6 100644
--- a/docs/ml-skills.md
+++ b/docs/ml-skills.md
@@ -62,7 +62,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 First, fetch the data provider AEA:
 ``` bash
-aea fetch fetchai/ml_data_provider:0.12.0
+aea fetch fetchai/ml_data_provider:0.13.0
 cd ml_data_provider
 aea install
 ```
@@ -74,18 +74,18 @@ The following steps create the data provider from scratch:
 ``` bash
 aea create ml_data_provider
 cd ml_data_provider
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/ml_data_provider:0.11.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/ml_data_provider:0.12.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea install
 ```
 
 In `ml_data_provider/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -96,7 +96,7 @@ default_routing:
 
 Then, fetch the model trainer AEA:
 ``` bash
-aea fetch fetchai/ml_model_trainer:0.12.0
+aea fetch fetchai/ml_model_trainer:0.13.0
 cd ml_model_trainer
 aea install
 ```
@@ -108,18 +108,18 @@ The following steps create the model trainer from scratch:
 ``` bash
 aea create ml_model_trainer
 cd ml_model_trainer
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/ml_train:0.11.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/ml_train:0.12.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea install
 ```
 
 In `ml_model_trainer/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/docs/orm-integration.md b/docs/orm-integration.md
index 704d8bddad..d170c326c4 100644
--- a/docs/orm-integration.md
+++ b/docs/orm-integration.md
@@ -59,7 +59,7 @@ A demo to run a scenario with a true ledger transaction on Fetch.ai `testnet` ne
 
 First, fetch the seller AEA, which will provide data:
 ``` bash
-aea fetch fetchai/thermometer_aea:0.10.0 --alias my_thermometer_aea
+aea fetch fetchai/thermometer_aea:0.11.0 --alias my_thermometer_aea
 cd my_thermometer_aea
 aea install
 ```
@@ -71,18 +71,18 @@ The following steps create the seller from scratch:
 ``` bash
 aea create my_thermometer_aea
 cd my_thermometer_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_thermometer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -94,7 +94,7 @@ default_routing:
 
 In another terminal, fetch the AEA that will query the seller AEA.
 ``` bash
-aea fetch fetchai/thermometer_client:0.10.0 --alias my_thermometer_client
+aea fetch fetchai/thermometer_client:0.11.0 --alias my_thermometer_client
 cd my_thermometer_client
 aea install
 ```
@@ -106,18 +106,18 @@ The following steps create the car data client from scratch:
 ``` bash
 aea create my_thermometer_client
 cd my_thermometer_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer_client:0.10.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer_client:0.11.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_buyer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -214,7 +214,7 @@ aea install
 Before being able to modify a package we need to eject it from vendor:
 
 ``` bash
-aea eject skill fetchai/thermometer:0.11.0
+aea eject skill fetchai/thermometer:0.12.0
 ```
 
 This will move the package to your `skills` directory and reset the version to `0.1.0` and the author to your author handle.
diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md
index bcef264a73..8537bfe080 100644
--- a/docs/p2p-connection.md
+++ b/docs/p2p-connection.md
@@ -1,4 +1,4 @@
-The `fetchai/p2p_libp2p:0.9.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses.
+The `fetchai/p2p_libp2p:0.10.0` connection allows AEAs to create a peer-to-peer communication network. In particular, the connection creates an overlay network which maps agents' public keys to IP addresses.
 
 ## Local demo
 
@@ -9,9 +9,9 @@ Create one AEA as follows:
 ``` bash
 aea create my_genesis_aea
 cd my_genesis_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
-aea run --connections fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
+aea run --connections fetchai/p2p_libp2p:0.10.0
 ```
 
 ### Create and run another AEA
@@ -21,8 +21,8 @@ Create a second AEA:
 ``` bash
 aea create my_other_aea
 cd my_other_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 Provide the AEA with the information it needs to find the genesis by replacing the following block in `vendor/fetchai/connnections/p2p_libp2p/connection.yaml`:
@@ -40,7 +40,7 @@ Here `MULTI_ADDRESSES` needs to be replaced with the list of multi addresses dis
 Run the AEA:
 
 ``` bash
-aea run --connections fetchai/p2p_libp2p:0.9.0
+aea run --connections fetchai/p2p_libp2p:0.10.0
 ```
 
 You can inspect the `libp2p_node.log` log files of the AEA to see how they discover each other.
@@ -71,7 +71,7 @@ config:
 ## Configuring the `connection.yaml` entries:
 
 
-To learn more about how to configure your `fetchai/p2p_libp2p:0.9.0` connection consult the `README.md` supplied with the connection package.
+To learn more about how to configure your `fetchai/p2p_libp2p:0.10.0` connection consult the `README.md` supplied with the connection package.
 
 ## Running Go peer standalone
 
diff --git a/docs/skill-guide.md b/docs/skill-guide.md
index 2284b44733..6309c2ff87 100644
--- a/docs/skill-guide.md
+++ b/docs/skill-guide.md
@@ -381,9 +381,9 @@ This adds the protocol to our AEA and makes it available on the path `packages.f
 We also need to add the soef and p2p connections and install the AEA's dependencies:
 ``` bash
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 Finally, in the `aea-config.yaml` add the following lines:
@@ -398,7 +398,7 @@ This will ensure that search requests are processed by the correct connection.
 
 In order to be able to find another AEA when searching, from a different terminal window, we fetch another finished AEA:
 ``` bash
-aea fetch fetchai/simple_service_registration:0.12.0 && cd simple_service_registration
+aea fetch fetchai/simple_service_registration:0.13.0 && cd simple_service_registration
 ```
 
 This AEA will simply register a location service on the <a href="../simple-oef">SOEF search node</a> so we can search for it.
@@ -693,7 +693,7 @@ from packages.fetchai.skills.simple_service_registration.dialogues import (
     OefSearchDialogues,
 )
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class OefSearchHandler(Handler):
diff --git a/docs/tac-skills-contract.md b/docs/tac-skills-contract.md
index aa013c812e..3a7feb913d 100644
--- a/docs/tac-skills-contract.md
+++ b/docs/tac-skills-contract.md
@@ -101,7 +101,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 In the root directory, fetch the controller AEA:
 ``` bash
-aea fetch fetchai/tac_controller_contract:0.10.0
+aea fetch fetchai/tac_controller_contract:0.11.0
 cd tac_controller_contract
 aea install
 ```
@@ -113,12 +113,12 @@ The following steps create the controller from scratch:
 ``` bash
 aea create tac_controller_contract
 cd tac_controller_contract
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_control_contract:0.8.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_control_contract:0.9.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger ethereum
 ```
 
@@ -154,12 +154,12 @@ aea get-wealth ethereum
 
 In a separate terminal, in the root directory, fetch at least two participants:
 ``` bash
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_one
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_one
 cd tac_participant_one
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
 cd ..
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_two
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_two
 cd tac_participant_two
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
@@ -178,13 +178,13 @@ aea create tac_participant_two
 Build participant one:
 ``` bash
 cd tac_participant_one
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger ethereum
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
@@ -193,13 +193,13 @@ aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_con
 Then, build participant two:
 ``` bash
 cd tac_participant_two
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger ethereum
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
diff --git a/docs/tac-skills.md b/docs/tac-skills.md
index 4b8375e5c2..c70415a668 100644
--- a/docs/tac-skills.md
+++ b/docs/tac-skills.md
@@ -100,7 +100,7 @@ Follow the <a href="../quickstart/#preliminaries">Preliminaries</a> and <a href=
 
 In the root directory, fetch the controller AEA:
 ``` bash
-aea fetch fetchai/tac_controller:0.9.0
+aea fetch fetchai/tac_controller:0.10.0
 cd tac_controller
 aea install
 ```
@@ -112,12 +112,12 @@ The following steps create the controller from scratch:
 ``` bash
 aea create tac_controller
 cd tac_controller
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
+aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_control:0.7.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
 ```
 
@@ -134,8 +134,8 @@ default_routing:
 
 In a separate terminal, in the root directory, fetch at least two participants:
 ``` bash
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_one
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_two
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_one
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_two
 cd tac_participant_two
 aea install
 ```
@@ -152,40 +152,40 @@ aea create tac_participant_two
 Build participant one:
 ``` bash
 cd tac_participant_one
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
 ```
 
 In `tac_participant_one/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
 Then, build participant two:
 ``` bash
 cd tac_participant_two
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
 ```
 
 In `tac_participant_two/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/docs/thermometer-skills.md b/docs/thermometer-skills.md
index fd63d7453f..f6d24d01f5 100644
--- a/docs/thermometer-skills.md
+++ b/docs/thermometer-skills.md
@@ -62,7 +62,7 @@ A demo to run the thermometer scenario with a true ledger transaction This demo
 
 First, fetch the thermometer AEA:
 ``` bash
-aea fetch fetchai/thermometer_aea:0.10.0 --alias my_thermometer_aea
+aea fetch fetchai/thermometer_aea:0.11.0 --alias my_thermometer_aea
 cd thermometer_aea
 aea install
 ```
@@ -74,18 +74,18 @@ The following steps create the thermometer AEA from scratch:
 ``` bash
 aea create my_thermometer_aea
 cd my_thermometer_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_thermometer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -96,7 +96,7 @@ default_routing:
 
 Then, fetch the thermometer client AEA:
 ``` bash
-aea fetch fetchai/thermometer_client:0.10.0 --alias my_thermometer_client
+aea fetch fetchai/thermometer_client:0.11.0 --alias my_thermometer_client
 cd my_thermometer_client
 aea install
 ```
@@ -108,18 +108,18 @@ The following steps create the thermometer client from scratch:
 ``` bash
 aea create my_thermometer_client
 cd my_thermometer_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer_client:0.10.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer_client:0.11.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_thermometer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/docs/weather-skills.md b/docs/weather-skills.md
index e00d9f8139..fc1ce3c493 100644
--- a/docs/weather-skills.md
+++ b/docs/weather-skills.md
@@ -61,7 +61,7 @@ trusts the seller AEA to send the data upon successful payment.
 
 First, fetch the AEA that will provide weather measurements:
 ``` bash
-aea fetch fetchai/weather_station:0.12.0 --alias my_weather_station
+aea fetch fetchai/weather_station:0.13.0 --alias my_weather_station
 cd my_weather_station
 aea install
 ```
@@ -73,18 +73,18 @@ The following steps create the weather station from scratch:
 ``` bash
 aea create my_weather_station
 cd my_weather_station
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/weather_station:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/weather_station:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `weather_station/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
@@ -96,7 +96,7 @@ default_routing:
 
 In another terminal, fetch the AEA that will query the weather station:
 ``` bash
-aea fetch fetchai/weather_client:0.12.0 --alias my_weather_client
+aea fetch fetchai/weather_client:0.13.0 --alias my_weather_client
 cd my_weather_client
 aea install
 ```
@@ -108,18 +108,18 @@ The following steps create the weather client from scratch:
 ``` bash
 aea create my_weather_client
 cd my_weather_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/weather_client:0.10.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/weather_client:0.11.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 
 In `my_weather_client/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index b2502868b3..514d6e4095 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -87,7 +87,7 @@ def __init__(self, gym_env: gym.Env) -> None:
         super().__init__()
         self._queue: Queue = Queue()
         self._action_counter: int = 0
-        self.gym_address = "fetchai/gym:0.7.0"
+        self.gym_address = "fetchai/gym:0.8.0"
         self._agent = ProxyAgent(
             name="proxy", gym_env=gym_env, proxy_env_queue=self._queue
         )
diff --git a/packages/fetchai/agents/aries_alice/aea-config.yaml b/packages/fetchai/agents/aries_alice/aea-config.yaml
index 3c04d20afa..0ad1aa0a90 100644
--- a/packages/fetchai/agents/aries_alice/aea-config.yaml
+++ b/packages/fetchai/agents/aries_alice/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: aries_alice
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: An AEA representing Alice in the Aries demo.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
@@ -8,7 +8,7 @@ fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
 - fetchai/http_client:0.8.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 - fetchai/webhook:0.6.0
@@ -20,7 +20,7 @@ protocols:
 skills:
 - fetchai/aries_alice:0.7.0
 - fetchai/error:0.5.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/fetchai/agents/aries_faber/aea-config.yaml b/packages/fetchai/agents/aries_faber/aea-config.yaml
index 88c40844d9..7d043ca849 100644
--- a/packages/fetchai/agents/aries_faber/aea-config.yaml
+++ b/packages/fetchai/agents/aries_faber/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: aries_faber
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: An AEA representing Faber in the Aries demo.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
@@ -8,7 +8,7 @@ fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
 - fetchai/http_client:0.8.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 - fetchai/webhook:0.6.0
diff --git a/packages/fetchai/agents/car_data_buyer/aea-config.yaml b/packages/fetchai/agents/car_data_buyer/aea-config.yaml
index a4fcb288b1..2a40202d91 100644
--- a/packages/fetchai/agents/car_data_buyer/aea-config.yaml
+++ b/packages/fetchai/agents/car_data_buyer/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: car_data_buyer
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: An agent which searches for an instance of a `car_detector` agent and
   attempts to purchase car park data from it.
 license: Apache-2.0
@@ -8,8 +8,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,10 +19,10 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/carpark_client:0.11.0
+- fetchai/carpark_client:0.12.0
 - fetchai/error:0.5.0
-- fetchai/generic_buyer:0.11.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_buyer:0.12.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -30,5 +30,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/car_detector/aea-config.yaml b/packages/fetchai/agents/car_detector/aea-config.yaml
index 6bf9b901b3..e2bd0d8eb7 100644
--- a/packages/fetchai/agents/car_detector/aea-config.yaml
+++ b/packages/fetchai/agents/car_detector/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: car_detector
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: An agent which sells car park data to instances of `car_data_buyer` agents.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -18,10 +18,10 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/carpark_detection:0.11.0
+- fetchai/carpark_detection:0.12.0
 - fetchai/error:0.5.0
-- fetchai/generic_seller:0.12.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_seller:0.13.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/erc1155_client/aea-config.yaml b/packages/fetchai/agents/erc1155_client/aea-config.yaml
index f3ac748a21..d168178040 100644
--- a/packages/fetchai/agents/erc1155_client/aea-config.yaml
+++ b/packages/fetchai/agents/erc1155_client/aea-config.yaml
@@ -1,29 +1,29 @@
 agent_name: erc1155_client
 author: fetchai
-version: 0.13.0
+version: 0.14.0
 description: An AEA to interact with the ERC1155 deployer AEA
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
-- fetchai/contract_api:0.4.0
+- fetchai/contract_api:0.5.0
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 - fetchai/signing:0.3.0
 skills:
-- fetchai/erc1155_client:0.12.0
+- fetchai/erc1155_client:0.13.0
 - fetchai/error:0.5.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: ethereum
 logging_config:
   disable_existing_loggers: false
@@ -31,6 +31,6 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/contract_api:0.4.0: fetchai/ledger:0.5.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/erc1155_deployer/aea-config.yaml b/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
index 023ba1cf50..6a60e30ba2 100644
--- a/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
+++ b/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
@@ -1,29 +1,29 @@
 agent_name: erc1155_deployer
 author: fetchai
-version: 0.13.0
+version: 0.14.0
 description: An AEA to deploy and interact with an ERC1155
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
-- fetchai/contract_api:0.4.0
+- fetchai/contract_api:0.5.0
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 - fetchai/signing:0.3.0
 skills:
-- fetchai/erc1155_deploy:0.13.0
+- fetchai/erc1155_deploy:0.14.0
 - fetchai/error:0.5.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: ethereum
 logging_config:
   disable_existing_loggers: false
@@ -31,6 +31,6 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/contract_api:0.4.0: fetchai/ledger:0.5.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/generic_buyer/aea-config.yaml b/packages/fetchai/agents/generic_buyer/aea-config.yaml
index 731a7ee38f..6e20d189fa 100644
--- a/packages/fetchai/agents/generic_buyer/aea-config.yaml
+++ b/packages/fetchai/agents/generic_buyer/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: generic_buyer
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 description: The buyer AEA purchases the services offered by the seller AEA.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,8 +19,8 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_buyer:0.11.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_buyer:0.12.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -28,5 +28,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/generic_seller/aea-config.yaml b/packages/fetchai/agents/generic_seller/aea-config.yaml
index fc6b1abd7f..2e3394d829 100644
--- a/packages/fetchai/agents/generic_seller/aea-config.yaml
+++ b/packages/fetchai/agents/generic_seller/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: generic_seller
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 description: The seller AEA sells the services specified in the `skill.yaml` file
   and delivers them upon payment to the buyer.
 license: Apache-2.0
@@ -8,8 +8,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -20,8 +20,8 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_seller:0.12.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_seller:0.13.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml
index f1e714d92b..69a7d2fc18 100644
--- a/packages/fetchai/agents/gym_aea/aea-config.yaml
+++ b/packages/fetchai/agents/gym_aea/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: gym_aea
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: The gym aea demos the interaction between a skill containing a RL agent
   and a gym connection.
 license: Apache-2.0
@@ -8,16 +8,16 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/gym:0.7.0
+- fetchai/gym:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
 - fetchai/default:0.5.0
-- fetchai/gym:0.5.0
+- fetchai/gym:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/gym:0.7.0
-default_connection: fetchai/gym:0.7.0
+- fetchai/gym:0.8.0
+default_connection: fetchai/gym:0.8.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/fetchai/agents/ml_data_provider/aea-config.yaml b/packages/fetchai/agents/ml_data_provider/aea-config.yaml
index d8bf076dda..ffb8c1b082 100644
--- a/packages/fetchai/agents/ml_data_provider/aea-config.yaml
+++ b/packages/fetchai/agents/ml_data_provider/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: ml_data_provider
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: An agent that sells data.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,9 +19,9 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_seller:0.12.0
-- fetchai/ml_data_provider:0.11.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_seller:0.13.0
+- fetchai/ml_data_provider:0.12.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/ml_model_trainer/aea-config.yaml b/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
index 38779b7f3d..262eaa4b24 100644
--- a/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
+++ b/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: ml_model_trainer
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: An agent buying data and training a model from it.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,9 +19,9 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_buyer:0.11.0
-- fetchai/ml_train:0.11.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_buyer:0.12.0
+- fetchai/ml_train:0.12.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/simple_service_registration/aea-config.yaml b/packages/fetchai/agents/simple_service_registration/aea-config.yaml
index 6d6d43c3ef..7762008c7a 100644
--- a/packages/fetchai/agents/simple_service_registration/aea-config.yaml
+++ b/packages/fetchai/agents/simple_service_registration/aea-config.yaml
@@ -1,13 +1,13 @@
 agent_name: simple_service_registration
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: A simple example of service registration.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: ''
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -17,8 +17,8 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/simple_service_registration:0.9.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/simple_service_registration:0.10.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/fetchai/agents/tac_controller/aea-config.yaml b/packages/fetchai/agents/tac_controller/aea-config.yaml
index 7a225f4ded..3470e8a73f 100644
--- a/packages/fetchai/agents/tac_controller/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller/aea-config.yaml
@@ -1,13 +1,13 @@
 agent_name: tac_controller
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 description: An AEA to manage an instance of the TAC (trading agent competition)
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -18,7 +18,7 @@ protocols:
 skills:
 - fetchai/error:0.5.0
 - fetchai/tac_control:0.7.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 8c9372385f..caa12bbff0 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: tac_controller_contract
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: An AEA to manage an instance of the TAC (trading agent competition) using
   an ERC1155 smart contract.
 license: Apache-2.0
@@ -11,7 +11,7 @@ connections:
 - fetchai/oef:0.9.0
 - fetchai/stub:0.9.0
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
@@ -19,7 +19,7 @@ protocols:
 - fetchai/tac:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/tac_control_contract:0.8.0
+- fetchai/tac_control_contract:0.9.0
 default_connection: fetchai/oef:0.9.0
 default_ledger: ethereum
 logging_config:
diff --git a/packages/fetchai/agents/tac_participant/aea-config.yaml b/packages/fetchai/agents/tac_participant/aea-config.yaml
index ebd1c67c58..e4180ff1a9 100644
--- a/packages/fetchai/agents/tac_participant/aea-config.yaml
+++ b/packages/fetchai/agents/tac_participant/aea-config.yaml
@@ -1,18 +1,18 @@
 agent_name: tac_participant
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: An AEA to participate in the TAC (trading agent competition)
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
@@ -20,9 +20,9 @@ protocols:
 - fetchai/tac:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/tac_negotiation:0.9.0
-- fetchai/tac_participation:0.8.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/tac_negotiation:0.10.0
+- fetchai/tac_participation:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -30,5 +30,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/thermometer_aea/aea-config.yaml b/packages/fetchai/agents/thermometer_aea/aea-config.yaml
index 334e44fd75..f212ebdf5c 100644
--- a/packages/fetchai/agents/thermometer_aea/aea-config.yaml
+++ b/packages/fetchai/agents/thermometer_aea/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: thermometer_aea
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: An AEA to represent a thermometer and sell temperature data.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,9 +19,9 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_seller:0.12.0
-- fetchai/thermometer:0.11.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_seller:0.13.0
+- fetchai/thermometer:0.12.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/thermometer_client/aea-config.yaml b/packages/fetchai/agents/thermometer_client/aea-config.yaml
index 47f00a1ca4..02f51acf56 100644
--- a/packages/fetchai/agents/thermometer_client/aea-config.yaml
+++ b/packages/fetchai/agents/thermometer_client/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: thermometer_client
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 description: An AEA that purchases thermometer data.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,9 +19,9 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_buyer:0.11.0
-- fetchai/thermometer_client:0.10.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_buyer:0.12.0
+- fetchai/thermometer_client:0.11.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/weather_client/aea-config.yaml b/packages/fetchai/agents/weather_client/aea-config.yaml
index 03351270fd..894da78b40 100644
--- a/packages/fetchai/agents/weather_client/aea-config.yaml
+++ b/packages/fetchai/agents/weather_client/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: weather_client
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: This AEA purchases weather data from the weather station.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,9 +19,9 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_buyer:0.11.0
-- fetchai/weather_client:0.10.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_buyer:0.12.0
+- fetchai/weather_client:0.11.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/agents/weather_station/aea-config.yaml b/packages/fetchai/agents/weather_station/aea-config.yaml
index 974e15c9f4..ee6630c2f1 100644
--- a/packages/fetchai/agents/weather_station/aea-config.yaml
+++ b/packages/fetchai/agents/weather_station/aea-config.yaml
@@ -1,14 +1,14 @@
 agent_name: weather_station
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 description: This AEA represents a weather station selling weather data.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/ledger:0.5.0
-- fetchai/p2p_libp2p:0.9.0
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts: []
@@ -19,9 +19,9 @@ protocols:
 - fetchai/oef_search:0.6.0
 skills:
 - fetchai/error:0.5.0
-- fetchai/generic_seller:0.12.0
-- fetchai/weather_station:0.11.0
-default_connection: fetchai/p2p_libp2p:0.9.0
+- fetchai/generic_seller:0.13.0
+- fetchai/weather_station:0.12.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/connections/gym/README.md b/packages/fetchai/connections/gym/README.md
index e16762485e..cbb2f0f0e7 100644
--- a/packages/fetchai/connections/gym/README.md
+++ b/packages/fetchai/connections/gym/README.md
@@ -6,4 +6,4 @@ The connection wraps a gym and allows the AEA to interact with the gym interface
 
 ## Usage
 
-First, add the connection to your AEA project (`aea add connection fetchai/gym:0.7.0`). Then, update the `config` in `connection.yaml` by providing a dotted path to the gym module in the `env` field.
+First, add the connection to your AEA project (`aea add connection fetchai/gym:0.8.0`). Then, update the `config` in `connection.yaml` by providing a dotted path to the gym module in the `env` field.
diff --git a/packages/fetchai/connections/gym/connection.py b/packages/fetchai/connections/gym/connection.py
index 22f53ec98f..395a566099 100644
--- a/packages/fetchai/connections/gym/connection.py
+++ b/packages/fetchai/connections/gym/connection.py
@@ -43,7 +43,7 @@
 
 logger = logging.getLogger("aea.packages.fetchai.connections.gym")
 
-PUBLIC_ID = PublicId.from_str("fetchai/gym:0.7.0")
+PUBLIC_ID = PublicId.from_str("fetchai/gym:0.8.0")
 
 
 class GymDialogues(BaseGymDialogues):
diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml
index cfacab69bb..cce17f13a0 100644
--- a/packages/fetchai/connections/gym/connection.yaml
+++ b/packages/fetchai/connections/gym/connection.yaml
@@ -1,22 +1,22 @@
 name: gym
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: connection
 description: The gym connection wraps an OpenAI gym.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmbhBvtb6QLnUaeBHgBM1w4q2YNNkXYNGMbHx5wg7tkKaH
+  README.md: QmPUxpn8smGVFexxhUu3Vy3q5xsJukHnYtQzUXyt965bmL
   __init__.py: QmWwxj1hGGZNteCvRtZxwtY9PuEKsrWsEmMWCKwiYCdvRR
-  connection.py: QmTRbo73s5nzsPy5fXejJVNTrHMe9bTxV6Mdfwd4tXaioF
+  connection.py: QmeBfJXcmyFzH84siPgKjTCrsSnTw7V1Jza1ZL9vUjpBS3
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/gym:0.5.0
+- fetchai/gym:0.6.0
 class_name: GymConnection
 config:
   env: ''
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/gym:0.5.0
+- fetchai/gym:0.6.0
 dependencies:
   gym: {}
diff --git a/packages/fetchai/connections/ledger/README.md b/packages/fetchai/connections/ledger/README.md
index 2042b55457..807387e685 100644
--- a/packages/fetchai/connections/ledger/README.md
+++ b/packages/fetchai/connections/ledger/README.md
@@ -2,10 +2,10 @@
 
 The ledger connection wraps the APIs needed to interact with multiple ledgers, including smart contracts deployed on those ledgers.
 
-The AEA communicates with the ledger connection via the `fetchai/ledger_api:0.3.0` and `fetchai/contract_api:0.4.0` protocols.
+The AEA communicates with the ledger connection via the `fetchai/ledger_api:0.3.0` and `fetchai/contract_api:0.5.0` protocols.
 
 The connection uses the ledger apis registered in the ledger api registry.
 
 ## Usage
 
-First, add the connection to your AEA project (`aea add connection fetchai/ledger:0.5.0`). Optionally, update the `ledger_apis` in `config` of `connection.yaml`.
+First, add the connection to your AEA project (`aea add connection fetchai/ledger:0.6.0`). Optionally, update the `ledger_apis` in `config` of `connection.yaml`.
diff --git a/packages/fetchai/connections/ledger/base.py b/packages/fetchai/connections/ledger/base.py
index 26ab3ee967..c9fbdd4411 100644
--- a/packages/fetchai/connections/ledger/base.py
+++ b/packages/fetchai/connections/ledger/base.py
@@ -34,7 +34,7 @@
 from aea.protocols.dialogue.base import Dialogue, Dialogues
 
 
-CONNECTION_ID = PublicId.from_str("fetchai/ledger:0.5.0")
+CONNECTION_ID = PublicId.from_str("fetchai/ledger:0.6.0")
 
 
 class RequestDispatcher(ABC):
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index 304703f3a2..323030a60f 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -1,20 +1,20 @@
 name: ledger
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 type: connection
 description: A connection to interact with any ledger API and contract API.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmRWAyV2qsyzALTGQft4m9Nd3N6kCcuK1AQ7APmwfAoouW
+  README.md: QmfQN7UK1M4pBUzKVzPannPLVi8iiULKHNtJ7XpoWpjqfc
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
-  base.py: QmP6SiNTCWBW8Bt6wsgP2gp7K2LcV4AeVk2saM7tqyx44S
+  base.py: QmNnSBVmVgdDFwzqDUncwLHeyDfMEfmvujJdKbdGNGH4Be
   connection.py: QmS3CJwjgzZ5SrAeJjCnC5ChZDfTsDuV6ndgMsGV1bidnf
   contract_dispatcher.py: QmRegSPqqkns7xp5zr6xiuTxjGLiGGG2qLkwunpFCbzEwX
   ledger_dispatcher.py: QmarLEyR2Je6NtXSJmPy9NbGL7J85FVAZJPkFKqCotEKjc
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/contract_api:0.4.0
+- fetchai/contract_api:0.5.0
 - fetchai/ledger_api:0.3.0
 class_name: LedgerConnection
 config:
@@ -26,6 +26,6 @@ config:
       address: https://rest-agent-land.fetch.ai:443
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/contract_api:0.4.0
+- fetchai/contract_api:0.5.0
 - fetchai/ledger_api:0.3.0
 dependencies: {}
diff --git a/packages/fetchai/connections/p2p_libp2p/README.md b/packages/fetchai/connections/p2p_libp2p/README.md
index 0bfeb0d64e..036c8c2d17 100644
--- a/packages/fetchai/connections/p2p_libp2p/README.md
+++ b/packages/fetchai/connections/p2p_libp2p/README.md
@@ -6,7 +6,7 @@ The DHT provides proper messages delivery by mapping agents addresses to their l
 
 ## Usage
 
-First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p:0.9.0`.
+First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p:0.10.0`.
 
 Next, ensure that the connection is properly configured by setting:
 
@@ -15,4 +15,4 @@ Next, ensure that the connection is properly configured by setting:
 - `entry_peers` to a list of multiaddresses of already deployed nodes to join their network, should be empty for genesis node
 - `delegate_uri` to the ip address and port number for the delegate service, leave empty to disable the service
 
-If the delegate service is enabled, then other AEAs can connect to the peer node using the `fetchai/p2p_libp2p_client:0.6.0` connection.
+If the delegate service is enabled, then other AEAs can connect to the peer node using the `fetchai/p2p_libp2p_client:0.7.0` connection.
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.py b/packages/fetchai/connections/p2p_libp2p/connection.py
index edfd302c6c..84627fb356 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p/connection.py
@@ -60,7 +60,7 @@
 # TOFIX(LR) not sure is needed
 LIBP2P = "libp2p"
 
-PUBLIC_ID = PublicId.from_str("fetchai/p2p_libp2p:0.9.0")
+PUBLIC_ID = PublicId.from_str("fetchai/p2p_libp2p:0.10.0")
 
 MultiAddr = str
 
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.yaml b/packages/fetchai/connections/p2p_libp2p/connection.yaml
index 0842a3660f..217db0e2b6 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p/connection.yaml
@@ -1,6 +1,6 @@
 name: p2p_libp2p
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 type: connection
 description: The p2p libp2p connection implements an interface to standalone golang
   go-libp2p node that can exchange aea envelopes with other agents connected to the
@@ -8,14 +8,14 @@ description: The p2p libp2p connection implements an interface to standalone gol
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmfEaK1sB87aTd2H65KfszqJ6C1L4DBx94JwBs4ZhuQNkR
+  README.md: QmWefvnDUHPCCZqe8BseAj6EuJWc4RrKKRL8Y8bT5ip3hy
   __init__.py: QmYQuLNyQ8WTjgRYAoKAzoJEb7ocKXvM2hTyK4hsGch5D6
   aea/api.go: QmYRSRJL5jUTU8eBUFDot5inhmpZPZLykCRM32LVQHauVS
   aea/envelope.pb.go: QmRfUNGpCeVJfsW3H1MzCN4pwDWgumfyWufVFp6xvUjjug
   aea/envelope.proto: QmSC8EGCKiNFR2vf5bSWymSzYDFMipQW9aQVMwPzQoKb4n
   aea/pipe_unix.go: QmSzbAexrSUSA9ZE6VT6MmcWF5MhEcmceQjAbnfRoK7Ruv
   aea/pipe_windows.go: QmdYpfjgdgFbA6Pothg65NYM45ubfpZeKr8cVQoqbFzgUK
-  connection.py: QmVRe5AfSov69zJTGtDDmbjusr1tERsbe4H7Ee4h2ptcem
+  connection.py: QmPEcaeBAHS7FQE27idXAB5WP9MnSXTxdVr39jdd5zdX5Z
   dht/dhtclient/dhtclient.go: QmasA3GrgswTnUJoffBzeeqxeT3GjLu6foN6PHJhWNpMMa
   dht/dhtclient/dhtclient_test.go: QmPfnHSHXtbaW5VYuq1QsKQWey64pUEvLEaKKkT9eAcmws
   dht/dhtclient/options.go: QmPorj38wNrxGrzsbFe5wwLmiHzxbTJ2VsgvSd8tLDYS8s
diff --git a/packages/fetchai/connections/p2p_libp2p_client/README.md b/packages/fetchai/connections/p2p_libp2p_client/README.md
index db18786200..73dbde954c 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/README.md
+++ b/packages/fetchai/connections/p2p_libp2p_client/README.md
@@ -7,7 +7,7 @@ It allows for using the DHT without having to deploy a node by delegating its co
 
 ## Usage 
 
-First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p_client:0.6.0`.
+First, add the connection to your AEA project: `aea add connection fetchai/p2p_libp2p_client:0.7.0`.
 
 Next, ensure that the connection is properly configured by setting:
 
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.py b/packages/fetchai/connections/p2p_libp2p_client/connection.py
index 83355fffde..0ae1dfa284 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.py
@@ -36,7 +36,7 @@
 
 logger = logging.getLogger("aea.packages.fetchai.connections.p2p_libp2p_client")
 
-PUBLIC_ID = PublicId.from_str("fetchai/p2p_libp2p_client:0.6.0")
+PUBLIC_ID = PublicId.from_str("fetchai/p2p_libp2p_client:0.7.0")
 
 SUPPORTED_LEDGER_IDS = ["fetchai", "cosmos", "ethereum"]
 
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
index c467491e5c..a51a00d00d 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
@@ -1,6 +1,6 @@
 name: p2p_libp2p_client
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: connection
 description: The libp2p client connection implements a tcp connection to a running
   libp2p node as a traffic delegate to send/receive envelopes to/from agents in the
@@ -8,9 +8,9 @@ description: The libp2p client connection implements a tcp connection to a runni
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmXWbE53xWwPkQiuR16WP8gDS6fDRtWhbeP7gmBDfoUQtc
+  README.md: QmUp9UrXSqEYeRxrEsGDhGPTjFrwKmuT3bjHJfGrfP8yjk
   __init__.py: QmT1FEHkPGMHV5oiVEfQHHr25N2qdZxydSNRJabJvYiTgf
-  connection.py: QmQ78ZURrHYCLbtTpT4WLcKQiXF3gq6cLS2kaCNeDgw6SA
+  connection.py: QmeSyMBkN1Y99g7c7j89Ack8NjzSPw5WDbodbwfqLP6ZLT
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PLibp2pClientConnection
diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml
index cf9a6b934e..221b26e0c5 100644
--- a/packages/fetchai/contracts/erc1155/contract.yaml
+++ b/packages/fetchai/contracts/erc1155/contract.yaml
@@ -1,6 +1,6 @@
 name: erc1155
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 type: contract
 description: The erc1155 contract implements an ERC1155 contract package.
 license: Apache-2.0
diff --git a/packages/fetchai/protocols/contract_api/message.py b/packages/fetchai/protocols/contract_api/message.py
index b6108ee30c..d84c69c714 100644
--- a/packages/fetchai/protocols/contract_api/message.py
+++ b/packages/fetchai/protocols/contract_api/message.py
@@ -43,7 +43,7 @@
 class ContractApiMessage(Message):
     """A protocol for contract APIs requests and responses."""
 
-    protocol_id = ProtocolId.from_str("fetchai/contract_api:0.4.0")
+    protocol_id = ProtocolId.from_str("fetchai/contract_api:0.5.0")
 
     Kwargs = CustomKwargs
 
diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index 3c8a6ec990..c41896ef87 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -1,6 +1,6 @@
 name: contract_api
 author: fetchai
-version: 0.4.0
+version: 0.5.0
 type: protocol
 description: A protocol for contract APIs requests and responses.
 license: Apache-2.0
@@ -12,7 +12,7 @@ fingerprint:
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
   custom_types.py: QmbLjpiTcGNfvdBsu8pgQH6PK5y6ujdNnZ53JSk1GZDRCA
   dialogues.py: QmTjXH8JUtziUFDawKsSTYE5dxn1n1FmMPeWexyxiPYd6k
-  message.py: Qmd7r8Zf3jC1uwMRM1dhs1FTEqDMXreHHRiGgViAQkEMXc
+  message.py: Qmbxqt2TauoUkP6bqeYz1LZ7FukMvW3szs26HU87QCEFya
   serialization.py: QmdJZ6GBrURgzJCfYSZzLhWirfm5bDJxumz7ieAELC9juw
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/gym/message.py b/packages/fetchai/protocols/gym/message.py
index 2aaacf6386..7642fde42f 100644
--- a/packages/fetchai/protocols/gym/message.py
+++ b/packages/fetchai/protocols/gym/message.py
@@ -36,7 +36,7 @@
 class GymMessage(Message):
     """A protocol for interacting with a gym connection."""
 
-    protocol_id = ProtocolId.from_str("fetchai/gym:0.5.0")
+    protocol_id = ProtocolId.from_str("fetchai/gym:0.6.0")
 
     AnyObject = CustomAnyObject
 
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index ede670f598..f381e6973e 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -1,6 +1,6 @@
 name: gym
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 type: protocol
 description: A protocol for interacting with a gym connection.
 license: Apache-2.0
@@ -12,7 +12,7 @@ fingerprint:
   dialogues.py: QmdCzcFfyPF43U2SoxwshG5p4hd6dK49m6GYKduDHbnNPo
   gym.proto: QmQGF9Xz4Z93wmhdKoztzxjo5pS4SsAWe2TQdvZCLuzdGC
   gym_pb2.py: QmSTz7xrL8ryqzR1Sgu1NpR6PmW7GUhBGnN2qYc8m8NCcN
-  message.py: Qmc4wx56DVaSpLe6h7KSUBmxEWoHVFFAQQB4mpympggcTG
+  message.py: QmTaiHDJkdduU4HLn7i17oAigJQwrws8FmfQCwbfAagnGp
   serialization.py: QmaZd7YMHrHZvbeMMb1JfnkUZRHk7zKy45M7kDvG5wbY9C
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/skills/carpark_client/skill.yaml b/packages/fetchai/skills/carpark_client/skill.yaml
index dd2af9169d..f57a37bb82 100644
--- a/packages/fetchai/skills/carpark_client/skill.yaml
+++ b/packages/fetchai/skills/carpark_client/skill.yaml
@@ -1,6 +1,6 @@
 name: carpark_client
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The carpark client skill implements the functionality to run a client
   for carpark data.
@@ -21,7 +21,7 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_buyer:0.11.0
+- fetchai/generic_buyer:0.12.0
 behaviours:
   search:
     args:
diff --git a/packages/fetchai/skills/carpark_detection/skill.yaml b/packages/fetchai/skills/carpark_detection/skill.yaml
index b73d3f41cc..387e93cf7a 100644
--- a/packages/fetchai/skills/carpark_detection/skill.yaml
+++ b/packages/fetchai/skills/carpark_detection/skill.yaml
@@ -1,6 +1,6 @@
 name: carpark_detection
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The carpark detection skill implements the detection and trading functionality
   for a carpark agent.
@@ -23,7 +23,7 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_seller:0.12.0
+- fetchai/generic_seller:0.13.0
 behaviours:
   service_registration:
     args:
diff --git a/packages/fetchai/skills/erc1155_client/behaviours.py b/packages/fetchai/skills/erc1155_client/behaviours.py
index cf5819feab..dfa465d175 100644
--- a/packages/fetchai/skills/erc1155_client/behaviours.py
+++ b/packages/fetchai/skills/erc1155_client/behaviours.py
@@ -32,7 +32,7 @@
 from packages.fetchai.skills.erc1155_client.strategy import Strategy
 
 DEFAULT_SEARCH_INTERVAL = 5.0
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class SearchBehaviour(TickerBehaviour):
diff --git a/packages/fetchai/skills/erc1155_client/handlers.py b/packages/fetchai/skills/erc1155_client/handlers.py
index d767ddcbe2..fd542bd2b1 100644
--- a/packages/fetchai/skills/erc1155_client/handlers.py
+++ b/packages/fetchai/skills/erc1155_client/handlers.py
@@ -47,7 +47,7 @@
 )
 from packages.fetchai.skills.erc1155_client.strategy import Strategy
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class FipaHandler(Handler):
@@ -153,7 +153,7 @@ def _handle_propose(
                 counterparty=LEDGER_API_ADDRESS,
                 performative=ContractApiMessage.Performative.GET_RAW_MESSAGE,
                 ledger_id=strategy.ledger_id,
-                contract_id="fetchai/erc1155:0.9.0",
+                contract_id="fetchai/erc1155:0.10.0",
                 contract_address=fipa_msg.proposal.values["contract_address"],
                 callable="get_hash_single",
                 kwargs=ContractApiMessage.Kwargs(
diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml
index b294f8691d..099ed84f66 100644
--- a/packages/fetchai/skills/erc1155_client/skill.yaml
+++ b/packages/fetchai/skills/erc1155_client/skill.yaml
@@ -1,6 +1,6 @@
 name: erc1155_client
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 type: skill
 description: The erc1155 client interacts with the erc1155 deployer to conduct an
   atomic swap.
@@ -9,15 +9,15 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZLsx2wJE762rqDqfeqLMg9RBczvALxy3H2U9kfRvgK3s
   __init__.py: QmRXXJsv5bfvb7qsyxQtVzXwn6PMLJKkbm6kg4DNkT1NtW
-  behaviours.py: QmR3owNU8XPaiqPQSrwBjVVtsij9tvPUnyEVqmuekQ6Xdf
+  behaviours.py: QmaCak7V3jYEWdj4fLdd2tEG4fiSazbLBC5WKjDeSAQhrh
   dialogues.py: QmPb2odXbXxuY5Ygm9mfCufM2mtMZ23oapsAzsWHC2x2k4
-  handlers.py: QmTK8i26gDaWc713KGvu9pTyv25xCatcZRfhYLGnZqeJtf
+  handlers.py: QmSahx4wij2w9X6Zm9wAHyeJVRifpKGkstwYKDzcosqkfe
   strategy.py: QmNg87LgfLPoPyokFrmvrNghQD7JkWehRNAdRNyB3YogeN
 fingerprint_ignore_patterns: []
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
-- fetchai/contract_api:0.4.0
+- fetchai/contract_api:0.5.0
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
 - fetchai/ledger_api:0.3.0
diff --git a/packages/fetchai/skills/erc1155_deploy/behaviours.py b/packages/fetchai/skills/erc1155_deploy/behaviours.py
index 24c1a5d7de..84357c3b9c 100644
--- a/packages/fetchai/skills/erc1155_deploy/behaviours.py
+++ b/packages/fetchai/skills/erc1155_deploy/behaviours.py
@@ -35,7 +35,7 @@
 from packages.fetchai.skills.erc1155_deploy.strategy import Strategy
 
 DEFAULT_SERVICES_INTERVAL = 30.0
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class ServiceRegistrationBehaviour(TickerBehaviour):
@@ -130,7 +130,7 @@ def _request_contract_deploy_transaction(self) -> None:
             counterparty=LEDGER_API_ADDRESS,
             performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
             ledger_id=strategy.ledger_id,
-            contract_id="fetchai/erc1155:0.9.0",
+            contract_id="fetchai/erc1155:0.10.0",
             callable="get_deploy_transaction",
             kwargs=ContractApiMessage.Kwargs(
                 {"deployer_address": self.context.agent_address}
@@ -156,7 +156,7 @@ def _request_token_create_transaction(self) -> None:
             counterparty=LEDGER_API_ADDRESS,
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
             ledger_id=strategy.ledger_id,
-            contract_id="fetchai/erc1155:0.9.0",
+            contract_id="fetchai/erc1155:0.10.0",
             contract_address=strategy.contract_address,
             callable="get_create_batch_transaction",
             kwargs=ContractApiMessage.Kwargs(
@@ -186,7 +186,7 @@ def _request_token_mint_transaction(self) -> None:
             counterparty=LEDGER_API_ADDRESS,
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
             ledger_id=strategy.ledger_id,
-            contract_id="fetchai/erc1155:0.9.0",
+            contract_id="fetchai/erc1155:0.10.0",
             contract_address=strategy.contract_address,
             callable="get_mint_batch_transaction",
             kwargs=ContractApiMessage.Kwargs(
diff --git a/packages/fetchai/skills/erc1155_deploy/handlers.py b/packages/fetchai/skills/erc1155_deploy/handlers.py
index 95b3780804..fd9f0a7168 100644
--- a/packages/fetchai/skills/erc1155_deploy/handlers.py
+++ b/packages/fetchai/skills/erc1155_deploy/handlers.py
@@ -48,7 +48,7 @@
 from packages.fetchai.skills.erc1155_deploy.strategy import Strategy
 
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class FipaHandler(Handler):
@@ -172,7 +172,7 @@ def _handle_accept_w_inform(
                 counterparty=LEDGER_API_ADDRESS,
                 performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
                 ledger_id=strategy.ledger_id,
-                contract_id="fetchai/erc1155:0.9.0",
+                contract_id="fetchai/erc1155:0.10.0",
                 contract_address=strategy.contract_address,
                 callable="get_atomic_swap_single_transaction",
                 kwargs=ContractApiMessage.Kwargs(
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index e8000b0ca2..b43dc83ed4 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -1,6 +1,6 @@
 name: erc1155_deploy
 author: fetchai
-version: 0.13.0
+version: 0.14.0
 type: skill
 description: The ERC1155 deploy skill has the ability to deploy and interact with
   the smart contract.
@@ -9,15 +9,15 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZ7swVkRpmJbJZ2NoLb9CWwH8p3QjnjRJg71UbAXdrKyx
   __init__.py: Qmbm3ZtGpfdvvzqykfRqbaReAK9a16mcyK7qweSfeN5pq1
-  behaviours.py: Qmcr9SMJC82L2A9tG76nsitHiH3JogfWdPXnusSbWadccC
+  behaviours.py: QmaiK1q2cYeP64YriCw6PHm9Mr1okMRU9esPftQDXXFy1f
   dialogues.py: QmcCbdxFM4SX3MgXDxxbsC66gp8QK3C4W2czniQ5oDNc7G
-  handlers.py: QmdFjFEarXivuDwn2Ucw9aXCmRdbFwRK23qz6u6thgjVnn
+  handlers.py: QmSp3YuFz5nLy6Bc6qQr27ZUtwNQR6LyKiRHXcYpnmhm9r
   strategy.py: QmeoDg7UT5MG5khmrZna3v8HYrC6QJjjEV26kcq1mPs6yx
 fingerprint_ignore_patterns: []
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
-- fetchai/contract_api:0.4.0
+- fetchai/contract_api:0.5.0
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
 - fetchai/ledger_api:0.3.0
diff --git a/packages/fetchai/skills/generic_buyer/behaviours.py b/packages/fetchai/skills/generic_buyer/behaviours.py
index 356c14b689..1eecadaa15 100644
--- a/packages/fetchai/skills/generic_buyer/behaviours.py
+++ b/packages/fetchai/skills/generic_buyer/behaviours.py
@@ -32,7 +32,7 @@
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
 DEFAULT_SEARCH_INTERVAL = 5.0
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericSearchBehaviour(TickerBehaviour):
diff --git a/packages/fetchai/skills/generic_buyer/handlers.py b/packages/fetchai/skills/generic_buyer/handlers.py
index d4c5d16832..0e60ef1b1a 100644
--- a/packages/fetchai/skills/generic_buyer/handlers.py
+++ b/packages/fetchai/skills/generic_buyer/handlers.py
@@ -44,7 +44,7 @@
 )
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericFipaHandler(Handler):
diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml
index 581dd657ae..0f4dd4f620 100644
--- a/packages/fetchai/skills/generic_buyer/skill.yaml
+++ b/packages/fetchai/skills/generic_buyer/skill.yaml
@@ -1,6 +1,6 @@
 name: generic_buyer
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The weather client skill implements the skill to purchase weather data.
 license: Apache-2.0
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTR91jm7WfJpmabisy74NR5mc35YXjDU1zQAUKZeHRw8L
   __init__.py: QmaEDrNJBeHCJpbdFckRUhLSBqCXQ6umdipTMpYhqSKxSG
-  behaviours.py: QmT5Ca3y4Mv3Fxx98koEJpzP9ZoNBj1UetsffuJe2apnNF
+  behaviours.py: QmSEymQerdUYooELqC2NyXJFpXLpwBX49G1DjMzzMVa69s
   dialogues.py: QmPoKjJbwVWFPiKuV4a3ZC21SNLsWZUMXAGFzJuVedgxZ4
-  handlers.py: QmbQEVZXcLbfaeX3b7FHGWEf121bSXrYkAc8nFBJVrmp8U
+  handlers.py: QmZVuiu84WgGX3R438kuDVcNJZrahzWgLxsPAy34R6kc34
   strategy.py: Qmb2T99WnQQa4qyZSdu31QyrbtHy8ZWC6Jhv9sVrTYrFxE
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/generic_seller/behaviours.py b/packages/fetchai/skills/generic_seller/behaviours.py
index 7d2c29ba88..c60d770500 100644
--- a/packages/fetchai/skills/generic_seller/behaviours.py
+++ b/packages/fetchai/skills/generic_seller/behaviours.py
@@ -33,7 +33,7 @@
 
 
 DEFAULT_SERVICES_INTERVAL = 60.0
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericServiceRegistrationBehaviour(TickerBehaviour):
diff --git a/packages/fetchai/skills/generic_seller/handlers.py b/packages/fetchai/skills/generic_seller/handlers.py
index 8226f4e11c..1fe577cb7a 100644
--- a/packages/fetchai/skills/generic_seller/handlers.py
+++ b/packages/fetchai/skills/generic_seller/handlers.py
@@ -42,7 +42,7 @@
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class GenericFipaHandler(Handler):
diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml
index e3e5906733..5060c3d1e2 100644
--- a/packages/fetchai/skills/generic_seller/skill.yaml
+++ b/packages/fetchai/skills/generic_seller/skill.yaml
@@ -1,6 +1,6 @@
 name: generic_seller
 author: fetchai
-version: 0.12.0
+version: 0.13.0
 type: skill
 description: The weather station skill implements the functionality to sell weather
   data.
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPb5kHYZyhUN87EKmuahyGqDGgqVdGPyfC1KpGC3xfmcP
   __init__.py: QmbfkeFnZVKppLEHpBrTXUXBwg2dpPABJWSLND8Lf1cmpG
-  behaviours.py: QmNrrkUfstFUseuXwXMJPMq5gFiDio6NzRP8W53iFx1E2h
+  behaviours.py: QmdHumzBTxWg2PgWzwNVF4a5eG1dhGXzDwrY9eq4uevHqs
   dialogues.py: QmRJCregJWVs8scTMjQptvztKa5NEHKUfeZECVxdU233C6
-  handlers.py: QmTCNmgGGkkcoziJcUE6XG8WzZdN1LHiwnD7XPWT7tVXAZ
+  handlers.py: QmYyAYGiSMzUAq96LuFsVewYut9njvCR3NG9uEKonnwGf5
   strategy.py: QmX1mp7eZkz1P6iVyoDCATZDKZRgwe1EgMVmAyvtGDHvm3
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/gym/helpers.py b/packages/fetchai/skills/gym/helpers.py
index 0723bf0891..f32e80eb2a 100644
--- a/packages/fetchai/skills/gym/helpers.py
+++ b/packages/fetchai/skills/gym/helpers.py
@@ -59,7 +59,7 @@ def __init__(self, skill_context: SkillContext) -> None:
         self._is_rl_agent_trained = False
         self._step_count = 0
         self._active_dialogue = None  # type: Optional[GymDialogue]
-        self.gym_address = "fetchai/gym:0.7.0"
+        self.gym_address = "fetchai/gym:0.8.0"
 
     @property
     def gym_dialogues(self) -> GymDialogues:
diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml
index d04cb3259b..016b84f3b4 100644
--- a/packages/fetchai/skills/gym/skill.yaml
+++ b/packages/fetchai/skills/gym/skill.yaml
@@ -1,6 +1,6 @@
 name: gym
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: skill
 description: The gym skill wraps an RL agent.
 license: Apache-2.0
@@ -10,13 +10,13 @@ fingerprint:
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
   dialogues.py: QmdGo2TGJTjRXhGngZPNCBvpNqwv3B581DFmaxEMDyswrd
   handlers.py: QmagqBdQaGuGbVS5dFqxFtEww2e1YF2NprBNPtt5pVA2hZ
-  helpers.py: QmaJaypMVpRUZTDhduMLfYivq2MHENALmFFuxEP6jfnepZ
+  helpers.py: QmbRSMX7UCRAEotS4ocTEcZLo1qietAAU9K5zBtqY1nE82
   rl_agent.py: QmUq3XY9Dd2XZBhNNK9J3S5937d3az4cwP1BmeieHSgJ3m
   tasks.py: QmVf9K7zCkKYduTnS7nS3d8FvUbEVy7s7a26yaCC8Q3rgd
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/gym:0.5.0
+- fetchai/gym:0.6.0
 skills: []
 behaviours: {}
 handlers:
diff --git a/packages/fetchai/skills/ml_data_provider/skill.yaml b/packages/fetchai/skills/ml_data_provider/skill.yaml
index 7a56894bc2..9d26be6227 100644
--- a/packages/fetchai/skills/ml_data_provider/skill.yaml
+++ b/packages/fetchai/skills/ml_data_provider/skill.yaml
@@ -1,6 +1,6 @@
 name: ml_data_provider
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The ml data provider skill implements a provider for Machine Learning
   datasets in order to monetize data.
@@ -21,7 +21,7 @@ protocols:
 - fetchai/ml_trade:0.5.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_seller:0.12.0
+- fetchai/generic_seller:0.13.0
 behaviours:
   service_registration:
     args:
diff --git a/packages/fetchai/skills/ml_train/handlers.py b/packages/fetchai/skills/ml_train/handlers.py
index 7af561e772..2b94f46624 100644
--- a/packages/fetchai/skills/ml_train/handlers.py
+++ b/packages/fetchai/skills/ml_train/handlers.py
@@ -48,7 +48,7 @@
 
 
 DUMMY_DIGEST = "dummy_digest"
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class MlTradeHandler(Handler):
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index 1285241205..1379ad8436 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -1,6 +1,6 @@
 name: ml_train
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The ml train and predict skill implements a simple skill which buys training
   data, trains a model and sells predictions.
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
   behaviours.py: QmQiBzKV5rEFpMQbSjfjzAJ7SqwwGmso6TozWkjdytucLR
   dialogues.py: QmccMjTxTrTaDyXFTTfAWHmA3xBiPCmKwBfiDSCW428Xie
-  handlers.py: QmXxVeXQDjqQ8gC1fwrZvFtSSHuwGERMoj1j5bYuNfAQYp
+  handlers.py: QmSZR738THX7bCaXkuuoPDgwF3fo6DSD3hDt7EY2pRGxBm
   ml_model.py: QmXp667GwVRrGsLxtqricnnyrBUUDn6efem22UCBd2g1y8
   model.json: QmdV2tGrRY6VQ5VLgUa4yqAhPDG6X8tYsWecypq8nox9Td
   strategy.py: QmY8z1DW6PqQuiEpgXAhwasSk1CgvvTNZQH1LtExupif9g
@@ -24,7 +24,7 @@ protocols:
 - fetchai/ml_trade:0.5.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_buyer:0.11.0
+- fetchai/generic_buyer:0.12.0
 behaviours:
   search:
     args:
diff --git a/packages/fetchai/skills/simple_service_registration/handlers.py b/packages/fetchai/skills/simple_service_registration/handlers.py
index 69c8297436..3826e190f2 100644
--- a/packages/fetchai/skills/simple_service_registration/handlers.py
+++ b/packages/fetchai/skills/simple_service_registration/handlers.py
@@ -31,7 +31,7 @@
     OefSearchDialogues,
 )
 
-LEDGER_API_ADDRESS = "fetchai/ledger:0.5.0"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
 class OefSearchHandler(Handler):
diff --git a/packages/fetchai/skills/simple_service_registration/skill.yaml b/packages/fetchai/skills/simple_service_registration/skill.yaml
index 1de824dda5..da13bda8c9 100644
--- a/packages/fetchai/skills/simple_service_registration/skill.yaml
+++ b/packages/fetchai/skills/simple_service_registration/skill.yaml
@@ -1,6 +1,6 @@
 name: simple_service_registration
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 type: skill
 description: The simple service registration skills is a skill to register a service.
 license: Apache-2.0
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
   behaviours.py: Qmcz55RRytuCEZTkAU5PxX4jjaPxkp3f747ivJcceH78b4
   dialogues.py: QmX8L6qMd4X6LHLyPmiXaQL2LA5Ca9Q6B77qYdfvfJ3aen
-  handlers.py: QmZ55vACd5DEAoPujJ6eSk89PKHx3yWJFYTo1kHgoxjzuU
+  handlers.py: QmcFWEWmjDFxiksQiwWSUJ3mzJhVRXt9EmrD6PTHCmUX5G
   strategy.py: QmNTZ6XXAv6nvJs7B1p5mt7bVdH4pb3motxADDrxCpbmWF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 5475cda285..42af59473b 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -1,6 +1,6 @@
 name: tac_control_contract
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: skill
 description: The tac control skill implements the logic for an AEA to control an instance
   of the TAC.
@@ -16,7 +16,7 @@ fingerprint:
   parameters.py: QmRU9gxsWcxy25g69jbrKve2f8kFxNBjFfRjPZNKsYoYCP
 fingerprint_ignore_patterns: []
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/oef_search:0.6.0
 - fetchai/tac:0.6.0
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index edefa7e622..455aee1dfd 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -1,6 +1,6 @@
 name: tac_negotiation
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 type: skill
 description: The tac negotiation skill implements the logic for an AEA to do fipa
   negotiation in the TAC.
@@ -17,12 +17,12 @@ fingerprint:
   transactions.py: Qmc9Re92RLFkfds1NspTRym1wn7XPGSNDRFGtaG6Hrix4E
 fingerprint_ignore_patterns: []
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/fipa:0.6.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/tac_participation:0.8.0
+- fetchai/tac_participation:0.9.0
 behaviours:
   clean_up:
     args:
diff --git a/packages/fetchai/skills/tac_participation/skill.yaml b/packages/fetchai/skills/tac_participation/skill.yaml
index 2286a36267..ca4252c8f6 100644
--- a/packages/fetchai/skills/tac_participation/skill.yaml
+++ b/packages/fetchai/skills/tac_participation/skill.yaml
@@ -1,6 +1,6 @@
 name: tac_participation
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: skill
 description: The tac participation skill implements the logic for an AEA to participate
   in the TAC.
@@ -15,7 +15,7 @@ fingerprint:
   handlers.py: QmSseAwQqHsSmj2eBPPnC9eygNSSwL1kheRVsgbLqyeDvV
 fingerprint_ignore_patterns: []
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/oef_search:0.6.0
 - fetchai/tac:0.6.0
diff --git a/packages/fetchai/skills/thermometer/skill.yaml b/packages/fetchai/skills/thermometer/skill.yaml
index e7947c11d1..219f6095a3 100644
--- a/packages/fetchai/skills/thermometer/skill.yaml
+++ b/packages/fetchai/skills/thermometer/skill.yaml
@@ -1,6 +1,6 @@
 name: thermometer
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The thermometer skill implements the functionality to sell data.
 license: Apache-2.0
@@ -20,7 +20,7 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_seller:0.12.0
+- fetchai/generic_seller:0.13.0
 behaviours:
   service_registration:
     args:
diff --git a/packages/fetchai/skills/thermometer_client/skill.yaml b/packages/fetchai/skills/thermometer_client/skill.yaml
index 434b3f851e..91ee45bf87 100644
--- a/packages/fetchai/skills/thermometer_client/skill.yaml
+++ b/packages/fetchai/skills/thermometer_client/skill.yaml
@@ -1,6 +1,6 @@
 name: thermometer_client
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 type: skill
 description: The thermometer client skill implements the skill to purchase temperature
   data.
@@ -21,7 +21,7 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_buyer:0.11.0
+- fetchai/generic_buyer:0.12.0
 behaviours:
   search:
     args:
diff --git a/packages/fetchai/skills/weather_client/skill.yaml b/packages/fetchai/skills/weather_client/skill.yaml
index 665517e309..c897a88117 100644
--- a/packages/fetchai/skills/weather_client/skill.yaml
+++ b/packages/fetchai/skills/weather_client/skill.yaml
@@ -1,6 +1,6 @@
 name: weather_client
 author: fetchai
-version: 0.10.0
+version: 0.11.0
 type: skill
 description: The weather client skill implements the skill to purchase weather data.
 license: Apache-2.0
@@ -20,7 +20,7 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_buyer:0.11.0
+- fetchai/generic_buyer:0.12.0
 behaviours:
   search:
     args:
diff --git a/packages/fetchai/skills/weather_station/skill.yaml b/packages/fetchai/skills/weather_station/skill.yaml
index 603ee048aa..44781300c7 100644
--- a/packages/fetchai/skills/weather_station/skill.yaml
+++ b/packages/fetchai/skills/weather_station/skill.yaml
@@ -1,6 +1,6 @@
 name: weather_station
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 type: skill
 description: The weather station skill implements the functionality to sell weather
   data.
@@ -24,7 +24,7 @@ protocols:
 - fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
 skills:
-- fetchai/generic_seller:0.12.0
+- fetchai/generic_seller:0.13.0
 behaviours:
   service_registration:
     args:
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 3202b8923f..affbbbc4be 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -1,43 +1,43 @@
-fetchai/agents/aries_alice,QmdugL9YTvbBPph2KiaLMRgR35TqmAMV7U3PuZF1XW3YkN
-fetchai/agents/aries_faber,QmRjqCnDPRVLWyMsrVH1yaKPRMxQRTRgcmgRZLw8gVXPPc
-fetchai/agents/car_data_buyer,QmPUpG8Ui3WRomnXgbwGXrzYhGvJFRgsCiXqF36bokfMev
-fetchai/agents/car_detector,QmNzRPX63ZGHTBtxHQGGKjHuGMjZyVDpJjnHaPsTJN4wAJ
-fetchai/agents/erc1155_client,Qmauiu9jx3fDtPtUcr4BShuxzNLGMovSNfTk7Lu6Zn9Cs7
-fetchai/agents/erc1155_deployer,QmSXrULV2no3gVKysWicoDrdN9CCnkNGMgZhFtFVm8q1zp
-fetchai/agents/generic_buyer,QmSNFhJaW4dZ37wcNV4z41y2z82joTo1oTZEqpve8CKqet
-fetchai/agents/generic_seller,Qme8VKXcu73KQaWFEwawp59UgHzWNA1pQk7BEgtghGTZBu
-fetchai/agents/gym_aea,QmSmrMbwtajZ3WdP1UANrH9XXpq9tu5C35aemM4YMfacy6
-fetchai/agents/ml_data_provider,QmYT2smoTJkVKhQYRkXxCdQYxcGS3Uw7Hwzjgsk14X2Bou
-fetchai/agents/ml_model_trainer,QmdYCVbUkP46aD5xZCQWnjGNi6pNf1XBzBUVTzDagqGyTN
+fetchai/agents/aries_alice,QmSzfcX1hnJ4raTS4yREwSEKQastCHM4Z9a6irY5Es3Toc
+fetchai/agents/aries_faber,QmaJEpXeh1rKsYyggoj5L2S3N37AAJdMuZxVQExyyKUDqx
+fetchai/agents/car_data_buyer,QmYNak5SGrrfkfp28Zm2osp5xKeFTBJPTPXruh2zTpcYH4
+fetchai/agents/car_detector,QmPDuvJLVi1kfobAEnHMouobZCBniwrxRnZiGRQt5KJHYi
+fetchai/agents/erc1155_client,QmQQmTrnLuVAqeez4vuL1pFLT8sNtHJWZCp9NTXcJvcupS
+fetchai/agents/erc1155_deployer,QmVa7cpE6dzhRA9RRnLvcXjftUs4ELDxh5MsvsZBVsK9BL
+fetchai/agents/generic_buyer,QmSsZKZos8qgQFBkqLdPb12dBXKGsfrkVMs6nuqJswJvx2
+fetchai/agents/generic_seller,QmdRy5T4qCF6njPBk7ZhWmKJrLJAte2aXCHsAURNXpb4R2
+fetchai/agents/gym_aea,QmUtKrUwVt63iKZxjncrBSz6eZ9g4RGWFM49qtA4JtFMCm
+fetchai/agents/ml_data_provider,QmQtHQkYgNivnP1WuBbpnRLFKtjZbhRyeZFBW64GXXqhEy
+fetchai/agents/ml_model_trainer,Qmbk9YkJ7AX4VPcxS1anFU1sEgcU8oZn5fbSv2KuErBWMW
 fetchai/agents/my_first_aea,QmdYThnxTmqZizzvJvYH1HmnT5HKn5MsprkkHA8k3dgDPZ
-fetchai/agents/simple_service_registration,QmVR26MH3BCZgs7u8yNLbhesh5Ww5trXuDCu9jpkAyk7DW
-fetchai/agents/tac_controller,QmQnLko5QR2r9rjbyj5H5X8hXPyabkdAF5jCQ3Q1qQxz9n
-fetchai/agents/tac_controller_contract,QmUQN91FjFBr9ckKGHFfTEDBoDjDJjCwKwP2z89D6WAt1q
-fetchai/agents/tac_participant,QmRP67EwNBiXaDAJn9RXdPDjJQ4KsymokRsq6Z5b5inaFP
-fetchai/agents/thermometer_aea,QmfHJ4RSR29FbfA1RvE4j8xALEAL3iNzBjyWMY5FTLd1ZY
-fetchai/agents/thermometer_client,QmRA1KowqqTSBukUektJtxPHNHeCh31fWPi3LhyYrsG7vZ
-fetchai/agents/weather_client,QmfLNW1SF3pv5HMmXq5RUKUtsDBaoH9tu2yRTCAVRC98tZ
-fetchai/agents/weather_station,QmZ3cmNvuSkqWSKJ8VoqwBZaphRZYdZLVm3vsFBkU7aNr2
-fetchai/connections/gym,QmSdnXM6hqJT3JzCmGqas5RPxodWqrhUwGGTinFn3kYpSL
+fetchai/agents/simple_service_registration,QmWKm97p72CSV9A9i4yrVi5ucWhw2jqAurbBE8xkuwHLSQ
+fetchai/agents/tac_controller,QmSLFA3m31SB45De8SEYixvAGkPcpv6dqtKKkssTW97HpB
+fetchai/agents/tac_controller_contract,QmXY3FHDmK8RYh6Hb4aodxzjuG1d5iggn6UtnoJph8wvVE
+fetchai/agents/tac_participant,Qme3EP7MYHKre7GK2X5jZ4Pq973DaJPfpPXZX64gtp5iUk
+fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
+fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
+fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
+fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
+fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
 fetchai/connections/http_client,QmfSuWhrseBCVcmzwKmqFDC6qX3ryFzfx2uuUTb8HPGuEd
 fetchai/connections/http_server,QmU2XNsgEV7zGEgiu4PD2mjXP3fA6Fa7ivrcd7dUzC6PKc
-fetchai/connections/ledger,QmapEL72QxY2GFJXcrhJAe1YP7jtJSxp4HY8psKkRHNkxZ
+fetchai/connections/ledger,QmR77FXChjMt1K9QahWhuXHqiUwYjCxyiT2XZVtucv67Za
 fetchai/connections/local,QmWZPDvqjZjzNDUX4ivHF3kGvkNCUYM449RqNEyyoexFix
 fetchai/connections/oef,QmWpjFr7im4afmsdtmBSYJp2tRzVpeZdYpRvsDYq6q3kg7
-fetchai/connections/p2p_libp2p,QmXBdcmsx2J9rQfEJhmSAg6HdpzjtDLVjMcEnNCeAsD8VM
-fetchai/connections/p2p_libp2p_client,QmTEE3wRLyGhVbm5oGZG819ijM5HxvuZdy1mtJUoo5XwpS
+fetchai/connections/p2p_libp2p,QmVXSnhCn37mgacK7iG1HENbEkSvSZMMaf9RTFCUUDa2C9
+fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4bW222
 fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
 fetchai/connections/soef,QmQWyjmHg6HWsLEuighe2vrWQSKBZAXvoXSXF33XhaVyE8
 fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
 fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
 fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
-fetchai/contracts/erc1155,QmdhfKcSJR4cpfcNDWyq14LXFCGXVkQ4HxSH4P3NB6EeGs
+fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,QmeGEAe7GgLmFtFECQQtaPe5RYEA7EnfHbHToXv5NJSxGy
+fetchai/protocols/contract_api,QmaxhJetT4GQ1A2ctbxxWQLvLny6LZykFnXEt2yDVb4sKJ
 fetchai/protocols/default,QmXAdTynqPF8kYFsRZzxigVh3LYZJ8FSGEPEmNPDLoyHmM
 fetchai/protocols/fipa,Qmb3GXxbEQ23sZ1d7HsmrvchLwPfsEcDAbpLLjRTYxdJDm
-fetchai/protocols/gym,QmRmnLVMCkDa2LJz4RPjKRQvruhKmhMw4wf2VwaQTv3ggB
+fetchai/protocols/gym,Qmaj7TByBrHvbecUzWmuy96t7W8iocsD3gKunWZZSLTF5b
 fetchai/protocols/http,QmZJVqY2cxjky6p3o76TUemSsFDws8Dx33voG9WMdrKcry
 fetchai/protocols/ledger_api,Qmak3uKpeSfT5f4oqes3oUcNSg7vy7WKE2tUmSu8CZUNJ5
 fetchai/protocols/ml_trade,QmNVZvbcgERSypYUopKMHvd6F8B81rQqtLVqUvzMeEEwJN
@@ -48,25 +48,25 @@ fetchai/protocols/state_update,QmQmQt1VHwxmnNmwxKcrF4Qno6iHzVhhnUUjsqPtpfpQUV
 fetchai/protocols/tac,QmSn9DVVZUroa5dsjqMwiVBFmpLjyGuox8nt2FhhTs2KM6
 fetchai/skills/aries_alice,QmXp6W2vFmQgYCchQwLa3yDUwWw7hjeC8WnuPmtrXebZnq
 fetchai/skills/aries_faber,QmZFcjJddJM3mJyVDPu8xfcmUi4TgHgTB92A8SSPr9eD2X
-fetchai/skills/carpark_client,Qmer91keoAdEHnwQeuPKAnRSXDJP5ivmvNjyQbttgkU6pC
-fetchai/skills/carpark_detection,QmSFS2eti7WqR1yFos2ADYc2tmgciMvzZ4yNGUVtFJcD65
+fetchai/skills/carpark_client,QmV3vHmx4sDaecBq56L6kMD2K6JorNq4fTVC2X2NqqdUFP
+fetchai/skills/carpark_detection,QmSMoWJggZdTF3p4Y7CRUj94U9fny9tbPqJg5dZSDzUCFp
 fetchai/skills/echo,QmVRzFQnq22j7tcWK6MiD9q8Vs6mAAJhY3FrRE4CfJQ1D2
-fetchai/skills/erc1155_client,QmcUa2zx8QnfEHdioiHePw7V3oMxwGjxvkzygMYcTj9bE5
-fetchai/skills/erc1155_deploy,QmdBGAc1jGBzAPjLkrVi2roSDF7n9ahHss7zDFwwxYDosM
+fetchai/skills/erc1155_client,Qma5wTx1huj5DAcsBkRwCvZVczRREwyUawVJhyaC4UTrRE
+fetchai/skills/erc1155_deploy,QmPPHF6PUzRbeRCwy4m73oykUbTcNb1cGSoco5tSjcpVoB
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
-fetchai/skills/generic_buyer,QmSe98t6M5CCAfAh8KxbtZt2PUV1Ds1K3VetjbdZBoZfMK
-fetchai/skills/generic_seller,Qmb1KxJxXyxqf5oQjs4rtEDKyjnCgPbVDJijyWGNSpWQdT
-fetchai/skills/gym,QmaiTBVJRwKFgBnL2EJHFgtEWmQ1BDcjGuasVM1D4Na6RT
+fetchai/skills/generic_buyer,QmR2xrE8RJMmtHPRw8sjH1RxY459958MDZNkUur6cvgSsg
+fetchai/skills/generic_seller,QmQYVjJ1NnTTzLPxf2yXGkwHbCBADDJCUjCjBH2NpvG2pB
+fetchai/skills/gym,Qmc78RwfDZFyBxQBn6qyakD55dKEPwUERZ1hXpx9xyN6TW
 fetchai/skills/http_echo,QmZR1VgVb51R2PjuHtBTd8w2ye6rfnMbgi7GJ7BQhDXAPJ
-fetchai/skills/ml_data_provider,QmQke9TmGmC9EXrQbst95Bw4gnTK1gLxH9i1Uv7CTxzhn4
-fetchai/skills/ml_train,Qmd2abFvxSwhybqQ3zLkZDKNHrMyqoQqhG4mmKX66v4Wyj
+fetchai/skills/ml_data_provider,QmdgxfES4XpmREpp9QqPQRMH9TvTF9nZ21zKM5RHLGCLke
+fetchai/skills/ml_train,QmbRQZz1MPXXuWyNW3BqhcsZKtZPhYakxGkVrBswNTgfk9
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
-fetchai/skills/simple_service_registration,QmfSUCJT7szDvpsUYF1emfzNZgHoNM1o9nrEtCchPodBz2
+fetchai/skills/simple_service_registration,QmeckN8mcKLeqmJoQfdYqPsJ49nbxxwBhYPhjkTS99v1De
 fetchai/skills/tac_control,QmYCCU6RsvwqmjTRM3Nx8H99HhJXEFuinJSeG3UcjDubYH
-fetchai/skills/tac_control_contract,QmbstL6fn99jFVsZsGQT3Sjy8SBdm1rrW87oHmdyMTJKmd
-fetchai/skills/tac_negotiation,Qme9Vcdk1ovguZJTaCrVo5kcJCKw3jBHJgxhQY9QKiDYAW
-fetchai/skills/tac_participation,QmcynKNnEFSM2pNAwkMsBD1c2JEqfqCocv16tk4mRvFFbv
-fetchai/skills/thermometer,Qmaez14AMYqBkkQ1oLHVQUM18RdJu8haz9PacRmJvHEQak
-fetchai/skills/thermometer_client,QmU1fvDdtbv7eLjkMyUx1HJNzFqLh86QpW6kDiSpFqGa89
-fetchai/skills/weather_client,Qmca6hQUUwjvnhQscYfkw8CttL2TyQeDzCiReoDQoPyMhG
-fetchai/skills/weather_station,QmWTgypTWmZXugL2135YzwQuDDDdi5FmHj2DpaRe3FXZdt
+fetchai/skills/tac_control_contract,QmNz5pNPvS7LBUMdjVPrRAFgJbaD2xTL1HJQnCoYK3Va4J
+fetchai/skills/tac_negotiation,QmRCZWxUh6mkaBsa1CYNk3fmNKzSVxfiqwYGbzU1E3672F
+fetchai/skills/tac_participation,QmWBATSrN9J3XoqMJ89iniMnMDZZpLqoenWTigukaDasQG
+fetchai/skills/thermometer,QmWSFjntE9MvLpqUTfJrx4FxnG7ZSGQifoTft9mJ9MiPYt
+fetchai/skills/thermometer_client,QmQidRBB71VaaDA9LfQodFmBTHmfFi9onG1afjPmADysEx
+fetchai/skills/weather_client,QmbsSVhqy6nNe637PKhaiNmUpbztsfxqyuNe6r94QXiKiU
+fetchai/skills/weather_station,QmSHssQvAEAKpogK4sFdAzGEhtvdxXi4orJY6PeNoMzouC
diff --git a/tests/data/dummy_aea/aea-config.yaml b/tests/data/dummy_aea/aea-config.yaml
index 42e843d2da..3dc734de13 100644
--- a/tests/data/dummy_aea/aea-config.yaml
+++ b/tests/data/dummy_aea/aea-config.yaml
@@ -9,7 +9,7 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/local:0.8.0
 contracts:
-- fetchai/erc1155:0.9.0
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/default:0.5.0
 - fetchai/fipa:0.6.0
diff --git a/tests/data/gym-connection.yaml b/tests/data/gym-connection.yaml
index ffdc8ba2b5..83da790575 100644
--- a/tests/data/gym-connection.yaml
+++ b/tests/data/gym-connection.yaml
@@ -9,8 +9,8 @@ fingerprint:
 aea_version: '>=0.6.0, <0.7.0'
 description: "The gym connection wraps an OpenAI gym."
 class_name: GymConnection
-protocols: ["fetchai/gym:0.5.0"]
-restricted_to_protocols: ["fetchai/gym:0.5.0"]
+protocols: ["fetchai/gym:0.6.0"]
+restricted_to_protocols: ["fetchai/gym:0.6.0"]
 excluded_protocols: []
 config:
   env: 'gyms.env.BanditNArmedRandom'
diff --git a/tests/data/hashes.csv b/tests/data/hashes.csv
index 32219ab32f..8e4ba4b05d 100644
--- a/tests/data/hashes.csv
+++ b/tests/data/hashes.csv
@@ -1,4 +1,4 @@
-dummy_author/agents/dummy_aea,QmQRx5aPogjbzyV1GKFByfPpCENu7A1E1GGC9arXCKnzsD
+dummy_author/agents/dummy_aea,QmeFNeXh5vk81YwPnPY9qmBA5wrHeH8VsHkDcv6TqHvmFn
 dummy_author/skills/dummy_skill,QmQpimGAQ56nihemchgE29Mfan57YdGixj3kat69FGkrjK
 fetchai/connections/dummy_connection,QmT7zw62fDK1mmwYqTvw4pWqFg8Fc1DYQHUxcxd7sqZiLu
 fetchai/contracts/dummy_contract,QmPMs9VDGZGF8xJ8XBYLVb1xK5XAgiaJr5Gwcq7Vr3TUyu
diff --git a/tests/test_cli/test_add/test_protocol.py b/tests/test_cli/test_add/test_protocol.py
index 6e013f0944..c9820afb3a 100644
--- a/tests/test_cli/test_add/test_protocol.py
+++ b/tests/test_cli/test_add/test_protocol.py
@@ -56,7 +56,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.protocol_id = PublicId.from_str("fetchai/gym:0.5.0")
+        cls.protocol_id = PublicId.from_str("fetchai/gym:0.6.0")
         cls.protocol_name = cls.protocol_id.name
         cls.protocol_author = cls.protocol_id.author
         cls.protocol_version = cls.protocol_id.version
@@ -124,7 +124,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.protocol_id = PublicId.from_str("fetchai/gym:0.5.0")
+        cls.protocol_id = PublicId.from_str("fetchai/gym:0.6.0")
         cls.protocol_name = cls.protocol_id.name
         cls.protocol_author = cls.protocol_id.author
         cls.protocol_version = cls.protocol_id.version
@@ -336,7 +336,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.protocol_id = "fetchai/gym:0.5.0"
+        cls.protocol_id = "fetchai/gym:0.6.0"
 
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
@@ -402,7 +402,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.protocol_id = "fetchai/gym:0.5.0"
+        cls.protocol_id = "fetchai/gym:0.6.0"
         cls.protocol_name = "gym"
 
         # copy the 'packages' directory in the parent of the agent folder.
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index dc8e4b9790..6f200b2c77 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -473,7 +473,7 @@ class TestAddSkillWithContractsDeps(AEATestCaseEmpty):
 
     def test_add_skill_with_contracts_positive(self):
         """Test add skill with contract dependencies positive result."""
-        self.add_item("skill", "fetchai/erc1155_client:0.12.0")
+        self.add_item("skill", "fetchai/erc1155_client:0.13.0")
 
         contracts_path = os.path.join(self.agent_name, "vendor", "fetchai", "contracts")
         contracts_folders = os.listdir(contracts_path)
diff --git a/tests/test_cli/test_eject.py b/tests/test_cli/test_eject.py
index 7ba55101b7..7ef05aca81 100644
--- a/tests/test_cli/test_eject.py
+++ b/tests/test_cli/test_eject.py
@@ -33,29 +33,29 @@ def test_eject_commands_positive(self):
 
         self.set_agent_context(agent_name)
         cwd = os.path.join(self.t, agent_name)
-        self.add_item("connection", "fetchai/gym:0.7.0")
-        self.add_item("skill", "fetchai/gym:0.7.0")
-        self.add_item("contract", "fetchai/erc1155:0.9.0")
+        self.add_item("connection", "fetchai/gym:0.8.0")
+        self.add_item("skill", "fetchai/gym:0.8.0")
+        self.add_item("contract", "fetchai/erc1155:0.10.0")
 
-        self.run_cli_command("eject", "connection", "fetchai/gym:0.7.0", cwd=cwd)
+        self.run_cli_command("eject", "connection", "fetchai/gym:0.8.0", cwd=cwd)
         assert "gym" not in os.listdir(
             (os.path.join(cwd, "vendor", "fetchai", "connections"))
         )
         assert "gym" in os.listdir((os.path.join(cwd, "connections")))
 
-        self.run_cli_command("eject", "protocol", "fetchai/gym:0.5.0", cwd=cwd)
+        self.run_cli_command("eject", "protocol", "fetchai/gym:0.6.0", cwd=cwd)
         assert "gym" not in os.listdir(
             (os.path.join(cwd, "vendor", "fetchai", "protocols"))
         )
         assert "gym" in os.listdir((os.path.join(cwd, "protocols")))
 
-        self.run_cli_command("eject", "skill", "fetchai/gym:0.7.0", cwd=cwd)
+        self.run_cli_command("eject", "skill", "fetchai/gym:0.8.0", cwd=cwd)
         assert "gym" not in os.listdir(
             (os.path.join(cwd, "vendor", "fetchai", "skills"))
         )
         assert "gym" in os.listdir((os.path.join(cwd, "skills")))
 
-        self.run_cli_command("eject", "contract", "fetchai/erc1155:0.9.0", cwd=cwd)
+        self.run_cli_command("eject", "contract", "fetchai/erc1155:0.10.0", cwd=cwd)
         assert "erc1155" not in os.listdir(
             (os.path.join(cwd, "vendor", "fetchai", "contracts"))
         )
diff --git a/tests/test_cli/test_remove/test_protocol.py b/tests/test_cli/test_remove/test_protocol.py
index 86c6e4fd35..f4b82b2ea9 100644
--- a/tests/test_cli/test_remove/test_protocol.py
+++ b/tests/test_cli/test_remove/test_protocol.py
@@ -47,7 +47,7 @@ def setup_class(cls):
         cls.t = tempfile.mkdtemp()
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
-        cls.protocol_id = "fetchai/gym:0.5.0"
+        cls.protocol_id = "fetchai/gym:0.6.0"
         cls.protocol_name = "gym"
 
         os.chdir(cls.t)
@@ -109,7 +109,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.protocol_id = "fetchai/gym:0.5.0"
+        cls.protocol_id = "fetchai/gym:0.6.0"
 
         os.chdir(cls.t)
         result = cls.runner.invoke(
@@ -164,7 +164,7 @@ def setup_class(cls):
         cls.t = tempfile.mkdtemp()
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
-        cls.protocol_id = "fetchai/gym:0.5.0"
+        cls.protocol_id = "fetchai/gym:0.6.0"
 
         os.chdir(cls.t)
         result = cls.runner.invoke(
diff --git a/tests/test_cli/test_remove/test_skill.py b/tests/test_cli/test_remove/test_skill.py
index 45531339ae..372836292d 100644
--- a/tests/test_cli/test_remove/test_skill.py
+++ b/tests/test_cli/test_remove/test_skill.py
@@ -45,7 +45,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = "fetchai/gym:0.7.0"
+        cls.skill_id = "fetchai/gym:0.8.0"
         cls.skill_name = "gym"
 
         os.chdir(cls.t)
@@ -114,7 +114,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = "fetchai/gym:0.7.0"
+        cls.skill_id = "fetchai/gym:0.8.0"
 
         os.chdir(cls.t)
         result = cls.runner.invoke(
@@ -168,7 +168,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = "fetchai/gym:0.7.0"
+        cls.skill_id = "fetchai/gym:0.8.0"
         cls.skill_name = "gym"
 
         os.chdir(cls.t)
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md b/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md
index 4f667e7a30..0c2e6b7738 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md
@@ -15,13 +15,13 @@ aca-py start --admin 127.0.0.1 8021 --admin-insecure-mode --inbound-transport ht
 aca-py start --admin 127.0.0.1 8031 --admin-insecure-mode --inbound-transport http 0.0.0.0 8030 --outbound-transp http --webhook-url http://127.0.0.1:8032/webhooks
 ```
 ``` bash
-aea fetch fetchai/aries_alice:0.10.0
+aea fetch fetchai/aries_alice:0.11.0
 cd aries_alice
 ```
 ``` bash
 aea create aries_alice
 cd aries_alice
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
 aea add connection fetchai/http_client:0.8.0
 aea add connection fetchai/webhook:0.6.0
@@ -54,13 +54,13 @@ aea install
 aea run
 ```
 ``` bash
-aea fetch fetchai/aries_faber:0.10.0
+aea fetch fetchai/aries_faber:0.11.0
 cd aries_faber
 ```
 ``` bash
 aea create aries_faber
 cd aries_faber
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
 aea add connection fetchai/http_client:0.8.0
 aea add connection fetchai/webhook:0.6.0
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md
index b98e43524a..de141063dc 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md
@@ -1,32 +1,32 @@
 ``` bash
-aea fetch fetchai/car_detector:0.12.0
+aea fetch fetchai/car_detector:0.13.0
 cd car_detector
 aea install
 ```
 ``` bash
 aea create car_detector
 cd car_detector
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/carpark_detection:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/carpark_detection:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea fetch fetchai/car_data_buyer:0.12.0
+aea fetch fetchai/car_data_buyer:0.13.0
 cd car_data_buyer
 aea install
 ```
 ``` bash
 aea create car_data_buyer
 cd car_data_buyer
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/carpark_client:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/carpark_client:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea generate-key fetchai
@@ -54,12 +54,12 @@ aea delete car_data_buyer
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-cli-vs-programmatic-aeas.md b/tests/test_docs/test_bash_yaml/md_files/bash-cli-vs-programmatic-aeas.md
index b7615e2cef..2d271b9c25 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-cli-vs-programmatic-aeas.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-cli-vs-programmatic-aeas.md
@@ -2,7 +2,7 @@
 svn export https://github.com/fetchai/agents-aea.git/trunk/packages
 ```
 ``` bash
-aea fetch fetchai/weather_station:0.12.0
+aea fetch fetchai/weather_station:0.13.0
 cd weather_station
 ```
 ``` bash
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-config.md b/tests/test_docs/test_bash_yaml/md_files/bash-config.md
index 8ed7b3821d..0041a7c21b 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-config.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-config.md
@@ -20,7 +20,7 @@ protocols:                                      # The list of protocol public id
 - fetchai/default:0.5.0
 skills:                                         # The list of skill public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX).
 - fetchai/error:0.5.0
-default_connection: fetchai/p2p_libp2p:0.9.0    # The default connection used for envelopes sent by the AEA (must satisfy PUBLIC_ID_REGEX).
+default_connection: fetchai/p2p_libp2p:0.10.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)
 logging_config:                                 # The logging configurations the AEA project uses
   disable_existing_loggers: false
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md
index d6fdbcd6de..d44f8d086b 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md
@@ -1,17 +1,17 @@
 ``` bash
-aea fetch fetchai/erc1155_deployer:0.13.0
+aea fetch fetchai/erc1155_deployer:0.14.0
 cd erc1155_deployer
 aea install
 ```
 ``` bash
 aea create erc1155_deployer
 cd erc1155_deployer
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/erc1155_deploy:0.13.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/erc1155_deploy:0.14.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea config set agent.default_ledger ethereum
@@ -25,19 +25,19 @@ aea generate-key cosmos
 aea add-key cosmos cosmos_private_key.txt --connection
 ```
 ``` bash
-aea fetch fetchai/erc1155_client:0.13.0
+aea fetch fetchai/erc1155_client:0.14.0
 cd erc1155_client
 aea install
 ```
 ``` bash
 aea create erc1155_client
 cd erc1155_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/erc1155_client:0.12.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/erc1155_client:0.13.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea config set agent.default_ledger ethereum
@@ -75,14 +75,14 @@ aea delete erc1155_client
 ```
 ``` yaml
 default_routing:
-  fetchai/contract_api:0.4.0: fetchai/ledger:0.5.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/contract_api:0.4.0: fetchai/ledger:0.5.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md
index 5b92dc3897..760425d948 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md
@@ -5,15 +5,15 @@ sudo nano 99-hidraw-permissions.rules
 KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0664", GROUP="plugdev"
 ```
 ``` bash
-aea fetch fetchai/generic_seller:0.9.0
+aea fetch fetchai/generic_seller:0.10.0
 cd generic_seller
-aea eject skill fetchai/generic_seller:0.12.0
+aea eject skill fetchai/generic_seller:0.13.0
 cd ..
 ```
 ``` bash
-aea fetch fetchai/generic_buyer:0.9.0
+aea fetch fetchai/generic_buyer:0.10.0
 cd generic_buyer
-aea eject skill fetchai/generic_buyer:0.11.0
+aea eject skill fetchai/generic_buyer:0.12.0
 cd ..
 ```
 ``` bash
@@ -48,22 +48,22 @@ aea add-key fetchai fetchai_private_key.txt --connection
 aea generate-wealth fetchai --sync
 ```
 ``` bash
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
+aea add connection fetchai/ledger:0.6.0
 aea add protocol fetchai/fipa:0.6.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea run
 ```
 ``` bash 
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
+aea add connection fetchai/ledger:0.6.0
 aea add protocol fetchai/fipa:0.6.0
 aea add protocol fetchai/signing:0.3.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea run
@@ -225,7 +225,7 @@ addr: ${OEF_ADDR: 127.0.0.1}
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md
index 31dc731eb9..6f01f1085c 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md
@@ -1,32 +1,32 @@
 ``` bash
-aea fetch fetchai/generic_seller:0.9.0 --alias my_seller_aea
+aea fetch fetchai/generic_seller:0.10.0 --alias my_seller_aea
 cd my_seller_aea
 aea install
 ```
 ``` bash
 aea create my_seller_aea
 cd my_seller_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/generic_seller:0.12.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/generic_seller:0.13.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea fetch fetchai/generic_buyer:0.9.0 --alias my_buyer_aea
+aea fetch fetchai/generic_buyer:0.10.0 --alias my_buyer_aea
 cd my_buyer_aea
 aea install
 ```
 ``` bash
 aea create my_buyer_aea
 cd my_buyer_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/generic_buyer:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/generic_buyer:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea generate-key fetchai
@@ -62,12 +62,12 @@ aea delete my_buyer_aea
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md
index a6808d7816..c0cfb5601d 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md
@@ -1,5 +1,5 @@
 ``` bash
-aea fetch fetchai/gym_aea:0.10.0 --alias my_gym_aea
+aea fetch fetchai/gym_aea:0.11.0 --alias my_gym_aea
 cd my_gym_aea
 aea install
 ```
@@ -8,10 +8,10 @@ aea create my_gym_aea
 cd my_gym_aea
 ```
 ``` bash
-aea add skill fetchai/gym:0.7.0
+aea add skill fetchai/gym:0.8.0
 ```
 ``` bash
-aea add connection fetchai/gym:0.7.0
+aea add connection fetchai/gym:0.8.0
 aea config set agent.default_connection fetchai/gym:0.7.0
 ```
 ``` bash
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md
index 446ae4810f..901ad6cab9 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md
@@ -1,31 +1,31 @@
 ``` bash
-aea fetch fetchai/ml_data_provider:0.12.0
+aea fetch fetchai/ml_data_provider:0.13.0
 cd ml_data_provider
 aea install
 ``` 
 ``` bash
 aea create ml_data_provider
 cd ml_data_provider
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/ml_data_provider:0.11.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/ml_data_provider:0.12.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea install
 ```
 ``` bash
-aea fetch fetchai/ml_model_trainer:0.12.0
+aea fetch fetchai/ml_model_trainer:0.13.0
 cd ml_model_trainer
 aea install
 ```
 ``` bash
 aea create ml_model_trainer
 cd ml_model_trainer
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/ml_train:0.11.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/ml_train:0.12.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea install
 ```
 ``` bash
@@ -54,12 +54,12 @@ aea delete ml_model_trainer
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md b/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md
index 39e3a71084..9984fab6fd 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md
@@ -1,32 +1,32 @@
 ``` bash
-aea fetch fetchai/thermometer_aea:0.10.0 --alias my_thermometer_aea
+aea fetch fetchai/thermometer_aea:0.11.0 --alias my_thermometer_aea
 cd my_thermometer_aea
 aea install
 ```
 ``` bash
 aea create my_thermometer_aea
 cd my_thermometer_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea fetch fetchai/thermometer_client:0.10.0 --alias my_thermometer_client
+aea fetch fetchai/thermometer_client:0.11.0 --alias my_thermometer_client
 cd my_thermometer_client
 aea install
 ```
 ``` bash
 aea create my_thermometer_client
 cd my_thermometer_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer_client:0.10.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer_client:0.11.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea generate-key fetchai
@@ -45,7 +45,7 @@ aea generate-wealth fetchai
 aea install
 ```
 ``` bash
-aea eject skill fetchai/thermometer:0.11.0
+aea eject skill fetchai/thermometer:0.12.0
 ```
 ``` bash
 aea fingerprint skill {YOUR_AUTHOR_HANDLE}/thermometer:0.1.0
@@ -63,12 +63,12 @@ aea delete my_thermometer_client
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md b/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md
index f377d5396c..e316c52cb9 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md
@@ -1,18 +1,18 @@
 ``` bash
 aea create my_genesis_aea
 cd my_genesis_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
-aea run --connections fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
+aea run --connections fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea create my_other_aea
 cd my_other_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea run --connections fetchai/p2p_libp2p:0.9.0
+aea run --connections fetchai/p2p_libp2p:0.10.0
 ```
   ``` bash
   svn export https://github.com/fetchai/agents-aea.git/trunk/packages/fetchai/connections/p2p_libp2p
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md b/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md
index 6274a34d55..d132e978f1 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md
@@ -10,12 +10,12 @@ aea add protocol fetchai/oef_search:0.6.0
 ```
 ``` bash
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea fetch fetchai/simple_service_registration:0.12.0 && cd simple_service_registration
+aea fetch fetchai/simple_service_registration:0.13.0 && cd simple_service_registration
 ```
 ``` bash
 aea generate-key fetchai
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
index f7e4385b0a..dba8940de7 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
@@ -1,17 +1,17 @@
 ``` bash
-aea fetch fetchai/tac_controller_contract:0.10.0
+aea fetch fetchai/tac_controller_contract:0.11.0
 cd tac_controller_contract
 aea install
 ```
 ``` bash
 aea create tac_controller_contract
 cd tac_controller_contract
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_control_contract:0.8.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_control_contract:0.9.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger ethereum
 ```
 ``` bash
@@ -25,12 +25,12 @@ aea generate-wealth ethereum
 aea get-wealth ethereum
 ```
 ``` bash
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_one
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_one
 cd tac_participant_one
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
 cd ..
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_two
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_two
 cd tac_participant_two
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
@@ -42,26 +42,26 @@ aea create tac_participant_two
 ```
 ``` bash
 cd tac_participant_one
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger ethereum
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
 ```
 ``` bash
 cd tac_participant_two
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger ethereum
 aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract 'True' --type bool
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
index 8b8a0d4468..1eb1768963 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
@@ -1,22 +1,22 @@
 ``` bash
-aea fetch fetchai/tac_controller:0.9.0
+aea fetch fetchai/tac_controller:0.10.0
 cd tac_controller
 aea install
 ```
 ``` bash
 aea create tac_controller
 cd tac_controller
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
+aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_control:0.7.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
 ```
 ``` bash
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_one
-aea fetch fetchai/tac_participant:0.10.0 --alias tac_participant_two
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_one
+aea fetch fetchai/tac_participant:0.11.0 --alias tac_participant_two
 cd tac_participant_two
 aea install
 ```
@@ -26,24 +26,24 @@ aea create tac_participant_two
 ```
 ``` bash
 cd tac_participant_one
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
 ```
 ``` bash
 cd tac_participant_two
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/tac_participation:0.8.0
-aea add skill fetchai/tac_negotiation:0.9.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/tac_participation:0.9.0
+aea add skill fetchai/tac_negotiation:0.10.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
 ```
 ``` bash
@@ -72,12 +72,12 @@ default_routing:
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md
index 87ce48c0d3..61fe285d41 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md
@@ -1,32 +1,32 @@
 ``` bash 
-aea fetch fetchai/thermometer_aea:0.10.0 --alias my_thermometer_aea
+aea fetch fetchai/thermometer_aea:0.11.0 --alias my_thermometer_aea
 cd thermometer_aea
 aea install
 ```
 ``` bash
 aea create my_thermometer_aea
 cd my_thermometer_aea
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea fetch fetchai/thermometer_client:0.10.0 --alias my_thermometer_client
+aea fetch fetchai/thermometer_client:0.11.0 --alias my_thermometer_client
 cd my_thermometer_client
 aea install
 ```
 ``` bash
 aea create my_thermometer_client
 cd my_thermometer_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/thermometer_client:0.10.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/thermometer_client:0.11.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea generate-key fetchai
@@ -54,12 +54,12 @@ aea delete my_thermometer_client
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md
index 70577d1cc7..c138469064 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md
@@ -1,32 +1,32 @@
 ``` bash
-aea fetch fetchai/weather_station:0.12.0 --alias my_weather_station
+aea fetch fetchai/weather_station:0.13.0 --alias my_weather_station
 cd my_weather_station
 aea install
 ```
 ``` bash
 aea create my_weather_station
 cd my_weather_station
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/weather_station:0.11.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/weather_station:0.12.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
-aea fetch fetchai/weather_client:0.12.0 --alias my_weather_client
+aea fetch fetchai/weather_client:0.13.0 --alias my_weather_client
 cd my_weather_client
 aea install
 ```
 ``` bash
 aea create my_weather_client
 cd my_weather_client
-aea add connection fetchai/p2p_libp2p:0.9.0
+aea add connection fetchai/p2p_libp2p:0.10.0
 aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/ledger:0.5.0
-aea add skill fetchai/weather_client:0.10.0
+aea add connection fetchai/ledger:0.6.0
+aea add skill fetchai/weather_client:0.11.0
 aea install
-aea config set agent.default_connection fetchai/p2p_libp2p:0.9.0
+aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
 ``` bash
 aea generate-key fetchai
@@ -54,12 +54,12 @@ aea delete my_weather_client
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.5.0
+  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ```
 ``` yaml
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
index ef0e787577..43c52bda0d 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
@@ -62,7 +62,7 @@ def test_cli_programmatic_communication(self):
         """Test the communication of the two agents."""
 
         weather_station = "weather_station"
-        self.fetch_agent("fetchai/weather_station:0.12.0", weather_station)
+        self.fetch_agent("fetchai/weather_station:0.13.0", weather_station)
         self.set_agent_context(weather_station)
         self.set_config(
             "vendor.fetchai.skills.weather_station.models.strategy.args.is_ledger_tx",
diff --git a/tests/test_docs/test_orm_integration/test_orm_integration.py b/tests/test_docs/test_orm_integration/test_orm_integration.py
index b96e8f6c44..56f83cf22d 100644
--- a/tests/test_docs/test_orm_integration/test_orm_integration.py
+++ b/tests/test_docs/test_orm_integration/test_orm_integration.py
@@ -127,7 +127,7 @@ def test_orm_integration_docs_example(self):
         self.create_agents(seller_aea_name, buyer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -139,15 +139,15 @@ def test_orm_integration_docs_example(self):
 
         # Setup seller
         self.set_agent_context(seller_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/thermometer:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/thermometer:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         # ejecting changes author and version!
-        self.eject_item("skill", "fetchai/thermometer:0.11.0")
+        self.eject_item("skill", "fetchai/thermometer:0.12.0")
         seller_skill_config_replacement = yaml.safe_load(seller_strategy_replacement)
         self.force_set_config(
             "skills.thermometer.models", seller_skill_config_replacement["models"],
@@ -185,11 +185,11 @@ def test_orm_integration_docs_example(self):
 
         # Setup Buyer
         self.set_agent_context(buyer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/thermometer_client:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/thermometer_client:0.11.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         buyer_skill_config_replacement = yaml.safe_load(buyer_strategy_replacement)
diff --git a/tests/test_docs/test_skill_guide/test_skill_guide.py b/tests/test_docs/test_skill_guide/test_skill_guide.py
index c4a237e5fe..87fcc76cad 100644
--- a/tests/test_docs/test_skill_guide/test_skill_guide.py
+++ b/tests/test_docs/test_skill_guide/test_skill_guide.py
@@ -76,7 +76,7 @@ def test_update_skill_and_run(self):
 
         simple_service_registration_aea = "simple_service_registration"
         self.fetch_agent(
-            "fetchai/simple_service_registration:0.12.0",
+            "fetchai/simple_service_registration:0.13.0",
             simple_service_registration_aea,
         )
         self.set_agent_context(simple_service_registration_aea)
@@ -107,9 +107,9 @@ def test_update_skill_and_run(self):
         skill_name = "my_search"
         skill_id = AUTHOR + "/" + skill_name + ":" + DEFAULT_VERSION
         self.scaffold_item("skill", skill_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
 
diff --git a/tests/test_packages/test_connections/test_ledger/test_contract_api.py b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
index 756d7f3fc5..88bb315259 100644
--- a/tests/test_packages/test_connections/test_ledger/test_contract_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
@@ -85,7 +85,7 @@ async def test_erc1155_get_deploy_transaction(erc1155_contract, ledger_apis_conn
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         callable="get_deploy_transaction",
         kwargs=ContractApiMessage.Kwargs({"deployer_address": address}),
     )
@@ -126,7 +126,7 @@ async def test_erc1155_get_raw_transaction(erc1155_contract, ledger_apis_connect
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address=contract_address,
         callable="get_create_batch_transaction",
         kwargs=ContractApiMessage.Kwargs(
@@ -171,7 +171,7 @@ async def test_erc1155_get_raw_message(erc1155_contract, ledger_apis_connection)
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_RAW_MESSAGE,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address=contract_address,
         callable="get_hash_single",
         kwargs=ContractApiMessage.Kwargs(
@@ -223,7 +223,7 @@ async def test_erc1155_get_state(erc1155_contract, ledger_apis_connection):
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_STATE,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address=contract_address,
         callable="get_balance",
         kwargs=ContractApiMessage.Kwargs(
@@ -268,7 +268,7 @@ def _raise():
         counterparty="str(ledger_apis_connection.connection_id)",
         performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address="test addr",
         callable="get_create_batch_transaction",
         kwargs=ContractApiMessage.Kwargs(
@@ -313,7 +313,7 @@ async def test_callable_wrong_number_of_arguments_api_and_contract_address(
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_STATE,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address=contract_address,
         callable="get_balance",
         kwargs=ContractApiMessage.Kwargs(
@@ -365,7 +365,7 @@ async def test_callable_wrong_number_of_arguments_apis(
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         callable="get_deploy_transaction",
         kwargs=ContractApiMessage.Kwargs({}),
     )
@@ -418,7 +418,7 @@ async def test_callable_wrong_number_of_arguments_apis_method_call(
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         callable="get_deploy_transaction",
         kwargs=ContractApiMessage.Kwargs({}),
     )
@@ -454,7 +454,7 @@ async def test_callable_generic_error(erc1155_contract, ledger_apis_connection):
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_STATE,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address=contract_address,
         callable="get_balance",
         kwargs=ContractApiMessage.Kwargs(
@@ -499,7 +499,7 @@ async def test_callable_cannot_find(erc1155_contract, ledger_apis_connection, ca
         counterparty=str(ledger_apis_connection.connection_id),
         performative=ContractApiMessage.Performative.GET_STATE,
         ledger_id=ETHEREUM,
-        contract_id="fetchai/erc1155:0.9.0",
+        contract_id="fetchai/erc1155:0.10.0",
         contract_address=contract_address,
         callable="unknown_callable",
         kwargs=ContractApiMessage.Kwargs(
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
index c1e9f70ea2..d31a3afbce 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
@@ -44,8 +44,8 @@ def setup_class(cls):
     @libp2p_log_on_failure
     def test_agent(self):
         """Test with aea."""
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
 
         # for logging
         config_path = "vendor.fetchai.connections.p2p_libp2p.config"
@@ -89,7 +89,7 @@ def setup_class(cls):
     @libp2p_log_on_failure
     def test_agent(self):
         """Test with aea."""
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
 
         # setup a full node: with public uri, relay service, and delegate service
         config_path = "vendor.fetchai.connections.p2p_libp2p.config"
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
index 831d56a466..08838b121a 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
@@ -355,8 +355,8 @@ class TestLibp2pConnectionPublicDHTRelayAEACli(AEATestCaseEmpty):
     @libp2p_log_on_failure
     def test_connectivity(self):
         """Test connectivity."""
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
 
         config_path = "vendor.fetchai.connections.p2p_libp2p.config"
         self.set_config(
@@ -401,7 +401,7 @@ class TestLibp2pConnectionPublicDHTDelegateAEACli(AEATestCaseEmpty):
 
     def test_connectivity(self):
         """Test connectivity."""
-        self.add_item("connection", "fetchai/p2p_libp2p_client:0.6.0")
+        self.add_item("connection", "fetchai/p2p_libp2p_client:0.7.0")
         config_path = "vendor.fetchai.connections.p2p_libp2p_client.config"
         self.force_set_config(
             "{}.nodes".format(config_path),
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
index 6ad8a42aaa..fc3c87b396 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
@@ -61,7 +61,7 @@ def test_node(self):
 
     def test_connection(self):
         """Test the connection can be used in an aea."""
-        self.add_item("connection", "fetchai/p2p_libp2p_client:0.6.0")
+        self.add_item("connection", "fetchai/p2p_libp2p_client:0.7.0")
         config_path = "vendor.fetchai.connections.p2p_libp2p_client.config"
         self.force_set_config(
             "{}.nodes".format(config_path),
diff --git a/tests/test_packages/test_skills/test_carpark.py b/tests/test_packages/test_skills/test_carpark.py
index 2297c45339..a95f7128b1 100644
--- a/tests/test_packages/test_skills/test_carpark.py
+++ b/tests/test_packages/test_skills/test_carpark.py
@@ -51,7 +51,7 @@ def test_carpark(self):
         self.create_agents(carpark_aea_name, carpark_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -63,11 +63,11 @@ def test_carpark(self):
 
         # Setup agent one
         self.set_agent_context(carpark_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/carpark_detection:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/carpark_detection:0.12.0")
         setting_path = (
             "vendor.fetchai.skills.carpark_detection.models.strategy.args.is_ledger_tx"
         )
@@ -98,11 +98,11 @@ def test_carpark(self):
 
         # Setup agent two
         self.set_agent_context(carpark_client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/carpark_client:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/carpark_client:0.12.0")
         setting_path = (
             "vendor.fetchai.skills.carpark_client.models.strategy.args.is_ledger_tx"
         )
@@ -226,7 +226,7 @@ def test_carpark(self):
         self.create_agents(carpark_aea_name, carpark_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -238,17 +238,17 @@ def test_carpark(self):
 
         # Setup agent one
         self.set_agent_context(carpark_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/carpark_detection:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/carpark_detection:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/car_detector:0.12.0", carpark_aea_name
+            "fetchai/car_detector:0.13.0", carpark_aea_name
         )
         assert (
             diff == []
@@ -276,17 +276,17 @@ def test_carpark(self):
 
         # Setup agent two
         self.set_agent_context(carpark_client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/carpark_client:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/carpark_client:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/car_data_buyer:0.12.0", carpark_client_aea_name
+            "fetchai/car_data_buyer:0.13.0", carpark_client_aea_name
         )
         assert (
             diff == []
diff --git a/tests/test_packages/test_skills/test_erc1155.py b/tests/test_packages/test_skills/test_erc1155.py
index af88f06e0f..f785a87681 100644
--- a/tests/test_packages/test_skills/test_erc1155.py
+++ b/tests/test_packages/test_skills/test_erc1155.py
@@ -56,8 +56,8 @@ def test_generic(self):
 
         # add ethereum ledger in both configuration files
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
-            "fetchai/contract_api:0.4.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
+            "fetchai/contract_api:0.5.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -69,17 +69,17 @@ def test_generic(self):
 
         # add packages for agent one
         self.set_agent_context(deploy_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.set_config("agent.default_ledger", ETHEREUM)
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
-        self.add_item("skill", "fetchai/erc1155_deploy:0.13.0")
+        self.add_item("skill", "fetchai/erc1155_deploy:0.14.0")
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/erc1155_deployer:0.13.0", deploy_aea_name
+            "fetchai/erc1155_deployer:0.14.0", deploy_aea_name
         )
         assert (
             diff == []
@@ -113,17 +113,17 @@ def test_generic(self):
 
         # add packages for agent two
         self.set_agent_context(client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.set_config("agent.default_ledger", ETHEREUM)
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
-        self.add_item("skill", "fetchai/erc1155_client:0.12.0")
+        self.add_item("skill", "fetchai/erc1155_client:0.13.0")
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/erc1155_client:0.13.0", client_aea_name
+            "fetchai/erc1155_client:0.14.0", client_aea_name
         )
         assert (
             diff == []
diff --git a/tests/test_packages/test_skills/test_generic.py b/tests/test_packages/test_skills/test_generic.py
index 180edafc9f..d320798742 100644
--- a/tests/test_packages/test_skills/test_generic.py
+++ b/tests/test_packages/test_skills/test_generic.py
@@ -50,7 +50,7 @@ def test_generic(self, pytestconfig):
         self.create_agents(seller_aea_name, buyer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -62,11 +62,11 @@ def test_generic(self, pytestconfig):
 
         # prepare seller agent
         self.set_agent_context(seller_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/generic_seller:0.12.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/generic_seller:0.13.0")
         setting_path = (
             "vendor.fetchai.skills.generic_seller.models.strategy.args.is_ledger_tx"
         )
@@ -101,11 +101,11 @@ def test_generic(self, pytestconfig):
 
         # prepare buyer agent
         self.set_agent_context(buyer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/generic_buyer:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/generic_buyer:0.12.0")
         setting_path = (
             "vendor.fetchai.skills.generic_buyer.models.strategy.args.is_ledger_tx"
         )
@@ -231,7 +231,7 @@ def test_generic(self, pytestconfig):
         self.create_agents(seller_aea_name, buyer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -243,17 +243,17 @@ def test_generic(self, pytestconfig):
 
         # prepare seller agent
         self.set_agent_context(seller_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/generic_seller:0.12.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/generic_seller:0.13.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/generic_seller:0.9.0", seller_aea_name
+            "fetchai/generic_seller:0.10.0", seller_aea_name
         )
         assert (
             diff == []
@@ -285,17 +285,17 @@ def test_generic(self, pytestconfig):
 
         # prepare buyer agent
         self.set_agent_context(buyer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/generic_buyer:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/generic_buyer:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/generic_buyer:0.9.0", buyer_aea_name
+            "fetchai/generic_buyer:0.10.0", buyer_aea_name
         )
         assert (
             diff == []
diff --git a/tests/test_packages/test_skills/test_gym.py b/tests/test_packages/test_skills/test_gym.py
index 3a9bd4e173..1d2126cf88 100644
--- a/tests/test_packages/test_skills/test_gym.py
+++ b/tests/test_packages/test_skills/test_gym.py
@@ -33,16 +33,16 @@ class TestGymSkill(AEATestCaseEmpty):
 
     def test_gym(self):
         """Run the gym skill sequence."""
-        self.add_item("skill", "fetchai/gym:0.7.0")
-        self.add_item("connection", "fetchai/gym:0.7.0")
+        self.add_item("skill", "fetchai/gym:0.8.0")
+        self.add_item("connection", "fetchai/gym:0.8.0")
         self.run_install()
 
         # change default connection
         setting_path = "agent.default_connection"
-        self.set_config(setting_path, "fetchai/gym:0.7.0")
+        self.set_config(setting_path, "fetchai/gym:0.8.0")
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/gym_aea:0.10.0", self.agent_name
+            "fetchai/gym_aea:0.11.0", self.agent_name
         )
         assert (
             diff == []
diff --git a/tests/test_packages/test_skills/test_ml_skills.py b/tests/test_packages/test_skills/test_ml_skills.py
index db6bff20b6..3ed1c80747 100644
--- a/tests/test_packages/test_skills/test_ml_skills.py
+++ b/tests/test_packages/test_skills/test_ml_skills.py
@@ -64,7 +64,7 @@ def test_ml_skills(self, pytestconfig):
         self.create_agents(data_provider_aea_name, model_trainer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -76,11 +76,11 @@ def test_ml_skills(self, pytestconfig):
 
         # prepare data provider agent
         self.set_agent_context(data_provider_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/ml_data_provider:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/ml_data_provider:0.12.0")
         setting_path = (
             "vendor.fetchai.skills.ml_data_provider.models.strategy.args.is_ledger_tx"
         )
@@ -111,11 +111,11 @@ def test_ml_skills(self, pytestconfig):
 
         # prepare model trainer agent
         self.set_agent_context(model_trainer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/ml_train:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/ml_train:0.12.0")
         setting_path = (
             "vendor.fetchai.skills.ml_train.models.strategy.args.is_ledger_tx"
         )
@@ -241,7 +241,7 @@ def test_ml_skills(self, pytestconfig):
         self.create_agents(data_provider_aea_name, model_trainer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -253,17 +253,17 @@ def test_ml_skills(self, pytestconfig):
 
         # prepare data provider agent
         self.set_agent_context(data_provider_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/ml_data_provider:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/ml_data_provider:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/ml_data_provider:0.12.0", data_provider_aea_name
+            "fetchai/ml_data_provider:0.13.0", data_provider_aea_name
         )
         assert (
             diff == []
@@ -291,17 +291,17 @@ def test_ml_skills(self, pytestconfig):
 
         # prepare model trainer agent
         self.set_agent_context(model_trainer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/ml_train:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/ml_train:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/ml_model_trainer:0.12.0", model_trainer_aea_name
+            "fetchai/ml_model_trainer:0.13.0", model_trainer_aea_name
         )
         assert (
             diff == []
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index f2f6a5d0d2..a2397ffcbc 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -66,8 +66,8 @@ def test_tac(self):
 
         # prepare tac controller for test
         self.set_agent_context(tac_controller_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
         self.add_item("skill", "fetchai/tac_control:0.7.0")
         self.set_config("agent.default_ledger", FETCHAI)
@@ -76,7 +76,7 @@ def test_tac(self):
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/tac_controller:0.9.0", tac_controller_name
+            "fetchai/tac_controller:0.10.0", tac_controller_name
         )
         assert (
             diff == []
@@ -96,7 +96,7 @@ def test_tac(self):
         self.force_set_config(setting_path, COSMOS)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -106,18 +106,18 @@ def test_tac(self):
             (tac_aea_two, NON_GENESIS_CONFIG_TWO),
         ):
             self.set_agent_context(agent_name)
-            self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-            self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+            self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+            self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
             self.add_item("connection", "fetchai/soef:0.8.0")
-            self.add_item("connection", "fetchai/ledger:0.5.0")
-            self.add_item("skill", "fetchai/tac_participation:0.8.0")
-            self.add_item("skill", "fetchai/tac_negotiation:0.9.0")
+            self.add_item("connection", "fetchai/ledger:0.6.0")
+            self.add_item("skill", "fetchai/tac_participation:0.9.0")
+            self.add_item("skill", "fetchai/tac_negotiation:0.10.0")
             self.set_config("agent.default_ledger", FETCHAI)
             setting_path = "agent.default_routing"
             self.force_set_config(setting_path, default_routing)
             self.run_install()
             diff = self.difference_to_fetched_agent(
-                "fetchai/tac_participant:0.10.0", agent_name
+                "fetchai/tac_participant:0.11.0", agent_name
             )
             assert (
                 diff == []
@@ -277,14 +277,14 @@ def test_tac(self):
 
         # prepare tac controller for test
         self.set_agent_context(tac_controller_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("skill", "fetchai/tac_control_contract:0.8.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("skill", "fetchai/tac_control_contract:0.9.0")
         self.set_config("agent.default_ledger", ETHEREUM)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/tac_controller_contract:0.10.0", tac_controller_name
+            "fetchai/tac_controller_contract:0.11.0", tac_controller_name
         )
         assert (
             diff == []
@@ -302,10 +302,10 @@ def test_tac(self):
             (FUNDED_ETH_PRIVATE_KEY_2, FUNDED_ETH_PRIVATE_KEY_3),
         ):
             self.set_agent_context(agent_name)
-            self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
-            self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-            self.add_item("skill", "fetchai/tac_participation:0.8.0")
-            self.add_item("skill", "fetchai/tac_negotiation:0.9.0")
+            self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
+            self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+            self.add_item("skill", "fetchai/tac_participation:0.9.0")
+            self.add_item("skill", "fetchai/tac_negotiation:0.10.0")
             self.set_config("agent.default_ledger", ETHEREUM)
             self.set_config(
                 "vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract",
@@ -319,7 +319,7 @@ def test_tac(self):
             )
             self.run_install()
             diff = self.difference_to_fetched_agent(
-                "fetchai/tac_participant:0.10.0", agent_name
+                "fetchai/tac_participant:0.11.0", agent_name
             )
             assert (
                 diff == []
@@ -339,7 +339,7 @@ def test_tac(self):
         setting_path = "vendor.fetchai.skills.tac_control_contract.models.parameters.args.start_time"
         self.set_config(setting_path, start_time)
         tac_controller_process = self.run_agent(
-            "--connections", "fetchai/p2p_libp2p:0.9.0"
+            "--connections", "fetchai/p2p_libp2p:0.10.0"
         )
 
         check_strings = (
@@ -359,12 +359,12 @@ def test_tac(self):
         # run two participants as well
         self.set_agent_context(tac_aea_one)
         tac_aea_one_process = self.run_agent(
-            "--connections", "fetchai/p2p_libp2p:0.9.0"
+            "--connections", "fetchai/p2p_libp2p:0.10.0"
         )
 
         self.set_agent_context(tac_aea_two)
         tac_aea_two_process = self.run_agent(
-            "--connections", "fetchai/p2p_libp2p:0.9.0"
+            "--connections", "fetchai/p2p_libp2p:0.10.0"
         )
 
         check_strings = (
diff --git a/tests/test_packages/test_skills/test_thermometer.py b/tests/test_packages/test_skills/test_thermometer.py
index 99408af8d9..0d87abf663 100644
--- a/tests/test_packages/test_skills/test_thermometer.py
+++ b/tests/test_packages/test_skills/test_thermometer.py
@@ -51,7 +51,7 @@ def test_thermometer(self):
         self.create_agents(thermometer_aea_name, thermometer_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -63,11 +63,11 @@ def test_thermometer(self):
 
         # add packages for agent one and run it
         self.set_agent_context(thermometer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/thermometer:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/thermometer:0.12.0")
         setting_path = (
             "vendor.fetchai.skills.thermometer.models.strategy.args.is_ledger_tx"
         )
@@ -95,11 +95,11 @@ def test_thermometer(self):
 
         # add packages for agent two and run it
         self.set_agent_context(thermometer_client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/thermometer_client:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/thermometer_client:0.11.0")
         setting_path = (
             "vendor.fetchai.skills.thermometer_client.models.strategy.args.is_ledger_tx"
         )
@@ -227,7 +227,7 @@ def test_thermometer(self):
         self.create_agents(thermometer_aea_name, thermometer_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -239,17 +239,17 @@ def test_thermometer(self):
 
         # add packages for agent one and run it
         self.set_agent_context(thermometer_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/thermometer:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/thermometer:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/thermometer_aea:0.10.0", thermometer_aea_name
+            "fetchai/thermometer_aea:0.11.0", thermometer_aea_name
         )
         assert (
             diff == []
@@ -274,17 +274,17 @@ def test_thermometer(self):
 
         # add packages for agent two and run it
         self.set_agent_context(thermometer_client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/thermometer_client:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/thermometer_client:0.11.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/thermometer_client:0.10.0", thermometer_client_aea_name
+            "fetchai/thermometer_client:0.11.0", thermometer_client_aea_name
         )
         assert (
             diff == []
diff --git a/tests/test_packages/test_skills/test_weather.py b/tests/test_packages/test_skills/test_weather.py
index c514486ac3..76f159df7a 100644
--- a/tests/test_packages/test_skills/test_weather.py
+++ b/tests/test_packages/test_skills/test_weather.py
@@ -50,7 +50,7 @@ def test_weather(self):
         self.create_agents(weather_station_aea_name, weather_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -62,12 +62,12 @@ def test_weather(self):
 
         # prepare agent one (weather station)
         self.set_agent_context(weather_station_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/weather_station:0.11.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/weather_station:0.12.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         dotted_path = (
             "vendor.fetchai.skills.weather_station.models.strategy.args.is_ledger_tx"
         )
@@ -97,12 +97,12 @@ def test_weather(self):
 
         # prepare agent two (weather client)
         self.set_agent_context(weather_client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/weather_client:0.10.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/weather_client:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         dotted_path = (
             "vendor.fetchai.skills.weather_client.models.strategy.args.is_ledger_tx"
         )
@@ -222,7 +222,7 @@ def test_weather(self):
         self.create_agents(weather_station_aea_name, weather_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.5.0",
+            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
             "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
         }
 
@@ -234,17 +234,17 @@ def test_weather(self):
 
         # add packages for agent one
         self.set_agent_context(weather_station_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/weather_station:0.11.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/weather_station:0.12.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/weather_station:0.12.0", weather_station_aea_name
+            "fetchai/weather_station:0.13.0", weather_station_aea_name
         )
         assert (
             diff == []
@@ -271,17 +271,17 @@ def test_weather(self):
 
         # add packages for agent two
         self.set_agent_context(weather_client_aea_name)
-        self.add_item("connection", "fetchai/p2p_libp2p:0.9.0")
+        self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/soef:0.8.0")
-        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.9.0")
-        self.add_item("connection", "fetchai/ledger:0.5.0")
-        self.add_item("skill", "fetchai/weather_client:0.10.0")
+        self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
+        self.add_item("skill", "fetchai/weather_client:0.11.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
-            "fetchai/weather_client:0.12.0", weather_client_aea_name
+            "fetchai/weather_client:0.13.0", weather_client_aea_name
         )
         assert (
             diff == []
diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index 29f86eacec..35c145764a 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -80,7 +80,7 @@ def setup_class(cls):
         cls.registry = AgentComponentRegistry()
         cls.registry.register(contract.component_id, cast(Contract, contract))
         cls.expected_contract_ids = {
-            PublicId.from_str("fetchai/erc1155:0.9.0"),
+            PublicId.from_str("fetchai/erc1155:0.10.0"),
         }
 
     def test_fetch_all(self):
@@ -91,14 +91,14 @@ def test_fetch_all(self):
 
     def test_fetch(self):
         """Test that the `fetch` method works as expected."""
-        contract_id = PublicId.from_str("fetchai/erc1155:0.9.0")
+        contract_id = PublicId.from_str("fetchai/erc1155:0.10.0")
         contract = self.registry.fetch(ComponentId(ComponentType.CONTRACT, contract_id))
         assert isinstance(contract, Contract)
         assert contract.id == contract_id
 
     def test_unregister(self):
         """Test that the 'unregister' method works as expected."""
-        contract_id_removed = PublicId.from_str("fetchai/erc1155:0.9.0")
+        contract_id_removed = PublicId.from_str("fetchai/erc1155:0.10.0")
         component_id = ComponentId(ComponentType.CONTRACT, contract_id_removed)
         contract_removed = self.registry.fetch(component_id)
         self.registry.unregister(contract_removed.component_id)
@@ -243,7 +243,7 @@ def setup_class(cls):
         cls.error_skill_public_id = DEFAULT_SKILL
         cls.dummy_skill_public_id = PublicId.from_str("dummy_author/dummy:0.1.0")
 
-        cls.contract_public_id = PublicId.from_str("fetchai/erc1155:0.9.0")
+        cls.contract_public_id = PublicId.from_str("fetchai/erc1155:0.10.0")
 
     def test_unregister_handler(self):
         """Test that the unregister of handlers work correctly."""

From ab2a4f335292e3a75127a5f921fcea5ebb8ecc64 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Fri, 18 Sep 2020 00:15:54 +0100
Subject: [PATCH 011/131] fix broken tests

---
 docs/agent-vs-aea.md                 | 9 +++++++++
 tests/test_cli_gui/test_get_items.py | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index 354a7c09ae..a49868c25d 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -186,12 +186,20 @@ class MyAgent(Agent):
         super().__init__(identity, connections)
 
     def setup(self):
+        """Setup the agent."""
         pass
 
     def act(self):
+        """Act implementation."""
         print("Act called for tick {}".format(self.tick))
 
     def handle_envelope(self, envelope: Envelope) -> None:
+        """
+        Handle envelope.
+
+        :param envelope: the envelope received
+        :return: None
+        """
         print("React called for tick {}".format(self.tick))
         if envelope is not None and envelope.protocol_id == DefaultMessage.protocol_id:
             sender = envelope.sender
@@ -209,6 +217,7 @@ class MyAgent(Agent):
             self.outbox.put(envelope)
 
     def teardown(self):
+        """Teardown the agent."""
         pass
 
 
diff --git a/tests/test_cli_gui/test_get_items.py b/tests/test_cli_gui/test_get_items.py
index 9d2a850eb6..3522a5cae0 100644
--- a/tests/test_cli_gui/test_get_items.py
+++ b/tests/test_cli_gui/test_get_items.py
@@ -94,4 +94,4 @@ def test_get_local_items_negative(self, *mocks):
 
         result = json.loads(response.get_data(as_text=True))
         expected_result = "Failed to list agent items."
-        self.assertEqual(result["detail"], expected_result)
+        self.assertEqual(result[0]["detail"], expected_result)

From 9f1c9cc3703b9cba333186a4eb909a67f4a1b77b Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Sat, 19 Sep 2020 20:47:01 +0100
Subject: [PATCH 012/131] part 1 of refactoring tac_control_*, removing
 duplicate code

---
 .../fetchai/protocols/contract_api/README.md  |   2 +-
 packages/fetchai/protocols/gym/README.md      |   2 +-
 .../fetchai/skills/tac_control/behaviours.py  |   1 +
 packages/fetchai/skills/tac_control/game.py   |  24 +-
 .../fetchai/skills/tac_control/helpers.py     |  80 +-
 .../fetchai/skills/tac_control/parameters.py  | 156 ++-
 .../fetchai/skills/tac_control/skill.yaml     |   3 +-
 .../skills/tac_control_contract/behaviours.py | 304 ++----
 .../skills/tac_control_contract/dialogues.py  |  59 ++
 .../skills/tac_control_contract/game.py       | 899 +-----------------
 .../skills/tac_control_contract/handlers.py   | 187 +---
 .../skills/tac_control_contract/helpers.py    | 321 -------
 .../skills/tac_control_contract/parameters.py | 212 +----
 .../skills/tac_control_contract/skill.yaml    |  25 +-
 14 files changed, 451 insertions(+), 1824 deletions(-)
 create mode 100644 packages/fetchai/skills/tac_control_contract/dialogues.py
 delete mode 100644 packages/fetchai/skills/tac_control_contract/helpers.py

diff --git a/packages/fetchai/protocols/contract_api/README.md b/packages/fetchai/protocols/contract_api/README.md
index 19ea53f3d3..532ccff9b0 100644
--- a/packages/fetchai/protocols/contract_api/README.md
+++ b/packages/fetchai/protocols/contract_api/README.md
@@ -10,7 +10,7 @@ This is a protocol for contract APIs' requests and responses.
 ---
 name: contract_api
 author: fetchai
-version: 0.4.0
+version: 0.5.0
 description: A protocol for contract APIs requests and responses.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/protocols/gym/README.md b/packages/fetchai/protocols/gym/README.md
index 53f7d0095a..791f5a109b 100644
--- a/packages/fetchai/protocols/gym/README.md
+++ b/packages/fetchai/protocols/gym/README.md
@@ -10,7 +10,7 @@ This is a protocol for interacting with a gym connection.
 ---
 name: gym
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 description: A protocol for interacting with a gym connection.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/skills/tac_control/behaviours.py b/packages/fetchai/skills/tac_control/behaviours.py
index 50df1bcc61..658d9e41fd 100644
--- a/packages/fetchai/skills/tac_control/behaviours.py
+++ b/packages/fetchai/skills/tac_control/behaviours.py
@@ -205,6 +205,7 @@ def _start_tac(self, game: Game):
                 agent_addr_to_name=game.conf.agent_addr_to_name,
                 good_id_to_name=game.conf.good_id_to_name,
                 version_id=game.conf.version_id,
+                info={"contract_address": game.conf.contract_address},
             )
             self.context.outbox.put_message(message=tac_msg)
             self.context.logger.debug(
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 99cd613e18..d3624c88d0 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -45,11 +45,9 @@
 from packages.fetchai.skills.tac_control.helpers import (
     determine_scaling_factor,
     generate_currency_endowments,
-    generate_currency_id_to_name,
     generate_equilibrium_prices_and_holdings,
     generate_exchange_params,
     generate_good_endowments,
-    generate_good_id_to_name,
     generate_utility_params,
 )
 from packages.fetchai.skills.tac_control.parameters import Parameters
@@ -72,10 +70,20 @@ class Phase(Enum):
     """This class defines the phases of the game."""
 
     PRE_GAME = "pre_game"
+    CONTRACT_DEPLOYMENT_PROPOSAL = "contract_deployment_proposal"
+    CONTRACT_DEPLOYING = "contract_deploying"
+    CONTRACT_DEPLOYED = "contract_deployed"
     GAME_REGISTRATION = "game_registration"
     GAME_SETUP = "game_setup"
+    TOKENS_CREATION_PROPOSAL = "token_creation_proposal"  # nosec
+    TOKENS_CREATING = "tokens_creating"
+    TOKENS_CREATED = "tokens_created"  # nosec
+    TOKENS_MINTING_PROPOSAL = "token_minting_proposal"
+    TOKENS_MINTING = "token_minting"  # nosec
+    TOKENS_MINTED = "tokens_minted"  # nosec
     GAME = "game"
     POST_GAME = "post_game"
+    CANCELLED_GAME = "cancelled_game"
 
 
 class Configuration:
@@ -86,7 +94,8 @@ def __init__(
         version_id: str,
         tx_fee: int,
         agent_addr_to_name: Dict[Address, str],
-        nb_goods: int,
+        currency_id_to_name: Dict[str, str],
+        good_id_to_name: Dict[str, str],
     ):
         """
         Instantiate a game configuration.
@@ -95,12 +104,13 @@ def __init__(
         :param tx_fee: the fee for a transaction.
         :param agent_addr_to_name: a dictionary mapping agent addresses to agent names (as strings).
         :param nb_goods: the number of goods.
+        :param nb_currencies: the number of currencies.
         """
         self._version_id = version_id
         self._tx_fee = tx_fee
         self._agent_addr_to_name = agent_addr_to_name
-        self._currency_id_to_name = generate_currency_id_to_name()
-        self._good_id_to_name = generate_good_id_to_name(nb_goods)
+        self._currency_id_to_name = currency_id_to_name
+        self._good_id_to_name = good_id_to_name
         self._check_consistency()
 
     @property
@@ -724,6 +734,7 @@ def phase(self) -> Phase:
     @phase.setter
     def phase(self, phase: Phase) -> None:
         """Set the game phase."""
+        self.context.logger.debug("Game phase set to: {}".format(phase))
         self._phase = phase
 
     @property
@@ -778,7 +789,8 @@ def _generate(self):
             parameters.version_id,
             parameters.tx_fee,
             self.registration.agent_addr_to_name,
-            parameters.nb_goods,
+            parameters.currency_id_to_name,
+            parameters.good_id_to_name,
         )
 
         scaling_factor = determine_scaling_factor(parameters.money_endowment)
diff --git a/packages/fetchai/skills/tac_control/helpers.py b/packages/fetchai/skills/tac_control/helpers.py
index fbe56fa922..1e830f35ad 100644
--- a/packages/fetchai/skills/tac_control/helpers.py
+++ b/packages/fetchai/skills/tac_control/helpers.py
@@ -20,37 +20,93 @@
 
 """This module contains the helpers methods for the controller agent."""
 
-import math
 import random
-from typing import Dict, List, Tuple, cast
+from typing import Dict, List, Optional, Tuple, cast
 
 import numpy as np
 
 from aea.exceptions import enforce
 
+from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
+
 QUANTITY_SHIFT = 1  # Any non-negative integer is fine.
-DEFAULT_CURRENCY_ID_TO_NAME = {"0": "FET"}
+FT_NAME = "FT"
+FT_ID = 2
 
 
-def generate_currency_id_to_name() -> Dict[str, str]:
+def generate_good_ids(nb_goods: int) -> List[int]:
     """
-    Generate ids for currencies.
+    Generate ids for things.
 
-    :return: a dictionary mapping currency' ids to names.
+    :param nb_goods: the number of things.
+    :param contract: the instance of the contract
     """
-    return DEFAULT_CURRENCY_ID_TO_NAME
+    good_ids = ERC1155Contract.generate_token_ids(FT_ID, nb_goods)
+    enforce(
+        len(good_ids) == nb_goods, "Length of good ids and number of goods must match."
+    )
+    return good_ids
 
 
-def generate_good_id_to_name(nb_goods: int) -> Dict[str, str]:
+def generate_currency_ids(nb_currencies: int) -> List[int]:
     """
-    Generate ids for things.
+    Generate currency ids.
+
+    :param nb_currencies: the number of currencies.
+    :param contract: the instance of the contract.
+    """
+    currency_ids = ERC1155Contract.generate_token_ids(FT_ID, nb_currencies)
+    enforce(
+        len(currency_ids) == nb_currencies,
+        "Length of currency ids and number of currencies must match.",
+    )
+    return currency_ids
+
+
+def generate_currency_id_to_name(
+    nb_currencies: int, currency_ids: Optional[List[int]] = None
+) -> Dict[str, str]:
+    """
+    Generate a dictionary mapping good ids to names.
+
+    :param nb_currencies: the number of currencies.
+    :param currency_ids: the currency ids
+    :return: a dictionary mapping currency's ids to names.
+    """
+    if currency_ids is not None:
+        enforce(
+            len(currency_ids) == nb_currencies,
+            "Length of currency_ids does not match nb_currencies.",
+        )
+    else:
+        currency_ids = generate_currency_ids(nb_currencies)
+    currency_id_to_name = {
+        str(currency_id): "{}_{}".format(FT_NAME, currency_id)
+        for currency_id in currency_ids
+    }
+    return currency_id_to_name
+
+
+def generate_good_id_to_name(
+    nb_goods: int, good_ids: Optional[List[int]] = None
+) -> Dict[str, str]:
+    """
+    Generate a dictionary mapping good ids to names.
 
     :param nb_goods: the number of things.
+    :param good_ids: a list of good ids
     :return: a dictionary mapping goods' ids to names.
     """
-    max_number_of_digits = math.ceil(math.log10(nb_goods))
-    string_format = "tac_good_{:0" + str(max_number_of_digits) + "}"
-    return {str(i + 1): string_format.format(i + 1) for i in range(nb_goods)}
+    if good_ids is not None:
+        enforce(
+            len(good_ids) == nb_goods, "Length of good_ids does not match nb_goods."
+        )
+    else:
+        good_ids = generate_good_ids(nb_goods)
+    good_id_to_name = {
+        str(good_id): "{}_{}".format(FT_NAME, good_id) for good_id in good_ids
+    }
+    return good_id_to_name
 
 
 def determine_scaling_factor(money_endowment: int) -> float:
diff --git a/packages/fetchai/skills/tac_control/parameters.py b/packages/fetchai/skills/tac_control/parameters.py
index 8198910907..a93b1b2ab1 100644
--- a/packages/fetchai/skills/tac_control/parameters.py
+++ b/packages/fetchai/skills/tac_control/parameters.py
@@ -20,12 +20,30 @@
 """This package contains a class representing the game parameters."""
 
 import datetime
-from typing import Dict, Set
+from typing import Dict, List, Optional, Set
 
-from aea.exceptions import enforce
-from aea.helpers.search.models import Location
+from aea.exceptions import AEAEnforceError, enforce
+from aea.helpers.search.models import (
+    Location,
+)
 from aea.skills.base import Model
 
+from packages.fetchai.skills.tac_control.helpers import generate_currency_id_to_name, generate_good_id_to_name
+
+DEFAULT_LEDGER_ID = "ethereum"
+DEFAULT_MIN_NB_AGENTS = 2
+DEFAULT_MONEY_ENDOWMENT = 200
+DEFAULT_NB_GOODS = 9  # ERC1155 vyper contract only accepts 10 tokens per mint/create
+DEFAULT_NB_CURRENCIES = 1
+DEFAULT_TX_FEE = 1
+DEFAULT_BASE_GOOD_ENDOWMENT = 2
+DEFAULT_LOWER_BOUND_FACTOR = 1
+DEFAULT_UPPER_BOUND_FACTOR = 1
+DEFAULT_START_TIME = "01 01 2020  00:01"
+DEFAULT_REGISTRATION_TIMEOUT = 60
+DEFAULT_ITEM_SETUP_TIMEOUT = 60
+DEFAULT_COMPETITION_TIMEOUT = 300
+DEFAULT_INACTIVITY_TIMEOUT = 30
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
 DEFAULT_SERVICE_DATA = {"key": "tac", "value": "v1"}
 
@@ -35,20 +53,50 @@ class Parameters(Model):
 
     def __init__(self, **kwargs):
         """Instantiate the search class."""
-        self._min_nb_agents = kwargs.pop("min_nb_agents", 5)  # type: int
-        self._money_endowment = kwargs.pop("money_endowment", 200)  # type: int
-        self._nb_goods = kwargs.pop("nb_goods", 5)  # type: int
-        self._tx_fee = kwargs.pop("tx_fee", 1)
-        self._base_good_endowment = kwargs.pop("base_good_endowment", 2)  # type: int
-        self._lower_bound_factor = kwargs.pop("lower_bound_factor", 1)  # type: int
-        self._upper_bound_factor = kwargs.pop("upper_bound_factor", 1)  # type: int
-        start_time = kwargs.pop("start_time", "01 01 2020  00:01")  # type: str
+        self._ledger_id = kwargs.pop("ledger_id", DEFAULT_LEDGER_ID)
+        self._contract_address = kwargs.pop(
+            "contract_adress", None
+        )  # type: Optional[str]
+        self._good_ids = kwargs.pop("good_ids", None)  # type: Optional[List[int]]
+        self._currency_ids = kwargs.pop(
+            "currency_ids", None
+        )  # type: Optional[List[int]]
+        self._min_nb_agents = kwargs.pop(
+            "min_nb_agents", DEFAULT_MIN_NB_AGENTS
+        )  # type: int
+        self._money_endowment = kwargs.pop(
+            "money_endowment", DEFAULT_MONEY_ENDOWMENT
+        )  # type: int
+        self._nb_goods = kwargs.pop("nb_goods", DEFAULT_NB_GOODS)  # type: int
+        self._nb_currencies = kwargs.pop(
+            "nb_currencies", DEFAULT_NB_CURRENCIES
+        )  # type: int
+        self._tx_fee = kwargs.pop("tx_fee", DEFAULT_TX_FEE)  # type: int
+        self._base_good_endowment = kwargs.pop(
+            "base_good_endowment", DEFAULT_BASE_GOOD_ENDOWMENT
+        )  # type: int
+        self._lower_bound_factor = kwargs.pop(
+            "lower_bound_factor", DEFAULT_LOWER_BOUND_FACTOR
+        )  # type: int
+        self._upper_bound_factor = kwargs.pop(
+            "upper_bound_factor", DEFAULT_UPPER_BOUND_FACTOR
+        )  # type: int
+        start_time = kwargs.pop("start_time", DEFAULT_START_TIME)  # type: str
         self._start_time = datetime.datetime.strptime(
             start_time, "%d %m %Y %H:%M"
         )  # type: datetime.datetime
-        self._registration_timeout = kwargs.pop("registration_timeout", 10)  # type: int
-        self._competition_timeout = kwargs.pop("competition_timeout", 20)  # type: int
-        self._inactivity_timeout = kwargs.pop("inactivity_timeout", 10)  # type: int
+        self._registration_timeout = kwargs.pop(
+            "registration_timeout", DEFAULT_REGISTRATION_TIMEOUT
+        )  # type: int
+        self._item_setup_timeout = kwargs.pop(
+            "item_setup_timeout", DEFAULT_ITEM_SETUP_TIMEOUT
+        )  # type: int
+        self._competition_timeout = kwargs.pop(
+            "competition_timeout", DEFAULT_COMPETITION_TIMEOUT
+        )  # type: int
+        self._inactivity_timeout = kwargs.pop(
+            "inactivity_timeout", DEFAULT_INACTIVITY_TIMEOUT
+        )  # type: int
         self._whitelist = set(kwargs.pop("whitelist", []))  # type: Set[str]
         self._location = kwargs.pop("location", DEFAULT_LOCATION)
         self._service_data = kwargs.pop("service_data", DEFAULT_SERVICE_DATA)
@@ -72,19 +120,55 @@ def __init__(self, **kwargs):
         }
 
         super().__init__(**kwargs)
+        self._currency_id_to_name = generate_currency_id_to_name(
+            self.nb_currencies, self.currency_ids
+        )
+        self._good_id_to_name = generate_good_id_to_name(self.nb_goods, self.good_ids)
         now = datetime.datetime.now()
         if now > self.registration_start_time:
             self.context.logger.warning(
-                "TAC registration start time {} is in the past!".format(
+                "TAC registration start time {} is in the past! Deregistering skill.".format(
                     self.registration_start_time
                 )
             )
+            self.context.is_active = False
         else:
             self.context.logger.info(
-                "TAC registation start time: {}, and start time: {}, and end time: {}".format(
-                    self.registration_start_time, self.start_time, self.end_time,
+                "TAC registation start time: {}, and registration end time: {}, and start time: {}, and end time: {}".format(
+                    self.registration_start_time,
+                    self.registration_end_time,
+                    self.start_time,
+                    self.end_time,
                 )
             )
+        self._check_consistency()
+
+    @property
+    def ledger_id(self) -> str:
+        """Get the ledger identifier."""
+        return self._ledger_id
+
+    @property
+    def contract_address(self) -> str:
+        """The contract address of an already deployed smart-contract."""
+        if self._contract_address is None:
+            raise AEAEnforceError("No contract address provided.")
+        return self._contract_address
+
+    @property
+    def is_contract_deployed(self) -> bool:
+        """Check if there is a deployed instance of the contract."""
+        return self._contract_address is not None
+
+    @property
+    def good_ids(self) -> Optional[List[int]]:
+        """The item ids of an already deployed smart-contract."""
+        return self._good_ids
+
+    @property
+    def currency_ids(self) -> Optional[List[int]]:
+        """The currency ids of an already deployed smart-contract."""
+        return self._currency_ids
 
     @property
     def min_nb_agents(self) -> int:
@@ -101,6 +185,21 @@ def nb_goods(self) -> int:
         """Good number for a TAC instance."""
         return self._nb_goods
 
+    @property
+    def nb_currencies(self) -> int:
+        """Currency number for a TAC instance."""
+        return self._nb_goods
+
+    @property
+    def currency_id_to_name(self) -> Dict[str, str]:
+        """Mapping of currency ids to names"""
+        return self._currency_id_to_name
+
+    @property
+    def good_id_to_name(self) -> Dict[str, str]:
+        """Mapping of good ids to names."""
+        return self._good_id_to_name
+
     @property
     def tx_fee(self) -> int:
         """Transaction fee for a TAC instance."""
@@ -124,7 +223,16 @@ def upper_bound_factor(self) -> int:
     @property
     def registration_start_time(self) -> datetime.datetime:
         """TAC registration start time."""
-        return self._start_time - datetime.timedelta(seconds=self._registration_timeout)
+        return (
+            self._start_time
+            - datetime.timedelta(seconds=self._item_setup_timeout)
+            - datetime.timedelta(seconds=self._registration_timeout)
+        )
+
+    @property
+    def registration_end_time(self) -> datetime.datetime:
+        """TAC registration end time."""
+        return self._start_time - datetime.timedelta(seconds=self._item_setup_timeout)
 
     @property
     def start_time(self) -> datetime.datetime:
@@ -170,3 +278,15 @@ def remove_service_data(self) -> Dict[str, str]:
     def simple_service_data(self) -> Dict[str, str]:
         """Get the simple service data."""
         return self._simple_service_data
+
+    def _check_consistency(self) -> None:
+        """Check the parameters are consistent."""
+        if self._contract_address is not None and (
+            self._good_ids is not None
+            or self._currency_ids is not None
+            or len(self._good_ids) != self._nb_goods
+            or len(self._currency_ids) != self._nb_currencies
+        ):
+            raise ValueError(
+                "If the contract address is set, then good ids and currency id must be provided and consistent."
+            )
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 8417c0f319..4cb9306bc0 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -16,7 +16,8 @@ fingerprint:
   helpers.py: QmdG31YUJakBz8FdNNxU6RxqhWy9iv1BG253PzfxBhzqq2
   parameters.py: QmQB95beEKzyA8Aa7Y9HTPw6BPEVi6BGkpsUqN4QZ4DcVG
 fingerprint_ignore_patterns: []
-contracts: []
+contracts:
+- fetchai/erc1155:0.10.0
 protocols:
 - fetchai/oef_search:0.6.0
 - fetchai/tac:0.6.0
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 28562d5ae1..702a2ef1a9 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -20,18 +20,17 @@
 """This package contains the behaviours."""
 
 import datetime
-from typing import List, Optional, cast
+from typing import List, cast
 
-from aea.crypto.base import LedgerApi
-from aea.helpers.search.models import Attribute, DataModel, Description
-from aea.protocols.signing.message import SigningMessage
-from aea.skills.behaviours import SimpleBehaviour, TickerBehaviour
+from aea.skills.behaviours import TickerBehaviour
 
-from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
-from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-from packages.fetchai.protocols.tac.message import TacMessage
+from packages.fetchai.protocols.contract_api.message import ContractApiMessage
+from packages.fetchai.skills.tac_control.behaviours import TacBehaviour
+from packages.fetchai.skills.tac_control_contract.dialogues import (
+    ContractApiDialogue,
+    ContractApiDialogues,
+)
 from packages.fetchai.skills.tac_control_contract.game import (
-    AgentState,
     Configuration,
     Game,
     Phase,
@@ -44,65 +43,47 @@
 )
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
-CONTROLLER_DATAMODEL = DataModel(
-    "tac",
-    [Attribute("version", str, True, "Version number of the TAC Controller Agent.")],
-)
+LEDGER_API_ADDRESS = "///"
 
 
-class TACBehaviour(SimpleBehaviour):
+class TacBehaviour(TacBehaviour):
     """This class implements the TAC control behaviour."""
 
-    def __init__(self, **kwargs):
-        """Instantiate the behaviour."""
-        super().__init__(**kwargs)
-        self._oef_msg_id = 0
-        self._registered_desc = None  # type: Optional[Description]
-
     def setup(self) -> None:
         """
         Implement the setup.
 
         :return: None
         """
+        super().setup()
         parameters = cast(Parameters, self.context.parameters)
-        contract = cast(ERC1155Contract, self.context.contracts.erc1155)
-        ledger_api = self.context.ledger_apis.get_api(parameters.ledger)
-        if parameters.is_contract_deployed:
-            self._set_game(parameters, ledger_api, contract)
-        else:
-            self._deploy_contract(ledger_api, contract)
+        if not parameters.is_contract_deployed:
+            self._request_contract_deploy_transaction()
 
-    def _set_game(  # pylint: disable=unused-argument
-        self, parameters: Parameters, ledger_api: LedgerApi, contract: ERC1155Contract
-    ) -> None:
-        """Set the contract and configuration based on provided parameters."""
-        game = cast(Game, self.context.game)
-        game.phase = Phase.CONTRACT_DEPLOYED
-        self.context.logger.info("Setting up the game")
-        configuration = Configuration(parameters.version_id, parameters.tx_fee,)
-        configuration.good_id_to_name = generate_good_id_to_name(parameters.good_ids)
-        configuration.currency_id_to_name = generate_currency_id_to_name(
-            parameters.currency_ids
-        )
-        configuration.contract_address = parameters.contract_address
-        game.conf = configuration
+    def _request_contract_deploy_transaction(self) -> None:
+        """
+        Request contract deploy transaction
 
-    def _deploy_contract(  # pylint: disable=unused-argument
-        self, ledger_api: LedgerApi, contract: ERC1155Contract
-    ) -> None:
-        """Send deploy contract tx msg to decision maker."""
-        game = cast(Game, self.context.game)
-        game.phase = Phase.CONTRACT_DEPLOYMENT_PROPOSAL
-        self.context.logger.info("sending deploy transaction to decision maker.")
-        # request deploy tx # noqa: E800
-        # contract.set_instance(ledger_api) # noqa: E800
-        # transaction_message = contract.get_deploy_transaction_msg( # noqa: E800
-        #     deployer_address=self.context.agent_address, # noqa: E800
-        #     ledger_api=ledger_api, # noqa: E800
-        #     skill_callback_id=self.context.skill_id, # noqa: E800
-        # ) # noqa: E800
-        # self.context.decision_maker_message_queue.put_nowait(transaction_message) # noqa: E800
+        :return: None
+        """
+        parameters = cast(Parameters, self.context.parameters)
+        contract_api_dialogues = cast(
+            ContractApiDialogues, self.context.contract_api_dialogues
+        )
+        contract_api_msg, contract_api_dialogue = contract_api_dialogues.create(
+            counterparty=LEDGER_API_ADDRESS,
+            performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
+            ledger_id=parameters.ledger_id,
+            contract_id="fetchai/erc1155:0.10.0",
+            callable="get_deploy_transaction",
+            kwargs=ContractApiMessage.Kwargs(
+                {"deployer_address": self.context.agent_address}
+            ),
+        )
+        contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue,)
+        contract_api_dialogue.terms = strategy.get_deploy_terms()
+        self.context.outbox.put_message(message=contract_api_msg)
+        self.context.logger.info("requesting contract deployment transaction...")
 
     def act(self) -> None:
         """
@@ -113,8 +94,6 @@ def act(self) -> None:
         game = cast(Game, self.context.game)
         parameters = cast(Parameters, self.context.parameters)
         now = datetime.datetime.now()
-        contract = cast(ERC1155Contract, self.context.contracts.erc1155)
-        ledger_api = self.context.ledger_apis.get_api(parameters.ledger)
         if (
             game.phase.value == Phase.CONTRACT_DEPLOYED.value
             and parameters.registration_start_time
@@ -123,19 +102,22 @@ def act(self) -> None:
         ):
             game.phase = Phase.GAME_REGISTRATION
             self._register_tac(parameters)
+            self.context.logger.info(
+                "TAC open for registration until: {}".format(parameters.start_time)
+            )
         elif (
             game.phase.value == Phase.GAME_REGISTRATION.value
             and parameters.registration_end_time < now < parameters.start_time
         ):
             self.context.logger.info("closing registration!")
             if game.registration.nb_agents < parameters.min_nb_agents:
-                game.phase = Phase.CANCELLED_GAME
                 self.context.logger.info(
                     "registered agents={}, minimum agents required={}".format(
                         game.registration.nb_agents, parameters.min_nb_agents,
                     )
                 )
-                self._end_tac(game, "cancelled")
+                self._cancel_tac(game)
+                game.phase = Phase.POST_GAME
                 self._unregister_tac()
                 self.context.is_active = False
             else:
@@ -147,10 +129,10 @@ def act(self) -> None:
             and parameters.registration_end_time < now < parameters.start_time
         ):
             game.phase = Phase.TOKENS_CREATION_PROPOSAL
-            self._create_items(game, ledger_api, contract)
+            self._request_create_items_transaction(game)
         elif game.phase.value == Phase.TOKENS_CREATED.value:
             game.phase = Phase.TOKENS_MINTING_PROPOSAL
-            self._mint_items(game, ledger_api, contract)
+            self._request_mint_items_transaction(game)
         elif (
             game.phase.value == Phase.TOKENS_MINTED.value
             and parameters.start_time < now < parameters.end_time
@@ -159,8 +141,7 @@ def act(self) -> None:
             self._start_tac(game)
         elif game.phase.value == Phase.GAME.value and now > parameters.end_time:
             game.phase = Phase.POST_GAME
-            self._end_tac(game, "finished")
-            self._game_finished_summary(game)
+            self._cancel_tac(game)
             self.context.is_active = False
 
     def teardown(self) -> None:
@@ -169,160 +150,75 @@ def teardown(self) -> None:
 
         :return: None
         """
-        if self._registered_desc is not None:
-            self._unregister_tac()
+        super().teardown()
 
-    def _register_tac(self, parameters) -> None:
+    def _request_create_items_transaction(self, game: Game) -> None:
         """
-        Register on the OEF as a TAC controller agent.
+        Request token create transaction
 
-        :return: None.
+        :return: None
         """
-        self._oef_msg_id += 1
-        desc = Description(
-            {"version": parameters.version_id}, data_model=CONTROLLER_DATAMODEL,
-        )
-        self.context.logger.info("registering TAC data model")
-        oef_msg = OefSearchMessage(
-            performative=OefSearchMessage.Performative.REGISTER_SERVICE,
-            dialogue_reference=(str(self._oef_msg_id), ""),
-            service_description=desc,
+        parameters = cast(Parameters, self.context.parameters)
+        contract_api_dialogues = cast(
+            ContractApiDialogues, self.context.contract_api_dialogues
         )
-        oef_msg.to = self.context.search_service_address
-        self.context.outbox.put_message(message=oef_msg)
-        self._registered_desc = desc
-        self.context.logger.info(
-            "TAC open for registration until: {}".format(
-                parameters.registration_end_time
-            )
+        token_ids = [int(good_id) for good_id in game.conf.good_id_to_name.keys()] + [
+            int(currency_id) for currency_id in game.conf.currency_id_to_name.keys()
+        ]
+        contract_api_msg, contract_api_dialogue = contract_api_dialogues.create(
+            counterparty=LEDGER_API_ADDRESS,
+            performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
+            ledger_id=parameters.ledger_id,
+            contract_id="fetchai/erc1155:0.10.0",
+            callable="get_create_batch_transaction",
+            kwargs=ContractApiMessage.Kwargs(
+                {"deployer_address": self.context.agent_address, "token_ids": token_ids}
+            ),
         )
+        contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
+        contract_api_dialogue.terms = strategy.get_create_items_terms()
+        self.context.outbox.put_message(message=contract_api_msg)
+        self.context.logger.info("requesting create items transaction...")
 
-    def _unregister_tac(self) -> None:
+    def _request_mint_items_transaction(self, game: Game) -> None:
         """
-        Unregister from the OEF as a TAC controller agent.
+        Request token mint transaction
 
-        :return: None.
+        :return: None
         """
-        if self._registered_desc is not None:
-            self._oef_msg_id += 1
-            self.context.logger.info("unregistering TAC data model")
-            oef_msg = OefSearchMessage(
-                performative=OefSearchMessage.Performative.UNREGISTER_SERVICE,
-                dialogue_reference=(str(self._oef_msg_id), ""),
-                service_description=self._registered_desc,
-            )
-            oef_msg.to = self.context.search_service_address
-            self.context.outbox.put_message(message=oef_msg)
-            self._registered_desc = None
-
-    def _create_items(
-        self, game: Game, ledger_api: LedgerApi, contract: ERC1155Contract
-    ) -> None:
-        """Send create items transaction to decision maker."""
-        self.context.logger.info("sending create_items transaction to decision maker.")
-        tx_msg = self._get_create_items_tx_msg(  # pylint: disable=assignment-from-none
-            game.conf, ledger_api, contract
-        )
-        self.context.decision_maker_message_queue.put_nowait(tx_msg)
-
-    def _mint_items(
-        self, game: Game, ledger_api: LedgerApi, contract: ERC1155Contract
-    ) -> None:
-        """Send mint items transactions to decision maker."""
-        self.context.logger.info("sending mint_items transactions to decision maker.")
+        self.context.logger.info("requesting mint_items transactions.")
         for agent_state in game.initial_agent_states.values():
-            tx_msg = self._get_mint_goods_and_currency_tx_msg(  # pylint: disable=assignment-from-none
-                agent_state, ledger_api, contract
+            parameters = cast(Parameters, self.context.parameters)
+            token_ids = []  # type: List[int]
+            mint_quantities = []  # type: List[int]
+            for good_id, quantity in agent_state.quantities_by_good_id.items():
+                token_ids.append(int(good_id))
+                mint_quantities.append(quantity)
+            for currency_id, amount in agent_state.amount_by_currency_id.items():
+                token_ids.append(int(currency_id))
+                mint_quantities.append(amount)
+            contract_api_dialogues = cast(
+                ContractApiDialogues, self.context.contract_api_dialogues
             )
-            self.context.decision_maker_message_queue.put_nowait(tx_msg)
-
-    def _start_tac(self, game: Game) -> None:
-        """Create a game and send the game configuration to every registered agent."""
-        self.context.logger.info(
-            "starting competition with configuration:\n{}".format(game.holdings_summary)
-        )
-        self.context.logger.info(
-            "computed theoretical equilibrium:\n{}".format(game.equilibrium_summary)
-        )
-        for agent_address in game.conf.agent_addr_to_name.keys():
-            agent_state = game.current_agent_states[agent_address]
-            tac_msg = TacMessage(
-                performative=TacMessage.Performative.GAME_DATA,
-                amount_by_currency_id=agent_state.amount_by_currency_id,
-                exchange_params_by_currency_id=agent_state.exchange_params_by_currency_id,
-                quantities_by_good_id=agent_state.quantities_by_good_id,
-                utility_params_by_good_id=agent_state.utility_params_by_good_id,
-                tx_fee=game.conf.tx_fee,
-                agent_addr_to_name=game.conf.agent_addr_to_name,
-                good_id_to_name=game.conf.good_id_to_name,
-                currency_id_to_name=game.conf.currency_id_to_name,
-                version_id=game.conf.version_id,
-                info={"contract_address": game.conf.contract_address},
-            )
-            self.context.logger.debug(
-                "sending game data to '{}'.".format(agent_address)
+            contract_api_msg, contract_api_dialogue = contract_api_dialogues.create(
+                counterparty=LEDGER_API_ADDRESS,
+                performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
+                ledger_id=parameters.ledger_id,
+                contract_id="fetchai/erc1155:0.10.0",
+                contract_address=parameters.contract_address,
+                callable="get_mint_batch_transaction",
+                kwargs=ContractApiMessage.Kwargs(
+                    {
+                        "deployer_address": self.context.agent_address,
+                        "recipient_address": self.context.agent_address,
+                        "token_ids": token_ids,
+                        "mint_quantities": mint_quantities,
+                    }
+                ),
             )
-            self.context.logger.debug("game data={}".format(str(tac_msg)))
-            tac_msg.to = agent_address
-            self.context.outbox.put_message(message=tac_msg)
-
-    def _end_tac(self, game: Game, reason: str) -> None:
-        """Notify agents that the TAC is cancelled."""
-        self.context.logger.info("notifying agents that TAC is {}.".format(reason))
-        for agent_addr in game.registration.agent_addr_to_name.keys():
-            tac_msg = TacMessage(performative=TacMessage.Performative.CANCELLED)
-            tac_msg.to = agent_addr
-            self.context.outbox.put_message(message=tac_msg)
-
-    def _game_finished_summary(self, game: Game) -> None:
-        """Provide summary of game stats."""
-        self.context.logger.info(
-            "finished competition:\n{}".format(game.holdings_summary)
-        )
-        self.context.logger.info(
-            "computed equilibrium:\n{}".format(game.equilibrium_summary)
-        )
-
-    def _get_create_items_tx_msg(  # pylint: disable=no-self-use,unused-argument
-        self,
-        configuration: Configuration,
-        ledger_api: LedgerApi,
-        contract: ERC1155Contract,
-    ) -> SigningMessage:
-        # request tx # noqa: E800
-        # token_ids = [ # noqa: E800
-        #     int(good_id) for good_id in configuration.good_id_to_name.keys() # noqa: E800
-        # ] + [ # noqa: E800
-        #     int(currency_id) for currency_id in configuration.currency_id_to_name.keys() # noqa: E800
-        # ] # noqa: E800
-        # tx_msg = contract.get_create_batch_transaction_msg( # noqa: E800
-        #     deployer_address=self.context.agent_address, # noqa: E800
-        #     ledger_api=ledger_api, # noqa: E800
-        #     skill_callback_id=self.context.skill_id, # noqa: E800
-        #     token_ids=token_ids, # noqa: E800
-        # ) # noqa: E800
-        return None  # type: ignore
-
-    def _get_mint_goods_and_currency_tx_msg(  # pylint: disable=no-self-use,useless-return,unused-argument
-        self, agent_state: AgentState, ledger_api: LedgerApi, contract: ERC1155Contract,
-    ) -> SigningMessage:
-        token_ids = []  # type: List[int]
-        mint_quantities = []  # type: List[int]
-        for good_id, quantity in agent_state.quantities_by_good_id.items():
-            token_ids.append(int(good_id))
-            mint_quantities.append(quantity)
-        for currency_id, amount in agent_state.amount_by_currency_id.items():
-            token_ids.append(int(currency_id))
-            mint_quantities.append(amount)
-        # tx_msg = contract.get_mint_batch_transaction_msg( # noqa: E800
-        #     deployer_address=self.context.agent_address, # noqa: E800
-        #     recipient_address=agent_state.agent_address, # noqa: E800
-        #     mint_quantities=mint_quantities, # noqa: E800
-        #     ledger_api=ledger_api, # noqa: E800
-        #     skill_callback_id=self.context.skill_id, # noqa: E800
-        #     token_ids=token_ids, # noqa: E800
-        # ) # noqa: E800
-        return None  # type: ignore
+            contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
+            contract_api_dialogue.terms = strategy.get_mint_token_terms()
+            self.context.outbox.put_message(message=contract_api_msg)
 
 
 class ContractBehaviour(TickerBehaviour):
diff --git a/packages/fetchai/skills/tac_control_contract/dialogues.py b/packages/fetchai/skills/tac_control_contract/dialogues.py
new file mode 100644
index 0000000000..2f15292e02
--- /dev/null
+++ b/packages/fetchai/skills/tac_control_contract/dialogues.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2018-2019 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.
+#
+# ------------------------------------------------------------------------------
+
+"""
+This module contains the classes required for dialogue management.
+
+- DefaultDialogue: The dialogue class maintains state of a dialogue of type default and manages it.
+- DefaultDialogues: The dialogues class keeps track of all dialogues of type default.
+- OefSearchDialogue: The dialogue class maintains state of a dialogue of type oef_search and manages it.
+- OefSearchDialogues: The dialogues class keeps track of all dialogues of type oef_search.
+- TacDialogue: The dialogue class maintains state of a dialogue of type tac and manages it.
+- TacDialogues: The dialogues class keeps track of all dialogues of type tac.
+"""
+
+from packages.fetchai.skills.tac_control.dialogues import (
+    DefaultDialogue as BaseDefaultDialogue,
+)
+from packages.fetchai.skills.tac_control.dialogues import (
+    DefaultDialogues as BaseDefaultDialogues,
+)
+from packages.fetchai.skills.tac_control.dialogues import (
+    OefSearchDialogue as BaseOefSearchDialogue,
+)
+from packages.fetchai.skills.tac_control.dialogues import (
+    OefSearchDialogues as BaseOefSearchDialogues,
+)
+from packages.fetchai.skills.tac_control.dialogues import TacDialogue as BaseTacDialogue
+from packages.fetchai.skills.tac_control.dialogues import (
+    TacDialogues as BaseTacDialogues,
+)
+
+
+DefaultDialogue = BaseDefaultDialogue
+
+DefaultDialogues = BaseDefaultDialogues
+
+OefSearchDialogue = BaseOefSearchDialogue
+
+OefSearchDialogues = BaseOefSearchDialogues
+
+TacDialogue = BaseTacDialogue
+
+TacDialogues = BaseTacDialogues
diff --git a/packages/fetchai/skills/tac_control_contract/game.py b/packages/fetchai/skills/tac_control_contract/game.py
index 5120453dc0..23baa86044 100644
--- a/packages/fetchai/skills/tac_control_contract/game.py
+++ b/packages/fetchai/skills/tac_control_contract/game.py
@@ -19,92 +19,47 @@
 
 """This package contains a class representing the game."""
 
-import copy
-import datetime
-import pprint
-from enum import Enum
-from typing import Dict, List, Optional, cast
+from typing import Dict, List, Optional
 
 from aea.common import Address
 from aea.exceptions import AEAEnforceError, enforce
-from aea.helpers.preference_representations.base import (
-    linear_utility,
-    logarithmic_utility,
-)
-from aea.helpers.transaction.base import Terms
-from aea.skills.base import Model
-
-from packages.fetchai.protocols.tac.message import TacMessage
-from packages.fetchai.skills.tac_control_contract.helpers import (
-    determine_scaling_factor,
-    generate_currency_endowments,
-    generate_equilibrium_prices_and_holdings,
-    generate_exchange_params,
-    generate_good_endowments,
-    generate_utility_params,
+
+from packages.fetchai.skills.tac_control.game import AgentState as BaseAgentState
+from packages.fetchai.skills.tac_control.game import Configuration as BaseConfiguration
+from packages.fetchai.skills.tac_control.game import Game as BaseGame
+from packages.fetchai.skills.tac_control.game import (
+    Initialization as BaseInitialization,
 )
-from packages.fetchai.skills.tac_control_contract.parameters import Parameters
-
-GoodId = str
-CurrencyId = str
-Quantity = int
-EquilibriumQuantity = float
-Parameter = float
-TransactionId = str
-CurrencyEndowment = Dict[CurrencyId, Quantity]
-ExchangeParams = Dict[CurrencyId, Parameter]
-GoodEndowment = Dict[GoodId, Quantity]
-UtilityParams = Dict[GoodId, Parameter]
-EquilibriumCurrencyHoldings = Dict[CurrencyId, EquilibriumQuantity]
-EquilibriumGoodHoldings = Dict[GoodId, EquilibriumQuantity]
-
-
-class Phase(Enum):
-    """This class defines the phases of the game."""
-
-    PRE_GAME = "pre_game"
-    CONTRACT_DEPLOYMENT_PROPOSAL = "contract_deployment_proposal"
-    CONTRACT_DEPLOYING = "contract_deploying"
-    CONTRACT_DEPLOYED = "contract_deployed"
-    GAME_REGISTRATION = "game_registration"
-    GAME_SETUP = "game_setup"
-    TOKENS_CREATION_PROPOSAL = "token_creation_proposal"  # nosec
-    TOKENS_CREATING = "tokens_creating"
-    TOKENS_CREATED = "tokens_created"  # nosec
-    TOKENS_MINTING_PROPOSAL = "token_minting_proposal"
-    TOKENS_MINTING = "token_minting"  # nosec
-    TOKENS_MINTED = "tokens_minted"  # nosec
-    GAME = "game"
-    POST_GAME = "post_game"
-    CANCELLED_GAME = "cancelled_game"
-
-
-class Configuration:
+from packages.fetchai.skills.tac_control.game import Phase as BasePhase
+from packages.fetchai.skills.tac_control.game import Registration as BaseRegistration
+from packages.fetchai.skills.tac_control.game import Transaction as BaseTransaction
+from packages.fetchai.skills.tac_control.game import Transactions as BaseTransactions
+
+
+Phase = BasePhase
+
+
+class Configuration(BaseConfiguration):
     """Class containing the configuration of the game."""
 
-    def __init__(self, version_id: str, tx_fee: int):
+    def __init__(
+        self,
+        version_id: str,
+        tx_fee: int,
+        agent_addr_to_name: Dict[Address, str],
+        currency_id_to_name: Dict[str, str],
+        good_id_to_name: Dict[str, str],
+    ):
         """
         Instantiate a game configuration.
 
         :param version_id: the version of the game.
         :param tx_fee: the fee for a transaction.
+        :param agent_addr_to_name: a dictionary mapping agent addresses to agent names (as strings).
+        :param nb_goods: the number of goods.
         """
-        self._version_id = version_id
-        self._tx_fee = tx_fee
+        super().__init__(version_id, tx_fee, agent_addr_to_name, currency_id_to_name, good_id_to_name)
         self._contract_address = None  # type: Optional[str]
-        self._agent_addr_to_name = None  # type: Optional[Dict[str, str]]
-        self._good_id_to_name = None  # type: Optional[Dict[str, str]]
-        self._currency_id_to_name = None  # type: Optional[Dict[str, str]]
-
-    @property
-    def version_id(self) -> str:
-        """Agent number of a TAC instance."""
-        return self._version_id
-
-    @property
-    def tx_fee(self) -> int:
-        """Transaction fee for the TAC instance."""
-        return self._tx_fee
 
     @property
     def contract_address(self) -> str:
@@ -119,587 +74,20 @@ def contract_address(self, contract_address: str) -> None:
         enforce(self._contract_address is None, "Contract_address already set!")
         self._contract_address = contract_address
 
-    @property
-    def agent_addr_to_name(self) -> Dict[Address, str]:
-        """Return the map agent addresses to names."""
-        if self._agent_addr_to_name is None:
-            raise AEAEnforceError("Agent_addr_to_name not set yet!")
-        return self._agent_addr_to_name
-
-    @agent_addr_to_name.setter
-    def agent_addr_to_name(self, agent_addr_to_name: Dict[Address, str]) -> None:
-        """Set map of agent addresses to names"""
-        enforce(self._agent_addr_to_name is None, "Agent_addr_to_name already set!")
-        self._agent_addr_to_name = agent_addr_to_name
-
-    @property
-    def good_id_to_name(self) -> Dict[str, str]:
-        """Map good ids to names."""
-        if self._good_id_to_name is None:
-            raise AEAEnforceError("Good_id_to_name not set yet!")
-        return self._good_id_to_name
-
-    @good_id_to_name.setter
-    def good_id_to_name(self, good_id_to_name: Dict[str, str]) -> None:
-        """Set map of goods ids to names."""
-        enforce(self._good_id_to_name is None, "Good_id_to_name already set!")
-        self._good_id_to_name = good_id_to_name
-
-    @property
-    def currency_id_to_name(self) -> Dict[str, str]:
-        """Map currency id to name."""
-        if self._currency_id_to_name is None:
-            raise AEAEnforceError("Currency_id_to_name not set yet!")
-        return self._currency_id_to_name
-
-    @currency_id_to_name.setter
-    def currency_id_to_name(self, currency_id_to_name: Dict[str, str]) -> None:
-        """Set map of currency id to name."""
-        enforce(self._currency_id_to_name is None, "Currency_id_to_name already set!")
-        self._currency_id_to_name = currency_id_to_name
-
-    def check_consistency(self):
-        """
-        Check the consistency of the game configuration.
-
-        :return: None
-        :raises: AEAEnforceError: if some constraint is not satisfied.
-        """
-        enforce(self.version_id is not None, "A version id must be set.")
-        enforce(self.tx_fee >= 0, "Tx fee must be non-negative.")
-        enforce(len(self.agent_addr_to_name) >= 2, "Must have at least two agents.")
-        enforce(len(self.good_id_to_name) >= 2, "Must have at least two goods.")
-        enforce(len(self.currency_id_to_name) == 1, "Must have exactly one currency.")
-
-
-class Initialization:
-    """Class containing the initialization of the game."""
-
-    def __init__(
-        self,
-        agent_addr_to_currency_endowments: Dict[Address, CurrencyEndowment],
-        agent_addr_to_exchange_params: Dict[Address, ExchangeParams],
-        agent_addr_to_good_endowments: Dict[Address, GoodEndowment],
-        agent_addr_to_utility_params: Dict[Address, UtilityParams],
-        good_id_to_eq_prices: Dict[GoodId, float],
-        agent_addr_to_eq_good_holdings: Dict[Address, EquilibriumGoodHoldings],
-        agent_addr_to_eq_currency_holdings: Dict[Address, EquilibriumCurrencyHoldings],
-    ):
-        """
-        Instantiate a game initialization.
-
-        :param agent_addr_to_currency_endowments: the currency endowments of the agents. A nested dict where the outer key is the agent id
-                            and the inner key is the currency id.
-        :param agent_addr_to_exchange_params: the exchange params representing the exchange rate the agetns use between currencies.
-        :param agent_addr_to_good_endowments: the good endowments of the agents. A nested dict where the outer key is the agent id
-                            and the inner key is the good id.
-        :param agent_addr_to_utility_params: the utility params representing the preferences of the agents.
-        :param good_id_to_eq_prices: the competitive equilibrium prices of the goods. A list.
-        :param agent_addr_to_eq_good_holdings: the competitive equilibrium good holdings of the agents.
-        :param agent_addr_to_eq_currency_holdings: the competitive equilibrium money holdings of the agents.
-        """
-        self._agent_addr_to_currency_endowments = agent_addr_to_currency_endowments
-        self._agent_addr_to_exchange_params = agent_addr_to_exchange_params
-        self._agent_addr_to_good_endowments = agent_addr_to_good_endowments
-        self._agent_addr_to_utility_params = agent_addr_to_utility_params
-        self._good_id_to_eq_prices = good_id_to_eq_prices
-        self._agent_addr_to_eq_good_holdings = agent_addr_to_eq_good_holdings
-        self._agent_addr_to_eq_currency_holdings = agent_addr_to_eq_currency_holdings
-        self._check_consistency()
-
-    @property
-    def agent_addr_to_currency_endowments(self) -> Dict[Address, CurrencyEndowment]:
-        """Get currency endowments of agents."""
-        return self._agent_addr_to_currency_endowments
-
-    @property
-    def agent_addr_to_exchange_params(self) -> Dict[Address, ExchangeParams]:
-        """Get exchange params of agents."""
-        return self._agent_addr_to_exchange_params
-
-    @property
-    def agent_addr_to_good_endowments(self) -> Dict[Address, GoodEndowment]:
-        """Get good endowments of the agents."""
-        return self._agent_addr_to_good_endowments
-
-    @property
-    def agent_addr_to_utility_params(self) -> Dict[Address, UtilityParams]:
-        """Get utility parameters of agents."""
-        return self._agent_addr_to_utility_params
-
-    @property
-    def good_id_to_eq_prices(self) -> Dict[GoodId, float]:
-        """Get theoretical equilibrium prices (a benchmark)."""
-        return self._good_id_to_eq_prices
-
-    @property
-    def agent_addr_to_eq_good_holdings(self) -> Dict[Address, EquilibriumGoodHoldings]:
-        """Get theoretical equilibrium good holdings (a benchmark)."""
-        return self._agent_addr_to_eq_good_holdings
-
-    @property
-    def agent_addr_to_eq_currency_holdings(
-        self,
-    ) -> Dict[Address, EquilibriumCurrencyHoldings]:
-        """Get theoretical equilibrium currency holdings (a benchmark)."""
-        return self._agent_addr_to_eq_currency_holdings
-
-    def _check_consistency(self):
-        """
-        Check the consistency of the game configuration.
-
-        :return: None
-        :raises: AEAEnforceError: if some constraint is not satisfied.
-        """
-        enforce(
-            all(
-                c_e >= 0
-                for currency_endowments in self.agent_addr_to_currency_endowments.values()
-                for c_e in currency_endowments.values()
-            ),
-            "Currency endowments must be non-negative.",
-        )
-        enforce(
-            all(
-                p > 0
-                for params in self.agent_addr_to_exchange_params.values()
-                for p in params.values()
-            ),
-            "ExchangeParams must be strictly positive.",
-        )
-        enforce(
-            all(
-                g_e > 0
-                for good_endowments in self.agent_addr_to_good_endowments.values()
-                for g_e in good_endowments.values()
-            ),
-            "Good endowments must be strictly positive.",
-        )
-        enforce(
-            all(
-                p > 0
-                for params in self.agent_addr_to_utility_params.values()
-                for p in params.values()
-            ),
-            "UtilityParams must be strictly positive.",
-        )
-        enforce(
-            len(self.agent_addr_to_good_endowments.keys())
-            == len(self.agent_addr_to_currency_endowments.keys()),
-            "Length of endowments must be the same.",
-        )
-        enforce(
-            len(self.agent_addr_to_exchange_params.keys())
-            == len(self.agent_addr_to_utility_params.keys()),
-            "Length of params must be the same.",
-        )
-        enforce(
-            all(
-                len(self.good_id_to_eq_prices.values()) == len(eq_good_holdings)
-                for eq_good_holdings in self.agent_addr_to_eq_good_holdings.values()
-            ),
-            "Length of eq_prices and an element of eq_good_holdings must be the same.",
-        )
-        enforce(
-            len(self.agent_addr_to_eq_good_holdings.values())
-            == len(self.agent_addr_to_eq_currency_holdings.values()),
-            "Length of eq_good_holdings and eq_currency_holdings must be the same.",
-        )
-        enforce(
-            all(
-                len(self.agent_addr_to_exchange_params[agent_addr]) == len(endowments)
-                for agent_addr, endowments in self.agent_addr_to_currency_endowments.items()
-            ),
-            "Dimensions for exchange_params and currency_endowments rows must be the same.",
-        )
-        enforce(
-            all(
-                len(self.agent_addr_to_utility_params[agent_addr]) == len(endowments)
-                for agent_addr, endowments in self.agent_addr_to_good_endowments.items()
-            ),
-            "Dimensions for utility_params and good_endowments rows must be the same.",
-        )
-
-
-class Transaction(Terms):
-    """Convenience representation of a transaction."""
-
-    def __init__(
-        self,
-        ledger_id: str,
-        sender_address: Address,
-        counterparty_address: Address,
-        amount_by_currency_id: Dict[str, int],
-        quantities_by_good_id: Dict[str, int],
-        is_sender_payable_tx_fee: bool,
-        nonce: str,
-        fee_by_currency_id: Optional[Dict[str, int]],
-        sender_signature: str,
-        counterparty_signature: str,
-    ) -> None:
-        """
-        Instantiate transaction.
-
-        This extends a terms object to be used as a transaction.
-
-        :param ledger_id: the ledger on which the terms are to be settled.
-        :param sender_address: the sender address of the transaction.
-        :param counterparty_address: the counterparty address of the transaction.
-        :param amount_by_currency_id: the amount by the currency of the transaction.
-        :param quantities_by_good_id: a map from good id to the quantity of that good involved in the transaction.
-        :param is_sender_payable_tx_fee: whether the sender or counterparty pays the tx fee.
-        :param nonce: nonce to be included in transaction to discriminate otherwise identical transactions.
-        :param fee_by_currency_id: the fee associated with the transaction.
-        :param sender_signature: the signature of the terms by the sender.
-        :param counterparty_signature: the signature of the terms by the counterparty.
-        """
-        super().__init__(
-            ledger_id=ledger_id,
-            sender_address=sender_address,
-            counterparty_address=counterparty_address,
-            amount_by_currency_id=amount_by_currency_id,
-            quantities_by_good_id=quantities_by_good_id,
-            is_sender_payable_tx_fee=is_sender_payable_tx_fee,
-            nonce=nonce,
-            fee_by_currency_id=fee_by_currency_id,
-        )
-        self._sender_signature = sender_signature
-        self._counterparty_signature = counterparty_signature
-
-    @property
-    def sender_signature(self) -> str:
-        """Get the sender signature."""
-        return self._sender_signature
-
-    @property
-    def counterparty_signature(self) -> str:
-        """Get the counterparty signature."""
-        return self._counterparty_signature
-
-    @classmethod
-    def from_message(cls, message: TacMessage) -> "Transaction":
-        """
-        Create a transaction from a proposal.
-
-        :param message: the message
-        :return: Transaction
-        """
-        enforce(
-            message.performative == TacMessage.Performative.TRANSACTION,
-            "Wrong performative",
-        )
-        transaction = Transaction(
-            ledger_id=message.ledger_id,
-            sender_address=message.sender_address,
-            counterparty_address=message.counterparty_address,
-            amount_by_currency_id=message.amount_by_currency_id,
-            fee_by_currency_id=message.fee_by_currency_id,
-            quantities_by_good_id=message.quantities_by_good_id,
-            is_sender_payable_tx_fee=True,
-            nonce=str(message.nonce),
-            sender_signature=message.sender_signature,
-            counterparty_signature=message.counterparty_signature,
-        )
-        enforce(
-            transaction.id == message.transaction_id,
-            "Transaction content does not match hash.",
-        )
-        return transaction
-
-    def __eq__(self, other):
-        """Compare to another object."""
-        return (
-            isinstance(other, Transaction)
-            and super.__eq__()
-            and self.sender_signature == other.sender_signature
-            and self.counterparty_signature == other.counterparty_signature
-        )
-
-
-class AgentState:
-    """Represent the state of an agent during the game."""
-
-    def __init__(
-        self,
-        agent_address: Address,
-        amount_by_currency_id: Dict[CurrencyId, Quantity],
-        exchange_params_by_currency_id: Dict[CurrencyId, Parameter],
-        quantities_by_good_id: Dict[GoodId, Quantity],
-        utility_params_by_good_id: Dict[GoodId, Parameter],
-    ):
-        """
-        Instantiate an agent state object.
-
-        :param agent_address: the agent address
-        :param amount_by_currency_id: the amount for each currency
-        :param exchange_params_by_currency_id: the exchange parameters of the different currencies
-        :param quantities_by_good_id: the quantities for each good.
-        :param utility_params_by_good_id: the utility params for every good.
-        """
-        enforce(
-            len(amount_by_currency_id.keys())
-            == len(exchange_params_by_currency_id.keys()),
-            "Different number of elements in amount_by_currency_id and exchange_params_by_currency_id.",
-        )
-        enforce(
-            len(quantities_by_good_id.keys()) == len(utility_params_by_good_id.keys()),
-            "Different number of elements in quantities_by_good_id and utility_params_by_good_id.",
-        )
-        self._agent_address = agent_address
-        self._amount_by_currency_id = copy.copy(amount_by_currency_id)
-        self._exchange_params_by_currency_id = copy.copy(exchange_params_by_currency_id)
-        self._quantities_by_good_id = quantities_by_good_id
-        self._utility_params_by_good_id = copy.copy(utility_params_by_good_id)
-
-    @property
-    def agent_address(self) -> str:
-        """Get address of the agent which state that is."""
-        return self._agent_address
-
-    @property
-    def amount_by_currency_id(self) -> Dict[CurrencyId, Quantity]:
-        """Get the amount for each currency."""
-        return copy.copy(self._amount_by_currency_id)
-
-    @property
-    def exchange_params_by_currency_id(self) -> Dict[CurrencyId, Parameter]:
-        """Get the exchange parameters for each currency."""
-        return copy.copy(self._exchange_params_by_currency_id)
-
-    @property
-    def quantities_by_good_id(self) -> Dict[GoodId, Quantity]:
-        """Get holding of each good."""
-        return copy.copy(self._quantities_by_good_id)
-
-    @property
-    def utility_params_by_good_id(self) -> Dict[GoodId, Parameter]:
-        """Get utility parameter for each good."""
-        return copy.copy(self._utility_params_by_good_id)
-
-    def get_score(self) -> float:
-        """
-        Compute the score of the current state.
-
-        The score is computed as the sum of all the utilities for the good holdings
-        with positive quantity plus the money left.
-        :return: the score.
-        """
-        goods_score = logarithmic_utility(
-            self.utility_params_by_good_id, self.quantities_by_good_id
-        )
-        money_score = linear_utility(
-            self.exchange_params_by_currency_id, self.amount_by_currency_id
-        )
-        score = goods_score + money_score
-        return score
-
-    def is_consistent_transaction(self, tx: Transaction) -> bool:
-        """
-        Check if the transaction is consistent.
-
-        E.g. check that the agent state has enough money if it is a buyer
-        or enough holdings if it is a seller.
-        :return: True if the transaction is legal wrt the current state, False otherwise.
-        """
-        result = self.agent_address in [tx.sender_address, tx.counterparty_address]
-        result = result and tx.is_single_currency
-        if not result:
-            return result
-        if all(amount == 0 for amount in tx.amount_by_currency_id.values()) and all(
-            quantity == 0 for quantity in tx.quantities_by_good_id.values()
-        ):
-            # reject the transaction when there is no wealth exchange
-            result = False
-        elif all(amount <= 0 for amount in tx.amount_by_currency_id.values()) and all(
-            quantity >= 0 for quantity in tx.quantities_by_good_id.values()
-        ):
-            # sender is buyer, counterparty is seller
-            if self.agent_address == tx.sender_address:
-                # check this sender state has enough money
-                result = result and (
-                    self.amount_by_currency_id[tx.currency_id]
-                    >= tx.sender_payable_amount
-                )
-            elif self.agent_address == tx.counterparty_address:
-                # check this counterparty state has enough goods
-                result = result and all(
-                    self.quantities_by_good_id[good_id] >= quantity
-                    for good_id, quantity in tx.quantities_by_good_id.items()
-                )
-        elif all(amount >= 0 for amount in tx.amount_by_currency_id.values()) and all(
-            quantity <= 0 for quantity in tx.quantities_by_good_id.values()
-        ):
-            # sender is seller, counterparty is buyer
-            # Note, on a ledger, this atomic swap would only be possible for amount == 0!
-            if self.agent_address == tx.sender_address:
-                # check this sender state has enough goods
-                result = result and all(
-                    self.quantities_by_good_id[good_id] >= -quantity
-                    for good_id, quantity in tx.quantities_by_good_id.items()
-                )
-            elif self.agent_address == tx.counterparty_address:
-                # check this counterparty state has enough money
-                result = result and (
-                    self.amount_by_currency_id[tx.currency_id]
-                    >= tx.counterparty_payable_amount
-                )
-        else:
-            result = False
-        return result
-
-    def apply(self, transactions: List[Transaction]) -> "AgentState":
-        """
-        Apply a list of transactions to the current state.
-
-        :param transactions: the sequence of transaction.
-        :return: the final state.
-        """
-        new_state = copy.copy(self)
-        for tx in transactions:
-            new_state.update(tx)
-
-        return new_state
-
-    def update(self, tx: Transaction) -> None:
-        """
-        Update the agent state from a transaction.
-
-        :param tx: the transaction.
-        :return: None
-        """
-        enforce(self.is_consistent_transaction(tx), "Inconsistent transaction.")
-
-        new_amount_by_currency_id = self.amount_by_currency_id
-        if self.agent_address == tx.sender_address:
-            # settling the transaction for the sender
-            for currency_id, amount in tx.amount_by_currency_id.items():
-                new_amount_by_currency_id[currency_id] += amount
-        elif self.agent_address == tx.counterparty_address:
-            # settling the transaction for the counterparty
-            for currency_id, amount in tx.amount_by_currency_id.items():
-                new_amount_by_currency_id[currency_id] += amount
-
-        self._amount_by_currency_id = new_amount_by_currency_id
-
-        new_quantities_by_good_id = self.quantities_by_good_id
-        for good_id, quantity in tx.quantities_by_good_id.items():
-            if self.agent_address == tx.sender_address:
-                new_quantities_by_good_id[good_id] += quantity
-            elif self.agent_address == tx.counterparty_address:
-                new_quantities_by_good_id[good_id] -= quantity
-        self._quantities_by_good_id = new_quantities_by_good_id
-
-    def __copy__(self):
-        """Copy the object."""
-        return AgentState(
-            self.agent_address,
-            self.amount_by_currency_id,
-            self.exchange_params_by_currency_id,
-            self.quantities_by_good_id,
-            self.utility_params_by_good_id,
-        )
-
-    def __str__(self):
-        """From object to string."""
-        return "AgentState{}".format(
-            pprint.pformat(
-                {
-                    "agent_address": self.agent_address,
-                    "amount_by_currency_id": self.amount_by_currency_id,
-                    "exchange_params_by_currency_id": self.exchange_params_by_currency_id,
-                    "quantities_by_good_id": self.quantities_by_good_id,
-                    "utility_params_by_good_id": self.utility_params_by_good_id,
-                }
-            )
-        )
-
-    def __eq__(self, other) -> bool:
-        """Compare equality of two instances of the class."""
-        return (
-            isinstance(other, AgentState)
-            and self.agent_address == other.agent_address
-            and self.amount_by_currency_id == other.amount_by_currency_id
-            and self.exchange_params_by_currency_id
-            == other.exchange_params_by_currency_id
-            and self.quantities_by_good_id == other.quantities_by_good_id
-            and self.utility_params_by_good_id == other.utility_params_by_good_id
-        )
 
+Initialization = BaseInitialization
 
-class Transactions:
-    """Class managing the transactions."""
 
-    def __init__(self):
-        """Instantiate the transaction class."""
-        self._confirmed = {}  # type: Dict[datetime.datetime, Transaction]
-        self._confirmed_per_agent = (
-            {}
-        )  # type: Dict[Address, Dict[datetime.datetime, Transaction]]
+Transaction = BaseTransaction
 
-    @property
-    def confirmed(self) -> Dict[datetime.datetime, Transaction]:
-        """Get the confirmed transactions."""
-        return self._confirmed
 
-    @property
-    def confirmed_per_agent(
-        self,
-    ) -> Dict[Address, Dict[datetime.datetime, Transaction]]:
-        """Get the confirmed transactions by agent."""
-        return self._confirmed_per_agent
+AgentState = BaseAgentState
 
-    def add(self, transaction: Transaction) -> None:
-        """
-        Add a confirmed transaction.
 
-        :param transaction: the transaction
-        :return: None
-        """
-        now = datetime.datetime.now()
-        self._confirmed[now] = transaction
-        if self._confirmed_per_agent.get(transaction.sender_address) is None:
-            self._confirmed_per_agent[transaction.sender_address] = {}
-        self._confirmed_per_agent[transaction.sender_address][now] = transaction
-        if self._confirmed_per_agent.get(transaction.counterparty_address) is None:
-            self._confirmed_per_agent[transaction.counterparty_address] = {}
-        self._confirmed_per_agent[transaction.counterparty_address][now] = transaction
+Transactions = BaseTransactions
 
 
-class Registration:
-    """Class managing the registration of the game."""
-
-    def __init__(self):
-        """Instantiate the registration class."""
-        self._agent_addr_to_name = {}  # type: Dict[str, str]
-
-    @property
-    def agent_addr_to_name(self) -> Dict[str, str]:
-        """Get the registered agent addresses and their names."""
-        return self._agent_addr_to_name
-
-    @property
-    def nb_agents(self) -> int:
-        """Get the number of registered agents."""
-        return len(self._agent_addr_to_name)
-
-    def register_agent(self, agent_addr: Address, agent_name: str) -> None:
-        """
-        Register an agent.
-
-        :param agent_addr: the Address of the agent
-        :param agent_name: the name of the agent
-        :return: None
-        """
-        self._agent_addr_to_name[agent_addr] = agent_name
-
-    def unregister_agent(self, agent_addr: Address) -> None:
-        """
-        Register an agent.
-
-        :param agent_addr: the Address of the agent
-        :return: None
-        """
-        self._agent_addr_to_name.pop(agent_addr)
+Registration = BaseRegistration
 
 
 class ContractManager:
@@ -776,234 +164,15 @@ def add_confirmed_mint_tokens_agents(self, agent_addr: str) -> None:
         self._confirmed_mint_tokens_agents.append(agent_addr)
 
 
-class Game(Model):
+class Game(BaseGame):
     """A class to manage a TAC instance."""
 
     def __init__(self, **kwargs):
         """Instantiate the search class."""
         super().__init__(**kwargs)
-        self._phase = Phase.PRE_GAME
-        self._registration = Registration()
         self._contract_manager = ContractManager()
-        self._conf = None  # type: Optional[Configuration]
-        self._initialization = None  # type: Optional[Initialization]
-        self._initial_agent_states = None  # type: Optional[Dict[str, AgentState]]
-        self._current_agent_states = None  # type: Optional[Dict[str, AgentState]]
-        self._transactions = Transactions()
-
-    @property
-    def phase(self) -> Phase:
-        """Get the game phase."""
-        return self._phase
-
-    @phase.setter
-    def phase(self, phase: Phase) -> None:
-        """Set the game phase."""
-        self.context.logger.debug("Game phase set to: {}".format(phase))
-        self._phase = phase
-
-    @property
-    def registration(self) -> Registration:
-        """Get the registration."""
-        return self._registration
 
     @property
     def contract_manager(self) -> ContractManager:
         """Get the contract manager."""
         return self._contract_manager
-
-    @property
-    def conf(self) -> Configuration:
-        """Get game configuration."""
-        if self._conf is None:
-            raise AEAEnforceError("Call create before calling configuration.")
-        return self._conf
-
-    @conf.setter
-    def conf(self, configuration: Configuration):
-        """Set the configuration."""
-        enforce(self._conf is None, "Configuration already set!.")
-        self._conf = configuration
-
-    @property
-    def initialization(self) -> Initialization:
-        """Get game initialization."""
-        if self._initialization is None:
-            raise AEAEnforceError("Call create before calling initialization.")
-        return self._initialization
-
-    @property
-    def initial_agent_states(self) -> Dict[str, AgentState]:
-        """Get initial state of each agent."""
-        if self._initial_agent_states is None:
-            raise AEAEnforceError("Call create before calling initial_agent_states.")
-        return self._initial_agent_states
-
-    @property
-    def current_agent_states(self) -> Dict[str, AgentState]:
-        """Get current state of each agent."""
-        if self._current_agent_states is None:
-            raise AEAEnforceError("Call create before calling current_agent_states.")
-        return self._current_agent_states
-
-    @property
-    def transactions(self) -> Transactions:
-        """Get the transactions."""
-        return self._transactions
-
-    def create(self):
-        """Create a game."""
-        enforce(self.phase.value == Phase.GAME_SETUP.value, "Wrong game phase.")
-        self.context.logger.info("setting Up the TAC game.")
-        self._generate()
-
-    def _generate(self):
-        """Generate a TAC game."""
-        parameters = cast(Parameters, self.context.parameters)
-        self.conf.agent_addr_to_name = self.registration.agent_addr_to_name
-        self.conf.check_consistency()
-
-        scaling_factor = determine_scaling_factor(parameters.money_endowment)
-
-        agent_addr_to_currency_endowments = generate_currency_endowments(
-            list(self.conf.agent_addr_to_name.keys()),
-            list(self.conf.currency_id_to_name.keys()),
-            parameters.money_endowment,
-        )
-
-        agent_addr_to_exchange_params = generate_exchange_params(
-            list(self.conf.agent_addr_to_name.keys()),
-            list(self.conf.currency_id_to_name.keys()),
-        )
-
-        agent_addr_to_good_endowments = generate_good_endowments(
-            list(self.conf.agent_addr_to_name.keys()),
-            list(self.conf.good_id_to_name.keys()),
-            parameters.base_good_endowment,
-            parameters.lower_bound_factor,
-            parameters.upper_bound_factor,
-        )
-
-        agent_addr_to_utility_params = generate_utility_params(
-            list(self.conf.agent_addr_to_name.keys()),
-            list(self.conf.good_id_to_name.keys()),
-            scaling_factor,
-        )
-
-        (
-            good_id_to_eq_prices,
-            agent_addr_to_eq_good_holdings,
-            agent_addr_to_eq_currency_holdings,
-        ) = generate_equilibrium_prices_and_holdings(
-            agent_addr_to_good_endowments,
-            agent_addr_to_utility_params,
-            agent_addr_to_currency_endowments,
-            agent_addr_to_exchange_params,
-            scaling_factor,
-        )
-
-        self._initialization = Initialization(
-            agent_addr_to_currency_endowments,
-            agent_addr_to_exchange_params,
-            agent_addr_to_good_endowments,
-            agent_addr_to_utility_params,
-            good_id_to_eq_prices,
-            agent_addr_to_eq_good_holdings,
-            agent_addr_to_eq_currency_holdings,
-        )
-
-        self._initial_agent_states = dict(
-            (
-                agent_addr,
-                AgentState(
-                    agent_addr,
-                    self.initialization.agent_addr_to_currency_endowments[agent_addr],
-                    self.initialization.agent_addr_to_exchange_params[agent_addr],
-                    self.initialization.agent_addr_to_good_endowments[agent_addr],
-                    self.initialization.agent_addr_to_utility_params[agent_addr],
-                ),
-            )
-            for agent_addr in self.conf.agent_addr_to_name.keys()
-        )
-
-        self._current_agent_states = dict(
-            (
-                agent_addr,
-                AgentState(
-                    agent_addr,
-                    self.initialization.agent_addr_to_currency_endowments[agent_addr],
-                    self.initialization.agent_addr_to_exchange_params[agent_addr],
-                    self.initialization.agent_addr_to_good_endowments[agent_addr],
-                    self.initialization.agent_addr_to_utility_params[agent_addr],
-                ),
-            )
-            for agent_addr in self.conf.agent_addr_to_name.keys()
-        )
-
-    @property
-    def holdings_summary(self) -> str:
-        """Get holdings summary (a string representing the holdings for every agent)."""
-        result = "\n" + "Current good & money allocation & score: \n"
-        for agent_addr, agent_state in self.current_agent_states.items():
-            result = (
-                result + "- " + self.conf.agent_addr_to_name[agent_addr] + ":" + "\n"
-            )
-            for good_id, quantity in agent_state.quantities_by_good_id.items():
-                result += (
-                    "    "
-                    + self.conf.good_id_to_name[good_id]
-                    + ": "
-                    + str(quantity)
-                    + "\n"
-                )
-            for currency_id, amount in agent_state.amount_by_currency_id.items():
-                result += (
-                    "    "
-                    + self.conf.currency_id_to_name[currency_id]
-                    + ": "
-                    + str(amount)
-                    + "\n"
-                )
-            result += "    score: " + str(round(agent_state.get_score(), 2)) + "\n"
-        result = result + "\n"
-        return result
-
-    @property
-    def equilibrium_summary(self) -> str:
-        """Get equilibrium summary."""
-        result = "\n" + "Equilibrium prices: \n"
-        for good_id, eq_price in self.initialization.good_id_to_eq_prices.items():
-            result = (
-                result + self.conf.good_id_to_name[good_id] + " " + str(eq_price) + "\n"
-            )
-        result = result + "\n"
-        result = result + "Equilibrium good allocation: \n"
-        for (
-            agent_addr,
-            eq_allocations,
-        ) in self.initialization.agent_addr_to_eq_good_holdings.items():
-            result = result + "- " + self.conf.agent_addr_to_name[agent_addr] + ":\n"
-            for good_id, quantity in eq_allocations.items():
-                result = (
-                    result
-                    + "    "
-                    + self.conf.good_id_to_name[good_id]
-                    + ": "
-                    + str(quantity)
-                    + "\n"
-                )
-        result = result + "\n"
-        result = result + "Equilibrium money allocation: \n"
-        for (
-            agent_addr,
-            eq_allocation,
-        ) in self.initialization.agent_addr_to_eq_currency_holdings.items():
-            result = (
-                result
-                + self.conf.agent_addr_to_name[agent_addr]
-                + " "
-                + str(eq_allocation)
-                + "\n"
-            )
-        result = result + "\n"
-        return result
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index 0445ede7c1..37ded8d678 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -25,193 +25,18 @@
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
 
-from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-from packages.fetchai.protocols.tac.message import TacMessage
+from packages.fetchai.skills.tac_control.handlers import (
+    OefSearchHandler as BaseOefSearchHandler,
+)
+from packages.fetchai.skills.tac_control.handlers import TacHandler as BaseTacHandler
 from packages.fetchai.skills.tac_control_contract.game import Game, Phase
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
 
-class TACHandler(Handler):
-    """This class handles oef messages."""
+TacHandler = BaseTacHandler
 
-    SUPPORTED_PROTOCOL = TacMessage.protocol_id
 
-    def setup(self) -> None:
-        """
-        Implement the handler setup.
-
-        :return: None
-        """
-        pass
-
-    def handle(self, message: Message) -> None:
-        """
-        Handle a register message.
-
-        If the address is already registered, answer with an error message.
-
-        :param message: the 'get agent state' TacMessage.
-        :return: None
-        """
-        tac_message = cast(TacMessage, message)
-        game = cast(Game, self.context.game)
-
-        self.context.logger.debug(
-            "handling TAC message. type={}".format(tac_message.performative)
-        )
-        if (
-            tac_message.performative == TacMessage.Performative.REGISTER
-            and game.phase == Phase.GAME_REGISTRATION
-        ):
-            self._on_register(tac_message)
-        elif (
-            tac_message.performative == TacMessage.Performative.UNREGISTER
-            and game.phase == Phase.GAME_REGISTRATION
-        ):
-            self._on_unregister(tac_message)
-        else:
-            self.context.logger.warning(
-                "TAC Message type not recognized or not permitted."
-            )
-
-    def _on_register(self, message: TacMessage) -> None:
-        """
-        Handle a register message.
-
-        If the address is not registered, answer with an error message.
-
-        :param message: the 'get agent state' TacMessage.
-        :return: None
-        """
-        parameters = cast(Parameters, self.context.parameters)
-        agent_name = message.agent_name
-        if len(parameters.whitelist) != 0 and agent_name not in parameters.whitelist:
-            self.context.logger.warning(
-                "agent name not in whitelist: '{}'".format(agent_name)
-            )
-            tac_msg = TacMessage(
-                performative=TacMessage.Performative.TAC_ERROR,
-                error_code=TacMessage.ErrorCode.AGENT_NAME_NOT_IN_WHITELIST,
-            )
-            tac_msg.to = message.sender
-            self.context.outbox.put_message(message=tac_msg)
-            return
-
-        game = cast(Game, self.context.game)
-        if message.sender in game.registration.agent_addr_to_name:
-            self.context.logger.warning(
-                "agent already registered: '{}'".format(
-                    game.registration.agent_addr_to_name[message.sender],
-                )
-            )
-            tac_msg = TacMessage(
-                performative=TacMessage.Performative.TAC_ERROR,
-                error_code=TacMessage.ErrorCode.AGENT_ADDR_ALREADY_REGISTERED,
-            )
-            tac_msg.to = message.sender
-            self.context.outbox.put_message(message=tac_msg)
-
-        if agent_name in game.registration.agent_addr_to_name.values():
-            self.context.logger.warning(
-                "agent with this name already registered: '{}'".format(agent_name)
-            )
-            tac_msg = TacMessage(
-                performative=TacMessage.Performative.TAC_ERROR,
-                error_code=TacMessage.ErrorCode.AGENT_NAME_ALREADY_REGISTERED,
-            )
-            tac_msg.to = message.sender
-            self.context.outbox.put_message(message=tac_msg)
-        game.registration.register_agent(message.sender, agent_name)
-        self.context.logger.info("agent registered: '{}'".format(agent_name))
-
-    def _on_unregister(self, message: TacMessage) -> None:
-        """
-        Handle a unregister message.
-
-        If the address is not registered, answer with an error message.
-
-        :param message: the 'get agent state' TacMessage.
-        :return: None
-        """
-        game = cast(Game, self.context.game)
-        if message.sender not in game.registration.agent_addr_to_name:
-            self.context.logger.warning(
-                "agent not registered: '{}'".format(message.sender)
-            )
-            tac_msg = TacMessage(
-                performative=TacMessage.Performative.TAC_ERROR,
-                error_code=TacMessage.ErrorCode.AGENT_NOT_REGISTERED,
-            )
-            tac_msg.to = message.sender
-            self.context.outbox.put_message(message=tac_msg)
-        else:
-            self.context.logger.debug(
-                "agent unregistered: '{}'".format(
-                    game.conf.agent_addr_to_name[message.sender],
-                )
-            )
-            game.registration.unregister_agent(message.sender)
-
-    def teardown(self) -> None:
-        """
-        Implement the handler teardown.
-
-        :return: None
-        """
-        pass
-
-
-class OEFRegistrationHandler(Handler):
-    """Handle the message exchange with the OEF search node."""
-
-    SUPPORTED_PROTOCOL = OefSearchMessage.protocol_id
-
-    def setup(self) -> None:
-        """
-        Implement the handler setup.
-
-        :return: None
-        """
-        pass
-
-    def handle(self, message: Message) -> None:
-        """
-        Implement the reaction to a message.
-
-        :param message: the message
-        :return: None
-        """
-        oef_message = cast(OefSearchMessage, message)
-
-        self.context.logger.debug(
-            "handling OEF message. type={}".format(oef_message.performative)
-        )
-        if oef_message.performative == OefSearchMessage.Performative.OEF_ERROR:
-            self._on_oef_error(oef_message)
-        else:
-            self.context.logger.warning("OEF Message type not recognized.")
-
-    def _on_oef_error(self, oef_error: OefSearchMessage) -> None:
-        """
-        Handle an OEF error message.
-
-        :param oef_error: the oef error
-
-        :return: None
-        """
-        self.context.logger.warning(
-            "received OEF Search error: dialogue_reference={}, operation={}".format(
-                oef_error.dialogue_reference, oef_error.oef_error_operation,
-            )
-        )
-
-    def teardown(self) -> None:
-        """
-        Implement the handler teardown.
-
-        :return: None
-        """
-        pass
+OefSearchHandler = BaseOefSearchHandler
 
 
 class SigningHandler(Handler):
diff --git a/packages/fetchai/skills/tac_control_contract/helpers.py b/packages/fetchai/skills/tac_control_contract/helpers.py
deleted file mode 100644
index 6441d00f9f..0000000000
--- a/packages/fetchai/skills/tac_control_contract/helpers.py
+++ /dev/null
@@ -1,321 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------------------------
-#
-#   Copyright 2018-2019 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.
-#
-# ------------------------------------------------------------------------------
-
-"""This module contains the helpers methods for the controller agent."""
-
-import random
-from typing import Dict, List, Tuple, cast
-
-import numpy as np
-
-from aea.exceptions import enforce
-
-from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
-
-QUANTITY_SHIFT = 1  # Any non-negative integer is fine.
-FT_NAME = "FT"
-FT_ID = 2
-NB_CURRENCIES = 1
-
-
-def generate_good_id_to_name(good_ids: List[int]) -> Dict[str, str]:
-    """
-    Generate a dictionary mapping good ids to names.
-
-    :param good_ids: a list of good ids
-    :return: a dictionary mapping goods' ids to names.
-    """
-    good_id_to_name = {
-        str(good_id): "{}_{}".format(FT_NAME, good_id) for good_id in good_ids
-    }
-    return good_id_to_name
-
-
-def generate_good_ids(nb_goods: int) -> List[int]:
-    """
-    Generate ids for things.
-
-    :param nb_goods: the number of things.
-    :param contract: the instance of the contract
-    """
-    good_ids = ERC1155Contract.generate_token_ids(FT_ID, nb_goods)
-    enforce(
-        len(good_ids) == nb_goods, "Length of good ids and number of goods must match."
-    )
-    return good_ids
-
-
-def generate_currency_id_to_name(currency_ids: List[int]) -> Dict[str, str]:
-    """
-    Generate a dictionary mapping good ids to names.
-
-    :param currency_ids: the currency ids
-    :return: a dictionary mapping currency's ids to names.
-    """
-    currency_id_to_name = {
-        str(currency_id): "{}_{}".format(FT_NAME, currency_id)
-        for currency_id in currency_ids
-    }
-    return currency_id_to_name
-
-
-def generate_currency_ids(nb_currencies: int) -> List[int]:
-    """
-    Generate currency ids.
-
-    :param nb_currencies: the number of currencies.
-    :param contract: the instance of the contract.
-    """
-    currency_ids = ERC1155Contract.generate_token_ids(FT_ID, nb_currencies)
-    enforce(
-        len(currency_ids) == nb_currencies,
-        "Length of currency ids and number of currencies must match.",
-    )
-    return currency_ids
-
-
-def determine_scaling_factor(money_endowment: int) -> float:
-    """
-    Compute the scaling factor based on the money amount.
-
-    :param money_endowment: the endowment of money for the agent
-    :return: the scaling factor
-    """
-    scaling_factor = 10.0 ** (len(str(money_endowment)) - 1)
-    return scaling_factor
-
-
-def generate_good_endowments(
-    agent_addresses: List[str],
-    good_ids: List[str],
-    base_amount: int,
-    uniform_lower_bound_factor: int,
-    uniform_upper_bound_factor: int,
-) -> Dict[str, Dict[str, int]]:
-    """
-    Compute good endowments per agent. That is, a matrix of shape (nb_agents, nb_goods).
-
-    :param agent_addresses: the addresses of the agents
-    :param good_ids: the list of good ids
-    :param base_amount: the base amount of instances per good
-    :param uniform_lower_bound_factor: the lower bound of the uniform distribution for the sampling of the good instance number.
-    :param uniform_upper_bound_factor: the upper bound of the uniform distribution for the sampling of the good instance number.
-    :return: the endowments matrix.
-    """
-    # sample good instances
-    nb_agents = len(agent_addresses)
-    instances_per_good = _sample_good_instances(
-        nb_agents,
-        good_ids,
-        base_amount,
-        uniform_lower_bound_factor,
-        uniform_upper_bound_factor,
-    )
-    # each agent receives at least base amount of each good
-    base_assignment = {good_id: base_amount for good_id in good_ids}
-    endowments = {agent_addr: base_assignment for agent_addr in agent_addresses}
-    # randomly assign additional goods to create differences
-    for good_id in good_ids:
-        for _ in range(instances_per_good[good_id] - (base_amount * nb_agents)):
-            idx = random.randint(0, nb_agents - 1)  # nosec
-            agent_addr = agent_addresses[idx]
-            endowments[agent_addr][good_id] += 1
-    return endowments
-
-
-def generate_utility_params(
-    agent_addresses: List[str], good_ids: List[str], scaling_factor: float
-) -> Dict[str, Dict[str, float]]:
-    """
-    Compute the preference matrix. That is, a generic element e_ij is the utility of good j for agent i.
-
-    :param agent_addresses: the agent addresses
-    :param good_ids: the list of good ids
-    :param scaling_factor: a scaling factor for all the utility params generated.
-    :return: the preference matrix.
-    """
-    decimals = 4 if len(good_ids) < 100 else 8
-    utility_function_params = {}  # type: Dict[str, Dict[str, float]]
-    for agent_addr in agent_addresses:
-        random_integers = [
-            random.randint(1, 101) for _ in range(len(good_ids))  # nosec
-        ]
-        total = sum(random_integers)
-        normalized_fractions = [
-            round(i / float(total), decimals) for i in random_integers
-        ]
-        if not sum(normalized_fractions) == 1.0:
-            normalized_fractions[-1] = round(
-                1.0 - sum(normalized_fractions[0:-1]), decimals
-            )
-        # scale the utility params
-        params = {
-            good_id: param * scaling_factor
-            for good_id, param in zip(good_ids, normalized_fractions)
-        }
-        utility_function_params[agent_addr] = params
-
-    return utility_function_params
-
-
-def _sample_good_instances(
-    nb_agents: int,
-    good_ids: List[str],
-    base_amount: int,
-    uniform_lower_bound_factor: int,
-    uniform_upper_bound_factor: int,
-) -> Dict[str, int]:
-    """
-    Sample the number of instances for a good.
-
-    :param nb_agents: the number of agents
-    :param good_ids: the good ids
-    :param base_amount: the base amount of instances per good
-    :param uniform_lower_bound_factor: the lower bound factor of a uniform distribution
-    :param uniform_upper_bound_factor: the upper bound factor of a uniform distribution
-    :return: the number of instances I sampled.
-    """
-    a = base_amount * nb_agents + nb_agents * uniform_lower_bound_factor
-    b = base_amount * nb_agents + nb_agents * uniform_upper_bound_factor
-    # Return random integer in range [a, b]
-    nb_instances = {good_id: round(np.random.uniform(a, b)) for good_id in good_ids}
-    return nb_instances
-
-
-def generate_currency_endowments(
-    agent_addresses: List[str], currency_ids: List[str], money_endowment: int
-) -> Dict[str, Dict[str, int]]:
-    """
-    Compute the initial money amounts for each agent.
-
-    :param agent_addresses: addresses of the agents.
-    :param currency_ids: the currency ids.
-    :param money_endowment: money endowment per agent.
-    :return: the nested dict of currency endowments
-    """
-    currency_endowment = {currency_id: money_endowment for currency_id in currency_ids}
-    return {agent_addr: currency_endowment for agent_addr in agent_addresses}
-
-
-def generate_exchange_params(
-    agent_addresses: List[str], currency_ids: List[str],
-) -> Dict[str, Dict[str, float]]:
-    """
-    Compute the exchange parameters for each agent.
-
-    :param agent_addresses: addresses of the agents.
-    :param currency_ids: the currency ids.
-    :return: the nested dict of currency endowments
-    """
-    exchange_params = {currency_id: 1.0 for currency_id in currency_ids}
-    return {agent_addr: exchange_params for agent_addr in agent_addresses}
-
-
-def generate_equilibrium_prices_and_holdings(  # pylint: disable=unused-argument
-    agent_addr_to_good_endowments: Dict[str, Dict[str, int]],
-    agent_addr_to_utility_params: Dict[str, Dict[str, float]],
-    agent_addr_to_currency_endowments: Dict[str, Dict[str, int]],
-    agent_addr_to_exchange_params: Dict[str, Dict[str, float]],
-    scaling_factor: float,
-    quantity_shift: int = QUANTITY_SHIFT,
-) -> Tuple[Dict[str, float], Dict[str, Dict[str, float]], Dict[str, float]]:
-    """
-    Compute the competitive equilibrium prices and allocation.
-
-    :param agent_addr_to_good_endowments: endowments of the agents
-    :param agent_addr_to_utility_params: utility function params of the agents (already scaled)
-    :param agent_addr_to_currency_endowments: money endowment per agent.
-    :param agent_addr_to_exchange_params: exchange params per agent.
-    :param scaling_factor: a scaling factor for all the utility params generated.
-    :param quantity_shift: a factor to shift the quantities in the utility function (to ensure the natural logarithm can be used on the entire range of quantities)
-    :return: the lists of equilibrium prices, equilibrium good holdings and equilibrium money holdings
-    """
-    # create ordered lists
-    agent_addresses = []  # type: List[str]
-    good_ids = []  # type: List[str]
-    good_ids_to_idx = {}  # type: Dict[str, int]
-    good_endowments_l = []  # type: List[List[int]]
-    utility_params_l = []  # type: List[List[float]]
-    currency_endowment_l = []  # type: List[int]
-    count = 0
-    for agent_addr, good_endowment in agent_addr_to_good_endowments.items():
-        agent_addresses.append(agent_addr)
-        enforce(
-            len(agent_addr_to_currency_endowments[agent_addr].values()) == 1,
-            "Cannot have more than one currency.",
-        )
-        currency_endowment_l.append(
-            list(agent_addr_to_currency_endowments[agent_addr].values())[0]
-        )
-        enforce(
-            len(good_endowment.keys())
-            == len(agent_addr_to_utility_params[agent_addr].keys()),
-            "Good endowments and utility params inconsistent.",
-        )
-        temp_g_e = [0] * len(good_endowment.keys())
-        temp_u_p = [0.0] * len(agent_addr_to_utility_params[agent_addr].keys())
-        idx = 0
-        for good_id, quantity in good_endowment.items():
-            if count == 0:
-                good_ids.append(good_id)
-                good_ids_to_idx[good_id] = idx
-                idx += 1
-            temp_g_e[good_ids_to_idx[good_id]] = quantity
-            temp_u_p[good_ids_to_idx[good_id]] = agent_addr_to_utility_params[
-                agent_addr
-            ][good_id]
-        count += 1
-        good_endowments_l.append(temp_g_e)
-        utility_params_l.append(temp_u_p)
-
-    # maths
-    endowments_a = np.array(good_endowments_l, dtype=np.int)
-    scaled_utility_params_a = np.array(
-        utility_params_l, dtype=np.float
-    )  # note, they are already scaled
-    endowments_by_good = np.sum(endowments_a, axis=0)
-    scaled_params_by_good = np.sum(scaled_utility_params_a, axis=0)
-    eq_prices = np.divide(
-        scaled_params_by_good,
-        quantity_shift * len(agent_addresses) + endowments_by_good,
-    )
-    eq_good_holdings = np.divide(scaled_utility_params_a, eq_prices) - quantity_shift
-    eq_currency_holdings = (
-        np.transpose(np.dot(eq_prices, np.transpose(endowments_a + quantity_shift)))
-        + currency_endowment_l
-        - scaling_factor
-    )
-
-    # back to dicts
-    eq_prices_dict = {
-        good_id: cast(float, eq_price)
-        for good_id, eq_price in zip(good_ids, eq_prices.tolist())
-    }
-    eq_good_holdings_dict = {
-        agent_addr: {good_id: cast(float, v) for good_id, v in zip(good_ids, egh)}
-        for agent_addr, egh in zip(agent_addresses, eq_good_holdings.tolist())
-    }
-    eq_currency_holdings_dict = {
-        agent_addr: cast(float, eq_currency_holding)
-        for agent_addr, eq_currency_holding in zip(
-            agent_addresses, eq_currency_holdings.tolist()
-        )
-    }
-    return eq_prices_dict, eq_good_holdings_dict, eq_currency_holdings_dict
diff --git a/packages/fetchai/skills/tac_control_contract/parameters.py b/packages/fetchai/skills/tac_control_contract/parameters.py
index 7b7d098d80..5046c98a66 100644
--- a/packages/fetchai/skills/tac_control_contract/parameters.py
+++ b/packages/fetchai/skills/tac_control_contract/parameters.py
@@ -19,215 +19,7 @@
 
 """This package contains a class representing the game parameters."""
 
-import datetime
-from typing import List, Optional, Set
+from packages.fetchai.skills.tac_control.parameters import Parameters as BaseParameters
 
-from aea.exceptions import AEAEnforceError, enforce
-from aea.skills.base import Model
 
-DEFAULT_MIN_NB_AGENTS = 5
-DEFAULT_MONEY_ENDOWMENT = 200
-DEFAULT_NB_GOODS = 9  # ERC1155 vyper contract only accepts 10 tokens per mint/create
-DEFAULT_NB_CURRENCIES = 1
-DEFAULT_TX_FEE = 1
-DEFAULT_BASE_GOOD_ENDOWMENT = 2
-DEFAULT_LOWER_BOUND_FACTOR = 1
-DEFAULT_UPPER_BOUND_FACTOR = 1
-DEFAULT_START_TIME = "01 01 2020  00:01"
-DEFAULT_REGISTRATION_TIMEOUT = 60
-DEFAULT_ITEM_SETUP_TIMEOUT = 60
-DEFAULT_COMPETITION_TIMEOUT = 300
-DEFAULT_INACTIVITY_TIMEOUT = 30
-DEFAULT_VERSION = "v1"
-DEFAULT_LEDGER_ID = "ethereum"
-
-
-class Parameters(Model):
-    """This class contains the parameters of the game."""
-
-    def __init__(self, **kwargs):
-        """Instantiate the search class."""
-
-        self._ledger = kwargs.pop("ledger", DEFAULT_LEDGER_ID)
-        self._contract_address = kwargs.pop(
-            "contract_adress", None
-        )  # type: Optional[str]
-        self._good_ids = kwargs.pop("good_ids", [])  # type: List[int]
-        self._currency_ids = kwargs.pop("currency_ids", [])  # type: List[int]
-        self._min_nb_agents = kwargs.pop(
-            "min_nb_agents", DEFAULT_MIN_NB_AGENTS
-        )  # type: int
-        self._money_endowment = kwargs.pop(
-            "money_endowment", DEFAULT_MONEY_ENDOWMENT
-        )  # type: int
-        self._nb_goods = DEFAULT_NB_GOODS
-        self._nb_currencies = DEFAULT_NB_CURRENCIES
-        self._tx_fee = kwargs.pop("tx_fee", DEFAULT_TX_FEE)
-        self._base_good_endowment = kwargs.pop(
-            "base_good_endowment", DEFAULT_BASE_GOOD_ENDOWMENT
-        )  # type: int
-        self._lower_bound_factor = kwargs.pop(
-            "lower_bound_factor", DEFAULT_LOWER_BOUND_FACTOR
-        )  # type: int
-        self._upper_bound_factor = kwargs.pop(
-            "upper_bound_factor", DEFAULT_UPPER_BOUND_FACTOR
-        )  # type: int
-        start_time = kwargs.pop("start_time", DEFAULT_START_TIME)  # type: str
-        self._start_time = datetime.datetime.strptime(
-            start_time, "%d %m %Y %H:%M"
-        )  # type: datetime.datetime
-        self._registration_timeout = kwargs.pop(
-            "registration_timeout", DEFAULT_REGISTRATION_TIMEOUT
-        )  # type: int
-        self._item_setup_timeout = kwargs.pop(
-            "item_setup_timeout", DEFAULT_ITEM_SETUP_TIMEOUT
-        )  # type: int
-        self._competition_timeout = kwargs.pop(
-            "competition_timeout", DEFAULT_COMPETITION_TIMEOUT
-        )  # type: int
-        self._inactivity_timeout = kwargs.pop(
-            "inactivity_timeout", DEFAULT_INACTIVITY_TIMEOUT
-        )  # type: int
-        self._whitelist = set(kwargs.pop("whitelist", []))  # type: Set[str]
-        self._version_id = kwargs.pop("version_id", DEFAULT_VERSION)  # type: str
-        super().__init__(**kwargs)
-        now = datetime.datetime.now()
-        if now > self.registration_start_time:
-            self.context.logger.warning(
-                "TAC registration start time {} is in the past! Deregistering skill.".format(
-                    self.registration_start_time
-                )
-            )
-            self.context.is_active = False
-        else:
-            self.context.logger.info(
-                "TAC registation start time: {}, and registration end time: {}, and start time: {}, and end time: {}".format(
-                    self.registration_start_time,
-                    self.registration_end_time,
-                    self.start_time,
-                    self.end_time,
-                )
-            )
-        self._check_consistency()
-
-    @property
-    def ledger(self) -> str:
-        """Get the ledger identifier."""
-        return self._ledger
-
-    @property
-    def contract_address(self) -> str:
-        """The contract address of an already deployed smart-contract."""
-        if self._contract_address is None:
-            raise AEAEnforceError("No contract address provided.")
-        return self._contract_address
-
-    @property
-    def is_contract_deployed(self) -> bool:
-        """Check if there is a deployed instance of the contract."""
-        return self._contract_address is not None
-
-    @property
-    def good_ids(self) -> List[int]:
-        """The item ids of an already deployed smart-contract."""
-        enforce(self.is_contract_deployed, "There is no deployed contract.")
-        enforce(self._good_ids != [], "No good_ids provided.")
-        return self._good_ids
-
-    @property
-    def currency_ids(self) -> List[int]:
-        """The currency ids of an already deployed smart-contract."""
-        enforce(self.is_contract_deployed, "There is no deployed contract.")
-        enforce(self._currency_ids != [], "No currency_ids provided.")
-        return self._currency_ids
-
-    @property
-    def min_nb_agents(self) -> int:
-        """Minimum number of agents required for a TAC instance."""
-        return self._min_nb_agents
-
-    @property
-    def money_endowment(self) -> int:
-        """Money endowment per agent for a TAC instance."""
-        return self._money_endowment
-
-    @property
-    def nb_goods(self) -> int:
-        """Good number for a TAC instance."""
-        return self._nb_goods
-
-    @property
-    def nb_currencies(self) -> int:
-        """Currency number for a TAC instance."""
-        return self._nb_currencies
-
-    @property
-    def tx_fee(self) -> int:
-        """Transaction fee for a TAC instance."""
-        return self._tx_fee
-
-    @property
-    def base_good_endowment(self) -> int:
-        """Minimum endowment of each agent for each good."""
-        return self._base_good_endowment
-
-    @property
-    def lower_bound_factor(self) -> int:
-        """Lower bound of a uniform distribution."""
-        return self._lower_bound_factor
-
-    @property
-    def upper_bound_factor(self) -> int:
-        """Upper bound of a uniform distribution."""
-        return self._upper_bound_factor
-
-    @property
-    def registration_start_time(self) -> datetime.datetime:
-        """TAC registration start time."""
-        return (
-            self._start_time
-            - datetime.timedelta(seconds=self._item_setup_timeout)
-            - datetime.timedelta(seconds=self._registration_timeout)
-        )
-
-    @property
-    def registration_end_time(self) -> datetime.datetime:
-        """TAC registration end time."""
-        return self._start_time - datetime.timedelta(seconds=self._item_setup_timeout)
-
-    @property
-    def start_time(self) -> datetime.datetime:
-        """TAC start time."""
-        return self._start_time
-
-    @property
-    def end_time(self) -> datetime.datetime:
-        """TAC end time."""
-        return self._start_time + datetime.timedelta(seconds=self._competition_timeout)
-
-    @property
-    def inactivity_timeout(self):
-        """Timeout of agent inactivity from controller perspective (no received transactions)."""
-        return self._inactivity_timeout
-
-    @property
-    def whitelist(self) -> Set[str]:
-        """Whitelist of agent addresses allowed into the TAC instance."""
-        return self._whitelist
-
-    @property
-    def version_id(self) -> str:
-        """Version id."""
-        return self._version_id
-
-    def _check_consistency(self) -> None:
-        """Check the parameters are consistent."""
-        if self._contract_address is not None and (
-            self._good_ids == []
-            or self._currency_ids == []
-            or len(self._good_ids) != self._nb_goods
-            or len(self._currency_ids) != self._nb_currencies
-        ):
-            raise ValueError(
-                "If the contract address is set, then good ids and currency id must be provided and consistent."
-            )
+Parameters = BaseParameters
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 42af59473b..e23ef0f683 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -20,7 +20,8 @@ contracts:
 protocols:
 - fetchai/oef_search:0.6.0
 - fetchai/tac:0.6.0
-skills: []
+skills:
+- fetchai/tac_control:0.7.0
 behaviours:
   contract:
     args:
@@ -28,21 +29,27 @@ behaviours:
     class_name: ContractBehaviour
   tac:
     args: {}
-    class_name: TACBehaviour
+    class_name: TacBehaviour
 handlers:
   oef:
     args: {}
-    class_name: OEFRegistrationHandler
+    class_name: OefSearchHandler
   tac:
     args: {}
-    class_name: TACHandler
+    class_name: TacHandler
   transaction:
     args: {}
     class_name: TransactionHandler
 models:
+  default_dialogues:
+    args: {}
+    class_name: DefaultDialogues
   game:
     args: {}
     class_name: Game
+  oef_search_dialogues:
+    args: {}
+    class_name: OefSearchDialogues
   parameters:
     args:
       base_good_endowment: 4
@@ -52,16 +59,26 @@ models:
       inactivity_timeout: 60
       item_setup_timeout: 120
       ledger: ethereum
+      location:
+        latitude: 0.127
+        longitude: 51.5194
       lower_bound_factor: 1
       min_nb_agents: 2
       money_endowment: 2000000
+      nb_goods: 10
       registration_timeout: 60
+      service_data:
+        key: tac
+        value: v1
       start_time: 09 03 2020 15:15
       tx_fee: 1
       upper_bound_factor: 1
       version_id: v1
       whitelist: []
     class_name: Parameters
+  tac_dialogues:
+    args: {}
+    class_name: TacDialogues
 dependencies:
   numpy: {}
   vyper:

From b5c011bcbd07707ab1c449bd5c078f1458a1d08e Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 15:19:54 +0200
Subject: [PATCH 013/131] add isort.

---
 .github/workflows/workflow.yml                |  1 +
 .pylintrc                                     |  4 +-
 Makefile                                      |  1 +
 Pipfile                                       |  5 +-
 aea/__init__.py                               | 13 ++-
 aea/aea.py                                    |  2 +-
 aea/aea_builder.py                            |  3 +-
 aea/agent.py                                  |  1 -
 aea/agent_loop.py                             |  3 +-
 aea/cli/__main__.py                           |  1 -
 aea/cli/config.py                             |  7 +-
 aea/cli/create.py                             |  2 +-
 aea/cli/fetch.py                              |  2 +-
 aea/cli/fingerprint.py                        |  8 +-
 aea/cli/freeze.py                             |  2 +-
 aea/cli/generate_key.py                       |  2 +-
 aea/cli/generate_wealth.py                    |  2 +-
 aea/cli/get_multiaddress.py                   |  8 +-
 aea/cli/get_wealth.py                         |  2 +-
 aea/cli/install.py                            |  2 +-
 aea/cli/launch.py                             |  2 +-
 aea/cli/list.py                               |  2 +-
 aea/cli/registry/utils.py                     |  1 -
 aea/cli/run.py                                |  2 +-
 aea/cli/scaffold.py                           |  5 +-
 aea/cli/search.py                             |  2 +-
 aea/cli/utils/config.py                       |  4 +-
 aea/cli/utils/constants.py                    |  1 -
 aea/cli/utils/context.py                      |  4 +-
 aea/cli/utils/decorators.py                   |  8 +-
 aea/cli/utils/generic.py                      |  3 +-
 aea/cli/utils/loggers.py                      |  1 -
 aea/cli/utils/package_utils.py                |  5 +-
 aea/cli_gui/__init__.py                       | 12 +--
 aea/components/loader.py                      |  6 +-
 aea/configurations/base.py                    |  5 +-
 aea/configurations/loader.py                  |  6 +-
 aea/configurations/pypi.py                    |  2 +-
 aea/connections/base.py                       | 11 +--
 aea/connections/stub/connection.py            |  1 -
 aea/connections/stub/connection.yaml          |  2 +-
 aea/contracts/base.py                         |  9 +-
 aea/crypto/__init__.py                        |  7 +-
 aea/crypto/base.py                            |  1 -
 aea/crypto/cosmos.py                          |  4 +-
 aea/crypto/ethereum.py                        |  7 +-
 aea/crypto/fetchai.py                         |  3 +-
 aea/crypto/wallet.py                          |  2 +-
 aea/decision_maker/default.py                 |  2 +-
 aea/helpers/async_utils.py                    |  4 +-
 aea/helpers/base.py                           |  3 +-
 aea/helpers/file_lock.py                      |  4 +-
 aea/helpers/ipfs/base.py                      |  3 +-
 aea/helpers/ipfs/pb/merkledag_pb2.py          |  3 +-
 aea/helpers/ipfs/pb/unixfs_pb2.py             |  3 +-
 aea/helpers/logging.py                        |  2 +-
 aea/helpers/multiaddr/base.py                 |  4 +-
 aea/helpers/multiaddr/crypto_pb2.py           |  5 +-
 aea/helpers/multiple_executor.py              |  3 +-
 aea/helpers/search/models.py                  |  2 +-
 aea/launcher.py                               |  3 +-
 aea/mail/base_pb2.py                          |  3 +-
 aea/multiplexer.py                            | 12 +--
 aea/protocols/base.py                         |  8 +-
 aea/protocols/default/dialogues.py            |  2 +-
 aea/protocols/default/message.py              |  2 +-
 aea/protocols/default/protocol.yaml           |  6 +-
 aea/protocols/default/serialization.py        |  5 +-
 aea/protocols/dialogue/base.py                |  2 +-
 aea/protocols/generator/base.py               | 20 ++--
 .../generator/extract_specification.py        |  4 +-
 aea/protocols/generator/validate.py           |  6 +-
 aea/protocols/scaffold/protocol.yaml          |  2 +-
 aea/protocols/scaffold/serialization.py       |  3 +-
 aea/protocols/signing/dialogues.py            |  2 +-
 aea/protocols/signing/message.py              |  2 +-
 aea/protocols/signing/protocol.yaml           |  6 +-
 aea/protocols/signing/serialization.py        | 19 ++--
 aea/protocols/state_update/dialogues.py       |  2 +-
 aea/protocols/state_update/message.py         |  2 +-
 aea/protocols/state_update/protocol.yaml      |  6 +-
 aea/protocols/state_update/serialization.py   |  5 +-
 aea/registries/base.py                        |  2 +-
 aea/registries/filter.py                      |  5 +-
 aea/registries/resources.py                   |  2 +-
 aea/runner.py                                 |  1 -
 aea/runtime.py                                |  3 +-
 aea/skills/base.py                            |  2 +-
 aea/skills/tasks.py                           |  2 +-
 aea/test_tools/click_testing.py               |  3 +-
 aea/test_tools/test_cases.py                  |  2 -
 .../react_multi_agents_fake_connection.py     |  3 +-
 benchmark/cases/react_speed_multi_agents.py   |  3 +-
 benchmark/checks/check_mem_usage.py           |  5 +-
 benchmark/checks/check_multiagent.py          | 16 ++--
 benchmark/checks/check_proactive.py           |  8 +-
 benchmark/checks/check_reactive.py            |  7 +-
 benchmark/checks/utils.py                     |  7 +-
 benchmark/framework/aea_test_wrapper.py       |  3 +-
 benchmark/framework/executor.py               |  3 -
 benchmark/framework/report_printer.py         |  1 -
 examples/gym_ex/gyms/env.py                   |  3 +-
 examples/gym_ex/proxy/agent.py                |  6 +-
 examples/gym_ex/proxy/env.py                  | 13 +--
 examples/gym_ex/rl/agent.py                   |  1 -
 .../fetchai/connections/gym/connection.py     |  4 +-
 .../fetchai/connections/gym/connection.yaml   |  2 +-
 .../connections/http_client/connection.py     |  4 +-
 .../connections/http_client/connection.yaml   |  2 +-
 .../connections/http_server/connection.py     | 12 +--
 .../connections/http_server/connection.yaml   |  2 +-
 packages/fetchai/connections/ledger/base.py   |  3 +-
 .../fetchai/connections/ledger/connection.py  |  8 +-
 .../connections/ledger/connection.yaml        |  8 +-
 .../connections/ledger/contract_dispatcher.py | 14 +--
 .../connections/ledger/ledger_dispatcher.py   | 12 +--
 .../fetchai/connections/local/connection.py   |  3 +-
 .../fetchai/connections/local/connection.yaml |  2 +-
 .../fetchai/connections/oef/connection.py     |  4 +-
 .../fetchai/connections/oef/connection.yaml   |  4 +-
 .../connections/oef/object_translator.py      | 41 +++-----
 .../connections/p2p_libp2p/connection.py      |  2 +-
 .../connections/p2p_libp2p/connection.yaml    |  2 +-
 .../p2p_libp2p_client/connection.py           |  2 +-
 .../p2p_libp2p_client/connection.yaml         |  2 +-
 .../connections/p2p_stub/connection.py        |  2 +-
 .../connections/p2p_stub/connection.yaml      |  2 +-
 .../fetchai/connections/soef/connection.py    |  6 +-
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 .../fetchai/connections/tcp/connection.yaml   |  4 +-
 .../fetchai/connections/tcp/tcp_client.py     |  3 +-
 .../fetchai/connections/tcp/tcp_server.py     |  3 +-
 .../fetchai/connections/webhook/connection.py |  3 +-
 .../connections/webhook/connection.yaml       |  2 +-
 .../fetchai/contracts/erc1155/contract.py     |  2 +-
 .../fetchai/contracts/erc1155/contract.yaml   |  2 +-
 .../protocols/contract_api/dialogues.py       |  3 +-
 .../fetchai/protocols/contract_api/message.py |  3 +-
 .../protocols/contract_api/protocol.yaml      |  6 +-
 .../protocols/contract_api/serialization.py   | 16 ++--
 packages/fetchai/protocols/fipa/dialogues.py  |  3 +-
 packages/fetchai/protocols/fipa/message.py    |  3 +-
 packages/fetchai/protocols/fipa/protocol.yaml |  6 +-
 .../fetchai/protocols/fipa/serialization.py   |  9 +-
 packages/fetchai/protocols/gym/dialogues.py   |  3 +-
 packages/fetchai/protocols/gym/message.py     |  3 +-
 packages/fetchai/protocols/gym/protocol.yaml  |  6 +-
 .../fetchai/protocols/gym/serialization.py    |  6 +-
 packages/fetchai/protocols/http/dialogues.py  |  3 +-
 packages/fetchai/protocols/http/message.py    |  2 +-
 packages/fetchai/protocols/http/protocol.yaml |  6 +-
 .../fetchai/protocols/http/serialization.py   |  6 +-
 .../protocols/ledger_api/custom_types.py      |  1 -
 .../fetchai/protocols/ledger_api/dialogues.py |  3 +-
 .../fetchai/protocols/ledger_api/message.py   |  3 +-
 .../protocols/ledger_api/protocol.yaml        |  8 +-
 .../protocols/ledger_api/serialization.py     | 18 ++--
 .../protocols/ml_trade/custom_types.py        |  1 -
 .../fetchai/protocols/ml_trade/dialogues.py   |  3 +-
 .../fetchai/protocols/ml_trade/message.py     |  3 +-
 .../fetchai/protocols/ml_trade/protocol.yaml  |  8 +-
 .../protocols/ml_trade/serialization.py       |  9 +-
 .../protocols/oef_search/custom_types.py      |  1 -
 .../fetchai/protocols/oef_search/dialogues.py |  3 +-
 .../fetchai/protocols/oef_search/message.py   |  3 +-
 .../protocols/oef_search/protocol.yaml        |  8 +-
 .../protocols/oef_search/serialization.py     | 16 ++--
 .../fetchai/protocols/tac/custom_types.py     |  1 -
 packages/fetchai/protocols/tac/dialogues.py   |  3 +-
 packages/fetchai/protocols/tac/message.py     |  3 +-
 packages/fetchai/protocols/tac/protocol.yaml  |  8 +-
 .../fetchai/protocols/tac/serialization.py    |  6 +-
 .../fetchai/skills/aries_alice/behaviours.py  |  3 +-
 .../fetchai/skills/aries_alice/dialogues.py   |  1 -
 .../fetchai/skills/aries_alice/handlers.py    |  3 +-
 .../fetchai/skills/aries_alice/skill.yaml     |  6 +-
 .../fetchai/skills/aries_faber/behaviours.py  |  3 +-
 .../fetchai/skills/aries_faber/dialogues.py   |  1 -
 .../fetchai/skills/aries_faber/handlers.py    |  3 +-
 .../fetchai/skills/aries_faber/skill.yaml     |  8 +-
 .../fetchai/skills/aries_faber/strategy.py    |  7 +-
 .../skills/carpark_client/behaviours.py       |  1 -
 .../fetchai/skills/carpark_client/handlers.py |  1 -
 .../fetchai/skills/carpark_client/skill.yaml  |  6 +-
 .../fetchai/skills/carpark_client/strategy.py |  1 -
 .../skills/carpark_detection/behaviours.py    |  1 -
 .../skills/carpark_detection/dialogues.py     |  1 -
 .../skills/carpark_detection/handlers.py      |  1 -
 .../skills/carpark_detection/skill.yaml       |  8 +-
 .../skills/carpark_detection/strategy.py      |  1 -
 packages/fetchai/skills/echo/handlers.py      |  4 +-
 packages/fetchai/skills/echo/skill.yaml       |  2 +-
 .../skills/erc1155_client/behaviours.py       |  1 -
 .../skills/erc1155_client/dialogues.py        |  1 -
 .../fetchai/skills/erc1155_client/handlers.py |  3 +-
 .../fetchai/skills/erc1155_client/skill.yaml  |  6 +-
 .../skills/erc1155_deploy/behaviours.py       |  1 -
 .../skills/erc1155_deploy/dialogues.py        |  1 -
 .../fetchai/skills/erc1155_deploy/handlers.py |  4 +-
 .../fetchai/skills/erc1155_deploy/skill.yaml  |  8 +-
 .../fetchai/skills/erc1155_deploy/strategy.py |  1 -
 .../skills/generic_buyer/behaviours.py        |  1 -
 .../fetchai/skills/generic_buyer/dialogues.py |  2 -
 .../fetchai/skills/generic_buyer/handlers.py  |  3 +-
 .../fetchai/skills/generic_buyer/skill.yaml   |  6 +-
 .../skills/generic_seller/behaviours.py       |  2 -
 .../skills/generic_seller/dialogues.py        |  1 -
 .../fetchai/skills/generic_seller/handlers.py |  3 +-
 .../fetchai/skills/generic_seller/skill.yaml  |  6 +-
 packages/fetchai/skills/gym/dialogues.py      |  2 -
 packages/fetchai/skills/gym/handlers.py       |  1 -
 packages/fetchai/skills/gym/helpers.py        |  3 +-
 packages/fetchai/skills/gym/skill.yaml        |  8 +-
 packages/fetchai/skills/gym/tasks.py          |  1 -
 .../fetchai/skills/http_echo/dialogues.py     |  2 -
 packages/fetchai/skills/http_echo/handlers.py |  1 -
 packages/fetchai/skills/http_echo/skill.yaml  |  4 +-
 .../skills/ml_data_provider/behaviours.py     |  1 -
 .../skills/ml_data_provider/dialogues.py      |  1 -
 .../skills/ml_data_provider/handlers.py       |  3 +-
 .../skills/ml_data_provider/skill.yaml        |  8 +-
 .../skills/ml_data_provider/strategy.py       |  1 -
 .../fetchai/skills/ml_train/behaviours.py     |  1 -
 packages/fetchai/skills/ml_train/dialogues.py |  2 -
 packages/fetchai/skills/ml_train/handlers.py  |  4 +-
 packages/fetchai/skills/ml_train/skill.yaml   |  8 +-
 packages/fetchai/skills/ml_train/tasks.py     |  1 -
 .../simple_service_registration/behaviours.py |  1 -
 .../simple_service_registration/dialogues.py  |  2 -
 .../simple_service_registration/handlers.py   |  3 +-
 .../simple_service_registration/skill.yaml    |  6 +-
 .../fetchai/skills/tac_control/behaviours.py  |  3 +-
 .../fetchai/skills/tac_control/dialogues.py   |  2 -
 packages/fetchai/skills/tac_control/game.py   |  3 +-
 .../fetchai/skills/tac_control/handlers.py    |  3 +-
 .../fetchai/skills/tac_control/helpers.py     |  2 +-
 .../fetchai/skills/tac_control/skill.yaml     | 10 +-
 .../skills/tac_control_contract/behaviours.py |  3 +-
 .../skills/tac_control_contract/game.py       |  3 +-
 .../skills/tac_control_contract/handlers.py   |  1 -
 .../skills/tac_control_contract/helpers.py    |  3 +-
 .../skills/tac_control_contract/skill.yaml    |  8 +-
 .../skills/tac_negotiation/behaviours.py      |  1 -
 .../skills/tac_negotiation/dialogues.py       |  4 +-
 .../skills/tac_negotiation/handlers.py        |  3 +-
 .../fetchai/skills/tac_negotiation/helpers.py |  2 +-
 .../fetchai/skills/tac_negotiation/skill.yaml | 12 +--
 .../skills/tac_negotiation/strategy.py        |  4 +-
 .../skills/tac_negotiation/transactions.py    |  3 +-
 .../skills/tac_participation/behaviours.py    |  3 +-
 .../skills/tac_participation/dialogues.py     |  2 -
 .../fetchai/skills/tac_participation/game.py  |  1 -
 .../skills/tac_participation/handlers.py      |  3 +-
 .../skills/tac_participation/skill.yaml       |  8 +-
 .../fetchai/skills/thermometer/behaviours.py  |  1 -
 .../fetchai/skills/thermometer/dialogues.py   |  1 -
 .../fetchai/skills/thermometer/handlers.py    |  1 -
 .../fetchai/skills/thermometer/skill.yaml     |  6 +-
 .../skills/thermometer_client/behaviours.py   |  1 -
 .../skills/thermometer_client/handlers.py     |  1 -
 .../skills/thermometer_client/skill.yaml      |  6 +-
 .../skills/thermometer_client/strategy.py     |  1 -
 .../skills/weather_client/behaviours.py       |  1 -
 .../fetchai/skills/weather_client/handlers.py |  1 -
 .../fetchai/skills/weather_client/skill.yaml  |  6 +-
 .../fetchai/skills/weather_client/strategy.py |  1 -
 .../skills/weather_station/behaviours.py      |  1 -
 .../weather_station/db_communication.py       |  2 +-
 .../skills/weather_station/dialogues.py       |  1 -
 .../skills/weather_station/handlers.py        |  1 -
 .../fetchai/skills/weather_station/skill.yaml |  8 +-
 packages/hashes.csv                           | 96 +++++++++----------
 scripts/acn/run_acn_node_standalone.py        |  8 +-
 scripts/check_package_dependencies.py         |  2 -
 scripts/check_package_versions_in_docs.py     |  2 -
 scripts/deploy_to_registry.py                 |  3 +-
 scripts/generate_ipfs_hashes.py               |  5 +-
 scripts/oef/launch.py                         |  5 +-
 scripts/update_package_versions.py            |  5 +-
 setup.cfg                                     |  9 ++
 .../common/oef_search_pluto_scripts/launch.py |  5 +-
 tests/common/utils.py                         |  2 -
 tests/conftest.py                             | 34 +++----
 tests/data/generator/t_protocol/dialogues.py  |  3 +-
 tests/data/generator/t_protocol/message.py    |  3 +-
 .../generator/t_protocol/serialization.py     |  6 +-
 .../generator/t_protocol_no_ct/dialogues.py   |  3 +-
 .../generator/t_protocol_no_ct/message.py     |  2 +-
 .../t_protocol_no_ct/serialization.py         |  6 +-
 tests/test_aea.py                             |  4 +-
 tests/test_aea_builder.py                     |  6 +-
 tests/test_agent.py                           |  2 -
 tests/test_agent_loop.py                      |  1 -
 tests/test_cli/test_add/test_connection.py    |  9 +-
 tests/test_cli/test_add/test_contract.py      |  3 +-
 tests/test_cli/test_add/test_generic.py       |  3 +-
 tests/test_cli/test_add/test_protocol.py      |  9 +-
 tests/test_cli/test_add/test_skill.py         |  9 +-
 tests/test_cli/test_add_key.py                |  5 +-
 tests/test_cli/test_config.py                 |  3 +-
 tests/test_cli/test_core.py                   |  2 +-
 tests/test_cli/test_create.py                 |  7 +-
 tests/test_cli/test_delete.py                 |  1 -
 tests/test_cli/test_fetch.py                  |  6 +-
 tests/test_cli/test_fingerprint.py            |  3 +-
 tests/test_cli/test_freeze.py                 |  6 +-
 tests/test_cli/test_generate/test_generate.py |  3 +-
 .../test_cli/test_generate/test_protocols.py  |  6 +-
 tests/test_cli/test_generate_key.py           |  1 -
 tests/test_cli/test_generate_wealth.py        |  3 +-
 tests/test_cli/test_get_address.py            |  3 +-
 tests/test_cli/test_get_multiaddress.py       |  2 -
 tests/test_cli/test_get_wealth.py             |  3 +-
 tests/test_cli/test_gui.py                    |  4 +-
 tests/test_cli/test_init.py                   |  1 -
 tests/test_cli/test_install.py                |  5 +-
 tests/test_cli/test_interact.py               |  3 +-
 tests/test_cli/test_launch.py                 |  7 +-
 tests/test_cli/test_list.py                   |  5 +-
 tests/test_cli/test_loggers.py                |  2 +-
 tests/test_cli/test_login.py                  |  3 +-
 tests/test_cli/test_logout.py                 |  3 +-
 tests/test_cli/test_publish.py                |  3 +-
 tests/test_cli/test_push.py                   |  3 +-
 tests/test_cli/test_register.py               |  3 +-
 tests/test_cli/test_registry/test_add.py      |  2 +-
 tests/test_cli/test_registry/test_fetch.py    |  3 +-
 tests/test_cli/test_registry/test_login.py    |  2 +-
 tests/test_cli/test_registry/test_logout.py   |  2 +-
 tests/test_cli/test_registry/test_publish.py  |  3 +-
 tests/test_cli/test_registry/test_push.py     |  3 +-
 .../test_registry/test_registration.py        |  2 +-
 tests/test_cli/test_registry/test_utils.py    |  3 +-
 tests/test_cli/test_remove/test_connection.py |  3 +-
 tests/test_cli/test_remove/test_contract.py   |  3 +-
 tests/test_cli/test_remove/test_protocol.py   |  3 +-
 .../test_cli/test_remove/test_remove_item.py  |  3 +-
 tests/test_cli/test_remove/test_skill.py      |  1 -
 tests/test_cli/test_run.py                    | 10 +-
 .../test_cli/test_scaffold/test_connection.py |  6 +-
 tests/test_cli/test_scaffold/test_generic.py  |  3 +-
 .../test_cli/test_scaffold/test_protocols.py  |  6 +-
 tests/test_cli/test_scaffold/test_skills.py   |  6 +-
 tests/test_cli/test_search.py                 |  5 +-
 tests/test_cli/test_utils/test_config.py      |  3 +-
 tests/test_cli/test_utils/test_utils.py       | 10 +-
 tests/test_cli_gui/test_create.py             |  3 +-
 tests/test_cli_gui/test_get_items.py          |  2 +-
 tests/test_cli_gui/test_misc.py               |  1 -
 tests/test_cli_gui/test_run_agent.py          |  3 +-
 tests/test_cli_gui/test_utils.py              |  4 +-
 tests/test_components/test_base.py            |  1 -
 tests/test_configurations/test_aea_config.py  |  5 +-
 tests/test_configurations/test_base.py        | 17 ++--
 tests/test_configurations/test_loader.py      |  2 -
 tests/test_configurations/test_schema.py      | 17 ++--
 tests/test_connections/test_stub.py           |  5 +-
 tests/test_context/test_base.py               |  1 -
 tests/test_contracts/test_base.py             |  7 +-
 tests/test_crypto/test_cosmos.py              |  6 +-
 tests/test_crypto/test_ethereum.py            |  2 -
 tests/test_crypto/test_fetchai.py             |  3 +-
 tests/test_crypto/test_helpers.py             |  2 -
 tests/test_crypto/test_ledger_apis.py         |  7 +-
 .../test_registry/test_crypto_registry.py     |  1 -
 .../test_registry/test_ledger_api_registry.py |  1 -
 tests/test_crypto/test_wallet.py              |  2 -
 tests/test_decision_maker/test_default.py     |  4 +-
 .../test_ownership_state.py                   |  1 -
 tests/test_decision_maker/test_preferences.py |  1 -
 .../test_agent_vs_aea/agent_code_block.py     |  1 -
 .../test_agent_vs_aea/test_agent_vs_aea.py    |  1 -
 .../test_bash_yaml/test_demo_docs.py          |  1 -
 .../programmatic_aea.py                       |  2 +-
 .../test_programmatic_aea.py                  |  1 -
 .../programmatic_aea.py                       |  3 +-
 .../test_cli_vs_programmatic_aea.py           |  1 -
 .../decision_maker_transaction.py             |  2 +-
 .../test_decision_maker_transaction.py        |  7 +-
 tests/test_docs/test_docs_protocol.py         |  2 -
 tests/test_docs/test_docs_skill.py            |  1 -
 .../test_multiplexer_standalone.py            |  3 -
 .../test_orm_integration.py                   |  3 -
 .../test_skill_guide/test_skill_guide.py      |  2 -
 .../standalone_transaction.py                 |  1 -
 .../test_standalone_transaction.py            |  6 +-
 tests/test_examples/test_gym_ex.py            |  2 +-
 ..._client_connection_to_aries_cloud_agent.py |  4 -
 tests/test_helpers/test_async_utils.py        |  4 +-
 tests/test_helpers/test_base.py               |  6 +-
 tests/test_helpers/test_exec_timeout.py       | 10 +-
 tests/test_helpers/test_ipfs/test_base.py     |  3 +-
 tests/test_helpers/test_pipe/test_pipe.py     |  5 +-
 tests/test_helpers/test_search/test_models.py |  2 +-
 tests/test_identity/test_base.py              |  1 -
 tests/test_launcher.py                        |  8 +-
 tests/test_mail/test_base.py                  |  4 +-
 tests/test_multiplexer.py                     | 15 +--
 tests/test_package_loading.py                 |  4 +-
 .../test_connections/test_gym/test_gym.py     |  4 -
 .../test_http_client/test_http_client.py      | 10 +-
 .../test_http_server/test_http_server.py      | 11 +--
 .../test_http_server_and_client.py            | 11 +--
 .../test_ledger/test_contract_api.py          |  2 -
 .../test_ledger/test_ledger_api.py            |  2 -
 .../test_connections/test_local/test_misc.py  |  2 -
 .../test_local/test_search_services.py        |  4 +-
 .../test_oef/test_communication.py            |  9 +-
 .../test_connections/test_oef/test_models.py  |  1 -
 .../test_oef/test_oef_serializer.py           |  1 -
 .../test_p2p_libp2p/test_aea_cli.py           |  1 -
 .../test_p2p_libp2p/test_communication.py     |  2 -
 .../test_p2p_libp2p/test_errors.py            | 11 +--
 .../test_p2p_libp2p/test_fault_tolerance.py   |  1 -
 .../test_p2p_libp2p/test_public_dht.py        |  9 +-
 .../test_p2p_libp2p_client/test_aea_cli.py    |  1 -
 .../test_communication.py                     |  2 -
 .../test_p2p_libp2p_client/test_errors.py     |  4 +-
 .../test_p2p_stub/test_p2p_stub.py            |  1 -
 .../test_connections/test_soef/models.py      |  2 -
 .../test_connections/test_soef/test_soef.py   |  2 -
 .../test_soef/test_soef_integration.py        |  7 +-
 .../test_connections/test_tcp/test_base.py    |  1 -
 .../test_tcp/test_communication.py            |  1 -
 .../test_webhook/test_webhook.py              | 10 +-
 .../test_erc1155/test_contract.py             |  1 -
 .../test_protocols/test_contract_api.py       |  4 +-
 .../test_packages/test_protocols/test_fipa.py |  4 +-
 .../test_packages/test_protocols/test_gym.py  |  4 +-
 .../test_packages/test_protocols/test_http.py |  4 +-
 .../test_protocols/test_ledger_api.py         |  4 +-
 .../test_protocols/test_ml_trade.py           | 13 +--
 .../test_protocols/test_oef_search.py         | 13 +--
 .../test_packages/test_protocols/test_tac.py  |  6 +-
 .../test_packages/test_skills/test_carpark.py |  1 -
 .../test_packages/test_skills/test_erc1155.py |  1 -
 .../test_packages/test_skills/test_generic.py |  1 -
 tests/test_packages/test_skills/test_gym.py   |  2 -
 .../test_skills/test_http_echo.py             |  1 -
 .../test_skills/test_ml_skills.py             |  1 -
 tests/test_packages/test_skills/test_tac.py   |  1 -
 .../test_skills/test_thermometer.py           |  1 -
 .../test_packages/test_skills/test_weather.py |  1 -
 tests/test_protocols/test_base.py             |  1 -
 .../test_protocols/test_dialogue/test_base.py |  6 +-
 .../test_generator/test_common.py             |  3 +-
 .../test_generator/test_end_to_end.py         | 14 +--
 .../test_extract_specification.py             |  5 +-
 .../test_generator/test_generator.py          |  8 +-
 .../test_generator/test_validate.py           | 10 +-
 tests/test_protocols/test_signing.py          |  1 -
 tests/test_registries/test_base.py            |  3 +-
 tests/test_registries/test_filter.py          |  2 -
 tests/test_runner.py                          |  7 +-
 tests/test_runtime.py                         |  2 -
 tests/test_skills/test_base.py                |  9 +-
 tests/test_skills/test_behaviours.py          |  2 +-
 tests/test_skills/test_error.py               |  5 +-
 tests/test_skills/test_tasks.py               |  4 +-
 tests/test_test_tools/test_testcases.py       |  2 -
 tox.ini                                       | 14 ++-
 461 files changed, 730 insertions(+), 1279 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 81193a368a..4d48e1f1ed 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -52,6 +52,7 @@ jobs:
       - name: Code style check
         run: |
           tox -e black-check
+          tox -e isort-check
           tox -e flake8
       - name: Unused code check
         run: tox -e vulture
diff --git a/.pylintrc b/.pylintrc
index f289c246a0..9b2784db56 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -2,9 +2,10 @@
 ignore-patterns=serialization.py,message.py,__main__.py,.*_pb2.py
 
 [MESSAGES CONTROL]
-disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W1202,W1203,R0902,R0913,R0914,R0801,R0904,R0903,R0911,R0912,R0901,R0916,R1702,R0915
+disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,R0914,R0801,R0904,R0903,R0911,R0912,R0901,R0916,R1702,R0915,R1725
 
 ## Eventually resolve these:
+# W0707: raise-missing-from
 # R0902: too-many-instance-attributes
 # R0913: too-many-arguments
 # R0914: too-many-locals
@@ -16,6 +17,7 @@ disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W1202,W1203,R0902,R0913,R0914,
 # R0916: too-many-boolean-expressions
 # R1702: too-many-nested-blocks
 # R0915: too-many-statements
+# R1725: super-with-arguments
 # decide on a logging policy:
 # W1202: logging-format-interpolation
 # W1203: logging-fstring-interpolation
diff --git a/Makefile b/Makefile
index 059e991009..6ffffecb1a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ clean-test:
 .PHONY: lint
 lint:
 	black aea benchmark examples packages scripts tests
+	isort aea benchmark examples packages scripts tests
 	flake8 aea benchmark examples packages scripts tests
 	vulture aea scripts/whitelist.py --exclude "*_pb2.py"
 
diff --git a/Pipfile b/Pipfile
index d54d72e4e5..c5d3b65260 100644
--- a/Pipfile
+++ b/Pipfile
@@ -20,7 +20,7 @@ flake8 = "==3.7.9"
 flake8-bugbear = "==20.1.4"
 flake8-docstrings = "==1.5.0"
 flake8-eradicate = "==0.4.0"
-flake8-import-order = "==0.18.1"
+flake8-isort = "==4.0.0"
 gym = "==0.15.6"
 ipfshttpclient = "==0.6.1"
 liccheck = "==0.4.3"
@@ -40,7 +40,7 @@ pexpect = "==4.8.0"
 psutil = "==5.7.0"
 pydocstyle = "==3.0.0"
 pygments = "==2.5.2"
-pylint = "==2.5.2"
+pylint = "==2.6.0"
 pymdown-extensions = "==6.3"
 pynacl = "==1.3.0"
 pytest = "==5.4.3"
@@ -54,6 +54,7 @@ sqlalchemy = "==1.3.17"
 tox = "==3.15.1"
 vulture = "==2.1"
 vyper = "==0.1.0b12"
+isort = "==5.5.2"
 
 [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/aea/__init__.py b/aea/__init__.py
index 8dbb4b319b..23ed8227c4 100644
--- a/aea/__init__.py
+++ b/aea/__init__.py
@@ -21,9 +21,16 @@
 
 import inspect
 import os
-import aea.crypto  # triggers registry population
 
-from aea.__version__ import __title__, __description__, __url__, __version__
-from aea.__version__ import __author__, __license__, __copyright__
+import aea.crypto  # triggers registry population
+from aea.__version__ import (
+    __author__,
+    __copyright__,
+    __description__,
+    __license__,
+    __title__,
+    __url__,
+    __version__,
+)
 
 AEA_DIR = os.path.dirname(inspect.getfile(inspect.currentframe()))  # type: ignore
diff --git a/aea/aea.py b/aea/aea.py
index bb3ff4c5e2..882228b277 100644
--- a/aea/aea.py
+++ b/aea/aea.py
@@ -25,6 +25,7 @@
 from typing import (
     Any,
     Callable,
+    cast,
     Collection,
     Dict,
     List,
@@ -32,7 +33,6 @@
     Sequence,
     Tuple,
     Type,
-    cast,
 )
 
 from aea.agent import Agent
diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index 0b16148bda..ddfe577a6b 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -29,6 +29,7 @@
 from pathlib import Path
 from typing import (
     Any,
+    cast,
     Collection,
     Deque,
     Dict,
@@ -38,11 +39,9 @@
     Tuple,
     Type,
     Union,
-    cast,
 )
 
 import jsonschema
-
 from packaging.specifiers import SpecifierSet
 
 from aea import AEA_DIR
diff --git a/aea/agent.py b/aea/agent.py
index b62acaadf6..16188a0e03 100644
--- a/aea/agent.py
+++ b/aea/agent.py
@@ -29,7 +29,6 @@
 from aea.multiplexer import InBox, OutBox
 from aea.runtime import AsyncRuntime, BaseRuntime, RuntimeStates, ThreadedRuntime
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index 59fff7c62d..5be8686f4c 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -32,14 +32,13 @@
 from aea.exceptions import AEAException
 from aea.helpers.async_utils import (
     AsyncState,
+    ensure_loop,
     HandlerItemGetter,
     PeriodicCaller,
-    ensure_loop,
 )
 from aea.helpers.exec_timeout import ExecTimeoutThreadGuard, TimeoutException
 from aea.helpers.logging import WithLogger
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/cli/__main__.py b/aea/cli/__main__.py
index b67db019ec..129ecab13f 100755
--- a/aea/cli/__main__.py
+++ b/aea/cli/__main__.py
@@ -22,6 +22,5 @@
 
 from aea.cli.core import cli
 
-
 if __name__ == "__main__":
     cli(prog_name="aea")  # pragma: no cover
diff --git a/aea/cli/config.py b/aea/cli/config.py
index 06c18ae08b..51591d3ae0 100644
--- a/aea/cli/config.py
+++ b/aea/cli/config.py
@@ -19,15 +19,12 @@
 
 """Implementation of the 'aea list' subcommand."""
 
-from typing import Dict, List, cast
+from typing import cast, Dict, List
 
 import click
 
 from aea.cli.utils.click_utils import AEAJsonPathType
-from aea.cli.utils.constants import (
-    FALSE_EQUIVALENTS,
-    FROM_STRING_TO_TYPE,
-)
+from aea.cli.utils.constants import FALSE_EQUIVALENTS, FROM_STRING_TO_TYPE
 from aea.cli.utils.context import Context
 from aea.cli.utils.decorators import check_aea_project, pass_ctx
 from aea.cli.utils.generic import get_parent_object, load_yaml
diff --git a/aea/cli/create.py b/aea/cli/create.py
index 691ed37cdc..104e6a854d 100644
--- a/aea/cli/create.py
+++ b/aea/cli/create.py
@@ -21,7 +21,7 @@
 
 import os
 from pathlib import Path
-from typing import Optional, cast
+from typing import cast, Optional
 
 import click
 
diff --git a/aea/cli/fetch.py b/aea/cli/fetch.py
index f56b4a70ad..2e7baff1e7 100644
--- a/aea/cli/fetch.py
+++ b/aea/cli/fetch.py
@@ -21,7 +21,7 @@
 
 import os
 from distutils.dir_util import copy_tree
-from typing import Optional, cast
+from typing import cast, Optional
 
 import click
 
diff --git a/aea/cli/fingerprint.py b/aea/cli/fingerprint.py
index c52bebbafe..5909a9bf07 100644
--- a/aea/cli/fingerprint.py
+++ b/aea/cli/fingerprint.py
@@ -19,21 +19,19 @@
 
 """Implementation of the 'aea add' subcommand."""
 from pathlib import Path
-from typing import Dict, cast
+from typing import cast, Dict
 
 import click
 
 from aea.cli.utils.click_utils import PublicIdParameter
 from aea.cli.utils.context import Context
 from aea.configurations.base import (  # noqa: F401 # pylint: disable=unused-import
+    _compute_fingerprint,
+    _get_default_configuration_file_name_from_type,
     DEFAULT_CONNECTION_CONFIG_FILE,
     DEFAULT_PROTOCOL_CONFIG_FILE,
     DEFAULT_SKILL_CONFIG_FILE,
-    _compute_fingerprint,
-)
-from aea.configurations.base import (
     PublicId,
-    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 
diff --git a/aea/cli/freeze.py b/aea/cli/freeze.py
index 6dbae8eca0..a537ffba31 100644
--- a/aea/cli/freeze.py
+++ b/aea/cli/freeze.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea delete' subcommand."""
 
-from typing import List, cast
+from typing import cast, List
 
 import click
 
diff --git a/aea/cli/generate_key.py b/aea/cli/generate_key.py
index 8173a276ec..1825c34665 100644
--- a/aea/cli/generate_key.py
+++ b/aea/cli/generate_key.py
@@ -24,7 +24,7 @@
 
 import click
 
-from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
+from aea.crypto.helpers import create_private_key, PRIVATE_KEY_PATH_SCHEMA
 from aea.crypto.registries import crypto_registry
 
 
diff --git a/aea/cli/generate_wealth.py b/aea/cli/generate_wealth.py
index c8d346a4a0..1a6c5d9386 100644
--- a/aea/cli/generate_wealth.py
+++ b/aea/cli/generate_wealth.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea generate_wealth' subcommand."""
 
-from typing import Dict, Optional, cast
+from typing import cast, Dict, Optional
 
 import click
 
diff --git a/aea/cli/get_multiaddress.py b/aea/cli/get_multiaddress.py
index 81d63ad2f3..a76dcbd1ae 100644
--- a/aea/cli/get_multiaddress.py
+++ b/aea/cli/get_multiaddress.py
@@ -21,7 +21,7 @@
 import re
 import typing
 from pathlib import Path
-from typing import Optional, Tuple, cast
+from typing import cast, Optional, Tuple
 
 import click
 from click import ClickException
@@ -31,16 +31,12 @@
 from aea.cli.utils.context import Context
 from aea.cli.utils.decorators import check_aea_project
 from aea.cli.utils.package_utils import get_package_path_unified
-from aea.configurations.base import (
-    ConnectionConfig,
-    PublicId,
-)
+from aea.configurations.base import ConnectionConfig, PublicId
 from aea.crypto.base import Crypto
 from aea.crypto.registries import crypto_registry
 from aea.exceptions import enforce
 from aea.helpers.multiaddr.base import MultiAddr
 
-
 URI_REGEX = re.compile(r"(?:https?://)?(?P<host>[^:/ ]+):(?P<port>[0-9]*)")
 
 
diff --git a/aea/cli/get_wealth.py b/aea/cli/get_wealth.py
index 021c48faa1..ee5679e2c4 100644
--- a/aea/cli/get_wealth.py
+++ b/aea/cli/get_wealth.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea get_wealth' subcommand."""
 
-from typing import Dict, Optional, cast
+from typing import cast, Dict, Optional
 
 import click
 
diff --git a/aea/cli/install.py b/aea/cli/install.py
index 88ce64dfd5..5295453ef0 100644
--- a/aea/cli/install.py
+++ b/aea/cli/install.py
@@ -22,7 +22,7 @@
 import pprint
 import subprocess  # nosec
 import sys
-from typing import List, Optional, cast
+from typing import cast, List, Optional
 
 import click
 
diff --git a/aea/cli/launch.py b/aea/cli/launch.py
index a35458d39b..734d19cba8 100644
--- a/aea/cli/launch.py
+++ b/aea/cli/launch.py
@@ -20,7 +20,7 @@
 import sys
 from collections import OrderedDict
 from pathlib import Path
-from typing import List, cast
+from typing import cast, List
 
 import click
 
diff --git a/aea/cli/list.py b/aea/cli/list.py
index a827e8c821..ecd1c82d04 100644
--- a/aea/cli/list.py
+++ b/aea/cli/list.py
@@ -30,9 +30,9 @@
 from aea.cli.utils.decorators import check_aea_project, pass_ctx
 from aea.cli.utils.formatting import format_items, retrieve_details, sort_items
 from aea.configurations.base import (
+    _get_default_configuration_file_name_from_type,
     PackageType,
     PublicId,
-    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 
diff --git a/aea/cli/registry/utils.py b/aea/cli/registry/utils.py
index 323fdef364..720edb1b1a 100644
--- a/aea/cli/registry/utils.py
+++ b/aea/cli/registry/utils.py
@@ -24,7 +24,6 @@
 from json.decoder import JSONDecodeError
 
 import click
-
 import requests
 
 from aea.cli.registry.settings import AUTH_TOKEN_KEY, REGISTRY_API_URL
diff --git a/aea/cli/run.py b/aea/cli/run.py
index 1d7e9bb160..146cfff7eb 100644
--- a/aea/cli/run.py
+++ b/aea/cli/run.py
@@ -20,7 +20,7 @@
 """Implementation of the 'aea run' subcommand."""
 
 from pathlib import Path
-from typing import List, Optional, cast
+from typing import cast, List, Optional
 
 import click
 
diff --git a/aea/cli/scaffold.py b/aea/cli/scaffold.py
index 48fdab355b..b2942ec590 100644
--- a/aea/cli/scaffold.py
+++ b/aea/cli/scaffold.py
@@ -24,7 +24,6 @@
 from pathlib import Path
 
 import click
-
 from jsonschema import ValidationError
 
 from aea import AEA_DIR
@@ -32,12 +31,14 @@
 from aea.cli.utils.decorators import check_aea_project, clean_after, pass_ctx
 from aea.cli.utils.loggers import logger
 from aea.cli.utils.package_utils import validate_package_name
-from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, DEFAULT_VERSION, PublicId
 from aea.configurations.base import (  # noqa: F401  # pylint: disable=unused-import
+    DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_CONNECTION_CONFIG_FILE,
     DEFAULT_CONTRACT_CONFIG_FILE,
     DEFAULT_PROTOCOL_CONFIG_FILE,
     DEFAULT_SKILL_CONFIG_FILE,
+    DEFAULT_VERSION,
+    PublicId,
 )
 
 
diff --git a/aea/cli/search.py b/aea/cli/search.py
index 4e5513be1b..02abc70937 100644
--- a/aea/cli/search.py
+++ b/aea/cli/search.py
@@ -21,7 +21,7 @@
 
 import os
 from pathlib import Path
-from typing import Dict, List, Tuple, cast
+from typing import cast, Dict, List, Tuple
 
 import click
 
diff --git a/aea/cli/utils/config.py b/aea/cli/utils/config.py
index 71bc9b50ff..5903954b40 100644
--- a/aea/cli/utils/config.py
+++ b/aea/cli/utils/config.py
@@ -26,9 +26,7 @@
 from typing import Dict, Tuple
 
 import click
-
 import jsonschema
-
 import yaml
 
 from aea.cli.utils.constants import (
@@ -40,10 +38,10 @@
 from aea.cli.utils.exceptions import AEAConfigException
 from aea.cli.utils.generic import load_yaml
 from aea.configurations.base import (
+    _get_default_configuration_file_name_from_type,
     DEFAULT_AEA_CONFIG_FILE,
     PackageConfiguration,
     PackageType,
-    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader, ConfigLoaders
 from aea.exceptions import AEAException
diff --git a/aea/cli/utils/constants.py b/aea/cli/utils/constants.py
index 0504843d48..4f699a7be6 100644
--- a/aea/cli/utils/constants.py
+++ b/aea/cli/utils/constants.py
@@ -30,7 +30,6 @@
     DEFAULT_SKILL_CONFIG_FILE,
 )
 
-
 AEA_DIR = str(Path("."))
 
 ITEM_TYPES = ("connection", "contract", "protocol", "skill")
diff --git a/aea/cli/utils/context.py b/aea/cli/utils/context.py
index 3bdb651525..85aeb8a4d1 100644
--- a/aea/cli/utils/context.py
+++ b/aea/cli/utils/context.py
@@ -20,15 +20,15 @@
 """A module with context tools of the aea cli."""
 
 from pathlib import Path
-from typing import Dict, List, cast
+from typing import cast, Dict, List
 
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
+    _get_default_configuration_file_name_from_type,
     AgentConfig,
     Dependencies,
     PackageType,
     PublicId,
-    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 
diff --git a/aea/cli/utils/decorators.py b/aea/cli/utils/decorators.py
index 20a41f367d..f702a7226b 100644
--- a/aea/cli/utils/decorators.py
+++ b/aea/cli/utils/decorators.py
@@ -23,25 +23,23 @@
 import shutil
 from functools import update_wrapper
 from pathlib import Path
-from typing import Callable, Dict, Union, cast
+from typing import Callable, cast, Dict, Union
 
 import click
-
 from jsonschema import ValidationError
 
 from aea.cli.utils.config import try_to_load_agent_config
 from aea.cli.utils.context import Context
 from aea.configurations.base import (
-    PackageType,
-    PublicId,
     _check_aea_version,
     _compare_fingerprints,
     _get_default_configuration_file_name_from_type,
+    PackageType,
+    PublicId,
 )
 from aea.configurations.loader import ConfigLoaders
 from aea.exceptions import AEAException, enforce
 
-
 pass_ctx = click.make_pass_decorator(Context)
 
 
diff --git a/aea/cli/utils/generic.py b/aea/cli/utils/generic.py
index f7e0e72757..582d673b2b 100644
--- a/aea/cli/utils/generic.py
+++ b/aea/cli/utils/generic.py
@@ -22,9 +22,8 @@
 import os
 from typing import Dict, List
 
-from click import ClickException
-
 import yaml
+from click import ClickException
 
 
 def get_parent_object(obj: Dict, dotted_path: List[str]):
diff --git a/aea/cli/utils/loggers.py b/aea/cli/utils/loggers.py
index 237315f396..b549d39aa5 100644
--- a/aea/cli/utils/loggers.py
+++ b/aea/cli/utils/loggers.py
@@ -24,7 +24,6 @@
 
 import click
 
-
 OFF = 100
 logging.addLevelName(OFF, "OFF")
 
diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py
index 32d0727958..ab57fcb89b 100644
--- a/aea/cli/utils/package_utils.py
+++ b/aea/cli/utils/package_utils.py
@@ -26,7 +26,6 @@
 from typing import Optional
 
 import click
-
 from jsonschema import ValidationError
 
 from aea import AEA_DIR
@@ -34,12 +33,12 @@
 from aea.cli.utils.context import Context
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
+    _compute_fingerprint,
+    _get_default_configuration_file_name_from_type,
     AgentConfig,
     DEFAULT_AEA_CONFIG_FILE,
     PackageType,
     PublicId,
-    _compute_fingerprint,
-    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 from aea.crypto.helpers import verify_or_create_private_keys
diff --git a/aea/cli_gui/__init__.py b/aea/cli_gui/__init__.py
index 0917193f44..273eba4bf9 100644
--- a/aea/cli_gui/__init__.py
+++ b/aea/cli_gui/__init__.py
@@ -25,11 +25,9 @@
 import threading
 from typing import Any, Dict, List, Tuple
 
-from click import ClickException
-
 import connexion
-
 import flask
+from click import ClickException
 
 from aea.cli.add import add_item as cli_add_item
 from aea.cli.create import create_aea as cli_create_aea
@@ -39,18 +37,16 @@
 from aea.cli.registry.fetch import fetch_agent as cli_fetch_agent
 from aea.cli.remove import remove_item as cli_remove_item
 from aea.cli.scaffold import scaffold_item as cli_scaffold_item
-from aea.cli.search import (
-    search_items as cli_search_items,
-    setup_search_ctx as cli_setup_search_ctx,
-)
+from aea.cli.search import search_items as cli_search_items
+from aea.cli.search import setup_search_ctx as cli_setup_search_ctx
 from aea.cli.utils.config import try_to_load_agent_config
 from aea.cli.utils.context import Context
 from aea.cli.utils.formatting import sort_items
 from aea.cli_gui.utils import (
-    ProcessState,
     call_aea_async,
     get_process_status,
     is_agent_dir,
+    ProcessState,
     read_error,
     read_tty,
     stop_agent_process,
diff --git a/aea/components/loader.py b/aea/components/loader.py
index f53e92f8a9..8e192bd68f 100644
--- a/aea/components/loader.py
+++ b/aea/components/loader.py
@@ -23,17 +23,13 @@
 from typing import Dict, Type
 
 from aea.components.base import Component
-from aea.configurations.base import (
-    ComponentConfiguration,
-    ComponentType,
-)
+from aea.configurations.base import ComponentConfiguration, ComponentType
 from aea.connections.base import Connection
 from aea.contracts.base import Contract
 from aea.exceptions import AEAPackageLoadingError, enforce
 from aea.protocols.base import Protocol
 from aea.skills.base import Skill
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 1a68f8de41..ed2b61d0ba 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -31,6 +31,7 @@
 from pathlib import Path
 from typing import (
     Any,
+    cast,
     Collection,
     Dict,
     Generic,
@@ -42,15 +43,13 @@
     Type,
     TypeVar,
     Union,
-    cast,
 )
 
 import packaging
+import semver
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 
-import semver
-
 from aea.__version__ import __version__ as __aea_version__
 from aea.exceptions import enforce
 from aea.helpers.ipfs.base import IPFSHashOnly
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 492b8dd3da..f4466bbf35 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -25,13 +25,11 @@
 import re
 from copy import deepcopy
 from pathlib import Path
-from typing import Dict, Generic, List, TextIO, Tuple, Type, TypeVar, Union, cast
-
+from typing import cast, Dict, Generic, List, TextIO, Tuple, Type, TypeVar, Union
 
 import jsonschema
-from jsonschema import Draft4Validator
-
 import yaml
+from jsonschema import Draft4Validator
 from yaml import SafeLoader
 
 from aea.configurations.base import (
diff --git a/aea/configurations/pypi.py b/aea/configurations/pypi.py
index 5dd0bd0953..440d228bac 100644
--- a/aea/configurations/pypi.py
+++ b/aea/configurations/pypi.py
@@ -21,7 +21,7 @@
 """This module contains a checker for PyPI version consistency."""
 import operator
 from collections import defaultdict
-from typing import Dict, Set, cast
+from typing import cast, Dict, Set
 
 from packaging.specifiers import Specifier, SpecifierSet
 from packaging.version import InvalidVersion, Version
diff --git a/aea/connections/base.py b/aea/connections/base.py
index 983b2234b3..d4a7d5e971 100644
--- a/aea/connections/base.py
+++ b/aea/connections/base.py
@@ -26,14 +26,10 @@
 from contextlib import contextmanager
 from enum import Enum
 from pathlib import Path
-from typing import Generator, Optional, Set, TYPE_CHECKING, cast
+from typing import cast, Generator, Optional, Set, TYPE_CHECKING
 
 from aea.components.base import Component, load_aea_package
-from aea.configurations.base import (
-    ComponentType,
-    ConnectionConfig,
-    PublicId,
-)
+from aea.configurations.base import ComponentType, ConnectionConfig, PublicId
 from aea.configurations.loader import load_component_configuration
 from aea.crypto.wallet import CryptoStore
 from aea.exceptions import enforce
@@ -41,9 +37,8 @@
 from aea.helpers.base import load_module
 from aea.identity.base import Identity
 
-
 if TYPE_CHECKING:
-    from aea.mail.base import Envelope, Address  # pragma: no cover
+    from aea.mail.base import Address, Envelope  # pragma: no cover
 
 
 logger = logging.getLogger(__name__)
diff --git a/aea/connections/stub/connection.py b/aea/connections/stub/connection.py
index a80267f0c9..155aee920b 100644
--- a/aea/connections/stub/connection.py
+++ b/aea/connections/stub/connection.py
@@ -35,7 +35,6 @@
 from aea.helpers.base import exception_log_and_reraise
 from aea.mail.base import Envelope
 
-
 logger = logging.getLogger(__name__)
 
 INPUT_FILE_KEY = "input_file"
diff --git a/aea/connections/stub/connection.yaml b/aea/connections/stub/connection.yaml
index 743ee3598a..cdd0ca8581 100644
--- a/aea/connections/stub/connection.yaml
+++ b/aea/connections/stub/connection.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmWwepN9Fy9gHAp39vUGFSLdnB9JZjdyE3STnbowSUhJkC
-  connection.py: QmTSESVFvsDc9iq2QM3YdZju3yHqTA3wHbLkAzHXEFY17Z
+  connection.py: QmYAWVhNoWhJNaCkEh5cMScJ53a1gkfcBNGt9LLxftyUuR
   readme.md: QmXSAtxSY7C2YkvUxeVnpqCJY9uJYZxZBmuUcE4zjFXcXz
 fingerprint_ignore_patterns: []
 protocols: []
diff --git a/aea/contracts/base.py b/aea/contracts/base.py
index 2d82b162fd..d14bc5d4ce 100644
--- a/aea/contracts/base.py
+++ b/aea/contracts/base.py
@@ -22,21 +22,16 @@
 import logging
 import re
 from pathlib import Path
-from typing import Any, Dict, Optional, cast
+from typing import Any, cast, Dict, Optional
 
 from aea.components.base import Component, load_aea_package
-from aea.configurations.base import (
-    ComponentType,
-    ContractConfig,
-    ContractId,
-)
+from aea.configurations.base import ComponentType, ContractConfig, ContractId
 from aea.configurations.loader import load_component_configuration
 from aea.crypto.base import LedgerApi
 from aea.crypto.registries import Registry
 from aea.exceptions import AEAException, enforce
 from aea.helpers.base import load_module
 
-
 contract_registry: Registry["Contract"] = Registry["Contract"]()
 logger = logging.getLogger(__name__)
 
diff --git a/aea/crypto/__init__.py b/aea/crypto/__init__.py
index 0a07586c50..11df4e865b 100644
--- a/aea/crypto/__init__.py
+++ b/aea/crypto/__init__.py
@@ -22,11 +22,8 @@
 from aea.crypto.cosmos import CosmosCrypto
 from aea.crypto.ethereum import EthereumCrypto
 from aea.crypto.fetchai import FetchAICrypto
-from aea.crypto.registries import (
-    register_crypto,
-    register_faucet_api,
-    register_ledger_api,
-)  # noqa
+from aea.crypto.registries import register_crypto  # noqa
+from aea.crypto.registries import register_faucet_api, register_ledger_api
 
 register_crypto(
     id_=FetchAICrypto.identifier, entry_point="aea.crypto.fetchai:FetchAICrypto"
diff --git a/aea/crypto/base.py b/aea/crypto/base.py
index 2f70e8513b..0b8fb15d75 100644
--- a/aea/crypto/base.py
+++ b/aea/crypto/base.py
@@ -24,7 +24,6 @@
 
 from aea.common import Address
 
-
 EntityClass = TypeVar("EntityClass")
 
 
diff --git a/aea/crypto/cosmos.py b/aea/crypto/cosmos.py
index 3534f03a66..051fb376f6 100644
--- a/aea/crypto/cosmos.py
+++ b/aea/crypto/cosmos.py
@@ -31,13 +31,11 @@
 from pathlib import Path
 from typing import Any, BinaryIO, Dict, List, Optional, Tuple
 
+import requests
 from bech32 import bech32_encode, convertbits
-
 from ecdsa import SECP256k1, SigningKey, VerifyingKey
 from ecdsa.util import sigencode_string_canonize
 
-import requests
-
 from aea.common import Address
 from aea.crypto.base import Crypto, FaucetApi, Helper, LedgerApi
 from aea.exceptions import AEAEnforceError
diff --git a/aea/crypto/ethereum.py b/aea/crypto/ethereum.py
index 8ff54ef609..2055b52eb3 100644
--- a/aea/crypto/ethereum.py
+++ b/aea/crypto/ethereum.py
@@ -24,16 +24,13 @@
 import time
 import warnings
 from pathlib import Path
-from typing import Any, BinaryIO, Dict, Optional, Tuple, Union, cast
+from typing import Any, BinaryIO, cast, Dict, Optional, Tuple, Union
 
+import requests
 from eth_account import Account
 from eth_account.datastructures import SignedTransaction
 from eth_account.messages import encode_defunct
-
 from eth_keys import keys
-
-import requests
-
 from web3 import HTTPProvider, Web3
 from web3.types import TxParams
 
diff --git a/aea/crypto/fetchai.py b/aea/crypto/fetchai.py
index f3f77a1355..60d1772b27 100644
--- a/aea/crypto/fetchai.py
+++ b/aea/crypto/fetchai.py
@@ -19,8 +19,7 @@
 """Fetchai module wrapping the public and private key cryptography and ledger api."""
 
 
-from aea.crypto.cosmos import CosmosCrypto, CosmosFaucetApi, CosmosHelper, _CosmosApi
-
+from aea.crypto.cosmos import _CosmosApi, CosmosCrypto, CosmosFaucetApi, CosmosHelper
 
 _FETCHAI = "fetchai"
 _FETCH = "fetch"
diff --git a/aea/crypto/wallet.py b/aea/crypto/wallet.py
index 29a19f1be2..e27863bc22 100644
--- a/aea/crypto/wallet.py
+++ b/aea/crypto/wallet.py
@@ -20,7 +20,7 @@
 """Module wrapping all the public and private keys cryptography."""
 
 import logging
-from typing import Any, Dict, Optional, cast
+from typing import Any, cast, Dict, Optional
 
 from aea.crypto.base import Crypto
 from aea.crypto.registries import make_crypto
diff --git a/aea/decision_maker/default.py b/aea/decision_maker/default.py
index 4e4fb3feb7..9493d0a2e7 100644
--- a/aea/decision_maker/default.py
+++ b/aea/decision_maker/default.py
@@ -22,7 +22,7 @@
 import copy
 import logging
 from enum import Enum
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, cast, Dict, List, Optional
 
 from aea.common import Address
 from aea.crypto.wallet import Wallet
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 6e3ca74660..435ec5a72d 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -48,7 +48,9 @@
     from asyncio import create_task  # pylint: disable=ungrouped-imports,unused-import
 except ImportError:  # pragma: no cover
     # for python3.6!
-    from asyncio import ensure_future as create_task  # type: ignore # noqa: F401 # pylint: disable=ungrouped-imports,unused-import
+    from asyncio import (  # type: ignore # noqa: F401 # pylint: disable=ungrouped-imports,unused-import
+        ensure_future as create_task,
+    )
 
 
 logger = logging.getLogger(__file__)
diff --git a/aea/helpers/base.py b/aea/helpers/base.py
index 98ccdedca9..ed1a8aed80 100644
--- a/aea/helpers/base.py
+++ b/aea/helpers/base.py
@@ -36,9 +36,8 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, List, TextIO, Union
 
-from dotenv import load_dotenv
-
 import yaml
+from dotenv import load_dotenv
 
 logger = logging.getLogger(__name__)
 
diff --git a/aea/helpers/file_lock.py b/aea/helpers/file_lock.py
index f48a37c8f6..7939178331 100644
--- a/aea/helpers/file_lock.py
+++ b/aea/helpers/file_lock.py
@@ -24,9 +24,9 @@
 
 # needs win32all to work on Windows
 if os.name == "nt":  # pragma: nocover  # cause platform dependent!
+    import pywintypes  # pylint: disable=import-error
     import win32con  # pylint: disable=import-error
     import win32file  # pylint: disable=import-error
-    import pywintypes  # pylint: disable=import-error
 
     LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK
     LOCK_SH = 0  # the default
@@ -49,8 +49,8 @@ def unlock(file):
 
 
 elif os.name == "posix":  # pragma: nocover  # cause platform dependent!
-    from fcntl import LOCK_EX, LOCK_SH, LOCK_NB  # noqa # pylint: disable=unused-import
     import fcntl
+    from fcntl import LOCK_EX, LOCK_NB, LOCK_SH  # noqa # pylint: disable=unused-import
 
     def lock(file, flags):
         """Lock a file with flags."""
diff --git a/aea/helpers/ipfs/base.py b/aea/helpers/ipfs/base.py
index 80ce3ca731..8f218db261 100644
--- a/aea/helpers/ipfs/base.py
+++ b/aea/helpers/ipfs/base.py
@@ -25,8 +25,7 @@
 
 import base58
 
-from aea.helpers.ipfs.pb import merkledag_pb2
-from aea.helpers.ipfs.pb import unixfs_pb2
+from aea.helpers.ipfs.pb import merkledag_pb2, unixfs_pb2
 
 # https://github.com/multiformats/multicodec/blob/master/table.csv
 SHA256_ID = "12"  # 0x12
diff --git a/aea/helpers/ipfs/pb/merkledag_pb2.py b/aea/helpers/ipfs/pb/merkledag_pb2.py
index e58b9a94c8..8a5a344e8a 100644
--- a/aea/helpers/ipfs/pb/merkledag_pb2.py
+++ b/aea/helpers/ipfs/pb/merkledag_pb2.py
@@ -4,12 +4,13 @@
 
 import sys
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
+
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
diff --git a/aea/helpers/ipfs/pb/unixfs_pb2.py b/aea/helpers/ipfs/pb/unixfs_pb2.py
index 08d096b3c5..f0c93e07b1 100644
--- a/aea/helpers/ipfs/pb/unixfs_pb2.py
+++ b/aea/helpers/ipfs/pb/unixfs_pb2.py
@@ -4,12 +4,13 @@
 
 import sys
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
+
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
diff --git a/aea/helpers/logging.py b/aea/helpers/logging.py
index 8a085528a5..58a99ffa6b 100644
--- a/aea/helpers/logging.py
+++ b/aea/helpers/logging.py
@@ -19,7 +19,7 @@
 """Logging helpers."""
 import logging
 from logging import Logger, LoggerAdapter
-from typing import Any, MutableMapping, Optional, Tuple, cast
+from typing import Any, cast, MutableMapping, Optional, Tuple
 
 
 class AgentLoggerAdapter(LoggerAdapter):
diff --git a/aea/helpers/multiaddr/base.py b/aea/helpers/multiaddr/base.py
index afbac8afbb..9ad06d76d0 100644
--- a/aea/helpers/multiaddr/base.py
+++ b/aea/helpers/multiaddr/base.py
@@ -22,10 +22,8 @@
 from binascii import unhexlify
 
 import base58
-
-from ecdsa import VerifyingKey, curves, keys
-
 import multihash  # type: ignore
+from ecdsa import curves, keys, VerifyingKey
 
 from aea.helpers.multiaddr.crypto_pb2 import KeyType, PublicKey
 
diff --git a/aea/helpers/multiaddr/crypto_pb2.py b/aea/helpers/multiaddr/crypto_pb2.py
index 9094243b4c..5838976bd0 100644
--- a/aea/helpers/multiaddr/crypto_pb2.py
+++ b/aea/helpers/multiaddr/crypto_pb2.py
@@ -4,12 +4,13 @@
 
 import sys
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
-from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import enum_type_wrapper
+
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 
 # @@protoc_insertion_point(imports)
 
diff --git a/aea/helpers/multiple_executor.py b/aea/helpers/multiple_executor.py
index a4d0772c12..40a25ce92e 100644
--- a/aea/helpers/multiple_executor.py
+++ b/aea/helpers/multiple_executor.py
@@ -30,6 +30,7 @@
 from typing import (
     Any,
     Callable,
+    cast,
     Dict,
     Optional,
     Sequence,
@@ -37,10 +38,8 @@
     Tuple,
     Type,
     Union,
-    cast,
 )
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/helpers/search/models.py b/aea/helpers/search/models.py
index 02dbe0b686..31a045bbfb 100644
--- a/aea/helpers/search/models.py
+++ b/aea/helpers/search/models.py
@@ -25,7 +25,7 @@
 from copy import deepcopy
 from enum import Enum
 from math import asin, cos, radians, sin, sqrt
-from typing import Any, Dict, List, Mapping, Optional, Tuple, Type, Union, cast
+from typing import Any, cast, Dict, List, Mapping, Optional, Tuple, Type, Union
 
 from aea.exceptions import enforce
 
diff --git a/aea/launcher.py b/aea/launcher.py
index 8512bd7485..36c0352e24 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -44,7 +44,6 @@
 )
 from aea.runtime import AsyncRuntime
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -64,7 +63,7 @@ def _set_logger(
     log_level: Optional[str],
 ):  # pragma: nocover # used in spawned process and pytest does not see this code
     from aea.cli.utils.loggers import (  # pylint: disable=import-outside-toplevel
-        default_logging_config,  # pylint: disable=import-outside-toplevel
+        default_logging_config,
     )
 
     logger_ = logging.getLogger("aea")
diff --git a/aea/mail/base_pb2.py b/aea/mail/base_pb2.py
index 60579813c1..8adfaeb583 100644
--- a/aea/mail/base_pb2.py
+++ b/aea/mail/base_pb2.py
@@ -4,12 +4,13 @@
 
 import sys
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
+
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index 4b5b4661ad..0b4a75930b 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -23,8 +23,7 @@
 from asyncio.events import AbstractEventLoop
 from concurrent.futures._base import CancelledError
 from contextlib import suppress
-from typing import Callable, Collection, Dict, List, Optional, Sequence, Tuple, cast
-
+from typing import Callable, cast, Collection, Dict, List, Optional, Sequence, Tuple
 
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
@@ -33,13 +32,8 @@
 from aea.helpers.async_utils import AsyncState, ThreadedAsyncRunner
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.helpers.logging import WithLogger
-from aea.mail.base import (
-    AEAConnectionError,
-    Empty,
-    Envelope,
-    EnvelopeContext,
-    logger as default_logger,
-)
+from aea.mail.base import AEAConnectionError, Empty, Envelope, EnvelopeContext
+from aea.mail.base import logger as default_logger
 from aea.protocols.base import Message
 
 
diff --git a/aea/protocols/base.py b/aea/protocols/base.py
index f79089ac4e..eed501dca1 100644
--- a/aea/protocols/base.py
+++ b/aea/protocols/base.py
@@ -26,16 +26,12 @@
 from copy import copy
 from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, Optional, Tuple, Type, cast
+from typing import Any, cast, Dict, Optional, Tuple, Type
 
 from google.protobuf.struct_pb2 import Struct
 
 from aea.components.base import Component, load_aea_package
-from aea.configurations.base import (
-    ComponentType,
-    ProtocolConfig,
-    PublicId,
-)
+from aea.configurations.base import ComponentType, ProtocolConfig, PublicId
 from aea.configurations.loader import load_component_configuration
 from aea.exceptions import enforce
 
diff --git a/aea/protocols/default/dialogues.py b/aea/protocols/default/dialogues.py
index 9ac396bf19..f984fbf0c5 100644
--- a/aea/protocols/default/dialogues.py
+++ b/aea/protocols/default/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/aea/protocols/default/message.py b/aea/protocols/default/message.py
index 547286e375..cb75fe0eae 100644
--- a/aea/protocols/default/message.py
+++ b/aea/protocols/default/message.py
@@ -20,7 +20,7 @@
 """This module contains default's message definition."""
 
 import logging
-from typing import Dict, Set, Tuple, cast
+from typing import cast, Dict, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/aea/protocols/default/protocol.yaml b/aea/protocols/default/protocol.yaml
index 6019f072c0..20626ed573 100644
--- a/aea/protocols/default/protocol.yaml
+++ b/aea/protocols/default/protocol.yaml
@@ -11,9 +11,9 @@ fingerprint:
   custom_types.py: QmRcgwDdTxkSHyfF9eoMtsb5P5GJDm4oyLq5W6ZBko1MFU
   default.proto: QmNzMUvXkBm5bbitR5Yi49ADiwNn1FhCvXqSKKoqAPZyXv
   default_pb2.py: QmSRFi1s3jcqnPuk4yopJeNuC6o58RL7dvEdt85uns3B3N
-  dialogues.py: Qmc991snbS7DwFxo1cKcq1rQ2uj7y8ukp14kfe2zve387C
-  message.py: QmeaadvKib9QqpjZgd7NiDUqGRpC2eZPVpgq1dY3PYacht
-  serialization.py: QmRnajc9BNCftjGkYTKCP9LnD3rq197jM3Re1GDVJTHh2y
+  dialogues.py: QmNi8Zya7ViRnpuqZsLRsj6bqHaXEsxCBqM4rafL5rsL3A
+  message.py: QmQPpq2HmjWDuWFcVE4VHRswdrUFYkrAwxMSA9SS9jsc5B
+  serialization.py: Qmc33mPC3sa2EAYvWBGfFVNQJVCWSk6LzCAXHPFKb1TEAZ
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/aea/protocols/default/serialization.py b/aea/protocols/default/serialization.py
index fb886974cd..f24928db33 100644
--- a/aea/protocols/default/serialization.py
+++ b/aea/protocols/default/serialization.py
@@ -19,10 +19,9 @@
 
 """Serialization module for default protocol."""
 
-from typing import Any, Dict, cast
+from typing import Any, cast, Dict
 
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from aea.protocols.base import Message, Serializer
 from aea.protocols.default import default_pb2
 from aea.protocols.default.custom_types import ErrorCode
 from aea.protocols.default.message import DefaultMessage
diff --git a/aea/protocols/dialogue/base.py b/aea/protocols/dialogue/base.py
index 52b154609b..4ef54b09d3 100644
--- a/aea/protocols/dialogue/base.py
+++ b/aea/protocols/dialogue/base.py
@@ -30,7 +30,7 @@
 from abc import ABC
 from enum import Enum
 from inspect import signature
-from typing import Callable, Dict, FrozenSet, List, Optional, Set, Tuple, Type, cast
+from typing import Callable, cast, Dict, FrozenSet, List, Optional, Set, Tuple, Type
 
 from aea.common import Address
 from aea.exceptions import enforce
diff --git a/aea/protocols/generator/base.py b/aea/protocols/generator/base.py
index 198a1a0dab..e16c64427b 100644
--- a/aea/protocols/generator/base.py
+++ b/aea/protocols/generator/base.py
@@ -28,16 +28,6 @@
 from typing import Optional, Tuple
 
 from aea.protocols.generator.common import (
-    CUSTOM_TYPES_DOT_PY_FILE_NAME,
-    DIALOGUE_DOT_PY_FILE_NAME,
-    INIT_FILE_NAME,
-    MESSAGE_DOT_PY_FILE_NAME,
-    MESSAGE_IMPORT,
-    PATH_TO_PACKAGES,
-    PROTOCOL_YAML_FILE_NAME,
-    PYTHON_TYPE_TO_PROTO_TYPE,
-    SERIALIZATION_DOT_PY_FILE_NAME,
-    SERIALIZER_IMPORT,
     _camel_case_to_snake_case,
     _create_protocol_file,
     _get_sub_types_of_compositional_types,
@@ -47,7 +37,17 @@
     _union_sub_type_to_protobuf_variable_name,
     check_prerequisites,
     check_protobuf_using_protoc,
+    CUSTOM_TYPES_DOT_PY_FILE_NAME,
+    DIALOGUE_DOT_PY_FILE_NAME,
+    INIT_FILE_NAME,
     load_protocol_specification,
+    MESSAGE_DOT_PY_FILE_NAME,
+    MESSAGE_IMPORT,
+    PATH_TO_PACKAGES,
+    PROTOCOL_YAML_FILE_NAME,
+    PYTHON_TYPE_TO_PROTO_TYPE,
+    SERIALIZATION_DOT_PY_FILE_NAME,
+    SERIALIZER_IMPORT,
     try_run_black_formatting,
     try_run_protoc,
 )
diff --git a/aea/protocols/generator/extract_specification.py b/aea/protocols/generator/extract_specification.py
index e3f42cf45c..3946a11e1f 100644
--- a/aea/protocols/generator/extract_specification.py
+++ b/aea/protocols/generator/extract_specification.py
@@ -19,15 +19,15 @@
 """This module extracts a valid protocol specification into pythonic objects."""
 
 import re
-from typing import Dict, List, cast
+from typing import cast, Dict, List
 
 from aea.configurations.base import (
     ProtocolSpecification,
     ProtocolSpecificationParseError,
 )
 from aea.protocols.generator.common import (
-    SPECIFICATION_PRIMITIVE_TYPES,
     _get_sub_types_of_compositional_types,
+    SPECIFICATION_PRIMITIVE_TYPES,
 )
 from aea.protocols.generator.validate import validate
 
diff --git a/aea/protocols/generator/validate.py b/aea/protocols/generator/validate.py
index bae664d719..c2610aea43 100644
--- a/aea/protocols/generator/validate.py
+++ b/aea/protocols/generator/validate.py
@@ -19,14 +19,14 @@
 """This module validates a protocol specification."""
 
 import re
-from typing import Dict, List, Optional, Set, Tuple, cast
+from typing import cast, Dict, List, Optional, Set, Tuple
 
 from aea.configurations.base import ProtocolSpecification
 from aea.protocols.generator.common import (
-    SPECIFICATION_COMPOSITIONAL_TYPES,
-    SPECIFICATION_PRIMITIVE_TYPES,
     _get_sub_types_of_compositional_types,
     _has_matched_brackets,
+    SPECIFICATION_COMPOSITIONAL_TYPES,
+    SPECIFICATION_PRIMITIVE_TYPES,
 )
 
 # The following names are reserved for standard message fields and cannot be
diff --git a/aea/protocols/scaffold/protocol.yaml b/aea/protocols/scaffold/protocol.yaml
index a3b8c82f35..9574de00c7 100644
--- a/aea/protocols/scaffold/protocol.yaml
+++ b/aea/protocols/scaffold/protocol.yaml
@@ -8,6 +8,6 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmedGZfo1UqT6UJoRkHys9kmquia9BQcK17y2touwSENDU
   message.py: QmQRGUakU9MGVAXy8Hmte5DEAvNYuzw8znt1h9Jg62ZEpM
-  serialization.py: QmNjyzqmoYnCxiLoBeZjXMhYkQzJpbDSFm7A9wytyRa2Xn
+  serialization.py: QmaAf5fppirUWe8JaeBbsqfbeofTHe8DDGHJooe2X389qo
 fingerprint_ignore_patterns: []
 dependencies: {}
diff --git a/aea/protocols/scaffold/serialization.py b/aea/protocols/scaffold/serialization.py
index 237927b25b..82d9086e05 100644
--- a/aea/protocols/scaffold/serialization.py
+++ b/aea/protocols/scaffold/serialization.py
@@ -20,8 +20,7 @@
 """Serialization for the scaffold protocol."""
 
 
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from aea.protocols.base import Message, Serializer
 
 
 class MyScaffoldSerializer(Serializer):  # pragma: no cover
diff --git a/aea/protocols/signing/dialogues.py b/aea/protocols/signing/dialogues.py
index 2602cbb7d9..705342f3a5 100644
--- a/aea/protocols/signing/dialogues.py
+++ b/aea/protocols/signing/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/aea/protocols/signing/message.py b/aea/protocols/signing/message.py
index 68a46db489..6669ad0633 100644
--- a/aea/protocols/signing/message.py
+++ b/aea/protocols/signing/message.py
@@ -20,7 +20,7 @@
 """This module contains signing's message definition."""
 
 import logging
-from typing import Set, Tuple, cast
+from typing import cast, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/aea/protocols/signing/protocol.yaml b/aea/protocols/signing/protocol.yaml
index 15bf3690d9..c01952688d 100644
--- a/aea/protocols/signing/protocol.yaml
+++ b/aea/protocols/signing/protocol.yaml
@@ -9,9 +9,9 @@ fingerprint:
   README.md: QmSoa5dnxz53GWpWT2VvcRG4asVbzA8JzguiVgwqiLtguM
   __init__.py: QmcCL3TTdvd8wxYKzf2d3cgKEtY9RzLjPCn4hex4wmb6h6
   custom_types.py: Qmc7sAyCQbAaVs5dZf9hFkTrB2BG8VAioWzbyKBAybrQ1J
-  dialogues.py: QmQ1WKs3Dn15oDSwpc4N8hdADLxrn76U4X5SiLAmyGiPPY
-  message.py: QmRLWAYfjCQmdg2hH8R5R63DKYaDrzuX4dVTFqNHuyjawq
-  serialization.py: QmZrztNBaWA6B5wJHQWfM2g6opPtvsEXtqytzmxjKWm7Sb
+  dialogues.py: QmaURpsd9ERiJ9CRnrfR1o94PGtMXaCb7k1SU2qyDG1q6x
+  message.py: QmVtRBy5LGTGHXEQSc9Br1gcpA7mqc7VmKCmmFzERiKqEP
+  serialization.py: QmS7H7WEBTQe4Nzxqz8kc6bXtVKjMzASvCitGdtFc2nyfT
   signing.proto: QmcxyLzqhTE9xstAEzCVH17osbLxmSdALx9njmuPjhjrvZ
   signing_pb2.py: QmY3Ak5ih5zGvKjeZ5EnzrGX4tMYn5dWpjPArQwFeJpVKu
 fingerprint_ignore_patterns: []
diff --git a/aea/protocols/signing/serialization.py b/aea/protocols/signing/serialization.py
index 88acd2f7a4..b36b6c883f 100644
--- a/aea/protocols/signing/serialization.py
+++ b/aea/protocols/signing/serialization.py
@@ -19,17 +19,18 @@
 
 """Serialization module for signing protocol."""
 
-from typing import Any, Dict, cast
+from typing import Any, cast, Dict
 
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from aea.protocols.base import Message, Serializer
 from aea.protocols.signing import signing_pb2
-from aea.protocols.signing.custom_types import ErrorCode
-from aea.protocols.signing.custom_types import RawMessage
-from aea.protocols.signing.custom_types import RawTransaction
-from aea.protocols.signing.custom_types import SignedMessage
-from aea.protocols.signing.custom_types import SignedTransaction
-from aea.protocols.signing.custom_types import Terms
+from aea.protocols.signing.custom_types import (
+    ErrorCode,
+    RawMessage,
+    RawTransaction,
+    SignedMessage,
+    SignedTransaction,
+    Terms,
+)
 from aea.protocols.signing.message import SigningMessage
 
 
diff --git a/aea/protocols/state_update/dialogues.py b/aea/protocols/state_update/dialogues.py
index 53b5fdebda..e0f59bb7e8 100644
--- a/aea/protocols/state_update/dialogues.py
+++ b/aea/protocols/state_update/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/aea/protocols/state_update/message.py b/aea/protocols/state_update/message.py
index 2444c40c0f..a96667a6e1 100644
--- a/aea/protocols/state_update/message.py
+++ b/aea/protocols/state_update/message.py
@@ -20,7 +20,7 @@
 """This module contains state_update's message definition."""
 
 import logging
-from typing import Dict, Set, Tuple, cast
+from typing import cast, Dict, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/aea/protocols/state_update/protocol.yaml b/aea/protocols/state_update/protocol.yaml
index 99162fad2e..13fa3717f7 100644
--- a/aea/protocols/state_update/protocol.yaml
+++ b/aea/protocols/state_update/protocol.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: Qmc12hnCshAE3TL9ba4vo6L8ZZhynyfhEUoStJggRrbimc
   __init__.py: Qma2opyN54gwTpkVV1E14jjeMmMfoqgE6XMM9LsvGuTdkm
-  dialogues.py: Qmd59WgpFccLn1zhpLdwm3zDCmCsjSoQXVn6M7PgFwwkgR
-  message.py: QmbXbxXbu1vzrCjzDy6qDtEvssmiHKFLWGgCEenrE4TPZW
-  serialization.py: QmQDdbN4pgfdL1LUhV4J7xMUhdqUJ2Tamz7Nheca3yGw2G
+  dialogues.py: Qmettr9uNhMjKJTMPwRgkMsJxFscE6GLVMCjJWYxNNqzaq
+  message.py: QmezFVx1VikTQBGjPWz3yucbqMBs5E9eBufBYaZaQMhkG8
+  serialization.py: QmPp8zqaLLa17YCiVu5SyD5We3cLkmsXcPcnwv2UDjDvMX
   state_update.proto: QmdmEUSa7PDxJ98ZmGE7bLFPmUJv8refgbkHPejw6uDdwD
   state_update_pb2.py: QmQr5KXhapRv9AnfQe7Xbr5bBqYWp9DEMLjxX8UWmK75Z4
 fingerprint_ignore_patterns: []
diff --git a/aea/protocols/state_update/serialization.py b/aea/protocols/state_update/serialization.py
index b5af452a72..dbb39e82a1 100644
--- a/aea/protocols/state_update/serialization.py
+++ b/aea/protocols/state_update/serialization.py
@@ -19,10 +19,9 @@
 
 """Serialization module for state_update protocol."""
 
-from typing import Any, Dict, cast
+from typing import Any, cast, Dict
 
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from aea.protocols.base import Message, Serializer
 from aea.protocols.state_update import state_update_pb2
 from aea.protocols.state_update.message import StateUpdateMessage
 
diff --git a/aea/registries/base.py b/aea/registries/base.py
index 60fce0f86f..15f12ea96b 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -22,7 +22,7 @@
 import copy
 import logging
 from abc import ABC, abstractmethod
-from typing import Dict, Generic, List, Optional, Set, Tuple, TypeVar, cast
+from typing import cast, Dict, Generic, List, Optional, Set, Tuple, TypeVar
 
 from aea.components.base import Component
 from aea.configurations.base import (
diff --git a/aea/registries/filter.py b/aea/registries/filter.py
index 5ceaff0d3a..fde6e48ce7 100644
--- a/aea/registries/filter.py
+++ b/aea/registries/filter.py
@@ -21,10 +21,7 @@
 import logging
 from typing import List, Optional
 
-from aea.configurations.base import (
-    PublicId,
-    SkillId,
-)
+from aea.configurations.base import PublicId, SkillId
 from aea.helpers.async_friendly_queue import AsyncFriendlyQueue
 from aea.protocols.base import Message
 from aea.registries.resources import Resources
diff --git a/aea/registries/resources.py b/aea/registries/resources.py
index d136a7678c..9126a7e7bc 100644
--- a/aea/registries/resources.py
+++ b/aea/registries/resources.py
@@ -19,7 +19,7 @@
 
 """This module contains the resources class."""
 from contextlib import suppress
-from typing import List, Optional, cast
+from typing import cast, List, Optional
 
 from aea.components.base import Component
 from aea.configurations.base import (
diff --git a/aea/runner.py b/aea/runner.py
index 4b00f4e0a4..3620ff03f4 100644
--- a/aea/runner.py
+++ b/aea/runner.py
@@ -33,7 +33,6 @@
 )
 from aea.runtime import AsyncRuntime
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/runtime.py b/aea/runtime.py
index d8c81f139c..89ff68c694 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -26,7 +26,7 @@
 from asyncio.events import AbstractEventLoop
 from contextlib import suppress
 from enum import Enum
-from typing import Dict, Optional, Type, cast
+from typing import cast, Dict, Optional, Type
 
 from aea.abstract_agent import AbstractAgent
 from aea.agent_loop import AsyncAgentLoop, AsyncState, BaseAgentLoop, SyncAgentLoop
@@ -36,7 +36,6 @@
 from aea.multiplexer import AsyncMultiplexer, Multiplexer
 from aea.skills.tasks import TaskManager
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/skills/base.py b/aea/skills/base.py
index 1e9fff3d96..071bfa98b3 100644
--- a/aea/skills/base.py
+++ b/aea/skills/base.py
@@ -29,7 +29,7 @@
 from pathlib import Path
 from queue import Queue
 from types import SimpleNamespace
-from typing import Any, Dict, Optional, Sequence, Set, Tuple, Type, cast
+from typing import Any, cast, Dict, Optional, Sequence, Set, Tuple, Type
 
 from aea.common import Address
 from aea.components.base import Component, load_aea_package
diff --git a/aea/skills/tasks.py b/aea/skills/tasks.py
index 6b0350285c..d49f21fc22 100644
--- a/aea/skills/tasks.py
+++ b/aea/skills/tasks.py
@@ -23,7 +23,7 @@
 import threading
 from abc import abstractmethod
 from multiprocessing.pool import AsyncResult, Pool
-from typing import Any, Callable, Dict, Optional, Sequence, cast
+from typing import Any, Callable, cast, Dict, Optional, Sequence
 
 from aea.helpers.logging import WithLogger
 
diff --git a/aea/test_tools/click_testing.py b/aea/test_tools/click_testing.py
index bc6d80b50c..b79ab74a4e 100644
--- a/aea/test_tools/click_testing.py
+++ b/aea/test_tools/click_testing.py
@@ -33,7 +33,8 @@
 import sys
 
 from click._compat import string_types  # type: ignore
-from click.testing import CliRunner as ClickCliRunner, Result
+from click.testing import CliRunner as ClickCliRunner
+from click.testing import Result
 
 
 class CliRunner(ClickCliRunner):
diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index 53953a37c6..b01dd4895d 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -36,7 +36,6 @@
 from typing import Any, Callable, Dict, List, Optional, Sequence, Set, Tuple, Union
 
 import pytest
-
 import yaml
 
 from aea.cli import cli
@@ -58,7 +57,6 @@
     read_envelope_from_file,
     write_envelope_to_file,
 )
-
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/benchmark/cases/react_multi_agents_fake_connection.py b/benchmark/cases/react_multi_agents_fake_connection.py
index fedb5800f3..9ceb8c9163 100644
--- a/benchmark/cases/react_multi_agents_fake_connection.py
+++ b/benchmark/cases/react_multi_agents_fake_connection.py
@@ -25,13 +25,12 @@
 """
 import time
 
+from aea.configurations.base import SkillConfig
 from benchmark.cases.helpers.dummy_handler import DummyHandler
 from benchmark.framework.aea_test_wrapper import AEATestWrapper
 from benchmark.framework.benchmark import BenchmarkControl
 from benchmark.framework.cli import TestCli
 
-from aea.configurations.base import SkillConfig
-
 
 def _make_custom_config(name: str = "dummy_agent", skills_num: int = 1) -> dict:
     """
diff --git a/benchmark/cases/react_speed_multi_agents.py b/benchmark/cases/react_speed_multi_agents.py
index df34bd360d..76f1bb096f 100644
--- a/benchmark/cases/react_speed_multi_agents.py
+++ b/benchmark/cases/react_speed_multi_agents.py
@@ -20,13 +20,12 @@
 """Example performance test using benchmark framework. Test react speed on amount of incoming messages using normal agent operating."""
 import time
 
+from aea.configurations.base import SkillConfig
 from benchmark.cases.helpers.dummy_handler import DummyHandler
 from benchmark.framework.aea_test_wrapper import AEATestWrapper
 from benchmark.framework.benchmark import BenchmarkControl
 from benchmark.framework.cli import TestCli
 
-from aea.configurations.base import SkillConfig
-
 
 def _make_custom_config(name: str = "dummy_agent", skills_num: int = 1) -> dict:
     """
diff --git a/benchmark/checks/check_mem_usage.py b/benchmark/checks/check_mem_usage.py
index a159637ac9..99193ba6ba 100755
--- a/benchmark/checks/check_mem_usage.py
+++ b/benchmark/checks/check_mem_usage.py
@@ -26,9 +26,8 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
-from benchmark.checks.utils import (  # noqa: I100
-    SyncedGeneratorConnection,
+from benchmark.checks.utils import SyncedGeneratorConnection  # noqa: I100
+from benchmark.checks.utils import (
     get_mem_usage_in_mb,
     make_agent,
     make_envelope,
diff --git a/benchmark/checks/check_multiagent.py b/benchmark/checks/check_multiagent.py
index 9b475e5315..549f8f43e3 100755
--- a/benchmark/checks/check_multiagent.py
+++ b/benchmark/checks/check_multiagent.py
@@ -24,7 +24,6 @@
 import sys
 import time
 
-
 import click
 
 from aea.configurations.base import ConnectionConfig
@@ -32,24 +31,23 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.runner import AEARunner
 from aea.skills.base import Handler
-
-from benchmark.checks.utils import (  # noqa: I100
-    get_mem_usage_in_mb,
+from benchmark.checks.utils import get_mem_usage_in_mb  # noqa: I100
+from benchmark.checks.utils import (
     make_agent,
     make_envelope,
+    make_skill,
     multi_run,
     print_results,
+    wait_for_condition,
 )
-from benchmark.checks.utils import make_skill, wait_for_condition
-
-ROOT_PATH = os.path.join(os.path.abspath(__file__), "..", "..")
-sys.path.append(ROOT_PATH)
-
 from packages.fetchai.connections.local.connection import (  # noqa: E402 # pylint: disable=C0413
     LocalNode,
     OEFLocalConnection,
 )
 
+ROOT_PATH = os.path.join(os.path.abspath(__file__), "..", "..")
+sys.path.append(ROOT_PATH)
+
 
 class TestHandler(Handler):
     """Dummy handler to handle messages."""
diff --git a/benchmark/checks/check_proactive.py b/benchmark/checks/check_proactive.py
index 548e4ca208..c52e2ce1ee 100755
--- a/benchmark/checks/check_proactive.py
+++ b/benchmark/checks/check_proactive.py
@@ -25,15 +25,15 @@
 
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Behaviour
-
-from benchmark.checks.utils import (  # noqa: I100
-    SyncedGeneratorConnection,
+from benchmark.checks.utils import SyncedGeneratorConnection  # noqa: I100
+from benchmark.checks.utils import (
     make_agent,
     make_envelope,
+    make_skill,
     multi_run,
     print_results,
+    wait_for_condition,
 )
-from benchmark.checks.utils import make_skill, wait_for_condition
 
 
 class TestBehaviour(Behaviour):
diff --git a/benchmark/checks/check_reactive.py b/benchmark/checks/check_reactive.py
index f4abbd8d60..f2bb484ece 100755
--- a/benchmark/checks/check_reactive.py
+++ b/benchmark/checks/check_reactive.py
@@ -29,15 +29,14 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
-from benchmark.checks.utils import (  # noqa: I100
-    GeneratorConnection,
-    SyncedGeneratorConnection,
+from benchmark.checks.utils import GeneratorConnection  # noqa: I100
+from benchmark.checks.utils import (
     make_agent,
     make_envelope,
     make_skill,
     multi_run,
     print_results,
+    SyncedGeneratorConnection,
     wait_for_condition,
 )
 
diff --git a/benchmark/checks/utils.py b/benchmark/checks/utils.py
index 8bd27c6c7f..89ab2b50b5 100644
--- a/benchmark/checks/utils.py
+++ b/benchmark/checks/utils.py
@@ -29,17 +29,12 @@
 from unittest.mock import MagicMock
 
 import click
-
 import psutil  # type: ignore
 
 from aea import AEA_DIR
 from aea.aea import AEA
 from aea.configurations.base import ConnectionConfig, PublicId, SkillConfig
-from aea.configurations.constants import (
-    DEFAULT_LEDGER,
-    DEFAULT_PROTOCOL,
-    DEFAULT_SKILL,
-)
+from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PROTOCOL, DEFAULT_SKILL
 from aea.connections.base import Connection, ConnectionStates
 from aea.crypto.wallet import Wallet
 from aea.identity.base import Identity
diff --git a/benchmark/framework/aea_test_wrapper.py b/benchmark/framework/aea_test_wrapper.py
index 059b6e664c..39de905bb3 100644
--- a/benchmark/framework/aea_test_wrapper.py
+++ b/benchmark/framework/aea_test_wrapper.py
@@ -22,8 +22,6 @@
 from threading import Thread
 from typing import Dict, List, Optional, Tuple, Type, Union
 
-from benchmark.framework.fake_connection import FakeConnection
-
 from aea.aea import AEA
 from aea.aea_builder import AEABuilder
 from aea.components.base import Component
@@ -34,6 +32,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
 from aea.skills.base import Handler, Skill, SkillContext
+from benchmark.framework.fake_connection import FakeConnection
 
 
 class AEATestWrapper:
diff --git a/benchmark/framework/executor.py b/benchmark/framework/executor.py
index 206580b557..0f4645fb36 100644
--- a/benchmark/framework/executor.py
+++ b/benchmark/framework/executor.py
@@ -28,14 +28,11 @@
 from typing import Callable, List, Tuple
 
 import memory_profiler  # type: ignore
-
 import psutil  # type: ignore
 
 from benchmark.framework.benchmark import BenchmarkControl  # noqa: I100
-
 from tests.common.utils import timeit_context
 
-
 ResourceStats = namedtuple("ResourceStats", "time,cpu,mem")
 
 
diff --git a/benchmark/framework/report_printer.py b/benchmark/framework/report_printer.py
index 6dfd4a2e16..725330ca49 100644
--- a/benchmark/framework/report_printer.py
+++ b/benchmark/framework/report_printer.py
@@ -22,7 +22,6 @@
 from statistics import mean, stdev
 from typing import Any, List, Optional, Tuple
 
-
 from .executor import ExecReport
 from .func_details import BaseFuncDetails
 
diff --git a/examples/gym_ex/gyms/env.py b/examples/gym_ex/gyms/env.py
index bb2eb3126e..66acc54026 100644
--- a/examples/gym_ex/gyms/env.py
+++ b/examples/gym_ex/gyms/env.py
@@ -22,9 +22,8 @@
 from typing import List, Tuple
 
 import gym
-from gym import spaces  # type: ignore
-
 import numpy as np
+from gym import spaces  # type: ignore
 
 BanditId = int
 Price = int
diff --git a/examples/gym_ex/proxy/agent.py b/examples/gym_ex/proxy/agent.py
index 42b5fbf7b1..90b87cf225 100644
--- a/examples/gym_ex/proxy/agent.py
+++ b/examples/gym_ex/proxy/agent.py
@@ -29,13 +29,13 @@
 from aea.helpers.base import locate
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
+from packages.fetchai.connections.gym.connection import (  # noqa: E402  # pylint: disable=wrong-import-position
+    GymConnection,
+)
 
 sys.modules["packages.fetchai.connections.gym"] = locate(
     "packages.fetchai.connections.gym"
 )
-from packages.fetchai.connections.gym.connection import (  # noqa: E402  # pylint: disable=wrong-import-position
-    GymConnection,
-)
 
 ADDRESS = "some_address"
 
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index 514d6e4095..9c5e4a467d 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -22,7 +22,7 @@
 import time
 from queue import Queue
 from threading import Thread
-from typing import Any, Optional, Tuple, cast
+from typing import Any, cast, Optional, Tuple
 
 import gym
 
@@ -31,11 +31,6 @@
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
-sys.modules["packages.fetchai.connections.gym"] = locate(
-    "packages.fetchai.connections.gym"
-)
-sys.modules["packages.fetchai.protocols.gym"] = locate("packages.fetchai.protocols.gym")
 from packages.fetchai.protocols.gym.dialogues import (  # noqa: E402  # pylint: disable=wrong-import-position
     GymDialogue as BaseGymDialogue,
 )
@@ -48,6 +43,12 @@
 
 from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
 
+sys.modules["packages.fetchai.connections.gym"] = locate(
+    "packages.fetchai.connections.gym"
+)
+sys.modules["packages.fetchai.protocols.gym"] = locate("packages.fetchai.protocols.gym")
+
+
 Action = Any
 Observation = Any
 Reward = float
diff --git a/examples/gym_ex/rl/agent.py b/examples/gym_ex/rl/agent.py
index d8206848a9..aa71d0ac66 100644
--- a/examples/gym_ex/rl/agent.py
+++ b/examples/gym_ex/rl/agent.py
@@ -23,7 +23,6 @@
 from typing import Dict, Tuple
 
 import gym
-
 import numpy as np
 
 BanditId = int
diff --git a/packages/fetchai/connections/gym/connection.py b/packages/fetchai/connections/gym/connection.py
index 395a566099..6d0d39dd5d 100644
--- a/packages/fetchai/connections/gym/connection.py
+++ b/packages/fetchai/connections/gym/connection.py
@@ -24,7 +24,7 @@
 from asyncio import CancelledError
 from asyncio.events import AbstractEventLoop
 from concurrent.futures.thread import ThreadPoolExecutor
-from typing import Optional, Tuple, Union, cast
+from typing import cast, Optional, Tuple, Union
 
 import gym
 
@@ -35,12 +35,10 @@
 from aea.helpers.base import locate
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.protocols.gym.dialogues import GymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
 
-
 logger = logging.getLogger("aea.packages.fetchai.connections.gym")
 
 PUBLIC_ID = PublicId.from_str("fetchai/gym:0.8.0")
diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml
index cce17f13a0..e6ef3b80c0 100644
--- a/packages/fetchai/connections/gym/connection.yaml
+++ b/packages/fetchai/connections/gym/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPUxpn8smGVFexxhUu3Vy3q5xsJukHnYtQzUXyt965bmL
   __init__.py: QmWwxj1hGGZNteCvRtZxwtY9PuEKsrWsEmMWCKwiYCdvRR
-  connection.py: QmeBfJXcmyFzH84siPgKjTCrsSnTw7V1Jza1ZL9vUjpBS3
+  connection.py: QmavgJYnKS9AY9UXyPM3mWZMZ9kCCSPjNAySn33N92kcV7
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/gym:0.6.0
diff --git a/packages/fetchai/connections/http_client/connection.py b/packages/fetchai/connections/http_client/connection.py
index 72ed44788f..429b4fee2a 100644
--- a/packages/fetchai/connections/http_client/connection.py
+++ b/packages/fetchai/connections/http_client/connection.py
@@ -26,7 +26,7 @@
 from asyncio.events import AbstractEventLoop
 from asyncio.tasks import Task
 from traceback import format_exc
-from typing import Any, Optional, Set, Tuple, Union, cast
+from typing import Any, cast, Optional, Set, Tuple, Union
 
 import aiohttp
 from aiohttp.client_reqrep import ClientResponse
@@ -37,12 +37,10 @@
 from aea.exceptions import enforce
 from aea.mail.base import Envelope, EnvelopeContext, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 
-
 SUCCESS = 200
 NOT_FOUND = 404
 REQUEST_TIMEOUT = 408
diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml
index 462f0c8937..8a785639c9 100644
--- a/packages/fetchai/connections/http_client/connection.yaml
+++ b/packages/fetchai/connections/http_client/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmXfZJPAh4Ujt3xj8xzd6ng6HbrpJQUuvjWe8DNQSwSKWU
   __init__.py: QmPdKAks8A6XKAgZiopJzPZYXJumTeUqChd8UorqmLQQPU
-  connection.py: QmW9DVSJwTdD8BkjiZc8fYa2ndHVCy6HepFpmnX8H8TVMH
+  connection.py: QmYTSggRJNrtKMkkigLL2eCWTdcRojJagXNjGz3rJ4emrB
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/http_server/connection.py b/packages/fetchai/connections/http_server/connection.py
index f2267bd642..a774a43e03 100644
--- a/packages/fetchai/connections/http_server/connection.py
+++ b/packages/fetchai/connections/http_server/connection.py
@@ -27,28 +27,21 @@
 from asyncio.events import AbstractEventLoop
 from asyncio.futures import Future
 from traceback import format_exc
-from typing import Dict, Optional, Set, cast
+from typing import cast, Dict, Optional, Set
 from urllib.parse import parse_qs, urlencode, urlparse
 
 from aiohttp import web
 from aiohttp.web_request import BaseRequest
-
 from openapi_core import create_spec
-from openapi_core.validation.request.datatypes import (
-    OpenAPIRequest,
-    RequestParameters,
-)
+from openapi_core.validation.request.datatypes import OpenAPIRequest, RequestParameters
 from openapi_core.validation.request.shortcuts import validate_request
 from openapi_core.validation.request.validators import RequestValidator
-
 from openapi_spec_validator.exceptions import (  # pylint: disable=wrong-import-order
     OpenAPIValidationError,
 )
 from openapi_spec_validator.schemas import (  # pylint: disable=wrong-import-order
     read_yaml_file,
 )
-
-
 from werkzeug.datastructures import (  # pylint: disable=wrong-import-order
     ImmutableMultiDict,
 )
@@ -59,7 +52,6 @@
 from aea.mail.base import Envelope, EnvelopeContext, Message, URI
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml
index cdab3a9916..b94bf4851f 100644
--- a/packages/fetchai/connections/http_server/connection.yaml
+++ b/packages/fetchai/connections/http_server/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTmQcnUPKaDHHJHngBFXnUVPdgBLanP9DbjVHZT55Scfn
   __init__.py: Qmb6JEAkJeb5JweqrSGiGoQp1vGXqddjGgb9WMkm2phTgA
-  connection.py: QmbmtdBBj7p1T7SYoBhP3CnvGeZhnQH8FQiQLSAKAhdATf
+  connection.py: QmfZHq3FHwXecTAiRohbHLnaFucpD5h7BXqahJmnVDZA2K
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/ledger/base.py b/packages/fetchai/connections/ledger/base.py
index c9fbdd4411..1afb3aa1a8 100644
--- a/packages/fetchai/connections/ledger/base.py
+++ b/packages/fetchai/connections/ledger/base.py
@@ -27,13 +27,12 @@
 
 from aea.configurations.base import PublicId
 from aea.crypto.base import LedgerApi
-from aea.crypto.registries import Registry, ledger_apis_registry
+from aea.crypto.registries import ledger_apis_registry, Registry
 from aea.helpers.async_utils import AsyncState
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, Dialogues
 
-
 CONNECTION_ID = PublicId.from_str("fetchai/ledger:0.6.0")
 
 
diff --git a/packages/fetchai/connections/ledger/connection.py b/packages/fetchai/connections/ledger/connection.py
index 1fe1fd45e9..1b153ef6d9 100644
--- a/packages/fetchai/connections/ledger/connection.py
+++ b/packages/fetchai/connections/ledger/connection.py
@@ -21,16 +21,12 @@
 import asyncio
 from asyncio import Task
 from collections import deque
-from typing import Deque, Dict, List, Optional, cast
+from typing import cast, Deque, Dict, List, Optional
 
 from aea.connections.base import Connection, ConnectionStates
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
-
-from packages.fetchai.connections.ledger.base import (
-    CONNECTION_ID,
-    RequestDispatcher,
-)
+from packages.fetchai.connections.ledger.base import CONNECTION_ID, RequestDispatcher
 from packages.fetchai.connections.ledger.contract_dispatcher import (
     ContractApiRequestDispatcher,
 )
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index 323030a60f..efcfd06f44 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfQN7UK1M4pBUzKVzPannPLVi8iiULKHNtJ7XpoWpjqfc
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
-  base.py: QmNnSBVmVgdDFwzqDUncwLHeyDfMEfmvujJdKbdGNGH4Be
-  connection.py: QmS3CJwjgzZ5SrAeJjCnC5ChZDfTsDuV6ndgMsGV1bidnf
-  contract_dispatcher.py: QmRegSPqqkns7xp5zr6xiuTxjGLiGGG2qLkwunpFCbzEwX
-  ledger_dispatcher.py: QmarLEyR2Je6NtXSJmPy9NbGL7J85FVAZJPkFKqCotEKjc
+  base.py: QmXHmxdtk2Bp5RUG7VZb8rTAShtnnePj8rzS2HLEp14xTx
+  connection.py: QmdpsBY8SeYmxj8ijv7BuRKwjseoNXMX7gRP9ufLPoTFUM
+  contract_dispatcher.py: QmVaDEyhBFwf48iLYqeEXijpjDbeoNgsptXWFQ3DWSau5K
+  ledger_dispatcher.py: QmRXSuhgHqRgqkTtcBwdvjPd4QRpVuZWfBubgNeQSh9FJJ
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/contract_api:0.5.0
diff --git a/packages/fetchai/connections/ledger/contract_dispatcher.py b/packages/fetchai/connections/ledger/contract_dispatcher.py
index ca2561ed01..2d0283b132 100644
--- a/packages/fetchai/connections/ledger/contract_dispatcher.py
+++ b/packages/fetchai/connections/ledger/contract_dispatcher.py
@@ -19,7 +19,7 @@
 
 """This module contains the implementation of the contract API request dispatcher."""
 import inspect
-from typing import Callable, Optional, cast
+from typing import Callable, cast, Optional
 
 from aea.contracts import Contract, contract_registry
 from aea.crypto.base import LedgerApi
@@ -27,15 +27,9 @@
 from aea.exceptions import AEAException
 from aea.helpers.transaction.base import RawMessage, RawTransaction, State
 from aea.protocols.base import Address, Message
-from aea.protocols.dialogue.base import (
-    Dialogue as BaseDialogue,
-    Dialogues as BaseDialogues,
-)
-
-from packages.fetchai.connections.ledger.base import (
-    CONNECTION_ID,
-    RequestDispatcher,
-)
+from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+from aea.protocols.dialogue.base import Dialogues as BaseDialogues
+from packages.fetchai.connections.ledger.base import CONNECTION_ID, RequestDispatcher
 from packages.fetchai.protocols.contract_api import ContractApiMessage
 from packages.fetchai.protocols.contract_api.dialogues import ContractApiDialogue
 from packages.fetchai.protocols.contract_api.dialogues import (
diff --git a/packages/fetchai/connections/ledger/ledger_dispatcher.py b/packages/fetchai/connections/ledger/ledger_dispatcher.py
index bd11c7a887..fdc76f0f03 100644
--- a/packages/fetchai/connections/ledger/ledger_dispatcher.py
+++ b/packages/fetchai/connections/ledger/ledger_dispatcher.py
@@ -24,15 +24,9 @@
 from aea.crypto.base import LedgerApi
 from aea.helpers.transaction.base import RawTransaction, TransactionDigest
 from aea.protocols.base import Address, Message
-from aea.protocols.dialogue.base import (
-    Dialogue as BaseDialogue,
-    Dialogues as BaseDialogues,
-)
-
-from packages.fetchai.connections.ledger.base import (
-    CONNECTION_ID,
-    RequestDispatcher,
-)
+from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+from aea.protocols.dialogue.base import Dialogues as BaseDialogues
+from packages.fetchai.connections.ledger.base import CONNECTION_ID, RequestDispatcher
 from packages.fetchai.protocols.ledger_api.custom_types import TransactionReceipt
 from packages.fetchai.protocols.ledger_api.dialogues import LedgerApiDialogue
 from packages.fetchai.protocols.ledger_api.dialogues import (
diff --git a/packages/fetchai/connections/local/connection.py b/packages/fetchai/connections/local/connection.py
index 3d79dc86b2..a7da093a2d 100644
--- a/packages/fetchai/connections/local/connection.py
+++ b/packages/fetchai/connections/local/connection.py
@@ -23,7 +23,7 @@
 from asyncio import AbstractEventLoop, Queue
 from collections import defaultdict
 from threading import Thread
-from typing import Dict, List, Optional, Tuple, cast
+from typing import cast, Dict, List, Optional, Tuple
 
 from aea.common import Address
 from aea.configurations.base import ProtocolId, PublicId
@@ -32,7 +32,6 @@
 from aea.mail.base import Envelope, Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogues as BaseOefSearchDialogues,
diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml
index 5c722defd8..3fc3e9c37c 100644
--- a/packages/fetchai/connections/local/connection.yaml
+++ b/packages/fetchai/connections/local/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbK7MtyAVqh2LmSh9TY6yBZqfWaAXURP4rQGATyP2hTKC
   __init__.py: QmeeoX5E38Ecrb1rLdeFyyxReHLrcJoETnBcPbcNWVbiKG
-  connection.py: QmaydCZEzNwBiDw5rVAW9oh63S9ymaG4WHcj2TWDnWViF2
+  connection.py: QmVEpirVUJ6QYEzpDSdVUhnyPJHZk1WgHofjrRvY24sLYj
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/oef/connection.py b/packages/fetchai/connections/oef/connection.py
index 124d6ad822..a7db37505a 100644
--- a/packages/fetchai/connections/oef/connection.py
+++ b/packages/fetchai/connections/oef/connection.py
@@ -23,7 +23,7 @@
 from asyncio import AbstractEventLoop, CancelledError
 from concurrent.futures.thread import ThreadPoolExecutor
 from itertools import cycle
-from typing import Dict, List, Optional, Set, Type, cast
+from typing import cast, Dict, List, Optional, Set, Type
 
 import oef
 from oef.agents import OEFAgent
@@ -39,7 +39,6 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
-
 from packages.fetchai.connections.oef.object_translator import OEFObjectTranslator
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
@@ -49,7 +48,6 @@
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
-
 logger = logging.getLogger("aea.packages.fetchai.connections.oef")
 
 TARGET = 0
diff --git a/packages/fetchai/connections/oef/connection.yaml b/packages/fetchai/connections/oef/connection.yaml
index c3d8f0b085..da80a8b4ee 100644
--- a/packages/fetchai/connections/oef/connection.yaml
+++ b/packages/fetchai/connections/oef/connection.yaml
@@ -9,8 +9,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVHWxThR1u9a4BEm89oCxUTPGnN6PznvNgo6oZLqDD3n5
   __init__.py: QmUAen8tmoBHuCerjA3FSGKJRLG6JYyUS3chuWzPxKYzez
-  connection.py: QmfDKjDageCc4Pxdqokw7s2foEgwrWnoexcdHL9PcVWS45
-  object_translator.py: QmdScfifH8EX472dGUhHin634G4zYS2TLSxSJdSLL9AoAC
+  connection.py: QmcFn2NMW3U2Fcc2v3N49kDgwxF7Whe1aGW29dkEkmWcfL
+  object_translator.py: QmfDTqq9kUhWrAJf8SyevzhcKcuYioiLxLQtWhavxbvawS
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/default:0.5.0
diff --git a/packages/fetchai/connections/oef/object_translator.py b/packages/fetchai/connections/oef/object_translator.py
index 4d6d1a710b..98fe4241b3 100644
--- a/packages/fetchai/connections/oef/object_translator.py
+++ b/packages/fetchai/connections/oef/object_translator.py
@@ -21,31 +21,21 @@
 
 import logging
 
-from oef.query import (
-    And as OEFAnd,
-    Constraint as OEFConstraint,
-    ConstraintExpr as OEFConstraintExpr,
-    ConstraintType as OEFConstraintType,
-    Distance,
-    Eq,
-    Gt,
-    GtEq,
-    In,
-    Location as OEFLocation,
-    Lt,
-    LtEq,
-    Not as OEFNot,
-    NotEq,
-    NotIn,
-    Or as OEFOr,
-    Query as OEFQuery,
-    Range,
-)
-from oef.schema import (
-    AttributeSchema as OEFAttribute,
-    DataModel as OEFDataModel,
-    Description as OEFDescription,
-)
+from oef.query import And as OEFAnd
+from oef.query import Constraint as OEFConstraint
+from oef.query import ConstraintExpr as OEFConstraintExpr
+from oef.query import ConstraintType as OEFConstraintType
+from oef.query import Distance, Eq, Gt, GtEq, In
+from oef.query import Location as OEFLocation
+from oef.query import Lt, LtEq
+from oef.query import Not as OEFNot
+from oef.query import NotEq, NotIn
+from oef.query import Or as OEFOr
+from oef.query import Query as OEFQuery
+from oef.query import Range
+from oef.schema import AttributeSchema as OEFAttribute
+from oef.schema import DataModel as OEFDataModel
+from oef.schema import Description as OEFDescription
 
 from aea.helpers.search.models import (
     And,
@@ -62,7 +52,6 @@
     Query,
 )
 
-
 logger = logging.getLogger("aea.packages.fetchai.connections.oef")
 
 
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.py b/packages/fetchai/connections/p2p_libp2p/connection.py
index 84627fb356..32f51a2063 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p/connection.py
@@ -28,7 +28,7 @@
 from asyncio import AbstractEventLoop, CancelledError
 from pathlib import Path
 from random import randint
-from typing import IO, List, Optional, Sequence, cast
+from typing import cast, IO, List, Optional, Sequence
 
 from aea.common import Address
 from aea.configurations.base import PublicId
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.yaml b/packages/fetchai/connections/p2p_libp2p/connection.yaml
index 217db0e2b6..89b5831ea6 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p/connection.yaml
@@ -15,7 +15,7 @@ fingerprint:
   aea/envelope.proto: QmSC8EGCKiNFR2vf5bSWymSzYDFMipQW9aQVMwPzQoKb4n
   aea/pipe_unix.go: QmSzbAexrSUSA9ZE6VT6MmcWF5MhEcmceQjAbnfRoK7Ruv
   aea/pipe_windows.go: QmdYpfjgdgFbA6Pothg65NYM45ubfpZeKr8cVQoqbFzgUK
-  connection.py: QmPEcaeBAHS7FQE27idXAB5WP9MnSXTxdVr39jdd5zdX5Z
+  connection.py: Qma7mVzE8TddKpJeKHEgeyPjxT4vQX8y9uPEtkWwA9tTaf
   dht/dhtclient/dhtclient.go: QmasA3GrgswTnUJoffBzeeqxeT3GjLu6foN6PHJhWNpMMa
   dht/dhtclient/dhtclient_test.go: QmPfnHSHXtbaW5VYuq1QsKQWey64pUEvLEaKKkT9eAcmws
   dht/dhtclient/options.go: QmPorj38wNrxGrzsbFe5wwLmiHzxbTJ2VsgvSd8tLDYS8s
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.py b/packages/fetchai/connections/p2p_libp2p_client/connection.py
index 0ae1dfa284..dce5235c07 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.py
@@ -25,7 +25,7 @@
 import struct
 from asyncio import CancelledError
 from random import randint
-from typing import List, Optional, Union, cast
+from typing import cast, List, Optional, Union
 
 from aea.configurations.base import PublicId
 from aea.configurations.constants import DEFAULT_LEDGER
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
index a51a00d00d..c3eb2fb000 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
@@ -10,7 +10,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUp9UrXSqEYeRxrEsGDhGPTjFrwKmuT3bjHJfGrfP8yjk
   __init__.py: QmT1FEHkPGMHV5oiVEfQHHr25N2qdZxydSNRJabJvYiTgf
-  connection.py: QmeSyMBkN1Y99g7c7j89Ack8NjzSPw5WDbodbwfqLP6ZLT
+  connection.py: QmZLM7ihaCnvGurmAXYd2WesDcY5YWyfb6rmZT5qsbxP6w
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PLibp2pClientConnection
diff --git a/packages/fetchai/connections/p2p_stub/connection.py b/packages/fetchai/connections/p2p_stub/connection.py
index 615b2e6f27..a357aa4295 100644
--- a/packages/fetchai/connections/p2p_stub/connection.py
+++ b/packages/fetchai/connections/p2p_stub/connection.py
@@ -21,7 +21,7 @@
 import os
 import tempfile
 from pathlib import Path
-from typing import Union, cast
+from typing import cast, Union
 
 from aea.configurations.base import ConnectionConfig, PublicId
 from aea.connections.stub.connection import StubConnection, write_envelope
diff --git a/packages/fetchai/connections/p2p_stub/connection.yaml b/packages/fetchai/connections/p2p_stub/connection.yaml
index c64dd5676d..98120d9535 100644
--- a/packages/fetchai/connections/p2p_stub/connection.yaml
+++ b/packages/fetchai/connections/p2p_stub/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbAStnFJj6jMTwqNu7DG9dt2uy5JGrGhKtCbYuAhWLBCk
   __init__.py: QmW9XFKGsea4u3fupkFMcQutgsjqusCMBMyTcTmLLmQ4tR
-  connection.py: QmSd6uheF634ZkHoPe1DtpPeD6Sx6p11rpB8tYELqWZUoS
+  connection.py: QmZ9YcefyzbVP45UaFrZcrKNKQQpeAkk45w5T9q2piEfpy
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PStubConnection
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 622543e773..913fbfbd77 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -26,13 +26,12 @@
 from concurrent.futures._base import CancelledError as ConcurrentCancelledError
 from concurrent.futures.thread import ThreadPoolExecutor
 from contextlib import suppress
-from typing import Callable, Dict, List, Optional, Set, Type, Union, cast
+from typing import Callable, cast, Dict, List, Optional, Set, Type, Union
 from urllib import parse
 from uuid import uuid4
 
-from defusedxml import ElementTree as ET  # pylint: disable=wrong-import-order
-
 import requests
+from defusedxml import ElementTree as ET  # pylint: disable=wrong-import-order
 
 from aea.common import Address
 from aea.configurations.base import PublicId
@@ -49,7 +48,6 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
-
 from packages.fetchai.protocols.oef_search.custom_types import (
     AgentsInfo,
     OefErrorOperation,
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index f11cd94684..bc37bd232e 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmWwjETX39APP9RD5oVPeeCiDnUoDvjAcoVe2FK2Jc6anM
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmfK5khjQuqewKVuqyedgmToQvRbh69oT8f5WcSvzvvjJL
+  connection.py: QmTf8NU96LvnDdkB88b37Xk8K4cZFb6tj57TNP86ZL1Gyj
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/tcp/connection.yaml b/packages/fetchai/connections/tcp/connection.yaml
index 7ecf44617c..e3dcc18244 100644
--- a/packages/fetchai/connections/tcp/connection.yaml
+++ b/packages/fetchai/connections/tcp/connection.yaml
@@ -10,8 +10,8 @@ fingerprint:
   __init__.py: QmTxAtQ9ffraStxxLAkvmWxyGhoV3jE16Sw6SJ9xzTthLb
   base.py: QmRu7RYvTQuXvzM8mj8LQ8d3XtaHKLRdnMo7AvX2X76npe
   connection.py: QmcQnyUagAhE7UsSBxiBSqsuF4mTMdU26LZLhUhdq5QygR
-  tcp_client.py: QmR96SGPA9ZKQSJuhXXuQhPu55X3pygwGKhjtVZaynFVF1
-  tcp_server.py: Qme1JTrtwuR1aGsA24yCnuPeGq1NRXrLDuG4ANUK5Uv317
+  tcp_client.py: QmevCDDRJBJuw8awsn3TYWHbqPJLegjDZdeHFi5ZUwRKDg
+  tcp_server.py: QmUQwZmu12FeGNpg22Jn4ZFaoP53WpdLfAM18ySfoCyTsj
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: TCPClientConnection
diff --git a/packages/fetchai/connections/tcp/tcp_client.py b/packages/fetchai/connections/tcp/tcp_client.py
index 4b1fd007fc..76e0b52122 100644
--- a/packages/fetchai/connections/tcp/tcp_client.py
+++ b/packages/fetchai/connections/tcp/tcp_client.py
@@ -27,11 +27,10 @@
     StreamReader,
     StreamWriter,
 )
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ConnectionConfig
 from aea.mail.base import Envelope
-
 from packages.fetchai.connections.tcp.base import TCPConnection
 
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp.tcp_client")
diff --git a/packages/fetchai/connections/tcp/tcp_server.py b/packages/fetchai/connections/tcp/tcp_server.py
index 9b0325ecfd..c04213ef33 100644
--- a/packages/fetchai/connections/tcp/tcp_server.py
+++ b/packages/fetchai/connections/tcp/tcp_server.py
@@ -22,12 +22,11 @@
 import asyncio
 import logging
 from asyncio import AbstractServer, Future, StreamReader, StreamWriter
-from typing import Dict, Optional, Tuple, cast
+from typing import cast, Dict, Optional, Tuple
 
 from aea.common import Address
 from aea.configurations.base import ConnectionConfig
 from aea.mail.base import Envelope
-
 from packages.fetchai.connections.tcp.base import TCPConnection
 
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp.tcp_server")
diff --git a/packages/fetchai/connections/webhook/connection.py b/packages/fetchai/connections/webhook/connection.py
index b4e28cfa38..0d4d6e9dc1 100644
--- a/packages/fetchai/connections/webhook/connection.py
+++ b/packages/fetchai/connections/webhook/connection.py
@@ -22,7 +22,7 @@
 import json
 import logging
 from asyncio import CancelledError
-from typing import Optional, Union, cast
+from typing import cast, Optional, Union
 
 from aiohttp import web  # type: ignore
 
@@ -32,7 +32,6 @@
 from aea.mail.base import Envelope, EnvelopeContext, URI
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
diff --git a/packages/fetchai/connections/webhook/connection.yaml b/packages/fetchai/connections/webhook/connection.yaml
index edbd4803ec..68fec4e29a 100644
--- a/packages/fetchai/connections/webhook/connection.yaml
+++ b/packages/fetchai/connections/webhook/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmQDqfKKsksKsUqdqTcYe8P8Fw3MGovVuZBFHPbhupkkxf
   __init__.py: QmWUKSmXaBgGMvKgdmzKmMjCx43BnrfW6og2n3afNoAALq
-  connection.py: QmVzx4qbqru7oLCsUnSqWCMt9e69yUr9BquhaLXdTKz16U
+  connection.py: QmSTcUqdxmFG4N2NPbKRxpTcbChThVryJ6xGhD7DeWwuT5
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/contracts/erc1155/contract.py b/packages/fetchai/contracts/erc1155/contract.py
index 99db581ea3..950e2331f2 100644
--- a/packages/fetchai/contracts/erc1155/contract.py
+++ b/packages/fetchai/contracts/erc1155/contract.py
@@ -22,7 +22,7 @@
 import json
 import logging
 import random
-from typing import Any, Dict, List, Optional, cast
+from typing import Any, cast, Dict, List, Optional
 
 from vyper.utils import keccak256
 
diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml
index 221b26e0c5..c07b8fde4c 100644
--- a/packages/fetchai/contracts/erc1155/contract.yaml
+++ b/packages/fetchai/contracts/erc1155/contract.yaml
@@ -10,7 +10,7 @@ fingerprint:
   build/Migrations.json: QmfFYYWoq1L1Ni6YPBWWoRPvCZKBLZ7qzN3UDX537mCeuE
   build/erc1155.json: Qma5n7au2NDCg1nLwYfYnmFNwWChFuXtu65w5DV7wAZRvw
   build/erc1155.wasm: Qmc9gthbdwRSywinTHKjRVQdFzrKTxUuLDx2ryNfQp1xqf
-  contract.py: QmSEfxq6dH53q9qEw3KrtTgUqvyDgCefy59RNpciGGAGi6
+  contract.py: QmREF1pSQhJduHCWQpn67EtfNuZp93PzJY152tkqq32B7t
   contracts/Migrations.sol: QmbW34mYrj3uLteyHf3S46pnp9bnwovtCXHbdBHfzMkSZx
   contracts/erc1155.vy: QmXwob8G1uX7fDvtuuKW139LALWtQmGw2vvaTRBVAWRxTx
   migrations/1_initial_migration.js: QmcxaWKQ2yPkQBmnpXmcuxPZQUMuUudmPmX3We8Z9vtAf7
diff --git a/packages/fetchai/protocols/contract_api/dialogues.py b/packages/fetchai/protocols/contract_api/dialogues.py
index ca9cb3c8ab..c27ccea420 100644
--- a/packages/fetchai/protocols/contract_api/dialogues.py
+++ b/packages/fetchai/protocols/contract_api/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 
 
diff --git a/packages/fetchai/protocols/contract_api/message.py b/packages/fetchai/protocols/contract_api/message.py
index d84c69c714..1e666fd247 100644
--- a/packages/fetchai/protocols/contract_api/message.py
+++ b/packages/fetchai/protocols/contract_api/message.py
@@ -20,12 +20,11 @@
 """This module contains contract_api's message definition."""
 
 import logging
-from typing import Optional, Set, Tuple, cast
+from typing import cast, Optional, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.contract_api.custom_types import Kwargs as CustomKwargs
 from packages.fetchai.protocols.contract_api.custom_types import (
     RawMessage as CustomRawMessage,
diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index c41896ef87..98d312b0b9 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -11,9 +11,9 @@ fingerprint:
   contract_api.proto: QmNwngtcYFSuqL8yeTGVXmrHjfebCybdUa9BnTDKXn8odk
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
   custom_types.py: QmbLjpiTcGNfvdBsu8pgQH6PK5y6ujdNnZ53JSk1GZDRCA
-  dialogues.py: QmTjXH8JUtziUFDawKsSTYE5dxn1n1FmMPeWexyxiPYd6k
-  message.py: Qmbxqt2TauoUkP6bqeYz1LZ7FukMvW3szs26HU87QCEFya
-  serialization.py: QmdJZ6GBrURgzJCfYSZzLhWirfm5bDJxumz7ieAELC9juw
+  dialogues.py: QmatXfb83UiHz78oNir1m7BHUCHcjC2vToX5ym5xg2TsqE
+  message.py: Qmb1jJji5cKaRTZ5pyXfRvgaVJg39519Py1a3o3FM2QEew
+  serialization.py: QmYxhZxqEFj6yoLuUuHssR4Hv59C72uAUwom3sM6hLtKad
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/contract_api/serialization.py b/packages/fetchai/protocols/contract_api/serialization.py
index fa94eb9382..418d551676 100644
--- a/packages/fetchai/protocols/contract_api/serialization.py
+++ b/packages/fetchai/protocols/contract_api/serialization.py
@@ -19,16 +19,16 @@
 
 """Serialization module for contract_api protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.contract_api import contract_api_pb2
-from packages.fetchai.protocols.contract_api.custom_types import Kwargs
-from packages.fetchai.protocols.contract_api.custom_types import RawMessage
-from packages.fetchai.protocols.contract_api.custom_types import RawTransaction
-from packages.fetchai.protocols.contract_api.custom_types import State
+from packages.fetchai.protocols.contract_api.custom_types import (
+    Kwargs,
+    RawMessage,
+    RawTransaction,
+    State,
+)
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 
 
diff --git a/packages/fetchai/protocols/fipa/dialogues.py b/packages/fetchai/protocols/fipa/dialogues.py
index 39a531fd20..784d9e51fd 100644
--- a/packages/fetchai/protocols/fipa/dialogues.py
+++ b/packages/fetchai/protocols/fipa/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 
 
diff --git a/packages/fetchai/protocols/fipa/message.py b/packages/fetchai/protocols/fipa/message.py
index 02328af938..5fc4da7939 100644
--- a/packages/fetchai/protocols/fipa/message.py
+++ b/packages/fetchai/protocols/fipa/message.py
@@ -20,12 +20,11 @@
 """This module contains fipa's message definition."""
 
 import logging
-from typing import Dict, Set, Tuple, cast
+from typing import cast, Dict, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.fipa.custom_types import (
     Description as CustomDescription,
 )
diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml
index 56acab1c84..6a112e5fa4 100644
--- a/packages/fetchai/protocols/fipa/protocol.yaml
+++ b/packages/fetchai/protocols/fipa/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmRwxwzxfhotek7WUbyAeufBvoHpWbDwfUVMy3FKitiHKy
   __init__.py: QmZuv8RGegxunYaJ7sHLwj2oLLCFCAGF139b8DxEY68MRT
   custom_types.py: Qmb7bzEUAW74ZeSFqL7sTccNCjudStV63K4CFNZtibKUHB
-  dialogues.py: QmWaciW35ZTVeTeLWeyp3hjehKkWB5ZY7Di8N8cDH8Mjwb
+  dialogues.py: QmXKE9vDi5byW2qUoooE8qbkETJH9DDPHq5qNkG9drfpRU
   fipa.proto: QmP7JqnuQSQ9BDcKkscrTydKEX4wFBoyFaY1bkzGkamcit
   fipa_pb2.py: QmZMkefJLrb3zJKoimb6a9tdpxDBhc8rR2ghimqg7gZ471
-  message.py: QmbFtigdnmqqmKZMTxjmk6JQJtcyhVY9a4mpEEcHmFJd24
-  serialization.py: QmU6Xj55eaRxCYAeyR1difC769NHLB8kciorajvkLZCwDR
+  message.py: QmUvHvbZnos2VPfa7CibXpddc1wEKwL55zhCnodqPucj1h
+  serialization.py: QmQiFE2TzLMVM2mcbNHLrF5reydWt4UWuCC8bX3YJyBs5E
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/fipa/serialization.py b/packages/fetchai/protocols/fipa/serialization.py
index d317c4c4ee..cc1f44f309 100644
--- a/packages/fetchai/protocols/fipa/serialization.py
+++ b/packages/fetchai/protocols/fipa/serialization.py
@@ -19,14 +19,11 @@
 
 """Serialization module for fipa protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.fipa import fipa_pb2
-from packages.fetchai.protocols.fipa.custom_types import Description
-from packages.fetchai.protocols.fipa.custom_types import Query
+from packages.fetchai.protocols.fipa.custom_types import Description, Query
 from packages.fetchai.protocols.fipa.message import FipaMessage
 
 
diff --git a/packages/fetchai/protocols/gym/dialogues.py b/packages/fetchai/protocols/gym/dialogues.py
index cf665a79b0..7bf4fcf0ac 100644
--- a/packages/fetchai/protocols/gym/dialogues.py
+++ b/packages/fetchai/protocols/gym/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.gym.message import GymMessage
 
 
diff --git a/packages/fetchai/protocols/gym/message.py b/packages/fetchai/protocols/gym/message.py
index 7642fde42f..f8217f85b7 100644
--- a/packages/fetchai/protocols/gym/message.py
+++ b/packages/fetchai/protocols/gym/message.py
@@ -20,12 +20,11 @@
 """This module contains gym's message definition."""
 
 import logging
-from typing import Dict, Set, Tuple, cast
+from typing import cast, Dict, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.gym.custom_types import AnyObject as CustomAnyObject
 
 logger = logging.getLogger("aea.packages.fetchai.protocols.gym.message")
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index f381e6973e..511e35da86 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmTCkz4cEUcwuPZVtvrVr8Np5qn1SMwm6foGSY9Y68DhZT
   __init__.py: QmWBvruqGuU2BVCq8cuP1S3mgvuC78yrG4TdtSvKhCT8qX
   custom_types.py: QmT3VKT86xZKR11RR1vQ3myRpmVZNdzY6ELd8HG9U2ngwa
-  dialogues.py: QmdCzcFfyPF43U2SoxwshG5p4hd6dK49m6GYKduDHbnNPo
+  dialogues.py: QmTUPRyUM8d78KYhsecD9KH6FNhJzTQ4ETv8z1SueerDSB
   gym.proto: QmQGF9Xz4Z93wmhdKoztzxjo5pS4SsAWe2TQdvZCLuzdGC
   gym_pb2.py: QmSTz7xrL8ryqzR1Sgu1NpR6PmW7GUhBGnN2qYc8m8NCcN
-  message.py: QmTaiHDJkdduU4HLn7i17oAigJQwrws8FmfQCwbfAagnGp
-  serialization.py: QmaZd7YMHrHZvbeMMb1JfnkUZRHk7zKy45M7kDvG5wbY9C
+  message.py: QmT7dXmEqwPEi4ngZVWRMaYSddDHeemTAcxLdXv67mAJZB
+  serialization.py: QmQd94GuH1XZ1QZUCzdYT4cRyM5Vy4B3ABEHQNVfeTSNPC
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/gym/serialization.py b/packages/fetchai/protocols/gym/serialization.py
index 8b058f15b5..f2f0aea130 100644
--- a/packages/fetchai/protocols/gym/serialization.py
+++ b/packages/fetchai/protocols/gym/serialization.py
@@ -19,11 +19,9 @@
 
 """Serialization module for gym protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.gym import gym_pb2
 from packages.fetchai.protocols.gym.custom_types import AnyObject
 from packages.fetchai.protocols.gym.message import GymMessage
diff --git a/packages/fetchai/protocols/http/dialogues.py b/packages/fetchai/protocols/http/dialogues.py
index f5c52a86e5..40e5c219b9 100644
--- a/packages/fetchai/protocols/http/dialogues.py
+++ b/packages/fetchai/protocols/http/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.http.message import HttpMessage
 
 
diff --git a/packages/fetchai/protocols/http/message.py b/packages/fetchai/protocols/http/message.py
index 3c4841038a..95e73ffd59 100644
--- a/packages/fetchai/protocols/http/message.py
+++ b/packages/fetchai/protocols/http/message.py
@@ -20,7 +20,7 @@
 """This module contains http's message definition."""
 
 import logging
-from typing import Set, Tuple, cast
+from typing import cast, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml
index bfe9679b93..a93a22a670 100644
--- a/packages/fetchai/protocols/http/protocol.yaml
+++ b/packages/fetchai/protocols/http/protocol.yaml
@@ -8,11 +8,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmY7fxhyNBgwU7uc6LKtCN4aSQ4bym5BwqtwRAfwPokULN
   __init__.py: QmRWie4QPiFJE8nK4fFJ6prqoG3u36cPo7st5JUZAGpVWv
-  dialogues.py: QmdwTehjCppcxyDid8m6zuHY5YwprUhato88R9Zdm9aXaM
+  dialogues.py: QmbLrJoAwsdDMuZkFnkbDSH2xJ1JZjmwUn7BfzGcEw9VvE
   http.proto: QmdTUTvvxGxMxSTB67AXjMUSDLdsxBYiSuJNVxHuLKB1jS
   http_pb2.py: QmYYKqdwiueq54EveL9WXn216FXLSQ6XGJJHoiJxwJjzHC
-  message.py: QmYSmd2xLU8TsLLorxxNnaHj1cVLztgrKtQnaqJ1USFkPY
-  serialization.py: QmUgo5BtLYDyy7syHBd6brd8zAXivNR2UEiBckryCwg6hk
+  message.py: QmZ54hhAZXbj5K1eJ23GDhkGVbsG76hnDfon9qG8Pm3dB7
+  serialization.py: Qmbx7TrAXy4TCJzxM2fMWfKod7Bgx51FMYU9eVGYBcbP11
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/http/serialization.py b/packages/fetchai/protocols/http/serialization.py
index 749ddba29d..16f4dbaf9b 100644
--- a/packages/fetchai/protocols/http/serialization.py
+++ b/packages/fetchai/protocols/http/serialization.py
@@ -19,11 +19,9 @@
 
 """Serialization module for http protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.http import http_pb2
 from packages.fetchai.protocols.http.message import HttpMessage
 
diff --git a/packages/fetchai/protocols/ledger_api/custom_types.py b/packages/fetchai/protocols/ledger_api/custom_types.py
index 43508e0ee5..adde5cd580 100644
--- a/packages/fetchai/protocols/ledger_api/custom_types.py
+++ b/packages/fetchai/protocols/ledger_api/custom_types.py
@@ -25,7 +25,6 @@
 from aea.helpers.transaction.base import TransactionDigest as BaseTransactionDigest
 from aea.helpers.transaction.base import TransactionReceipt as BaseTransactionReceipt
 
-
 RawTransaction = BaseRawTransaction
 SignedTransaction = BaseSignedTransaction
 Terms = BaseTerms
diff --git a/packages/fetchai/protocols/ledger_api/dialogues.py b/packages/fetchai/protocols/ledger_api/dialogues.py
index c53552918c..6c3cc92ad2 100644
--- a/packages/fetchai/protocols/ledger_api/dialogues.py
+++ b/packages/fetchai/protocols/ledger_api/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 
 
diff --git a/packages/fetchai/protocols/ledger_api/message.py b/packages/fetchai/protocols/ledger_api/message.py
index 6b60d32682..790c2f58be 100644
--- a/packages/fetchai/protocols/ledger_api/message.py
+++ b/packages/fetchai/protocols/ledger_api/message.py
@@ -20,12 +20,11 @@
 """This module contains ledger_api's message definition."""
 
 import logging
-from typing import Optional, Set, Tuple, cast
+from typing import cast, Optional, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.ledger_api.custom_types import (
     RawTransaction as CustomRawTransaction,
 )
diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml
index a3f92d5551..6c92685ba9 100644
--- a/packages/fetchai/protocols/ledger_api/protocol.yaml
+++ b/packages/fetchai/protocols/ledger_api/protocol.yaml
@@ -8,12 +8,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSoo6ds8mKhtoG8CBbu9rb9yj7sqeeuBfcU7CLj584uRX
   __init__.py: Qmct8jVx6ndWwaa5HXJAJgMraVuZ8kMeyx6rnEeHAYHwDJ
-  custom_types.py: QmWRrvFStMhVJy8P2WD6qjDgk14ZnxErN7XymxUtof7HQo
-  dialogues.py: QmRtWkAfR9WTvygMJ36R758RzdY2mGQs2fgtHCfjxmeaHy
+  custom_types.py: QmQJnWQvtj1D9zqGWM3XrpNtZPmzr4rLgKxoG1MzM5udNA
+  dialogues.py: QmVJLujzpu7Zm6i4Mqw6Yf4g2sjJbmdT5FqV8KURqjLvg8
   ledger_api.proto: QmfLcv7jJcGJ1gAdCMqsyxJcRud7RaTWteSXHL5NvGuViP
   ledger_api_pb2.py: QmQhM848REJTDKDoiqxkTniChW8bNNm66EtwMRkvVdbMry
-  message.py: QmcLuy4YcL22qs3jHf5KHZ7vZueiTDrEmbWjfRTbyzwc5m
-  serialization.py: QmUvysZKkt5xLKLVHAyaZQ3jsRDkPn5bJURdsTDHgkE3HS
+  message.py: QmYXnMm4fbHyk88qn6VdqfMerZA3R6Xs48LrYRwTr7ghD5
+  serialization.py: QmV4F4vqvjHcVt5axZKC9cpCbmtQdQeixKK7KdC6MVKbFH
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/ledger_api/serialization.py b/packages/fetchai/protocols/ledger_api/serialization.py
index ac850b11e3..86f0c9077a 100644
--- a/packages/fetchai/protocols/ledger_api/serialization.py
+++ b/packages/fetchai/protocols/ledger_api/serialization.py
@@ -19,17 +19,17 @@
 
 """Serialization module for ledger_api protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.ledger_api import ledger_api_pb2
-from packages.fetchai.protocols.ledger_api.custom_types import RawTransaction
-from packages.fetchai.protocols.ledger_api.custom_types import SignedTransaction
-from packages.fetchai.protocols.ledger_api.custom_types import Terms
-from packages.fetchai.protocols.ledger_api.custom_types import TransactionDigest
-from packages.fetchai.protocols.ledger_api.custom_types import TransactionReceipt
+from packages.fetchai.protocols.ledger_api.custom_types import (
+    RawTransaction,
+    SignedTransaction,
+    Terms,
+    TransactionDigest,
+    TransactionReceipt,
+)
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 
 
diff --git a/packages/fetchai/protocols/ml_trade/custom_types.py b/packages/fetchai/protocols/ml_trade/custom_types.py
index 12aef0abc9..995f1444a6 100644
--- a/packages/fetchai/protocols/ml_trade/custom_types.py
+++ b/packages/fetchai/protocols/ml_trade/custom_types.py
@@ -22,7 +22,6 @@
 from aea.helpers.search.models import Description as BaseDescription
 from aea.helpers.search.models import Query as BaseQuery
 
-
 Description = BaseDescription
 
 Query = BaseQuery
diff --git a/packages/fetchai/protocols/ml_trade/dialogues.py b/packages/fetchai/protocols/ml_trade/dialogues.py
index 2bb14a478f..c9a992a235 100644
--- a/packages/fetchai/protocols/ml_trade/dialogues.py
+++ b/packages/fetchai/protocols/ml_trade/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 
 
diff --git a/packages/fetchai/protocols/ml_trade/message.py b/packages/fetchai/protocols/ml_trade/message.py
index f99abeaa98..2e1b2124e2 100644
--- a/packages/fetchai/protocols/ml_trade/message.py
+++ b/packages/fetchai/protocols/ml_trade/message.py
@@ -20,12 +20,11 @@
 """This module contains ml_trade's message definition."""
 
 import logging
-from typing import Set, Tuple, cast
+from typing import cast, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.ml_trade.custom_types import (
     Description as CustomDescription,
 )
diff --git a/packages/fetchai/protocols/ml_trade/protocol.yaml b/packages/fetchai/protocols/ml_trade/protocol.yaml
index 1863dda440..ce091dcef8 100644
--- a/packages/fetchai/protocols/ml_trade/protocol.yaml
+++ b/packages/fetchai/protocols/ml_trade/protocol.yaml
@@ -8,12 +8,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSRtzACMh3x3LSjYqWXWTpYpE4C7G8EHbW4zQQoMFFZ4K
   __init__.py: QmXZMVdsBXUJxLZvwwhWBx58xfxMSyoGxdYp5Aeqmzqhzt
-  custom_types.py: QmPa6mxbN8WShsniQxJACfzAPRjGzYLbUFGoVU4N9DewUw
-  dialogues.py: QmVvP34aKWEtHrKmccNMvEdDnx5B7xpE5aEGzr6GU2u8UK
-  message.py: QmZdRAScKbmJgKVbRJvDyMUNfRZKWCwWFYjGNDDBAq5fUT
+  custom_types.py: QmeWvNKuezFxfmLYaxKhP9XffeiFFCwH1qowyiJacLAHpF
+  dialogues.py: QmWywRmmJYXD4TRkPJeDa5ntueK4DPJ6L9sKgM5wuq98wT
+  message.py: QmeFb86N5UxzQQhJyXFnJKSqgKymVu1wEyCrhaUaCn2K1f
   ml_trade.proto: QmeB21MQduEGQCrtiYZQzPpRqHL4CWEkvvcaKZ9GsfE8f6
   ml_trade_pb2.py: QmZVvugPysR1og6kWCJkvo3af2s9pQRHfuj4BptE7gU1EU
-  serialization.py: QmSHywy12uQkzakU1RHnnkaPuTzaFTALsKisyYF8dPc8ns
+  serialization.py: QmVGjPRVK7sm82F9XYgT1giVcpQ1X5fEu9ydwvgRP63vZV
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/ml_trade/serialization.py b/packages/fetchai/protocols/ml_trade/serialization.py
index ab0e4574dc..635f63eb63 100644
--- a/packages/fetchai/protocols/ml_trade/serialization.py
+++ b/packages/fetchai/protocols/ml_trade/serialization.py
@@ -19,14 +19,11 @@
 
 """Serialization module for ml_trade protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.ml_trade import ml_trade_pb2
-from packages.fetchai.protocols.ml_trade.custom_types import Description
-from packages.fetchai.protocols.ml_trade.custom_types import Query
+from packages.fetchai.protocols.ml_trade.custom_types import Description, Query
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 
 
diff --git a/packages/fetchai/protocols/oef_search/custom_types.py b/packages/fetchai/protocols/oef_search/custom_types.py
index b7bfeb8e5b..9a0fb4dc0d 100644
--- a/packages/fetchai/protocols/oef_search/custom_types.py
+++ b/packages/fetchai/protocols/oef_search/custom_types.py
@@ -27,7 +27,6 @@
 from aea.helpers.search.models import Description as BaseDescription
 from aea.helpers.search.models import Query as BaseQuery
 
-
 Description = BaseDescription
 
 
diff --git a/packages/fetchai/protocols/oef_search/dialogues.py b/packages/fetchai/protocols/oef_search/dialogues.py
index add8484e76..82e4b1c5d1 100644
--- a/packages/fetchai/protocols/oef_search/dialogues.py
+++ b/packages/fetchai/protocols/oef_search/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
 
diff --git a/packages/fetchai/protocols/oef_search/message.py b/packages/fetchai/protocols/oef_search/message.py
index 51190e1eee..c8281c00af 100644
--- a/packages/fetchai/protocols/oef_search/message.py
+++ b/packages/fetchai/protocols/oef_search/message.py
@@ -20,12 +20,11 @@
 """This module contains oef_search's message definition."""
 
 import logging
-from typing import Set, Tuple, cast
+from typing import cast, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.oef_search.custom_types import (
     AgentsInfo as CustomAgentsInfo,
 )
diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml
index e03193f84d..b035e7433a 100644
--- a/packages/fetchai/protocols/oef_search/protocol.yaml
+++ b/packages/fetchai/protocols/oef_search/protocol.yaml
@@ -8,12 +8,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmaGSTqxvQFKccBnLovhBbfSH3C3Sorrj7kFyZqW9qptLa
   __init__.py: QmRvTtynKcd7shmzgf8aZdcA5witjNL5cL2a7WPgscp7wq
-  custom_types.py: QmYAkKYj9gGHaij7uTejoJe9KRhNcsU4sJC1utMfhUYhg3
-  dialogues.py: QmQPLnW3jAs6tLLmhkX4C7texGRHM9bfdjs83dUH5TkJ4v
-  message.py: QmU8jH94qxrcr9eUtXWn5PzqmHT7NBc62gs53HPXKVk1Ts
+  custom_types.py: QmPSAWKkH7R8XCfPUCRmuEqVxCnp8L5PTUq4DBt59AzFUC
+  dialogues.py: QmZ9AMyHu4pPFHBiE239AWQT8haVK74JFWPVjtd2kPc9ej
+  message.py: QmdUz4aHSwo1xAtpJuNusakJAz4cU1XdLzKo9bwuL5QLfq
   oef_search.proto: QmNU8WsxT6XNFFneKKeDaZkNn3CEFDfZQkmKv9TyhyxzDB
   oef_search_pb2.py: QmSAFT1xxYRzJU6h1aFVDuYcx672sZ2vzV6c2ico7f4BLK
-  serialization.py: QmVmZnv4kHr2E9UaYACiwnTuT79N4hSe7NZZ2ogB2bD2K2
+  serialization.py: QmaVfY1Q5EpkQhoHMip45efayT4a6iPxknTNuMQKGyTf4S
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/oef_search/serialization.py b/packages/fetchai/protocols/oef_search/serialization.py
index 57a94b67be..e81792a4c3 100644
--- a/packages/fetchai/protocols/oef_search/serialization.py
+++ b/packages/fetchai/protocols/oef_search/serialization.py
@@ -19,16 +19,16 @@
 
 """Serialization module for oef_search protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.oef_search import oef_search_pb2
-from packages.fetchai.protocols.oef_search.custom_types import AgentsInfo
-from packages.fetchai.protocols.oef_search.custom_types import Description
-from packages.fetchai.protocols.oef_search.custom_types import OefErrorOperation
-from packages.fetchai.protocols.oef_search.custom_types import Query
+from packages.fetchai.protocols.oef_search.custom_types import (
+    AgentsInfo,
+    Description,
+    OefErrorOperation,
+    Query,
+)
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
 
diff --git a/packages/fetchai/protocols/tac/custom_types.py b/packages/fetchai/protocols/tac/custom_types.py
index 094741edfe..453dab2932 100644
--- a/packages/fetchai/protocols/tac/custom_types.py
+++ b/packages/fetchai/protocols/tac/custom_types.py
@@ -22,7 +22,6 @@
 from enum import Enum
 from typing import Dict
 
-
 CODE_TO_MSG = {
     0: "Unexpected error.",
     1: "Request not recognized",
diff --git a/packages/fetchai/protocols/tac/dialogues.py b/packages/fetchai/protocols/tac/dialogues.py
index 250ae33e75..b388b9209b 100644
--- a/packages/fetchai/protocols/tac/dialogues.py
+++ b/packages/fetchai/protocols/tac/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from packages.fetchai.protocols.tac.message import TacMessage
 
 
diff --git a/packages/fetchai/protocols/tac/message.py b/packages/fetchai/protocols/tac/message.py
index 999a42bbf9..81c321a38a 100644
--- a/packages/fetchai/protocols/tac/message.py
+++ b/packages/fetchai/protocols/tac/message.py
@@ -20,12 +20,11 @@
 """This module contains tac's message definition."""
 
 import logging
-from typing import Dict, Optional, Set, Tuple, cast
+from typing import cast, Dict, Optional, Set, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from packages.fetchai.protocols.tac.custom_types import ErrorCode as CustomErrorCode
 
 logger = logging.getLogger("aea.packages.fetchai.protocols.tac.message")
diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml
index d8f0dcaa5c..5ff8fe1708 100644
--- a/packages/fetchai/protocols/tac/protocol.yaml
+++ b/packages/fetchai/protocols/tac/protocol.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVhm6VBbggxjTe3PEhCBfTomWekNa5buYy3sY7YYN6Er6
   __init__.py: QmZYdAjm3o44drRiY3MT4RtG2fFLxtaL8h898DmjoJwJzV
-  custom_types.py: QmXQATfnvuCpt4FicF4QcqCcLj9PQNsSHjCBvVQknWpyaN
-  dialogues.py: QmTxHrcGujP1RUYvfJygZyQoUwmDg2GBWfmbR3tWUSbyop
-  message.py: QmfNdmYk3wssDJvHwMsMxXaiWCjm3fSH9Su4KmsYDZJoWg
-  serialization.py: QmfZMesx1EFVYx1pj5SBn3eF7A2fz5a8cnBKzhBmVha31U
+  custom_types.py: QmXyAhpkE6sLExGgf2GxBv8gRYTDZu7XCDsa2m4rwvQrmp
+  dialogues.py: QmSZMt9rRFasAkziB3ZtUvLKSpF7dKPRenqUXNtEuBqPhF
+  message.py: QmWDvBFPBk6cy2Auso4VGxZFrn4K4jqgTtCRLJazmoYx9H
+  serialization.py: QmZqeRNTVTTpFp7ymKgeKaGj7zHMCHD6KBAe9v1LLJJXyS
   tac.proto: QmdpPZNhUW593qVNVoSTWZgd9R69bmBbw6Y9xjzYpvuDvV
   tac_pb2.py: QmUwW3kixKwD2o1RRdq4NoNoihPb5BXKKRngWXztq32fea
 fingerprint_ignore_patterns: []
diff --git a/packages/fetchai/protocols/tac/serialization.py b/packages/fetchai/protocols/tac/serialization.py
index d709b5cee0..fabcb1e28d 100644
--- a/packages/fetchai/protocols/tac/serialization.py
+++ b/packages/fetchai/protocols/tac/serialization.py
@@ -19,11 +19,9 @@
 
 """Serialization module for tac protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.tac import tac_pb2
 from packages.fetchai.protocols.tac.custom_types import ErrorCode
 from packages.fetchai.protocols.tac.message import TacMessage
diff --git a/packages/fetchai/skills/aries_alice/behaviours.py b/packages/fetchai/skills/aries_alice/behaviours.py
index 847c40c3b8..18ede1fb58 100644
--- a/packages/fetchai/skills/aries_alice/behaviours.py
+++ b/packages/fetchai/skills/aries_alice/behaviours.py
@@ -20,11 +20,10 @@
 """This package contains the behaviour of a generic seller AEA."""
 
 import json
-from typing import Dict, cast
+from typing import cast, Dict
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.connections.http_client.connection import (
     PUBLIC_ID as HTTP_CLIENT_CONNECTION_PUBLIC_ID,
 )
diff --git a/packages/fetchai/skills/aries_alice/dialogues.py b/packages/fetchai/skills/aries_alice/dialogues.py
index 96983efc95..1384d1fd26 100644
--- a/packages/fetchai/skills/aries_alice/dialogues.py
+++ b/packages/fetchai/skills/aries_alice/dialogues.py
@@ -29,7 +29,6 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.oef_search.dialogues import (
diff --git a/packages/fetchai/skills/aries_alice/handlers.py b/packages/fetchai/skills/aries_alice/handlers.py
index 5bb7f3b52b..5eb646663c 100644
--- a/packages/fetchai/skills/aries_alice/handlers.py
+++ b/packages/fetchai/skills/aries_alice/handlers.py
@@ -22,14 +22,13 @@
 import base64
 import binascii
 import json
-from typing import Dict, Optional, cast
+from typing import cast, Dict, Optional
 from urllib.parse import urlparse
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.aries_alice.dialogues import (
diff --git a/packages/fetchai/skills/aries_alice/skill.yaml b/packages/fetchai/skills/aries_alice/skill.yaml
index 7bdeae07c0..a9bf82b529 100644
--- a/packages/fetchai/skills/aries_alice/skill.yaml
+++ b/packages/fetchai/skills/aries_alice/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfS1ezD77No8WQkvrkPs4oSXHFbULRxatGzRhMbSMntSx
   __init__.py: Qma8qSTU34ADKWskBwQKQLGNpe3xDKNgjNQ6Q4MxUnKa3Q
-  behaviours.py: QmZafoGe1KJ6ZfQhAkgVQFUAbDfackh8YHRjxVdCLm2TQE
-  dialogues.py: QmRbbuYSXuNzMVK3gkHVFhwqH8k6oPo4ThGvVPrrn9N3Yq
-  handlers.py: QmTtqM5oWBEAZcHdTuwuPtbiZZGWontMNEtmDxcccS2u2Y
+  behaviours.py: QmPQ87aRJ4KHAq29ghNPioA7YH36Pz5XbRhQsW4EPh63J6
+  dialogues.py: QmQwremVUhyXMcoPQEvc4yJaUUDBx9ZYmDUCUHZwwux9Gc
+  handlers.py: QmQg1WLMNdgKmaBphEwdVeXcK9nq7VxkY4QPhT2A4y4ZZp
   strategy.py: QmZ2jhWFQZipk6wAquS1gWxX94iAmhN9Vrh7tcPU9bgpzF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/aries_faber/behaviours.py b/packages/fetchai/skills/aries_faber/behaviours.py
index 2e0080d319..3c030933b9 100644
--- a/packages/fetchai/skills/aries_faber/behaviours.py
+++ b/packages/fetchai/skills/aries_faber/behaviours.py
@@ -20,10 +20,9 @@
 """This package contains the behaviour for the aries_faber skill."""
 
 import json
-from typing import Dict, cast
+from typing import cast, Dict
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.aries_faber.dialogues import (
diff --git a/packages/fetchai/skills/aries_faber/dialogues.py b/packages/fetchai/skills/aries_faber/dialogues.py
index f00b84bd56..334b38e46b 100644
--- a/packages/fetchai/skills/aries_faber/dialogues.py
+++ b/packages/fetchai/skills/aries_faber/dialogues.py
@@ -29,7 +29,6 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.oef_search.dialogues import (
diff --git a/packages/fetchai/skills/aries_faber/handlers.py b/packages/fetchai/skills/aries_faber/handlers.py
index dd46d1205c..66630ded93 100644
--- a/packages/fetchai/skills/aries_faber/handlers.py
+++ b/packages/fetchai/skills/aries_faber/handlers.py
@@ -21,14 +21,13 @@
 
 import json
 import random
-from typing import Dict, Optional, cast
+from typing import cast, Dict, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.mail.base import EnvelopeContext
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.connections.p2p_libp2p.connection import (
     PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID,
 )
diff --git a/packages/fetchai/skills/aries_faber/skill.yaml b/packages/fetchai/skills/aries_faber/skill.yaml
index 6ad3ba2d21..a2254a2537 100644
--- a/packages/fetchai/skills/aries_faber/skill.yaml
+++ b/packages/fetchai/skills/aries_faber/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdkSNCYx5dNGDAAveapQgoyM7Y7iYeQzR7KN2Sso3CJG4
   __init__.py: QmNPVQ6UajvJodqTLWbLvQZkKCfrNn1nYPrQXai3xdj6F7
-  behaviours.py: QmfF39uLgQinDRfWHo4fzbgJBGm1xanL1BbvdDwAHT7HPQ
-  dialogues.py: QmXveWmeU3eTDDhqDkBcVE2pJAtxJUAzcjbM8ZEjRvKUYW
-  handlers.py: QmZMEEQ3tGdfE1N5oMem5AZkXqreJ6BuGu7HsYrNwH99C3
-  strategy.py: QmNs4KYe8C5zdFnD3Cp6X9ZKRjqeKG8GNmBiMxLidNTEhe
+  behaviours.py: QmfKXbGwvhnNSCDmEjt9z8YjD98gReD7v5MDeDbaPkgLMt
+  dialogues.py: QmPHqMtprNxvA6VTAi7ZRbLfFNy4pDPUcu9T6sM37wxMyQ
+  handlers.py: QmYD7CvETEoMmk5sb1rbBSK1sUzbtg3MLDLrVetMsn8quA
+  strategy.py: QmcUmddp6CUP31Bfckt6EkV3n2VZcJrUagoGBaTDBMTdXR
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/aries_faber/strategy.py b/packages/fetchai/skills/aries_faber/strategy.py
index 6ac7c5bce2..a73030b91e 100644
--- a/packages/fetchai/skills/aries_faber/strategy.py
+++ b/packages/fetchai/skills/aries_faber/strategy.py
@@ -21,12 +21,7 @@
 
 from aea.common import Address
 from aea.exceptions import enforce
-from aea.helpers.search.models import (
-    Constraint,
-    ConstraintType,
-    Location,
-    Query,
-)
+from aea.helpers.search.models import Constraint, ConstraintType, Location, Query
 from aea.skills.base import Model
 
 # Default Config
diff --git a/packages/fetchai/skills/carpark_client/behaviours.py b/packages/fetchai/skills/carpark_client/behaviours.py
index 3f2e38b180..deda9acdac 100644
--- a/packages/fetchai/skills/carpark_client/behaviours.py
+++ b/packages/fetchai/skills/carpark_client/behaviours.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
-
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/carpark_client/handlers.py b/packages/fetchai/skills/carpark_client/handlers.py
index 2f1e9cb165..ce8f9a83a0 100644
--- a/packages/fetchai/skills/carpark_client/handlers.py
+++ b/packages/fetchai/skills/carpark_client/handlers.py
@@ -26,7 +26,6 @@
     GenericSigningHandler,
 )
 
-
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/carpark_client/skill.yaml b/packages/fetchai/skills/carpark_client/skill.yaml
index f57a37bb82..acc3ffab98 100644
--- a/packages/fetchai/skills/carpark_client/skill.yaml
+++ b/packages/fetchai/skills/carpark_client/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmeypYUvYR61ZD7qWQmeMnGq3ior9dQ6uuRpAduws65rFG
   __init__.py: QmPZ4bRmXpsDKD7ogCJHEMrtm67hpA5aqxvujgfQD1PtMd
-  behaviours.py: QmXw3wGKAqCT55MRX61g3eN1T2YVY4XC5z9b4Dg7x1Wihc
+  behaviours.py: QmW2VLVXoepN7V1u4rgARXjp9d9PpPfVgMz2KuNdR76aRg
   dialogues.py: QmcMynppu7B2nZR21LzxFQMpoRdegpWpwcXti2ba4Vcei5
-  handlers.py: QmYx8WzeR2aCg2b2uiR1K2NHLn8DKhzAahLXoFnrXyDoDz
-  strategy.py: QmZVALhDnpEdxLhk3HLAmTs3JdEr9tk1QTS33ZsVnxkLXZ
+  handlers.py: Qme3AaVj6UPLufnMFoXVQKZn5EbEa1JsUqUNHh7jrxKWBE
+  strategy.py: QmRSgvrswoay8vF6woRm97vYVK9ZAGk1Gh26EkD4fFmbjz
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/carpark_client/strategy.py b/packages/fetchai/skills/carpark_client/strategy.py
index 4b755b9173..9748064074 100644
--- a/packages/fetchai/skills/carpark_client/strategy.py
+++ b/packages/fetchai/skills/carpark_client/strategy.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
-
 Strategy = GenericStrategy
diff --git a/packages/fetchai/skills/carpark_detection/behaviours.py b/packages/fetchai/skills/carpark_detection/behaviours.py
index 589ac88e89..24754d2cd2 100755
--- a/packages/fetchai/skills/carpark_detection/behaviours.py
+++ b/packages/fetchai/skills/carpark_detection/behaviours.py
@@ -23,5 +23,4 @@
     GenericServiceRegistrationBehaviour,
 )
 
-
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/carpark_detection/dialogues.py b/packages/fetchai/skills/carpark_detection/dialogues.py
index d493129414..aa3bde5528 100644
--- a/packages/fetchai/skills/carpark_detection/dialogues.py
+++ b/packages/fetchai/skills/carpark_detection/dialogues.py
@@ -39,7 +39,6 @@
     OefSearchDialogues as GenericOefSearchDialogues,
 )
 
-
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/carpark_detection/handlers.py b/packages/fetchai/skills/carpark_detection/handlers.py
index d92a4497fd..f0d711e69c 100644
--- a/packages/fetchai/skills/carpark_detection/handlers.py
+++ b/packages/fetchai/skills/carpark_detection/handlers.py
@@ -25,7 +25,6 @@
     GenericOefSearchHandler,
 )
 
-
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/carpark_detection/skill.yaml b/packages/fetchai/skills/carpark_detection/skill.yaml
index 387e93cf7a..1dc69e1ef1 100644
--- a/packages/fetchai/skills/carpark_detection/skill.yaml
+++ b/packages/fetchai/skills/carpark_detection/skill.yaml
@@ -9,11 +9,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmcwNhv5N8m4ZtWvXY5eMDeL5ciivryDZPtGWXMFfTbYR7
   __init__.py: QmQoECB7dpCDCG3xCnBsoMy6oqgSdu69CzRcAcuZuyapnQ
-  behaviours.py: QmTNboU3YH8DehWnpZmoiDUCncpNmqoSVt1Yp4j7NsgY2S
+  behaviours.py: QmaPS7Q3jJMASLRzGBpM5nzw3qQfkEwa9AW6kRv8nAjDo7
   database.py: QmQv79qDxNk8v9chNYq7AxxChAJVGs4B8Y9we35rjzaonP
-  dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
-  handlers.py: QmbkmEP9K4Qu2MsRtnkdx3PGNbSW46qi48bCHVCUJHpcQF
-  strategy.py: QmTHW32BzzYrBF1YkmftAMuyx6cKKGrp554qeKiFBJieJJ
+  dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
+  handlers.py: QmZ7r1LaYnjjkW6T7XLdmWdHjmyd9DsBjnFDvf5zoa6U6V
+  strategy.py: QmX2LcvY3yHDeKH4VeCCJM9JFihj5Hwwii6zZi3efMXSpV
 fingerprint_ignore_patterns:
 - temp_files_placeholder/*
 contracts: []
diff --git a/packages/fetchai/skills/carpark_detection/strategy.py b/packages/fetchai/skills/carpark_detection/strategy.py
index f3cde2bdf7..0f46795b8f 100644
--- a/packages/fetchai/skills/carpark_detection/strategy.py
+++ b/packages/fetchai/skills/carpark_detection/strategy.py
@@ -23,7 +23,6 @@
 from typing import Dict
 
 from aea.exceptions import enforce
-
 from packages.fetchai.skills.carpark_detection.database import DetectionDatabase
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
diff --git a/packages/fetchai/skills/echo/handlers.py b/packages/fetchai/skills/echo/handlers.py
index a43ba669f9..551cd4c4b9 100644
--- a/packages/fetchai/skills/echo/handlers.py
+++ b/packages/fetchai/skills/echo/handlers.py
@@ -23,9 +23,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
-from packages.fetchai.skills.echo.dialogues import DefaultDialogue
-from packages.fetchai.skills.echo.dialogues import DefaultDialogues
+from packages.fetchai.skills.echo.dialogues import DefaultDialogue, DefaultDialogues
 
 
 class EchoHandler(Handler):
diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml
index 8d1bed0ceb..94480f9071 100644
--- a/packages/fetchai/skills/echo/skill.yaml
+++ b/packages/fetchai/skills/echo/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
   behaviours.py: QmXARXRvJkpzuqnYNhJhv42Sk6J4KzRW2AKvC6FJWLU9JL
   dialogues.py: QmTWhg4VnPFVsEq6D4KQvLWZntFDBxY7ujEjgD7ZspKcen
-  handlers.py: QmZhzCr55WSCWc7ebKn7FD7V939Q3wCqeAWQUF2RdRBb57
+  handlers.py: QmSapUa6eiyRFFuXthGY8ELJ4byK6SykE6TuMMspF3i3Ep
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/erc1155_client/behaviours.py b/packages/fetchai/skills/erc1155_client/behaviours.py
index dfa465d175..16937ccf57 100644
--- a/packages/fetchai/skills/erc1155_client/behaviours.py
+++ b/packages/fetchai/skills/erc1155_client/behaviours.py
@@ -22,7 +22,6 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.erc1155_client.dialogues import (
diff --git a/packages/fetchai/skills/erc1155_client/dialogues.py b/packages/fetchai/skills/erc1155_client/dialogues.py
index 10af7d3bea..bbc010b99f 100644
--- a/packages/fetchai/skills/erc1155_client/dialogues.py
+++ b/packages/fetchai/skills/erc1155_client/dialogues.py
@@ -38,7 +38,6 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.contract_api.dialogues import (
     ContractApiDialogue as BaseContractApiDialogue,
 )
diff --git a/packages/fetchai/skills/erc1155_client/handlers.py b/packages/fetchai/skills/erc1155_client/handlers.py
index fd542bd2b1..ea5ebffbe7 100644
--- a/packages/fetchai/skills/erc1155_client/handlers.py
+++ b/packages/fetchai/skills/erc1155_client/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains handlers for the erc1155-client skill."""
 
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.helpers.transaction.base import RawMessage, Terms
@@ -27,7 +27,6 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml
index 099ed84f66..eb0e11c443 100644
--- a/packages/fetchai/skills/erc1155_client/skill.yaml
+++ b/packages/fetchai/skills/erc1155_client/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZLsx2wJE762rqDqfeqLMg9RBczvALxy3H2U9kfRvgK3s
   __init__.py: QmRXXJsv5bfvb7qsyxQtVzXwn6PMLJKkbm6kg4DNkT1NtW
-  behaviours.py: QmaCak7V3jYEWdj4fLdd2tEG4fiSazbLBC5WKjDeSAQhrh
-  dialogues.py: QmPb2odXbXxuY5Ygm9mfCufM2mtMZ23oapsAzsWHC2x2k4
-  handlers.py: QmSahx4wij2w9X6Zm9wAHyeJVRifpKGkstwYKDzcosqkfe
+  behaviours.py: QmT1c2JxQf92Em8ohu4qMSmBtebgmW7Gm6ZAK5ifFT2bQS
+  dialogues.py: QmUM3rDDQALcgfKsX7gGpT7sP1DVXsneS6XbqVANaW4Xfh
+  handlers.py: QmVpnbEiVX1P8E49mbMAtGGMpDD5CA7W7CipEwryubUH8N
   strategy.py: QmNg87LgfLPoPyokFrmvrNghQD7JkWehRNAdRNyB3YogeN
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/erc1155_deploy/behaviours.py b/packages/fetchai/skills/erc1155_deploy/behaviours.py
index 84357c3b9c..93baf383cb 100644
--- a/packages/fetchai/skills/erc1155_deploy/behaviours.py
+++ b/packages/fetchai/skills/erc1155_deploy/behaviours.py
@@ -22,7 +22,6 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/erc1155_deploy/dialogues.py b/packages/fetchai/skills/erc1155_deploy/dialogues.py
index b3ba399f52..b73adcf187 100644
--- a/packages/fetchai/skills/erc1155_deploy/dialogues.py
+++ b/packages/fetchai/skills/erc1155_deploy/dialogues.py
@@ -39,7 +39,6 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.contract_api.dialogues import (
     ContractApiDialogue as BaseContractApiDialogue,
 )
diff --git a/packages/fetchai/skills/erc1155_deploy/handlers.py b/packages/fetchai/skills/erc1155_deploy/handlers.py
index fd9f0a7168..0ce403de5a 100644
--- a/packages/fetchai/skills/erc1155_deploy/handlers.py
+++ b/packages/fetchai/skills/erc1155_deploy/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers of the erc1155 deploy skill AEA."""
 
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.crypto.ethereum import EthereumHelper
@@ -27,7 +27,6 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
@@ -47,7 +46,6 @@
 )
 from packages.fetchai.skills.erc1155_deploy.strategy import Strategy
 
-
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index b43dc83ed4..cacb0033d1 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZ7swVkRpmJbJZ2NoLb9CWwH8p3QjnjRJg71UbAXdrKyx
   __init__.py: Qmbm3ZtGpfdvvzqykfRqbaReAK9a16mcyK7qweSfeN5pq1
-  behaviours.py: QmaiK1q2cYeP64YriCw6PHm9Mr1okMRU9esPftQDXXFy1f
-  dialogues.py: QmcCbdxFM4SX3MgXDxxbsC66gp8QK3C4W2czniQ5oDNc7G
-  handlers.py: QmSp3YuFz5nLy6Bc6qQr27ZUtwNQR6LyKiRHXcYpnmhm9r
-  strategy.py: QmeoDg7UT5MG5khmrZna3v8HYrC6QJjjEV26kcq1mPs6yx
+  behaviours.py: QmNf5NGKdNaffwFHHyNPv1FMocJ9YbnvU1zKFaYJoUEexA
+  dialogues.py: QmdHxieCCQjSbEf1U1vekKUK86EVu64Hw2HFKWrC9hK5q6
+  handlers.py: QmYYvptHAuprPXDjpYGPrGpn4Qp7cioFK3anGK9JBeGMXY
+  strategy.py: QmcmUTRZk4BDm9DyowWm9NT1UzDe6rjQhgyongibSPh3hc
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/erc1155_deploy/strategy.py b/packages/fetchai/skills/erc1155_deploy/strategy.py
index bdb058f810..266af5d71e 100644
--- a/packages/fetchai/skills/erc1155_deploy/strategy.py
+++ b/packages/fetchai/skills/erc1155_deploy/strategy.py
@@ -33,7 +33,6 @@
 from aea.helpers.search.models import Description, Location
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
-
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 
 DEFAULT_IS_LEDGER_TX = True
diff --git a/packages/fetchai/skills/generic_buyer/behaviours.py b/packages/fetchai/skills/generic_buyer/behaviours.py
index 1eecadaa15..b3e721520d 100644
--- a/packages/fetchai/skills/generic_buyer/behaviours.py
+++ b/packages/fetchai/skills/generic_buyer/behaviours.py
@@ -22,7 +22,6 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_buyer.dialogues import (
diff --git a/packages/fetchai/skills/generic_buyer/dialogues.py b/packages/fetchai/skills/generic_buyer/dialogues.py
index a22c0127ec..1f91a5aa66 100644
--- a/packages/fetchai/skills/generic_buyer/dialogues.py
+++ b/packages/fetchai/skills/generic_buyer/dialogues.py
@@ -40,8 +40,6 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
-
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/packages/fetchai/skills/generic_buyer/handlers.py b/packages/fetchai/skills/generic_buyer/handlers.py
index 0e60ef1b1a..f521639e09 100644
--- a/packages/fetchai/skills/generic_buyer/handlers.py
+++ b/packages/fetchai/skills/generic_buyer/handlers.py
@@ -20,14 +20,13 @@
 """This package contains handlers for the generic buyer skill."""
 
 import pprint
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml
index 0f4dd4f620..c0ca469e65 100644
--- a/packages/fetchai/skills/generic_buyer/skill.yaml
+++ b/packages/fetchai/skills/generic_buyer/skill.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTR91jm7WfJpmabisy74NR5mc35YXjDU1zQAUKZeHRw8L
   __init__.py: QmaEDrNJBeHCJpbdFckRUhLSBqCXQ6umdipTMpYhqSKxSG
-  behaviours.py: QmSEymQerdUYooELqC2NyXJFpXLpwBX49G1DjMzzMVa69s
-  dialogues.py: QmPoKjJbwVWFPiKuV4a3ZC21SNLsWZUMXAGFzJuVedgxZ4
-  handlers.py: QmZVuiu84WgGX3R438kuDVcNJZrahzWgLxsPAy34R6kc34
+  behaviours.py: QmX2CDEtaNMeP8iSRafRiYcso7rcEYgSZpn6UV3JgFbAio
+  dialogues.py: QmUmPdxtaXK783i63ZB2nvHctHg9sZqRVgP6P7rnsG2V9s
+  handlers.py: QmU3yFr2XiaBtYEZV6uh9LdjaDi52LHo8e9u5xKfpYUKiQ
   strategy.py: Qmb2T99WnQQa4qyZSdu31QyrbtHy8ZWC6Jhv9sVrTYrFxE
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/generic_seller/behaviours.py b/packages/fetchai/skills/generic_seller/behaviours.py
index c60d770500..ec68164ef7 100644
--- a/packages/fetchai/skills/generic_seller/behaviours.py
+++ b/packages/fetchai/skills/generic_seller/behaviours.py
@@ -22,7 +22,6 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_seller.dialogues import (
@@ -31,7 +30,6 @@
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
-
 DEFAULT_SERVICES_INTERVAL = 60.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/generic_seller/dialogues.py b/packages/fetchai/skills/generic_seller/dialogues.py
index dbdff8f02d..4acb51bd2b 100644
--- a/packages/fetchai/skills/generic_seller/dialogues.py
+++ b/packages/fetchai/skills/generic_seller/dialogues.py
@@ -35,7 +35,6 @@
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/packages/fetchai/skills/generic_seller/handlers.py b/packages/fetchai/skills/generic_seller/handlers.py
index 1fe577cb7a..8f47a5ee73 100644
--- a/packages/fetchai/skills/generic_seller/handlers.py
+++ b/packages/fetchai/skills/generic_seller/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers of a generic seller AEA."""
 
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.crypto.ledger_apis import LedgerApis
@@ -27,7 +27,6 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml
index 5060c3d1e2..528326461c 100644
--- a/packages/fetchai/skills/generic_seller/skill.yaml
+++ b/packages/fetchai/skills/generic_seller/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPb5kHYZyhUN87EKmuahyGqDGgqVdGPyfC1KpGC3xfmcP
   __init__.py: QmbfkeFnZVKppLEHpBrTXUXBwg2dpPABJWSLND8Lf1cmpG
-  behaviours.py: QmdHumzBTxWg2PgWzwNVF4a5eG1dhGXzDwrY9eq4uevHqs
-  dialogues.py: QmRJCregJWVs8scTMjQptvztKa5NEHKUfeZECVxdU233C6
-  handlers.py: QmYyAYGiSMzUAq96LuFsVewYut9njvCR3NG9uEKonnwGf5
+  behaviours.py: QmdsS8wmLyxTZc4FdUri4ojRG1nMbasSHC4u6i1AfTQH1V
+  dialogues.py: QmZuFnZKndhsrUZrqjGpYHBzPFAZZbVdzGt6FLXvSi8AdS
+  handlers.py: QmXtsQEM8MoKL9jSTrARKnrFwDawFc6nQGK4Ba8VBN9S6i
   strategy.py: QmX1mp7eZkz1P6iVyoDCATZDKZRgwe1EgMVmAyvtGDHvm3
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/gym/dialogues.py b/packages/fetchai/skills/gym/dialogues.py
index b95b5d9fe8..0100e7bdff 100644
--- a/packages/fetchai/skills/gym/dialogues.py
+++ b/packages/fetchai/skills/gym/dialogues.py
@@ -31,8 +31,6 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
-
-
 from packages.fetchai.protocols.gym.dialogues import GymDialogue as BaseGymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 
diff --git a/packages/fetchai/skills/gym/handlers.py b/packages/fetchai/skills/gym/handlers.py
index 82c76d5be5..fe521f392e 100644
--- a/packages/fetchai/skills/gym/handlers.py
+++ b/packages/fetchai/skills/gym/handlers.py
@@ -24,7 +24,6 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.skills.gym.dialogues import (
     DefaultDialogues,
diff --git a/packages/fetchai/skills/gym/helpers.py b/packages/fetchai/skills/gym/helpers.py
index f32e80eb2a..b95a0ebb65 100644
--- a/packages/fetchai/skills/gym/helpers.py
+++ b/packages/fetchai/skills/gym/helpers.py
@@ -22,13 +22,12 @@
 
 from abc import ABC, abstractmethod
 from queue import Queue
-from typing import Any, Optional, Tuple, cast
+from typing import Any, cast, Optional, Tuple
 
 import gym
 
 from aea.protocols.base import Message
 from aea.skills.base import SkillContext
-
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.skills.gym.dialogues import GymDialogue, GymDialogues
 
diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml
index 016b84f3b4..c7889c40ab 100644
--- a/packages/fetchai/skills/gym/skill.yaml
+++ b/packages/fetchai/skills/gym/skill.yaml
@@ -8,11 +8,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUpD7PeLHS8nH7HJ48hBafSFhLn8Yrh571RCmxnStpNwq
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
-  dialogues.py: QmdGo2TGJTjRXhGngZPNCBvpNqwv3B581DFmaxEMDyswrd
-  handlers.py: QmagqBdQaGuGbVS5dFqxFtEww2e1YF2NprBNPtt5pVA2hZ
-  helpers.py: QmbRSMX7UCRAEotS4ocTEcZLo1qietAAU9K5zBtqY1nE82
+  dialogues.py: QmQik8PG4xfuvbDwxocfRHygLHDbHkeqxHEGToAM2EooQz
+  handlers.py: QmbqpPWc3N6MFSpJq2DaPcu78mJG3S9iJuJBuPproSnXHf
+  helpers.py: Qmc7pKqwSagUXCeT4cTP3Ed2Ji6Lc18Xa42Vs8XCGX6dcT
   rl_agent.py: QmUq3XY9Dd2XZBhNNK9J3S5937d3az4cwP1BmeieHSgJ3m
-  tasks.py: QmVf9K7zCkKYduTnS7nS3d8FvUbEVy7s7a26yaCC8Q3rgd
+  tasks.py: QmR4zfFktphJrF23feYbeYHczpBRsTAW8icoeTvG19SkjC
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/gym/tasks.py b/packages/fetchai/skills/gym/tasks.py
index 0972210c19..f7a725eedb 100644
--- a/packages/fetchai/skills/gym/tasks.py
+++ b/packages/fetchai/skills/gym/tasks.py
@@ -24,7 +24,6 @@
 
 from aea.skills.base import SkillContext
 from aea.skills.tasks import Task
-
 from packages.fetchai.skills.gym.helpers import ProxyEnv
 from packages.fetchai.skills.gym.rl_agent import DEFAULT_NB_STEPS, MyRLAgent, NB_GOODS
 
diff --git a/packages/fetchai/skills/http_echo/dialogues.py b/packages/fetchai/skills/http_echo/dialogues.py
index fc7a371532..055a035e58 100644
--- a/packages/fetchai/skills/http_echo/dialogues.py
+++ b/packages/fetchai/skills/http_echo/dialogues.py
@@ -31,8 +31,6 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
-
-
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 
diff --git a/packages/fetchai/skills/http_echo/handlers.py b/packages/fetchai/skills/http_echo/handlers.py
index f0dba0c4fc..a5e1ba1487 100644
--- a/packages/fetchai/skills/http_echo/handlers.py
+++ b/packages/fetchai/skills/http_echo/handlers.py
@@ -25,7 +25,6 @@
 from aea.protocols.base import Message
 from aea.protocols.default import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.skills.http_echo.dialogues import (
     DefaultDialogues,
diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml
index b2f4228f72..20dd372b38 100644
--- a/packages/fetchai/skills/http_echo/skill.yaml
+++ b/packages/fetchai/skills/http_echo/skill.yaml
@@ -9,8 +9,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmYMHPsBX3wTMZZP89aKa7FzDCqGyvvue54ZBN8NZt4mNt
   __init__.py: QmaKik9dXg6cajBPG9RTDr6BhVdWk8aoR8QDNfPQgiy1kv
-  dialogues.py: QmZVMQqP24xR4Hec2f79UMuuBWRkCL7TG3jw5yTkPRoRXT
-  handlers.py: QmdTuiao42XEvbp2wuqKP4U4noRqAVdec9rss51pswYCoe
+  dialogues.py: QmVXAbsx66KousdDsy8dH3LHS52SqZAFfP8a967yynbMxr
+  handlers.py: QmWRgGGnNyGSyYwdUB3u1k4zdygs196iYQ2sNjWHYt1qww
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/ml_data_provider/behaviours.py b/packages/fetchai/skills/ml_data_provider/behaviours.py
index 76a04e4899..0c086baff1 100644
--- a/packages/fetchai/skills/ml_data_provider/behaviours.py
+++ b/packages/fetchai/skills/ml_data_provider/behaviours.py
@@ -23,5 +23,4 @@
     GenericServiceRegistrationBehaviour,
 )
 
-
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/ml_data_provider/dialogues.py b/packages/fetchai/skills/ml_data_provider/dialogues.py
index e175dac3b9..30ee046b0f 100644
--- a/packages/fetchai/skills/ml_data_provider/dialogues.py
+++ b/packages/fetchai/skills/ml_data_provider/dialogues.py
@@ -33,7 +33,6 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.ledger_api.dialogues import (
     LedgerApiDialogue as BaseLedgerApiDialogue,
 )
diff --git a/packages/fetchai/skills/ml_data_provider/handlers.py b/packages/fetchai/skills/ml_data_provider/handlers.py
index 0c06eeaa7e..02359293ce 100644
--- a/packages/fetchai/skills/ml_data_provider/handlers.py
+++ b/packages/fetchai/skills/ml_data_provider/handlers.py
@@ -20,13 +20,12 @@
 """This module contains the handler for the 'ml_data_provider' skill."""
 
 import pickle  # nosec
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/ml_data_provider/skill.yaml b/packages/fetchai/skills/ml_data_provider/skill.yaml
index 9d26be6227..e94c28834e 100644
--- a/packages/fetchai/skills/ml_data_provider/skill.yaml
+++ b/packages/fetchai/skills/ml_data_provider/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmakpsKWJrGRsoFaKR1Gf94KqcuPrkdXTYyciq5d4EhoFF
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
-  behaviours.py: QmWgXU9qgahXwMKNqLLfDiGNYJozSXv2SVMkoPDQncC7ok
-  dialogues.py: QmdFsEXJdTiQo7GSS1U7n9ukd79ZEDVki3ifeYeGsowv2G
-  handlers.py: QmbmS4C1GdumnVkA5dc7czWRkjb9HGzY7YeATrnuMVU2X9
-  strategy.py: QmdPfmAJ9u6VWjvR2x4FBkCyVJ3g3YYSCgwREjC35yvAbL
+  behaviours.py: QmWC4PEwWEyqcEJ9rTFjL9YpZ1pgkSpY9f4pE9mQHviSLz
+  dialogues.py: QmRsg5xMC3QqHK2p2ULDkdcUECiX3YLPwbqfXdWZ3PewhD
+  handlers.py: QmXk3mCd2uB6mg2aT74jTSLkktY3FntL5cMs5yQ7Mi8uAF
+  strategy.py: QmUsa36TcE6DXjdDDz1u1tAPVPHaJyMnVCTxudJhVCyA3e
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/ml_data_provider/strategy.py b/packages/fetchai/skills/ml_data_provider/strategy.py
index df48d99a9f..04cd032521 100644
--- a/packages/fetchai/skills/ml_data_provider/strategy.py
+++ b/packages/fetchai/skills/ml_data_provider/strategy.py
@@ -20,7 +20,6 @@
 """This module contains the strategy class."""
 
 import numpy as np
-
 from tensorflow import keras
 
 from aea.configurations.constants import DEFAULT_LEDGER
diff --git a/packages/fetchai/skills/ml_train/behaviours.py b/packages/fetchai/skills/ml_train/behaviours.py
index 875e5c4090..90540c71f5 100644
--- a/packages/fetchai/skills/ml_train/behaviours.py
+++ b/packages/fetchai/skills/ml_train/behaviours.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
-
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/ml_train/dialogues.py b/packages/fetchai/skills/ml_train/dialogues.py
index 168987bee9..b26923a1ba 100644
--- a/packages/fetchai/skills/ml_train/dialogues.py
+++ b/packages/fetchai/skills/ml_train/dialogues.py
@@ -41,8 +41,6 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
-
 from packages.fetchai.protocols.ledger_api.dialogues import (
     LedgerApiDialogue as BaseLedgerApiDialogue,
 )
diff --git a/packages/fetchai/skills/ml_train/handlers.py b/packages/fetchai/skills/ml_train/handlers.py
index 2b94f46624..fd7a0d16c9 100644
--- a/packages/fetchai/skills/ml_train/handlers.py
+++ b/packages/fetchai/skills/ml_train/handlers.py
@@ -21,7 +21,7 @@
 
 import pickle  # nosec
 import uuid
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.helpers.transaction.base import Terms
@@ -29,7 +29,6 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
@@ -46,7 +45,6 @@
 )
 from packages.fetchai.skills.ml_train.strategy import Strategy
 
-
 DUMMY_DIGEST = "dummy_digest"
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index 1379ad8436..5af8adcaa2 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -9,13 +9,13 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmeHcYRhDJi6gqAHpK29UJz3doiyaicoqeTrPddqM3gh64
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
-  behaviours.py: QmQiBzKV5rEFpMQbSjfjzAJ7SqwwGmso6TozWkjdytucLR
-  dialogues.py: QmccMjTxTrTaDyXFTTfAWHmA3xBiPCmKwBfiDSCW428Xie
-  handlers.py: QmSZR738THX7bCaXkuuoPDgwF3fo6DSD3hDt7EY2pRGxBm
+  behaviours.py: QmbJtAxgudXA35gERW14gMnCA9q79iRNQmKfgTTY9e2Bif
+  dialogues.py: Qma7uAuHWEdohLKMxGXHk34tRqXaS3FjFpyWCxpWtwRwEK
+  handlers.py: QmY2rbcg4agZYuTX5zfLEnpSFAfqqWHsW1hFFw4o58xk5A
   ml_model.py: QmXp667GwVRrGsLxtqricnnyrBUUDn6efem22UCBd2g1y8
   model.json: QmdV2tGrRY6VQ5VLgUa4yqAhPDG6X8tYsWecypq8nox9Td
   strategy.py: QmY8z1DW6PqQuiEpgXAhwasSk1CgvvTNZQH1LtExupif9g
-  tasks.py: QmTb7kCt2UheQ8kwPewkzgfX8m2DF4KtnYCugWdmERJnTU
+  tasks.py: QmahJRCf6V61FsqrKgMMUyJ8F7PRd6C2bjunZg2XtM9fpF
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/ml_train/tasks.py b/packages/fetchai/skills/ml_train/tasks.py
index 72468c0f39..c285a4b68b 100644
--- a/packages/fetchai/skills/ml_train/tasks.py
+++ b/packages/fetchai/skills/ml_train/tasks.py
@@ -22,7 +22,6 @@
 from typing import Tuple
 
 import numpy as np
-
 from tensorflow import keras
 
 from aea.skills.base import SkillContext
diff --git a/packages/fetchai/skills/simple_service_registration/behaviours.py b/packages/fetchai/skills/simple_service_registration/behaviours.py
index d2fba8f27c..16e2d91eda 100644
--- a/packages/fetchai/skills/simple_service_registration/behaviours.py
+++ b/packages/fetchai/skills/simple_service_registration/behaviours.py
@@ -22,7 +22,6 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.simple_service_registration.dialogues import (
     OefSearchDialogues,
diff --git a/packages/fetchai/skills/simple_service_registration/dialogues.py b/packages/fetchai/skills/simple_service_registration/dialogues.py
index 9b1b4b03d3..75541e3ff0 100644
--- a/packages/fetchai/skills/simple_service_registration/dialogues.py
+++ b/packages/fetchai/skills/simple_service_registration/dialogues.py
@@ -27,7 +27,6 @@
 from aea.protocols.base import Address, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
 )
@@ -35,7 +34,6 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
-
 OefSearchDialogue = BaseOefSearchDialogue
 
 
diff --git a/packages/fetchai/skills/simple_service_registration/handlers.py b/packages/fetchai/skills/simple_service_registration/handlers.py
index 3826e190f2..83dcbdd9be 100644
--- a/packages/fetchai/skills/simple_service_registration/handlers.py
+++ b/packages/fetchai/skills/simple_service_registration/handlers.py
@@ -19,12 +19,11 @@
 
 """This package contains the handlers of a generic seller AEA."""
 
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.simple_service_registration.dialogues import (
     OefSearchDialogue,
diff --git a/packages/fetchai/skills/simple_service_registration/skill.yaml b/packages/fetchai/skills/simple_service_registration/skill.yaml
index da13bda8c9..770186f6c6 100644
--- a/packages/fetchai/skills/simple_service_registration/skill.yaml
+++ b/packages/fetchai/skills/simple_service_registration/skill.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPuD9EtLKV143FbAaGUht5ZVtemVWXnm1jYmQxyUNnZ9T
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: Qmcz55RRytuCEZTkAU5PxX4jjaPxkp3f747ivJcceH78b4
-  dialogues.py: QmX8L6qMd4X6LHLyPmiXaQL2LA5Ca9Q6B77qYdfvfJ3aen
-  handlers.py: QmcFWEWmjDFxiksQiwWSUJ3mzJhVRXt9EmrD6PTHCmUX5G
+  behaviours.py: QmREzo2bxMA9h84utHze1BFptT2MgiSMkfiSydbynthRna
+  dialogues.py: QmRMZk46s3AJ9KUbgP4fMP39qGX1YPsvJAJqmaFanMtZiV
+  handlers.py: QmTg94BbYLoAe3PUu7ZynGKe1MSw8bBCVr6PKGekjJBiQg
   strategy.py: QmNTZ6XXAv6nvJs7B1p5mt7bVdH4pb3motxADDrxCpbmWF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/tac_control/behaviours.py b/packages/fetchai/skills/tac_control/behaviours.py
index 50df1bcc61..fe8cd33e43 100644
--- a/packages/fetchai/skills/tac_control/behaviours.py
+++ b/packages/fetchai/skills/tac_control/behaviours.py
@@ -20,11 +20,10 @@
 """This package contains a the behaviours."""
 
 import datetime
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.helpers.search.models import Description
 from aea.skills.base import Behaviour
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control.dialogues import (
diff --git a/packages/fetchai/skills/tac_control/dialogues.py b/packages/fetchai/skills/tac_control/dialogues.py
index dc1f522c68..3c831c3726 100644
--- a/packages/fetchai/skills/tac_control/dialogues.py
+++ b/packages/fetchai/skills/tac_control/dialogues.py
@@ -33,7 +33,6 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
 )
@@ -43,7 +42,6 @@
 from packages.fetchai.protocols.tac.dialogues import TacDialogue as BaseTacDialogue
 from packages.fetchai.protocols.tac.dialogues import TacDialogues as BaseTacDialogues
 
-
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 99cd613e18..55335b6ab8 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -23,7 +23,7 @@
 import datetime
 import pprint
 from enum import Enum
-from typing import Dict, List, Optional, cast
+from typing import cast, Dict, List, Optional
 
 from aea.common import Address
 from aea.crypto.ledger_apis import LedgerApis
@@ -40,7 +40,6 @@
 from aea.helpers.search.models import Description
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control.helpers import (
     determine_scaling_factor,
diff --git a/packages/fetchai/skills/tac_control/handlers.py b/packages/fetchai/skills/tac_control/handlers.py
index 8dd75f55a5..382f3941b8 100644
--- a/packages/fetchai/skills/tac_control/handlers.py
+++ b/packages/fetchai/skills/tac_control/handlers.py
@@ -19,12 +19,11 @@
 
 """This package contains the handlers."""
 
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control.dialogues import (
diff --git a/packages/fetchai/skills/tac_control/helpers.py b/packages/fetchai/skills/tac_control/helpers.py
index fbe56fa922..a214c7f16d 100644
--- a/packages/fetchai/skills/tac_control/helpers.py
+++ b/packages/fetchai/skills/tac_control/helpers.py
@@ -22,7 +22,7 @@
 
 import math
 import random
-from typing import Dict, List, Tuple, cast
+from typing import cast, Dict, List, Tuple
 
 import numpy as np
 
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 8417c0f319..1876fe4347 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -9,11 +9,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdWECpRXZXH5JPV6wVHqeUtvjBhieUFTEoT2e7EY16N8M
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
-  behaviours.py: QmTVCXtTpH1A55vWnynz1PjM4VCrQ6EDy5XfcJpT93doEq
-  dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
-  game.py: QmeAmG3LH1xBFRvUATrWY7spSDmjNeXVD4ZNYrt1BRY3jB
-  handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
-  helpers.py: QmdG31YUJakBz8FdNNxU6RxqhWy9iv1BG253PzfxBhzqq2
+  behaviours.py: QmPMdhZh9Uzx5zy7qxQGqFanaC9h8SwNRkW94r8fD3DECG
+  dialogues.py: QmVSNY2MaKJ1JKfbt39qJ2CJz1dMhPNFefS6Nn2Ld2WqNA
+  game.py: QmRrKBB2ithuHbytNWZiW9gq9TA9xkjN7bdFwpd9pZS7Pa
+  handlers.py: QmfQBa9NLVkcAUhQaY8grMB7yiAARgjoADP7pjVaegcBtt
+  helpers.py: QmZyaDLh8rAZ7LTbGCRgnQ8zMA4cqzCQjweBwd9MWL7t2t
   parameters.py: QmQB95beEKzyA8Aa7Y9HTPw6BPEVi6BGkpsUqN4QZ4DcVG
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 28562d5ae1..cd9d91cb0c 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -20,13 +20,12 @@
 """This package contains the behaviours."""
 
 import datetime
-from typing import List, Optional, cast
+from typing import cast, List, Optional
 
 from aea.crypto.base import LedgerApi
 from aea.helpers.search.models import Attribute, DataModel, Description
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.behaviours import SimpleBehaviour, TickerBehaviour
-
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
diff --git a/packages/fetchai/skills/tac_control_contract/game.py b/packages/fetchai/skills/tac_control_contract/game.py
index 5120453dc0..737e710999 100644
--- a/packages/fetchai/skills/tac_control_contract/game.py
+++ b/packages/fetchai/skills/tac_control_contract/game.py
@@ -23,7 +23,7 @@
 import datetime
 import pprint
 from enum import Enum
-from typing import Dict, List, Optional, cast
+from typing import cast, Dict, List, Optional
 
 from aea.common import Address
 from aea.exceptions import AEAEnforceError, enforce
@@ -33,7 +33,6 @@
 )
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control_contract.helpers import (
     determine_scaling_factor,
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index 0445ede7c1..ca8f0f7a12 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -24,7 +24,6 @@
 from aea.protocols.base import Message
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control_contract.game import Game, Phase
diff --git a/packages/fetchai/skills/tac_control_contract/helpers.py b/packages/fetchai/skills/tac_control_contract/helpers.py
index 6441d00f9f..8fa7c3720b 100644
--- a/packages/fetchai/skills/tac_control_contract/helpers.py
+++ b/packages/fetchai/skills/tac_control_contract/helpers.py
@@ -21,12 +21,11 @@
 """This module contains the helpers methods for the controller agent."""
 
 import random
-from typing import Dict, List, Tuple, cast
+from typing import cast, Dict, List, Tuple
 
 import numpy as np
 
 from aea.exceptions import enforce
-
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 
 QUANTITY_SHIFT = 1  # Any non-negative integer is fine.
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 42af59473b..34978934be 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmV6mToyVnQL9squVJntDPrHvtxFk7sfEYJ61Fyoiy9wsE
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmcLSggJr1XpiDEwefCGGpfwUp282J4i97ziCNFH7X1M9C
-  game.py: Qmdz91tAYzEFDsvN4hNBawK7D7beTfocps1hpQc3RgavUK
-  handlers.py: QmWyibFRxcunBLqb7FJEkx9RpS6fNZpAvNDkG6cCfK7mQd
-  helpers.py: QmQ36tdx5itzz189tUgmyR74Q63vSRUcPTsg9qEwBUYdNU
+  behaviours.py: QmPNHEtFZ98SkPYGs6LbX5VwKM2xoAoZ6CLbopmTidYuJk
+  game.py: QmcY99fhKGAQZqDdic3iATmWEM6oMSwpHdH5MeBFmXiX9u
+  handlers.py: QmR2kWAiBB99TrJxpue4JpC8J8aewadg5FSMa6V2YS28Ws
+  helpers.py: QmS2zGCt2afonTTpNCPm2R74uUS834bpHFUnXFFnuZ1i8C
   parameters.py: QmRU9gxsWcxy25g69jbrKve2f8kFxNBjFfRjPZNKsYoYCP
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/tac_negotiation/behaviours.py b/packages/fetchai/skills/tac_negotiation/behaviours.py
index 536ad27706..59b593a2bc 100644
--- a/packages/fetchai/skills/tac_negotiation/behaviours.py
+++ b/packages/fetchai/skills/tac_negotiation/behaviours.py
@@ -23,7 +23,6 @@
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.tac_negotiation.dialogues import (
     OefSearchDialogue,
diff --git a/packages/fetchai/skills/tac_negotiation/dialogues.py b/packages/fetchai/skills/tac_negotiation/dialogues.py
index 493185e91d..514e81d095 100644
--- a/packages/fetchai/skills/tac_negotiation/dialogues.py
+++ b/packages/fetchai/skills/tac_negotiation/dialogues.py
@@ -23,7 +23,7 @@
 - Dialogues: The dialogues class keeps track of all dialogues.
 """
 
-from typing import Optional, Type, cast
+from typing import cast, Optional, Type
 
 from aea.common import Address
 from aea.exceptions import enforce
@@ -35,7 +35,6 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
@@ -51,7 +50,6 @@
     SUPPLY_DATAMODEL_NAME,
 )
 
-
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/tac_negotiation/handlers.py b/packages/fetchai/skills/tac_negotiation/handlers.py
index 016d018775..392518aef9 100644
--- a/packages/fetchai/skills/tac_negotiation/handlers.py
+++ b/packages/fetchai/skills/tac_negotiation/handlers.py
@@ -21,7 +21,7 @@
 
 import pprint
 import time
-from typing import Optional, Tuple, cast
+from typing import cast, Optional, Tuple
 
 from aea.configurations.base import ProtocolId
 from aea.helpers.search.models import Query
@@ -29,7 +29,6 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.tac_negotiation.dialogues import (
diff --git a/packages/fetchai/skills/tac_negotiation/helpers.py b/packages/fetchai/skills/tac_negotiation/helpers.py
index 9e965f377f..a12267b109 100644
--- a/packages/fetchai/skills/tac_negotiation/helpers.py
+++ b/packages/fetchai/skills/tac_negotiation/helpers.py
@@ -20,7 +20,7 @@
 """This class contains the helpers for FIPA negotiation."""
 
 import copy
-from typing import Dict, List, Union, cast
+from typing import cast, Dict, List, Union
 
 from aea.helpers.search.models import (
     Attribute,
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index 455aee1dfd..f8cb6f1d92 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -9,12 +9,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZucue4N3TX7BPe9CDZybfMQc1zpYbRKEVXAUGYRpcUfD
   __init__.py: QmcgZLvHebdfocqBmbu6gJp35khs6nbdbC649jzUyS86wy
-  behaviours.py: QmUm9C86crCZpXkHGCaPKeMfuMnP8BjMzSsjrUGkysmg9T
-  dialogues.py: QmdPAjBTpgrW9qP8SnAjKHWxBQRiGUqmgiiXMdrPKAJUKj
-  handlers.py: QmeSaLfQV3rzHuHPhzsBps9z4AbX1MNevTs2YTjnZaWuEA
-  helpers.py: QmfRnfpeCtHMEXSH3q3ofWhoSc7pbpRrSFSBVStUK3JWt3
-  strategy.py: QmYcwqZ9ejjK2zxN8nKoc3kvBoGamTxwGQqXJrWV5s8STx
-  transactions.py: Qmc9Re92RLFkfds1NspTRym1wn7XPGSNDRFGtaG6Hrix4E
+  behaviours.py: QmPnCqPr6c3vqCt2x5rZ9tHZ9hD8mGA4F2fNDTXo1fxfmR
+  dialogues.py: QmaqBNTf4pMscFp7VRG7s4Ca7TjFQCBcnRD3WLkEJRX4Ah
+  handlers.py: QmeCNBScErhiWXH7zubEDf7RRWcAZH9NJH1jRxwHjtCqXr
+  helpers.py: QmTQBUUNbubMc7NkYkVtePL6WCQsGdvmqPFUeSxf2VLAqN
+  strategy.py: QmYrM2HoKVQXWpjYxtWeZZxjCjiingJ6PJKkmegh3Eiwfg
+  transactions.py: QmUd1PzECqMtVNrhwDMGfLa7zAfnLhtQoNjugSYYfuSSTN
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_negotiation/strategy.py b/packages/fetchai/skills/tac_negotiation/strategy.py
index 23cadbaa3d..13313f9c47 100644
--- a/packages/fetchai/skills/tac_negotiation/strategy.py
+++ b/packages/fetchai/skills/tac_negotiation/strategy.py
@@ -22,7 +22,7 @@
 import copy
 import random
 from enum import Enum
-from typing import Dict, List, Optional, Tuple, cast
+from typing import cast, Dict, List, Optional, Tuple
 
 from aea.decision_maker.default import OwnershipState, Preferences
 from aea.helpers.search.generic import (
@@ -39,7 +39,6 @@
 )
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
 from packages.fetchai.skills.tac_negotiation.dialogues import FipaDialogue
 from packages.fetchai.skills.tac_negotiation.helpers import (
     build_goods_description,
@@ -47,7 +46,6 @@
 )
 from packages.fetchai.skills.tac_negotiation.transactions import Transactions
 
-
 ROUNDING_ADJUSTMENT = 1
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
 DEFAULT_SERVICE_KEY = "tac_service"
diff --git a/packages/fetchai/skills/tac_negotiation/transactions.py b/packages/fetchai/skills/tac_negotiation/transactions.py
index 1997572150..b2a6a0d6a7 100644
--- a/packages/fetchai/skills/tac_negotiation/transactions.py
+++ b/packages/fetchai/skills/tac_negotiation/transactions.py
@@ -22,7 +22,7 @@
 import copy
 import datetime
 from collections import defaultdict, deque
-from typing import Deque, Dict, List, Tuple, cast
+from typing import cast, Deque, Dict, List, Tuple
 
 from aea.common import Address
 from aea.decision_maker.default import OwnershipState
@@ -32,7 +32,6 @@
 from aea.protocols.dialogue.base import DialogueLabel
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
 from packages.fetchai.skills.tac_negotiation.dialogues import (
     FipaDialogue,
     SigningDialogue,
diff --git a/packages/fetchai/skills/tac_participation/behaviours.py b/packages/fetchai/skills/tac_participation/behaviours.py
index 018fe26085..1c7d907c7c 100644
--- a/packages/fetchai/skills/tac_participation/behaviours.py
+++ b/packages/fetchai/skills/tac_participation/behaviours.py
@@ -19,11 +19,10 @@
 
 """This package contains a tac search behaviour."""
 
-from typing import Any, Dict, cast
+from typing import Any, cast, Dict
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_participation.dialogues import OefSearchDialogues
diff --git a/packages/fetchai/skills/tac_participation/dialogues.py b/packages/fetchai/skills/tac_participation/dialogues.py
index bb05c4b233..3ecacbde03 100644
--- a/packages/fetchai/skills/tac_participation/dialogues.py
+++ b/packages/fetchai/skills/tac_participation/dialogues.py
@@ -37,7 +37,6 @@
     StateUpdateDialogues as BaseStateUpdateDialogues,
 )
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
 )
@@ -47,7 +46,6 @@
 from packages.fetchai.protocols.tac.dialogues import TacDialogue as BaseTacDialogue
 from packages.fetchai.protocols.tac.dialogues import TacDialogues as BaseTacDialogues
 
-
 OefSearchDialogue = BaseOefSearchDialogue
 
 
diff --git a/packages/fetchai/skills/tac_participation/game.py b/packages/fetchai/skills/tac_participation/game.py
index 534c2bd01a..4b96be9dad 100644
--- a/packages/fetchai/skills/tac_participation/game.py
+++ b/packages/fetchai/skills/tac_participation/game.py
@@ -25,7 +25,6 @@
 from aea.exceptions import AEAEnforceError, enforce
 from aea.helpers.search.models import Constraint, ConstraintType, Location, Query
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_participation.dialogues import (
     StateUpdateDialogue,
diff --git a/packages/fetchai/skills/tac_participation/handlers.py b/packages/fetchai/skills/tac_participation/handlers.py
index 4530402a6a..897b2725ed 100644
--- a/packages/fetchai/skills/tac_participation/handlers.py
+++ b/packages/fetchai/skills/tac_participation/handlers.py
@@ -19,13 +19,12 @@
 
 """This package contains the handlers."""
 
-from typing import Dict, Optional, Tuple, cast
+from typing import cast, Dict, Optional, Tuple
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.state_update.message import StateUpdateMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_participation.dialogues import (
diff --git a/packages/fetchai/skills/tac_participation/skill.yaml b/packages/fetchai/skills/tac_participation/skill.yaml
index ca4252c8f6..41e519c743 100644
--- a/packages/fetchai/skills/tac_participation/skill.yaml
+++ b/packages/fetchai/skills/tac_participation/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVNxdGy1pbosYrrvbXczbkJtU7f5ddrBPSNnFoJA9GJzg
   __init__.py: QmcVpVrbV54Aogmowu6AomDiVMrVMo9BUvwKt9V1bJpBwp
-  behaviours.py: QmX3UbuLohnPSLM2W6LrWcZyo4zXCr1YN5Bznu61v27SZC
-  dialogues.py: QmZrJ1d9mhtfkxRg5QfsKbbtVZFa6cKna4anRWHvzNTEdD
-  game.py: QmVGeCGEfwmzktSPQN4xWL5yxjHqNyenneQzeW2vfx4giv
-  handlers.py: QmSseAwQqHsSmj2eBPPnC9eygNSSwL1kheRVsgbLqyeDvV
+  behaviours.py: QmREapjgiTGH3JsTqeJbR2CcCjRa3jnRdeNVVNUaU8mhRX
+  dialogues.py: QmNZvomWQBx8p8Ftkgg55Pw44P8RedKTKtFULh9Qb8AJLY
+  game.py: QmUotRmam5EqL2YWAwPR9i1uWHNeBsphcDJwB59ZiLFKSw
+  handlers.py: QmZqqEiXBjs77DS7GnE8f7tSF9uDoVyVZ7HNMV1uW1wtDX
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/thermometer/behaviours.py b/packages/fetchai/skills/thermometer/behaviours.py
index 76a04e4899..0c086baff1 100644
--- a/packages/fetchai/skills/thermometer/behaviours.py
+++ b/packages/fetchai/skills/thermometer/behaviours.py
@@ -23,5 +23,4 @@
     GenericServiceRegistrationBehaviour,
 )
 
-
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/thermometer/dialogues.py b/packages/fetchai/skills/thermometer/dialogues.py
index d493129414..aa3bde5528 100644
--- a/packages/fetchai/skills/thermometer/dialogues.py
+++ b/packages/fetchai/skills/thermometer/dialogues.py
@@ -39,7 +39,6 @@
     OefSearchDialogues as GenericOefSearchDialogues,
 )
 
-
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/thermometer/handlers.py b/packages/fetchai/skills/thermometer/handlers.py
index 3766f61003..1c9dec0554 100644
--- a/packages/fetchai/skills/thermometer/handlers.py
+++ b/packages/fetchai/skills/thermometer/handlers.py
@@ -25,7 +25,6 @@
     GenericOefSearchHandler,
 )
 
-
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/thermometer/skill.yaml b/packages/fetchai/skills/thermometer/skill.yaml
index 219f6095a3..a975946e98 100644
--- a/packages/fetchai/skills/thermometer/skill.yaml
+++ b/packages/fetchai/skills/thermometer/skill.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUH2RCKZZ3sKBptXtYZaFJTsJFyk5P1aeTNYYV1YPRNxP
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmWgXU9qgahXwMKNqLLfDiGNYJozSXv2SVMkoPDQncC7ok
-  dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
-  handlers.py: QmNujxh4FtecTar5coHTJyY3BnVnsseuARSpyTLUDmFmfX
+  behaviours.py: QmWC4PEwWEyqcEJ9rTFjL9YpZ1pgkSpY9f4pE9mQHviSLz
+  dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
+  handlers.py: QmeWzG6R8P7z98M2kfXKzmK5u9vT6ZAp2tG7NcXTwWFSaZ
   strategy.py: QmcFRUUhi6VubFw51rhkTH28QjQEV67kBFeTmAviroopmZ
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/thermometer_client/behaviours.py b/packages/fetchai/skills/thermometer_client/behaviours.py
index 3f2e38b180..deda9acdac 100644
--- a/packages/fetchai/skills/thermometer_client/behaviours.py
+++ b/packages/fetchai/skills/thermometer_client/behaviours.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
-
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/thermometer_client/handlers.py b/packages/fetchai/skills/thermometer_client/handlers.py
index 2f1e9cb165..ce8f9a83a0 100644
--- a/packages/fetchai/skills/thermometer_client/handlers.py
+++ b/packages/fetchai/skills/thermometer_client/handlers.py
@@ -26,7 +26,6 @@
     GenericSigningHandler,
 )
 
-
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/thermometer_client/skill.yaml b/packages/fetchai/skills/thermometer_client/skill.yaml
index 91ee45bf87..dd9d186bb6 100644
--- a/packages/fetchai/skills/thermometer_client/skill.yaml
+++ b/packages/fetchai/skills/thermometer_client/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSn1bh9J7RT241DGT4812rTNGe2S2YLpEvy8ApNqNNqjf
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmXw3wGKAqCT55MRX61g3eN1T2YVY4XC5z9b4Dg7x1Wihc
+  behaviours.py: QmW2VLVXoepN7V1u4rgARXjp9d9PpPfVgMz2KuNdR76aRg
   dialogues.py: QmcMynppu7B2nZR21LzxFQMpoRdegpWpwcXti2ba4Vcei5
-  handlers.py: QmYx8WzeR2aCg2b2uiR1K2NHLn8DKhzAahLXoFnrXyDoDz
-  strategy.py: QmZVALhDnpEdxLhk3HLAmTs3JdEr9tk1QTS33ZsVnxkLXZ
+  handlers.py: Qme3AaVj6UPLufnMFoXVQKZn5EbEa1JsUqUNHh7jrxKWBE
+  strategy.py: QmRSgvrswoay8vF6woRm97vYVK9ZAGk1Gh26EkD4fFmbjz
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/thermometer_client/strategy.py b/packages/fetchai/skills/thermometer_client/strategy.py
index 4b755b9173..9748064074 100644
--- a/packages/fetchai/skills/thermometer_client/strategy.py
+++ b/packages/fetchai/skills/thermometer_client/strategy.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
-
 Strategy = GenericStrategy
diff --git a/packages/fetchai/skills/weather_client/behaviours.py b/packages/fetchai/skills/weather_client/behaviours.py
index 3f2e38b180..deda9acdac 100644
--- a/packages/fetchai/skills/weather_client/behaviours.py
+++ b/packages/fetchai/skills/weather_client/behaviours.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
-
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/weather_client/handlers.py b/packages/fetchai/skills/weather_client/handlers.py
index 2f1e9cb165..ce8f9a83a0 100644
--- a/packages/fetchai/skills/weather_client/handlers.py
+++ b/packages/fetchai/skills/weather_client/handlers.py
@@ -26,7 +26,6 @@
     GenericSigningHandler,
 )
 
-
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/weather_client/skill.yaml b/packages/fetchai/skills/weather_client/skill.yaml
index c897a88117..a2bf4ab038 100644
--- a/packages/fetchai/skills/weather_client/skill.yaml
+++ b/packages/fetchai/skills/weather_client/skill.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmP5vjtJk1TirWqzFcgvQYTZeZwaV3Qs5HKVW1WNWgMTPM
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmXw3wGKAqCT55MRX61g3eN1T2YVY4XC5z9b4Dg7x1Wihc
+  behaviours.py: QmW2VLVXoepN7V1u4rgARXjp9d9PpPfVgMz2KuNdR76aRg
   dialogues.py: QmcMynppu7B2nZR21LzxFQMpoRdegpWpwcXti2ba4Vcei5
-  handlers.py: QmYx8WzeR2aCg2b2uiR1K2NHLn8DKhzAahLXoFnrXyDoDz
-  strategy.py: QmZVALhDnpEdxLhk3HLAmTs3JdEr9tk1QTS33ZsVnxkLXZ
+  handlers.py: Qme3AaVj6UPLufnMFoXVQKZn5EbEa1JsUqUNHh7jrxKWBE
+  strategy.py: QmRSgvrswoay8vF6woRm97vYVK9ZAGk1Gh26EkD4fFmbjz
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/weather_client/strategy.py b/packages/fetchai/skills/weather_client/strategy.py
index 4b755b9173..9748064074 100644
--- a/packages/fetchai/skills/weather_client/strategy.py
+++ b/packages/fetchai/skills/weather_client/strategy.py
@@ -21,5 +21,4 @@
 
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
-
 Strategy = GenericStrategy
diff --git a/packages/fetchai/skills/weather_station/behaviours.py b/packages/fetchai/skills/weather_station/behaviours.py
index 3218eb045c..93d026803e 100644
--- a/packages/fetchai/skills/weather_station/behaviours.py
+++ b/packages/fetchai/skills/weather_station/behaviours.py
@@ -24,5 +24,4 @@
     GenericServiceRegistrationBehaviour,
 )
 
-
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/weather_station/db_communication.py b/packages/fetchai/skills/weather_station/db_communication.py
index 9cd37018b3..e601c7e380 100644
--- a/packages/fetchai/skills/weather_station/db_communication.py
+++ b/packages/fetchai/skills/weather_station/db_communication.py
@@ -22,7 +22,7 @@
 import datetime
 import os.path
 import sqlite3
-from typing import Dict, cast
+from typing import cast, Dict
 
 my_path = os.path.dirname(__file__)
 
diff --git a/packages/fetchai/skills/weather_station/dialogues.py b/packages/fetchai/skills/weather_station/dialogues.py
index d493129414..aa3bde5528 100644
--- a/packages/fetchai/skills/weather_station/dialogues.py
+++ b/packages/fetchai/skills/weather_station/dialogues.py
@@ -39,7 +39,6 @@
     OefSearchDialogues as GenericOefSearchDialogues,
 )
 
-
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/weather_station/handlers.py b/packages/fetchai/skills/weather_station/handlers.py
index 3766f61003..1c9dec0554 100644
--- a/packages/fetchai/skills/weather_station/handlers.py
+++ b/packages/fetchai/skills/weather_station/handlers.py
@@ -25,7 +25,6 @@
     GenericOefSearchHandler,
 )
 
-
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/weather_station/skill.yaml b/packages/fetchai/skills/weather_station/skill.yaml
index 44781300c7..fb62e1bba9 100644
--- a/packages/fetchai/skills/weather_station/skill.yaml
+++ b/packages/fetchai/skills/weather_station/skill.yaml
@@ -9,11 +9,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: Qma72715sXAgDLggNNVkXQoVxCu9hyEEFKbyWTKSavEF2v
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmfPE6zrMmY2QARQt3gNZ2oiV3uAqvAQXSvU3XWnFDUQkG
-  db_communication.py: QmPHjQJvYp96TRUWxTRW9TE9BHATNuUyMw3wy5oQSftnug
-  dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
+  behaviours.py: QmWRboujPwBEJNHqXJcyNbbVvdGiJ2mabvjXS6td3YDb2Q
+  db_communication.py: QmNWfTjZirbmCnx5K75fZLA19gsunt34aicvZniLCmZKxB
+  dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
   dummy_weather_station_data.py: QmeSSsAiCKBfMHfUN4QvoKBTQRNCcGxeJicThkDTGRQE7i
-  handlers.py: QmNujxh4FtecTar5coHTJyY3BnVnsseuARSpyTLUDmFmfX
+  handlers.py: QmeWzG6R8P7z98M2kfXKzmK5u9vT6ZAp2tG7NcXTwWFSaZ
   strategy.py: QmWZiiNXeXGiduzro1bWdTr6ZLjL45TtvxFtY1dUQNWfYZ
 fingerprint_ignore_patterns:
 - '*.db'
diff --git a/packages/hashes.csv b/packages/hashes.csv
index affbbbc4be..f487ca55cb 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -18,55 +18,55 @@ fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
 fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
 fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
 fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
-fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
-fetchai/connections/http_client,QmfSuWhrseBCVcmzwKmqFDC6qX3ryFzfx2uuUTb8HPGuEd
-fetchai/connections/http_server,QmU2XNsgEV7zGEgiu4PD2mjXP3fA6Fa7ivrcd7dUzC6PKc
-fetchai/connections/ledger,QmR77FXChjMt1K9QahWhuXHqiUwYjCxyiT2XZVtucv67Za
-fetchai/connections/local,QmWZPDvqjZjzNDUX4ivHF3kGvkNCUYM449RqNEyyoexFix
-fetchai/connections/oef,QmWpjFr7im4afmsdtmBSYJp2tRzVpeZdYpRvsDYq6q3kg7
-fetchai/connections/p2p_libp2p,QmVXSnhCn37mgacK7iG1HENbEkSvSZMMaf9RTFCUUDa2C9
-fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4bW222
-fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
+fetchai/connections/gym,QmRjx3wvjadxBqZKptWHwTBwkAQBcPeq89g2ikEq7ozmDX
+fetchai/connections/http_client,QmajyVnAQoG58R5HiWfFdBfvLwmGaXKGinH7r1NYjfCDWJ
+fetchai/connections/http_server,QmXi4BRRxsCf817q72d9QpfwmcdfnHwxKttFF8zH6uWhr5
+fetchai/connections/ledger,QmZmv1G5NK3MYnA4z4JU66f8Yn1c7UAA92UdJet5a7UcjF
+fetchai/connections/local,QmcPGZtD76x3RdsJZmUpSzgU7Nvy9hMvFH9GY3hqAVP4Ci
+fetchai/connections/oef,Qmbu8UptZnquusUSYA3Yqo1zuvtNsYNEZte7gHNLr5JVoa
+fetchai/connections/p2p_libp2p,QmQCf8etp59MDck1ZmciGGQvhP2SkfceNYoHZBcs7KrBgB
+fetchai/connections/p2p_libp2p_client,Qmc4LTENH1b6MoeVN7UAKtxe3UU8Y5Pj5G9ojdZsbQTvVL
+fetchai/connections/p2p_stub,QmNNstioPgSoQJbvf5NkPNViZE9udnnN6GRxWdLVxrKBA7
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmQWyjmHg6HWsLEuighe2vrWQSKBZAXvoXSXF33XhaVyE8
-fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
-fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
-fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
-fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
+fetchai/connections/soef,QmbEnyTJoZWDkwQNV2XJw8v6z6fz3gvuyxxay7YJhoHAxE
+fetchai/connections/stub,QmU1fuqRkzBufaHTB9qY7GSUkkh4Wq1M6ru6FQKnrcEoUZ
+fetchai/connections/tcp,QmS9dWyHZUY4pZEzMVJ3mZs42fBkAQFtLxWq3VXkzbueLY
+fetchai/connections/webhook,QmVMNFuX88Fj68hm2WhwfuhPLi1TMnLYNA31asN6HLCW3g
+fetchai/contracts/erc1155,Qmf7sDBb6kf3ru18NHjC7irB31vFDEJe8D8UtqYRN3cYrw
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,QmaxhJetT4GQ1A2ctbxxWQLvLny6LZykFnXEt2yDVb4sKJ
-fetchai/protocols/default,QmXAdTynqPF8kYFsRZzxigVh3LYZJ8FSGEPEmNPDLoyHmM
-fetchai/protocols/fipa,Qmb3GXxbEQ23sZ1d7HsmrvchLwPfsEcDAbpLLjRTYxdJDm
-fetchai/protocols/gym,Qmaj7TByBrHvbecUzWmuy96t7W8iocsD3gKunWZZSLTF5b
-fetchai/protocols/http,QmZJVqY2cxjky6p3o76TUemSsFDws8Dx33voG9WMdrKcry
-fetchai/protocols/ledger_api,Qmak3uKpeSfT5f4oqes3oUcNSg7vy7WKE2tUmSu8CZUNJ5
-fetchai/protocols/ml_trade,QmNVZvbcgERSypYUopKMHvd6F8B81rQqtLVqUvzMeEEwJN
-fetchai/protocols/oef_search,QmYjitTtVuVynTWv4TE34Wm2b37LAfyKgZEaiMfZv1jH3Z
-fetchai/protocols/scaffold,QmZhHsoA7JzNSoSUABFWqyRELaei4BtKYce1QKVcHhnQJN
-fetchai/protocols/signing,QmPhHfj2N2iCRTMEDYiifC3AkytZRFpVMoH7g63NwGcKwH
-fetchai/protocols/state_update,QmQmQt1VHwxmnNmwxKcrF4Qno6iHzVhhnUUjsqPtpfpQUV
-fetchai/protocols/tac,QmSn9DVVZUroa5dsjqMwiVBFmpLjyGuox8nt2FhhTs2KM6
-fetchai/skills/aries_alice,QmXp6W2vFmQgYCchQwLa3yDUwWw7hjeC8WnuPmtrXebZnq
-fetchai/skills/aries_faber,QmZFcjJddJM3mJyVDPu8xfcmUi4TgHgTB92A8SSPr9eD2X
-fetchai/skills/carpark_client,QmV3vHmx4sDaecBq56L6kMD2K6JorNq4fTVC2X2NqqdUFP
-fetchai/skills/carpark_detection,QmSMoWJggZdTF3p4Y7CRUj94U9fny9tbPqJg5dZSDzUCFp
-fetchai/skills/echo,QmVRzFQnq22j7tcWK6MiD9q8Vs6mAAJhY3FrRE4CfJQ1D2
-fetchai/skills/erc1155_client,Qma5wTx1huj5DAcsBkRwCvZVczRREwyUawVJhyaC4UTrRE
-fetchai/skills/erc1155_deploy,QmPPHF6PUzRbeRCwy4m73oykUbTcNb1cGSoco5tSjcpVoB
+fetchai/protocols/contract_api,Qme5e9KAzdcKhzzLWzFFqzbYB1EebghS4BY3gtPvPhqHVd
+fetchai/protocols/default,QmPo3UzUagCMq4xvWjcECDWdYqur9uzabsug1WRsaAmKFR
+fetchai/protocols/fipa,QmbtJuAbuKVuYuXXW7v9VGiK2StSQEVBzLZjSQBftdkgzg
+fetchai/protocols/gym,QmXHiPkic2umXCYo5479rQNndSgYSA5xbxZhYugv1D8vC7
+fetchai/protocols/http,Qmbb7kpNdXtRAxnuqh6GULxpb9c3Pu6YckPRVERgSAL4aW
+fetchai/protocols/ledger_api,QmYnU11zKVE9LzEVS9H6Tst7cqcuwZDKpgNSAeG26o7ggU
+fetchai/protocols/ml_trade,QmShijhkQYbzabZWNUenabn2tqsu3cRFGx42dHReKdn3mA
+fetchai/protocols/oef_search,QmQarQdcwwtAo382A4xQKxvExZuUiHnFzrREHT4ZoVGoyv
+fetchai/protocols/scaffold,QmXJb2kxe228AqQ2iHRiKJnhhKsC9zU8pqNdojLNXqjUvz
+fetchai/protocols/signing,QmWm7ThNZFND7ZuWQ7CLkJN6vGjAxauiF7LBLxBTKKstJZ
+fetchai/protocols/state_update,QmciKjpSjjd1E34iT8xT2XznCqChU4s6NnCqHfpNALftRQ
+fetchai/protocols/tac,QmeyUr7iHGb1mHrM8qiR5uJqHbVpPTP4ryT2ww5piCH8HD
+fetchai/skills/aries_alice,QmTLZP3j8xdqWnxCAbWEehZXh4ksPztJYtktb8a6SNA1vj
+fetchai/skills/aries_faber,QmfN448ztvQgLN9FTK3pHaRs8nZNCC5pdar5Tut5BCydio
+fetchai/skills/carpark_client,QmPYHXP1TvNihMa6WFSLP1NhiFDKTiArZbStQ6v54ySa8j
+fetchai/skills/carpark_detection,QmetEJmLHLWCPRyYByvrJ48fjM42sg91fqBfzZukmUth6b
+fetchai/skills/echo,QmPjabbvqPfabWhyE3vYCtTpPLJgYd4ZQBBsKsSJ5bLbeb
+fetchai/skills/erc1155_client,QmeQoL6WgcpMW8NUahWo8E4gcBP6iMoJqAisVNm7LLJZLv
+fetchai/skills/erc1155_deploy,QmTjV8pqyFSsj2Ci2tuJ5RmQz1CVFEQTs7kdPYdsiNXe2g
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
-fetchai/skills/generic_buyer,QmR2xrE8RJMmtHPRw8sjH1RxY459958MDZNkUur6cvgSsg
-fetchai/skills/generic_seller,QmQYVjJ1NnTTzLPxf2yXGkwHbCBADDJCUjCjBH2NpvG2pB
-fetchai/skills/gym,Qmc78RwfDZFyBxQBn6qyakD55dKEPwUERZ1hXpx9xyN6TW
-fetchai/skills/http_echo,QmZR1VgVb51R2PjuHtBTd8w2ye6rfnMbgi7GJ7BQhDXAPJ
-fetchai/skills/ml_data_provider,QmdgxfES4XpmREpp9QqPQRMH9TvTF9nZ21zKM5RHLGCLke
-fetchai/skills/ml_train,QmbRQZz1MPXXuWyNW3BqhcsZKtZPhYakxGkVrBswNTgfk9
+fetchai/skills/generic_buyer,QmP1iGjhcwor2k9dW6bfYY2xufitdUMBWDiSts4bMTL2u8
+fetchai/skills/generic_seller,QmT6sWte67JD5zkhvki1R6ZfynsvCNPwurbiXtrA6oNtDE
+fetchai/skills/gym,QmdSqhucusGCGzAwDqfRg6rVu86sGNiBTj1rueRbfTXUNU
+fetchai/skills/http_echo,QmXb9b5YTwxHavSjoGzCC4DaSSoZMsbYgFiuy2fqFQno5J
+fetchai/skills/ml_data_provider,QmWU6ZqncZTs6wSs43s1ji2F27VyvcGJXsq1N1W7BKPTUS
+fetchai/skills/ml_train,QmUkG9umsnwZKqbQVoKZLxbaFWyAUycMLyzsb8fzKFACzF
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
-fetchai/skills/simple_service_registration,QmeckN8mcKLeqmJoQfdYqPsJ49nbxxwBhYPhjkTS99v1De
-fetchai/skills/tac_control,QmYCCU6RsvwqmjTRM3Nx8H99HhJXEFuinJSeG3UcjDubYH
-fetchai/skills/tac_control_contract,QmNz5pNPvS7LBUMdjVPrRAFgJbaD2xTL1HJQnCoYK3Va4J
-fetchai/skills/tac_negotiation,QmRCZWxUh6mkaBsa1CYNk3fmNKzSVxfiqwYGbzU1E3672F
-fetchai/skills/tac_participation,QmWBATSrN9J3XoqMJ89iniMnMDZZpLqoenWTigukaDasQG
-fetchai/skills/thermometer,QmWSFjntE9MvLpqUTfJrx4FxnG7ZSGQifoTft9mJ9MiPYt
-fetchai/skills/thermometer_client,QmQidRBB71VaaDA9LfQodFmBTHmfFi9onG1afjPmADysEx
-fetchai/skills/weather_client,QmbsSVhqy6nNe637PKhaiNmUpbztsfxqyuNe6r94QXiKiU
-fetchai/skills/weather_station,QmSHssQvAEAKpogK4sFdAzGEhtvdxXi4orJY6PeNoMzouC
+fetchai/skills/simple_service_registration,QmbBSb9u5bCYf1aPEzD4oKJRKx8QD48Tf1SbzCmVmquB58
+fetchai/skills/tac_control,QmSJrPKJRwt98AuFJAP91e2JFkD4xqxCCo6jQvgse92ND9
+fetchai/skills/tac_control_contract,QmfFrPNaG3M1YKjFyEYESAAhuBW4yGT6W1Q5XVoX378h4c
+fetchai/skills/tac_negotiation,QmQWHy4RutKEQETsQZP3i3Xjz8D2XnSRdiaqexRNA7CSky
+fetchai/skills/tac_participation,QmbJqdFPbwFG6c7LUaXxzj9XUnhFd4QxUisJWHdodUyCh8
+fetchai/skills/thermometer,QmUEuRdsTw3iTzLRA4C6SiRGwEK6gauLP1Apk13fCQYtKw
+fetchai/skills/thermometer_client,QmdESHLrhNasaUKYpG2m5p6f61dxmqjVKGPiNdEUs5ZHnu
+fetchai/skills/weather_client,QmTa3Pxv8tD478xGA6DkNjQn8vxKwGfqLhLMbAC73fK6qo
+fetchai/skills/weather_station,QmSLdrYpe8yShYECQuFMWqycmihQVp8ZSfmCvCcCTtGRg7
diff --git a/scripts/acn/run_acn_node_standalone.py b/scripts/acn/run_acn_node_standalone.py
index 36b1493f16..a8bb034cdc 100644
--- a/scripts/acn/run_acn_node_standalone.py
+++ b/scripts/acn/run_acn_node_standalone.py
@@ -24,14 +24,12 @@
 from binascii import unhexlify
 from typing import Dict, List, Optional
 
-# following imports needed only if checks are enabled
-
 from base58 import b58decode
-
-from ecdsa import SigningKey, curves
-
+from ecdsa import curves, SigningKey
 from multihash import decode as multihashdecode  # type: ignore
 
+# following imports needed only if checks are enabled
+
 
 class AcnNodeConfig:
     """Store the configuration of an acn node as a dictionary."""
diff --git a/scripts/check_package_dependencies.py b/scripts/check_package_dependencies.py
index d89486ee92..25ce34d07a 100755
--- a/scripts/check_package_dependencies.py
+++ b/scripts/check_package_dependencies.py
@@ -34,10 +34,8 @@
 
 import yaml
 
-
 from aea.configurations.base import PackageId, PackageType, PublicId
 
-
 DEFAULT_CONFIG_FILE_PATHS = [
     Path("aea", "connections", "stub", "connection.yaml"),
     Path("aea", "protocols", "default", "protocol.yaml"),
diff --git a/scripts/check_package_versions_in_docs.py b/scripts/check_package_versions_in_docs.py
index 2c4ec9965b..2252870b35 100755
--- a/scripts/check_package_versions_in_docs.py
+++ b/scripts/check_package_versions_in_docs.py
@@ -33,10 +33,8 @@
 
 import yaml
 
-
 from aea.configurations.base import ComponentType, PackageId, PackageType, PublicId
 
-
 PUBLIC_ID_REGEX = PublicId.PUBLIC_ID_REGEX[1:-1]
 """This regex removes the '^' and '$' respectively, at the beginning and at the end."""
 
diff --git a/scripts/deploy_to_registry.py b/scripts/deploy_to_registry.py
index 34a2275451..b2e5ad866e 100644
--- a/scripts/deploy_to_registry.py
+++ b/scripts/deploy_to_registry.py
@@ -27,9 +27,8 @@
 from pathlib import Path
 from typing import Set
 
-from click.testing import CliRunner
-
 import yaml
+from click.testing import CliRunner
 
 from aea.cli import cli
 from aea.configurations.base import PackageId, PackageType, PublicId
diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py
index faa20c585f..9dffc61d01 100755
--- a/scripts/generate_ipfs_hashes.py
+++ b/scripts/generate_ipfs_hashes.py
@@ -38,13 +38,13 @@
 import time
 import traceback
 from pathlib import Path
-from typing import Collection, Dict, List, Optional, Tuple, Type, cast
+from typing import cast, Collection, Dict, List, Optional, Tuple, Type
 
 import ipfshttpclient
-
 import yaml
 
 from aea.configurations.base import (
+    _compute_fingerprint,
     AgentConfig,
     ConnectionConfig,
     ContractConfig,
@@ -52,7 +52,6 @@
     PackageType,
     ProtocolConfig,
     SkillConfig,
-    _compute_fingerprint,
 )
 from aea.helpers.base import yaml_dump, yaml_dump_all
 
diff --git a/scripts/oef/launch.py b/scripts/oef/launch.py
index 30e7d58c43..1c71a3be0c 100644
--- a/scripts/oef/launch.py
+++ b/scripts/oef/launch.py
@@ -19,11 +19,12 @@
 # ------------------------------------------------------------------------------
 
 from __future__ import print_function
+
+import argparse
 import json
+import os
 import subprocess  # nosec
-import argparse
 import sys
-import os
 
 
 def run(cmd):
diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index 58528e34e2..f4fbbd7478 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -37,16 +37,13 @@
 from pathlib import Path
 from typing import Dict, Optional, Set, Tuple
 
-from click.testing import CliRunner
-
 import semver
-
 import yaml
+from click.testing import CliRunner
 
 from aea.cli import cli
 from aea.configurations.base import PackageId, PackageType, PublicId
 from aea.configurations.loader import ConfigLoader
-
 from scripts.generate_ipfs_hashes import update_hashes
 
 DIRECTORIES = ["packages", "aea", "docs", "benchmark", "examples", "tests"]
diff --git a/setup.cfg b/setup.cfg
index 98c82a39bb..a21a839073 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,15 @@ application-import-names = aea,packages,tests,scripts
 # D202: blank lines
 # B014: redundant exception
 
+[isort]
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+line_length=88
+order_by_type=False
+
+
 [mypy]
 python_version = 3.7
 strict_optional = True
diff --git a/tests/common/oef_search_pluto_scripts/launch.py b/tests/common/oef_search_pluto_scripts/launch.py
index 1664943d05..78127f7868 100755
--- a/tests/common/oef_search_pluto_scripts/launch.py
+++ b/tests/common/oef_search_pluto_scripts/launch.py
@@ -20,11 +20,12 @@
 """This test module contains the launch script for the oef."""
 
 from __future__ import print_function
+
+import argparse
 import json
+import os
 import subprocess  # nosec
-import argparse
 import sys
-import os
 
 
 def run(cmd):
diff --git a/tests/common/utils.py b/tests/common/utils.py
index ae84d74635..24e90f7626 100644
--- a/tests/common/utils.py
+++ b/tests/common/utils.py
@@ -24,14 +24,12 @@
 from threading import Thread
 from typing import Any, Callable, Tuple, Type, Union
 
-
 from aea.aea import AEA
 from aea.configurations.base import ProtocolId
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Behaviour, Handler
-
 from tests.conftest import ROOT_DIR
 
 DEFAULT_SLEEP = 0.0001
diff --git a/tests/conftest.py b/tests/conftest.py
index e432671a01..5d1984815b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -31,51 +31,43 @@
 from pathlib import Path
 from threading import Timer
 from types import FunctionType, MethodType
-from typing import Callable, List, Optional, Sequence, cast
+from typing import Callable, cast, List, Optional, Sequence
 from unittest.mock import patch
 
 import docker as docker
-from docker.models.containers import Container
-
 import gym
-
-from oef.agents import AsyncioCore, OEFAgent
-
 import pytest
+from docker.models.containers import Container
+from oef.agents import AsyncioCore, OEFAgent
 
 from aea import AEA_DIR
 from aea.aea import AEA
 from aea.cli.utils.config import _init_cli_config
 from aea.common import Address
-from aea.configurations.base import (
-    ComponentType,
-    ConnectionConfig,
-    ContractConfig,
-    DEFAULT_AEA_CONFIG_FILE as AGENT_YAML,
-    DEFAULT_CONNECTION_CONFIG_FILE as CONNECTION_YAML,
-    DEFAULT_CONTRACT_CONFIG_FILE as CONTRACT_YAML,
-    DEFAULT_PROTOCOL_CONFIG_FILE as PROTOCOL_YAML,
-    DEFAULT_SKILL_CONFIG_FILE as SKILL_YAML,
-    PublicId,
-)
+from aea.configurations.base import ComponentType, ConnectionConfig, ContractConfig
+from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE as AGENT_YAML
+from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE as CONNECTION_YAML
+from aea.configurations.base import DEFAULT_CONTRACT_CONFIG_FILE as CONTRACT_YAML
+from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE as PROTOCOL_YAML
+from aea.configurations.base import DEFAULT_SKILL_CONFIG_FILE as SKILL_YAML
+from aea.configurations.base import PublicId
 from aea.configurations.constants import DEFAULT_CONNECTION, DEFAULT_LEDGER
 from aea.configurations.loader import load_component_configuration
 from aea.connections.base import Connection
 from aea.connections.stub.connection import StubConnection
 from aea.contracts.base import Contract, contract_registry
-from aea.crypto.cosmos import DEFAULT_ADDRESS as COSMOS_DEFAULT_ADDRESS
 from aea.crypto.cosmos import _COSMOS
-from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
+from aea.crypto.cosmos import DEFAULT_ADDRESS as COSMOS_DEFAULT_ADDRESS
 from aea.crypto.ethereum import _ETHEREUM
-from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
+from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
 from aea.crypto.fetchai import _FETCHAI
+from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
 from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA
 from aea.crypto.registries import make_crypto
 from aea.crypto.wallet import CryptoStore
 from aea.identity.base import Identity
 from aea.test_tools.click_testing import CliRunner as ImportedCliRunner
 from aea.test_tools.constants import DEFAULT_AUTHOR
-
 from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection
 from packages.fetchai.connections.oef.connection import OEFConnection
 from packages.fetchai.connections.p2p_libp2p.connection import (
diff --git a/tests/data/generator/t_protocol/dialogues.py b/tests/data/generator/t_protocol/dialogues.py
index 7254d504a9..0efcb291ed 100644
--- a/tests/data/generator/t_protocol/dialogues.py
+++ b/tests/data/generator/t_protocol/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from tests.data.generator.t_protocol.message import TProtocolMessage
 
 
diff --git a/tests/data/generator/t_protocol/message.py b/tests/data/generator/t_protocol/message.py
index b07a48d58d..b28dad220f 100644
--- a/tests/data/generator/t_protocol/message.py
+++ b/tests/data/generator/t_protocol/message.py
@@ -20,12 +20,11 @@
 """This module contains t_protocol's message definition."""
 
 import logging
-from typing import Dict, FrozenSet, Optional, Set, Tuple, Union, cast
+from typing import cast, Dict, FrozenSet, Optional, Set, Tuple, Union
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
-
 from tests.data.generator.t_protocol.custom_types import DataModel as CustomDataModel
 
 logger = logging.getLogger("aea.packages.fetchai.protocols.t_protocol.message")
diff --git a/tests/data/generator/t_protocol/serialization.py b/tests/data/generator/t_protocol/serialization.py
index 942f766ba8..262df38cc0 100644
--- a/tests/data/generator/t_protocol/serialization.py
+++ b/tests/data/generator/t_protocol/serialization.py
@@ -19,11 +19,9 @@
 
 """Serialization module for t_protocol protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from tests.data.generator.t_protocol import t_protocol_pb2
 from tests.data.generator.t_protocol.custom_types import DataModel
 from tests.data.generator.t_protocol.message import TProtocolMessage
diff --git a/tests/data/generator/t_protocol_no_ct/dialogues.py b/tests/data/generator/t_protocol_no_ct/dialogues.py
index 231c2d90c7..63657c12a3 100644
--- a/tests/data/generator/t_protocol_no_ct/dialogues.py
+++ b/tests/data/generator/t_protocol_no_ct/dialogues.py
@@ -25,12 +25,11 @@
 """
 
 from abc import ABC
-from typing import Callable, FrozenSet, Type, cast
+from typing import Callable, cast, FrozenSet, Type
 
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
-
 from tests.data.generator.t_protocol_no_ct.message import TProtocolNoCtMessage
 
 
diff --git a/tests/data/generator/t_protocol_no_ct/message.py b/tests/data/generator/t_protocol_no_ct/message.py
index 8733c6d431..83138b6176 100644
--- a/tests/data/generator/t_protocol_no_ct/message.py
+++ b/tests/data/generator/t_protocol_no_ct/message.py
@@ -20,7 +20,7 @@
 """This module contains t_protocol_no_ct's message definition."""
 
 import logging
-from typing import Dict, FrozenSet, Optional, Set, Tuple, Union, cast
+from typing import cast, Dict, FrozenSet, Optional, Set, Tuple, Union
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/tests/data/generator/t_protocol_no_ct/serialization.py b/tests/data/generator/t_protocol_no_ct/serialization.py
index bf7b3face3..ff9113c313 100644
--- a/tests/data/generator/t_protocol_no_ct/serialization.py
+++ b/tests/data/generator/t_protocol_no_ct/serialization.py
@@ -19,11 +19,9 @@
 
 """Serialization module for t_protocol_no_ct protocol."""
 
-from typing import Any, Dict, cast
-
-from aea.protocols.base import Message
-from aea.protocols.base import Serializer
+from typing import Any, cast, Dict
 
+from aea.protocols.base import Message, Serializer
 from tests.data.generator.t_protocol_no_ct import t_protocol_no_ct_pb2
 from tests.data.generator.t_protocol_no_ct.message import TProtocolNoCtMessage
 
diff --git a/tests/test_aea.py b/tests/test_aea.py
index 7e5b575bf2..bcc1a5f1b9 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -44,10 +44,8 @@
 from aea.protocols.default.serialization import DefaultSerializer
 from aea.registries.resources import Resources
 from aea.skills.base import Skill, SkillContext
-
 from packages.fetchai.connections.local.connection import LocalNode
 from packages.fetchai.protocols.fipa.message import FipaMessage
-
 from tests.common.utils import (
     AeaTool,
     make_behaviour_cls_from_funcion,
@@ -58,12 +56,12 @@
 )
 
 from .conftest import (
+    _make_local_connection,
     CUR_PATH,
     DUMMY_SKILL_PUBLIC_ID,
     FETCHAI_PRIVATE_KEY_PATH,
     ROOT_DIR,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
-    _make_local_connection,
 )
 from .data.dummy_aea.skills.dummy.tasks import DummyTask  # type: ignore
 from .data.dummy_skill.behaviours import DummyBehaviour  # type: ignore
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index e9d464538d..4b7aa6571e 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -27,11 +27,10 @@
 from unittest.mock import Mock, patch
 
 import pytest
-
 import yaml
 
 from aea.aea import AEA
-from aea.aea_builder import AEABuilder, _DependenciesManager
+from aea.aea_builder import _DependenciesManager, AEABuilder
 from aea.components.base import Component
 from aea.configurations.base import (
     ComponentId,
@@ -53,12 +52,11 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
 from aea.test_tools.test_cases import AEATestCase, AEATestCaseEmpty
-
 from tests.conftest import (
+    _make_dummy_connection,
     CUR_PATH,
     DEFAULT_PRIVATE_KEY_PATH,
     ROOT_DIR,
-    _make_dummy_connection,
 )
 
 dummy_skill_path = os.path.join(CUR_PATH, "data", "dummy_skill")
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 35f4ff37a6..30e8093bf7 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -25,9 +25,7 @@
 
 from aea.agent import Agent, Identity
 from aea.runtime import RuntimeStates
-
 from packages.fetchai.connections.local.connection import LocalNode
-
 from tests.common.utils import wait_for_condition
 
 from .conftest import _make_local_connection
diff --git a/tests/test_agent_loop.py b/tests/test_agent_loop.py
index 77f81453b2..465d12f567 100644
--- a/tests/test_agent_loop.py
+++ b/tests/test_agent_loop.py
@@ -35,7 +35,6 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Behaviour, Handler, SkillContext
 from aea.skills.behaviours import TickerBehaviour
-
 from tests.common.utils import run_in_thread, wait_for_condition
 
 
diff --git a/tests/test_cli/test_add/test_connection.py b/tests/test_cli/test_add/test_connection.py
index 39d13712e3..834a9b4425 100644
--- a/tests/test_cli/test_add/test_connection.py
+++ b/tests/test_cli/test_add/test_connection.py
@@ -25,24 +25,21 @@
 import unittest.mock
 from pathlib import Path
 
-from jsonschema import ValidationError
-
 import pytest
-
 import yaml
+from jsonschema import ValidationError
 
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE, PublicId
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CUR_PATH,
     CliRunner,
-    MAX_FLAKY_RERUNS,
+    CUR_PATH,
     double_escape_windows_path_separator,
+    MAX_FLAKY_RERUNS,
 )
 
 
diff --git a/tests/test_cli/test_add/test_contract.py b/tests/test_cli/test_add/test_contract.py
index 030278f521..1d77fee879 100644
--- a/tests/test_cli/test_add/test_contract.py
+++ b/tests/test_cli/test_add/test_contract.py
@@ -19,13 +19,12 @@
 """This test module contains the tests for the `aea add contract` sub-command."""
 
 import os
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import pytest
 
 from aea.cli import cli
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
 
 
diff --git a/tests/test_cli/test_add/test_generic.py b/tests/test_cli/test_add/test_generic.py
index cc8f33e348..a4661c400e 100644
--- a/tests/test_cli/test_add/test_generic.py
+++ b/tests/test_cli/test_add/test_generic.py
@@ -18,10 +18,9 @@
 # ------------------------------------------------------------------------------
 """This test module contains tests for aea.cli.add generic methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.add import _add_item_deps
-
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_add/test_protocol.py b/tests/test_cli/test_add/test_protocol.py
index c9820afb3a..234c107b20 100644
--- a/tests/test_cli/test_add/test_protocol.py
+++ b/tests/test_cli/test_add/test_protocol.py
@@ -25,24 +25,21 @@
 import unittest.mock
 from pathlib import Path
 
-from jsonschema import ValidationError
-
 import pytest
-
 import yaml
+from jsonschema import ValidationError
 
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE, PublicId
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CUR_PATH,
     CliRunner,
-    MAX_FLAKY_RERUNS,
+    CUR_PATH,
     double_escape_windows_path_separator,
+    MAX_FLAKY_RERUNS,
 )
 
 
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index 6f200b2c77..46df071ba8 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -25,11 +25,9 @@
 from pathlib import Path
 from unittest import mock
 
-from jsonschema import ValidationError
-
 import pytest
-
 import yaml
+from jsonschema import ValidationError
 
 import aea
 from aea.cli import cli
@@ -40,15 +38,14 @@
     PublicId,
 )
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CUR_PATH,
     CliRunner,
+    CUR_PATH,
+    double_escape_windows_path_separator,
     MAX_FLAKY_RERUNS,
     ROOT_DIR,
-    double_escape_windows_path_separator,
 )
 
 
diff --git a/tests/test_cli/test_add_key.py b/tests/test_cli/test_add_key.py
index f8c84aa07c..8da1917d2f 100644
--- a/tests/test_cli/test_add_key.py
+++ b/tests/test_cli/test_add_key.py
@@ -22,7 +22,7 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import yaml
 
@@ -30,12 +30,11 @@
 from aea.cli import cli
 from aea.cli.add_key import _try_add_key
 from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CUR_PATH,
     CliRunner,
+    CUR_PATH,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_FILE,
     FETCHAI,
diff --git a/tests/test_cli/test_config.py b/tests/test_cli/test_config.py
index aae0e685c2..cf3ea585a1 100644
--- a/tests/test_cli/test_config.py
+++ b/tests/test_cli/test_config.py
@@ -26,8 +26,7 @@
 
 from aea.cli import cli
 from aea.cli.utils.constants import ALLOWED_PATH_ROOTS
-
-from tests.conftest import CLI_LOG_OPTION, CUR_PATH, CliRunner
+from tests.conftest import CLI_LOG_OPTION, CliRunner, CUR_PATH
 
 
 class TestConfigGet:
diff --git a/tests/test_cli/test_core.py b/tests/test_cli/test_core.py
index 865043f859..a4b31b1d77 100644
--- a/tests/test_cli/test_core.py
+++ b/tests/test_cli/test_core.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI core methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_create.py b/tests/test_cli/test_create.py
index 1aa10bdcac..2a3c50aaee 100644
--- a/tests/test_cli/test_create.py
+++ b/tests/test_cli/test_create.py
@@ -30,11 +30,9 @@
 from unittest.mock import patch
 
 import jsonschema
-from jsonschema import Draft4Validator
-
 import pytest
-
 import yaml
+from jsonschema import Draft4Validator
 
 import aea
 from aea.cli import cli
@@ -45,13 +43,12 @@
     DEFAULT_SKILL,
 )
 from aea.configurations.loader import ConfigLoader, make_jsonschema_base_uri
-
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     AUTHOR,
     CLI_LOG_OPTION,
-    CONFIGURATION_SCHEMA_DIR,
     CliRunner,
+    CONFIGURATION_SCHEMA_DIR,
     ROOT_DIR,
 )
 
diff --git a/tests/test_cli/test_delete.py b/tests/test_cli/test_delete.py
index ce66ea73ef..8a694629d5 100644
--- a/tests/test_cli/test_delete.py
+++ b/tests/test_cli/test_delete.py
@@ -26,7 +26,6 @@
 from pathlib import Path
 
 from aea.cli import cli
-
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index 2f6781d5ce..bec3f6fee7 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -19,16 +19,14 @@
 """This test module contains the tests for CLI Registry fetch methods."""
 
 import os
-from unittest import TestCase, mock
-
-from click import ClickException
+from unittest import mock, TestCase
 
 import pytest
+from click import ClickException
 
 from aea.cli import cli
 from aea.cli.fetch import _is_version_correct, fetch_agent_locally
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_fingerprint.py b/tests/test_cli/test_fingerprint.py
index f89f9ba3a3..c98037d999 100644
--- a/tests/test_cli/test_fingerprint.py
+++ b/tests/test_cli/test_fingerprint.py
@@ -18,13 +18,12 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI fingerprint command."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli import cli
 from aea.cli.fingerprint import _fingerprint_item
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import ConfigLoaderMock, ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_freeze.py b/tests/test_cli/test_freeze.py
index bb8fa04b72..788fed1a32 100644
--- a/tests/test_cli/test_freeze.py
+++ b/tests/test_cli/test_freeze.py
@@ -26,19 +26,17 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator
-
 import pytest
+from jsonschema import Draft4Validator
 
 from aea.cli import cli
 from aea.configurations.loader import make_jsonschema_base_uri
-
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CLI_LOG_OPTION,
+    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
-    CliRunner,
     MAX_FLAKY_RERUNS,
 )
 
diff --git a/tests/test_cli/test_generate/test_generate.py b/tests/test_cli/test_generate/test_generate.py
index 680c6c0e76..c07dd3955c 100644
--- a/tests/test_cli/test_generate/test_generate.py
+++ b/tests/test_cli/test_generate/test_generate.py
@@ -19,13 +19,12 @@
 
 """This test module contains the tests for the aea.cli.generate sub-module."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli.generate import _generate_item
 from aea.configurations.base import ProtocolSpecificationParseError
-
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_generate/test_protocols.py b/tests/test_cli/test_generate/test_protocols.py
index a67f71b3b1..88ac84cc3b 100644
--- a/tests/test_cli/test_generate/test_protocols.py
+++ b/tests/test_cli/test_generate/test_protocols.py
@@ -27,20 +27,18 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator, ValidationError
-
 import yaml
+from jsonschema import Draft4Validator, ValidationError
 
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
+    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
-    CliRunner,
     PROTOCOL_CONFIGURATION_SCHEMA,
 )
 
diff --git a/tests/test_cli/test_generate_key.py b/tests/test_cli/test_generate_key.py
index f30dd52e19..cd6e6961b6 100644
--- a/tests/test_cli/test_generate_key.py
+++ b/tests/test_cli/test_generate_key.py
@@ -26,7 +26,6 @@
 
 from aea.cli import cli
 from aea.crypto.registries import make_crypto
-
 from tests.conftest import (
     CLI_LOG_OPTION,
     CliRunner,
diff --git a/tests/test_cli/test_generate_wealth.py b/tests/test_cli/test_generate_wealth.py
index f061b96d13..5b8a8935d4 100644
--- a/tests/test_cli/test_generate_wealth.py
+++ b/tests/test_cli/test_generate_wealth.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for commands in aea.cli.generate_wealth module."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import pytest
 
@@ -26,7 +26,6 @@
 from aea.cli.generate_wealth import _try_generate_wealth
 from aea.test_tools.exceptions import AEATestingException
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     CLI_LOG_OPTION,
     CliRunner,
diff --git a/tests/test_cli/test_get_address.py b/tests/test_cli/test_get_address.py
index 82c81b59e3..bb498a93af 100644
--- a/tests/test_cli/test_get_address.py
+++ b/tests/test_cli/test_get_address.py
@@ -18,11 +18,10 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for commands in aea.cli.get_address module."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli import cli
 from aea.cli.get_address import _try_get_address
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner, FETCHAI
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_get_multiaddress.py b/tests/test_cli/test_get_multiaddress.py
index ba8c00e33c..a46f6f58a2 100644
--- a/tests/test_cli/test_get_multiaddress.py
+++ b/tests/test_cli/test_get_multiaddress.py
@@ -20,11 +20,9 @@
 from unittest import mock
 
 import base58
-
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import FETCHAI
 
 
diff --git a/tests/test_cli/test_get_wealth.py b/tests/test_cli/test_get_wealth.py
index 1d7f45d3a6..c1f5a3b68a 100644
--- a/tests/test_cli/test_get_wealth.py
+++ b/tests/test_cli/test_get_wealth.py
@@ -18,11 +18,10 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for commands in aea.cli.generate_wealth module."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli import cli
 from aea.cli.get_wealth import _try_get_wealth
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner, FETCHAI
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_gui.py b/tests/test_cli/test_gui.py
index 9d087d385f..78b813d4dc 100644
--- a/tests/test_cli/test_gui.py
+++ b/tests/test_cli/test_gui.py
@@ -25,14 +25,12 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator
-
 import pytest
+from jsonschema import Draft4Validator
 
 from aea.cli import cli
 from aea.configurations.loader import make_jsonschema_base_uri
 from aea.test_tools.click_testing import CliRunner
-
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
diff --git a/tests/test_cli/test_init.py b/tests/test_cli/test_init.py
index 52611313cf..424375b27b 100644
--- a/tests/test_cli/test_init.py
+++ b/tests/test_cli/test_init.py
@@ -29,7 +29,6 @@
 import yaml
 
 from aea.cli import cli
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_install.py b/tests/test_cli/test_install.py
index 060efd06fd..ef5d46524e 100644
--- a/tests/test_cli/test_install.py
+++ b/tests/test_cli/test_install.py
@@ -23,7 +23,7 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import yaml
 
@@ -31,8 +31,7 @@
 from aea.cli.install import _install_dependency
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.exceptions import AEAException
-
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH
 
 
 class TestInstall:
diff --git a/tests/test_cli/test_interact.py b/tests/test_cli/test_interact.py
index 9d8adb5697..80c464bb4f 100644
--- a/tests/test_cli/test_interact.py
+++ b/tests/test_cli/test_interact.py
@@ -17,7 +17,7 @@
 #
 # ------------------------------------------------------------------------------
 """This test module contains tests for iteract command."""
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import pytest
 
@@ -29,7 +29,6 @@
 from aea.helpers.base import send_control_c
 from aea.mail.base import Envelope
 from aea.test_tools.test_cases import AEATestCaseEmpty, AEATestCaseMany
-
 from tests.conftest import MAX_FLAKY_RERUNS
 
 
diff --git a/tests/test_cli/test_launch.py b/tests/test_cli/test_launch.py
index 96ae414009..d0510171b1 100644
--- a/tests/test_cli/test_launch.py
+++ b/tests/test_cli/test_launch.py
@@ -28,17 +28,14 @@
 from pathlib import Path
 from typing import Generator, List, Optional
 
-from pexpect.exceptions import EOF  # type: ignore
-
 import pytest
-
 import yaml
+from pexpect.exceptions import EOF  # type: ignore
 
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
-
 from tests.common.pexpect_popen import PexpectWrapper
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner, MAX_FLAKY_RERUNS
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH, MAX_FLAKY_RERUNS
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_cli/test_list.py b/tests/test_cli/test_list.py
index 8b9030e964..aa370e7d4c 100644
--- a/tests/test_cli/test_list.py
+++ b/tests/test_cli/test_list.py
@@ -24,19 +24,18 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import jsonschema
 from jsonschema import Draft4Validator
 
 from aea.cli import cli
-
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CLI_LOG_OPTION,
+    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
-    CliRunner,
 )
 from tests.test_cli.constants import FORMAT_ITEMS_SAMPLE_OUTPUT
 
diff --git a/tests/test_cli/test_loggers.py b/tests/test_cli/test_loggers.py
index 61ccf4f70e..be18fd9b8b 100644
--- a/tests/test_cli/test_loggers.py
+++ b/tests/test_cli/test_loggers.py
@@ -19,7 +19,7 @@
 
 """This test module contains the tests for commands in aea.cli.utils.loggers module."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.utils.loggers import ColorFormatter
 
diff --git a/tests/test_cli/test_login.py b/tests/test_cli/test_login.py
index bb75736b03..051939f2a7 100644
--- a/tests/test_cli/test_login.py
+++ b/tests/test_cli/test_login.py
@@ -18,10 +18,9 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI login command."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli import cli
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_logout.py b/tests/test_cli/test_logout.py
index 491141119e..04a9a34ad7 100644
--- a/tests/test_cli/test_logout.py
+++ b/tests/test_cli/test_logout.py
@@ -18,10 +18,9 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI logout command."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli import cli
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_publish.py b/tests/test_cli/test_publish.py
index ab5b97d799..03f492727c 100644
--- a/tests/test_cli/test_publish.py
+++ b/tests/test_cli/test_publish.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry publish methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
@@ -28,7 +28,6 @@
     _save_agent_locally,
     _validate_pkp,
 )
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import (
     ContextMock,
diff --git a/tests/test_cli/test_push.py b/tests/test_cli/test_push.py
index 5856162ea5..3054802a8b 100644
--- a/tests/test_cli/test_push.py
+++ b/tests/test_cli/test_push.py
@@ -18,13 +18,12 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry push methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli import cli
 from aea.cli.push import _check_package_public_id, _save_item_locally
-
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_register.py b/tests/test_cli/test_register.py
index 72f7d771b0..87056c9c4a 100644
--- a/tests/test_cli/test_register.py
+++ b/tests/test_cli/test_register.py
@@ -18,12 +18,11 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI register command."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli import cli
 from aea.cli.register import do_register
 from aea.cli.registry.settings import AUTH_TOKEN_KEY
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_registry/test_add.py b/tests/test_cli/test_registry/test_add.py
index 9a81089cfc..9fd225c6df 100644
--- a/tests/test_cli/test_registry/test_add.py
+++ b/tests/test_cli/test_registry/test_add.py
@@ -19,7 +19,7 @@
 """This test module contains tests for CLI Registry add methods."""
 
 import os
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.registry.add import fetch_package
 from aea.configurations.base import PublicId
diff --git a/tests/test_cli/test_registry/test_fetch.py b/tests/test_cli/test_registry/test_fetch.py
index 1a800c4197..50ede87504 100644
--- a/tests/test_cli/test_registry/test_fetch.py
+++ b/tests/test_cli/test_registry/test_fetch.py
@@ -21,12 +21,11 @@
 import os
 import shutil
 import tempfile
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli.registry.fetch import fetch_agent
-
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
 
diff --git a/tests/test_cli/test_registry/test_login.py b/tests/test_cli/test_registry/test_login.py
index 4b5c45f695..5381893c3e 100644
--- a/tests/test_cli/test_registry/test_login.py
+++ b/tests/test_cli/test_registry/test_login.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains tests for CLI Registry login methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.registry.login import registry_login
 
diff --git a/tests/test_cli/test_registry/test_logout.py b/tests/test_cli/test_registry/test_logout.py
index 3627eb6fda..ca8485f5ce 100644
--- a/tests/test_cli/test_registry/test_logout.py
+++ b/tests/test_cli/test_registry/test_logout.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains tests for CLI Registry logout methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.registry.logout import registry_logout
 
diff --git a/tests/test_cli/test_registry/test_publish.py b/tests/test_cli/test_registry/test_publish.py
index 22f2c38100..2d7e9c8e52 100644
--- a/tests/test_cli/test_registry/test_publish.py
+++ b/tests/test_cli/test_registry/test_publish.py
@@ -18,10 +18,9 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry publish methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.registry.publish import _compress, publish_agent
-
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_registry/test_push.py b/tests/test_cli/test_registry/test_push.py
index f60c89b5a8..f7291e4525 100644
--- a/tests/test_cli/test_registry/test_push.py
+++ b/tests/test_cli/test_registry/test_push.py
@@ -19,12 +19,11 @@
 """Test module for Registry push methods."""
 
 import os
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli.registry.push import _compress_dir, _remove_pycache, push_item
-
 from tests.conftest import AUTHOR
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_registry/test_registration.py b/tests/test_cli/test_registry/test_registration.py
index 39945b0536..ad6bbb3867 100644
--- a/tests/test_cli/test_registry/test_registration.py
+++ b/tests/test_cli/test_registry/test_registration.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry registration methods."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_registry/test_utils.py b/tests/test_cli/test_registry/test_utils.py
index f8890e468d..a75e648ce1 100644
--- a/tests/test_cli/test_registry/test_utils.py
+++ b/tests/test_cli/test_registry/test_utils.py
@@ -20,10 +20,9 @@
 
 import os
 from json.decoder import JSONDecodeError
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
-
 from requests.exceptions import ConnectionError
 
 from aea.cli.registry.settings import AUTH_TOKEN_KEY, REGISTRY_API_URL
diff --git a/tests/test_cli/test_remove/test_connection.py b/tests/test_cli/test_remove/test_connection.py
index 3e4b5f69b0..24320b5a4c 100644
--- a/tests/test_cli/test_remove/test_connection.py
+++ b/tests/test_cli/test_remove/test_connection.py
@@ -31,8 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
-
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH
 
 
 class TestRemoveConnectionWithPublicId:
diff --git a/tests/test_cli/test_remove/test_contract.py b/tests/test_cli/test_remove/test_contract.py
index 044d563ba8..56a7d9bbbd 100644
--- a/tests/test_cli/test_remove/test_contract.py
+++ b/tests/test_cli/test_remove/test_contract.py
@@ -18,10 +18,9 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for the `aea remove contract` sub-command."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli import cli
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_remove/test_protocol.py b/tests/test_cli/test_remove/test_protocol.py
index f4b82b2ea9..c166d9094f 100644
--- a/tests/test_cli/test_remove/test_protocol.py
+++ b/tests/test_cli/test_remove/test_protocol.py
@@ -31,8 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
-
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH
 
 
 class TestRemoveProtocolWithPublicId:
diff --git a/tests/test_cli/test_remove/test_remove_item.py b/tests/test_cli/test_remove/test_remove_item.py
index d7769bbcd8..dc2ee28191 100644
--- a/tests/test_cli/test_remove/test_remove_item.py
+++ b/tests/test_cli/test_remove/test_remove_item.py
@@ -18,12 +18,11 @@
 # ------------------------------------------------------------------------------
 """Test module for aea.cli.remove.remove_item method."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli.remove import remove_item
-
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
 
diff --git a/tests/test_cli/test_remove/test_skill.py b/tests/test_cli/test_remove/test_skill.py
index 372836292d..97ce06d2f5 100644
--- a/tests/test_cli/test_remove/test_skill.py
+++ b/tests/test_cli/test_remove/test_skill.py
@@ -31,7 +31,6 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE
-
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, ROOT_DIR
 
 
diff --git a/tests/test_cli/test_run.py b/tests/test_cli/test_run.py
index b050ec782a..da6622fa89 100644
--- a/tests/test_cli/test_run.py
+++ b/tests/test_cli/test_run.py
@@ -25,15 +25,12 @@
 import tempfile
 import time
 from pathlib import Path
-from unittest import TestCase, mock
-
-from click import ClickException
-
-from pexpect.exceptions import EOF  # type: ignore
+from unittest import mock, TestCase
 
 import pytest
-
 import yaml
+from click import ClickException
+from pexpect.exceptions import EOF  # type: ignore
 
 from aea.cli import cli
 from aea.cli.run import _build_aea, run_aea
@@ -44,7 +41,6 @@
 )
 from aea.configurations.constants import DEFAULT_CONNECTION
 from aea.exceptions import AEAPackageLoadingError
-
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import (
     AUTHOR,
diff --git a/tests/test_cli/test_scaffold/test_connection.py b/tests/test_cli/test_scaffold/test_connection.py
index 7b27f33618..c4fc46e24e 100644
--- a/tests/test_cli/test_scaffold/test_connection.py
+++ b/tests/test_cli/test_scaffold/test_connection.py
@@ -28,21 +28,19 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator, ValidationError
-
 import yaml
+from jsonschema import Draft4Validator, ValidationError
 
 from aea import AEA_DIR
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
+    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CONNECTION_CONFIGURATION_SCHEMA,
-    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_scaffold/test_generic.py b/tests/test_cli/test_scaffold/test_generic.py
index 89d8ab38cd..9710925e44 100644
--- a/tests/test_cli/test_scaffold/test_generic.py
+++ b/tests/test_cli/test_scaffold/test_generic.py
@@ -18,13 +18,12 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI scaffold generic methods and commands."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from click import ClickException
 
 from aea.cli import cli
 from aea.cli.scaffold import _scaffold_dm_handler
-
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_scaffold/test_protocols.py b/tests/test_cli/test_scaffold/test_protocols.py
index fdf8e23c6c..62b8a38fa8 100644
--- a/tests/test_cli/test_scaffold/test_protocols.py
+++ b/tests/test_cli/test_scaffold/test_protocols.py
@@ -28,20 +28,18 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator, ValidationError
-
 import yaml
+from jsonschema import Draft4Validator, ValidationError
 
 from aea import AEA_DIR
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CONFIGURATION_SCHEMA_DIR,
     CliRunner,
+    CONFIGURATION_SCHEMA_DIR,
     PROTOCOL_CONFIGURATION_SCHEMA,
 )
 
diff --git a/tests/test_cli/test_scaffold/test_skills.py b/tests/test_cli/test_scaffold/test_skills.py
index 40954447ed..523f747fab 100644
--- a/tests/test_cli/test_scaffold/test_skills.py
+++ b/tests/test_cli/test_scaffold/test_skills.py
@@ -28,20 +28,18 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator, ValidationError
-
 import yaml
+from jsonschema import Draft4Validator, ValidationError
 
 from aea import AEA_DIR
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_SKILL_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
-
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CONFIGURATION_SCHEMA_DIR,
     CliRunner,
+    CONFIGURATION_SCHEMA_DIR,
     SKILL_CONFIGURATION_SCHEMA,
 )
 
diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py
index ebcad61cad..6f4938c09d 100644
--- a/tests/test_cli/test_search.py
+++ b/tests/test_cli/test_search.py
@@ -24,7 +24,7 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import jsonschema
 from jsonschema import Draft4Validator
@@ -32,13 +32,12 @@
 from aea import AEA_DIR
 from aea.cli import cli
 from aea.configurations.base import PublicId
-
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     AUTHOR,
     CLI_LOG_OPTION,
-    CONFIGURATION_SCHEMA_DIR,
     CliRunner,
+    CONFIGURATION_SCHEMA_DIR,
     ROOT_DIR,
 )
 from tests.test_cli.constants import FORMAT_ITEMS_SAMPLE_OUTPUT
diff --git a/tests/test_cli/test_utils/test_config.py b/tests/test_cli/test_utils/test_config.py
index 971eda8410..db09f03927 100644
--- a/tests/test_cli/test_utils/test_config.py
+++ b/tests/test_cli/test_utils/test_config.py
@@ -20,11 +20,10 @@
 """This test module contains the tests for aea.cli.utils.config module."""
 
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli.utils.config import validate_item_config
 from aea.cli.utils.exceptions import AEAConfigException
-
 from tests.test_cli.tools_for_testing import AgentConfigMock, ConfigLoaderMock
 
 
diff --git a/tests/test_cli/test_utils/test_utils.py b/tests/test_cli/test_utils/test_utils.py
index a70b06a98d..41b2fa5a66 100644
--- a/tests/test_cli/test_utils/test_utils.py
+++ b/tests/test_cli/test_utils/test_utils.py
@@ -21,14 +21,11 @@
 
 from builtins import FileNotFoundError
 from typing import cast
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
+import pytest
 from click import BadParameter, ClickException
-
 from jsonschema import ValidationError
-
-import pytest
-
 from yaml import YAMLError
 
 from aea.cli.utils.click_utils import AEAJsonPathType, PublicIdParameter
@@ -53,14 +50,13 @@
     validate_author_name,
     validate_package_name,
 )
-
 from tests.conftest import FETCHAI
 from tests.test_cli.tools_for_testing import (
     ConfigLoaderMock,
     ContextMock,
     PublicIdMock,
-    StopTest,
     raise_stoptest,
+    StopTest,
 )
 
 AUTHOR = "author"
diff --git a/tests/test_cli_gui/test_create.py b/tests/test_cli_gui/test_create.py
index 5be16113f2..f6f42e6cf7 100644
--- a/tests/test_cli_gui/test_create.py
+++ b/tests/test_cli_gui/test_create.py
@@ -27,10 +27,9 @@
 from aea.cli.create import create_aea
 from aea.cli.utils.context import Context
 from aea.test_tools.constants import DEFAULT_AUTHOR
-
 from tests.conftest import CUR_PATH
 from tests.test_cli.tools_for_testing import raise_click_exception
-from tests.test_cli_gui.test_base import TempCWD, create_app
+from tests.test_cli_gui.test_base import create_app, TempCWD
 
 
 @patch("aea.cli_gui.cli_create_aea")
diff --git a/tests/test_cli_gui/test_get_items.py b/tests/test_cli_gui/test_get_items.py
index 3522a5cae0..12466d145c 100644
--- a/tests/test_cli_gui/test_get_items.py
+++ b/tests/test_cli_gui/test_get_items.py
@@ -19,7 +19,7 @@
 """Test module for get registered items with CLI GUI."""
 
 import json
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from tests.test_cli.tools_for_testing import raise_click_exception
 from tests.test_cli_gui.test_base import create_app
diff --git a/tests/test_cli_gui/test_misc.py b/tests/test_cli_gui/test_misc.py
index 44b2680380..e7c05c23d4 100644
--- a/tests/test_cli_gui/test_misc.py
+++ b/tests/test_cli_gui/test_misc.py
@@ -23,7 +23,6 @@
 from flask import Flask
 
 import aea.cli_gui
-
 from tests.common.mocks import ctx_mock_Popen
 
 from .test_base import create_app
diff --git a/tests/test_cli_gui/test_run_agent.py b/tests/test_cli_gui/test_run_agent.py
index cdf4611e31..a684589b5b 100644
--- a/tests/test_cli_gui/test_run_agent.py
+++ b/tests/test_cli_gui/test_run_agent.py
@@ -32,9 +32,8 @@
 from aea.cli.utils.context import Context
 from aea.configurations.constants import DEFAULT_CONNECTION
 from aea.test_tools.constants import DEFAULT_AUTHOR
-
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS
-from tests.test_cli_gui.test_base import TempCWD, create_app
+from tests.test_cli_gui.test_base import create_app, TempCWD
 
 
 @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS)
diff --git a/tests/test_cli_gui/test_utils.py b/tests/test_cli_gui/test_utils.py
index fa0bad2aa5..ee663abf67 100644
--- a/tests/test_cli_gui/test_utils.py
+++ b/tests/test_cli_gui/test_utils.py
@@ -19,13 +19,13 @@
 """Test module for utils of CLI GUI."""
 
 from subprocess import TimeoutExpired  # nosec
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.cli_gui.utils import (
-    ProcessState,
     _call_subprocess,
     _terminate_process,
     get_process_status,
+    ProcessState,
     read_error,
     read_tty,
 )
diff --git a/tests/test_components/test_base.py b/tests/test_components/test_base.py
index 8fbbaf486c..bb520fff59 100644
--- a/tests/test_components/test_base.py
+++ b/tests/test_components/test_base.py
@@ -24,7 +24,6 @@
 
 from aea.components.base import Component, load_aea_package
 from aea.configurations.base import ConnectionConfig, ProtocolConfig
-
 from tests.conftest import ROOT_DIR
 
 
diff --git a/tests/test_configurations/test_aea_config.py b/tests/test_configurations/test_aea_config.py
index 039b6a3eb6..edec905c05 100644
--- a/tests/test_configurations/test_aea_config.py
+++ b/tests/test_configurations/test_aea_config.py
@@ -24,11 +24,9 @@
 from typing import Any, List, Sequence
 from unittest import TestCase
 
-from jsonschema.exceptions import ValidationError  # type: ignore
-
 import pytest
-
 import yaml
+from jsonschema.exceptions import ValidationError  # type: ignore
 
 from aea.aea import AEA
 from aea.aea_builder import AEABuilder
@@ -41,7 +39,6 @@
 )
 from aea.configurations.loader import ConfigLoader, ConfigLoaders
 from aea.helpers.exception_policy import ExceptionPolicyEnum
-
 from tests.conftest import CUR_PATH, ROOT_DIR
 
 
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 13d523b9ea..f8f617806d 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -20,21 +20,22 @@
 """This module contains the tests for the aea.configurations.base module."""
 import re
 from pathlib import Path
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import pytest
-
 import semver
-
 import yaml
 
 from aea.configurations.base import (
+    _check_aea_version,
+    _compare_fingerprints,
+    _get_default_configuration_file_name_from_type,
     AgentConfig,
-    CRUDCollection,
     ComponentId,
     ComponentType,
     ConnectionConfig,
     ContractConfig,
+    CRUDCollection,
     DEFAULT_SKILL_CONFIG_FILE,
     PackageId,
     PackageType,
@@ -44,20 +45,16 @@
     PublicId,
     SkillConfig,
     SpeechActContentConfig,
-    _check_aea_version,
-    _compare_fingerprints,
-    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.configurations.loader import ConfigLoaders, load_component_configuration
-
 from tests.conftest import (
-    AUTHOR,
-    ROOT_DIR,
     agent_config_files,
+    AUTHOR,
     connection_config_files,
     contract_config_files,
     protocol_config_files,
+    ROOT_DIR,
     skill_config_files,
 )
 
diff --git a/tests/test_configurations/test_loader.py b/tests/test_configurations/test_loader.py
index b973f932b8..6862dd3d4a 100644
--- a/tests/test_configurations/test_loader.py
+++ b/tests/test_configurations/test_loader.py
@@ -24,14 +24,12 @@
 from unittest.mock import MagicMock
 
 import pytest
-
 import yaml
 
 import aea
 from aea.configurations.base import PackageType, ProtocolSpecification
 from aea.configurations.loader import ConfigLoader, make_jsonschema_base_uri
 from aea.protocols.generator.common import load_protocol_specification
-
 from tests.conftest import protocol_specification_files
 
 
diff --git a/tests/test_configurations/test_schema.py b/tests/test_configurations/test_schema.py
index fff431060c..c4b33d9685 100644
--- a/tests/test_configurations/test_schema.py
+++ b/tests/test_configurations/test_schema.py
@@ -25,29 +25,26 @@
 from pathlib import Path
 
 import jsonschema
-from jsonschema import Draft4Validator  # type: ignore
-
 import pytest
-
 import yaml
+from jsonschema import Draft4Validator  # type: ignore
 
 from aea.configurations.loader import make_jsonschema_base_uri
-
 from tests.conftest import (
+    agent_config_files,
     AGENT_CONFIGURATION_SCHEMA,
     CONFIGURATION_SCHEMA_DIR,
+    connection_config_files,
     CONNECTION_CONFIGURATION_SCHEMA,
+    contract_config_files,
     CONTRACT_CONFIGURATION_SCHEMA,
+    protocol_config_files,
     PROTOCOL_CONFIGURATION_SCHEMA,
     PROTOCOL_SPEC_CONFIGURATION_SCHEMA,
-    ROOT_DIR,
-    SKILL_CONFIGURATION_SCHEMA,
-    agent_config_files,
-    connection_config_files,
-    contract_config_files,
-    protocol_config_files,
     protocol_specification_files,
+    ROOT_DIR,
     skill_config_files,
+    SKILL_CONFIGURATION_SCHEMA,
 )
 
 
diff --git a/tests/test_connections/test_stub.py b/tests/test_connections/test_stub.py
index a9a3219028..d5db2c2f7e 100644
--- a/tests/test_connections/test_stub.py
+++ b/tests/test_connections/test_stub.py
@@ -31,9 +31,9 @@
 import aea
 from aea.configurations.base import PublicId
 from aea.connections.stub.connection import (
-    StubConnection,
     _process_line,
     lock_file,
+    StubConnection,
     write_envelope,
     write_with_lock,
 )
@@ -42,8 +42,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
-
-from tests.conftest import ROOT_DIR, _make_stub_connection
+from tests.conftest import _make_stub_connection, ROOT_DIR
 
 SEPARATOR = ","
 
diff --git a/tests/test_context/test_base.py b/tests/test_context/test_base.py
index 4ebe49282f..333a8bacfe 100644
--- a/tests/test_context/test_base.py
+++ b/tests/test_context/test_base.py
@@ -22,7 +22,6 @@
 
 from aea.context.base import AgentContext
 from aea.identity.base import Identity
-
 from tests.conftest import FETCHAI
 
 
diff --git a/tests/test_contracts/test_base.py b/tests/test_contracts/test_base.py
index 13e2e10064..fc0de4cfbc 100644
--- a/tests/test_contracts/test_base.py
+++ b/tests/test_contracts/test_base.py
@@ -24,13 +24,9 @@
 from typing import cast
 
 import pytest
-
 import web3
 
-from aea.configurations.base import (
-    ComponentType,
-    ContractConfig,
-)
+from aea.configurations.base import ComponentType, ContractConfig
 from aea.configurations.loader import load_component_configuration
 from aea.contracts import contract_registry
 from aea.contracts.base import Contract
@@ -38,7 +34,6 @@
 from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
 from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
 from aea.crypto.registries import crypto_registry, ledger_apis_registry
-
 from tests.conftest import ETHEREUM, FETCHAI, ROOT_DIR
 
 
diff --git a/tests/test_crypto/test_cosmos.py b/tests/test_crypto/test_cosmos.py
index fc9531d515..36bbf49e38 100644
--- a/tests/test_crypto/test_cosmos.py
+++ b/tests/test_crypto/test_cosmos.py
@@ -21,11 +21,7 @@
 from unittest.mock import MagicMock
 
 from aea.crypto.cosmos import CosmosApi, CosmosCrypto
-
-from tests.conftest import (
-    COSMOS_PRIVATE_KEY_PATH,
-    COSMOS_TESTNET_CONFIG,
-)
+from tests.conftest import COSMOS_PRIVATE_KEY_PATH, COSMOS_TESTNET_CONFIG
 
 
 def test_creation():
diff --git a/tests/test_crypto/test_ethereum.py b/tests/test_crypto/test_ethereum.py
index d569c06cf9..b2e80ffcc8 100644
--- a/tests/test_crypto/test_ethereum.py
+++ b/tests/test_crypto/test_ethereum.py
@@ -25,11 +25,9 @@
 from unittest.mock import MagicMock
 
 import eth_account
-
 import pytest
 
 from aea.crypto.ethereum import EthereumApi, EthereumCrypto, EthereumFaucetApi
-
 from tests.conftest import (
     ETHEREUM_PRIVATE_KEY_PATH,
     ETHEREUM_TESTNET_CONFIG,
diff --git a/tests/test_crypto/test_fetchai.py b/tests/test_crypto/test_fetchai.py
index aec465043f..f2bcf34731 100644
--- a/tests/test_crypto/test_fetchai.py
+++ b/tests/test_crypto/test_fetchai.py
@@ -21,12 +21,11 @@
 import logging
 import time
 from unittest import mock
-from unittest.mock import MagicMock, call
+from unittest.mock import call, MagicMock
 
 import pytest
 
 from aea.crypto.fetchai import FetchAIApi, FetchAICrypto, FetchAIFaucetApi
-
 from tests.conftest import (
     FETCHAI_PRIVATE_KEY_PATH,
     FETCHAI_TESTNET_CONFIG,
diff --git a/tests/test_crypto/test_helpers.py b/tests/test_crypto/test_helpers.py
index 05dcd0876e..2814346786 100644
--- a/tests/test_crypto/test_helpers.py
+++ b/tests/test_crypto/test_helpers.py
@@ -25,7 +25,6 @@
 from unittest.mock import mock_open, patch
 
 import pytest
-
 import requests
 
 from aea.crypto.cosmos import CosmosCrypto
@@ -37,7 +36,6 @@
     try_validate_private_key_path,
     verify_or_create_private_keys,
 )
-
 from tests.conftest import (
     COSMOS_PRIVATE_KEY_FILE,
     CUR_PATH,
diff --git a/tests/test_crypto/test_ledger_apis.py b/tests/test_crypto/test_ledger_apis.py
index d021a04a2d..7bb5bd0a56 100644
--- a/tests/test_crypto/test_ledger_apis.py
+++ b/tests/test_crypto/test_ledger_apis.py
@@ -29,12 +29,7 @@
 from aea.crypto.fetchai import FetchAIApi
 from aea.crypto.ledger_apis import LedgerApis
 from aea.exceptions import AEAEnforceError
-
-from tests.conftest import (
-    COSMOS,
-    COSMOS_ADDRESS_ONE,
-    ETHEREUM_ADDRESS_ONE,
-)
+from tests.conftest import COSMOS, COSMOS_ADDRESS_ONE, ETHEREUM_ADDRESS_ONE
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_crypto/test_registry/test_crypto_registry.py b/tests/test_crypto/test_registry/test_crypto_registry.py
index 19607fc413..e0471b0dcb 100644
--- a/tests/test_crypto/test_registry/test_crypto_registry.py
+++ b/tests/test_crypto/test_registry/test_crypto_registry.py
@@ -31,7 +31,6 @@
 from aea.crypto.fetchai import FetchAICrypto
 from aea.crypto.registries.base import EntryPoint
 from aea.exceptions import AEAException
-
 from tests.conftest import COSMOS, ETHEREUM, FETCHAI
 from tests.data.custom_crypto import CustomCrypto
 
diff --git a/tests/test_crypto/test_registry/test_ledger_api_registry.py b/tests/test_crypto/test_registry/test_ledger_api_registry.py
index 088128a9c3..9fe8943e4b 100644
--- a/tests/test_crypto/test_registry/test_ledger_api_registry.py
+++ b/tests/test_crypto/test_registry/test_ledger_api_registry.py
@@ -24,7 +24,6 @@
 import pytest
 
 import aea.crypto
-
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_ADDRESS_ONE,
diff --git a/tests/test_crypto/test_wallet.py b/tests/test_crypto/test_wallet.py
index efb31f17b2..04ed6d899f 100644
--- a/tests/test_crypto/test_wallet.py
+++ b/tests/test_crypto/test_wallet.py
@@ -22,7 +22,6 @@
 from unittest import TestCase
 
 import eth_account
-
 import pytest
 
 from aea.crypto.cosmos import CosmosCrypto
@@ -30,7 +29,6 @@
 from aea.crypto.fetchai import FetchAICrypto
 from aea.crypto.wallet import Wallet
 from aea.exceptions import AEAException
-
 from tests.conftest import (
     COSMOS_PRIVATE_KEY_PATH,
     ETHEREUM_PRIVATE_KEY_PATH,
diff --git a/tests/test_decision_maker/test_default.py b/tests/test_decision_maker/test_default.py
index 859fe720f4..af6846e403 100644
--- a/tests/test_decision_maker/test_default.py
+++ b/tests/test_decision_maker/test_default.py
@@ -20,11 +20,10 @@
 """This module contains tests for decision_maker."""
 
 from queue import Queue
-from typing import Optional, cast
+from typing import cast, Optional
 from unittest import mock
 
 import eth_account
-
 import pytest
 
 import aea
@@ -51,7 +50,6 @@
     StateUpdateDialogues as BaseStateUpdateDialogues,
 )
 from aea.protocols.state_update.message import StateUpdateMessage
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_PATH,
diff --git a/tests/test_decision_maker/test_ownership_state.py b/tests/test_decision_maker/test_ownership_state.py
index c5ae85ae26..26c6996ab9 100644
--- a/tests/test_decision_maker/test_ownership_state.py
+++ b/tests/test_decision_maker/test_ownership_state.py
@@ -23,7 +23,6 @@
 
 from aea.decision_maker.default import OwnershipState
 from aea.helpers.transaction.base import Terms
-
 from tests.conftest import ETHEREUM
 
 
diff --git a/tests/test_decision_maker/test_preferences.py b/tests/test_decision_maker/test_preferences.py
index e64ce455de..3bd8b09879 100644
--- a/tests/test_decision_maker/test_preferences.py
+++ b/tests/test_decision_maker/test_preferences.py
@@ -25,7 +25,6 @@
 
 from aea.decision_maker.default import OwnershipState, Preferences
 from aea.helpers.transaction.base import Terms
-
 from tests.conftest import ETHEREUM
 
 
diff --git a/tests/test_docs/test_agent_vs_aea/agent_code_block.py b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
index e219fd1420..332fc97204 100644
--- a/tests/test_docs/test_agent_vs_aea/agent_code_block.py
+++ b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
@@ -32,7 +32,6 @@
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
 
-
 INPUT_FILE = "input_file"
 OUTPUT_FILE = "output_file"
 
diff --git a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
index 9fe0f5dfad..0f25897695 100644
--- a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
+++ b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
@@ -24,7 +24,6 @@
 import pytest
 
 from aea.test_tools.test_cases import BaseAEATestCase
-
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 from tests.test_docs.test_agent_vs_aea.agent_code_block import run
diff --git a/tests/test_docs/test_bash_yaml/test_demo_docs.py b/tests/test_docs/test_bash_yaml/test_demo_docs.py
index 85b1c5e31b..dde33427ea 100644
--- a/tests/test_docs/test_bash_yaml/test_demo_docs.py
+++ b/tests/test_docs/test_bash_yaml/test_demo_docs.py
@@ -26,7 +26,6 @@
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, read_md_file
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
index 5d004506d0..fc80cdf4e7 100644
--- a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
@@ -27,7 +27,7 @@
 from aea.configurations.base import SkillConfig
 from aea.connections.stub.connection import write_with_lock
 from aea.crypto.fetchai import FetchAICrypto
-from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
+from aea.crypto.helpers import create_private_key, PRIVATE_KEY_PATH_SCHEMA
 from aea.skills.base import Skill
 
 ROOT_DIR = "./"
diff --git a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
index cb307c49d2..349289ad5c 100644
--- a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
@@ -24,7 +24,6 @@
 
 from aea.configurations.constants import DEFAULT_PRIVATE_KEY_FILE
 from aea.test_tools.test_cases import BaseAEATestCase
-
 from tests.conftest import CUR_PATH, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
index 737f29fdfa..d9de11f423 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
@@ -28,13 +28,12 @@
 from aea.aea import AEA
 from aea.configurations.base import ConnectionConfig, PublicId
 from aea.crypto.fetchai import FetchAICrypto
-from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
+from aea.crypto.helpers import create_private_key, PRIVATE_KEY_PATH_SCHEMA
 from aea.crypto.wallet import Wallet
 from aea.identity.base import Identity
 from aea.protocols.base import Protocol
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
-
 from packages.fetchai.connections.ledger.connection import LedgerConnection
 from packages.fetchai.connections.p2p_libp2p.connection import P2PLibp2pConnection
 from packages.fetchai.connections.soef.connection import SOEFConnection
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
index 43c52bda0d..80bd07567d 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
@@ -27,7 +27,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     CUR_PATH,
     FETCHAI,
diff --git a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
index 10e9ad3055..7c9a968eda 100644
--- a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
@@ -22,7 +22,7 @@
 import logging
 import time
 from threading import Thread
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.aea_builder import AEABuilder
 from aea.configurations.base import ProtocolId, SkillConfig
diff --git a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
index 7c3065ddde..6a142c3c0e 100644
--- a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
@@ -25,12 +25,9 @@
 
 from aea.test_tools.test_cases import BaseAEATestCase
 
-from .decision_maker_transaction import (
-    logger,
-    run,
-)
-from ..helper import extract_code_blocks, extract_python_code
 from ...conftest import CUR_PATH, ROOT_DIR
+from ..helper import extract_code_blocks, extract_python_code
+from .decision_maker_transaction import logger, run
 
 MD_FILE = "docs/decision-maker-transaction.md"
 PY_FILE = "test_docs/test_decision_maker_transaction/decision_maker_transaction.py"
diff --git a/tests/test_docs/test_docs_protocol.py b/tests/test_docs/test_docs_protocol.py
index 1bec995f56..750dd8e5cf 100644
--- a/tests/test_docs/test_docs_protocol.py
+++ b/tests/test_docs/test_docs_protocol.py
@@ -24,11 +24,9 @@
 import mistune
 
 from aea.protocols.default.message import DefaultMessage
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.oef_search.custom_types import OefErrorOperation
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import compare_enum_classes, compile_and_exec
 
diff --git a/tests/test_docs/test_docs_skill.py b/tests/test_docs/test_docs_skill.py
index 00e2b47bb6..1cbde84b96 100644
--- a/tests/test_docs/test_docs_skill.py
+++ b/tests/test_docs/test_docs_skill.py
@@ -24,7 +24,6 @@
 
 from aea.skills.behaviours import OneShotBehaviour
 from aea.skills.tasks import Task
-
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import compile_and_exec
 
diff --git a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
index 0789e8019c..762fdcb010 100644
--- a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
@@ -22,15 +22,12 @@
 import os
 from pathlib import Path
 
-
 from aea.test_tools.test_cases import BaseAEATestCase
-
 from tests.conftest import CUR_PATH, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 from .multiplexer_standalone import run
 
-
 MD_FILE = "docs/multiplexer-standalone.md"
 PY_FILE = "test_docs/test_multiplexer_standalone/multiplexer_standalone.py"
 
diff --git a/tests/test_docs/test_orm_integration/test_orm_integration.py b/tests/test_docs/test_orm_integration/test_orm_integration.py
index 56f83cf22d..a452a241b5 100644
--- a/tests/test_docs/test_orm_integration/test_orm_integration.py
+++ b/tests/test_docs/test_orm_integration/test_orm_integration.py
@@ -22,13 +22,10 @@
 from random import uniform
 
 import mistune
-
 import pytest
-
 import yaml
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_docs/test_skill_guide/test_skill_guide.py b/tests/test_docs/test_skill_guide/test_skill_guide.py
index 87fcc76cad..0f77e47bc9 100644
--- a/tests/test_docs/test_skill_guide/test_skill_guide.py
+++ b/tests/test_docs/test_skill_guide/test_skill_guide.py
@@ -29,7 +29,6 @@
 from aea import AEA_DIR
 from aea.configurations.base import DEFAULT_VERSION
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     AUTHOR,
     COSMOS,
@@ -44,7 +43,6 @@
 )
 from tests.test_docs.helper import extract_code_blocks
 
-
 MD_FILE = "docs/skill-guide.md"
 
 
diff --git a/tests/test_docs/test_standalone_transaction/standalone_transaction.py b/tests/test_docs/test_standalone_transaction/standalone_transaction.py
index e137def89f..892d2db880 100644
--- a/tests/test_docs/test_standalone_transaction/standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/standalone_transaction.py
@@ -26,7 +26,6 @@
 from aea.crypto.ledger_apis import LedgerApis
 from aea.crypto.wallet import Wallet
 
-
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
index 3355099c3e..e9df590305 100644
--- a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
@@ -26,14 +26,10 @@
 import pytest
 
 from aea.test_tools.test_cases import BaseAEATestCase
-
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS_INTEGRATION, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
-from .standalone_transaction import (
-    logger,
-    run,
-)
+from .standalone_transaction import logger, run
 
 MD_FILE = "docs/standalone-transaction.md"
 PY_FILE = "test_docs/test_standalone_transaction/standalone_transaction.py"
diff --git a/tests/test_examples/test_gym_ex.py b/tests/test_examples/test_gym_ex.py
index 219de01525..aa950c7153 100644
--- a/tests/test_examples/test_gym_ex.py
+++ b/tests/test_examples/test_gym_ex.py
@@ -25,7 +25,7 @@
 from pathlib import Path
 
 from tests.common.pexpect_popen import PexpectWrapper
-from tests.conftest import ROOT_DIR, env_path_separator
+from tests.conftest import env_path_separator, ROOT_DIR
 
 DIRECTORIES = ["packages", "examples"]
 
diff --git a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
index ac2e07b52f..aa572200b0 100644
--- a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
+++ b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
@@ -29,7 +29,6 @@
 from typing import Optional
 
 import pytest
-
 import yaml
 
 from aea import AEA_DIR
@@ -47,13 +46,10 @@
 from aea.protocols.base import Message, Protocol
 from aea.registries.resources import Resources
 from aea.skills.base import Handler, Skill, SkillContext
-
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.protocols.http.message import HttpMessage
-
 from tests.conftest import HTTP_PROTOCOL_PUBLIC_ID
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index 6c008a29fd..d54ac7d6c3 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -26,11 +26,11 @@
 from aea.helpers.async_utils import (
     AsyncState,
     AwaitableProc,
+    ensure_list,
+    ensure_loop,
     HandlerItemGetter,
     PeriodicCaller,
     ThreadedAsyncRunner,
-    ensure_list,
-    ensure_loop,
 )
 
 
diff --git a/tests/test_helpers/test_base.py b/tests/test_helpers/test_base.py
index b063cc3732..be19160c1c 100644
--- a/tests/test_helpers/test_base.py
+++ b/tests/test_helpers/test_base.py
@@ -32,12 +32,12 @@
 import pytest
 
 from aea.helpers.base import (
-    MaxRetriesError,
-    RegexConstrainedString,
     exception_log_and_reraise,
     load_env_file,
     load_module,
     locate,
+    MaxRetriesError,
+    RegexConstrainedString,
     retry_decorator,
     send_control_c,
     try_decorator,
@@ -47,9 +47,7 @@
     yaml_load,
     yaml_load_all,
 )
-
 from packages.fetchai.connections.oef.connection import OEFConnection
-
 from tests.conftest import CUR_PATH, ROOT_DIR, skip_test_windows
 
 
diff --git a/tests/test_helpers/test_exec_timeout.py b/tests/test_helpers/test_exec_timeout.py
index 3dcf40bf3c..87e7c42c5f 100644
--- a/tests/test_helpers/test_exec_timeout.py
+++ b/tests/test_helpers/test_exec_timeout.py
@@ -26,12 +26,14 @@
 
 import pytest
 
-from aea.helpers.exec_timeout import BaseExecTimeout, ExecTimeoutSigAlarm
-from aea.helpers.exec_timeout import ExecTimeoutThreadGuard, TimeoutException
-
+from aea.helpers.exec_timeout import (
+    BaseExecTimeout,
+    ExecTimeoutSigAlarm,
+    ExecTimeoutThreadGuard,
+    TimeoutException,
+)
 from tests.common.utils import timeit_context
 
-
 if os.name == "nt":
     pytest.skip("signal.settimer non available on Windows.", allow_module_level=True)
 
diff --git a/tests/test_helpers/test_ipfs/test_base.py b/tests/test_helpers/test_ipfs/test_base.py
index 820f7b40b2..416c9f9390 100644
--- a/tests/test_helpers/test_ipfs/test_base.py
+++ b/tests/test_helpers/test_ipfs/test_base.py
@@ -22,8 +22,7 @@
 import os
 from unittest.mock import patch
 
-from aea.helpers.ipfs.base import IPFSHashOnly, _is_text
-
+from aea.helpers.ipfs.base import _is_text, IPFSHashOnly
 from tests.conftest import CUR_PATH
 
 FILE_PATH = "__init__.py"
diff --git a/tests/test_helpers/test_pipe/test_pipe.py b/tests/test_helpers/test_pipe/test_pipe.py
index f4e5d95ef5..8d4fc3d9b9 100644
--- a/tests/test_helpers/test_pipe/test_pipe.py
+++ b/tests/test_helpers/test_pipe/test_pipe.py
@@ -25,14 +25,13 @@
 
 from aea.helpers.pipe import (
     IPCChannelClient,
+    make_ipc_channel,
+    make_ipc_channel_client,
     PosixNamedPipeChannel,
     PosixNamedPipeChannelClient,
     TCPSocketChannel,
     TCPSocketChannelClient,
-    make_ipc_channel,
-    make_ipc_channel_client,
 )
-
 from tests.conftest import skip_test_windows
 
 
diff --git a/tests/test_helpers/test_search/test_models.py b/tests/test_helpers/test_search/test_models.py
index fbf6e152ac..6e64f5028f 100644
--- a/tests/test_helpers/test_search/test_models.py
+++ b/tests/test_helpers/test_search/test_models.py
@@ -32,11 +32,11 @@
     ConstraintTypes,
     DataModel,
     Description,
+    generate_data_model,
     Location,
     Not,
     Or,
     Query,
-    generate_data_model,
 )
 
 
diff --git a/tests/test_identity/test_base.py b/tests/test_identity/test_base.py
index 78ab1e42da..91ad680452 100644
--- a/tests/test_identity/test_base.py
+++ b/tests/test_identity/test_base.py
@@ -23,7 +23,6 @@
 
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.identity.base import Identity
-
 from tests.conftest import FETCHAI
 
 
diff --git a/tests/test_launcher.py b/tests/test_launcher.py
index 34071b62aa..6e0f30e82d 100644
--- a/tests/test_launcher.py
+++ b/tests/test_launcher.py
@@ -25,20 +25,16 @@
 from pathlib import Path
 from threading import Thread
 
-
 import pytest
-
 import yaml
 
 from aea.cli.core import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
 from aea.helpers.base import cd
-from aea.launcher import AEALauncher, _run_agent
+from aea.launcher import _run_agent, AEALauncher
 from aea.test_tools.test_cases import CLI_LOG_OPTION
-
-
 from tests.common.utils import wait_for_condition
-from tests.conftest import AUTHOR, CUR_PATH, CliRunner
+from tests.conftest import AUTHOR, CliRunner, CUR_PATH
 
 
 class TestThreadLauncherMode:
diff --git a/tests/test_mail/test_base.py b/tests/test_mail/test_base.py
index d4fdb3e624..71282b3083 100644
--- a/tests/test_mail/test_base.py
+++ b/tests/test_mail/test_base.py
@@ -29,13 +29,11 @@
 from aea.multiplexer import InBox, Multiplexer, OutBox
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
-
 from packages.fetchai.connections.local.connection import LocalNode
-
 from tests.conftest import (
-    UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
     _make_local_connection,
+    UNKNOWN_PROTOCOL_PUBLIC_ID,
 )
 
 
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index 41693c0f9e..f88202960e 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -27,7 +27,7 @@
 from pathlib import Path
 from threading import Thread
 from unittest import mock
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import call, MagicMock, patch
 
 import pytest
 
@@ -38,25 +38,18 @@
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.identity.base import Identity
 from aea.mail.base import AEAConnectionError, Envelope, EnvelopeContext
-from aea.multiplexer import (
-    AsyncMultiplexer,
-    InBox,
-    Multiplexer,
-    OutBox,
-)
+from aea.multiplexer import AsyncMultiplexer, InBox, Multiplexer, OutBox
 from aea.protocols.default.message import DefaultMessage
-
 from packages.fetchai.connections.local.connection import LocalNode
-
 from tests.common.utils import wait_for_condition
 
 from .conftest import (
-    UNKNOWN_CONNECTION_PUBLIC_ID,
-    UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
     _make_local_connection,
     _make_stub_connection,
     logger,
+    UNKNOWN_CONNECTION_PUBLIC_ID,
+    UNKNOWN_PROTOCOL_PUBLIC_ID,
 )
 
 
diff --git a/tests/test_package_loading.py b/tests/test_package_loading.py
index 4f3717bc12..6b3b5b22c8 100644
--- a/tests/test_package_loading.py
+++ b/tests/test_package_loading.py
@@ -45,6 +45,8 @@ def test_loading():
     ), "Not all the subpackages are importable."
 
     # try to import a function from a skill submodule.
-    from packages.dummy_author.skills.dummy.dummy_subpackage.foo import bar  # type: ignore
+    from packages.dummy_author.skills.dummy.dummy_subpackage.foo import (  # type: ignore
+        bar,
+    )
 
     assert bar() == 42
diff --git a/tests/test_packages/test_connections/test_gym/test_gym.py b/tests/test_packages/test_connections/test_gym/test_gym.py
index e3e316efe3..dc5dbc56e1 100644
--- a/tests/test_packages/test_connections/test_gym/test_gym.py
+++ b/tests/test_packages/test_connections/test_gym/test_gym.py
@@ -24,7 +24,6 @@
 from unittest.mock import patch
 
 import gym
-
 import pytest
 
 from aea.common import Address
@@ -32,13 +31,10 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
-
 from packages.fetchai.connections.gym.connection import GymConnection
 from packages.fetchai.protocols.gym.dialogues import GymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
-
 from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_http_client/test_http_client.py b/tests/test_packages/test_connections/test_http_client/test_http_client.py
index efd1560d15..590ae817f1 100644
--- a/tests/test_packages/test_connections/test_http_client/test_http_client.py
+++ b/tests/test_packages/test_connections/test_http_client/test_http_client.py
@@ -22,9 +22,7 @@
 from asyncio import CancelledError
 from unittest.mock import Mock, patch
 
-
 import aiohttp
-
 import pytest
 
 from aea.common import Address
@@ -32,18 +30,12 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
-
 from tests.common.mocks import AnyStringWith
-from tests.conftest import (
-    UNKNOWN_PROTOCOL_PUBLIC_ID,
-    get_host,
-    get_unused_tcp_port,
-)
+from tests.conftest import get_host, get_unused_tcp_port, UNKNOWN_PROTOCOL_PUBLIC_ID
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py
index 215dbc830b..aa5270162e 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server.py
@@ -23,20 +23,18 @@
 import logging
 import os
 from traceback import print_exc
-from typing import Tuple, cast
+from typing import cast, Tuple
 from unittest.mock import Mock, patch
 
 import aiohttp
-from aiohttp.client_reqrep import ClientResponse
-
 import pytest
+from aiohttp.client_reqrep import ClientResponse
 
 from aea.common import Address
 from aea.configurations.base import ConnectionConfig, PublicId
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.connections.http_server.connection import (
     APISpec,
     HTTPServerConnection,
@@ -45,14 +43,13 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
-
 from tests.common.mocks import RegexComparator
 from tests.conftest import (
+    get_host,
+    get_unused_tcp_port,
     HTTP_PROTOCOL_PUBLIC_ID,
     ROOT_DIR,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
-    get_host,
-    get_unused_tcp_port,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
index 5eb224b937..e1fb4f9864 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
@@ -29,18 +29,11 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.connections.http_server.connection import HTTPServerConnection
-from packages.fetchai.protocols.http.dialogues import HttpDialogue
-from packages.fetchai.protocols.http.dialogues import HttpDialogues
+from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
-
-from tests.conftest import (
-    get_host,
-    get_unused_tcp_port,
-)
-
+from tests.conftest import get_host, get_unused_tcp_port
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_packages/test_connections/test_ledger/test_contract_api.py b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
index 88bb315259..c37e72d756 100644
--- a/tests/test_packages/test_connections/test_ledger/test_contract_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
@@ -31,7 +31,6 @@
 from aea.multiplexer import MultiplexerStatus
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue
-
 from packages.fetchai.connections.ledger.contract_dispatcher import (
     ContractApiRequestDispatcher,
 )
@@ -40,7 +39,6 @@
     ContractApiDialogues as BaseContractApiDialogues,
 )
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
-
 from tests.conftest import ETHEREUM, ETHEREUM_ADDRESS_ONE
 
 
diff --git a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
index 21ceaf2f5c..8b217f7a92 100644
--- a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
@@ -41,7 +41,6 @@
 )
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.connections.ledger.connection import LedgerConnection
 from packages.fetchai.connections.ledger.ledger_dispatcher import (
     LedgerApiRequestDispatcher,
@@ -51,7 +50,6 @@
     LedgerApiDialogues as BaseLedgerApiDialogues,
 )
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
-
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_ADDRESS_ONE,
diff --git a/tests/test_packages/test_connections/test_local/test_misc.py b/tests/test_packages/test_connections/test_local/test_misc.py
index 1c49dcf99d..a4fa2b3d14 100644
--- a/tests/test_packages/test_connections/test_local/test_misc.py
+++ b/tests/test_packages/test_connections/test_local/test_misc.py
@@ -27,10 +27,8 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
-
 from packages.fetchai.connections.local.connection import LocalNode
 from packages.fetchai.protocols.fipa.message import FipaMessage
-
 from tests.conftest import _make_local_connection
 
 
diff --git a/tests/test_packages/test_connections/test_local/test_search_services.py b/tests/test_packages/test_connections/test_local/test_search_services.py
index 4c4c24ba4b..e6633574de 100644
--- a/tests/test_packages/test_connections/test_local/test_search_services.py
+++ b/tests/test_packages/test_connections/test_local/test_search_services.py
@@ -35,7 +35,6 @@
 from aea.multiplexer import InBox, Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
@@ -44,10 +43,9 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-
 from tests.common.mocks import AnyStringWith
 from tests.common.utils import wait_for_condition
-from tests.conftest import MAX_FLAKY_RERUNS, _make_local_connection
+from tests.conftest import _make_local_connection, MAX_FLAKY_RERUNS
 
 
 class OefSearchDialogues(BaseOefSearchDialogues):
diff --git a/tests/test_packages/test_connections/test_oef/test_communication.py b/tests/test_packages/test_connections/test_oef/test_communication.py
index 8d2a67ec92..d0afb31781 100644
--- a/tests/test_packages/test_connections/test_oef/test_communication.py
+++ b/tests/test_packages/test_connections/test_oef/test_communication.py
@@ -25,15 +25,14 @@
 import time
 import unittest
 from contextlib import suppress
-from typing import Dict, cast
+from typing import cast, Dict
 from unittest import mock
 from unittest.mock import patch
 
+import pytest
 from oef.messages import OEFErrorOperation
 from oef.query import ConstraintExpr
 
-import pytest
-
 from aea.common import Address
 from aea.helpers.search.models import (
     Attribute,
@@ -51,7 +50,6 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.test_tools.test_cases import UseOef
-
 from packages.fetchai.connections.oef.connection import OEFObjectTranslator
 from packages.fetchai.protocols.fipa import fipa_pb2
 from packages.fetchai.protocols.fipa.message import FipaMessage
@@ -60,11 +58,10 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-
 from tests.conftest import (
+    _make_oef_connection,
     FETCHAI_ADDRESS_ONE,
     FETCHAI_ADDRESS_TWO,
-    _make_oef_connection,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_oef/test_models.py b/tests/test_packages/test_connections/test_oef/test_models.py
index accb7470c5..544d8390d3 100644
--- a/tests/test_packages/test_connections/test_oef/test_models.py
+++ b/tests/test_packages/test_connections/test_oef/test_models.py
@@ -36,7 +36,6 @@
     Or,
     Query,
 )
-
 from packages.fetchai.connections.oef.connection import OEFObjectTranslator
 
 
diff --git a/tests/test_packages/test_connections/test_oef/test_oef_serializer.py b/tests/test_packages/test_connections/test_oef/test_oef_serializer.py
index a6e1e20b0b..1240a82c02 100644
--- a/tests/test_packages/test_connections/test_oef/test_oef_serializer.py
+++ b/tests/test_packages/test_connections/test_oef/test_oef_serializer.py
@@ -27,7 +27,6 @@
     Location,
     Query,
 )
-
 from packages.fetchai.connections.oef.object_translator import OEFObjectTranslator
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
index d31a3afbce..3958eff47f 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
@@ -22,7 +22,6 @@
 import os
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import libp2p_log_on_failure
 
 DEFAULT_PORT = 10234
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
index 49a08a0be9..4893ad2a6e 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
@@ -28,9 +28,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
-
 from packages.fetchai.connections.p2p_libp2p.connection import Uri
-
 from tests.conftest import (
     _make_libp2p_connection,
     libp2p_log_on_failure,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index 7828bec9ed..9b53827308 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -30,19 +30,14 @@
 from aea.crypto.registries import make_crypto
 from aea.identity.base import Identity
 from aea.multiplexer import Multiplexer
-
 from packages.fetchai.connections.p2p_libp2p.connection import (
+    _golang_module_build_async,
+    _golang_module_run,
     AwaitableProc,
     LIBP2P_NODE_MODULE_NAME,
     P2PLibp2pConnection,
-    _golang_module_build_async,
-    _golang_module_run,
-)
-
-from tests.conftest import (
-    COSMOS,
-    _make_libp2p_connection,
 )
+from tests.conftest import _make_libp2p_connection, COSMOS
 
 DEFAULT_PORT = 10234
 DEFAULT_NET_SIZE = 4
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
index 97553180c5..8b7d39157b 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
@@ -30,7 +30,6 @@
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
-
 from tests.conftest import (
     _make_libp2p_connection,
     libp2p_log_on_failure,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
index 08838b121a..9e726a4f15 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
@@ -29,16 +29,15 @@
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import (
-    PUBLIC_DHT_DELEGATE_URI_1,
-    PUBLIC_DHT_DELEGATE_URI_2,
-    PUBLIC_DHT_P2P_MADDR_1,
-    PUBLIC_DHT_P2P_MADDR_2,
     _make_libp2p_client_connection,
     _make_libp2p_connection,
     libp2p_log_on_failure,
     libp2p_log_on_failure_all,
+    PUBLIC_DHT_DELEGATE_URI_1,
+    PUBLIC_DHT_DELEGATE_URI_2,
+    PUBLIC_DHT_P2P_MADDR_1,
+    PUBLIC_DHT_P2P_MADDR_2,
 )
 
 DEFAULT_PORT = 10234
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
index fc3c87b396..0a03321867 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
@@ -20,7 +20,6 @@
 """This test module contains AEA cli tests for Libp2p tcp client connection."""
 from aea.multiplexer import Multiplexer
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import (
     _make_libp2p_connection,
     libp2p_log_on_failure,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
index 308f2b6bd2..82a4f55b3f 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
@@ -29,9 +29,7 @@
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
-
 from packages.fetchai.connections.p2p_libp2p_client.connection import Uri
-
 from tests.conftest import (
     _make_libp2p_client_connection,
     _make_libp2p_connection,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
index 4500e3c166..25c898821f 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
@@ -29,15 +29,13 @@
 from aea.crypto.registries import make_crypto
 from aea.identity.base import Identity
 from aea.multiplexer import Multiplexer
-
 from packages.fetchai.connections.p2p_libp2p_client.connection import (
     P2PLibp2pClientConnection,
 )
-
 from tests.conftest import (
-    COSMOS,
     _make_libp2p_client_connection,
     _make_libp2p_connection,
+    COSMOS,
     libp2p_log_on_failure,
 )
 
diff --git a/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py b/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
index d5cfccb73d..9c56863b1b 100644
--- a/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
+++ b/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
@@ -30,7 +30,6 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
-
 from packages.fetchai.connections.p2p_stub.connection import P2PStubConnection
 
 SEPARATOR = ","
diff --git a/tests/test_packages/test_connections/test_soef/models.py b/tests/test_packages/test_connections/test_soef/models.py
index 0f523d5807..a2dab6c1b3 100644
--- a/tests/test_packages/test_connections/test_soef/models.py
+++ b/tests/test_packages/test_connections/test_soef/models.py
@@ -19,10 +19,8 @@
 """This module contains models for soef connection tests."""
 
 from aea.helpers.search.models import Attribute, DataModel, Location
-
 from packages.fetchai.connections.soef.connection import ModelNames
 
-
 AGENT_LOCATION_MODEL = DataModel(
     ModelNames.location_agent,
     [
diff --git a/tests/test_packages/test_connections/test_soef/test_soef.py b/tests/test_packages/test_connections/test_soef/test_soef.py
index 4cd3630ffd..3957765ebb 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef.py
@@ -41,14 +41,12 @@
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-
 from packages.fetchai.connections.soef.connection import SOEFConnection, SOEFException
 from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID
 
 from . import models
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 46d4405451..413f6294c5 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -21,12 +21,11 @@
 import logging
 import time
 from threading import Thread
-from typing import Any, Dict, Optional, Tuple, cast
+from typing import Any, cast, Dict, Optional, Tuple
 from urllib.parse import urlencode
 
-from defusedxml import ElementTree as ET  # pylint: disable=wrong-import-order
-
 import pytest
+from defusedxml import ElementTree as ET  # pylint: disable=wrong-import-order
 
 from aea.configurations.base import ConnectionConfig, PublicId
 from aea.configurations.constants import DEFAULT_LEDGER
@@ -42,10 +41,8 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
-
 from packages.fetchai.connections.soef.connection import SOEFConnection
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-
 from tests.common.utils import wait_for_condition
 
 from . import models
diff --git a/tests/test_packages/test_connections/test_tcp/test_base.py b/tests/test_packages/test_connections/test_tcp/test_base.py
index 4381d84e28..c5a627a1bc 100644
--- a/tests/test_packages/test_connections/test_tcp/test_base.py
+++ b/tests/test_packages/test_connections/test_tcp/test_base.py
@@ -27,7 +27,6 @@
 
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
-
 from tests.conftest import (
     _make_tcp_client_connection,
     _make_tcp_server_connection,
diff --git a/tests/test_packages/test_connections/test_tcp/test_communication.py b/tests/test_packages/test_connections/test_tcp/test_communication.py
index 1a39f25d22..49da99d4f6 100644
--- a/tests/test_packages/test_connections/test_tcp/test_communication.py
+++ b/tests/test_packages/test_connections/test_tcp/test_communication.py
@@ -28,7 +28,6 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
-
 from tests.conftest import (
     _make_tcp_client_connection,
     _make_tcp_server_connection,
diff --git a/tests/test_packages/test_connections/test_webhook/test_webhook.py b/tests/test_packages/test_connections/test_webhook/test_webhook.py
index 369d7900e4..177842aade 100644
--- a/tests/test_packages/test_connections/test_webhook/test_webhook.py
+++ b/tests/test_packages/test_connections/test_webhook/test_webhook.py
@@ -26,9 +26,8 @@
 from unittest.mock import patch
 
 import aiohttp
-from aiohttp.client_reqrep import ClientResponse
-
 import pytest
+from aiohttp.client_reqrep import ClientResponse
 
 from aea.common import Address
 from aea.configurations.base import ConnectionConfig, PublicId
@@ -36,17 +35,12 @@
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue
-
 from packages.fetchai.connections.webhook.connection import WebhookConnection
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
-
 from tests.common.mocks import RegexComparator
-from tests.conftest import (
-    get_host,
-    get_unused_tcp_port,
-)
+from tests.conftest import get_host, get_unused_tcp_port
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_packages/test_contracts/test_erc1155/test_contract.py b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
index f2e9d58821..a30b081ff1 100644
--- a/tests/test_packages/test_contracts/test_erc1155/test_contract.py
+++ b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
@@ -30,7 +30,6 @@
     faucet_apis_registry,
     ledger_apis_registry,
 )
-
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_ADDRESS_ONE,
diff --git a/tests/test_packages/test_protocols/test_contract_api.py b/tests/test_packages/test_protocols/test_contract_api.py
index 397cc26142..af7ee43db4 100644
--- a/tests/test_packages/test_protocols/test_contract_api.py
+++ b/tests/test_packages/test_protocols/test_contract_api.py
@@ -26,14 +26,13 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.contract_api.dialogues import (
     ContractApiDialogue,
     ContractApiDialogues,
@@ -42,7 +41,6 @@
 from packages.fetchai.protocols.contract_api.message import (
     logger as contract_api_message_logger,
 )
-
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_fipa.py b/tests/test_packages/test_protocols/test_fipa.py
index abead1272a..ebbcf70e7b 100644
--- a/tests/test_packages/test_protocols/test_fipa.py
+++ b/tests/test_packages/test_protocols/test_fipa.py
@@ -26,6 +26,7 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.helpers.search.models import Constraint, ConstraintType, Description, Query
@@ -33,12 +34,9 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.fipa.message import logger as fipa_message_logger
-
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_gym.py b/tests/test_packages/test_protocols/test_gym.py
index 330e9a7833..9393c45328 100644
--- a/tests/test_packages/test_protocols/test_gym.py
+++ b/tests/test_packages/test_protocols/test_gym.py
@@ -25,18 +25,16 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.gym.dialogues import GymDialogue, GymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.protocols.gym.message import logger as gym_message_logger
-
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_http.py b/tests/test_packages/test_protocols/test_http.py
index 0d7d8d9833..39eaaffc5d 100644
--- a/tests/test_packages/test_protocols/test_http.py
+++ b/tests/test_packages/test_protocols/test_http.py
@@ -25,18 +25,16 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.http.message import logger as http_message_logger
-
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_ledger_api.py b/tests/test_packages/test_protocols/test_ledger_api.py
index 01b64fce26..89ab8c7914 100644
--- a/tests/test_packages/test_protocols/test_ledger_api.py
+++ b/tests/test_packages/test_protocols/test_ledger_api.py
@@ -25,14 +25,13 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.ledger_api.dialogues import (
     LedgerApiDialogue,
     LedgerApiDialogues,
@@ -41,7 +40,6 @@
 from packages.fetchai.protocols.ledger_api.message import (
     logger as ledger_api_message_logger,
 )
-
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_ml_trade.py b/tests/test_packages/test_protocols/test_ml_trade.py
index df379a7c7e..fc93e3ba1c 100644
--- a/tests/test_packages/test_protocols/test_ml_trade.py
+++ b/tests/test_packages/test_protocols/test_ml_trade.py
@@ -26,29 +26,22 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
-from aea.helpers.search.models import (
-    Constraint,
-    ConstraintType,
-    Description,
-    Query,
-)
+from aea.helpers.search.models import Constraint, ConstraintType, Description, Query
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.ml_trade.dialogues import (
     MlTradeDialogue,
     MlTradeDialogues,
 )
-from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.ml_trade.message import (
     logger as ml_trade_message_logger,
 )
-
+from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_oef_search.py b/tests/test_packages/test_protocols/test_oef_search.py
index 6c73e6d1e1..41f2d1dccc 100644
--- a/tests/test_packages/test_protocols/test_oef_search.py
+++ b/tests/test_packages/test_protocols/test_oef_search.py
@@ -25,29 +25,22 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
-from aea.helpers.search.models import (
-    Constraint,
-    ConstraintType,
-    Description,
-    Query,
-)
+from aea.helpers.search.models import Constraint, ConstraintType, Description, Query
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue,
     OefSearchDialogues,
 )
-from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.oef_search.message import (
     logger as oef_search_message_logger,
 )
-
+from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_tac.py b/tests/test_packages/test_protocols/test_tac.py
index 2ea87db305..f9dd8f5ad8 100644
--- a/tests/test_packages/test_protocols/test_tac.py
+++ b/tests/test_packages/test_protocols/test_tac.py
@@ -25,18 +25,16 @@
 
 import pytest
 
+import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
-
-import packages
 from packages.fetchai.protocols.tac.dialogues import TacDialogue, TacDialogues
-from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.protocols.tac.message import logger as tac_message_logger
-
+from packages.fetchai.protocols.tac.message import TacMessage
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_skills/test_carpark.py b/tests/test_packages/test_skills/test_carpark.py
index a95f7128b1..ca63ad4c3e 100644
--- a/tests/test_packages/test_skills/test_carpark.py
+++ b/tests/test_packages/test_skills/test_carpark.py
@@ -24,7 +24,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_erc1155.py b/tests/test_packages/test_skills/test_erc1155.py
index f785a87681..439bdf5b27 100644
--- a/tests/test_packages/test_skills/test_erc1155.py
+++ b/tests/test_packages/test_skills/test_erc1155.py
@@ -23,7 +23,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_generic.py b/tests/test_packages/test_skills/test_generic.py
index d320798742..7791c37d50 100644
--- a/tests/test_packages/test_skills/test_generic.py
+++ b/tests/test_packages/test_skills/test_generic.py
@@ -23,7 +23,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_gym.py b/tests/test_packages/test_skills/test_gym.py
index 1d2126cf88..4f5f3544d2 100644
--- a/tests/test_packages/test_skills/test_gym.py
+++ b/tests/test_packages/test_skills/test_gym.py
@@ -22,9 +22,7 @@
 import os
 import shutil
 
-
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import ROOT_DIR
 
 
diff --git a/tests/test_packages/test_skills/test_http_echo.py b/tests/test_packages/test_skills/test_http_echo.py
index e476ed7de2..f44520bc57 100644
--- a/tests/test_packages/test_skills/test_http_echo.py
+++ b/tests/test_packages/test_skills/test_http_echo.py
@@ -24,7 +24,6 @@
 import requests
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
-
 from tests.conftest import ROOT_DIR
 
 API_SPEC_PATH = Path(ROOT_DIR, "examples", "http_ex", "petstore.yaml").absolute()
diff --git a/tests/test_packages/test_skills/test_ml_skills.py b/tests/test_packages/test_skills/test_ml_skills.py
index 3ed1c80747..0d17f5cc40 100644
--- a/tests/test_packages/test_skills/test_ml_skills.py
+++ b/tests/test_packages/test_skills/test_ml_skills.py
@@ -25,7 +25,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index a2397ffcbc..0ea77c3680 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -23,7 +23,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_thermometer.py b/tests/test_packages/test_skills/test_thermometer.py
index 0d87abf663..c000784bcd 100644
--- a/tests/test_packages/test_skills/test_thermometer.py
+++ b/tests/test_packages/test_skills/test_thermometer.py
@@ -23,7 +23,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_weather.py b/tests/test_packages/test_skills/test_weather.py
index 76f159df7a..ecf0d33309 100644
--- a/tests/test_packages/test_skills/test_weather.py
+++ b/tests/test_packages/test_skills/test_weather.py
@@ -23,7 +23,6 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
-
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_protocols/test_base.py b/tests/test_protocols/test_base.py
index 357b1e9a8e..dd7f7c9e2b 100644
--- a/tests/test_protocols/test_base.py
+++ b/tests/test_protocols/test_base.py
@@ -40,7 +40,6 @@
     StateUpdateDialogue,
     StateUpdateDialogues,
 )
-
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID
 
 
diff --git a/tests/test_protocols/test_dialogue/test_base.py b/tests/test_protocols/test_dialogue/test_base.py
index 272676ca91..de3c33d420 100644
--- a/tests/test_protocols/test_dialogue/test_base.py
+++ b/tests/test_protocols/test_dialogue/test_base.py
@@ -19,7 +19,7 @@
 
 """This module contains the tests for the dialogue/base.py module."""
 
-from typing import FrozenSet, Tuple, Type, cast
+from typing import cast, FrozenSet, Tuple, Type
 
 import pytest
 
@@ -28,9 +28,9 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-from aea.protocols.dialogue.base import DialogueLabel, DialogueStats
+from aea.protocols.dialogue.base import DialogueLabel
 from aea.protocols.dialogue.base import Dialogues as BaseDialogues
-from aea.protocols.dialogue.base import InvalidDialogueMessage
+from aea.protocols.dialogue.base import DialogueStats, InvalidDialogueMessage
 from aea.protocols.state_update.message import StateUpdateMessage
 
 
diff --git a/tests/test_protocols/test_generator/test_common.py b/tests/test_protocols/test_generator/test_common.py
index 0c6a86960e..f31b8a072e 100644
--- a/tests/test_protocols/test_generator/test_common.py
+++ b/tests/test_protocols/test_generator/test_common.py
@@ -23,7 +23,7 @@
 import tempfile
 from pathlib import Path
 from subprocess import CalledProcessError  # nosec
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.protocols.generator.common import (
     _camel_case_to_snake_case,
@@ -42,7 +42,6 @@
     try_run_black_formatting,
     try_run_protoc,
 )
-
 from tests.test_protocols.test_generator.common import (
     PATH_TO_T_PROTOCOL_SPECIFICATION,
     T_PROTOCOL_NAME,
diff --git a/tests/test_protocols/test_generator/test_end_to_end.py b/tests/test_protocols/test_generator/test_end_to_end.py
index d1b98204c1..217ecf0c9c 100644
--- a/tests/test_protocols/test_generator/test_end_to_end.py
+++ b/tests/test_protocols/test_generator/test_end_to_end.py
@@ -24,30 +24,22 @@
 import time
 from pathlib import Path
 from threading import Thread
-from typing import Optional, cast
+from typing import cast, Optional
 
 from aea.aea_builder import AEABuilder
-from aea.configurations.base import (
-    ComponentType,
-    ProtocolId,
-    PublicId,
-    SkillConfig,
-)
+from aea.configurations.base import ComponentType, ProtocolId, PublicId, SkillConfig
 from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PRIVATE_KEY_FILE
 from aea.crypto.helpers import create_private_key
 from aea.protocols.base import Address, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Handler, Skill, SkillContext
 from aea.test_tools.test_cases import UseOef
-
 from tests.conftest import ROOT_DIR
 from tests.data.generator.t_protocol.dialogues import (
     TProtocolDialogue,
     TProtocolDialogues,
 )
-from tests.data.generator.t_protocol.message import (  # type: ignore
-    TProtocolMessage,
-)
+from tests.data.generator.t_protocol.message import TProtocolMessage  # type: ignore
 from tests.test_protocols.test_generator.common import PATH_TO_T_PROTOCOL
 
 logger = logging.getLogger("aea")
diff --git a/tests/test_protocols/test_generator/test_extract_specification.py b/tests/test_protocols/test_generator/test_extract_specification.py
index 9f1122363b..deb111388d 100644
--- a/tests/test_protocols/test_generator/test_extract_specification.py
+++ b/tests/test_protocols/test_generator/test_extract_specification.py
@@ -21,12 +21,11 @@
 import os
 import shutil
 import tempfile
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.configurations.base import ProtocolSpecificationParseError
 from aea.protocols.generator.common import load_protocol_specification
 from aea.protocols.generator.extract_specification import (
-    PythonicProtocolSpecification,
     _ct_specification_type_to_python_type,
     _mt_specification_type_to_python_type,
     _optional_specification_type_to_python_type,
@@ -35,8 +34,8 @@
     _pt_specification_type_to_python_type,
     _specification_type_to_python_type,
     extract,
+    PythonicProtocolSpecification,
 )
-
 from tests.test_protocols.test_generator.common import PATH_TO_T_PROTOCOL_SPECIFICATION
 
 logger = logging.getLogger("aea")
diff --git a/tests/test_protocols/test_generator/test_generator.py b/tests/test_protocols/test_generator/test_generator.py
index 1d57fcee60..82e074b89c 100644
--- a/tests/test_protocols/test_generator/test_generator.py
+++ b/tests/test_protocols/test_generator/test_generator.py
@@ -24,7 +24,7 @@
 import tempfile
 from pathlib import Path
 from typing import cast
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import pytest
 
@@ -33,18 +33,14 @@
     ProtocolSpecificationParseError,
 )
 from aea.protocols.generator.base import ProtocolGenerator
-
 from tests.conftest import ROOT_DIR
-from tests.data.generator.t_protocol.message import (  # type: ignore
-    TProtocolMessage,
-)
+from tests.data.generator.t_protocol.message import TProtocolMessage  # type: ignore
 from tests.test_protocols.test_generator.common import (
     PATH_TO_T_PROTOCOL,
     PATH_TO_T_PROTOCOL_SPECIFICATION,
     T_PROTOCOL_NAME,
 )
 
-
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_protocols/test_generator/test_validate.py b/tests/test_protocols/test_generator/test_validate.py
index eeeda771f3..9211f29623 100644
--- a/tests/test_protocols/test_generator/test_validate.py
+++ b/tests/test_protocols/test_generator/test_validate.py
@@ -18,14 +18,10 @@
 # ------------------------------------------------------------------------------
 """This module contains the tests for generator/validate.py module."""
 import logging
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 from aea.configurations.base import CRUDCollection, SpeechActContentConfig
 from aea.protocols.generator.validate import (
-    CONTENT_NAME_REGEX_PATTERN,
-    END_STATE_REGEX_PATTERN,
-    PERFORMATIVE_REGEX_PATTERN,
-    ROLE_REGEX_PATTERN,
     _has_brackets,
     _is_reserved_name,
     _is_valid_content_type_format,
@@ -48,6 +44,10 @@
     _validate_roles,
     _validate_speech_acts_section,
     _validate_termination,
+    CONTENT_NAME_REGEX_PATTERN,
+    END_STATE_REGEX_PATTERN,
+    PERFORMATIVE_REGEX_PATTERN,
+    ROLE_REGEX_PATTERN,
     validate,
 )
 
diff --git a/tests/test_protocols/test_signing.py b/tests/test_protocols/test_signing.py
index a548e4fa02..24fe1adcf9 100644
--- a/tests/test_protocols/test_signing.py
+++ b/tests/test_protocols/test_signing.py
@@ -30,7 +30,6 @@
     Terms,
 )
 from aea.protocols.signing.message import SigningMessage
-
 from tests.conftest import COSMOS
 
 
diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index 35c145764a..3bc28e1d4d 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -53,8 +53,7 @@
 )
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
-
-from tests.conftest import CUR_PATH, ROOT_DIR, _make_dummy_connection
+from tests.conftest import _make_dummy_connection, CUR_PATH, ROOT_DIR
 
 
 class TestContractRegistry:
diff --git a/tests/test_registries/test_filter.py b/tests/test_registries/test_filter.py
index eb28fd0f12..4e34d9f14d 100644
--- a/tests/test_registries/test_filter.py
+++ b/tests/test_registries/test_filter.py
@@ -22,7 +22,6 @@
 
 import pytest
 
-
 import aea
 from aea.configurations.base import PublicId, SkillConfig
 from aea.helpers.async_friendly_queue import AsyncFriendlyQueue
@@ -30,7 +29,6 @@
 from aea.registries.filter import Filter
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
-
 from tests.data.dummy_skill.behaviours import DummyBehaviour
 from tests.data.dummy_skill.handlers import DummyHandler
 
diff --git a/tests/test_runner.py b/tests/test_runner.py
index 36b7be2137..cfeb15bf65 100644
--- a/tests/test_runner.py
+++ b/tests/test_runner.py
@@ -25,13 +25,10 @@
 from aea.aea_builder import AEABuilder
 from aea.configurations.base import SkillConfig
 from aea.configurations.constants import DEFAULT_LEDGER
-from aea.helpers.multiple_executor import (
-    ExecutorExceptionPolicies,
-    logger as executor_logger,
-)
+from aea.helpers.multiple_executor import ExecutorExceptionPolicies
+from aea.helpers.multiple_executor import logger as executor_logger
 from aea.runner import AEARunner
 from aea.skills.base import Skill, SkillContext
-
 from tests.common.utils import make_behaviour_cls_from_funcion, wait_for_condition
 from tests.conftest import FETCHAI_PRIVATE_KEY_PATH
 
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
index e786ee55f5..c111287df1 100644
--- a/tests/test_runtime.py
+++ b/tests/test_runtime.py
@@ -27,8 +27,6 @@
 from aea.aea_builder import AEABuilder
 from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PRIVATE_KEY_FILE
 from aea.runtime import AsyncRuntime, BaseRuntime, RuntimeStates, ThreadedRuntime
-
-
 from tests.common.utils import run_in_thread, wait_for_condition
 from tests.conftest import CUR_PATH
 
diff --git a/tests/test_skills/test_base.py b/tests/test_skills/test_base.py
index 4becbd346d..a1f193b8e2 100644
--- a/tests/test_skills/test_base.py
+++ b/tests/test_skills/test_base.py
@@ -23,7 +23,7 @@
 from pathlib import Path
 from queue import Queue
 from types import SimpleNamespace
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 from unittest.mock import MagicMock, Mock
 
 import pytest
@@ -39,23 +39,22 @@
 from aea.protocols.base import Message
 from aea.registries.resources import Resources
 from aea.skills.base import (
+    _check_duplicate_classes,
+    _print_warning_message_for_non_declared_skill_components,
     Behaviour,
     Handler,
     Model,
     Skill,
     SkillComponent,
     SkillContext,
-    _check_duplicate_classes,
-    _print_warning_message_for_non_declared_skill_components,
 )
-
 from tests.conftest import (
+    _make_dummy_connection,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_PATH,
     FETCHAI,
     FETCHAI_PRIVATE_KEY_PATH,
     ROOT_DIR,
-    _make_dummy_connection,
 )
 
 
diff --git a/tests/test_skills/test_behaviours.py b/tests/test_skills/test_behaviours.py
index d0cf7fd4fb..9aee8d143e 100644
--- a/tests/test_skills/test_behaviours.py
+++ b/tests/test_skills/test_behaviours.py
@@ -19,7 +19,7 @@
 
 """This module contains the tests for the behaviours."""
 from collections import Counter
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 
 import pytest
 
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index 926951face..a397c3ba1a 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -35,12 +35,9 @@
 from aea.registries.resources import Resources
 from aea.skills.base import SkillContext
 from aea.skills.error.handlers import ErrorHandler
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
-
 from tests.common.utils import wait_for_condition
-from tests.conftest import CUR_PATH, _make_dummy_connection
-
+from tests.conftest import _make_dummy_connection, CUR_PATH
 
 logger = logging.getLogger(__file__)
 
diff --git a/tests/test_skills/test_tasks.py b/tests/test_skills/test_tasks.py
index 4308e14740..336ec68d3f 100644
--- a/tests/test_skills/test_tasks.py
+++ b/tests/test_skills/test_tasks.py
@@ -19,10 +19,10 @@
 
 """This module contains the tests for the tasks module."""
 
-from unittest import TestCase, mock
+from unittest import mock, TestCase
 from unittest.mock import Mock, patch
 
-from aea.skills.tasks import Task, TaskManager, init_worker
+from aea.skills.tasks import init_worker, Task, TaskManager
 
 
 def _raise_exception(self, *args, **kwargs):
diff --git a/tests/test_test_tools/test_testcases.py b/tests/test_test_tools/test_testcases.py
index 0a4567d923..22f5abc4ca 100644
--- a/tests/test_test_tools/test_testcases.py
+++ b/tests/test_test_tools/test_testcases.py
@@ -31,11 +31,9 @@
 from aea.protocols.dialogue.base import Dialogue
 from aea.test_tools.exceptions import AEATestingException
 from aea.test_tools.test_cases import AEATestCase, AEATestCaseEmpty
-
 from tests.conftest import FETCHAI
 from tests.test_cli import test_generate_wealth, test_interact
 
-
 TestWealthCommandsPositive = test_generate_wealth.TestWealthCommandsPositive
 TestInteractCommand = test_interact.TestInteractCommand
 
diff --git a/tox.ini b/tox.ini
index ed4f4b27b6..d1eab833e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,6 +69,18 @@ skip_install = True
 deps = black==19.10b0
 commands = black aea benchmark examples packages scripts tests --check --verbose
 
+[testenv:isort]
+skipsdist = True
+skip_install = True
+deps = isort==5.5.2
+commands = isort aea benchmark examples packages scripts tests
+
+[testenv:isort-check]
+skipsdist = True
+skip_install = True
+deps = isort==5.5.2
+commands = isort --check-only --verbose aea benchmark examples packages scripts tests
+
 [testenv:copyright_check]
 skipsdist = True
 skip_install = True
@@ -126,7 +138,7 @@ deps = flake8==3.7.9
        flake8-bugbear==20.1.4
        flake8-docstrings==1.5.0
        flake8-eradicate==0.4.0
-       flake8-import-order==0.18.1
+       flake8-isort==4.0.0
        pydocstyle==3.0.0
 commands = flake8 aea benchmark examples packages scripts tests
 

From 1ba6d13066cb7a08230a683c03582bac12e14a60 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 15:34:54 +0200
Subject: [PATCH 014/131] use isort with order_by_type=True

---
 aea/aea.py                                    |  2 +-
 aea/aea_builder.py                            |  4 +-
 aea/agent_loop.py                             |  2 +-
 aea/cli/config.py                             |  2 +-
 aea/cli/create.py                             |  4 +-
 aea/cli/fetch.py                              |  2 +-
 aea/cli/fingerprint.py                        |  6 +-
 aea/cli/freeze.py                             |  2 +-
 aea/cli/generate_key.py                       |  2 +-
 aea/cli/generate_wealth.py                    |  2 +-
 aea/cli/get_multiaddress.py                   |  2 +-
 aea/cli/get_wealth.py                         |  2 +-
 aea/cli/install.py                            |  2 +-
 aea/cli/interact.py                           |  2 +-
 aea/cli/launch.py                             |  2 +-
 aea/cli/list.py                               |  2 +-
 aea/cli/publish.py                            |  2 +-
 aea/cli/run.py                                |  2 +-
 aea/cli/search.py                             |  2 +-
 aea/cli/utils/config.py                       |  2 +-
 aea/cli/utils/context.py                      |  4 +-
 aea/cli/utils/decorators.py                   |  6 +-
 aea/cli/utils/package_utils.py                |  6 +-
 aea/cli_gui/__init__.py                       |  2 +-
 aea/configurations/base.py                    |  2 +-
 aea/configurations/loader.py                  |  2 +-
 aea/configurations/pypi.py                    |  2 +-
 aea/connections/base.py                       |  2 +-
 aea/connections/stub/connection.py            |  2 +-
 aea/connections/stub/connection.yaml          |  2 +-
 aea/contracts/base.py                         |  2 +-
 aea/crypto/ethereum.py                        |  2 +-
 aea/crypto/fetchai.py                         |  2 +-
 aea/crypto/helpers.py                         |  2 +-
 aea/crypto/ledger_apis.py                     |  2 +-
 aea/crypto/wallet.py                          |  2 +-
 aea/decision_maker/default.py                 |  2 +-
 aea/helpers/logging.py                        |  2 +-
 aea/helpers/multiaddr/base.py                 |  2 +-
 aea/helpers/multiple_executor.py              |  2 +-
 aea/helpers/search/models.py                  |  2 +-
 aea/multiplexer.py                            |  2 +-
 aea/protocols/base.py                         |  2 +-
 aea/protocols/default/dialogues.py            |  2 +-
 aea/protocols/default/message.py              |  2 +-
 aea/protocols/default/protocol.yaml           |  6 +-
 aea/protocols/default/serialization.py        |  2 +-
 aea/protocols/dialogue/base.py                |  2 +-
 aea/protocols/generator/base.py               | 20 ++---
 .../generator/extract_specification.py        |  4 +-
 aea/protocols/generator/validate.py           |  6 +-
 aea/protocols/signing/dialogues.py            |  2 +-
 aea/protocols/signing/message.py              |  2 +-
 aea/protocols/signing/protocol.yaml           |  6 +-
 aea/protocols/signing/serialization.py        |  2 +-
 aea/protocols/state_update/dialogues.py       |  2 +-
 aea/protocols/state_update/message.py         |  2 +-
 aea/protocols/state_update/protocol.yaml      |  6 +-
 aea/protocols/state_update/serialization.py   |  2 +-
 aea/registries/base.py                        |  2 +-
 aea/registries/resources.py                   |  2 +-
 aea/runtime.py                                |  2 +-
 aea/skills/base.py                            |  2 +-
 aea/skills/tasks.py                           |  2 +-
 aea/test_tools/test_cases.py                  |  2 +-
 benchmark/checks/check_reactive.py            |  2 +-
 examples/gym_ex/proxy/env.py                  |  2 +-
 .../fetchai/connections/gym/connection.py     |  2 +-
 .../fetchai/connections/gym/connection.yaml   |  2 +-
 .../connections/http_client/connection.py     |  2 +-
 .../connections/http_client/connection.yaml   |  2 +-
 .../connections/http_server/connection.py     |  4 +-
 .../connections/http_server/connection.yaml   |  2 +-
 packages/fetchai/connections/ledger/base.py   |  2 +-
 .../fetchai/connections/ledger/connection.py  |  2 +-
 .../connections/ledger/connection.yaml        |  6 +-
 .../connections/ledger/contract_dispatcher.py |  2 +-
 .../fetchai/connections/local/connection.py   |  2 +-
 .../fetchai/connections/local/connection.yaml |  2 +-
 .../fetchai/connections/oef/connection.py     |  2 +-
 .../fetchai/connections/oef/connection.yaml   |  2 +-
 .../connections/p2p_libp2p/connection.py      |  2 +-
 .../connections/p2p_libp2p/connection.yaml    |  2 +-
 .../p2p_libp2p_client/connection.py           |  2 +-
 .../p2p_libp2p_client/connection.yaml         |  2 +-
 .../connections/p2p_stub/connection.py        |  2 +-
 .../connections/p2p_stub/connection.yaml      |  2 +-
 .../fetchai/connections/soef/connection.py    |  2 +-
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 .../fetchai/connections/tcp/connection.yaml   |  4 +-
 .../fetchai/connections/tcp/tcp_client.py     |  2 +-
 .../fetchai/connections/tcp/tcp_server.py     |  2 +-
 .../fetchai/connections/webhook/connection.py |  4 +-
 .../connections/webhook/connection.yaml       |  2 +-
 .../fetchai/contracts/erc1155/contract.py     |  2 +-
 .../fetchai/contracts/erc1155/contract.yaml   |  2 +-
 .../protocols/contract_api/dialogues.py       |  2 +-
 .../fetchai/protocols/contract_api/message.py |  2 +-
 .../protocols/contract_api/protocol.yaml      |  6 +-
 .../protocols/contract_api/serialization.py   |  2 +-
 packages/fetchai/protocols/fipa/dialogues.py  |  2 +-
 packages/fetchai/protocols/fipa/message.py    |  2 +-
 packages/fetchai/protocols/fipa/protocol.yaml |  6 +-
 .../fetchai/protocols/fipa/serialization.py   |  2 +-
 packages/fetchai/protocols/gym/dialogues.py   |  2 +-
 packages/fetchai/protocols/gym/message.py     |  2 +-
 packages/fetchai/protocols/gym/protocol.yaml  |  6 +-
 .../fetchai/protocols/gym/serialization.py    |  2 +-
 packages/fetchai/protocols/http/dialogues.py  |  2 +-
 packages/fetchai/protocols/http/message.py    |  2 +-
 packages/fetchai/protocols/http/protocol.yaml |  6 +-
 .../fetchai/protocols/http/serialization.py   |  2 +-
 .../fetchai/protocols/ledger_api/dialogues.py |  2 +-
 .../fetchai/protocols/ledger_api/message.py   |  2 +-
 .../protocols/ledger_api/protocol.yaml        |  6 +-
 .../protocols/ledger_api/serialization.py     |  2 +-
 .../fetchai/protocols/ml_trade/dialogues.py   |  2 +-
 .../fetchai/protocols/ml_trade/message.py     |  2 +-
 .../fetchai/protocols/ml_trade/protocol.yaml  |  6 +-
 .../protocols/ml_trade/serialization.py       |  2 +-
 .../fetchai/protocols/oef_search/dialogues.py |  2 +-
 .../fetchai/protocols/oef_search/message.py   |  2 +-
 .../protocols/oef_search/protocol.yaml        |  6 +-
 .../protocols/oef_search/serialization.py     |  2 +-
 packages/fetchai/protocols/tac/dialogues.py   |  2 +-
 packages/fetchai/protocols/tac/message.py     |  2 +-
 packages/fetchai/protocols/tac/protocol.yaml  |  6 +-
 .../fetchai/protocols/tac/serialization.py    |  2 +-
 .../fetchai/skills/aries_alice/behaviours.py  |  4 +-
 .../fetchai/skills/aries_alice/handlers.py    |  2 +-
 .../fetchai/skills/aries_alice/skill.yaml     |  4 +-
 .../fetchai/skills/aries_faber/behaviours.py  |  4 +-
 .../fetchai/skills/aries_faber/handlers.py    |  4 +-
 .../fetchai/skills/aries_faber/skill.yaml     |  4 +-
 .../fetchai/skills/erc1155_client/handlers.py |  2 +-
 .../fetchai/skills/erc1155_client/skill.yaml  |  2 +-
 .../fetchai/skills/erc1155_deploy/handlers.py |  2 +-
 .../fetchai/skills/erc1155_deploy/skill.yaml  |  2 +-
 .../fetchai/skills/generic_buyer/handlers.py  |  2 +-
 .../fetchai/skills/generic_buyer/skill.yaml   |  2 +-
 .../fetchai/skills/generic_seller/handlers.py |  2 +-
 .../fetchai/skills/generic_seller/skill.yaml  |  2 +-
 packages/fetchai/skills/gym/helpers.py        |  2 +-
 packages/fetchai/skills/gym/skill.yaml        |  4 +-
 packages/fetchai/skills/gym/tasks.py          |  2 +-
 .../skills/ml_data_provider/handlers.py       |  2 +-
 .../skills/ml_data_provider/skill.yaml        |  2 +-
 packages/fetchai/skills/ml_train/handlers.py  |  2 +-
 packages/fetchai/skills/ml_train/skill.yaml   |  2 +-
 .../simple_service_registration/handlers.py   |  2 +-
 .../simple_service_registration/skill.yaml    |  2 +-
 .../fetchai/skills/tac_control/behaviours.py  |  2 +-
 packages/fetchai/skills/tac_control/game.py   |  2 +-
 .../fetchai/skills/tac_control/handlers.py    |  2 +-
 .../fetchai/skills/tac_control/helpers.py     |  2 +-
 .../fetchai/skills/tac_control/skill.yaml     |  8 +-
 .../skills/tac_control_contract/behaviours.py |  2 +-
 .../skills/tac_control_contract/game.py       |  2 +-
 .../skills/tac_control_contract/helpers.py    |  2 +-
 .../skills/tac_control_contract/skill.yaml    |  6 +-
 .../skills/tac_negotiation/dialogues.py       |  2 +-
 .../skills/tac_negotiation/handlers.py        |  2 +-
 .../fetchai/skills/tac_negotiation/helpers.py |  2 +-
 .../fetchai/skills/tac_negotiation/skill.yaml | 10 +--
 .../skills/tac_negotiation/strategy.py        |  2 +-
 .../skills/tac_negotiation/transactions.py    |  2 +-
 .../skills/tac_participation/behaviours.py    |  2 +-
 .../skills/tac_participation/handlers.py      |  2 +-
 .../skills/tac_participation/skill.yaml       |  4 +-
 .../weather_station/db_communication.py       |  2 +-
 .../fetchai/skills/weather_station/skill.yaml |  2 +-
 packages/hashes.csv                           | 80 +++++++++----------
 scripts/acn/run_acn_node_standalone.py        |  2 +-
 scripts/generate_ipfs_hashes.py               |  4 +-
 setup.cfg                                     |  3 +-
 tests/conftest.py                             | 10 ++-
 tests/data/generator/t_protocol/dialogues.py  |  2 +-
 tests/data/generator/t_protocol/message.py    |  2 +-
 .../generator/t_protocol/serialization.py     |  2 +-
 .../generator/t_protocol_no_ct/dialogues.py   |  2 +-
 .../generator/t_protocol_no_ct/message.py     |  2 +-
 .../t_protocol_no_ct/serialization.py         |  2 +-
 tests/test_aea.py                             |  2 +-
 tests/test_aea_builder.py                     |  6 +-
 tests/test_cli/test_add/test_connection.py    |  4 +-
 tests/test_cli/test_add/test_contract.py      |  4 +-
 tests/test_cli/test_add/test_generic.py       |  2 +-
 tests/test_cli/test_add/test_protocol.py      |  4 +-
 tests/test_cli/test_add/test_skill.py         |  6 +-
 tests/test_cli/test_add_key.py                |  6 +-
 tests/test_cli/test_config.py                 |  2 +-
 tests/test_cli/test_core.py                   |  2 +-
 tests/test_cli/test_create.py                 |  2 +-
 tests/test_cli/test_fetch.py                  |  4 +-
 tests/test_cli/test_fingerprint.py            |  2 +-
 tests/test_cli/test_freeze.py                 |  2 +-
 tests/test_cli/test_generate/test_generate.py |  2 +-
 .../test_cli/test_generate/test_protocols.py  |  2 +-
 tests/test_cli/test_generate_key.py           |  2 +-
 tests/test_cli/test_generate_wealth.py        |  4 +-
 tests/test_cli/test_get_address.py            |  4 +-
 tests/test_cli/test_get_wealth.py             |  4 +-
 tests/test_cli/test_install.py                |  4 +-
 tests/test_cli/test_interact.py               |  2 +-
 tests/test_cli/test_launch.py                 |  2 +-
 tests/test_cli/test_list.py                   |  4 +-
 tests/test_cli/test_loggers.py                |  2 +-
 tests/test_cli/test_login.py                  |  2 +-
 tests/test_cli/test_logout.py                 |  2 +-
 tests/test_cli/test_publish.py                |  2 +-
 tests/test_cli/test_push.py                   |  2 +-
 tests/test_cli/test_register.py               |  2 +-
 tests/test_cli/test_registry/test_add.py      |  2 +-
 tests/test_cli/test_registry/test_fetch.py    |  2 +-
 tests/test_cli/test_registry/test_login.py    |  2 +-
 tests/test_cli/test_registry/test_logout.py   |  2 +-
 tests/test_cli/test_registry/test_publish.py  |  2 +-
 tests/test_cli/test_registry/test_push.py     |  2 +-
 .../test_registry/test_registration.py        |  2 +-
 tests/test_cli/test_registry/test_utils.py    |  2 +-
 tests/test_cli/test_remove/test_connection.py |  2 +-
 tests/test_cli/test_remove/test_contract.py   |  2 +-
 tests/test_cli/test_remove/test_protocol.py   |  2 +-
 .../test_cli/test_remove/test_remove_item.py  |  2 +-
 tests/test_cli/test_remove/test_skill.py      |  4 +-
 tests/test_cli/test_run.py                    |  4 +-
 .../test_cli/test_scaffold/test_connection.py |  2 +-
 tests/test_cli/test_scaffold/test_generic.py  |  2 +-
 .../test_cli/test_scaffold/test_protocols.py  |  2 +-
 tests/test_cli/test_scaffold/test_skills.py   |  2 +-
 tests/test_cli/test_search.py                 |  4 +-
 tests/test_cli/test_utils/test_config.py      |  2 +-
 tests/test_cli/test_utils/test_utils.py       |  4 +-
 tests/test_cli_gui/test_create.py             |  2 +-
 tests/test_cli_gui/test_get_items.py          |  2 +-
 tests/test_cli_gui/test_run_agent.py          |  2 +-
 tests/test_cli_gui/test_utils.py              |  4 +-
 tests/test_configurations/test_base.py        | 14 ++--
 tests/test_configurations/test_schema.py      | 12 +--
 tests/test_connections/test_stub.py           |  4 +-
 tests/test_crypto/test_fetchai.py             |  2 +-
 tests/test_decision_maker/test_default.py     |  2 +-
 .../programmatic_aea.py                       |  2 +-
 .../programmatic_aea.py                       |  2 +-
 .../decision_maker_transaction.py             |  2 +-
 tests/test_examples/test_gym_ex.py            |  2 +-
 tests/test_helpers/test_async_utils.py        |  4 +-
 tests/test_helpers/test_base.py               |  4 +-
 tests/test_helpers/test_ipfs/test_base.py     |  2 +-
 tests/test_helpers/test_pipe/test_pipe.py     |  4 +-
 tests/test_helpers/test_search/test_models.py |  2 +-
 tests/test_launcher.py                        |  4 +-
 tests/test_mail/test_base.py                  |  4 +-
 tests/test_multiplexer.py                     |  6 +-
 .../test_http_client/test_http_client.py      |  2 +-
 .../test_http_server/test_http_server.py      |  6 +-
 .../test_local/test_search_services.py        |  2 +-
 .../test_oef/test_communication.py            |  4 +-
 .../test_p2p_libp2p/test_errors.py            |  8 +-
 .../test_p2p_libp2p/test_public_dht.py        |  8 +-
 .../test_p2p_libp2p_client/test_errors.py     |  2 +-
 .../test_soef/test_soef_integration.py        |  2 +-
 .../test_protocols/test_ml_trade.py           |  2 +-
 .../test_protocols/test_oef_search.py         |  2 +-
 .../test_packages/test_protocols/test_tac.py  |  2 +-
 .../test_protocols/test_dialogue/test_base.py |  2 +-
 .../test_generator/test_common.py             |  2 +-
 .../test_generator/test_end_to_end.py         |  2 +-
 .../test_extract_specification.py             |  4 +-
 .../test_generator/test_generator.py          |  2 +-
 .../test_generator/test_validate.py           | 10 +--
 tests/test_registries/test_base.py            |  2 +-
 tests/test_skills/test_base.py                |  8 +-
 tests/test_skills/test_behaviours.py          |  2 +-
 tests/test_skills/test_error.py               |  2 +-
 tests/test_skills/test_tasks.py               |  4 +-
 276 files changed, 444 insertions(+), 439 deletions(-)

diff --git a/aea/aea.py b/aea/aea.py
index 882228b277..bb3ff4c5e2 100644
--- a/aea/aea.py
+++ b/aea/aea.py
@@ -25,7 +25,6 @@
 from typing import (
     Any,
     Callable,
-    cast,
     Collection,
     Dict,
     List,
@@ -33,6 +32,7 @@
     Sequence,
     Tuple,
     Type,
+    cast,
 )
 
 from aea.agent import Agent
diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index ddfe577a6b..f82307effc 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -29,7 +29,6 @@
 from pathlib import Path
 from typing import (
     Any,
-    cast,
     Collection,
     Deque,
     Dict,
@@ -39,6 +38,7 @@
     Tuple,
     Type,
     Union,
+    cast,
 )
 
 import jsonschema
@@ -49,13 +49,13 @@
 from aea.components.base import Component, load_aea_package
 from aea.components.loader import load_component_from_config
 from aea.configurations.base import (
+    DEFAULT_AEA_CONFIG_FILE,
     AgentConfig,
     ComponentConfiguration,
     ComponentId,
     ComponentType,
     ConnectionConfig,
     ContractConfig,
-    DEFAULT_AEA_CONFIG_FILE,
     Dependencies,
     PackageType,
     ProtocolConfig,
diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index 5be8686f4c..cfed6e08fc 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -32,9 +32,9 @@
 from aea.exceptions import AEAException
 from aea.helpers.async_utils import (
     AsyncState,
-    ensure_loop,
     HandlerItemGetter,
     PeriodicCaller,
+    ensure_loop,
 )
 from aea.helpers.exec_timeout import ExecTimeoutThreadGuard, TimeoutException
 from aea.helpers.logging import WithLogger
diff --git a/aea/cli/config.py b/aea/cli/config.py
index 51591d3ae0..a896e4eea0 100644
--- a/aea/cli/config.py
+++ b/aea/cli/config.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea list' subcommand."""
 
-from typing import cast, Dict, List
+from typing import Dict, List, cast
 
 import click
 
diff --git a/aea/cli/create.py b/aea/cli/create.py
index 104e6a854d..d11061c2f3 100644
--- a/aea/cli/create.py
+++ b/aea/cli/create.py
@@ -21,7 +21,7 @@
 
 import os
 from pathlib import Path
-from typing import cast, Optional
+from typing import Optional, cast
 
 import click
 
@@ -34,9 +34,9 @@
 from aea.cli.utils.decorators import clean_after
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
-    AgentConfig,
     DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_VERSION,
+    AgentConfig,
 )
 from aea.configurations.constants import (
     DEFAULT_CONNECTION,
diff --git a/aea/cli/fetch.py b/aea/cli/fetch.py
index 2e7baff1e7..f56b4a70ad 100644
--- a/aea/cli/fetch.py
+++ b/aea/cli/fetch.py
@@ -21,7 +21,7 @@
 
 import os
 from distutils.dir_util import copy_tree
-from typing import cast, Optional
+from typing import Optional, cast
 
 import click
 
diff --git a/aea/cli/fingerprint.py b/aea/cli/fingerprint.py
index 5909a9bf07..b1d2aade53 100644
--- a/aea/cli/fingerprint.py
+++ b/aea/cli/fingerprint.py
@@ -19,19 +19,19 @@
 
 """Implementation of the 'aea add' subcommand."""
 from pathlib import Path
-from typing import cast, Dict
+from typing import Dict, cast
 
 import click
 
 from aea.cli.utils.click_utils import PublicIdParameter
 from aea.cli.utils.context import Context
 from aea.configurations.base import (  # noqa: F401 # pylint: disable=unused-import
-    _compute_fingerprint,
-    _get_default_configuration_file_name_from_type,
     DEFAULT_CONNECTION_CONFIG_FILE,
     DEFAULT_PROTOCOL_CONFIG_FILE,
     DEFAULT_SKILL_CONFIG_FILE,
     PublicId,
+    _compute_fingerprint,
+    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 
diff --git a/aea/cli/freeze.py b/aea/cli/freeze.py
index a537ffba31..6dbae8eca0 100644
--- a/aea/cli/freeze.py
+++ b/aea/cli/freeze.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea delete' subcommand."""
 
-from typing import cast, List
+from typing import List, cast
 
 import click
 
diff --git a/aea/cli/generate_key.py b/aea/cli/generate_key.py
index 1825c34665..8173a276ec 100644
--- a/aea/cli/generate_key.py
+++ b/aea/cli/generate_key.py
@@ -24,7 +24,7 @@
 
 import click
 
-from aea.crypto.helpers import create_private_key, PRIVATE_KEY_PATH_SCHEMA
+from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
 from aea.crypto.registries import crypto_registry
 
 
diff --git a/aea/cli/generate_wealth.py b/aea/cli/generate_wealth.py
index 1a6c5d9386..c8d346a4a0 100644
--- a/aea/cli/generate_wealth.py
+++ b/aea/cli/generate_wealth.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea generate_wealth' subcommand."""
 
-from typing import cast, Dict, Optional
+from typing import Dict, Optional, cast
 
 import click
 
diff --git a/aea/cli/get_multiaddress.py b/aea/cli/get_multiaddress.py
index a76dcbd1ae..3013f5077d 100644
--- a/aea/cli/get_multiaddress.py
+++ b/aea/cli/get_multiaddress.py
@@ -21,7 +21,7 @@
 import re
 import typing
 from pathlib import Path
-from typing import cast, Optional, Tuple
+from typing import Optional, Tuple, cast
 
 import click
 from click import ClickException
diff --git a/aea/cli/get_wealth.py b/aea/cli/get_wealth.py
index ee5679e2c4..021c48faa1 100644
--- a/aea/cli/get_wealth.py
+++ b/aea/cli/get_wealth.py
@@ -19,7 +19,7 @@
 
 """Implementation of the 'aea get_wealth' subcommand."""
 
-from typing import cast, Dict, Optional
+from typing import Dict, Optional, cast
 
 import click
 
diff --git a/aea/cli/install.py b/aea/cli/install.py
index 5295453ef0..88ce64dfd5 100644
--- a/aea/cli/install.py
+++ b/aea/cli/install.py
@@ -22,7 +22,7 @@
 import pprint
 import subprocess  # nosec
 import sys
-from typing import cast, List, Optional
+from typing import List, Optional, cast
 
 import click
 
diff --git a/aea/cli/interact.py b/aea/cli/interact.py
index 19d1976f4d..62cb63b715 100644
--- a/aea/cli/interact.py
+++ b/aea/cli/interact.py
@@ -29,8 +29,8 @@
 from aea.cli.utils.exceptions import InterruptInputException
 from aea.common import Address
 from aea.configurations.base import (
-    ConnectionConfig,
     DEFAULT_AEA_CONFIG_FILE,
+    ConnectionConfig,
     PackageType,
 )
 from aea.configurations.loader import ConfigLoader
diff --git a/aea/cli/launch.py b/aea/cli/launch.py
index 734d19cba8..a35458d39b 100644
--- a/aea/cli/launch.py
+++ b/aea/cli/launch.py
@@ -20,7 +20,7 @@
 import sys
 from collections import OrderedDict
 from pathlib import Path
-from typing import cast, List
+from typing import List, cast
 
 import click
 
diff --git a/aea/cli/list.py b/aea/cli/list.py
index ecd1c82d04..a827e8c821 100644
--- a/aea/cli/list.py
+++ b/aea/cli/list.py
@@ -30,9 +30,9 @@
 from aea.cli.utils.decorators import check_aea_project, pass_ctx
 from aea.cli.utils.formatting import format_items, retrieve_details, sort_items
 from aea.configurations.base import (
-    _get_default_configuration_file_name_from_type,
     PackageType,
     PublicId,
+    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 
diff --git a/aea/cli/publish.py b/aea/cli/publish.py
index 6653fc3161..a6baa68c17 100644
--- a/aea/cli/publish.py
+++ b/aea/cli/publish.py
@@ -35,7 +35,7 @@
     try_get_item_source_path,
     try_get_item_target_path,
 )
-from aea.configurations.base import CRUDCollection, DEFAULT_AEA_CONFIG_FILE, PublicId
+from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, CRUDCollection, PublicId
 from aea.configurations.constants import (
     DEFAULT_CONNECTION,
     DEFAULT_PROTOCOL,
diff --git a/aea/cli/run.py b/aea/cli/run.py
index 146cfff7eb..1d7e9bb160 100644
--- a/aea/cli/run.py
+++ b/aea/cli/run.py
@@ -20,7 +20,7 @@
 """Implementation of the 'aea run' subcommand."""
 
 from pathlib import Path
-from typing import cast, List, Optional
+from typing import List, Optional, cast
 
 import click
 
diff --git a/aea/cli/search.py b/aea/cli/search.py
index 02abc70937..4e5513be1b 100644
--- a/aea/cli/search.py
+++ b/aea/cli/search.py
@@ -21,7 +21,7 @@
 
 import os
 from pathlib import Path
-from typing import cast, Dict, List, Tuple
+from typing import Dict, List, Tuple, cast
 
 import click
 
diff --git a/aea/cli/utils/config.py b/aea/cli/utils/config.py
index 5903954b40..dbdd476209 100644
--- a/aea/cli/utils/config.py
+++ b/aea/cli/utils/config.py
@@ -38,10 +38,10 @@
 from aea.cli.utils.exceptions import AEAConfigException
 from aea.cli.utils.generic import load_yaml
 from aea.configurations.base import (
-    _get_default_configuration_file_name_from_type,
     DEFAULT_AEA_CONFIG_FILE,
     PackageConfiguration,
     PackageType,
+    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader, ConfigLoaders
 from aea.exceptions import AEAException
diff --git a/aea/cli/utils/context.py b/aea/cli/utils/context.py
index 85aeb8a4d1..3bdb651525 100644
--- a/aea/cli/utils/context.py
+++ b/aea/cli/utils/context.py
@@ -20,15 +20,15 @@
 """A module with context tools of the aea cli."""
 
 from pathlib import Path
-from typing import cast, Dict, List
+from typing import Dict, List, cast
 
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
-    _get_default_configuration_file_name_from_type,
     AgentConfig,
     Dependencies,
     PackageType,
     PublicId,
+    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 
diff --git a/aea/cli/utils/decorators.py b/aea/cli/utils/decorators.py
index f702a7226b..87fd3cd604 100644
--- a/aea/cli/utils/decorators.py
+++ b/aea/cli/utils/decorators.py
@@ -23,7 +23,7 @@
 import shutil
 from functools import update_wrapper
 from pathlib import Path
-from typing import Callable, cast, Dict, Union
+from typing import Callable, Dict, Union, cast
 
 import click
 from jsonschema import ValidationError
@@ -31,11 +31,11 @@
 from aea.cli.utils.config import try_to_load_agent_config
 from aea.cli.utils.context import Context
 from aea.configurations.base import (
+    PackageType,
+    PublicId,
     _check_aea_version,
     _compare_fingerprints,
     _get_default_configuration_file_name_from_type,
-    PackageType,
-    PublicId,
 )
 from aea.configurations.loader import ConfigLoaders
 from aea.exceptions import AEAException, enforce
diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py
index ab57fcb89b..f6556c34bf 100644
--- a/aea/cli/utils/package_utils.py
+++ b/aea/cli/utils/package_utils.py
@@ -33,12 +33,12 @@
 from aea.cli.utils.context import Context
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
-    _compute_fingerprint,
-    _get_default_configuration_file_name_from_type,
-    AgentConfig,
     DEFAULT_AEA_CONFIG_FILE,
+    AgentConfig,
     PackageType,
     PublicId,
+    _compute_fingerprint,
+    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader
 from aea.crypto.helpers import verify_or_create_private_keys
diff --git a/aea/cli_gui/__init__.py b/aea/cli_gui/__init__.py
index 273eba4bf9..0f17a05e87 100644
--- a/aea/cli_gui/__init__.py
+++ b/aea/cli_gui/__init__.py
@@ -43,10 +43,10 @@
 from aea.cli.utils.context import Context
 from aea.cli.utils.formatting import sort_items
 from aea.cli_gui.utils import (
+    ProcessState,
     call_aea_async,
     get_process_status,
     is_agent_dir,
-    ProcessState,
     read_error,
     read_tty,
     stop_agent_process,
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index ed2b61d0ba..2e3b245828 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -31,7 +31,6 @@
 from pathlib import Path
 from typing import (
     Any,
-    cast,
     Collection,
     Dict,
     Generic,
@@ -43,6 +42,7 @@
     Type,
     TypeVar,
     Union,
+    cast,
 )
 
 import packaging
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index f4466bbf35..5c0b51a1a8 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -25,7 +25,7 @@
 import re
 from copy import deepcopy
 from pathlib import Path
-from typing import cast, Dict, Generic, List, TextIO, Tuple, Type, TypeVar, Union
+from typing import Dict, Generic, List, TextIO, Tuple, Type, TypeVar, Union, cast
 
 import jsonschema
 import yaml
diff --git a/aea/configurations/pypi.py b/aea/configurations/pypi.py
index 440d228bac..5dd0bd0953 100644
--- a/aea/configurations/pypi.py
+++ b/aea/configurations/pypi.py
@@ -21,7 +21,7 @@
 """This module contains a checker for PyPI version consistency."""
 import operator
 from collections import defaultdict
-from typing import cast, Dict, Set
+from typing import Dict, Set, cast
 
 from packaging.specifiers import Specifier, SpecifierSet
 from packaging.version import InvalidVersion, Version
diff --git a/aea/connections/base.py b/aea/connections/base.py
index d4a7d5e971..767e2267fd 100644
--- a/aea/connections/base.py
+++ b/aea/connections/base.py
@@ -26,7 +26,7 @@
 from contextlib import contextmanager
 from enum import Enum
 from pathlib import Path
-from typing import cast, Generator, Optional, Set, TYPE_CHECKING
+from typing import TYPE_CHECKING, Generator, Optional, Set, cast
 
 from aea.components.base import Component, load_aea_package
 from aea.configurations.base import ComponentType, ConnectionConfig, PublicId
diff --git a/aea/connections/stub/connection.py b/aea/connections/stub/connection.py
index 155aee920b..7c1310f01c 100644
--- a/aea/connections/stub/connection.py
+++ b/aea/connections/stub/connection.py
@@ -27,7 +27,7 @@
 from concurrent.futures.thread import ThreadPoolExecutor
 from contextlib import contextmanager
 from pathlib import Path
-from typing import AsyncIterable, IO, List, Optional, Union
+from typing import IO, AsyncIterable, List, Optional, Union
 
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
diff --git a/aea/connections/stub/connection.yaml b/aea/connections/stub/connection.yaml
index cdd0ca8581..05026c3e63 100644
--- a/aea/connections/stub/connection.yaml
+++ b/aea/connections/stub/connection.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmWwepN9Fy9gHAp39vUGFSLdnB9JZjdyE3STnbowSUhJkC
-  connection.py: QmYAWVhNoWhJNaCkEh5cMScJ53a1gkfcBNGt9LLxftyUuR
+  connection.py: QmUQVdzJ1YWiERHmjoy8YuzLUmtcw39weShXtZESfvoAdj
   readme.md: QmXSAtxSY7C2YkvUxeVnpqCJY9uJYZxZBmuUcE4zjFXcXz
 fingerprint_ignore_patterns: []
 protocols: []
diff --git a/aea/contracts/base.py b/aea/contracts/base.py
index d14bc5d4ce..3d2c10f6d8 100644
--- a/aea/contracts/base.py
+++ b/aea/contracts/base.py
@@ -22,7 +22,7 @@
 import logging
 import re
 from pathlib import Path
-from typing import Any, cast, Dict, Optional
+from typing import Any, Dict, Optional, cast
 
 from aea.components.base import Component, load_aea_package
 from aea.configurations.base import ComponentType, ContractConfig, ContractId
diff --git a/aea/crypto/ethereum.py b/aea/crypto/ethereum.py
index 2055b52eb3..7e05306166 100644
--- a/aea/crypto/ethereum.py
+++ b/aea/crypto/ethereum.py
@@ -24,7 +24,7 @@
 import time
 import warnings
 from pathlib import Path
-from typing import Any, BinaryIO, cast, Dict, Optional, Tuple, Union
+from typing import Any, BinaryIO, Dict, Optional, Tuple, Union, cast
 
 import requests
 from eth_account import Account
diff --git a/aea/crypto/fetchai.py b/aea/crypto/fetchai.py
index 60d1772b27..2108fa3512 100644
--- a/aea/crypto/fetchai.py
+++ b/aea/crypto/fetchai.py
@@ -19,7 +19,7 @@
 """Fetchai module wrapping the public and private key cryptography and ledger api."""
 
 
-from aea.crypto.cosmos import _CosmosApi, CosmosCrypto, CosmosFaucetApi, CosmosHelper
+from aea.crypto.cosmos import CosmosCrypto, CosmosFaucetApi, CosmosHelper, _CosmosApi
 
 _FETCHAI = "fetchai"
 _FETCH = "fetch"
diff --git a/aea/crypto/helpers.py b/aea/crypto/helpers.py
index 53d64a31a9..8d3cb7d905 100644
--- a/aea/crypto/helpers.py
+++ b/aea/crypto/helpers.py
@@ -23,7 +23,7 @@
 import sys
 from pathlib import Path
 
-from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE, PackageType
+from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig, PackageType
 from aea.configurations.loader import ConfigLoaders
 from aea.crypto.registries import crypto_registry, make_crypto, make_faucet_api
 
diff --git a/aea/crypto/ledger_apis.py b/aea/crypto/ledger_apis.py
index bdf82496f4..c005e3068f 100644
--- a/aea/crypto/ledger_apis.py
+++ b/aea/crypto/ledger_apis.py
@@ -24,8 +24,8 @@
 from aea.common import Address
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.crypto.base import LedgerApi
-from aea.crypto.cosmos import CosmosApi
 from aea.crypto.cosmos import DEFAULT_ADDRESS as COSMOS_DEFAULT_ADDRESS
+from aea.crypto.cosmos import CosmosApi
 from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
 from aea.crypto.ethereum import DEFAULT_CHAIN_ID, EthereumApi
 from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
diff --git a/aea/crypto/wallet.py b/aea/crypto/wallet.py
index e27863bc22..29a19f1be2 100644
--- a/aea/crypto/wallet.py
+++ b/aea/crypto/wallet.py
@@ -20,7 +20,7 @@
 """Module wrapping all the public and private keys cryptography."""
 
 import logging
-from typing import Any, cast, Dict, Optional
+from typing import Any, Dict, Optional, cast
 
 from aea.crypto.base import Crypto
 from aea.crypto.registries import make_crypto
diff --git a/aea/decision_maker/default.py b/aea/decision_maker/default.py
index 9493d0a2e7..4e4fb3feb7 100644
--- a/aea/decision_maker/default.py
+++ b/aea/decision_maker/default.py
@@ -22,7 +22,7 @@
 import copy
 import logging
 from enum import Enum
-from typing import Any, cast, Dict, List, Optional
+from typing import Any, Dict, List, Optional, cast
 
 from aea.common import Address
 from aea.crypto.wallet import Wallet
diff --git a/aea/helpers/logging.py b/aea/helpers/logging.py
index 58a99ffa6b..8a085528a5 100644
--- a/aea/helpers/logging.py
+++ b/aea/helpers/logging.py
@@ -19,7 +19,7 @@
 """Logging helpers."""
 import logging
 from logging import Logger, LoggerAdapter
-from typing import Any, cast, MutableMapping, Optional, Tuple
+from typing import Any, MutableMapping, Optional, Tuple, cast
 
 
 class AgentLoggerAdapter(LoggerAdapter):
diff --git a/aea/helpers/multiaddr/base.py b/aea/helpers/multiaddr/base.py
index 9ad06d76d0..0f477f448e 100644
--- a/aea/helpers/multiaddr/base.py
+++ b/aea/helpers/multiaddr/base.py
@@ -23,7 +23,7 @@
 
 import base58
 import multihash  # type: ignore
-from ecdsa import curves, keys, VerifyingKey
+from ecdsa import VerifyingKey, curves, keys
 
 from aea.helpers.multiaddr.crypto_pb2 import KeyType, PublicKey
 
diff --git a/aea/helpers/multiple_executor.py b/aea/helpers/multiple_executor.py
index 40a25ce92e..7768c85dde 100644
--- a/aea/helpers/multiple_executor.py
+++ b/aea/helpers/multiple_executor.py
@@ -30,7 +30,6 @@
 from typing import (
     Any,
     Callable,
-    cast,
     Dict,
     Optional,
     Sequence,
@@ -38,6 +37,7 @@
     Tuple,
     Type,
     Union,
+    cast,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/aea/helpers/search/models.py b/aea/helpers/search/models.py
index 31a045bbfb..02dbe0b686 100644
--- a/aea/helpers/search/models.py
+++ b/aea/helpers/search/models.py
@@ -25,7 +25,7 @@
 from copy import deepcopy
 from enum import Enum
 from math import asin, cos, radians, sin, sqrt
-from typing import Any, cast, Dict, List, Mapping, Optional, Tuple, Type, Union
+from typing import Any, Dict, List, Mapping, Optional, Tuple, Type, Union, cast
 
 from aea.exceptions import enforce
 
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index 0b4a75930b..e58db114a6 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -23,7 +23,7 @@
 from asyncio.events import AbstractEventLoop
 from concurrent.futures._base import CancelledError
 from contextlib import suppress
-from typing import Callable, cast, Collection, Dict, List, Optional, Sequence, Tuple
+from typing import Callable, Collection, Dict, List, Optional, Sequence, Tuple, cast
 
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
diff --git a/aea/protocols/base.py b/aea/protocols/base.py
index eed501dca1..a9a9981fe1 100644
--- a/aea/protocols/base.py
+++ b/aea/protocols/base.py
@@ -26,7 +26,7 @@
 from copy import copy
 from enum import Enum
 from pathlib import Path
-from typing import Any, cast, Dict, Optional, Tuple, Type
+from typing import Any, Dict, Optional, Tuple, Type, cast
 
 from google.protobuf.struct_pb2 import Struct
 
diff --git a/aea/protocols/default/dialogues.py b/aea/protocols/default/dialogues.py
index f984fbf0c5..9ac396bf19 100644
--- a/aea/protocols/default/dialogues.py
+++ b/aea/protocols/default/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/aea/protocols/default/message.py b/aea/protocols/default/message.py
index cb75fe0eae..547286e375 100644
--- a/aea/protocols/default/message.py
+++ b/aea/protocols/default/message.py
@@ -20,7 +20,7 @@
 """This module contains default's message definition."""
 
 import logging
-from typing import cast, Dict, Set, Tuple
+from typing import Dict, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/aea/protocols/default/protocol.yaml b/aea/protocols/default/protocol.yaml
index 20626ed573..ff9675da3a 100644
--- a/aea/protocols/default/protocol.yaml
+++ b/aea/protocols/default/protocol.yaml
@@ -11,9 +11,9 @@ fingerprint:
   custom_types.py: QmRcgwDdTxkSHyfF9eoMtsb5P5GJDm4oyLq5W6ZBko1MFU
   default.proto: QmNzMUvXkBm5bbitR5Yi49ADiwNn1FhCvXqSKKoqAPZyXv
   default_pb2.py: QmSRFi1s3jcqnPuk4yopJeNuC6o58RL7dvEdt85uns3B3N
-  dialogues.py: QmNi8Zya7ViRnpuqZsLRsj6bqHaXEsxCBqM4rafL5rsL3A
-  message.py: QmQPpq2HmjWDuWFcVE4VHRswdrUFYkrAwxMSA9SS9jsc5B
-  serialization.py: Qmc33mPC3sa2EAYvWBGfFVNQJVCWSk6LzCAXHPFKb1TEAZ
+  dialogues.py: Qmc991snbS7DwFxo1cKcq1rQ2uj7y8ukp14kfe2zve387C
+  message.py: QmeaadvKib9QqpjZgd7NiDUqGRpC2eZPVpgq1dY3PYacht
+  serialization.py: QmRF7XPNEk1emKmFMZaYBCF3gr4CdkMXagoSpjQEmnRGG6
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/aea/protocols/default/serialization.py b/aea/protocols/default/serialization.py
index f24928db33..75c046ac6f 100644
--- a/aea/protocols/default/serialization.py
+++ b/aea/protocols/default/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for default protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from aea.protocols.default import default_pb2
diff --git a/aea/protocols/dialogue/base.py b/aea/protocols/dialogue/base.py
index 4ef54b09d3..52b154609b 100644
--- a/aea/protocols/dialogue/base.py
+++ b/aea/protocols/dialogue/base.py
@@ -30,7 +30,7 @@
 from abc import ABC
 from enum import Enum
 from inspect import signature
-from typing import Callable, cast, Dict, FrozenSet, List, Optional, Set, Tuple, Type
+from typing import Callable, Dict, FrozenSet, List, Optional, Set, Tuple, Type, cast
 
 from aea.common import Address
 from aea.exceptions import enforce
diff --git a/aea/protocols/generator/base.py b/aea/protocols/generator/base.py
index e16c64427b..198a1a0dab 100644
--- a/aea/protocols/generator/base.py
+++ b/aea/protocols/generator/base.py
@@ -28,19 +28,9 @@
 from typing import Optional, Tuple
 
 from aea.protocols.generator.common import (
-    _camel_case_to_snake_case,
-    _create_protocol_file,
-    _get_sub_types_of_compositional_types,
-    _includes_custom_type,
-    _python_pt_or_ct_type_to_proto_type,
-    _to_camel_case,
-    _union_sub_type_to_protobuf_variable_name,
-    check_prerequisites,
-    check_protobuf_using_protoc,
     CUSTOM_TYPES_DOT_PY_FILE_NAME,
     DIALOGUE_DOT_PY_FILE_NAME,
     INIT_FILE_NAME,
-    load_protocol_specification,
     MESSAGE_DOT_PY_FILE_NAME,
     MESSAGE_IMPORT,
     PATH_TO_PACKAGES,
@@ -48,6 +38,16 @@
     PYTHON_TYPE_TO_PROTO_TYPE,
     SERIALIZATION_DOT_PY_FILE_NAME,
     SERIALIZER_IMPORT,
+    _camel_case_to_snake_case,
+    _create_protocol_file,
+    _get_sub_types_of_compositional_types,
+    _includes_custom_type,
+    _python_pt_or_ct_type_to_proto_type,
+    _to_camel_case,
+    _union_sub_type_to_protobuf_variable_name,
+    check_prerequisites,
+    check_protobuf_using_protoc,
+    load_protocol_specification,
     try_run_black_formatting,
     try_run_protoc,
 )
diff --git a/aea/protocols/generator/extract_specification.py b/aea/protocols/generator/extract_specification.py
index 3946a11e1f..e3f42cf45c 100644
--- a/aea/protocols/generator/extract_specification.py
+++ b/aea/protocols/generator/extract_specification.py
@@ -19,15 +19,15 @@
 """This module extracts a valid protocol specification into pythonic objects."""
 
 import re
-from typing import cast, Dict, List
+from typing import Dict, List, cast
 
 from aea.configurations.base import (
     ProtocolSpecification,
     ProtocolSpecificationParseError,
 )
 from aea.protocols.generator.common import (
-    _get_sub_types_of_compositional_types,
     SPECIFICATION_PRIMITIVE_TYPES,
+    _get_sub_types_of_compositional_types,
 )
 from aea.protocols.generator.validate import validate
 
diff --git a/aea/protocols/generator/validate.py b/aea/protocols/generator/validate.py
index c2610aea43..bae664d719 100644
--- a/aea/protocols/generator/validate.py
+++ b/aea/protocols/generator/validate.py
@@ -19,14 +19,14 @@
 """This module validates a protocol specification."""
 
 import re
-from typing import cast, Dict, List, Optional, Set, Tuple
+from typing import Dict, List, Optional, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolSpecification
 from aea.protocols.generator.common import (
-    _get_sub_types_of_compositional_types,
-    _has_matched_brackets,
     SPECIFICATION_COMPOSITIONAL_TYPES,
     SPECIFICATION_PRIMITIVE_TYPES,
+    _get_sub_types_of_compositional_types,
+    _has_matched_brackets,
 )
 
 # The following names are reserved for standard message fields and cannot be
diff --git a/aea/protocols/signing/dialogues.py b/aea/protocols/signing/dialogues.py
index 705342f3a5..2602cbb7d9 100644
--- a/aea/protocols/signing/dialogues.py
+++ b/aea/protocols/signing/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/aea/protocols/signing/message.py b/aea/protocols/signing/message.py
index 6669ad0633..68a46db489 100644
--- a/aea/protocols/signing/message.py
+++ b/aea/protocols/signing/message.py
@@ -20,7 +20,7 @@
 """This module contains signing's message definition."""
 
 import logging
-from typing import cast, Set, Tuple
+from typing import Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/aea/protocols/signing/protocol.yaml b/aea/protocols/signing/protocol.yaml
index c01952688d..0063a35e85 100644
--- a/aea/protocols/signing/protocol.yaml
+++ b/aea/protocols/signing/protocol.yaml
@@ -9,9 +9,9 @@ fingerprint:
   README.md: QmSoa5dnxz53GWpWT2VvcRG4asVbzA8JzguiVgwqiLtguM
   __init__.py: QmcCL3TTdvd8wxYKzf2d3cgKEtY9RzLjPCn4hex4wmb6h6
   custom_types.py: Qmc7sAyCQbAaVs5dZf9hFkTrB2BG8VAioWzbyKBAybrQ1J
-  dialogues.py: QmaURpsd9ERiJ9CRnrfR1o94PGtMXaCb7k1SU2qyDG1q6x
-  message.py: QmVtRBy5LGTGHXEQSc9Br1gcpA7mqc7VmKCmmFzERiKqEP
-  serialization.py: QmS7H7WEBTQe4Nzxqz8kc6bXtVKjMzASvCitGdtFc2nyfT
+  dialogues.py: QmQ1WKs3Dn15oDSwpc4N8hdADLxrn76U4X5SiLAmyGiPPY
+  message.py: QmRLWAYfjCQmdg2hH8R5R63DKYaDrzuX4dVTFqNHuyjawq
+  serialization.py: QmbXSvWYfEmYyGdfuTXVJYaJfzqVLtMaLR8H3UCLZkvbSC
   signing.proto: QmcxyLzqhTE9xstAEzCVH17osbLxmSdALx9njmuPjhjrvZ
   signing_pb2.py: QmY3Ak5ih5zGvKjeZ5EnzrGX4tMYn5dWpjPArQwFeJpVKu
 fingerprint_ignore_patterns: []
diff --git a/aea/protocols/signing/serialization.py b/aea/protocols/signing/serialization.py
index b36b6c883f..0f103dfde1 100644
--- a/aea/protocols/signing/serialization.py
+++ b/aea/protocols/signing/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for signing protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from aea.protocols.signing import signing_pb2
diff --git a/aea/protocols/state_update/dialogues.py b/aea/protocols/state_update/dialogues.py
index e0f59bb7e8..53b5fdebda 100644
--- a/aea/protocols/state_update/dialogues.py
+++ b/aea/protocols/state_update/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/aea/protocols/state_update/message.py b/aea/protocols/state_update/message.py
index a96667a6e1..2444c40c0f 100644
--- a/aea/protocols/state_update/message.py
+++ b/aea/protocols/state_update/message.py
@@ -20,7 +20,7 @@
 """This module contains state_update's message definition."""
 
 import logging
-from typing import cast, Dict, Set, Tuple
+from typing import Dict, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/aea/protocols/state_update/protocol.yaml b/aea/protocols/state_update/protocol.yaml
index 13fa3717f7..4e9d8b1f7c 100644
--- a/aea/protocols/state_update/protocol.yaml
+++ b/aea/protocols/state_update/protocol.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: Qmc12hnCshAE3TL9ba4vo6L8ZZhynyfhEUoStJggRrbimc
   __init__.py: Qma2opyN54gwTpkVV1E14jjeMmMfoqgE6XMM9LsvGuTdkm
-  dialogues.py: Qmettr9uNhMjKJTMPwRgkMsJxFscE6GLVMCjJWYxNNqzaq
-  message.py: QmezFVx1VikTQBGjPWz3yucbqMBs5E9eBufBYaZaQMhkG8
-  serialization.py: QmPp8zqaLLa17YCiVu5SyD5We3cLkmsXcPcnwv2UDjDvMX
+  dialogues.py: Qmd59WgpFccLn1zhpLdwm3zDCmCsjSoQXVn6M7PgFwwkgR
+  message.py: QmbXbxXbu1vzrCjzDy6qDtEvssmiHKFLWGgCEenrE4TPZW
+  serialization.py: QmciaNPHkpyxWLYVtBPnYkKHj6Ur9E3CPJ9QvWbXFD91Yw
   state_update.proto: QmdmEUSa7PDxJ98ZmGE7bLFPmUJv8refgbkHPejw6uDdwD
   state_update_pb2.py: QmQr5KXhapRv9AnfQe7Xbr5bBqYWp9DEMLjxX8UWmK75Z4
 fingerprint_ignore_patterns: []
diff --git a/aea/protocols/state_update/serialization.py b/aea/protocols/state_update/serialization.py
index dbb39e82a1..c90504eba9 100644
--- a/aea/protocols/state_update/serialization.py
+++ b/aea/protocols/state_update/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for state_update protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from aea.protocols.state_update import state_update_pb2
diff --git a/aea/registries/base.py b/aea/registries/base.py
index 15f12ea96b..60fce0f86f 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -22,7 +22,7 @@
 import copy
 import logging
 from abc import ABC, abstractmethod
-from typing import cast, Dict, Generic, List, Optional, Set, Tuple, TypeVar
+from typing import Dict, Generic, List, Optional, Set, Tuple, TypeVar, cast
 
 from aea.components.base import Component
 from aea.configurations.base import (
diff --git a/aea/registries/resources.py b/aea/registries/resources.py
index 9126a7e7bc..d136a7678c 100644
--- a/aea/registries/resources.py
+++ b/aea/registries/resources.py
@@ -19,7 +19,7 @@
 
 """This module contains the resources class."""
 from contextlib import suppress
-from typing import cast, List, Optional
+from typing import List, Optional, cast
 
 from aea.components.base import Component
 from aea.configurations.base import (
diff --git a/aea/runtime.py b/aea/runtime.py
index 89ff68c694..d31342075b 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -26,7 +26,7 @@
 from asyncio.events import AbstractEventLoop
 from contextlib import suppress
 from enum import Enum
-from typing import cast, Dict, Optional, Type
+from typing import Dict, Optional, Type, cast
 
 from aea.abstract_agent import AbstractAgent
 from aea.agent_loop import AsyncAgentLoop, AsyncState, BaseAgentLoop, SyncAgentLoop
diff --git a/aea/skills/base.py b/aea/skills/base.py
index 071bfa98b3..1e9fff3d96 100644
--- a/aea/skills/base.py
+++ b/aea/skills/base.py
@@ -29,7 +29,7 @@
 from pathlib import Path
 from queue import Queue
 from types import SimpleNamespace
-from typing import Any, cast, Dict, Optional, Sequence, Set, Tuple, Type
+from typing import Any, Dict, Optional, Sequence, Set, Tuple, Type, cast
 
 from aea.common import Address
 from aea.components.base import Component, load_aea_package
diff --git a/aea/skills/tasks.py b/aea/skills/tasks.py
index d49f21fc22..6b0350285c 100644
--- a/aea/skills/tasks.py
+++ b/aea/skills/tasks.py
@@ -23,7 +23,7 @@
 import threading
 from abc import abstractmethod
 from multiprocessing.pool import AsyncResult, Pool
-from typing import Any, Callable, cast, Dict, Optional, Sequence
+from typing import Any, Callable, Dict, Optional, Sequence, cast
 
 from aea.helpers.logging import WithLogger
 
diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index b01dd4895d..2c33b3b758 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -39,7 +39,7 @@
 import yaml
 
 from aea.cli import cli
-from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE, PackageType
+from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig, PackageType
 from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PRIVATE_KEY_FILE
 from aea.configurations.loader import ConfigLoader
 from aea.connections.stub.connection import (
diff --git a/benchmark/checks/check_reactive.py b/benchmark/checks/check_reactive.py
index f2bb484ece..6fe47ffc4d 100755
--- a/benchmark/checks/check_reactive.py
+++ b/benchmark/checks/check_reactive.py
@@ -31,12 +31,12 @@
 from aea.skills.base import Handler
 from benchmark.checks.utils import GeneratorConnection  # noqa: I100
 from benchmark.checks.utils import (
+    SyncedGeneratorConnection,
     make_agent,
     make_envelope,
     make_skill,
     multi_run,
     print_results,
-    SyncedGeneratorConnection,
     wait_for_condition,
 )
 
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index 9c5e4a467d..3992bb0bd2 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -22,7 +22,7 @@
 import time
 from queue import Queue
 from threading import Thread
-from typing import Any, cast, Optional, Tuple
+from typing import Any, Optional, Tuple, cast
 
 import gym
 
diff --git a/packages/fetchai/connections/gym/connection.py b/packages/fetchai/connections/gym/connection.py
index 6d0d39dd5d..c60f05297d 100644
--- a/packages/fetchai/connections/gym/connection.py
+++ b/packages/fetchai/connections/gym/connection.py
@@ -24,7 +24,7 @@
 from asyncio import CancelledError
 from asyncio.events import AbstractEventLoop
 from concurrent.futures.thread import ThreadPoolExecutor
-from typing import cast, Optional, Tuple, Union
+from typing import Optional, Tuple, Union, cast
 
 import gym
 
diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml
index e6ef3b80c0..f55d9694b2 100644
--- a/packages/fetchai/connections/gym/connection.yaml
+++ b/packages/fetchai/connections/gym/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPUxpn8smGVFexxhUu3Vy3q5xsJukHnYtQzUXyt965bmL
   __init__.py: QmWwxj1hGGZNteCvRtZxwtY9PuEKsrWsEmMWCKwiYCdvRR
-  connection.py: QmavgJYnKS9AY9UXyPM3mWZMZ9kCCSPjNAySn33N92kcV7
+  connection.py: QmSnGeGf42n8XTqe3jT9SvpLsEaXaEP7ciSSF1p1sNhMbi
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/gym:0.6.0
diff --git a/packages/fetchai/connections/http_client/connection.py b/packages/fetchai/connections/http_client/connection.py
index 429b4fee2a..8fe29e6ea1 100644
--- a/packages/fetchai/connections/http_client/connection.py
+++ b/packages/fetchai/connections/http_client/connection.py
@@ -26,7 +26,7 @@
 from asyncio.events import AbstractEventLoop
 from asyncio.tasks import Task
 from traceback import format_exc
-from typing import Any, cast, Optional, Set, Tuple, Union
+from typing import Any, Optional, Set, Tuple, Union, cast
 
 import aiohttp
 from aiohttp.client_reqrep import ClientResponse
diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml
index 8a785639c9..19a78aab55 100644
--- a/packages/fetchai/connections/http_client/connection.yaml
+++ b/packages/fetchai/connections/http_client/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmXfZJPAh4Ujt3xj8xzd6ng6HbrpJQUuvjWe8DNQSwSKWU
   __init__.py: QmPdKAks8A6XKAgZiopJzPZYXJumTeUqChd8UorqmLQQPU
-  connection.py: QmYTSggRJNrtKMkkigLL2eCWTdcRojJagXNjGz3rJ4emrB
+  connection.py: QmcUNSyeaKRnbWMtZeHnHhz8VUYMZMdUZn6mipmFciDGzH
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/http_server/connection.py b/packages/fetchai/connections/http_server/connection.py
index a774a43e03..d922e8a4c1 100644
--- a/packages/fetchai/connections/http_server/connection.py
+++ b/packages/fetchai/connections/http_server/connection.py
@@ -27,7 +27,7 @@
 from asyncio.events import AbstractEventLoop
 from asyncio.futures import Future
 from traceback import format_exc
-from typing import cast, Dict, Optional, Set
+from typing import Dict, Optional, Set, cast
 from urllib.parse import parse_qs, urlencode, urlparse
 
 from aiohttp import web
@@ -49,7 +49,7 @@
 from aea.common import Address
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
-from aea.mail.base import Envelope, EnvelopeContext, Message, URI
+from aea.mail.base import URI, Envelope, EnvelopeContext, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml
index b94bf4851f..0bbcde7cf3 100644
--- a/packages/fetchai/connections/http_server/connection.yaml
+++ b/packages/fetchai/connections/http_server/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTmQcnUPKaDHHJHngBFXnUVPdgBLanP9DbjVHZT55Scfn
   __init__.py: Qmb6JEAkJeb5JweqrSGiGoQp1vGXqddjGgb9WMkm2phTgA
-  connection.py: QmfZHq3FHwXecTAiRohbHLnaFucpD5h7BXqahJmnVDZA2K
+  connection.py: QmXLqBCHVsQmpTKdDNUB6GJkHVFRipA39uoij8snVExEP4
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/ledger/base.py b/packages/fetchai/connections/ledger/base.py
index 1afb3aa1a8..da1920fd63 100644
--- a/packages/fetchai/connections/ledger/base.py
+++ b/packages/fetchai/connections/ledger/base.py
@@ -27,7 +27,7 @@
 
 from aea.configurations.base import PublicId
 from aea.crypto.base import LedgerApi
-from aea.crypto.registries import ledger_apis_registry, Registry
+from aea.crypto.registries import Registry, ledger_apis_registry
 from aea.helpers.async_utils import AsyncState
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
diff --git a/packages/fetchai/connections/ledger/connection.py b/packages/fetchai/connections/ledger/connection.py
index 1b153ef6d9..8e0a1a4fdb 100644
--- a/packages/fetchai/connections/ledger/connection.py
+++ b/packages/fetchai/connections/ledger/connection.py
@@ -21,7 +21,7 @@
 import asyncio
 from asyncio import Task
 from collections import deque
-from typing import cast, Deque, Dict, List, Optional
+from typing import Deque, Dict, List, Optional, cast
 
 from aea.connections.base import Connection, ConnectionStates
 from aea.mail.base import Envelope
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index efcfd06f44..c2b54a95fb 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfQN7UK1M4pBUzKVzPannPLVi8iiULKHNtJ7XpoWpjqfc
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
-  base.py: QmXHmxdtk2Bp5RUG7VZb8rTAShtnnePj8rzS2HLEp14xTx
-  connection.py: QmdpsBY8SeYmxj8ijv7BuRKwjseoNXMX7gRP9ufLPoTFUM
-  contract_dispatcher.py: QmVaDEyhBFwf48iLYqeEXijpjDbeoNgsptXWFQ3DWSau5K
+  base.py: Qmec23f5Be6AkNvjwujzrRJExeXkjhD6fPzhRmGiPgwPLC
+  connection.py: QmaRg6kLFsSERL4gExFfnXTK3ZAj6Kx4nTVcVL4Yh67ECs
+  contract_dispatcher.py: QmZnytzjMMgJeACQRgVvhH4iijgvvW4nmP7AD6Fz4rAKjr
   ledger_dispatcher.py: QmRXSuhgHqRgqkTtcBwdvjPd4QRpVuZWfBubgNeQSh9FJJ
 fingerprint_ignore_patterns: []
 protocols:
diff --git a/packages/fetchai/connections/ledger/contract_dispatcher.py b/packages/fetchai/connections/ledger/contract_dispatcher.py
index 2d0283b132..70e0f19243 100644
--- a/packages/fetchai/connections/ledger/contract_dispatcher.py
+++ b/packages/fetchai/connections/ledger/contract_dispatcher.py
@@ -19,7 +19,7 @@
 
 """This module contains the implementation of the contract API request dispatcher."""
 import inspect
-from typing import Callable, cast, Optional
+from typing import Callable, Optional, cast
 
 from aea.contracts import Contract, contract_registry
 from aea.crypto.base import LedgerApi
diff --git a/packages/fetchai/connections/local/connection.py b/packages/fetchai/connections/local/connection.py
index a7da093a2d..7dab288623 100644
--- a/packages/fetchai/connections/local/connection.py
+++ b/packages/fetchai/connections/local/connection.py
@@ -23,7 +23,7 @@
 from asyncio import AbstractEventLoop, Queue
 from collections import defaultdict
 from threading import Thread
-from typing import cast, Dict, List, Optional, Tuple
+from typing import Dict, List, Optional, Tuple, cast
 
 from aea.common import Address
 from aea.configurations.base import ProtocolId, PublicId
diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml
index 3fc3e9c37c..e8d3ffba04 100644
--- a/packages/fetchai/connections/local/connection.yaml
+++ b/packages/fetchai/connections/local/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbK7MtyAVqh2LmSh9TY6yBZqfWaAXURP4rQGATyP2hTKC
   __init__.py: QmeeoX5E38Ecrb1rLdeFyyxReHLrcJoETnBcPbcNWVbiKG
-  connection.py: QmVEpirVUJ6QYEzpDSdVUhnyPJHZk1WgHofjrRvY24sLYj
+  connection.py: QmQcok4CvW1WHqyx3pUUgyKjvLYW5PCYEUH7MFYWbpFGuS
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/oef/connection.py b/packages/fetchai/connections/oef/connection.py
index a7db37505a..f693018895 100644
--- a/packages/fetchai/connections/oef/connection.py
+++ b/packages/fetchai/connections/oef/connection.py
@@ -23,7 +23,7 @@
 from asyncio import AbstractEventLoop, CancelledError
 from concurrent.futures.thread import ThreadPoolExecutor
 from itertools import cycle
-from typing import cast, Dict, List, Optional, Set, Type
+from typing import Dict, List, Optional, Set, Type, cast
 
 import oef
 from oef.agents import OEFAgent
diff --git a/packages/fetchai/connections/oef/connection.yaml b/packages/fetchai/connections/oef/connection.yaml
index da80a8b4ee..803272c1f0 100644
--- a/packages/fetchai/connections/oef/connection.yaml
+++ b/packages/fetchai/connections/oef/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVHWxThR1u9a4BEm89oCxUTPGnN6PznvNgo6oZLqDD3n5
   __init__.py: QmUAen8tmoBHuCerjA3FSGKJRLG6JYyUS3chuWzPxKYzez
-  connection.py: QmcFn2NMW3U2Fcc2v3N49kDgwxF7Whe1aGW29dkEkmWcfL
+  connection.py: QmVCcDnoAVFVCGovD8WUdT99BAkkRgsoxGEiizQBw72CT7
   object_translator.py: QmfDTqq9kUhWrAJf8SyevzhcKcuYioiLxLQtWhavxbvawS
 fingerprint_ignore_patterns: []
 protocols:
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.py b/packages/fetchai/connections/p2p_libp2p/connection.py
index 32f51a2063..84627fb356 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p/connection.py
@@ -28,7 +28,7 @@
 from asyncio import AbstractEventLoop, CancelledError
 from pathlib import Path
 from random import randint
-from typing import cast, IO, List, Optional, Sequence
+from typing import IO, List, Optional, Sequence, cast
 
 from aea.common import Address
 from aea.configurations.base import PublicId
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.yaml b/packages/fetchai/connections/p2p_libp2p/connection.yaml
index 89b5831ea6..217db0e2b6 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p/connection.yaml
@@ -15,7 +15,7 @@ fingerprint:
   aea/envelope.proto: QmSC8EGCKiNFR2vf5bSWymSzYDFMipQW9aQVMwPzQoKb4n
   aea/pipe_unix.go: QmSzbAexrSUSA9ZE6VT6MmcWF5MhEcmceQjAbnfRoK7Ruv
   aea/pipe_windows.go: QmdYpfjgdgFbA6Pothg65NYM45ubfpZeKr8cVQoqbFzgUK
-  connection.py: Qma7mVzE8TddKpJeKHEgeyPjxT4vQX8y9uPEtkWwA9tTaf
+  connection.py: QmPEcaeBAHS7FQE27idXAB5WP9MnSXTxdVr39jdd5zdX5Z
   dht/dhtclient/dhtclient.go: QmasA3GrgswTnUJoffBzeeqxeT3GjLu6foN6PHJhWNpMMa
   dht/dhtclient/dhtclient_test.go: QmPfnHSHXtbaW5VYuq1QsKQWey64pUEvLEaKKkT9eAcmws
   dht/dhtclient/options.go: QmPorj38wNrxGrzsbFe5wwLmiHzxbTJ2VsgvSd8tLDYS8s
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.py b/packages/fetchai/connections/p2p_libp2p_client/connection.py
index dce5235c07..0ae1dfa284 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.py
@@ -25,7 +25,7 @@
 import struct
 from asyncio import CancelledError
 from random import randint
-from typing import cast, List, Optional, Union
+from typing import List, Optional, Union, cast
 
 from aea.configurations.base import PublicId
 from aea.configurations.constants import DEFAULT_LEDGER
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
index c3eb2fb000..a51a00d00d 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
@@ -10,7 +10,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUp9UrXSqEYeRxrEsGDhGPTjFrwKmuT3bjHJfGrfP8yjk
   __init__.py: QmT1FEHkPGMHV5oiVEfQHHr25N2qdZxydSNRJabJvYiTgf
-  connection.py: QmZLM7ihaCnvGurmAXYd2WesDcY5YWyfb6rmZT5qsbxP6w
+  connection.py: QmeSyMBkN1Y99g7c7j89Ack8NjzSPw5WDbodbwfqLP6ZLT
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PLibp2pClientConnection
diff --git a/packages/fetchai/connections/p2p_stub/connection.py b/packages/fetchai/connections/p2p_stub/connection.py
index a357aa4295..615b2e6f27 100644
--- a/packages/fetchai/connections/p2p_stub/connection.py
+++ b/packages/fetchai/connections/p2p_stub/connection.py
@@ -21,7 +21,7 @@
 import os
 import tempfile
 from pathlib import Path
-from typing import cast, Union
+from typing import Union, cast
 
 from aea.configurations.base import ConnectionConfig, PublicId
 from aea.connections.stub.connection import StubConnection, write_envelope
diff --git a/packages/fetchai/connections/p2p_stub/connection.yaml b/packages/fetchai/connections/p2p_stub/connection.yaml
index 98120d9535..c64dd5676d 100644
--- a/packages/fetchai/connections/p2p_stub/connection.yaml
+++ b/packages/fetchai/connections/p2p_stub/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbAStnFJj6jMTwqNu7DG9dt2uy5JGrGhKtCbYuAhWLBCk
   __init__.py: QmW9XFKGsea4u3fupkFMcQutgsjqusCMBMyTcTmLLmQ4tR
-  connection.py: QmZ9YcefyzbVP45UaFrZcrKNKQQpeAkk45w5T9q2piEfpy
+  connection.py: QmSd6uheF634ZkHoPe1DtpPeD6Sx6p11rpB8tYELqWZUoS
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PStubConnection
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 913fbfbd77..e587160479 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -26,7 +26,7 @@
 from concurrent.futures._base import CancelledError as ConcurrentCancelledError
 from concurrent.futures.thread import ThreadPoolExecutor
 from contextlib import suppress
-from typing import Callable, cast, Dict, List, Optional, Set, Type, Union
+from typing import Callable, Dict, List, Optional, Set, Type, Union, cast
 from urllib import parse
 from uuid import uuid4
 
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index bc37bd232e..0d3a69b6a9 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmWwjETX39APP9RD5oVPeeCiDnUoDvjAcoVe2FK2Jc6anM
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmTf8NU96LvnDdkB88b37Xk8K4cZFb6tj57TNP86ZL1Gyj
+  connection.py: QmZUiXzv3TTQN3pRSTXv21zDkaTKCpEbQy4WKEysaNz5iq
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/tcp/connection.yaml b/packages/fetchai/connections/tcp/connection.yaml
index e3dcc18244..244e25f814 100644
--- a/packages/fetchai/connections/tcp/connection.yaml
+++ b/packages/fetchai/connections/tcp/connection.yaml
@@ -10,8 +10,8 @@ fingerprint:
   __init__.py: QmTxAtQ9ffraStxxLAkvmWxyGhoV3jE16Sw6SJ9xzTthLb
   base.py: QmRu7RYvTQuXvzM8mj8LQ8d3XtaHKLRdnMo7AvX2X76npe
   connection.py: QmcQnyUagAhE7UsSBxiBSqsuF4mTMdU26LZLhUhdq5QygR
-  tcp_client.py: QmevCDDRJBJuw8awsn3TYWHbqPJLegjDZdeHFi5ZUwRKDg
-  tcp_server.py: QmUQwZmu12FeGNpg22Jn4ZFaoP53WpdLfAM18ySfoCyTsj
+  tcp_client.py: QmZ525Hun84As512AvVM6imBfeF9Rg9Qu9uqySynEJqeda
+  tcp_server.py: QmVxWqr4Hr5Kumdwi9xE83Pez5aMx64HqgV2NHeRUUka1A
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: TCPClientConnection
diff --git a/packages/fetchai/connections/tcp/tcp_client.py b/packages/fetchai/connections/tcp/tcp_client.py
index 76e0b52122..00ce22f43e 100644
--- a/packages/fetchai/connections/tcp/tcp_client.py
+++ b/packages/fetchai/connections/tcp/tcp_client.py
@@ -27,7 +27,7 @@
     StreamReader,
     StreamWriter,
 )
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ConnectionConfig
 from aea.mail.base import Envelope
diff --git a/packages/fetchai/connections/tcp/tcp_server.py b/packages/fetchai/connections/tcp/tcp_server.py
index c04213ef33..8bcdd72ecb 100644
--- a/packages/fetchai/connections/tcp/tcp_server.py
+++ b/packages/fetchai/connections/tcp/tcp_server.py
@@ -22,7 +22,7 @@
 import asyncio
 import logging
 from asyncio import AbstractServer, Future, StreamReader, StreamWriter
-from typing import cast, Dict, Optional, Tuple
+from typing import Dict, Optional, Tuple, cast
 
 from aea.common import Address
 from aea.configurations.base import ConnectionConfig
diff --git a/packages/fetchai/connections/webhook/connection.py b/packages/fetchai/connections/webhook/connection.py
index 0d4d6e9dc1..15bcf0490c 100644
--- a/packages/fetchai/connections/webhook/connection.py
+++ b/packages/fetchai/connections/webhook/connection.py
@@ -22,14 +22,14 @@
 import json
 import logging
 from asyncio import CancelledError
-from typing import cast, Optional, Union
+from typing import Optional, Union, cast
 
 from aiohttp import web  # type: ignore
 
 from aea.common import Address
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
-from aea.mail.base import Envelope, EnvelopeContext, URI
+from aea.mail.base import URI, Envelope, EnvelopeContext
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
diff --git a/packages/fetchai/connections/webhook/connection.yaml b/packages/fetchai/connections/webhook/connection.yaml
index 68fec4e29a..8486472c9c 100644
--- a/packages/fetchai/connections/webhook/connection.yaml
+++ b/packages/fetchai/connections/webhook/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmQDqfKKsksKsUqdqTcYe8P8Fw3MGovVuZBFHPbhupkkxf
   __init__.py: QmWUKSmXaBgGMvKgdmzKmMjCx43BnrfW6og2n3afNoAALq
-  connection.py: QmSTcUqdxmFG4N2NPbKRxpTcbChThVryJ6xGhD7DeWwuT5
+  connection.py: QmPXKYLQXdv6QryujJ8JXvLqRxAnEPjN2uWoYx3GkhYkac
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/contracts/erc1155/contract.py b/packages/fetchai/contracts/erc1155/contract.py
index 950e2331f2..99db581ea3 100644
--- a/packages/fetchai/contracts/erc1155/contract.py
+++ b/packages/fetchai/contracts/erc1155/contract.py
@@ -22,7 +22,7 @@
 import json
 import logging
 import random
-from typing import Any, cast, Dict, List, Optional
+from typing import Any, Dict, List, Optional, cast
 
 from vyper.utils import keccak256
 
diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml
index c07b8fde4c..221b26e0c5 100644
--- a/packages/fetchai/contracts/erc1155/contract.yaml
+++ b/packages/fetchai/contracts/erc1155/contract.yaml
@@ -10,7 +10,7 @@ fingerprint:
   build/Migrations.json: QmfFYYWoq1L1Ni6YPBWWoRPvCZKBLZ7qzN3UDX537mCeuE
   build/erc1155.json: Qma5n7au2NDCg1nLwYfYnmFNwWChFuXtu65w5DV7wAZRvw
   build/erc1155.wasm: Qmc9gthbdwRSywinTHKjRVQdFzrKTxUuLDx2ryNfQp1xqf
-  contract.py: QmREF1pSQhJduHCWQpn67EtfNuZp93PzJY152tkqq32B7t
+  contract.py: QmSEfxq6dH53q9qEw3KrtTgUqvyDgCefy59RNpciGGAGi6
   contracts/Migrations.sol: QmbW34mYrj3uLteyHf3S46pnp9bnwovtCXHbdBHfzMkSZx
   contracts/erc1155.vy: QmXwob8G1uX7fDvtuuKW139LALWtQmGw2vvaTRBVAWRxTx
   migrations/1_initial_migration.js: QmcxaWKQ2yPkQBmnpXmcuxPZQUMuUudmPmX3We8Z9vtAf7
diff --git a/packages/fetchai/protocols/contract_api/dialogues.py b/packages/fetchai/protocols/contract_api/dialogues.py
index c27ccea420..3f2ec696b3 100644
--- a/packages/fetchai/protocols/contract_api/dialogues.py
+++ b/packages/fetchai/protocols/contract_api/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/contract_api/message.py b/packages/fetchai/protocols/contract_api/message.py
index 1e666fd247..a663637112 100644
--- a/packages/fetchai/protocols/contract_api/message.py
+++ b/packages/fetchai/protocols/contract_api/message.py
@@ -20,7 +20,7 @@
 """This module contains contract_api's message definition."""
 
 import logging
-from typing import cast, Optional, Set, Tuple
+from typing import Optional, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index 98d312b0b9..c2c207893f 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -11,9 +11,9 @@ fingerprint:
   contract_api.proto: QmNwngtcYFSuqL8yeTGVXmrHjfebCybdUa9BnTDKXn8odk
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
   custom_types.py: QmbLjpiTcGNfvdBsu8pgQH6PK5y6ujdNnZ53JSk1GZDRCA
-  dialogues.py: QmatXfb83UiHz78oNir1m7BHUCHcjC2vToX5ym5xg2TsqE
-  message.py: Qmb1jJji5cKaRTZ5pyXfRvgaVJg39519Py1a3o3FM2QEew
-  serialization.py: QmYxhZxqEFj6yoLuUuHssR4Hv59C72uAUwom3sM6hLtKad
+  dialogues.py: QmSDg2B75CTZ3y8hyZgEsCMPseu6XFzcB7QX8XtMXJDWbn
+  message.py: QmUccjMF97WqBZNuDrsYRMofAsfZ2vZFEHnyoiicNuY73K
+  serialization.py: QmfGrQURxWxrYQMYATbseN3pggTbJbYccy1kXFkqKSrLeK
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/contract_api/serialization.py b/packages/fetchai/protocols/contract_api/serialization.py
index 418d551676..718c9d9819 100644
--- a/packages/fetchai/protocols/contract_api/serialization.py
+++ b/packages/fetchai/protocols/contract_api/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for contract_api protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.contract_api import contract_api_pb2
diff --git a/packages/fetchai/protocols/fipa/dialogues.py b/packages/fetchai/protocols/fipa/dialogues.py
index 784d9e51fd..abf8ada492 100644
--- a/packages/fetchai/protocols/fipa/dialogues.py
+++ b/packages/fetchai/protocols/fipa/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/fipa/message.py b/packages/fetchai/protocols/fipa/message.py
index 5fc4da7939..3f1648efff 100644
--- a/packages/fetchai/protocols/fipa/message.py
+++ b/packages/fetchai/protocols/fipa/message.py
@@ -20,7 +20,7 @@
 """This module contains fipa's message definition."""
 
 import logging
-from typing import cast, Dict, Set, Tuple
+from typing import Dict, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml
index 6a112e5fa4..a03513921d 100644
--- a/packages/fetchai/protocols/fipa/protocol.yaml
+++ b/packages/fetchai/protocols/fipa/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmRwxwzxfhotek7WUbyAeufBvoHpWbDwfUVMy3FKitiHKy
   __init__.py: QmZuv8RGegxunYaJ7sHLwj2oLLCFCAGF139b8DxEY68MRT
   custom_types.py: Qmb7bzEUAW74ZeSFqL7sTccNCjudStV63K4CFNZtibKUHB
-  dialogues.py: QmXKE9vDi5byW2qUoooE8qbkETJH9DDPHq5qNkG9drfpRU
+  dialogues.py: QmdGVV1SqzwYo1UwEfpPMAryzCaYTWXUuraYDSe9ZKQXZZ
   fipa.proto: QmP7JqnuQSQ9BDcKkscrTydKEX4wFBoyFaY1bkzGkamcit
   fipa_pb2.py: QmZMkefJLrb3zJKoimb6a9tdpxDBhc8rR2ghimqg7gZ471
-  message.py: QmUvHvbZnos2VPfa7CibXpddc1wEKwL55zhCnodqPucj1h
-  serialization.py: QmQiFE2TzLMVM2mcbNHLrF5reydWt4UWuCC8bX3YJyBs5E
+  message.py: QmPEx8gqKV6Cw1LeakKfC6frVpe225zb3BjyVxqX3bKwQr
+  serialization.py: QmW8riKb6M5Bso67hp9XRLXUC86hAR5GJEyyQWcqdkbdt5
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/fipa/serialization.py b/packages/fetchai/protocols/fipa/serialization.py
index cc1f44f309..d7875b9181 100644
--- a/packages/fetchai/protocols/fipa/serialization.py
+++ b/packages/fetchai/protocols/fipa/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for fipa protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.fipa import fipa_pb2
diff --git a/packages/fetchai/protocols/gym/dialogues.py b/packages/fetchai/protocols/gym/dialogues.py
index 7bf4fcf0ac..602ba60402 100644
--- a/packages/fetchai/protocols/gym/dialogues.py
+++ b/packages/fetchai/protocols/gym/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/gym/message.py b/packages/fetchai/protocols/gym/message.py
index f8217f85b7..ab08207cec 100644
--- a/packages/fetchai/protocols/gym/message.py
+++ b/packages/fetchai/protocols/gym/message.py
@@ -20,7 +20,7 @@
 """This module contains gym's message definition."""
 
 import logging
-from typing import cast, Dict, Set, Tuple
+from typing import Dict, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index 511e35da86..6e3c2e1f63 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmTCkz4cEUcwuPZVtvrVr8Np5qn1SMwm6foGSY9Y68DhZT
   __init__.py: QmWBvruqGuU2BVCq8cuP1S3mgvuC78yrG4TdtSvKhCT8qX
   custom_types.py: QmT3VKT86xZKR11RR1vQ3myRpmVZNdzY6ELd8HG9U2ngwa
-  dialogues.py: QmTUPRyUM8d78KYhsecD9KH6FNhJzTQ4ETv8z1SueerDSB
+  dialogues.py: QmTJLhmqiB1DpoQVQKwo8RRUeoba8h1jVeTm399vgd2t66
   gym.proto: QmQGF9Xz4Z93wmhdKoztzxjo5pS4SsAWe2TQdvZCLuzdGC
   gym_pb2.py: QmSTz7xrL8ryqzR1Sgu1NpR6PmW7GUhBGnN2qYc8m8NCcN
-  message.py: QmT7dXmEqwPEi4ngZVWRMaYSddDHeemTAcxLdXv67mAJZB
-  serialization.py: QmQd94GuH1XZ1QZUCzdYT4cRyM5Vy4B3ABEHQNVfeTSNPC
+  message.py: Qmd9viV8e1SzaTNmKXVjFnsTavNN64JReJRkkQAnpX1A97
+  serialization.py: QmZ4aVD25B2jpEPBXzPgPHj9PeyZyh8VwYrb2knJcgXCbE
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/gym/serialization.py b/packages/fetchai/protocols/gym/serialization.py
index f2f0aea130..a69428758c 100644
--- a/packages/fetchai/protocols/gym/serialization.py
+++ b/packages/fetchai/protocols/gym/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for gym protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.gym import gym_pb2
diff --git a/packages/fetchai/protocols/http/dialogues.py b/packages/fetchai/protocols/http/dialogues.py
index 40e5c219b9..7d722c6aa8 100644
--- a/packages/fetchai/protocols/http/dialogues.py
+++ b/packages/fetchai/protocols/http/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/http/message.py b/packages/fetchai/protocols/http/message.py
index 95e73ffd59..3c4841038a 100644
--- a/packages/fetchai/protocols/http/message.py
+++ b/packages/fetchai/protocols/http/message.py
@@ -20,7 +20,7 @@
 """This module contains http's message definition."""
 
 import logging
-from typing import cast, Set, Tuple
+from typing import Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml
index a93a22a670..75bb043685 100644
--- a/packages/fetchai/protocols/http/protocol.yaml
+++ b/packages/fetchai/protocols/http/protocol.yaml
@@ -8,11 +8,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmY7fxhyNBgwU7uc6LKtCN4aSQ4bym5BwqtwRAfwPokULN
   __init__.py: QmRWie4QPiFJE8nK4fFJ6prqoG3u36cPo7st5JUZAGpVWv
-  dialogues.py: QmbLrJoAwsdDMuZkFnkbDSH2xJ1JZjmwUn7BfzGcEw9VvE
+  dialogues.py: Qmf69mXWZQU1jaPAKqdyFujgp2LmXu37RJYqzvgYttPfDS
   http.proto: QmdTUTvvxGxMxSTB67AXjMUSDLdsxBYiSuJNVxHuLKB1jS
   http_pb2.py: QmYYKqdwiueq54EveL9WXn216FXLSQ6XGJJHoiJxwJjzHC
-  message.py: QmZ54hhAZXbj5K1eJ23GDhkGVbsG76hnDfon9qG8Pm3dB7
-  serialization.py: Qmbx7TrAXy4TCJzxM2fMWfKod7Bgx51FMYU9eVGYBcbP11
+  message.py: QmYSmd2xLU8TsLLorxxNnaHj1cVLztgrKtQnaqJ1USFkPY
+  serialization.py: QmUdYL9PqDEbbjLaotxMSNEoVnEAdvFewffw2CV5SgG7sp
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/http/serialization.py b/packages/fetchai/protocols/http/serialization.py
index 16f4dbaf9b..896249bc9b 100644
--- a/packages/fetchai/protocols/http/serialization.py
+++ b/packages/fetchai/protocols/http/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for http protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.http import http_pb2
diff --git a/packages/fetchai/protocols/ledger_api/dialogues.py b/packages/fetchai/protocols/ledger_api/dialogues.py
index 6c3cc92ad2..a1e375a13f 100644
--- a/packages/fetchai/protocols/ledger_api/dialogues.py
+++ b/packages/fetchai/protocols/ledger_api/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/ledger_api/message.py b/packages/fetchai/protocols/ledger_api/message.py
index 790c2f58be..e38a9e002d 100644
--- a/packages/fetchai/protocols/ledger_api/message.py
+++ b/packages/fetchai/protocols/ledger_api/message.py
@@ -20,7 +20,7 @@
 """This module contains ledger_api's message definition."""
 
 import logging
-from typing import cast, Optional, Set, Tuple
+from typing import Optional, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml
index 6c92685ba9..eb615a0b21 100644
--- a/packages/fetchai/protocols/ledger_api/protocol.yaml
+++ b/packages/fetchai/protocols/ledger_api/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmSoo6ds8mKhtoG8CBbu9rb9yj7sqeeuBfcU7CLj584uRX
   __init__.py: Qmct8jVx6ndWwaa5HXJAJgMraVuZ8kMeyx6rnEeHAYHwDJ
   custom_types.py: QmQJnWQvtj1D9zqGWM3XrpNtZPmzr4rLgKxoG1MzM5udNA
-  dialogues.py: QmVJLujzpu7Zm6i4Mqw6Yf4g2sjJbmdT5FqV8KURqjLvg8
+  dialogues.py: QmVCWMYaVVhtAoJVfzdpBz3bhGvXZH3XEY3KqbFGhwRx6b
   ledger_api.proto: QmfLcv7jJcGJ1gAdCMqsyxJcRud7RaTWteSXHL5NvGuViP
   ledger_api_pb2.py: QmQhM848REJTDKDoiqxkTniChW8bNNm66EtwMRkvVdbMry
-  message.py: QmYXnMm4fbHyk88qn6VdqfMerZA3R6Xs48LrYRwTr7ghD5
-  serialization.py: QmV4F4vqvjHcVt5axZKC9cpCbmtQdQeixKK7KdC6MVKbFH
+  message.py: QmSoC4Vt4CFWGbZB6rsXn7jLho3CiuvHTTEnKS2RBRg1LZ
+  serialization.py: QmWnjRaZBpUtErSTGGR6uQmatXy1xcbfhSvsFzYKjRNzM5
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/ledger_api/serialization.py b/packages/fetchai/protocols/ledger_api/serialization.py
index 86f0c9077a..60171b5576 100644
--- a/packages/fetchai/protocols/ledger_api/serialization.py
+++ b/packages/fetchai/protocols/ledger_api/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for ledger_api protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.ledger_api import ledger_api_pb2
diff --git a/packages/fetchai/protocols/ml_trade/dialogues.py b/packages/fetchai/protocols/ml_trade/dialogues.py
index c9a992a235..ac734a9f4e 100644
--- a/packages/fetchai/protocols/ml_trade/dialogues.py
+++ b/packages/fetchai/protocols/ml_trade/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/ml_trade/message.py b/packages/fetchai/protocols/ml_trade/message.py
index 2e1b2124e2..f3b96e6949 100644
--- a/packages/fetchai/protocols/ml_trade/message.py
+++ b/packages/fetchai/protocols/ml_trade/message.py
@@ -20,7 +20,7 @@
 """This module contains ml_trade's message definition."""
 
 import logging
-from typing import cast, Set, Tuple
+from typing import Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/ml_trade/protocol.yaml b/packages/fetchai/protocols/ml_trade/protocol.yaml
index ce091dcef8..b57c75503b 100644
--- a/packages/fetchai/protocols/ml_trade/protocol.yaml
+++ b/packages/fetchai/protocols/ml_trade/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmSRtzACMh3x3LSjYqWXWTpYpE4C7G8EHbW4zQQoMFFZ4K
   __init__.py: QmXZMVdsBXUJxLZvwwhWBx58xfxMSyoGxdYp5Aeqmzqhzt
   custom_types.py: QmeWvNKuezFxfmLYaxKhP9XffeiFFCwH1qowyiJacLAHpF
-  dialogues.py: QmWywRmmJYXD4TRkPJeDa5ntueK4DPJ6L9sKgM5wuq98wT
-  message.py: QmeFb86N5UxzQQhJyXFnJKSqgKymVu1wEyCrhaUaCn2K1f
+  dialogues.py: QmVqaAXZrVvw3Djyi7BgpJCSBtoSmBeDEYFtD7k3y45vu1
+  message.py: QmQWqj74tHy16CgnMYYWa8tTSChmjquGNtYtnLkzMdDLEH
   ml_trade.proto: QmeB21MQduEGQCrtiYZQzPpRqHL4CWEkvvcaKZ9GsfE8f6
   ml_trade_pb2.py: QmZVvugPysR1og6kWCJkvo3af2s9pQRHfuj4BptE7gU1EU
-  serialization.py: QmVGjPRVK7sm82F9XYgT1giVcpQ1X5fEu9ydwvgRP63vZV
+  serialization.py: QmQCjiTWXmvrfFjsLUwuSBVujRq7zihL1nkcdhQkweakDy
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/ml_trade/serialization.py b/packages/fetchai/protocols/ml_trade/serialization.py
index 635f63eb63..faf1ae5665 100644
--- a/packages/fetchai/protocols/ml_trade/serialization.py
+++ b/packages/fetchai/protocols/ml_trade/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for ml_trade protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.ml_trade import ml_trade_pb2
diff --git a/packages/fetchai/protocols/oef_search/dialogues.py b/packages/fetchai/protocols/oef_search/dialogues.py
index 82e4b1c5d1..1a29699488 100644
--- a/packages/fetchai/protocols/oef_search/dialogues.py
+++ b/packages/fetchai/protocols/oef_search/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/oef_search/message.py b/packages/fetchai/protocols/oef_search/message.py
index c8281c00af..acff1547b6 100644
--- a/packages/fetchai/protocols/oef_search/message.py
+++ b/packages/fetchai/protocols/oef_search/message.py
@@ -20,7 +20,7 @@
 """This module contains oef_search's message definition."""
 
 import logging
-from typing import cast, Set, Tuple
+from typing import Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml
index b035e7433a..c29691d3c0 100644
--- a/packages/fetchai/protocols/oef_search/protocol.yaml
+++ b/packages/fetchai/protocols/oef_search/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmaGSTqxvQFKccBnLovhBbfSH3C3Sorrj7kFyZqW9qptLa
   __init__.py: QmRvTtynKcd7shmzgf8aZdcA5witjNL5cL2a7WPgscp7wq
   custom_types.py: QmPSAWKkH7R8XCfPUCRmuEqVxCnp8L5PTUq4DBt59AzFUC
-  dialogues.py: QmZ9AMyHu4pPFHBiE239AWQT8haVK74JFWPVjtd2kPc9ej
-  message.py: QmdUz4aHSwo1xAtpJuNusakJAz4cU1XdLzKo9bwuL5QLfq
+  dialogues.py: QmYE5MGfXV2aQEUr3pAMKsuP9ywzWtLEkrDBu7zA25ms3U
+  message.py: QmXSb2g2Dfeu629wXUZ4WzhrGwWaTNmu28P1hihUnEViVL
   oef_search.proto: QmNU8WsxT6XNFFneKKeDaZkNn3CEFDfZQkmKv9TyhyxzDB
   oef_search_pb2.py: QmSAFT1xxYRzJU6h1aFVDuYcx672sZ2vzV6c2ico7f4BLK
-  serialization.py: QmaVfY1Q5EpkQhoHMip45efayT4a6iPxknTNuMQKGyTf4S
+  serialization.py: QmSH58UnNGcGTFqEcsokB58CRVEfHtiMskTFtrams8f5CH
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/oef_search/serialization.py b/packages/fetchai/protocols/oef_search/serialization.py
index e81792a4c3..15895850df 100644
--- a/packages/fetchai/protocols/oef_search/serialization.py
+++ b/packages/fetchai/protocols/oef_search/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for oef_search protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.oef_search import oef_search_pb2
diff --git a/packages/fetchai/protocols/tac/dialogues.py b/packages/fetchai/protocols/tac/dialogues.py
index b388b9209b..3fd6363ac1 100644
--- a/packages/fetchai/protocols/tac/dialogues.py
+++ b/packages/fetchai/protocols/tac/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/protocols/tac/message.py b/packages/fetchai/protocols/tac/message.py
index 81c321a38a..9ceb13b045 100644
--- a/packages/fetchai/protocols/tac/message.py
+++ b/packages/fetchai/protocols/tac/message.py
@@ -20,7 +20,7 @@
 """This module contains tac's message definition."""
 
 import logging
-from typing import cast, Dict, Optional, Set, Tuple
+from typing import Dict, Optional, Set, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml
index 5ff8fe1708..a78d53b0ef 100644
--- a/packages/fetchai/protocols/tac/protocol.yaml
+++ b/packages/fetchai/protocols/tac/protocol.yaml
@@ -10,9 +10,9 @@ fingerprint:
   README.md: QmVhm6VBbggxjTe3PEhCBfTomWekNa5buYy3sY7YYN6Er6
   __init__.py: QmZYdAjm3o44drRiY3MT4RtG2fFLxtaL8h898DmjoJwJzV
   custom_types.py: QmXyAhpkE6sLExGgf2GxBv8gRYTDZu7XCDsa2m4rwvQrmp
-  dialogues.py: QmSZMt9rRFasAkziB3ZtUvLKSpF7dKPRenqUXNtEuBqPhF
-  message.py: QmWDvBFPBk6cy2Auso4VGxZFrn4K4jqgTtCRLJazmoYx9H
-  serialization.py: QmZqeRNTVTTpFp7ymKgeKaGj7zHMCHD6KBAe9v1LLJJXyS
+  dialogues.py: QmQNMQ6J85Jp59vZXRuKZtyh4MessMCxjs75C5EC3TfJbA
+  message.py: Qme5qTFZr7vTc76rbUwrYuRZNQKuxqHdVdP4pPk3m16Q4S
+  serialization.py: QmV2haMtVTKaeqZrXriZuzL2TAcNQ245AqYFsGBJzuibx7
   tac.proto: QmdpPZNhUW593qVNVoSTWZgd9R69bmBbw6Y9xjzYpvuDvV
   tac_pb2.py: QmUwW3kixKwD2o1RRdq4NoNoihPb5BXKKRngWXztq32fea
 fingerprint_ignore_patterns: []
diff --git a/packages/fetchai/protocols/tac/serialization.py b/packages/fetchai/protocols/tac/serialization.py
index fabcb1e28d..6f12536758 100644
--- a/packages/fetchai/protocols/tac/serialization.py
+++ b/packages/fetchai/protocols/tac/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for tac protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from packages.fetchai.protocols.tac import tac_pb2
diff --git a/packages/fetchai/skills/aries_alice/behaviours.py b/packages/fetchai/skills/aries_alice/behaviours.py
index 18ede1fb58..52b8c53e2e 100644
--- a/packages/fetchai/skills/aries_alice/behaviours.py
+++ b/packages/fetchai/skills/aries_alice/behaviours.py
@@ -20,7 +20,7 @@
 """This package contains the behaviour of a generic seller AEA."""
 
 import json
-from typing import cast, Dict
+from typing import Dict, cast
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
@@ -34,8 +34,8 @@
     OefSearchDialogues,
 )
 from packages.fetchai.skills.aries_alice.strategy import (
-    AliceStrategy,
     HTTP_COUNTERPARTY,
+    AliceStrategy,
 )
 
 DEFAULT_SERVICES_INTERVAL = 60.0
diff --git a/packages/fetchai/skills/aries_alice/handlers.py b/packages/fetchai/skills/aries_alice/handlers.py
index 5eb646663c..59bc2ef6fa 100644
--- a/packages/fetchai/skills/aries_alice/handlers.py
+++ b/packages/fetchai/skills/aries_alice/handlers.py
@@ -22,7 +22,7 @@
 import base64
 import binascii
 import json
-from typing import cast, Dict, Optional
+from typing import Dict, Optional, cast
 from urllib.parse import urlparse
 
 from aea.configurations.base import ProtocolId
diff --git a/packages/fetchai/skills/aries_alice/skill.yaml b/packages/fetchai/skills/aries_alice/skill.yaml
index a9bf82b529..d8ccc8de1f 100644
--- a/packages/fetchai/skills/aries_alice/skill.yaml
+++ b/packages/fetchai/skills/aries_alice/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfS1ezD77No8WQkvrkPs4oSXHFbULRxatGzRhMbSMntSx
   __init__.py: Qma8qSTU34ADKWskBwQKQLGNpe3xDKNgjNQ6Q4MxUnKa3Q
-  behaviours.py: QmPQ87aRJ4KHAq29ghNPioA7YH36Pz5XbRhQsW4EPh63J6
+  behaviours.py: QmaFXL8xKh4vL5qXtQq8nyQXBAGJXEnMY5crL3CBoSjTuW
   dialogues.py: QmQwremVUhyXMcoPQEvc4yJaUUDBx9ZYmDUCUHZwwux9Gc
-  handlers.py: QmQg1WLMNdgKmaBphEwdVeXcK9nq7VxkY4QPhT2A4y4ZZp
+  handlers.py: Qmc4cdzhZPxQsc8FzZXq1P4KfFNX78yPA5LVmEKfVP46Xa
   strategy.py: QmZ2jhWFQZipk6wAquS1gWxX94iAmhN9Vrh7tcPU9bgpzF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/aries_faber/behaviours.py b/packages/fetchai/skills/aries_faber/behaviours.py
index 3c030933b9..9a4f57c62d 100644
--- a/packages/fetchai/skills/aries_faber/behaviours.py
+++ b/packages/fetchai/skills/aries_faber/behaviours.py
@@ -20,7 +20,7 @@
 """This package contains the behaviour for the aries_faber skill."""
 
 import json
-from typing import cast, Dict
+from typing import Dict, cast
 
 from aea.skills.behaviours import TickerBehaviour
 from packages.fetchai.protocols.http.message import HttpMessage
@@ -30,8 +30,8 @@
     OefSearchDialogues,
 )
 from packages.fetchai.skills.aries_faber.strategy import (
-    FaberStrategy,
     HTTP_COUNTERPARTY,
+    FaberStrategy,
 )
 
 DEFAULT_SEARCH_INTERVAL = 5.0
diff --git a/packages/fetchai/skills/aries_faber/handlers.py b/packages/fetchai/skills/aries_faber/handlers.py
index 66630ded93..c792a3fa51 100644
--- a/packages/fetchai/skills/aries_faber/handlers.py
+++ b/packages/fetchai/skills/aries_faber/handlers.py
@@ -21,7 +21,7 @@
 
 import json
 import random
-from typing import cast, Dict, Optional
+from typing import Dict, Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.mail.base import EnvelopeContext
@@ -46,8 +46,8 @@
     ADMIN_COMMAND_SCEHMAS,
     ADMIN_COMMAND_STATUS,
     FABER_ACA_IDENTITY,
-    FaberStrategy,
     LEDGER_COMMAND_REGISTER_DID,
+    FaberStrategy,
 )
 
 SUPPORT_REVOCATION = False
diff --git a/packages/fetchai/skills/aries_faber/skill.yaml b/packages/fetchai/skills/aries_faber/skill.yaml
index a2254a2537..37e0837dba 100644
--- a/packages/fetchai/skills/aries_faber/skill.yaml
+++ b/packages/fetchai/skills/aries_faber/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdkSNCYx5dNGDAAveapQgoyM7Y7iYeQzR7KN2Sso3CJG4
   __init__.py: QmNPVQ6UajvJodqTLWbLvQZkKCfrNn1nYPrQXai3xdj6F7
-  behaviours.py: QmfKXbGwvhnNSCDmEjt9z8YjD98gReD7v5MDeDbaPkgLMt
+  behaviours.py: QmUodVZv8uBeDLCiWnQpRoRGT5oEUauhrSoZdMx1VxGFaU
   dialogues.py: QmPHqMtprNxvA6VTAi7ZRbLfFNy4pDPUcu9T6sM37wxMyQ
-  handlers.py: QmYD7CvETEoMmk5sb1rbBSK1sUzbtg3MLDLrVetMsn8quA
+  handlers.py: QmTDWYft3unkJhhQZGKcEHdyw8LuZPHuCLbFrUg9PHe1Fh
   strategy.py: QmcUmddp6CUP31Bfckt6EkV3n2VZcJrUagoGBaTDBMTdXR
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/erc1155_client/handlers.py b/packages/fetchai/skills/erc1155_client/handlers.py
index ea5ebffbe7..283f1311c1 100644
--- a/packages/fetchai/skills/erc1155_client/handlers.py
+++ b/packages/fetchai/skills/erc1155_client/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains handlers for the erc1155-client skill."""
 
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.helpers.transaction.base import RawMessage, Terms
diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml
index eb0e11c443..7b624d2b71 100644
--- a/packages/fetchai/skills/erc1155_client/skill.yaml
+++ b/packages/fetchai/skills/erc1155_client/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: QmRXXJsv5bfvb7qsyxQtVzXwn6PMLJKkbm6kg4DNkT1NtW
   behaviours.py: QmT1c2JxQf92Em8ohu4qMSmBtebgmW7Gm6ZAK5ifFT2bQS
   dialogues.py: QmUM3rDDQALcgfKsX7gGpT7sP1DVXsneS6XbqVANaW4Xfh
-  handlers.py: QmVpnbEiVX1P8E49mbMAtGGMpDD5CA7W7CipEwryubUH8N
+  handlers.py: Qme7hDcANLpsUcJAm74eLRRzHTDKbBNUxt5sbMmUnE75sr
   strategy.py: QmNg87LgfLPoPyokFrmvrNghQD7JkWehRNAdRNyB3YogeN
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/erc1155_deploy/handlers.py b/packages/fetchai/skills/erc1155_deploy/handlers.py
index 0ce403de5a..5db033feb3 100644
--- a/packages/fetchai/skills/erc1155_deploy/handlers.py
+++ b/packages/fetchai/skills/erc1155_deploy/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers of the erc1155 deploy skill AEA."""
 
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.crypto.ethereum import EthereumHelper
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index cacb0033d1..ea1b113692 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: Qmbm3ZtGpfdvvzqykfRqbaReAK9a16mcyK7qweSfeN5pq1
   behaviours.py: QmNf5NGKdNaffwFHHyNPv1FMocJ9YbnvU1zKFaYJoUEexA
   dialogues.py: QmdHxieCCQjSbEf1U1vekKUK86EVu64Hw2HFKWrC9hK5q6
-  handlers.py: QmYYvptHAuprPXDjpYGPrGpn4Qp7cioFK3anGK9JBeGMXY
+  handlers.py: QmR9hFdRrtGyXeijkWH31KXyE835x3CiNXPh6cy1hthv1A
   strategy.py: QmcmUTRZk4BDm9DyowWm9NT1UzDe6rjQhgyongibSPh3hc
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/generic_buyer/handlers.py b/packages/fetchai/skills/generic_buyer/handlers.py
index f521639e09..89eb62d5d2 100644
--- a/packages/fetchai/skills/generic_buyer/handlers.py
+++ b/packages/fetchai/skills/generic_buyer/handlers.py
@@ -20,7 +20,7 @@
 """This package contains handlers for the generic buyer skill."""
 
 import pprint
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml
index c0ca469e65..09725cf577 100644
--- a/packages/fetchai/skills/generic_buyer/skill.yaml
+++ b/packages/fetchai/skills/generic_buyer/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmaEDrNJBeHCJpbdFckRUhLSBqCXQ6umdipTMpYhqSKxSG
   behaviours.py: QmX2CDEtaNMeP8iSRafRiYcso7rcEYgSZpn6UV3JgFbAio
   dialogues.py: QmUmPdxtaXK783i63ZB2nvHctHg9sZqRVgP6P7rnsG2V9s
-  handlers.py: QmU3yFr2XiaBtYEZV6uh9LdjaDi52LHo8e9u5xKfpYUKiQ
+  handlers.py: QmNo8CT3ev8m25ePhAaRJaqo1BcprpK5kvUYjARoPHnJia
   strategy.py: Qmb2T99WnQQa4qyZSdu31QyrbtHy8ZWC6Jhv9sVrTYrFxE
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/generic_seller/handlers.py b/packages/fetchai/skills/generic_seller/handlers.py
index 8f47a5ee73..2b39a677b0 100644
--- a/packages/fetchai/skills/generic_seller/handlers.py
+++ b/packages/fetchai/skills/generic_seller/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers of a generic seller AEA."""
 
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.crypto.ledger_apis import LedgerApis
diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml
index 528326461c..6397a8f591 100644
--- a/packages/fetchai/skills/generic_seller/skill.yaml
+++ b/packages/fetchai/skills/generic_seller/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: QmbfkeFnZVKppLEHpBrTXUXBwg2dpPABJWSLND8Lf1cmpG
   behaviours.py: QmdsS8wmLyxTZc4FdUri4ojRG1nMbasSHC4u6i1AfTQH1V
   dialogues.py: QmZuFnZKndhsrUZrqjGpYHBzPFAZZbVdzGt6FLXvSi8AdS
-  handlers.py: QmXtsQEM8MoKL9jSTrARKnrFwDawFc6nQGK4Ba8VBN9S6i
+  handlers.py: QmeHRB72xVXoWCUd58SQ3q4vnzMZzrGjodWSyKGCyeYTwp
   strategy.py: QmX1mp7eZkz1P6iVyoDCATZDKZRgwe1EgMVmAyvtGDHvm3
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/gym/helpers.py b/packages/fetchai/skills/gym/helpers.py
index b95a0ebb65..073aabd4ce 100644
--- a/packages/fetchai/skills/gym/helpers.py
+++ b/packages/fetchai/skills/gym/helpers.py
@@ -22,7 +22,7 @@
 
 from abc import ABC, abstractmethod
 from queue import Queue
-from typing import Any, cast, Optional, Tuple
+from typing import Any, Optional, Tuple, cast
 
 import gym
 
diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml
index c7889c40ab..c44d7e4065 100644
--- a/packages/fetchai/skills/gym/skill.yaml
+++ b/packages/fetchai/skills/gym/skill.yaml
@@ -10,9 +10,9 @@ fingerprint:
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
   dialogues.py: QmQik8PG4xfuvbDwxocfRHygLHDbHkeqxHEGToAM2EooQz
   handlers.py: QmbqpPWc3N6MFSpJq2DaPcu78mJG3S9iJuJBuPproSnXHf
-  helpers.py: Qmc7pKqwSagUXCeT4cTP3Ed2Ji6Lc18Xa42Vs8XCGX6dcT
+  helpers.py: Qmf48TPcPXxZDVRjFtcJAHAbNJu1qGn8Hju1T1sqnwcL9C
   rl_agent.py: QmUq3XY9Dd2XZBhNNK9J3S5937d3az4cwP1BmeieHSgJ3m
-  tasks.py: QmR4zfFktphJrF23feYbeYHczpBRsTAW8icoeTvG19SkjC
+  tasks.py: QmR6XMqp4uwHyZ4MgJWdgmcUHjk92jWkRjskknZ1Zjji6i
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/gym/tasks.py b/packages/fetchai/skills/gym/tasks.py
index f7a725eedb..e10ecf1f7d 100644
--- a/packages/fetchai/skills/gym/tasks.py
+++ b/packages/fetchai/skills/gym/tasks.py
@@ -25,7 +25,7 @@
 from aea.skills.base import SkillContext
 from aea.skills.tasks import Task
 from packages.fetchai.skills.gym.helpers import ProxyEnv
-from packages.fetchai.skills.gym.rl_agent import DEFAULT_NB_STEPS, MyRLAgent, NB_GOODS
+from packages.fetchai.skills.gym.rl_agent import DEFAULT_NB_STEPS, NB_GOODS, MyRLAgent
 
 
 class GymTask(Task):
diff --git a/packages/fetchai/skills/ml_data_provider/handlers.py b/packages/fetchai/skills/ml_data_provider/handlers.py
index 02359293ce..7ba97e3d7a 100644
--- a/packages/fetchai/skills/ml_data_provider/handlers.py
+++ b/packages/fetchai/skills/ml_data_provider/handlers.py
@@ -20,7 +20,7 @@
 """This module contains the handler for the 'ml_data_provider' skill."""
 
 import pickle  # nosec
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
diff --git a/packages/fetchai/skills/ml_data_provider/skill.yaml b/packages/fetchai/skills/ml_data_provider/skill.yaml
index e94c28834e..61e6dee039 100644
--- a/packages/fetchai/skills/ml_data_provider/skill.yaml
+++ b/packages/fetchai/skills/ml_data_provider/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
   behaviours.py: QmWC4PEwWEyqcEJ9rTFjL9YpZ1pgkSpY9f4pE9mQHviSLz
   dialogues.py: QmRsg5xMC3QqHK2p2ULDkdcUECiX3YLPwbqfXdWZ3PewhD
-  handlers.py: QmXk3mCd2uB6mg2aT74jTSLkktY3FntL5cMs5yQ7Mi8uAF
+  handlers.py: QmePX9rXfypdNaqWfNZb2sXrSTuxwRGR2o3nXSw9yQSo1d
   strategy.py: QmUsa36TcE6DXjdDDz1u1tAPVPHaJyMnVCTxudJhVCyA3e
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/ml_train/handlers.py b/packages/fetchai/skills/ml_train/handlers.py
index fd7a0d16c9..63dcc7451b 100644
--- a/packages/fetchai/skills/ml_train/handlers.py
+++ b/packages/fetchai/skills/ml_train/handlers.py
@@ -21,7 +21,7 @@
 
 import pickle  # nosec
 import uuid
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.helpers.transaction.base import Terms
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index 5af8adcaa2..a1d228f6d9 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
   behaviours.py: QmbJtAxgudXA35gERW14gMnCA9q79iRNQmKfgTTY9e2Bif
   dialogues.py: Qma7uAuHWEdohLKMxGXHk34tRqXaS3FjFpyWCxpWtwRwEK
-  handlers.py: QmY2rbcg4agZYuTX5zfLEnpSFAfqqWHsW1hFFw4o58xk5A
+  handlers.py: QmRUQUVmcV3W8aCL3LEP3ZPx2aENMNbZe5EvS5vRBnK2RF
   ml_model.py: QmXp667GwVRrGsLxtqricnnyrBUUDn6efem22UCBd2g1y8
   model.json: QmdV2tGrRY6VQ5VLgUa4yqAhPDG6X8tYsWecypq8nox9Td
   strategy.py: QmY8z1DW6PqQuiEpgXAhwasSk1CgvvTNZQH1LtExupif9g
diff --git a/packages/fetchai/skills/simple_service_registration/handlers.py b/packages/fetchai/skills/simple_service_registration/handlers.py
index 83dcbdd9be..4693d7622a 100644
--- a/packages/fetchai/skills/simple_service_registration/handlers.py
+++ b/packages/fetchai/skills/simple_service_registration/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers of a generic seller AEA."""
 
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
diff --git a/packages/fetchai/skills/simple_service_registration/skill.yaml b/packages/fetchai/skills/simple_service_registration/skill.yaml
index 770186f6c6..6c2dad4ef6 100644
--- a/packages/fetchai/skills/simple_service_registration/skill.yaml
+++ b/packages/fetchai/skills/simple_service_registration/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
   behaviours.py: QmREzo2bxMA9h84utHze1BFptT2MgiSMkfiSydbynthRna
   dialogues.py: QmRMZk46s3AJ9KUbgP4fMP39qGX1YPsvJAJqmaFanMtZiV
-  handlers.py: QmTg94BbYLoAe3PUu7ZynGKe1MSw8bBCVr6PKGekjJBiQg
+  handlers.py: QmVGi8jXkCCJmxkpiwoAiWK1WNTYM4zYcJL4Vid6w7ekX3
   strategy.py: QmNTZ6XXAv6nvJs7B1p5mt7bVdH4pb3motxADDrxCpbmWF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/tac_control/behaviours.py b/packages/fetchai/skills/tac_control/behaviours.py
index fe8cd33e43..c396a06557 100644
--- a/packages/fetchai/skills/tac_control/behaviours.py
+++ b/packages/fetchai/skills/tac_control/behaviours.py
@@ -20,7 +20,7 @@
 """This package contains a the behaviours."""
 
 import datetime
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.helpers.search.models import Description
 from aea.skills.base import Behaviour
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 55335b6ab8..e03ab5e810 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -23,7 +23,7 @@
 import datetime
 import pprint
 from enum import Enum
-from typing import cast, Dict, List, Optional
+from typing import Dict, List, Optional, cast
 
 from aea.common import Address
 from aea.crypto.ledger_apis import LedgerApis
diff --git a/packages/fetchai/skills/tac_control/handlers.py b/packages/fetchai/skills/tac_control/handlers.py
index 382f3941b8..d5e422b0e7 100644
--- a/packages/fetchai/skills/tac_control/handlers.py
+++ b/packages/fetchai/skills/tac_control/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers."""
 
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
diff --git a/packages/fetchai/skills/tac_control/helpers.py b/packages/fetchai/skills/tac_control/helpers.py
index a214c7f16d..fbe56fa922 100644
--- a/packages/fetchai/skills/tac_control/helpers.py
+++ b/packages/fetchai/skills/tac_control/helpers.py
@@ -22,7 +22,7 @@
 
 import math
 import random
-from typing import cast, Dict, List, Tuple
+from typing import Dict, List, Tuple, cast
 
 import numpy as np
 
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 1876fe4347..e29fa64d42 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -9,11 +9,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdWECpRXZXH5JPV6wVHqeUtvjBhieUFTEoT2e7EY16N8M
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
-  behaviours.py: QmPMdhZh9Uzx5zy7qxQGqFanaC9h8SwNRkW94r8fD3DECG
+  behaviours.py: QmVUdw95id6YWhAxQU79iGdmt3P3C4PthPsDZL6x3M7kV6
   dialogues.py: QmVSNY2MaKJ1JKfbt39qJ2CJz1dMhPNFefS6Nn2Ld2WqNA
-  game.py: QmRrKBB2ithuHbytNWZiW9gq9TA9xkjN7bdFwpd9pZS7Pa
-  handlers.py: QmfQBa9NLVkcAUhQaY8grMB7yiAARgjoADP7pjVaegcBtt
-  helpers.py: QmZyaDLh8rAZ7LTbGCRgnQ8zMA4cqzCQjweBwd9MWL7t2t
+  game.py: QmWrQC1i2dPsDEzS1bjd6KiDCFSRCAgdiMrrrLgfsKMU49
+  handlers.py: QmX2N2Nr8DsCQuXxuGhxh89tUAzChTjx8yWtUof8UMQmQM
+  helpers.py: QmdG31YUJakBz8FdNNxU6RxqhWy9iv1BG253PzfxBhzqq2
   parameters.py: QmQB95beEKzyA8Aa7Y9HTPw6BPEVi6BGkpsUqN4QZ4DcVG
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index cd9d91cb0c..5486b259b7 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -20,7 +20,7 @@
 """This package contains the behaviours."""
 
 import datetime
-from typing import cast, List, Optional
+from typing import List, Optional, cast
 
 from aea.crypto.base import LedgerApi
 from aea.helpers.search.models import Attribute, DataModel, Description
diff --git a/packages/fetchai/skills/tac_control_contract/game.py b/packages/fetchai/skills/tac_control_contract/game.py
index 737e710999..f32e503911 100644
--- a/packages/fetchai/skills/tac_control_contract/game.py
+++ b/packages/fetchai/skills/tac_control_contract/game.py
@@ -23,7 +23,7 @@
 import datetime
 import pprint
 from enum import Enum
-from typing import cast, Dict, List, Optional
+from typing import Dict, List, Optional, cast
 
 from aea.common import Address
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/packages/fetchai/skills/tac_control_contract/helpers.py b/packages/fetchai/skills/tac_control_contract/helpers.py
index 8fa7c3720b..db746cd1cc 100644
--- a/packages/fetchai/skills/tac_control_contract/helpers.py
+++ b/packages/fetchai/skills/tac_control_contract/helpers.py
@@ -21,7 +21,7 @@
 """This module contains the helpers methods for the controller agent."""
 
 import random
-from typing import cast, Dict, List, Tuple
+from typing import Dict, List, Tuple, cast
 
 import numpy as np
 
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 34978934be..956895937c 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmV6mToyVnQL9squVJntDPrHvtxFk7sfEYJ61Fyoiy9wsE
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmPNHEtFZ98SkPYGs6LbX5VwKM2xoAoZ6CLbopmTidYuJk
-  game.py: QmcY99fhKGAQZqDdic3iATmWEM6oMSwpHdH5MeBFmXiX9u
+  behaviours.py: QmUmKgFhFmrGtCCJNjZggZiu9JotKNqmUfpShAYM2oKsSj
+  game.py: QmRYzPv29VZbxDKTBqi8Y3Z1iLjwdNhgG6rGuYNYLTw4Z5
   handlers.py: QmR2kWAiBB99TrJxpue4JpC8J8aewadg5FSMa6V2YS28Ws
-  helpers.py: QmS2zGCt2afonTTpNCPm2R74uUS834bpHFUnXFFnuZ1i8C
+  helpers.py: QmREf3hRufKHwQq6Hr4YFdBWp53Vy8WWo89R4pKRyjX4Bs
   parameters.py: QmRU9gxsWcxy25g69jbrKve2f8kFxNBjFfRjPZNKsYoYCP
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/tac_negotiation/dialogues.py b/packages/fetchai/skills/tac_negotiation/dialogues.py
index 514e81d095..0833070d31 100644
--- a/packages/fetchai/skills/tac_negotiation/dialogues.py
+++ b/packages/fetchai/skills/tac_negotiation/dialogues.py
@@ -23,7 +23,7 @@
 - Dialogues: The dialogues class keeps track of all dialogues.
 """
 
-from typing import cast, Optional, Type
+from typing import Optional, Type, cast
 
 from aea.common import Address
 from aea.exceptions import enforce
diff --git a/packages/fetchai/skills/tac_negotiation/handlers.py b/packages/fetchai/skills/tac_negotiation/handlers.py
index 392518aef9..ce4d4a5724 100644
--- a/packages/fetchai/skills/tac_negotiation/handlers.py
+++ b/packages/fetchai/skills/tac_negotiation/handlers.py
@@ -21,7 +21,7 @@
 
 import pprint
 import time
-from typing import cast, Optional, Tuple
+from typing import Optional, Tuple, cast
 
 from aea.configurations.base import ProtocolId
 from aea.helpers.search.models import Query
diff --git a/packages/fetchai/skills/tac_negotiation/helpers.py b/packages/fetchai/skills/tac_negotiation/helpers.py
index a12267b109..9e965f377f 100644
--- a/packages/fetchai/skills/tac_negotiation/helpers.py
+++ b/packages/fetchai/skills/tac_negotiation/helpers.py
@@ -20,7 +20,7 @@
 """This class contains the helpers for FIPA negotiation."""
 
 import copy
-from typing import cast, Dict, List, Union
+from typing import Dict, List, Union, cast
 
 from aea.helpers.search.models import (
     Attribute,
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index f8cb6f1d92..60d3ecf09d 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -10,11 +10,11 @@ fingerprint:
   README.md: QmZucue4N3TX7BPe9CDZybfMQc1zpYbRKEVXAUGYRpcUfD
   __init__.py: QmcgZLvHebdfocqBmbu6gJp35khs6nbdbC649jzUyS86wy
   behaviours.py: QmPnCqPr6c3vqCt2x5rZ9tHZ9hD8mGA4F2fNDTXo1fxfmR
-  dialogues.py: QmaqBNTf4pMscFp7VRG7s4Ca7TjFQCBcnRD3WLkEJRX4Ah
-  handlers.py: QmeCNBScErhiWXH7zubEDf7RRWcAZH9NJH1jRxwHjtCqXr
-  helpers.py: QmTQBUUNbubMc7NkYkVtePL6WCQsGdvmqPFUeSxf2VLAqN
-  strategy.py: QmYrM2HoKVQXWpjYxtWeZZxjCjiingJ6PJKkmegh3Eiwfg
-  transactions.py: QmUd1PzECqMtVNrhwDMGfLa7zAfnLhtQoNjugSYYfuSSTN
+  dialogues.py: QmUZgPaShiApdbrf98x45k6JwYtsLdzJJw8JuMqCqrsHov
+  handlers.py: QmNbMa9A6D7G95cRwc2zsP1uVymmwpt1QXqz5ccfwcTQcZ
+  helpers.py: QmfRnfpeCtHMEXSH3q3ofWhoSc7pbpRrSFSBVStUK3JWt3
+  strategy.py: QmPG7sCfCk6ozaBSmPPYeexe9Y1zq5fsg383Z5k8RbBDqg
+  transactions.py: QmdpNcQTG45V8JtrpHgYPMdWanwnF22vBkmAELJdT1AYgt
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_negotiation/strategy.py b/packages/fetchai/skills/tac_negotiation/strategy.py
index 13313f9c47..1272be1de2 100644
--- a/packages/fetchai/skills/tac_negotiation/strategy.py
+++ b/packages/fetchai/skills/tac_negotiation/strategy.py
@@ -22,7 +22,7 @@
 import copy
 import random
 from enum import Enum
-from typing import cast, Dict, List, Optional, Tuple
+from typing import Dict, List, Optional, Tuple, cast
 
 from aea.decision_maker.default import OwnershipState, Preferences
 from aea.helpers.search.generic import (
diff --git a/packages/fetchai/skills/tac_negotiation/transactions.py b/packages/fetchai/skills/tac_negotiation/transactions.py
index b2a6a0d6a7..91521f5e12 100644
--- a/packages/fetchai/skills/tac_negotiation/transactions.py
+++ b/packages/fetchai/skills/tac_negotiation/transactions.py
@@ -22,7 +22,7 @@
 import copy
 import datetime
 from collections import defaultdict, deque
-from typing import cast, Deque, Dict, List, Tuple
+from typing import Deque, Dict, List, Tuple, cast
 
 from aea.common import Address
 from aea.decision_maker.default import OwnershipState
diff --git a/packages/fetchai/skills/tac_participation/behaviours.py b/packages/fetchai/skills/tac_participation/behaviours.py
index 1c7d907c7c..f6a70e244c 100644
--- a/packages/fetchai/skills/tac_participation/behaviours.py
+++ b/packages/fetchai/skills/tac_participation/behaviours.py
@@ -19,7 +19,7 @@
 
 """This package contains a tac search behaviour."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
diff --git a/packages/fetchai/skills/tac_participation/handlers.py b/packages/fetchai/skills/tac_participation/handlers.py
index 897b2725ed..c17a27da8e 100644
--- a/packages/fetchai/skills/tac_participation/handlers.py
+++ b/packages/fetchai/skills/tac_participation/handlers.py
@@ -19,7 +19,7 @@
 
 """This package contains the handlers."""
 
-from typing import cast, Dict, Optional, Tuple
+from typing import Dict, Optional, Tuple, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/packages/fetchai/skills/tac_participation/skill.yaml b/packages/fetchai/skills/tac_participation/skill.yaml
index 41e519c743..53e9be94f9 100644
--- a/packages/fetchai/skills/tac_participation/skill.yaml
+++ b/packages/fetchai/skills/tac_participation/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVNxdGy1pbosYrrvbXczbkJtU7f5ddrBPSNnFoJA9GJzg
   __init__.py: QmcVpVrbV54Aogmowu6AomDiVMrVMo9BUvwKt9V1bJpBwp
-  behaviours.py: QmREapjgiTGH3JsTqeJbR2CcCjRa3jnRdeNVVNUaU8mhRX
+  behaviours.py: QmW3uvkUtkknF7gMFoqbXZWpVcoS274tk7jXouzLTCtdmU
   dialogues.py: QmNZvomWQBx8p8Ftkgg55Pw44P8RedKTKtFULh9Qb8AJLY
   game.py: QmUotRmam5EqL2YWAwPR9i1uWHNeBsphcDJwB59ZiLFKSw
-  handlers.py: QmZqqEiXBjs77DS7GnE8f7tSF9uDoVyVZ7HNMV1uW1wtDX
+  handlers.py: QmcmPDJrmyiMFSf9neCDczvn6RuJN4XfhtxdABR9GjnTWm
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/weather_station/db_communication.py b/packages/fetchai/skills/weather_station/db_communication.py
index e601c7e380..9cd37018b3 100644
--- a/packages/fetchai/skills/weather_station/db_communication.py
+++ b/packages/fetchai/skills/weather_station/db_communication.py
@@ -22,7 +22,7 @@
 import datetime
 import os.path
 import sqlite3
-from typing import cast, Dict
+from typing import Dict, cast
 
 my_path = os.path.dirname(__file__)
 
diff --git a/packages/fetchai/skills/weather_station/skill.yaml b/packages/fetchai/skills/weather_station/skill.yaml
index fb62e1bba9..f6ec6e5f55 100644
--- a/packages/fetchai/skills/weather_station/skill.yaml
+++ b/packages/fetchai/skills/weather_station/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   README.md: Qma72715sXAgDLggNNVkXQoVxCu9hyEEFKbyWTKSavEF2v
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
   behaviours.py: QmWRboujPwBEJNHqXJcyNbbVvdGiJ2mabvjXS6td3YDb2Q
-  db_communication.py: QmNWfTjZirbmCnx5K75fZLA19gsunt34aicvZniLCmZKxB
+  db_communication.py: QmPHjQJvYp96TRUWxTRW9TE9BHATNuUyMw3wy5oQSftnug
   dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
   dummy_weather_station_data.py: QmeSSsAiCKBfMHfUN4QvoKBTQRNCcGxeJicThkDTGRQE7i
   handlers.py: QmeWzG6R8P7z98M2kfXKzmK5u9vT6ZAp2tG7NcXTwWFSaZ
diff --git a/packages/hashes.csv b/packages/hashes.csv
index f487ca55cb..dc13684148 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -18,55 +18,55 @@ fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
 fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
 fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
 fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
-fetchai/connections/gym,QmRjx3wvjadxBqZKptWHwTBwkAQBcPeq89g2ikEq7ozmDX
-fetchai/connections/http_client,QmajyVnAQoG58R5HiWfFdBfvLwmGaXKGinH7r1NYjfCDWJ
-fetchai/connections/http_server,QmXi4BRRxsCf817q72d9QpfwmcdfnHwxKttFF8zH6uWhr5
-fetchai/connections/ledger,QmZmv1G5NK3MYnA4z4JU66f8Yn1c7UAA92UdJet5a7UcjF
-fetchai/connections/local,QmcPGZtD76x3RdsJZmUpSzgU7Nvy9hMvFH9GY3hqAVP4Ci
-fetchai/connections/oef,Qmbu8UptZnquusUSYA3Yqo1zuvtNsYNEZte7gHNLr5JVoa
-fetchai/connections/p2p_libp2p,QmQCf8etp59MDck1ZmciGGQvhP2SkfceNYoHZBcs7KrBgB
-fetchai/connections/p2p_libp2p_client,Qmc4LTENH1b6MoeVN7UAKtxe3UU8Y5Pj5G9ojdZsbQTvVL
-fetchai/connections/p2p_stub,QmNNstioPgSoQJbvf5NkPNViZE9udnnN6GRxWdLVxrKBA7
+fetchai/connections/gym,QmYpTqreykMfC8iTuoFK3EbjkfgLKBk39aYcvWamGQTrCQ
+fetchai/connections/http_client,QmTyfu8TTAQBcecg2CeJZRm9wFqhsi9VtRuFYpU5hEwEoX
+fetchai/connections/http_server,QmduD27PwFbYEo5BZ6fTERfPyNVrG7i8XN7QGcwCTHbXjN
+fetchai/connections/ledger,QmRUJPXzU2rqykAkNWt4BudP87ryzGdzqt5jJj4q3Gb7HM
+fetchai/connections/local,Qmadp2J7U59MvJaPZeytGhqhtLqL4AZghNZLki2YTdLUA1
+fetchai/connections/oef,QmPCrbZ2tdbzLQNkPDJnArwgPqtH6caGdqdfyFSjdcL6R7
+fetchai/connections/p2p_libp2p,QmVXSnhCn37mgacK7iG1HENbEkSvSZMMaf9RTFCUUDa2C9
+fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4bW222
+fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmbEnyTJoZWDkwQNV2XJw8v6z6fz3gvuyxxay7YJhoHAxE
-fetchai/connections/stub,QmU1fuqRkzBufaHTB9qY7GSUkkh4Wq1M6ru6FQKnrcEoUZ
-fetchai/connections/tcp,QmS9dWyHZUY4pZEzMVJ3mZs42fBkAQFtLxWq3VXkzbueLY
-fetchai/connections/webhook,QmVMNFuX88Fj68hm2WhwfuhPLi1TMnLYNA31asN6HLCW3g
-fetchai/contracts/erc1155,Qmf7sDBb6kf3ru18NHjC7irB31vFDEJe8D8UtqYRN3cYrw
+fetchai/connections/soef,QmPawrdmAJLQU4jqyEx592HsJaSAHqgEDhmbmmuVz9LnVn
+fetchai/connections/stub,QmaxLLkfgUZL4s1r2yP5mbZqV4g1dmLLoA4uEApgPyR3aE
+fetchai/connections/tcp,QmeFxgyyEnHUkAxuSHSYvFQLxKgWdV7xob6QvZnCHo9AdX
+fetchai/connections/webhook,Qmb3EN5NhFavVZT6rvDzhxdANx6dSo2K95MsJ8owpYDDSD
+fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,Qme5e9KAzdcKhzzLWzFFqzbYB1EebghS4BY3gtPvPhqHVd
-fetchai/protocols/default,QmPo3UzUagCMq4xvWjcECDWdYqur9uzabsug1WRsaAmKFR
-fetchai/protocols/fipa,QmbtJuAbuKVuYuXXW7v9VGiK2StSQEVBzLZjSQBftdkgzg
-fetchai/protocols/gym,QmXHiPkic2umXCYo5479rQNndSgYSA5xbxZhYugv1D8vC7
-fetchai/protocols/http,Qmbb7kpNdXtRAxnuqh6GULxpb9c3Pu6YckPRVERgSAL4aW
-fetchai/protocols/ledger_api,QmYnU11zKVE9LzEVS9H6Tst7cqcuwZDKpgNSAeG26o7ggU
-fetchai/protocols/ml_trade,QmShijhkQYbzabZWNUenabn2tqsu3cRFGx42dHReKdn3mA
-fetchai/protocols/oef_search,QmQarQdcwwtAo382A4xQKxvExZuUiHnFzrREHT4ZoVGoyv
+fetchai/protocols/contract_api,QmbHbjNcYaZ4LDpP5L1qNUu82aKCdGa8MNX9e2wanMsGc5
+fetchai/protocols/default,QmZ4y4M1zZ3j2BAvLKHf1Grf5twcsmSamdgc2zmkBdv254
+fetchai/protocols/fipa,QmYJhzwFtZp5FRZx3jkeiLT2NZTUhNa6dHM9CJ1JXBiEsY
+fetchai/protocols/gym,Qmc5UvXeWtGz4aVytmgaB1WGNMsVkutgNGqn57PmXXCRLs
+fetchai/protocols/http,QmXEczv6AR7bHoM8CQ55xd31iopWc6wFoR1Kc59xMzb9wP
+fetchai/protocols/ledger_api,Qmbr8jpkgjvRXefeCyTFvnb6WZAvQPDsmzoZk6t3AXcyRR
+fetchai/protocols/ml_trade,QmSXQbbGihThLyp8djf2PccrzbCBWVymW4uBvCi4pDxB2P
+fetchai/protocols/oef_search,QmSrtCZ7JUvxKXzUq3svJiQBLSaQVyhH9MJRnbZm9TWNhD
 fetchai/protocols/scaffold,QmXJb2kxe228AqQ2iHRiKJnhhKsC9zU8pqNdojLNXqjUvz
-fetchai/protocols/signing,QmWm7ThNZFND7ZuWQ7CLkJN6vGjAxauiF7LBLxBTKKstJZ
-fetchai/protocols/state_update,QmciKjpSjjd1E34iT8xT2XznCqChU4s6NnCqHfpNALftRQ
-fetchai/protocols/tac,QmeyUr7iHGb1mHrM8qiR5uJqHbVpPTP4ryT2ww5piCH8HD
-fetchai/skills/aries_alice,QmTLZP3j8xdqWnxCAbWEehZXh4ksPztJYtktb8a6SNA1vj
-fetchai/skills/aries_faber,QmfN448ztvQgLN9FTK3pHaRs8nZNCC5pdar5Tut5BCydio
+fetchai/protocols/signing,QmYTfrqGX7exRtafwm9wHGzHZB1FziuZdYMVT1ad3fnKYR
+fetchai/protocols/state_update,QmejF6NFSBgfa1KTNkBCw4oZGrTnXHvwYXxayHKGLV4PtW
+fetchai/protocols/tac,QmcyYPtULaU15VMyfRqwDHCn7g4czUoe9ipcUSBAVqLTFc
+fetchai/skills/aries_alice,Qmf2PV9D6WZjjuQ1eqL7S1DKVYc9Ea6wJDNEAD3zxEUpLU
+fetchai/skills/aries_faber,QmXBksccX6fBcemjr6gL4KBAfExeoBNKyVK4tJscPk1dsp
 fetchai/skills/carpark_client,QmPYHXP1TvNihMa6WFSLP1NhiFDKTiArZbStQ6v54ySa8j
 fetchai/skills/carpark_detection,QmetEJmLHLWCPRyYByvrJ48fjM42sg91fqBfzZukmUth6b
 fetchai/skills/echo,QmPjabbvqPfabWhyE3vYCtTpPLJgYd4ZQBBsKsSJ5bLbeb
-fetchai/skills/erc1155_client,QmeQoL6WgcpMW8NUahWo8E4gcBP6iMoJqAisVNm7LLJZLv
-fetchai/skills/erc1155_deploy,QmTjV8pqyFSsj2Ci2tuJ5RmQz1CVFEQTs7kdPYdsiNXe2g
+fetchai/skills/erc1155_client,QmeH3ZaMQt4iMz7B8p9mwtbetyt9Gy42rrkXLuk6LpQz69
+fetchai/skills/erc1155_deploy,QmT6UivEs5DbqfkbeRZYr1mF3WYiyUrp2hucLMMXWBwj3r
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
-fetchai/skills/generic_buyer,QmP1iGjhcwor2k9dW6bfYY2xufitdUMBWDiSts4bMTL2u8
-fetchai/skills/generic_seller,QmT6sWte67JD5zkhvki1R6ZfynsvCNPwurbiXtrA6oNtDE
-fetchai/skills/gym,QmdSqhucusGCGzAwDqfRg6rVu86sGNiBTj1rueRbfTXUNU
+fetchai/skills/generic_buyer,QmUKHWVoBDWJVymwj5PHqkEXjRGkJBoPrV2capmftA717a
+fetchai/skills/generic_seller,QmTJabpuQKLfC9t8mGjswKgpU8wGazNsvZegwLtTiRVF8g
+fetchai/skills/gym,QmfKQFkyfm89t4MQ1FUgQe2MFLZw1PUapMrTGBiSqn6frn
 fetchai/skills/http_echo,QmXb9b5YTwxHavSjoGzCC4DaSSoZMsbYgFiuy2fqFQno5J
-fetchai/skills/ml_data_provider,QmWU6ZqncZTs6wSs43s1ji2F27VyvcGJXsq1N1W7BKPTUS
-fetchai/skills/ml_train,QmUkG9umsnwZKqbQVoKZLxbaFWyAUycMLyzsb8fzKFACzF
+fetchai/skills/ml_data_provider,QmXkX14MRTdticWjwF469RfXA9sQ82ddY7pzQMCbRikuz1
+fetchai/skills/ml_train,QmdmnV66naRKrYgLAJDMbCHWTocVLeX8JtYLfJwzMVxBhG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
-fetchai/skills/simple_service_registration,QmbBSb9u5bCYf1aPEzD4oKJRKx8QD48Tf1SbzCmVmquB58
-fetchai/skills/tac_control,QmSJrPKJRwt98AuFJAP91e2JFkD4xqxCCo6jQvgse92ND9
-fetchai/skills/tac_control_contract,QmfFrPNaG3M1YKjFyEYESAAhuBW4yGT6W1Q5XVoX378h4c
-fetchai/skills/tac_negotiation,QmQWHy4RutKEQETsQZP3i3Xjz8D2XnSRdiaqexRNA7CSky
-fetchai/skills/tac_participation,QmbJqdFPbwFG6c7LUaXxzj9XUnhFd4QxUisJWHdodUyCh8
+fetchai/skills/simple_service_registration,QmSpM3b3GL5Wh9Cu4KYE3Tiyb5XfyUTcYSctUMNSjAjGdk
+fetchai/skills/tac_control,QmcPKqAatmFxtQHhSjpdLXL5XcUav4XzT17McZQwwoDcCW
+fetchai/skills/tac_control_contract,QmSBWfymLZ4LT4T3cwq4cVRbqnkxSFuviykiw5hYaYBMH4
+fetchai/skills/tac_negotiation,QmVfat3p7G8CPXuPm7wy3i81AtxqeTQzDDbPGMZ439zsLm
+fetchai/skills/tac_participation,QmYhmrYZvywb5L15VZDZ91Y2bCF2eD2Lasg79nNBRr3rHs
 fetchai/skills/thermometer,QmUEuRdsTw3iTzLRA4C6SiRGwEK6gauLP1Apk13fCQYtKw
 fetchai/skills/thermometer_client,QmdESHLrhNasaUKYpG2m5p6f61dxmqjVKGPiNdEUs5ZHnu
 fetchai/skills/weather_client,QmTa3Pxv8tD478xGA6DkNjQn8vxKwGfqLhLMbAC73fK6qo
-fetchai/skills/weather_station,QmSLdrYpe8yShYECQuFMWqycmihQVp8ZSfmCvCcCTtGRg7
+fetchai/skills/weather_station,QmX75zb2gERaSHXVTcxJ3uRdSBiUVHvwieyWrdUyCSDQYm
diff --git a/scripts/acn/run_acn_node_standalone.py b/scripts/acn/run_acn_node_standalone.py
index a8bb034cdc..f9e55f63e7 100644
--- a/scripts/acn/run_acn_node_standalone.py
+++ b/scripts/acn/run_acn_node_standalone.py
@@ -25,7 +25,7 @@
 from typing import Dict, List, Optional
 
 from base58 import b58decode
-from ecdsa import curves, SigningKey
+from ecdsa import SigningKey, curves
 from multihash import decode as multihashdecode  # type: ignore
 
 # following imports needed only if checks are enabled
diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py
index 9dffc61d01..e5af338e4b 100755
--- a/scripts/generate_ipfs_hashes.py
+++ b/scripts/generate_ipfs_hashes.py
@@ -38,13 +38,12 @@
 import time
 import traceback
 from pathlib import Path
-from typing import cast, Collection, Dict, List, Optional, Tuple, Type
+from typing import Collection, Dict, List, Optional, Tuple, Type, cast
 
 import ipfshttpclient
 import yaml
 
 from aea.configurations.base import (
-    _compute_fingerprint,
     AgentConfig,
     ConnectionConfig,
     ContractConfig,
@@ -52,6 +51,7 @@
     PackageType,
     ProtocolConfig,
     SkillConfig,
+    _compute_fingerprint,
 )
 from aea.helpers.base import yaml_dump, yaml_dump_all
 
diff --git a/setup.cfg b/setup.cfg
index a21a839073..6951a36e91 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,8 +29,9 @@ multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0
 use_parentheses=True
+ensure_newline_before_comments = True
 line_length=88
-order_by_type=False
+order_by_type=True
 
 
 [mypy]
diff --git a/tests/conftest.py b/tests/conftest.py
index 5d1984815b..db82e37561 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -31,7 +31,7 @@
 from pathlib import Path
 from threading import Timer
 from types import FunctionType, MethodType
-from typing import Callable, cast, List, Optional, Sequence
+from typing import Callable, List, Optional, Sequence, cast
 from unittest.mock import patch
 
 import docker as docker
@@ -44,13 +44,17 @@
 from aea.aea import AEA
 from aea.cli.utils.config import _init_cli_config
 from aea.common import Address
-from aea.configurations.base import ComponentType, ConnectionConfig, ContractConfig
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE as AGENT_YAML
 from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE as CONNECTION_YAML
 from aea.configurations.base import DEFAULT_CONTRACT_CONFIG_FILE as CONTRACT_YAML
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE as PROTOCOL_YAML
 from aea.configurations.base import DEFAULT_SKILL_CONFIG_FILE as SKILL_YAML
-from aea.configurations.base import PublicId
+from aea.configurations.base import (
+    ComponentType,
+    ConnectionConfig,
+    ContractConfig,
+    PublicId,
+)
 from aea.configurations.constants import DEFAULT_CONNECTION, DEFAULT_LEDGER
 from aea.configurations.loader import load_component_configuration
 from aea.connections.base import Connection
diff --git a/tests/data/generator/t_protocol/dialogues.py b/tests/data/generator/t_protocol/dialogues.py
index 0efcb291ed..d709c0bb49 100644
--- a/tests/data/generator/t_protocol/dialogues.py
+++ b/tests/data/generator/t_protocol/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/tests/data/generator/t_protocol/message.py b/tests/data/generator/t_protocol/message.py
index b28dad220f..9b1cf47807 100644
--- a/tests/data/generator/t_protocol/message.py
+++ b/tests/data/generator/t_protocol/message.py
@@ -20,7 +20,7 @@
 """This module contains t_protocol's message definition."""
 
 import logging
-from typing import cast, Dict, FrozenSet, Optional, Set, Tuple, Union
+from typing import Dict, FrozenSet, Optional, Set, Tuple, Union, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/tests/data/generator/t_protocol/serialization.py b/tests/data/generator/t_protocol/serialization.py
index 262df38cc0..fb7f28d97f 100644
--- a/tests/data/generator/t_protocol/serialization.py
+++ b/tests/data/generator/t_protocol/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for t_protocol protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from tests.data.generator.t_protocol import t_protocol_pb2
diff --git a/tests/data/generator/t_protocol_no_ct/dialogues.py b/tests/data/generator/t_protocol_no_ct/dialogues.py
index 63657c12a3..c5666a74c9 100644
--- a/tests/data/generator/t_protocol_no_ct/dialogues.py
+++ b/tests/data/generator/t_protocol_no_ct/dialogues.py
@@ -25,7 +25,7 @@
 """
 
 from abc import ABC
-from typing import Callable, cast, FrozenSet, Type
+from typing import Callable, FrozenSet, Type, cast
 
 from aea.common import Address
 from aea.protocols.base import Message
diff --git a/tests/data/generator/t_protocol_no_ct/message.py b/tests/data/generator/t_protocol_no_ct/message.py
index 83138b6176..8733c6d431 100644
--- a/tests/data/generator/t_protocol_no_ct/message.py
+++ b/tests/data/generator/t_protocol_no_ct/message.py
@@ -20,7 +20,7 @@
 """This module contains t_protocol_no_ct's message definition."""
 
 import logging
-from typing import cast, Dict, FrozenSet, Optional, Set, Tuple, Union
+from typing import Dict, FrozenSet, Optional, Set, Tuple, Union, cast
 
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
diff --git a/tests/data/generator/t_protocol_no_ct/serialization.py b/tests/data/generator/t_protocol_no_ct/serialization.py
index ff9113c313..0c8a6879e0 100644
--- a/tests/data/generator/t_protocol_no_ct/serialization.py
+++ b/tests/data/generator/t_protocol_no_ct/serialization.py
@@ -19,7 +19,7 @@
 
 """Serialization module for t_protocol_no_ct protocol."""
 
-from typing import Any, cast, Dict
+from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
 from tests.data.generator.t_protocol_no_ct import t_protocol_no_ct_pb2
diff --git a/tests/test_aea.py b/tests/test_aea.py
index bcc1a5f1b9..bbe9f1bccc 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -56,12 +56,12 @@
 )
 
 from .conftest import (
-    _make_local_connection,
     CUR_PATH,
     DUMMY_SKILL_PUBLIC_ID,
     FETCHAI_PRIVATE_KEY_PATH,
     ROOT_DIR,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
+    _make_local_connection,
 )
 from .data.dummy_aea.skills.dummy.tasks import DummyTask  # type: ignore
 from .data.dummy_skill.behaviours import DummyBehaviour  # type: ignore
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 4b7aa6571e..17e4947edd 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -30,13 +30,13 @@
 import yaml
 
 from aea.aea import AEA
-from aea.aea_builder import _DependenciesManager, AEABuilder
+from aea.aea_builder import AEABuilder, _DependenciesManager
 from aea.components.base import Component
 from aea.configurations.base import (
+    DEFAULT_AEA_CONFIG_FILE,
     ComponentId,
     ComponentType,
     ConnectionConfig,
-    DEFAULT_AEA_CONFIG_FILE,
     ProtocolConfig,
     PublicId,
     SkillConfig,
@@ -53,10 +53,10 @@
 from aea.skills.base import Skill
 from aea.test_tools.test_cases import AEATestCase, AEATestCaseEmpty
 from tests.conftest import (
-    _make_dummy_connection,
     CUR_PATH,
     DEFAULT_PRIVATE_KEY_PATH,
     ROOT_DIR,
+    _make_dummy_connection,
 )
 
 dummy_skill_path = os.path.join(CUR_PATH, "data", "dummy_skill")
diff --git a/tests/test_cli/test_add/test_connection.py b/tests/test_cli/test_add/test_connection.py
index 834a9b4425..98dc2ad55f 100644
--- a/tests/test_cli/test_add/test_connection.py
+++ b/tests/test_cli/test_add/test_connection.py
@@ -36,10 +36,10 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CUR_PATH,
-    double_escape_windows_path_separator,
     MAX_FLAKY_RERUNS,
+    CliRunner,
+    double_escape_windows_path_separator,
 )
 
 
diff --git a/tests/test_cli/test_add/test_contract.py b/tests/test_cli/test_add/test_contract.py
index 1d77fee879..36898a2503 100644
--- a/tests/test_cli/test_add/test_contract.py
+++ b/tests/test_cli/test_add/test_contract.py
@@ -19,13 +19,13 @@
 """This test module contains the tests for the `aea add contract` sub-command."""
 
 import os
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 
 from aea.cli import cli
 from aea.test_tools.test_cases import AEATestCaseEmpty
-from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
+from tests.conftest import CLI_LOG_OPTION, MAX_FLAKY_RERUNS, CliRunner
 
 
 @mock.patch("aea.cli.utils.decorators.try_to_load_agent_config")
diff --git a/tests/test_cli/test_add/test_generic.py b/tests/test_cli/test_add/test_generic.py
index a4661c400e..be4ed151f7 100644
--- a/tests/test_cli/test_add/test_generic.py
+++ b/tests/test_cli/test_add/test_generic.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains tests for aea.cli.add generic methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.add import _add_item_deps
 from tests.test_cli.tools_for_testing import ContextMock
diff --git a/tests/test_cli/test_add/test_protocol.py b/tests/test_cli/test_add/test_protocol.py
index 234c107b20..370ced6021 100644
--- a/tests/test_cli/test_add/test_protocol.py
+++ b/tests/test_cli/test_add/test_protocol.py
@@ -36,10 +36,10 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CUR_PATH,
-    double_escape_windows_path_separator,
     MAX_FLAKY_RERUNS,
+    CliRunner,
+    double_escape_windows_path_separator,
 )
 
 
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index 46df071ba8..3bb7272949 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -32,20 +32,20 @@
 import aea
 from aea.cli import cli
 from aea.configurations.base import (
-    AgentConfig,
     DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_SKILL_CONFIG_FILE,
+    AgentConfig,
     PublicId,
 )
 from aea.test_tools.test_cases import AEATestCaseEmpty
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CUR_PATH,
-    double_escape_windows_path_separator,
     MAX_FLAKY_RERUNS,
     ROOT_DIR,
+    CliRunner,
+    double_escape_windows_path_separator,
 )
 
 
diff --git a/tests/test_cli/test_add_key.py b/tests/test_cli/test_add_key.py
index 8da1917d2f..cf2b248f87 100644
--- a/tests/test_cli/test_add_key.py
+++ b/tests/test_cli/test_add_key.py
@@ -22,24 +22,24 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import yaml
 
 import aea
 from aea.cli import cli
 from aea.cli.add_key import _try_add_key
-from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE
+from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CUR_PATH,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_FILE,
     FETCHAI,
     FETCHAI_PRIVATE_KEY_FILE,
     ROOT_DIR,
+    CliRunner,
 )
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_config.py b/tests/test_cli/test_config.py
index cf3ea585a1..0195ca0675 100644
--- a/tests/test_cli/test_config.py
+++ b/tests/test_cli/test_config.py
@@ -26,7 +26,7 @@
 
 from aea.cli import cli
 from aea.cli.utils.constants import ALLOWED_PATH_ROOTS
-from tests.conftest import CLI_LOG_OPTION, CliRunner, CUR_PATH
+from tests.conftest import CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
 class TestConfigGet:
diff --git a/tests/test_cli/test_core.py b/tests/test_cli/test_core.py
index a4b31b1d77..865043f859 100644
--- a/tests/test_cli/test_core.py
+++ b/tests/test_cli/test_core.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI core methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_create.py b/tests/test_cli/test_create.py
index 2a3c50aaee..e30f57d714 100644
--- a/tests/test_cli/test_create.py
+++ b/tests/test_cli/test_create.py
@@ -47,9 +47,9 @@
     AGENT_CONFIGURATION_SCHEMA,
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     ROOT_DIR,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index bec3f6fee7..0b79bc69d0 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -19,7 +19,7 @@
 """This test module contains the tests for CLI Registry fetch methods."""
 
 import os
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 from click import ClickException
@@ -27,7 +27,7 @@
 from aea.cli import cli
 from aea.cli.fetch import _is_version_correct, fetch_agent_locally
 from aea.test_tools.test_cases import AEATestCaseMany
-from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
+from tests.conftest import CLI_LOG_OPTION, MAX_FLAKY_RERUNS, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
 
diff --git a/tests/test_cli/test_fingerprint.py b/tests/test_cli/test_fingerprint.py
index c98037d999..3d984fe13c 100644
--- a/tests/test_cli/test_fingerprint.py
+++ b/tests/test_cli/test_fingerprint.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI fingerprint command."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_freeze.py b/tests/test_cli/test_freeze.py
index 788fed1a32..a6208472c5 100644
--- a/tests/test_cli/test_freeze.py
+++ b/tests/test_cli/test_freeze.py
@@ -34,10 +34,10 @@
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
     MAX_FLAKY_RERUNS,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_generate/test_generate.py b/tests/test_cli/test_generate/test_generate.py
index c07dd3955c..673d31157e 100644
--- a/tests/test_cli/test_generate/test_generate.py
+++ b/tests/test_cli/test_generate/test_generate.py
@@ -19,7 +19,7 @@
 
 """This test module contains the tests for the aea.cli.generate sub-module."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_generate/test_protocols.py b/tests/test_cli/test_generate/test_protocols.py
index 88ac84cc3b..9fc2128df1 100644
--- a/tests/test_cli/test_generate/test_protocols.py
+++ b/tests/test_cli/test_generate/test_protocols.py
@@ -36,10 +36,10 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
     PROTOCOL_CONFIGURATION_SCHEMA,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_generate_key.py b/tests/test_cli/test_generate_key.py
index cd6e6961b6..b2795b22bd 100644
--- a/tests/test_cli/test_generate_key.py
+++ b/tests/test_cli/test_generate_key.py
@@ -28,11 +28,11 @@
 from aea.crypto.registries import make_crypto
 from tests.conftest import (
     CLI_LOG_OPTION,
-    CliRunner,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_FILE,
     FETCHAI,
     FETCHAI_PRIVATE_KEY_FILE,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_generate_wealth.py b/tests/test_cli/test_generate_wealth.py
index 5b8a8935d4..f71687627b 100644
--- a/tests/test_cli/test_generate_wealth.py
+++ b/tests/test_cli/test_generate_wealth.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for commands in aea.cli.generate_wealth module."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 
@@ -28,9 +28,9 @@
 from aea.test_tools.test_cases import AEATestCaseMany
 from tests.conftest import (
     CLI_LOG_OPTION,
-    CliRunner,
     FETCHAI,
     MAX_FLAKY_RERUNS_INTEGRATION,
+    CliRunner,
 )
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_get_address.py b/tests/test_cli/test_get_address.py
index bb498a93af..8d76ac81ea 100644
--- a/tests/test_cli/test_get_address.py
+++ b/tests/test_cli/test_get_address.py
@@ -18,11 +18,11 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for commands in aea.cli.get_address module."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli import cli
 from aea.cli.get_address import _try_get_address
-from tests.conftest import CLI_LOG_OPTION, CliRunner, FETCHAI
+from tests.conftest import CLI_LOG_OPTION, FETCHAI, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_get_wealth.py b/tests/test_cli/test_get_wealth.py
index c1f5a3b68a..4f7561eec9 100644
--- a/tests/test_cli/test_get_wealth.py
+++ b/tests/test_cli/test_get_wealth.py
@@ -18,11 +18,11 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for commands in aea.cli.generate_wealth module."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli import cli
 from aea.cli.get_wealth import _try_get_wealth
-from tests.conftest import CLI_LOG_OPTION, CliRunner, FETCHAI
+from tests.conftest import CLI_LOG_OPTION, FETCHAI, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_install.py b/tests/test_cli/test_install.py
index ef5d46524e..648ddcc5c5 100644
--- a/tests/test_cli/test_install.py
+++ b/tests/test_cli/test_install.py
@@ -23,7 +23,7 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import yaml
 
@@ -31,7 +31,7 @@
 from aea.cli.install import _install_dependency
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.exceptions import AEAException
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
 class TestInstall:
diff --git a/tests/test_cli/test_interact.py b/tests/test_cli/test_interact.py
index 80c464bb4f..43e4bf3628 100644
--- a/tests/test_cli/test_interact.py
+++ b/tests/test_cli/test_interact.py
@@ -17,7 +17,7 @@
 #
 # ------------------------------------------------------------------------------
 """This test module contains tests for iteract command."""
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 
diff --git a/tests/test_cli/test_launch.py b/tests/test_cli/test_launch.py
index d0510171b1..e0d8560c4f 100644
--- a/tests/test_cli/test_launch.py
+++ b/tests/test_cli/test_launch.py
@@ -35,7 +35,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
 from tests.common.pexpect_popen import PexpectWrapper
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH, MAX_FLAKY_RERUNS
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, MAX_FLAKY_RERUNS, CliRunner
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_cli/test_list.py b/tests/test_cli/test_list.py
index aa370e7d4c..b78583c896 100644
--- a/tests/test_cli/test_list.py
+++ b/tests/test_cli/test_list.py
@@ -24,7 +24,7 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import jsonschema
 from jsonschema import Draft4Validator
@@ -33,9 +33,9 @@
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
+    CliRunner,
 )
 from tests.test_cli.constants import FORMAT_ITEMS_SAMPLE_OUTPUT
 
diff --git a/tests/test_cli/test_loggers.py b/tests/test_cli/test_loggers.py
index be18fd9b8b..61ccf4f70e 100644
--- a/tests/test_cli/test_loggers.py
+++ b/tests/test_cli/test_loggers.py
@@ -19,7 +19,7 @@
 
 """This test module contains the tests for commands in aea.cli.utils.loggers module."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.utils.loggers import ColorFormatter
 
diff --git a/tests/test_cli/test_login.py b/tests/test_cli/test_login.py
index 051939f2a7..3bdb94e8dc 100644
--- a/tests/test_cli/test_login.py
+++ b/tests/test_cli/test_login.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI login command."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli import cli
 from tests.conftest import CLI_LOG_OPTION, CliRunner
diff --git a/tests/test_cli/test_logout.py b/tests/test_cli/test_logout.py
index 04a9a34ad7..6847fc5948 100644
--- a/tests/test_cli/test_logout.py
+++ b/tests/test_cli/test_logout.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI logout command."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli import cli
 from tests.conftest import CLI_LOG_OPTION, CliRunner
diff --git a/tests/test_cli/test_publish.py b/tests/test_cli/test_publish.py
index 03f492727c..63e827c7ab 100644
--- a/tests/test_cli/test_publish.py
+++ b/tests/test_cli/test_publish.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry publish methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_push.py b/tests/test_cli/test_push.py
index 3054802a8b..86abf6f7a9 100644
--- a/tests/test_cli/test_push.py
+++ b/tests/test_cli/test_push.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry push methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_register.py b/tests/test_cli/test_register.py
index 87056c9c4a..c0f296f1f9 100644
--- a/tests/test_cli/test_register.py
+++ b/tests/test_cli/test_register.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI register command."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli import cli
 from aea.cli.register import do_register
diff --git a/tests/test_cli/test_registry/test_add.py b/tests/test_cli/test_registry/test_add.py
index 9fd225c6df..9a81089cfc 100644
--- a/tests/test_cli/test_registry/test_add.py
+++ b/tests/test_cli/test_registry/test_add.py
@@ -19,7 +19,7 @@
 """This test module contains tests for CLI Registry add methods."""
 
 import os
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.registry.add import fetch_package
 from aea.configurations.base import PublicId
diff --git a/tests/test_cli/test_registry/test_fetch.py b/tests/test_cli/test_registry/test_fetch.py
index 50ede87504..81c41143a4 100644
--- a/tests/test_cli/test_registry/test_fetch.py
+++ b/tests/test_cli/test_registry/test_fetch.py
@@ -21,7 +21,7 @@
 import os
 import shutil
 import tempfile
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_registry/test_login.py b/tests/test_cli/test_registry/test_login.py
index 5381893c3e..4b5c45f695 100644
--- a/tests/test_cli/test_registry/test_login.py
+++ b/tests/test_cli/test_registry/test_login.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains tests for CLI Registry login methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.registry.login import registry_login
 
diff --git a/tests/test_cli/test_registry/test_logout.py b/tests/test_cli/test_registry/test_logout.py
index ca8485f5ce..3627eb6fda 100644
--- a/tests/test_cli/test_registry/test_logout.py
+++ b/tests/test_cli/test_registry/test_logout.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains tests for CLI Registry logout methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.registry.logout import registry_logout
 
diff --git a/tests/test_cli/test_registry/test_publish.py b/tests/test_cli/test_registry/test_publish.py
index 2d7e9c8e52..2ec37fcc59 100644
--- a/tests/test_cli/test_registry/test_publish.py
+++ b/tests/test_cli/test_registry/test_publish.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry publish methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.registry.publish import _compress, publish_agent
 from tests.test_cli.tools_for_testing import ContextMock
diff --git a/tests/test_cli/test_registry/test_push.py b/tests/test_cli/test_registry/test_push.py
index f7291e4525..a3b28b3b8a 100644
--- a/tests/test_cli/test_registry/test_push.py
+++ b/tests/test_cli/test_registry/test_push.py
@@ -19,7 +19,7 @@
 """Test module for Registry push methods."""
 
 import os
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_registry/test_registration.py b/tests/test_cli/test_registry/test_registration.py
index ad6bbb3867..39945b0536 100644
--- a/tests/test_cli/test_registry/test_registration.py
+++ b/tests/test_cli/test_registry/test_registration.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for Registry registration methods."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_registry/test_utils.py b/tests/test_cli/test_registry/test_utils.py
index a75e648ce1..ed085c944a 100644
--- a/tests/test_cli/test_registry/test_utils.py
+++ b/tests/test_cli/test_registry/test_utils.py
@@ -20,7 +20,7 @@
 
 import os
 from json.decoder import JSONDecodeError
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 from requests.exceptions import ConnectionError
diff --git a/tests/test_cli/test_remove/test_connection.py b/tests/test_cli/test_remove/test_connection.py
index 24320b5a4c..3b54a1efcb 100644
--- a/tests/test_cli/test_remove/test_connection.py
+++ b/tests/test_cli/test_remove/test_connection.py
@@ -31,7 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
 class TestRemoveConnectionWithPublicId:
diff --git a/tests/test_cli/test_remove/test_contract.py b/tests/test_cli/test_remove/test_contract.py
index 56a7d9bbbd..a2423d27df 100644
--- a/tests/test_cli/test_remove/test_contract.py
+++ b/tests/test_cli/test_remove/test_contract.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for the `aea remove contract` sub-command."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli import cli
 from tests.conftest import CLI_LOG_OPTION, CliRunner
diff --git a/tests/test_cli/test_remove/test_protocol.py b/tests/test_cli/test_remove/test_protocol.py
index c166d9094f..d06341bc75 100644
--- a/tests/test_cli/test_remove/test_protocol.py
+++ b/tests/test_cli/test_remove/test_protocol.py
@@ -31,7 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, CUR_PATH
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
 class TestRemoveProtocolWithPublicId:
diff --git a/tests/test_cli/test_remove/test_remove_item.py b/tests/test_cli/test_remove/test_remove_item.py
index dc2ee28191..783f45fa7c 100644
--- a/tests/test_cli/test_remove/test_remove_item.py
+++ b/tests/test_cli/test_remove/test_remove_item.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """Test module for aea.cli.remove.remove_item method."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_remove/test_skill.py b/tests/test_cli/test_remove/test_skill.py
index 97ce06d2f5..23bcb7649f 100644
--- a/tests/test_cli/test_remove/test_skill.py
+++ b/tests/test_cli/test_remove/test_skill.py
@@ -30,8 +30,8 @@
 import aea
 import aea.configurations.base
 from aea.cli import cli
-from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, ROOT_DIR
+from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, ROOT_DIR, CliRunner
 
 
 class TestRemoveSkillWithPublicId:
diff --git a/tests/test_cli/test_run.py b/tests/test_cli/test_run.py
index da6622fa89..ef7c5b091d 100644
--- a/tests/test_cli/test_run.py
+++ b/tests/test_cli/test_run.py
@@ -25,7 +25,7 @@
 import tempfile
 import time
 from pathlib import Path
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 import yaml
@@ -45,10 +45,10 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     FETCHAI_PRIVATE_KEY_FILE,
     MAX_FLAKY_RERUNS,
     ROOT_DIR,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_scaffold/test_connection.py b/tests/test_cli/test_scaffold/test_connection.py
index c4fc46e24e..ba70ef207d 100644
--- a/tests/test_cli/test_scaffold/test_connection.py
+++ b/tests/test_cli/test_scaffold/test_connection.py
@@ -38,9 +38,9 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     CONNECTION_CONFIGURATION_SCHEMA,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_scaffold/test_generic.py b/tests/test_cli/test_scaffold/test_generic.py
index 9710925e44..2391b0b84d 100644
--- a/tests/test_cli/test_scaffold/test_generic.py
+++ b/tests/test_cli/test_scaffold/test_generic.py
@@ -18,7 +18,7 @@
 # ------------------------------------------------------------------------------
 """This test module contains the tests for CLI scaffold generic methods and commands."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from click import ClickException
 
diff --git a/tests/test_cli/test_scaffold/test_protocols.py b/tests/test_cli/test_scaffold/test_protocols.py
index 62b8a38fa8..22f44ce1e1 100644
--- a/tests/test_cli/test_scaffold/test_protocols.py
+++ b/tests/test_cli/test_scaffold/test_protocols.py
@@ -38,9 +38,9 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     PROTOCOL_CONFIGURATION_SCHEMA,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_scaffold/test_skills.py b/tests/test_cli/test_scaffold/test_skills.py
index 523f747fab..22be5fe660 100644
--- a/tests/test_cli/test_scaffold/test_skills.py
+++ b/tests/test_cli/test_scaffold/test_skills.py
@@ -38,9 +38,9 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     SKILL_CONFIGURATION_SCHEMA,
+    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py
index 6f4938c09d..8a983d9f16 100644
--- a/tests/test_cli/test_search.py
+++ b/tests/test_cli/test_search.py
@@ -24,7 +24,7 @@
 import shutil
 import tempfile
 from pathlib import Path
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import jsonschema
 from jsonschema import Draft4Validator
@@ -36,9 +36,9 @@
     AGENT_CONFIGURATION_SCHEMA,
     AUTHOR,
     CLI_LOG_OPTION,
-    CliRunner,
     CONFIGURATION_SCHEMA_DIR,
     ROOT_DIR,
+    CliRunner,
 )
 from tests.test_cli.constants import FORMAT_ITEMS_SAMPLE_OUTPUT
 
diff --git a/tests/test_cli/test_utils/test_config.py b/tests/test_cli/test_utils/test_config.py
index db09f03927..e81b0ab859 100644
--- a/tests/test_cli/test_utils/test_config.py
+++ b/tests/test_cli/test_utils/test_config.py
@@ -20,7 +20,7 @@
 """This test module contains the tests for aea.cli.utils.config module."""
 
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli.utils.config import validate_item_config
 from aea.cli.utils.exceptions import AEAConfigException
diff --git a/tests/test_cli/test_utils/test_utils.py b/tests/test_cli/test_utils/test_utils.py
index 41b2fa5a66..ce2f250a59 100644
--- a/tests/test_cli/test_utils/test_utils.py
+++ b/tests/test_cli/test_utils/test_utils.py
@@ -21,7 +21,7 @@
 
 from builtins import FileNotFoundError
 from typing import cast
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 from click import BadParameter, ClickException
@@ -55,8 +55,8 @@
     ConfigLoaderMock,
     ContextMock,
     PublicIdMock,
-    raise_stoptest,
     StopTest,
+    raise_stoptest,
 )
 
 AUTHOR = "author"
diff --git a/tests/test_cli_gui/test_create.py b/tests/test_cli_gui/test_create.py
index f6f42e6cf7..53f83bba3f 100644
--- a/tests/test_cli_gui/test_create.py
+++ b/tests/test_cli_gui/test_create.py
@@ -29,7 +29,7 @@
 from aea.test_tools.constants import DEFAULT_AUTHOR
 from tests.conftest import CUR_PATH
 from tests.test_cli.tools_for_testing import raise_click_exception
-from tests.test_cli_gui.test_base import create_app, TempCWD
+from tests.test_cli_gui.test_base import TempCWD, create_app
 
 
 @patch("aea.cli_gui.cli_create_aea")
diff --git a/tests/test_cli_gui/test_get_items.py b/tests/test_cli_gui/test_get_items.py
index 12466d145c..3522a5cae0 100644
--- a/tests/test_cli_gui/test_get_items.py
+++ b/tests/test_cli_gui/test_get_items.py
@@ -19,7 +19,7 @@
 """Test module for get registered items with CLI GUI."""
 
 import json
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from tests.test_cli.tools_for_testing import raise_click_exception
 from tests.test_cli_gui.test_base import create_app
diff --git a/tests/test_cli_gui/test_run_agent.py b/tests/test_cli_gui/test_run_agent.py
index a684589b5b..dff54f1fa9 100644
--- a/tests/test_cli_gui/test_run_agent.py
+++ b/tests/test_cli_gui/test_run_agent.py
@@ -33,7 +33,7 @@
 from aea.configurations.constants import DEFAULT_CONNECTION
 from aea.test_tools.constants import DEFAULT_AUTHOR
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS
-from tests.test_cli_gui.test_base import create_app, TempCWD
+from tests.test_cli_gui.test_base import TempCWD, create_app
 
 
 @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS)
diff --git a/tests/test_cli_gui/test_utils.py b/tests/test_cli_gui/test_utils.py
index ee663abf67..fa0bad2aa5 100644
--- a/tests/test_cli_gui/test_utils.py
+++ b/tests/test_cli_gui/test_utils.py
@@ -19,13 +19,13 @@
 """Test module for utils of CLI GUI."""
 
 from subprocess import TimeoutExpired  # nosec
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.cli_gui.utils import (
+    ProcessState,
     _call_subprocess,
     _terminate_process,
     get_process_status,
-    ProcessState,
     read_error,
     read_tty,
 )
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index f8f617806d..d7a8a7b825 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -20,23 +20,20 @@
 """This module contains the tests for the aea.configurations.base module."""
 import re
 from pathlib import Path
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 import semver
 import yaml
 
 from aea.configurations.base import (
-    _check_aea_version,
-    _compare_fingerprints,
-    _get_default_configuration_file_name_from_type,
+    DEFAULT_SKILL_CONFIG_FILE,
     AgentConfig,
     ComponentId,
     ComponentType,
     ConnectionConfig,
     ContractConfig,
     CRUDCollection,
-    DEFAULT_SKILL_CONFIG_FILE,
     PackageId,
     PackageType,
     ProtocolConfig,
@@ -45,16 +42,19 @@
     PublicId,
     SkillConfig,
     SpeechActContentConfig,
+    _check_aea_version,
+    _compare_fingerprints,
+    _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.configurations.loader import ConfigLoaders, load_component_configuration
 from tests.conftest import (
-    agent_config_files,
     AUTHOR,
+    ROOT_DIR,
+    agent_config_files,
     connection_config_files,
     contract_config_files,
     protocol_config_files,
-    ROOT_DIR,
     skill_config_files,
 )
 
diff --git a/tests/test_configurations/test_schema.py b/tests/test_configurations/test_schema.py
index c4b33d9685..dafbb537f1 100644
--- a/tests/test_configurations/test_schema.py
+++ b/tests/test_configurations/test_schema.py
@@ -31,20 +31,20 @@
 
 from aea.configurations.loader import make_jsonschema_base_uri
 from tests.conftest import (
-    agent_config_files,
     AGENT_CONFIGURATION_SCHEMA,
     CONFIGURATION_SCHEMA_DIR,
-    connection_config_files,
     CONNECTION_CONFIGURATION_SCHEMA,
-    contract_config_files,
     CONTRACT_CONFIGURATION_SCHEMA,
-    protocol_config_files,
     PROTOCOL_CONFIGURATION_SCHEMA,
     PROTOCOL_SPEC_CONFIGURATION_SCHEMA,
-    protocol_specification_files,
     ROOT_DIR,
-    skill_config_files,
     SKILL_CONFIGURATION_SCHEMA,
+    agent_config_files,
+    connection_config_files,
+    contract_config_files,
+    protocol_config_files,
+    protocol_specification_files,
+    skill_config_files,
 )
 
 
diff --git a/tests/test_connections/test_stub.py b/tests/test_connections/test_stub.py
index d5db2c2f7e..2ac56d71fd 100644
--- a/tests/test_connections/test_stub.py
+++ b/tests/test_connections/test_stub.py
@@ -31,9 +31,9 @@
 import aea
 from aea.configurations.base import PublicId
 from aea.connections.stub.connection import (
+    StubConnection,
     _process_line,
     lock_file,
-    StubConnection,
     write_envelope,
     write_with_lock,
 )
@@ -42,7 +42,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
-from tests.conftest import _make_stub_connection, ROOT_DIR
+from tests.conftest import ROOT_DIR, _make_stub_connection
 
 SEPARATOR = ","
 
diff --git a/tests/test_crypto/test_fetchai.py b/tests/test_crypto/test_fetchai.py
index f2bcf34731..e26d8611fd 100644
--- a/tests/test_crypto/test_fetchai.py
+++ b/tests/test_crypto/test_fetchai.py
@@ -21,7 +21,7 @@
 import logging
 import time
 from unittest import mock
-from unittest.mock import call, MagicMock
+from unittest.mock import MagicMock, call
 
 import pytest
 
diff --git a/tests/test_decision_maker/test_default.py b/tests/test_decision_maker/test_default.py
index af6846e403..47fd7225f3 100644
--- a/tests/test_decision_maker/test_default.py
+++ b/tests/test_decision_maker/test_default.py
@@ -20,7 +20,7 @@
 """This module contains tests for decision_maker."""
 
 from queue import Queue
-from typing import cast, Optional
+from typing import Optional, cast
 from unittest import mock
 
 import eth_account
diff --git a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
index fc80cdf4e7..5d004506d0 100644
--- a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
@@ -27,7 +27,7 @@
 from aea.configurations.base import SkillConfig
 from aea.connections.stub.connection import write_with_lock
 from aea.crypto.fetchai import FetchAICrypto
-from aea.crypto.helpers import create_private_key, PRIVATE_KEY_PATH_SCHEMA
+from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
 from aea.skills.base import Skill
 
 ROOT_DIR = "./"
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
index d9de11f423..5b8b52feeb 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
@@ -28,7 +28,7 @@
 from aea.aea import AEA
 from aea.configurations.base import ConnectionConfig, PublicId
 from aea.crypto.fetchai import FetchAICrypto
-from aea.crypto.helpers import create_private_key, PRIVATE_KEY_PATH_SCHEMA
+from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
 from aea.crypto.wallet import Wallet
 from aea.identity.base import Identity
 from aea.protocols.base import Protocol
diff --git a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
index 7c9a968eda..10e9ad3055 100644
--- a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
@@ -22,7 +22,7 @@
 import logging
 import time
 from threading import Thread
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.aea_builder import AEABuilder
 from aea.configurations.base import ProtocolId, SkillConfig
diff --git a/tests/test_examples/test_gym_ex.py b/tests/test_examples/test_gym_ex.py
index aa950c7153..219de01525 100644
--- a/tests/test_examples/test_gym_ex.py
+++ b/tests/test_examples/test_gym_ex.py
@@ -25,7 +25,7 @@
 from pathlib import Path
 
 from tests.common.pexpect_popen import PexpectWrapper
-from tests.conftest import env_path_separator, ROOT_DIR
+from tests.conftest import ROOT_DIR, env_path_separator
 
 DIRECTORIES = ["packages", "examples"]
 
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index d54ac7d6c3..6c008a29fd 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -26,11 +26,11 @@
 from aea.helpers.async_utils import (
     AsyncState,
     AwaitableProc,
-    ensure_list,
-    ensure_loop,
     HandlerItemGetter,
     PeriodicCaller,
     ThreadedAsyncRunner,
+    ensure_list,
+    ensure_loop,
 )
 
 
diff --git a/tests/test_helpers/test_base.py b/tests/test_helpers/test_base.py
index be19160c1c..692ef0ff54 100644
--- a/tests/test_helpers/test_base.py
+++ b/tests/test_helpers/test_base.py
@@ -32,12 +32,12 @@
 import pytest
 
 from aea.helpers.base import (
+    MaxRetriesError,
+    RegexConstrainedString,
     exception_log_and_reraise,
     load_env_file,
     load_module,
     locate,
-    MaxRetriesError,
-    RegexConstrainedString,
     retry_decorator,
     send_control_c,
     try_decorator,
diff --git a/tests/test_helpers/test_ipfs/test_base.py b/tests/test_helpers/test_ipfs/test_base.py
index 416c9f9390..b7f581edb9 100644
--- a/tests/test_helpers/test_ipfs/test_base.py
+++ b/tests/test_helpers/test_ipfs/test_base.py
@@ -22,7 +22,7 @@
 import os
 from unittest.mock import patch
 
-from aea.helpers.ipfs.base import _is_text, IPFSHashOnly
+from aea.helpers.ipfs.base import IPFSHashOnly, _is_text
 from tests.conftest import CUR_PATH
 
 FILE_PATH = "__init__.py"
diff --git a/tests/test_helpers/test_pipe/test_pipe.py b/tests/test_helpers/test_pipe/test_pipe.py
index 8d4fc3d9b9..41fdb0d1cd 100644
--- a/tests/test_helpers/test_pipe/test_pipe.py
+++ b/tests/test_helpers/test_pipe/test_pipe.py
@@ -25,12 +25,12 @@
 
 from aea.helpers.pipe import (
     IPCChannelClient,
-    make_ipc_channel,
-    make_ipc_channel_client,
     PosixNamedPipeChannel,
     PosixNamedPipeChannelClient,
     TCPSocketChannel,
     TCPSocketChannelClient,
+    make_ipc_channel,
+    make_ipc_channel_client,
 )
 from tests.conftest import skip_test_windows
 
diff --git a/tests/test_helpers/test_search/test_models.py b/tests/test_helpers/test_search/test_models.py
index 6e64f5028f..fbf6e152ac 100644
--- a/tests/test_helpers/test_search/test_models.py
+++ b/tests/test_helpers/test_search/test_models.py
@@ -32,11 +32,11 @@
     ConstraintTypes,
     DataModel,
     Description,
-    generate_data_model,
     Location,
     Not,
     Or,
     Query,
+    generate_data_model,
 )
 
 
diff --git a/tests/test_launcher.py b/tests/test_launcher.py
index 6e0f30e82d..3b4ec4c1a5 100644
--- a/tests/test_launcher.py
+++ b/tests/test_launcher.py
@@ -31,10 +31,10 @@
 from aea.cli.core import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
 from aea.helpers.base import cd
-from aea.launcher import _run_agent, AEALauncher
+from aea.launcher import AEALauncher, _run_agent
 from aea.test_tools.test_cases import CLI_LOG_OPTION
 from tests.common.utils import wait_for_condition
-from tests.conftest import AUTHOR, CliRunner, CUR_PATH
+from tests.conftest import AUTHOR, CUR_PATH, CliRunner
 
 
 class TestThreadLauncherMode:
diff --git a/tests/test_mail/test_base.py b/tests/test_mail/test_base.py
index 71282b3083..03cd58bd7b 100644
--- a/tests/test_mail/test_base.py
+++ b/tests/test_mail/test_base.py
@@ -25,15 +25,15 @@
 
 import aea
 from aea.configurations.base import PublicId
-from aea.mail.base import Envelope, EnvelopeContext, ProtobufEnvelopeSerializer, URI
+from aea.mail.base import URI, Envelope, EnvelopeContext, ProtobufEnvelopeSerializer
 from aea.multiplexer import InBox, Multiplexer, OutBox
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from packages.fetchai.connections.local.connection import LocalNode
 from tests.conftest import (
+    UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
     _make_local_connection,
-    UNKNOWN_PROTOCOL_PUBLIC_ID,
 )
 
 
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index f88202960e..a33f19f3a5 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -27,7 +27,7 @@
 from pathlib import Path
 from threading import Thread
 from unittest import mock
-from unittest.mock import call, MagicMock, patch
+from unittest.mock import MagicMock, call, patch
 
 import pytest
 
@@ -44,12 +44,12 @@
 from tests.common.utils import wait_for_condition
 
 from .conftest import (
+    UNKNOWN_CONNECTION_PUBLIC_ID,
+    UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
     _make_local_connection,
     _make_stub_connection,
     logger,
-    UNKNOWN_CONNECTION_PUBLIC_ID,
-    UNKNOWN_PROTOCOL_PUBLIC_ID,
 )
 
 
diff --git a/tests/test_packages/test_connections/test_http_client/test_http_client.py b/tests/test_packages/test_connections/test_http_client/test_http_client.py
index 590ae817f1..46fa4697c2 100644
--- a/tests/test_packages/test_connections/test_http_client/test_http_client.py
+++ b/tests/test_packages/test_connections/test_http_client/test_http_client.py
@@ -35,7 +35,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 from tests.common.mocks import AnyStringWith
-from tests.conftest import get_host, get_unused_tcp_port, UNKNOWN_PROTOCOL_PUBLIC_ID
+from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID, get_host, get_unused_tcp_port
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py
index aa5270162e..a233cff419 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server.py
@@ -23,7 +23,7 @@
 import logging
 import os
 from traceback import print_exc
-from typing import cast, Tuple
+from typing import Tuple, cast
 from unittest.mock import Mock, patch
 
 import aiohttp
@@ -45,11 +45,11 @@
 from packages.fetchai.protocols.http.message import HttpMessage
 from tests.common.mocks import RegexComparator
 from tests.conftest import (
-    get_host,
-    get_unused_tcp_port,
     HTTP_PROTOCOL_PUBLIC_ID,
     ROOT_DIR,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
+    get_host,
+    get_unused_tcp_port,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_local/test_search_services.py b/tests/test_packages/test_connections/test_local/test_search_services.py
index e6633574de..dc6dea7450 100644
--- a/tests/test_packages/test_connections/test_local/test_search_services.py
+++ b/tests/test_packages/test_connections/test_local/test_search_services.py
@@ -45,7 +45,7 @@
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from tests.common.mocks import AnyStringWith
 from tests.common.utils import wait_for_condition
-from tests.conftest import _make_local_connection, MAX_FLAKY_RERUNS
+from tests.conftest import MAX_FLAKY_RERUNS, _make_local_connection
 
 
 class OefSearchDialogues(BaseOefSearchDialogues):
diff --git a/tests/test_packages/test_connections/test_oef/test_communication.py b/tests/test_packages/test_connections/test_oef/test_communication.py
index d0afb31781..e39741e3c1 100644
--- a/tests/test_packages/test_connections/test_oef/test_communication.py
+++ b/tests/test_packages/test_connections/test_oef/test_communication.py
@@ -25,7 +25,7 @@
 import time
 import unittest
 from contextlib import suppress
-from typing import cast, Dict
+from typing import Dict, cast
 from unittest import mock
 from unittest.mock import patch
 
@@ -59,9 +59,9 @@
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from tests.conftest import (
-    _make_oef_connection,
     FETCHAI_ADDRESS_ONE,
     FETCHAI_ADDRESS_TWO,
+    _make_oef_connection,
 )
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index 9b53827308..b9230ea5b1 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -31,13 +31,13 @@
 from aea.identity.base import Identity
 from aea.multiplexer import Multiplexer
 from packages.fetchai.connections.p2p_libp2p.connection import (
-    _golang_module_build_async,
-    _golang_module_run,
-    AwaitableProc,
     LIBP2P_NODE_MODULE_NAME,
+    AwaitableProc,
     P2PLibp2pConnection,
+    _golang_module_build_async,
+    _golang_module_run,
 )
-from tests.conftest import _make_libp2p_connection, COSMOS
+from tests.conftest import COSMOS, _make_libp2p_connection
 
 DEFAULT_PORT = 10234
 DEFAULT_NET_SIZE = 4
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
index 9e726a4f15..c83f9b5887 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
@@ -30,14 +30,14 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.test_tools.test_cases import AEATestCaseEmpty
 from tests.conftest import (
-    _make_libp2p_client_connection,
-    _make_libp2p_connection,
-    libp2p_log_on_failure,
-    libp2p_log_on_failure_all,
     PUBLIC_DHT_DELEGATE_URI_1,
     PUBLIC_DHT_DELEGATE_URI_2,
     PUBLIC_DHT_P2P_MADDR_1,
     PUBLIC_DHT_P2P_MADDR_2,
+    _make_libp2p_client_connection,
+    _make_libp2p_connection,
+    libp2p_log_on_failure,
+    libp2p_log_on_failure_all,
 )
 
 DEFAULT_PORT = 10234
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
index 25c898821f..3d1831717c 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
@@ -33,9 +33,9 @@
     P2PLibp2pClientConnection,
 )
 from tests.conftest import (
+    COSMOS,
     _make_libp2p_client_connection,
     _make_libp2p_connection,
-    COSMOS,
     libp2p_log_on_failure,
 )
 
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 413f6294c5..188089bdb7 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -21,7 +21,7 @@
 import logging
 import time
 from threading import Thread
-from typing import Any, cast, Dict, Optional, Tuple
+from typing import Any, Dict, Optional, Tuple, cast
 from urllib.parse import urlencode
 
 import pytest
diff --git a/tests/test_packages/test_protocols/test_ml_trade.py b/tests/test_packages/test_protocols/test_ml_trade.py
index fc93e3ba1c..3b8add1aa6 100644
--- a/tests/test_packages/test_protocols/test_ml_trade.py
+++ b/tests/test_packages/test_protocols/test_ml_trade.py
@@ -38,10 +38,10 @@
     MlTradeDialogue,
     MlTradeDialogues,
 )
+from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.ml_trade.message import (
     logger as ml_trade_message_logger,
 )
-from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_oef_search.py b/tests/test_packages/test_protocols/test_oef_search.py
index 41f2d1dccc..36016ac7eb 100644
--- a/tests/test_packages/test_protocols/test_oef_search.py
+++ b/tests/test_packages/test_protocols/test_oef_search.py
@@ -37,10 +37,10 @@
     OefSearchDialogue,
     OefSearchDialogues,
 )
+from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.oef_search.message import (
     logger as oef_search_message_logger,
 )
-from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_tac.py b/tests/test_packages/test_protocols/test_tac.py
index f9dd8f5ad8..3cadefbf99 100644
--- a/tests/test_packages/test_protocols/test_tac.py
+++ b/tests/test_packages/test_protocols/test_tac.py
@@ -33,8 +33,8 @@
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
 from packages.fetchai.protocols.tac.dialogues import TacDialogue, TacDialogues
-from packages.fetchai.protocols.tac.message import logger as tac_message_logger
 from packages.fetchai.protocols.tac.message import TacMessage
+from packages.fetchai.protocols.tac.message import logger as tac_message_logger
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_protocols/test_dialogue/test_base.py b/tests/test_protocols/test_dialogue/test_base.py
index de3c33d420..19994e658b 100644
--- a/tests/test_protocols/test_dialogue/test_base.py
+++ b/tests/test_protocols/test_dialogue/test_base.py
@@ -19,7 +19,7 @@
 
 """This module contains the tests for the dialogue/base.py module."""
 
-from typing import cast, FrozenSet, Tuple, Type
+from typing import FrozenSet, Tuple, Type, cast
 
 import pytest
 
diff --git a/tests/test_protocols/test_generator/test_common.py b/tests/test_protocols/test_generator/test_common.py
index f31b8a072e..dbd496f6b9 100644
--- a/tests/test_protocols/test_generator/test_common.py
+++ b/tests/test_protocols/test_generator/test_common.py
@@ -23,7 +23,7 @@
 import tempfile
 from pathlib import Path
 from subprocess import CalledProcessError  # nosec
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.protocols.generator.common import (
     _camel_case_to_snake_case,
diff --git a/tests/test_protocols/test_generator/test_end_to_end.py b/tests/test_protocols/test_generator/test_end_to_end.py
index 217ecf0c9c..bc9f189eca 100644
--- a/tests/test_protocols/test_generator/test_end_to_end.py
+++ b/tests/test_protocols/test_generator/test_end_to_end.py
@@ -24,7 +24,7 @@
 import time
 from pathlib import Path
 from threading import Thread
-from typing import cast, Optional
+from typing import Optional, cast
 
 from aea.aea_builder import AEABuilder
 from aea.configurations.base import ComponentType, ProtocolId, PublicId, SkillConfig
diff --git a/tests/test_protocols/test_generator/test_extract_specification.py b/tests/test_protocols/test_generator/test_extract_specification.py
index deb111388d..2161c9d559 100644
--- a/tests/test_protocols/test_generator/test_extract_specification.py
+++ b/tests/test_protocols/test_generator/test_extract_specification.py
@@ -21,11 +21,12 @@
 import os
 import shutil
 import tempfile
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.configurations.base import ProtocolSpecificationParseError
 from aea.protocols.generator.common import load_protocol_specification
 from aea.protocols.generator.extract_specification import (
+    PythonicProtocolSpecification,
     _ct_specification_type_to_python_type,
     _mt_specification_type_to_python_type,
     _optional_specification_type_to_python_type,
@@ -34,7 +35,6 @@
     _pt_specification_type_to_python_type,
     _specification_type_to_python_type,
     extract,
-    PythonicProtocolSpecification,
 )
 from tests.test_protocols.test_generator.common import PATH_TO_T_PROTOCOL_SPECIFICATION
 
diff --git a/tests/test_protocols/test_generator/test_generator.py b/tests/test_protocols/test_generator/test_generator.py
index 82e074b89c..d47b575af4 100644
--- a/tests/test_protocols/test_generator/test_generator.py
+++ b/tests/test_protocols/test_generator/test_generator.py
@@ -24,7 +24,7 @@
 import tempfile
 from pathlib import Path
 from typing import cast
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 
diff --git a/tests/test_protocols/test_generator/test_validate.py b/tests/test_protocols/test_generator/test_validate.py
index 9211f29623..eeeda771f3 100644
--- a/tests/test_protocols/test_generator/test_validate.py
+++ b/tests/test_protocols/test_generator/test_validate.py
@@ -18,10 +18,14 @@
 # ------------------------------------------------------------------------------
 """This module contains the tests for generator/validate.py module."""
 import logging
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 from aea.configurations.base import CRUDCollection, SpeechActContentConfig
 from aea.protocols.generator.validate import (
+    CONTENT_NAME_REGEX_PATTERN,
+    END_STATE_REGEX_PATTERN,
+    PERFORMATIVE_REGEX_PATTERN,
+    ROLE_REGEX_PATTERN,
     _has_brackets,
     _is_reserved_name,
     _is_valid_content_type_format,
@@ -44,10 +48,6 @@
     _validate_roles,
     _validate_speech_acts_section,
     _validate_termination,
-    CONTENT_NAME_REGEX_PATTERN,
-    END_STATE_REGEX_PATTERN,
-    PERFORMATIVE_REGEX_PATTERN,
-    ROLE_REGEX_PATTERN,
     validate,
 )
 
diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index 3bc28e1d4d..f8e94145c9 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -53,7 +53,7 @@
 )
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
-from tests.conftest import _make_dummy_connection, CUR_PATH, ROOT_DIR
+from tests.conftest import CUR_PATH, ROOT_DIR, _make_dummy_connection
 
 
 class TestContractRegistry:
diff --git a/tests/test_skills/test_base.py b/tests/test_skills/test_base.py
index a1f193b8e2..9468b317d9 100644
--- a/tests/test_skills/test_base.py
+++ b/tests/test_skills/test_base.py
@@ -23,7 +23,7 @@
 from pathlib import Path
 from queue import Queue
 from types import SimpleNamespace
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 from unittest.mock import MagicMock, Mock
 
 import pytest
@@ -39,22 +39,22 @@
 from aea.protocols.base import Message
 from aea.registries.resources import Resources
 from aea.skills.base import (
-    _check_duplicate_classes,
-    _print_warning_message_for_non_declared_skill_components,
     Behaviour,
     Handler,
     Model,
     Skill,
     SkillComponent,
     SkillContext,
+    _check_duplicate_classes,
+    _print_warning_message_for_non_declared_skill_components,
 )
 from tests.conftest import (
-    _make_dummy_connection,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_PATH,
     FETCHAI,
     FETCHAI_PRIVATE_KEY_PATH,
     ROOT_DIR,
+    _make_dummy_connection,
 )
 
 
diff --git a/tests/test_skills/test_behaviours.py b/tests/test_skills/test_behaviours.py
index 9aee8d143e..d0cf7fd4fb 100644
--- a/tests/test_skills/test_behaviours.py
+++ b/tests/test_skills/test_behaviours.py
@@ -19,7 +19,7 @@
 
 """This module contains the tests for the behaviours."""
 from collections import Counter
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 
 import pytest
 
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index a397c3ba1a..ff38b21c2b 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -37,7 +37,7 @@
 from aea.skills.error.handlers import ErrorHandler
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from tests.common.utils import wait_for_condition
-from tests.conftest import _make_dummy_connection, CUR_PATH
+from tests.conftest import CUR_PATH, _make_dummy_connection
 
 logger = logging.getLogger(__file__)
 
diff --git a/tests/test_skills/test_tasks.py b/tests/test_skills/test_tasks.py
index 336ec68d3f..4308e14740 100644
--- a/tests/test_skills/test_tasks.py
+++ b/tests/test_skills/test_tasks.py
@@ -19,10 +19,10 @@
 
 """This module contains the tests for the tasks module."""
 
-from unittest import mock, TestCase
+from unittest import TestCase, mock
 from unittest.mock import Mock, patch
 
-from aea.skills.tasks import init_worker, Task, TaskManager
+from aea.skills.tasks import Task, TaskManager, init_worker
 
 
 def _raise_exception(self, *args, **kwargs):

From f9b7d51fe730e485b2694ae0963dce7d5f3a30f0 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 15:40:29 +0200
Subject: [PATCH 015/131] ignore *_pb2.py files

---
 aea/helpers/ipfs/pb/merkledag_pb2.py | 3 +--
 aea/helpers/ipfs/pb/unixfs_pb2.py    | 3 +--
 aea/helpers/multiaddr/crypto_pb2.py  | 5 ++---
 aea/mail/base_pb2.py                 | 3 +--
 setup.cfg                            | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/aea/helpers/ipfs/pb/merkledag_pb2.py b/aea/helpers/ipfs/pb/merkledag_pb2.py
index 8a5a344e8a..e58b9a94c8 100644
--- a/aea/helpers/ipfs/pb/merkledag_pb2.py
+++ b/aea/helpers/ipfs/pb/merkledag_pb2.py
@@ -4,13 +4,12 @@
 
 import sys
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
diff --git a/aea/helpers/ipfs/pb/unixfs_pb2.py b/aea/helpers/ipfs/pb/unixfs_pb2.py
index f0c93e07b1..08d096b3c5 100644
--- a/aea/helpers/ipfs/pb/unixfs_pb2.py
+++ b/aea/helpers/ipfs/pb/unixfs_pb2.py
@@ -4,13 +4,12 @@
 
 import sys
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
diff --git a/aea/helpers/multiaddr/crypto_pb2.py b/aea/helpers/multiaddr/crypto_pb2.py
index 5838976bd0..9094243b4c 100644
--- a/aea/helpers/multiaddr/crypto_pb2.py
+++ b/aea/helpers/multiaddr/crypto_pb2.py
@@ -4,13 +4,12 @@
 
 import sys
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
+from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import enum_type_wrapper
-
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 
 # @@protoc_insertion_point(imports)
 
diff --git a/aea/mail/base_pb2.py b/aea/mail/base_pb2.py
index 8adfaeb583..60579813c1 100644
--- a/aea/mail/base_pb2.py
+++ b/aea/mail/base_pb2.py
@@ -4,13 +4,12 @@
 
 import sys
 
+_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
-
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
diff --git a/setup.cfg b/setup.cfg
index 6951a36e91..15b772d51b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ use_parentheses=True
 ensure_newline_before_comments = True
 line_length=88
 order_by_type=True
-
+skip_glob = **/*_pb2.py
 
 [mypy]
 python_version = 3.7

From 11a6c6cafa6003ed69146375a74261cc8d8e163f Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 16:05:13 +0200
Subject: [PATCH 016/131] fix docs according to isort changes

---
 docs/agent-vs-aea.md                | 1 -
 docs/cli-vs-programmatic-aeas.md    | 1 -
 docs/generic-skills-step-by-step.md | 8 --------
 3 files changed, 10 deletions(-)

diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index a49868c25d..0d31c84ae9 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -173,7 +173,6 @@ from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
 
-
 INPUT_FILE = "input_file"
 OUTPUT_FILE = "output_file"
 
diff --git a/docs/cli-vs-programmatic-aeas.md b/docs/cli-vs-programmatic-aeas.md
index 379e573926..2bd526eb3a 100644
--- a/docs/cli-vs-programmatic-aeas.md
+++ b/docs/cli-vs-programmatic-aeas.md
@@ -80,7 +80,6 @@ from aea.identity.base import Identity
 from aea.protocols.base import Protocol
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
-
 from packages.fetchai.connections.ledger.connection import LedgerConnection
 from packages.fetchai.connections.p2p_libp2p.connection import P2PLibp2pConnection
 from packages.fetchai.connections.soef.connection import SOEFConnection
diff --git a/docs/generic-skills-step-by-step.md b/docs/generic-skills-step-by-step.md
index 55d354ed9f..37fb56f7e3 100644
--- a/docs/generic-skills-step-by-step.md
+++ b/docs/generic-skills-step-by-step.md
@@ -94,7 +94,6 @@ Open the `behaviours.py` file (`my_generic_seller/skills/generic_seller/behaviou
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_seller.dialogues import (
@@ -103,7 +102,6 @@ from packages.fetchai.skills.generic_seller.dialogues import (
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
-
 DEFAULT_SERVICES_INTERVAL = 60.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
@@ -298,7 +296,6 @@ from aea.helpers.transaction.base import TransactionDigest
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
@@ -1057,7 +1054,6 @@ from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialo
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
 from aea.skills.base import Model
-
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
@@ -1410,7 +1406,6 @@ Open the `behaviours.py` (`my_generic_buyer/skills/generic_buyer/behaviours.py`)
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_buyer.dialogues import (
@@ -1495,7 +1490,6 @@ from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
-
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
@@ -2425,8 +2419,6 @@ from aea.protocols.signing.dialogues import SigningDialogue as BaseSigningDialog
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
-
-
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage

From 50cbbcef22d272bd9244d0ed7e9330448e0cccb4 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 16:34:33 +0200
Subject: [PATCH 017/131] add isort and isort-check to tox.ini envlist

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index d1eab833e6..02d40f3a99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@
 ; we set the associated flag (e.g. for linting we don't need
 ; the package installation).
 [tox]
-envlist = bandit, black, black-check, copyright_check, docs, flake8, liccheck, mypy, py{3.6,3.7,3.8}
+envlist = bandit, black, black-check, isort, isort-check, copyright_check, docs, flake8, liccheck, mypy, py{3.6,3.7,3.8}
 
 [testenv]
 basepython = python3

From 6d5253811242b9e95b093ff1b32300b95fb13ffe Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 16:35:07 +0200
Subject: [PATCH 018/131] add isort in Contribute section of README

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 2e21a4006b..63505da775 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,10 @@ The following steps are **only relevant if you intend to contribute** to the rep
 
       tox -e black
 
+- To run isort code formatter:
+
+      tox -e isort
+
 - To run bandit security checks:
 
       tox -e bandit

From db7bedea51560b16ae200cc31dfd991b7c365283 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 16:35:25 +0200
Subject: [PATCH 019/131] make generator to call 'isort'

---
 aea/protocols/generator/base.py               |  6 ++++
 aea/protocols/generator/common.py             | 34 +++++++++++++++++--
 docs/api/protocols/generator/base.md          |  2 ++
 tests/test_cli/test_generate/test_generate.py | 25 ++++++++++++--
 .../test_generator/test_common.py             |  7 ++++
 tox.ini                                       |  1 +
 6 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/aea/protocols/generator/base.py b/aea/protocols/generator/base.py
index 198a1a0dab..f1d06a53dd 100644
--- a/aea/protocols/generator/base.py
+++ b/aea/protocols/generator/base.py
@@ -49,6 +49,7 @@
     check_protobuf_using_protoc,
     load_protocol_specification,
     try_run_black_formatting,
+    try_run_isort_formatting,
     try_run_protoc,
 )
 from aea.protocols.generator.extract_specification import extract
@@ -1942,6 +1943,7 @@ def generate_full_mode(self) -> None:
         b) creates the protocol buffer schema file.
         c) generates python modules.
         d) applies black formatting
+        e) applies isort formatting
 
         :return: None
         """
@@ -1991,6 +1993,9 @@ def generate_full_mode(self) -> None:
         # Run black formatting
         try_run_black_formatting(self.path_to_generated_protocol_package)
 
+        # Run isort formatting
+        try_run_isort_formatting(self.path_to_generated_protocol_package)
+
         # Warn if specification has custom types
         if len(self.spec.all_custom_types) > 0:
             incomplete_generation_warning_msg = "The generated protocol is incomplete, because the protocol specification contains the following custom types: {}. Update the generated '{}' file with the appropriate implementations of these custom types.".format(
@@ -2006,6 +2011,7 @@ def generate(self, protobuf_only: bool = False) -> None:
         b) creates the protocol buffer schema file.
         c) generates python modules.
         d) applies black formatting
+        e) applies isort formatting
 
         If in "protobuf only" mode (protobuf_only is True), it only does a) and b).
 
diff --git a/aea/protocols/generator/common.py b/aea/protocols/generator/common.py
index 226c29ece9..e0f8350f64 100644
--- a/aea/protocols/generator/common.py
+++ b/aea/protocols/generator/common.py
@@ -63,6 +63,17 @@
     "str": "string",
 }
 
+ISORT_CLI_ARGS = [
+    "--multi-line=3",
+    "--trailing-comma",
+    "--force-grid-wrap=0",
+    "--use-parentheses",
+    "--line-width=88",
+    "--quiet",
+    "--sg",
+    "**/*_pb2.py",
+]
+
 
 def _to_camel_case(text: str) -> str:
     """
@@ -294,13 +305,19 @@ def check_prerequisites() -> None:
 
     :return: None
     """
-    # check protocol buffer compiler is installed
+    # check black code formatter is installed
     if not is_installed("black"):
         raise FileNotFoundError(
             "Cannot find black code formatter! To install, please follow this link: https://black.readthedocs.io/en/stable/installation_and_usage.html"
         )
 
-    # check black code formatter is installed
+    # check isort code formatter is installed
+    if not is_installed("isort"):
+        raise FileNotFoundError(
+            "Cannot find isort code formatter! To install, please follow this link: https://pycqa.github.io/isort/#installing-isort"
+        )
+
+    # check protocol buffer compiler is installed
     if not is_installed("protoc"):
         raise FileNotFoundError(
             "Cannot find protocol buffer compiler! To install, please follow this link: https://developers.google.com/protocol-buffers/"
@@ -352,6 +369,19 @@ def try_run_black_formatting(path_to_protocol_package: str) -> None:
     )
 
 
+def try_run_isort_formatting(path_to_protocol_package: str) -> None:
+    """
+    Run Isort code formatting via subprocess.
+
+    :param path_to_protocol_package: a path where formatting should be applied.
+    :return: None
+    """
+    subprocess.run(  # nosec
+        [sys.executable, "-m", "isort", *ISORT_CLI_ARGS, path_to_protocol_package],
+        check=True,
+    )
+
+
 def try_run_protoc(path_to_generated_protocol_package, name) -> None:
     """
     Run 'protoc' protocol buffer compiler via subprocess.
diff --git a/docs/api/protocols/generator/base.md b/docs/api/protocols/generator/base.md
index 52e1235f26..ef1bead8e6 100644
--- a/docs/api/protocols/generator/base.md
+++ b/docs/api/protocols/generator/base.md
@@ -58,6 +58,7 @@ a) validates the protocol specification.
 b) creates the protocol buffer schema file.
 c) generates python modules.
 d) applies black formatting
+d) applies isort formatting
 
 **Returns**:
 
@@ -75,6 +76,7 @@ a) validates the protocol specification.
 b) creates the protocol buffer schema file.
 c) generates python modules.
 d) applies black formatting
+d) applies isort formatting
 
 If in "protobuf only" mode (protobuf_only is True), it only does a) and b).
 
diff --git a/tests/test_cli/test_generate/test_generate.py b/tests/test_cli/test_generate/test_generate.py
index 673d31157e..0528b6e166 100644
--- a/tests/test_cli/test_generate/test_generate.py
+++ b/tests/test_cli/test_generate/test_generate.py
@@ -18,7 +18,6 @@
 # ------------------------------------------------------------------------------
 
 """This test module contains the tests for the aea.cli.generate sub-module."""
-
 from unittest import TestCase, mock
 
 from click import ClickException
@@ -39,6 +38,13 @@ def _which_mock(arg):
         return None
 
 
+def _which_mock_isort(arg):
+    if arg == "isort":
+        return None
+    else:
+        return True
+
+
 def _raise_psperror(*args, **kwargs):
     raise ProtocolSpecificationParseError()
 
@@ -50,14 +56,14 @@ def _raise_psperror(*args, **kwargs):
 class GenerateItemTestCase(TestCase):
     """Test case for fetch_agent_locally method."""
 
-    def test__generate_item_file_exists(self, *mocks):
+    def test__generate_item_file_exists(self, *_mocks):
         """Test for fetch_agent_locally method file exists result."""
         ctx_mock = ContextMock()
         with self.assertRaises(ClickException):
             _generate_item(ctx_mock, "protocol", "path")
 
     @mock.patch("aea.protocols.generator.base.shutil.which", _which_mock)
-    def test__generate_item_no_res(self, *mocks):
+    def test__generate_item_no_res(self, *_mocks):
         """Test for fetch_agent_locally method no black."""
         ctx_mock = ContextMock()
         with self.assertRaises(ClickException) as cm:
@@ -69,6 +75,19 @@ def test__generate_item_no_res(self, *mocks):
         )
         self.assertEqual(cm.exception.message, expected_msg)
 
+    @mock.patch("aea.protocols.generator.base.shutil.which", _which_mock_isort)
+    def test__generate_item_no_res_isort_missing(self, *_mocks):
+        """Test for fetch_agent_locally method no isort."""
+        ctx_mock = ContextMock()
+        with self.assertRaises(ClickException) as cm:
+            _generate_item(ctx_mock, "protocol", "path")
+        expected_msg = (
+            "Protocol is NOT generated. The following error happened while generating the protocol:\n"
+            "Cannot find isort code formatter! To install, please follow this link: "
+            "https://pycqa.github.io/isort/#installing-isort"
+        )
+        self.assertEqual(cm.exception.message, expected_msg)
+
     @mock.patch("aea.cli.generate.os.path.exists", return_value=False)
     @mock.patch("aea.protocols.generator.base.shutil.which", return_value="some")
     @mock.patch("aea.cli.generate.ProtocolGenerator.generate", _raise_psperror)
diff --git a/tests/test_protocols/test_generator/test_common.py b/tests/test_protocols/test_generator/test_common.py
index dbd496f6b9..5dce4dd880 100644
--- a/tests/test_protocols/test_generator/test_common.py
+++ b/tests/test_protocols/test_generator/test_common.py
@@ -40,6 +40,7 @@
     is_installed,
     load_protocol_specification,
     try_run_black_formatting,
+    try_run_isort_formatting,
     try_run_protoc,
 )
 from tests.test_protocols.test_generator.common import (
@@ -398,6 +399,12 @@ def test_try_run_black_formatting(self, mocked_subprocess):
         try_run_black_formatting("some_path")
         mocked_subprocess.assert_called_once()
 
+    @mock.patch("subprocess.run")
+    def test_try_run_isort_formatting(self, mocked_subprocess):
+        """Test the 'try_run_isort_formatting' method"""
+        try_run_isort_formatting("some_path")
+        mocked_subprocess.assert_called_once()
+
     @mock.patch("subprocess.run")
     def test_try_run_protoc(self, mocked_subprocess):
         """Test the 'try_run_protoc' method"""
diff --git a/tox.ini b/tox.ini
index 02d40f3a99..651d091b37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,6 +28,7 @@ deps =
     openapi-core==0.13.2
     openapi-spec-validator==0.2.8
     black==19.10b0
+    isort==5.5.2
     mistune==2.0.0a4
     aiohttp==3.6.2
     SQLAlchemy==1.3.16

From 0a40de7dfd84fe02a6e3fb4f32cdfedf8c73b525 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Sun, 20 Sep 2020 17:23:34 +0200
Subject: [PATCH 020/131] update standalone transaction docs after isort

---
 docs/standalone-transaction.md                                  | 2 --
 .../test_standalone_transaction/test_standalone_transaction.py  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/standalone-transaction.md b/docs/standalone-transaction.md
index bf23bb1275..1c43c03f21 100644
--- a/docs/standalone-transaction.md
+++ b/docs/standalone-transaction.md
@@ -10,7 +10,6 @@ from aea.crypto.helpers import create_private_key, try_generate_testnet_wealth
 from aea.crypto.ledger_apis import LedgerApis
 from aea.crypto.wallet import Wallet
 
-
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
@@ -91,7 +90,6 @@ from aea.crypto.helpers import create_private_key, try_generate_testnet_wealth
 from aea.crypto.ledger_apis import LedgerApis
 from aea.crypto.wallet import Wallet
 
-
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
index e9df590305..2a98cb68e1 100644
--- a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
@@ -37,7 +37,6 @@
 test_logger = logging.getLogger(__name__)
 
 
-@pytest.mark.integration(reruns=MAX_FLAKY_RERUNS_INTEGRATION)
 class TestStandaloneTransaction(BaseAEATestCase):
     """This class contains the tests for the code-blocks in the agent-vs-aea.md file."""
 
@@ -67,6 +66,7 @@ def test_read_md_file(self):
             self.code_blocks[-1] == self.python_file
         ), "Files must be exactly the same."
 
+    @pytest.mark.integration(reruns=MAX_FLAKY_RERUNS_INTEGRATION)
     def test_run_end_to_end(self):
         """Run the transaction from the file."""
         try:

From 1c06001ccdfcf255aa0f38165e972e0580bc2aae Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 10:11:44 +0200
Subject: [PATCH 021/131] add new line before local_folder group 'packages' and
 'tests'

---
 aea/test_tools/test_cases.py                  |  1 +
 benchmark/checks/check_multiagent.py          |  1 +
 benchmark/framework/executor.py               |  1 +
 examples/gym_ex/proxy/agent.py                |  1 +
 examples/gym_ex/proxy/env.py                  |  4 ++--
 .../fetchai/connections/gym/connection.py     |  1 +
 .../connections/http_client/connection.py     |  1 +
 .../connections/http_server/connection.py     |  1 +
 .../fetchai/connections/ledger/connection.py  |  1 +
 .../connections/ledger/contract_dispatcher.py |  1 +
 .../connections/ledger/ledger_dispatcher.py   |  1 +
 .../fetchai/connections/local/connection.py   |  1 +
 .../fetchai/connections/oef/connection.py     |  1 +
 .../fetchai/connections/soef/connection.py    |  1 +
 .../fetchai/connections/tcp/tcp_client.py     |  1 +
 .../fetchai/connections/tcp/tcp_server.py     |  1 +
 .../fetchai/connections/webhook/connection.py |  1 +
 .../protocols/contract_api/dialogues.py       |  1 +
 .../fetchai/protocols/contract_api/message.py |  1 +
 .../protocols/contract_api/serialization.py   |  1 +
 packages/fetchai/protocols/fipa/dialogues.py  |  1 +
 packages/fetchai/protocols/fipa/message.py    |  1 +
 .../fetchai/protocols/fipa/serialization.py   |  1 +
 packages/fetchai/protocols/gym/dialogues.py   |  1 +
 packages/fetchai/protocols/gym/message.py     |  1 +
 .../fetchai/protocols/gym/serialization.py    |  1 +
 packages/fetchai/protocols/http/dialogues.py  |  1 +
 .../fetchai/protocols/http/serialization.py   |  1 +
 .../fetchai/protocols/ledger_api/dialogues.py |  1 +
 .../fetchai/protocols/ledger_api/message.py   |  1 +
 .../protocols/ledger_api/serialization.py     |  1 +
 .../fetchai/protocols/ml_trade/dialogues.py   |  1 +
 .../fetchai/protocols/ml_trade/message.py     |  1 +
 .../protocols/ml_trade/serialization.py       |  1 +
 .../fetchai/protocols/oef_search/dialogues.py |  1 +
 .../fetchai/protocols/oef_search/message.py   |  1 +
 .../protocols/oef_search/serialization.py     |  1 +
 packages/fetchai/protocols/tac/dialogues.py   |  1 +
 packages/fetchai/protocols/tac/message.py     |  1 +
 .../fetchai/protocols/tac/serialization.py    |  1 +
 .../fetchai/skills/aries_alice/behaviours.py  |  1 +
 .../fetchai/skills/aries_alice/dialogues.py   |  1 +
 .../fetchai/skills/aries_alice/handlers.py    |  1 +
 .../fetchai/skills/aries_faber/behaviours.py  |  1 +
 .../fetchai/skills/aries_faber/dialogues.py   |  1 +
 .../fetchai/skills/aries_faber/handlers.py    |  1 +
 .../skills/carpark_detection/strategy.py      |  1 +
 packages/fetchai/skills/echo/handlers.py      |  1 +
 .../skills/erc1155_client/behaviours.py       |  1 +
 .../skills/erc1155_client/dialogues.py        |  1 +
 .../fetchai/skills/erc1155_client/handlers.py |  1 +
 .../skills/erc1155_deploy/behaviours.py       |  1 +
 .../skills/erc1155_deploy/dialogues.py        |  1 +
 .../fetchai/skills/erc1155_deploy/handlers.py |  1 +
 .../fetchai/skills/erc1155_deploy/strategy.py |  1 +
 .../skills/generic_buyer/behaviours.py        |  1 +
 .../fetchai/skills/generic_buyer/dialogues.py |  1 +
 .../fetchai/skills/generic_buyer/handlers.py  |  1 +
 .../skills/generic_seller/behaviours.py       |  1 +
 .../skills/generic_seller/dialogues.py        |  1 +
 .../fetchai/skills/generic_seller/handlers.py |  1 +
 packages/fetchai/skills/gym/dialogues.py      |  1 +
 packages/fetchai/skills/gym/handlers.py       |  1 +
 packages/fetchai/skills/gym/helpers.py        |  1 +
 packages/fetchai/skills/gym/tasks.py          |  1 +
 .../fetchai/skills/http_echo/dialogues.py     |  1 +
 packages/fetchai/skills/http_echo/handlers.py |  1 +
 .../skills/ml_data_provider/dialogues.py      |  1 +
 .../skills/ml_data_provider/handlers.py       |  1 +
 packages/fetchai/skills/ml_train/dialogues.py |  1 +
 packages/fetchai/skills/ml_train/handlers.py  |  1 +
 .../simple_service_registration/behaviours.py |  1 +
 .../simple_service_registration/dialogues.py  |  1 +
 .../simple_service_registration/handlers.py   |  1 +
 .../fetchai/skills/tac_control/behaviours.py  |  1 +
 .../fetchai/skills/tac_control/dialogues.py   |  1 +
 packages/fetchai/skills/tac_control/game.py   |  1 +
 .../fetchai/skills/tac_control/handlers.py    |  1 +
 .../skills/tac_control_contract/behaviours.py |  1 +
 .../skills/tac_control_contract/game.py       |  1 +
 .../skills/tac_control_contract/handlers.py   |  1 +
 .../skills/tac_control_contract/helpers.py    |  1 +
 .../skills/tac_negotiation/behaviours.py      |  1 +
 .../skills/tac_negotiation/dialogues.py       |  1 +
 .../skills/tac_negotiation/handlers.py        |  1 +
 .../skills/tac_negotiation/strategy.py        |  1 +
 .../skills/tac_negotiation/transactions.py    |  1 +
 .../skills/tac_participation/behaviours.py    |  1 +
 .../skills/tac_participation/dialogues.py     |  1 +
 .../fetchai/skills/tac_participation/game.py  |  1 +
 .../skills/tac_participation/handlers.py      |  1 +
 setup.cfg                                     |  3 +++
 tests/common/utils.py                         |  1 +
 tests/conftest.py                             |  4 ++--
 tests/data/generator/t_protocol/dialogues.py  |  1 +
 tests/data/generator/t_protocol/message.py    |  1 +
 .../generator/t_protocol/serialization.py     |  1 +
 .../generator/t_protocol_no_ct/dialogues.py   |  1 +
 .../t_protocol_no_ct/serialization.py         |  1 +
 tests/test_aea.py                             | 20 +++++++++----------
 tests/test_aea_builder.py                     |  1 +
 tests/test_agent.py                           |  4 ++--
 tests/test_agent_loop.py                      |  1 +
 tests/test_cli/test_add/test_connection.py    |  1 +
 tests/test_cli/test_add/test_contract.py      |  1 +
 tests/test_cli/test_add/test_generic.py       |  1 +
 tests/test_cli/test_add/test_protocol.py      |  1 +
 tests/test_cli/test_add/test_skill.py         |  1 +
 tests/test_cli/test_add_key.py                |  1 +
 tests/test_cli/test_config.py                 |  1 +
 tests/test_cli/test_create.py                 |  1 +
 tests/test_cli/test_delete.py                 |  1 +
 tests/test_cli/test_fetch.py                  |  1 +
 tests/test_cli/test_fingerprint.py            |  1 +
 tests/test_cli/test_freeze.py                 |  1 +
 tests/test_cli/test_generate/test_generate.py |  1 +
 .../test_cli/test_generate/test_protocols.py  |  1 +
 tests/test_cli/test_generate_key.py           |  1 +
 tests/test_cli/test_generate_wealth.py        |  1 +
 tests/test_cli/test_get_address.py            |  1 +
 tests/test_cli/test_get_multiaddress.py       |  1 +
 tests/test_cli/test_get_wealth.py             |  1 +
 tests/test_cli/test_gui.py                    |  1 +
 tests/test_cli/test_init.py                   |  1 +
 tests/test_cli/test_install.py                |  1 +
 tests/test_cli/test_interact.py               |  1 +
 tests/test_cli/test_launch.py                 |  1 +
 tests/test_cli/test_list.py                   |  1 +
 tests/test_cli/test_login.py                  |  1 +
 tests/test_cli/test_logout.py                 |  1 +
 tests/test_cli/test_publish.py                |  1 +
 tests/test_cli/test_push.py                   |  1 +
 tests/test_cli/test_register.py               |  1 +
 tests/test_cli/test_registry/test_fetch.py    |  1 +
 tests/test_cli/test_registry/test_publish.py  |  1 +
 tests/test_cli/test_registry/test_push.py     |  1 +
 tests/test_cli/test_remove/test_connection.py |  1 +
 tests/test_cli/test_remove/test_contract.py   |  1 +
 tests/test_cli/test_remove/test_protocol.py   |  1 +
 .../test_cli/test_remove/test_remove_item.py  |  1 +
 tests/test_cli/test_remove/test_skill.py      |  1 +
 tests/test_cli/test_run.py                    |  1 +
 .../test_cli/test_scaffold/test_connection.py |  1 +
 tests/test_cli/test_scaffold/test_generic.py  |  1 +
 .../test_cli/test_scaffold/test_protocols.py  |  1 +
 tests/test_cli/test_scaffold/test_skills.py   |  1 +
 tests/test_cli/test_search.py                 |  1 +
 tests/test_cli/test_utils/test_config.py      |  1 +
 tests/test_cli/test_utils/test_utils.py       |  1 +
 tests/test_cli_gui/test_create.py             |  1 +
 tests/test_cli_gui/test_misc.py               |  2 +-
 tests/test_cli_gui/test_run_agent.py          |  1 +
 tests/test_components/test_base.py            |  1 +
 tests/test_configurations/test_aea_config.py  |  1 +
 tests/test_configurations/test_base.py        |  1 +
 tests/test_configurations/test_loader.py      |  1 +
 tests/test_configurations/test_schema.py      |  1 +
 tests/test_connections/test_stub.py           |  1 +
 tests/test_context/test_base.py               |  1 +
 tests/test_contracts/test_base.py             |  1 +
 tests/test_crypto/test_cosmos.py              |  1 +
 tests/test_crypto/test_ethereum.py            |  1 +
 tests/test_crypto/test_fetchai.py             |  1 +
 tests/test_crypto/test_helpers.py             |  1 +
 tests/test_crypto/test_ledger_apis.py         |  1 +
 .../test_registry/test_crypto_registry.py     |  1 +
 .../test_registry/test_ledger_api_registry.py |  1 +
 tests/test_crypto/test_wallet.py              |  1 +
 tests/test_decision_maker/test_default.py     |  1 +
 .../test_ownership_state.py                   |  1 +
 tests/test_decision_maker/test_preferences.py |  1 +
 .../test_agent_vs_aea/test_agent_vs_aea.py    |  1 +
 .../test_programmatic_aea.py                  |  4 ++--
 .../programmatic_aea.py                       |  1 +
 .../test_cli_vs_programmatic_aea.py           |  1 +
 tests/test_docs/test_docs_protocol.py         |  1 +
 tests/test_docs/test_docs_skill.py            |  1 +
 .../test_multiplexer_standalone.py            |  4 ++--
 .../test_orm_integration.py                   |  1 +
 .../test_skill_guide/test_skill_guide.py      |  1 +
 .../test_standalone_transaction.py            |  4 ++--
 ..._client_connection_to_aries_cloud_agent.py |  1 +
 tests/test_helpers/test_base.py               |  1 +
 tests/test_helpers/test_exec_timeout.py       |  1 +
 tests/test_helpers/test_ipfs/test_base.py     |  1 +
 tests/test_helpers/test_pipe/test_pipe.py     |  1 +
 tests/test_identity/test_base.py              |  1 +
 tests/test_launcher.py                        |  1 +
 tests/test_mail/test_base.py                  |  1 +
 tests/test_multiplexer.py                     |  4 ++--
 .../test_connections/test_gym/test_gym.py     |  1 +
 .../test_http_client/test_http_client.py      |  1 +
 .../test_http_server/test_http_server.py      |  1 +
 .../test_http_server_and_client.py            |  1 +
 .../test_ledger/test_contract_api.py          |  1 +
 .../test_ledger/test_ledger_api.py            |  1 +
 .../test_connections/test_local/test_misc.py  |  1 +
 .../test_local/test_search_services.py        |  1 +
 .../test_oef/test_communication.py            |  1 +
 .../test_connections/test_oef/test_models.py  |  1 +
 .../test_oef/test_oef_serializer.py           |  1 +
 .../test_p2p_libp2p/test_aea_cli.py           |  1 +
 .../test_p2p_libp2p/test_communication.py     |  1 +
 .../test_p2p_libp2p/test_errors.py            |  1 +
 .../test_p2p_libp2p/test_fault_tolerance.py   |  1 +
 .../test_p2p_libp2p/test_public_dht.py        |  1 +
 .../test_p2p_libp2p_client/test_aea_cli.py    |  1 +
 .../test_communication.py                     |  1 +
 .../test_p2p_libp2p_client/test_errors.py     |  1 +
 .../test_p2p_stub/test_p2p_stub.py            |  1 +
 .../test_connections/test_soef/models.py      |  1 +
 .../test_connections/test_soef/test_soef.py   |  4 ++--
 .../test_soef/test_soef_integration.py        |  6 +++---
 .../test_connections/test_tcp/test_base.py    |  1 +
 .../test_tcp/test_communication.py            |  1 +
 .../test_webhook/test_webhook.py              |  1 +
 .../test_erc1155/test_contract.py             |  1 +
 .../test_protocols/test_contract_api.py       |  3 ++-
 .../test_packages/test_protocols/test_fipa.py |  3 ++-
 .../test_packages/test_protocols/test_gym.py  |  3 ++-
 .../test_packages/test_protocols/test_http.py |  3 ++-
 .../test_protocols/test_ledger_api.py         |  3 ++-
 .../test_protocols/test_ml_trade.py           |  3 ++-
 .../test_protocols/test_oef_search.py         |  3 ++-
 .../test_packages/test_protocols/test_tac.py  |  3 ++-
 .../test_packages/test_skills/test_carpark.py |  1 +
 .../test_packages/test_skills/test_erc1155.py |  1 +
 .../test_packages/test_skills/test_generic.py |  1 +
 tests/test_packages/test_skills/test_gym.py   |  1 +
 .../test_skills/test_http_echo.py             |  1 +
 .../test_skills/test_ml_skills.py             |  1 +
 tests/test_packages/test_skills/test_tac.py   |  1 +
 .../test_skills/test_thermometer.py           |  1 +
 .../test_packages/test_skills/test_weather.py |  1 +
 tests/test_protocols/test_base.py             |  1 +
 .../test_generator/test_common.py             |  1 +
 .../test_generator/test_end_to_end.py         |  1 +
 .../test_extract_specification.py             |  1 +
 .../test_generator/test_generator.py          |  1 +
 tests/test_protocols/test_signing.py          |  1 +
 tests/test_registries/test_base.py            |  1 +
 tests/test_registries/test_filter.py          |  1 +
 tests/test_runner.py                          |  1 +
 tests/test_runtime.py                         |  1 +
 tests/test_skills/test_base.py                |  1 +
 tests/test_skills/test_error.py               |  1 +
 tests/test_test_tools/test_testcases.py       |  1 +
 247 files changed, 276 insertions(+), 38 deletions(-)

diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index 2c33b3b758..26ce7365c7 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -57,6 +57,7 @@
     read_envelope_from_file,
     write_envelope_to_file,
 )
+
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/benchmark/checks/check_multiagent.py b/benchmark/checks/check_multiagent.py
index 549f8f43e3..70c0450220 100755
--- a/benchmark/checks/check_multiagent.py
+++ b/benchmark/checks/check_multiagent.py
@@ -40,6 +40,7 @@
     print_results,
     wait_for_condition,
 )
+
 from packages.fetchai.connections.local.connection import (  # noqa: E402 # pylint: disable=C0413
     LocalNode,
     OEFLocalConnection,
diff --git a/benchmark/framework/executor.py b/benchmark/framework/executor.py
index 0f4645fb36..f46acb95e7 100644
--- a/benchmark/framework/executor.py
+++ b/benchmark/framework/executor.py
@@ -31,6 +31,7 @@
 import psutil  # type: ignore
 
 from benchmark.framework.benchmark import BenchmarkControl  # noqa: I100
+
 from tests.common.utils import timeit_context
 
 ResourceStats = namedtuple("ResourceStats", "time,cpu,mem")
diff --git a/examples/gym_ex/proxy/agent.py b/examples/gym_ex/proxy/agent.py
index 90b87cf225..f008b1ec52 100644
--- a/examples/gym_ex/proxy/agent.py
+++ b/examples/gym_ex/proxy/agent.py
@@ -29,6 +29,7 @@
 from aea.helpers.base import locate
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
+
 from packages.fetchai.connections.gym.connection import (  # noqa: E402  # pylint: disable=wrong-import-position
     GymConnection,
 )
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index 3992bb0bd2..e40c89babb 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -31,6 +31,8 @@
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
+from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
 from packages.fetchai.protocols.gym.dialogues import (  # noqa: E402  # pylint: disable=wrong-import-position
     GymDialogue as BaseGymDialogue,
 )
@@ -41,8 +43,6 @@
     GymMessage,
 )
 
-from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
-
 sys.modules["packages.fetchai.connections.gym"] = locate(
     "packages.fetchai.connections.gym"
 )
diff --git a/packages/fetchai/connections/gym/connection.py b/packages/fetchai/connections/gym/connection.py
index c60f05297d..593a57d7d8 100644
--- a/packages/fetchai/connections/gym/connection.py
+++ b/packages/fetchai/connections/gym/connection.py
@@ -35,6 +35,7 @@
 from aea.helpers.base import locate
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.protocols.gym.dialogues import GymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
diff --git a/packages/fetchai/connections/http_client/connection.py b/packages/fetchai/connections/http_client/connection.py
index 8fe29e6ea1..6d8d158165 100644
--- a/packages/fetchai/connections/http_client/connection.py
+++ b/packages/fetchai/connections/http_client/connection.py
@@ -37,6 +37,7 @@
 from aea.exceptions import enforce
 from aea.mail.base import Envelope, EnvelopeContext, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
diff --git a/packages/fetchai/connections/http_server/connection.py b/packages/fetchai/connections/http_server/connection.py
index d922e8a4c1..95ff9d12b1 100644
--- a/packages/fetchai/connections/http_server/connection.py
+++ b/packages/fetchai/connections/http_server/connection.py
@@ -52,6 +52,7 @@
 from aea.mail.base import URI, Envelope, EnvelopeContext, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
diff --git a/packages/fetchai/connections/ledger/connection.py b/packages/fetchai/connections/ledger/connection.py
index 8e0a1a4fdb..d3f02c51f4 100644
--- a/packages/fetchai/connections/ledger/connection.py
+++ b/packages/fetchai/connections/ledger/connection.py
@@ -26,6 +26,7 @@
 from aea.connections.base import Connection, ConnectionStates
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
+
 from packages.fetchai.connections.ledger.base import CONNECTION_ID, RequestDispatcher
 from packages.fetchai.connections.ledger.contract_dispatcher import (
     ContractApiRequestDispatcher,
diff --git a/packages/fetchai/connections/ledger/contract_dispatcher.py b/packages/fetchai/connections/ledger/contract_dispatcher.py
index 70e0f19243..c553633baa 100644
--- a/packages/fetchai/connections/ledger/contract_dispatcher.py
+++ b/packages/fetchai/connections/ledger/contract_dispatcher.py
@@ -29,6 +29,7 @@
 from aea.protocols.base import Address, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import Dialogues as BaseDialogues
+
 from packages.fetchai.connections.ledger.base import CONNECTION_ID, RequestDispatcher
 from packages.fetchai.protocols.contract_api import ContractApiMessage
 from packages.fetchai.protocols.contract_api.dialogues import ContractApiDialogue
diff --git a/packages/fetchai/connections/ledger/ledger_dispatcher.py b/packages/fetchai/connections/ledger/ledger_dispatcher.py
index fdc76f0f03..224e5dfbe3 100644
--- a/packages/fetchai/connections/ledger/ledger_dispatcher.py
+++ b/packages/fetchai/connections/ledger/ledger_dispatcher.py
@@ -26,6 +26,7 @@
 from aea.protocols.base import Address, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import Dialogues as BaseDialogues
+
 from packages.fetchai.connections.ledger.base import CONNECTION_ID, RequestDispatcher
 from packages.fetchai.protocols.ledger_api.custom_types import TransactionReceipt
 from packages.fetchai.protocols.ledger_api.dialogues import LedgerApiDialogue
diff --git a/packages/fetchai/connections/local/connection.py b/packages/fetchai/connections/local/connection.py
index 7dab288623..3d79dc86b2 100644
--- a/packages/fetchai/connections/local/connection.py
+++ b/packages/fetchai/connections/local/connection.py
@@ -32,6 +32,7 @@
 from aea.mail.base import Envelope, Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogues as BaseOefSearchDialogues,
diff --git a/packages/fetchai/connections/oef/connection.py b/packages/fetchai/connections/oef/connection.py
index f693018895..8470f41a8a 100644
--- a/packages/fetchai/connections/oef/connection.py
+++ b/packages/fetchai/connections/oef/connection.py
@@ -39,6 +39,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
+
 from packages.fetchai.connections.oef.object_translator import OEFObjectTranslator
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index e587160479..822944c72e 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -48,6 +48,7 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
+
 from packages.fetchai.protocols.oef_search.custom_types import (
     AgentsInfo,
     OefErrorOperation,
diff --git a/packages/fetchai/connections/tcp/tcp_client.py b/packages/fetchai/connections/tcp/tcp_client.py
index 00ce22f43e..4b1fd007fc 100644
--- a/packages/fetchai/connections/tcp/tcp_client.py
+++ b/packages/fetchai/connections/tcp/tcp_client.py
@@ -31,6 +31,7 @@
 
 from aea.configurations.base import ConnectionConfig
 from aea.mail.base import Envelope
+
 from packages.fetchai.connections.tcp.base import TCPConnection
 
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp.tcp_client")
diff --git a/packages/fetchai/connections/tcp/tcp_server.py b/packages/fetchai/connections/tcp/tcp_server.py
index 8bcdd72ecb..9b0325ecfd 100644
--- a/packages/fetchai/connections/tcp/tcp_server.py
+++ b/packages/fetchai/connections/tcp/tcp_server.py
@@ -27,6 +27,7 @@
 from aea.common import Address
 from aea.configurations.base import ConnectionConfig
 from aea.mail.base import Envelope
+
 from packages.fetchai.connections.tcp.base import TCPConnection
 
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp.tcp_server")
diff --git a/packages/fetchai/connections/webhook/connection.py b/packages/fetchai/connections/webhook/connection.py
index 15bcf0490c..ec356aac75 100644
--- a/packages/fetchai/connections/webhook/connection.py
+++ b/packages/fetchai/connections/webhook/connection.py
@@ -32,6 +32,7 @@
 from aea.mail.base import URI, Envelope, EnvelopeContext
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
diff --git a/packages/fetchai/protocols/contract_api/dialogues.py b/packages/fetchai/protocols/contract_api/dialogues.py
index 3f2ec696b3..ca9cb3c8ab 100644
--- a/packages/fetchai/protocols/contract_api/dialogues.py
+++ b/packages/fetchai/protocols/contract_api/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 
 
diff --git a/packages/fetchai/protocols/contract_api/message.py b/packages/fetchai/protocols/contract_api/message.py
index a663637112..d84c69c714 100644
--- a/packages/fetchai/protocols/contract_api/message.py
+++ b/packages/fetchai/protocols/contract_api/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.contract_api.custom_types import Kwargs as CustomKwargs
 from packages.fetchai.protocols.contract_api.custom_types import (
     RawMessage as CustomRawMessage,
diff --git a/packages/fetchai/protocols/contract_api/serialization.py b/packages/fetchai/protocols/contract_api/serialization.py
index 718c9d9819..faba77c2e4 100644
--- a/packages/fetchai/protocols/contract_api/serialization.py
+++ b/packages/fetchai/protocols/contract_api/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.contract_api import contract_api_pb2
 from packages.fetchai.protocols.contract_api.custom_types import (
     Kwargs,
diff --git a/packages/fetchai/protocols/fipa/dialogues.py b/packages/fetchai/protocols/fipa/dialogues.py
index abf8ada492..39a531fd20 100644
--- a/packages/fetchai/protocols/fipa/dialogues.py
+++ b/packages/fetchai/protocols/fipa/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 
 
diff --git a/packages/fetchai/protocols/fipa/message.py b/packages/fetchai/protocols/fipa/message.py
index 3f1648efff..02328af938 100644
--- a/packages/fetchai/protocols/fipa/message.py
+++ b/packages/fetchai/protocols/fipa/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.fipa.custom_types import (
     Description as CustomDescription,
 )
diff --git a/packages/fetchai/protocols/fipa/serialization.py b/packages/fetchai/protocols/fipa/serialization.py
index d7875b9181..15a0d8270b 100644
--- a/packages/fetchai/protocols/fipa/serialization.py
+++ b/packages/fetchai/protocols/fipa/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.fipa import fipa_pb2
 from packages.fetchai.protocols.fipa.custom_types import Description, Query
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/packages/fetchai/protocols/gym/dialogues.py b/packages/fetchai/protocols/gym/dialogues.py
index 602ba60402..cf665a79b0 100644
--- a/packages/fetchai/protocols/gym/dialogues.py
+++ b/packages/fetchai/protocols/gym/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.gym.message import GymMessage
 
 
diff --git a/packages/fetchai/protocols/gym/message.py b/packages/fetchai/protocols/gym/message.py
index ab08207cec..7642fde42f 100644
--- a/packages/fetchai/protocols/gym/message.py
+++ b/packages/fetchai/protocols/gym/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.gym.custom_types import AnyObject as CustomAnyObject
 
 logger = logging.getLogger("aea.packages.fetchai.protocols.gym.message")
diff --git a/packages/fetchai/protocols/gym/serialization.py b/packages/fetchai/protocols/gym/serialization.py
index a69428758c..c96b1fc1ae 100644
--- a/packages/fetchai/protocols/gym/serialization.py
+++ b/packages/fetchai/protocols/gym/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.gym import gym_pb2
 from packages.fetchai.protocols.gym.custom_types import AnyObject
 from packages.fetchai.protocols.gym.message import GymMessage
diff --git a/packages/fetchai/protocols/http/dialogues.py b/packages/fetchai/protocols/http/dialogues.py
index 7d722c6aa8..f5c52a86e5 100644
--- a/packages/fetchai/protocols/http/dialogues.py
+++ b/packages/fetchai/protocols/http/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.http.message import HttpMessage
 
 
diff --git a/packages/fetchai/protocols/http/serialization.py b/packages/fetchai/protocols/http/serialization.py
index 896249bc9b..123479cc69 100644
--- a/packages/fetchai/protocols/http/serialization.py
+++ b/packages/fetchai/protocols/http/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.http import http_pb2
 from packages.fetchai.protocols.http.message import HttpMessage
 
diff --git a/packages/fetchai/protocols/ledger_api/dialogues.py b/packages/fetchai/protocols/ledger_api/dialogues.py
index a1e375a13f..c53552918c 100644
--- a/packages/fetchai/protocols/ledger_api/dialogues.py
+++ b/packages/fetchai/protocols/ledger_api/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 
 
diff --git a/packages/fetchai/protocols/ledger_api/message.py b/packages/fetchai/protocols/ledger_api/message.py
index e38a9e002d..6b60d32682 100644
--- a/packages/fetchai/protocols/ledger_api/message.py
+++ b/packages/fetchai/protocols/ledger_api/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.ledger_api.custom_types import (
     RawTransaction as CustomRawTransaction,
 )
diff --git a/packages/fetchai/protocols/ledger_api/serialization.py b/packages/fetchai/protocols/ledger_api/serialization.py
index 60171b5576..7877d294bb 100644
--- a/packages/fetchai/protocols/ledger_api/serialization.py
+++ b/packages/fetchai/protocols/ledger_api/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.ledger_api import ledger_api_pb2
 from packages.fetchai.protocols.ledger_api.custom_types import (
     RawTransaction,
diff --git a/packages/fetchai/protocols/ml_trade/dialogues.py b/packages/fetchai/protocols/ml_trade/dialogues.py
index ac734a9f4e..2bb14a478f 100644
--- a/packages/fetchai/protocols/ml_trade/dialogues.py
+++ b/packages/fetchai/protocols/ml_trade/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 
 
diff --git a/packages/fetchai/protocols/ml_trade/message.py b/packages/fetchai/protocols/ml_trade/message.py
index f3b96e6949..f99abeaa98 100644
--- a/packages/fetchai/protocols/ml_trade/message.py
+++ b/packages/fetchai/protocols/ml_trade/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.ml_trade.custom_types import (
     Description as CustomDescription,
 )
diff --git a/packages/fetchai/protocols/ml_trade/serialization.py b/packages/fetchai/protocols/ml_trade/serialization.py
index faf1ae5665..3065702423 100644
--- a/packages/fetchai/protocols/ml_trade/serialization.py
+++ b/packages/fetchai/protocols/ml_trade/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.ml_trade import ml_trade_pb2
 from packages.fetchai.protocols.ml_trade.custom_types import Description, Query
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
diff --git a/packages/fetchai/protocols/oef_search/dialogues.py b/packages/fetchai/protocols/oef_search/dialogues.py
index 1a29699488..add8484e76 100644
--- a/packages/fetchai/protocols/oef_search/dialogues.py
+++ b/packages/fetchai/protocols/oef_search/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
 
diff --git a/packages/fetchai/protocols/oef_search/message.py b/packages/fetchai/protocols/oef_search/message.py
index acff1547b6..51190e1eee 100644
--- a/packages/fetchai/protocols/oef_search/message.py
+++ b/packages/fetchai/protocols/oef_search/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.oef_search.custom_types import (
     AgentsInfo as CustomAgentsInfo,
 )
diff --git a/packages/fetchai/protocols/oef_search/serialization.py b/packages/fetchai/protocols/oef_search/serialization.py
index 15895850df..f547763780 100644
--- a/packages/fetchai/protocols/oef_search/serialization.py
+++ b/packages/fetchai/protocols/oef_search/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.oef_search import oef_search_pb2
 from packages.fetchai.protocols.oef_search.custom_types import (
     AgentsInfo,
diff --git a/packages/fetchai/protocols/tac/dialogues.py b/packages/fetchai/protocols/tac/dialogues.py
index 3fd6363ac1..250ae33e75 100644
--- a/packages/fetchai/protocols/tac/dialogues.py
+++ b/packages/fetchai/protocols/tac/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from packages.fetchai.protocols.tac.message import TacMessage
 
 
diff --git a/packages/fetchai/protocols/tac/message.py b/packages/fetchai/protocols/tac/message.py
index 9ceb13b045..999a42bbf9 100644
--- a/packages/fetchai/protocols/tac/message.py
+++ b/packages/fetchai/protocols/tac/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from packages.fetchai.protocols.tac.custom_types import ErrorCode as CustomErrorCode
 
 logger = logging.getLogger("aea.packages.fetchai.protocols.tac.message")
diff --git a/packages/fetchai/protocols/tac/serialization.py b/packages/fetchai/protocols/tac/serialization.py
index 6f12536758..312aa4563b 100644
--- a/packages/fetchai/protocols/tac/serialization.py
+++ b/packages/fetchai/protocols/tac/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from packages.fetchai.protocols.tac import tac_pb2
 from packages.fetchai.protocols.tac.custom_types import ErrorCode
 from packages.fetchai.protocols.tac.message import TacMessage
diff --git a/packages/fetchai/skills/aries_alice/behaviours.py b/packages/fetchai/skills/aries_alice/behaviours.py
index 52b8c53e2e..192879fc28 100644
--- a/packages/fetchai/skills/aries_alice/behaviours.py
+++ b/packages/fetchai/skills/aries_alice/behaviours.py
@@ -24,6 +24,7 @@
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.connections.http_client.connection import (
     PUBLIC_ID as HTTP_CLIENT_CONNECTION_PUBLIC_ID,
 )
diff --git a/packages/fetchai/skills/aries_alice/dialogues.py b/packages/fetchai/skills/aries_alice/dialogues.py
index 1384d1fd26..96983efc95 100644
--- a/packages/fetchai/skills/aries_alice/dialogues.py
+++ b/packages/fetchai/skills/aries_alice/dialogues.py
@@ -29,6 +29,7 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.oef_search.dialogues import (
diff --git a/packages/fetchai/skills/aries_alice/handlers.py b/packages/fetchai/skills/aries_alice/handlers.py
index 59bc2ef6fa..5bb7f3b52b 100644
--- a/packages/fetchai/skills/aries_alice/handlers.py
+++ b/packages/fetchai/skills/aries_alice/handlers.py
@@ -29,6 +29,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.aries_alice.dialogues import (
diff --git a/packages/fetchai/skills/aries_faber/behaviours.py b/packages/fetchai/skills/aries_faber/behaviours.py
index 9a4f57c62d..b3706e86e7 100644
--- a/packages/fetchai/skills/aries_faber/behaviours.py
+++ b/packages/fetchai/skills/aries_faber/behaviours.py
@@ -23,6 +23,7 @@
 from typing import Dict, cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.aries_faber.dialogues import (
diff --git a/packages/fetchai/skills/aries_faber/dialogues.py b/packages/fetchai/skills/aries_faber/dialogues.py
index 334b38e46b..f00b84bd56 100644
--- a/packages/fetchai/skills/aries_faber/dialogues.py
+++ b/packages/fetchai/skills/aries_faber/dialogues.py
@@ -29,6 +29,7 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.oef_search.dialogues import (
diff --git a/packages/fetchai/skills/aries_faber/handlers.py b/packages/fetchai/skills/aries_faber/handlers.py
index c792a3fa51..77be923810 100644
--- a/packages/fetchai/skills/aries_faber/handlers.py
+++ b/packages/fetchai/skills/aries_faber/handlers.py
@@ -28,6 +28,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.connections.p2p_libp2p.connection import (
     PUBLIC_ID as P2P_CONNECTION_PUBLIC_ID,
 )
diff --git a/packages/fetchai/skills/carpark_detection/strategy.py b/packages/fetchai/skills/carpark_detection/strategy.py
index 0f46795b8f..f3cde2bdf7 100644
--- a/packages/fetchai/skills/carpark_detection/strategy.py
+++ b/packages/fetchai/skills/carpark_detection/strategy.py
@@ -23,6 +23,7 @@
 from typing import Dict
 
 from aea.exceptions import enforce
+
 from packages.fetchai.skills.carpark_detection.database import DetectionDatabase
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
diff --git a/packages/fetchai/skills/echo/handlers.py b/packages/fetchai/skills/echo/handlers.py
index 551cd4c4b9..3d7b315320 100644
--- a/packages/fetchai/skills/echo/handlers.py
+++ b/packages/fetchai/skills/echo/handlers.py
@@ -23,6 +23,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.skills.echo.dialogues import DefaultDialogue, DefaultDialogues
 
 
diff --git a/packages/fetchai/skills/erc1155_client/behaviours.py b/packages/fetchai/skills/erc1155_client/behaviours.py
index 16937ccf57..dfa465d175 100644
--- a/packages/fetchai/skills/erc1155_client/behaviours.py
+++ b/packages/fetchai/skills/erc1155_client/behaviours.py
@@ -22,6 +22,7 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.erc1155_client.dialogues import (
diff --git a/packages/fetchai/skills/erc1155_client/dialogues.py b/packages/fetchai/skills/erc1155_client/dialogues.py
index bbc010b99f..10af7d3bea 100644
--- a/packages/fetchai/skills/erc1155_client/dialogues.py
+++ b/packages/fetchai/skills/erc1155_client/dialogues.py
@@ -38,6 +38,7 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.contract_api.dialogues import (
     ContractApiDialogue as BaseContractApiDialogue,
 )
diff --git a/packages/fetchai/skills/erc1155_client/handlers.py b/packages/fetchai/skills/erc1155_client/handlers.py
index 283f1311c1..fd542bd2b1 100644
--- a/packages/fetchai/skills/erc1155_client/handlers.py
+++ b/packages/fetchai/skills/erc1155_client/handlers.py
@@ -27,6 +27,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
diff --git a/packages/fetchai/skills/erc1155_deploy/behaviours.py b/packages/fetchai/skills/erc1155_deploy/behaviours.py
index 93baf383cb..84357c3b9c 100644
--- a/packages/fetchai/skills/erc1155_deploy/behaviours.py
+++ b/packages/fetchai/skills/erc1155_deploy/behaviours.py
@@ -22,6 +22,7 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/erc1155_deploy/dialogues.py b/packages/fetchai/skills/erc1155_deploy/dialogues.py
index b73adcf187..b3ba399f52 100644
--- a/packages/fetchai/skills/erc1155_deploy/dialogues.py
+++ b/packages/fetchai/skills/erc1155_deploy/dialogues.py
@@ -39,6 +39,7 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.contract_api.dialogues import (
     ContractApiDialogue as BaseContractApiDialogue,
 )
diff --git a/packages/fetchai/skills/erc1155_deploy/handlers.py b/packages/fetchai/skills/erc1155_deploy/handlers.py
index 5db033feb3..540cf087af 100644
--- a/packages/fetchai/skills/erc1155_deploy/handlers.py
+++ b/packages/fetchai/skills/erc1155_deploy/handlers.py
@@ -27,6 +27,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
diff --git a/packages/fetchai/skills/erc1155_deploy/strategy.py b/packages/fetchai/skills/erc1155_deploy/strategy.py
index 266af5d71e..bdb058f810 100644
--- a/packages/fetchai/skills/erc1155_deploy/strategy.py
+++ b/packages/fetchai/skills/erc1155_deploy/strategy.py
@@ -33,6 +33,7 @@
 from aea.helpers.search.models import Description, Location
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
+
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 
 DEFAULT_IS_LEDGER_TX = True
diff --git a/packages/fetchai/skills/generic_buyer/behaviours.py b/packages/fetchai/skills/generic_buyer/behaviours.py
index b3e721520d..1eecadaa15 100644
--- a/packages/fetchai/skills/generic_buyer/behaviours.py
+++ b/packages/fetchai/skills/generic_buyer/behaviours.py
@@ -22,6 +22,7 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_buyer.dialogues import (
diff --git a/packages/fetchai/skills/generic_buyer/dialogues.py b/packages/fetchai/skills/generic_buyer/dialogues.py
index 1f91a5aa66..3e57ed0b77 100644
--- a/packages/fetchai/skills/generic_buyer/dialogues.py
+++ b/packages/fetchai/skills/generic_buyer/dialogues.py
@@ -40,6 +40,7 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/packages/fetchai/skills/generic_buyer/handlers.py b/packages/fetchai/skills/generic_buyer/handlers.py
index 89eb62d5d2..0e60ef1b1a 100644
--- a/packages/fetchai/skills/generic_buyer/handlers.py
+++ b/packages/fetchai/skills/generic_buyer/handlers.py
@@ -27,6 +27,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/generic_seller/behaviours.py b/packages/fetchai/skills/generic_seller/behaviours.py
index ec68164ef7..0a7cb9028f 100644
--- a/packages/fetchai/skills/generic_seller/behaviours.py
+++ b/packages/fetchai/skills/generic_seller/behaviours.py
@@ -22,6 +22,7 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_seller.dialogues import (
diff --git a/packages/fetchai/skills/generic_seller/dialogues.py b/packages/fetchai/skills/generic_seller/dialogues.py
index 4acb51bd2b..dbdff8f02d 100644
--- a/packages/fetchai/skills/generic_seller/dialogues.py
+++ b/packages/fetchai/skills/generic_seller/dialogues.py
@@ -35,6 +35,7 @@
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/packages/fetchai/skills/generic_seller/handlers.py b/packages/fetchai/skills/generic_seller/handlers.py
index 2b39a677b0..1fe577cb7a 100644
--- a/packages/fetchai/skills/generic_seller/handlers.py
+++ b/packages/fetchai/skills/generic_seller/handlers.py
@@ -27,6 +27,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/gym/dialogues.py b/packages/fetchai/skills/gym/dialogues.py
index 0100e7bdff..831524be4f 100644
--- a/packages/fetchai/skills/gym/dialogues.py
+++ b/packages/fetchai/skills/gym/dialogues.py
@@ -31,6 +31,7 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.gym.dialogues import GymDialogue as BaseGymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 
diff --git a/packages/fetchai/skills/gym/handlers.py b/packages/fetchai/skills/gym/handlers.py
index fe521f392e..82c76d5be5 100644
--- a/packages/fetchai/skills/gym/handlers.py
+++ b/packages/fetchai/skills/gym/handlers.py
@@ -24,6 +24,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.skills.gym.dialogues import (
     DefaultDialogues,
diff --git a/packages/fetchai/skills/gym/helpers.py b/packages/fetchai/skills/gym/helpers.py
index 073aabd4ce..f32e80eb2a 100644
--- a/packages/fetchai/skills/gym/helpers.py
+++ b/packages/fetchai/skills/gym/helpers.py
@@ -28,6 +28,7 @@
 
 from aea.protocols.base import Message
 from aea.skills.base import SkillContext
+
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.skills.gym.dialogues import GymDialogue, GymDialogues
 
diff --git a/packages/fetchai/skills/gym/tasks.py b/packages/fetchai/skills/gym/tasks.py
index e10ecf1f7d..d96e02029c 100644
--- a/packages/fetchai/skills/gym/tasks.py
+++ b/packages/fetchai/skills/gym/tasks.py
@@ -24,6 +24,7 @@
 
 from aea.skills.base import SkillContext
 from aea.skills.tasks import Task
+
 from packages.fetchai.skills.gym.helpers import ProxyEnv
 from packages.fetchai.skills.gym.rl_agent import DEFAULT_NB_STEPS, NB_GOODS, MyRLAgent
 
diff --git a/packages/fetchai/skills/http_echo/dialogues.py b/packages/fetchai/skills/http_echo/dialogues.py
index 055a035e58..e2d7d164e5 100644
--- a/packages/fetchai/skills/http_echo/dialogues.py
+++ b/packages/fetchai/skills/http_echo/dialogues.py
@@ -31,6 +31,7 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 
diff --git a/packages/fetchai/skills/http_echo/handlers.py b/packages/fetchai/skills/http_echo/handlers.py
index a5e1ba1487..f0dba0c4fc 100644
--- a/packages/fetchai/skills/http_echo/handlers.py
+++ b/packages/fetchai/skills/http_echo/handlers.py
@@ -25,6 +25,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.skills.http_echo.dialogues import (
     DefaultDialogues,
diff --git a/packages/fetchai/skills/ml_data_provider/dialogues.py b/packages/fetchai/skills/ml_data_provider/dialogues.py
index 30ee046b0f..e175dac3b9 100644
--- a/packages/fetchai/skills/ml_data_provider/dialogues.py
+++ b/packages/fetchai/skills/ml_data_provider/dialogues.py
@@ -33,6 +33,7 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.ledger_api.dialogues import (
     LedgerApiDialogue as BaseLedgerApiDialogue,
 )
diff --git a/packages/fetchai/skills/ml_data_provider/handlers.py b/packages/fetchai/skills/ml_data_provider/handlers.py
index 7ba97e3d7a..0c06eeaa7e 100644
--- a/packages/fetchai/skills/ml_data_provider/handlers.py
+++ b/packages/fetchai/skills/ml_data_provider/handlers.py
@@ -26,6 +26,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/ml_train/dialogues.py b/packages/fetchai/skills/ml_train/dialogues.py
index b26923a1ba..4fe3d6c61a 100644
--- a/packages/fetchai/skills/ml_train/dialogues.py
+++ b/packages/fetchai/skills/ml_train/dialogues.py
@@ -41,6 +41,7 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.ledger_api.dialogues import (
     LedgerApiDialogue as BaseLedgerApiDialogue,
 )
diff --git a/packages/fetchai/skills/ml_train/handlers.py b/packages/fetchai/skills/ml_train/handlers.py
index 63dcc7451b..f5c82a88dc 100644
--- a/packages/fetchai/skills/ml_train/handlers.py
+++ b/packages/fetchai/skills/ml_train/handlers.py
@@ -29,6 +29,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/packages/fetchai/skills/simple_service_registration/behaviours.py b/packages/fetchai/skills/simple_service_registration/behaviours.py
index 16e2d91eda..d2fba8f27c 100644
--- a/packages/fetchai/skills/simple_service_registration/behaviours.py
+++ b/packages/fetchai/skills/simple_service_registration/behaviours.py
@@ -22,6 +22,7 @@
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.simple_service_registration.dialogues import (
     OefSearchDialogues,
diff --git a/packages/fetchai/skills/simple_service_registration/dialogues.py b/packages/fetchai/skills/simple_service_registration/dialogues.py
index 75541e3ff0..8cfa6723d6 100644
--- a/packages/fetchai/skills/simple_service_registration/dialogues.py
+++ b/packages/fetchai/skills/simple_service_registration/dialogues.py
@@ -27,6 +27,7 @@
 from aea.protocols.base import Address, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
 )
diff --git a/packages/fetchai/skills/simple_service_registration/handlers.py b/packages/fetchai/skills/simple_service_registration/handlers.py
index 4693d7622a..3826e190f2 100644
--- a/packages/fetchai/skills/simple_service_registration/handlers.py
+++ b/packages/fetchai/skills/simple_service_registration/handlers.py
@@ -24,6 +24,7 @@
 from aea.configurations.base import ProtocolId
 from aea.protocols.base import Message
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.simple_service_registration.dialogues import (
     OefSearchDialogue,
diff --git a/packages/fetchai/skills/tac_control/behaviours.py b/packages/fetchai/skills/tac_control/behaviours.py
index c396a06557..50df1bcc61 100644
--- a/packages/fetchai/skills/tac_control/behaviours.py
+++ b/packages/fetchai/skills/tac_control/behaviours.py
@@ -24,6 +24,7 @@
 
 from aea.helpers.search.models import Description
 from aea.skills.base import Behaviour
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control.dialogues import (
diff --git a/packages/fetchai/skills/tac_control/dialogues.py b/packages/fetchai/skills/tac_control/dialogues.py
index 3c831c3726..ad7982d1d5 100644
--- a/packages/fetchai/skills/tac_control/dialogues.py
+++ b/packages/fetchai/skills/tac_control/dialogues.py
@@ -33,6 +33,7 @@
 from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialogues
 from aea.protocols.dialogue.base import Dialogue
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
 )
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index e03ab5e810..99cd613e18 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -40,6 +40,7 @@
 from aea.helpers.search.models import Description
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control.helpers import (
     determine_scaling_factor,
diff --git a/packages/fetchai/skills/tac_control/handlers.py b/packages/fetchai/skills/tac_control/handlers.py
index d5e422b0e7..8dd75f55a5 100644
--- a/packages/fetchai/skills/tac_control/handlers.py
+++ b/packages/fetchai/skills/tac_control/handlers.py
@@ -24,6 +24,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control.dialogues import (
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 5486b259b7..28562d5ae1 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -26,6 +26,7 @@
 from aea.helpers.search.models import Attribute, DataModel, Description
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.behaviours import SimpleBehaviour, TickerBehaviour
+
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
diff --git a/packages/fetchai/skills/tac_control_contract/game.py b/packages/fetchai/skills/tac_control_contract/game.py
index f32e503911..5120453dc0 100644
--- a/packages/fetchai/skills/tac_control_contract/game.py
+++ b/packages/fetchai/skills/tac_control_contract/game.py
@@ -33,6 +33,7 @@
 )
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control_contract.helpers import (
     determine_scaling_factor,
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index ca8f0f7a12..0445ede7c1 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -24,6 +24,7 @@
 from aea.protocols.base import Message
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_control_contract.game import Game, Phase
diff --git a/packages/fetchai/skills/tac_control_contract/helpers.py b/packages/fetchai/skills/tac_control_contract/helpers.py
index db746cd1cc..6441d00f9f 100644
--- a/packages/fetchai/skills/tac_control_contract/helpers.py
+++ b/packages/fetchai/skills/tac_control_contract/helpers.py
@@ -26,6 +26,7 @@
 import numpy as np
 
 from aea.exceptions import enforce
+
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 
 QUANTITY_SHIFT = 1  # Any non-negative integer is fine.
diff --git a/packages/fetchai/skills/tac_negotiation/behaviours.py b/packages/fetchai/skills/tac_negotiation/behaviours.py
index 59b593a2bc..536ad27706 100644
--- a/packages/fetchai/skills/tac_negotiation/behaviours.py
+++ b/packages/fetchai/skills/tac_negotiation/behaviours.py
@@ -23,6 +23,7 @@
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.tac_negotiation.dialogues import (
     OefSearchDialogue,
diff --git a/packages/fetchai/skills/tac_negotiation/dialogues.py b/packages/fetchai/skills/tac_negotiation/dialogues.py
index 0833070d31..cd8c7c1b7f 100644
--- a/packages/fetchai/skills/tac_negotiation/dialogues.py
+++ b/packages/fetchai/skills/tac_negotiation/dialogues.py
@@ -35,6 +35,7 @@
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/packages/fetchai/skills/tac_negotiation/handlers.py b/packages/fetchai/skills/tac_negotiation/handlers.py
index ce4d4a5724..016d018775 100644
--- a/packages/fetchai/skills/tac_negotiation/handlers.py
+++ b/packages/fetchai/skills/tac_negotiation/handlers.py
@@ -29,6 +29,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.tac_negotiation.dialogues import (
diff --git a/packages/fetchai/skills/tac_negotiation/strategy.py b/packages/fetchai/skills/tac_negotiation/strategy.py
index 1272be1de2..2496848c7a 100644
--- a/packages/fetchai/skills/tac_negotiation/strategy.py
+++ b/packages/fetchai/skills/tac_negotiation/strategy.py
@@ -39,6 +39,7 @@
 )
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.skills.tac_negotiation.dialogues import FipaDialogue
 from packages.fetchai.skills.tac_negotiation.helpers import (
     build_goods_description,
diff --git a/packages/fetchai/skills/tac_negotiation/transactions.py b/packages/fetchai/skills/tac_negotiation/transactions.py
index 91521f5e12..1997572150 100644
--- a/packages/fetchai/skills/tac_negotiation/transactions.py
+++ b/packages/fetchai/skills/tac_negotiation/transactions.py
@@ -32,6 +32,7 @@
 from aea.protocols.dialogue.base import DialogueLabel
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.skills.tac_negotiation.dialogues import (
     FipaDialogue,
     SigningDialogue,
diff --git a/packages/fetchai/skills/tac_participation/behaviours.py b/packages/fetchai/skills/tac_participation/behaviours.py
index f6a70e244c..018fe26085 100644
--- a/packages/fetchai/skills/tac_participation/behaviours.py
+++ b/packages/fetchai/skills/tac_participation/behaviours.py
@@ -23,6 +23,7 @@
 
 from aea.mail.base import EnvelopeContext
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_participation.dialogues import OefSearchDialogues
diff --git a/packages/fetchai/skills/tac_participation/dialogues.py b/packages/fetchai/skills/tac_participation/dialogues.py
index 3ecacbde03..f63c6d7c5b 100644
--- a/packages/fetchai/skills/tac_participation/dialogues.py
+++ b/packages/fetchai/skills/tac_participation/dialogues.py
@@ -37,6 +37,7 @@
     StateUpdateDialogues as BaseStateUpdateDialogues,
 )
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue as BaseOefSearchDialogue,
 )
diff --git a/packages/fetchai/skills/tac_participation/game.py b/packages/fetchai/skills/tac_participation/game.py
index 4b96be9dad..534c2bd01a 100644
--- a/packages/fetchai/skills/tac_participation/game.py
+++ b/packages/fetchai/skills/tac_participation/game.py
@@ -25,6 +25,7 @@
 from aea.exceptions import AEAEnforceError, enforce
 from aea.helpers.search.models import Constraint, ConstraintType, Location, Query
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_participation.dialogues import (
     StateUpdateDialogue,
diff --git a/packages/fetchai/skills/tac_participation/handlers.py b/packages/fetchai/skills/tac_participation/handlers.py
index c17a27da8e..4530402a6a 100644
--- a/packages/fetchai/skills/tac_participation/handlers.py
+++ b/packages/fetchai/skills/tac_participation/handlers.py
@@ -25,6 +25,7 @@
 from aea.protocols.base import Message
 from aea.protocols.state_update.message import StateUpdateMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.skills.tac_participation.dialogues import (
diff --git a/setup.cfg b/setup.cfg
index 15b772d51b..5e175502fa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,14 +25,17 @@ application-import-names = aea,packages,tests,scripts
 # B014: redundant exception
 
 [isort]
+# for black compatibility
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0
 use_parentheses=True
 ensure_newline_before_comments = True
 line_length=88
+# custom configurations
 order_by_type=True
 skip_glob = **/*_pb2.py
+known_local_folder=packages,tests
 
 [mypy]
 python_version = 3.7
diff --git a/tests/common/utils.py b/tests/common/utils.py
index 24e90f7626..81a64a5ac6 100644
--- a/tests/common/utils.py
+++ b/tests/common/utils.py
@@ -30,6 +30,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Behaviour, Handler
+
 from tests.conftest import ROOT_DIR
 
 DEFAULT_SLEEP = 0.0001
diff --git a/tests/conftest.py b/tests/conftest.py
index db82e37561..f18aae15c2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -72,6 +72,8 @@
 from aea.identity.base import Identity
 from aea.test_tools.click_testing import CliRunner as ImportedCliRunner
 from aea.test_tools.constants import DEFAULT_AUTHOR
+
+from .data.dummy_connection.connection import DummyConnection  # type: ignore
 from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection
 from packages.fetchai.connections.oef.connection import OEFConnection
 from packages.fetchai.connections.p2p_libp2p.connection import (
@@ -84,8 +86,6 @@
 from packages.fetchai.connections.tcp.tcp_client import TCPClientConnection
 from packages.fetchai.connections.tcp.tcp_server import TCPServerConnection
 
-from .data.dummy_connection.connection import DummyConnection  # type: ignore
-
 logger = logging.getLogger(__name__)
 
 CliRunner = ImportedCliRunner
diff --git a/tests/data/generator/t_protocol/dialogues.py b/tests/data/generator/t_protocol/dialogues.py
index d709c0bb49..7254d504a9 100644
--- a/tests/data/generator/t_protocol/dialogues.py
+++ b/tests/data/generator/t_protocol/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from tests.data.generator.t_protocol.message import TProtocolMessage
 
 
diff --git a/tests/data/generator/t_protocol/message.py b/tests/data/generator/t_protocol/message.py
index 9b1cf47807..b07a48d58d 100644
--- a/tests/data/generator/t_protocol/message.py
+++ b/tests/data/generator/t_protocol/message.py
@@ -25,6 +25,7 @@
 from aea.configurations.base import ProtocolId
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
+
 from tests.data.generator.t_protocol.custom_types import DataModel as CustomDataModel
 
 logger = logging.getLogger("aea.packages.fetchai.protocols.t_protocol.message")
diff --git a/tests/data/generator/t_protocol/serialization.py b/tests/data/generator/t_protocol/serialization.py
index fb7f28d97f..f258300973 100644
--- a/tests/data/generator/t_protocol/serialization.py
+++ b/tests/data/generator/t_protocol/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from tests.data.generator.t_protocol import t_protocol_pb2
 from tests.data.generator.t_protocol.custom_types import DataModel
 from tests.data.generator.t_protocol.message import TProtocolMessage
diff --git a/tests/data/generator/t_protocol_no_ct/dialogues.py b/tests/data/generator/t_protocol_no_ct/dialogues.py
index c5666a74c9..231c2d90c7 100644
--- a/tests/data/generator/t_protocol_no_ct/dialogues.py
+++ b/tests/data/generator/t_protocol_no_ct/dialogues.py
@@ -30,6 +30,7 @@
 from aea.common import Address
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, DialogueLabel, Dialogues
+
 from tests.data.generator.t_protocol_no_ct.message import TProtocolNoCtMessage
 
 
diff --git a/tests/data/generator/t_protocol_no_ct/serialization.py b/tests/data/generator/t_protocol_no_ct/serialization.py
index 0c8a6879e0..65c911b6d2 100644
--- a/tests/data/generator/t_protocol_no_ct/serialization.py
+++ b/tests/data/generator/t_protocol_no_ct/serialization.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, cast
 
 from aea.protocols.base import Message, Serializer
+
 from tests.data.generator.t_protocol_no_ct import t_protocol_no_ct_pb2
 from tests.data.generator.t_protocol_no_ct.message import TProtocolNoCtMessage
 
diff --git a/tests/test_aea.py b/tests/test_aea.py
index bbe9f1bccc..573582b97a 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -44,16 +44,6 @@
 from aea.protocols.default.serialization import DefaultSerializer
 from aea.registries.resources import Resources
 from aea.skills.base import Skill, SkillContext
-from packages.fetchai.connections.local.connection import LocalNode
-from packages.fetchai.protocols.fipa.message import FipaMessage
-from tests.common.utils import (
-    AeaTool,
-    make_behaviour_cls_from_funcion,
-    make_handler_cls_from_funcion,
-    run_in_thread,
-    timeit_context,
-    wait_for_condition,
-)
 
 from .conftest import (
     CUR_PATH,
@@ -65,6 +55,16 @@
 )
 from .data.dummy_aea.skills.dummy.tasks import DummyTask  # type: ignore
 from .data.dummy_skill.behaviours import DummyBehaviour  # type: ignore
+from packages.fetchai.connections.local.connection import LocalNode
+from packages.fetchai.protocols.fipa.message import FipaMessage
+from tests.common.utils import (
+    AeaTool,
+    make_behaviour_cls_from_funcion,
+    make_handler_cls_from_funcion,
+    run_in_thread,
+    timeit_context,
+    wait_for_condition,
+)
 
 
 def test_setup_aea():
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 17e4947edd..d99333f678 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -52,6 +52,7 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
 from aea.test_tools.test_cases import AEATestCase, AEATestCaseEmpty
+
 from tests.conftest import (
     CUR_PATH,
     DEFAULT_PRIVATE_KEY_PATH,
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 30e8093bf7..3d05a0bacf 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -25,10 +25,10 @@
 
 from aea.agent import Agent, Identity
 from aea.runtime import RuntimeStates
-from packages.fetchai.connections.local.connection import LocalNode
-from tests.common.utils import wait_for_condition
 
 from .conftest import _make_local_connection
+from packages.fetchai.connections.local.connection import LocalNode
+from tests.common.utils import wait_for_condition
 
 
 class DummyAgent(Agent):
diff --git a/tests/test_agent_loop.py b/tests/test_agent_loop.py
index 465d12f567..77f81453b2 100644
--- a/tests/test_agent_loop.py
+++ b/tests/test_agent_loop.py
@@ -35,6 +35,7 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Behaviour, Handler, SkillContext
 from aea.skills.behaviours import TickerBehaviour
+
 from tests.common.utils import run_in_thread, wait_for_condition
 
 
diff --git a/tests/test_cli/test_add/test_connection.py b/tests/test_cli/test_add/test_connection.py
index 98dc2ad55f..e83d766785 100644
--- a/tests/test_cli/test_add/test_connection.py
+++ b/tests/test_cli/test_add/test_connection.py
@@ -33,6 +33,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE, PublicId
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_add/test_contract.py b/tests/test_cli/test_add/test_contract.py
index 36898a2503..829a25c3d6 100644
--- a/tests/test_cli/test_add/test_contract.py
+++ b/tests/test_cli/test_add/test_contract.py
@@ -25,6 +25,7 @@
 
 from aea.cli import cli
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import CLI_LOG_OPTION, MAX_FLAKY_RERUNS, CliRunner
 
 
diff --git a/tests/test_cli/test_add/test_generic.py b/tests/test_cli/test_add/test_generic.py
index be4ed151f7..cc8f33e348 100644
--- a/tests/test_cli/test_add/test_generic.py
+++ b/tests/test_cli/test_add/test_generic.py
@@ -21,6 +21,7 @@
 from unittest import TestCase, mock
 
 from aea.cli.add import _add_item_deps
+
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_add/test_protocol.py b/tests/test_cli/test_add/test_protocol.py
index 370ced6021..5f009b6285 100644
--- a/tests/test_cli/test_add/test_protocol.py
+++ b/tests/test_cli/test_add/test_protocol.py
@@ -33,6 +33,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE, PublicId
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index 3bb7272949..1dda532ee9 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -38,6 +38,7 @@
     PublicId,
 )
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_add_key.py b/tests/test_cli/test_add_key.py
index cf2b248f87..e064351450 100644
--- a/tests/test_cli/test_add_key.py
+++ b/tests/test_cli/test_add_key.py
@@ -30,6 +30,7 @@
 from aea.cli import cli
 from aea.cli.add_key import _try_add_key
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_config.py b/tests/test_cli/test_config.py
index 0195ca0675..aae0e685c2 100644
--- a/tests/test_cli/test_config.py
+++ b/tests/test_cli/test_config.py
@@ -26,6 +26,7 @@
 
 from aea.cli import cli
 from aea.cli.utils.constants import ALLOWED_PATH_ROOTS
+
 from tests.conftest import CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
diff --git a/tests/test_cli/test_create.py b/tests/test_cli/test_create.py
index e30f57d714..33432b81e2 100644
--- a/tests/test_cli/test_create.py
+++ b/tests/test_cli/test_create.py
@@ -43,6 +43,7 @@
     DEFAULT_SKILL,
 )
 from aea.configurations.loader import ConfigLoader, make_jsonschema_base_uri
+
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     AUTHOR,
diff --git a/tests/test_cli/test_delete.py b/tests/test_cli/test_delete.py
index 8a694629d5..ce66ea73ef 100644
--- a/tests/test_cli/test_delete.py
+++ b/tests/test_cli/test_delete.py
@@ -26,6 +26,7 @@
 from pathlib import Path
 
 from aea.cli import cli
+
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index 0b79bc69d0..618546666a 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -27,6 +27,7 @@
 from aea.cli import cli
 from aea.cli.fetch import _is_version_correct, fetch_agent_locally
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import CLI_LOG_OPTION, MAX_FLAKY_RERUNS, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_fingerprint.py b/tests/test_cli/test_fingerprint.py
index 3d984fe13c..f89f9ba3a3 100644
--- a/tests/test_cli/test_fingerprint.py
+++ b/tests/test_cli/test_fingerprint.py
@@ -24,6 +24,7 @@
 
 from aea.cli import cli
 from aea.cli.fingerprint import _fingerprint_item
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import ConfigLoaderMock, ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_freeze.py b/tests/test_cli/test_freeze.py
index a6208472c5..c939ad7e40 100644
--- a/tests/test_cli/test_freeze.py
+++ b/tests/test_cli/test_freeze.py
@@ -31,6 +31,7 @@
 
 from aea.cli import cli
 from aea.configurations.loader import make_jsonschema_base_uri
+
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_generate/test_generate.py b/tests/test_cli/test_generate/test_generate.py
index 0528b6e166..78df934c71 100644
--- a/tests/test_cli/test_generate/test_generate.py
+++ b/tests/test_cli/test_generate/test_generate.py
@@ -24,6 +24,7 @@
 
 from aea.cli.generate import _generate_item
 from aea.configurations.base import ProtocolSpecificationParseError
+
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_generate/test_protocols.py b/tests/test_cli/test_generate/test_protocols.py
index 9fc2128df1..36d60b7271 100644
--- a/tests/test_cli/test_generate/test_protocols.py
+++ b/tests/test_cli/test_generate/test_protocols.py
@@ -33,6 +33,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_generate_key.py b/tests/test_cli/test_generate_key.py
index b2795b22bd..67801b6f4a 100644
--- a/tests/test_cli/test_generate_key.py
+++ b/tests/test_cli/test_generate_key.py
@@ -26,6 +26,7 @@
 
 from aea.cli import cli
 from aea.crypto.registries import make_crypto
+
 from tests.conftest import (
     CLI_LOG_OPTION,
     ETHEREUM,
diff --git a/tests/test_cli/test_generate_wealth.py b/tests/test_cli/test_generate_wealth.py
index f71687627b..01ac6d42c4 100644
--- a/tests/test_cli/test_generate_wealth.py
+++ b/tests/test_cli/test_generate_wealth.py
@@ -26,6 +26,7 @@
 from aea.cli.generate_wealth import _try_generate_wealth
 from aea.test_tools.exceptions import AEATestingException
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     CLI_LOG_OPTION,
     FETCHAI,
diff --git a/tests/test_cli/test_get_address.py b/tests/test_cli/test_get_address.py
index 8d76ac81ea..86e582f7a1 100644
--- a/tests/test_cli/test_get_address.py
+++ b/tests/test_cli/test_get_address.py
@@ -22,6 +22,7 @@
 
 from aea.cli import cli
 from aea.cli.get_address import _try_get_address
+
 from tests.conftest import CLI_LOG_OPTION, FETCHAI, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_get_multiaddress.py b/tests/test_cli/test_get_multiaddress.py
index a46f6f58a2..6f2c13e138 100644
--- a/tests/test_cli/test_get_multiaddress.py
+++ b/tests/test_cli/test_get_multiaddress.py
@@ -23,6 +23,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import FETCHAI
 
 
diff --git a/tests/test_cli/test_get_wealth.py b/tests/test_cli/test_get_wealth.py
index 4f7561eec9..ff6f118a2d 100644
--- a/tests/test_cli/test_get_wealth.py
+++ b/tests/test_cli/test_get_wealth.py
@@ -22,6 +22,7 @@
 
 from aea.cli import cli
 from aea.cli.get_wealth import _try_get_wealth
+
 from tests.conftest import CLI_LOG_OPTION, FETCHAI, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_gui.py b/tests/test_cli/test_gui.py
index 78b813d4dc..a52d3d964e 100644
--- a/tests/test_cli/test_gui.py
+++ b/tests/test_cli/test_gui.py
@@ -31,6 +31,7 @@
 from aea.cli import cli
 from aea.configurations.loader import make_jsonschema_base_uri
 from aea.test_tools.click_testing import CliRunner
+
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
diff --git a/tests/test_cli/test_init.py b/tests/test_cli/test_init.py
index 424375b27b..52611313cf 100644
--- a/tests/test_cli/test_init.py
+++ b/tests/test_cli/test_init.py
@@ -29,6 +29,7 @@
 import yaml
 
 from aea.cli import cli
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_install.py b/tests/test_cli/test_install.py
index 648ddcc5c5..060efd06fd 100644
--- a/tests/test_cli/test_install.py
+++ b/tests/test_cli/test_install.py
@@ -31,6 +31,7 @@
 from aea.cli.install import _install_dependency
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.exceptions import AEAException
+
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
diff --git a/tests/test_cli/test_interact.py b/tests/test_cli/test_interact.py
index 43e4bf3628..9d8adb5697 100644
--- a/tests/test_cli/test_interact.py
+++ b/tests/test_cli/test_interact.py
@@ -29,6 +29,7 @@
 from aea.helpers.base import send_control_c
 from aea.mail.base import Envelope
 from aea.test_tools.test_cases import AEATestCaseEmpty, AEATestCaseMany
+
 from tests.conftest import MAX_FLAKY_RERUNS
 
 
diff --git a/tests/test_cli/test_launch.py b/tests/test_cli/test_launch.py
index e0d8560c4f..cf9054a9af 100644
--- a/tests/test_cli/test_launch.py
+++ b/tests/test_cli/test_launch.py
@@ -34,6 +34,7 @@
 
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
+
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, MAX_FLAKY_RERUNS, CliRunner
 
diff --git a/tests/test_cli/test_list.py b/tests/test_cli/test_list.py
index b78583c896..8b9030e964 100644
--- a/tests/test_cli/test_list.py
+++ b/tests/test_cli/test_list.py
@@ -30,6 +30,7 @@
 from jsonschema import Draft4Validator
 
 from aea.cli import cli
+
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_login.py b/tests/test_cli/test_login.py
index 3bdb94e8dc..bb75736b03 100644
--- a/tests/test_cli/test_login.py
+++ b/tests/test_cli/test_login.py
@@ -21,6 +21,7 @@
 from unittest import TestCase, mock
 
 from aea.cli import cli
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_logout.py b/tests/test_cli/test_logout.py
index 6847fc5948..491141119e 100644
--- a/tests/test_cli/test_logout.py
+++ b/tests/test_cli/test_logout.py
@@ -21,6 +21,7 @@
 from unittest import TestCase, mock
 
 from aea.cli import cli
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_publish.py b/tests/test_cli/test_publish.py
index 63e827c7ab..ab5b97d799 100644
--- a/tests/test_cli/test_publish.py
+++ b/tests/test_cli/test_publish.py
@@ -28,6 +28,7 @@
     _save_agent_locally,
     _validate_pkp,
 )
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import (
     ContextMock,
diff --git a/tests/test_cli/test_push.py b/tests/test_cli/test_push.py
index 86abf6f7a9..5856162ea5 100644
--- a/tests/test_cli/test_push.py
+++ b/tests/test_cli/test_push.py
@@ -24,6 +24,7 @@
 
 from aea.cli import cli
 from aea.cli.push import _check_package_public_id, _save_item_locally
+
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_register.py b/tests/test_cli/test_register.py
index c0f296f1f9..72f7d771b0 100644
--- a/tests/test_cli/test_register.py
+++ b/tests/test_cli/test_register.py
@@ -23,6 +23,7 @@
 from aea.cli import cli
 from aea.cli.register import do_register
 from aea.cli.registry.settings import AUTH_TOKEN_KEY
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_registry/test_fetch.py b/tests/test_cli/test_registry/test_fetch.py
index 81c41143a4..1a800c4197 100644
--- a/tests/test_cli/test_registry/test_fetch.py
+++ b/tests/test_cli/test_registry/test_fetch.py
@@ -26,6 +26,7 @@
 from click import ClickException
 
 from aea.cli.registry.fetch import fetch_agent
+
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
 
diff --git a/tests/test_cli/test_registry/test_publish.py b/tests/test_cli/test_registry/test_publish.py
index 2ec37fcc59..22f2c38100 100644
--- a/tests/test_cli/test_registry/test_publish.py
+++ b/tests/test_cli/test_registry/test_publish.py
@@ -21,6 +21,7 @@
 from unittest import TestCase, mock
 
 from aea.cli.registry.publish import _compress, publish_agent
+
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_registry/test_push.py b/tests/test_cli/test_registry/test_push.py
index a3b28b3b8a..f60c89b5a8 100644
--- a/tests/test_cli/test_registry/test_push.py
+++ b/tests/test_cli/test_registry/test_push.py
@@ -24,6 +24,7 @@
 from click import ClickException
 
 from aea.cli.registry.push import _compress_dir, _remove_pycache, push_item
+
 from tests.conftest import AUTHOR
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
diff --git a/tests/test_cli/test_remove/test_connection.py b/tests/test_cli/test_remove/test_connection.py
index 3b54a1efcb..3e4b5f69b0 100644
--- a/tests/test_cli/test_remove/test_connection.py
+++ b/tests/test_cli/test_remove/test_connection.py
@@ -31,6 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
+
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
diff --git a/tests/test_cli/test_remove/test_contract.py b/tests/test_cli/test_remove/test_contract.py
index a2423d27df..044d563ba8 100644
--- a/tests/test_cli/test_remove/test_contract.py
+++ b/tests/test_cli/test_remove/test_contract.py
@@ -21,6 +21,7 @@
 from unittest import TestCase, mock
 
 from aea.cli import cli
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 
 
diff --git a/tests/test_cli/test_remove/test_protocol.py b/tests/test_cli/test_remove/test_protocol.py
index d06341bc75..f4b82b2ea9 100644
--- a/tests/test_cli/test_remove/test_protocol.py
+++ b/tests/test_cli/test_remove/test_protocol.py
@@ -31,6 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
+
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner
 
 
diff --git a/tests/test_cli/test_remove/test_remove_item.py b/tests/test_cli/test_remove/test_remove_item.py
index 783f45fa7c..d7769bbcd8 100644
--- a/tests/test_cli/test_remove/test_remove_item.py
+++ b/tests/test_cli/test_remove/test_remove_item.py
@@ -23,6 +23,7 @@
 from click import ClickException
 
 from aea.cli.remove import remove_item
+
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
 
diff --git a/tests/test_cli/test_remove/test_skill.py b/tests/test_cli/test_remove/test_skill.py
index 23bcb7649f..659a94cc9c 100644
--- a/tests/test_cli/test_remove/test_skill.py
+++ b/tests/test_cli/test_remove/test_skill.py
@@ -31,6 +31,7 @@
 import aea.configurations.base
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig
+
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, ROOT_DIR, CliRunner
 
 
diff --git a/tests/test_cli/test_run.py b/tests/test_cli/test_run.py
index ef7c5b091d..6ad47c3502 100644
--- a/tests/test_cli/test_run.py
+++ b/tests/test_cli/test_run.py
@@ -41,6 +41,7 @@
 )
 from aea.configurations.constants import DEFAULT_CONNECTION
 from aea.exceptions import AEAPackageLoadingError
+
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import (
     AUTHOR,
diff --git a/tests/test_cli/test_scaffold/test_connection.py b/tests/test_cli/test_scaffold/test_connection.py
index ba70ef207d..c8fe7fad7b 100644
--- a/tests/test_cli/test_scaffold/test_connection.py
+++ b/tests/test_cli/test_scaffold/test_connection.py
@@ -35,6 +35,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_scaffold/test_generic.py b/tests/test_cli/test_scaffold/test_generic.py
index 2391b0b84d..89d8ab38cd 100644
--- a/tests/test_cli/test_scaffold/test_generic.py
+++ b/tests/test_cli/test_scaffold/test_generic.py
@@ -24,6 +24,7 @@
 
 from aea.cli import cli
 from aea.cli.scaffold import _scaffold_dm_handler
+
 from tests.conftest import CLI_LOG_OPTION, CliRunner
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_scaffold/test_protocols.py b/tests/test_cli/test_scaffold/test_protocols.py
index 22f44ce1e1..65df7b4b89 100644
--- a/tests/test_cli/test_scaffold/test_protocols.py
+++ b/tests/test_cli/test_scaffold/test_protocols.py
@@ -35,6 +35,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_scaffold/test_skills.py b/tests/test_cli/test_scaffold/test_skills.py
index 22be5fe660..5c1b593e61 100644
--- a/tests/test_cli/test_scaffold/test_skills.py
+++ b/tests/test_cli/test_scaffold/test_skills.py
@@ -35,6 +35,7 @@
 from aea.cli import cli
 from aea.configurations.base import DEFAULT_SKILL_CONFIG_FILE
 from aea.configurations.loader import make_jsonschema_base_uri
+
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py
index 8a983d9f16..6989eb16d2 100644
--- a/tests/test_cli/test_search.py
+++ b/tests/test_cli/test_search.py
@@ -32,6 +32,7 @@
 from aea import AEA_DIR
 from aea.cli import cli
 from aea.configurations.base import PublicId
+
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     AUTHOR,
diff --git a/tests/test_cli/test_utils/test_config.py b/tests/test_cli/test_utils/test_config.py
index e81b0ab859..971eda8410 100644
--- a/tests/test_cli/test_utils/test_config.py
+++ b/tests/test_cli/test_utils/test_config.py
@@ -24,6 +24,7 @@
 
 from aea.cli.utils.config import validate_item_config
 from aea.cli.utils.exceptions import AEAConfigException
+
 from tests.test_cli.tools_for_testing import AgentConfigMock, ConfigLoaderMock
 
 
diff --git a/tests/test_cli/test_utils/test_utils.py b/tests/test_cli/test_utils/test_utils.py
index ce2f250a59..455570208b 100644
--- a/tests/test_cli/test_utils/test_utils.py
+++ b/tests/test_cli/test_utils/test_utils.py
@@ -50,6 +50,7 @@
     validate_author_name,
     validate_package_name,
 )
+
 from tests.conftest import FETCHAI
 from tests.test_cli.tools_for_testing import (
     ConfigLoaderMock,
diff --git a/tests/test_cli_gui/test_create.py b/tests/test_cli_gui/test_create.py
index 53f83bba3f..5be16113f2 100644
--- a/tests/test_cli_gui/test_create.py
+++ b/tests/test_cli_gui/test_create.py
@@ -27,6 +27,7 @@
 from aea.cli.create import create_aea
 from aea.cli.utils.context import Context
 from aea.test_tools.constants import DEFAULT_AUTHOR
+
 from tests.conftest import CUR_PATH
 from tests.test_cli.tools_for_testing import raise_click_exception
 from tests.test_cli_gui.test_base import TempCWD, create_app
diff --git a/tests/test_cli_gui/test_misc.py b/tests/test_cli_gui/test_misc.py
index e7c05c23d4..86beb80b0a 100644
--- a/tests/test_cli_gui/test_misc.py
+++ b/tests/test_cli_gui/test_misc.py
@@ -23,9 +23,9 @@
 from flask import Flask
 
 import aea.cli_gui
-from tests.common.mocks import ctx_mock_Popen
 
 from .test_base import create_app
+from tests.common.mocks import ctx_mock_Popen
 
 
 def test_home_page_exits():
diff --git a/tests/test_cli_gui/test_run_agent.py b/tests/test_cli_gui/test_run_agent.py
index dff54f1fa9..cdf4611e31 100644
--- a/tests/test_cli_gui/test_run_agent.py
+++ b/tests/test_cli_gui/test_run_agent.py
@@ -32,6 +32,7 @@
 from aea.cli.utils.context import Context
 from aea.configurations.constants import DEFAULT_CONNECTION
 from aea.test_tools.constants import DEFAULT_AUTHOR
+
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS
 from tests.test_cli_gui.test_base import TempCWD, create_app
 
diff --git a/tests/test_components/test_base.py b/tests/test_components/test_base.py
index bb520fff59..8fbbaf486c 100644
--- a/tests/test_components/test_base.py
+++ b/tests/test_components/test_base.py
@@ -24,6 +24,7 @@
 
 from aea.components.base import Component, load_aea_package
 from aea.configurations.base import ConnectionConfig, ProtocolConfig
+
 from tests.conftest import ROOT_DIR
 
 
diff --git a/tests/test_configurations/test_aea_config.py b/tests/test_configurations/test_aea_config.py
index edec905c05..e7616166e4 100644
--- a/tests/test_configurations/test_aea_config.py
+++ b/tests/test_configurations/test_aea_config.py
@@ -39,6 +39,7 @@
 )
 from aea.configurations.loader import ConfigLoader, ConfigLoaders
 from aea.helpers.exception_policy import ExceptionPolicyEnum
+
 from tests.conftest import CUR_PATH, ROOT_DIR
 
 
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index d7a8a7b825..cc5095176a 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -48,6 +48,7 @@
 )
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.configurations.loader import ConfigLoaders, load_component_configuration
+
 from tests.conftest import (
     AUTHOR,
     ROOT_DIR,
diff --git a/tests/test_configurations/test_loader.py b/tests/test_configurations/test_loader.py
index 6862dd3d4a..11fb64e920 100644
--- a/tests/test_configurations/test_loader.py
+++ b/tests/test_configurations/test_loader.py
@@ -30,6 +30,7 @@
 from aea.configurations.base import PackageType, ProtocolSpecification
 from aea.configurations.loader import ConfigLoader, make_jsonschema_base_uri
 from aea.protocols.generator.common import load_protocol_specification
+
 from tests.conftest import protocol_specification_files
 
 
diff --git a/tests/test_configurations/test_schema.py b/tests/test_configurations/test_schema.py
index dafbb537f1..08c1fcefd7 100644
--- a/tests/test_configurations/test_schema.py
+++ b/tests/test_configurations/test_schema.py
@@ -30,6 +30,7 @@
 from jsonschema import Draft4Validator  # type: ignore
 
 from aea.configurations.loader import make_jsonschema_base_uri
+
 from tests.conftest import (
     AGENT_CONFIGURATION_SCHEMA,
     CONFIGURATION_SCHEMA_DIR,
diff --git a/tests/test_connections/test_stub.py b/tests/test_connections/test_stub.py
index 2ac56d71fd..a9a3219028 100644
--- a/tests/test_connections/test_stub.py
+++ b/tests/test_connections/test_stub.py
@@ -42,6 +42,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
+
 from tests.conftest import ROOT_DIR, _make_stub_connection
 
 SEPARATOR = ","
diff --git a/tests/test_context/test_base.py b/tests/test_context/test_base.py
index 333a8bacfe..4ebe49282f 100644
--- a/tests/test_context/test_base.py
+++ b/tests/test_context/test_base.py
@@ -22,6 +22,7 @@
 
 from aea.context.base import AgentContext
 from aea.identity.base import Identity
+
 from tests.conftest import FETCHAI
 
 
diff --git a/tests/test_contracts/test_base.py b/tests/test_contracts/test_base.py
index fc0de4cfbc..2dfc07a4a7 100644
--- a/tests/test_contracts/test_base.py
+++ b/tests/test_contracts/test_base.py
@@ -34,6 +34,7 @@
 from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
 from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
 from aea.crypto.registries import crypto_registry, ledger_apis_registry
+
 from tests.conftest import ETHEREUM, FETCHAI, ROOT_DIR
 
 
diff --git a/tests/test_crypto/test_cosmos.py b/tests/test_crypto/test_cosmos.py
index 36bbf49e38..521cd0267e 100644
--- a/tests/test_crypto/test_cosmos.py
+++ b/tests/test_crypto/test_cosmos.py
@@ -21,6 +21,7 @@
 from unittest.mock import MagicMock
 
 from aea.crypto.cosmos import CosmosApi, CosmosCrypto
+
 from tests.conftest import COSMOS_PRIVATE_KEY_PATH, COSMOS_TESTNET_CONFIG
 
 
diff --git a/tests/test_crypto/test_ethereum.py b/tests/test_crypto/test_ethereum.py
index b2e80ffcc8..e0aafd7d78 100644
--- a/tests/test_crypto/test_ethereum.py
+++ b/tests/test_crypto/test_ethereum.py
@@ -28,6 +28,7 @@
 import pytest
 
 from aea.crypto.ethereum import EthereumApi, EthereumCrypto, EthereumFaucetApi
+
 from tests.conftest import (
     ETHEREUM_PRIVATE_KEY_PATH,
     ETHEREUM_TESTNET_CONFIG,
diff --git a/tests/test_crypto/test_fetchai.py b/tests/test_crypto/test_fetchai.py
index e26d8611fd..aec465043f 100644
--- a/tests/test_crypto/test_fetchai.py
+++ b/tests/test_crypto/test_fetchai.py
@@ -26,6 +26,7 @@
 import pytest
 
 from aea.crypto.fetchai import FetchAIApi, FetchAICrypto, FetchAIFaucetApi
+
 from tests.conftest import (
     FETCHAI_PRIVATE_KEY_PATH,
     FETCHAI_TESTNET_CONFIG,
diff --git a/tests/test_crypto/test_helpers.py b/tests/test_crypto/test_helpers.py
index 2814346786..1bb71be721 100644
--- a/tests/test_crypto/test_helpers.py
+++ b/tests/test_crypto/test_helpers.py
@@ -36,6 +36,7 @@
     try_validate_private_key_path,
     verify_or_create_private_keys,
 )
+
 from tests.conftest import (
     COSMOS_PRIVATE_KEY_FILE,
     CUR_PATH,
diff --git a/tests/test_crypto/test_ledger_apis.py b/tests/test_crypto/test_ledger_apis.py
index 7bb5bd0a56..ade3ee345d 100644
--- a/tests/test_crypto/test_ledger_apis.py
+++ b/tests/test_crypto/test_ledger_apis.py
@@ -29,6 +29,7 @@
 from aea.crypto.fetchai import FetchAIApi
 from aea.crypto.ledger_apis import LedgerApis
 from aea.exceptions import AEAEnforceError
+
 from tests.conftest import COSMOS, COSMOS_ADDRESS_ONE, ETHEREUM_ADDRESS_ONE
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_crypto/test_registry/test_crypto_registry.py b/tests/test_crypto/test_registry/test_crypto_registry.py
index e0471b0dcb..19607fc413 100644
--- a/tests/test_crypto/test_registry/test_crypto_registry.py
+++ b/tests/test_crypto/test_registry/test_crypto_registry.py
@@ -31,6 +31,7 @@
 from aea.crypto.fetchai import FetchAICrypto
 from aea.crypto.registries.base import EntryPoint
 from aea.exceptions import AEAException
+
 from tests.conftest import COSMOS, ETHEREUM, FETCHAI
 from tests.data.custom_crypto import CustomCrypto
 
diff --git a/tests/test_crypto/test_registry/test_ledger_api_registry.py b/tests/test_crypto/test_registry/test_ledger_api_registry.py
index 9fe8943e4b..088128a9c3 100644
--- a/tests/test_crypto/test_registry/test_ledger_api_registry.py
+++ b/tests/test_crypto/test_registry/test_ledger_api_registry.py
@@ -24,6 +24,7 @@
 import pytest
 
 import aea.crypto
+
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_ADDRESS_ONE,
diff --git a/tests/test_crypto/test_wallet.py b/tests/test_crypto/test_wallet.py
index 04ed6d899f..6f82c08868 100644
--- a/tests/test_crypto/test_wallet.py
+++ b/tests/test_crypto/test_wallet.py
@@ -29,6 +29,7 @@
 from aea.crypto.fetchai import FetchAICrypto
 from aea.crypto.wallet import Wallet
 from aea.exceptions import AEAException
+
 from tests.conftest import (
     COSMOS_PRIVATE_KEY_PATH,
     ETHEREUM_PRIVATE_KEY_PATH,
diff --git a/tests/test_decision_maker/test_default.py b/tests/test_decision_maker/test_default.py
index 47fd7225f3..c475bd2d29 100644
--- a/tests/test_decision_maker/test_default.py
+++ b/tests/test_decision_maker/test_default.py
@@ -50,6 +50,7 @@
     StateUpdateDialogues as BaseStateUpdateDialogues,
 )
 from aea.protocols.state_update.message import StateUpdateMessage
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_PATH,
diff --git a/tests/test_decision_maker/test_ownership_state.py b/tests/test_decision_maker/test_ownership_state.py
index 26c6996ab9..c5ae85ae26 100644
--- a/tests/test_decision_maker/test_ownership_state.py
+++ b/tests/test_decision_maker/test_ownership_state.py
@@ -23,6 +23,7 @@
 
 from aea.decision_maker.default import OwnershipState
 from aea.helpers.transaction.base import Terms
+
 from tests.conftest import ETHEREUM
 
 
diff --git a/tests/test_decision_maker/test_preferences.py b/tests/test_decision_maker/test_preferences.py
index 3bd8b09879..e64ce455de 100644
--- a/tests/test_decision_maker/test_preferences.py
+++ b/tests/test_decision_maker/test_preferences.py
@@ -25,6 +25,7 @@
 
 from aea.decision_maker.default import OwnershipState, Preferences
 from aea.helpers.transaction.base import Terms
+
 from tests.conftest import ETHEREUM
 
 
diff --git a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
index 0f25897695..9fe0f5dfad 100644
--- a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
+++ b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
@@ -24,6 +24,7 @@
 import pytest
 
 from aea.test_tools.test_cases import BaseAEATestCase
+
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 from tests.test_docs.test_agent_vs_aea.agent_code_block import run
diff --git a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
index 349289ad5c..834963d279 100644
--- a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
@@ -24,10 +24,10 @@
 
 from aea.configurations.constants import DEFAULT_PRIVATE_KEY_FILE
 from aea.test_tools.test_cases import BaseAEATestCase
-from tests.conftest import CUR_PATH, ROOT_DIR
-from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 from .programmatic_aea import run
+from tests.conftest import CUR_PATH, ROOT_DIR
+from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 MD_FILE = "docs/build-aea-programmatically.md"
 PY_FILE = "test_docs/test_build_aea_programmatically/programmatic_aea.py"
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
index 5b8b52feeb..737f29fdfa 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
@@ -34,6 +34,7 @@
 from aea.protocols.base import Protocol
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
+
 from packages.fetchai.connections.ledger.connection import LedgerConnection
 from packages.fetchai.connections.p2p_libp2p.connection import P2PLibp2pConnection
 from packages.fetchai.connections.soef.connection import SOEFConnection
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
index 80bd07567d..43c52bda0d 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
@@ -27,6 +27,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     CUR_PATH,
     FETCHAI,
diff --git a/tests/test_docs/test_docs_protocol.py b/tests/test_docs/test_docs_protocol.py
index 750dd8e5cf..4f68f4abf1 100644
--- a/tests/test_docs/test_docs_protocol.py
+++ b/tests/test_docs/test_docs_protocol.py
@@ -24,6 +24,7 @@
 import mistune
 
 from aea.protocols.default.message import DefaultMessage
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.oef_search.custom_types import OefErrorOperation
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
diff --git a/tests/test_docs/test_docs_skill.py b/tests/test_docs/test_docs_skill.py
index 1cbde84b96..00e2b47bb6 100644
--- a/tests/test_docs/test_docs_skill.py
+++ b/tests/test_docs/test_docs_skill.py
@@ -24,6 +24,7 @@
 
 from aea.skills.behaviours import OneShotBehaviour
 from aea.skills.tasks import Task
+
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import compile_and_exec
 
diff --git a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
index 762fdcb010..615e30e44a 100644
--- a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
@@ -23,10 +23,10 @@
 from pathlib import Path
 
 from aea.test_tools.test_cases import BaseAEATestCase
-from tests.conftest import CUR_PATH, ROOT_DIR
-from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 from .multiplexer_standalone import run
+from tests.conftest import CUR_PATH, ROOT_DIR
+from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 MD_FILE = "docs/multiplexer-standalone.md"
 PY_FILE = "test_docs/test_multiplexer_standalone/multiplexer_standalone.py"
diff --git a/tests/test_docs/test_orm_integration/test_orm_integration.py b/tests/test_docs/test_orm_integration/test_orm_integration.py
index a452a241b5..e111461af7 100644
--- a/tests/test_docs/test_orm_integration/test_orm_integration.py
+++ b/tests/test_docs/test_orm_integration/test_orm_integration.py
@@ -26,6 +26,7 @@
 import yaml
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_docs/test_skill_guide/test_skill_guide.py b/tests/test_docs/test_skill_guide/test_skill_guide.py
index 0f77e47bc9..0c9a5e1663 100644
--- a/tests/test_docs/test_skill_guide/test_skill_guide.py
+++ b/tests/test_docs/test_skill_guide/test_skill_guide.py
@@ -29,6 +29,7 @@
 from aea import AEA_DIR
 from aea.configurations.base import DEFAULT_VERSION
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     AUTHOR,
     COSMOS,
diff --git a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
index 2a98cb68e1..277e18c5fc 100644
--- a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
@@ -26,10 +26,10 @@
 import pytest
 
 from aea.test_tools.test_cases import BaseAEATestCase
-from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS_INTEGRATION, ROOT_DIR
-from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 from .standalone_transaction import logger, run
+from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS_INTEGRATION, ROOT_DIR
+from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
 MD_FILE = "docs/standalone-transaction.md"
 PY_FILE = "test_docs/test_standalone_transaction/standalone_transaction.py"
diff --git a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
index aa572200b0..1a8234e66e 100644
--- a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
+++ b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
@@ -46,6 +46,7 @@
 from aea.protocols.base import Message, Protocol
 from aea.registries.resources import Resources
 from aea.skills.base import Handler, Skill, SkillContext
+
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.protocols.http.message import HttpMessage
 from tests.conftest import HTTP_PROTOCOL_PUBLIC_ID
diff --git a/tests/test_helpers/test_base.py b/tests/test_helpers/test_base.py
index 692ef0ff54..d2b2ee347a 100644
--- a/tests/test_helpers/test_base.py
+++ b/tests/test_helpers/test_base.py
@@ -47,6 +47,7 @@
     yaml_load,
     yaml_load_all,
 )
+
 from packages.fetchai.connections.oef.connection import OEFConnection
 from tests.conftest import CUR_PATH, ROOT_DIR, skip_test_windows
 
diff --git a/tests/test_helpers/test_exec_timeout.py b/tests/test_helpers/test_exec_timeout.py
index 87e7c42c5f..683a449f2f 100644
--- a/tests/test_helpers/test_exec_timeout.py
+++ b/tests/test_helpers/test_exec_timeout.py
@@ -32,6 +32,7 @@
     ExecTimeoutThreadGuard,
     TimeoutException,
 )
+
 from tests.common.utils import timeit_context
 
 if os.name == "nt":
diff --git a/tests/test_helpers/test_ipfs/test_base.py b/tests/test_helpers/test_ipfs/test_base.py
index b7f581edb9..820f7b40b2 100644
--- a/tests/test_helpers/test_ipfs/test_base.py
+++ b/tests/test_helpers/test_ipfs/test_base.py
@@ -23,6 +23,7 @@
 from unittest.mock import patch
 
 from aea.helpers.ipfs.base import IPFSHashOnly, _is_text
+
 from tests.conftest import CUR_PATH
 
 FILE_PATH = "__init__.py"
diff --git a/tests/test_helpers/test_pipe/test_pipe.py b/tests/test_helpers/test_pipe/test_pipe.py
index 41fdb0d1cd..f4e5d95ef5 100644
--- a/tests/test_helpers/test_pipe/test_pipe.py
+++ b/tests/test_helpers/test_pipe/test_pipe.py
@@ -32,6 +32,7 @@
     make_ipc_channel,
     make_ipc_channel_client,
 )
+
 from tests.conftest import skip_test_windows
 
 
diff --git a/tests/test_identity/test_base.py b/tests/test_identity/test_base.py
index 91ad680452..78ab1e42da 100644
--- a/tests/test_identity/test_base.py
+++ b/tests/test_identity/test_base.py
@@ -23,6 +23,7 @@
 
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.identity.base import Identity
+
 from tests.conftest import FETCHAI
 
 
diff --git a/tests/test_launcher.py b/tests/test_launcher.py
index 3b4ec4c1a5..2ea05053ff 100644
--- a/tests/test_launcher.py
+++ b/tests/test_launcher.py
@@ -33,6 +33,7 @@
 from aea.helpers.base import cd
 from aea.launcher import AEALauncher, _run_agent
 from aea.test_tools.test_cases import CLI_LOG_OPTION
+
 from tests.common.utils import wait_for_condition
 from tests.conftest import AUTHOR, CUR_PATH, CliRunner
 
diff --git a/tests/test_mail/test_base.py b/tests/test_mail/test_base.py
index 03cd58bd7b..0c24589ca9 100644
--- a/tests/test_mail/test_base.py
+++ b/tests/test_mail/test_base.py
@@ -29,6 +29,7 @@
 from aea.multiplexer import InBox, Multiplexer, OutBox
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
+
 from packages.fetchai.connections.local.connection import LocalNode
 from tests.conftest import (
     UNKNOWN_PROTOCOL_PUBLIC_ID,
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index a33f19f3a5..f3048912e7 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -40,8 +40,6 @@
 from aea.mail.base import AEAConnectionError, Envelope, EnvelopeContext
 from aea.multiplexer import AsyncMultiplexer, InBox, Multiplexer, OutBox
 from aea.protocols.default.message import DefaultMessage
-from packages.fetchai.connections.local.connection import LocalNode
-from tests.common.utils import wait_for_condition
 
 from .conftest import (
     UNKNOWN_CONNECTION_PUBLIC_ID,
@@ -51,6 +49,8 @@
     _make_stub_connection,
     logger,
 )
+from packages.fetchai.connections.local.connection import LocalNode
+from tests.common.utils import wait_for_condition
 
 
 @pytest.mark.asyncio
diff --git a/tests/test_packages/test_connections/test_gym/test_gym.py b/tests/test_packages/test_connections/test_gym/test_gym.py
index dc5dbc56e1..f2bced4db9 100644
--- a/tests/test_packages/test_connections/test_gym/test_gym.py
+++ b/tests/test_packages/test_connections/test_gym/test_gym.py
@@ -31,6 +31,7 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.connections.gym.connection import GymConnection
 from packages.fetchai.protocols.gym.dialogues import GymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
diff --git a/tests/test_packages/test_connections/test_http_client/test_http_client.py b/tests/test_packages/test_connections/test_http_client/test_http_client.py
index 46fa4697c2..5ce8c66936 100644
--- a/tests/test_packages/test_connections/test_http_client/test_http_client.py
+++ b/tests/test_packages/test_connections/test_http_client/test_http_client.py
@@ -30,6 +30,7 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py
index a233cff419..a63e7af233 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server.py
@@ -35,6 +35,7 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.connections.http_server.connection import (
     APISpec,
     HTTPServerConnection,
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
index e1fb4f9864..faddbd6f72 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
@@ -29,6 +29,7 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.connections.http_server.connection import HTTPServerConnection
 from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues
diff --git a/tests/test_packages/test_connections/test_ledger/test_contract_api.py b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
index c37e72d756..a0b314f5f7 100644
--- a/tests/test_packages/test_connections/test_ledger/test_contract_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
@@ -31,6 +31,7 @@
 from aea.multiplexer import MultiplexerStatus
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue
+
 from packages.fetchai.connections.ledger.contract_dispatcher import (
     ContractApiRequestDispatcher,
 )
diff --git a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
index 8b217f7a92..edcf7358b0 100644
--- a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
@@ -41,6 +41,7 @@
 )
 from aea.mail.base import Envelope, Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.connections.ledger.connection import LedgerConnection
 from packages.fetchai.connections.ledger.ledger_dispatcher import (
     LedgerApiRequestDispatcher,
diff --git a/tests/test_packages/test_connections/test_local/test_misc.py b/tests/test_packages/test_connections/test_local/test_misc.py
index a4fa2b3d14..9f89eac9e6 100644
--- a/tests/test_packages/test_connections/test_local/test_misc.py
+++ b/tests/test_packages/test_connections/test_local/test_misc.py
@@ -27,6 +27,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
+
 from packages.fetchai.connections.local.connection import LocalNode
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from tests.conftest import _make_local_connection
diff --git a/tests/test_packages/test_connections/test_local/test_search_services.py b/tests/test_packages/test_connections/test_local/test_search_services.py
index dc6dea7450..97e03fd4bf 100644
--- a/tests/test_packages/test_connections/test_local/test_search_services.py
+++ b/tests/test_packages/test_connections/test_local/test_search_services.py
@@ -35,6 +35,7 @@
 from aea.multiplexer import InBox, Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
 from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/tests/test_packages/test_connections/test_oef/test_communication.py b/tests/test_packages/test_connections/test_oef/test_communication.py
index e39741e3c1..79972d8107 100644
--- a/tests/test_packages/test_connections/test_oef/test_communication.py
+++ b/tests/test_packages/test_connections/test_oef/test_communication.py
@@ -50,6 +50,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.test_tools.test_cases import UseOef
+
 from packages.fetchai.connections.oef.connection import OEFObjectTranslator
 from packages.fetchai.protocols.fipa import fipa_pb2
 from packages.fetchai.protocols.fipa.message import FipaMessage
diff --git a/tests/test_packages/test_connections/test_oef/test_models.py b/tests/test_packages/test_connections/test_oef/test_models.py
index 544d8390d3..accb7470c5 100644
--- a/tests/test_packages/test_connections/test_oef/test_models.py
+++ b/tests/test_packages/test_connections/test_oef/test_models.py
@@ -36,6 +36,7 @@
     Or,
     Query,
 )
+
 from packages.fetchai.connections.oef.connection import OEFObjectTranslator
 
 
diff --git a/tests/test_packages/test_connections/test_oef/test_oef_serializer.py b/tests/test_packages/test_connections/test_oef/test_oef_serializer.py
index 1240a82c02..a6e1e20b0b 100644
--- a/tests/test_packages/test_connections/test_oef/test_oef_serializer.py
+++ b/tests/test_packages/test_connections/test_oef/test_oef_serializer.py
@@ -27,6 +27,7 @@
     Location,
     Query,
 )
+
 from packages.fetchai.connections.oef.object_translator import OEFObjectTranslator
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
index 3958eff47f..d31a3afbce 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
@@ -22,6 +22,7 @@
 import os
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import libp2p_log_on_failure
 
 DEFAULT_PORT = 10234
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
index 4893ad2a6e..8b42415786 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
@@ -28,6 +28,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
+
 from packages.fetchai.connections.p2p_libp2p.connection import Uri
 from tests.conftest import (
     _make_libp2p_connection,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index b9230ea5b1..27deba8716 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -30,6 +30,7 @@
 from aea.crypto.registries import make_crypto
 from aea.identity.base import Identity
 from aea.multiplexer import Multiplexer
+
 from packages.fetchai.connections.p2p_libp2p.connection import (
     LIBP2P_NODE_MODULE_NAME,
     AwaitableProc,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
index 8b7d39157b..97553180c5 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
@@ -30,6 +30,7 @@
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
+
 from tests.conftest import (
     _make_libp2p_connection,
     libp2p_log_on_failure,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
index c83f9b5887..08838b121a 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
@@ -29,6 +29,7 @@
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import (
     PUBLIC_DHT_DELEGATE_URI_1,
     PUBLIC_DHT_DELEGATE_URI_2,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
index 0a03321867..fc3c87b396 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
@@ -20,6 +20,7 @@
 """This test module contains AEA cli tests for Libp2p tcp client connection."""
 from aea.multiplexer import Multiplexer
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import (
     _make_libp2p_connection,
     libp2p_log_on_failure,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
index 82a4f55b3f..51f293def8 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
@@ -29,6 +29,7 @@
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
+
 from packages.fetchai.connections.p2p_libp2p_client.connection import Uri
 from tests.conftest import (
     _make_libp2p_client_connection,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
index 3d1831717c..1834e135fb 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
@@ -29,6 +29,7 @@
 from aea.crypto.registries import make_crypto
 from aea.identity.base import Identity
 from aea.multiplexer import Multiplexer
+
 from packages.fetchai.connections.p2p_libp2p_client.connection import (
     P2PLibp2pClientConnection,
 )
diff --git a/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py b/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
index 9c56863b1b..d5cfccb73d 100644
--- a/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
+++ b/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
@@ -30,6 +30,7 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
+
 from packages.fetchai.connections.p2p_stub.connection import P2PStubConnection
 
 SEPARATOR = ","
diff --git a/tests/test_packages/test_connections/test_soef/models.py b/tests/test_packages/test_connections/test_soef/models.py
index a2dab6c1b3..245a50d19f 100644
--- a/tests/test_packages/test_connections/test_soef/models.py
+++ b/tests/test_packages/test_connections/test_soef/models.py
@@ -19,6 +19,7 @@
 """This module contains models for soef connection tests."""
 
 from aea.helpers.search.models import Attribute, DataModel, Location
+
 from packages.fetchai.connections.soef.connection import ModelNames
 
 AGENT_LOCATION_MODEL = DataModel(
diff --git a/tests/test_packages/test_connections/test_soef/test_soef.py b/tests/test_packages/test_connections/test_soef/test_soef.py
index 3957765ebb..dcecd3b2fb 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef.py
@@ -41,6 +41,8 @@
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+
+from . import models
 from packages.fetchai.connections.soef.connection import SOEFConnection, SOEFException
 from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue
 from packages.fetchai.protocols.oef_search.dialogues import (
@@ -49,8 +51,6 @@
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID
 
-from . import models
-
 
 def make_async(return_value: Any) -> Callable:
     """Wrap value into async function."""
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 188089bdb7..3366cee8ca 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -41,12 +41,12 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
-from packages.fetchai.connections.soef.connection import SOEFConnection
-from packages.fetchai.protocols.oef_search.message import OefSearchMessage
-from tests.common.utils import wait_for_condition
 
 from . import models
 from .test_soef import OefSearchDialogues
+from packages.fetchai.connections.soef.connection import SOEFConnection
+from packages.fetchai.protocols.oef_search.message import OefSearchMessage
+from tests.common.utils import wait_for_condition
 
 logging.basicConfig(level=logging.DEBUG)
 
diff --git a/tests/test_packages/test_connections/test_tcp/test_base.py b/tests/test_packages/test_connections/test_tcp/test_base.py
index c5a627a1bc..4381d84e28 100644
--- a/tests/test_packages/test_connections/test_tcp/test_base.py
+++ b/tests/test_packages/test_connections/test_tcp/test_base.py
@@ -27,6 +27,7 @@
 
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
+
 from tests.conftest import (
     _make_tcp_client_connection,
     _make_tcp_server_connection,
diff --git a/tests/test_packages/test_connections/test_tcp/test_communication.py b/tests/test_packages/test_connections/test_tcp/test_communication.py
index 49da99d4f6..1a39f25d22 100644
--- a/tests/test_packages/test_connections/test_tcp/test_communication.py
+++ b/tests/test_packages/test_connections/test_tcp/test_communication.py
@@ -28,6 +28,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 from aea.protocols.default.message import DefaultMessage
+
 from tests.conftest import (
     _make_tcp_client_connection,
     _make_tcp_server_connection,
diff --git a/tests/test_packages/test_connections/test_webhook/test_webhook.py b/tests/test_packages/test_connections/test_webhook/test_webhook.py
index 177842aade..5a68208fc8 100644
--- a/tests/test_packages/test_connections/test_webhook/test_webhook.py
+++ b/tests/test_packages/test_connections/test_webhook/test_webhook.py
@@ -35,6 +35,7 @@
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue
+
 from packages.fetchai.connections.webhook.connection import WebhookConnection
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
diff --git a/tests/test_packages/test_contracts/test_erc1155/test_contract.py b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
index a30b081ff1..f2e9d58821 100644
--- a/tests/test_packages/test_contracts/test_erc1155/test_contract.py
+++ b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
@@ -30,6 +30,7 @@
     faucet_apis_registry,
     ledger_apis_registry,
 )
+
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_ADDRESS_ONE,
diff --git a/tests/test_packages/test_protocols/test_contract_api.py b/tests/test_packages/test_protocols/test_contract_api.py
index af7ee43db4..d9a3ca45ce 100644
--- a/tests/test_packages/test_protocols/test_contract_api.py
+++ b/tests/test_packages/test_protocols/test_contract_api.py
@@ -26,13 +26,14 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.contract_api.dialogues import (
     ContractApiDialogue,
     ContractApiDialogues,
diff --git a/tests/test_packages/test_protocols/test_fipa.py b/tests/test_packages/test_protocols/test_fipa.py
index ebbcf70e7b..0383e3d837 100644
--- a/tests/test_packages/test_protocols/test_fipa.py
+++ b/tests/test_packages/test_protocols/test_fipa.py
@@ -26,7 +26,6 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.helpers.search.models import Constraint, ConstraintType, Description, Query
@@ -34,6 +33,8 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.fipa.message import logger as fipa_message_logger
diff --git a/tests/test_packages/test_protocols/test_gym.py b/tests/test_packages/test_protocols/test_gym.py
index 9393c45328..2189e884b1 100644
--- a/tests/test_packages/test_protocols/test_gym.py
+++ b/tests/test_packages/test_protocols/test_gym.py
@@ -25,13 +25,14 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.gym.dialogues import GymDialogue, GymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.protocols.gym.message import logger as gym_message_logger
diff --git a/tests/test_packages/test_protocols/test_http.py b/tests/test_packages/test_protocols/test_http.py
index 39eaaffc5d..ccd682fbd3 100644
--- a/tests/test_packages/test_protocols/test_http.py
+++ b/tests/test_packages/test_protocols/test_http.py
@@ -25,13 +25,14 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.http.message import logger as http_message_logger
diff --git a/tests/test_packages/test_protocols/test_ledger_api.py b/tests/test_packages/test_protocols/test_ledger_api.py
index 89ab8c7914..ab4b545fb8 100644
--- a/tests/test_packages/test_protocols/test_ledger_api.py
+++ b/tests/test_packages/test_protocols/test_ledger_api.py
@@ -25,13 +25,14 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.ledger_api.dialogues import (
     LedgerApiDialogue,
     LedgerApiDialogues,
diff --git a/tests/test_packages/test_protocols/test_ml_trade.py b/tests/test_packages/test_protocols/test_ml_trade.py
index 3b8add1aa6..51e1c309d9 100644
--- a/tests/test_packages/test_protocols/test_ml_trade.py
+++ b/tests/test_packages/test_protocols/test_ml_trade.py
@@ -26,7 +26,6 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.helpers.search.models import Constraint, ConstraintType, Description, Query
@@ -34,6 +33,8 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.ml_trade.dialogues import (
     MlTradeDialogue,
     MlTradeDialogues,
diff --git a/tests/test_packages/test_protocols/test_oef_search.py b/tests/test_packages/test_protocols/test_oef_search.py
index 36016ac7eb..5efd5a8735 100644
--- a/tests/test_packages/test_protocols/test_oef_search.py
+++ b/tests/test_packages/test_protocols/test_oef_search.py
@@ -25,7 +25,6 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.helpers.search.models import Constraint, ConstraintType, Description, Query
@@ -33,6 +32,8 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogue,
     OefSearchDialogues,
diff --git a/tests/test_packages/test_protocols/test_tac.py b/tests/test_packages/test_protocols/test_tac.py
index 3cadefbf99..ea4cfa7809 100644
--- a/tests/test_packages/test_protocols/test_tac.py
+++ b/tests/test_packages/test_protocols/test_tac.py
@@ -25,13 +25,14 @@
 
 import pytest
 
-import packages
 from aea.common import Address
 from aea.exceptions import AEAEnforceError
 from aea.mail.base import Envelope
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
+
+import packages
 from packages.fetchai.protocols.tac.dialogues import TacDialogue, TacDialogues
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.protocols.tac.message import logger as tac_message_logger
diff --git a/tests/test_packages/test_skills/test_carpark.py b/tests/test_packages/test_skills/test_carpark.py
index ca63ad4c3e..a95f7128b1 100644
--- a/tests/test_packages/test_skills/test_carpark.py
+++ b/tests/test_packages/test_skills/test_carpark.py
@@ -24,6 +24,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_erc1155.py b/tests/test_packages/test_skills/test_erc1155.py
index 439bdf5b27..f785a87681 100644
--- a/tests/test_packages/test_skills/test_erc1155.py
+++ b/tests/test_packages/test_skills/test_erc1155.py
@@ -23,6 +23,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_generic.py b/tests/test_packages/test_skills/test_generic.py
index 7791c37d50..d320798742 100644
--- a/tests/test_packages/test_skills/test_generic.py
+++ b/tests/test_packages/test_skills/test_generic.py
@@ -23,6 +23,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_gym.py b/tests/test_packages/test_skills/test_gym.py
index 4f5f3544d2..91619b6314 100644
--- a/tests/test_packages/test_skills/test_gym.py
+++ b/tests/test_packages/test_skills/test_gym.py
@@ -23,6 +23,7 @@
 import shutil
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import ROOT_DIR
 
 
diff --git a/tests/test_packages/test_skills/test_http_echo.py b/tests/test_packages/test_skills/test_http_echo.py
index f44520bc57..e476ed7de2 100644
--- a/tests/test_packages/test_skills/test_http_echo.py
+++ b/tests/test_packages/test_skills/test_http_echo.py
@@ -24,6 +24,7 @@
 import requests
 
 from aea.test_tools.test_cases import AEATestCaseEmpty
+
 from tests.conftest import ROOT_DIR
 
 API_SPEC_PATH = Path(ROOT_DIR, "examples", "http_ex", "petstore.yaml").absolute()
diff --git a/tests/test_packages/test_skills/test_ml_skills.py b/tests/test_packages/test_skills/test_ml_skills.py
index 0d17f5cc40..3ed1c80747 100644
--- a/tests/test_packages/test_skills/test_ml_skills.py
+++ b/tests/test_packages/test_skills/test_ml_skills.py
@@ -25,6 +25,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index 0ea77c3680..a2397ffcbc 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -23,6 +23,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_thermometer.py b/tests/test_packages/test_skills/test_thermometer.py
index c000784bcd..0d87abf663 100644
--- a/tests/test_packages/test_skills/test_thermometer.py
+++ b/tests/test_packages/test_skills/test_thermometer.py
@@ -23,6 +23,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_packages/test_skills/test_weather.py b/tests/test_packages/test_skills/test_weather.py
index ecf0d33309..76f159df7a 100644
--- a/tests/test_packages/test_skills/test_weather.py
+++ b/tests/test_packages/test_skills/test_weather.py
@@ -23,6 +23,7 @@
 import pytest
 
 from aea.test_tools.test_cases import AEATestCaseMany
+
 from tests.conftest import (
     COSMOS,
     COSMOS_PRIVATE_KEY_FILE_CONNECTION,
diff --git a/tests/test_protocols/test_base.py b/tests/test_protocols/test_base.py
index dd7f7c9e2b..357b1e9a8e 100644
--- a/tests/test_protocols/test_base.py
+++ b/tests/test_protocols/test_base.py
@@ -40,6 +40,7 @@
     StateUpdateDialogue,
     StateUpdateDialogues,
 )
+
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID
 
 
diff --git a/tests/test_protocols/test_generator/test_common.py b/tests/test_protocols/test_generator/test_common.py
index 5dce4dd880..a2d8a12360 100644
--- a/tests/test_protocols/test_generator/test_common.py
+++ b/tests/test_protocols/test_generator/test_common.py
@@ -43,6 +43,7 @@
     try_run_isort_formatting,
     try_run_protoc,
 )
+
 from tests.test_protocols.test_generator.common import (
     PATH_TO_T_PROTOCOL_SPECIFICATION,
     T_PROTOCOL_NAME,
diff --git a/tests/test_protocols/test_generator/test_end_to_end.py b/tests/test_protocols/test_generator/test_end_to_end.py
index bc9f189eca..bae4a62cad 100644
--- a/tests/test_protocols/test_generator/test_end_to_end.py
+++ b/tests/test_protocols/test_generator/test_end_to_end.py
@@ -34,6 +34,7 @@
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Handler, Skill, SkillContext
 from aea.test_tools.test_cases import UseOef
+
 from tests.conftest import ROOT_DIR
 from tests.data.generator.t_protocol.dialogues import (
     TProtocolDialogue,
diff --git a/tests/test_protocols/test_generator/test_extract_specification.py b/tests/test_protocols/test_generator/test_extract_specification.py
index 2161c9d559..9f1122363b 100644
--- a/tests/test_protocols/test_generator/test_extract_specification.py
+++ b/tests/test_protocols/test_generator/test_extract_specification.py
@@ -36,6 +36,7 @@
     _specification_type_to_python_type,
     extract,
 )
+
 from tests.test_protocols.test_generator.common import PATH_TO_T_PROTOCOL_SPECIFICATION
 
 logger = logging.getLogger("aea")
diff --git a/tests/test_protocols/test_generator/test_generator.py b/tests/test_protocols/test_generator/test_generator.py
index d47b575af4..b6038accee 100644
--- a/tests/test_protocols/test_generator/test_generator.py
+++ b/tests/test_protocols/test_generator/test_generator.py
@@ -33,6 +33,7 @@
     ProtocolSpecificationParseError,
 )
 from aea.protocols.generator.base import ProtocolGenerator
+
 from tests.conftest import ROOT_DIR
 from tests.data.generator.t_protocol.message import TProtocolMessage  # type: ignore
 from tests.test_protocols.test_generator.common import (
diff --git a/tests/test_protocols/test_signing.py b/tests/test_protocols/test_signing.py
index 24fe1adcf9..a548e4fa02 100644
--- a/tests/test_protocols/test_signing.py
+++ b/tests/test_protocols/test_signing.py
@@ -30,6 +30,7 @@
     Terms,
 )
 from aea.protocols.signing.message import SigningMessage
+
 from tests.conftest import COSMOS
 
 
diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index f8e94145c9..35c145764a 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -53,6 +53,7 @@
 )
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
+
 from tests.conftest import CUR_PATH, ROOT_DIR, _make_dummy_connection
 
 
diff --git a/tests/test_registries/test_filter.py b/tests/test_registries/test_filter.py
index 4e34d9f14d..f07b9b2db7 100644
--- a/tests/test_registries/test_filter.py
+++ b/tests/test_registries/test_filter.py
@@ -29,6 +29,7 @@
 from aea.registries.filter import Filter
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
+
 from tests.data.dummy_skill.behaviours import DummyBehaviour
 from tests.data.dummy_skill.handlers import DummyHandler
 
diff --git a/tests/test_runner.py b/tests/test_runner.py
index cfeb15bf65..170ef93eac 100644
--- a/tests/test_runner.py
+++ b/tests/test_runner.py
@@ -29,6 +29,7 @@
 from aea.helpers.multiple_executor import logger as executor_logger
 from aea.runner import AEARunner
 from aea.skills.base import Skill, SkillContext
+
 from tests.common.utils import make_behaviour_cls_from_funcion, wait_for_condition
 from tests.conftest import FETCHAI_PRIVATE_KEY_PATH
 
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
index c111287df1..05cc970e66 100644
--- a/tests/test_runtime.py
+++ b/tests/test_runtime.py
@@ -27,6 +27,7 @@
 from aea.aea_builder import AEABuilder
 from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PRIVATE_KEY_FILE
 from aea.runtime import AsyncRuntime, BaseRuntime, RuntimeStates, ThreadedRuntime
+
 from tests.common.utils import run_in_thread, wait_for_condition
 from tests.conftest import CUR_PATH
 
diff --git a/tests/test_skills/test_base.py b/tests/test_skills/test_base.py
index 9468b317d9..4becbd346d 100644
--- a/tests/test_skills/test_base.py
+++ b/tests/test_skills/test_base.py
@@ -48,6 +48,7 @@
     _check_duplicate_classes,
     _print_warning_message_for_non_declared_skill_components,
 )
+
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_PATH,
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index ff38b21c2b..f8e3d4c2ad 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -35,6 +35,7 @@
 from aea.registries.resources import Resources
 from aea.skills.base import SkillContext
 from aea.skills.error.handlers import ErrorHandler
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from tests.common.utils import wait_for_condition
 from tests.conftest import CUR_PATH, _make_dummy_connection
diff --git a/tests/test_test_tools/test_testcases.py b/tests/test_test_tools/test_testcases.py
index 22f5abc4ca..3a8b77b366 100644
--- a/tests/test_test_tools/test_testcases.py
+++ b/tests/test_test_tools/test_testcases.py
@@ -31,6 +31,7 @@
 from aea.protocols.dialogue.base import Dialogue
 from aea.test_tools.exceptions import AEATestingException
 from aea.test_tools.test_cases import AEATestCase, AEATestCaseEmpty
+
 from tests.conftest import FETCHAI
 from tests.test_cli import test_generate_wealth, test_interact
 

From b6bd3b61b60cbb118ef74fea3378731d59992014 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 10:15:12 +0200
Subject: [PATCH 022/131] update hashes

---
 .../fetchai/connections/gym/connection.yaml   |  2 +-
 .../connections/http_client/connection.yaml   |  2 +-
 .../connections/http_server/connection.yaml   |  2 +-
 .../connections/ledger/connection.yaml        |  6 +-
 .../fetchai/connections/local/connection.yaml |  2 +-
 .../fetchai/connections/oef/connection.yaml   |  2 +-
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 .../fetchai/connections/tcp/connection.yaml   |  4 +-
 .../connections/webhook/connection.yaml       |  2 +-
 .../protocols/contract_api/protocol.yaml      |  6 +-
 packages/fetchai/protocols/fipa/protocol.yaml |  6 +-
 packages/fetchai/protocols/gym/protocol.yaml  |  6 +-
 packages/fetchai/protocols/http/protocol.yaml |  4 +-
 .../protocols/ledger_api/protocol.yaml        |  6 +-
 .../fetchai/protocols/ml_trade/protocol.yaml  |  6 +-
 .../protocols/oef_search/protocol.yaml        |  6 +-
 packages/fetchai/protocols/tac/protocol.yaml  |  6 +-
 .../fetchai/skills/aries_alice/skill.yaml     |  6 +-
 .../fetchai/skills/aries_faber/skill.yaml     |  6 +-
 .../skills/carpark_detection/skill.yaml       |  2 +-
 packages/fetchai/skills/echo/skill.yaml       |  2 +-
 .../fetchai/skills/erc1155_client/skill.yaml  |  6 +-
 .../fetchai/skills/erc1155_deploy/skill.yaml  |  8 +--
 .../fetchai/skills/generic_buyer/skill.yaml   |  6 +-
 .../fetchai/skills/generic_seller/skill.yaml  |  6 +-
 packages/fetchai/skills/gym/skill.yaml        |  8 +--
 packages/fetchai/skills/http_echo/skill.yaml  |  4 +-
 .../skills/ml_data_provider/skill.yaml        |  4 +-
 packages/fetchai/skills/ml_train/skill.yaml   |  4 +-
 .../simple_service_registration/skill.yaml    |  6 +-
 .../fetchai/skills/tac_control/skill.yaml     |  8 +--
 .../skills/tac_control_contract/skill.yaml    |  8 +--
 .../fetchai/skills/tac_negotiation/skill.yaml | 10 +--
 .../skills/tac_participation/skill.yaml       |  8 +--
 packages/hashes.csv                           | 68 +++++++++----------
 35 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml
index f55d9694b2..2ecf2a9b7a 100644
--- a/packages/fetchai/connections/gym/connection.yaml
+++ b/packages/fetchai/connections/gym/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPUxpn8smGVFexxhUu3Vy3q5xsJukHnYtQzUXyt965bmL
   __init__.py: QmWwxj1hGGZNteCvRtZxwtY9PuEKsrWsEmMWCKwiYCdvRR
-  connection.py: QmSnGeGf42n8XTqe3jT9SvpLsEaXaEP7ciSSF1p1sNhMbi
+  connection.py: QmVDJV8G9xdk4QN2izxRH183WesDjPxXxrZ8PAurqtZ9D3
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/gym:0.6.0
diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml
index 19a78aab55..f87a4b0e3f 100644
--- a/packages/fetchai/connections/http_client/connection.yaml
+++ b/packages/fetchai/connections/http_client/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmXfZJPAh4Ujt3xj8xzd6ng6HbrpJQUuvjWe8DNQSwSKWU
   __init__.py: QmPdKAks8A6XKAgZiopJzPZYXJumTeUqChd8UorqmLQQPU
-  connection.py: QmcUNSyeaKRnbWMtZeHnHhz8VUYMZMdUZn6mipmFciDGzH
+  connection.py: QmSBQnD19bcfrmgv5zFex94DLeY33osLwduozYqABRiSvo
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml
index 0bbcde7cf3..f6ba1d652a 100644
--- a/packages/fetchai/connections/http_server/connection.yaml
+++ b/packages/fetchai/connections/http_server/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTmQcnUPKaDHHJHngBFXnUVPdgBLanP9DbjVHZT55Scfn
   __init__.py: Qmb6JEAkJeb5JweqrSGiGoQp1vGXqddjGgb9WMkm2phTgA
-  connection.py: QmXLqBCHVsQmpTKdDNUB6GJkHVFRipA39uoij8snVExEP4
+  connection.py: QmTbxD1VE4nA8uonSWa1b4hZwji8UEJ8aCXb71LVxeFFYY
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index c2b54a95fb..1fa8d81190 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -9,9 +9,9 @@ fingerprint:
   README.md: QmfQN7UK1M4pBUzKVzPannPLVi8iiULKHNtJ7XpoWpjqfc
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
   base.py: Qmec23f5Be6AkNvjwujzrRJExeXkjhD6fPzhRmGiPgwPLC
-  connection.py: QmaRg6kLFsSERL4gExFfnXTK3ZAj6Kx4nTVcVL4Yh67ECs
-  contract_dispatcher.py: QmZnytzjMMgJeACQRgVvhH4iijgvvW4nmP7AD6Fz4rAKjr
-  ledger_dispatcher.py: QmRXSuhgHqRgqkTtcBwdvjPd4QRpVuZWfBubgNeQSh9FJJ
+  connection.py: Qmdibf99GzdFjFCcoTX7AiiBVWznKvPZWvur8cngSRNdye
+  contract_dispatcher.py: QmXMPf7Mekyfo8SofcVYWWgMwADQZw68cXbmtf1pyKchVc
+  ledger_dispatcher.py: QmTGvnN5W7VHZ9McQSyDQ1jPQoFWmQmuR2a3y8LL6J7aiM
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/contract_api:0.5.0
diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml
index e8d3ffba04..5c722defd8 100644
--- a/packages/fetchai/connections/local/connection.yaml
+++ b/packages/fetchai/connections/local/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbK7MtyAVqh2LmSh9TY6yBZqfWaAXURP4rQGATyP2hTKC
   __init__.py: QmeeoX5E38Ecrb1rLdeFyyxReHLrcJoETnBcPbcNWVbiKG
-  connection.py: QmQcok4CvW1WHqyx3pUUgyKjvLYW5PCYEUH7MFYWbpFGuS
+  connection.py: QmaydCZEzNwBiDw5rVAW9oh63S9ymaG4WHcj2TWDnWViF2
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/oef/connection.yaml b/packages/fetchai/connections/oef/connection.yaml
index 803272c1f0..0f429611ed 100644
--- a/packages/fetchai/connections/oef/connection.yaml
+++ b/packages/fetchai/connections/oef/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVHWxThR1u9a4BEm89oCxUTPGnN6PznvNgo6oZLqDD3n5
   __init__.py: QmUAen8tmoBHuCerjA3FSGKJRLG6JYyUS3chuWzPxKYzez
-  connection.py: QmVCcDnoAVFVCGovD8WUdT99BAkkRgsoxGEiizQBw72CT7
+  connection.py: QmQZf8YSviqEi2KbkQUdAAU5Z2TCAdXuQXTLv2sVCncrQ9
   object_translator.py: QmfDTqq9kUhWrAJf8SyevzhcKcuYioiLxLQtWhavxbvawS
 fingerprint_ignore_patterns: []
 protocols:
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 0d3a69b6a9..8a6ca5d174 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmWwjETX39APP9RD5oVPeeCiDnUoDvjAcoVe2FK2Jc6anM
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmZUiXzv3TTQN3pRSTXv21zDkaTKCpEbQy4WKEysaNz5iq
+  connection.py: QmaBSm4WJgew1c2tChSR3683PTKBqdXgdHaPaQJXuEFXFL
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/tcp/connection.yaml b/packages/fetchai/connections/tcp/connection.yaml
index 244e25f814..7ecf44617c 100644
--- a/packages/fetchai/connections/tcp/connection.yaml
+++ b/packages/fetchai/connections/tcp/connection.yaml
@@ -10,8 +10,8 @@ fingerprint:
   __init__.py: QmTxAtQ9ffraStxxLAkvmWxyGhoV3jE16Sw6SJ9xzTthLb
   base.py: QmRu7RYvTQuXvzM8mj8LQ8d3XtaHKLRdnMo7AvX2X76npe
   connection.py: QmcQnyUagAhE7UsSBxiBSqsuF4mTMdU26LZLhUhdq5QygR
-  tcp_client.py: QmZ525Hun84As512AvVM6imBfeF9Rg9Qu9uqySynEJqeda
-  tcp_server.py: QmVxWqr4Hr5Kumdwi9xE83Pez5aMx64HqgV2NHeRUUka1A
+  tcp_client.py: QmR96SGPA9ZKQSJuhXXuQhPu55X3pygwGKhjtVZaynFVF1
+  tcp_server.py: Qme1JTrtwuR1aGsA24yCnuPeGq1NRXrLDuG4ANUK5Uv317
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: TCPClientConnection
diff --git a/packages/fetchai/connections/webhook/connection.yaml b/packages/fetchai/connections/webhook/connection.yaml
index 8486472c9c..e234b9719c 100644
--- a/packages/fetchai/connections/webhook/connection.yaml
+++ b/packages/fetchai/connections/webhook/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmQDqfKKsksKsUqdqTcYe8P8Fw3MGovVuZBFHPbhupkkxf
   __init__.py: QmWUKSmXaBgGMvKgdmzKmMjCx43BnrfW6og2n3afNoAALq
-  connection.py: QmPXKYLQXdv6QryujJ8JXvLqRxAnEPjN2uWoYx3GkhYkac
+  connection.py: Qme93KgLYqvUkqspcrLb2wyBqN4v2wbvcNMXFnuVMRKJBx
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index c2c207893f..f1bf7e424c 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -11,9 +11,9 @@ fingerprint:
   contract_api.proto: QmNwngtcYFSuqL8yeTGVXmrHjfebCybdUa9BnTDKXn8odk
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
   custom_types.py: QmbLjpiTcGNfvdBsu8pgQH6PK5y6ujdNnZ53JSk1GZDRCA
-  dialogues.py: QmSDg2B75CTZ3y8hyZgEsCMPseu6XFzcB7QX8XtMXJDWbn
-  message.py: QmUccjMF97WqBZNuDrsYRMofAsfZ2vZFEHnyoiicNuY73K
-  serialization.py: QmfGrQURxWxrYQMYATbseN3pggTbJbYccy1kXFkqKSrLeK
+  dialogues.py: QmTjXH8JUtziUFDawKsSTYE5dxn1n1FmMPeWexyxiPYd6k
+  message.py: Qmbxqt2TauoUkP6bqeYz1LZ7FukMvW3szs26HU87QCEFya
+  serialization.py: QmQzS931wTQNt758wvnB81aD16hUMQ19WVK6f1p1XuEwUp
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml
index a03513921d..f1f2a5a028 100644
--- a/packages/fetchai/protocols/fipa/protocol.yaml
+++ b/packages/fetchai/protocols/fipa/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmRwxwzxfhotek7WUbyAeufBvoHpWbDwfUVMy3FKitiHKy
   __init__.py: QmZuv8RGegxunYaJ7sHLwj2oLLCFCAGF139b8DxEY68MRT
   custom_types.py: Qmb7bzEUAW74ZeSFqL7sTccNCjudStV63K4CFNZtibKUHB
-  dialogues.py: QmdGVV1SqzwYo1UwEfpPMAryzCaYTWXUuraYDSe9ZKQXZZ
+  dialogues.py: QmWaciW35ZTVeTeLWeyp3hjehKkWB5ZY7Di8N8cDH8Mjwb
   fipa.proto: QmP7JqnuQSQ9BDcKkscrTydKEX4wFBoyFaY1bkzGkamcit
   fipa_pb2.py: QmZMkefJLrb3zJKoimb6a9tdpxDBhc8rR2ghimqg7gZ471
-  message.py: QmPEx8gqKV6Cw1LeakKfC6frVpe225zb3BjyVxqX3bKwQr
-  serialization.py: QmW8riKb6M5Bso67hp9XRLXUC86hAR5GJEyyQWcqdkbdt5
+  message.py: QmbFtigdnmqqmKZMTxjmk6JQJtcyhVY9a4mpEEcHmFJd24
+  serialization.py: QmQMb8F8hJm1gkJFSPPCtDAoxSX3bFkshtzRgDWfWB8ynd
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index 6e3c2e1f63..e53d9e38d6 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmTCkz4cEUcwuPZVtvrVr8Np5qn1SMwm6foGSY9Y68DhZT
   __init__.py: QmWBvruqGuU2BVCq8cuP1S3mgvuC78yrG4TdtSvKhCT8qX
   custom_types.py: QmT3VKT86xZKR11RR1vQ3myRpmVZNdzY6ELd8HG9U2ngwa
-  dialogues.py: QmTJLhmqiB1DpoQVQKwo8RRUeoba8h1jVeTm399vgd2t66
+  dialogues.py: QmdCzcFfyPF43U2SoxwshG5p4hd6dK49m6GYKduDHbnNPo
   gym.proto: QmQGF9Xz4Z93wmhdKoztzxjo5pS4SsAWe2TQdvZCLuzdGC
   gym_pb2.py: QmSTz7xrL8ryqzR1Sgu1NpR6PmW7GUhBGnN2qYc8m8NCcN
-  message.py: Qmd9viV8e1SzaTNmKXVjFnsTavNN64JReJRkkQAnpX1A97
-  serialization.py: QmZ4aVD25B2jpEPBXzPgPHj9PeyZyh8VwYrb2knJcgXCbE
+  message.py: QmTaiHDJkdduU4HLn7i17oAigJQwrws8FmfQCwbfAagnGp
+  serialization.py: QmPNsgeGkagzQuAyq97fcGXA2LoPwiuq8X1tcfVXoLwnSV
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml
index 75bb043685..fba165de7c 100644
--- a/packages/fetchai/protocols/http/protocol.yaml
+++ b/packages/fetchai/protocols/http/protocol.yaml
@@ -8,11 +8,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmY7fxhyNBgwU7uc6LKtCN4aSQ4bym5BwqtwRAfwPokULN
   __init__.py: QmRWie4QPiFJE8nK4fFJ6prqoG3u36cPo7st5JUZAGpVWv
-  dialogues.py: Qmf69mXWZQU1jaPAKqdyFujgp2LmXu37RJYqzvgYttPfDS
+  dialogues.py: QmdwTehjCppcxyDid8m6zuHY5YwprUhato88R9Zdm9aXaM
   http.proto: QmdTUTvvxGxMxSTB67AXjMUSDLdsxBYiSuJNVxHuLKB1jS
   http_pb2.py: QmYYKqdwiueq54EveL9WXn216FXLSQ6XGJJHoiJxwJjzHC
   message.py: QmYSmd2xLU8TsLLorxxNnaHj1cVLztgrKtQnaqJ1USFkPY
-  serialization.py: QmUdYL9PqDEbbjLaotxMSNEoVnEAdvFewffw2CV5SgG7sp
+  serialization.py: QmTq34k2PD6Ybhk8x1EboY3UcNp8r3H6Tb3egZsWJN9nFv
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml
index eb615a0b21..e74aaec3e3 100644
--- a/packages/fetchai/protocols/ledger_api/protocol.yaml
+++ b/packages/fetchai/protocols/ledger_api/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmSoo6ds8mKhtoG8CBbu9rb9yj7sqeeuBfcU7CLj584uRX
   __init__.py: Qmct8jVx6ndWwaa5HXJAJgMraVuZ8kMeyx6rnEeHAYHwDJ
   custom_types.py: QmQJnWQvtj1D9zqGWM3XrpNtZPmzr4rLgKxoG1MzM5udNA
-  dialogues.py: QmVCWMYaVVhtAoJVfzdpBz3bhGvXZH3XEY3KqbFGhwRx6b
+  dialogues.py: QmRtWkAfR9WTvygMJ36R758RzdY2mGQs2fgtHCfjxmeaHy
   ledger_api.proto: QmfLcv7jJcGJ1gAdCMqsyxJcRud7RaTWteSXHL5NvGuViP
   ledger_api_pb2.py: QmQhM848REJTDKDoiqxkTniChW8bNNm66EtwMRkvVdbMry
-  message.py: QmSoC4Vt4CFWGbZB6rsXn7jLho3CiuvHTTEnKS2RBRg1LZ
-  serialization.py: QmWnjRaZBpUtErSTGGR6uQmatXy1xcbfhSvsFzYKjRNzM5
+  message.py: QmcLuy4YcL22qs3jHf5KHZ7vZueiTDrEmbWjfRTbyzwc5m
+  serialization.py: QmRuTqH9t9JtsnpWX5wpC438DdRxWKiqAB2u9fvQ2oy1GE
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/ml_trade/protocol.yaml b/packages/fetchai/protocols/ml_trade/protocol.yaml
index b57c75503b..160ce8cb5c 100644
--- a/packages/fetchai/protocols/ml_trade/protocol.yaml
+++ b/packages/fetchai/protocols/ml_trade/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmSRtzACMh3x3LSjYqWXWTpYpE4C7G8EHbW4zQQoMFFZ4K
   __init__.py: QmXZMVdsBXUJxLZvwwhWBx58xfxMSyoGxdYp5Aeqmzqhzt
   custom_types.py: QmeWvNKuezFxfmLYaxKhP9XffeiFFCwH1qowyiJacLAHpF
-  dialogues.py: QmVqaAXZrVvw3Djyi7BgpJCSBtoSmBeDEYFtD7k3y45vu1
-  message.py: QmQWqj74tHy16CgnMYYWa8tTSChmjquGNtYtnLkzMdDLEH
+  dialogues.py: QmVvP34aKWEtHrKmccNMvEdDnx5B7xpE5aEGzr6GU2u8UK
+  message.py: QmZdRAScKbmJgKVbRJvDyMUNfRZKWCwWFYjGNDDBAq5fUT
   ml_trade.proto: QmeB21MQduEGQCrtiYZQzPpRqHL4CWEkvvcaKZ9GsfE8f6
   ml_trade_pb2.py: QmZVvugPysR1og6kWCJkvo3af2s9pQRHfuj4BptE7gU1EU
-  serialization.py: QmQCjiTWXmvrfFjsLUwuSBVujRq7zihL1nkcdhQkweakDy
+  serialization.py: QmTamQzo8ZNM6T7QnsA7qNzs2uJ7CHTUczzCsHwU9Q6Z5K
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml
index c29691d3c0..656d835d6f 100644
--- a/packages/fetchai/protocols/oef_search/protocol.yaml
+++ b/packages/fetchai/protocols/oef_search/protocol.yaml
@@ -9,11 +9,11 @@ fingerprint:
   README.md: QmaGSTqxvQFKccBnLovhBbfSH3C3Sorrj7kFyZqW9qptLa
   __init__.py: QmRvTtynKcd7shmzgf8aZdcA5witjNL5cL2a7WPgscp7wq
   custom_types.py: QmPSAWKkH7R8XCfPUCRmuEqVxCnp8L5PTUq4DBt59AzFUC
-  dialogues.py: QmYE5MGfXV2aQEUr3pAMKsuP9ywzWtLEkrDBu7zA25ms3U
-  message.py: QmXSb2g2Dfeu629wXUZ4WzhrGwWaTNmu28P1hihUnEViVL
+  dialogues.py: QmQPLnW3jAs6tLLmhkX4C7texGRHM9bfdjs83dUH5TkJ4v
+  message.py: QmU8jH94qxrcr9eUtXWn5PzqmHT7NBc62gs53HPXKVk1Ts
   oef_search.proto: QmNU8WsxT6XNFFneKKeDaZkNn3CEFDfZQkmKv9TyhyxzDB
   oef_search_pb2.py: QmSAFT1xxYRzJU6h1aFVDuYcx672sZ2vzV6c2ico7f4BLK
-  serialization.py: QmSH58UnNGcGTFqEcsokB58CRVEfHtiMskTFtrams8f5CH
+  serialization.py: QmU3ipyvogbpkFuQki6xqscdiPahDVYw4sBaPHaH3LVvwJ
 fingerprint_ignore_patterns: []
 dependencies:
   protobuf: {}
diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml
index a78d53b0ef..db3fb0f167 100644
--- a/packages/fetchai/protocols/tac/protocol.yaml
+++ b/packages/fetchai/protocols/tac/protocol.yaml
@@ -10,9 +10,9 @@ fingerprint:
   README.md: QmVhm6VBbggxjTe3PEhCBfTomWekNa5buYy3sY7YYN6Er6
   __init__.py: QmZYdAjm3o44drRiY3MT4RtG2fFLxtaL8h898DmjoJwJzV
   custom_types.py: QmXyAhpkE6sLExGgf2GxBv8gRYTDZu7XCDsa2m4rwvQrmp
-  dialogues.py: QmQNMQ6J85Jp59vZXRuKZtyh4MessMCxjs75C5EC3TfJbA
-  message.py: Qme5qTFZr7vTc76rbUwrYuRZNQKuxqHdVdP4pPk3m16Q4S
-  serialization.py: QmV2haMtVTKaeqZrXriZuzL2TAcNQ245AqYFsGBJzuibx7
+  dialogues.py: QmTxHrcGujP1RUYvfJygZyQoUwmDg2GBWfmbR3tWUSbyop
+  message.py: QmfNdmYk3wssDJvHwMsMxXaiWCjm3fSH9Su4KmsYDZJoWg
+  serialization.py: QmTk2Jp19dQ4SJdjSHAr8wbxw4rQSMheSuf1XzXG8CaoB4
   tac.proto: QmdpPZNhUW593qVNVoSTWZgd9R69bmBbw6Y9xjzYpvuDvV
   tac_pb2.py: QmUwW3kixKwD2o1RRdq4NoNoihPb5BXKKRngWXztq32fea
 fingerprint_ignore_patterns: []
diff --git a/packages/fetchai/skills/aries_alice/skill.yaml b/packages/fetchai/skills/aries_alice/skill.yaml
index d8ccc8de1f..38cb454605 100644
--- a/packages/fetchai/skills/aries_alice/skill.yaml
+++ b/packages/fetchai/skills/aries_alice/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfS1ezD77No8WQkvrkPs4oSXHFbULRxatGzRhMbSMntSx
   __init__.py: Qma8qSTU34ADKWskBwQKQLGNpe3xDKNgjNQ6Q4MxUnKa3Q
-  behaviours.py: QmaFXL8xKh4vL5qXtQq8nyQXBAGJXEnMY5crL3CBoSjTuW
-  dialogues.py: QmQwremVUhyXMcoPQEvc4yJaUUDBx9ZYmDUCUHZwwux9Gc
-  handlers.py: Qmc4cdzhZPxQsc8FzZXq1P4KfFNX78yPA5LVmEKfVP46Xa
+  behaviours.py: QmVCaSA8nEDYfB99EhBVr9pWyRcuAgAgWjburFaHLTXdbK
+  dialogues.py: QmRbbuYSXuNzMVK3gkHVFhwqH8k6oPo4ThGvVPrrn9N3Yq
+  handlers.py: QmTtqM5oWBEAZcHdTuwuPtbiZZGWontMNEtmDxcccS2u2Y
   strategy.py: QmZ2jhWFQZipk6wAquS1gWxX94iAmhN9Vrh7tcPU9bgpzF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/aries_faber/skill.yaml b/packages/fetchai/skills/aries_faber/skill.yaml
index 37e0837dba..3b4021817d 100644
--- a/packages/fetchai/skills/aries_faber/skill.yaml
+++ b/packages/fetchai/skills/aries_faber/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdkSNCYx5dNGDAAveapQgoyM7Y7iYeQzR7KN2Sso3CJG4
   __init__.py: QmNPVQ6UajvJodqTLWbLvQZkKCfrNn1nYPrQXai3xdj6F7
-  behaviours.py: QmUodVZv8uBeDLCiWnQpRoRGT5oEUauhrSoZdMx1VxGFaU
-  dialogues.py: QmPHqMtprNxvA6VTAi7ZRbLfFNy4pDPUcu9T6sM37wxMyQ
-  handlers.py: QmTDWYft3unkJhhQZGKcEHdyw8LuZPHuCLbFrUg9PHe1Fh
+  behaviours.py: QmYvoagukgT4oRGxLThY8QcgZBAbZfogVBuuuytVpnMsMR
+  dialogues.py: QmXveWmeU3eTDDhqDkBcVE2pJAtxJUAzcjbM8ZEjRvKUYW
+  handlers.py: QmcJ2c4enNm2K2ZdY5KKQtUri1MRYcDgQsPV4G8U8ndnmD
   strategy.py: QmcUmddp6CUP31Bfckt6EkV3n2VZcJrUagoGBaTDBMTdXR
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/carpark_detection/skill.yaml b/packages/fetchai/skills/carpark_detection/skill.yaml
index 1dc69e1ef1..1371479964 100644
--- a/packages/fetchai/skills/carpark_detection/skill.yaml
+++ b/packages/fetchai/skills/carpark_detection/skill.yaml
@@ -13,7 +13,7 @@ fingerprint:
   database.py: QmQv79qDxNk8v9chNYq7AxxChAJVGs4B8Y9we35rjzaonP
   dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
   handlers.py: QmZ7r1LaYnjjkW6T7XLdmWdHjmyd9DsBjnFDvf5zoa6U6V
-  strategy.py: QmX2LcvY3yHDeKH4VeCCJM9JFihj5Hwwii6zZi3efMXSpV
+  strategy.py: QmTHW32BzzYrBF1YkmftAMuyx6cKKGrp554qeKiFBJieJJ
 fingerprint_ignore_patterns:
 - temp_files_placeholder/*
 contracts: []
diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml
index 94480f9071..ea30fccd22 100644
--- a/packages/fetchai/skills/echo/skill.yaml
+++ b/packages/fetchai/skills/echo/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
   behaviours.py: QmXARXRvJkpzuqnYNhJhv42Sk6J4KzRW2AKvC6FJWLU9JL
   dialogues.py: QmTWhg4VnPFVsEq6D4KQvLWZntFDBxY7ujEjgD7ZspKcen
-  handlers.py: QmSapUa6eiyRFFuXthGY8ELJ4byK6SykE6TuMMspF3i3Ep
+  handlers.py: QmfD1dbce2WoPF54DNgu9DUNZrHeTucA5LyDoiFr8j5pTx
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml
index 7b624d2b71..099ed84f66 100644
--- a/packages/fetchai/skills/erc1155_client/skill.yaml
+++ b/packages/fetchai/skills/erc1155_client/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZLsx2wJE762rqDqfeqLMg9RBczvALxy3H2U9kfRvgK3s
   __init__.py: QmRXXJsv5bfvb7qsyxQtVzXwn6PMLJKkbm6kg4DNkT1NtW
-  behaviours.py: QmT1c2JxQf92Em8ohu4qMSmBtebgmW7Gm6ZAK5ifFT2bQS
-  dialogues.py: QmUM3rDDQALcgfKsX7gGpT7sP1DVXsneS6XbqVANaW4Xfh
-  handlers.py: Qme7hDcANLpsUcJAm74eLRRzHTDKbBNUxt5sbMmUnE75sr
+  behaviours.py: QmaCak7V3jYEWdj4fLdd2tEG4fiSazbLBC5WKjDeSAQhrh
+  dialogues.py: QmPb2odXbXxuY5Ygm9mfCufM2mtMZ23oapsAzsWHC2x2k4
+  handlers.py: QmSahx4wij2w9X6Zm9wAHyeJVRifpKGkstwYKDzcosqkfe
   strategy.py: QmNg87LgfLPoPyokFrmvrNghQD7JkWehRNAdRNyB3YogeN
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index ea1b113692..fadc21b3bf 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZ7swVkRpmJbJZ2NoLb9CWwH8p3QjnjRJg71UbAXdrKyx
   __init__.py: Qmbm3ZtGpfdvvzqykfRqbaReAK9a16mcyK7qweSfeN5pq1
-  behaviours.py: QmNf5NGKdNaffwFHHyNPv1FMocJ9YbnvU1zKFaYJoUEexA
-  dialogues.py: QmdHxieCCQjSbEf1U1vekKUK86EVu64Hw2HFKWrC9hK5q6
-  handlers.py: QmR9hFdRrtGyXeijkWH31KXyE835x3CiNXPh6cy1hthv1A
-  strategy.py: QmcmUTRZk4BDm9DyowWm9NT1UzDe6rjQhgyongibSPh3hc
+  behaviours.py: QmaiK1q2cYeP64YriCw6PHm9Mr1okMRU9esPftQDXXFy1f
+  dialogues.py: QmcCbdxFM4SX3MgXDxxbsC66gp8QK3C4W2czniQ5oDNc7G
+  handlers.py: Qmeof4YFVmZGUacBBbibhnEH4CU4hDCDmcKRoEBx6NPvvd
+  strategy.py: QmeoDg7UT5MG5khmrZna3v8HYrC6QJjjEV26kcq1mPs6yx
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml
index 09725cf577..3072c5b6b0 100644
--- a/packages/fetchai/skills/generic_buyer/skill.yaml
+++ b/packages/fetchai/skills/generic_buyer/skill.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTR91jm7WfJpmabisy74NR5mc35YXjDU1zQAUKZeHRw8L
   __init__.py: QmaEDrNJBeHCJpbdFckRUhLSBqCXQ6umdipTMpYhqSKxSG
-  behaviours.py: QmX2CDEtaNMeP8iSRafRiYcso7rcEYgSZpn6UV3JgFbAio
-  dialogues.py: QmUmPdxtaXK783i63ZB2nvHctHg9sZqRVgP6P7rnsG2V9s
-  handlers.py: QmNo8CT3ev8m25ePhAaRJaqo1BcprpK5kvUYjARoPHnJia
+  behaviours.py: QmSEymQerdUYooELqC2NyXJFpXLpwBX49G1DjMzzMVa69s
+  dialogues.py: QmeUqYS9BXKfVJZDPUwLQZAzzEwPJcdDt9hPiBAKPYazt6
+  handlers.py: QmZVuiu84WgGX3R438kuDVcNJZrahzWgLxsPAy34R6kc34
   strategy.py: Qmb2T99WnQQa4qyZSdu31QyrbtHy8ZWC6Jhv9sVrTYrFxE
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml
index 6397a8f591..24bb952fc8 100644
--- a/packages/fetchai/skills/generic_seller/skill.yaml
+++ b/packages/fetchai/skills/generic_seller/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPb5kHYZyhUN87EKmuahyGqDGgqVdGPyfC1KpGC3xfmcP
   __init__.py: QmbfkeFnZVKppLEHpBrTXUXBwg2dpPABJWSLND8Lf1cmpG
-  behaviours.py: QmdsS8wmLyxTZc4FdUri4ojRG1nMbasSHC4u6i1AfTQH1V
-  dialogues.py: QmZuFnZKndhsrUZrqjGpYHBzPFAZZbVdzGt6FLXvSi8AdS
-  handlers.py: QmeHRB72xVXoWCUd58SQ3q4vnzMZzrGjodWSyKGCyeYTwp
+  behaviours.py: QmTYpaELjbZxs128wSAxLry6vKgjnz3EuuDVy86T7XVAQ6
+  dialogues.py: QmRJCregJWVs8scTMjQptvztKa5NEHKUfeZECVxdU233C6
+  handlers.py: QmYyAYGiSMzUAq96LuFsVewYut9njvCR3NG9uEKonnwGf5
   strategy.py: QmX1mp7eZkz1P6iVyoDCATZDKZRgwe1EgMVmAyvtGDHvm3
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml
index c44d7e4065..d6108e6eae 100644
--- a/packages/fetchai/skills/gym/skill.yaml
+++ b/packages/fetchai/skills/gym/skill.yaml
@@ -8,11 +8,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUpD7PeLHS8nH7HJ48hBafSFhLn8Yrh571RCmxnStpNwq
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
-  dialogues.py: QmQik8PG4xfuvbDwxocfRHygLHDbHkeqxHEGToAM2EooQz
-  handlers.py: QmbqpPWc3N6MFSpJq2DaPcu78mJG3S9iJuJBuPproSnXHf
-  helpers.py: Qmf48TPcPXxZDVRjFtcJAHAbNJu1qGn8Hju1T1sqnwcL9C
+  dialogues.py: QmWQrpkx9GP3E1a9STqDQtKfXmKEUtrVkCEQjXh8YTeL8U
+  handlers.py: QmagqBdQaGuGbVS5dFqxFtEww2e1YF2NprBNPtt5pVA2hZ
+  helpers.py: QmbRSMX7UCRAEotS4ocTEcZLo1qietAAU9K5zBtqY1nE82
   rl_agent.py: QmUq3XY9Dd2XZBhNNK9J3S5937d3az4cwP1BmeieHSgJ3m
-  tasks.py: QmR6XMqp4uwHyZ4MgJWdgmcUHjk92jWkRjskknZ1Zjji6i
+  tasks.py: QmW4WBzC2pkcnjnwJZKu63qXXWEbMVV3fwQMozGxjWnEdt
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml
index 20dd372b38..86be8f91e3 100644
--- a/packages/fetchai/skills/http_echo/skill.yaml
+++ b/packages/fetchai/skills/http_echo/skill.yaml
@@ -9,8 +9,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmYMHPsBX3wTMZZP89aKa7FzDCqGyvvue54ZBN8NZt4mNt
   __init__.py: QmaKik9dXg6cajBPG9RTDr6BhVdWk8aoR8QDNfPQgiy1kv
-  dialogues.py: QmVXAbsx66KousdDsy8dH3LHS52SqZAFfP8a967yynbMxr
-  handlers.py: QmWRgGGnNyGSyYwdUB3u1k4zdygs196iYQ2sNjWHYt1qww
+  dialogues.py: QmQNBqcRDZwYSK3hucbNZf4CiTxEei5c4MV5wXvu1tZx1C
+  handlers.py: QmdTuiao42XEvbp2wuqKP4U4noRqAVdec9rss51pswYCoe
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/ml_data_provider/skill.yaml b/packages/fetchai/skills/ml_data_provider/skill.yaml
index 61e6dee039..6747072baf 100644
--- a/packages/fetchai/skills/ml_data_provider/skill.yaml
+++ b/packages/fetchai/skills/ml_data_provider/skill.yaml
@@ -10,8 +10,8 @@ fingerprint:
   README.md: QmakpsKWJrGRsoFaKR1Gf94KqcuPrkdXTYyciq5d4EhoFF
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
   behaviours.py: QmWC4PEwWEyqcEJ9rTFjL9YpZ1pgkSpY9f4pE9mQHviSLz
-  dialogues.py: QmRsg5xMC3QqHK2p2ULDkdcUECiX3YLPwbqfXdWZ3PewhD
-  handlers.py: QmePX9rXfypdNaqWfNZb2sXrSTuxwRGR2o3nXSw9yQSo1d
+  dialogues.py: QmdFsEXJdTiQo7GSS1U7n9ukd79ZEDVki3ifeYeGsowv2G
+  handlers.py: QmbmS4C1GdumnVkA5dc7czWRkjb9HGzY7YeATrnuMVU2X9
   strategy.py: QmUsa36TcE6DXjdDDz1u1tAPVPHaJyMnVCTxudJhVCyA3e
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index a1d228f6d9..9a1766f226 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -10,8 +10,8 @@ fingerprint:
   README.md: QmeHcYRhDJi6gqAHpK29UJz3doiyaicoqeTrPddqM3gh64
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
   behaviours.py: QmbJtAxgudXA35gERW14gMnCA9q79iRNQmKfgTTY9e2Bif
-  dialogues.py: Qma7uAuHWEdohLKMxGXHk34tRqXaS3FjFpyWCxpWtwRwEK
-  handlers.py: QmRUQUVmcV3W8aCL3LEP3ZPx2aENMNbZe5EvS5vRBnK2RF
+  dialogues.py: QmT5owqhNghzRDXrm5FjDX4juGnSUxdCZX76jRCrPGevt7
+  handlers.py: QmbXT1EAHEX7hct6auLdBJXX9k9ujdoQgkXZCZqzTfdto1
   ml_model.py: QmXp667GwVRrGsLxtqricnnyrBUUDn6efem22UCBd2g1y8
   model.json: QmdV2tGrRY6VQ5VLgUa4yqAhPDG6X8tYsWecypq8nox9Td
   strategy.py: QmY8z1DW6PqQuiEpgXAhwasSk1CgvvTNZQH1LtExupif9g
diff --git a/packages/fetchai/skills/simple_service_registration/skill.yaml b/packages/fetchai/skills/simple_service_registration/skill.yaml
index 6c2dad4ef6..04c176e168 100644
--- a/packages/fetchai/skills/simple_service_registration/skill.yaml
+++ b/packages/fetchai/skills/simple_service_registration/skill.yaml
@@ -8,9 +8,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPuD9EtLKV143FbAaGUht5ZVtemVWXnm1jYmQxyUNnZ9T
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmREzo2bxMA9h84utHze1BFptT2MgiSMkfiSydbynthRna
-  dialogues.py: QmRMZk46s3AJ9KUbgP4fMP39qGX1YPsvJAJqmaFanMtZiV
-  handlers.py: QmVGi8jXkCCJmxkpiwoAiWK1WNTYM4zYcJL4Vid6w7ekX3
+  behaviours.py: Qmcz55RRytuCEZTkAU5PxX4jjaPxkp3f747ivJcceH78b4
+  dialogues.py: QmRJP7qGj2X74KoKrSMQiPkCRP6dGKtunw4e7qVwh1Sa3E
+  handlers.py: QmcFWEWmjDFxiksQiwWSUJ3mzJhVRXt9EmrD6PTHCmUX5G
   strategy.py: QmNTZ6XXAv6nvJs7B1p5mt7bVdH4pb3motxADDrxCpbmWF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index e29fa64d42..e1b7dbd0fc 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdWECpRXZXH5JPV6wVHqeUtvjBhieUFTEoT2e7EY16N8M
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
-  behaviours.py: QmVUdw95id6YWhAxQU79iGdmt3P3C4PthPsDZL6x3M7kV6
-  dialogues.py: QmVSNY2MaKJ1JKfbt39qJ2CJz1dMhPNFefS6Nn2Ld2WqNA
-  game.py: QmWrQC1i2dPsDEzS1bjd6KiDCFSRCAgdiMrrrLgfsKMU49
-  handlers.py: QmX2N2Nr8DsCQuXxuGhxh89tUAzChTjx8yWtUof8UMQmQM
+  behaviours.py: QmTVCXtTpH1A55vWnynz1PjM4VCrQ6EDy5XfcJpT93doEq
+  dialogues.py: QmV38FUrGYZeBcnC5cexQrNA5bdsJ44dC5hWTRSZiUxQmK
+  game.py: QmeAmG3LH1xBFRvUATrWY7spSDmjNeXVD4ZNYrt1BRY3jB
+  handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
   helpers.py: QmdG31YUJakBz8FdNNxU6RxqhWy9iv1BG253PzfxBhzqq2
   parameters.py: QmQB95beEKzyA8Aa7Y9HTPw6BPEVi6BGkpsUqN4QZ4DcVG
 fingerprint_ignore_patterns: []
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 956895937c..42af59473b 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmV6mToyVnQL9squVJntDPrHvtxFk7sfEYJ61Fyoiy9wsE
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmUmKgFhFmrGtCCJNjZggZiu9JotKNqmUfpShAYM2oKsSj
-  game.py: QmRYzPv29VZbxDKTBqi8Y3Z1iLjwdNhgG6rGuYNYLTw4Z5
-  handlers.py: QmR2kWAiBB99TrJxpue4JpC8J8aewadg5FSMa6V2YS28Ws
-  helpers.py: QmREf3hRufKHwQq6Hr4YFdBWp53Vy8WWo89R4pKRyjX4Bs
+  behaviours.py: QmcLSggJr1XpiDEwefCGGpfwUp282J4i97ziCNFH7X1M9C
+  game.py: Qmdz91tAYzEFDsvN4hNBawK7D7beTfocps1hpQc3RgavUK
+  handlers.py: QmWyibFRxcunBLqb7FJEkx9RpS6fNZpAvNDkG6cCfK7mQd
+  helpers.py: QmQ36tdx5itzz189tUgmyR74Q63vSRUcPTsg9qEwBUYdNU
   parameters.py: QmRU9gxsWcxy25g69jbrKve2f8kFxNBjFfRjPZNKsYoYCP
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index 60d3ecf09d..c7eae7a763 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -9,12 +9,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZucue4N3TX7BPe9CDZybfMQc1zpYbRKEVXAUGYRpcUfD
   __init__.py: QmcgZLvHebdfocqBmbu6gJp35khs6nbdbC649jzUyS86wy
-  behaviours.py: QmPnCqPr6c3vqCt2x5rZ9tHZ9hD8mGA4F2fNDTXo1fxfmR
-  dialogues.py: QmUZgPaShiApdbrf98x45k6JwYtsLdzJJw8JuMqCqrsHov
-  handlers.py: QmNbMa9A6D7G95cRwc2zsP1uVymmwpt1QXqz5ccfwcTQcZ
+  behaviours.py: QmUm9C86crCZpXkHGCaPKeMfuMnP8BjMzSsjrUGkysmg9T
+  dialogues.py: QmdzrSoUvvjRzKvAZ53ErHCgwj1r4oQnf8D6tbRnctKTMW
+  handlers.py: QmeSaLfQV3rzHuHPhzsBps9z4AbX1MNevTs2YTjnZaWuEA
   helpers.py: QmfRnfpeCtHMEXSH3q3ofWhoSc7pbpRrSFSBVStUK3JWt3
-  strategy.py: QmPG7sCfCk6ozaBSmPPYeexe9Y1zq5fsg383Z5k8RbBDqg
-  transactions.py: QmdpNcQTG45V8JtrpHgYPMdWanwnF22vBkmAELJdT1AYgt
+  strategy.py: QmUd3cH7TDnc9f3cmDxhSuwQU33Hdn5eb2J4AuKHVE9Uxm
+  transactions.py: Qmc9Re92RLFkfds1NspTRym1wn7XPGSNDRFGtaG6Hrix4E
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_participation/skill.yaml b/packages/fetchai/skills/tac_participation/skill.yaml
index 53e9be94f9..a28101841d 100644
--- a/packages/fetchai/skills/tac_participation/skill.yaml
+++ b/packages/fetchai/skills/tac_participation/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVNxdGy1pbosYrrvbXczbkJtU7f5ddrBPSNnFoJA9GJzg
   __init__.py: QmcVpVrbV54Aogmowu6AomDiVMrVMo9BUvwKt9V1bJpBwp
-  behaviours.py: QmW3uvkUtkknF7gMFoqbXZWpVcoS274tk7jXouzLTCtdmU
-  dialogues.py: QmNZvomWQBx8p8Ftkgg55Pw44P8RedKTKtFULh9Qb8AJLY
-  game.py: QmUotRmam5EqL2YWAwPR9i1uWHNeBsphcDJwB59ZiLFKSw
-  handlers.py: QmcmPDJrmyiMFSf9neCDczvn6RuJN4XfhtxdABR9GjnTWm
+  behaviours.py: QmX3UbuLohnPSLM2W6LrWcZyo4zXCr1YN5Bznu61v27SZC
+  dialogues.py: QmNz8EeBvoR4QCMcVxVqVuLaPvU4nEhRgvxQnXCq1x7jS1
+  game.py: QmVGeCGEfwmzktSPQN4xWL5yxjHqNyenneQzeW2vfx4giv
+  handlers.py: QmSseAwQqHsSmj2eBPPnC9eygNSSwL1kheRVsgbLqyeDvV
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index dc13684148..bc02fd394e 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -18,54 +18,54 @@ fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
 fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
 fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
 fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
-fetchai/connections/gym,QmYpTqreykMfC8iTuoFK3EbjkfgLKBk39aYcvWamGQTrCQ
-fetchai/connections/http_client,QmTyfu8TTAQBcecg2CeJZRm9wFqhsi9VtRuFYpU5hEwEoX
-fetchai/connections/http_server,QmduD27PwFbYEo5BZ6fTERfPyNVrG7i8XN7QGcwCTHbXjN
-fetchai/connections/ledger,QmRUJPXzU2rqykAkNWt4BudP87ryzGdzqt5jJj4q3Gb7HM
-fetchai/connections/local,Qmadp2J7U59MvJaPZeytGhqhtLqL4AZghNZLki2YTdLUA1
-fetchai/connections/oef,QmPCrbZ2tdbzLQNkPDJnArwgPqtH6caGdqdfyFSjdcL6R7
+fetchai/connections/gym,QmeVoxp49pwDh57ZirtpjZrC7YmdV7YYn5GHJVq7ekovEV
+fetchai/connections/http_client,QmeSZGTkJfG95iBjdhmevfEU1qAdX2gnrawHpwQrbG8DfS
+fetchai/connections/http_server,QmU8RjATmQ8X95p2aCahZGfUEs5eQjYam2vAepX1tAM64i
+fetchai/connections/ledger,QmXZjQkskqt5UbAw9bJbj6Lo9h4TRvengRqAchDRuJwGJd
+fetchai/connections/local,QmWZPDvqjZjzNDUX4ivHF3kGvkNCUYM449RqNEyyoexFix
+fetchai/connections/oef,QmaJZCCrYCjA8eY3zav9QjxWNcVJ6yQw2n6ZJ53fQT22xb
 fetchai/connections/p2p_libp2p,QmVXSnhCn37mgacK7iG1HENbEkSvSZMMaf9RTFCUUDa2C9
 fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4bW222
 fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmPawrdmAJLQU4jqyEx592HsJaSAHqgEDhmbmmuVz9LnVn
+fetchai/connections/soef,QmQ82mNiuBc9jEUFU8TeaAk5ktqnXX512h4X67yYUxRrX5
 fetchai/connections/stub,QmaxLLkfgUZL4s1r2yP5mbZqV4g1dmLLoA4uEApgPyR3aE
-fetchai/connections/tcp,QmeFxgyyEnHUkAxuSHSYvFQLxKgWdV7xob6QvZnCHo9AdX
-fetchai/connections/webhook,Qmb3EN5NhFavVZT6rvDzhxdANx6dSo2K95MsJ8owpYDDSD
+fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
+fetchai/connections/webhook,QmTjyENiT8KZDKUD1B6dDC1gAEYDU8UMNkXa8tSbZYKPsk
 fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,QmbHbjNcYaZ4LDpP5L1qNUu82aKCdGa8MNX9e2wanMsGc5
+fetchai/protocols/contract_api,QmWWMHyzRT7rvdiBsPJ4xrE1nF5TZFfkW6J44D7Dc6g4mT
 fetchai/protocols/default,QmZ4y4M1zZ3j2BAvLKHf1Grf5twcsmSamdgc2zmkBdv254
-fetchai/protocols/fipa,QmYJhzwFtZp5FRZx3jkeiLT2NZTUhNa6dHM9CJ1JXBiEsY
-fetchai/protocols/gym,Qmc5UvXeWtGz4aVytmgaB1WGNMsVkutgNGqn57PmXXCRLs
-fetchai/protocols/http,QmXEczv6AR7bHoM8CQ55xd31iopWc6wFoR1Kc59xMzb9wP
-fetchai/protocols/ledger_api,Qmbr8jpkgjvRXefeCyTFvnb6WZAvQPDsmzoZk6t3AXcyRR
-fetchai/protocols/ml_trade,QmSXQbbGihThLyp8djf2PccrzbCBWVymW4uBvCi4pDxB2P
-fetchai/protocols/oef_search,QmSrtCZ7JUvxKXzUq3svJiQBLSaQVyhH9MJRnbZm9TWNhD
+fetchai/protocols/fipa,QmerHPCMw8rGSrtM7mxuD93CgdCZ5YTreeNC8BNU8UskbK
+fetchai/protocols/gym,QmTEWeswAtuJrG4Uo8GWnpvgsGRTHxfDoQAohp42hFdkW9
+fetchai/protocols/http,QmYF8drqdddj8tRt9H9QQ1oMKSfrr6kGQvtpsseWBe8FjA
+fetchai/protocols/ledger_api,QmbF7U9YZbanjqJjAScHA5uiVp7HxfSnQxugwLptBKcVUc
+fetchai/protocols/ml_trade,Qmdx55dM9fFXeWrVzhHeUU9CoTt9t7YJACBwfg5EwBa2Rz
+fetchai/protocols/oef_search,Qmee5Bi3xQ98qX2uFkhUjhXTZi7uMFWnicK2yp7LBcuTYF
 fetchai/protocols/scaffold,QmXJb2kxe228AqQ2iHRiKJnhhKsC9zU8pqNdojLNXqjUvz
 fetchai/protocols/signing,QmYTfrqGX7exRtafwm9wHGzHZB1FziuZdYMVT1ad3fnKYR
 fetchai/protocols/state_update,QmejF6NFSBgfa1KTNkBCw4oZGrTnXHvwYXxayHKGLV4PtW
-fetchai/protocols/tac,QmcyYPtULaU15VMyfRqwDHCn7g4czUoe9ipcUSBAVqLTFc
-fetchai/skills/aries_alice,Qmf2PV9D6WZjjuQ1eqL7S1DKVYc9Ea6wJDNEAD3zxEUpLU
-fetchai/skills/aries_faber,QmXBksccX6fBcemjr6gL4KBAfExeoBNKyVK4tJscPk1dsp
+fetchai/protocols/tac,QmchXXv217Dyft4PN6s1iE1Y5EKYUiYeSv9qLPZVrMwaLr
+fetchai/skills/aries_alice,QmVqS1TMK5Mp3zV59gGN3Ef9xJBcxqKpN6PhrDV9UzEQd6
+fetchai/skills/aries_faber,QmeipFxDi2tPz3taPDPZJvstxjAPUdUcCwckFmjjFhBps5
 fetchai/skills/carpark_client,QmPYHXP1TvNihMa6WFSLP1NhiFDKTiArZbStQ6v54ySa8j
-fetchai/skills/carpark_detection,QmetEJmLHLWCPRyYByvrJ48fjM42sg91fqBfzZukmUth6b
-fetchai/skills/echo,QmPjabbvqPfabWhyE3vYCtTpPLJgYd4ZQBBsKsSJ5bLbeb
-fetchai/skills/erc1155_client,QmeH3ZaMQt4iMz7B8p9mwtbetyt9Gy42rrkXLuk6LpQz69
-fetchai/skills/erc1155_deploy,QmT6UivEs5DbqfkbeRZYr1mF3WYiyUrp2hucLMMXWBwj3r
+fetchai/skills/carpark_detection,QmUDRJUJm9UTCyM9o3AwphD6q1L7mNLXPqSizJJvivtRe4
+fetchai/skills/echo,QmcHx9UjP429vnTxMpM3wSphkY2umanW1CZJyn7B1FkpWV
+fetchai/skills/erc1155_client,Qma5wTx1huj5DAcsBkRwCvZVczRREwyUawVJhyaC4UTrRE
+fetchai/skills/erc1155_deploy,QmYyeafnykiRwNHyk8hhLhyG3EaHijSMAoFXkrfeXv4DcE
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
-fetchai/skills/generic_buyer,QmUKHWVoBDWJVymwj5PHqkEXjRGkJBoPrV2capmftA717a
-fetchai/skills/generic_seller,QmTJabpuQKLfC9t8mGjswKgpU8wGazNsvZegwLtTiRVF8g
-fetchai/skills/gym,QmfKQFkyfm89t4MQ1FUgQe2MFLZw1PUapMrTGBiSqn6frn
-fetchai/skills/http_echo,QmXb9b5YTwxHavSjoGzCC4DaSSoZMsbYgFiuy2fqFQno5J
-fetchai/skills/ml_data_provider,QmXkX14MRTdticWjwF469RfXA9sQ82ddY7pzQMCbRikuz1
-fetchai/skills/ml_train,QmdmnV66naRKrYgLAJDMbCHWTocVLeX8JtYLfJwzMVxBhG
+fetchai/skills/generic_buyer,QmT6F5P2ZajWNHi4XiHXPa3iEuvVCrNcCNTzEi8XSkkHTT
+fetchai/skills/generic_seller,QmXzF3FiqNbFMYu2nMNbonzqZAY5Lf7NN6S9whd7c8Ek18
+fetchai/skills/gym,QmPeiufnXTJ424Tcep8JcjJYErHJmFKh4XY8ituJWL6SAg
+fetchai/skills/http_echo,QmaBNGNtDDcfCTQY6hsANAeZz7F4ZXEEPgTMd3ip75Zh1D
+fetchai/skills/ml_data_provider,QmXZpzAetLKPfoPSMAafjha2qjF38dWsLpZQg2jCQ3QgAV
+fetchai/skills/ml_train,QmU4HiyQUagkEwbU9rutL3g9xmQbo8WHUAULMBUcrEULks
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
-fetchai/skills/simple_service_registration,QmSpM3b3GL5Wh9Cu4KYE3Tiyb5XfyUTcYSctUMNSjAjGdk
-fetchai/skills/tac_control,QmcPKqAatmFxtQHhSjpdLXL5XcUav4XzT17McZQwwoDcCW
-fetchai/skills/tac_control_contract,QmSBWfymLZ4LT4T3cwq4cVRbqnkxSFuviykiw5hYaYBMH4
-fetchai/skills/tac_negotiation,QmVfat3p7G8CPXuPm7wy3i81AtxqeTQzDDbPGMZ439zsLm
-fetchai/skills/tac_participation,QmYhmrYZvywb5L15VZDZ91Y2bCF2eD2Lasg79nNBRr3rHs
+fetchai/skills/simple_service_registration,Qmdqf1kGGfEb65UZcDmhEzW6GcTQyKdW5zjKhQjmLo3J11
+fetchai/skills/tac_control,QmXxSSNbHztL5UYSep2bLbsC7jUzyzeFQwDtf7VXnGMY1j
+fetchai/skills/tac_control_contract,QmNz5pNPvS7LBUMdjVPrRAFgJbaD2xTL1HJQnCoYK3Va4J
+fetchai/skills/tac_negotiation,QmT78rzq6dDBSguehay3R19LwcfXZDpuxYEsvgvY8mf1V7
+fetchai/skills/tac_participation,QmckgUZ2YoLi5j7btqWLRZLxPx9RkeUdYdp9cfu95sZMXy
 fetchai/skills/thermometer,QmUEuRdsTw3iTzLRA4C6SiRGwEK6gauLP1Apk13fCQYtKw
 fetchai/skills/thermometer_client,QmdESHLrhNasaUKYpG2m5p6f61dxmqjVKGPiNdEUs5ZHnu
 fetchai/skills/weather_client,QmTa3Pxv8tD478xGA6DkNjQn8vxKwGfqLhLMbAC73fK6qo

From ad0cb8ffce88724bbbe0a0700cf3fe2c506710a7 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 10:28:38 +0200
Subject: [PATCH 023/131] set isort to be case-sensitive

---
 aea/aea_builder.py                                 |  2 +-
 aea/cli/create.py                                  |  2 +-
 aea/cli/interact.py                                |  2 +-
 aea/cli/publish.py                                 |  2 +-
 aea/cli/utils/package_utils.py                     |  2 +-
 aea/connections/base.py                            |  2 +-
 aea/connections/stub/connection.py                 |  2 +-
 aea/connections/stub/connection.yaml               |  2 +-
 aea/crypto/helpers.py                              |  2 +-
 aea/crypto/ledger_apis.py                          |  2 +-
 aea/test_tools/test_cases.py                       |  2 +-
 .../fetchai/connections/http_server/connection.py  |  2 +-
 .../connections/http_server/connection.yaml        |  2 +-
 packages/fetchai/connections/webhook/connection.py |  2 +-
 .../fetchai/connections/webhook/connection.yaml    |  2 +-
 packages/fetchai/skills/aries_alice/behaviours.py  |  2 +-
 packages/fetchai/skills/aries_alice/skill.yaml     |  2 +-
 packages/fetchai/skills/aries_faber/behaviours.py  |  2 +-
 packages/fetchai/skills/aries_faber/handlers.py    |  2 +-
 packages/fetchai/skills/aries_faber/skill.yaml     |  4 ++--
 packages/fetchai/skills/gym/skill.yaml             |  2 +-
 packages/fetchai/skills/gym/tasks.py               |  2 +-
 packages/hashes.csv                                | 12 ++++++------
 setup.cfg                                          |  3 ++-
 tests/conftest.py                                  | 14 +++++---------
 tests/test_aea_builder.py                          |  2 +-
 tests/test_cli/test_add/test_connection.py         |  2 +-
 tests/test_cli/test_add/test_contract.py           |  2 +-
 tests/test_cli/test_add/test_protocol.py           |  2 +-
 tests/test_cli/test_add/test_skill.py              |  4 ++--
 tests/test_cli/test_add_key.py                     |  4 ++--
 tests/test_cli/test_create.py                      |  2 +-
 tests/test_cli/test_fetch.py                       |  2 +-
 tests/test_cli/test_freeze.py                      |  2 +-
 tests/test_cli/test_generate/test_protocols.py     |  2 +-
 tests/test_cli/test_generate_key.py                |  2 +-
 tests/test_cli/test_generate_wealth.py             |  2 +-
 tests/test_cli/test_get_address.py                 |  2 +-
 tests/test_cli/test_get_wealth.py                  |  2 +-
 tests/test_cli/test_launch.py                      |  2 +-
 tests/test_cli/test_remove/test_skill.py           |  4 ++--
 tests/test_cli/test_run.py                         |  2 +-
 tests/test_cli/test_scaffold/test_protocols.py     |  2 +-
 tests/test_cli/test_scaffold/test_skills.py        |  2 +-
 tests/test_cli/test_search.py                      |  2 +-
 tests/test_configurations/test_base.py             |  4 ++--
 tests/test_mail/test_base.py                       |  2 +-
 .../test_p2p_libp2p/test_errors.py                 |  2 +-
 tests/test_protocols/test_dialogue/test_base.py    |  4 ++--
 49 files changed, 65 insertions(+), 68 deletions(-)

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index f82307effc..c302b710ba 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -49,13 +49,13 @@
 from aea.components.base import Component, load_aea_package
 from aea.components.loader import load_component_from_config
 from aea.configurations.base import (
-    DEFAULT_AEA_CONFIG_FILE,
     AgentConfig,
     ComponentConfiguration,
     ComponentId,
     ComponentType,
     ConnectionConfig,
     ContractConfig,
+    DEFAULT_AEA_CONFIG_FILE,
     Dependencies,
     PackageType,
     ProtocolConfig,
diff --git a/aea/cli/create.py b/aea/cli/create.py
index d11061c2f3..691ed37cdc 100644
--- a/aea/cli/create.py
+++ b/aea/cli/create.py
@@ -34,9 +34,9 @@
 from aea.cli.utils.decorators import clean_after
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
+    AgentConfig,
     DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_VERSION,
-    AgentConfig,
 )
 from aea.configurations.constants import (
     DEFAULT_CONNECTION,
diff --git a/aea/cli/interact.py b/aea/cli/interact.py
index 62cb63b715..19d1976f4d 100644
--- a/aea/cli/interact.py
+++ b/aea/cli/interact.py
@@ -29,8 +29,8 @@
 from aea.cli.utils.exceptions import InterruptInputException
 from aea.common import Address
 from aea.configurations.base import (
-    DEFAULT_AEA_CONFIG_FILE,
     ConnectionConfig,
+    DEFAULT_AEA_CONFIG_FILE,
     PackageType,
 )
 from aea.configurations.loader import ConfigLoader
diff --git a/aea/cli/publish.py b/aea/cli/publish.py
index a6baa68c17..6653fc3161 100644
--- a/aea/cli/publish.py
+++ b/aea/cli/publish.py
@@ -35,7 +35,7 @@
     try_get_item_source_path,
     try_get_item_target_path,
 )
-from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, CRUDCollection, PublicId
+from aea.configurations.base import CRUDCollection, DEFAULT_AEA_CONFIG_FILE, PublicId
 from aea.configurations.constants import (
     DEFAULT_CONNECTION,
     DEFAULT_PROTOCOL,
diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py
index f6556c34bf..f36dc4c469 100644
--- a/aea/cli/utils/package_utils.py
+++ b/aea/cli/utils/package_utils.py
@@ -33,8 +33,8 @@
 from aea.cli.utils.context import Context
 from aea.cli.utils.loggers import logger
 from aea.configurations.base import (
-    DEFAULT_AEA_CONFIG_FILE,
     AgentConfig,
+    DEFAULT_AEA_CONFIG_FILE,
     PackageType,
     PublicId,
     _compute_fingerprint,
diff --git a/aea/connections/base.py b/aea/connections/base.py
index 767e2267fd..9542b78b6b 100644
--- a/aea/connections/base.py
+++ b/aea/connections/base.py
@@ -26,7 +26,7 @@
 from contextlib import contextmanager
 from enum import Enum
 from pathlib import Path
-from typing import TYPE_CHECKING, Generator, Optional, Set, cast
+from typing import Generator, Optional, Set, TYPE_CHECKING, cast
 
 from aea.components.base import Component, load_aea_package
 from aea.configurations.base import ComponentType, ConnectionConfig, PublicId
diff --git a/aea/connections/stub/connection.py b/aea/connections/stub/connection.py
index 7c1310f01c..155aee920b 100644
--- a/aea/connections/stub/connection.py
+++ b/aea/connections/stub/connection.py
@@ -27,7 +27,7 @@
 from concurrent.futures.thread import ThreadPoolExecutor
 from contextlib import contextmanager
 from pathlib import Path
-from typing import IO, AsyncIterable, List, Optional, Union
+from typing import AsyncIterable, IO, List, Optional, Union
 
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
diff --git a/aea/connections/stub/connection.yaml b/aea/connections/stub/connection.yaml
index 05026c3e63..cdd0ca8581 100644
--- a/aea/connections/stub/connection.yaml
+++ b/aea/connections/stub/connection.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmWwepN9Fy9gHAp39vUGFSLdnB9JZjdyE3STnbowSUhJkC
-  connection.py: QmUQVdzJ1YWiERHmjoy8YuzLUmtcw39weShXtZESfvoAdj
+  connection.py: QmYAWVhNoWhJNaCkEh5cMScJ53a1gkfcBNGt9LLxftyUuR
   readme.md: QmXSAtxSY7C2YkvUxeVnpqCJY9uJYZxZBmuUcE4zjFXcXz
 fingerprint_ignore_patterns: []
 protocols: []
diff --git a/aea/crypto/helpers.py b/aea/crypto/helpers.py
index 8d3cb7d905..53d64a31a9 100644
--- a/aea/crypto/helpers.py
+++ b/aea/crypto/helpers.py
@@ -23,7 +23,7 @@
 import sys
 from pathlib import Path
 
-from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig, PackageType
+from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE, PackageType
 from aea.configurations.loader import ConfigLoaders
 from aea.crypto.registries import crypto_registry, make_crypto, make_faucet_api
 
diff --git a/aea/crypto/ledger_apis.py b/aea/crypto/ledger_apis.py
index c005e3068f..bdf82496f4 100644
--- a/aea/crypto/ledger_apis.py
+++ b/aea/crypto/ledger_apis.py
@@ -24,8 +24,8 @@
 from aea.common import Address
 from aea.configurations.constants import DEFAULT_LEDGER
 from aea.crypto.base import LedgerApi
-from aea.crypto.cosmos import DEFAULT_ADDRESS as COSMOS_DEFAULT_ADDRESS
 from aea.crypto.cosmos import CosmosApi
+from aea.crypto.cosmos import DEFAULT_ADDRESS as COSMOS_DEFAULT_ADDRESS
 from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
 from aea.crypto.ethereum import DEFAULT_CHAIN_ID, EthereumApi
 from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index 26ce7365c7..fdf105a486 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -39,7 +39,7 @@
 import yaml
 
 from aea.cli import cli
-from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig, PackageType
+from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE, PackageType
 from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PRIVATE_KEY_FILE
 from aea.configurations.loader import ConfigLoader
 from aea.connections.stub.connection import (
diff --git a/packages/fetchai/connections/http_server/connection.py b/packages/fetchai/connections/http_server/connection.py
index 95ff9d12b1..c5629419dc 100644
--- a/packages/fetchai/connections/http_server/connection.py
+++ b/packages/fetchai/connections/http_server/connection.py
@@ -49,7 +49,7 @@
 from aea.common import Address
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
-from aea.mail.base import URI, Envelope, EnvelopeContext, Message
+from aea.mail.base import Envelope, EnvelopeContext, Message, URI
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel
 
diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml
index f6ba1d652a..7878887307 100644
--- a/packages/fetchai/connections/http_server/connection.yaml
+++ b/packages/fetchai/connections/http_server/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTmQcnUPKaDHHJHngBFXnUVPdgBLanP9DbjVHZT55Scfn
   __init__.py: Qmb6JEAkJeb5JweqrSGiGoQp1vGXqddjGgb9WMkm2phTgA
-  connection.py: QmTbxD1VE4nA8uonSWa1b4hZwji8UEJ8aCXb71LVxeFFYY
+  connection.py: QmUdFW1587JpJEfwzb9LS55imtdNkXnZZKZfQNWtrLbDAa
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/webhook/connection.py b/packages/fetchai/connections/webhook/connection.py
index ec356aac75..b4e28cfa38 100644
--- a/packages/fetchai/connections/webhook/connection.py
+++ b/packages/fetchai/connections/webhook/connection.py
@@ -29,7 +29,7 @@
 from aea.common import Address
 from aea.configurations.base import PublicId
 from aea.connections.base import Connection, ConnectionStates
-from aea.mail.base import URI, Envelope, EnvelopeContext
+from aea.mail.base import Envelope, EnvelopeContext, URI
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 
diff --git a/packages/fetchai/connections/webhook/connection.yaml b/packages/fetchai/connections/webhook/connection.yaml
index e234b9719c..edbd4803ec 100644
--- a/packages/fetchai/connections/webhook/connection.yaml
+++ b/packages/fetchai/connections/webhook/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmQDqfKKsksKsUqdqTcYe8P8Fw3MGovVuZBFHPbhupkkxf
   __init__.py: QmWUKSmXaBgGMvKgdmzKmMjCx43BnrfW6og2n3afNoAALq
-  connection.py: Qme93KgLYqvUkqspcrLb2wyBqN4v2wbvcNMXFnuVMRKJBx
+  connection.py: QmVzx4qbqru7oLCsUnSqWCMt9e69yUr9BquhaLXdTKz16U
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/skills/aries_alice/behaviours.py b/packages/fetchai/skills/aries_alice/behaviours.py
index 192879fc28..847c40c3b8 100644
--- a/packages/fetchai/skills/aries_alice/behaviours.py
+++ b/packages/fetchai/skills/aries_alice/behaviours.py
@@ -35,8 +35,8 @@
     OefSearchDialogues,
 )
 from packages.fetchai.skills.aries_alice.strategy import (
-    HTTP_COUNTERPARTY,
     AliceStrategy,
+    HTTP_COUNTERPARTY,
 )
 
 DEFAULT_SERVICES_INTERVAL = 60.0
diff --git a/packages/fetchai/skills/aries_alice/skill.yaml b/packages/fetchai/skills/aries_alice/skill.yaml
index 38cb454605..7bdeae07c0 100644
--- a/packages/fetchai/skills/aries_alice/skill.yaml
+++ b/packages/fetchai/skills/aries_alice/skill.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfS1ezD77No8WQkvrkPs4oSXHFbULRxatGzRhMbSMntSx
   __init__.py: Qma8qSTU34ADKWskBwQKQLGNpe3xDKNgjNQ6Q4MxUnKa3Q
-  behaviours.py: QmVCaSA8nEDYfB99EhBVr9pWyRcuAgAgWjburFaHLTXdbK
+  behaviours.py: QmZafoGe1KJ6ZfQhAkgVQFUAbDfackh8YHRjxVdCLm2TQE
   dialogues.py: QmRbbuYSXuNzMVK3gkHVFhwqH8k6oPo4ThGvVPrrn9N3Yq
   handlers.py: QmTtqM5oWBEAZcHdTuwuPtbiZZGWontMNEtmDxcccS2u2Y
   strategy.py: QmZ2jhWFQZipk6wAquS1gWxX94iAmhN9Vrh7tcPU9bgpzF
diff --git a/packages/fetchai/skills/aries_faber/behaviours.py b/packages/fetchai/skills/aries_faber/behaviours.py
index b3706e86e7..2e0080d319 100644
--- a/packages/fetchai/skills/aries_faber/behaviours.py
+++ b/packages/fetchai/skills/aries_faber/behaviours.py
@@ -31,8 +31,8 @@
     OefSearchDialogues,
 )
 from packages.fetchai.skills.aries_faber.strategy import (
-    HTTP_COUNTERPARTY,
     FaberStrategy,
+    HTTP_COUNTERPARTY,
 )
 
 DEFAULT_SEARCH_INTERVAL = 5.0
diff --git a/packages/fetchai/skills/aries_faber/handlers.py b/packages/fetchai/skills/aries_faber/handlers.py
index 77be923810..dd46d1205c 100644
--- a/packages/fetchai/skills/aries_faber/handlers.py
+++ b/packages/fetchai/skills/aries_faber/handlers.py
@@ -47,8 +47,8 @@
     ADMIN_COMMAND_SCEHMAS,
     ADMIN_COMMAND_STATUS,
     FABER_ACA_IDENTITY,
-    LEDGER_COMMAND_REGISTER_DID,
     FaberStrategy,
+    LEDGER_COMMAND_REGISTER_DID,
 )
 
 SUPPORT_REVOCATION = False
diff --git a/packages/fetchai/skills/aries_faber/skill.yaml b/packages/fetchai/skills/aries_faber/skill.yaml
index 3b4021817d..6e25d53973 100644
--- a/packages/fetchai/skills/aries_faber/skill.yaml
+++ b/packages/fetchai/skills/aries_faber/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdkSNCYx5dNGDAAveapQgoyM7Y7iYeQzR7KN2Sso3CJG4
   __init__.py: QmNPVQ6UajvJodqTLWbLvQZkKCfrNn1nYPrQXai3xdj6F7
-  behaviours.py: QmYvoagukgT4oRGxLThY8QcgZBAbZfogVBuuuytVpnMsMR
+  behaviours.py: QmfF39uLgQinDRfWHo4fzbgJBGm1xanL1BbvdDwAHT7HPQ
   dialogues.py: QmXveWmeU3eTDDhqDkBcVE2pJAtxJUAzcjbM8ZEjRvKUYW
-  handlers.py: QmcJ2c4enNm2K2ZdY5KKQtUri1MRYcDgQsPV4G8U8ndnmD
+  handlers.py: QmZMEEQ3tGdfE1N5oMem5AZkXqreJ6BuGu7HsYrNwH99C3
   strategy.py: QmcUmddp6CUP31Bfckt6EkV3n2VZcJrUagoGBaTDBMTdXR
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml
index d6108e6eae..5f983718bd 100644
--- a/packages/fetchai/skills/gym/skill.yaml
+++ b/packages/fetchai/skills/gym/skill.yaml
@@ -12,7 +12,7 @@ fingerprint:
   handlers.py: QmagqBdQaGuGbVS5dFqxFtEww2e1YF2NprBNPtt5pVA2hZ
   helpers.py: QmbRSMX7UCRAEotS4ocTEcZLo1qietAAU9K5zBtqY1nE82
   rl_agent.py: QmUq3XY9Dd2XZBhNNK9J3S5937d3az4cwP1BmeieHSgJ3m
-  tasks.py: QmW4WBzC2pkcnjnwJZKu63qXXWEbMVV3fwQMozGxjWnEdt
+  tasks.py: QmVf9K7zCkKYduTnS7nS3d8FvUbEVy7s7a26yaCC8Q3rgd
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/gym/tasks.py b/packages/fetchai/skills/gym/tasks.py
index d96e02029c..0972210c19 100644
--- a/packages/fetchai/skills/gym/tasks.py
+++ b/packages/fetchai/skills/gym/tasks.py
@@ -26,7 +26,7 @@
 from aea.skills.tasks import Task
 
 from packages.fetchai.skills.gym.helpers import ProxyEnv
-from packages.fetchai.skills.gym.rl_agent import DEFAULT_NB_STEPS, NB_GOODS, MyRLAgent
+from packages.fetchai.skills.gym.rl_agent import DEFAULT_NB_STEPS, MyRLAgent, NB_GOODS
 
 
 class GymTask(Task):
diff --git a/packages/hashes.csv b/packages/hashes.csv
index bc02fd394e..0341ac6d1c 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -20,7 +20,7 @@ fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
 fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
 fetchai/connections/gym,QmeVoxp49pwDh57ZirtpjZrC7YmdV7YYn5GHJVq7ekovEV
 fetchai/connections/http_client,QmeSZGTkJfG95iBjdhmevfEU1qAdX2gnrawHpwQrbG8DfS
-fetchai/connections/http_server,QmU8RjATmQ8X95p2aCahZGfUEs5eQjYam2vAepX1tAM64i
+fetchai/connections/http_server,Qmbjf44kA8X3axcBX5AohNd8rF1K2uweSCDc9x6AsE4S9y
 fetchai/connections/ledger,QmXZjQkskqt5UbAw9bJbj6Lo9h4TRvengRqAchDRuJwGJd
 fetchai/connections/local,QmWZPDvqjZjzNDUX4ivHF3kGvkNCUYM449RqNEyyoexFix
 fetchai/connections/oef,QmaJZCCrYCjA8eY3zav9QjxWNcVJ6yQw2n6ZJ53fQT22xb
@@ -29,9 +29,9 @@ fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4b
 fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
 fetchai/connections/soef,QmQ82mNiuBc9jEUFU8TeaAk5ktqnXX512h4X67yYUxRrX5
-fetchai/connections/stub,QmaxLLkfgUZL4s1r2yP5mbZqV4g1dmLLoA4uEApgPyR3aE
+fetchai/connections/stub,QmU1fuqRkzBufaHTB9qY7GSUkkh4Wq1M6ru6FQKnrcEoUZ
 fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
-fetchai/connections/webhook,QmTjyENiT8KZDKUD1B6dDC1gAEYDU8UMNkXa8tSbZYKPsk
+fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
 fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
 fetchai/protocols/contract_api,QmWWMHyzRT7rvdiBsPJ4xrE1nF5TZFfkW6J44D7Dc6g4mT
@@ -46,8 +46,8 @@ fetchai/protocols/scaffold,QmXJb2kxe228AqQ2iHRiKJnhhKsC9zU8pqNdojLNXqjUvz
 fetchai/protocols/signing,QmYTfrqGX7exRtafwm9wHGzHZB1FziuZdYMVT1ad3fnKYR
 fetchai/protocols/state_update,QmejF6NFSBgfa1KTNkBCw4oZGrTnXHvwYXxayHKGLV4PtW
 fetchai/protocols/tac,QmchXXv217Dyft4PN6s1iE1Y5EKYUiYeSv9qLPZVrMwaLr
-fetchai/skills/aries_alice,QmVqS1TMK5Mp3zV59gGN3Ef9xJBcxqKpN6PhrDV9UzEQd6
-fetchai/skills/aries_faber,QmeipFxDi2tPz3taPDPZJvstxjAPUdUcCwckFmjjFhBps5
+fetchai/skills/aries_alice,QmXp6W2vFmQgYCchQwLa3yDUwWw7hjeC8WnuPmtrXebZnq
+fetchai/skills/aries_faber,QmcuNdL6rJz6xy9bqarRzmoJCVXk4NJjMfqeNnaS6WhwSD
 fetchai/skills/carpark_client,QmPYHXP1TvNihMa6WFSLP1NhiFDKTiArZbStQ6v54ySa8j
 fetchai/skills/carpark_detection,QmUDRJUJm9UTCyM9o3AwphD6q1L7mNLXPqSizJJvivtRe4
 fetchai/skills/echo,QmcHx9UjP429vnTxMpM3wSphkY2umanW1CZJyn7B1FkpWV
@@ -56,7 +56,7 @@ fetchai/skills/erc1155_deploy,QmYyeafnykiRwNHyk8hhLhyG3EaHijSMAoFXkrfeXv4DcE
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
 fetchai/skills/generic_buyer,QmT6F5P2ZajWNHi4XiHXPa3iEuvVCrNcCNTzEi8XSkkHTT
 fetchai/skills/generic_seller,QmXzF3FiqNbFMYu2nMNbonzqZAY5Lf7NN6S9whd7c8Ek18
-fetchai/skills/gym,QmPeiufnXTJ424Tcep8JcjJYErHJmFKh4XY8ituJWL6SAg
+fetchai/skills/gym,QmTXKPy2QGtHe1Nko7jXzUnq8EqT6Uto8ZETmMGH2Zyu4Z
 fetchai/skills/http_echo,QmaBNGNtDDcfCTQY6hsANAeZz7F4ZXEEPgTMd3ip75Zh1D
 fetchai/skills/ml_data_provider,QmXZpzAetLKPfoPSMAafjha2qjF38dWsLpZQg2jCQ3QgAV
 fetchai/skills/ml_train,QmU4HiyQUagkEwbU9rutL3g9xmQbo8WHUAULMBUcrEULks
diff --git a/setup.cfg b/setup.cfg
index 5e175502fa..502c1c9ba7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,9 +33,10 @@ use_parentheses=True
 ensure_newline_before_comments = True
 line_length=88
 # custom configurations
-order_by_type=True
+order_by_type=False
 skip_glob = **/*_pb2.py
 known_local_folder=packages,tests
+case_sensitive=True
 
 [mypy]
 python_version = 3.7
diff --git a/tests/conftest.py b/tests/conftest.py
index f18aae15c2..4be0997617 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -44,28 +44,24 @@
 from aea.aea import AEA
 from aea.cli.utils.config import _init_cli_config
 from aea.common import Address
+from aea.configurations.base import ComponentType, ConnectionConfig, ContractConfig
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE as AGENT_YAML
 from aea.configurations.base import DEFAULT_CONNECTION_CONFIG_FILE as CONNECTION_YAML
 from aea.configurations.base import DEFAULT_CONTRACT_CONFIG_FILE as CONTRACT_YAML
 from aea.configurations.base import DEFAULT_PROTOCOL_CONFIG_FILE as PROTOCOL_YAML
 from aea.configurations.base import DEFAULT_SKILL_CONFIG_FILE as SKILL_YAML
-from aea.configurations.base import (
-    ComponentType,
-    ConnectionConfig,
-    ContractConfig,
-    PublicId,
-)
+from aea.configurations.base import PublicId
 from aea.configurations.constants import DEFAULT_CONNECTION, DEFAULT_LEDGER
 from aea.configurations.loader import load_component_configuration
 from aea.connections.base import Connection
 from aea.connections.stub.connection import StubConnection
 from aea.contracts.base import Contract, contract_registry
-from aea.crypto.cosmos import _COSMOS
 from aea.crypto.cosmos import DEFAULT_ADDRESS as COSMOS_DEFAULT_ADDRESS
-from aea.crypto.ethereum import _ETHEREUM
+from aea.crypto.cosmos import _COSMOS
 from aea.crypto.ethereum import DEFAULT_ADDRESS as ETHEREUM_DEFAULT_ADDRESS
-from aea.crypto.fetchai import _FETCHAI
+from aea.crypto.ethereum import _ETHEREUM
 from aea.crypto.fetchai import DEFAULT_ADDRESS as FETCHAI_DEFAULT_ADDRESS
+from aea.crypto.fetchai import _FETCHAI
 from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA
 from aea.crypto.registries import make_crypto
 from aea.crypto.wallet import CryptoStore
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index d99333f678..94516cc5c6 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -33,10 +33,10 @@
 from aea.aea_builder import AEABuilder, _DependenciesManager
 from aea.components.base import Component
 from aea.configurations.base import (
-    DEFAULT_AEA_CONFIG_FILE,
     ComponentId,
     ComponentType,
     ConnectionConfig,
+    DEFAULT_AEA_CONFIG_FILE,
     ProtocolConfig,
     PublicId,
     SkillConfig,
diff --git a/tests/test_cli/test_add/test_connection.py b/tests/test_cli/test_add/test_connection.py
index e83d766785..47cbef9433 100644
--- a/tests/test_cli/test_add/test_connection.py
+++ b/tests/test_cli/test_add/test_connection.py
@@ -38,8 +38,8 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CUR_PATH,
-    MAX_FLAKY_RERUNS,
     CliRunner,
+    MAX_FLAKY_RERUNS,
     double_escape_windows_path_separator,
 )
 
diff --git a/tests/test_cli/test_add/test_contract.py b/tests/test_cli/test_add/test_contract.py
index 829a25c3d6..030278f521 100644
--- a/tests/test_cli/test_add/test_contract.py
+++ b/tests/test_cli/test_add/test_contract.py
@@ -26,7 +26,7 @@
 from aea.cli import cli
 from aea.test_tools.test_cases import AEATestCaseEmpty
 
-from tests.conftest import CLI_LOG_OPTION, MAX_FLAKY_RERUNS, CliRunner
+from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
 
 
 @mock.patch("aea.cli.utils.decorators.try_to_load_agent_config")
diff --git a/tests/test_cli/test_add/test_protocol.py b/tests/test_cli/test_add/test_protocol.py
index 5f009b6285..705021ee1f 100644
--- a/tests/test_cli/test_add/test_protocol.py
+++ b/tests/test_cli/test_add/test_protocol.py
@@ -38,8 +38,8 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CUR_PATH,
-    MAX_FLAKY_RERUNS,
     CliRunner,
+    MAX_FLAKY_RERUNS,
     double_escape_windows_path_separator,
 )
 
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index 1dda532ee9..01d3a980ed 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -32,9 +32,9 @@
 import aea
 from aea.cli import cli
 from aea.configurations.base import (
+    AgentConfig,
     DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_SKILL_CONFIG_FILE,
-    AgentConfig,
     PublicId,
 )
 from aea.test_tools.test_cases import AEATestCaseEmpty
@@ -43,9 +43,9 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CUR_PATH,
+    CliRunner,
     MAX_FLAKY_RERUNS,
     ROOT_DIR,
-    CliRunner,
     double_escape_windows_path_separator,
 )
 
diff --git a/tests/test_cli/test_add_key.py b/tests/test_cli/test_add_key.py
index e064351450..f8c84aa07c 100644
--- a/tests/test_cli/test_add_key.py
+++ b/tests/test_cli/test_add_key.py
@@ -29,18 +29,18 @@
 import aea
 from aea.cli import cli
 from aea.cli.add_key import _try_add_key
-from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig
+from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE
 
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
     CUR_PATH,
+    CliRunner,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_FILE,
     FETCHAI,
     FETCHAI_PRIVATE_KEY_FILE,
     ROOT_DIR,
-    CliRunner,
 )
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_create.py b/tests/test_cli/test_create.py
index 33432b81e2..b9aba65181 100644
--- a/tests/test_cli/test_create.py
+++ b/tests/test_cli/test_create.py
@@ -49,8 +49,8 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CONFIGURATION_SCHEMA_DIR,
-    ROOT_DIR,
     CliRunner,
+    ROOT_DIR,
 )
 
 
diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index 618546666a..56aa93d944 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -28,7 +28,7 @@
 from aea.cli.fetch import _is_version_correct, fetch_agent_locally
 from aea.test_tools.test_cases import AEATestCaseMany
 
-from tests.conftest import CLI_LOG_OPTION, MAX_FLAKY_RERUNS, CliRunner
+from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
 
diff --git a/tests/test_cli/test_freeze.py b/tests/test_cli/test_freeze.py
index c939ad7e40..8e44bccabe 100644
--- a/tests/test_cli/test_freeze.py
+++ b/tests/test_cli/test_freeze.py
@@ -37,8 +37,8 @@
     CLI_LOG_OPTION,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
-    MAX_FLAKY_RERUNS,
     CliRunner,
+    MAX_FLAKY_RERUNS,
 )
 
 
diff --git a/tests/test_cli/test_generate/test_protocols.py b/tests/test_cli/test_generate/test_protocols.py
index 36d60b7271..9b594c6348 100644
--- a/tests/test_cli/test_generate/test_protocols.py
+++ b/tests/test_cli/test_generate/test_protocols.py
@@ -39,8 +39,8 @@
     CLI_LOG_OPTION,
     CONFIGURATION_SCHEMA_DIR,
     CUR_PATH,
-    PROTOCOL_CONFIGURATION_SCHEMA,
     CliRunner,
+    PROTOCOL_CONFIGURATION_SCHEMA,
 )
 
 
diff --git a/tests/test_cli/test_generate_key.py b/tests/test_cli/test_generate_key.py
index 67801b6f4a..f30dd52e19 100644
--- a/tests/test_cli/test_generate_key.py
+++ b/tests/test_cli/test_generate_key.py
@@ -29,11 +29,11 @@
 
 from tests.conftest import (
     CLI_LOG_OPTION,
+    CliRunner,
     ETHEREUM,
     ETHEREUM_PRIVATE_KEY_FILE,
     FETCHAI,
     FETCHAI_PRIVATE_KEY_FILE,
-    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_generate_wealth.py b/tests/test_cli/test_generate_wealth.py
index 01ac6d42c4..f061b96d13 100644
--- a/tests/test_cli/test_generate_wealth.py
+++ b/tests/test_cli/test_generate_wealth.py
@@ -29,9 +29,9 @@
 
 from tests.conftest import (
     CLI_LOG_OPTION,
+    CliRunner,
     FETCHAI,
     MAX_FLAKY_RERUNS_INTEGRATION,
-    CliRunner,
 )
 from tests.test_cli.tools_for_testing import ContextMock
 
diff --git a/tests/test_cli/test_get_address.py b/tests/test_cli/test_get_address.py
index 86e582f7a1..82c81b59e3 100644
--- a/tests/test_cli/test_get_address.py
+++ b/tests/test_cli/test_get_address.py
@@ -23,7 +23,7 @@
 from aea.cli import cli
 from aea.cli.get_address import _try_get_address
 
-from tests.conftest import CLI_LOG_OPTION, FETCHAI, CliRunner
+from tests.conftest import CLI_LOG_OPTION, CliRunner, FETCHAI
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_get_wealth.py b/tests/test_cli/test_get_wealth.py
index ff6f118a2d..1d7f45d3a6 100644
--- a/tests/test_cli/test_get_wealth.py
+++ b/tests/test_cli/test_get_wealth.py
@@ -23,7 +23,7 @@
 from aea.cli import cli
 from aea.cli.get_wealth import _try_get_wealth
 
-from tests.conftest import CLI_LOG_OPTION, FETCHAI, CliRunner
+from tests.conftest import CLI_LOG_OPTION, CliRunner, FETCHAI
 from tests.test_cli.tools_for_testing import ContextMock
 
 
diff --git a/tests/test_cli/test_launch.py b/tests/test_cli/test_launch.py
index cf9054a9af..664036df3e 100644
--- a/tests/test_cli/test_launch.py
+++ b/tests/test_cli/test_launch.py
@@ -36,7 +36,7 @@
 from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE
 
 from tests.common.pexpect_popen import PexpectWrapper
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, MAX_FLAKY_RERUNS, CliRunner
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner, MAX_FLAKY_RERUNS
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_cli/test_remove/test_skill.py b/tests/test_cli/test_remove/test_skill.py
index 659a94cc9c..372836292d 100644
--- a/tests/test_cli/test_remove/test_skill.py
+++ b/tests/test_cli/test_remove/test_skill.py
@@ -30,9 +30,9 @@
 import aea
 import aea.configurations.base
 from aea.cli import cli
-from aea.configurations.base import DEFAULT_AEA_CONFIG_FILE, AgentConfig
+from aea.configurations.base import AgentConfig, DEFAULT_AEA_CONFIG_FILE
 
-from tests.conftest import AUTHOR, CLI_LOG_OPTION, ROOT_DIR, CliRunner
+from tests.conftest import AUTHOR, CLI_LOG_OPTION, CliRunner, ROOT_DIR
 
 
 class TestRemoveSkillWithPublicId:
diff --git a/tests/test_cli/test_run.py b/tests/test_cli/test_run.py
index 6ad47c3502..b263fe0677 100644
--- a/tests/test_cli/test_run.py
+++ b/tests/test_cli/test_run.py
@@ -46,10 +46,10 @@
 from tests.conftest import (
     AUTHOR,
     CLI_LOG_OPTION,
+    CliRunner,
     FETCHAI_PRIVATE_KEY_FILE,
     MAX_FLAKY_RERUNS,
     ROOT_DIR,
-    CliRunner,
 )
 
 
diff --git a/tests/test_cli/test_scaffold/test_protocols.py b/tests/test_cli/test_scaffold/test_protocols.py
index 65df7b4b89..1fbbb707e0 100644
--- a/tests/test_cli/test_scaffold/test_protocols.py
+++ b/tests/test_cli/test_scaffold/test_protocols.py
@@ -40,8 +40,8 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CONFIGURATION_SCHEMA_DIR,
-    PROTOCOL_CONFIGURATION_SCHEMA,
     CliRunner,
+    PROTOCOL_CONFIGURATION_SCHEMA,
 )
 
 
diff --git a/tests/test_cli/test_scaffold/test_skills.py b/tests/test_cli/test_scaffold/test_skills.py
index 5c1b593e61..d4c1a50248 100644
--- a/tests/test_cli/test_scaffold/test_skills.py
+++ b/tests/test_cli/test_scaffold/test_skills.py
@@ -40,8 +40,8 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CONFIGURATION_SCHEMA_DIR,
-    SKILL_CONFIGURATION_SCHEMA,
     CliRunner,
+    SKILL_CONFIGURATION_SCHEMA,
 )
 
 
diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py
index 6989eb16d2..ebcad61cad 100644
--- a/tests/test_cli/test_search.py
+++ b/tests/test_cli/test_search.py
@@ -38,8 +38,8 @@
     AUTHOR,
     CLI_LOG_OPTION,
     CONFIGURATION_SCHEMA_DIR,
-    ROOT_DIR,
     CliRunner,
+    ROOT_DIR,
 )
 from tests.test_cli.constants import FORMAT_ITEMS_SAMPLE_OUTPUT
 
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index cc5095176a..3409f549ff 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -27,13 +27,13 @@
 import yaml
 
 from aea.configurations.base import (
-    DEFAULT_SKILL_CONFIG_FILE,
     AgentConfig,
+    CRUDCollection,
     ComponentId,
     ComponentType,
     ConnectionConfig,
     ContractConfig,
-    CRUDCollection,
+    DEFAULT_SKILL_CONFIG_FILE,
     PackageId,
     PackageType,
     ProtocolConfig,
diff --git a/tests/test_mail/test_base.py b/tests/test_mail/test_base.py
index 0c24589ca9..518d5b4eaa 100644
--- a/tests/test_mail/test_base.py
+++ b/tests/test_mail/test_base.py
@@ -25,7 +25,7 @@
 
 import aea
 from aea.configurations.base import PublicId
-from aea.mail.base import URI, Envelope, EnvelopeContext, ProtobufEnvelopeSerializer
+from aea.mail.base import Envelope, EnvelopeContext, ProtobufEnvelopeSerializer, URI
 from aea.multiplexer import InBox, Multiplexer, OutBox
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index 27deba8716..b53367abc8 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -32,8 +32,8 @@
 from aea.multiplexer import Multiplexer
 
 from packages.fetchai.connections.p2p_libp2p.connection import (
-    LIBP2P_NODE_MODULE_NAME,
     AwaitableProc,
+    LIBP2P_NODE_MODULE_NAME,
     P2PLibp2pConnection,
     _golang_module_build_async,
     _golang_module_run,
diff --git a/tests/test_protocols/test_dialogue/test_base.py b/tests/test_protocols/test_dialogue/test_base.py
index 19994e658b..272676ca91 100644
--- a/tests/test_protocols/test_dialogue/test_base.py
+++ b/tests/test_protocols/test_dialogue/test_base.py
@@ -28,9 +28,9 @@
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
-from aea.protocols.dialogue.base import DialogueLabel
+from aea.protocols.dialogue.base import DialogueLabel, DialogueStats
 from aea.protocols.dialogue.base import Dialogues as BaseDialogues
-from aea.protocols.dialogue.base import DialogueStats, InvalidDialogueMessage
+from aea.protocols.dialogue.base import InvalidDialogueMessage
 from aea.protocols.state_update.message import StateUpdateMessage
 
 

From c7843665a445f4928da22c1b1099ebe1b2714860 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 10:49:04 +0200
Subject: [PATCH 024/131] add 'packages' import group

---
 examples/gym_ex/proxy/env.py                                 | 3 ++-
 setup.cfg                                                    | 4 +++-
 tests/conftest.py                                            | 3 ++-
 tests/test_aea.py                                            | 5 +++--
 tests/test_agent.py                                          | 3 ++-
 tests/test_docs/test_docs_protocol.py                        | 1 +
 .../test_http_client_connection_to_aries_cloud_agent.py      | 1 +
 tests/test_helpers/test_base.py                              | 1 +
 tests/test_mail/test_base.py                                 | 1 +
 tests/test_multiplexer.py                                    | 3 ++-
 tests/test_packages/test_connections/test_gym/test_gym.py    | 1 +
 .../test_connections/test_http_client/test_http_client.py    | 1 +
 .../test_connections/test_http_server/test_http_server.py    | 1 +
 .../test_http_server/test_http_server_and_client.py          | 1 +
 .../test_connections/test_ledger/test_contract_api.py        | 1 +
 .../test_connections/test_ledger/test_ledger_api.py          | 1 +
 tests/test_packages/test_connections/test_local/test_misc.py | 1 +
 .../test_connections/test_local/test_search_services.py      | 1 +
 .../test_connections/test_oef/test_communication.py          | 1 +
 .../test_connections/test_p2p_libp2p/test_communication.py   | 1 +
 .../test_connections/test_p2p_libp2p/test_errors.py          | 1 +
 .../test_p2p_libp2p_client/test_communication.py             | 1 +
 .../test_connections/test_p2p_libp2p_client/test_errors.py   | 1 +
 tests/test_packages/test_connections/test_soef/test_soef.py  | 3 ++-
 .../test_connections/test_soef/test_soef_integration.py      | 5 +++--
 .../test_connections/test_webhook/test_webhook.py            | 1 +
 tests/test_packages/test_protocols/test_contract_api.py      | 1 +
 tests/test_packages/test_protocols/test_fipa.py              | 1 +
 tests/test_packages/test_protocols/test_gym.py               | 1 +
 tests/test_packages/test_protocols/test_http.py              | 1 +
 tests/test_packages/test_protocols/test_ledger_api.py        | 1 +
 tests/test_packages/test_protocols/test_ml_trade.py          | 1 +
 tests/test_packages/test_protocols/test_oef_search.py        | 1 +
 tests/test_packages/test_protocols/test_tac.py               | 1 +
 tests/test_skills/test_error.py                              | 1 +
 35 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index e40c89babb..815985da5f 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -32,7 +32,6 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 
-from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
 from packages.fetchai.protocols.gym.dialogues import (  # noqa: E402  # pylint: disable=wrong-import-position
     GymDialogue as BaseGymDialogue,
 )
@@ -43,6 +42,8 @@
     GymMessage,
 )
 
+from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
+
 sys.modules["packages.fetchai.connections.gym"] = locate(
     "packages.fetchai.connections.gym"
 )
diff --git a/setup.cfg b/setup.cfg
index 502c1c9ba7..69fd0de769 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,7 +35,9 @@ line_length=88
 # custom configurations
 order_by_type=False
 skip_glob = **/*_pb2.py
-known_local_folder=packages,tests
+known_packages=packages
+known_local_folder=tests
+sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER
 case_sensitive=True
 
 [mypy]
diff --git a/tests/conftest.py b/tests/conftest.py
index 4be0997617..f6998ac373 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -69,7 +69,6 @@
 from aea.test_tools.click_testing import CliRunner as ImportedCliRunner
 from aea.test_tools.constants import DEFAULT_AUTHOR
 
-from .data.dummy_connection.connection import DummyConnection  # type: ignore
 from packages.fetchai.connections.local.connection import LocalNode, OEFLocalConnection
 from packages.fetchai.connections.oef.connection import OEFConnection
 from packages.fetchai.connections.p2p_libp2p.connection import (
@@ -82,6 +81,8 @@
 from packages.fetchai.connections.tcp.tcp_client import TCPClientConnection
 from packages.fetchai.connections.tcp.tcp_server import TCPServerConnection
 
+from .data.dummy_connection.connection import DummyConnection  # type: ignore
+
 logger = logging.getLogger(__name__)
 
 CliRunner = ImportedCliRunner
diff --git a/tests/test_aea.py b/tests/test_aea.py
index 573582b97a..46553c275c 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -45,6 +45,9 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Skill, SkillContext
 
+from packages.fetchai.connections.local.connection import LocalNode
+from packages.fetchai.protocols.fipa.message import FipaMessage
+
 from .conftest import (
     CUR_PATH,
     DUMMY_SKILL_PUBLIC_ID,
@@ -55,8 +58,6 @@
 )
 from .data.dummy_aea.skills.dummy.tasks import DummyTask  # type: ignore
 from .data.dummy_skill.behaviours import DummyBehaviour  # type: ignore
-from packages.fetchai.connections.local.connection import LocalNode
-from packages.fetchai.protocols.fipa.message import FipaMessage
 from tests.common.utils import (
     AeaTool,
     make_behaviour_cls_from_funcion,
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 3d05a0bacf..e16446fc07 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -26,8 +26,9 @@
 from aea.agent import Agent, Identity
 from aea.runtime import RuntimeStates
 
-from .conftest import _make_local_connection
 from packages.fetchai.connections.local.connection import LocalNode
+
+from .conftest import _make_local_connection
 from tests.common.utils import wait_for_condition
 
 
diff --git a/tests/test_docs/test_docs_protocol.py b/tests/test_docs/test_docs_protocol.py
index 4f68f4abf1..1bec995f56 100644
--- a/tests/test_docs/test_docs_protocol.py
+++ b/tests/test_docs/test_docs_protocol.py
@@ -28,6 +28,7 @@
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.oef_search.custom_types import OefErrorOperation
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
+
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import compare_enum_classes, compile_and_exec
 
diff --git a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
index 1a8234e66e..b2b78230dc 100644
--- a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
+++ b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
@@ -49,6 +49,7 @@
 
 from packages.fetchai.connections.http_client.connection import HTTPClientConnection
 from packages.fetchai.protocols.http.message import HttpMessage
+
 from tests.conftest import HTTP_PROTOCOL_PUBLIC_ID
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_helpers/test_base.py b/tests/test_helpers/test_base.py
index d2b2ee347a..b063cc3732 100644
--- a/tests/test_helpers/test_base.py
+++ b/tests/test_helpers/test_base.py
@@ -49,6 +49,7 @@
 )
 
 from packages.fetchai.connections.oef.connection import OEFConnection
+
 from tests.conftest import CUR_PATH, ROOT_DIR, skip_test_windows
 
 
diff --git a/tests/test_mail/test_base.py b/tests/test_mail/test_base.py
index 518d5b4eaa..d4fdb3e624 100644
--- a/tests/test_mail/test_base.py
+++ b/tests/test_mail/test_base.py
@@ -31,6 +31,7 @@
 from aea.protocols.default.message import DefaultMessage
 
 from packages.fetchai.connections.local.connection import LocalNode
+
 from tests.conftest import (
     UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index f3048912e7..07f507b13f 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -41,6 +41,8 @@
 from aea.multiplexer import AsyncMultiplexer, InBox, Multiplexer, OutBox
 from aea.protocols.default.message import DefaultMessage
 
+from packages.fetchai.connections.local.connection import LocalNode
+
 from .conftest import (
     UNKNOWN_CONNECTION_PUBLIC_ID,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
@@ -49,7 +51,6 @@
     _make_stub_connection,
     logger,
 )
-from packages.fetchai.connections.local.connection import LocalNode
 from tests.common.utils import wait_for_condition
 
 
diff --git a/tests/test_packages/test_connections/test_gym/test_gym.py b/tests/test_packages/test_connections/test_gym/test_gym.py
index f2bced4db9..281b163905 100644
--- a/tests/test_packages/test_connections/test_gym/test_gym.py
+++ b/tests/test_packages/test_connections/test_gym/test_gym.py
@@ -36,6 +36,7 @@
 from packages.fetchai.protocols.gym.dialogues import GymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
+
 from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_http_client/test_http_client.py b/tests/test_packages/test_connections/test_http_client/test_http_client.py
index 5ce8c66936..07be0cee65 100644
--- a/tests/test_packages/test_connections/test_http_client/test_http_client.py
+++ b/tests/test_packages/test_connections/test_http_client/test_http_client.py
@@ -35,6 +35,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
+
 from tests.common.mocks import AnyStringWith
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID, get_host, get_unused_tcp_port
 
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py
index a63e7af233..495178987d 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server.py
@@ -44,6 +44,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
+
 from tests.common.mocks import RegexComparator
 from tests.conftest import (
     HTTP_PROTOCOL_PUBLIC_ID,
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
index faddbd6f72..9bbd81a3f4 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
@@ -34,6 +34,7 @@
 from packages.fetchai.connections.http_server.connection import HTTPServerConnection
 from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
+
 from tests.conftest import get_host, get_unused_tcp_port
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_ledger/test_contract_api.py b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
index a0b314f5f7..88bb315259 100644
--- a/tests/test_packages/test_connections/test_ledger/test_contract_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_contract_api.py
@@ -40,6 +40,7 @@
     ContractApiDialogues as BaseContractApiDialogues,
 )
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
+
 from tests.conftest import ETHEREUM, ETHEREUM_ADDRESS_ONE
 
 
diff --git a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
index edcf7358b0..21ceaf2f5c 100644
--- a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
@@ -51,6 +51,7 @@
     LedgerApiDialogues as BaseLedgerApiDialogues,
 )
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
+
 from tests.conftest import (
     ETHEREUM,
     ETHEREUM_ADDRESS_ONE,
diff --git a/tests/test_packages/test_connections/test_local/test_misc.py b/tests/test_packages/test_connections/test_local/test_misc.py
index 9f89eac9e6..1c49dcf99d 100644
--- a/tests/test_packages/test_connections/test_local/test_misc.py
+++ b/tests/test_packages/test_connections/test_local/test_misc.py
@@ -30,6 +30,7 @@
 
 from packages.fetchai.connections.local.connection import LocalNode
 from packages.fetchai.protocols.fipa.message import FipaMessage
+
 from tests.conftest import _make_local_connection
 
 
diff --git a/tests/test_packages/test_connections/test_local/test_search_services.py b/tests/test_packages/test_connections/test_local/test_search_services.py
index 97e03fd4bf..4c4c24ba4b 100644
--- a/tests/test_packages/test_connections/test_local/test_search_services.py
+++ b/tests/test_packages/test_connections/test_local/test_search_services.py
@@ -44,6 +44,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
+
 from tests.common.mocks import AnyStringWith
 from tests.common.utils import wait_for_condition
 from tests.conftest import MAX_FLAKY_RERUNS, _make_local_connection
diff --git a/tests/test_packages/test_connections/test_oef/test_communication.py b/tests/test_packages/test_connections/test_oef/test_communication.py
index 79972d8107..ea4676d068 100644
--- a/tests/test_packages/test_connections/test_oef/test_communication.py
+++ b/tests/test_packages/test_connections/test_oef/test_communication.py
@@ -59,6 +59,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
+
 from tests.conftest import (
     FETCHAI_ADDRESS_ONE,
     FETCHAI_ADDRESS_TWO,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
index 8b42415786..49a08a0be9 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
@@ -30,6 +30,7 @@
 from aea.protocols.default.message import DefaultMessage
 
 from packages.fetchai.connections.p2p_libp2p.connection import Uri
+
 from tests.conftest import (
     _make_libp2p_connection,
     libp2p_log_on_failure,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index b53367abc8..1ef0791958 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -38,6 +38,7 @@
     _golang_module_build_async,
     _golang_module_run,
 )
+
 from tests.conftest import COSMOS, _make_libp2p_connection
 
 DEFAULT_PORT = 10234
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
index 51f293def8..308f2b6bd2 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
@@ -31,6 +31,7 @@
 from aea.protocols.default.serialization import DefaultSerializer
 
 from packages.fetchai.connections.p2p_libp2p_client.connection import Uri
+
 from tests.conftest import (
     _make_libp2p_client_connection,
     _make_libp2p_connection,
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
index 1834e135fb..4500e3c166 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_errors.py
@@ -33,6 +33,7 @@
 from packages.fetchai.connections.p2p_libp2p_client.connection import (
     P2PLibp2pClientConnection,
 )
+
 from tests.conftest import (
     COSMOS,
     _make_libp2p_client_connection,
diff --git a/tests/test_packages/test_connections/test_soef/test_soef.py b/tests/test_packages/test_connections/test_soef/test_soef.py
index dcecd3b2fb..1f4517f016 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef.py
@@ -42,13 +42,14 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 
-from . import models
 from packages.fetchai.connections.soef.connection import SOEFConnection, SOEFException
 from packages.fetchai.protocols.oef_search.dialogues import OefSearchDialogue
 from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
+
+from . import models
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID
 
 
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 3366cee8ca..9f0d345ffa 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -42,10 +42,11 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 
-from . import models
-from .test_soef import OefSearchDialogues
 from packages.fetchai.connections.soef.connection import SOEFConnection
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
+
+from . import models
+from .test_soef import OefSearchDialogues
 from tests.common.utils import wait_for_condition
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/tests/test_packages/test_connections/test_webhook/test_webhook.py b/tests/test_packages/test_connections/test_webhook/test_webhook.py
index 5a68208fc8..d7e09becbe 100644
--- a/tests/test_packages/test_connections/test_webhook/test_webhook.py
+++ b/tests/test_packages/test_connections/test_webhook/test_webhook.py
@@ -40,6 +40,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
+
 from tests.common.mocks import RegexComparator
 from tests.conftest import get_host, get_unused_tcp_port
 
diff --git a/tests/test_packages/test_protocols/test_contract_api.py b/tests/test_packages/test_protocols/test_contract_api.py
index d9a3ca45ce..397cc26142 100644
--- a/tests/test_packages/test_protocols/test_contract_api.py
+++ b/tests/test_packages/test_protocols/test_contract_api.py
@@ -42,6 +42,7 @@
 from packages.fetchai.protocols.contract_api.message import (
     logger as contract_api_message_logger,
 )
+
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_fipa.py b/tests/test_packages/test_protocols/test_fipa.py
index 0383e3d837..abead1272a 100644
--- a/tests/test_packages/test_protocols/test_fipa.py
+++ b/tests/test_packages/test_protocols/test_fipa.py
@@ -38,6 +38,7 @@
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue, FipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.fipa.message import logger as fipa_message_logger
+
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_gym.py b/tests/test_packages/test_protocols/test_gym.py
index 2189e884b1..330e9a7833 100644
--- a/tests/test_packages/test_protocols/test_gym.py
+++ b/tests/test_packages/test_protocols/test_gym.py
@@ -36,6 +36,7 @@
 from packages.fetchai.protocols.gym.dialogues import GymDialogue, GymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.protocols.gym.message import logger as gym_message_logger
+
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_http.py b/tests/test_packages/test_protocols/test_http.py
index ccd682fbd3..0d7d8d9833 100644
--- a/tests/test_packages/test_protocols/test_http.py
+++ b/tests/test_packages/test_protocols/test_http.py
@@ -36,6 +36,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogue, HttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.http.message import logger as http_message_logger
+
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_ledger_api.py b/tests/test_packages/test_protocols/test_ledger_api.py
index ab4b545fb8..01b64fce26 100644
--- a/tests/test_packages/test_protocols/test_ledger_api.py
+++ b/tests/test_packages/test_protocols/test_ledger_api.py
@@ -41,6 +41,7 @@
 from packages.fetchai.protocols.ledger_api.message import (
     logger as ledger_api_message_logger,
 )
+
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_ml_trade.py b/tests/test_packages/test_protocols/test_ml_trade.py
index 51e1c309d9..3377373631 100644
--- a/tests/test_packages/test_protocols/test_ml_trade.py
+++ b/tests/test_packages/test_protocols/test_ml_trade.py
@@ -43,6 +43,7 @@
 from packages.fetchai.protocols.ml_trade.message import (
     logger as ml_trade_message_logger,
 )
+
 from tests.conftest import ROOT_DIR
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_protocols/test_oef_search.py b/tests/test_packages/test_protocols/test_oef_search.py
index 5efd5a8735..11fd064554 100644
--- a/tests/test_packages/test_protocols/test_oef_search.py
+++ b/tests/test_packages/test_protocols/test_oef_search.py
@@ -42,6 +42,7 @@
 from packages.fetchai.protocols.oef_search.message import (
     logger as oef_search_message_logger,
 )
+
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_packages/test_protocols/test_tac.py b/tests/test_packages/test_protocols/test_tac.py
index ea4cfa7809..2ea87db305 100644
--- a/tests/test_packages/test_protocols/test_tac.py
+++ b/tests/test_packages/test_protocols/test_tac.py
@@ -36,6 +36,7 @@
 from packages.fetchai.protocols.tac.dialogues import TacDialogue, TacDialogues
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.protocols.tac.message import logger as tac_message_logger
+
 from tests.conftest import ROOT_DIR
 
 sys.path.append(ROOT_DIR)
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index f8e3d4c2ad..813a78e4ca 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -37,6 +37,7 @@
 from aea.skills.error.handlers import ErrorHandler
 
 from packages.fetchai.protocols.fipa.message import FipaMessage
+
 from tests.common.utils import wait_for_condition
 from tests.conftest import CUR_PATH, _make_dummy_connection
 

From dba7e92c5891f49aa2c78be3ef1748d3cfc38884 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 10:52:25 +0200
Subject: [PATCH 025/131] add isort:skip to import comment

---
 scripts/acn/run_acn_node_standalone.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/acn/run_acn_node_standalone.py b/scripts/acn/run_acn_node_standalone.py
index f9e55f63e7..5ab3e59de2 100644
--- a/scripts/acn/run_acn_node_standalone.py
+++ b/scripts/acn/run_acn_node_standalone.py
@@ -24,12 +24,11 @@
 from binascii import unhexlify
 from typing import Dict, List, Optional
 
+# following imports needed only if checks are enabled  # isort:skip
 from base58 import b58decode
 from ecdsa import SigningKey, curves
 from multihash import decode as multihashdecode  # type: ignore
 
-# following imports needed only if checks are enabled
-
 
 class AcnNodeConfig:
     """Store the configuration of an acn node as a dictionary."""

From 7c1aec4df26021b3c3b529a58b3506cc6085f3d7 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 12:40:09 +0200
Subject: [PATCH 026/131] fix tests for 'aea fetch' due to version 'latest'
 changes

---
 tests/test_cli/test_fetch.py           | 11 +++++++----
 tests/test_configurations/test_base.py |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index 2f6781d5ce..a9a5af2e7f 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -27,6 +27,7 @@
 
 from aea.cli import cli
 from aea.cli.fetch import _is_version_correct, fetch_agent_locally
+from aea.configurations.base import PackageVersion
 from aea.test_tools.test_cases import AEATestCaseMany
 
 from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
@@ -127,17 +128,19 @@ class IsVersionCorrectTestCase(TestCase):
 
     def test__is_version_correct_positive(self):
         """Test for _is_version_correct method positive result."""
-        ctx_mock = ContextMock(version="correct")
+        package_version = PackageVersion("0.1.0")
+        ctx_mock = ContextMock(version=str(package_version))
         public_id_mock = PublicIdMock()
-        public_id_mock.version = "correct"
+        public_id_mock.package_version = package_version
         result = _is_version_correct(ctx_mock, public_id_mock)
         self.assertTrue(result)
 
     def test__is_version_correct_negative(self):
         """Test for _is_version_correct method negative result."""
-        ctx_mock = ContextMock(version="correct")
+        package_version = PackageVersion("0.1.0")
+        ctx_mock = ContextMock(version="0.1.1")
         public_id_mock = PublicIdMock()
-        public_id_mock.version = "incorrect"
+        public_id_mock.package_version = package_version
         result = _is_version_correct(ctx_mock, public_id_mock)
         self.assertFalse(result)
 
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 6da2b38d32..90d27cefa2 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -436,12 +436,21 @@ def test_public_id_from_string():
 
 
 def test_public_id_from_string_without_version_string():
+    """Test parsing the public id without version string."""
     public_id = PublicId.from_str("author/package")
     assert public_id.author == "author"
     assert public_id.name == "package"
     assert public_id.version == "latest"
 
 
+def test_public_id_from_string_with_version_string_latest():
+    """Test parsing the public id with version string 'latest'."""
+    public_id = PublicId.from_str("author/package:latest")
+    assert public_id.author == "author"
+    assert public_id.name == "package"
+    assert public_id.version == "latest"
+
+
 def test_public_id_from_uri_path():
     """Test PublicId.from_uri_path"""
     result = PublicId.from_uri_path("author/package_name/0.1.0")

From adb263be4b9e4a40947576577e513ca6ecbec062 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Mon, 21 Sep 2020 11:50:27 +0100
Subject: [PATCH 027/131] part 2 of conversion to message based tac control
 contract skill

---
 .../fetchai/skills/erc1155_deploy/handlers.py |   7 +-
 .../fetchai/skills/tac_control/behaviours.py  |   7 +-
 packages/fetchai/skills/tac_control/game.py   |  19 +
 .../fetchai/skills/tac_control/parameters.py  |  27 +-
 .../skills/tac_control_contract/README.md     |   7 +-
 .../skills/tac_control_contract/behaviours.py | 133 +-----
 .../skills/tac_control_contract/dialogues.py  | 256 +++++++++++
 .../skills/tac_control_contract/game.py       | 139 +-----
 .../skills/tac_control_contract/handlers.py   | 435 ++++++++++++++++--
 .../skills/tac_control_contract/parameters.py | 143 +++++-
 .../skills/tac_control_contract/skill.yaml    |  28 +-
 11 files changed, 884 insertions(+), 317 deletions(-)

diff --git a/packages/fetchai/skills/erc1155_deploy/handlers.py b/packages/fetchai/skills/erc1155_deploy/handlers.py
index fd9f0a7168..2caf6908fc 100644
--- a/packages/fetchai/skills/erc1155_deploy/handlers.py
+++ b/packages/fetchai/skills/erc1155_deploy/handlers.py
@@ -22,7 +22,7 @@
 from typing import Optional, cast
 
 from aea.configurations.base import ProtocolId
-from aea.crypto.ethereum import EthereumHelper
+from aea.crypto.ledger_apis import LedgerApis
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
@@ -329,8 +329,9 @@ def _handle_transaction_receipt(self, ledger_api_msg: LedgerApiMessage) -> None:
 
         :param ledger_api_message: the ledger api message
         """
-        is_transaction_successful = EthereumHelper.is_transaction_settled(
-            ledger_api_msg.transaction_receipt.receipt
+        is_transaction_successful = LedgerApis.is_transaction_settled(
+            ledger_api_msg.transaction_receipt.ledger_id,
+            ledger_api_msg.transaction_receipt.receipt,
         )
         if is_transaction_successful:
             self.context.logger.info(
diff --git a/packages/fetchai/skills/tac_control/behaviours.py b/packages/fetchai/skills/tac_control/behaviours.py
index 658d9e41fd..6b79c0f094 100644
--- a/packages/fetchai/skills/tac_control/behaviours.py
+++ b/packages/fetchai/skills/tac_control/behaviours.py
@@ -193,6 +193,11 @@ def _start_tac(self, game: Game):
             if last_msg is None:
                 raise ValueError("Error when retrieving last message.")
             agent_state = game.current_agent_states[agent_address]
+            info = (
+                {"contract_address": game.conf.contract_address}
+                if game.conf.has_contract_address
+                else {}
+            )
             tac_msg = tac_dialogue.reply(
                 performative=TacMessage.Performative.GAME_DATA,
                 target_message=last_msg,
@@ -205,7 +210,7 @@ def _start_tac(self, game: Game):
                 agent_addr_to_name=game.conf.agent_addr_to_name,
                 good_id_to_name=game.conf.good_id_to_name,
                 version_id=game.conf.version_id,
-                info={"contract_address": game.conf.contract_address},
+                info=info,
             )
             self.context.outbox.put_message(message=tac_msg)
             self.context.logger.debug(
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index d3624c88d0..b49d8432f2 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -111,6 +111,7 @@ def __init__(
         self._agent_addr_to_name = agent_addr_to_name
         self._currency_id_to_name = currency_id_to_name
         self._good_id_to_name = good_id_to_name
+        self._contract_address = None  # type: Optional[str]
         self._check_consistency()
 
     @property
@@ -138,6 +139,24 @@ def good_id_to_name(self) -> Dict[str, str]:
         """Map good ids to names."""
         return self._good_id_to_name
 
+    @property
+    def has_contract_address(self) -> bool:
+        """Check if contract address is present."""
+        return self._contract_address is not None
+
+    @property
+    def contract_address(self) -> str:
+        """Get the contract address for the game."""
+        if self._contract_address is None:
+            raise AEAEnforceError("Contract_address not set yet!")
+        return self._contract_address
+
+    @contract_address.setter
+    def contract_address(self, contract_address: str) -> None:
+        """Set the contract address for the game."""
+        enforce(self._contract_address is None, "Contract_address already set!")
+        self._contract_address = contract_address
+
     def _check_consistency(self):
         """
         Check the consistency of the game configuration.
diff --git a/packages/fetchai/skills/tac_control/parameters.py b/packages/fetchai/skills/tac_control/parameters.py
index a93b1b2ab1..a5da9ae09a 100644
--- a/packages/fetchai/skills/tac_control/parameters.py
+++ b/packages/fetchai/skills/tac_control/parameters.py
@@ -23,12 +23,13 @@
 from typing import Dict, List, Optional, Set
 
 from aea.exceptions import AEAEnforceError, enforce
-from aea.helpers.search.models import (
-    Location,
-)
+from aea.helpers.search.models import Location
 from aea.skills.base import Model
 
-from packages.fetchai.skills.tac_control.helpers import generate_currency_id_to_name, generate_good_id_to_name
+from packages.fetchai.skills.tac_control.helpers import (
+    generate_currency_id_to_name,
+    generate_good_id_to_name,
+)
 
 DEFAULT_LEDGER_ID = "ethereum"
 DEFAULT_MIN_NB_AGENTS = 2
@@ -52,7 +53,7 @@ class Parameters(Model):
     """This class contains the parameters of the game."""
 
     def __init__(self, **kwargs):
-        """Instantiate the search class."""
+        """Instantiate the parameter class."""
         self._ledger_id = kwargs.pop("ledger_id", DEFAULT_LEDGER_ID)
         self._contract_address = kwargs.pop(
             "contract_adress", None
@@ -155,6 +156,13 @@ def contract_address(self) -> str:
             raise AEAEnforceError("No contract address provided.")
         return self._contract_address
 
+    @contract_address.setter
+    def contract_address(self, contract_address: str) -> None:
+        """Set contract address of an already deployed smart-contract."""
+        if self._contract_address is not None:
+            raise AEAEnforceError("Contract address already provided.")
+        self._contract_address = contract_address
+
     @property
     def is_contract_deployed(self) -> bool:
         """Check if there is a deployed instance of the contract."""
@@ -282,10 +290,11 @@ def simple_service_data(self) -> Dict[str, str]:
     def _check_consistency(self) -> None:
         """Check the parameters are consistent."""
         if self._contract_address is not None and (
-            self._good_ids is not None
-            or self._currency_ids is not None
-            or len(self._good_ids) != self._nb_goods
-            or len(self._currency_ids) != self._nb_currencies
+            (self._good_ids is not None and len(self._good_ids) != self._nb_goods)
+            or (
+                self._currency_ids is not None
+                and len(self._currency_ids) != self._nb_currencies
+            )
         ):
             raise ValueError(
                 "If the contract address is set, then good ids and currency id must be provided and consistent."
diff --git a/packages/fetchai/skills/tac_control_contract/README.md b/packages/fetchai/skills/tac_control_contract/README.md
index 7032d335ee..47fdb3903a 100644
--- a/packages/fetchai/skills/tac_control_contract/README.md
+++ b/packages/fetchai/skills/tac_control_contract/README.md
@@ -8,14 +8,15 @@ This skill is part of the Fetch.ai TAC demo. It manages the smart contract (cont
 
 ## Behaviours
 
-* contract: manages the contract (deploying the contract, creating tokens, minting tokens) 
 * tac:  deploys smart contract, manages progression of the competition
 
 ## Handlers
 
-* tac: handles TAC messages for registering/unregistering agents in the TAC
+* contract_api: handles contract_api messages for interaction with contract
+* ledger_api: handles ledger_api messages for interaction with ledger
 * oef: handles oef_search messages if (un)registration on SOEF is unsuccessful
-* transaction: handles signing messages for communication with the ledger
+* signing: handles signing messages for interaction with decision maker
+* tac: handles TAC messages for registering/unregistering agents in the TAC
 
 ## Links
 
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 702a2ef1a9..7b2b87104c 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -22,31 +22,24 @@
 import datetime
 from typing import List, cast
 
-from aea.skills.behaviours import TickerBehaviour
-
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
-from packages.fetchai.skills.tac_control.behaviours import TacBehaviour
+from packages.fetchai.skills.tac_control.behaviours import (
+    TacBehaviour as BaseTacBehaviour,
+)
 from packages.fetchai.skills.tac_control_contract.dialogues import (
     ContractApiDialogue,
     ContractApiDialogues,
 )
 from packages.fetchai.skills.tac_control_contract.game import (
-    Configuration,
     Game,
     Phase,
 )
-from packages.fetchai.skills.tac_control_contract.helpers import (
-    generate_currency_id_to_name,
-    generate_currency_ids,
-    generate_good_id_to_name,
-    generate_good_ids,
-)
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
-LEDGER_API_ADDRESS = "///"
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
-class TacBehaviour(TacBehaviour):
+class TacBehaviour(BaseTacBehaviour):
     """This class implements the TAC control behaviour."""
 
     def setup(self) -> None:
@@ -81,7 +74,7 @@ def _request_contract_deploy_transaction(self) -> None:
             ),
         )
         contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue,)
-        contract_api_dialogue.terms = strategy.get_deploy_terms()
+        contract_api_dialogue.terms = parameters.get_deploy_terms()
         self.context.outbox.put_message(message=contract_api_msg)
         self.context.logger.info("requesting contract deployment transaction...")
 
@@ -101,7 +94,7 @@ def act(self) -> None:
             < parameters.registration_end_time
         ):
             game.phase = Phase.GAME_REGISTRATION
-            self._register_tac(parameters)
+            self._register_tac()
             self.context.logger.info(
                 "TAC open for registration until: {}".format(parameters.start_time)
             )
@@ -144,14 +137,6 @@ def act(self) -> None:
             self._cancel_tac(game)
             self.context.is_active = False
 
-    def teardown(self) -> None:
-        """
-        Implement the task teardown.
-
-        :return: None
-        """
-        super().teardown()
-
     def _request_create_items_transaction(self, game: Game) -> None:
         """
         Request token create transaction
@@ -176,7 +161,7 @@ def _request_create_items_transaction(self, game: Game) -> None:
             ),
         )
         contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
-        contract_api_dialogue.terms = strategy.get_create_items_terms()
+        contract_api_dialogue.terms = parameters.get_create_token_terms()
         self.context.outbox.put_message(message=contract_api_msg)
         self.context.logger.info("requesting create items transaction...")
 
@@ -217,105 +202,5 @@ def _request_mint_items_transaction(self, game: Game) -> None:
                 ),
             )
             contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
-            contract_api_dialogue.terms = strategy.get_mint_token_terms()
+            contract_api_dialogue.terms = parameters.get_mint_token_terms()
             self.context.outbox.put_message(message=contract_api_msg)
-
-
-class ContractBehaviour(TickerBehaviour):
-    """This class implements the TAC control behaviour."""
-
-    def act(self) -> None:
-        """
-        Implement the act.
-
-        :return: None
-        """
-        game = cast(Game, self.context.game)
-        parameters = cast(Parameters, self.context.parameters)
-        ledger_api = self.context.ledger_apis.get_api(parameters.ledger)
-        if game.phase.value == Phase.CONTRACT_DEPLOYING.value:
-            tx_receipt = ledger_api.get_transaction_receipt(
-                tx_digest=game.contract_manager.deploy_tx_digest
-            )
-            if tx_receipt is None:
-                self.context.logger.info(
-                    "cannot verify whether contract deployment was successful. Retrying..."
-                )
-            elif tx_receipt.status != 1:
-                self.context.is_active = False
-                self.context.warning(
-                    "the contract did not deployed successfully. Transaction hash: {}. Aborting!".format(
-                        tx_receipt.transactionHash.hex()
-                    )
-                )
-            else:
-                self.context.logger.info(
-                    "the contract was successfully deployed. Contract address: {}. Transaction hash: {}".format(
-                        tx_receipt.contractAddress, tx_receipt.transactionHash.hex(),
-                    )
-                )
-                configuration = Configuration(parameters.version_id, parameters.tx_fee,)
-                currency_ids = generate_currency_ids(parameters.nb_currencies)
-                configuration.currency_id_to_name = generate_currency_id_to_name(
-                    currency_ids
-                )
-                good_ids = generate_good_ids(parameters.nb_goods)
-                configuration.good_id_to_name = generate_good_id_to_name(good_ids)
-                configuration.contract_address = tx_receipt.contractAddress
-                game.conf = configuration
-                game.phase = Phase.CONTRACT_DEPLOYED
-        elif game.phase.value == Phase.TOKENS_CREATING.value:
-            tx_receipt = ledger_api.get_transaction_receipt(
-                tx_digest=game.contract_manager.create_tokens_tx_digest
-            )
-            if tx_receipt is None:
-                self.context.logger.info(
-                    "cannot verify whether token creation was successful. Retrying..."
-                )
-            elif tx_receipt.status != 1:
-                self.context.is_active = False
-                self.context.warning(
-                    "the token creation wasn't successful. Transaction hash: {}. Aborting!".format(
-                        tx_receipt.transactionHash.hex()
-                    )
-                )
-            else:
-                self.context.logger.info(
-                    "successfully created the tokens. Transaction hash: {}".format(
-                        tx_receipt.transactionHash.hex()
-                    )
-                )
-                game.phase = Phase.TOKENS_CREATED
-        elif game.phase.value == Phase.TOKENS_MINTING.value:
-            for (
-                agent_addr,
-                tx_digest,
-            ) in game.contract_manager.mint_tokens_tx_digests.items():
-                if agent_addr in game.contract_manager.confirmed_mint_tokens_agents:
-                    continue
-                tx_receipt = ledger_api.get_transaction_receipt(tx_digest=tx_digest)
-                if tx_receipt is None:
-                    self.context.logger.info(
-                        "cannot verify whether token minting for agent_addr={} was successful. Retrying...".format(
-                            agent_addr
-                        )
-                    )
-                elif tx_receipt.status != 1:
-                    self.context.is_active = False
-                    self.context.logger.warning(
-                        "the token minting for agent_addr={} wasn't successful. Transaction hash: {}. Aborting!".format(
-                            agent_addr, tx_receipt.transactionHash.hex(),
-                        )
-                    )
-                else:
-                    self.context.logger.info(
-                        "successfully minted the tokens for agent_addr={}. Transaction hash: {}".format(
-                            agent_addr, tx_receipt.transactionHash.hex(),
-                        )
-                    )
-                    game.contract_manager.add_confirmed_mint_tokens_agents(agent_addr)
-                    if len(game.contract_manager.confirmed_mint_tokens_agents) == len(
-                        game.initial_agent_states
-                    ):
-                        self.context.logger.info("All tokens minted!")
-                        game.phase = Phase.TOKENS_MINTED
diff --git a/packages/fetchai/skills/tac_control_contract/dialogues.py b/packages/fetchai/skills/tac_control_contract/dialogues.py
index 2f15292e02..77718207a2 100644
--- a/packages/fetchai/skills/tac_control_contract/dialogues.py
+++ b/packages/fetchai/skills/tac_control_contract/dialogues.py
@@ -28,6 +28,33 @@
 - TacDialogues: The dialogues class keeps track of all dialogues of type tac.
 """
 
+from typing import Optional, Type
+
+from aea.common import Address
+from aea.exceptions import enforce
+from aea.helpers.transaction.base import Terms
+from aea.protocols.base import Message
+from aea.protocols.dialogue.base import Dialogue as BaseDialogue
+from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
+from aea.protocols.signing.dialogues import SigningDialogue as BaseSigningDialogue
+from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
+from aea.protocols.signing.message import SigningMessage
+from aea.skills.base import Model
+
+from packages.fetchai.protocols.contract_api.dialogues import (
+    ContractApiDialogue as BaseContractApiDialogue,
+)
+from packages.fetchai.protocols.contract_api.dialogues import (
+    ContractApiDialogues as BaseContractApiDialogues,
+)
+from packages.fetchai.protocols.contract_api.message import ContractApiMessage
+from packages.fetchai.protocols.ledger_api.dialogues import (
+    LedgerApiDialogue as BaseLedgerApiDialogue,
+)
+from packages.fetchai.protocols.ledger_api.dialogues import (
+    LedgerApiDialogues as BaseLedgerApiDialogues,
+)
+from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.skills.tac_control.dialogues import (
     DefaultDialogue as BaseDefaultDialogue,
 )
@@ -57,3 +84,232 @@
 TacDialogue = BaseTacDialogue
 
 TacDialogues = BaseTacDialogues
+
+
+class ContractApiDialogue(BaseContractApiDialogue):
+    """The dialogue class maintains state of a dialogue and manages it."""
+
+    def __init__(
+        self,
+        dialogue_label: BaseDialogueLabel,
+        self_address: Address,
+        role: BaseDialogue.Role,
+        message_class: Type[ContractApiMessage] = ContractApiMessage,
+    ) -> None:
+        """
+        Initialize a dialogue.
+
+        :param dialogue_label: the identifier of the dialogue
+        :param self_address: the address of the entity for whom this dialogue is maintained
+        :param role: the role of the agent this dialogue is maintained for
+
+        :return: None
+        """
+        BaseContractApiDialogue.__init__(
+            self,
+            dialogue_label=dialogue_label,
+            self_address=self_address,
+            role=role,
+            message_class=message_class,
+        )
+        self._terms = None  # type: Optional[Terms]
+
+    @property
+    def terms(self) -> Terms:
+        """Get the terms."""
+        if self._terms is None:
+            raise ValueError("Terms not set!")
+        return self._terms
+
+    @terms.setter
+    def terms(self, terms: Terms) -> None:
+        """Set the terms."""
+        enforce(self._terms is None, "Terms already set!")
+        self._terms = terms
+
+
+class ContractApiDialogues(Model, BaseContractApiDialogues):
+    """The dialogues class keeps track of all dialogues."""
+
+    def __init__(self, **kwargs) -> None:
+        """
+        Initialize dialogues.
+
+        :return: None
+        """
+        Model.__init__(self, **kwargs)
+
+        def role_from_first_message(  # pylint: disable=unused-argument
+            message: Message, receiver_address: Address
+        ) -> BaseDialogue.Role:
+            """Infer the role of the agent from an incoming/outgoing first message
+
+            :param message: an incoming/outgoing first message
+            :param receiver_address: the address of the receiving agent
+            :return: The role of the agent
+            """
+            return ContractApiDialogue.Role.AGENT
+
+        BaseContractApiDialogues.__init__(
+            self,
+            self_address=self.context.agent_address,
+            role_from_first_message=role_from_first_message,
+            dialogue_class=ContractApiDialogue,
+        )
+
+
+class SigningDialogue(BaseSigningDialogue):
+    """The dialogue class maintains state of a dialogue and manages it."""
+
+    def __init__(
+        self,
+        dialogue_label: BaseDialogueLabel,
+        self_address: Address,
+        role: BaseDialogue.Role,
+        message_class: Type[SigningMessage] = SigningMessage,
+    ) -> None:
+        """
+        Initialize a dialogue.
+
+        :param dialogue_label: the identifier of the dialogue
+        :param self_address: the address of the entity for whom this dialogue is maintained
+        :param role: the role of the agent this dialogue is maintained for
+
+        :return: None
+        """
+        BaseSigningDialogue.__init__(
+            self,
+            dialogue_label=dialogue_label,
+            self_address=self_address,
+            role=role,
+            message_class=message_class,
+        )
+        self._associated_contract_api_dialogue = (
+            None
+        )  # type: Optional[ContractApiDialogue]
+
+    @property
+    def associated_contract_api_dialogue(self) -> ContractApiDialogue:
+        """Get the associated contract api dialogue."""
+        if self._associated_contract_api_dialogue is None:
+            raise ValueError("Associated contract api dialogue not set!")
+        return self._associated_contract_api_dialogue
+
+    @associated_contract_api_dialogue.setter
+    def associated_contract_api_dialogue(
+        self, associated_contract_api_dialogue: ContractApiDialogue
+    ) -> None:
+        """Set the associated contract api dialogue."""
+        enforce(
+            self._associated_contract_api_dialogue is None,
+            "Associated contract api dialogue already set!",
+        )
+        self._associated_contract_api_dialogue = associated_contract_api_dialogue
+
+
+class SigningDialogues(Model, BaseSigningDialogues):
+    """This class keeps track of all oef_search dialogues."""
+
+    def __init__(self, **kwargs) -> None:
+        """
+        Initialize dialogues.
+
+        :param agent_address: the address of the agent for whom dialogues are maintained
+        :return: None
+        """
+        Model.__init__(self, **kwargs)
+
+        def role_from_first_message(  # pylint: disable=unused-argument
+            message: Message, receiver_address: Address
+        ) -> BaseDialogue.Role:
+            """Infer the role of the agent from an incoming/outgoing first message
+
+            :param message: an incoming/outgoing first message
+            :param receiver_address: the address of the receiving agent
+            :return: The role of the agent
+            """
+            return BaseSigningDialogue.Role.SKILL
+
+        BaseSigningDialogues.__init__(
+            self,
+            self_address=str(self.skill_id),
+            role_from_first_message=role_from_first_message,
+            dialogue_class=SigningDialogue,
+        )
+
+
+class LedgerApiDialogue(BaseLedgerApiDialogue):
+    """The dialogue class maintains state of a dialogue and manages it."""
+
+    def __init__(
+        self,
+        dialogue_label: BaseDialogueLabel,
+        self_address: Address,
+        role: BaseDialogue.Role,
+        message_class: Type[LedgerApiMessage] = LedgerApiMessage,
+    ) -> None:
+        """
+        Initialize a dialogue.
+
+        :param dialogue_label: the identifier of the dialogue
+        :param self_address: the address of the entity for whom this dialogue is maintained
+        :param role: the role of the agent this dialogue is maintained for
+
+        :return: None
+        """
+        BaseLedgerApiDialogue.__init__(
+            self,
+            dialogue_label=dialogue_label,
+            self_address=self_address,
+            role=role,
+            message_class=message_class,
+        )
+        self._associated_signing_dialogue = None  # type: Optional[SigningDialogue]
+
+    @property
+    def associated_signing_dialogue(self) -> "SigningDialogue":
+        """Get the associated signing dialogue."""
+        if self._associated_signing_dialogue is None:
+            raise ValueError("Associated signing dialogue not set!")
+        return self._associated_signing_dialogue
+
+    @associated_signing_dialogue.setter
+    def associated_signing_dialogue(
+        self, associated_signing_dialogue: "SigningDialogue"
+    ) -> None:
+        """Set the associated signing dialogue."""
+        enforce(
+            self._associated_signing_dialogue is None,
+            "Associated signing dialogue already set!",
+        )
+        self._associated_signing_dialogue = associated_signing_dialogue
+
+
+class LedgerApiDialogues(Model, BaseLedgerApiDialogues):
+    """The dialogues class keeps track of all dialogues."""
+
+    def __init__(self, **kwargs) -> None:
+        """
+        Initialize dialogues.
+
+        :return: None
+        """
+        Model.__init__(self, **kwargs)
+
+        def role_from_first_message(  # pylint: disable=unused-argument
+            message: Message, receiver_address: Address
+        ) -> BaseDialogue.Role:
+            """Infer the role of the agent from an incoming/outgoing first message
+
+            :param message: an incoming/outgoing first message
+            :param receiver_address: the address of the receiving agent
+            :return: The role of the agent
+            """
+            return BaseLedgerApiDialogue.Role.AGENT
+
+        BaseLedgerApiDialogues.__init__(
+            self,
+            self_address=self.context.agent_address,
+            role_from_first_message=role_from_first_message,
+            dialogue_class=LedgerApiDialogue,
+        )
diff --git a/packages/fetchai/skills/tac_control_contract/game.py b/packages/fetchai/skills/tac_control_contract/game.py
index 23baa86044..8d315b3dfd 100644
--- a/packages/fetchai/skills/tac_control_contract/game.py
+++ b/packages/fetchai/skills/tac_control_contract/game.py
@@ -19,11 +19,6 @@
 
 """This package contains a class representing the game."""
 
-from typing import Dict, List, Optional
-
-from aea.common import Address
-from aea.exceptions import AEAEnforceError, enforce
-
 from packages.fetchai.skills.tac_control.game import AgentState as BaseAgentState
 from packages.fetchai.skills.tac_control.game import Configuration as BaseConfiguration
 from packages.fetchai.skills.tac_control.game import Game as BaseGame
@@ -36,143 +31,25 @@
 from packages.fetchai.skills.tac_control.game import Transactions as BaseTransactions
 
 
-Phase = BasePhase
+AgentState = BaseAgentState
 
 
-class Configuration(BaseConfiguration):
-    """Class containing the configuration of the game."""
-
-    def __init__(
-        self,
-        version_id: str,
-        tx_fee: int,
-        agent_addr_to_name: Dict[Address, str],
-        currency_id_to_name: Dict[str, str],
-        good_id_to_name: Dict[str, str],
-    ):
-        """
-        Instantiate a game configuration.
-
-        :param version_id: the version of the game.
-        :param tx_fee: the fee for a transaction.
-        :param agent_addr_to_name: a dictionary mapping agent addresses to agent names (as strings).
-        :param nb_goods: the number of goods.
-        """
-        super().__init__(version_id, tx_fee, agent_addr_to_name, currency_id_to_name, good_id_to_name)
-        self._contract_address = None  # type: Optional[str]
-
-    @property
-    def contract_address(self) -> str:
-        """Get the contract address for the game."""
-        if self._contract_address is None:
-            raise AEAEnforceError("Contract_address not set yet!")
-        return self._contract_address
-
-    @contract_address.setter
-    def contract_address(self, contract_address: str) -> None:
-        """Set the contract address for the game."""
-        enforce(self._contract_address is None, "Contract_address already set!")
-        self._contract_address = contract_address
+Configuration = BaseConfiguration
 
 
-Initialization = BaseInitialization
+Game = BaseGame
 
 
-Transaction = BaseTransaction
+Initialization = BaseInitialization
 
 
-AgentState = BaseAgentState
+Phase = BasePhase
 
 
-Transactions = BaseTransactions
+Registration = BaseRegistration
 
 
-Registration = BaseRegistration
+Transaction = BaseTransaction
 
 
-class ContractManager:
-    """Class managing the contract."""
-
-    def __init__(self):
-        """Instantiate the contract manager class."""
-        self._deploy_tx_digest = None  # type: Optional[str]
-        self._create_tokens_tx_digest = None  # type: Optional[str]
-        self._mint_tokens_tx_digests = {}  # type: Dict[str, str]
-        self._confirmed_mint_tokens_agents = []  # type: List[str, str]
-
-    @property
-    def deploy_tx_digest(self) -> str:
-        """Get the contract deployment tx digest."""
-        if self._deploy_tx_digest is None:
-            raise AEAEnforceError("Deploy_tx_digest is not set yet!")
-        return self._deploy_tx_digest
-
-    @deploy_tx_digest.setter
-    def deploy_tx_digest(self, deploy_tx_digest: str) -> None:
-        """Set the contract deployment tx digest."""
-        enforce(self._deploy_tx_digest is None, "Deploy_tx_digest already set!")
-        self._deploy_tx_digest = deploy_tx_digest
-
-    @property
-    def create_tokens_tx_digest(self) -> str:
-        """Get the contract deployment tx digest."""
-        if self._create_tokens_tx_digest is None:
-            raise AEAEnforceError("Create_tokens_tx_digest is not set yet!")
-        return self._create_tokens_tx_digest
-
-    @create_tokens_tx_digest.setter
-    def create_tokens_tx_digest(self, create_tokens_tx_digest: str) -> None:
-        """Set the contract deployment tx digest."""
-        enforce(
-            self._create_tokens_tx_digest is None,
-            "Create_tokens_tx_digest already set!",
-        )
-        self._create_tokens_tx_digest = create_tokens_tx_digest
-
-    @property
-    def mint_tokens_tx_digests(self) -> Dict[str, str]:
-        """Get the mint tokens tx digests."""
-        return self._mint_tokens_tx_digests
-
-    def set_mint_tokens_tx_digest(self, agent_addr: str, tx_digest: str) -> None:
-        """
-        Set a mint token tx digest for an agent.
-
-        :param agent_addr: the agent addresss
-        :param tx_digest: the transaction digest
-        """
-        enforce(
-            agent_addr not in self._mint_tokens_tx_digests, "Tx digest already set."
-        )
-        self._mint_tokens_tx_digests[agent_addr] = tx_digest
-
-    @property
-    def confirmed_mint_tokens_agents(self) -> List[str]:
-        """Get the agents which are confirmed to have minted tokens on chain."""
-        return self._confirmed_mint_tokens_agents
-
-    def add_confirmed_mint_tokens_agents(self, agent_addr: str) -> None:
-        """
-        Set agent addresses whose tokens have been minted.
-
-        :param agent_addr: the agent address
-        """
-        enforce(
-            agent_addr not in self.confirmed_mint_tokens_agents,
-            "Agent already in list.",
-        )
-        self._confirmed_mint_tokens_agents.append(agent_addr)
-
-
-class Game(BaseGame):
-    """A class to manage a TAC instance."""
-
-    def __init__(self, **kwargs):
-        """Instantiate the search class."""
-        super().__init__(**kwargs)
-        self._contract_manager = ContractManager()
-
-    @property
-    def contract_manager(self) -> ContractManager:
-        """Get the contract manager."""
-        return self._contract_manager
+Transactions = BaseTransactions
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index 37ded8d678..304445a5e3 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -19,8 +19,10 @@
 
 """This package contains the handlers."""
 
-from typing import cast
+from typing import Optional, cast
 
+from aea.configurations.base import ProtocolId
+from aea.crypto.ledger_apis import LedgerApis
 from aea.protocols.base import Message
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
@@ -29,9 +31,20 @@
     OefSearchHandler as BaseOefSearchHandler,
 )
 from packages.fetchai.skills.tac_control.handlers import TacHandler as BaseTacHandler
-from packages.fetchai.skills.tac_control_contract.game import Game, Phase
+from packages.fetchai.skills.tac_control_contract.dialogues import (
+    ContractApiDialogue,
+    ContractApiDialogues,
+    ContractApiMessage,
+    LedgerApiDialogue,
+    LedgerApiDialogues,
+    LedgerApiMessage,
+    SigningDialogue,
+    SigningDialogues,
+)
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
+LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
+
 
 TacHandler = BaseTacHandler
 
@@ -39,10 +52,134 @@
 OefSearchHandler = BaseOefSearchHandler
 
 
+class ContractApiHandler(Handler):
+    """Implement the contract api handler."""
+
+    SUPPORTED_PROTOCOL = ContractApiMessage.protocol_id  # type: Optional[ProtocolId]
+
+    def setup(self) -> None:
+        """Implement the setup for the handler."""
+        pass
+
+    def handle(self, message: Message) -> None:
+        """
+        Implement the reaction to a message.
+
+        :param message: the message
+        :return: None
+        """
+        contract_api_msg = cast(ContractApiMessage, message)
+
+        # recover dialogue
+        contract_api_dialogues = cast(
+            ContractApiDialogues, self.context.contract_api_dialogues
+        )
+        contract_api_dialogue = cast(
+            Optional[ContractApiDialogue],
+            contract_api_dialogues.update(contract_api_msg),
+        )
+        if contract_api_dialogue is None:
+            self._handle_unidentified_dialogue(contract_api_msg)
+            return
+
+        # handle message
+        if (
+            contract_api_msg.performative
+            is ContractApiMessage.Performative.RAW_TRANSACTION
+        ):
+            self._handle_raw_transaction(contract_api_msg, contract_api_dialogue)
+        elif contract_api_msg.performative == ContractApiMessage.Performative.ERROR:
+            self._handle_error(contract_api_msg, contract_api_dialogue)
+        else:
+            self._handle_invalid(contract_api_msg, contract_api_dialogue)
+
+    def teardown(self) -> None:
+        """
+        Implement the handler teardown.
+
+        :return: None
+        """
+        pass
+
+    def _handle_unidentified_dialogue(
+        self, contract_api_msg: ContractApiMessage
+    ) -> None:
+        """
+        Handle an unidentified dialogue.
+
+        :param msg: the message
+        """
+        self.context.logger.info(
+            "received invalid contract_api message={}, unidentified dialogue.".format(
+                contract_api_msg
+            )
+        )
+
+    def _handle_raw_transaction(
+        self,
+        contract_api_msg: ContractApiMessage,
+        contract_api_dialogue: ContractApiDialogue,
+    ) -> None:
+        """
+        Handle a message of raw_transaction performative.
+
+        :param contract_api_message: the ledger api message
+        :param contract_api_dialogue: the ledger api dialogue
+        """
+        self.context.logger.info("received raw transaction={}".format(contract_api_msg))
+        signing_dialogues = cast(SigningDialogues, self.context.signing_dialogues)
+        signing_msg, signing_dialogue = signing_dialogues.create(
+            counterparty=self.context.decision_maker_address,
+            performative=SigningMessage.Performative.SIGN_TRANSACTION,
+            raw_transaction=contract_api_msg.raw_transaction,
+            terms=contract_api_dialogue.terms,
+        )
+        signing_dialogue = cast(SigningDialogue, signing_dialogue)
+        signing_dialogue.associated_contract_api_dialogue = contract_api_dialogue
+        self.context.decision_maker_message_queue.put_nowait(signing_msg)
+        self.context.logger.info(
+            "proposing the transaction to the decision maker. Waiting for confirmation ..."
+        )
+
+    def _handle_error(
+        self,
+        contract_api_msg: ContractApiMessage,
+        contract_api_dialogue: ContractApiDialogue,
+    ) -> None:
+        """
+        Handle a message of error performative.
+
+        :param contract_api_message: the ledger api message
+        :param contract_api_dialogue: the ledger api dialogue
+        """
+        self.context.logger.info(
+            "received ledger_api error message={} in dialogue={}.".format(
+                contract_api_msg, contract_api_dialogue
+            )
+        )
+
+    def _handle_invalid(
+        self,
+        contract_api_msg: ContractApiMessage,
+        contract_api_dialogue: ContractApiDialogue,
+    ) -> None:
+        """
+        Handle a message of invalid performative.
+
+        :param contract_api_message: the ledger api message
+        :param contract_api_dialogue: the ledger api dialogue
+        """
+        self.context.logger.warning(
+            "cannot handle contract_api message of performative={} in dialogue={}.".format(
+                contract_api_msg.performative, contract_api_dialogue,
+            )
+        )
+
+
 class SigningHandler(Handler):
     """Implement the transaction handler."""
 
-    SUPPORTED_PROTOCOL = SigningMessage.protocol_id
+    SUPPORTED_PROTOCOL = SigningMessage.protocol_id  # type: Optional[ProtocolId]
 
     def setup(self) -> None:
         """Implement the setup for the handler."""
@@ -55,41 +192,24 @@ def handle(self, message: Message) -> None:
         :param message: the message
         :return: None
         """
-        signing_msg_response = cast(SigningMessage, message)
-        game = cast(Game, self.context.game)
-        parameters = cast(Parameters, self.context.parameters)
-        ledger_api = self.context.ledger_apis.get_api(parameters.ledger)
-        if signing_msg_response.dialogue_reference[0] == "contract_deploy":
-            game.phase = Phase.CONTRACT_DEPLOYING
-            self.context.logger.info("sending deployment transaction to the ledger...")
-            tx_signed = signing_msg_response.signed_transaction
-            tx_digest = ledger_api.send_signed_transaction(tx_signed=tx_signed)
-            if tx_digest is None:
-                self.context.logger.warning("sending transaction failed. Aborting!")
-                self.context.is_active = False
-            else:
-                game.contract_manager.deploy_tx_digest = tx_digest
-        elif signing_msg_response.dialogue_reference[0] == "contract_create_batch":
-            game.phase = Phase.TOKENS_CREATING
-            self.context.logger.info("sending creation transaction to the ledger...")
-            tx_signed = signing_msg_response.signed_transaction
-            tx_digest = ledger_api.send_signed_transaction(tx_signed=tx_signed)
-            if tx_digest is None:
-                self.context.logger.warning("sending transaction failed. Aborting!")
-                self.context.is_active = False
-            else:
-                game.contract_manager.create_tokens_tx_digest = tx_digest
-        elif signing_msg_response.dialogue_reference[0] == "contract_mint_batch":
-            game.phase = Phase.TOKENS_MINTING
-            self.context.logger.info("sending minting transaction to the ledger...")
-            tx_signed = signing_msg_response.signed_transaction
-            agent_addr = signing_msg_response.terms.counterparty_address
-            tx_digest = ledger_api.send_signed_transaction(tx_signed=tx_signed)
-            if tx_digest is None:
-                self.context.logger.warning("sending transaction failed. Aborting!")
-                self.context.is_active = False
-            else:
-                game.contract_manager.set_mint_tokens_tx_digest(agent_addr, tx_digest)
+        signing_msg = cast(SigningMessage, message)
+
+        # recover dialogue
+        signing_dialogues = cast(SigningDialogues, self.context.signing_dialogues)
+        signing_dialogue = cast(
+            Optional[SigningDialogue], signing_dialogues.update(signing_msg)
+        )
+        if signing_dialogue is None:
+            self._handle_unidentified_dialogue(signing_msg)
+            return
+
+        # handle message
+        if signing_msg.performative is SigningMessage.Performative.SIGNED_TRANSACTION:
+            self._handle_signed_transaction(signing_msg, signing_dialogue)
+        elif signing_msg.performative is SigningMessage.Performative.ERROR:
+            self._handle_error(signing_msg, signing_dialogue)
+        else:
+            self._handle_invalid(signing_msg, signing_dialogue)
 
     def teardown(self) -> None:
         """
@@ -98,3 +218,242 @@ def teardown(self) -> None:
         :return: None
         """
         pass
+
+    def _handle_unidentified_dialogue(self, signing_msg: SigningMessage) -> None:
+        """
+        Handle an unidentified dialogue.
+
+        :param msg: the message
+        """
+        self.context.logger.info(
+            "received invalid signing message={}, unidentified dialogue.".format(
+                signing_msg
+            )
+        )
+
+    def _handle_signed_transaction(
+        self, signing_msg: SigningMessage, signing_dialogue: SigningDialogue
+    ) -> None:
+        """
+        Handle an oef search message.
+
+        :param signing_msg: the signing message
+        :param signing_dialogue: the dialogue
+        :return: None
+        """
+        self.context.logger.info("transaction signing was successful.")
+        ledger_api_dialogues = cast(
+            LedgerApiDialogues, self.context.ledger_api_dialogues
+        )
+        ledger_api_msg, ledger_api_dialogue = ledger_api_dialogues.create(
+            counterparty=LEDGER_API_ADDRESS,
+            performative=LedgerApiMessage.Performative.SEND_SIGNED_TRANSACTION,
+            signed_transaction=signing_msg.signed_transaction,
+        )
+        ledger_api_dialogue = cast(LedgerApiDialogue, ledger_api_dialogue)
+        ledger_api_dialogue.associated_signing_dialogue = signing_dialogue
+        self.context.outbox.put_message(message=ledger_api_msg)
+        self.context.logger.info("sending transaction to ledger.")
+
+    def _handle_error(
+        self, signing_msg: SigningMessage, signing_dialogue: SigningDialogue
+    ) -> None:
+        """
+        Handle an oef search message.
+
+        :param signing_msg: the signing message
+        :param signing_dialogue: the dialogue
+        :return: None
+        """
+        self.context.logger.info(
+            "transaction signing was not successful. Error_code={} in dialogue={}".format(
+                signing_msg.error_code, signing_dialogue
+            )
+        )
+
+    def _handle_invalid(
+        self, signing_msg: SigningMessage, signing_dialogue: SigningDialogue
+    ) -> None:
+        """
+        Handle an oef search message.
+
+        :param signing_msg: the signing message
+        :param signing_dialogue: the dialogue
+        :return: None
+        """
+        self.context.logger.warning(
+            "cannot handle signing message of performative={} in dialogue={}.".format(
+                signing_msg.performative, signing_dialogue
+            )
+        )
+
+
+class LedgerApiHandler(Handler):
+    """Implement the ledger api handler."""
+
+    SUPPORTED_PROTOCOL = LedgerApiMessage.protocol_id  # type: Optional[ProtocolId]
+
+    def setup(self) -> None:
+        """Implement the setup for the handler."""
+        pass
+
+    def handle(self, message: Message) -> None:
+        """
+        Implement the reaction to a message.
+
+        :param message: the message
+        :return: None
+        """
+        ledger_api_msg = cast(LedgerApiMessage, message)
+
+        # recover dialogue
+        ledger_api_dialogues = cast(
+            LedgerApiDialogues, self.context.ledger_api_dialogues
+        )
+        ledger_api_dialogue = cast(
+            Optional[LedgerApiDialogue], ledger_api_dialogues.update(ledger_api_msg)
+        )
+        if ledger_api_dialogue is None:
+            self._handle_unidentified_dialogue(ledger_api_msg)
+            return
+
+        # handle message
+        if ledger_api_msg.performative is LedgerApiMessage.Performative.BALANCE:
+            self._handle_balance(ledger_api_msg)
+        elif (
+            ledger_api_msg.performative
+            is LedgerApiMessage.Performative.TRANSACTION_DIGEST
+        ):
+            self._handle_transaction_digest(ledger_api_msg, ledger_api_dialogue)
+        elif (
+            ledger_api_msg.performative
+            is LedgerApiMessage.Performative.TRANSACTION_RECEIPT
+        ):
+            self._handle_transaction_receipt(ledger_api_msg)
+        elif ledger_api_msg.performative == LedgerApiMessage.Performative.ERROR:
+            self._handle_error(ledger_api_msg, ledger_api_dialogue)
+        else:
+            self._handle_invalid(ledger_api_msg, ledger_api_dialogue)
+
+    def teardown(self) -> None:
+        """
+        Implement the handler teardown.
+
+        :return: None
+        """
+        pass
+
+    def _handle_unidentified_dialogue(self, ledger_api_msg: LedgerApiMessage) -> None:
+        """
+        Handle an unidentified dialogue.
+
+        :param msg: the message
+        """
+        self.context.logger.info(
+            "received invalid ledger_api message={}, unidentified dialogue.".format(
+                ledger_api_msg
+            )
+        )
+
+    def _handle_balance(self, ledger_api_msg: LedgerApiMessage) -> None:
+        """
+        Handle a message of balance performative.
+
+        :param ledger_api_message: the ledger api message
+        """
+        self.context.logger.info(
+            "starting balance on {} ledger={}.".format(
+                ledger_api_msg.ledger_id, ledger_api_msg.balance,
+            )
+        )
+
+    def _handle_transaction_digest(
+        self, ledger_api_msg: LedgerApiMessage, ledger_api_dialogue: LedgerApiDialogue
+    ) -> None:
+        """
+        Handle a message of transaction_digest performative.
+
+        :param ledger_api_message: the ledger api message
+        :param ledger_api_dialogue: the ledger api dialogue
+        """
+        self.context.logger.info(
+            "transaction was successfully submitted. Transaction digest={}".format(
+                ledger_api_msg.transaction_digest
+            )
+        )
+        msg = ledger_api_dialogue.reply(
+            performative=LedgerApiMessage.Performative.GET_TRANSACTION_RECEIPT,
+            target_message=ledger_api_msg,
+            transaction_digest=ledger_api_msg.transaction_digest,
+        )
+        self.context.outbox.put_message(message=msg)
+        self.context.logger.info("requesting transaction receipt.")
+
+    def _handle_transaction_receipt(self, ledger_api_msg: LedgerApiMessage) -> None:
+        """
+        Handle a message of transaction_receipt performative.
+
+        :param ledger_api_message: the ledger api message
+        """
+        is_transaction_successful = LedgerApis.is_transaction_settled(
+            ledger_api_msg.transaction_receipt.ledger_id,
+            ledger_api_msg.transaction_receipt.receipt,
+        )
+        if is_transaction_successful:
+            self.context.logger.info(
+                "transaction was successfully settled. Transaction receipt={}".format(
+                    ledger_api_msg.transaction_receipt
+                )
+            )
+            parameters = cast(Parameters, self.context.parameters)
+            if not parameters.contract_manager.is_contract_deployed:
+                contract_address = ledger_api_msg.transaction_receipt.receipt.get(
+                    "contractAddress", None
+                )
+                parameters.contract_address = contract_address
+                parameters.contract_manager.is_contract_deployed = is_transaction_successful
+            elif not parameters.contract_manager.is_tokens_created:
+                parameters.contract_manager.is_tokens_created = is_transaction_successful
+            elif not parameters.contract_manager.is_tokens_minted:
+                parameters.is_tokens_minted = is_transaction_successful
+            elif parameters.is_tokens_minted:
+                self.context.is_active = False
+                self.context.logger.info("demo finished!")
+            else:
+                self.context.logger.error("unexpected transaction receipt!")
+        else:
+            self.context.logger.error(
+                "transaction failed. Transaction receipt={}".format(
+                    ledger_api_msg.transaction_receipt
+                )
+            )
+
+    def _handle_error(
+        self, ledger_api_msg: LedgerApiMessage, ledger_api_dialogue: LedgerApiDialogue
+    ) -> None:
+        """
+        Handle a message of error performative.
+
+        :param ledger_api_message: the ledger api message
+        :param ledger_api_dialogue: the ledger api dialogue
+        """
+        self.context.logger.info(
+            "received ledger_api error message={} in dialogue={}.".format(
+                ledger_api_msg, ledger_api_dialogue
+            )
+        )
+
+    def _handle_invalid(
+        self, ledger_api_msg: LedgerApiMessage, ledger_api_dialogue: LedgerApiDialogue
+    ) -> None:
+        """
+        Handle a message of invalid performative.
+
+        :param ledger_api_message: the ledger api message
+        :param ledger_api_dialogue: the ledger api dialogue
+        """
+        self.context.logger.warning(
+            "cannot handle ledger_api message of performative={} in dialogue={}.".format(
+                ledger_api_msg.performative, ledger_api_dialogue,
+            )
+        )
diff --git a/packages/fetchai/skills/tac_control_contract/parameters.py b/packages/fetchai/skills/tac_control_contract/parameters.py
index 5046c98a66..f9ea7ee3b0 100644
--- a/packages/fetchai/skills/tac_control_contract/parameters.py
+++ b/packages/fetchai/skills/tac_control_contract/parameters.py
@@ -19,7 +19,148 @@
 
 """This package contains a class representing the game parameters."""
 
+from typing import Dict, List, Optional
+
+from aea.exceptions import AEAEnforceError, enforce
+from aea.helpers.transaction.base import Terms
+
 from packages.fetchai.skills.tac_control.parameters import Parameters as BaseParameters
 
 
-Parameters = BaseParameters
+class ContractManager:
+    """Class managing the contract."""
+
+    def __init__(self, is_contract_deployed: bool = False):
+        """Instantiate the contract manager class."""
+        self._deploy_tx_digest = None  # type: Optional[str]
+        self._create_tokens_tx_digest = None  # type: Optional[str]
+        self._mint_tokens_tx_digests = {}  # type: Dict[str, str]
+        self._confirmed_mint_tokens_agents = []  # type: List[str]
+        self.is_contract_deployed = is_contract_deployed
+        self.is_tokens_created = False
+        self.is_tokens_minted = False
+
+    @property
+    def deploy_tx_digest(self) -> str:
+        """Get the contract deployment tx digest."""
+        if self._deploy_tx_digest is None:
+            raise AEAEnforceError("Deploy_tx_digest is not set yet!")
+        return self._deploy_tx_digest
+
+    @deploy_tx_digest.setter
+    def deploy_tx_digest(self, deploy_tx_digest: str) -> None:
+        """Set the contract deployment tx digest."""
+        enforce(self._deploy_tx_digest is None, "Deploy_tx_digest already set!")
+        self._deploy_tx_digest = deploy_tx_digest
+
+    @property
+    def create_tokens_tx_digest(self) -> str:
+        """Get the contract deployment tx digest."""
+        if self._create_tokens_tx_digest is None:
+            raise AEAEnforceError("Create_tokens_tx_digest is not set yet!")
+        return self._create_tokens_tx_digest
+
+    @create_tokens_tx_digest.setter
+    def create_tokens_tx_digest(self, create_tokens_tx_digest: str) -> None:
+        """Set the contract deployment tx digest."""
+        enforce(
+            self._create_tokens_tx_digest is None,
+            "Create_tokens_tx_digest already set!",
+        )
+        self._create_tokens_tx_digest = create_tokens_tx_digest
+
+    @property
+    def mint_tokens_tx_digests(self) -> Dict[str, str]:
+        """Get the mint tokens tx digests."""
+        return self._mint_tokens_tx_digests
+
+    def set_mint_tokens_tx_digest(self, agent_addr: str, tx_digest: str) -> None:
+        """
+        Set a mint token tx digest for an agent.
+
+        :param agent_addr: the agent addresss
+        :param tx_digest: the transaction digest
+        """
+        enforce(
+            agent_addr not in self._mint_tokens_tx_digests, "Tx digest already set."
+        )
+        self._mint_tokens_tx_digests[agent_addr] = tx_digest
+
+    @property
+    def confirmed_mint_tokens_agents(self) -> List[str]:
+        """Get the agents which are confirmed to have minted tokens on chain."""
+        return self._confirmed_mint_tokens_agents
+
+    def add_confirmed_mint_tokens_agents(self, agent_addr: str) -> None:
+        """
+        Set agent addresses whose tokens have been minted.
+
+        :param agent_addr: the agent address
+        """
+        enforce(
+            agent_addr not in self.confirmed_mint_tokens_agents,
+            "Agent already in list.",
+        )
+        self._confirmed_mint_tokens_agents.append(agent_addr)
+
+
+class Parameters(BaseParameters):
+    """This class contains the parameters of the game."""
+
+    def __init__(self, **kwargs):
+        """Instantiate the parameter class."""
+        super().__init__(**kwargs)
+        self._contract_manager = ContractManager()
+
+    @property
+    def contract_manager(self) -> ContractManager:
+        """Get contract manager."""
+        return self._contract_manager
+
+    def get_deploy_terms(self) -> Terms:
+        """
+        Get deploy terms of deployment.
+
+        :return: terms
+        """
+        terms = Terms(
+            ledger_id=self.ledger_id,
+            sender_address=self.context.agent_address,
+            counterparty_address=self.context.agent_address,
+            amount_by_currency_id={},
+            quantities_by_good_id={},
+            nonce="",
+        )
+        return terms
+
+    def get_create_token_terms(self) -> Terms:
+        """
+        Get create token terms of deployment.
+
+        :return: terms
+        """
+        terms = Terms(
+            ledger_id=self.ledger_id,
+            sender_address=self.context.agent_address,
+            counterparty_address=self.context.agent_address,
+            amount_by_currency_id={},
+            quantities_by_good_id={},
+            nonce="",
+        )
+        return terms
+
+    def get_mint_token_terms(self) -> Terms:
+        """
+        Get mint token terms of deployment.
+
+        :return: terms
+        """
+        terms = Terms(
+            ledger_id=self.ledger_id,
+            sender_address=self.context.agent_address,
+            counterparty_address=self.context.agent_address,
+            amount_by_currency_id={},
+            quantities_by_good_id={},
+            nonce="",
+        )
+        return terms
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index e23ef0f683..ac1f539616 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -18,35 +18,46 @@ fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
+- fetchai/contract_api:0.5.0
+- fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
+- fetchai/signing:0.3.0
 - fetchai/tac:0.6.0
 skills:
 - fetchai/tac_control:0.7.0
 behaviours:
-  contract:
-    args:
-      tick_interval: 5
-    class_name: ContractBehaviour
   tac:
     args: {}
     class_name: TacBehaviour
 handlers:
+  contract_api:
+    args: {}
+    class_name: ContractApiHandler
+  ledger_api:
+    args: {}
+    class_name: LedgerApiHandler
   oef:
     args: {}
     class_name: OefSearchHandler
+  signing:
+    args: {}
+    class_name: SigningHandler
   tac:
     args: {}
     class_name: TacHandler
-  transaction:
-    args: {}
-    class_name: TransactionHandler
 models:
+  contract_api_dialogues:
+    args: {}
+    class_name: ContractApiDialogues
   default_dialogues:
     args: {}
     class_name: DefaultDialogues
   game:
     args: {}
     class_name: Game
+  ledger_api_dialogues:
+    args: {}
+    class_name: LedgerApiDialogues
   oef_search_dialogues:
     args: {}
     class_name: OefSearchDialogues
@@ -76,6 +87,9 @@ models:
       version_id: v1
       whitelist: []
     class_name: Parameters
+  signing_dialogues:
+    args: {}
+    class_name: SigningDialogues
   tac_dialogues:
     args: {}
     class_name: TacDialogues

From 966992126488f5ab565fe5c609a7dd1ed5213915 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 21 Sep 2020 15:29:05 +0300
Subject: [PATCH 028/131] set declared name test for soef integration

---
 .../test_soef/test_soef_integration.py        | 59 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 46d4405451..49c620805b 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -20,6 +20,7 @@
 
 import logging
 import time
+import urllib
 from threading import Thread
 from typing import Any, Dict, Optional, Tuple, cast
 from urllib.parse import urlencode
@@ -236,7 +237,6 @@ class TestRealNetwork:
     @pytest.mark.integration
     def test_search_no_filters(self):
         """Perform tests over real networ with no filters."""
-
         agent_location = Location(*self.LOCATION)
         agent = Instance(agent_location)
         agent2 = Instance(agent_location)
@@ -382,3 +382,60 @@ def test_generic_command(self):
 
         finally:
             agent.stop()
+
+    @pytest.mark.integration
+    def test_generic_command_set_declared_name(self):
+        """Test generic command."""
+        agent_location = Location(*self.LOCATION)
+        agent1 = Instance(agent_location)
+        agent1.start()
+        agent2 = Instance(agent_location)
+        agent2.start()
+
+        declared_name = "new_declared_name"
+        try:
+            # send generic command."""
+            service_description = Description(
+                {
+                    "command": "set_declared_name",
+                    "parameters": urllib.parse.urlencode({"name": declared_name}),
+                },
+                data_model=models.AGENT_GENERIC_COMMAND_MODEL,
+            )
+            message, _ = agent1.oef_search_dialogues.create(
+                performative=OefSearchMessage.Performative.REGISTER_SERVICE,
+                service_description=service_description,
+                counterparty=SOEFConnection.connection_id.latest,
+            )
+
+            envelope = Envelope(
+                to=message.to,
+                sender=message.sender,
+                protocol_id=message.protocol_id,
+                message=message,
+            )
+            agent1.multiplexer.put(envelope)
+
+            envelope = agent1.get()
+            assert (
+                envelope.message.performative == OefSearchMessage.Performative.SUCCESS
+            )
+
+            radius = 0.1
+            close_to_my_service = Constraint(
+                "location", ConstraintType("distance", (agent_location, radius))
+            )
+            closeness_query = Query(
+                [close_to_my_service], model=models.AGENT_LOCATION_MODEL
+            )
+
+            message = agent2.search(closeness_query)
+            assert message.performative == OefSearchMessage.Performative.SEARCH_RESULT
+            assert len(message.agents) >= 1
+
+            assert agent1.address in message.agents_info.body
+            assert message.agents_info.body[agent1.address]["name"] == declared_name
+
+        finally:
+            agent1.stop()
+            agent2.stop()

From c43375f7da2a9c683de99653d7ebe7f150a35b22 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 15:40:49 +0200
Subject: [PATCH 029/131] make add/fetch/remove commands to accept 'latest' as
 public id version.

---
 aea/cli/add.py                          |  8 ++----
 aea/cli/fetch.py                        |  2 +-
 aea/cli/remove.py                       |  7 +++---
 aea/cli/utils/package_utils.py          | 31 ++++++++++++++++++++---
 aea/configurations/base.py              |  4 +++
 aea/registries/base.py                  |  1 -
 scripts/whitelist.py                    |  1 +
 tests/test_cli/test_fetch.py            | 21 ++++++++--------
 tests/test_cli/test_utils/test_utils.py | 33 +++++++++++++++++++++++++
 tests/test_configurations/test_base.py  | 16 ++++++++++++
 10 files changed, 98 insertions(+), 26 deletions(-)

diff --git a/aea/cli/add.py b/aea/cli/add.py
index 0049ee4202..093a881751 100644
--- a/aea/cli/add.py
+++ b/aea/cli/add.py
@@ -35,14 +35,10 @@
     get_package_path,
     is_fingerprint_correct,
     is_item_present,
+    is_local_item,
     register_item,
 )
 from aea.configurations.base import PublicId
-from aea.configurations.constants import (
-    DEFAULT_CONNECTION,
-    DEFAULT_SKILL,
-    LOCAL_PROTOCOLS,
-)
 
 
 @click.group()
@@ -116,7 +112,7 @@ def add_item(ctx: Context, item_type: str, item_public_id: PublicId) -> None:
     is_local = ctx.config.get("is_local")
 
     ctx.clean_paths.append(dest_path)
-    if item_public_id in [DEFAULT_CONNECTION, *LOCAL_PROTOCOLS, DEFAULT_SKILL]:
+    if is_local_item(item_public_id):
         source_path = find_item_in_distribution(ctx, item_type, item_public_id)
         package_path = copy_package_directory(source_path, dest_path)
     elif is_local:
diff --git a/aea/cli/fetch.py b/aea/cli/fetch.py
index 05d8a076f7..e10b9eae29 100644
--- a/aea/cli/fetch.py
+++ b/aea/cli/fetch.py
@@ -61,7 +61,7 @@ def _is_version_correct(ctx: Context, agent_public_id: PublicId) -> bool:
 
     :return: bool is version correct.
     """
-    return (
+    return ctx.agent_config.public_id.same_prefix(agent_public_id) and (
         agent_public_id.package_version.is_latest
         or ctx.agent_config.version == agent_public_id.version
     )
diff --git a/aea/cli/remove.py b/aea/cli/remove.py
index 7e8243d7d7..d301368503 100644
--- a/aea/cli/remove.py
+++ b/aea/cli/remove.py
@@ -112,9 +112,8 @@ def remove_item(ctx: Context, item_type: str, item_id: PublicId) -> None:
         )
     )
 
-    if (
-        item_id not in existing_items_name_to_ids.keys()
-        and item_id not in existing_item_ids
+    if item_name not in existing_items_name_to_ids.keys() and not any(
+        item_id.same_prefix(existing_id) for existing_id in existing_item_ids
     ):
         raise click.ClickException(
             "The {} '{}' is not supported.".format(item_type, item_id)
@@ -144,7 +143,7 @@ def remove_item(ctx: Context, item_type: str, item_id: PublicId) -> None:
     except BaseException:
         raise click.ClickException("An error occurred.")
 
-    # removing the protocol to the configurations.
+    # removing the item from the configurations.
     item_public_id = existing_items_name_to_ids[item_name]
     logger.debug("Removing the {} from {}".format(item_type, DEFAULT_AEA_CONFIG_FILE))
     existing_item_ids.remove(item_public_id)
diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py
index bf3a7b91c2..20c06a9cf7 100644
--- a/aea/cli/utils/package_utils.py
+++ b/aea/cli/utils/package_utils.py
@@ -23,7 +23,7 @@
 import re
 import shutil
 from pathlib import Path
-from typing import Optional
+from typing import List, Optional
 
 import click
 
@@ -41,6 +41,11 @@
     _compute_fingerprint,
     _get_default_configuration_file_name_from_type,
 )
+from aea.configurations.constants import (
+    DEFAULT_CONNECTION,
+    DEFAULT_SKILL,
+    LOCAL_PROTOCOLS,
+)
 from aea.configurations.loader import ConfigLoader
 from aea.crypto.helpers import verify_or_create_private_keys
 from aea.crypto.ledger_apis import DEFAULT_LEDGER_CONFIGS, LedgerApis
@@ -270,7 +275,7 @@ def find_item_locally(ctx, item_type, item_public_id) -> Path:
 
 
 def find_item_in_distribution(  # pylint: disable=unused-argument
-    ctx, item_type, item_public_id
+    ctx, item_type, item_public_id: PublicId
 ) -> Path:
     """
     Find an item in the AEA directory.
@@ -310,7 +315,10 @@ def find_item_in_distribution(  # pylint: disable=unused-argument
     # check that the configuration file of the found package matches the expected author and version.
     version = item_configuration.version
     author = item_configuration.author
-    if item_public_id.author != author or item_public_id.version != version:
+    if item_public_id.author != author or (
+        not item_public_id.package_version.is_latest
+        and item_public_id.version != version
+    ):
         raise click.ClickException(
             "Cannot find {} with author and version specified.".format(item_type)
         )
@@ -442,6 +450,23 @@ def is_item_present(
     ).exists()
 
 
+def is_local_item(item_public_id: PublicId) -> bool:
+    """
+    Check whether the item public id correspond to a local package.
+
+    If the provided item has version 'latest', only the prefixes are compared.
+    Otherwise, the function will try to match the exact version occurrence among the local packages.
+    """
+    local_packages: List[PublicId] = [
+        DEFAULT_CONNECTION,
+        *LOCAL_PROTOCOLS,
+        DEFAULT_SKILL,
+    ]
+    if item_public_id.package_version.is_latest:
+        return any(item_public_id.same_prefix(other) for other in local_packages)
+    return item_public_id in local_packages
+
+
 def try_get_balance(  # pylint: disable=unused-argument
     agent_config: AgentConfig, wallet: Wallet, type_: str
 ) -> int:
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 390a572cd0..5cec8c5aa7 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -439,6 +439,10 @@ def same_prefix(self, other: "PublicId") -> bool:
         """Check if the other public id has the same author and name of this."""
         return self.name == other.name and self.author == other.author
 
+    def to_latest(self) -> "PublicId":
+        """Return the same public id, but with latest version."""
+        return PublicId(self.author, self.name, self.LATEST_VERSION)
+
     @classmethod
     def from_str(cls, public_id_string: str) -> "PublicId":
         """
diff --git a/aea/registries/base.py b/aea/registries/base.py
index 98ba2fff37..f7c05a2383 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -543,7 +543,6 @@ def register(
             protocol_handlers_by_skill is not None
             and skill_id in protocol_handlers_by_skill.ids()
         ):
-            # clean up previous modifications done by super().register
             raise ValueError(
                 "A handler already registered with pair of protocol id {} and skill id {}".format(
                     protocol_id, skill_id
diff --git a/scripts/whitelist.py b/scripts/whitelist.py
index 735667e245..296f020813 100644
--- a/scripts/whitelist.py
+++ b/scripts/whitelist.py
@@ -62,6 +62,7 @@
 STOPPING  # unused variable (aea/cli_gui/utils.py:35)
 _call_subprocess  # unused function (aea/cli_gui/utils.py:44)
 _.latest  # unused property (aea/configurations/base.py:384)
+_.to_latest  # unused property (aea/configurations/base.py:442)
 _.to_uri_path  # unused property (aea/configurations/base.py:445)
 _.to_uri_path  # unused property (aea/configurations/base.py:605)
 _.has_crypto_store  # unused property (aea/connections/base.py:138)
diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index a9a5af2e7f..9d92e3b934 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -27,7 +27,7 @@
 
 from aea.cli import cli
 from aea.cli.fetch import _is_version_correct, fetch_agent_locally
-from aea.configurations.base import PackageVersion
+from aea.configurations.base import PublicId
 from aea.test_tools.test_cases import AEATestCaseMany
 
 from tests.conftest import CLI_LOG_OPTION, CliRunner, MAX_FLAKY_RERUNS
@@ -128,20 +128,19 @@ class IsVersionCorrectTestCase(TestCase):
 
     def test__is_version_correct_positive(self):
         """Test for _is_version_correct method positive result."""
-        package_version = PackageVersion("0.1.0")
-        ctx_mock = ContextMock(version=str(package_version))
-        public_id_mock = PublicIdMock()
-        public_id_mock.package_version = package_version
-        result = _is_version_correct(ctx_mock, public_id_mock)
+        public_id = PublicId("author", "package", "0.1.0")
+        ctx_mock = ContextMock()
+        ctx_mock.agent_config.public_id = public_id
+        result = _is_version_correct(ctx_mock, public_id)
         self.assertTrue(result)
 
     def test__is_version_correct_negative(self):
         """Test for _is_version_correct method negative result."""
-        package_version = PackageVersion("0.1.0")
-        ctx_mock = ContextMock(version="0.1.1")
-        public_id_mock = PublicIdMock()
-        public_id_mock.package_version = package_version
-        result = _is_version_correct(ctx_mock, public_id_mock)
+        public_id_a = PublicId("author", "package", "0.1.0")
+        public_id_b = PublicId("author", "package", "0.1.1")
+        ctx_mock = ContextMock()
+        ctx_mock.agent_config.public_id = public_id_b
+        result = _is_version_correct(ctx_mock, public_id_a)
         self.assertFalse(result)
 
 
diff --git a/tests/test_cli/test_utils/test_utils.py b/tests/test_cli/test_utils/test_utils.py
index 79349330d9..01bf05c49f 100644
--- a/tests/test_cli/test_utils/test_utils.py
+++ b/tests/test_cli/test_utils/test_utils.py
@@ -47,12 +47,21 @@
     get_package_path_unified,
     is_fingerprint_correct,
     is_item_present_unified,
+    is_local_item,
     try_get_balance,
     try_get_item_source_path,
     try_get_item_target_path,
     validate_author_name,
     validate_package_name,
 )
+from aea.configurations.base import PublicId
+from aea.configurations.constants import (
+    DEFAULT_CONNECTION,
+    DEFAULT_PROTOCOL,
+    DEFAULT_SKILL,
+    SIGNING_PROTOCOL,
+    STATE_UPDATE_PROTOCOL,
+)
 
 from tests.conftest import FETCHAI
 from tests.test_cli.tools_for_testing import (
@@ -454,3 +463,27 @@ def test_is_item_present_unified(mock_, vendor):
     public_id_mock = mock.MagicMock(author="some_author")
     result = is_item_present_unified(contex_mock, "some_component_type", public_id_mock)
     assert not result
+
+
+@pytest.mark.parametrize(
+    ["public_id", "expected_outcome"],
+    [
+        (PublicId.from_str("author/package:0.1.0"), False),
+        (PublicId.from_str("author/package:latest"), False),
+        (PublicId.from_str("fetchai/oef:0.1.0"), False),
+        (PublicId.from_str("fetchai/oef:latest"), False),
+        (DEFAULT_CONNECTION, True),
+        (DEFAULT_SKILL, True),
+        (DEFAULT_PROTOCOL, True),
+        (SIGNING_PROTOCOL, True),
+        (STATE_UPDATE_PROTOCOL, True),
+        (DEFAULT_CONNECTION.to_latest(), True),
+        (DEFAULT_SKILL.to_latest(), True),
+        (DEFAULT_PROTOCOL.to_latest(), True),
+        (SIGNING_PROTOCOL.to_latest(), True),
+        (STATE_UPDATE_PROTOCOL.to_latest(), True),
+    ],
+)
+def test_is_local_item(public_id, expected_outcome):
+    """Test the 'is_local_item' CLI utility function."""
+    assert is_local_item(public_id) is expected_outcome
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 90d27cefa2..5c4c842131 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -480,6 +480,22 @@ def test_pubic_id_repr():
     assert repr(public_id) == "<author/name:0.1.0>"
 
 
+def test_pubic_id_same_prefix():
+    """Test PublicId.same_prefix"""
+    same_1 = PublicId("author", "name", "0.1.0")
+    same_2 = PublicId("author", "name", "0.1.1")
+    different = PublicId("author", "different_name", "0.1.0")
+
+    assert same_1.same_prefix(same_2)
+    assert same_2.same_prefix(same_1)
+
+    assert not different.same_prefix(same_1)
+    assert not same_1.same_prefix(different)
+
+    assert not different.same_prefix(same_2)
+    assert not same_2.same_prefix(different)
+
+
 def test_public_id_comparator_when_author_is_different():
     """Test PublicId.__lt__ when author is different."""
     pid1 = PublicId("author_1", "name", "0.1.0")

From ad705faddfb8580c515de18f779471a450396305 Mon Sep 17 00:00:00 2001
From: Oleg Panasevych <panasevychol@gmail.com>
Date: Mon, 21 Sep 2020 17:19:52 +0300
Subject: [PATCH 030/131] CLI reset_password command implemented.

---
 aea/cli/core.py                            |  2 +
 aea/cli/registry/login.py                  | 11 ++++
 aea/cli/reset_password.py                  | 43 ++++++++++++++++
 tests/test_cli/test_misc.py                |  1 +
 tests/test_cli/test_registry/test_login.py | 14 ++++-
 tests/test_cli/test_reset_password.py      | 59 ++++++++++++++++++++++
 6 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 aea/cli/reset_password.py
 create mode 100644 tests/test_cli/test_reset_password.py

diff --git a/aea/cli/core.py b/aea/cli/core.py
index 9bdb9f40db..829a63a0d3 100644
--- a/aea/cli/core.py
+++ b/aea/cli/core.py
@@ -50,6 +50,7 @@
 from aea.cli.push import push
 from aea.cli.register import register
 from aea.cli.remove import remove
+from aea.cli.reset_password import reset_password
 from aea.cli.run import run
 from aea.cli.scaffold import scaffold
 from aea.cli.search import search
@@ -138,6 +139,7 @@ def _init_gui() -> None:
 cli.add_command(push)
 cli.add_command(register)
 cli.add_command(remove)
+cli.add_command(reset_password)
 cli.add_command(run)
 cli.add_command(scaffold)
 cli.add_command(search)
diff --git a/aea/cli/registry/login.py b/aea/cli/registry/login.py
index 4aa307de0e..3bbc6a3879 100644
--- a/aea/cli/registry/login.py
+++ b/aea/cli/registry/login.py
@@ -34,3 +34,14 @@ def registry_login(username: str, password: str) -> str:
         "POST", "/rest-auth/login/", data={"username": username, "password": password}
     )
     return resp["key"]
+
+
+def registry_reset_password(email: str) -> None:
+    """
+    Request Registry to reset password.
+
+    :param email: user email.
+
+    :return: None.
+    """
+    request_api("POST", "/rest-auth/password/reset/", data={"email": email})
diff --git a/aea/cli/reset_password.py b/aea/cli/reset_password.py
new file mode 100644
index 0000000000..4313957b9d
--- /dev/null
+++ b/aea/cli/reset_password.py
@@ -0,0 +1,43 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+
+"""Implementation of the 'aea reset_password' subcommand."""
+
+import click
+
+from aea.cli.registry.login import registry_reset_password
+
+
+@click.command(name="reset_password", help="Reset password of Registry account.")
+@click.argument("email", type=str, required=True)
+def reset_password(email):
+    """Command to request Registry to reset password."""
+    _do_password_reset(email)
+
+
+def _do_password_reset(email: str) -> None:
+    """
+    Request Registry to reset password.
+
+    :param email: str email.
+
+    :return:
+    """
+    registry_reset_password(email)
+    click.echo("A letter with password reset link was sent to {}".format(email))
diff --git a/tests/test_cli/test_misc.py b/tests/test_cli/test_misc.py
index b43b70870c..4d1bbc7e1b 100644
--- a/tests/test_cli/test_misc.py
+++ b/tests/test_cli/test_misc.py
@@ -85,6 +85,7 @@ def test_flag_help():
   push              Push item to Registry or save it in local packages.
   register          Register a new Registry account.
   remove            Remove a resource from the agent.
+  reset_password    Reset password of Registry account.
   run               Run the agent.
   scaffold          Scaffold a resource for the agent.
   search            Search for components in the registry.
diff --git a/tests/test_cli/test_registry/test_login.py b/tests/test_cli/test_registry/test_login.py
index 4b5c45f695..ed1a797212 100644
--- a/tests/test_cli/test_registry/test_login.py
+++ b/tests/test_cli/test_registry/test_login.py
@@ -20,7 +20,7 @@
 
 from unittest import TestCase, mock
 
-from aea.cli.registry.login import registry_login
+from aea.cli.registry.login import registry_login, registry_reset_password
 
 
 @mock.patch("aea.cli.registry.login.request_api", return_value={"key": "key"})
@@ -33,3 +33,15 @@ def test_registry_login_positive(self, request_api_mock):
         expected_result = "key"
         self.assertEqual(result, expected_result)
         request_api_mock.assert_called_once()
+
+
+@mock.patch(
+    "aea.cli.registry.login.request_api", return_value={"message": "Email was sent."}
+)
+class RegistryResetPasswordTestCase(TestCase):
+    """Test case for registry_reset_password method."""
+
+    def test_registry_reset_password_positive(self, request_api_mock):
+        """Test for registry_reset_password method positive result."""
+        registry_reset_password("email@example.com")
+        request_api_mock.assert_called_once()
diff --git a/tests/test_cli/test_reset_password.py b/tests/test_cli/test_reset_password.py
new file mode 100644
index 0000000000..b8b28437c4
--- /dev/null
+++ b/tests/test_cli/test_reset_password.py
@@ -0,0 +1,59 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+"""This test module contains the tests for CLI reset_password command."""
+
+from unittest import TestCase, mock
+
+from aea.cli import cli
+from aea.cli.reset_password import _do_password_reset
+
+from tests.conftest import CLI_LOG_OPTION, CliRunner
+
+
+@mock.patch("aea.cli.reset_password._do_password_reset")
+class ResetPasswordTestCase(TestCase):
+    """Test case for CLI reset_password command."""
+
+    def setUp(self):
+        """Set it up."""
+        self.runner = CliRunner()
+
+    def test_reset_password_positive(self, registry_reset_password_mock):
+        """Test for CLI reset_password positive result."""
+        email = "email@example.com"
+        result = self.runner.invoke(
+            cli, [*CLI_LOG_OPTION, "reset_password", email], standalone_mode=False,
+        )
+        self.assertEqual(result.exit_code, 0)
+        registry_reset_password_mock.assert_called_once_with(email)
+
+
+class DoPasswordResetTestCase(TestCase):
+    """Test case for _do_password_reset method."""
+
+    @mock.patch("aea.cli.reset_password.registry_reset_password")
+    @mock.patch("aea.cli.reset_password.click.echo")
+    def test__do_password_reset_positive(self, echo_mock, registry_reset_password_mock):
+        """Test _do_password_reset for positive result."""
+        email = "email@example.com"
+        _do_password_reset(email)
+        registry_reset_password_mock.assert_called_once_with(email)
+        echo_mock.assert_called_once_with(
+            "A letter with password reset link was sent to {}".format(email)
+        )

From 7423ba776cf7dc3f9a056bf43e8a41e4b0b464c7 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 16:32:07 +0200
Subject: [PATCH 031/131] add tests on 'aea add/fetch/remove' with latest as id
 version

---
 tests/test_cli/test_add/test_connection.py    | 13 ++++++
 tests/test_cli/test_add/test_contract.py      | 15 +++++++
 tests/test_cli/test_add/test_protocol.py      | 13 ++++++
 tests/test_cli/test_add/test_skill.py         | 13 ++++++
 tests/test_cli/test_fetch.py                  | 13 +++++-
 .../{test_remove_item.py => test_base.py}     | 44 ++++++++++++++++++-
 6 files changed, 108 insertions(+), 3 deletions(-)
 rename tests/test_cli/test_remove/{test_remove_item.py => test_base.py} (50%)

diff --git a/tests/test_cli/test_add/test_connection.py b/tests/test_cli/test_add/test_connection.py
index 39d13712e3..e8ecb9b81f 100644
--- a/tests/test_cli/test_add/test_connection.py
+++ b/tests/test_cli/test_add/test_connection.py
@@ -488,3 +488,16 @@ def test_add_connection_from_remote_registry_positive(self):
         items_folders = os.listdir(items_path)
         item_name = "local"
         assert item_name in items_folders
+
+
+class TestAddConnectionWithLatestVersion(AEATestCaseEmpty):
+    """Test case for add connection with latest version."""
+
+    def test_add_connection_latest_version(self):
+        """Test add connection with latest version."""
+        self.add_item("connection", "fetchai/local:latest", local=True)
+
+        items_path = os.path.join(self.agent_name, "vendor", "fetchai", "connections")
+        items_folders = os.listdir(items_path)
+        item_name = "local"
+        assert item_name in items_folders
diff --git a/tests/test_cli/test_add/test_contract.py b/tests/test_cli/test_add/test_contract.py
index 030278f521..18662e80fd 100644
--- a/tests/test_cli/test_add/test_contract.py
+++ b/tests/test_cli/test_add/test_contract.py
@@ -68,3 +68,18 @@ def test_add_contract_from_remote_registry_positive(self):
         items_folders = os.listdir(items_path)
         item_name = "erc1155"
         assert item_name in items_folders
+
+
+class TestAddContractWithLatestVersion(AEATestCaseEmpty):
+    """Test case for add contract with latest version."""
+
+    @pytest.mark.integration
+    @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS)
+    def test_add_contract_latest_version(self):
+        """Test add contract with latest version."""
+        self.add_item("contract", "fetchai/erc1155:latest", local=True)
+
+        items_path = os.path.join(self.agent_name, "vendor", "fetchai", "contracts")
+        items_folders = os.listdir(items_path)
+        item_name = "erc1155"
+        assert item_name in items_folders
diff --git a/tests/test_cli/test_add/test_protocol.py b/tests/test_cli/test_add/test_protocol.py
index 6e013f0944..786f7aed20 100644
--- a/tests/test_cli/test_add/test_protocol.py
+++ b/tests/test_cli/test_add/test_protocol.py
@@ -469,3 +469,16 @@ def test_add_protocol_from_remote_registry_positive(self):
         items_folders = os.listdir(items_path)
         item_name = "fipa"
         assert item_name in items_folders
+
+
+class TestAddProtocolWithLatestVersion(AEATestCaseEmpty):
+    """Test case for add protocol with latest version."""
+
+    def test_add_protocol_latest_version(self):
+        """Test add protocol with latest version."""
+        self.add_item("protocol", "fetchai/fipa:latest", local=True)
+
+        items_path = os.path.join(self.agent_name, "vendor", "fetchai", "protocols")
+        items_folders = os.listdir(items_path)
+        item_name = "fipa"
+        assert item_name in items_folders
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index 4dbffc1abe..ad8e4d3084 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -497,3 +497,16 @@ def test_add_skill_from_remote_registry_positive(self):
         items_folders = os.listdir(items_path)
         item_name = "echo"
         assert item_name in items_folders
+
+
+class TestAddSkillWithLatestVersion(AEATestCaseEmpty):
+    """Test case for add skill with latest version."""
+
+    def test_add_skill_latest_version(self):
+        """Test add skill with latest version."""
+        self.add_item("skill", "fetchai/echo:latest", local=True)
+
+        items_path = os.path.join(self.agent_name, "vendor", "fetchai", "skills")
+        items_folders = os.listdir(items_path)
+        item_name = "echo"
+        assert item_name in items_folders
diff --git a/tests/test_cli/test_fetch.py b/tests/test_cli/test_fetch.py
index 9d92e3b934..0221620518 100644
--- a/tests/test_cli/test_fetch.py
+++ b/tests/test_cli/test_fetch.py
@@ -129,7 +129,7 @@ class IsVersionCorrectTestCase(TestCase):
     def test__is_version_correct_positive(self):
         """Test for _is_version_correct method positive result."""
         public_id = PublicId("author", "package", "0.1.0")
-        ctx_mock = ContextMock()
+        ctx_mock = ContextMock(version=public_id.version)
         ctx_mock.agent_config.public_id = public_id
         result = _is_version_correct(ctx_mock, public_id)
         self.assertTrue(result)
@@ -138,7 +138,7 @@ def test__is_version_correct_negative(self):
         """Test for _is_version_correct method negative result."""
         public_id_a = PublicId("author", "package", "0.1.0")
         public_id_b = PublicId("author", "package", "0.1.1")
-        ctx_mock = ContextMock()
+        ctx_mock = ContextMock(version=public_id_b.version)
         ctx_mock.agent_config.public_id = public_id_b
         result = _is_version_correct(ctx_mock, public_id_a)
         self.assertFalse(result)
@@ -153,3 +153,12 @@ def test_fetch_agent_from_remote_registry_positive(self):
         """Test fetch agent from Registry for positive result."""
         self.run_cli_command("fetch", "fetchai/my_first_aea:0.7.0")
         assert "my_first_aea" in os.listdir(self.t)
+
+
+class TestFetchLatestVersion(AEATestCaseMany):
+    """Test case for fetch agent, latest version."""
+
+    def test_fetch_agent_latest(self):
+        """Test fetch agent, latest version."""
+        self.run_cli_command("fetch", "--local", "fetchai/my_first_aea:latest")
+        assert "my_first_aea" in os.listdir(self.t)
diff --git a/tests/test_cli/test_remove/test_remove_item.py b/tests/test_cli/test_remove/test_base.py
similarity index 50%
rename from tests/test_cli/test_remove/test_remove_item.py
rename to tests/test_cli/test_remove/test_base.py
index d7769bbcd8..7f4f797f8e 100644
--- a/tests/test_cli/test_remove/test_remove_item.py
+++ b/tests/test_cli/test_remove/test_base.py
@@ -17,12 +17,21 @@
 #
 # ------------------------------------------------------------------------------
 """Test module for aea.cli.remove.remove_item method."""
-
+import os
 from unittest import TestCase, mock
 
 from click import ClickException
 
+import pytest
+
 from aea.cli.remove import remove_item
+from aea.configurations.base import PublicId
+from aea.configurations.constants import (
+    DEFAULT_CONNECTION,
+    DEFAULT_PROTOCOL,
+    DEFAULT_SKILL,
+)
+from aea.test_tools.test_cases import AEATestCaseEmpty
 
 from tests.test_cli.tools_for_testing import ContextMock, PublicIdMock
 
@@ -37,3 +46,36 @@ def test_remove_item_item_folder_not_exists(self, *mocks):
         public_id = PublicIdMock.from_str("author/name:0.1.0")
         with self.assertRaises(ClickException):
             remove_item(ContextMock(protocols=[public_id]), "protocol", public_id)
+
+
+class TestRemovePackageWithLatestVersion(AEATestCaseEmpty):
+    """Test case for remove package with latest version."""
+
+    @pytest.mark.parametrize(
+        ["type_", "public_id"],
+        [
+            ("protocol", DEFAULT_PROTOCOL.to_latest()),
+            ("connection", DEFAULT_CONNECTION.to_latest()),
+            ("contract", PublicId("fetchai", "erc1155").to_latest()),
+            ("skill", DEFAULT_SKILL.to_latest()),
+        ],
+    )
+    def test_remove_pacakge_latest_version(self, type_, public_id):
+        """Test remove protocol with latest version."""
+        assert public_id.package_version.is_latest
+        # we need this because there isn't a default contract
+        if type_ == "contract":
+            self.add_item("contract", str(public_id))
+
+        # first, check the package is present
+        items_path = os.path.join(self.agent_name, "vendor", "fetchai", type_ + "s")
+        items_folders = os.listdir(items_path)
+        item_name = public_id.name
+        assert item_name in items_folders
+
+        # remove the package
+        self.run_cli_command(*["remove", type_, str(public_id)], cwd=self._get_cwd())
+
+        # check that the 'aea remove' took effect.
+        items_folders = os.listdir(items_path)
+        assert item_name not in items_folders

From 95545da04e80e8e8c8d3815d01009e65b893d226 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 16:40:53 +0200
Subject: [PATCH 032/131] configure isort to add two lines after imports

---
 aea/__init__.py                               |  1 +
 aea/aea_builder.py                            |  1 +
 aea/agent.py                                  |  1 +
 aea/agent_loop.py                             |  1 +
 aea/cli/__main__.py                           |  1 +
 aea/cli/get_multiaddress.py                   |  1 +
 aea/cli/utils/constants.py                    |  1 +
 aea/cli/utils/decorators.py                   |  1 +
 aea/cli/utils/loggers.py                      |  1 +
 aea/cli/utils/package_utils.py                |  1 +
 aea/cli_gui/__init__.py                       |  1 +
 aea/cli_gui/__main__.py                       |  1 +
 aea/components/base.py                        |  1 +
 aea/components/loader.py                      |  1 +
 aea/configurations/base.py                    |  1 +
 aea/configurations/constants.py               |  1 +
 aea/configurations/loader.py                  |  1 +
 aea/connections/base.py                       |  1 +
 aea/connections/stub/connection.py            |  1 +
 aea/connections/stub/connection.yaml          |  2 +-
 aea/contracts/base.py                         |  1 +
 aea/crypto/__init__.py                        |  1 +
 aea/crypto/base.py                            |  1 +
 aea/crypto/cosmos.py                          |  1 +
 aea/crypto/ethereum.py                        |  1 +
 aea/crypto/fetchai.py                         |  1 +
 aea/crypto/helpers.py                         |  1 +
 aea/crypto/ledger_apis.py                     |  1 +
 aea/crypto/registries/__init__.py             |  1 +
 aea/crypto/registries/base.py                 |  1 +
 aea/crypto/wallet.py                          |  1 +
 aea/decision_maker/base.py                    |  1 +
 aea/decision_maker/default.py                 |  1 +
 aea/helpers/async_utils.py                    |  1 +
 aea/helpers/base.py                           |  1 +
 aea/helpers/exec_timeout.py                   |  1 +
 aea/helpers/file_lock.py                      |  1 +
 aea/helpers/ipfs/base.py                      |  1 +
 aea/helpers/multiaddr/base.py                 |  1 +
 aea/helpers/multiple_executor.py              |  1 +
 aea/helpers/pipe.py                           |  1 +
 aea/helpers/search/generic.py                 |  1 +
 aea/helpers/search/models.py                  |  1 +
 aea/helpers/transaction/base.py               |  1 +
 aea/helpers/win32.py                          |  1 +
 aea/identity/base.py                          |  1 +
 aea/launcher.py                               |  1 +
 aea/mail/base.py                              |  1 +
 aea/protocols/base.py                         |  1 +
 aea/protocols/default/__init__.py             |  1 +
 aea/protocols/default/message.py              |  1 +
 aea/protocols/default/protocol.yaml           |  4 +-
 aea/protocols/generator/base.py               |  1 +
 aea/protocols/generator/common.py             |  1 +
 aea/protocols/generator/validate.py           |  1 +
 aea/protocols/scaffold/__init__.py            |  1 +
 aea/protocols/scaffold/protocol.yaml          |  2 +-
 aea/protocols/signing/__init__.py             |  1 +
 aea/protocols/signing/message.py              |  1 +
 aea/protocols/signing/protocol.yaml           |  4 +-
 aea/protocols/state_update/__init__.py        |  1 +
 aea/protocols/state_update/message.py         |  1 +
 aea/protocols/state_update/protocol.yaml      |  4 +-
 aea/registries/base.py                        |  1 +
 aea/registries/filter.py                      |  1 +
 aea/runner.py                                 |  1 +
 aea/runtime.py                                |  1 +
 aea/skills/base.py                            |  1 +
 aea/test_tools/test_cases.py                  |  1 +
 benchmark/checks/check_multiagent.py          |  1 +
 benchmark/checks/utils.py                     |  1 +
 benchmark/framework/executor.py               |  1 +
 examples/gym_ex/gyms/env.py                   |  1 +
 examples/gym_ex/proxy/agent.py                |  1 +
 examples/gym_ex/proxy/env.py                  |  1 +
 examples/gym_ex/rl/agent.py                   |  1 +
 examples/gym_ex/train.py                      |  1 +
 .../fetchai/connections/gym/connection.py     |  1 +
 .../fetchai/connections/gym/connection.yaml   |  2 +-
 .../connections/http_client/connection.py     |  1 +
 .../connections/http_client/connection.yaml   |  2 +-
 .../connections/http_server/connection.py     |  1 +
 .../connections/http_server/connection.yaml   |  2 +-
 packages/fetchai/connections/ledger/base.py   |  1 +
 .../connections/ledger/connection.yaml        |  2 +-
 .../fetchai/connections/local/connection.py   |  1 +
 .../fetchai/connections/local/connection.yaml |  2 +-
 .../fetchai/connections/oef/connection.py     |  1 +
 .../fetchai/connections/oef/connection.yaml   |  4 +-
 .../connections/oef/object_translator.py      |  1 +
 .../connections/p2p_libp2p/connection.py      |  1 +
 .../connections/p2p_libp2p/connection.yaml    |  2 +-
 .../p2p_libp2p_client/connection.py           |  1 +
 .../p2p_libp2p_client/connection.yaml         |  2 +-
 .../connections/p2p_stub/connection.py        |  1 +
 .../connections/p2p_stub/connection.yaml      |  2 +-
 .../fetchai/connections/soef/connection.py    |  1 +
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 packages/fetchai/connections/tcp/base.py      |  1 +
 .../fetchai/connections/tcp/connection.yaml   |  6 +-
 .../fetchai/connections/tcp/tcp_client.py     |  1 +
 .../fetchai/connections/tcp/tcp_server.py     |  1 +
 .../fetchai/connections/webhook/connection.py |  1 +
 .../connections/webhook/connection.yaml       |  2 +-
 .../fetchai/contracts/erc1155/contract.py     |  1 +
 .../fetchai/contracts/erc1155/contract.yaml   |  2 +-
 .../protocols/contract_api/__init__.py        |  1 +
 .../protocols/contract_api/custom_types.py    |  1 +
 .../fetchai/protocols/contract_api/message.py |  1 +
 .../protocols/contract_api/protocol.yaml      |  6 +-
 packages/fetchai/protocols/fipa/__init__.py   |  1 +
 .../fetchai/protocols/fipa/custom_types.py    |  1 +
 packages/fetchai/protocols/fipa/message.py    |  1 +
 packages/fetchai/protocols/fipa/protocol.yaml |  6 +-
 packages/fetchai/protocols/gym/__init__.py    |  1 +
 packages/fetchai/protocols/gym/message.py     |  1 +
 packages/fetchai/protocols/gym/protocol.yaml  |  4 +-
 packages/fetchai/protocols/http/__init__.py   |  1 +
 packages/fetchai/protocols/http/message.py    |  1 +
 packages/fetchai/protocols/http/protocol.yaml |  4 +-
 .../fetchai/protocols/ledger_api/__init__.py  |  1 +
 .../protocols/ledger_api/custom_types.py      |  1 +
 .../fetchai/protocols/ledger_api/message.py   |  1 +
 .../protocols/ledger_api/protocol.yaml        |  6 +-
 .../fetchai/protocols/ml_trade/__init__.py    |  1 +
 .../protocols/ml_trade/custom_types.py        |  1 +
 .../fetchai/protocols/ml_trade/message.py     |  1 +
 .../fetchai/protocols/ml_trade/protocol.yaml  |  6 +-
 .../fetchai/protocols/oef_search/__init__.py  |  1 +
 .../protocols/oef_search/custom_types.py      |  1 +
 .../fetchai/protocols/oef_search/message.py   |  1 +
 .../protocols/oef_search/protocol.yaml        |  6 +-
 packages/fetchai/protocols/tac/__init__.py    |  1 +
 .../fetchai/protocols/tac/custom_types.py     |  1 +
 packages/fetchai/protocols/tac/message.py     |  1 +
 packages/fetchai/protocols/tac/protocol.yaml  |  6 +-
 .../fetchai/skills/aries_alice/behaviours.py  |  1 +
 .../fetchai/skills/aries_alice/dialogues.py   |  1 +
 .../fetchai/skills/aries_alice/skill.yaml     |  6 +-
 .../fetchai/skills/aries_alice/strategy.py    |  1 +
 .../fetchai/skills/aries_faber/behaviours.py  |  1 +
 .../fetchai/skills/aries_faber/dialogues.py   |  1 +
 .../fetchai/skills/aries_faber/handlers.py    |  1 +
 .../fetchai/skills/aries_faber/skill.yaml     |  8 +-
 .../fetchai/skills/aries_faber/strategy.py    |  1 +
 .../skills/carpark_client/behaviours.py       |  1 +
 .../skills/carpark_client/dialogues.py        |  1 +
 .../fetchai/skills/carpark_client/handlers.py |  1 +
 .../fetchai/skills/carpark_client/skill.yaml  |  8 +-
 .../fetchai/skills/carpark_client/strategy.py |  1 +
 .../skills/carpark_detection/behaviours.py    |  1 +
 .../skills/carpark_detection/database.py      |  1 +
 .../skills/carpark_detection/dialogues.py     |  1 +
 .../skills/carpark_detection/handlers.py      |  1 +
 .../skills/carpark_detection/skill.yaml       | 10 +-
 .../skills/carpark_detection/strategy.py      |  1 +
 packages/fetchai/skills/echo/dialogues.py     |  1 +
 packages/fetchai/skills/echo/skill.yaml       |  2 +-
 .../skills/erc1155_client/behaviours.py       |  1 +
 .../fetchai/skills/erc1155_client/handlers.py |  1 +
 .../fetchai/skills/erc1155_client/skill.yaml  |  6 +-
 .../fetchai/skills/erc1155_client/strategy.py |  1 +
 .../skills/erc1155_deploy/behaviours.py       |  1 +
 .../fetchai/skills/erc1155_deploy/handlers.py |  1 +
 .../fetchai/skills/erc1155_deploy/skill.yaml  |  6 +-
 .../fetchai/skills/erc1155_deploy/strategy.py |  1 +
 .../skills/generic_buyer/behaviours.py        |  1 +
 .../fetchai/skills/generic_buyer/dialogues.py |  1 +
 .../fetchai/skills/generic_buyer/handlers.py  |  1 +
 .../fetchai/skills/generic_buyer/skill.yaml   |  8 +-
 .../fetchai/skills/generic_buyer/strategy.py  |  1 +
 .../skills/generic_seller/behaviours.py       |  1 +
 .../skills/generic_seller/dialogues.py        |  1 +
 .../fetchai/skills/generic_seller/handlers.py |  1 +
 .../fetchai/skills/generic_seller/skill.yaml  |  8 +-
 .../fetchai/skills/generic_seller/strategy.py |  1 +
 packages/fetchai/skills/gym/dialogues.py      |  1 +
 packages/fetchai/skills/gym/helpers.py        |  1 +
 packages/fetchai/skills/gym/rl_agent.py       |  1 +
 packages/fetchai/skills/gym/skill.yaml        |  6 +-
 .../fetchai/skills/http_echo/dialogues.py     |  1 +
 packages/fetchai/skills/http_echo/skill.yaml  |  2 +-
 .../skills/ml_data_provider/behaviours.py     |  1 +
 .../skills/ml_data_provider/dialogues.py      |  1 +
 .../skills/ml_data_provider/skill.yaml        |  6 +-
 .../skills/ml_data_provider/strategy.py       |  1 +
 .../fetchai/skills/ml_train/behaviours.py     |  1 +
 packages/fetchai/skills/ml_train/dialogues.py |  1 +
 packages/fetchai/skills/ml_train/handlers.py  |  1 +
 packages/fetchai/skills/ml_train/ml_model.py  |  1 +
 packages/fetchai/skills/ml_train/skill.yaml   | 10 +-
 packages/fetchai/skills/ml_train/strategy.py  |  1 +
 .../simple_service_registration/behaviours.py |  1 +
 .../simple_service_registration/dialogues.py  |  1 +
 .../simple_service_registration/handlers.py   |  1 +
 .../simple_service_registration/skill.yaml    |  8 +-
 .../simple_service_registration/strategy.py   |  1 +
 .../fetchai/skills/tac_control/dialogues.py   |  1 +
 packages/fetchai/skills/tac_control/game.py   |  1 +
 .../fetchai/skills/tac_control/helpers.py     |  1 +
 .../fetchai/skills/tac_control/parameters.py  |  1 +
 .../fetchai/skills/tac_control/skill.yaml     |  8 +-
 .../skills/tac_control_contract/behaviours.py |  1 +
 .../skills/tac_control_contract/game.py       |  1 +
 .../skills/tac_control_contract/helpers.py    |  1 +
 .../skills/tac_control_contract/parameters.py |  1 +
 .../skills/tac_control_contract/skill.yaml    |  8 +-
 .../skills/tac_negotiation/behaviours.py      |  1 +
 .../skills/tac_negotiation/dialogues.py       |  1 +
 .../fetchai/skills/tac_negotiation/helpers.py |  1 +
 .../fetchai/skills/tac_negotiation/skill.yaml | 10 +-
 .../skills/tac_negotiation/strategy.py        |  1 +
 .../skills/tac_negotiation/transactions.py    |  1 +
 .../skills/tac_participation/dialogues.py     |  1 +
 .../fetchai/skills/tac_participation/game.py  |  1 +
 .../skills/tac_participation/skill.yaml       |  4 +-
 .../fetchai/skills/thermometer/behaviours.py  |  1 +
 .../fetchai/skills/thermometer/dialogues.py   |  1 +
 .../fetchai/skills/thermometer/handlers.py    |  1 +
 .../fetchai/skills/thermometer/skill.yaml     |  8 +-
 .../fetchai/skills/thermometer/strategy.py    |  1 +
 .../skills/thermometer_client/behaviours.py   |  1 +
 .../skills/thermometer_client/dialogues.py    |  1 +
 .../skills/thermometer_client/handlers.py     |  1 +
 .../skills/thermometer_client/skill.yaml      |  8 +-
 .../skills/thermometer_client/strategy.py     |  1 +
 .../skills/weather_client/behaviours.py       |  1 +
 .../skills/weather_client/dialogues.py        |  1 +
 .../fetchai/skills/weather_client/handlers.py |  1 +
 .../fetchai/skills/weather_client/skill.yaml  |  8 +-
 .../fetchai/skills/weather_client/strategy.py |  1 +
 .../skills/weather_station/behaviours.py      |  1 +
 .../weather_station/db_communication.py       |  1 +
 .../skills/weather_station/dialogues.py       |  1 +
 .../dummy_weather_station_data.py             |  1 +
 .../skills/weather_station/handlers.py        |  1 +
 .../fetchai/skills/weather_station/skill.yaml | 12 +--
 .../skills/weather_station/strategy.py        |  1 +
 packages/hashes.csv                           | 96 +++++++++----------
 scripts/check_copyright_notice.py             |  1 +
 scripts/check_doc_links.py                    |  1 +
 scripts/check_package_dependencies.py         |  1 +
 scripts/check_package_versions_in_docs.py     |  1 +
 scripts/deploy_to_registry.py                 |  1 +
 scripts/generate_api_docs.py                  |  1 +
 scripts/generate_ipfs_hashes.py               |  1 +
 scripts/update_package_versions.py            |  1 +
 scripts/update_symlinks_cross_platform.py     |  1 +
 setup.cfg                                     |  1 +
 tests/common/utils.py                         |  1 +
 tests/conftest.py                             |  1 +
 tests/data/generator/t_protocol/__init__.py   |  1 +
 tests/data/generator/t_protocol/message.py    |  1 +
 .../generator/t_protocol_no_ct/__init__.py    |  1 +
 .../generator/t_protocol_no_ct/message.py     |  1 +
 tests/test_aea_builder.py                     |  1 +
 tests/test_cli/constants.py                   |  1 +
 tests/test_cli/test_launch.py                 |  1 +
 tests/test_cli/test_utils/test_utils.py       |  1 +
 tests/test_connections/test_stub.py           |  1 +
 tests/test_crypto/test_helpers.py             |  1 +
 tests/test_crypto/test_ledger_apis.py         |  1 +
 tests/test_crypto/test_registries.py          |  1 +
 .../test_registry/test_crypto_registry.py     |  1 +
 .../test_registry/test_ledger_api_registry.py |  1 +
 .../test_agent_vs_aea/agent_code_block.py     |  1 +
 .../test_agent_vs_aea/test_agent_vs_aea.py    |  1 +
 .../test_bash_yaml/test_demo_docs.py          |  1 +
 .../programmatic_aea.py                       |  1 +
 .../test_programmatic_aea.py                  |  1 +
 .../programmatic_aea.py                       |  1 +
 .../test_cli_vs_programmatic_aea.py           |  1 +
 .../decision_maker_transaction.py             |  1 +
 .../test_decision_maker_transaction.py        |  1 +
 .../test_generic_step_by_step_guide.py        |  1 +
 .../multiplexer_standalone.py                 |  1 +
 .../test_multiplexer_standalone.py            |  1 +
 .../test_orm_integration.py                   |  1 +
 .../test_skill_guide/test_skill_guide.py      |  1 +
 .../standalone_transaction.py                 |  1 +
 .../test_standalone_transaction.py            |  1 +
 tests/test_examples/test_gym_ex.py            |  1 +
 ..._client_connection_to_aries_cloud_agent.py |  1 +
 tests/test_helpers/test_exec_timeout.py       |  1 +
 tests/test_helpers/test_ipfs/test_base.py     |  1 +
 tests/test_helpers/test_multiaddr.py          |  1 +
 .../test_connections/test_gym/test_gym.py     |  1 +
 .../test_http_client/test_http_client.py      |  1 +
 .../test_http_server/test_http_server.py      |  1 +
 .../test_http_server_and_client.py            |  1 +
 .../test_ledger/test_ledger_api.py            |  1 +
 .../test_oef/test_communication.py            |  1 +
 .../test_p2p_libp2p/test_aea_cli.py           |  1 +
 .../test_p2p_libp2p/test_communication.py     |  1 +
 .../test_p2p_libp2p/test_errors.py            |  1 +
 .../test_p2p_libp2p/test_fault_tolerance.py   |  1 +
 .../test_p2p_libp2p/test_public_dht.py        |  1 +
 .../test_p2p_libp2p_client/test_aea_cli.py    |  1 +
 .../test_communication.py                     |  1 +
 .../test_p2p_stub/test_p2p_stub.py            |  1 +
 .../test_connections/test_soef/models.py      |  1 +
 .../test_soef/test_soef_integration.py        |  1 +
 .../test_webhook/test_webhook.py              |  1 +
 .../test_erc1155/test_contract.py             |  1 +
 .../test_protocols/test_contract_api.py       |  1 +
 .../test_packages/test_protocols/test_fipa.py |  1 +
 .../test_packages/test_protocols/test_gym.py  |  1 +
 .../test_packages/test_protocols/test_http.py |  1 +
 .../test_protocols/test_ledger_api.py         |  1 +
 .../test_protocols/test_ml_trade.py           |  1 +
 .../test_protocols/test_oef_search.py         |  1 +
 .../test_packages/test_protocols/test_tac.py  |  1 +
 .../test_skills/test_http_echo.py             |  1 +
 tests/test_protocols/test_generator/common.py |  1 +
 .../test_generator/test_common.py             |  1 +
 .../test_generator/test_end_to_end.py         |  1 +
 .../test_extract_specification.py             |  1 +
 .../test_generator/test_generator.py          |  1 +
 .../test_generator/test_validate.py           |  1 +
 tests/test_skills/test_error.py               |  1 +
 tests/test_test_tools/test_testcases.py       |  1 +
 321 files changed, 446 insertions(+), 174 deletions(-)

diff --git a/aea/__init__.py b/aea/__init__.py
index 23ed8227c4..8fc0f884ed 100644
--- a/aea/__init__.py
+++ b/aea/__init__.py
@@ -33,4 +33,5 @@
     __version__,
 )
 
+
 AEA_DIR = os.path.dirname(inspect.getfile(inspect.currentframe()))  # type: ignore
diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index c302b710ba..a3570bbdef 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -83,6 +83,7 @@
 from aea.identity.base import Identity
 from aea.registries.resources import Resources
 
+
 PathLike = Union[os.PathLike, Path, str]
 
 logger = logging.getLogger(__name__)
diff --git a/aea/agent.py b/aea/agent.py
index 16188a0e03..b62acaadf6 100644
--- a/aea/agent.py
+++ b/aea/agent.py
@@ -29,6 +29,7 @@
 from aea.multiplexer import InBox, OutBox
 from aea.runtime import AsyncRuntime, BaseRuntime, RuntimeStates, ThreadedRuntime
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index cfed6e08fc..59fff7c62d 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -39,6 +39,7 @@
 from aea.helpers.exec_timeout import ExecTimeoutThreadGuard, TimeoutException
 from aea.helpers.logging import WithLogger
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/cli/__main__.py b/aea/cli/__main__.py
index 129ecab13f..b67db019ec 100755
--- a/aea/cli/__main__.py
+++ b/aea/cli/__main__.py
@@ -22,5 +22,6 @@
 
 from aea.cli.core import cli
 
+
 if __name__ == "__main__":
     cli(prog_name="aea")  # pragma: no cover
diff --git a/aea/cli/get_multiaddress.py b/aea/cli/get_multiaddress.py
index 3013f5077d..59ce38b96e 100644
--- a/aea/cli/get_multiaddress.py
+++ b/aea/cli/get_multiaddress.py
@@ -37,6 +37,7 @@
 from aea.exceptions import enforce
 from aea.helpers.multiaddr.base import MultiAddr
 
+
 URI_REGEX = re.compile(r"(?:https?://)?(?P<host>[^:/ ]+):(?P<port>[0-9]*)")
 
 
diff --git a/aea/cli/utils/constants.py b/aea/cli/utils/constants.py
index 4f699a7be6..0504843d48 100644
--- a/aea/cli/utils/constants.py
+++ b/aea/cli/utils/constants.py
@@ -30,6 +30,7 @@
     DEFAULT_SKILL_CONFIG_FILE,
 )
 
+
 AEA_DIR = str(Path("."))
 
 ITEM_TYPES = ("connection", "contract", "protocol", "skill")
diff --git a/aea/cli/utils/decorators.py b/aea/cli/utils/decorators.py
index 87fd3cd604..a05830e4b4 100644
--- a/aea/cli/utils/decorators.py
+++ b/aea/cli/utils/decorators.py
@@ -40,6 +40,7 @@
 from aea.configurations.loader import ConfigLoaders
 from aea.exceptions import AEAException, enforce
 
+
 pass_ctx = click.make_pass_decorator(Context)
 
 
diff --git a/aea/cli/utils/loggers.py b/aea/cli/utils/loggers.py
index b549d39aa5..237315f396 100644
--- a/aea/cli/utils/loggers.py
+++ b/aea/cli/utils/loggers.py
@@ -24,6 +24,7 @@
 
 import click
 
+
 OFF = 100
 logging.addLevelName(OFF, "OFF")
 
diff --git a/aea/cli/utils/package_utils.py b/aea/cli/utils/package_utils.py
index f36dc4c469..c4c57b7f76 100644
--- a/aea/cli/utils/package_utils.py
+++ b/aea/cli/utils/package_utils.py
@@ -45,6 +45,7 @@
 from aea.crypto.ledger_apis import DEFAULT_LEDGER_CONFIGS, LedgerApis
 from aea.crypto.wallet import Wallet
 
+
 ROOT = Path(".")
 
 
diff --git a/aea/cli_gui/__init__.py b/aea/cli_gui/__init__.py
index 0f17a05e87..e9a490bbf9 100644
--- a/aea/cli_gui/__init__.py
+++ b/aea/cli_gui/__init__.py
@@ -54,6 +54,7 @@
 )
 from aea.configurations.base import PublicId
 
+
 elements = [
     ["local", "agent", "localAgents"],
     ["registered", "protocol", "registeredProtocols"],
diff --git a/aea/cli_gui/__main__.py b/aea/cli_gui/__main__.py
index ec96f89fb2..7bed31763d 100644
--- a/aea/cli_gui/__main__.py
+++ b/aea/cli_gui/__main__.py
@@ -23,6 +23,7 @@
 
 import aea.cli_gui  # pragma: no cover
 
+
 parser = argparse.ArgumentParser(
     description="Launch the gui through python"
 )  # pragma: no cover
diff --git a/aea/components/base.py b/aea/components/base.py
index 08e906fe27..d02c1ef295 100644
--- a/aea/components/base.py
+++ b/aea/components/base.py
@@ -35,6 +35,7 @@
 from aea.exceptions import AEAEnforceError
 from aea.helpers.logging import WithLogger
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/components/loader.py b/aea/components/loader.py
index 8e192bd68f..c2a4ad8f0e 100644
--- a/aea/components/loader.py
+++ b/aea/components/loader.py
@@ -30,6 +30,7 @@
 from aea.protocols.base import Protocol
 from aea.skills.base import Skill
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 2e3b245828..9d633e2776 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -54,6 +54,7 @@
 from aea.exceptions import enforce
 from aea.helpers.ipfs.base import IPFSHashOnly
 
+
 T = TypeVar("T")
 DEFAULT_VERSION = "0.1.0"
 DEFAULT_AEA_CONFIG_FILE = "aea-config.yaml"
diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py
index 9370662185..128ffd8080 100644
--- a/aea/configurations/constants.py
+++ b/aea/configurations/constants.py
@@ -25,6 +25,7 @@
 from aea.crypto.fetchai import FetchAICrypto
 from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA
 
+
 DEFAULT_CONNECTION = PublicId.from_str("fetchai/stub:0.9.0")
 DEFAULT_PROTOCOL = PublicId.from_str("fetchai/default:0.5.0")
 DEFAULT_SKILL = PublicId.from_str("fetchai/error:0.5.0")
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 5c0b51a1a8..8a5c1e84d0 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -48,6 +48,7 @@
 from aea.exceptions import enforce
 from aea.helpers.base import yaml_dump, yaml_dump_all, yaml_load, yaml_load_all
 
+
 _CUR_DIR = os.path.dirname(inspect.getfile(inspect.currentframe()))  # type: ignore
 _SCHEMAS_DIR = os.path.join(_CUR_DIR, "schemas")
 
diff --git a/aea/connections/base.py b/aea/connections/base.py
index 9542b78b6b..a34afba31e 100644
--- a/aea/connections/base.py
+++ b/aea/connections/base.py
@@ -37,6 +37,7 @@
 from aea.helpers.base import load_module
 from aea.identity.base import Identity
 
+
 if TYPE_CHECKING:
     from aea.mail.base import Address, Envelope  # pragma: no cover
 
diff --git a/aea/connections/stub/connection.py b/aea/connections/stub/connection.py
index 155aee920b..a80267f0c9 100644
--- a/aea/connections/stub/connection.py
+++ b/aea/connections/stub/connection.py
@@ -35,6 +35,7 @@
 from aea.helpers.base import exception_log_and_reraise
 from aea.mail.base import Envelope
 
+
 logger = logging.getLogger(__name__)
 
 INPUT_FILE_KEY = "input_file"
diff --git a/aea/connections/stub/connection.yaml b/aea/connections/stub/connection.yaml
index cdd0ca8581..743ee3598a 100644
--- a/aea/connections/stub/connection.yaml
+++ b/aea/connections/stub/connection.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmWwepN9Fy9gHAp39vUGFSLdnB9JZjdyE3STnbowSUhJkC
-  connection.py: QmYAWVhNoWhJNaCkEh5cMScJ53a1gkfcBNGt9LLxftyUuR
+  connection.py: QmTSESVFvsDc9iq2QM3YdZju3yHqTA3wHbLkAzHXEFY17Z
   readme.md: QmXSAtxSY7C2YkvUxeVnpqCJY9uJYZxZBmuUcE4zjFXcXz
 fingerprint_ignore_patterns: []
 protocols: []
diff --git a/aea/contracts/base.py b/aea/contracts/base.py
index 3d2c10f6d8..21b34fd78b 100644
--- a/aea/contracts/base.py
+++ b/aea/contracts/base.py
@@ -32,6 +32,7 @@
 from aea.exceptions import AEAException, enforce
 from aea.helpers.base import load_module
 
+
 contract_registry: Registry["Contract"] = Registry["Contract"]()
 logger = logging.getLogger(__name__)
 
diff --git a/aea/crypto/__init__.py b/aea/crypto/__init__.py
index 11df4e865b..3006b6a9a8 100644
--- a/aea/crypto/__init__.py
+++ b/aea/crypto/__init__.py
@@ -25,6 +25,7 @@
 from aea.crypto.registries import register_crypto  # noqa
 from aea.crypto.registries import register_faucet_api, register_ledger_api
 
+
 register_crypto(
     id_=FetchAICrypto.identifier, entry_point="aea.crypto.fetchai:FetchAICrypto"
 )
diff --git a/aea/crypto/base.py b/aea/crypto/base.py
index 0b8fb15d75..2f70e8513b 100644
--- a/aea/crypto/base.py
+++ b/aea/crypto/base.py
@@ -24,6 +24,7 @@
 
 from aea.common import Address
 
+
 EntityClass = TypeVar("EntityClass")
 
 
diff --git a/aea/crypto/cosmos.py b/aea/crypto/cosmos.py
index 051fb376f6..d0a94db085 100644
--- a/aea/crypto/cosmos.py
+++ b/aea/crypto/cosmos.py
@@ -41,6 +41,7 @@
 from aea.exceptions import AEAEnforceError
 from aea.helpers.base import try_decorator
 
+
 logger = logging.getLogger(__name__)
 
 _COSMOS = "cosmos"
diff --git a/aea/crypto/ethereum.py b/aea/crypto/ethereum.py
index 7e05306166..0f4eb47d3c 100644
--- a/aea/crypto/ethereum.py
+++ b/aea/crypto/ethereum.py
@@ -39,6 +39,7 @@
 from aea.exceptions import enforce
 from aea.helpers.base import try_decorator
 
+
 logger = logging.getLogger(__name__)
 
 _ETHEREUM = "ethereum"
diff --git a/aea/crypto/fetchai.py b/aea/crypto/fetchai.py
index 2108fa3512..f3f77a1355 100644
--- a/aea/crypto/fetchai.py
+++ b/aea/crypto/fetchai.py
@@ -21,6 +21,7 @@
 
 from aea.crypto.cosmos import CosmosCrypto, CosmosFaucetApi, CosmosHelper, _CosmosApi
 
+
 _FETCHAI = "fetchai"
 _FETCH = "fetch"
 TESTNET_NAME = "testnet"
diff --git a/aea/crypto/helpers.py b/aea/crypto/helpers.py
index 53d64a31a9..cffc763e35 100644
--- a/aea/crypto/helpers.py
+++ b/aea/crypto/helpers.py
@@ -27,6 +27,7 @@
 from aea.configurations.loader import ConfigLoaders
 from aea.crypto.registries import crypto_registry, make_crypto, make_faucet_api
 
+
 PRIVATE_KEY_PATH_SCHEMA = "{}_private_key.txt"
 
 logger = logging.getLogger(__name__)
diff --git a/aea/crypto/ledger_apis.py b/aea/crypto/ledger_apis.py
index bdf82496f4..5773b5b83f 100644
--- a/aea/crypto/ledger_apis.py
+++ b/aea/crypto/ledger_apis.py
@@ -37,6 +37,7 @@
 )
 from aea.exceptions import enforce
 
+
 DEFAULT_LEDGER_CONFIGS = {
     CosmosApi.identifier: {"address": COSMOS_DEFAULT_ADDRESS},
     EthereumApi.identifier: {
diff --git a/aea/crypto/registries/__init__.py b/aea/crypto/registries/__init__.py
index 21c94d61cc..0087cc6fe7 100644
--- a/aea/crypto/registries/__init__.py
+++ b/aea/crypto/registries/__init__.py
@@ -23,6 +23,7 @@
 from aea.crypto.base import Crypto, FaucetApi, LedgerApi
 from aea.crypto.registries.base import Registry
 
+
 crypto_registry: Registry[Crypto] = Registry[Crypto]()
 register_crypto = crypto_registry.register
 make_crypto: Callable[..., Crypto] = crypto_registry.make
diff --git a/aea/crypto/registries/base.py b/aea/crypto/registries/base.py
index 854a1cb26e..2bd4427d31 100644
--- a/aea/crypto/registries/base.py
+++ b/aea/crypto/registries/base.py
@@ -26,6 +26,7 @@
 from aea.exceptions import AEAException
 from aea.helpers.base import RegexConstrainedString
 
+
 """A regex to match a Python identifier (i.e. a module/class name)."""
 PY_ID_REGEX = r"[^\d\W]\w*"
 ITEM_ID_REGEX = r"[:/._A-Za-z0-9]+"
diff --git a/aea/crypto/wallet.py b/aea/crypto/wallet.py
index 29a19f1be2..e030ef31d7 100644
--- a/aea/crypto/wallet.py
+++ b/aea/crypto/wallet.py
@@ -25,6 +25,7 @@
 from aea.crypto.base import Crypto
 from aea.crypto.registries import make_crypto
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/decision_maker/base.py b/aea/decision_maker/base.py
index d70a7a0eba..2565b84f75 100644
--- a/aea/decision_maker/base.py
+++ b/aea/decision_maker/base.py
@@ -34,6 +34,7 @@
 from aea.identity.base import Identity
 from aea.protocols.base import Message
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/decision_maker/default.py b/aea/decision_maker/default.py
index 4e4fb3feb7..a43d6c1973 100644
--- a/aea/decision_maker/default.py
+++ b/aea/decision_maker/default.py
@@ -47,6 +47,7 @@
 )
 from aea.protocols.state_update.message import StateUpdateMessage
 
+
 CurrencyHoldings = Dict[str, int]  # a map from identifier to quantity
 GoodHoldings = Dict[str, int]  # a map from identifier to quantity
 UtilityParams = Dict[str, float]  # a map from identifier to quantity
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 435ec5a72d..3adb111db1 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -44,6 +44,7 @@
     Union,
 )
 
+
 try:
     from asyncio import create_task  # pylint: disable=ungrouped-imports,unused-import
 except ImportError:  # pragma: no cover
diff --git a/aea/helpers/base.py b/aea/helpers/base.py
index ed1a8aed80..89cd6e3e71 100644
--- a/aea/helpers/base.py
+++ b/aea/helpers/base.py
@@ -39,6 +39,7 @@
 import yaml
 from dotenv import load_dotenv
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/helpers/exec_timeout.py b/aea/helpers/exec_timeout.py
index d291a1f88b..674e80e79b 100644
--- a/aea/helpers/exec_timeout.py
+++ b/aea/helpers/exec_timeout.py
@@ -30,6 +30,7 @@
 from types import TracebackType
 from typing import Optional, Type
 
+
 logger = logging.getLogger(__file__)
 
 
diff --git a/aea/helpers/file_lock.py b/aea/helpers/file_lock.py
index 7939178331..afb99642c8 100644
--- a/aea/helpers/file_lock.py
+++ b/aea/helpers/file_lock.py
@@ -22,6 +22,7 @@
 
 import os
 
+
 # needs win32all to work on Windows
 if os.name == "nt":  # pragma: nocover  # cause platform dependent!
     import pywintypes  # pylint: disable=import-error
diff --git a/aea/helpers/ipfs/base.py b/aea/helpers/ipfs/base.py
index 8f218db261..8a837d54e9 100644
--- a/aea/helpers/ipfs/base.py
+++ b/aea/helpers/ipfs/base.py
@@ -27,6 +27,7 @@
 
 from aea.helpers.ipfs.pb import merkledag_pb2, unixfs_pb2
 
+
 # https://github.com/multiformats/multicodec/blob/master/table.csv
 SHA256_ID = "12"  # 0x12
 LEN_SHA256 = "20"  # 0x20
diff --git a/aea/helpers/multiaddr/base.py b/aea/helpers/multiaddr/base.py
index 0f477f448e..01d12a4289 100644
--- a/aea/helpers/multiaddr/base.py
+++ b/aea/helpers/multiaddr/base.py
@@ -27,6 +27,7 @@
 
 from aea.helpers.multiaddr.crypto_pb2 import KeyType, PublicKey
 
+
 # NOTE:
 # - Reference: https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#keys
 # - Implementation inspired from https://github.com/libp2p/py-libp2p
diff --git a/aea/helpers/multiple_executor.py b/aea/helpers/multiple_executor.py
index 7768c85dde..a4d0772c12 100644
--- a/aea/helpers/multiple_executor.py
+++ b/aea/helpers/multiple_executor.py
@@ -40,6 +40,7 @@
     cast,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/helpers/pipe.py b/aea/helpers/pipe.py
index f2e19ccf92..d0738f4a91 100644
--- a/aea/helpers/pipe.py
+++ b/aea/helpers/pipe.py
@@ -33,6 +33,7 @@
 
 from aea.exceptions import enforce
 
+
 _default_logger = logging.getLogger(__name__)
 
 PIPE_CONN_TIMEOUT = 10.0
diff --git a/aea/helpers/search/generic.py b/aea/helpers/search/generic.py
index 5af99adc88..5891d71a3a 100644
--- a/aea/helpers/search/generic.py
+++ b/aea/helpers/search/generic.py
@@ -24,6 +24,7 @@
 from aea.exceptions import enforce
 from aea.helpers.search.models import Attribute, DataModel, Location
 
+
 SUPPORTED_TYPES = {"str": str, "int": int, "float": float, "bool": bool}
 
 
diff --git a/aea/helpers/search/models.py b/aea/helpers/search/models.py
index 02dbe0b686..164b52dc59 100644
--- a/aea/helpers/search/models.py
+++ b/aea/helpers/search/models.py
@@ -29,6 +29,7 @@
 
 from aea.exceptions import enforce
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/helpers/transaction/base.py b/aea/helpers/transaction/base.py
index d096b01792..f281627435 100644
--- a/aea/helpers/transaction/base.py
+++ b/aea/helpers/transaction/base.py
@@ -27,6 +27,7 @@
 from aea.crypto.ledger_apis import LedgerApis
 from aea.exceptions import enforce
 
+
 Address = str
 
 
diff --git a/aea/helpers/win32.py b/aea/helpers/win32.py
index c5a81b91c7..d48b67874f 100644
--- a/aea/helpers/win32.py
+++ b/aea/helpers/win32.py
@@ -22,6 +22,7 @@
 import logging
 import platform
 
+
 logger = logging.getLogger(__file__)
 
 
diff --git a/aea/identity/base.py b/aea/identity/base.py
index 888a3b4375..20f61dc4fd 100644
--- a/aea/identity/base.py
+++ b/aea/identity/base.py
@@ -24,6 +24,7 @@
 from aea.common import Address
 from aea.configurations.constants import DEFAULT_LEDGER
 
+
 DEFAULT_ADDRESS_KEY = DEFAULT_LEDGER
 
 
diff --git a/aea/launcher.py b/aea/launcher.py
index 36c0352e24..c8af13f718 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -44,6 +44,7 @@
 )
 from aea.runtime import AsyncRuntime
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/mail/base.py b/aea/mail/base.py
index 7e41685ec5..a21fb58527 100644
--- a/aea/mail/base.py
+++ b/aea/mail/base.py
@@ -29,6 +29,7 @@
 from aea.mail import base_pb2
 from aea.protocols.base import Message
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/protocols/base.py b/aea/protocols/base.py
index a9a9981fe1..b9eae56380 100644
--- a/aea/protocols/base.py
+++ b/aea/protocols/base.py
@@ -35,6 +35,7 @@
 from aea.configurations.loader import load_component_configuration
 from aea.exceptions import enforce
 
+
 logger = logging.getLogger(__name__)
 
 Address = str
diff --git a/aea/protocols/default/__init__.py b/aea/protocols/default/__init__.py
index 8b6776854d..84923b00ef 100644
--- a/aea/protocols/default/__init__.py
+++ b/aea/protocols/default/__init__.py
@@ -22,4 +22,5 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
 
+
 DefaultMessage.serializer = DefaultSerializer
diff --git a/aea/protocols/default/message.py b/aea/protocols/default/message.py
index 547286e375..b6c2b75073 100644
--- a/aea/protocols/default/message.py
+++ b/aea/protocols/default/message.py
@@ -27,6 +27,7 @@
 from aea.protocols.base import Message
 from aea.protocols.default.custom_types import ErrorCode as CustomErrorCode
 
+
 logger = logging.getLogger("aea.protocols.default.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/aea/protocols/default/protocol.yaml b/aea/protocols/default/protocol.yaml
index ff9675da3a..14c867de1a 100644
--- a/aea/protocols/default/protocol.yaml
+++ b/aea/protocols/default/protocol.yaml
@@ -7,12 +7,12 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmP3q9463opixzdv17QXkCSQvgR8KJXgLAVkfUPpdHJzPv
-  __init__.py: QmPMtKUrzVJp594VqNuapJzCesWLQ6Awjqv2ufG3wKNRmH
+  __init__.py: QmWpWuGcXu2SodVGUZiAdMrF8Tn7MAPDbiGh7vd9nEfEX6
   custom_types.py: QmRcgwDdTxkSHyfF9eoMtsb5P5GJDm4oyLq5W6ZBko1MFU
   default.proto: QmNzMUvXkBm5bbitR5Yi49ADiwNn1FhCvXqSKKoqAPZyXv
   default_pb2.py: QmSRFi1s3jcqnPuk4yopJeNuC6o58RL7dvEdt85uns3B3N
   dialogues.py: Qmc991snbS7DwFxo1cKcq1rQ2uj7y8ukp14kfe2zve387C
-  message.py: QmeaadvKib9QqpjZgd7NiDUqGRpC2eZPVpgq1dY3PYacht
+  message.py: QmWzSGcSeRGaHERQg6E8QaYDiCqmeJYdFqE7rrwMBP7mP2
   serialization.py: QmRF7XPNEk1emKmFMZaYBCF3gr4CdkMXagoSpjQEmnRGG6
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/aea/protocols/generator/base.py b/aea/protocols/generator/base.py
index f1d06a53dd..79725aaf03 100644
--- a/aea/protocols/generator/base.py
+++ b/aea/protocols/generator/base.py
@@ -54,6 +54,7 @@
 )
 from aea.protocols.generator.extract_specification import extract
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/protocols/generator/common.py b/aea/protocols/generator/common.py
index e0f8350f64..2e576ed293 100644
--- a/aea/protocols/generator/common.py
+++ b/aea/protocols/generator/common.py
@@ -28,6 +28,7 @@
 from aea.configurations.base import ProtocolSpecification
 from aea.configurations.loader import ConfigLoader
 
+
 SPECIFICATION_PRIMITIVE_TYPES = ["pt:bytes", "pt:int", "pt:float", "pt:bool", "pt:str"]
 SPECIFICATION_COMPOSITIONAL_TYPES = [
     "pt:set",
diff --git a/aea/protocols/generator/validate.py b/aea/protocols/generator/validate.py
index bae664d719..6e21ce2cf0 100644
--- a/aea/protocols/generator/validate.py
+++ b/aea/protocols/generator/validate.py
@@ -29,6 +29,7 @@
     _has_matched_brackets,
 )
 
+
 # The following names are reserved for standard message fields and cannot be
 # used as user defined names for performative or contents
 RESERVED_NAMES = {"body", "message_id", "dialogue_reference", "target", "performative"}
diff --git a/aea/protocols/scaffold/__init__.py b/aea/protocols/scaffold/__init__.py
index ffaf5d0866..8529f6170f 100644
--- a/aea/protocols/scaffold/__init__.py
+++ b/aea/protocols/scaffold/__init__.py
@@ -22,4 +22,5 @@
 from aea.protocols.scaffold.message import MyScaffoldMessage
 from aea.protocols.scaffold.serialization import MyScaffoldSerializer
 
+
 MyScaffoldMessage.serializer = MyScaffoldSerializer
diff --git a/aea/protocols/scaffold/protocol.yaml b/aea/protocols/scaffold/protocol.yaml
index 9574de00c7..e5377c1b93 100644
--- a/aea/protocols/scaffold/protocol.yaml
+++ b/aea/protocols/scaffold/protocol.yaml
@@ -6,7 +6,7 @@ description: The scaffold protocol scaffolds a protocol to be implemented by the
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  __init__.py: QmedGZfo1UqT6UJoRkHys9kmquia9BQcK17y2touwSENDU
+  __init__.py: Qmc9Ln8THrWmwou4nr3Acag7vcZ1fv8v5oRSkCWtv1aH6t
   message.py: QmQRGUakU9MGVAXy8Hmte5DEAvNYuzw8znt1h9Jg62ZEpM
   serialization.py: QmaAf5fppirUWe8JaeBbsqfbeofTHe8DDGHJooe2X389qo
 fingerprint_ignore_patterns: []
diff --git a/aea/protocols/signing/__init__.py b/aea/protocols/signing/__init__.py
index a64e961fd6..7fd69707d7 100644
--- a/aea/protocols/signing/__init__.py
+++ b/aea/protocols/signing/__init__.py
@@ -22,4 +22,5 @@
 from aea.protocols.signing.message import SigningMessage
 from aea.protocols.signing.serialization import SigningSerializer
 
+
 SigningMessage.serializer = SigningSerializer
diff --git a/aea/protocols/signing/message.py b/aea/protocols/signing/message.py
index 68a46db489..ae0f9224b2 100644
--- a/aea/protocols/signing/message.py
+++ b/aea/protocols/signing/message.py
@@ -34,6 +34,7 @@
 )
 from aea.protocols.signing.custom_types import Terms as CustomTerms
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.signing.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/aea/protocols/signing/protocol.yaml b/aea/protocols/signing/protocol.yaml
index 0063a35e85..fc81b885eb 100644
--- a/aea/protocols/signing/protocol.yaml
+++ b/aea/protocols/signing/protocol.yaml
@@ -7,10 +7,10 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSoa5dnxz53GWpWT2VvcRG4asVbzA8JzguiVgwqiLtguM
-  __init__.py: QmcCL3TTdvd8wxYKzf2d3cgKEtY9RzLjPCn4hex4wmb6h6
+  __init__.py: Qmd7JYjcrD95jdYfSZs6j7UX5TPZfPYXuTFrUzS3FHCxhS
   custom_types.py: Qmc7sAyCQbAaVs5dZf9hFkTrB2BG8VAioWzbyKBAybrQ1J
   dialogues.py: QmQ1WKs3Dn15oDSwpc4N8hdADLxrn76U4X5SiLAmyGiPPY
-  message.py: QmRLWAYfjCQmdg2hH8R5R63DKYaDrzuX4dVTFqNHuyjawq
+  message.py: QmRX642Lz3DDWuNmkncP8jdfFaMamuv9wFhwc2fGqss5om
   serialization.py: QmbXSvWYfEmYyGdfuTXVJYaJfzqVLtMaLR8H3UCLZkvbSC
   signing.proto: QmcxyLzqhTE9xstAEzCVH17osbLxmSdALx9njmuPjhjrvZ
   signing_pb2.py: QmY3Ak5ih5zGvKjeZ5EnzrGX4tMYn5dWpjPArQwFeJpVKu
diff --git a/aea/protocols/state_update/__init__.py b/aea/protocols/state_update/__init__.py
index 0ede0392d3..7e271c83c4 100644
--- a/aea/protocols/state_update/__init__.py
+++ b/aea/protocols/state_update/__init__.py
@@ -22,4 +22,5 @@
 from aea.protocols.state_update.message import StateUpdateMessage
 from aea.protocols.state_update.serialization import StateUpdateSerializer
 
+
 StateUpdateMessage.serializer = StateUpdateSerializer
diff --git a/aea/protocols/state_update/message.py b/aea/protocols/state_update/message.py
index 2444c40c0f..eee05054c2 100644
--- a/aea/protocols/state_update/message.py
+++ b/aea/protocols/state_update/message.py
@@ -26,6 +26,7 @@
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.state_update.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/aea/protocols/state_update/protocol.yaml b/aea/protocols/state_update/protocol.yaml
index 4e9d8b1f7c..66b150339e 100644
--- a/aea/protocols/state_update/protocol.yaml
+++ b/aea/protocols/state_update/protocol.yaml
@@ -7,9 +7,9 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: Qmc12hnCshAE3TL9ba4vo6L8ZZhynyfhEUoStJggRrbimc
-  __init__.py: Qma2opyN54gwTpkVV1E14jjeMmMfoqgE6XMM9LsvGuTdkm
+  __init__.py: QmUrvqDr24Ph1nnUqjTUPh9QoftuTsef3Dj3yzPUMY38fu
   dialogues.py: Qmd59WgpFccLn1zhpLdwm3zDCmCsjSoQXVn6M7PgFwwkgR
-  message.py: QmbXbxXbu1vzrCjzDy6qDtEvssmiHKFLWGgCEenrE4TPZW
+  message.py: QmchGWKst8yaXthWYT6prHAXJF4RACuaq81Tnc4Y4PFuXE
   serialization.py: QmciaNPHkpyxWLYVtBPnYkKHj6Ur9E3CPJ9QvWbXFD91Yw
   state_update.proto: QmdmEUSa7PDxJ98ZmGE7bLFPmUJv8refgbkHPejw6uDdwD
   state_update_pb2.py: QmQr5KXhapRv9AnfQe7Xbr5bBqYWp9DEMLjxX8UWmK75Z4
diff --git a/aea/registries/base.py b/aea/registries/base.py
index 60fce0f86f..ed265d83a5 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -35,6 +35,7 @@
 from aea.helpers.logging import WithLogger
 from aea.skills.base import Behaviour, Handler, Model
 
+
 logger = logging.getLogger(__name__)
 
 Item = TypeVar("Item")
diff --git a/aea/registries/filter.py b/aea/registries/filter.py
index fde6e48ce7..38c434b953 100644
--- a/aea/registries/filter.py
+++ b/aea/registries/filter.py
@@ -27,6 +27,7 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Behaviour, Handler
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/runner.py b/aea/runner.py
index 3620ff03f4..4b00f4e0a4 100644
--- a/aea/runner.py
+++ b/aea/runner.py
@@ -33,6 +33,7 @@
 )
 from aea.runtime import AsyncRuntime
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/runtime.py b/aea/runtime.py
index d31342075b..d8c81f139c 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -36,6 +36,7 @@
 from aea.multiplexer import AsyncMultiplexer, Multiplexer
 from aea.skills.tasks import TaskManager
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/aea/skills/base.py b/aea/skills/base.py
index 1e9fff3d96..25b1756a0c 100644
--- a/aea/skills/base.py
+++ b/aea/skills/base.py
@@ -49,6 +49,7 @@
 from aea.protocols.base import Message
 from aea.skills.tasks import TaskManager
 
+
 _default_logger = logging.getLogger(__name__)
 
 
diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index fdf105a486..55e1b9d2bc 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -60,6 +60,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 logger = logging.getLogger(__name__)
 
 CLI_LOG_OPTION = ["-v", "OFF"]
diff --git a/benchmark/checks/check_multiagent.py b/benchmark/checks/check_multiagent.py
index 70c0450220..ad4dbe8c58 100755
--- a/benchmark/checks/check_multiagent.py
+++ b/benchmark/checks/check_multiagent.py
@@ -46,6 +46,7 @@
     OEFLocalConnection,
 )
 
+
 ROOT_PATH = os.path.join(os.path.abspath(__file__), "..", "..")
 sys.path.append(ROOT_PATH)
 
diff --git a/benchmark/checks/utils.py b/benchmark/checks/utils.py
index 89ab2b50b5..18859f6fe5 100644
--- a/benchmark/checks/utils.py
+++ b/benchmark/checks/utils.py
@@ -44,6 +44,7 @@
 from aea.registries.resources import Resources
 from aea.skills.base import Skill, SkillContext
 
+
 ROOT_DIR = os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())))  # type: ignore
 
 
diff --git a/benchmark/framework/executor.py b/benchmark/framework/executor.py
index f46acb95e7..c1abb69963 100644
--- a/benchmark/framework/executor.py
+++ b/benchmark/framework/executor.py
@@ -34,6 +34,7 @@
 
 from tests.common.utils import timeit_context
 
+
 ResourceStats = namedtuple("ResourceStats", "time,cpu,mem")
 
 
diff --git a/examples/gym_ex/gyms/env.py b/examples/gym_ex/gyms/env.py
index 66acc54026..ee06b0a789 100644
--- a/examples/gym_ex/gyms/env.py
+++ b/examples/gym_ex/gyms/env.py
@@ -25,6 +25,7 @@
 import numpy as np
 from gym import spaces  # type: ignore
 
+
 BanditId = int
 Price = int
 
diff --git a/examples/gym_ex/proxy/agent.py b/examples/gym_ex/proxy/agent.py
index f008b1ec52..2c638ba0c7 100644
--- a/examples/gym_ex/proxy/agent.py
+++ b/examples/gym_ex/proxy/agent.py
@@ -34,6 +34,7 @@
     GymConnection,
 )
 
+
 sys.modules["packages.fetchai.connections.gym"] = locate(
     "packages.fetchai.connections.gym"
 )
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index 815985da5f..7066819cf3 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -44,6 +44,7 @@
 
 from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
 
+
 sys.modules["packages.fetchai.connections.gym"] = locate(
     "packages.fetchai.connections.gym"
 )
diff --git a/examples/gym_ex/rl/agent.py b/examples/gym_ex/rl/agent.py
index aa71d0ac66..1890358afe 100644
--- a/examples/gym_ex/rl/agent.py
+++ b/examples/gym_ex/rl/agent.py
@@ -25,6 +25,7 @@
 import gym
 import numpy as np
 
+
 BanditId = int
 Price = int
 
diff --git a/examples/gym_ex/train.py b/examples/gym_ex/train.py
index dc9d98bed7..2c3a2a0708 100644
--- a/examples/gym_ex/train.py
+++ b/examples/gym_ex/train.py
@@ -25,6 +25,7 @@
 from proxy.env import ProxyEnv  # noqa: I201
 from rl.agent import RLAgent  # noqa: I201
 
+
 DEFAULT_NB_GOODS = 10
 DEFAULT_NB_PRICES_PER_GOOD = 100
 DEFAULT_NB_STEPS = 4000
diff --git a/packages/fetchai/connections/gym/connection.py b/packages/fetchai/connections/gym/connection.py
index 593a57d7d8..395a566099 100644
--- a/packages/fetchai/connections/gym/connection.py
+++ b/packages/fetchai/connections/gym/connection.py
@@ -40,6 +40,7 @@
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 from packages.fetchai.protocols.gym.message import GymMessage
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.gym")
 
 PUBLIC_ID = PublicId.from_str("fetchai/gym:0.8.0")
diff --git a/packages/fetchai/connections/gym/connection.yaml b/packages/fetchai/connections/gym/connection.yaml
index 2ecf2a9b7a..cce17f13a0 100644
--- a/packages/fetchai/connections/gym/connection.yaml
+++ b/packages/fetchai/connections/gym/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPUxpn8smGVFexxhUu3Vy3q5xsJukHnYtQzUXyt965bmL
   __init__.py: QmWwxj1hGGZNteCvRtZxwtY9PuEKsrWsEmMWCKwiYCdvRR
-  connection.py: QmVDJV8G9xdk4QN2izxRH183WesDjPxXxrZ8PAurqtZ9D3
+  connection.py: QmeBfJXcmyFzH84siPgKjTCrsSnTw7V1Jza1ZL9vUjpBS3
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/gym:0.6.0
diff --git a/packages/fetchai/connections/http_client/connection.py b/packages/fetchai/connections/http_client/connection.py
index 6d8d158165..72ed44788f 100644
--- a/packages/fetchai/connections/http_client/connection.py
+++ b/packages/fetchai/connections/http_client/connection.py
@@ -42,6 +42,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 
+
 SUCCESS = 200
 NOT_FOUND = 404
 REQUEST_TIMEOUT = 408
diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml
index f87a4b0e3f..462f0c8937 100644
--- a/packages/fetchai/connections/http_client/connection.yaml
+++ b/packages/fetchai/connections/http_client/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmXfZJPAh4Ujt3xj8xzd6ng6HbrpJQUuvjWe8DNQSwSKWU
   __init__.py: QmPdKAks8A6XKAgZiopJzPZYXJumTeUqChd8UorqmLQQPU
-  connection.py: QmSBQnD19bcfrmgv5zFex94DLeY33osLwduozYqABRiSvo
+  connection.py: QmW9DVSJwTdD8BkjiZc8fYa2ndHVCy6HepFpmnX8H8TVMH
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/http_server/connection.py b/packages/fetchai/connections/http_server/connection.py
index c5629419dc..9655657e13 100644
--- a/packages/fetchai/connections/http_server/connection.py
+++ b/packages/fetchai/connections/http_server/connection.py
@@ -57,6 +57,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 
+
 SUCCESS = 200
 NOT_FOUND = 404
 REQUEST_TIMEOUT = 408
diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml
index 7878887307..9f5b628ccb 100644
--- a/packages/fetchai/connections/http_server/connection.yaml
+++ b/packages/fetchai/connections/http_server/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTmQcnUPKaDHHJHngBFXnUVPdgBLanP9DbjVHZT55Scfn
   __init__.py: Qmb6JEAkJeb5JweqrSGiGoQp1vGXqddjGgb9WMkm2phTgA
-  connection.py: QmUdFW1587JpJEfwzb9LS55imtdNkXnZZKZfQNWtrLbDAa
+  connection.py: QmNxiS2h8QhqraJTiNdrGtM7BNCxiFfZvgdaWK9T1ghgxj
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/connections/ledger/base.py b/packages/fetchai/connections/ledger/base.py
index da1920fd63..c9fbdd4411 100644
--- a/packages/fetchai/connections/ledger/base.py
+++ b/packages/fetchai/connections/ledger/base.py
@@ -33,6 +33,7 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue, Dialogues
 
+
 CONNECTION_ID = PublicId.from_str("fetchai/ledger:0.6.0")
 
 
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index 1fa8d81190..abf2098efc 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfQN7UK1M4pBUzKVzPannPLVi8iiULKHNtJ7XpoWpjqfc
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
-  base.py: Qmec23f5Be6AkNvjwujzrRJExeXkjhD6fPzhRmGiPgwPLC
+  base.py: QmNnSBVmVgdDFwzqDUncwLHeyDfMEfmvujJdKbdGNGH4Be
   connection.py: Qmdibf99GzdFjFCcoTX7AiiBVWznKvPZWvur8cngSRNdye
   contract_dispatcher.py: QmXMPf7Mekyfo8SofcVYWWgMwADQZw68cXbmtf1pyKchVc
   ledger_dispatcher.py: QmTGvnN5W7VHZ9McQSyDQ1jPQoFWmQmuR2a3y8LL6J7aiM
diff --git a/packages/fetchai/connections/local/connection.py b/packages/fetchai/connections/local/connection.py
index 3d79dc86b2..53c10fe68c 100644
--- a/packages/fetchai/connections/local/connection.py
+++ b/packages/fetchai/connections/local/connection.py
@@ -39,6 +39,7 @@
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
+
 _default_logger = logging.getLogger("aea.packages.fetchai.connections.local")
 
 TARGET = 0
diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml
index 5c722defd8..625d62d1ef 100644
--- a/packages/fetchai/connections/local/connection.yaml
+++ b/packages/fetchai/connections/local/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbK7MtyAVqh2LmSh9TY6yBZqfWaAXURP4rQGATyP2hTKC
   __init__.py: QmeeoX5E38Ecrb1rLdeFyyxReHLrcJoETnBcPbcNWVbiKG
-  connection.py: QmaydCZEzNwBiDw5rVAW9oh63S9ymaG4WHcj2TWDnWViF2
+  connection.py: QmXtme7q9RZaLb53Gjsv2GcBg1XfrPGZprzxu2eNHyFdFY
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/oef/connection.py b/packages/fetchai/connections/oef/connection.py
index 8470f41a8a..124d6ad822 100644
--- a/packages/fetchai/connections/oef/connection.py
+++ b/packages/fetchai/connections/oef/connection.py
@@ -49,6 +49,7 @@
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.oef")
 
 TARGET = 0
diff --git a/packages/fetchai/connections/oef/connection.yaml b/packages/fetchai/connections/oef/connection.yaml
index 0f429611ed..807f12d66e 100644
--- a/packages/fetchai/connections/oef/connection.yaml
+++ b/packages/fetchai/connections/oef/connection.yaml
@@ -9,8 +9,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVHWxThR1u9a4BEm89oCxUTPGnN6PznvNgo6oZLqDD3n5
   __init__.py: QmUAen8tmoBHuCerjA3FSGKJRLG6JYyUS3chuWzPxKYzez
-  connection.py: QmQZf8YSviqEi2KbkQUdAAU5Z2TCAdXuQXTLv2sVCncrQ9
-  object_translator.py: QmfDTqq9kUhWrAJf8SyevzhcKcuYioiLxLQtWhavxbvawS
+  connection.py: QmfDKjDageCc4Pxdqokw7s2foEgwrWnoexcdHL9PcVWS45
+  object_translator.py: QmZbRaJgFC1RKDA8hox6xTpqmrpTbp8SyYQoKarTmS5HwG
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/default:0.5.0
diff --git a/packages/fetchai/connections/oef/object_translator.py b/packages/fetchai/connections/oef/object_translator.py
index 98fe4241b3..ddbf63fe26 100644
--- a/packages/fetchai/connections/oef/object_translator.py
+++ b/packages/fetchai/connections/oef/object_translator.py
@@ -52,6 +52,7 @@
     Query,
 )
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.oef")
 
 
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.py b/packages/fetchai/connections/p2p_libp2p/connection.py
index 84627fb356..67107f20ac 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p/connection.py
@@ -41,6 +41,7 @@
 from aea.helpers.pipe import IPCChannel, make_ipc_channel
 from aea.mail.base import Envelope
 
+
 _default_logger = logging.getLogger("aea.packages.fetchai.connections.p2p_libp2p")
 
 LIBP2P_NODE_MODULE = str(os.path.abspath(os.path.dirname(__file__)))
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.yaml b/packages/fetchai/connections/p2p_libp2p/connection.yaml
index 217db0e2b6..323a12b3e1 100644
--- a/packages/fetchai/connections/p2p_libp2p/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p/connection.yaml
@@ -15,7 +15,7 @@ fingerprint:
   aea/envelope.proto: QmSC8EGCKiNFR2vf5bSWymSzYDFMipQW9aQVMwPzQoKb4n
   aea/pipe_unix.go: QmSzbAexrSUSA9ZE6VT6MmcWF5MhEcmceQjAbnfRoK7Ruv
   aea/pipe_windows.go: QmdYpfjgdgFbA6Pothg65NYM45ubfpZeKr8cVQoqbFzgUK
-  connection.py: QmPEcaeBAHS7FQE27idXAB5WP9MnSXTxdVr39jdd5zdX5Z
+  connection.py: QmXR4qF92gJDMvphLX14GwnPbGdYYWr3f7oM6dWjMScgzy
   dht/dhtclient/dhtclient.go: QmasA3GrgswTnUJoffBzeeqxeT3GjLu6foN6PHJhWNpMMa
   dht/dhtclient/dhtclient_test.go: QmPfnHSHXtbaW5VYuq1QsKQWey64pUEvLEaKKkT9eAcmws
   dht/dhtclient/options.go: QmPorj38wNrxGrzsbFe5wwLmiHzxbTJ2VsgvSd8tLDYS8s
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.py b/packages/fetchai/connections/p2p_libp2p_client/connection.py
index 0ae1dfa284..07b795f36e 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.py
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.py
@@ -34,6 +34,7 @@
 from aea.exceptions import enforce
 from aea.mail.base import Envelope
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.p2p_libp2p_client")
 
 PUBLIC_ID = PublicId.from_str("fetchai/p2p_libp2p_client:0.7.0")
diff --git a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
index a51a00d00d..dbe1904eb8 100644
--- a/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
+++ b/packages/fetchai/connections/p2p_libp2p_client/connection.yaml
@@ -10,7 +10,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUp9UrXSqEYeRxrEsGDhGPTjFrwKmuT3bjHJfGrfP8yjk
   __init__.py: QmT1FEHkPGMHV5oiVEfQHHr25N2qdZxydSNRJabJvYiTgf
-  connection.py: QmeSyMBkN1Y99g7c7j89Ack8NjzSPw5WDbodbwfqLP6ZLT
+  connection.py: QmSrJKGLtRogfMr6ZMGsZHeUfwkTAPDY49Hccw5QJzJ7K2
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PLibp2pClientConnection
diff --git a/packages/fetchai/connections/p2p_stub/connection.py b/packages/fetchai/connections/p2p_stub/connection.py
index 615b2e6f27..868ef46cb8 100644
--- a/packages/fetchai/connections/p2p_stub/connection.py
+++ b/packages/fetchai/connections/p2p_stub/connection.py
@@ -28,6 +28,7 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 
+
 PUBLIC_ID = PublicId.from_str("fetchai/p2p_stub:0.6.0")
 
 
diff --git a/packages/fetchai/connections/p2p_stub/connection.yaml b/packages/fetchai/connections/p2p_stub/connection.yaml
index c64dd5676d..cd89b62ea5 100644
--- a/packages/fetchai/connections/p2p_stub/connection.yaml
+++ b/packages/fetchai/connections/p2p_stub/connection.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbAStnFJj6jMTwqNu7DG9dt2uy5JGrGhKtCbYuAhWLBCk
   __init__.py: QmW9XFKGsea4u3fupkFMcQutgsjqusCMBMyTcTmLLmQ4tR
-  connection.py: QmSd6uheF634ZkHoPe1DtpPeD6Sx6p11rpB8tYELqWZUoS
+  connection.py: QmVcCQYuXoXbYUVDi3BBarf6fxeg9GjKYkr814CMGUq3UW
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PStubConnection
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 822944c72e..b6dd3a9a14 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -61,6 +61,7 @@
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
+
 _default_logger = logging.getLogger("aea.packages.fetchai.connections.oef")
 
 PUBLIC_ID = PublicId.from_str("fetchai/soef:0.8.0")
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 8a6ca5d174..5e40dea962 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmWwjETX39APP9RD5oVPeeCiDnUoDvjAcoVe2FK2Jc6anM
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmaBSm4WJgew1c2tChSR3683PTKBqdXgdHaPaQJXuEFXFL
+  connection.py: QmYzSA9zWn4r3kdBxvV1TGeqb1oGKCuvHruoH8Nkexneb7
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/connections/tcp/base.py b/packages/fetchai/connections/tcp/base.py
index da399a3792..dc5bddd500 100644
--- a/packages/fetchai/connections/tcp/base.py
+++ b/packages/fetchai/connections/tcp/base.py
@@ -28,6 +28,7 @@
 from aea.connections.base import Connection, ConnectionStates
 from aea.mail.base import Envelope
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp")
 
 PUBLIC_ID = PublicId.from_str("fetchai/tcp:0.7.0")
diff --git a/packages/fetchai/connections/tcp/connection.yaml b/packages/fetchai/connections/tcp/connection.yaml
index 7ecf44617c..0e740d4432 100644
--- a/packages/fetchai/connections/tcp/connection.yaml
+++ b/packages/fetchai/connections/tcp/connection.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVtv8cSd49aAYHFjbCdmvJJoD4mPCuG5PR7QKXxcAquJw
   __init__.py: QmTxAtQ9ffraStxxLAkvmWxyGhoV3jE16Sw6SJ9xzTthLb
-  base.py: QmRu7RYvTQuXvzM8mj8LQ8d3XtaHKLRdnMo7AvX2X76npe
+  base.py: Qmf3rJCzi6dmEXa87X1HpZRqWvuirAykeTnNyEt5SKzLJ9
   connection.py: QmcQnyUagAhE7UsSBxiBSqsuF4mTMdU26LZLhUhdq5QygR
-  tcp_client.py: QmR96SGPA9ZKQSJuhXXuQhPu55X3pygwGKhjtVZaynFVF1
-  tcp_server.py: Qme1JTrtwuR1aGsA24yCnuPeGq1NRXrLDuG4ANUK5Uv317
+  tcp_client.py: QmfTTuC41Wp8dRBeNJWXKa6ryu98TRT8H3oSCFmvfypCEy
+  tcp_server.py: QmZ8tNfGzqNepjjspMfjWdwsGX2Afj56nSEdyAJfdHcHqS
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: TCPClientConnection
diff --git a/packages/fetchai/connections/tcp/tcp_client.py b/packages/fetchai/connections/tcp/tcp_client.py
index 4b1fd007fc..4d4446d27d 100644
--- a/packages/fetchai/connections/tcp/tcp_client.py
+++ b/packages/fetchai/connections/tcp/tcp_client.py
@@ -34,6 +34,7 @@
 
 from packages.fetchai.connections.tcp.base import TCPConnection
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp.tcp_client")
 
 STUB_DIALOGUE_ID = 0
diff --git a/packages/fetchai/connections/tcp/tcp_server.py b/packages/fetchai/connections/tcp/tcp_server.py
index 9b0325ecfd..515d3d3c71 100644
--- a/packages/fetchai/connections/tcp/tcp_server.py
+++ b/packages/fetchai/connections/tcp/tcp_server.py
@@ -30,6 +30,7 @@
 
 from packages.fetchai.connections.tcp.base import TCPConnection
 
+
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp.tcp_server")
 
 STUB_DIALOGUE_ID = 0
diff --git a/packages/fetchai/connections/webhook/connection.py b/packages/fetchai/connections/webhook/connection.py
index b4e28cfa38..18d65e6d1a 100644
--- a/packages/fetchai/connections/webhook/connection.py
+++ b/packages/fetchai/connections/webhook/connection.py
@@ -37,6 +37,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 from packages.fetchai.protocols.http.message import HttpMessage
 
+
 SUCCESS = 200
 NOT_FOUND = 404
 REQUEST_TIMEOUT = 408
diff --git a/packages/fetchai/connections/webhook/connection.yaml b/packages/fetchai/connections/webhook/connection.yaml
index edbd4803ec..ca03a8df41 100644
--- a/packages/fetchai/connections/webhook/connection.yaml
+++ b/packages/fetchai/connections/webhook/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmQDqfKKsksKsUqdqTcYe8P8Fw3MGovVuZBFHPbhupkkxf
   __init__.py: QmWUKSmXaBgGMvKgdmzKmMjCx43BnrfW6og2n3afNoAALq
-  connection.py: QmVzx4qbqru7oLCsUnSqWCMt9e69yUr9BquhaLXdTKz16U
+  connection.py: QmVZv722GNjJkXxQSnvVBQgWCTnG2uBfAVAkgvn2E5qWzX
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/http:0.5.0
diff --git a/packages/fetchai/contracts/erc1155/contract.py b/packages/fetchai/contracts/erc1155/contract.py
index 99db581ea3..9d8b9852c8 100644
--- a/packages/fetchai/contracts/erc1155/contract.py
+++ b/packages/fetchai/contracts/erc1155/contract.py
@@ -33,6 +33,7 @@
 from aea.crypto.ethereum import EthereumApi
 from aea.crypto.fetchai import FetchAIApi
 
+
 logger = logging.getLogger("aea.packages.fetchai.contracts.erc1155.contract")
 MAX_UINT_256 = 2 ^ 256 - 1
 
diff --git a/packages/fetchai/contracts/erc1155/contract.yaml b/packages/fetchai/contracts/erc1155/contract.yaml
index 221b26e0c5..b482f4aa6c 100644
--- a/packages/fetchai/contracts/erc1155/contract.yaml
+++ b/packages/fetchai/contracts/erc1155/contract.yaml
@@ -10,7 +10,7 @@ fingerprint:
   build/Migrations.json: QmfFYYWoq1L1Ni6YPBWWoRPvCZKBLZ7qzN3UDX537mCeuE
   build/erc1155.json: Qma5n7au2NDCg1nLwYfYnmFNwWChFuXtu65w5DV7wAZRvw
   build/erc1155.wasm: Qmc9gthbdwRSywinTHKjRVQdFzrKTxUuLDx2ryNfQp1xqf
-  contract.py: QmSEfxq6dH53q9qEw3KrtTgUqvyDgCefy59RNpciGGAGi6
+  contract.py: QmeSSDsCXpXiaj3ZHJGPE7QCFcfw8EgP6kCr8CNg6SnN4Q
   contracts/Migrations.sol: QmbW34mYrj3uLteyHf3S46pnp9bnwovtCXHbdBHfzMkSZx
   contracts/erc1155.vy: QmXwob8G1uX7fDvtuuKW139LALWtQmGw2vvaTRBVAWRxTx
   migrations/1_initial_migration.js: QmcxaWKQ2yPkQBmnpXmcuxPZQUMuUudmPmX3We8Z9vtAf7
diff --git a/packages/fetchai/protocols/contract_api/__init__.py b/packages/fetchai/protocols/contract_api/__init__.py
index 4674ea494b..b93cfc3722 100644
--- a/packages/fetchai/protocols/contract_api/__init__.py
+++ b/packages/fetchai/protocols/contract_api/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.contract_api.message import ContractApiMessage
 from packages.fetchai.protocols.contract_api.serialization import ContractApiSerializer
 
+
 ContractApiMessage.serializer = ContractApiSerializer
diff --git a/packages/fetchai/protocols/contract_api/custom_types.py b/packages/fetchai/protocols/contract_api/custom_types.py
index 430b1dea25..6d8449867c 100644
--- a/packages/fetchai/protocols/contract_api/custom_types.py
+++ b/packages/fetchai/protocols/contract_api/custom_types.py
@@ -27,6 +27,7 @@
 from aea.helpers.transaction.base import RawTransaction as BaseRawTransaction
 from aea.helpers.transaction.base import State as BaseState
 
+
 RawMessage = BaseRawMessage
 RawTransaction = BaseRawTransaction
 State = BaseState
diff --git a/packages/fetchai/protocols/contract_api/message.py b/packages/fetchai/protocols/contract_api/message.py
index d84c69c714..eb6202f927 100644
--- a/packages/fetchai/protocols/contract_api/message.py
+++ b/packages/fetchai/protocols/contract_api/message.py
@@ -35,6 +35,7 @@
 )
 from packages.fetchai.protocols.contract_api.custom_types import State as CustomState
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.contract_api.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index f1bf7e424c..fb4df12be8 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -7,12 +7,12 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVR8NKCTfaoLCiepHWqPGPVRuhmbwaM4v9iheK4FzaWwj
-  __init__.py: QmZodYjNqoMgGAGKfkCU4zU9t1Cx9MAownqSy4wyVdwaHF
+  __init__.py: QmcZFuqoBkEx1fYytpLr7142vtXf9qh8cpeRYVZcaWdmrD
   contract_api.proto: QmNwngtcYFSuqL8yeTGVXmrHjfebCybdUa9BnTDKXn8odk
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
-  custom_types.py: QmbLjpiTcGNfvdBsu8pgQH6PK5y6ujdNnZ53JSk1GZDRCA
+  custom_types.py: QmcMtzozPhcL2H9hDmnUd9bHDE3ihy7HQgvGKkhqxdAXf4
   dialogues.py: QmTjXH8JUtziUFDawKsSTYE5dxn1n1FmMPeWexyxiPYd6k
-  message.py: Qmbxqt2TauoUkP6bqeYz1LZ7FukMvW3szs26HU87QCEFya
+  message.py: QmNodRNJKx6N2ToPRdVFark7e3S3j4VZU4c5rbTKa9Y5pw
   serialization.py: QmQzS931wTQNt758wvnB81aD16hUMQ19WVK6f1p1XuEwUp
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/fipa/__init__.py b/packages/fetchai/protocols/fipa/__init__.py
index 51ed765862..84ca80bc01 100644
--- a/packages/fetchai/protocols/fipa/__init__.py
+++ b/packages/fetchai/protocols/fipa/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.fipa.serialization import FipaSerializer
 
+
 FipaMessage.serializer = FipaSerializer
diff --git a/packages/fetchai/protocols/fipa/custom_types.py b/packages/fetchai/protocols/fipa/custom_types.py
index f00f139fdf..c028276b05 100644
--- a/packages/fetchai/protocols/fipa/custom_types.py
+++ b/packages/fetchai/protocols/fipa/custom_types.py
@@ -23,6 +23,7 @@
 from aea.helpers.search.models import Description as BaseDescription
 from aea.helpers.search.models import Query as BaseQuery
 
+
 Description = BaseDescription
 
 Query = BaseQuery
diff --git a/packages/fetchai/protocols/fipa/message.py b/packages/fetchai/protocols/fipa/message.py
index 02328af938..57f781e3ac 100644
--- a/packages/fetchai/protocols/fipa/message.py
+++ b/packages/fetchai/protocols/fipa/message.py
@@ -31,6 +31,7 @@
 )
 from packages.fetchai.protocols.fipa.custom_types import Query as CustomQuery
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.fipa.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml
index f1f2a5a028..93295d63a5 100644
--- a/packages/fetchai/protocols/fipa/protocol.yaml
+++ b/packages/fetchai/protocols/fipa/protocol.yaml
@@ -7,12 +7,12 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmRwxwzxfhotek7WUbyAeufBvoHpWbDwfUVMy3FKitiHKy
-  __init__.py: QmZuv8RGegxunYaJ7sHLwj2oLLCFCAGF139b8DxEY68MRT
-  custom_types.py: Qmb7bzEUAW74ZeSFqL7sTccNCjudStV63K4CFNZtibKUHB
+  __init__.py: QmR6pcWX14FsQip4eYJRNeiQdrNMPj6y4m6Tsgd6hd7yU6
+  custom_types.py: Qmf72KRbkNsxxAHwMtkmJc5TRL23fU7AuzJAdSTftckwJQ
   dialogues.py: QmWaciW35ZTVeTeLWeyp3hjehKkWB5ZY7Di8N8cDH8Mjwb
   fipa.proto: QmP7JqnuQSQ9BDcKkscrTydKEX4wFBoyFaY1bkzGkamcit
   fipa_pb2.py: QmZMkefJLrb3zJKoimb6a9tdpxDBhc8rR2ghimqg7gZ471
-  message.py: QmbFtigdnmqqmKZMTxjmk6JQJtcyhVY9a4mpEEcHmFJd24
+  message.py: QmSnzY8G89gUsgo21wF2TxnjZr7czba9a7HEfLpWg9tqQq
   serialization.py: QmQMb8F8hJm1gkJFSPPCtDAoxSX3bFkshtzRgDWfWB8ynd
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/gym/__init__.py b/packages/fetchai/protocols/gym/__init__.py
index ce5eacc728..6e25f7d246 100644
--- a/packages/fetchai/protocols/gym/__init__.py
+++ b/packages/fetchai/protocols/gym/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.protocols.gym.serialization import GymSerializer
 
+
 GymMessage.serializer = GymSerializer
diff --git a/packages/fetchai/protocols/gym/message.py b/packages/fetchai/protocols/gym/message.py
index 7642fde42f..a9ef1b03fe 100644
--- a/packages/fetchai/protocols/gym/message.py
+++ b/packages/fetchai/protocols/gym/message.py
@@ -28,6 +28,7 @@
 
 from packages.fetchai.protocols.gym.custom_types import AnyObject as CustomAnyObject
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.gym.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index e53d9e38d6..c806a183ef 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -7,12 +7,12 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTCkz4cEUcwuPZVtvrVr8Np5qn1SMwm6foGSY9Y68DhZT
-  __init__.py: QmWBvruqGuU2BVCq8cuP1S3mgvuC78yrG4TdtSvKhCT8qX
+  __init__.py: QmQvogZ6FVrp15UX2GZ2YKqZASS9gamA72MGt79oieE2tq
   custom_types.py: QmT3VKT86xZKR11RR1vQ3myRpmVZNdzY6ELd8HG9U2ngwa
   dialogues.py: QmdCzcFfyPF43U2SoxwshG5p4hd6dK49m6GYKduDHbnNPo
   gym.proto: QmQGF9Xz4Z93wmhdKoztzxjo5pS4SsAWe2TQdvZCLuzdGC
   gym_pb2.py: QmSTz7xrL8ryqzR1Sgu1NpR6PmW7GUhBGnN2qYc8m8NCcN
-  message.py: QmTaiHDJkdduU4HLn7i17oAigJQwrws8FmfQCwbfAagnGp
+  message.py: QmW1FwzkVpqcVmEWjwuX79ZYPuxwrmvfJEqtMcQjRC19AS
   serialization.py: QmPNsgeGkagzQuAyq97fcGXA2LoPwiuq8X1tcfVXoLwnSV
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/http/__init__.py b/packages/fetchai/protocols/http/__init__.py
index 8159b9d27c..9ec736425a 100644
--- a/packages/fetchai/protocols/http/__init__.py
+++ b/packages/fetchai/protocols/http/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.http.message import HttpMessage
 from packages.fetchai.protocols.http.serialization import HttpSerializer
 
+
 HttpMessage.serializer = HttpSerializer
diff --git a/packages/fetchai/protocols/http/message.py b/packages/fetchai/protocols/http/message.py
index 3c4841038a..e1facfecc5 100644
--- a/packages/fetchai/protocols/http/message.py
+++ b/packages/fetchai/protocols/http/message.py
@@ -26,6 +26,7 @@
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.http.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml
index fba165de7c..9fd9a926a5 100644
--- a/packages/fetchai/protocols/http/protocol.yaml
+++ b/packages/fetchai/protocols/http/protocol.yaml
@@ -7,11 +7,11 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmY7fxhyNBgwU7uc6LKtCN4aSQ4bym5BwqtwRAfwPokULN
-  __init__.py: QmRWie4QPiFJE8nK4fFJ6prqoG3u36cPo7st5JUZAGpVWv
+  __init__.py: QmWzgWYrnS7PhjYrrx2mykLoaCbb7rDnVRcDqifsRukTy4
   dialogues.py: QmdwTehjCppcxyDid8m6zuHY5YwprUhato88R9Zdm9aXaM
   http.proto: QmdTUTvvxGxMxSTB67AXjMUSDLdsxBYiSuJNVxHuLKB1jS
   http_pb2.py: QmYYKqdwiueq54EveL9WXn216FXLSQ6XGJJHoiJxwJjzHC
-  message.py: QmYSmd2xLU8TsLLorxxNnaHj1cVLztgrKtQnaqJ1USFkPY
+  message.py: QmcZaEZbRbcx5U5KVEi2QTr6BVyHGDXcRrSqKhpngXRZ15
   serialization.py: QmTq34k2PD6Ybhk8x1EboY3UcNp8r3H6Tb3egZsWJN9nFv
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/ledger_api/__init__.py b/packages/fetchai/protocols/ledger_api/__init__.py
index 03712dc20d..99f0907397 100644
--- a/packages/fetchai/protocols/ledger_api/__init__.py
+++ b/packages/fetchai/protocols/ledger_api/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.ledger_api.serialization import LedgerApiSerializer
 
+
 LedgerApiMessage.serializer = LedgerApiSerializer
diff --git a/packages/fetchai/protocols/ledger_api/custom_types.py b/packages/fetchai/protocols/ledger_api/custom_types.py
index adde5cd580..43508e0ee5 100644
--- a/packages/fetchai/protocols/ledger_api/custom_types.py
+++ b/packages/fetchai/protocols/ledger_api/custom_types.py
@@ -25,6 +25,7 @@
 from aea.helpers.transaction.base import TransactionDigest as BaseTransactionDigest
 from aea.helpers.transaction.base import TransactionReceipt as BaseTransactionReceipt
 
+
 RawTransaction = BaseRawTransaction
 SignedTransaction = BaseSignedTransaction
 Terms = BaseTerms
diff --git a/packages/fetchai/protocols/ledger_api/message.py b/packages/fetchai/protocols/ledger_api/message.py
index 6b60d32682..ef64a3fcf8 100644
--- a/packages/fetchai/protocols/ledger_api/message.py
+++ b/packages/fetchai/protocols/ledger_api/message.py
@@ -40,6 +40,7 @@
     TransactionReceipt as CustomTransactionReceipt,
 )
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.ledger_api.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml
index e74aaec3e3..b08f57e1c4 100644
--- a/packages/fetchai/protocols/ledger_api/protocol.yaml
+++ b/packages/fetchai/protocols/ledger_api/protocol.yaml
@@ -7,12 +7,12 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSoo6ds8mKhtoG8CBbu9rb9yj7sqeeuBfcU7CLj584uRX
-  __init__.py: Qmct8jVx6ndWwaa5HXJAJgMraVuZ8kMeyx6rnEeHAYHwDJ
-  custom_types.py: QmQJnWQvtj1D9zqGWM3XrpNtZPmzr4rLgKxoG1MzM5udNA
+  __init__.py: QmX6ta6j6ust7qhVk1kZygzZK3gTTg7hSCBbSMKUxJgWgG
+  custom_types.py: QmWRrvFStMhVJy8P2WD6qjDgk14ZnxErN7XymxUtof7HQo
   dialogues.py: QmRtWkAfR9WTvygMJ36R758RzdY2mGQs2fgtHCfjxmeaHy
   ledger_api.proto: QmfLcv7jJcGJ1gAdCMqsyxJcRud7RaTWteSXHL5NvGuViP
   ledger_api_pb2.py: QmQhM848REJTDKDoiqxkTniChW8bNNm66EtwMRkvVdbMry
-  message.py: QmcLuy4YcL22qs3jHf5KHZ7vZueiTDrEmbWjfRTbyzwc5m
+  message.py: QmNnb5uwsWZjQizDnuTwCAw1sGmmiARLeesTVDE4nLJi7j
   serialization.py: QmRuTqH9t9JtsnpWX5wpC438DdRxWKiqAB2u9fvQ2oy1GE
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/ml_trade/__init__.py b/packages/fetchai/protocols/ml_trade/__init__.py
index 84bc74eaac..bb602e2a47 100644
--- a/packages/fetchai/protocols/ml_trade/__init__.py
+++ b/packages/fetchai/protocols/ml_trade/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.ml_trade.message import MlTradeMessage
 from packages.fetchai.protocols.ml_trade.serialization import MlTradeSerializer
 
+
 MlTradeMessage.serializer = MlTradeSerializer
diff --git a/packages/fetchai/protocols/ml_trade/custom_types.py b/packages/fetchai/protocols/ml_trade/custom_types.py
index 995f1444a6..12aef0abc9 100644
--- a/packages/fetchai/protocols/ml_trade/custom_types.py
+++ b/packages/fetchai/protocols/ml_trade/custom_types.py
@@ -22,6 +22,7 @@
 from aea.helpers.search.models import Description as BaseDescription
 from aea.helpers.search.models import Query as BaseQuery
 
+
 Description = BaseDescription
 
 Query = BaseQuery
diff --git a/packages/fetchai/protocols/ml_trade/message.py b/packages/fetchai/protocols/ml_trade/message.py
index f99abeaa98..7cf62d08ed 100644
--- a/packages/fetchai/protocols/ml_trade/message.py
+++ b/packages/fetchai/protocols/ml_trade/message.py
@@ -31,6 +31,7 @@
 )
 from packages.fetchai.protocols.ml_trade.custom_types import Query as CustomQuery
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.ml_trade.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/ml_trade/protocol.yaml b/packages/fetchai/protocols/ml_trade/protocol.yaml
index 160ce8cb5c..b519b0114f 100644
--- a/packages/fetchai/protocols/ml_trade/protocol.yaml
+++ b/packages/fetchai/protocols/ml_trade/protocol.yaml
@@ -7,10 +7,10 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSRtzACMh3x3LSjYqWXWTpYpE4C7G8EHbW4zQQoMFFZ4K
-  __init__.py: QmXZMVdsBXUJxLZvwwhWBx58xfxMSyoGxdYp5Aeqmzqhzt
-  custom_types.py: QmeWvNKuezFxfmLYaxKhP9XffeiFFCwH1qowyiJacLAHpF
+  __init__.py: QmcCS9uUQTTS2w85dTNiN5rQ14wyBhmBkr7pPPPcbLphcn
+  custom_types.py: QmPa6mxbN8WShsniQxJACfzAPRjGzYLbUFGoVU4N9DewUw
   dialogues.py: QmVvP34aKWEtHrKmccNMvEdDnx5B7xpE5aEGzr6GU2u8UK
-  message.py: QmZdRAScKbmJgKVbRJvDyMUNfRZKWCwWFYjGNDDBAq5fUT
+  message.py: QmZ8HzNw27TdxoZBHRf1YJheACo7kU6n1497DYgxjbCwZu
   ml_trade.proto: QmeB21MQduEGQCrtiYZQzPpRqHL4CWEkvvcaKZ9GsfE8f6
   ml_trade_pb2.py: QmZVvugPysR1og6kWCJkvo3af2s9pQRHfuj4BptE7gU1EU
   serialization.py: QmTamQzo8ZNM6T7QnsA7qNzs2uJ7CHTUczzCsHwU9Q6Z5K
diff --git a/packages/fetchai/protocols/oef_search/__init__.py b/packages/fetchai/protocols/oef_search/__init__.py
index b8296a656d..f130fc2c1b 100644
--- a/packages/fetchai/protocols/oef_search/__init__.py
+++ b/packages/fetchai/protocols/oef_search/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.protocols.oef_search.serialization import OefSearchSerializer
 
+
 OefSearchMessage.serializer = OefSearchSerializer
diff --git a/packages/fetchai/protocols/oef_search/custom_types.py b/packages/fetchai/protocols/oef_search/custom_types.py
index 9a0fb4dc0d..b7bfeb8e5b 100644
--- a/packages/fetchai/protocols/oef_search/custom_types.py
+++ b/packages/fetchai/protocols/oef_search/custom_types.py
@@ -27,6 +27,7 @@
 from aea.helpers.search.models import Description as BaseDescription
 from aea.helpers.search.models import Query as BaseQuery
 
+
 Description = BaseDescription
 
 
diff --git a/packages/fetchai/protocols/oef_search/message.py b/packages/fetchai/protocols/oef_search/message.py
index 51190e1eee..824e80d505 100644
--- a/packages/fetchai/protocols/oef_search/message.py
+++ b/packages/fetchai/protocols/oef_search/message.py
@@ -37,6 +37,7 @@
 )
 from packages.fetchai.protocols.oef_search.custom_types import Query as CustomQuery
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.oef_search.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml
index 656d835d6f..4ab18b4d2f 100644
--- a/packages/fetchai/protocols/oef_search/protocol.yaml
+++ b/packages/fetchai/protocols/oef_search/protocol.yaml
@@ -7,10 +7,10 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmaGSTqxvQFKccBnLovhBbfSH3C3Sorrj7kFyZqW9qptLa
-  __init__.py: QmRvTtynKcd7shmzgf8aZdcA5witjNL5cL2a7WPgscp7wq
-  custom_types.py: QmPSAWKkH7R8XCfPUCRmuEqVxCnp8L5PTUq4DBt59AzFUC
+  __init__.py: Qmdr5ks5X4YtnpH6yKUcNu9uouyv3EGmrKFhyvNH7ZBjvT
+  custom_types.py: QmYAkKYj9gGHaij7uTejoJe9KRhNcsU4sJC1utMfhUYhg3
   dialogues.py: QmQPLnW3jAs6tLLmhkX4C7texGRHM9bfdjs83dUH5TkJ4v
-  message.py: QmU8jH94qxrcr9eUtXWn5PzqmHT7NBc62gs53HPXKVk1Ts
+  message.py: QmWFvjX7spNHQx6QQevBRXmFyJBuenyAPYAjxVLYvKdC7B
   oef_search.proto: QmNU8WsxT6XNFFneKKeDaZkNn3CEFDfZQkmKv9TyhyxzDB
   oef_search_pb2.py: QmSAFT1xxYRzJU6h1aFVDuYcx672sZ2vzV6c2ico7f4BLK
   serialization.py: QmU3ipyvogbpkFuQki6xqscdiPahDVYw4sBaPHaH3LVvwJ
diff --git a/packages/fetchai/protocols/tac/__init__.py b/packages/fetchai/protocols/tac/__init__.py
index 0563c30ca3..0dd910252c 100644
--- a/packages/fetchai/protocols/tac/__init__.py
+++ b/packages/fetchai/protocols/tac/__init__.py
@@ -22,4 +22,5 @@
 from packages.fetchai.protocols.tac.message import TacMessage
 from packages.fetchai.protocols.tac.serialization import TacSerializer
 
+
 TacMessage.serializer = TacSerializer
diff --git a/packages/fetchai/protocols/tac/custom_types.py b/packages/fetchai/protocols/tac/custom_types.py
index 453dab2932..094741edfe 100644
--- a/packages/fetchai/protocols/tac/custom_types.py
+++ b/packages/fetchai/protocols/tac/custom_types.py
@@ -22,6 +22,7 @@
 from enum import Enum
 from typing import Dict
 
+
 CODE_TO_MSG = {
     0: "Unexpected error.",
     1: "Request not recognized",
diff --git a/packages/fetchai/protocols/tac/message.py b/packages/fetchai/protocols/tac/message.py
index 999a42bbf9..29a6c32f5c 100644
--- a/packages/fetchai/protocols/tac/message.py
+++ b/packages/fetchai/protocols/tac/message.py
@@ -28,6 +28,7 @@
 
 from packages.fetchai.protocols.tac.custom_types import ErrorCode as CustomErrorCode
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.tac.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml
index db3fb0f167..d33f7cc5c9 100644
--- a/packages/fetchai/protocols/tac/protocol.yaml
+++ b/packages/fetchai/protocols/tac/protocol.yaml
@@ -8,10 +8,10 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmVhm6VBbggxjTe3PEhCBfTomWekNa5buYy3sY7YYN6Er6
-  __init__.py: QmZYdAjm3o44drRiY3MT4RtG2fFLxtaL8h898DmjoJwJzV
-  custom_types.py: QmXyAhpkE6sLExGgf2GxBv8gRYTDZu7XCDsa2m4rwvQrmp
+  __init__.py: QmSAC7PGra9fig8RhhF1j3XEVpgie9UZNNYPc2AB9Kx9xJ
+  custom_types.py: QmXQATfnvuCpt4FicF4QcqCcLj9PQNsSHjCBvVQknWpyaN
   dialogues.py: QmTxHrcGujP1RUYvfJygZyQoUwmDg2GBWfmbR3tWUSbyop
-  message.py: QmfNdmYk3wssDJvHwMsMxXaiWCjm3fSH9Su4KmsYDZJoWg
+  message.py: QmfNRtqEpLyAf4knnTecsiNxzehqwWjk8agfg9oe2XvCt3
   serialization.py: QmTk2Jp19dQ4SJdjSHAr8wbxw4rQSMheSuf1XzXG8CaoB4
   tac.proto: QmdpPZNhUW593qVNVoSTWZgd9R69bmBbw6Y9xjzYpvuDvV
   tac_pb2.py: QmUwW3kixKwD2o1RRdq4NoNoihPb5BXKKRngWXztq32fea
diff --git a/packages/fetchai/skills/aries_alice/behaviours.py b/packages/fetchai/skills/aries_alice/behaviours.py
index 847c40c3b8..e505883362 100644
--- a/packages/fetchai/skills/aries_alice/behaviours.py
+++ b/packages/fetchai/skills/aries_alice/behaviours.py
@@ -39,6 +39,7 @@
     HTTP_COUNTERPARTY,
 )
 
+
 DEFAULT_SERVICES_INTERVAL = 60.0
 
 
diff --git a/packages/fetchai/skills/aries_alice/dialogues.py b/packages/fetchai/skills/aries_alice/dialogues.py
index 96983efc95..d004587009 100644
--- a/packages/fetchai/skills/aries_alice/dialogues.py
+++ b/packages/fetchai/skills/aries_alice/dialogues.py
@@ -39,6 +39,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/aries_alice/skill.yaml b/packages/fetchai/skills/aries_alice/skill.yaml
index 7bdeae07c0..10baa733fa 100644
--- a/packages/fetchai/skills/aries_alice/skill.yaml
+++ b/packages/fetchai/skills/aries_alice/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmfS1ezD77No8WQkvrkPs4oSXHFbULRxatGzRhMbSMntSx
   __init__.py: Qma8qSTU34ADKWskBwQKQLGNpe3xDKNgjNQ6Q4MxUnKa3Q
-  behaviours.py: QmZafoGe1KJ6ZfQhAkgVQFUAbDfackh8YHRjxVdCLm2TQE
-  dialogues.py: QmRbbuYSXuNzMVK3gkHVFhwqH8k6oPo4ThGvVPrrn9N3Yq
+  behaviours.py: QmTdJbrP1N3W1M6CLDyPFc6erfcrhnbRJtDNN6ZuY9eRUt
+  dialogues.py: QmbCkYZ9mQK6az3qWVMuYmpy5bapq2szYigUbVzE2GgiJi
   handlers.py: QmTtqM5oWBEAZcHdTuwuPtbiZZGWontMNEtmDxcccS2u2Y
-  strategy.py: QmZ2jhWFQZipk6wAquS1gWxX94iAmhN9Vrh7tcPU9bgpzF
+  strategy.py: QmS6MYMF3TdZSqRNugUAoHcWcirsQ9kK2do28i5abKz4oM
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/aries_alice/strategy.py b/packages/fetchai/skills/aries_alice/strategy.py
index e18db9e729..af3158d7a6 100644
--- a/packages/fetchai/skills/aries_alice/strategy.py
+++ b/packages/fetchai/skills/aries_alice/strategy.py
@@ -28,6 +28,7 @@
 from aea.helpers.search.models import Description, Location
 from aea.skills.base import Model
 
+
 # default configs
 DEFAULT_ADMIN_HOST = "127.0.0.1"
 DEFAULT_ADMIN_PORT = 8031
diff --git a/packages/fetchai/skills/aries_faber/behaviours.py b/packages/fetchai/skills/aries_faber/behaviours.py
index 2e0080d319..629536e422 100644
--- a/packages/fetchai/skills/aries_faber/behaviours.py
+++ b/packages/fetchai/skills/aries_faber/behaviours.py
@@ -35,6 +35,7 @@
     HTTP_COUNTERPARTY,
 )
 
+
 DEFAULT_SEARCH_INTERVAL = 5.0
 
 
diff --git a/packages/fetchai/skills/aries_faber/dialogues.py b/packages/fetchai/skills/aries_faber/dialogues.py
index f00b84bd56..a82aad4e09 100644
--- a/packages/fetchai/skills/aries_faber/dialogues.py
+++ b/packages/fetchai/skills/aries_faber/dialogues.py
@@ -39,6 +39,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/aries_faber/handlers.py b/packages/fetchai/skills/aries_faber/handlers.py
index dd46d1205c..76c395f34b 100644
--- a/packages/fetchai/skills/aries_faber/handlers.py
+++ b/packages/fetchai/skills/aries_faber/handlers.py
@@ -51,6 +51,7 @@
     LEDGER_COMMAND_REGISTER_DID,
 )
 
+
 SUPPORT_REVOCATION = False
 
 
diff --git a/packages/fetchai/skills/aries_faber/skill.yaml b/packages/fetchai/skills/aries_faber/skill.yaml
index 6e25d53973..1841b6823a 100644
--- a/packages/fetchai/skills/aries_faber/skill.yaml
+++ b/packages/fetchai/skills/aries_faber/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdkSNCYx5dNGDAAveapQgoyM7Y7iYeQzR7KN2Sso3CJG4
   __init__.py: QmNPVQ6UajvJodqTLWbLvQZkKCfrNn1nYPrQXai3xdj6F7
-  behaviours.py: QmfF39uLgQinDRfWHo4fzbgJBGm1xanL1BbvdDwAHT7HPQ
-  dialogues.py: QmXveWmeU3eTDDhqDkBcVE2pJAtxJUAzcjbM8ZEjRvKUYW
-  handlers.py: QmZMEEQ3tGdfE1N5oMem5AZkXqreJ6BuGu7HsYrNwH99C3
-  strategy.py: QmcUmddp6CUP31Bfckt6EkV3n2VZcJrUagoGBaTDBMTdXR
+  behaviours.py: QmQUmnhHmEFjGp9SvkLqcBrmCe2CSFngzqTHNadqJXQMgw
+  dialogues.py: Qmeynv4h5ArYBJ2wkQurW7VXdDP1VXNbg5GiADkgMPFqj3
+  handlers.py: QmXpCVgMTLyewXPmXMmPHUpnZhQZ35GFAhZtcpujAd3WZ8
+  strategy.py: QmPPL4aZhf2jtCHjQyuzh9gyWiNYRt9V29UYvPvp9Lbqhw
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/aries_faber/strategy.py b/packages/fetchai/skills/aries_faber/strategy.py
index a73030b91e..c7fd743f3c 100644
--- a/packages/fetchai/skills/aries_faber/strategy.py
+++ b/packages/fetchai/skills/aries_faber/strategy.py
@@ -24,6 +24,7 @@
 from aea.helpers.search.models import Constraint, ConstraintType, Location, Query
 from aea.skills.base import Model
 
+
 # Default Config
 DEFAULT_ADMIN_HOST = "127.0.0.1"
 DEFAULT_ADMIN_PORT = 8021
diff --git a/packages/fetchai/skills/carpark_client/behaviours.py b/packages/fetchai/skills/carpark_client/behaviours.py
index deda9acdac..3f2e38b180 100644
--- a/packages/fetchai/skills/carpark_client/behaviours.py
+++ b/packages/fetchai/skills/carpark_client/behaviours.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
+
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/carpark_client/dialogues.py b/packages/fetchai/skills/carpark_client/dialogues.py
index 6f1ea07d83..40b2d5a2ac 100644
--- a/packages/fetchai/skills/carpark_client/dialogues.py
+++ b/packages/fetchai/skills/carpark_client/dialogues.py
@@ -43,6 +43,7 @@
     SigningDialogues as GenericSigningDialogues,
 )
 
+
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/carpark_client/handlers.py b/packages/fetchai/skills/carpark_client/handlers.py
index ce8f9a83a0..2f1e9cb165 100644
--- a/packages/fetchai/skills/carpark_client/handlers.py
+++ b/packages/fetchai/skills/carpark_client/handlers.py
@@ -26,6 +26,7 @@
     GenericSigningHandler,
 )
 
+
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/carpark_client/skill.yaml b/packages/fetchai/skills/carpark_client/skill.yaml
index acc3ffab98..9b81cf6b92 100644
--- a/packages/fetchai/skills/carpark_client/skill.yaml
+++ b/packages/fetchai/skills/carpark_client/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmeypYUvYR61ZD7qWQmeMnGq3ior9dQ6uuRpAduws65rFG
   __init__.py: QmPZ4bRmXpsDKD7ogCJHEMrtm67hpA5aqxvujgfQD1PtMd
-  behaviours.py: QmW2VLVXoepN7V1u4rgARXjp9d9PpPfVgMz2KuNdR76aRg
-  dialogues.py: QmcMynppu7B2nZR21LzxFQMpoRdegpWpwcXti2ba4Vcei5
-  handlers.py: Qme3AaVj6UPLufnMFoXVQKZn5EbEa1JsUqUNHh7jrxKWBE
-  strategy.py: QmRSgvrswoay8vF6woRm97vYVK9ZAGk1Gh26EkD4fFmbjz
+  behaviours.py: QmXw3wGKAqCT55MRX61g3eN1T2YVY4XC5z9b4Dg7x1Wihc
+  dialogues.py: QmcUgBjxeytE5aAx3VvPyna5EcBuqck9KazG3HygCWjawv
+  handlers.py: QmYx8WzeR2aCg2b2uiR1K2NHLn8DKhzAahLXoFnrXyDoDz
+  strategy.py: QmZVALhDnpEdxLhk3HLAmTs3JdEr9tk1QTS33ZsVnxkLXZ
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/carpark_client/strategy.py b/packages/fetchai/skills/carpark_client/strategy.py
index 9748064074..4b755b9173 100644
--- a/packages/fetchai/skills/carpark_client/strategy.py
+++ b/packages/fetchai/skills/carpark_client/strategy.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 Strategy = GenericStrategy
diff --git a/packages/fetchai/skills/carpark_detection/behaviours.py b/packages/fetchai/skills/carpark_detection/behaviours.py
index 24754d2cd2..589ac88e89 100755
--- a/packages/fetchai/skills/carpark_detection/behaviours.py
+++ b/packages/fetchai/skills/carpark_detection/behaviours.py
@@ -23,4 +23,5 @@
     GenericServiceRegistrationBehaviour,
 )
 
+
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/carpark_detection/database.py b/packages/fetchai/skills/carpark_detection/database.py
index 5d74865ad1..31dd90e8f9 100644
--- a/packages/fetchai/skills/carpark_detection/database.py
+++ b/packages/fetchai/skills/carpark_detection/database.py
@@ -27,6 +27,7 @@
 
 import skimage  # type: ignore
 
+
 _logger = logging.getLogger(
     "aea.packages.fetchai.skills.carpark_detection.detection_database"
 )
diff --git a/packages/fetchai/skills/carpark_detection/dialogues.py b/packages/fetchai/skills/carpark_detection/dialogues.py
index aa3bde5528..d493129414 100644
--- a/packages/fetchai/skills/carpark_detection/dialogues.py
+++ b/packages/fetchai/skills/carpark_detection/dialogues.py
@@ -39,6 +39,7 @@
     OefSearchDialogues as GenericOefSearchDialogues,
 )
 
+
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/carpark_detection/handlers.py b/packages/fetchai/skills/carpark_detection/handlers.py
index f0d711e69c..d92a4497fd 100644
--- a/packages/fetchai/skills/carpark_detection/handlers.py
+++ b/packages/fetchai/skills/carpark_detection/handlers.py
@@ -25,6 +25,7 @@
     GenericOefSearchHandler,
 )
 
+
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/carpark_detection/skill.yaml b/packages/fetchai/skills/carpark_detection/skill.yaml
index 1371479964..57a671e830 100644
--- a/packages/fetchai/skills/carpark_detection/skill.yaml
+++ b/packages/fetchai/skills/carpark_detection/skill.yaml
@@ -9,11 +9,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmcwNhv5N8m4ZtWvXY5eMDeL5ciivryDZPtGWXMFfTbYR7
   __init__.py: QmQoECB7dpCDCG3xCnBsoMy6oqgSdu69CzRcAcuZuyapnQ
-  behaviours.py: QmaPS7Q3jJMASLRzGBpM5nzw3qQfkEwa9AW6kRv8nAjDo7
-  database.py: QmQv79qDxNk8v9chNYq7AxxChAJVGs4B8Y9we35rjzaonP
-  dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
-  handlers.py: QmZ7r1LaYnjjkW6T7XLdmWdHjmyd9DsBjnFDvf5zoa6U6V
-  strategy.py: QmTHW32BzzYrBF1YkmftAMuyx6cKKGrp554qeKiFBJieJJ
+  behaviours.py: QmTNboU3YH8DehWnpZmoiDUCncpNmqoSVt1Yp4j7NsgY2S
+  database.py: QmcZ7zomRfpVakRQBaDFzkuAN8noEWkHo2LLxUMNpF1xUp
+  dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
+  handlers.py: QmbkmEP9K4Qu2MsRtnkdx3PGNbSW46qi48bCHVCUJHpcQF
+  strategy.py: QmUCmsvvKqRsM4nFuhsUUTfCnZ6zPffXytD3PjMjFdqHdU
 fingerprint_ignore_patterns:
 - temp_files_placeholder/*
 contracts: []
diff --git a/packages/fetchai/skills/carpark_detection/strategy.py b/packages/fetchai/skills/carpark_detection/strategy.py
index f3cde2bdf7..fda05ba286 100644
--- a/packages/fetchai/skills/carpark_detection/strategy.py
+++ b/packages/fetchai/skills/carpark_detection/strategy.py
@@ -27,6 +27,7 @@
 from packages.fetchai.skills.carpark_detection.database import DetectionDatabase
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
+
 DEFAULT_DB_IS_REL_TO_CWD = False
 DEFAULT_DB_REL_DIR = "temp_files_placeholder"
 
diff --git a/packages/fetchai/skills/echo/dialogues.py b/packages/fetchai/skills/echo/dialogues.py
index 877e8356dd..a0b0c96e5e 100644
--- a/packages/fetchai/skills/echo/dialogues.py
+++ b/packages/fetchai/skills/echo/dialogues.py
@@ -25,6 +25,7 @@
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.skills.base import Model
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml
index ea30fccd22..e83fba6fd6 100644
--- a/packages/fetchai/skills/echo/skill.yaml
+++ b/packages/fetchai/skills/echo/skill.yaml
@@ -9,7 +9,7 @@ fingerprint:
   README.md: Qmd884WK35W5JuT6i1gXQFspxVPnCpeXv9kqWXnUaUAx4E
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
   behaviours.py: QmXARXRvJkpzuqnYNhJhv42Sk6J4KzRW2AKvC6FJWLU9JL
-  dialogues.py: QmTWhg4VnPFVsEq6D4KQvLWZntFDBxY7ujEjgD7ZspKcen
+  dialogues.py: QmbfLMqP1aScVV68rEUpenKiWA5KsnT1Zq48jVnk5jFmQ5
   handlers.py: QmfD1dbce2WoPF54DNgu9DUNZrHeTucA5LyDoiFr8j5pTx
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/erc1155_client/behaviours.py b/packages/fetchai/skills/erc1155_client/behaviours.py
index dfa465d175..fd336e7fad 100644
--- a/packages/fetchai/skills/erc1155_client/behaviours.py
+++ b/packages/fetchai/skills/erc1155_client/behaviours.py
@@ -31,6 +31,7 @@
 )
 from packages.fetchai.skills.erc1155_client.strategy import Strategy
 
+
 DEFAULT_SEARCH_INTERVAL = 5.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/erc1155_client/handlers.py b/packages/fetchai/skills/erc1155_client/handlers.py
index fd542bd2b1..b0466bf9c5 100644
--- a/packages/fetchai/skills/erc1155_client/handlers.py
+++ b/packages/fetchai/skills/erc1155_client/handlers.py
@@ -47,6 +47,7 @@
 )
 from packages.fetchai.skills.erc1155_client.strategy import Strategy
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml
index 099ed84f66..8f419f4185 100644
--- a/packages/fetchai/skills/erc1155_client/skill.yaml
+++ b/packages/fetchai/skills/erc1155_client/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZLsx2wJE762rqDqfeqLMg9RBczvALxy3H2U9kfRvgK3s
   __init__.py: QmRXXJsv5bfvb7qsyxQtVzXwn6PMLJKkbm6kg4DNkT1NtW
-  behaviours.py: QmaCak7V3jYEWdj4fLdd2tEG4fiSazbLBC5WKjDeSAQhrh
+  behaviours.py: QmZwfSsHuCquNXfWaj2y4x5iTS7hhborRkkcaSCf83ELNo
   dialogues.py: QmPb2odXbXxuY5Ygm9mfCufM2mtMZ23oapsAzsWHC2x2k4
-  handlers.py: QmSahx4wij2w9X6Zm9wAHyeJVRifpKGkstwYKDzcosqkfe
-  strategy.py: QmNg87LgfLPoPyokFrmvrNghQD7JkWehRNAdRNyB3YogeN
+  handlers.py: QmNPXo4j4tZDSGBfufz6xocH6yJiCAfqw2bo7L2nhBSTiL
+  strategy.py: QmNroEjE9CZ5VKdCK3ojeEzknPdum2A2XjoYAGQRuFSjZS
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/erc1155_client/strategy.py b/packages/fetchai/skills/erc1155_client/strategy.py
index d528a4bb95..c4a9e5ddd9 100644
--- a/packages/fetchai/skills/erc1155_client/strategy.py
+++ b/packages/fetchai/skills/erc1155_client/strategy.py
@@ -24,6 +24,7 @@
 from aea.helpers.search.models import Constraint, ConstraintType, Location, Query
 from aea.skills.base import Model
 
+
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
 DEFAULT_SEARCH_QUERY = {
     "search_key": "seller_service",
diff --git a/packages/fetchai/skills/erc1155_deploy/behaviours.py b/packages/fetchai/skills/erc1155_deploy/behaviours.py
index 84357c3b9c..397b93405c 100644
--- a/packages/fetchai/skills/erc1155_deploy/behaviours.py
+++ b/packages/fetchai/skills/erc1155_deploy/behaviours.py
@@ -34,6 +34,7 @@
 )
 from packages.fetchai.skills.erc1155_deploy.strategy import Strategy
 
+
 DEFAULT_SERVICES_INTERVAL = 30.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/erc1155_deploy/handlers.py b/packages/fetchai/skills/erc1155_deploy/handlers.py
index 540cf087af..fd9f0a7168 100644
--- a/packages/fetchai/skills/erc1155_deploy/handlers.py
+++ b/packages/fetchai/skills/erc1155_deploy/handlers.py
@@ -47,6 +47,7 @@
 )
 from packages.fetchai.skills.erc1155_deploy.strategy import Strategy
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index fadc21b3bf..a69c4d2d60 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZ7swVkRpmJbJZ2NoLb9CWwH8p3QjnjRJg71UbAXdrKyx
   __init__.py: Qmbm3ZtGpfdvvzqykfRqbaReAK9a16mcyK7qweSfeN5pq1
-  behaviours.py: QmaiK1q2cYeP64YriCw6PHm9Mr1okMRU9esPftQDXXFy1f
+  behaviours.py: QmTxNwRPPSavQQFSnQLkEX6c49qJVg9cFfJuFv8HBpgvKo
   dialogues.py: QmcCbdxFM4SX3MgXDxxbsC66gp8QK3C4W2czniQ5oDNc7G
-  handlers.py: Qmeof4YFVmZGUacBBbibhnEH4CU4hDCDmcKRoEBx6NPvvd
-  strategy.py: QmeoDg7UT5MG5khmrZna3v8HYrC6QJjjEV26kcq1mPs6yx
+  handlers.py: QmSp3YuFz5nLy6Bc6qQr27ZUtwNQR6LyKiRHXcYpnmhm9r
+  strategy.py: QmaHiqKdShWi1ZAUeLpmKAKYN7Np9wZ3SnKYadMStqWdZn
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/erc1155_deploy/strategy.py b/packages/fetchai/skills/erc1155_deploy/strategy.py
index bdb058f810..c47f57ac4d 100644
--- a/packages/fetchai/skills/erc1155_deploy/strategy.py
+++ b/packages/fetchai/skills/erc1155_deploy/strategy.py
@@ -36,6 +36,7 @@
 
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 
+
 DEFAULT_IS_LEDGER_TX = True
 DEFAULT_NFT = 1
 DEFAULT_FT = 2
diff --git a/packages/fetchai/skills/generic_buyer/behaviours.py b/packages/fetchai/skills/generic_buyer/behaviours.py
index 1eecadaa15..5a8a0c2c8f 100644
--- a/packages/fetchai/skills/generic_buyer/behaviours.py
+++ b/packages/fetchai/skills/generic_buyer/behaviours.py
@@ -31,6 +31,7 @@
 )
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 DEFAULT_SEARCH_INTERVAL = 5.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/generic_buyer/dialogues.py b/packages/fetchai/skills/generic_buyer/dialogues.py
index 3e57ed0b77..aeffb739e0 100644
--- a/packages/fetchai/skills/generic_buyer/dialogues.py
+++ b/packages/fetchai/skills/generic_buyer/dialogues.py
@@ -58,6 +58,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/generic_buyer/handlers.py b/packages/fetchai/skills/generic_buyer/handlers.py
index 0e60ef1b1a..dc2318533f 100644
--- a/packages/fetchai/skills/generic_buyer/handlers.py
+++ b/packages/fetchai/skills/generic_buyer/handlers.py
@@ -44,6 +44,7 @@
 )
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml
index 3072c5b6b0..3d6c91eef6 100644
--- a/packages/fetchai/skills/generic_buyer/skill.yaml
+++ b/packages/fetchai/skills/generic_buyer/skill.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmTR91jm7WfJpmabisy74NR5mc35YXjDU1zQAUKZeHRw8L
   __init__.py: QmaEDrNJBeHCJpbdFckRUhLSBqCXQ6umdipTMpYhqSKxSG
-  behaviours.py: QmSEymQerdUYooELqC2NyXJFpXLpwBX49G1DjMzzMVa69s
-  dialogues.py: QmeUqYS9BXKfVJZDPUwLQZAzzEwPJcdDt9hPiBAKPYazt6
-  handlers.py: QmZVuiu84WgGX3R438kuDVcNJZrahzWgLxsPAy34R6kc34
-  strategy.py: Qmb2T99WnQQa4qyZSdu31QyrbtHy8ZWC6Jhv9sVrTYrFxE
+  behaviours.py: QmX7Km1haWpc8bXm24kD7d5F14me9sSfAo5X3JZtBhGUph
+  dialogues.py: QmY3uJpB2UpWsa9SipZQzMjYr7WtSycuF5YS3SLyCuh78N
+  handlers.py: QmTHw6Eg4zga1yzeskxu3qUKYcj56kLeogpJSYUwsvs29o
+  strategy.py: QmchU21Gb1pmNoGmFTDass7zhNE8rCvWGNh1UYFK5DzhoK
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/generic_buyer/strategy.py b/packages/fetchai/skills/generic_buyer/strategy.py
index bb7797bc11..d0966aa86e 100644
--- a/packages/fetchai/skills/generic_buyer/strategy.py
+++ b/packages/fetchai/skills/generic_buyer/strategy.py
@@ -33,6 +33,7 @@
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
 
+
 DEFAULT_LEDGER_ID = DEFAULT_LEDGER
 DEFAULT_IS_LEDGER_TX = True
 
diff --git a/packages/fetchai/skills/generic_seller/behaviours.py b/packages/fetchai/skills/generic_seller/behaviours.py
index 0a7cb9028f..c60d770500 100644
--- a/packages/fetchai/skills/generic_seller/behaviours.py
+++ b/packages/fetchai/skills/generic_seller/behaviours.py
@@ -31,6 +31,7 @@
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
+
 DEFAULT_SERVICES_INTERVAL = 60.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/generic_seller/dialogues.py b/packages/fetchai/skills/generic_seller/dialogues.py
index dbdff8f02d..72ef9bf837 100644
--- a/packages/fetchai/skills/generic_seller/dialogues.py
+++ b/packages/fetchai/skills/generic_seller/dialogues.py
@@ -53,6 +53,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/generic_seller/handlers.py b/packages/fetchai/skills/generic_seller/handlers.py
index 1fe577cb7a..db4547380b 100644
--- a/packages/fetchai/skills/generic_seller/handlers.py
+++ b/packages/fetchai/skills/generic_seller/handlers.py
@@ -42,6 +42,7 @@
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml
index 24bb952fc8..942e3dfa32 100644
--- a/packages/fetchai/skills/generic_seller/skill.yaml
+++ b/packages/fetchai/skills/generic_seller/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPb5kHYZyhUN87EKmuahyGqDGgqVdGPyfC1KpGC3xfmcP
   __init__.py: QmbfkeFnZVKppLEHpBrTXUXBwg2dpPABJWSLND8Lf1cmpG
-  behaviours.py: QmTYpaELjbZxs128wSAxLry6vKgjnz3EuuDVy86T7XVAQ6
-  dialogues.py: QmRJCregJWVs8scTMjQptvztKa5NEHKUfeZECVxdU233C6
-  handlers.py: QmYyAYGiSMzUAq96LuFsVewYut9njvCR3NG9uEKonnwGf5
-  strategy.py: QmX1mp7eZkz1P6iVyoDCATZDKZRgwe1EgMVmAyvtGDHvm3
+  behaviours.py: QmdHumzBTxWg2PgWzwNVF4a5eG1dhGXzDwrY9eq4uevHqs
+  dialogues.py: QmfBWHVuKTzXu8vV5AkgWF6ZqMTZ3bs7SHEykoKXdmqvnH
+  handlers.py: QmdCtELzeNVBtVozwMLqMeVDuk2JdS8CG5D3xssBWEjTrk
+  strategy.py: QmUrUJzDoKFk6mhoz5ui58pXxVjTkPfEMnSdM8UezTjy3S
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/generic_seller/strategy.py b/packages/fetchai/skills/generic_seller/strategy.py
index 0233da532b..a22aa9e183 100644
--- a/packages/fetchai/skills/generic_seller/strategy.py
+++ b/packages/fetchai/skills/generic_seller/strategy.py
@@ -36,6 +36,7 @@
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
 
+
 DEFAULT_LEDGER_ID = DEFAULT_LEDGER
 DEFAULT_IS_LEDGER_TX = True
 
diff --git a/packages/fetchai/skills/gym/dialogues.py b/packages/fetchai/skills/gym/dialogues.py
index 831524be4f..be966cc833 100644
--- a/packages/fetchai/skills/gym/dialogues.py
+++ b/packages/fetchai/skills/gym/dialogues.py
@@ -35,6 +35,7 @@
 from packages.fetchai.protocols.gym.dialogues import GymDialogue as BaseGymDialogue
 from packages.fetchai.protocols.gym.dialogues import GymDialogues as BaseGymDialogues
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/gym/helpers.py b/packages/fetchai/skills/gym/helpers.py
index f32e80eb2a..6347f05b1d 100644
--- a/packages/fetchai/skills/gym/helpers.py
+++ b/packages/fetchai/skills/gym/helpers.py
@@ -32,6 +32,7 @@
 from packages.fetchai.protocols.gym.message import GymMessage
 from packages.fetchai.skills.gym.dialogues import GymDialogue, GymDialogues
 
+
 Action = Any
 Observation = Any
 Reward = float
diff --git a/packages/fetchai/skills/gym/rl_agent.py b/packages/fetchai/skills/gym/rl_agent.py
index 64b8a61493..771178fa0f 100644
--- a/packages/fetchai/skills/gym/rl_agent.py
+++ b/packages/fetchai/skills/gym/rl_agent.py
@@ -27,6 +27,7 @@
 
 from packages.fetchai.skills.gym.helpers import ProxyEnv, RLAgent
 
+
 DEFAULT_NB_STEPS = 4000
 NB_GOODS = 10
 
diff --git a/packages/fetchai/skills/gym/skill.yaml b/packages/fetchai/skills/gym/skill.yaml
index 5f983718bd..a045eb7c63 100644
--- a/packages/fetchai/skills/gym/skill.yaml
+++ b/packages/fetchai/skills/gym/skill.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUpD7PeLHS8nH7HJ48hBafSFhLn8Yrh571RCmxnStpNwq
   __init__.py: QmTf1GCgHxu7qq4HvUNYiBwuGEL1DcsHQuWH7N7TB5TtoC
-  dialogues.py: QmWQrpkx9GP3E1a9STqDQtKfXmKEUtrVkCEQjXh8YTeL8U
+  dialogues.py: QmTETCiWFK7vu8PMM9AaY64xHZhHivafmX33n4FXVKSub6
   handlers.py: QmagqBdQaGuGbVS5dFqxFtEww2e1YF2NprBNPtt5pVA2hZ
-  helpers.py: QmbRSMX7UCRAEotS4ocTEcZLo1qietAAU9K5zBtqY1nE82
-  rl_agent.py: QmUq3XY9Dd2XZBhNNK9J3S5937d3az4cwP1BmeieHSgJ3m
+  helpers.py: QmeYUyhPUeR6umfUGwMuE9nH6QCPhwkBpGxRG6P3s1avHu
+  rl_agent.py: QmQMrewAKFZn7EmmHajm1wn1NJHvVUgxosaGR5zapWt13s
   tasks.py: QmVf9K7zCkKYduTnS7nS3d8FvUbEVy7s7a26yaCC8Q3rgd
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/http_echo/dialogues.py b/packages/fetchai/skills/http_echo/dialogues.py
index e2d7d164e5..e0006a7855 100644
--- a/packages/fetchai/skills/http_echo/dialogues.py
+++ b/packages/fetchai/skills/http_echo/dialogues.py
@@ -35,6 +35,7 @@
 from packages.fetchai.protocols.http.dialogues import HttpDialogue as BaseHttpDialogue
 from packages.fetchai.protocols.http.dialogues import HttpDialogues as BaseHttpDialogues
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml
index 86be8f91e3..1866ee9702 100644
--- a/packages/fetchai/skills/http_echo/skill.yaml
+++ b/packages/fetchai/skills/http_echo/skill.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmYMHPsBX3wTMZZP89aKa7FzDCqGyvvue54ZBN8NZt4mNt
   __init__.py: QmaKik9dXg6cajBPG9RTDr6BhVdWk8aoR8QDNfPQgiy1kv
-  dialogues.py: QmQNBqcRDZwYSK3hucbNZf4CiTxEei5c4MV5wXvu1tZx1C
+  dialogues.py: QmNWC7bEimPQUL1QbJD4uyZ16szPR6WsrKt3MuHZXKkwAH
   handlers.py: QmdTuiao42XEvbp2wuqKP4U4noRqAVdec9rss51pswYCoe
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/ml_data_provider/behaviours.py b/packages/fetchai/skills/ml_data_provider/behaviours.py
index 0c086baff1..76a04e4899 100644
--- a/packages/fetchai/skills/ml_data_provider/behaviours.py
+++ b/packages/fetchai/skills/ml_data_provider/behaviours.py
@@ -23,4 +23,5 @@
     GenericServiceRegistrationBehaviour,
 )
 
+
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/ml_data_provider/dialogues.py b/packages/fetchai/skills/ml_data_provider/dialogues.py
index e175dac3b9..627e4c03c3 100644
--- a/packages/fetchai/skills/ml_data_provider/dialogues.py
+++ b/packages/fetchai/skills/ml_data_provider/dialogues.py
@@ -53,6 +53,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/ml_data_provider/skill.yaml b/packages/fetchai/skills/ml_data_provider/skill.yaml
index 6747072baf..a4cdf26aed 100644
--- a/packages/fetchai/skills/ml_data_provider/skill.yaml
+++ b/packages/fetchai/skills/ml_data_provider/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmakpsKWJrGRsoFaKR1Gf94KqcuPrkdXTYyciq5d4EhoFF
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
-  behaviours.py: QmWC4PEwWEyqcEJ9rTFjL9YpZ1pgkSpY9f4pE9mQHviSLz
-  dialogues.py: QmdFsEXJdTiQo7GSS1U7n9ukd79ZEDVki3ifeYeGsowv2G
+  behaviours.py: QmWgXU9qgahXwMKNqLLfDiGNYJozSXv2SVMkoPDQncC7ok
+  dialogues.py: QmUExSjdSxrtTDzMB8tZ5J9tFrgd78LhdMuvptpViSPfAW
   handlers.py: QmbmS4C1GdumnVkA5dc7czWRkjb9HGzY7YeATrnuMVU2X9
-  strategy.py: QmUsa36TcE6DXjdDDz1u1tAPVPHaJyMnVCTxudJhVCyA3e
+  strategy.py: QmaCViuN7q33drEtnJLSFjvBnr4Q6GF9LrJCCdv9AVukxk
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/ml_data_provider/strategy.py b/packages/fetchai/skills/ml_data_provider/strategy.py
index 04cd032521..25bf63464d 100644
--- a/packages/fetchai/skills/ml_data_provider/strategy.py
+++ b/packages/fetchai/skills/ml_data_provider/strategy.py
@@ -33,6 +33,7 @@
 from aea.helpers.search.models import Description, Location, Query
 from aea.skills.base import Model
 
+
 DEFAULT_PRICE_PER_DATA_BATCH = 10
 DEFAULT_BATCH_SIZE = 32
 DEFAULT_SELLER_TX_FEE = 0
diff --git a/packages/fetchai/skills/ml_train/behaviours.py b/packages/fetchai/skills/ml_train/behaviours.py
index 90540c71f5..875e5c4090 100644
--- a/packages/fetchai/skills/ml_train/behaviours.py
+++ b/packages/fetchai/skills/ml_train/behaviours.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
+
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/ml_train/dialogues.py b/packages/fetchai/skills/ml_train/dialogues.py
index 4fe3d6c61a..d9c2f2cbb4 100644
--- a/packages/fetchai/skills/ml_train/dialogues.py
+++ b/packages/fetchai/skills/ml_train/dialogues.py
@@ -62,6 +62,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/ml_train/handlers.py b/packages/fetchai/skills/ml_train/handlers.py
index f5c82a88dc..2b94f46624 100644
--- a/packages/fetchai/skills/ml_train/handlers.py
+++ b/packages/fetchai/skills/ml_train/handlers.py
@@ -46,6 +46,7 @@
 )
 from packages.fetchai.skills.ml_train.strategy import Strategy
 
+
 DUMMY_DIGEST = "dummy_digest"
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
diff --git a/packages/fetchai/skills/ml_train/ml_model.py b/packages/fetchai/skills/ml_train/ml_model.py
index 258cd23e01..24b4e56af6 100644
--- a/packages/fetchai/skills/ml_train/ml_model.py
+++ b/packages/fetchai/skills/ml_train/ml_model.py
@@ -27,6 +27,7 @@
 
 from aea.skills.base import Model
 
+
 DEFAULT_MODEL_CONFIG_PATH = str(Path("..", "..", "model.config").resolve())
 
 
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index 9a1766f226..5f20f79b17 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -9,12 +9,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmeHcYRhDJi6gqAHpK29UJz3doiyaicoqeTrPddqM3gh64
   __init__.py: QmbQigh7SV7dD2hLTGv3k9tnvpYWN1otG5yjiM7F3bbGEQ
-  behaviours.py: QmbJtAxgudXA35gERW14gMnCA9q79iRNQmKfgTTY9e2Bif
-  dialogues.py: QmT5owqhNghzRDXrm5FjDX4juGnSUxdCZX76jRCrPGevt7
-  handlers.py: QmbXT1EAHEX7hct6auLdBJXX9k9ujdoQgkXZCZqzTfdto1
-  ml_model.py: QmXp667GwVRrGsLxtqricnnyrBUUDn6efem22UCBd2g1y8
+  behaviours.py: QmQiBzKV5rEFpMQbSjfjzAJ7SqwwGmso6TozWkjdytucLR
+  dialogues.py: QmPVJzrAKhfhG8n2JLhvycFYRReBFBj362LxH6s885rSQM
+  handlers.py: QmSZR738THX7bCaXkuuoPDgwF3fo6DSD3hDt7EY2pRGxBm
+  ml_model.py: QmTfshn6dFnz9gKXZt7aJJczRH14bN7nk6TybwFpzkEPnk
   model.json: QmdV2tGrRY6VQ5VLgUa4yqAhPDG6X8tYsWecypq8nox9Td
-  strategy.py: QmY8z1DW6PqQuiEpgXAhwasSk1CgvvTNZQH1LtExupif9g
+  strategy.py: QmR98NbFLJntoDfMMdps4XVZqXyoWNU97PF8WbxwpsxXxJ
   tasks.py: QmahJRCf6V61FsqrKgMMUyJ8F7PRd6C2bjunZg2XtM9fpF
 fingerprint_ignore_patterns: []
 contracts: []
diff --git a/packages/fetchai/skills/ml_train/strategy.py b/packages/fetchai/skills/ml_train/strategy.py
index e772102d23..4eb44a3826 100644
--- a/packages/fetchai/skills/ml_train/strategy.py
+++ b/packages/fetchai/skills/ml_train/strategy.py
@@ -30,6 +30,7 @@
 )
 from aea.skills.base import Model
 
+
 DEFAULT_MAX_ROW_PRICE = 5
 DEFAULT_MAX_TX_FEE = 2
 DEFAULT_CURRENCY_ID = "FET"
diff --git a/packages/fetchai/skills/simple_service_registration/behaviours.py b/packages/fetchai/skills/simple_service_registration/behaviours.py
index d2fba8f27c..a8d56d99f2 100644
--- a/packages/fetchai/skills/simple_service_registration/behaviours.py
+++ b/packages/fetchai/skills/simple_service_registration/behaviours.py
@@ -29,6 +29,7 @@
 )
 from packages.fetchai.skills.simple_service_registration.strategy import Strategy
 
+
 DEFAULT_SERVICES_INTERVAL = 30.0
 
 
diff --git a/packages/fetchai/skills/simple_service_registration/dialogues.py b/packages/fetchai/skills/simple_service_registration/dialogues.py
index 8cfa6723d6..9b1b4b03d3 100644
--- a/packages/fetchai/skills/simple_service_registration/dialogues.py
+++ b/packages/fetchai/skills/simple_service_registration/dialogues.py
@@ -35,6 +35,7 @@
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 OefSearchDialogue = BaseOefSearchDialogue
 
 
diff --git a/packages/fetchai/skills/simple_service_registration/handlers.py b/packages/fetchai/skills/simple_service_registration/handlers.py
index 3826e190f2..2a09d52d4e 100644
--- a/packages/fetchai/skills/simple_service_registration/handlers.py
+++ b/packages/fetchai/skills/simple_service_registration/handlers.py
@@ -31,6 +31,7 @@
     OefSearchDialogues,
 )
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
diff --git a/packages/fetchai/skills/simple_service_registration/skill.yaml b/packages/fetchai/skills/simple_service_registration/skill.yaml
index 04c176e168..ebd93696c0 100644
--- a/packages/fetchai/skills/simple_service_registration/skill.yaml
+++ b/packages/fetchai/skills/simple_service_registration/skill.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmPuD9EtLKV143FbAaGUht5ZVtemVWXnm1jYmQxyUNnZ9T
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: Qmcz55RRytuCEZTkAU5PxX4jjaPxkp3f747ivJcceH78b4
-  dialogues.py: QmRJP7qGj2X74KoKrSMQiPkCRP6dGKtunw4e7qVwh1Sa3E
-  handlers.py: QmcFWEWmjDFxiksQiwWSUJ3mzJhVRXt9EmrD6PTHCmUX5G
-  strategy.py: QmNTZ6XXAv6nvJs7B1p5mt7bVdH4pb3motxADDrxCpbmWF
+  behaviours.py: QmbAQq8xchbxFu7QT3RofR1VX1ExQGUBemCQuNjc5bUnVA
+  dialogues.py: QmX8L6qMd4X6LHLyPmiXaQL2LA5Ca9Q6B77qYdfvfJ3aen
+  handlers.py: QmSjcePSvevn3msjeyTsrE9fzsJARCMyrM2TWGPCfQuAEi
+  strategy.py: QmSBEPT151kejVVjQG4fuyHMPK1PZ4KQkY2fV4p9MKLAXb
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/simple_service_registration/strategy.py b/packages/fetchai/skills/simple_service_registration/strategy.py
index 116822eca4..ca6fa6d145 100644
--- a/packages/fetchai/skills/simple_service_registration/strategy.py
+++ b/packages/fetchai/skills/simple_service_registration/strategy.py
@@ -28,6 +28,7 @@
 from aea.helpers.search.models import Description, Location
 from aea.skills.base import Model
 
+
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
 DEFAULT_SERVICE_DATA = {"key": "seller_service", "value": "generic_service"}
 
diff --git a/packages/fetchai/skills/tac_control/dialogues.py b/packages/fetchai/skills/tac_control/dialogues.py
index ad7982d1d5..dc1f522c68 100644
--- a/packages/fetchai/skills/tac_control/dialogues.py
+++ b/packages/fetchai/skills/tac_control/dialogues.py
@@ -43,6 +43,7 @@
 from packages.fetchai.protocols.tac.dialogues import TacDialogue as BaseTacDialogue
 from packages.fetchai.protocols.tac.dialogues import TacDialogues as BaseTacDialogues
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 99cd613e18..7688887183 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -54,6 +54,7 @@
 )
 from packages.fetchai.skills.tac_control.parameters import Parameters
 
+
 GoodId = str
 CurrencyId = str
 Quantity = int
diff --git a/packages/fetchai/skills/tac_control/helpers.py b/packages/fetchai/skills/tac_control/helpers.py
index fbe56fa922..803d5289af 100644
--- a/packages/fetchai/skills/tac_control/helpers.py
+++ b/packages/fetchai/skills/tac_control/helpers.py
@@ -28,6 +28,7 @@
 
 from aea.exceptions import enforce
 
+
 QUANTITY_SHIFT = 1  # Any non-negative integer is fine.
 DEFAULT_CURRENCY_ID_TO_NAME = {"0": "FET"}
 
diff --git a/packages/fetchai/skills/tac_control/parameters.py b/packages/fetchai/skills/tac_control/parameters.py
index 8198910907..7d89b288af 100644
--- a/packages/fetchai/skills/tac_control/parameters.py
+++ b/packages/fetchai/skills/tac_control/parameters.py
@@ -26,6 +26,7 @@
 from aea.helpers.search.models import Location
 from aea.skills.base import Model
 
+
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
 DEFAULT_SERVICE_DATA = {"key": "tac", "value": "v1"}
 
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index e1b7dbd0fc..8c6978739b 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -10,11 +10,11 @@ fingerprint:
   README.md: QmdWECpRXZXH5JPV6wVHqeUtvjBhieUFTEoT2e7EY16N8M
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
   behaviours.py: QmTVCXtTpH1A55vWnynz1PjM4VCrQ6EDy5XfcJpT93doEq
-  dialogues.py: QmV38FUrGYZeBcnC5cexQrNA5bdsJ44dC5hWTRSZiUxQmK
-  game.py: QmeAmG3LH1xBFRvUATrWY7spSDmjNeXVD4ZNYrt1BRY3jB
+  dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
+  game.py: QmUALtQyMid2o58DjbJ7uHR5Vx3ZnTxP6dyPHMLJWUo8SN
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
-  helpers.py: QmdG31YUJakBz8FdNNxU6RxqhWy9iv1BG253PzfxBhzqq2
-  parameters.py: QmQB95beEKzyA8Aa7Y9HTPw6BPEVi6BGkpsUqN4QZ4DcVG
+  helpers.py: QmQxT9wX8KLEMudJci9ST5M9RswmdZoiKSS5RY5UgRvrAP
+  parameters.py: QmNwnsG5um2E56ymc4y7akCwXLof94Y9wxe5bqkygk3VAa
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 28562d5ae1..6df52ee3b6 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -44,6 +44,7 @@
 )
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
+
 CONTROLLER_DATAMODEL = DataModel(
     "tac",
     [Attribute("version", str, True, "Version number of the TAC Controller Agent.")],
diff --git a/packages/fetchai/skills/tac_control_contract/game.py b/packages/fetchai/skills/tac_control_contract/game.py
index 5120453dc0..eb145223a0 100644
--- a/packages/fetchai/skills/tac_control_contract/game.py
+++ b/packages/fetchai/skills/tac_control_contract/game.py
@@ -45,6 +45,7 @@
 )
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
+
 GoodId = str
 CurrencyId = str
 Quantity = int
diff --git a/packages/fetchai/skills/tac_control_contract/helpers.py b/packages/fetchai/skills/tac_control_contract/helpers.py
index 6441d00f9f..ef4a86225c 100644
--- a/packages/fetchai/skills/tac_control_contract/helpers.py
+++ b/packages/fetchai/skills/tac_control_contract/helpers.py
@@ -29,6 +29,7 @@
 
 from packages.fetchai.contracts.erc1155.contract import ERC1155Contract
 
+
 QUANTITY_SHIFT = 1  # Any non-negative integer is fine.
 FT_NAME = "FT"
 FT_ID = 2
diff --git a/packages/fetchai/skills/tac_control_contract/parameters.py b/packages/fetchai/skills/tac_control_contract/parameters.py
index 7b7d098d80..b723de9e01 100644
--- a/packages/fetchai/skills/tac_control_contract/parameters.py
+++ b/packages/fetchai/skills/tac_control_contract/parameters.py
@@ -25,6 +25,7 @@
 from aea.exceptions import AEAEnforceError, enforce
 from aea.skills.base import Model
 
+
 DEFAULT_MIN_NB_AGENTS = 5
 DEFAULT_MONEY_ENDOWMENT = 200
 DEFAULT_NB_GOODS = 9  # ERC1155 vyper contract only accepts 10 tokens per mint/create
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 42af59473b..360abaaf9b 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,11 +9,11 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmV6mToyVnQL9squVJntDPrHvtxFk7sfEYJ61Fyoiy9wsE
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmcLSggJr1XpiDEwefCGGpfwUp282J4i97ziCNFH7X1M9C
-  game.py: Qmdz91tAYzEFDsvN4hNBawK7D7beTfocps1hpQc3RgavUK
+  behaviours.py: QmPWZCP4kPGqxK1L6xEm98R533Pi1WYgEw7EByuuvMHezK
+  game.py: QmfUHpi9KPnJbV3yneSh7tWen3JXPKhXw9Sn927Nth3obV
   handlers.py: QmWyibFRxcunBLqb7FJEkx9RpS6fNZpAvNDkG6cCfK7mQd
-  helpers.py: QmQ36tdx5itzz189tUgmyR74Q63vSRUcPTsg9qEwBUYdNU
-  parameters.py: QmRU9gxsWcxy25g69jbrKve2f8kFxNBjFfRjPZNKsYoYCP
+  helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
+  parameters.py: QmXYqasdtJacZFYXJgprG1i24pNeM2P6ehzg2qrxKt3GZc
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_negotiation/behaviours.py b/packages/fetchai/skills/tac_negotiation/behaviours.py
index 536ad27706..27be3e7a0c 100644
--- a/packages/fetchai/skills/tac_negotiation/behaviours.py
+++ b/packages/fetchai/skills/tac_negotiation/behaviours.py
@@ -32,6 +32,7 @@
 from packages.fetchai.skills.tac_negotiation.strategy import Strategy
 from packages.fetchai.skills.tac_negotiation.transactions import Transactions
 
+
 DEFAULT_REGISTER_AND_SEARCH_INTERVAL = 5.0
 
 
diff --git a/packages/fetchai/skills/tac_negotiation/dialogues.py b/packages/fetchai/skills/tac_negotiation/dialogues.py
index cd8c7c1b7f..493185e91d 100644
--- a/packages/fetchai/skills/tac_negotiation/dialogues.py
+++ b/packages/fetchai/skills/tac_negotiation/dialogues.py
@@ -51,6 +51,7 @@
     SUPPLY_DATAMODEL_NAME,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/packages/fetchai/skills/tac_negotiation/helpers.py b/packages/fetchai/skills/tac_negotiation/helpers.py
index 9e965f377f..b767cda175 100644
--- a/packages/fetchai/skills/tac_negotiation/helpers.py
+++ b/packages/fetchai/skills/tac_negotiation/helpers.py
@@ -33,6 +33,7 @@
     Query,
 )
 
+
 SUPPLY_DATAMODEL_NAME = "supply"
 DEMAND_DATAMODEL_NAME = "demand"
 
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index c7eae7a763..267b3e3a04 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -9,12 +9,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmZucue4N3TX7BPe9CDZybfMQc1zpYbRKEVXAUGYRpcUfD
   __init__.py: QmcgZLvHebdfocqBmbu6gJp35khs6nbdbC649jzUyS86wy
-  behaviours.py: QmUm9C86crCZpXkHGCaPKeMfuMnP8BjMzSsjrUGkysmg9T
-  dialogues.py: QmdzrSoUvvjRzKvAZ53ErHCgwj1r4oQnf8D6tbRnctKTMW
+  behaviours.py: QmcBCRFpM6ZtcuNZ12HUuwKgQKVdiAqQ6jDNMvzTGMpDdx
+  dialogues.py: QmdPAjBTpgrW9qP8SnAjKHWxBQRiGUqmgiiXMdrPKAJUKj
   handlers.py: QmeSaLfQV3rzHuHPhzsBps9z4AbX1MNevTs2YTjnZaWuEA
-  helpers.py: QmfRnfpeCtHMEXSH3q3ofWhoSc7pbpRrSFSBVStUK3JWt3
-  strategy.py: QmUd3cH7TDnc9f3cmDxhSuwQU33Hdn5eb2J4AuKHVE9Uxm
-  transactions.py: Qmc9Re92RLFkfds1NspTRym1wn7XPGSNDRFGtaG6Hrix4E
+  helpers.py: QmTJbGL8V6CLhbVhLekqKkHbu7cJMfBcv8DtWLSpkKP5tk
+  strategy.py: QmYcwqZ9ejjK2zxN8nKoc3kvBoGamTxwGQqXJrWV5s8STx
+  transactions.py: QmSFgjuvFMymkpCErkEFDiy5o2WCXPJXzVvmWyNjCFFT22
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_negotiation/strategy.py b/packages/fetchai/skills/tac_negotiation/strategy.py
index 2496848c7a..23cadbaa3d 100644
--- a/packages/fetchai/skills/tac_negotiation/strategy.py
+++ b/packages/fetchai/skills/tac_negotiation/strategy.py
@@ -47,6 +47,7 @@
 )
 from packages.fetchai.skills.tac_negotiation.transactions import Transactions
 
+
 ROUNDING_ADJUSTMENT = 1
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
 DEFAULT_SERVICE_KEY = "tac_service"
diff --git a/packages/fetchai/skills/tac_negotiation/transactions.py b/packages/fetchai/skills/tac_negotiation/transactions.py
index 1997572150..3b7cacb7b1 100644
--- a/packages/fetchai/skills/tac_negotiation/transactions.py
+++ b/packages/fetchai/skills/tac_negotiation/transactions.py
@@ -39,6 +39,7 @@
     SigningDialogues,
 )
 
+
 MessageId = int
 
 
diff --git a/packages/fetchai/skills/tac_participation/dialogues.py b/packages/fetchai/skills/tac_participation/dialogues.py
index f63c6d7c5b..bb05c4b233 100644
--- a/packages/fetchai/skills/tac_participation/dialogues.py
+++ b/packages/fetchai/skills/tac_participation/dialogues.py
@@ -47,6 +47,7 @@
 from packages.fetchai.protocols.tac.dialogues import TacDialogue as BaseTacDialogue
 from packages.fetchai.protocols.tac.dialogues import TacDialogues as BaseTacDialogues
 
+
 OefSearchDialogue = BaseOefSearchDialogue
 
 
diff --git a/packages/fetchai/skills/tac_participation/game.py b/packages/fetchai/skills/tac_participation/game.py
index 534c2bd01a..50a508125c 100644
--- a/packages/fetchai/skills/tac_participation/game.py
+++ b/packages/fetchai/skills/tac_participation/game.py
@@ -32,6 +32,7 @@
     TacDialogue,
 )
 
+
 DEFAULT_LEDGER_ID = "ethereum"
 
 DEFAULT_LOCATION = {"longitude": 51.5194, "latitude": 0.1270}
diff --git a/packages/fetchai/skills/tac_participation/skill.yaml b/packages/fetchai/skills/tac_participation/skill.yaml
index a28101841d..74cd860e52 100644
--- a/packages/fetchai/skills/tac_participation/skill.yaml
+++ b/packages/fetchai/skills/tac_participation/skill.yaml
@@ -10,8 +10,8 @@ fingerprint:
   README.md: QmVNxdGy1pbosYrrvbXczbkJtU7f5ddrBPSNnFoJA9GJzg
   __init__.py: QmcVpVrbV54Aogmowu6AomDiVMrVMo9BUvwKt9V1bJpBwp
   behaviours.py: QmX3UbuLohnPSLM2W6LrWcZyo4zXCr1YN5Bznu61v27SZC
-  dialogues.py: QmNz8EeBvoR4QCMcVxVqVuLaPvU4nEhRgvxQnXCq1x7jS1
-  game.py: QmVGeCGEfwmzktSPQN4xWL5yxjHqNyenneQzeW2vfx4giv
+  dialogues.py: QmZrJ1d9mhtfkxRg5QfsKbbtVZFa6cKna4anRWHvzNTEdD
+  game.py: QmWkoofaEnbaNp2X63HCi6pnrpJ9b8i3t7bV36GqeuVNgo
   handlers.py: QmSseAwQqHsSmj2eBPPnC9eygNSSwL1kheRVsgbLqyeDvV
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/thermometer/behaviours.py b/packages/fetchai/skills/thermometer/behaviours.py
index 0c086baff1..76a04e4899 100644
--- a/packages/fetchai/skills/thermometer/behaviours.py
+++ b/packages/fetchai/skills/thermometer/behaviours.py
@@ -23,4 +23,5 @@
     GenericServiceRegistrationBehaviour,
 )
 
+
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/thermometer/dialogues.py b/packages/fetchai/skills/thermometer/dialogues.py
index aa3bde5528..d493129414 100644
--- a/packages/fetchai/skills/thermometer/dialogues.py
+++ b/packages/fetchai/skills/thermometer/dialogues.py
@@ -39,6 +39,7 @@
     OefSearchDialogues as GenericOefSearchDialogues,
 )
 
+
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/thermometer/handlers.py b/packages/fetchai/skills/thermometer/handlers.py
index 1c9dec0554..3766f61003 100644
--- a/packages/fetchai/skills/thermometer/handlers.py
+++ b/packages/fetchai/skills/thermometer/handlers.py
@@ -25,6 +25,7 @@
     GenericOefSearchHandler,
 )
 
+
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/thermometer/skill.yaml b/packages/fetchai/skills/thermometer/skill.yaml
index a975946e98..1e1194ec55 100644
--- a/packages/fetchai/skills/thermometer/skill.yaml
+++ b/packages/fetchai/skills/thermometer/skill.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUH2RCKZZ3sKBptXtYZaFJTsJFyk5P1aeTNYYV1YPRNxP
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmWC4PEwWEyqcEJ9rTFjL9YpZ1pgkSpY9f4pE9mQHviSLz
-  dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
-  handlers.py: QmeWzG6R8P7z98M2kfXKzmK5u9vT6ZAp2tG7NcXTwWFSaZ
-  strategy.py: QmcFRUUhi6VubFw51rhkTH28QjQEV67kBFeTmAviroopmZ
+  behaviours.py: QmWgXU9qgahXwMKNqLLfDiGNYJozSXv2SVMkoPDQncC7ok
+  dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
+  handlers.py: QmNujxh4FtecTar5coHTJyY3BnVnsseuARSpyTLUDmFmfX
+  strategy.py: Qmd3Ugpid9WTMnJUMLdK89PQrcivae264vWk7UrEntb9z9
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/thermometer/strategy.py b/packages/fetchai/skills/thermometer/strategy.py
index e83b9684f8..ecefc1b778 100644
--- a/packages/fetchai/skills/thermometer/strategy.py
+++ b/packages/fetchai/skills/thermometer/strategy.py
@@ -26,6 +26,7 @@
 
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
+
 MAX_RETRIES = 10
 
 
diff --git a/packages/fetchai/skills/thermometer_client/behaviours.py b/packages/fetchai/skills/thermometer_client/behaviours.py
index deda9acdac..3f2e38b180 100644
--- a/packages/fetchai/skills/thermometer_client/behaviours.py
+++ b/packages/fetchai/skills/thermometer_client/behaviours.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
+
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/thermometer_client/dialogues.py b/packages/fetchai/skills/thermometer_client/dialogues.py
index 6f1ea07d83..40b2d5a2ac 100644
--- a/packages/fetchai/skills/thermometer_client/dialogues.py
+++ b/packages/fetchai/skills/thermometer_client/dialogues.py
@@ -43,6 +43,7 @@
     SigningDialogues as GenericSigningDialogues,
 )
 
+
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/thermometer_client/handlers.py b/packages/fetchai/skills/thermometer_client/handlers.py
index ce8f9a83a0..2f1e9cb165 100644
--- a/packages/fetchai/skills/thermometer_client/handlers.py
+++ b/packages/fetchai/skills/thermometer_client/handlers.py
@@ -26,6 +26,7 @@
     GenericSigningHandler,
 )
 
+
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/thermometer_client/skill.yaml b/packages/fetchai/skills/thermometer_client/skill.yaml
index dd9d186bb6..8f53b3b101 100644
--- a/packages/fetchai/skills/thermometer_client/skill.yaml
+++ b/packages/fetchai/skills/thermometer_client/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmSn1bh9J7RT241DGT4812rTNGe2S2YLpEvy8ApNqNNqjf
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmW2VLVXoepN7V1u4rgARXjp9d9PpPfVgMz2KuNdR76aRg
-  dialogues.py: QmcMynppu7B2nZR21LzxFQMpoRdegpWpwcXti2ba4Vcei5
-  handlers.py: Qme3AaVj6UPLufnMFoXVQKZn5EbEa1JsUqUNHh7jrxKWBE
-  strategy.py: QmRSgvrswoay8vF6woRm97vYVK9ZAGk1Gh26EkD4fFmbjz
+  behaviours.py: QmXw3wGKAqCT55MRX61g3eN1T2YVY4XC5z9b4Dg7x1Wihc
+  dialogues.py: QmcUgBjxeytE5aAx3VvPyna5EcBuqck9KazG3HygCWjawv
+  handlers.py: QmYx8WzeR2aCg2b2uiR1K2NHLn8DKhzAahLXoFnrXyDoDz
+  strategy.py: QmZVALhDnpEdxLhk3HLAmTs3JdEr9tk1QTS33ZsVnxkLXZ
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/thermometer_client/strategy.py b/packages/fetchai/skills/thermometer_client/strategy.py
index 9748064074..4b755b9173 100644
--- a/packages/fetchai/skills/thermometer_client/strategy.py
+++ b/packages/fetchai/skills/thermometer_client/strategy.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 Strategy = GenericStrategy
diff --git a/packages/fetchai/skills/weather_client/behaviours.py b/packages/fetchai/skills/weather_client/behaviours.py
index deda9acdac..3f2e38b180 100644
--- a/packages/fetchai/skills/weather_client/behaviours.py
+++ b/packages/fetchai/skills/weather_client/behaviours.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.behaviours import GenericSearchBehaviour
 
+
 SearchBehaviour = GenericSearchBehaviour
diff --git a/packages/fetchai/skills/weather_client/dialogues.py b/packages/fetchai/skills/weather_client/dialogues.py
index 6f1ea07d83..40b2d5a2ac 100644
--- a/packages/fetchai/skills/weather_client/dialogues.py
+++ b/packages/fetchai/skills/weather_client/dialogues.py
@@ -43,6 +43,7 @@
     SigningDialogues as GenericSigningDialogues,
 )
 
+
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/weather_client/handlers.py b/packages/fetchai/skills/weather_client/handlers.py
index ce8f9a83a0..2f1e9cb165 100644
--- a/packages/fetchai/skills/weather_client/handlers.py
+++ b/packages/fetchai/skills/weather_client/handlers.py
@@ -26,6 +26,7 @@
     GenericSigningHandler,
 )
 
+
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/weather_client/skill.yaml b/packages/fetchai/skills/weather_client/skill.yaml
index a2bf4ab038..c0f0253f86 100644
--- a/packages/fetchai/skills/weather_client/skill.yaml
+++ b/packages/fetchai/skills/weather_client/skill.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmP5vjtJk1TirWqzFcgvQYTZeZwaV3Qs5HKVW1WNWgMTPM
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmW2VLVXoepN7V1u4rgARXjp9d9PpPfVgMz2KuNdR76aRg
-  dialogues.py: QmcMynppu7B2nZR21LzxFQMpoRdegpWpwcXti2ba4Vcei5
-  handlers.py: Qme3AaVj6UPLufnMFoXVQKZn5EbEa1JsUqUNHh7jrxKWBE
-  strategy.py: QmRSgvrswoay8vF6woRm97vYVK9ZAGk1Gh26EkD4fFmbjz
+  behaviours.py: QmXw3wGKAqCT55MRX61g3eN1T2YVY4XC5z9b4Dg7x1Wihc
+  dialogues.py: QmcUgBjxeytE5aAx3VvPyna5EcBuqck9KazG3HygCWjawv
+  handlers.py: QmYx8WzeR2aCg2b2uiR1K2NHLn8DKhzAahLXoFnrXyDoDz
+  strategy.py: QmZVALhDnpEdxLhk3HLAmTs3JdEr9tk1QTS33ZsVnxkLXZ
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
diff --git a/packages/fetchai/skills/weather_client/strategy.py b/packages/fetchai/skills/weather_client/strategy.py
index 9748064074..4b755b9173 100644
--- a/packages/fetchai/skills/weather_client/strategy.py
+++ b/packages/fetchai/skills/weather_client/strategy.py
@@ -21,4 +21,5 @@
 
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 Strategy = GenericStrategy
diff --git a/packages/fetchai/skills/weather_station/behaviours.py b/packages/fetchai/skills/weather_station/behaviours.py
index 93d026803e..3218eb045c 100644
--- a/packages/fetchai/skills/weather_station/behaviours.py
+++ b/packages/fetchai/skills/weather_station/behaviours.py
@@ -24,4 +24,5 @@
     GenericServiceRegistrationBehaviour,
 )
 
+
 ServiceRegistrationBehaviour = GenericServiceRegistrationBehaviour
diff --git a/packages/fetchai/skills/weather_station/db_communication.py b/packages/fetchai/skills/weather_station/db_communication.py
index 9cd37018b3..2ee5d86fb1 100644
--- a/packages/fetchai/skills/weather_station/db_communication.py
+++ b/packages/fetchai/skills/weather_station/db_communication.py
@@ -24,6 +24,7 @@
 import sqlite3
 from typing import Dict, cast
 
+
 my_path = os.path.dirname(__file__)
 
 DB_SOURCE = os.path.join(my_path, "dummy_weather_station_data.db")
diff --git a/packages/fetchai/skills/weather_station/dialogues.py b/packages/fetchai/skills/weather_station/dialogues.py
index aa3bde5528..d493129414 100644
--- a/packages/fetchai/skills/weather_station/dialogues.py
+++ b/packages/fetchai/skills/weather_station/dialogues.py
@@ -39,6 +39,7 @@
     OefSearchDialogues as GenericOefSearchDialogues,
 )
 
+
 DefaultDialogues = GenericDefaultDialogues
 FipaDialogues = GenericFipaDialogues
 LedgerApiDialogues = GenericLedgerApiDialogues
diff --git a/packages/fetchai/skills/weather_station/dummy_weather_station_data.py b/packages/fetchai/skills/weather_station/dummy_weather_station_data.py
index 05068dc684..bfde1963c9 100644
--- a/packages/fetchai/skills/weather_station/dummy_weather_station_data.py
+++ b/packages/fetchai/skills/weather_station/dummy_weather_station_data.py
@@ -27,6 +27,7 @@
 import time
 from typing import Dict, Union
 
+
 logger = logging.getLogger(
     "aea.packages.fetchai.skills.weather_station.dummy_weather_station_data"
 )
diff --git a/packages/fetchai/skills/weather_station/handlers.py b/packages/fetchai/skills/weather_station/handlers.py
index 1c9dec0554..3766f61003 100644
--- a/packages/fetchai/skills/weather_station/handlers.py
+++ b/packages/fetchai/skills/weather_station/handlers.py
@@ -25,6 +25,7 @@
     GenericOefSearchHandler,
 )
 
+
 FipaHandler = GenericFipaHandler
 LedgerApiHandler = GenericLedgerApiHandler
 OefSearchHandler = GenericOefSearchHandler
diff --git a/packages/fetchai/skills/weather_station/skill.yaml b/packages/fetchai/skills/weather_station/skill.yaml
index f6ec6e5f55..4dc6ece6a5 100644
--- a/packages/fetchai/skills/weather_station/skill.yaml
+++ b/packages/fetchai/skills/weather_station/skill.yaml
@@ -9,12 +9,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: Qma72715sXAgDLggNNVkXQoVxCu9hyEEFKbyWTKSavEF2v
   __init__.py: QmNkZAetyctaZCUf6ACxP5onGWsSxu2hjSNoFmJ3ta6Lta
-  behaviours.py: QmWRboujPwBEJNHqXJcyNbbVvdGiJ2mabvjXS6td3YDb2Q
-  db_communication.py: QmPHjQJvYp96TRUWxTRW9TE9BHATNuUyMw3wy5oQSftnug
-  dialogues.py: QmeYs1FYc1Ud4yXULoyf1nSqornVx2dczFCJbF1BwM2gzD
-  dummy_weather_station_data.py: QmeSSsAiCKBfMHfUN4QvoKBTQRNCcGxeJicThkDTGRQE7i
-  handlers.py: QmeWzG6R8P7z98M2kfXKzmK5u9vT6ZAp2tG7NcXTwWFSaZ
-  strategy.py: QmWZiiNXeXGiduzro1bWdTr6ZLjL45TtvxFtY1dUQNWfYZ
+  behaviours.py: QmfPE6zrMmY2QARQt3gNZ2oiV3uAqvAQXSvU3XWnFDUQkG
+  db_communication.py: QmSLm4jic8JbP2wz35WyWevc9H2ZxsEYfaBMWcEx4pzVcy
+  dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
+  dummy_weather_station_data.py: QmVurNWKjXvCZk62JdYLMvrhCuU3kUpBqcRGQs2E5KnrV7
+  handlers.py: QmNujxh4FtecTar5coHTJyY3BnVnsseuARSpyTLUDmFmfX
+  strategy.py: QmVDAXUA1YBGa2PSQKDekyf5j1qZfEfLvZpuLJ6MnURvS8
 fingerprint_ignore_patterns:
 - '*.db'
 contracts: []
diff --git a/packages/fetchai/skills/weather_station/strategy.py b/packages/fetchai/skills/weather_station/strategy.py
index b0eeac39c7..7885d95fcb 100644
--- a/packages/fetchai/skills/weather_station/strategy.py
+++ b/packages/fetchai/skills/weather_station/strategy.py
@@ -26,6 +26,7 @@
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 from packages.fetchai.skills.weather_station.db_communication import DBCommunication
 
+
 DEFAULT_DATE_ONE = "3/10/2019"
 DEFAULT_DATE_TWO = "15/10/2019"
 
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 0341ac6d1c..06d740acae 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -18,55 +18,55 @@ fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
 fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
 fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
 fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
-fetchai/connections/gym,QmeVoxp49pwDh57ZirtpjZrC7YmdV7YYn5GHJVq7ekovEV
-fetchai/connections/http_client,QmeSZGTkJfG95iBjdhmevfEU1qAdX2gnrawHpwQrbG8DfS
-fetchai/connections/http_server,Qmbjf44kA8X3axcBX5AohNd8rF1K2uweSCDc9x6AsE4S9y
-fetchai/connections/ledger,QmXZjQkskqt5UbAw9bJbj6Lo9h4TRvengRqAchDRuJwGJd
-fetchai/connections/local,QmWZPDvqjZjzNDUX4ivHF3kGvkNCUYM449RqNEyyoexFix
-fetchai/connections/oef,QmaJZCCrYCjA8eY3zav9QjxWNcVJ6yQw2n6ZJ53fQT22xb
-fetchai/connections/p2p_libp2p,QmVXSnhCn37mgacK7iG1HENbEkSvSZMMaf9RTFCUUDa2C9
-fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4bW222
-fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
+fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
+fetchai/connections/http_client,QmfSuWhrseBCVcmzwKmqFDC6qX3ryFzfx2uuUTb8HPGuEd
+fetchai/connections/http_server,QmcqvHZbzGX1zdfwVTpqq5j6ugJhpuKEcrWkCW6JJrLJSC
+fetchai/connections/ledger,Qmb7dP2cQcYdYMthh5P7EwipNops9CKn2N3TBGNgwNnA2u
+fetchai/connections/local,Qmconur9cKrzYY1113AukHUPhgxUjzFrHExWnVpPBV8cRx
+fetchai/connections/oef,QmNpYX8XX6uXbFmBDi3s3W9qA48bRcrJatqSHAXDjhLwax
+fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
+fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
+fetchai/connections/p2p_stub,QmaP81r3ZCqKdL925fbRB8YKxHYaVBR1yW3iwzaErUYDSC
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmQ82mNiuBc9jEUFU8TeaAk5ktqnXX512h4X67yYUxRrX5
-fetchai/connections/stub,QmU1fuqRkzBufaHTB9qY7GSUkkh4Wq1M6ru6FQKnrcEoUZ
-fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
-fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
-fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
+fetchai/connections/soef,QmNLzoPJXUrFLoTKSy8WgF1ivedTyXrKXwd4tmA8mxn7As
+fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
+fetchai/connections/tcp,QmQZBeN6EqH61GMLwuHqAw3LzdyKi7uj7zJtJ5ekYDpY4n
+fetchai/connections/webhook,QmXLbSSUSbsgqk3Zwo7sfBob5nKL6MLA4MCTQ3BXA2Bex3
+fetchai/contracts/erc1155,QmWu22zW9AVMBVySwF413JMiT5dcWsLsU2gk1KvFYWAwPq
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,QmWWMHyzRT7rvdiBsPJ4xrE1nF5TZFfkW6J44D7Dc6g4mT
-fetchai/protocols/default,QmZ4y4M1zZ3j2BAvLKHf1Grf5twcsmSamdgc2zmkBdv254
-fetchai/protocols/fipa,QmerHPCMw8rGSrtM7mxuD93CgdCZ5YTreeNC8BNU8UskbK
-fetchai/protocols/gym,QmTEWeswAtuJrG4Uo8GWnpvgsGRTHxfDoQAohp42hFdkW9
-fetchai/protocols/http,QmYF8drqdddj8tRt9H9QQ1oMKSfrr6kGQvtpsseWBe8FjA
-fetchai/protocols/ledger_api,QmbF7U9YZbanjqJjAScHA5uiVp7HxfSnQxugwLptBKcVUc
-fetchai/protocols/ml_trade,Qmdx55dM9fFXeWrVzhHeUU9CoTt9t7YJACBwfg5EwBa2Rz
-fetchai/protocols/oef_search,Qmee5Bi3xQ98qX2uFkhUjhXTZi7uMFWnicK2yp7LBcuTYF
-fetchai/protocols/scaffold,QmXJb2kxe228AqQ2iHRiKJnhhKsC9zU8pqNdojLNXqjUvz
-fetchai/protocols/signing,QmYTfrqGX7exRtafwm9wHGzHZB1FziuZdYMVT1ad3fnKYR
-fetchai/protocols/state_update,QmejF6NFSBgfa1KTNkBCw4oZGrTnXHvwYXxayHKGLV4PtW
-fetchai/protocols/tac,QmchXXv217Dyft4PN6s1iE1Y5EKYUiYeSv9qLPZVrMwaLr
-fetchai/skills/aries_alice,QmXp6W2vFmQgYCchQwLa3yDUwWw7hjeC8WnuPmtrXebZnq
-fetchai/skills/aries_faber,QmcuNdL6rJz6xy9bqarRzmoJCVXk4NJjMfqeNnaS6WhwSD
-fetchai/skills/carpark_client,QmPYHXP1TvNihMa6WFSLP1NhiFDKTiArZbStQ6v54ySa8j
-fetchai/skills/carpark_detection,QmUDRJUJm9UTCyM9o3AwphD6q1L7mNLXPqSizJJvivtRe4
-fetchai/skills/echo,QmcHx9UjP429vnTxMpM3wSphkY2umanW1CZJyn7B1FkpWV
-fetchai/skills/erc1155_client,Qma5wTx1huj5DAcsBkRwCvZVczRREwyUawVJhyaC4UTrRE
-fetchai/skills/erc1155_deploy,QmYyeafnykiRwNHyk8hhLhyG3EaHijSMAoFXkrfeXv4DcE
+fetchai/protocols/contract_api,QmZbbYPdpewfBfLWBQNGzjYr45ZDYJ5PqL5TMrMxa7PrjZ
+fetchai/protocols/default,QmaU6VsHxLfrFxcnBAzXNmYA7yQ23kRY1Ddq5pq4NsVhyu
+fetchai/protocols/fipa,QmYtTLb4Gk7eHo2Q8VwYZomTdUoa5N37a22Dnh4bjpTvxt
+fetchai/protocols/gym,QmWv9Hi8cDypDYPLJTbbgXGmw6jvzZLUB2idbMTFdbDDqM
+fetchai/protocols/http,QmWDjfvkAGGt6eA1Ja6sXeBeGqE3vtNbGBwnVhGPJrEq4g
+fetchai/protocols/ledger_api,QmQERKQhT9JQNvy6vvT2xsQpv4GnEdvwGdFx7J6AY1j3hw
+fetchai/protocols/ml_trade,QmVrv8SnxKoRM5pZLWNB3tZP9VggvDK4ygDqy6DmweFKQH
+fetchai/protocols/oef_search,QmYPsjL1m3KUbT9UFSUickf19ydK6DLTNXT1sqtftJA1py
+fetchai/protocols/scaffold,QmaQJxMae5XaHKDc838pcGEKhhYSUyKHGWiMfU6zEcVHsy
+fetchai/protocols/signing,QmaaX5WnjhFE4BKR99B2KN3yY9DmnHnavbUpzb8EQ612T3
+fetchai/protocols/state_update,QmeczT1eBFtY2Kr9ZcpzATJRmjDgqKSGhi3x1arCbhXTb6
+fetchai/protocols/tac,QmYryedEw85W99BYM8exZSERbkzHXPag6hp6HQtmmJppJ7
+fetchai/skills/aries_alice,QmXFSjt8FSHMnw4yjsmw4SVxKRj9N1i5aPcnmPpyoh3Bu1
+fetchai/skills/aries_faber,QmX3k9N3VmUE8bYaZ4KCq1Ny3ANTVw7sN8nuCRLDZcTTZK
+fetchai/skills/carpark_client,QmdfgS34Q7mo7yZ4uThZePudEoPgsmybC66YdVZAXYEybv
+fetchai/skills/carpark_detection,QmXwpLqW72SNbfEXrkHXCq6wucmsx6eTUTn9aZzXJaB8Gw
+fetchai/skills/echo,QmPu8BeKw5DRYdjHqVWqQnXjW1ZgRBjVthGmVerHLBmJPA
+fetchai/skills/erc1155_client,QmPceeYCnt1PC9dDv9EN9dHfzfFUESSZdEsKGTcesEVpsR
+fetchai/skills/erc1155_deploy,QmYyerCPVQg7zUagT6FxZEthdSFrLXKMG5LtJbCYnRPALN
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
-fetchai/skills/generic_buyer,QmT6F5P2ZajWNHi4XiHXPa3iEuvVCrNcCNTzEi8XSkkHTT
-fetchai/skills/generic_seller,QmXzF3FiqNbFMYu2nMNbonzqZAY5Lf7NN6S9whd7c8Ek18
-fetchai/skills/gym,QmTXKPy2QGtHe1Nko7jXzUnq8EqT6Uto8ZETmMGH2Zyu4Z
-fetchai/skills/http_echo,QmaBNGNtDDcfCTQY6hsANAeZz7F4ZXEEPgTMd3ip75Zh1D
-fetchai/skills/ml_data_provider,QmXZpzAetLKPfoPSMAafjha2qjF38dWsLpZQg2jCQ3QgAV
-fetchai/skills/ml_train,QmU4HiyQUagkEwbU9rutL3g9xmQbo8WHUAULMBUcrEULks
+fetchai/skills/generic_buyer,Qmdx6M3y9gRCPJv5Lp8YnJP9nqJCgYAyp4gggqw9V85rY3
+fetchai/skills/generic_seller,Qmf1SYiBVfF6NYSir7ES9reSBpAGqtN9GkULH3fpBjatNZ
+fetchai/skills/gym,QmUqB5EJafEGWX5xkTngAgXW2857RnCEk6St2HE5x9hgtZ
+fetchai/skills/http_echo,QmQk7NbMpMRT3GEKtPVkWFv2UzwJHajU27qQV9UHKV1xPz
+fetchai/skills/ml_data_provider,QmZS1fm9ZCmZ1quW1LH2K9tdBPWL2woHBdJ1N912vL7BsV
+fetchai/skills/ml_train,QmRgu8MwTF8CWfGTudkRPc6bGkQy3P8tLNmWYXCLcJiehg
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
-fetchai/skills/simple_service_registration,Qmdqf1kGGfEb65UZcDmhEzW6GcTQyKdW5zjKhQjmLo3J11
-fetchai/skills/tac_control,QmXxSSNbHztL5UYSep2bLbsC7jUzyzeFQwDtf7VXnGMY1j
-fetchai/skills/tac_control_contract,QmNz5pNPvS7LBUMdjVPrRAFgJbaD2xTL1HJQnCoYK3Va4J
-fetchai/skills/tac_negotiation,QmT78rzq6dDBSguehay3R19LwcfXZDpuxYEsvgvY8mf1V7
-fetchai/skills/tac_participation,QmckgUZ2YoLi5j7btqWLRZLxPx9RkeUdYdp9cfu95sZMXy
-fetchai/skills/thermometer,QmUEuRdsTw3iTzLRA4C6SiRGwEK6gauLP1Apk13fCQYtKw
-fetchai/skills/thermometer_client,QmdESHLrhNasaUKYpG2m5p6f61dxmqjVKGPiNdEUs5ZHnu
-fetchai/skills/weather_client,QmTa3Pxv8tD478xGA6DkNjQn8vxKwGfqLhLMbAC73fK6qo
-fetchai/skills/weather_station,QmX75zb2gERaSHXVTcxJ3uRdSBiUVHvwieyWrdUyCSDQYm
+fetchai/skills/simple_service_registration,QmR3SLTfRxyqUQGpBkq3nGbB6Cfm9fXzXgaknJDGNe1Mkr
+fetchai/skills/tac_control,QmWtrSiEfdPocyDFHwADj2xmPCeP29iFhdcbfgWrRfT68b
+fetchai/skills/tac_control_contract,QmbhmoLPCWY7sKBDnN3qVxtnzsE8tXCJFEZsXyJBKwnfYL
+fetchai/skills/tac_negotiation,QmYHjhKPCNQ83gsthbW7qYygrLzuFUy3tiqwhwtieHdXEu
+fetchai/skills/tac_participation,Qmdh6sM8GPf53Kbr9HGPBvUD5goz4fYnFLwLLcdqo5pedn
+fetchai/skills/thermometer,Qmf2ntUbVmfawJw8AU2nfUf2m9Nrn8Qg6CQZNg1ECrcitc
+fetchai/skills/thermometer_client,QmP5vL38Nw4pkJ6y1UVvMwmBWazenMzSs2afHEfTzNqLEb
+fetchai/skills/weather_client,QmYDzApib8cgGnaQVfsibV7sfKNQzrDTeTFiYAakfUyoSb
+fetchai/skills/weather_station,QmXF23jHpe56wXr8HfBUgYBR63zRaHFsLkCWaWfXvb2mHi
diff --git a/scripts/check_copyright_notice.py b/scripts/check_copyright_notice.py
index ccb19ed670..d85faacd8a 100755
--- a/scripts/check_copyright_notice.py
+++ b/scripts/check_copyright_notice.py
@@ -33,6 +33,7 @@
 import sys
 from pathlib import Path
 
+
 HEADER_REGEX = r"""(#!/usr/bin/env python3
 )?# -\*- coding: utf-8 -\*-
 # ------------------------------------------------------------------------------
diff --git a/scripts/check_doc_links.py b/scripts/check_doc_links.py
index 46a33ed5a5..a6e8b8ad73 100644
--- a/scripts/check_doc_links.py
+++ b/scripts/check_doc_links.py
@@ -27,6 +27,7 @@
 
 import requests
 
+
 LINK_PATTERN_MD = re.compile(r"\[([^]]+)]\(\s*([^]]+)\s*\)")
 LINK_PATTERN = re.compile(r'(?<=<a href=")[^"]*')
 IMAGE_PATTERN = re.compile(r'<img[^>]+src="([^">]+)"')
diff --git a/scripts/check_package_dependencies.py b/scripts/check_package_dependencies.py
index 25ce34d07a..882030b6e8 100755
--- a/scripts/check_package_dependencies.py
+++ b/scripts/check_package_dependencies.py
@@ -36,6 +36,7 @@
 
 from aea.configurations.base import PackageId, PackageType, PublicId
 
+
 DEFAULT_CONFIG_FILE_PATHS = [
     Path("aea", "connections", "stub", "connection.yaml"),
     Path("aea", "protocols", "default", "protocol.yaml"),
diff --git a/scripts/check_package_versions_in_docs.py b/scripts/check_package_versions_in_docs.py
index 2252870b35..33ddb38144 100755
--- a/scripts/check_package_versions_in_docs.py
+++ b/scripts/check_package_versions_in_docs.py
@@ -35,6 +35,7 @@
 
 from aea.configurations.base import ComponentType, PackageId, PackageType, PublicId
 
+
 PUBLIC_ID_REGEX = PublicId.PUBLIC_ID_REGEX[1:-1]
 """This regex removes the '^' and '$' respectively, at the beginning and at the end."""
 
diff --git a/scripts/deploy_to_registry.py b/scripts/deploy_to_registry.py
index b2e5ad866e..97729d068a 100644
--- a/scripts/deploy_to_registry.py
+++ b/scripts/deploy_to_registry.py
@@ -33,6 +33,7 @@
 from aea.cli import cli
 from aea.configurations.base import PackageId, PackageType, PublicId
 
+
 CLI_LOG_OPTION = ["-v", "OFF"]
 
 DEFAULT_CONFIG_FILE_PATHS = [
diff --git a/scripts/generate_api_docs.py b/scripts/generate_api_docs.py
index dffa0d5954..a282611af5 100755
--- a/scripts/generate_api_docs.py
+++ b/scripts/generate_api_docs.py
@@ -25,6 +25,7 @@
 import sys
 from pathlib import Path
 
+
 DOCS_DIR = "docs/"
 MODULES_TO_PATH = {
     "aea.abstract_agent": "api/abstract_agent.md",
diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py
index e5af338e4b..017b7deb42 100755
--- a/scripts/generate_ipfs_hashes.py
+++ b/scripts/generate_ipfs_hashes.py
@@ -55,6 +55,7 @@
 )
 from aea.helpers.base import yaml_dump, yaml_dump_all
 
+
 AUTHOR = "fetchai"
 CORE_PATH = Path("aea")
 TEST_PATH = Path("tests") / "data"
diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index f4fbbd7478..f1c368362d 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -46,6 +46,7 @@
 from aea.configurations.loader import ConfigLoader
 from scripts.generate_ipfs_hashes import update_hashes
 
+
 DIRECTORIES = ["packages", "aea", "docs", "benchmark", "examples", "tests"]
 CLI_LOG_OPTION = ["-v", "OFF"]
 TYPES = set(map(lambda x: x.to_plural(), PackageType))
diff --git a/scripts/update_symlinks_cross_platform.py b/scripts/update_symlinks_cross_platform.py
index 0a6f1f5fc0..3e87242bcd 100755
--- a/scripts/update_symlinks_cross_platform.py
+++ b/scripts/update_symlinks_cross_platform.py
@@ -30,6 +30,7 @@
 from pathlib import Path
 from typing import List, Tuple
 
+
 SCRIPTS_PATH = Path(os.path.dirname(inspect.getfile(inspect.currentframe())))  # type: ignore
 ROOT_PATH = SCRIPTS_PATH.parent.absolute()
 TEST_DATA = ROOT_PATH / "tests" / "data"
diff --git a/setup.cfg b/setup.cfg
index 69fd0de769..86f14c6af0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,6 +39,7 @@ known_packages=packages
 known_local_folder=tests
 sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER
 case_sensitive=True
+lines_after_imports=2
 
 [mypy]
 python_version = 3.7
diff --git a/tests/common/utils.py b/tests/common/utils.py
index 81a64a5ac6..f44ec39d37 100644
--- a/tests/common/utils.py
+++ b/tests/common/utils.py
@@ -33,6 +33,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 DEFAULT_SLEEP = 0.0001
 DEFAULT_TIMEOUT = 3
 
diff --git a/tests/conftest.py b/tests/conftest.py
index f6998ac373..eb3a412978 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -83,6 +83,7 @@
 
 from .data.dummy_connection.connection import DummyConnection  # type: ignore
 
+
 logger = logging.getLogger(__name__)
 
 CliRunner = ImportedCliRunner
diff --git a/tests/data/generator/t_protocol/__init__.py b/tests/data/generator/t_protocol/__init__.py
index 183352784d..56de0d0a42 100644
--- a/tests/data/generator/t_protocol/__init__.py
+++ b/tests/data/generator/t_protocol/__init__.py
@@ -22,4 +22,5 @@
 from tests.data.generator.t_protocol.message import TProtocolMessage
 from tests.data.generator.t_protocol.serialization import TProtocolSerializer
 
+
 TProtocolMessage.serializer = TProtocolSerializer
diff --git a/tests/data/generator/t_protocol/message.py b/tests/data/generator/t_protocol/message.py
index b07a48d58d..cd24500c6c 100644
--- a/tests/data/generator/t_protocol/message.py
+++ b/tests/data/generator/t_protocol/message.py
@@ -28,6 +28,7 @@
 
 from tests.data.generator.t_protocol.custom_types import DataModel as CustomDataModel
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.t_protocol.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/tests/data/generator/t_protocol_no_ct/__init__.py b/tests/data/generator/t_protocol_no_ct/__init__.py
index 4ce3b6e598..2518f2ff75 100644
--- a/tests/data/generator/t_protocol_no_ct/__init__.py
+++ b/tests/data/generator/t_protocol_no_ct/__init__.py
@@ -22,4 +22,5 @@
 from tests.data.generator.t_protocol_no_ct.message import TProtocolNoCtMessage
 from tests.data.generator.t_protocol_no_ct.serialization import TProtocolNoCtSerializer
 
+
 TProtocolNoCtMessage.serializer = TProtocolNoCtSerializer
diff --git a/tests/data/generator/t_protocol_no_ct/message.py b/tests/data/generator/t_protocol_no_ct/message.py
index 8733c6d431..3d71c4dfb7 100644
--- a/tests/data/generator/t_protocol_no_ct/message.py
+++ b/tests/data/generator/t_protocol_no_ct/message.py
@@ -26,6 +26,7 @@
 from aea.exceptions import AEAEnforceError, enforce
 from aea.protocols.base import Message
 
+
 logger = logging.getLogger("aea.packages.fetchai.protocols.t_protocol_no_ct.message")
 
 DEFAULT_BODY_SIZE = 4
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 94516cc5c6..c7f15be116 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -60,6 +60,7 @@
     _make_dummy_connection,
 )
 
+
 dummy_skill_path = os.path.join(CUR_PATH, "data", "dummy_skill")
 contract_path = os.path.join(ROOT_DIR, "packages", "fetchai", "contracts", "erc1155")
 
diff --git a/tests/test_cli/constants.py b/tests/test_cli/constants.py
index 7d395e0e78..77265bdfbd 100644
--- a/tests/test_cli/constants.py
+++ b/tests/test_cli/constants.py
@@ -20,6 +20,7 @@
 
 from aea.configurations.base import DEFAULT_VERSION
 
+
 FORMAT_ITEMS_SAMPLE_OUTPUT = "Correct items"
 
 DEFAULT_TESTING_VERSION = DEFAULT_VERSION
diff --git a/tests/test_cli/test_launch.py b/tests/test_cli/test_launch.py
index 664036df3e..91b7a65fba 100644
--- a/tests/test_cli/test_launch.py
+++ b/tests/test_cli/test_launch.py
@@ -38,6 +38,7 @@
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import AUTHOR, CLI_LOG_OPTION, CUR_PATH, CliRunner, MAX_FLAKY_RERUNS
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_cli/test_utils/test_utils.py b/tests/test_cli/test_utils/test_utils.py
index 455570208b..341dc18c3f 100644
--- a/tests/test_cli/test_utils/test_utils.py
+++ b/tests/test_cli/test_utils/test_utils.py
@@ -60,6 +60,7 @@
     raise_stoptest,
 )
 
+
 AUTHOR = "author"
 
 
diff --git a/tests/test_connections/test_stub.py b/tests/test_connections/test_stub.py
index a9a3219028..113b9936d6 100644
--- a/tests/test_connections/test_stub.py
+++ b/tests/test_connections/test_stub.py
@@ -45,6 +45,7 @@
 
 from tests.conftest import ROOT_DIR, _make_stub_connection
 
+
 SEPARATOR = ","
 
 
diff --git a/tests/test_crypto/test_helpers.py b/tests/test_crypto/test_helpers.py
index 1bb71be721..a4821001fb 100644
--- a/tests/test_crypto/test_helpers.py
+++ b/tests/test_crypto/test_helpers.py
@@ -45,6 +45,7 @@
     FETCHAI_PRIVATE_KEY_PATH,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_crypto/test_ledger_apis.py b/tests/test_crypto/test_ledger_apis.py
index ade3ee345d..fd3c0375f0 100644
--- a/tests/test_crypto/test_ledger_apis.py
+++ b/tests/test_crypto/test_ledger_apis.py
@@ -32,6 +32,7 @@
 
 from tests.conftest import COSMOS, COSMOS_ADDRESS_ONE, ETHEREUM_ADDRESS_ONE
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_crypto/test_registries.py b/tests/test_crypto/test_registries.py
index 52cc7cedaa..3958c210be 100644
--- a/tests/test_crypto/test_registries.py
+++ b/tests/test_crypto/test_registries.py
@@ -26,6 +26,7 @@
 from aea.crypto.registries import make_crypto, make_ledger_api
 from aea.crypto.registries.base import ItemId, Registry
 
+
 COSMOS = CosmosCrypto.identifier
 
 
diff --git a/tests/test_crypto/test_registry/test_crypto_registry.py b/tests/test_crypto/test_registry/test_crypto_registry.py
index 19607fc413..de374c7600 100644
--- a/tests/test_crypto/test_registry/test_crypto_registry.py
+++ b/tests/test_crypto/test_registry/test_crypto_registry.py
@@ -35,6 +35,7 @@
 from tests.conftest import COSMOS, ETHEREUM, FETCHAI
 from tests.data.custom_crypto import CustomCrypto
 
+
 logger = logging.getLogger(__name__)
 
 forbidden_special_characters = "".join(
diff --git a/tests/test_crypto/test_registry/test_ledger_api_registry.py b/tests/test_crypto/test_registry/test_ledger_api_registry.py
index 088128a9c3..5f93927748 100644
--- a/tests/test_crypto/test_registry/test_ledger_api_registry.py
+++ b/tests/test_crypto/test_registry/test_ledger_api_registry.py
@@ -34,6 +34,7 @@
     FETCHAI_TESTNET_CONFIG,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_docs/test_agent_vs_aea/agent_code_block.py b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
index 332fc97204..e219fd1420 100644
--- a/tests/test_docs/test_agent_vs_aea/agent_code_block.py
+++ b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
@@ -32,6 +32,7 @@
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
 
+
 INPUT_FILE = "input_file"
 OUTPUT_FILE = "output_file"
 
diff --git a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
index 9fe0f5dfad..154f9bf84d 100644
--- a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
+++ b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
@@ -29,6 +29,7 @@
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 from tests.test_docs.test_agent_vs_aea.agent_code_block import run
 
+
 MD_FILE = "docs/agent-vs-aea.md"
 PY_FILE = "test_docs/test_agent_vs_aea/agent_code_block.py"
 
diff --git a/tests/test_docs/test_bash_yaml/test_demo_docs.py b/tests/test_docs/test_bash_yaml/test_demo_docs.py
index dde33427ea..85b1c5e31b 100644
--- a/tests/test_docs/test_bash_yaml/test_demo_docs.py
+++ b/tests/test_docs/test_bash_yaml/test_demo_docs.py
@@ -26,6 +26,7 @@
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, read_md_file
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
index 5d004506d0..bdbac810af 100644
--- a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
@@ -30,6 +30,7 @@
 from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
 from aea.skills.base import Skill
 
+
 ROOT_DIR = "./"
 INPUT_FILE = "input_file"
 OUTPUT_FILE = "output_file"
diff --git a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
index 834963d279..d58f7ff8e7 100644
--- a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
@@ -29,6 +29,7 @@
 from tests.conftest import CUR_PATH, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
+
 MD_FILE = "docs/build-aea-programmatically.md"
 PY_FILE = "test_docs/test_build_aea_programmatically/programmatic_aea.py"
 
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
index 737f29fdfa..79428e901d 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
@@ -40,6 +40,7 @@
 from packages.fetchai.connections.soef.connection import SOEFConnection
 from packages.fetchai.skills.weather_client.strategy import Strategy
 
+
 API_KEY = "TwiCIriSl0mLahw17pyqoA"
 SOEF_ADDR = "soef.fetch.ai"
 SOEF_PORT = 9002
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
index 43c52bda0d..e944ab7b5e 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
@@ -40,6 +40,7 @@
 )
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
+
 MD_FILE = "docs/cli-vs-programmatic-aeas.md"
 PY_FILE = "test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py"
 DEST = "programmatic_aea.py"
diff --git a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
index 10e9ad3055..d4c1d27cde 100644
--- a/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/decision_maker_transaction.py
@@ -39,6 +39,7 @@
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler, Model, Skill, SkillContext
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
index 6a142c3c0e..5721c18354 100644
--- a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
@@ -29,6 +29,7 @@
 from ..helper import extract_code_blocks, extract_python_code
 from .decision_maker_transaction import logger, run
 
+
 MD_FILE = "docs/decision-maker-transaction.md"
 PY_FILE = "test_docs/test_decision_maker_transaction/decision_maker_transaction.py"
 
diff --git a/tests/test_docs/test_generic_step_by_step_guide/test_generic_step_by_step_guide.py b/tests/test_docs/test_generic_step_by_step_guide/test_generic_step_by_step_guide.py
index 6fd3428997..4c2a4e7080 100644
--- a/tests/test_docs/test_generic_step_by_step_guide/test_generic_step_by_step_guide.py
+++ b/tests/test_docs/test_generic_step_by_step_guide/test_generic_step_by_step_guide.py
@@ -26,6 +26,7 @@
 from tests.conftest import ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
index b4e1d47dde..53c69f4f8b 100644
--- a/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
@@ -31,6 +31,7 @@
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 
+
 INPUT_FILE = "input.txt"
 OUTPUT_FILE = "output.txt"
 
diff --git a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
index 615e30e44a..ef04685096 100644
--- a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
@@ -28,6 +28,7 @@
 from tests.conftest import CUR_PATH, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
+
 MD_FILE = "docs/multiplexer-standalone.md"
 PY_FILE = "test_docs/test_multiplexer_standalone/multiplexer_standalone.py"
 
diff --git a/tests/test_docs/test_orm_integration/test_orm_integration.py b/tests/test_docs/test_orm_integration/test_orm_integration.py
index e111461af7..5b3448a617 100644
--- a/tests/test_docs/test_orm_integration/test_orm_integration.py
+++ b/tests/test_docs/test_orm_integration/test_orm_integration.py
@@ -39,6 +39,7 @@
     wait_for_localhost_ports_to_close,
 )
 
+
 seller_strategy_replacement = """models:
   default_dialogues:
     args: {}
diff --git a/tests/test_docs/test_skill_guide/test_skill_guide.py b/tests/test_docs/test_skill_guide/test_skill_guide.py
index 0c9a5e1663..87fcc76cad 100644
--- a/tests/test_docs/test_skill_guide/test_skill_guide.py
+++ b/tests/test_docs/test_skill_guide/test_skill_guide.py
@@ -44,6 +44,7 @@
 )
 from tests.test_docs.helper import extract_code_blocks
 
+
 MD_FILE = "docs/skill-guide.md"
 
 
diff --git a/tests/test_docs/test_standalone_transaction/standalone_transaction.py b/tests/test_docs/test_standalone_transaction/standalone_transaction.py
index 892d2db880..e137def89f 100644
--- a/tests/test_docs/test_standalone_transaction/standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/standalone_transaction.py
@@ -26,6 +26,7 @@
 from aea.crypto.ledger_apis import LedgerApis
 from aea.crypto.wallet import Wallet
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
index 277e18c5fc..f501a2e803 100644
--- a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
@@ -31,6 +31,7 @@
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS_INTEGRATION, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
 
+
 MD_FILE = "docs/standalone-transaction.md"
 PY_FILE = "test_docs/test_standalone_transaction/standalone_transaction.py"
 
diff --git a/tests/test_examples/test_gym_ex.py b/tests/test_examples/test_gym_ex.py
index 219de01525..191e60979f 100644
--- a/tests/test_examples/test_gym_ex.py
+++ b/tests/test_examples/test_gym_ex.py
@@ -27,6 +27,7 @@
 from tests.common.pexpect_popen import PexpectWrapper
 from tests.conftest import ROOT_DIR, env_path_separator
 
+
 DIRECTORIES = ["packages", "examples"]
 
 
diff --git a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
index b2b78230dc..6477669016 100644
--- a/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
+++ b/tests/test_examples/test_http_client_connection_to_aries_cloud_agent.py
@@ -52,6 +52,7 @@
 
 from tests.conftest import HTTP_PROTOCOL_PUBLIC_ID
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_helpers/test_exec_timeout.py b/tests/test_helpers/test_exec_timeout.py
index 683a449f2f..2a031f66c3 100644
--- a/tests/test_helpers/test_exec_timeout.py
+++ b/tests/test_helpers/test_exec_timeout.py
@@ -35,6 +35,7 @@
 
 from tests.common.utils import timeit_context
 
+
 if os.name == "nt":
     pytest.skip("signal.settimer non available on Windows.", allow_module_level=True)
 
diff --git a/tests/test_helpers/test_ipfs/test_base.py b/tests/test_helpers/test_ipfs/test_base.py
index 820f7b40b2..eec6a1b39a 100644
--- a/tests/test_helpers/test_ipfs/test_base.py
+++ b/tests/test_helpers/test_ipfs/test_base.py
@@ -26,6 +26,7 @@
 
 from tests.conftest import CUR_PATH
 
+
 FILE_PATH = "__init__.py"
 
 
diff --git a/tests/test_helpers/test_multiaddr.py b/tests/test_helpers/test_multiaddr.py
index 74218e7134..022c65e22b 100644
--- a/tests/test_helpers/test_multiaddr.py
+++ b/tests/test_helpers/test_multiaddr.py
@@ -25,6 +25,7 @@
 from aea.crypto.registries import make_crypto
 from aea.helpers.multiaddr.base import MultiAddr
 
+
 HOST = "127.0.0.1"
 PORT = 13000
 
diff --git a/tests/test_packages/test_connections/test_gym/test_gym.py b/tests/test_packages/test_connections/test_gym/test_gym.py
index 281b163905..0efd2f482c 100644
--- a/tests/test_packages/test_connections/test_gym/test_gym.py
+++ b/tests/test_packages/test_connections/test_gym/test_gym.py
@@ -39,6 +39,7 @@
 
 from tests.conftest import ROOT_DIR, UNKNOWN_PROTOCOL_PUBLIC_ID
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_connections/test_http_client/test_http_client.py b/tests/test_packages/test_connections/test_http_client/test_http_client.py
index 07be0cee65..200003cfa7 100644
--- a/tests/test_packages/test_connections/test_http_client/test_http_client.py
+++ b/tests/test_packages/test_connections/test_http_client/test_http_client.py
@@ -39,6 +39,7 @@
 from tests.common.mocks import AnyStringWith
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID, get_host, get_unused_tcp_port
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py
index 495178987d..a3db1f3fe9 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server.py
@@ -54,6 +54,7 @@
     get_unused_tcp_port,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
index 9bbd81a3f4..7998701578 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
@@ -37,6 +37,7 @@
 
 from tests.conftest import get_host, get_unused_tcp_port
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
index 21ceaf2f5c..0f9703b6d7 100644
--- a/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
+++ b/tests/test_packages/test_connections/test_ledger/test_ledger_api.py
@@ -62,6 +62,7 @@
     FETCHAI_TESTNET_CONFIG,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_connections/test_oef/test_communication.py b/tests/test_packages/test_connections/test_oef/test_communication.py
index ea4676d068..191012d022 100644
--- a/tests/test_packages/test_connections/test_oef/test_communication.py
+++ b/tests/test_packages/test_connections/test_oef/test_communication.py
@@ -66,6 +66,7 @@
     _make_oef_connection,
 )
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
index d31a3afbce..956e4956c4 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_aea_cli.py
@@ -25,6 +25,7 @@
 
 from tests.conftest import libp2p_log_on_failure
 
+
 DEFAULT_PORT = 10234
 DEFAULT_DELEGATE_PORT = 11234
 DEFAULT_NET_SIZE = 4
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
index 49a08a0be9..e81d69d58b 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_communication.py
@@ -37,6 +37,7 @@
     libp2p_log_on_failure_all,
 )
 
+
 DEFAULT_PORT = 10234
 DEFAULT_NET_SIZE = 4
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
index 1ef0791958..c16e33f7a5 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_errors.py
@@ -41,6 +41,7 @@
 
 from tests.conftest import COSMOS, _make_libp2p_connection
 
+
 DEFAULT_PORT = 10234
 DEFAULT_NET_SIZE = 4
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
index 97553180c5..2466da846f 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_fault_tolerance.py
@@ -37,6 +37,7 @@
     libp2p_log_on_failure_all,
 )
 
+
 DEFAULT_PORT = 10234
 
 
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
index 08838b121a..c05e9c6c3c 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p/test_public_dht.py
@@ -41,6 +41,7 @@
     libp2p_log_on_failure_all,
 )
 
+
 DEFAULT_PORT = 10234
 PUBLIC_DHT_MADDRS = [PUBLIC_DHT_P2P_MADDR_1, PUBLIC_DHT_P2P_MADDR_2]
 PUBLIC_DHT_DELEGATE_URIS = [PUBLIC_DHT_DELEGATE_URI_1, PUBLIC_DHT_DELEGATE_URI_2]
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
index fc3c87b396..63351cecfa 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_aea_cli.py
@@ -27,6 +27,7 @@
     libp2p_log_on_failure_all,
 )
 
+
 DEFAULT_PORT = 10234
 DEFAULT_DELEGATE_PORT = 11234
 DEFAULT_HOST = "127.0.0.1"
diff --git a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
index 308f2b6bd2..86339c406e 100644
--- a/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
+++ b/tests/test_packages/test_connections/test_p2p_libp2p_client/test_communication.py
@@ -39,6 +39,7 @@
     libp2p_log_on_failure_all,
 )
 
+
 DEFAULT_PORT = 10234
 DEFAULT_DELEGATE_PORT = 11234
 DEFAULT_HOST = "127.0.0.1"
diff --git a/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py b/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
index d5cfccb73d..f5ab36c3c0 100644
--- a/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
+++ b/tests/test_packages/test_connections/test_p2p_stub/test_p2p_stub.py
@@ -33,6 +33,7 @@
 
 from packages.fetchai.connections.p2p_stub.connection import P2PStubConnection
 
+
 SEPARATOR = ","
 
 
diff --git a/tests/test_packages/test_connections/test_soef/models.py b/tests/test_packages/test_connections/test_soef/models.py
index 245a50d19f..0f523d5807 100644
--- a/tests/test_packages/test_connections/test_soef/models.py
+++ b/tests/test_packages/test_connections/test_soef/models.py
@@ -22,6 +22,7 @@
 
 from packages.fetchai.connections.soef.connection import ModelNames
 
+
 AGENT_LOCATION_MODEL = DataModel(
     ModelNames.location_agent,
     [
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 9f0d345ffa..d96b71ae4e 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -49,6 +49,7 @@
 from .test_soef import OefSearchDialogues
 from tests.common.utils import wait_for_condition
 
+
 logging.basicConfig(level=logging.DEBUG)
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_packages/test_connections/test_webhook/test_webhook.py b/tests/test_packages/test_connections/test_webhook/test_webhook.py
index d7e09becbe..83b37b13fd 100644
--- a/tests/test_packages/test_connections/test_webhook/test_webhook.py
+++ b/tests/test_packages/test_connections/test_webhook/test_webhook.py
@@ -44,6 +44,7 @@
 from tests.common.mocks import RegexComparator
 from tests.conftest import get_host, get_unused_tcp_port
 
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/tests/test_packages/test_contracts/test_erc1155/test_contract.py b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
index f2e9d58821..4955433723 100644
--- a/tests/test_packages/test_contracts/test_erc1155/test_contract.py
+++ b/tests/test_packages/test_contracts/test_erc1155/test_contract.py
@@ -40,6 +40,7 @@
     FETCHAI_TESTNET_CONFIG,
 )
 
+
 ledger = [
     (ETHEREUM, ETHEREUM_TESTNET_CONFIG),
 ]
diff --git a/tests/test_packages/test_protocols/test_contract_api.py b/tests/test_packages/test_protocols/test_contract_api.py
index 397cc26142..30c727b5a9 100644
--- a/tests/test_packages/test_protocols/test_contract_api.py
+++ b/tests/test_packages/test_protocols/test_contract_api.py
@@ -45,6 +45,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 logger = logging.getLogger(__name__)
 sys.path.append(ROOT_DIR)
 
diff --git a/tests/test_packages/test_protocols/test_fipa.py b/tests/test_packages/test_protocols/test_fipa.py
index abead1272a..8cf6e672cc 100644
--- a/tests/test_packages/test_protocols/test_fipa.py
+++ b/tests/test_packages/test_protocols/test_fipa.py
@@ -41,6 +41,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 logger = logging.getLogger(__name__)
 sys.path.append(ROOT_DIR)
 
diff --git a/tests/test_packages/test_protocols/test_gym.py b/tests/test_packages/test_protocols/test_gym.py
index 330e9a7833..01536401ad 100644
--- a/tests/test_packages/test_protocols/test_gym.py
+++ b/tests/test_packages/test_protocols/test_gym.py
@@ -39,6 +39,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 sys.path.append(ROOT_DIR)
 
 
diff --git a/tests/test_packages/test_protocols/test_http.py b/tests/test_packages/test_protocols/test_http.py
index 0d7d8d9833..ea6980397e 100644
--- a/tests/test_packages/test_protocols/test_http.py
+++ b/tests/test_packages/test_protocols/test_http.py
@@ -39,6 +39,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 sys.path.append(ROOT_DIR)
 
 
diff --git a/tests/test_packages/test_protocols/test_ledger_api.py b/tests/test_packages/test_protocols/test_ledger_api.py
index 01b64fce26..eee0e6955f 100644
--- a/tests/test_packages/test_protocols/test_ledger_api.py
+++ b/tests/test_packages/test_protocols/test_ledger_api.py
@@ -44,6 +44,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 sys.path.append(ROOT_DIR)
 
 
diff --git a/tests/test_packages/test_protocols/test_ml_trade.py b/tests/test_packages/test_protocols/test_ml_trade.py
index 3377373631..ebb435e104 100644
--- a/tests/test_packages/test_protocols/test_ml_trade.py
+++ b/tests/test_packages/test_protocols/test_ml_trade.py
@@ -46,6 +46,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 logger = logging.getLogger(__name__)
 sys.path.append(ROOT_DIR)
 
diff --git a/tests/test_packages/test_protocols/test_oef_search.py b/tests/test_packages/test_protocols/test_oef_search.py
index 11fd064554..9bb2c4506c 100644
--- a/tests/test_packages/test_protocols/test_oef_search.py
+++ b/tests/test_packages/test_protocols/test_oef_search.py
@@ -45,6 +45,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 sys.path.append(ROOT_DIR)
 
 
diff --git a/tests/test_packages/test_protocols/test_tac.py b/tests/test_packages/test_protocols/test_tac.py
index 2ea87db305..fc1f4c2336 100644
--- a/tests/test_packages/test_protocols/test_tac.py
+++ b/tests/test_packages/test_protocols/test_tac.py
@@ -39,6 +39,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 sys.path.append(ROOT_DIR)
 
 
diff --git a/tests/test_packages/test_skills/test_http_echo.py b/tests/test_packages/test_skills/test_http_echo.py
index e476ed7de2..6052165361 100644
--- a/tests/test_packages/test_skills/test_http_echo.py
+++ b/tests/test_packages/test_skills/test_http_echo.py
@@ -27,6 +27,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 API_SPEC_PATH = Path(ROOT_DIR, "examples", "http_ex", "petstore.yaml").absolute()
 
 
diff --git a/tests/test_protocols/test_generator/common.py b/tests/test_protocols/test_generator/common.py
index 38831b9632..6b94904ffd 100644
--- a/tests/test_protocols/test_generator/common.py
+++ b/tests/test_protocols/test_generator/common.py
@@ -21,6 +21,7 @@
 
 from tests.conftest import ROOT_DIR
 
+
 T_PROTOCOL_NAME = "t_protocol"
 PATH_TO_T_PROTOCOL_SPECIFICATION = os.path.join(
     ROOT_DIR, "tests", "data", "sample_specification.yaml"
diff --git a/tests/test_protocols/test_generator/test_common.py b/tests/test_protocols/test_generator/test_common.py
index a2d8a12360..bc6fae7f7e 100644
--- a/tests/test_protocols/test_generator/test_common.py
+++ b/tests/test_protocols/test_generator/test_common.py
@@ -49,6 +49,7 @@
     T_PROTOCOL_NAME,
 )
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_protocols/test_generator/test_end_to_end.py b/tests/test_protocols/test_generator/test_end_to_end.py
index bae4a62cad..c91a16a3c7 100644
--- a/tests/test_protocols/test_generator/test_end_to_end.py
+++ b/tests/test_protocols/test_generator/test_end_to_end.py
@@ -43,6 +43,7 @@
 from tests.data.generator.t_protocol.message import TProtocolMessage  # type: ignore
 from tests.test_protocols.test_generator.common import PATH_TO_T_PROTOCOL
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_protocols/test_generator/test_extract_specification.py b/tests/test_protocols/test_generator/test_extract_specification.py
index 9f1122363b..06b6b78c28 100644
--- a/tests/test_protocols/test_generator/test_extract_specification.py
+++ b/tests/test_protocols/test_generator/test_extract_specification.py
@@ -39,6 +39,7 @@
 
 from tests.test_protocols.test_generator.common import PATH_TO_T_PROTOCOL_SPECIFICATION
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_protocols/test_generator/test_generator.py b/tests/test_protocols/test_generator/test_generator.py
index b6038accee..9874792253 100644
--- a/tests/test_protocols/test_generator/test_generator.py
+++ b/tests/test_protocols/test_generator/test_generator.py
@@ -42,6 +42,7 @@
     T_PROTOCOL_NAME,
 )
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_protocols/test_generator/test_validate.py b/tests/test_protocols/test_generator/test_validate.py
index eeeda771f3..f1cb25633d 100644
--- a/tests/test_protocols/test_generator/test_validate.py
+++ b/tests/test_protocols/test_generator/test_validate.py
@@ -51,6 +51,7 @@
     validate,
 )
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index 813a78e4ca..926951face 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -41,6 +41,7 @@
 from tests.common.utils import wait_for_condition
 from tests.conftest import CUR_PATH, _make_dummy_connection
 
+
 logger = logging.getLogger(__file__)
 
 
diff --git a/tests/test_test_tools/test_testcases.py b/tests/test_test_tools/test_testcases.py
index 3a8b77b366..0a4567d923 100644
--- a/tests/test_test_tools/test_testcases.py
+++ b/tests/test_test_tools/test_testcases.py
@@ -35,6 +35,7 @@
 from tests.conftest import FETCHAI
 from tests.test_cli import test_generate_wealth, test_interact
 
+
 TestWealthCommandsPositive = test_generate_wealth.TestWealthCommandsPositive
 TestInteractCommand = test_interact.TestInteractCommand
 

From b74629731120b1d53b650bc1aa3fa028bd11bb99 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 16:59:35 +0200
Subject: [PATCH 033/131] add isort configuration file specific to the protocol
 generator

---
 MANIFEST.in                       |  2 +-
 aea/protocols/generator/common.py | 13 +++++--------
 aea/protocols/generator/isort.cfg | 18 ++++++++++++++++++
 setup.cfg                         |  5 +++--
 4 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 aea/protocols/generator/isort.cfg

diff --git a/MANIFEST.in b/MANIFEST.in
index 2b10871f8e..7a267950b3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include README.md LICENSE HISTORY.md AUTHORS.md SECURITY.md CODE_OF_CONDUCT.md Pipfile mkdocs.yml tox.ini pytest.ini strategy.ini
 
-recursive-include aea *.json *.yaml *.proto *.ico *png *.html *.js *.css *.md
+recursive-include aea *.json *.yaml *.proto *.ico *png *.html *.js *.css *.md *.cfg
 recursive-include docs *
 recursive-include examples *
 recursive-include packages *
diff --git a/aea/protocols/generator/common.py b/aea/protocols/generator/common.py
index 2e576ed293..9534ae246b 100644
--- a/aea/protocols/generator/common.py
+++ b/aea/protocols/generator/common.py
@@ -17,7 +17,7 @@
 #
 # ------------------------------------------------------------------------------
 """This module contains utility code for generator modules."""
-
+import inspect
 import os
 import re
 import shutil
@@ -64,15 +64,12 @@
     "str": "string",
 }
 
+CURRENT_DIR = os.path.dirname(inspect.getfile(inspect.currentframe()))  # type: ignore
+ISORT_CONFIGURATION_FILE = os.path.join(CURRENT_DIR, "isort.cfg")
 ISORT_CLI_ARGS = [
-    "--multi-line=3",
-    "--trailing-comma",
-    "--force-grid-wrap=0",
-    "--use-parentheses",
-    "--line-width=88",
+    "--settings-path",
+    ISORT_CONFIGURATION_FILE,
     "--quiet",
-    "--sg",
-    "**/*_pb2.py",
 ]
 
 
diff --git a/aea/protocols/generator/isort.cfg b/aea/protocols/generator/isort.cfg
new file mode 100644
index 0000000000..d15bf5f18d
--- /dev/null
+++ b/aea/protocols/generator/isort.cfg
@@ -0,0 +1,18 @@
+# isort configurations for the protocol generator
+[isort]
+# for black compatibility
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+ensure_newline_before_comments = True
+line_length=88
+# custom configurations
+order_by_type=False
+case_sensitive=True
+lines_after_imports=2
+skip_glob = **/*_pb2.py
+known_first_party=aea
+known_packages=packages
+known_local_folder=tests
+sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER
diff --git a/setup.cfg b/setup.cfg
index 86f14c6af0..66cc5a801c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,12 +34,13 @@ ensure_newline_before_comments = True
 line_length=88
 # custom configurations
 order_by_type=False
+case_sensitive=True
+lines_after_imports=2
 skip_glob = **/*_pb2.py
+known_first_party=aea
 known_packages=packages
 known_local_folder=tests
 sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER
-case_sensitive=True
-lines_after_imports=2
 
 [mypy]
 python_version = 3.7

From 8c36978493b8c1669603a2089e95578288b4e54d Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 18:46:23 +0200
Subject: [PATCH 034/131] fix docs tests according to new isort settings

---
 docs/agent-vs-aea.md                |  1 +
 docs/build-aea-programmatically.md  |  1 +
 docs/cli-vs-programmatic-aeas.md    |  2 ++
 docs/decision-maker-transaction.md  |  2 ++
 docs/generic-skills-step-by-step.md | 14 ++++++++++++++
 docs/multiplexer-standalone.md      |  2 ++
 docs/standalone-transaction.md      |  2 ++
 7 files changed, 24 insertions(+)

diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index 0d31c84ae9..a49868c25d 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -173,6 +173,7 @@ from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.protocols.default.message import DefaultMessage
 
+
 INPUT_FILE = "input_file"
 OUTPUT_FILE = "output_file"
 
diff --git a/docs/build-aea-programmatically.md b/docs/build-aea-programmatically.md
index fb2b593713..84d4b854a0 100644
--- a/docs/build-aea-programmatically.md
+++ b/docs/build-aea-programmatically.md
@@ -169,6 +169,7 @@ from aea.crypto.fetchai import FetchAICrypto
 from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA, create_private_key
 from aea.skills.base import Skill
 
+
 ROOT_DIR = "./"
 INPUT_FILE = "input_file"
 OUTPUT_FILE = "output_file"
diff --git a/docs/cli-vs-programmatic-aeas.md b/docs/cli-vs-programmatic-aeas.md
index 2bd526eb3a..6fae1bc689 100644
--- a/docs/cli-vs-programmatic-aeas.md
+++ b/docs/cli-vs-programmatic-aeas.md
@@ -80,11 +80,13 @@ from aea.identity.base import Identity
 from aea.protocols.base import Protocol
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
+
 from packages.fetchai.connections.ledger.connection import LedgerConnection
 from packages.fetchai.connections.p2p_libp2p.connection import P2PLibp2pConnection
 from packages.fetchai.connections.soef.connection import SOEFConnection
 from packages.fetchai.skills.weather_client.strategy import Strategy
 
+
 API_KEY = "TwiCIriSl0mLahw17pyqoA"
 SOEF_ADDR = "soef.fetch.ai"
 SOEF_PORT = 9002
diff --git a/docs/decision-maker-transaction.md b/docs/decision-maker-transaction.md
index e6a096007c..0df4924197 100644
--- a/docs/decision-maker-transaction.md
+++ b/docs/decision-maker-transaction.md
@@ -23,6 +23,7 @@ from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialo
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler, Model, Skill, SkillContext
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
@@ -311,6 +312,7 @@ from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialo
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler, Model, Skill, SkillContext
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
diff --git a/docs/generic-skills-step-by-step.md b/docs/generic-skills-step-by-step.md
index 37fb56f7e3..c71c402ba4 100644
--- a/docs/generic-skills-step-by-step.md
+++ b/docs/generic-skills-step-by-step.md
@@ -94,6 +94,7 @@ Open the `behaviours.py` file (`my_generic_seller/skills/generic_seller/behaviou
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_seller.dialogues import (
@@ -102,6 +103,7 @@ from packages.fetchai.skills.generic_seller.dialogues import (
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
+
 DEFAULT_SERVICES_INTERVAL = 60.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
@@ -296,6 +298,7 @@ from aea.helpers.transaction.base import TransactionDigest
 from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
@@ -310,6 +313,7 @@ from packages.fetchai.skills.generic_seller.dialogues import (
 )
 from packages.fetchai.skills.generic_seller.strategy import GenericStrategy
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
@@ -849,6 +853,7 @@ from aea.helpers.search.models import Description, Location, Query
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
 
+
 DEFAULT_LEDGER_ID = DEFAULT_LEDGER
 DEFAULT_IS_LEDGER_TX = True
 
@@ -1054,6 +1059,7 @@ from aea.protocols.default.dialogues import DefaultDialogues as BaseDefaultDialo
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 from aea.protocols.dialogue.base import DialogueLabel as BaseDialogueLabel
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
@@ -1071,6 +1077,7 @@ from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
@@ -1406,6 +1413,7 @@ Open the `behaviours.py` (`my_generic_buyer/skills/generic_buyer/behaviours.py`)
 from typing import cast
 
 from aea.skills.behaviours import TickerBehaviour
+
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 from packages.fetchai.skills.generic_buyer.dialogues import (
@@ -1414,6 +1422,7 @@ from packages.fetchai.skills.generic_buyer.dialogues import (
 )
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 DEFAULT_SEARCH_INTERVAL = 5.0
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
@@ -1490,6 +1499,7 @@ from aea.protocols.base import Message
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Handler
+
 from packages.fetchai.protocols.fipa.message import FipaMessage
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
@@ -1506,6 +1516,7 @@ from packages.fetchai.skills.generic_buyer.dialogues import (
 )
 from packages.fetchai.skills.generic_buyer.strategy import GenericStrategy
 
+
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
 
 
@@ -2196,6 +2207,7 @@ from aea.helpers.search.models import (
 from aea.helpers.transaction.base import Terms
 from aea.skills.base import Model
 
+
 DEFAULT_LEDGER_ID = DEFAULT_LEDGER
 DEFAULT_IS_LEDGER_TX = True
 
@@ -2419,6 +2431,7 @@ from aea.protocols.signing.dialogues import SigningDialogue as BaseSigningDialog
 from aea.protocols.signing.dialogues import SigningDialogues as BaseSigningDialogues
 from aea.protocols.signing.message import SigningMessage
 from aea.skills.base import Model
+
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogue as BaseFipaDialogue
 from packages.fetchai.protocols.fipa.dialogues import FipaDialogues as BaseFipaDialogues
 from packages.fetchai.protocols.fipa.message import FipaMessage
@@ -2436,6 +2449,7 @@ from packages.fetchai.protocols.oef_search.dialogues import (
     OefSearchDialogues as BaseOefSearchDialogues,
 )
 
+
 DefaultDialogue = BaseDefaultDialogue
 
 
diff --git a/docs/multiplexer-standalone.md b/docs/multiplexer-standalone.md
index e27fee3081..b3e21b32ac 100644
--- a/docs/multiplexer-standalone.md
+++ b/docs/multiplexer-standalone.md
@@ -14,6 +14,7 @@ from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 
+
 INPUT_FILE = "input.txt"
 OUTPUT_FILE = "output.txt"
 ```
@@ -124,6 +125,7 @@ from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.multiplexer import Multiplexer
 
+
 INPUT_FILE = "input.txt"
 OUTPUT_FILE = "output.txt"
 
diff --git a/docs/standalone-transaction.md b/docs/standalone-transaction.md
index 1c43c03f21..bf23bb1275 100644
--- a/docs/standalone-transaction.md
+++ b/docs/standalone-transaction.md
@@ -10,6 +10,7 @@ from aea.crypto.helpers import create_private_key, try_generate_testnet_wealth
 from aea.crypto.ledger_apis import LedgerApis
 from aea.crypto.wallet import Wallet
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 
@@ -90,6 +91,7 @@ from aea.crypto.helpers import create_private_key, try_generate_testnet_wealth
 from aea.crypto.ledger_apis import LedgerApis
 from aea.crypto.wallet import Wallet
 
+
 logger = logging.getLogger("aea")
 logging.basicConfig(level=logging.INFO)
 

From ed4e65c038a0425837825fabf39717b19713e875 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 19:24:20 +0200
Subject: [PATCH 035/131] add more tests to aea.configurations.base

---
 aea/configurations/base.py             |  2 +-
 tests/test_configurations/test_base.py | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 5cec8c5aa7..d902ca0fa2 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -1569,7 +1569,7 @@ def json(self) -> Dict:
         if self.skill_exception_policy is not None:
             config["skill_exception_policy"] = self.skill_exception_policy
         if self.connection_exception_policy is not None:
-            config["connection_exception_policy"] = self.skill_exception_policy
+            config["connection_exception_policy"] = self.connection_exception_policy
         if self.default_routing != {}:
             config["default_routing"] = {
                 str(key): str(value) for key, value in self.default_routing.items()
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 5c4c842131..efd30a1562 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -38,6 +38,7 @@
     DEFAULT_SKILL_CONFIG_FILE,
     PackageId,
     PackageType,
+    PackageVersion,
     ProtocolConfig,
     ProtocolSpecification,
     ProtocolSpecificationParseError,
@@ -480,6 +481,14 @@ def test_pubic_id_repr():
     assert repr(public_id) == "<author/name:0.1.0>"
 
 
+def test_pubic_id_to_latest():
+    """Test PublicId.to_latest"""
+    public_id = PublicId("author", "name", "0.1.0")
+    expected_public_id = PublicId("author", "name", "latest")
+    actual_public_id = public_id.to_latest()
+    assert expected_public_id == actual_public_id
+
+
 def test_pubic_id_same_prefix():
     """Test PublicId.same_prefix"""
     same_1 = PublicId("author", "name", "0.1.0")
@@ -663,6 +672,7 @@ def test_agent_config_to_json_with_optional_configurations():
         max_reactions=100,
         decision_maker_handler=dict(dotted_path="", file_path=""),
         skill_exception_policy="propagate",
+        connection_exception_policy="propagate",
         default_routing={"author/name:0.1.0": "author/name:0.1.0"},
         loop_mode="sync",
         runtime_mode="async",
@@ -690,3 +700,18 @@ def test_contract_config_component_type():
     """Test ContractConfig.component_type"""
     config = ContractConfig("name", "author", "0.1.0")
     assert config.component_type == ComponentType.CONTRACT
+
+
+def test_package_version_eq_negative():
+    """Test package version __eq__."""
+    v1 = PackageVersion("0.1.0")
+    v2 = PackageVersion("0.2.0")
+    assert v1 != v2
+
+
+def test_package_version_lt():
+    """Test package version __lt__."""
+    v1 = PackageVersion("0.1.0")
+    v2 = PackageVersion("0.2.0")
+    v3 = PackageVersion("latest")
+    assert v1 < v2 < v3

From e7247506df34647775ad03187dadae70603148aa Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 19:31:27 +0200
Subject: [PATCH 036/131] fix typo in api docs for protocol generator

---
 docs/api/protocols/generator/base.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/protocols/generator/base.md b/docs/api/protocols/generator/base.md
index ef1bead8e6..8859ed4742 100644
--- a/docs/api/protocols/generator/base.md
+++ b/docs/api/protocols/generator/base.md
@@ -58,7 +58,7 @@ a) validates the protocol specification.
 b) creates the protocol buffer schema file.
 c) generates python modules.
 d) applies black formatting
-d) applies isort formatting
+e) applies isort formatting
 
 **Returns**:
 
@@ -76,7 +76,7 @@ a) validates the protocol specification.
 b) creates the protocol buffer schema file.
 c) generates python modules.
 d) applies black formatting
-d) applies isort formatting
+e) applies isort formatting
 
 If in "protobuf only" mode (protobuf_only is True), it only does a) and b).
 

From 7a53b806ab9357841fd5ca06960561f68a8e3b34 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 19:48:15 +0200
Subject: [PATCH 037/131] address PR comments

remove relative imports in favour of absolute ones
make isort skip some lines between the imports in the examples/gym_ex code
---
 examples/gym_ex/proxy/agent.py                | 10 ++++++----
 examples/gym_ex/proxy/env.py                  | 15 ++++++++------
 tests/conftest.py                             |  2 +-
 tests/test_aea.py                             | 20 +++++++++----------
 tests/test_agent.py                           |  2 +-
 tests/test_cli/test_misc.py                   |  2 +-
 tests/test_cli_gui/test_misc.py               |  2 +-
 .../test_programmatic_aea.py                  |  2 +-
 .../test_decision_maker_transaction.py        |  2 +-
 .../test_multiplexer_standalone.py            |  2 +-
 .../test_standalone_transaction.py            |  5 ++++-
 tests/test_multiplexer.py                     |  4 ++--
 tests/test_package_loading.py                 |  2 +-
 .../test_connections/test_soef/test_soef.py   |  2 +-
 .../test_soef/test_soef_integration.py        |  2 +-
 15 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/examples/gym_ex/proxy/agent.py b/examples/gym_ex/proxy/agent.py
index 2c638ba0c7..bd858cdd4a 100644
--- a/examples/gym_ex/proxy/agent.py
+++ b/examples/gym_ex/proxy/agent.py
@@ -30,15 +30,17 @@
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 
-from packages.fetchai.connections.gym.connection import (  # noqa: E402  # pylint: disable=wrong-import-position
-    GymConnection,
+
+sys.modules["packages.fetchai.connections.gym"] = locate(  # isort:skip
+    "packages.fetchai.connections.gym"
 )
 
 
-sys.modules["packages.fetchai.connections.gym"] = locate(
-    "packages.fetchai.connections.gym"
+from packages.fetchai.connections.gym.connection import (  # noqa: E402  # pylint: disable=wrong-import-position
+    GymConnection,
 )
 
+
 ADDRESS = "some_address"
 
 
diff --git a/examples/gym_ex/proxy/env.py b/examples/gym_ex/proxy/env.py
index 7066819cf3..79637dd6da 100755
--- a/examples/gym_ex/proxy/env.py
+++ b/examples/gym_ex/proxy/env.py
@@ -32,6 +32,15 @@
 from aea.protocols.base import Message
 from aea.protocols.dialogue.base import Dialogue as BaseDialogue
 
+
+sys.modules["packages.fetchai.connections.gym"] = locate(  # isort:skip
+    "packages.fetchai.connections.gym"
+)
+sys.modules["packages.fetchai.protocols.gym"] = locate(  # isort:skip
+    "packages.fetchai.protocols.gym"
+)
+
+
 from packages.fetchai.protocols.gym.dialogues import (  # noqa: E402  # pylint: disable=wrong-import-position
     GymDialogue as BaseGymDialogue,
 )
@@ -45,12 +54,6 @@
 from .agent import ProxyAgent  # noqa: E402  # pylint: disable=wrong-import-position
 
 
-sys.modules["packages.fetchai.connections.gym"] = locate(
-    "packages.fetchai.connections.gym"
-)
-sys.modules["packages.fetchai.protocols.gym"] = locate("packages.fetchai.protocols.gym")
-
-
 Action = Any
 Observation = Any
 Reward = float
diff --git a/tests/conftest.py b/tests/conftest.py
index eb3a412978..8e125d7ae3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -81,7 +81,7 @@
 from packages.fetchai.connections.tcp.tcp_client import TCPClientConnection
 from packages.fetchai.connections.tcp.tcp_server import TCPServerConnection
 
-from .data.dummy_connection.connection import DummyConnection  # type: ignore
+from tests.data.dummy_connection.connection import DummyConnection  # type: ignore
 
 
 logger = logging.getLogger(__name__)
diff --git a/tests/test_aea.py b/tests/test_aea.py
index 46553c275c..57e5dca9aa 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -48,16 +48,6 @@
 from packages.fetchai.connections.local.connection import LocalNode
 from packages.fetchai.protocols.fipa.message import FipaMessage
 
-from .conftest import (
-    CUR_PATH,
-    DUMMY_SKILL_PUBLIC_ID,
-    FETCHAI_PRIVATE_KEY_PATH,
-    ROOT_DIR,
-    UNKNOWN_PROTOCOL_PUBLIC_ID,
-    _make_local_connection,
-)
-from .data.dummy_aea.skills.dummy.tasks import DummyTask  # type: ignore
-from .data.dummy_skill.behaviours import DummyBehaviour  # type: ignore
 from tests.common.utils import (
     AeaTool,
     make_behaviour_cls_from_funcion,
@@ -66,6 +56,16 @@
     timeit_context,
     wait_for_condition,
 )
+from tests.conftest import (
+    CUR_PATH,
+    DUMMY_SKILL_PUBLIC_ID,
+    FETCHAI_PRIVATE_KEY_PATH,
+    ROOT_DIR,
+    UNKNOWN_PROTOCOL_PUBLIC_ID,
+    _make_local_connection,
+)
+from tests.data.dummy_aea.skills.dummy.tasks import DummyTask  # type: ignore
+from tests.data.dummy_skill.behaviours import DummyBehaviour  # type: ignore
 
 
 def test_setup_aea():
diff --git a/tests/test_agent.py b/tests/test_agent.py
index e16446fc07..b0de015614 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -28,8 +28,8 @@
 
 from packages.fetchai.connections.local.connection import LocalNode
 
-from .conftest import _make_local_connection
 from tests.common.utils import wait_for_condition
+from tests.conftest import _make_local_connection
 
 
 class DummyAgent(Agent):
diff --git a/tests/test_cli/test_misc.py b/tests/test_cli/test_misc.py
index b43b70870c..48b896286d 100644
--- a/tests/test_cli/test_misc.py
+++ b/tests/test_cli/test_misc.py
@@ -22,7 +22,7 @@
 import aea
 from aea.cli import cli
 
-from ..conftest import CliRunner
+from tests.conftest import CliRunner
 
 
 def test_no_argument():
diff --git a/tests/test_cli_gui/test_misc.py b/tests/test_cli_gui/test_misc.py
index 86beb80b0a..eefd7c22f7 100644
--- a/tests/test_cli_gui/test_misc.py
+++ b/tests/test_cli_gui/test_misc.py
@@ -24,8 +24,8 @@
 
 import aea.cli_gui
 
-from .test_base import create_app
 from tests.common.mocks import ctx_mock_Popen
+from tests.test_cli_gui.test_base import create_app
 
 
 def test_home_page_exits():
diff --git a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
index d58f7ff8e7..290a7a7295 100644
--- a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
@@ -25,9 +25,9 @@
 from aea.configurations.constants import DEFAULT_PRIVATE_KEY_FILE
 from aea.test_tools.test_cases import BaseAEATestCase
 
-from .programmatic_aea import run
 from tests.conftest import CUR_PATH, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
+from tests.test_docs.test_build_aea_programmatically.programmatic_aea import run
 
 
 MD_FILE = "docs/build-aea-programmatically.md"
diff --git a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
index 5721c18354..2c1dde598e 100644
--- a/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
+++ b/tests/test_docs/test_decision_maker_transaction/test_decision_maker_transaction.py
@@ -25,9 +25,9 @@
 
 from aea.test_tools.test_cases import BaseAEATestCase
 
-from ...conftest import CUR_PATH, ROOT_DIR
 from ..helper import extract_code_blocks, extract_python_code
 from .decision_maker_transaction import logger, run
+from tests.conftest import CUR_PATH, ROOT_DIR
 
 
 MD_FILE = "docs/decision-maker-transaction.md"
diff --git a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
index ef04685096..b67134a50c 100644
--- a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
@@ -24,9 +24,9 @@
 
 from aea.test_tools.test_cases import BaseAEATestCase
 
-from .multiplexer_standalone import run
 from tests.conftest import CUR_PATH, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
+from tests.test_docs.test_multiplexer_standalone.multiplexer_standalone import run
 
 
 MD_FILE = "docs/multiplexer-standalone.md"
diff --git a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
index f501a2e803..47e99223a9 100644
--- a/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
+++ b/tests/test_docs/test_standalone_transaction/test_standalone_transaction.py
@@ -27,9 +27,12 @@
 
 from aea.test_tools.test_cases import BaseAEATestCase
 
-from .standalone_transaction import logger, run
 from tests.conftest import CUR_PATH, MAX_FLAKY_RERUNS_INTEGRATION, ROOT_DIR
 from tests.test_docs.helper import extract_code_blocks, extract_python_code
+from tests.test_docs.test_standalone_transaction.standalone_transaction import (
+    logger,
+    run,
+)
 
 
 MD_FILE = "docs/standalone-transaction.md"
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index 07f507b13f..e6129619a4 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -43,7 +43,8 @@
 
 from packages.fetchai.connections.local.connection import LocalNode
 
-from .conftest import (
+from tests.common.utils import wait_for_condition
+from tests.conftest import (
     UNKNOWN_CONNECTION_PUBLIC_ID,
     UNKNOWN_PROTOCOL_PUBLIC_ID,
     _make_dummy_connection,
@@ -51,7 +52,6 @@
     _make_stub_connection,
     logger,
 )
-from tests.common.utils import wait_for_condition
 
 
 @pytest.mark.asyncio
diff --git a/tests/test_package_loading.py b/tests/test_package_loading.py
index 6b3b5b22c8..c463a07e3b 100644
--- a/tests/test_package_loading.py
+++ b/tests/test_package_loading.py
@@ -24,7 +24,7 @@
 
 from aea.skills.base import Skill
 
-from .conftest import CUR_PATH
+from tests.conftest import CUR_PATH
 
 
 def test_loading():
diff --git a/tests/test_packages/test_connections/test_soef/test_soef.py b/tests/test_packages/test_connections/test_soef/test_soef.py
index 1f4517f016..7f887bea0d 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef.py
@@ -49,8 +49,8 @@
 )
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
-from . import models
 from tests.conftest import UNKNOWN_PROTOCOL_PUBLIC_ID
+from tests.test_packages.test_connections.test_soef import models
 
 
 def make_async(return_value: Any) -> Callable:
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index d96b71ae4e..0ab0ef729a 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -45,9 +45,9 @@
 from packages.fetchai.connections.soef.connection import SOEFConnection
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
-from . import models
 from .test_soef import OefSearchDialogues
 from tests.common.utils import wait_for_condition
+from tests.test_packages.test_connections.test_soef import models
 
 
 logging.basicConfig(level=logging.DEBUG)

From e5728acd0ce51c3d839eacc6374f0838287609b4 Mon Sep 17 00:00:00 2001
From: Oleg Panasevych <panasevychol@gmail.com>
Date: Mon, 21 Sep 2020 20:54:16 +0300
Subject: [PATCH 038/131] Echo message fixed.

---
 aea/cli/reset_password.py             | 2 +-
 tests/test_cli/test_reset_password.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aea/cli/reset_password.py b/aea/cli/reset_password.py
index 4313957b9d..cc3a07a6cb 100644
--- a/aea/cli/reset_password.py
+++ b/aea/cli/reset_password.py
@@ -40,4 +40,4 @@ def _do_password_reset(email: str) -> None:
     :return:
     """
     registry_reset_password(email)
-    click.echo("A letter with password reset link was sent to {}".format(email))
+    click.echo("An email with a password reset link was sent to {}".format(email))
diff --git a/tests/test_cli/test_reset_password.py b/tests/test_cli/test_reset_password.py
index b8b28437c4..dec51b4a28 100644
--- a/tests/test_cli/test_reset_password.py
+++ b/tests/test_cli/test_reset_password.py
@@ -55,5 +55,5 @@ def test__do_password_reset_positive(self, echo_mock, registry_reset_password_mo
         _do_password_reset(email)
         registry_reset_password_mock.assert_called_once_with(email)
         echo_mock.assert_called_once_with(
-            "A letter with password reset link was sent to {}".format(email)
+            "An email with a password reset link was sent to {}".format(email)
         )

From d5e773f64e7c85b52d53d5df2b97fb568bd4ffcf Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 22:02:38 +0200
Subject: [PATCH 039/131] update version bumper script

- shrink the set of ambiguous public ids. The idea is to
  overcome the "multiple-update", due to versions with consecutive minor numbers,
  by sorting the package id in descending order. May lead to other unforeseen issues.
- update the yamls independently of whether the package id is ambiguous or not,
  since in that case we always disambiguate thanks to the context;
- update protocol's READMEs, and in particular the protocol specifications,
  separately, by disambiguating from the path (the parent of the parent must be 'protocols').
---
 scripts/update_package_versions.py | 120 ++++++++++++++++++++++-------
 1 file changed, 91 insertions(+), 29 deletions(-)

diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index 58528e34e2..1c3f922911 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -35,7 +35,7 @@
 import sys
 from collections import Counter
 from pathlib import Path
-from typing import Dict, Optional, Set, Tuple
+from typing import Dict, List, Optional, Set
 
 from click.testing import CliRunner
 
@@ -284,11 +284,6 @@ def get_public_ids_to_update() -> Set[PackageId]:
     return result
 
 
-def _extract_prefix(public_id: PublicId) -> Tuple[str, str]:
-    """Extract (author, package_name) from public id."""
-    return public_id.author, public_id.name
-
-
 def _get_ambiguous_public_ids(
     all_package_ids_to_update: Set[PackageId],
 ) -> Set[PublicId]:
@@ -298,14 +293,36 @@ def _get_ambiguous_public_ids(
             operator.itemgetter(0),
             filter(
                 lambda x: x[1] > 1,
-                Counter(
-                    _extract_prefix(id_.public_id) for id_ in all_package_ids_to_update
-                ).items(),
+                Counter(id_.public_id for id_ in all_package_ids_to_update).items(),
             ),
         )
     )
 
 
+def _sort_in_update_order(package_ids: Set[PackageId]) -> List[PackageId]:
+    """
+    Sort the set of package id in the order of update.
+
+    In particular, they are sorted from the greatest version number to the lowest.
+
+    The reason is to avoid that consecutive package ids (i.e. whose minors difference is 1)
+    gets updated in ascending order, resulting in all the updates collapsing to the greatest version.
+    For example, consider two package ids with prefix 'author/package' and with versions
+    0.1.0 and 0.2.0, respectively. If we bump first the former and then the latter,
+    the new replacements associated to the first updated are taken into account in
+    the second update.
+    """
+    return sorted(
+        package_ids,
+        key=lambda x: (
+            semver.VersionInfo(x.public_id.version),
+            x.public_id,
+            x.package_type,
+        ),
+        reverse=True,
+    )
+
+
 def process_packages(all_package_ids_to_update: Set[PackageId]) -> bool:
     """Process the package versions."""
     is_bumped = False
@@ -313,12 +330,13 @@ def process_packages(all_package_ids_to_update: Set[PackageId]) -> bool:
     print("*" * 100)
     print("Start processing.")
     print(
-        f"Ambiguous public ids: {pprint.pformat(map(lambda x: '/'.join(str(x)), ambiguous_public_ids))}"
+        f"Ambiguous public ids: {pprint.pformat(list(map(lambda x: '/'.join(str(x)), ambiguous_public_ids)))}"
     )
-    for package_id in all_package_ids_to_update:
+    sorted_package_ids_list = _sort_in_update_order(all_package_ids_to_update)
+    for package_id in sorted_package_ids_list:
         print("#" * 50)
         print(f"Processing {package_id}")
-        is_ambiguous = _extract_prefix(package_id.public_id) in ambiguous_public_ids
+        is_ambiguous = package_id.public_id in ambiguous_public_ids
         process_package(package_id, is_ambiguous)
         is_bumped = True
     return is_bumped
@@ -352,11 +370,7 @@ def bump_package_version(
         for path in Path(rootdir).glob("**/*"):
             if path.is_file() and str(path).endswith((".py", ".yaml", ".md")):
                 inplace_change(
-                    path,
-                    str(current_public_id),
-                    str(new_public_id),
-                    type_,
-                    is_ambiguous,
+                    path, current_public_id, new_public_id, type_, is_ambiguous,
                 )
 
     bump_version_in_yaml(configuration_file_path, type_, new_public_id.version)
@@ -383,7 +397,13 @@ def _can_disambiguate_from_context(
     if re.search(fr"aea +fetch +{old_string}", line) is not None:
         return type_ == "agents"
     match = re.search(
-        f"(skill|protocol|connection|contract|agent)s?.*{old_string}", line
+        "(skill|SKILL|"
+        + "protocol|PROTOCOL|"
+        + "connection|CONNECTION|"
+        + "contract|CONTRACT|"
+        + "agent|AGENT"
+        + f")s?.*{old_string}",
+        line,
     )
     if match is not None:
         return (match.group(1) + "s") == type_
@@ -462,16 +482,18 @@ def replace_type_and_public_id_occurrences(line, old_string, new_string, type_)
     return line
 
 
-def replace_in_yamls(content, old_string, new_string, type_) -> str:
+def replace_in_yamls(
+    content, old_public_id: PublicId, new_public_id: PublicId, type_
+) -> str:
     """
     Replace the public id in configuration files (also nested in .md files).
 
-    1) replace in cases like:
+    1) replace package dependencies:
         |protocols:
         |- author/name:version
         |...
         |- old_string
-    2) replace in cases like:
+    2) replace in configuration headers:
         |name: package_name
         |author: package_author
         |version: package_version -> bump up
@@ -479,12 +501,10 @@ def replace_in_yamls(content, old_string, new_string, type_) -> str:
     """
 
     # case 1:
-    regex = re.compile(f"({type_}:\n(-.*\n)*)(- *{old_string})", re.MULTILINE)
-    content = regex.sub(rf"\g<1>- {new_string}", content)
+    regex = re.compile(f"({type_}:\n(-.*\n)*)(- *{str(old_public_id)})", re.MULTILINE)
+    content = regex.sub(rf"\g<1>- {str(new_public_id)}", content)
 
-    # case 1:
-    old_public_id = PublicId.from_str(old_string)
-    new_public_id = PublicId.from_str(new_string)
+    # case 2:
     regex = re.compile(
         rf"(name: {old_public_id.name}\nauthor: {old_public_id.author}\n)version: {old_public_id.version}\n(type: {type_[:-1]})",
         re.MULTILINE,
@@ -493,12 +513,51 @@ def replace_in_yamls(content, old_string, new_string, type_) -> str:
     return content
 
 
+def replace_in_protocol_readme(
+    fp: Path, content: str, old_public_id: PublicId, new_public_id: PublicId, type_: str
+) -> str:
+    """
+    Replace the version id in the protocol specification in the protcol's README.
+
+    That is, bump the version in cases like:
+
+        |name: package_name
+        |author: package_author
+        |version: package_version -> bump up
+        ...
+
+    :param fp: path to the file being edited.
+    :param content: the content of the file.
+    :param old_public_id: the old public id.
+    :param new_public_id: the new public id.
+    :param type_: the type of the package.
+    :return: the new content.
+    """
+    if (
+        type_ == fp.parent.parent == "protocols"
+        and fp.name == "README.md"
+        and fp.parent == old_public_id.name
+    ):
+        regex = re.compile(
+            rf"(name: {old_public_id.name}\nauthor: {old_public_id.author}\n)version: {old_public_id.version}\n(description:)",
+            re.MULTILINE,
+        )
+        content = regex.sub(rf"\g<1>version: {new_public_id.version}\n\g<2>", content)
+    return content
+
+
 def inplace_change(
-    fp: Path, old_string: str, new_string: str, type_: str, is_ambiguous: bool
+    fp: Path,
+    old_public_id: PublicId,
+    new_public_id: PublicId,
+    type_: str,
+    is_ambiguous: bool,
 ) -> None:
     """Replace the occurrence of a string with a new one in the provided file."""
 
     content = fp.read_text()
+    old_string = str(old_public_id)
+    new_string = str(new_public_id)
     if old_string not in content:
         return
 
@@ -506,10 +565,13 @@ def inplace_change(
         f"Processing file {fp} for replacing {old_string} with {new_string} (is_ambiguous: {is_ambiguous})"
     )
 
+    content = replace_in_yamls(content, old_public_id, new_public_id, type_)
+    content = replace_in_protocol_readme(
+        fp, content, old_public_id, new_public_id, type_
+    )
     if not is_ambiguous:
         content = content.replace(old_string, new_string)
     else:
-        content = replace_in_yamls(content, old_string, new_string, type_)
         content = _ask_to_user_and_replace_if_allowed(
             content, old_string, new_string, type_
         )
@@ -534,7 +596,7 @@ def process_package(package_id: PackageId, is_ambiguous: bool) -> None:
 
     - check version in registry
     - make sure, version is exactly one above the one in registry
-    - change all occurences in packages/tests/aea/examples/benchmark/docs to new reference
+    - change all occurrences in packages/tests/aea/examples/benchmark/docs to new reference
     - change yaml version number
 
     :param package_id: the id of the package

From 14bdbcc85a39d38806473f506c4fe01058791b77 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 21 Sep 2020 22:47:55 +0200
Subject: [PATCH 040/131] fix cli vs programmatic aea test due to isort changes

---
 .../test_cli_vs_programmatic_aea.py                             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
index e944ab7b5e..daf2c05033 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/test_cli_vs_programmatic_aea.py
@@ -173,7 +173,7 @@ def _inject_location(self, location, dst_file_path):
         """Inject location into the weather client strategy."""
         file = Path(dst_file_path)
         lines = file.read_text().splitlines()
-        line_insertion_position = 163  # line below: `strategy._is_ledger_tx = False`
+        line_insertion_position = 165  # line below: `strategy._is_ledger_tx = False`
         lines.insert(
             line_insertion_position,
             "    from packages.fetchai.skills.generic_buyer.strategy import Location",

From c9710754d116818d6e4b3f37c6cc75a6b9f0d5a2 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Mon, 21 Sep 2020 22:22:32 +0100
Subject: [PATCH 041/131] complete transition to message based for tac control
 contract

---
 .../skills/tac_control_contract/behaviours.py |  8 +-
 .../skills/tac_control_contract/dialogues.py  | 16 ++++
 .../skills/tac_control_contract/handlers.py   | 39 ++++++---
 .../skills/tac_control_contract/parameters.py | 87 +------------------
 4 files changed, 49 insertions(+), 101 deletions(-)

diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 7b2b87104c..7cc5a46586 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -51,6 +51,8 @@ def setup(self) -> None:
         super().setup()
         parameters = cast(Parameters, self.context.parameters)
         if not parameters.is_contract_deployed:
+            game = cast(Game, self.context.game)
+            game.phase = Phase.CONTRACT_DEPLOYMENT_PROPOSAL
             self._request_contract_deploy_transaction()
 
     def _request_contract_deploy_transaction(self) -> None:
@@ -68,7 +70,7 @@ def _request_contract_deploy_transaction(self) -> None:
             performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
             ledger_id=parameters.ledger_id,
             contract_id="fetchai/erc1155:0.10.0",
-            callable="get_deploy_transaction",
+            callable=ContractApiDialogue.Callable.GET_DEPLOY_TRANSACTION,
             kwargs=ContractApiMessage.Kwargs(
                 {"deployer_address": self.context.agent_address}
             ),
@@ -155,7 +157,7 @@ def _request_create_items_transaction(self, game: Game) -> None:
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
             ledger_id=parameters.ledger_id,
             contract_id="fetchai/erc1155:0.10.0",
-            callable="get_create_batch_transaction",
+            callable=ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION,
             kwargs=ContractApiMessage.Kwargs(
                 {"deployer_address": self.context.agent_address, "token_ids": token_ids}
             ),
@@ -191,7 +193,7 @@ def _request_mint_items_transaction(self, game: Game) -> None:
                 ledger_id=parameters.ledger_id,
                 contract_id="fetchai/erc1155:0.10.0",
                 contract_address=parameters.contract_address,
-                callable="get_mint_batch_transaction",
+                callable=ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION,
                 kwargs=ContractApiMessage.Kwargs(
                     {
                         "deployer_address": self.context.agent_address,
diff --git a/packages/fetchai/skills/tac_control_contract/dialogues.py b/packages/fetchai/skills/tac_control_contract/dialogues.py
index 77718207a2..be35d63101 100644
--- a/packages/fetchai/skills/tac_control_contract/dialogues.py
+++ b/packages/fetchai/skills/tac_control_contract/dialogues.py
@@ -28,6 +28,7 @@
 - TacDialogues: The dialogues class keeps track of all dialogues of type tac.
 """
 
+from enum import Enum
 from typing import Optional, Type
 
 from aea.common import Address
@@ -89,6 +90,13 @@
 class ContractApiDialogue(BaseContractApiDialogue):
     """The dialogue class maintains state of a dialogue and manages it."""
 
+    class Callable(Enum):
+        """Contract callable."""
+
+        GET_DEPLOY_TRANSACTION = "get_deploy_transaction"
+        GET_CREATE_BATCH_TRANSACTION = "get_create_batch_transaction"
+        GET_MINT_BATCH_TRANSACTION = "get_mint_batch_transaction"
+
     def __init__(
         self,
         dialogue_label: BaseDialogueLabel,
@@ -113,6 +121,14 @@ def __init__(
             message_class=message_class,
         )
         self._terms = None  # type: Optional[Terms]
+        self._callable = None  # type: Optional[ContractApiDialogue.Callable]
+
+    @property
+    def callable(self) -> Callable:
+        """Get the callable."""
+        if self._callable is None:
+            raise ValueError("Callable not set!")
+        return self._callable
 
     @property
     def terms(self) -> Terms:
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index 304445a5e3..6b50a79af5 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -41,6 +41,7 @@
     SigningDialogue,
     SigningDialogues,
 )
+from packages.fetchai.skills.tac_control_contract.game import Game, Phase
 from packages.fetchai.skills.tac_control_contract.parameters import Parameters
 
 LEDGER_API_ADDRESS = "fetchai/ledger:0.6.0"
@@ -329,7 +330,7 @@ def handle(self, message: Message) -> None:
             ledger_api_msg.performative
             is LedgerApiMessage.Performative.TRANSACTION_RECEIPT
         ):
-            self._handle_transaction_receipt(ledger_api_msg)
+            self._handle_transaction_receipt(ledger_api_msg, ledger_api_dialogue)
         elif ledger_api_msg.performative == LedgerApiMessage.Performative.ERROR:
             self._handle_error(ledger_api_msg, ledger_api_dialogue)
         else:
@@ -389,16 +390,21 @@ def _handle_transaction_digest(
         self.context.outbox.put_message(message=msg)
         self.context.logger.info("requesting transaction receipt.")
 
-    def _handle_transaction_receipt(self, ledger_api_msg: LedgerApiMessage) -> None:
+    def _handle_transaction_receipt(
+        self, ledger_api_msg: LedgerApiMessage, ledger_api_dialogue: LedgerApiDialogue
+    ) -> None:
         """
         Handle a message of transaction_receipt performative.
 
         :param ledger_api_message: the ledger api message
+        :param ledger_api_dialogue: the ledger api dialogue
         """
         is_transaction_successful = LedgerApis.is_transaction_settled(
             ledger_api_msg.transaction_receipt.ledger_id,
             ledger_api_msg.transaction_receipt.receipt,
         )
+        signing_dialogue = ledger_api_dialogue.associated_signing_dialogue
+        contract_api_dialogue = signing_dialogue.associated_contract_api_dialogue
         if is_transaction_successful:
             self.context.logger.info(
                 "transaction was successfully settled. Transaction receipt={}".format(
@@ -406,21 +412,30 @@ def _handle_transaction_receipt(self, ledger_api_msg: LedgerApiMessage) -> None:
                 )
             )
             parameters = cast(Parameters, self.context.parameters)
-            if not parameters.contract_manager.is_contract_deployed:
+            game = cast(Game, self.context.game)
+            if (
+                contract_api_dialogue.callable
+                == ContractApiDialogue.Callable.GET_DEPLOY_TRANSACTION
+            ):
                 contract_address = ledger_api_msg.transaction_receipt.receipt.get(
                     "contractAddress", None
                 )
                 parameters.contract_address = contract_address
-                parameters.contract_manager.is_contract_deployed = is_transaction_successful
-            elif not parameters.contract_manager.is_tokens_created:
-                parameters.contract_manager.is_tokens_created = is_transaction_successful
-            elif not parameters.contract_manager.is_tokens_minted:
-                parameters.is_tokens_minted = is_transaction_successful
-            elif parameters.is_tokens_minted:
-                self.context.is_active = False
-                self.context.logger.info("demo finished!")
+                game.phase = Phase.CONTRACT_DEPLOYED
+            elif (
+                contract_api_dialogue.callable
+                == ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION
+            ):
+                game.phase = Phase.TOKENS_CREATED
+            elif (
+                contract_api_dialogue.callable
+                == ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
+            ):
+                parameters.nb_completed_minting += 1
+                if game.registration.nb_agents == parameters.nb_completed_minting:
+                    game.phase = Phase.TOKENS_MINTED
             else:
-                self.context.logger.error("unexpected transaction receipt!")
+                self.context.logger.error("Unexpected transaction receipt!")
         else:
             self.context.logger.error(
                 "transaction failed. Transaction receipt={}".format(
diff --git a/packages/fetchai/skills/tac_control_contract/parameters.py b/packages/fetchai/skills/tac_control_contract/parameters.py
index f9ea7ee3b0..f7ff49fc51 100644
--- a/packages/fetchai/skills/tac_control_contract/parameters.py
+++ b/packages/fetchai/skills/tac_control_contract/parameters.py
@@ -19,103 +19,18 @@
 
 """This package contains a class representing the game parameters."""
 
-from typing import Dict, List, Optional
-
-from aea.exceptions import AEAEnforceError, enforce
 from aea.helpers.transaction.base import Terms
 
 from packages.fetchai.skills.tac_control.parameters import Parameters as BaseParameters
 
 
-class ContractManager:
-    """Class managing the contract."""
-
-    def __init__(self, is_contract_deployed: bool = False):
-        """Instantiate the contract manager class."""
-        self._deploy_tx_digest = None  # type: Optional[str]
-        self._create_tokens_tx_digest = None  # type: Optional[str]
-        self._mint_tokens_tx_digests = {}  # type: Dict[str, str]
-        self._confirmed_mint_tokens_agents = []  # type: List[str]
-        self.is_contract_deployed = is_contract_deployed
-        self.is_tokens_created = False
-        self.is_tokens_minted = False
-
-    @property
-    def deploy_tx_digest(self) -> str:
-        """Get the contract deployment tx digest."""
-        if self._deploy_tx_digest is None:
-            raise AEAEnforceError("Deploy_tx_digest is not set yet!")
-        return self._deploy_tx_digest
-
-    @deploy_tx_digest.setter
-    def deploy_tx_digest(self, deploy_tx_digest: str) -> None:
-        """Set the contract deployment tx digest."""
-        enforce(self._deploy_tx_digest is None, "Deploy_tx_digest already set!")
-        self._deploy_tx_digest = deploy_tx_digest
-
-    @property
-    def create_tokens_tx_digest(self) -> str:
-        """Get the contract deployment tx digest."""
-        if self._create_tokens_tx_digest is None:
-            raise AEAEnforceError("Create_tokens_tx_digest is not set yet!")
-        return self._create_tokens_tx_digest
-
-    @create_tokens_tx_digest.setter
-    def create_tokens_tx_digest(self, create_tokens_tx_digest: str) -> None:
-        """Set the contract deployment tx digest."""
-        enforce(
-            self._create_tokens_tx_digest is None,
-            "Create_tokens_tx_digest already set!",
-        )
-        self._create_tokens_tx_digest = create_tokens_tx_digest
-
-    @property
-    def mint_tokens_tx_digests(self) -> Dict[str, str]:
-        """Get the mint tokens tx digests."""
-        return self._mint_tokens_tx_digests
-
-    def set_mint_tokens_tx_digest(self, agent_addr: str, tx_digest: str) -> None:
-        """
-        Set a mint token tx digest for an agent.
-
-        :param agent_addr: the agent addresss
-        :param tx_digest: the transaction digest
-        """
-        enforce(
-            agent_addr not in self._mint_tokens_tx_digests, "Tx digest already set."
-        )
-        self._mint_tokens_tx_digests[agent_addr] = tx_digest
-
-    @property
-    def confirmed_mint_tokens_agents(self) -> List[str]:
-        """Get the agents which are confirmed to have minted tokens on chain."""
-        return self._confirmed_mint_tokens_agents
-
-    def add_confirmed_mint_tokens_agents(self, agent_addr: str) -> None:
-        """
-        Set agent addresses whose tokens have been minted.
-
-        :param agent_addr: the agent address
-        """
-        enforce(
-            agent_addr not in self.confirmed_mint_tokens_agents,
-            "Agent already in list.",
-        )
-        self._confirmed_mint_tokens_agents.append(agent_addr)
-
-
 class Parameters(BaseParameters):
     """This class contains the parameters of the game."""
 
     def __init__(self, **kwargs):
         """Instantiate the parameter class."""
         super().__init__(**kwargs)
-        self._contract_manager = ContractManager()
-
-    @property
-    def contract_manager(self) -> ContractManager:
-        """Get contract manager."""
-        return self._contract_manager
+        self.nb_completed_minting = 0
 
     def get_deploy_terms(self) -> Terms:
         """

From 4f176acdf4418449b6bb2a6dca73dd1b1e2e6561 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Mon, 21 Sep 2020 22:24:01 +0100
Subject: [PATCH 042/131] fix hashes

---
 .../fetchai/protocols/contract_api/protocol.yaml     |  2 +-
 packages/fetchai/protocols/gym/protocol.yaml         |  2 +-
 packages/fetchai/skills/erc1155_deploy/skill.yaml    |  2 +-
 packages/fetchai/skills/tac_control/skill.yaml       |  8 ++++----
 .../fetchai/skills/tac_control_contract/skill.yaml   | 12 ++++++------
 packages/hashes.csv                                  | 10 +++++-----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/fetchai/protocols/contract_api/protocol.yaml b/packages/fetchai/protocols/contract_api/protocol.yaml
index c41896ef87..3979768e87 100644
--- a/packages/fetchai/protocols/contract_api/protocol.yaml
+++ b/packages/fetchai/protocols/contract_api/protocol.yaml
@@ -6,7 +6,7 @@ description: A protocol for contract APIs requests and responses.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmVR8NKCTfaoLCiepHWqPGPVRuhmbwaM4v9iheK4FzaWwj
+  README.md: QmPK5NcjfCiw3wnnaM18hdgHUTyU9YfxVgs9wsBZdrfhhF
   __init__.py: QmZodYjNqoMgGAGKfkCU4zU9t1Cx9MAownqSy4wyVdwaHF
   contract_api.proto: QmNwngtcYFSuqL8yeTGVXmrHjfebCybdUa9BnTDKXn8odk
   contract_api_pb2.py: QmVT6Fv53KyFhshNFEo38seHypd7Y62psBaF8NszV8iRHK
diff --git a/packages/fetchai/protocols/gym/protocol.yaml b/packages/fetchai/protocols/gym/protocol.yaml
index f381e6973e..fb853161fa 100644
--- a/packages/fetchai/protocols/gym/protocol.yaml
+++ b/packages/fetchai/protocols/gym/protocol.yaml
@@ -6,7 +6,7 @@ description: A protocol for interacting with a gym connection.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmTCkz4cEUcwuPZVtvrVr8Np5qn1SMwm6foGSY9Y68DhZT
+  README.md: QmReTgjgH8mszRS1obqdxXDeA6f8sgkmfXHqZ1FSFeeZgX
   __init__.py: QmWBvruqGuU2BVCq8cuP1S3mgvuC78yrG4TdtSvKhCT8qX
   custom_types.py: QmT3VKT86xZKR11RR1vQ3myRpmVZNdzY6ELd8HG9U2ngwa
   dialogues.py: QmdCzcFfyPF43U2SoxwshG5p4hd6dK49m6GYKduDHbnNPo
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index b43dc83ed4..51ddb1f8e0 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: Qmbm3ZtGpfdvvzqykfRqbaReAK9a16mcyK7qweSfeN5pq1
   behaviours.py: QmaiK1q2cYeP64YriCw6PHm9Mr1okMRU9esPftQDXXFy1f
   dialogues.py: QmcCbdxFM4SX3MgXDxxbsC66gp8QK3C4W2czniQ5oDNc7G
-  handlers.py: QmSp3YuFz5nLy6Bc6qQr27ZUtwNQR6LyKiRHXcYpnmhm9r
+  handlers.py: QmUP1hkd8pGwFu9xK2GgempWwtQgh1BAfDvQPkJGCcKsoD
   strategy.py: QmeoDg7UT5MG5khmrZna3v8HYrC6QJjjEV26kcq1mPs6yx
 fingerprint_ignore_patterns: []
 contracts:
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 4cb9306bc0..e706c33ac8 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -9,12 +9,12 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdWECpRXZXH5JPV6wVHqeUtvjBhieUFTEoT2e7EY16N8M
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
-  behaviours.py: QmTVCXtTpH1A55vWnynz1PjM4VCrQ6EDy5XfcJpT93doEq
+  behaviours.py: QmcznM3tsmEDNx9Vbhv48o3PNtBEz5W1MVQ7SxJFGkH7di
   dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
-  game.py: QmeAmG3LH1xBFRvUATrWY7spSDmjNeXVD4ZNYrt1BRY3jB
+  game.py: QmNt16GHaJHtsw3tSS165RLU8pNtvdMbKJqEkMRdjZn3rS
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
-  helpers.py: QmdG31YUJakBz8FdNNxU6RxqhWy9iv1BG253PzfxBhzqq2
-  parameters.py: QmQB95beEKzyA8Aa7Y9HTPw6BPEVi6BGkpsUqN4QZ4DcVG
+  helpers.py: QmSh5DfkfsdAHQ7RnR5MHZaeJacVSPQqHMzESZg5mcUbFC
+  parameters.py: QmQkA45jEp5EK5GoD7TaVrckozGY8uTr9f3j4E6pzg72af
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index ac1f539616..f96d6b1a99 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -7,13 +7,13 @@ description: The tac control skill implements the logic for an AEA to control an
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmV6mToyVnQL9squVJntDPrHvtxFk7sfEYJ61Fyoiy9wsE
+  README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmcLSggJr1XpiDEwefCGGpfwUp282J4i97ziCNFH7X1M9C
-  game.py: Qmdz91tAYzEFDsvN4hNBawK7D7beTfocps1hpQc3RgavUK
-  handlers.py: QmWyibFRxcunBLqb7FJEkx9RpS6fNZpAvNDkG6cCfK7mQd
-  helpers.py: QmQ36tdx5itzz189tUgmyR74Q63vSRUcPTsg9qEwBUYdNU
-  parameters.py: QmRU9gxsWcxy25g69jbrKve2f8kFxNBjFfRjPZNKsYoYCP
+  behaviours.py: QmYsRchFNceEuwxkHFopENAR7nMFfZ5JLwtVXceM1jVkk3
+  dialogues.py: QmPNoMrAPBQb8ib5uwxxMXd8U8nG81uXt4no6WStS3pNob
+  game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
+  handlers.py: QmSXVdtLYeHkabpp8ZqSrqwywhQvT4EwfiYqWyWoF52GNr
+  parameters.py: QmVMNP52fPxkzEbXPhXtQXspnaj2f4ErZNcNdPAqv4cvwq
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index affbbbc4be..a1d99e1e51 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -34,10 +34,10 @@ fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
 fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
 fetchai/contracts/erc1155,QmUupRwnza2KZBGULZ62xQREtkuQbYUrt1W8NbYZJuqbNt
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
-fetchai/protocols/contract_api,QmaxhJetT4GQ1A2ctbxxWQLvLny6LZykFnXEt2yDVb4sKJ
+fetchai/protocols/contract_api,Qmak7HCvxTTY5XD5XkTNnn8g4uqqKwyxka9Aghm7tsRdmJ
 fetchai/protocols/default,QmXAdTynqPF8kYFsRZzxigVh3LYZJ8FSGEPEmNPDLoyHmM
 fetchai/protocols/fipa,Qmb3GXxbEQ23sZ1d7HsmrvchLwPfsEcDAbpLLjRTYxdJDm
-fetchai/protocols/gym,Qmaj7TByBrHvbecUzWmuy96t7W8iocsD3gKunWZZSLTF5b
+fetchai/protocols/gym,Qma7tTmiH5LFWCCUCcGMLP7G4DUhUZKbHSSH6BcB4qm4Vx
 fetchai/protocols/http,QmZJVqY2cxjky6p3o76TUemSsFDws8Dx33voG9WMdrKcry
 fetchai/protocols/ledger_api,Qmak3uKpeSfT5f4oqes3oUcNSg7vy7WKE2tUmSu8CZUNJ5
 fetchai/protocols/ml_trade,QmNVZvbcgERSypYUopKMHvd6F8B81rQqtLVqUvzMeEEwJN
@@ -52,7 +52,7 @@ fetchai/skills/carpark_client,QmV3vHmx4sDaecBq56L6kMD2K6JorNq4fTVC2X2NqqdUFP
 fetchai/skills/carpark_detection,QmSMoWJggZdTF3p4Y7CRUj94U9fny9tbPqJg5dZSDzUCFp
 fetchai/skills/echo,QmVRzFQnq22j7tcWK6MiD9q8Vs6mAAJhY3FrRE4CfJQ1D2
 fetchai/skills/erc1155_client,Qma5wTx1huj5DAcsBkRwCvZVczRREwyUawVJhyaC4UTrRE
-fetchai/skills/erc1155_deploy,QmPPHF6PUzRbeRCwy4m73oykUbTcNb1cGSoco5tSjcpVoB
+fetchai/skills/erc1155_deploy,QmRf1zDk9jqibdfV2iZACNCnypCYz74sAPvukprVcHQH4Y
 fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
 fetchai/skills/generic_buyer,QmR2xrE8RJMmtHPRw8sjH1RxY459958MDZNkUur6cvgSsg
 fetchai/skills/generic_seller,QmQYVjJ1NnTTzLPxf2yXGkwHbCBADDJCUjCjBH2NpvG2pB
@@ -62,8 +62,8 @@ fetchai/skills/ml_data_provider,QmdgxfES4XpmREpp9QqPQRMH9TvTF9nZ21zKM5RHLGCLke
 fetchai/skills/ml_train,QmbRQZz1MPXXuWyNW3BqhcsZKtZPhYakxGkVrBswNTgfk9
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmeckN8mcKLeqmJoQfdYqPsJ49nbxxwBhYPhjkTS99v1De
-fetchai/skills/tac_control,QmYCCU6RsvwqmjTRM3Nx8H99HhJXEFuinJSeG3UcjDubYH
-fetchai/skills/tac_control_contract,QmNz5pNPvS7LBUMdjVPrRAFgJbaD2xTL1HJQnCoYK3Va4J
+fetchai/skills/tac_control,QmfXLQLFVcdiQdqEHWacQ5bogWxok8B95pbfuCbD1gCwEA
+fetchai/skills/tac_control_contract,QmcU4n3kRrtD6eUmMiNiph512NqRhouhbTPLcv6LNzqBAD
 fetchai/skills/tac_negotiation,QmRCZWxUh6mkaBsa1CYNk3fmNKzSVxfiqwYGbzU1E3672F
 fetchai/skills/tac_participation,QmWBATSrN9J3XoqMJ89iniMnMDZZpLqoenWTigukaDasQG
 fetchai/skills/thermometer,QmWSFjntE9MvLpqUTfJrx4FxnG7ZSGQifoTft9mJ9MiPYt

From 2a557b9a6a82483c08414d269b0e287cac1d0590 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 22 Sep 2020 08:29:06 +0100
Subject: [PATCH 043/131] fix tac_controller_contract agent package

---
 .../agents/tac_controller_contract/aea-config.yaml     | 10 +++++++---
 packages/hashes.csv                                    |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index caa12bbff0..2e07b3d14e 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -8,19 +8,23 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/oef:0.9.0
+- fetchai/p2p_libp2p:0.10.0
+- fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
+- fetchai/contract_api:0.5.0
 - fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
+- fetchai/ledger_api:0.3.0
 - fetchai/oef_search:0.6.0
+- fetchai/signing:0.3.0
 - fetchai/tac:0.6.0
 skills:
 - fetchai/error:0.5.0
+- fetchai/tac_control:0.7.0
 - fetchai/tac_control_contract:0.9.0
-default_connection: fetchai/oef:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: ethereum
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/hashes.csv b/packages/hashes.csv
index a1d99e1e51..61607e215f 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -12,7 +12,7 @@ fetchai/agents/ml_model_trainer,Qmbk9YkJ7AX4VPcxS1anFU1sEgcU8oZn5fbSv2KuErBWMW
 fetchai/agents/my_first_aea,QmdYThnxTmqZizzvJvYH1HmnT5HKn5MsprkkHA8k3dgDPZ
 fetchai/agents/simple_service_registration,QmWKm97p72CSV9A9i4yrVi5ucWhw2jqAurbBE8xkuwHLSQ
 fetchai/agents/tac_controller,QmSLFA3m31SB45De8SEYixvAGkPcpv6dqtKKkssTW97HpB
-fetchai/agents/tac_controller_contract,QmXY3FHDmK8RYh6Hb4aodxzjuG1d5iggn6UtnoJph8wvVE
+fetchai/agents/tac_controller_contract,QmfNud5bgycNQY2qKzVBZ27heZHq2YptWN9kLNYWMX68N3
 fetchai/agents/tac_participant,Qme3EP7MYHKre7GK2X5jZ4Pq973DaJPfpPXZX64gtp5iUk
 fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
 fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT

From 15a3e5de8d718b577544c9336c069af4a380d9b2 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 22 Sep 2020 08:35:41 +0100
Subject: [PATCH 044/131] fix parsing of version info

---
 scripts/update_package_versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index 665d92f333..f93aba08c3 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -313,7 +313,7 @@ def _sort_in_update_order(package_ids: Set[PackageId]) -> List[PackageId]:
     return sorted(
         package_ids,
         key=lambda x: (
-            semver.VersionInfo(x.public_id.version),
+            semver.VersionInfo.parse(x.public_id.version),
             x.public_id,
             x.package_type,
         ),

From 878bad927430f14b915a1b22081c9f6b902f565f Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Tue, 22 Sep 2020 11:33:48 +0300
Subject: [PATCH 045/131] agents manager interface

---
 aea/manager.py | 151 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 aea/manager.py

diff --git a/aea/manager.py b/aea/manager.py
new file mode 100644
index 0000000000..bbb289d858
--- /dev/null
+++ b/aea/manager.py
@@ -0,0 +1,151 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+"""This module contains the implementation of AEA agents manager."""
+from abc import ABC, abstractmethod
+from typing import Dict, List
+
+from aea.aea_builder import PathLike
+from aea.configurations.base import PublicId
+
+
+class AbstractManager(ABC):
+    """Abstract agents manager."""
+
+    def __init__(self, working_dir: PathLike) -> None:
+        """
+        Initialize manager.
+
+        :param working_dir: directory to store base agents.
+        """
+        self.working_dir = working_dir
+
+    @abstractmethod
+    def start_manager(self) -> None:
+        """Start manager."""
+
+    @abstractmethod
+    def stop_manager(self, cleanup: bool = False) -> None:
+        """
+        Stop manager.
+
+        Stops all running agents and stop agent.
+
+        :param cleanup: remove agents_dir and purge in memory registry.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def add_project(self, public_id: PublicId) -> None:
+        """Fetch agent project and all dependencies to working_dir."""
+
+    @abstractmethod
+    def remove_project(self, public_id: PublicId) -> None:
+        """Remove agent project."""
+
+    @abstractmethod
+    def list_projects(self) -> List[PublicId]:
+        """
+        List all agents projects added.
+
+        :return: lit of public ids of projects
+        """
+
+    @abstractmethod
+    def add_agent(
+        self, project_id: PublicId, agent_name: str, config_overrides: Dict
+    ) -> None:
+        """
+        Create new agent configuration based on project with config overrides applied.
+
+        Alias is stored in memory only!
+
+        :param project_id: base agent public id
+        :param agent_name: unique name for the agent
+        :param config_overrides: overrides for component section.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def list_agents(self, running_only: bool = False) -> List[str]:
+        """
+        List all agents.
+
+        :param running_only: returns only running if set to True
+
+        :return: list of agents names
+        """
+
+    @abstractmethod
+    def remove_agent(self, agent_name: str) -> None:
+        """
+        Remove agent alias definition from registry.
+
+        :param agent_name: agent name to remove
+
+        :return: None
+        """
+
+    @abstractmethod
+    def start_agent(self, agent_name: str) -> None:
+        """
+        Start selected agent.
+
+        :param agent_name: agent name to start
+
+        :return: None
+        """
+
+    @abstractmethod
+    def start_all_agents(self) -> None:
+        """
+        Start all not started agents.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def stop_agent(self, agent_name: str) -> None:
+        """
+        Stop running agent.
+
+        :param agent_name: agent name to stop
+
+        :return: None
+        """
+
+    @abstractmethod
+    def stop_all_agents(self) -> None:
+        """
+        Stop all agents running.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def get_agent_details(self, agent_name: str) -> dict:
+        """
+        Return details about agent definition.
+
+        {
+            "project": str
+            "overrides": dict
+        }
+        """

From 905fe8ced85d2acc7d1ea252fcd15799ead85437 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 22 Sep 2020 12:19:13 +0200
Subject: [PATCH 046/131] add tests for registry.base

---
 tests/test_registries/test_base.py | 79 ++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index d198068de4..09dc54f064 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -50,6 +50,7 @@
     AgentComponentRegistry,
     ComponentRegistry,
     HandlerRegistry,
+    PublicIdRegistry,
 )
 from aea.registries.resources import Resources
 from aea.skills.base import Skill
@@ -545,6 +546,10 @@ def setup_class(self):
         """Set up the test."""
         self.registry = AgentComponentRegistry()
 
+    def test_ids(self):
+        """Test all ids getter."""
+        assert self.registry.ids() == set()
+
     def test_register_when_component_is_already_registered(self):
         """Test AgentComponentRegistry.register when the component is already registered."""
         component_id = ComponentId(
@@ -609,6 +614,23 @@ def setup_class(self):
         """Set up the tests."""
         self.registry = ComponentRegistry()
 
+    def test_ids(self):
+        """Test the getter of all ids."""
+        assert self.registry.ids() == set()
+
+    def test_ids_non_empty(self):
+        """Test ids, non-empty case."""
+        dummy_skill = Skill.from_dir(
+            Path(CUR_PATH, "data", "dummy_skill"), agent_context=MagicMock(),
+        )
+        behaviour = next(iter(dummy_skill.behaviours.values()))
+        skill_component_id = (dummy_skill.public_id, behaviour.name)
+        self.registry.register(skill_component_id, behaviour)
+
+        assert self.registry.ids() == {skill_component_id}
+
+        self.registry.unregister(skill_component_id)
+
     def test_unregister_when_item_not_registered(self):
         """Test 'unregister' in case the item is not registered."""
         with pytest.raises(ValueError):
@@ -668,6 +690,23 @@ def setup_class(cls):
         """Set up the tests."""
         cls.registry = HandlerRegistry()
 
+    def test_fetch_skill_id_not_present(self):
+        """Test fetch, negative case for skill id.."""
+        # register an item
+        protocol_id = MagicMock()
+        protocol_id.package_version.is_latest = False
+        skill_id = MagicMock()
+        skill_id.package_version.is_latest = False
+        handler_name = "handler"
+        handler_mock = MagicMock(name=handler_name, SUPPORTED_PROTOCOL=protocol_id)
+        self.registry.register((skill_id, handler_name), handler_mock)
+
+        # fetch an item with right protocol but unknown skill id
+        result = self.registry.fetch_by_protocol_and_skill(protocol_id, MagicMock())
+        assert result is None
+
+        self.registry.unregister((skill_id, handler_name))
+
     def test_register_and_unregister_dynamically(self):
         """Test register when protocol id is None."""
         assert len(self.registry._dynamically_added) == 0
@@ -733,3 +772,43 @@ def test_unregister_by_skill(self):
             ValueError, match="No component of skill .* present in the registry."
         ):
             self.registry.unregister_by_skill(skill_id)
+
+
+class TestPublicIdRegistry:
+    """Tests for the public id registry class."""
+
+    @classmethod
+    def setup_class(cls):
+        """Set up the class."""
+        cls.registry = PublicIdRegistry()
+
+    def test_register_fails_when_version_latest(self):
+        """Test that version 'latest' are not allowed for registration."""
+        public_id = PublicId("author", "package", "latest")
+        with pytest.raises(
+            ValueError,
+            match=f"Cannot register item with public id 'latest': {public_id}",
+        ):
+            self.registry.register(public_id, MagicMock())
+
+    def test_register_fails_when_already_registered(self):
+        """Test that register fails when the same public id is already registered."""
+        public_id = PublicId("author", "package", "0.1.0")
+        self.registry._public_id_to_item[public_id] = MagicMock()
+        with pytest.raises(
+            ValueError, match=f"Item already registered with item id '{public_id}'"
+        ):
+            self.registry.register(public_id, MagicMock())
+        self.registry._public_id_to_item.pop(public_id)
+
+    def test_unregister_fails_when_item_not_registered(self):
+        """Test that unregister fails when the item is not registered.."""
+        public_id = PublicId("author", "package", "0.1.0")
+        with pytest.raises(
+            ValueError, match=f"No item registered with item id '{public_id}'"
+        ):
+            self.registry.unregister(public_id)
+
+    def test_fetch_none(self):
+        """Test fetch, negative case."""
+        assert self.registry.fetch(MagicMock()) is None

From aa955115953d56ee082d6cbb0c9eb5fc77c3b2a6 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 22 Sep 2020 12:37:57 +0200
Subject: [PATCH 047/131] fix import order

---
 tests/test_cli/test_remove/test_base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/test_cli/test_remove/test_base.py b/tests/test_cli/test_remove/test_base.py
index 7f4f797f8e..036bdc6b0d 100644
--- a/tests/test_cli/test_remove/test_base.py
+++ b/tests/test_cli/test_remove/test_base.py
@@ -20,9 +20,8 @@
 import os
 from unittest import TestCase, mock
 
-from click import ClickException
-
 import pytest
+from click import ClickException
 
 from aea.cli.remove import remove_item
 from aea.configurations.base import PublicId

From b3ceb4369df350f6b2f3741aee0b614c76fdd575 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 22 Sep 2020 12:36:10 +0100
Subject: [PATCH 048/131] fix agents project dependencies tac

---
 .../tac_controller_contract/aea-config.yaml   |  5 +++
 .../fetchai/skills/tac_control/helpers.py     | 12 +++---
 .../fetchai/skills/tac_control/parameters.py  | 40 +++++++++++--------
 .../fetchai/skills/tac_control/skill.yaml     | 11 +++--
 .../skills/tac_control_contract/behaviours.py |  6 +--
 .../skills/tac_control_contract/skill.yaml    |  7 ++--
 packages/hashes.csv                           |  6 +--
 7 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 2e07b3d14e..5e20c223bc 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -8,6 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
+- fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.8.0
 - fetchai/stub:0.9.0
@@ -31,3 +32,7 @@ logging_config:
   version: 1
 private_key_paths: {}
 registry_path: ../packages
+default_routing:
+  fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
diff --git a/packages/fetchai/skills/tac_control/helpers.py b/packages/fetchai/skills/tac_control/helpers.py
index 1e830f35ad..585a9edb10 100644
--- a/packages/fetchai/skills/tac_control/helpers.py
+++ b/packages/fetchai/skills/tac_control/helpers.py
@@ -21,7 +21,7 @@
 """This module contains the helpers methods for the controller agent."""
 
 import random
-from typing import Dict, List, Optional, Tuple, cast
+from typing import Dict, List, Tuple, cast
 
 import numpy as np
 
@@ -64,7 +64,7 @@ def generate_currency_ids(nb_currencies: int) -> List[int]:
 
 
 def generate_currency_id_to_name(
-    nb_currencies: int, currency_ids: Optional[List[int]] = None
+    nb_currencies: int, currency_ids: List[int]
 ) -> Dict[str, str]:
     """
     Generate a dictionary mapping good ids to names.
@@ -73,7 +73,7 @@ def generate_currency_id_to_name(
     :param currency_ids: the currency ids
     :return: a dictionary mapping currency's ids to names.
     """
-    if currency_ids is not None:
+    if currency_ids != []:
         enforce(
             len(currency_ids) == nb_currencies,
             "Length of currency_ids does not match nb_currencies.",
@@ -87,9 +87,7 @@ def generate_currency_id_to_name(
     return currency_id_to_name
 
 
-def generate_good_id_to_name(
-    nb_goods: int, good_ids: Optional[List[int]] = None
-) -> Dict[str, str]:
+def generate_good_id_to_name(nb_goods: int, good_ids: List[int]) -> Dict[str, str]:
     """
     Generate a dictionary mapping good ids to names.
 
@@ -97,7 +95,7 @@ def generate_good_id_to_name(
     :param good_ids: a list of good ids
     :return: a dictionary mapping goods' ids to names.
     """
-    if good_ids is not None:
+    if good_ids != []:
         enforce(
             len(good_ids) == nb_goods, "Length of good_ids does not match nb_goods."
         )
diff --git a/packages/fetchai/skills/tac_control/parameters.py b/packages/fetchai/skills/tac_control/parameters.py
index a5da9ae09a..729c8f1e03 100644
--- a/packages/fetchai/skills/tac_control/parameters.py
+++ b/packages/fetchai/skills/tac_control/parameters.py
@@ -40,7 +40,7 @@
 DEFAULT_BASE_GOOD_ENDOWMENT = 2
 DEFAULT_LOWER_BOUND_FACTOR = 1
 DEFAULT_UPPER_BOUND_FACTOR = 1
-DEFAULT_START_TIME = "01 01 2020  00:01"
+DEFAULT_REGISTRATION_START_TIME = "01 01 2020  00:01"
 DEFAULT_REGISTRATION_TIMEOUT = 60
 DEFAULT_ITEM_SETUP_TIMEOUT = 60
 DEFAULT_COMPETITION_TIMEOUT = 300
@@ -58,10 +58,8 @@ def __init__(self, **kwargs):
         self._contract_address = kwargs.pop(
             "contract_adress", None
         )  # type: Optional[str]
-        self._good_ids = kwargs.pop("good_ids", None)  # type: Optional[List[int]]
-        self._currency_ids = kwargs.pop(
-            "currency_ids", None
-        )  # type: Optional[List[int]]
+        self._good_ids = kwargs.pop("good_ids", [])  # type: List[int]
+        self._currency_ids = kwargs.pop("currency_ids", [])  # type: List[int]
         self._min_nb_agents = kwargs.pop(
             "min_nb_agents", DEFAULT_MIN_NB_AGENTS
         )  # type: int
@@ -82,9 +80,11 @@ def __init__(self, **kwargs):
         self._upper_bound_factor = kwargs.pop(
             "upper_bound_factor", DEFAULT_UPPER_BOUND_FACTOR
         )  # type: int
-        start_time = kwargs.pop("start_time", DEFAULT_START_TIME)  # type: str
-        self._start_time = datetime.datetime.strptime(
-            start_time, "%d %m %Y %H:%M"
+        registration_start_time = kwargs.pop(
+            "registration_start_time", DEFAULT_REGISTRATION_START_TIME
+        )  # type: str
+        self._registration_start_time = datetime.datetime.strptime(
+            registration_start_time, "%d %m %Y %H:%M"
         )  # type: datetime.datetime
         self._registration_timeout = kwargs.pop(
             "registration_timeout", DEFAULT_REGISTRATION_TIMEOUT
@@ -125,6 +125,16 @@ def __init__(self, **kwargs):
             self.nb_currencies, self.currency_ids
         )
         self._good_id_to_name = generate_good_id_to_name(self.nb_goods, self.good_ids)
+        self._registration_end_time = (
+            self._registration_start_time
+            + datetime.timedelta(seconds=self._registration_timeout)
+        )
+        self._start_time = self._registration_end_time + datetime.timedelta(
+            seconds=self._item_setup_timeout
+        )
+        self._end_time = self._start_time + datetime.timedelta(
+            seconds=self._competition_timeout
+        )
         now = datetime.datetime.now()
         if now > self.registration_start_time:
             self.context.logger.warning(
@@ -169,12 +179,12 @@ def is_contract_deployed(self) -> bool:
         return self._contract_address is not None
 
     @property
-    def good_ids(self) -> Optional[List[int]]:
+    def good_ids(self) -> List[int]:
         """The item ids of an already deployed smart-contract."""
         return self._good_ids
 
     @property
-    def currency_ids(self) -> Optional[List[int]]:
+    def currency_ids(self) -> List[int]:
         """The currency ids of an already deployed smart-contract."""
         return self._currency_ids
 
@@ -231,16 +241,12 @@ def upper_bound_factor(self) -> int:
     @property
     def registration_start_time(self) -> datetime.datetime:
         """TAC registration start time."""
-        return (
-            self._start_time
-            - datetime.timedelta(seconds=self._item_setup_timeout)
-            - datetime.timedelta(seconds=self._registration_timeout)
-        )
+        return self._registration_start_time
 
     @property
     def registration_end_time(self) -> datetime.datetime:
         """TAC registration end time."""
-        return self._start_time - datetime.timedelta(seconds=self._item_setup_timeout)
+        return self._registration_end_time
 
     @property
     def start_time(self) -> datetime.datetime:
@@ -250,7 +256,7 @@ def start_time(self) -> datetime.datetime:
     @property
     def end_time(self) -> datetime.datetime:
         """TAC end time."""
-        return self._start_time + datetime.timedelta(seconds=self._competition_timeout)
+        return self._end_time
 
     @property
     def inactivity_timeout(self):
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index e706c33ac8..222032e936 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -13,8 +13,8 @@ fingerprint:
   dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
   game.py: QmNt16GHaJHtsw3tSS165RLU8pNtvdMbKJqEkMRdjZn3rS
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
-  helpers.py: QmSh5DfkfsdAHQ7RnR5MHZaeJacVSPQqHMzESZg5mcUbFC
-  parameters.py: QmQkA45jEp5EK5GoD7TaVrckozGY8uTr9f3j4E6pzg72af
+  helpers.py: QmZC2qWz5RW7HEHQiUAH48a8awomtzsm6PBZvaGTHEHwxy
+  parameters.py: QmNsjTrXyXezUrdtwRb9tCiEULSgHeFxmemqxFn5bW3Hqn
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
@@ -47,7 +47,11 @@ models:
     args:
       base_good_endowment: 2
       competition_timeout: 180
+      currency_ids: []
+      good_ids: []
       inactivity_timeout: 60
+      item_setup_timeout: 0
+      ledger_id: ethereum
       location:
         latitude: 0.127
         longitude: 51.5194
@@ -55,11 +59,11 @@ models:
       min_nb_agents: 2
       money_endowment: 2000000
       nb_goods: 10
+      registration_start_time: 01 01 2020  00:01
       registration_timeout: 60
       service_data:
         key: tac
         value: v1
-      start_time: 01 01 2020  00:01
       tx_fee: 1
       upper_bound_factor: 1
       whitelist: []
@@ -69,3 +73,4 @@ models:
     class_name: TacDialogues
 dependencies:
   numpy: {}
+is_abstract: true
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 7cc5a46586..ad695feb24 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -70,7 +70,7 @@ def _request_contract_deploy_transaction(self) -> None:
             performative=ContractApiMessage.Performative.GET_DEPLOY_TRANSACTION,
             ledger_id=parameters.ledger_id,
             contract_id="fetchai/erc1155:0.10.0",
-            callable=ContractApiDialogue.Callable.GET_DEPLOY_TRANSACTION,
+            callable=ContractApiDialogue.Callable.GET_DEPLOY_TRANSACTION.value,
             kwargs=ContractApiMessage.Kwargs(
                 {"deployer_address": self.context.agent_address}
             ),
@@ -157,7 +157,7 @@ def _request_create_items_transaction(self, game: Game) -> None:
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
             ledger_id=parameters.ledger_id,
             contract_id="fetchai/erc1155:0.10.0",
-            callable=ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION,
+            callable=ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION.value,
             kwargs=ContractApiMessage.Kwargs(
                 {"deployer_address": self.context.agent_address, "token_ids": token_ids}
             ),
@@ -193,7 +193,7 @@ def _request_mint_items_transaction(self, game: Game) -> None:
                 ledger_id=parameters.ledger_id,
                 contract_id="fetchai/erc1155:0.10.0",
                 contract_address=parameters.contract_address,
-                callable=ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION,
+                callable=ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION.value,
                 kwargs=ContractApiMessage.Kwargs(
                     {
                         "deployer_address": self.context.agent_address,
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index f96d6b1a99..bfd9c0a987 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,7 +9,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmYsRchFNceEuwxkHFopENAR7nMFfZ5JLwtVXceM1jVkk3
+  behaviours.py: QmbvhAKsmhr1aYdrKtcN3P1PpihSFxpTQXrRyGoFnTFqPa
   dialogues.py: QmPNoMrAPBQb8ib5uwxxMXd8U8nG81uXt4no6WStS3pNob
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
   handlers.py: QmSXVdtLYeHkabpp8ZqSrqwywhQvT4EwfiYqWyWoF52GNr
@@ -69,7 +69,7 @@ models:
       good_ids: []
       inactivity_timeout: 60
       item_setup_timeout: 120
-      ledger: ethereum
+      ledger_id: ethereum
       location:
         latitude: 0.127
         longitude: 51.5194
@@ -77,14 +77,13 @@ models:
       min_nb_agents: 2
       money_endowment: 2000000
       nb_goods: 10
+      registration_start_time: 01 01 2020  00:01
       registration_timeout: 60
       service_data:
         key: tac
         value: v1
-      start_time: 09 03 2020 15:15
       tx_fee: 1
       upper_bound_factor: 1
-      version_id: v1
       whitelist: []
     class_name: Parameters
   signing_dialogues:
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 61607e215f..90e6d12884 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -12,7 +12,7 @@ fetchai/agents/ml_model_trainer,Qmbk9YkJ7AX4VPcxS1anFU1sEgcU8oZn5fbSv2KuErBWMW
 fetchai/agents/my_first_aea,QmdYThnxTmqZizzvJvYH1HmnT5HKn5MsprkkHA8k3dgDPZ
 fetchai/agents/simple_service_registration,QmWKm97p72CSV9A9i4yrVi5ucWhw2jqAurbBE8xkuwHLSQ
 fetchai/agents/tac_controller,QmSLFA3m31SB45De8SEYixvAGkPcpv6dqtKKkssTW97HpB
-fetchai/agents/tac_controller_contract,QmfNud5bgycNQY2qKzVBZ27heZHq2YptWN9kLNYWMX68N3
+fetchai/agents/tac_controller_contract,QmWQRysyhhATUqxRxrAqvEvcdjzCiDGkZDzp7f7yvRTAz4
 fetchai/agents/tac_participant,Qme3EP7MYHKre7GK2X5jZ4Pq973DaJPfpPXZX64gtp5iUk
 fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
 fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
@@ -62,8 +62,8 @@ fetchai/skills/ml_data_provider,QmdgxfES4XpmREpp9QqPQRMH9TvTF9nZ21zKM5RHLGCLke
 fetchai/skills/ml_train,QmbRQZz1MPXXuWyNW3BqhcsZKtZPhYakxGkVrBswNTgfk9
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmeckN8mcKLeqmJoQfdYqPsJ49nbxxwBhYPhjkTS99v1De
-fetchai/skills/tac_control,QmfXLQLFVcdiQdqEHWacQ5bogWxok8B95pbfuCbD1gCwEA
-fetchai/skills/tac_control_contract,QmcU4n3kRrtD6eUmMiNiph512NqRhouhbTPLcv6LNzqBAD
+fetchai/skills/tac_control,QmTcQU7qs8toZMB4KgpxbcBiQj8Eucytq48XP4tGGTYPDD
+fetchai/skills/tac_control_contract,QmahExwhU8sYaZC7PGD1ShrPNdzAM4AEPZ6eGhsrQk8umk
 fetchai/skills/tac_negotiation,QmRCZWxUh6mkaBsa1CYNk3fmNKzSVxfiqwYGbzU1E3672F
 fetchai/skills/tac_participation,QmWBATSrN9J3XoqMJ89iniMnMDZZpLqoenWTigukaDasQG
 fetchai/skills/thermometer,QmWSFjntE9MvLpqUTfJrx4FxnG7ZSGQifoTft9mJ9MiPYt

From 0bdefc23153d2caf304e994e960cc88a11f0e030 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 22 Sep 2020 14:06:36 +0200
Subject: [PATCH 049/131] Update version bumper script.

- compute ambiguous public ids from all the package ids, and not only
  from those being updated;
- fix the check of whether a file should be processed or not. Earlier,
  it was only occurrence of public id; now we also check if
  the current file is a protocol README and if there is a protocol specification.
- improve debugging messages
---
 scripts/update_package_versions.py | 159 ++++++++++++++++++-----------
 1 file changed, 97 insertions(+), 62 deletions(-)

diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index f93aba08c3..baadd5a3df 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -61,6 +61,17 @@
 PUBLIC_ID_REGEX = PublicId.PUBLIC_ID_REGEX[1:-1]
 
 
+def get_protocol_specification_header_regex(public_id: PublicId) -> re.Pattern:
+    """Get the regex to match."""
+    return re.compile(
+        rf"(name: {public_id.name}\n"
+        + rf"author: {public_id.author}\n)"
+        + rf"version: {public_id.version}\n"
+        + rf"(description:)",
+        re.MULTILINE,
+    )
+
+
 def check_positive(value):
     """Check value is an int."""
     try:
@@ -71,29 +82,33 @@ def check_positive(value):
     return ivalue
 
 
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    "-n",
-    "--no-interactive",
-    action="store_true",
-    default=False,
-    help="Don't ask user confirmation for replacement.",
-)
-parser.add_argument(
-    "-C",
-    "--context",
-    type=check_positive,
-    default=3,
-    help="The number of above/below rows to display",
-)
-
-parser.add_argument(
-    "-r",
-    "--replace-by-default",
-    action="store_true",
-    default=False,
-    help="If --no-interactive is set, apply the replacement (default: False).",
-)
+def parse_arguments():
+    """Parse command-line arguments."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-n",
+        "--no-interactive",
+        action="store_true",
+        default=False,
+        help="Don't ask user confirmation for replacement.",
+    )
+    parser.add_argument(
+        "-C",
+        "--context",
+        type=check_positive,
+        default=3,
+        help="The number of above/below rows to display",
+    )
+
+    parser.add_argument(
+        "-r",
+        "--replace-by-default",
+        action="store_true",
+        default=False,
+        help="If --no-interactive is set, apply the replacement (default: False).",
+    )
+    return parser.parse_args()
+
 
 arguments: argparse.Namespace = None  # type: ignore
 
@@ -219,6 +234,20 @@ def public_id_in_registry(type_: str, name: str) -> PublicId:
     return highest
 
 
+def get_all_package_ids() -> Set[PackageId]:
+    """Get all the package ids in the local repository."""
+    result: Set[PackageId] = set()
+    now = get_hashes_from_current_release()
+    now_by_type = split_hashes_by_type(now)
+    for type_, name_to_hashes in now_by_type.items():
+        for name, _ in name_to_hashes.items():
+            configuration_file_path = get_configuration_file_path(type_, name)
+            public_id = get_public_id_from_yaml(configuration_file_path)
+            package_id = PackageId(PackageType(type_[:-1]), public_id)
+            result.add(package_id)
+    return result
+
+
 def get_public_ids_to_update() -> Set[PackageId]:
     """
     Get all the public ids to be updated.
@@ -260,38 +289,29 @@ def get_public_ids_to_update() -> Set[PackageId]:
             deployed_public_id = public_id_in_registry(type_, name)
             difference = minor_version_difference(current_public_id, deployed_public_id)
             # check if the public ids of the local package and the package in the registry are already the same.
+            package_info = f"Package `{name}` of type `{type_}`"
+            public_id_info = f"current id `{current_public_id}` and deployed id `{deployed_public_id}`"
             if difference == 0:
-                print(
-                    "Package `{}` of type `{}` needs to be bumped!".format(name, type_)
-                )
+                print(f"{package_info} needs to be bumped!")
                 result.add(PackageId(type_[:-1], current_public_id))
             elif difference == 1:
-                print(
-                    "Package `{}` of type `{}` already at correct version!".format(
-                        name, type_
-                    )
-                )
+                print(f"{package_info} already at correct version!")
                 continue
             else:
-                print(
-                    "Package `{}` of type `{}` has current id `{}` and deployed id `{}`. Error!".format(
-                        name, type_, current_public_id, deployed_public_id
-                    )
-                )
+                print(f"{package_info} has {public_id_info}. Error!")
                 sys.exit(1)
     return result
 
 
-def _get_ambiguous_public_ids(
-    all_package_ids_to_update: Set[PackageId],
-) -> Set[PublicId]:
+def _get_ambiguous_public_ids() -> Set[PublicId]:
     """Get the public ids that are the public ids of more than one package id."""
+    all_package_ids = get_all_package_ids()
     return set(
         map(
             operator.itemgetter(0),
             filter(
-                lambda x: x[1] > 1,
-                Counter(id_.public_id for id_ in all_package_ids_to_update).items(),
+                lambda x: x[0].name != "scaffold" and x[1] > 1,
+                Counter(id_.public_id for id_ in all_package_ids).items(),
             ),
         )
     )
@@ -314,30 +334,34 @@ def _sort_in_update_order(package_ids: Set[PackageId]) -> List[PackageId]:
         package_ids,
         key=lambda x: (
             semver.VersionInfo.parse(x.public_id.version),
-            x.public_id,
+            x.public_id.author,
+            x.public_id.name,
             x.package_type,
         ),
         reverse=True,
     )
 
 
-def process_packages(all_package_ids_to_update: Set[PackageId]) -> bool:
+def process_packages(
+    all_package_ids_to_update: Set[PackageId], ambiguous_public_ids: Set[PublicId]
+) -> None:
     """Process the package versions."""
-    is_bumped = False
-    ambiguous_public_ids = _get_ambiguous_public_ids(all_package_ids_to_update)
     print("*" * 100)
-    print("Start processing.")
-    print(
-        f"Ambiguous public ids: {pprint.pformat(list(map(lambda x: '/'.join(str(x)), ambiguous_public_ids)))}"
+
+    conflicts = {p.public_id for p in all_package_ids_to_update}.intersection(
+        ambiguous_public_ids
     )
+    print(f"Ambiguous public ids: {pprint.pformat(ambiguous_public_ids)}")
+    print(f"Conflicts with public ids to update: {pprint.pformat(conflicts)}",)
+
+    print("*" * 100)
+    print("Start processing.")
     sorted_package_ids_list = _sort_in_update_order(all_package_ids_to_update)
     for package_id in sorted_package_ids_list:
         print("#" * 50)
         print(f"Processing {package_id}")
         is_ambiguous = package_id.public_id in ambiguous_public_ids
         process_package(package_id, is_ambiguous)
-        is_bumped = True
-    return is_bumped
 
 
 def minor_version_difference(
@@ -532,18 +556,25 @@ def replace_in_protocol_readme(
     :return: the new content.
     """
     if (
-        type_ == fp.parent.parent == "protocols"
+        type_ == fp.parent.parent.name == "protocols"
         and fp.name == "README.md"
-        and fp.parent == old_public_id.name
+        and fp.parent.name == old_public_id.name
     ):
-        regex = re.compile(
-            rf"(name: {old_public_id.name}\nauthor: {old_public_id.author}\n)version: {old_public_id.version}\n(description:)",
-            re.MULTILINE,
-        )
+        regex = get_protocol_specification_header_regex(old_public_id)
         content = regex.sub(rf"\g<1>version: {new_public_id.version}\n\g<2>", content)
     return content
 
 
+def file_should_be_processed(content: str, old_public_id: PublicId):
+    """Check if the file should be processed."""
+    old_string = str(old_public_id)
+    return (
+        old_string in content
+        or get_protocol_specification_header_regex(old_public_id).search(content)
+        is not None
+    )
+
+
 def inplace_change(
     fp: Path,
     old_public_id: PublicId,
@@ -554,11 +585,11 @@ def inplace_change(
     """Replace the occurrence of a string with a new one in the provided file."""
 
     content = fp.read_text()
-    old_string = str(old_public_id)
-    new_string = str(new_public_id)
-    if old_string not in content:
+    if not file_should_be_processed(content, old_public_id):
         return
 
+    old_string = str(old_public_id)
+    new_string = str(new_public_id)
     print(
         f"Processing file {fp} for replacing {old_string} with {new_string} (is_ambiguous: {is_ambiguous})"
     )
@@ -611,8 +642,12 @@ def process_package(package_id: PackageId, is_ambiguous: bool) -> None:
 def run_once() -> bool:
     """Run the upgrade logic once."""
     all_package_ids_to_update = get_public_ids_to_update()
-    is_bumped = process_packages(all_package_ids_to_update)
-    return is_bumped
+    if len(all_package_ids_to_update) == 0:
+        print("No packages to update. Done!")
+        return False
+    ambiguous_public_ids = _get_ambiguous_public_ids()
+    process_packages(all_package_ids_to_update, ambiguous_public_ids)
+    return True
 
 
 if __name__ == "__main__":
@@ -620,7 +655,7 @@ def run_once() -> bool:
     First, check all hashes are up to date, exit if not.
     Then, run the bumping algo, re-hashing upon each bump.
     """
-    arguments = parser.parse_args()
+    arguments = parse_arguments()
     run_hashing()
     check_if_running_allowed()
     while run_once():

From b74c7d2f4b9bda8f4c05972db77291e8174e1029 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 22 Sep 2020 15:07:25 +0200
Subject: [PATCH 050/131] fix lint checks

---
 scripts/update_package_versions.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index baadd5a3df..a93f1067f0 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -35,7 +35,7 @@
 import sys
 from collections import Counter
 from pathlib import Path
-from typing import Dict, List, Optional, Set
+from typing import Dict, List, Optional, Pattern, Set
 
 import semver
 import yaml
@@ -61,13 +61,13 @@
 PUBLIC_ID_REGEX = PublicId.PUBLIC_ID_REGEX[1:-1]
 
 
-def get_protocol_specification_header_regex(public_id: PublicId) -> re.Pattern:
+def get_protocol_specification_header_regex(public_id: PublicId) -> Pattern:
     """Get the regex to match."""
     return re.compile(
         rf"(name: {public_id.name}\n"
         + rf"author: {public_id.author}\n)"
         + rf"version: {public_id.version}\n"
-        + rf"(description:)",
+        + r"(description:)",
         re.MULTILINE,
     )
 

From 12c95528c9320c1e2436e1b7afc23cd05943b148 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 22 Sep 2020 15:10:44 +0100
Subject: [PATCH 051/131] bump versions

---
 aea/cli/interact.py                           |   2 +-
 aea/configurations/constants.py               |   8 +-
 aea/protocols/default/README.md               |   2 +-
 aea/protocols/default/message.py              |   2 +-
 aea/protocols/default/protocol.yaml           |   6 +-
 aea/protocols/signing/README.md               |   2 +-
 aea/protocols/signing/message.py              |   2 +-
 aea/protocols/signing/protocol.yaml           |   6 +-
 aea/protocols/state_update/README.md          |   2 +-
 aea/protocols/state_update/message.py         |   2 +-
 aea/protocols/state_update/protocol.yaml      |   6 +-
 aea/skills/error/skill.yaml                   |   4 +-
 docs/agent-vs-aea.md                          |   4 +-
 docs/aries-cloud-agent-demo.md                |  16 +--
 docs/build-aea-programmatically.md            |  10 +-
 docs/car-park-skills.md                       |  12 +-
 docs/cli-vs-programmatic-aeas.md              |   6 +-
 docs/config.md                                |   4 +-
 docs/connect-a-frontend.md                    |   2 +-
 docs/contract.md                              |   8 +-
 docs/core-components-1.md                     |   2 +-
 docs/deployment.md                            |   2 +-
 docs/erc1155-skills.md                        |  12 +-
 docs/generic-skills-step-by-step.md           |  32 ++---
 docs/generic-skills.md                        |  12 +-
 docs/http-connection-and-skill.md             |   6 +-
 docs/language-agnostic-definition.md          |   4 +-
 docs/logging.md                               |   4 +-
 docs/ml-skills.md                             |  12 +-
 docs/multiplexer-standalone.md                |   4 +-
 docs/oef-ledger.md                            |   2 +-
 docs/orm-integration.md                       |  12 +-
 docs/protocol.md                              |  22 ++--
 docs/questions-and-answers.md                 |   2 +-
 docs/quickstart.md                            |  10 +-
 docs/simple-oef-usage.md                      |   4 +-
 docs/skill-guide.md                           |  10 +-
 docs/skill.md                                 |   4 +-
 docs/tac-skills-contract.md                   |   6 +-
 docs/tac-skills.md                            |  18 +--
 docs/thermometer-skills.md                    |  12 +-
 docs/weather-skills.md                        |  12 +-
 .../agents/aries_alice/aea-config.yaml        |  20 +--
 .../agents/aries_faber/aea-config.yaml        |  22 ++--
 .../agents/car_data_buyer/aea-config.yaml     |  16 +--
 .../agents/car_detector/aea-config.yaml       |  16 +--
 .../agents/erc1155_client/aea-config.yaml     |  18 +--
 .../agents/erc1155_deployer/aea-config.yaml   |  18 +--
 .../agents/generic_buyer/aea-config.yaml      |  16 +--
 .../agents/generic_seller/aea-config.yaml     |  16 +--
 .../fetchai/agents/gym_aea/aea-config.yaml    |   4 +-
 .../agents/ml_data_provider/aea-config.yaml   |  16 +--
 .../agents/ml_model_trainer/aea-config.yaml   |  16 +--
 .../agents/my_first_aea/aea-config.yaml       |   8 +-
 .../aea-config.yaml                           |  12 +-
 .../agents/tac_controller/aea-config.yaml     |  14 +-
 .../tac_controller_contract/aea-config.yaml   |  14 +-
 .../agents/tac_participant/aea-config.yaml    |  16 +--
 .../agents/thermometer_aea/aea-config.yaml    |  16 +--
 .../agents/thermometer_client/aea-config.yaml |  16 +--
 .../agents/weather_client/aea-config.yaml     |  16 +--
 .../agents/weather_station/aea-config.yaml    |  16 +--
 .../fetchai/connections/http_client/README.md |   2 +-
 .../connections/http_client/connection.py     |   2 +-
 .../connections/http_client/connection.yaml   |  10 +-
 .../fetchai/connections/http_server/README.md |   2 +-
 .../connections/http_server/connection.py     |   2 +-
 .../connections/http_server/connection.yaml   |  10 +-
 packages/fetchai/connections/ledger/README.md |   2 +-
 .../connections/ledger/connection.yaml        |   6 +-
 .../fetchai/connections/local/connection.py   |   4 +-
 .../fetchai/connections/local/connection.yaml |   6 +-
 packages/fetchai/connections/oef/README.md    |   2 +-
 .../fetchai/connections/oef/connection.py     |   4 +-
 .../fetchai/connections/oef/connection.yaml   |  10 +-
 .../fetchai/connections/p2p_stub/README.md    |   2 +-
 .../connections/p2p_stub/connection.py        |   2 +-
 .../connections/p2p_stub/connection.yaml      |   6 +-
 packages/fetchai/connections/soef/README.md   |   4 +-
 .../fetchai/connections/soef/connection.py    |   4 +-
 .../fetchai/connections/soef/connection.yaml  |  10 +-
 packages/fetchai/connections/tcp/README.md    |   2 +-
 packages/fetchai/connections/tcp/base.py      |   2 +-
 .../fetchai/connections/tcp/connection.yaml   |   6 +-
 .../fetchai/connections/webhook/README.md     |   2 +-
 .../fetchai/connections/webhook/connection.py |   2 +-
 .../connections/webhook/connection.yaml       |  10 +-
 packages/fetchai/protocols/fipa/README.md     |   2 +-
 packages/fetchai/protocols/fipa/message.py    |   2 +-
 packages/fetchai/protocols/fipa/protocol.yaml |   6 +-
 packages/fetchai/protocols/http/README.md     |   2 +-
 packages/fetchai/protocols/http/message.py    |   2 +-
 packages/fetchai/protocols/http/protocol.yaml |   6 +-
 .../fetchai/protocols/ledger_api/README.md    |   2 +-
 .../fetchai/protocols/ledger_api/message.py   |   2 +-
 .../protocols/ledger_api/protocol.yaml        |   6 +-
 packages/fetchai/protocols/ml_trade/README.md |   2 +-
 .../fetchai/protocols/ml_trade/message.py     |   2 +-
 .../fetchai/protocols/ml_trade/protocol.yaml  |   6 +-
 .../fetchai/protocols/oef_search/README.md    |   2 +-
 .../fetchai/protocols/oef_search/message.py   |   2 +-
 .../protocols/oef_search/protocol.yaml        |   6 +-
 packages/fetchai/protocols/tac/README.md      |   2 +-
 packages/fetchai/protocols/tac/message.py     |   2 +-
 packages/fetchai/protocols/tac/protocol.yaml  |   6 +-
 .../fetchai/skills/aries_alice/skill.yaml     |   8 +-
 .../fetchai/skills/aries_faber/skill.yaml     |   8 +-
 .../fetchai/skills/carpark_client/skill.yaml  |   8 +-
 .../skills/carpark_detection/skill.yaml       |   8 +-
 packages/fetchai/skills/echo/skill.yaml       |   4 +-
 .../fetchai/skills/erc1155_client/skill.yaml  |  10 +-
 .../fetchai/skills/erc1155_deploy/skill.yaml  |  10 +-
 .../fetchai/skills/generic_buyer/skill.yaml   |   8 +-
 .../fetchai/skills/generic_seller/skill.yaml  |   8 +-
 packages/fetchai/skills/http_echo/skill.yaml  |   4 +-
 .../skills/ml_data_provider/skill.yaml        |   8 +-
 packages/fetchai/skills/ml_train/skill.yaml   |   8 +-
 .../simple_service_registration/skill.yaml    |   2 +-
 .../fetchai/skills/tac_control/skill.yaml     |   6 +-
 .../skills/tac_control_contract/skill.yaml    |   4 +-
 .../fetchai/skills/tac_negotiation/skill.yaml |   4 +-
 .../skills/tac_participation/skill.yaml       |   4 +-
 .../fetchai/skills/thermometer/skill.yaml     |   8 +-
 .../skills/thermometer_client/skill.yaml      |   8 +-
 .../fetchai/skills/weather_client/skill.yaml  |   8 +-
 .../fetchai/skills/weather_station/skill.yaml |   8 +-
 packages/hashes.csv                           | 120 +++++++++---------
 tests/conftest.py                             |   2 +-
 tests/data/aea-config.example.yaml            |  14 +-
 tests/data/aea-config.example_w_keys.yaml     |  14 +-
 tests/data/dependencies_skill/skill.yaml      |   2 +-
 tests/data/dummy_aea/aea-config.yaml          |  12 +-
 tests/data/dummy_connection/connection.yaml   |   2 +-
 tests/data/dummy_skill/skill.yaml             |   2 +-
 tests/data/hashes.csv                         |   8 +-
 tests/test_aea.py                             |  12 +-
 tests/test_aea_builder.py                     |  10 +-
 tests/test_cli/test_add/test_connection.py    |   8 +-
 tests/test_cli/test_add/test_skill.py         |  10 +-
 tests/test_cli/test_interact.py               |  14 +-
 tests/test_cli/test_remove/test_connection.py |   6 +-
 tests/test_cli/test_run.py                    |  56 ++++----
 tests/test_cli/test_search.py                 |   8 +-
 tests/test_cli/test_utils/test_utils.py       |  10 +-
 tests/test_cli_gui/test_run_agent.py          |   2 +-
 tests/test_connections/test_stub.py           |   4 +-
 .../test_agent_vs_aea/agent_code_block.py     |   2 +-
 .../test_agent_vs_aea/test_agent_vs_aea.py    |   2 +-
 .../md_files/bash-aries-cloud-agent-demo.md   |  16 +--
 .../md_files/bash-car-park-skills.md          |  12 +-
 .../test_bash_yaml/md_files/bash-config.md    |   4 +-
 .../md_files/bash-erc1155-skills.md           |  12 +-
 .../bash-generic-skills-step-by-step.md       |  32 ++---
 .../md_files/bash-generic-skills.md           |  12 +-
 .../bash-http-connection-and-skill.md         |   6 +-
 .../test_bash_yaml/md_files/bash-logging.md   |   4 +-
 .../test_bash_yaml/md_files/bash-ml-skills.md |  12 +-
 .../md_files/bash-orm-integration.md          |  12 +-
 .../md_files/bash-p2p-connection.md           |   4 +-
 .../md_files/bash-quickstart.md               |   8 +-
 .../md_files/bash-skill-guide.md              |  10 +-
 .../test_bash_yaml/md_files/bash-skill.md     |   2 +-
 .../md_files/bash-tac-skills-contract.md      |   8 +-
 .../md_files/bash-tac-skills.md               |  18 +--
 .../md_files/bash-thermometer-skills.md       |  12 +-
 .../md_files/bash-weather-skills.md           |  12 +-
 .../programmatic_aea.py                       |   2 +-
 .../test_programmatic_aea.py                  |   2 +-
 .../programmatic_aea.py                       |   6 +-
 tests/test_docs/test_docs_protocol.py         |   4 +-
 .../multiplexer_standalone.py                 |   2 +-
 .../test_multiplexer_standalone.py            |   2 +-
 .../test_orm_integration.py                   |   8 +-
 .../test_skill_guide/test_skill_guide.py      |   4 +-
 .../test_http_server/test_http_server.py      |   2 +-
 .../test_http_server_and_client.py            |   2 +-
 .../test_connections/test_soef/test_soef.py   |   6 +-
 .../test_soef/test_soef_integration.py        |   2 +-
 .../test_webhook/test_webhook.py              |   2 +-
 .../test_packages/test_skills/test_carpark.py |  16 +--
 tests/test_packages/test_skills/test_echo.py  |   2 +-
 .../test_packages/test_skills/test_erc1155.py |   8 +-
 .../test_packages/test_skills/test_generic.py |  16 +--
 .../test_skills/test_http_echo.py             |   6 +-
 .../test_skills/test_ml_skills.py             |  16 +--
 tests/test_packages/test_skills/test_tac.py   |  12 +-
 .../test_skills/test_thermometer.py           |  16 +--
 .../test_packages/test_skills/test_weather.py |  16 +--
 .../test_generator/test_end_to_end.py         |  12 +-
 tests/test_registries/test_base.py            |   2 +-
 tests/test_test_tools/test_testcases.py       |  16 +--
 191 files changed, 818 insertions(+), 814 deletions(-)

diff --git a/aea/cli/interact.py b/aea/cli/interact.py
index 19d1976f4d..c9c59b6f31 100644
--- a/aea/cli/interact.py
+++ b/aea/cli/interact.py
@@ -157,7 +157,7 @@ def _try_construct_envelope(
         performative_str = "bytes"
         performative = DefaultMessage.Performative(performative_str)
         click.echo(
-            "Provide message of protocol fetchai/default:0.5.0 for performative {}:".format(
+            "Provide message of protocol fetchai/default:0.6.0 for performative {}:".format(
                 performative_str
             )
         )
diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py
index 128ffd8080..5cfb525c7b 100644
--- a/aea/configurations/constants.py
+++ b/aea/configurations/constants.py
@@ -27,12 +27,12 @@
 
 
 DEFAULT_CONNECTION = PublicId.from_str("fetchai/stub:0.9.0")
-DEFAULT_PROTOCOL = PublicId.from_str("fetchai/default:0.5.0")
-DEFAULT_SKILL = PublicId.from_str("fetchai/error:0.5.0")
+DEFAULT_PROTOCOL = PublicId.from_str("fetchai/default:0.6.0")
+DEFAULT_SKILL = PublicId.from_str("fetchai/error:0.6.0")
 DEFAULT_LEDGER = FetchAICrypto.identifier
 DEFAULT_PRIVATE_KEY_FILE = PRIVATE_KEY_PATH_SCHEMA.format(DEFAULT_LEDGER)
 DEFAULT_REGISTRY_PATH = DRP
 DEFAULT_LICENSE = DL
-SIGNING_PROTOCOL = PublicId.from_str("fetchai/signing:0.3.0")
-STATE_UPDATE_PROTOCOL = PublicId.from_str("fetchai/state_update:0.3.0")
+SIGNING_PROTOCOL = PublicId.from_str("fetchai/signing:0.4.0")
+STATE_UPDATE_PROTOCOL = PublicId.from_str("fetchai/state_update:0.4.0")
 LOCAL_PROTOCOLS = [DEFAULT_PROTOCOL, SIGNING_PROTOCOL, STATE_UPDATE_PROTOCOL]
diff --git a/aea/protocols/default/README.md b/aea/protocols/default/README.md
index ef5a05da42..52298fad7d 100644
--- a/aea/protocols/default/README.md
+++ b/aea/protocols/default/README.md
@@ -10,7 +10,7 @@ This is a protocol for two agents exchanging any bytes messages.
 ---
 name: default
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 description: A protocol for exchanging any bytes message.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/aea/protocols/default/message.py b/aea/protocols/default/message.py
index b6c2b75073..fcda5a2636 100644
--- a/aea/protocols/default/message.py
+++ b/aea/protocols/default/message.py
@@ -36,7 +36,7 @@
 class DefaultMessage(Message):
     """A protocol for exchanging any bytes message."""
 
-    protocol_id = ProtocolId.from_str("fetchai/default:0.5.0")
+    protocol_id = ProtocolId.from_str("fetchai/default:0.6.0")
 
     ErrorCode = CustomErrorCode
 
diff --git a/aea/protocols/default/protocol.yaml b/aea/protocols/default/protocol.yaml
index 14c867de1a..4e9fc8fb9f 100644
--- a/aea/protocols/default/protocol.yaml
+++ b/aea/protocols/default/protocol.yaml
@@ -1,18 +1,18 @@
 name: default
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 type: protocol
 description: A protocol for exchanging any bytes message.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmP3q9463opixzdv17QXkCSQvgR8KJXgLAVkfUPpdHJzPv
+  README.md: QmVXQi6676YTqbeYTRNyUw7Ln962VnKKF4HN1ren7TeNk9
   __init__.py: QmWpWuGcXu2SodVGUZiAdMrF8Tn7MAPDbiGh7vd9nEfEX6
   custom_types.py: QmRcgwDdTxkSHyfF9eoMtsb5P5GJDm4oyLq5W6ZBko1MFU
   default.proto: QmNzMUvXkBm5bbitR5Yi49ADiwNn1FhCvXqSKKoqAPZyXv
   default_pb2.py: QmSRFi1s3jcqnPuk4yopJeNuC6o58RL7dvEdt85uns3B3N
   dialogues.py: Qmc991snbS7DwFxo1cKcq1rQ2uj7y8ukp14kfe2zve387C
-  message.py: QmWzSGcSeRGaHERQg6E8QaYDiCqmeJYdFqE7rrwMBP7mP2
+  message.py: QmQBdmhR6GXkcfatPWnfaA87c5GnmEztU3vLEGCMWMH2kV
   serialization.py: QmRF7XPNEk1emKmFMZaYBCF3gr4CdkMXagoSpjQEmnRGG6
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/aea/protocols/signing/README.md b/aea/protocols/signing/README.md
index 77b43d1b22..72850bf2d7 100644
--- a/aea/protocols/signing/README.md
+++ b/aea/protocols/signing/README.md
@@ -10,7 +10,7 @@ This is a protocol for communication between a skill and a decision maker.
 ---
 name: signing
 author: fetchai
-version: 0.3.0
+version: 0.4.0
 description: A protocol for communication between skills and decision maker.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/aea/protocols/signing/message.py b/aea/protocols/signing/message.py
index ae0f9224b2..f0edf46a61 100644
--- a/aea/protocols/signing/message.py
+++ b/aea/protocols/signing/message.py
@@ -43,7 +43,7 @@
 class SigningMessage(Message):
     """A protocol for communication between skills and decision maker."""
 
-    protocol_id = ProtocolId.from_str("fetchai/signing:0.3.0")
+    protocol_id = ProtocolId.from_str("fetchai/signing:0.4.0")
 
     ErrorCode = CustomErrorCode
 
diff --git a/aea/protocols/signing/protocol.yaml b/aea/protocols/signing/protocol.yaml
index fc81b885eb..d1043f789c 100644
--- a/aea/protocols/signing/protocol.yaml
+++ b/aea/protocols/signing/protocol.yaml
@@ -1,16 +1,16 @@
 name: signing
 author: fetchai
-version: 0.3.0
+version: 0.4.0
 type: protocol
 description: A protocol for communication between skills and decision maker.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmSoa5dnxz53GWpWT2VvcRG4asVbzA8JzguiVgwqiLtguM
+  README.md: QmQGHs1QRtbTnqV4X8kzDyofu6U7Gx1WteC2MurAkcTpWG
   __init__.py: Qmd7JYjcrD95jdYfSZs6j7UX5TPZfPYXuTFrUzS3FHCxhS
   custom_types.py: Qmc7sAyCQbAaVs5dZf9hFkTrB2BG8VAioWzbyKBAybrQ1J
   dialogues.py: QmQ1WKs3Dn15oDSwpc4N8hdADLxrn76U4X5SiLAmyGiPPY
-  message.py: QmRX642Lz3DDWuNmkncP8jdfFaMamuv9wFhwc2fGqss5om
+  message.py: QmQV6iT67wo4Q9L5XGKbjyf83YB8kD9iGPQ5URxRE9sxyY
   serialization.py: QmbXSvWYfEmYyGdfuTXVJYaJfzqVLtMaLR8H3UCLZkvbSC
   signing.proto: QmcxyLzqhTE9xstAEzCVH17osbLxmSdALx9njmuPjhjrvZ
   signing_pb2.py: QmY3Ak5ih5zGvKjeZ5EnzrGX4tMYn5dWpjPArQwFeJpVKu
diff --git a/aea/protocols/state_update/README.md b/aea/protocols/state_update/README.md
index 3ba3eedfd7..4f1100612b 100644
--- a/aea/protocols/state_update/README.md
+++ b/aea/protocols/state_update/README.md
@@ -10,7 +10,7 @@ This is a protocol for updating the state of a decision maker.
 ---
 name: state_update
 author: fetchai
-version: 0.3.0
+version: 0.4.0
 description: A protocol for state updates to the decision maker state.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/aea/protocols/state_update/message.py b/aea/protocols/state_update/message.py
index eee05054c2..e62470fbd9 100644
--- a/aea/protocols/state_update/message.py
+++ b/aea/protocols/state_update/message.py
@@ -35,7 +35,7 @@
 class StateUpdateMessage(Message):
     """A protocol for state updates to the decision maker state."""
 
-    protocol_id = ProtocolId.from_str("fetchai/state_update:0.3.0")
+    protocol_id = ProtocolId.from_str("fetchai/state_update:0.4.0")
 
     class Performative(Message.Performative):
         """Performatives for the state_update protocol."""
diff --git a/aea/protocols/state_update/protocol.yaml b/aea/protocols/state_update/protocol.yaml
index 66b150339e..6adc5e1b0c 100644
--- a/aea/protocols/state_update/protocol.yaml
+++ b/aea/protocols/state_update/protocol.yaml
@@ -1,15 +1,15 @@
 name: state_update
 author: fetchai
-version: 0.3.0
+version: 0.4.0
 type: protocol
 description: A protocol for state updates to the decision maker state.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: Qmc12hnCshAE3TL9ba4vo6L8ZZhynyfhEUoStJggRrbimc
+  README.md: QmQ16KZTu6zC7GgAkAYnis5exdeUWLK77nkLTHEENuUNKM
   __init__.py: QmUrvqDr24Ph1nnUqjTUPh9QoftuTsef3Dj3yzPUMY38fu
   dialogues.py: Qmd59WgpFccLn1zhpLdwm3zDCmCsjSoQXVn6M7PgFwwkgR
-  message.py: QmchGWKst8yaXthWYT6prHAXJF4RACuaq81Tnc4Y4PFuXE
+  message.py: QmWzC79P44rpzdW5p5sdhxW5wv8CCrg4RzCgAnLPuPgyzC
   serialization.py: QmciaNPHkpyxWLYVtBPnYkKHj6Ur9E3CPJ9QvWbXFD91Yw
   state_update.proto: QmdmEUSa7PDxJ98ZmGE7bLFPmUJv8refgbkHPejw6uDdwD
   state_update_pb2.py: QmQr5KXhapRv9AnfQe7Xbr5bBqYWp9DEMLjxX8UWmK75Z4
diff --git a/aea/skills/error/skill.yaml b/aea/skills/error/skill.yaml
index 66d180ffd2..c6ecba3c6e 100644
--- a/aea/skills/error/skill.yaml
+++ b/aea/skills/error/skill.yaml
@@ -1,6 +1,6 @@
 name: error
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 type: skill
 description: The error skill implements basic error handling required by all AEAs.
 license: Apache-2.0
@@ -11,7 +11,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills: []
 behaviours: {}
 handlers:
diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index a49868c25d..4921a09331 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -127,7 +127,7 @@ We use the input and output text files to send an envelope to our agent and rece
 ``` python
         # Create a message inside an envelope and get the stub connection to pass it into the agent
         message_text = (
-            b"my_agent,other_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            b"my_agent,other_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         with open(INPUT_FILE, "wb") as f:
             write_with_lock(f, message_text)
@@ -254,7 +254,7 @@ def run():
 
         # Create a message inside an envelope and get the stub connection to pass it into the agent
         message_text = (
-            b"my_agent,other_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            b"my_agent,other_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         with open(INPUT_FILE, "wb") as f:
             write_with_lock(f, message_text)
diff --git a/docs/aries-cloud-agent-demo.md b/docs/aries-cloud-agent-demo.md
index acc6c3e901..74e487d125 100644
--- a/docs/aries-cloud-agent-demo.md
+++ b/docs/aries-cloud-agent-demo.md
@@ -192,10 +192,10 @@ The following steps create **Alice_AEA** from scratch:
 aea create aries_alice
 cd aries_alice
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/http_client:0.8.0
-aea add connection fetchai/webhook:0.6.0
-aea add skill fetchai/aries_alice:0.7.0
+aea add connection fetchai/soef:0.9.0
+aea add connection fetchai/http_client:0.9.0
+aea add connection fetchai/webhook:0.7.0
+aea add skill fetchai/aries_alice:0.8.0
 ```
 </p>
 </details>
@@ -277,10 +277,10 @@ The following steps create **Faber_AEA** from scratch:
 aea create aries_faber
 cd aries_faber
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/http_client:0.8.0
-aea add connection fetchai/webhook:0.6.0
-aea add skill fetchai/aries_faber:0.6.0
+aea add connection fetchai/soef:0.9.0
+aea add connection fetchai/http_client:0.9.0
+aea add connection fetchai/webhook:0.7.0
+aea add skill fetchai/aries_faber:0.7.0
 ```
 </p>
 </details>
diff --git a/docs/build-aea-programmatically.md b/docs/build-aea-programmatically.md
index 84d4b854a0..407925e113 100644
--- a/docs/build-aea-programmatically.md
+++ b/docs/build-aea-programmatically.md
@@ -48,7 +48,7 @@ We will use the stub connection to pass envelopes in and out of the AEA. Ensure
 ```
 
 ## Initialise the AEA
-We use the <a href="../api/aea_builder#aeabuilder-objects">`AEABuilder`</a> to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:0.5.0` protocol, the `fetchai/stub:0.9.0` connection and the `fetchai/error:0.5.0` skill.
+We use the <a href="../api/aea_builder#aeabuilder-objects">`AEABuilder`</a> to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:0.6.0` protocol, the `fetchai/stub:0.9.0` connection and the `fetchai/error:0.6.0` skill.
 ``` python
     # Instantiate the builder and build the AEA
     # By default, the default protocol, error skill and stub connection are added
@@ -121,7 +121,7 @@ We run the AEA from a different thread so that we can still use the main thread
 We use the input and output text files to send an envelope to our AEA and receive a response (from the echo skill)
 ``` python
         # Create a message inside an envelope and get the stub connection to pass it on to the echo skill
-        message_text = b"my_aea,other_agent,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,"
+        message_text = b"my_aea,other_agent,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,"
         with open(INPUT_FILE, "wb") as f:
             write_with_lock(f, message_text)
             print(b"input message: " + message_text)
@@ -147,8 +147,8 @@ Finally stop our AEA and wait for it to finish
 ## Running the AEA
 If you now run this python script file, you should see this output:
 
-    input message: my_aea,other_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello
-    output message: other_agent,my_aea,fetchai/default:0.5.0,...\x05hello
+    input message: my_aea,other_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello
+    output message: other_agent,my_aea,fetchai/default:0.6.0,...\x05hello
 
 
 ## Entire code listing
@@ -239,7 +239,7 @@ def run():
         time.sleep(4)
 
         # Create a message inside an envelope and get the stub connection to pass it on to the echo skill
-        message_text = b"my_aea,other_agent,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,"
+        message_text = b"my_aea,other_agent,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,"
         with open(INPUT_FILE, "wb") as f:
             write_with_lock(f, message_text)
             print(b"input message: " + message_text)
diff --git a/docs/car-park-skills.md b/docs/car-park-skills.md
index 922097bfc9..b7fed86aa3 100644
--- a/docs/car-park-skills.md
+++ b/docs/car-park-skills.md
@@ -68,7 +68,7 @@ The following steps create the car detector from scratch:
 aea create car_detector
 cd car_detector
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/carpark_detection:0.12.0
 aea install
@@ -78,8 +78,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `car_detector/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -102,7 +102,7 @@ The following steps create the car data client from scratch:
 aea create car_data_buyer
 cd car_data_buyer
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/carpark_client:0.12.0
 aea install
@@ -112,8 +112,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `car_data_buyer/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/docs/cli-vs-programmatic-aeas.md b/docs/cli-vs-programmatic-aeas.md
index 6fae1bc689..b4a3513300 100644
--- a/docs/cli-vs-programmatic-aeas.md
+++ b/docs/cli-vs-programmatic-aeas.md
@@ -124,8 +124,8 @@ def run():
 
     # specify the default routing for some protocols
     default_routing = {
-        PublicId.from_str("fetchai/ledger_api:0.3.0"): LedgerConnection.connection_id,
-        PublicId.from_str("fetchai/oef_search:0.6.0"): SOEFConnection.connection_id,
+        PublicId.from_str("fetchai/ledger_api:0.4.0"): LedgerConnection.connection_id,
+        PublicId.from_str("fetchai/oef_search:0.7.0"): SOEFConnection.connection_id,
     }
     default_connection = P2PLibp2pConnection.connection_id
 
@@ -192,7 +192,7 @@ def run():
         api_key=API_KEY,
         soef_addr=SOEF_ADDR,
         soef_port=SOEF_PORT,
-        restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.6.0")},
+        restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.7.0")},
         connection_id=SOEFConnection.connection_id,
     )
     soef_connection = SOEFConnection(configuration=configuration, identity=identity)
diff --git a/docs/config.md b/docs/config.md
index e95ddab7d8..9cc4e49ae8 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -24,9 +24,9 @@ connections:                                    # The list of connection public
 - fetchai/stub:0.9.0
 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:0.5.0
+- fetchai/default:0.6.0
 skills:                                         # The list of skill public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX).
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 default_connection: fetchai/p2p_libp2p:0.10.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)
 logging_config:                                 # The logging configurations the AEA project uses
diff --git a/docs/connect-a-frontend.md b/docs/connect-a-frontend.md
index 93d5b1a49b..6c1559b9bc 100644
--- a/docs/connect-a-frontend.md
+++ b/docs/connect-a-frontend.md
@@ -3,7 +3,7 @@ This demo discusses the options we have to connect a front-end to the AEA. The f
 <img src="../assets/http-integration.png" alt="How to connect frontend to your AEA" class="center" style="display: block; margin-left: auto; margin-right: auto;width:80%;">
 
 ## Case 1
-The first option we have is to create a `Connection` that will handle the incoming requests from the 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.8.0`) which translates these into Envelopes to be consumed by the correct skill.
+The first option we have is to create a `Connection` that will handle the incoming requests from the 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.9.0`) which translates these into Envelopes to be consumed by the correct skill.
 
 ## Case 2
 The other option we have is to create a stand-alone `Multiplexer` with a `P2P` connection (`fetchai/p2p_libp2p:0.10.0`). In this scenario, the front-end needs to incorporate a Multiplexer with an `P2P` Connection. Then the <a href="../acn">Agent Communication Network</a> can be used to send Envelopes from the AEA to the front-end.
\ No newline at end of file
diff --git a/docs/contract.md b/docs/contract.md
index 48ef8864e9..fdb0297a25 100644
--- a/docs/contract.md
+++ b/docs/contract.md
@@ -32,7 +32,7 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.6.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.6.0` connection using the `fetchai/ledger_api:0.3.0` protocol.
+This message will be handled by the `fetchai/ledger:0.6.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.6.0` connection using the `fetchai/ledger_api:0.4.0` protocol.
 
 - 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.10.0` package, we send the following message to the `fetchai/ledger:0.6.0`:
 
@@ -52,7 +52,7 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.6.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.10.0` contract package needs to implement the `get_create_batch_transaction` method with the specified key word arguments. 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.6.0` connection using the `fetchai/ledger_api:0.3.0` protocol.
+This message will be handled by the `fetchai/ledger:0.6.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.10.0` contract package needs to implement the `get_create_batch_transaction` method with the specified key word arguments. 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.6.0` connection using the `fetchai/ledger_api:0.4.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.10.0` package, we send the following message to the `fetchai/ledger:0.6.0`:
 
@@ -77,7 +77,7 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.6.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.10.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.6.0` connection using the `fetchai/ledger_api:0.3.0` protocol. In this case, signing is not required.
+This message will be handled by the `fetchai/ledger:0.6.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.10.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.6.0` connection using the `fetchai/ledger_api:0.4.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.10.0` package, we send the following message to the `fetchai/ledger:0.6.0`:
@@ -95,7 +95,7 @@ contract_api_msg = ContractApiMessage(
     ),
 )
 ```
-This message will be handled by the `fetchai/ledger:0.6.0` connection and then a `state` message will be returned with the matching state. For this to be executed correctly, the `fetchai/erc1155:0.10.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.6.0` connection using the `fetchai/ledger_api:0.3.0` protocol. In this case, signing is not required.
+This message will be handled by the `fetchai/ledger:0.6.0` connection and then a `state` message will be returned with the matching state. For this to be executed correctly, the `fetchai/erc1155:0.10.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.6.0` connection using the `fetchai/ledger_api:0.4.0` protocol. In this case, signing is not required.
 
 
 ## Developing your own
diff --git a/docs/core-components-1.md b/docs/core-components-1.md
index b0aa84b8df..d7500f3322 100644
--- a/docs/core-components-1.md
+++ b/docs/core-components-1.md
@@ -32,7 +32,7 @@ An <a href="../api/mail/base#envelope-objects">`Envelope`</a> is the core object
 
 * `Dialogues`, which define rules over `Message` sequences.
 
-The framework provides one default `Protocol`, called `default` (current version `fetchai/default:0.5.0`). This `Protocol` provides a bare-bones implementation for an AEA `Protocol` which includes a <a href="../api/protocols/default/message#aea.protocols.default.message">`DefaultMessage`</a>  class and associated <a href="../api/protocols/default/serialization#aea.protocols.default.serialization">`DefaultSerializer`</a> and <a href="../api/protocols/default/dialogues#aea.protocols.default.dialogues">`DefaultDialogue`</a> classes.
+The framework provides one default `Protocol`, called `default` (current version `fetchai/default:0.6.0`). This `Protocol` provides a bare-bones implementation for an AEA `Protocol` which includes a <a href="../api/protocols/default/message#aea.protocols.default.message">`DefaultMessage`</a>  class and associated <a href="../api/protocols/default/serialization#aea.protocols.default.serialization">`DefaultSerializer`</a> and <a href="../api/protocols/default/dialogues#aea.protocols.default.dialogues">`DefaultDialogue`</a> classes.
 
 Additional `Protocols` - i.e. a new type of interaction - can be added as packages and generated with the <a href="../protocol-generator">protocol generator</a>. For more details on `Protocols` also read the `Protocol` guide <a href="../protocol">here</a>.
 
diff --git a/docs/deployment.md b/docs/deployment.md
index 92f8c93ab3..e8fea42914 100644
--- a/docs/deployment.md
+++ b/docs/deployment.md
@@ -28,7 +28,7 @@ Finally, we run it:
 docker run -it aea-deploy:latest
 ```
 
-This will run the `fetchai/my_first_aea:0.11.0` demo project. You can edit `entrypoint.sh` to run whatever project you would like.
+This will run the `fetchai/my_first_aea:0.12.0` demo project. You can edit `entrypoint.sh` to run whatever project you would like.
 
 ## Deployment
 
diff --git a/docs/erc1155-skills.md b/docs/erc1155-skills.md
index 6b197156c4..1c2cd8fd5a 100644
--- a/docs/erc1155-skills.md
+++ b/docs/erc1155-skills.md
@@ -40,7 +40,7 @@ Create the AEA that will deploy the contract.
 aea create erc1155_deployer
 cd erc1155_deployer
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/erc1155_deploy:0.14.0
 aea install
@@ -51,8 +51,8 @@ Then update the agent config (`aea-config.yaml`) with the default routing:
 ``` yaml
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 And change the default ledger:
@@ -95,7 +95,7 @@ Create the AEA that will get some tokens from the deployer.
 aea create erc1155_client
 cd erc1155_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/erc1155_client:0.13.0
 aea install
@@ -106,8 +106,8 @@ Then update the agent config (`aea-config.yaml`) with the default routing:
 ``` yaml
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 And change the default ledger:
diff --git a/docs/generic-skills-step-by-step.md b/docs/generic-skills-step-by-step.md
index c71c402ba4..2e9c7318ab 100644
--- a/docs/generic-skills-step-by-step.md
+++ b/docs/generic-skills-step-by-step.md
@@ -1314,10 +1314,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   service_registration:
@@ -2776,11 +2776,11 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
 skills: []
 behaviours:
   search:
@@ -2881,8 +2881,8 @@ aea add-key fetchai fetchai_private_key.txt --connection
 Both in `my_generic_seller/aea-config.yaml` and `my_generic_buyer/aea-config.yaml`, and
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 ### Fund the buyer AEA
@@ -2899,9 +2899,9 @@ Add the remaining packages for the seller AEA, then run it:
 
 ``` bash
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
-aea add protocol fetchai/fipa:0.6.0
+aea add protocol fetchai/fipa:0.7.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea run
@@ -2915,10 +2915,10 @@ Add the remaining packages for the buyer AEA:
 
 ``` bash
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
-aea add protocol fetchai/fipa:0.6.0
-aea add protocol fetchai/signing:0.3.0
+aea add protocol fetchai/fipa:0.7.0
+aea add protocol fetchai/signing:0.4.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
diff --git a/docs/generic-skills.md b/docs/generic-skills.md
index b76ce18333..6774d0f47b 100644
--- a/docs/generic-skills.md
+++ b/docs/generic-skills.md
@@ -72,7 +72,7 @@ The following steps create the seller from scratch:
 aea create my_seller_aea
 cd my_seller_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/generic_seller:0.13.0
 aea install
@@ -82,8 +82,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_seller_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -106,7 +106,7 @@ The following steps create the buyer from scratch:
 aea create my_buyer_aea
 cd my_buyer_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/generic_buyer:0.12.0
 aea install
@@ -116,8 +116,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_buyer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/docs/http-connection-and-skill.md b/docs/http-connection-and-skill.md
index 2455fee6d7..dcf01bac81 100644
--- a/docs/http-connection-and-skill.md
+++ b/docs/http-connection-and-skill.md
@@ -14,13 +14,13 @@ cd my_aea
 Add the http server connection package
 
 ``` bash
-aea add connection fetchai/http_server:0.8.0
+aea add connection fetchai/http_server:0.9.0
 ```
 
 Update the default connection:
 
 ``` bash
-aea config set agent.default_connection fetchai/http_server:0.8.0
+aea config set agent.default_connection fetchai/http_server:0.9.0
 ```
 
 Modify the `api_spec_path`:
@@ -166,7 +166,7 @@ handlers:
 
 Finally, we run the fingerprinter:
 ``` bash
-aea fingerprint skill fetchai/http_echo:0.6.0
+aea fingerprint skill fetchai/http_echo:0.7.0
 ```
 Note, you will have to replace the author name with your author handle.
 
diff --git a/docs/language-agnostic-definition.md b/docs/language-agnostic-definition.md
index 3b0d059ef9..7d93b5429d 100644
--- a/docs/language-agnostic-definition.md
+++ b/docs/language-agnostic-definition.md
@@ -50,7 +50,7 @@ The format for the above fields, except `message`, is specified below. For those
   <p>This section is incomplete, and will be updated soon!</p>
 </div>
 </li>
-<li> It SHOULD implement the `fetchai/default:0.5.0` protocol which satisfies the following protobuf schema:
+<li> It SHOULD implement the `fetchai/default:0.6.0` protocol which satisfies the following protobuf schema:
 
 ``` proto
 syntax = "proto3";
@@ -100,7 +100,7 @@ message DefaultMessage{
 </li>
 <li> 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 eliptic curve must be of type <a href="https://en.bitcoin.it/wiki/Secp256k1" target="_blank">SECP256k1</a>).
 </li>
-<li> It SHOULD implement handling of errors using the `fetchai/default:0.5.0` protocol. The protobuf schema is given above.
+<li> It SHOULD implement handling of errors using the `fetchai/default:0.6.0` protocol. The protobuf schema is given above.
 </li>
 <li> It MUST implement the following principles when handling messages:
 <ul>
diff --git a/docs/logging.md b/docs/logging.md
index a183b4378c..8f0e4c0230 100644
--- a/docs/logging.md
+++ b/docs/logging.md
@@ -25,9 +25,9 @@ connections:
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 default_connection: fetchai/stub:0.9.0
 default_ledger: fetchai
 logging_config:
diff --git a/docs/ml-skills.md b/docs/ml-skills.md
index 6f34264db6..cf399e6cda 100644
--- a/docs/ml-skills.md
+++ b/docs/ml-skills.md
@@ -75,7 +75,7 @@ The following steps create the data provider from scratch:
 aea create ml_data_provider
 cd ml_data_provider
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/ml_data_provider:0.12.0
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
@@ -85,8 +85,8 @@ aea install
 In `ml_data_provider/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -109,7 +109,7 @@ The following steps create the model trainer from scratch:
 aea create ml_model_trainer
 cd ml_model_trainer
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/ml_train:0.12.0
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
@@ -119,8 +119,8 @@ aea install
 In `ml_model_trainer/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/docs/multiplexer-standalone.md b/docs/multiplexer-standalone.md
index b3e21b32ac..e8b3ed436e 100644
--- a/docs/multiplexer-standalone.md
+++ b/docs/multiplexer-standalone.md
@@ -61,7 +61,7 @@ We use the input and output text files to send an envelope to our agent and rece
 ``` python
         # Create a message inside an envelope and get the stub connection to pass it into the multiplexer
         message_text = (
-            "multiplexer,some_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            "multiplexer,some_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         with open(INPUT_FILE, "w") as f:
             write_with_lock(f, message_text)
@@ -159,7 +159,7 @@ def run():
 
         # Create a message inside an envelope and get the stub connection to pass it into the multiplexer
         message_text = (
-            "multiplexer,some_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            "multiplexer,some_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         with open(INPUT_FILE, "w") as f:
             write_with_lock(f, message_text)
diff --git a/docs/oef-ledger.md b/docs/oef-ledger.md
index a9d27aac1d..7b73b5202d 100644
--- a/docs/oef-ledger.md
+++ b/docs/oef-ledger.md
@@ -53,7 +53,7 @@ When it is live you will see the sentence 'A thing of beauty is a joy forever...
 
 To view the `OEF search and communication node` logs for debugging, navigate to `data/oef-logs`.
 
-To connect to an `OEF search and communication node` an AEA uses the `OEFConnection` connection package (`fetchai/oef:0.9.0`).
+To connect to an `OEF search and communication node` an AEA uses the `OEFConnection` connection package (`fetchai/oef:0.10.0`).
 
 If you experience any problems launching the `OEF search and communication node` then consult <a href="https://docs.google.com/document/d/1x_hFwEIXHlr_JCkuIv-izxSz0tN-7kSmSc-g32ImL1U/edit?usp=sharing" target="_blank">this</a> guide.
 
diff --git a/docs/orm-integration.md b/docs/orm-integration.md
index d170c326c4..4a879de4ce 100644
--- a/docs/orm-integration.md
+++ b/docs/orm-integration.md
@@ -72,7 +72,7 @@ The following steps create the seller from scratch:
 aea create my_thermometer_aea
 cd my_thermometer_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer:0.12.0
 aea install
@@ -82,8 +82,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_thermometer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -107,7 +107,7 @@ The following steps create the car data client from scratch:
 aea create my_thermometer_client
 cd my_thermometer_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer_client:0.11.0
 aea install
@@ -117,8 +117,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_buyer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/docs/protocol.md b/docs/protocol.md
index 67c23aeba0..8108395dd0 100644
--- a/docs/protocol.md
+++ b/docs/protocol.md
@@ -66,9 +66,9 @@ The developer can generate custom protocols with the <a href="../protocol-genera
 
 We highly recommend you **do not** attempt to write your own protocol code; always use existing packages or the protocol generator!
 
-## `fetchai/default:0.5.0` protocol
+## `fetchai/default:0.6.0` protocol
 
-The `fetchai/default:0.5.0` protocol is a protocol which each AEA is meant to implement. It serves AEA to AEA interaction and includes two message performatives:
+The `fetchai/default:0.6.0` protocol is a protocol which each AEA is meant to implement. It serves AEA to AEA interaction and includes two message performatives:
 
 ``` python
 from enum import Enum
@@ -115,13 +115,13 @@ msg = DefaultMessage(
 )
 ```
 
-Each AEA's `fetchai/error:0.5.0` skill utilises the `fetchai/default:0.5.0` protocol for error handling.
+Each AEA's `fetchai/error:0.6.0` skill utilises the `fetchai/default:0.6.0` protocol for error handling.
 
-## `fetchai/oef_search:0.6.0` protocol
+## `fetchai/oef_search:0.7.0` protocol
 
-The `fetchai/oef_search:0.6.0` protocol is used by AEAs to interact with an <a href="../simple-oef">SOEF search node</a> to register and unregister their own services and search for services registered by other agents.
+The `fetchai/oef_search:0.7.0` protocol is used by AEAs to interact with an <a href="../simple-oef">SOEF search node</a> to register and unregister their own services and search for services registered by other agents.
 
-The `fetchai/oef_search:0.6.0` protocol definition includes an `OefSearchMessage` with the following message types:
+The `fetchai/oef_search:0.7.0` protocol definition includes an `OefSearchMessage` with the following message types:
 
 ``` python
 class Performative(Enum):
@@ -231,7 +231,7 @@ oef_msg = OefSearchMessage(
 )
 ```
 
-* The <a href="../simple-oef">SOEF search node</a> will respond with a message, say `msg` of type `OefSearchMessage`, of performative `OefSearchMessage.Performative.SEARCH_RESULT`. To access the tuple of agents which match the query, simply use `msg.agents`. In particular, this will return the agent addresses matching the query. The <a href="../identity">agent address</a> can then be used to send a message to the agent utilising the <a href="../oef-ledger">P2P agent communication network</a> and any protocol other than `fetchai/oef_search:0.6.0`.
+* The <a href="../simple-oef">SOEF search node</a> will respond with a message, say `msg` of type `OefSearchMessage`, of performative `OefSearchMessage.Performative.SEARCH_RESULT`. To access the tuple of agents which match the query, simply use `msg.agents`. In particular, this will return the agent addresses matching the query. The <a href="../identity">agent address</a> can then be used to send a message to the agent utilising the <a href="../oef-ledger">P2P agent communication network</a> and any protocol other than `fetchai/oef_search:0.7.0`.
 
 * If the <a href="../simple-oef">SOEF search node</a> encounters any errors with the messages you send, it will return an `OefSearchMessage` of performative `OefSearchMessage.Performative.OEF_ERROR` and indicate the error operation encountered:
 ``` python
@@ -246,11 +246,11 @@ class OefErrorOperation(Enum):
     OTHER = 10000
 ```
 
-## `fetchai/fipa:0.6.0` protocol
+## `fetchai/fipa:0.7.0` protocol
 
 This protocol provides classes and functions necessary for communication between AEAs via a variant of the <a href="http://www.fipa.org/repository/aclspecs.html" target="_blank">FIPA</a> Agent Communication Language.
 
-The `fetchai/fipa:0.6.0` protocol definition includes a `FipaMessage` with the following performatives:
+The `fetchai/fipa:0.7.0` protocol definition includes a `FipaMessage` with the following performatives:
 
 ``` python
 class Performative(Enum):
@@ -283,9 +283,9 @@ def __init__(
 )
 ```
 
-The `fetchai/fipa:0.6.0` protocol also defines a `FipaDialogue` class which specifies the valid reply structure and provides other helper methods to maintain dialogues.
+The `fetchai/fipa:0.7.0` protocol also defines a `FipaDialogue` class which specifies the valid reply structure and provides other helper methods to maintain dialogues.
 
-For examples of the usage of the `fetchai/fipa:0.6.0` protocol check out the <a href="../generic-skills-step-by-step" target="_blank"> generic skills step by step guide</a>.
+For examples of the usage of the `fetchai/fipa:0.7.0` protocol check out the <a href="../generic-skills-step-by-step" target="_blank"> generic skills step by step guide</a>.
 
 
 ### Fipa dialogue
diff --git a/docs/questions-and-answers.md b/docs/questions-and-answers.md
index bb76fa60d7..9b0a634e69 100644
--- a/docs/questions-and-answers.md
+++ b/docs/questions-and-answers.md
@@ -72,7 +72,7 @@ You can find more details about the CLI commands <a href="../cli-commands/">here
 </details>
 
 <details><summary>When a new AEA is created, is the `vendor` folder populated with some default packages?</summary>
-All AEA projects by default hold the `fetchai/stub:0.9.0` connection, the `fetchai/default:0.5.0` protocol and the `fetchai/error:0.5.0` skill. These (as all other packages installed from the registry) are placed in the vendor's folder.
+All AEA projects by default hold the `fetchai/stub:0.9.0` connection, the `fetchai/default:0.6.0` protocol and the `fetchai/error:0.6.0` skill. These (as all other packages installed from the registry) are placed in the vendor's folder.
 <br><br>
 You can find more details about the file structure <a href="../package-imports/">here</a>
 </details>
diff --git a/docs/quickstart.md b/docs/quickstart.md
index f6a03ebd07..beae01bce4 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -101,7 +101,7 @@ AEA configurations successfully initialized: {'author': 'fetchai'}
 The echo skill is a simple demo that introduces you to the main business logic components of an AEA. The fastest way to create your first AEA is to fetch it!
 
 ``` bash
-aea fetch fetchai/my_first_aea:0.11.0
+aea fetch fetchai/my_first_aea:0.12.0
 cd my_first_aea
 ```
 
@@ -121,9 +121,9 @@ cd my_first_aea
 <br>
 Second, add the echo skill to the project.
 ``` bash
-aea add skill fetchai/echo:0.7.0
+aea add skill fetchai/echo:0.8.0
 ```
-This copies the `fetchai/echo:0.7.0` skill code containing the "behaviours", and "handlers" into the project, ready to run. The identifier of the skill `fetchai/echo:0.7.0` consists of the name of the author of the skill, followed by the skill name and its version.
+This copies the `fetchai/echo:0.8.0` skill code containing the "behaviours", and "handlers" into the project, ready to run. The identifier of the skill `fetchai/echo:0.8.0` consists of the name of the author of the skill, followed by the skill name and its version.
 </details>
 
 ## Communication via envelopes and messages
@@ -149,7 +149,7 @@ TO,SENDER,PROTOCOL_ID,ENCODED_MESSAGE,
 For example:
 
 ``` bash
-recipient_aea,sender_aea,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,
+recipient_aea,sender_aea,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,
 ```
 
 ## Run the AEA
@@ -212,7 +212,7 @@ info: Echo Behaviour: act method called.
 Optionally, from a different terminal and same directory (i.e. the `my_first_aea` project), we send the AEA a message wrapped in an envelope via the input file.
 
 ``` bash
-echo 'my_first_aea,sender_aea,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,' >> input_file
+echo 'my_first_aea,sender_aea,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,' >> input_file
 ```
 
 You will see the `Echo Handler` dealing with the envelope and responding with the same message to the `output_file`, and also decoding the Base64 encrypted message in this case.
diff --git a/docs/simple-oef-usage.md b/docs/simple-oef-usage.md
index 2b52ef796f..450f96d605 100644
--- a/docs/simple-oef-usage.md
+++ b/docs/simple-oef-usage.md
@@ -1,12 +1,12 @@
 You can use the <a href="../simple-oef">SOEF</a> in the agent framework by using the SOEF connection as a package in your agent project.
 
 ## Add the SOEF package
-Check out the <a href="../cli-commands">CLI guide</a> on details how to add a connection. You will want to add the `fetchai/soef:0.8.0` connection package. 
+Check out the <a href="../cli-commands">CLI guide</a> on details how to add a connection. You will want to add the `fetchai/soef:0.9.0` connection package. 
 
 ## Register your agent and its services
 
 ### Register agent location
-To register your agent's location, you have to send a message in the `fetchai/oef_search:0.6.0` protocol to the SOEF connection.
+To register your agent's location, you have to send a message in the `fetchai/oef_search:0.7.0` protocol to the SOEF connection.
 
 First, define a data model for location data:
 ``` python
diff --git a/docs/skill-guide.md b/docs/skill-guide.md
index 6309c2ff87..28bbc38848 100644
--- a/docs/skill-guide.md
+++ b/docs/skill-guide.md
@@ -329,7 +329,7 @@ fingerprint: {}
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   my_search_behaviour:
@@ -373,14 +373,14 @@ Ensure, you use the correct author name to reference your skill (here we use `fe
 
 Our AEA does not have the oef protocol yet so let's add it.
 ``` bash
-aea add protocol fetchai/oef_search:0.6.0
+aea add protocol fetchai/oef_search:0.7.0
 ```
 
 This adds the protocol to our AEA and makes it available on the path `packages.fetchai.protocols...`.
 
 We also need to add the soef and p2p connections and install the AEA's dependencies:
 ``` bash
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/p2p_libp2p:0.10.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
@@ -389,7 +389,7 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 Finally, in the `aea-config.yaml` add the following lines:
 ``` yaml
 default_routing:
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 This will ensure that search requests are processed by the correct connection.
@@ -803,7 +803,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   service:
diff --git a/docs/skill.md b/docs/skill.md
index 5b8e529d27..debb1d34ee 100644
--- a/docs/skill.md
+++ b/docs/skill.md
@@ -262,7 +262,7 @@ handlers:
 models: {}
 dependencies: {}
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 ```
 
 
@@ -275,7 +275,7 @@ All AEAs have a default `error` skill that contains error handling code for a nu
 * Envelopes with decoding errors
 * Invalid messages with respect to the registered protocol
 
-The error skill relies on the `fetchai/default:0.5.0` protocol which provides error codes for the above.
+The error skill relies on the `fetchai/default:0.6.0` protocol which provides error codes for the above.
 
 
 <br />
diff --git a/docs/tac-skills-contract.md b/docs/tac-skills-contract.md
index 3a7feb913d..0ef6ee0985 100644
--- a/docs/tac-skills-contract.md
+++ b/docs/tac-skills-contract.md
@@ -114,7 +114,7 @@ The following steps create the controller from scratch:
 aea create tac_controller_contract
 cd tac_controller_contract
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_control_contract:0.9.0
 aea install
@@ -179,7 +179,7 @@ Build participant one:
 ``` bash
 cd tac_participant_one
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -194,7 +194,7 @@ Then, build participant two:
 ``` bash
 cd tac_participant_two
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
diff --git a/docs/tac-skills.md b/docs/tac-skills.md
index c70415a668..bb9680e042 100644
--- a/docs/tac-skills.md
+++ b/docs/tac-skills.md
@@ -113,9 +113,9 @@ The following steps create the controller from scratch:
 aea create tac_controller
 cd tac_controller
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
-aea add skill fetchai/tac_control:0.7.0
+aea add skill fetchai/tac_control:0.8.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
@@ -124,7 +124,7 @@ aea config set agent.default_ledger fetchai
 In `tac_controller/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -153,7 +153,7 @@ Build participant one:
 ``` bash
 cd tac_participant_one
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -165,15 +165,15 @@ aea config set agent.default_ledger fetchai
 In `tac_participant_one/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 Then, build participant two:
 ``` bash
 cd tac_participant_two
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -185,8 +185,8 @@ aea config set agent.default_ledger fetchai
 In `tac_participant_two/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/docs/thermometer-skills.md b/docs/thermometer-skills.md
index f6d24d01f5..bbaed90239 100644
--- a/docs/thermometer-skills.md
+++ b/docs/thermometer-skills.md
@@ -75,7 +75,7 @@ The following steps create the thermometer AEA from scratch:
 aea create my_thermometer_aea
 cd my_thermometer_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer:0.12.0
 aea install
@@ -85,8 +85,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_thermometer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -109,7 +109,7 @@ The following steps create the thermometer client from scratch:
 aea create my_thermometer_client
 cd my_thermometer_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer_client:0.11.0
 aea install
@@ -119,8 +119,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_thermometer_aea/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/docs/weather-skills.md b/docs/weather-skills.md
index fc1ce3c493..3b1a2db8b7 100644
--- a/docs/weather-skills.md
+++ b/docs/weather-skills.md
@@ -74,7 +74,7 @@ The following steps create the weather station from scratch:
 aea create my_weather_station
 cd my_weather_station
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/weather_station:0.12.0
 aea install
@@ -84,8 +84,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `weather_station/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
@@ -109,7 +109,7 @@ The following steps create the weather client from scratch:
 aea create my_weather_client
 cd my_weather_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/weather_client:0.11.0
 aea install
@@ -119,8 +119,8 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 In `my_weather_client/aea-config.yaml` add 
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 
 </p>
diff --git a/packages/fetchai/agents/aries_alice/aea-config.yaml b/packages/fetchai/agents/aries_alice/aea-config.yaml
index 0ad1aa0a90..7efbe1b67a 100644
--- a/packages/fetchai/agents/aries_alice/aea-config.yaml
+++ b/packages/fetchai/agents/aries_alice/aea-config.yaml
@@ -7,19 +7,19 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/http_client:0.8.0
+- fetchai/http_client:0.9.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
-- fetchai/webhook:0.6.0
+- fetchai/webhook:0.7.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/http:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/http:0.6.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/aries_alice:0.7.0
-- fetchai/error:0.5.0
+- fetchai/aries_alice:0.8.0
+- fetchai/error:0.6.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
@@ -28,5 +28,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/http:0.5.0: fetchai/http_client:0.8.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/http:0.6.0: fetchai/http_client:0.9.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/aries_faber/aea-config.yaml b/packages/fetchai/agents/aries_faber/aea-config.yaml
index 7d043ca849..60858d53c7 100644
--- a/packages/fetchai/agents/aries_faber/aea-config.yaml
+++ b/packages/fetchai/agents/aries_faber/aea-config.yaml
@@ -7,20 +7,20 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/http_client:0.8.0
+- fetchai/http_client:0.9.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
-- fetchai/webhook:0.6.0
+- fetchai/webhook:0.7.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/http:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/http:0.6.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/aries_faber:0.6.0
-- fetchai/error:0.5.0
-default_connection: fetchai/http_client:0.8.0
+- fetchai/aries_faber:0.7.0
+- fetchai/error:0.6.0
+default_connection: fetchai/http_client:0.9.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
@@ -28,5 +28,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/http:0.5.0: fetchai/http_client:0.8.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/http:0.6.0: fetchai/http_client:0.9.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/car_data_buyer/aea-config.yaml b/packages/fetchai/agents/car_data_buyer/aea-config.yaml
index 2a40202d91..d4300cd29e 100644
--- a/packages/fetchai/agents/car_data_buyer/aea-config.yaml
+++ b/packages/fetchai/agents/car_data_buyer/aea-config.yaml
@@ -10,17 +10,17 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/carpark_client:0.12.0
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_buyer:0.12.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
@@ -30,5 +30,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/car_detector/aea-config.yaml b/packages/fetchai/agents/car_detector/aea-config.yaml
index e2bd0d8eb7..b63aafca67 100644
--- a/packages/fetchai/agents/car_detector/aea-config.yaml
+++ b/packages/fetchai/agents/car_detector/aea-config.yaml
@@ -9,17 +9,17 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/carpark_detection:0.12.0
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_seller:0.13.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/erc1155_client/aea-config.yaml b/packages/fetchai/agents/erc1155_client/aea-config.yaml
index d168178040..19ad7cf3c4 100644
--- a/packages/fetchai/agents/erc1155_client/aea-config.yaml
+++ b/packages/fetchai/agents/erc1155_client/aea-config.yaml
@@ -9,20 +9,20 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
 skills:
 - fetchai/erc1155_client:0.13.0
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: ethereum
 logging_config:
@@ -32,5 +32,5 @@ private_key_paths: {}
 registry_path: ../packages
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/erc1155_deployer/aea-config.yaml b/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
index 6a60e30ba2..abc22baa84 100644
--- a/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
+++ b/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
@@ -9,20 +9,20 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
 skills:
 - fetchai/erc1155_deploy:0.14.0
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: ethereum
 logging_config:
@@ -32,5 +32,5 @@ private_key_paths: {}
 registry_path: ../packages
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/generic_buyer/aea-config.yaml b/packages/fetchai/agents/generic_buyer/aea-config.yaml
index 6e20d189fa..b0482b5822 100644
--- a/packages/fetchai/agents/generic_buyer/aea-config.yaml
+++ b/packages/fetchai/agents/generic_buyer/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_buyer:0.12.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
@@ -28,5 +28,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/generic_seller/aea-config.yaml b/packages/fetchai/agents/generic_seller/aea-config.yaml
index 2e3394d829..e53783701c 100644
--- a/packages/fetchai/agents/generic_seller/aea-config.yaml
+++ b/packages/fetchai/agents/generic_seller/aea-config.yaml
@@ -10,16 +10,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_seller:0.13.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml
index 69a7d2fc18..d18a4ad991 100644
--- a/packages/fetchai/agents/gym_aea/aea-config.yaml
+++ b/packages/fetchai/agents/gym_aea/aea-config.yaml
@@ -12,10 +12,10 @@ connections:
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 - fetchai/gym:0.6.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/gym:0.8.0
 default_connection: fetchai/gym:0.8.0
 default_ledger: fetchai
diff --git a/packages/fetchai/agents/ml_data_provider/aea-config.yaml b/packages/fetchai/agents/ml_data_provider/aea-config.yaml
index ffb8c1b082..d6c4f22331 100644
--- a/packages/fetchai/agents/ml_data_provider/aea-config.yaml
+++ b/packages/fetchai/agents/ml_data_provider/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/ledger_api:0.3.0
-- fetchai/ml_trade:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/ledger_api:0.4.0
+- fetchai/ml_trade:0.6.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_seller:0.13.0
 - fetchai/ml_data_provider:0.12.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/ml_model_trainer/aea-config.yaml b/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
index 262eaa4b24..b6c7e4f8c6 100644
--- a/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
+++ b/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/ledger_api:0.3.0
-- fetchai/ml_trade:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/ledger_api:0.4.0
+- fetchai/ml_trade:0.6.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_buyer:0.12.0
 - fetchai/ml_train:0.12.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml
index 91e5e4786a..cab085b44c 100644
--- a/packages/fetchai/agents/my_first_aea/aea-config.yaml
+++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml
@@ -1,6 +1,6 @@
 agent_name: my_first_aea
 author: fetchai
-version: 0.11.0
+version: 0.12.0
 description: A simple agent to demo the echo skill.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
@@ -10,10 +10,10 @@ connections:
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills:
-- fetchai/echo:0.7.0
-- fetchai/error:0.5.0
+- fetchai/echo:0.8.0
+- fetchai/error:0.6.0
 default_connection: fetchai/stub:0.9.0
 default_ledger: fetchai
 logging_config:
diff --git a/packages/fetchai/agents/simple_service_registration/aea-config.yaml b/packages/fetchai/agents/simple_service_registration/aea-config.yaml
index 7762008c7a..6e6d8adceb 100644
--- a/packages/fetchai/agents/simple_service_registration/aea-config.yaml
+++ b/packages/fetchai/agents/simple_service_registration/aea-config.yaml
@@ -8,15 +8,15 @@ fingerprint: ''
 fingerprint_ignore_patterns: []
 connections:
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/simple_service_registration:0.10.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
@@ -26,4 +26,4 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/tac_controller/aea-config.yaml b/packages/fetchai/agents/tac_controller/aea-config.yaml
index 3470e8a73f..9ce1d7381f 100644
--- a/packages/fetchai/agents/tac_controller/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller/aea-config.yaml
@@ -8,16 +8,16 @@ fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/oef_search:0.6.0
-- fetchai/tac:0.6.0
+- fetchai/default:0.6.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
 skills:
-- fetchai/error:0.5.0
-- fetchai/tac_control:0.7.0
+- fetchai/error:0.6.0
+- fetchai/tac_control:0.8.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: fetchai
 logging_config:
@@ -26,4 +26,4 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index caa12bbff0..0a4302ca0b 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -8,19 +8,19 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/oef:0.9.0
+- fetchai/oef:0.10.0
 - fetchai/stub:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/oef_search:0.6.0
-- fetchai/tac:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/tac_control_contract:0.9.0
-default_connection: fetchai/oef:0.9.0
+default_connection: fetchai/oef:0.10.0
 default_ledger: ethereum
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/fetchai/agents/tac_participant/aea-config.yaml b/packages/fetchai/agents/tac_participant/aea-config.yaml
index e4180ff1a9..0c2333eece 100644
--- a/packages/fetchai/agents/tac_participant/aea-config.yaml
+++ b/packages/fetchai/agents/tac_participant/aea-config.yaml
@@ -9,17 +9,17 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/oef_search:0.6.0
-- fetchai/tac:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/tac_negotiation:0.10.0
 - fetchai/tac_participation:0.9.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -30,5 +30,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/thermometer_aea/aea-config.yaml b/packages/fetchai/agents/thermometer_aea/aea-config.yaml
index f212ebdf5c..f3e7d966b4 100644
--- a/packages/fetchai/agents/thermometer_aea/aea-config.yaml
+++ b/packages/fetchai/agents/thermometer_aea/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_seller:0.13.0
 - fetchai/thermometer:0.12.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/thermometer_client/aea-config.yaml b/packages/fetchai/agents/thermometer_client/aea-config.yaml
index 02f51acf56..64aa7e7bc6 100644
--- a/packages/fetchai/agents/thermometer_client/aea-config.yaml
+++ b/packages/fetchai/agents/thermometer_client/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_buyer:0.12.0
 - fetchai/thermometer_client:0.11.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/weather_client/aea-config.yaml b/packages/fetchai/agents/weather_client/aea-config.yaml
index 894da78b40..a86fbf5abb 100644
--- a/packages/fetchai/agents/weather_client/aea-config.yaml
+++ b/packages/fetchai/agents/weather_client/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_buyer:0.12.0
 - fetchai/weather_client:0.11.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/agents/weather_station/aea-config.yaml b/packages/fetchai/agents/weather_station/aea-config.yaml
index ee6630c2f1..0b892a4102 100644
--- a/packages/fetchai/agents/weather_station/aea-config.yaml
+++ b/packages/fetchai/agents/weather_station/aea-config.yaml
@@ -9,16 +9,16 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 - fetchai/generic_seller:0.13.0
 - fetchai/weather_station:0.12.0
 default_connection: fetchai/p2p_libp2p:0.10.0
@@ -29,5 +29,5 @@ logging_config:
 private_key_paths: {}
 registry_path: ../packages
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
diff --git a/packages/fetchai/connections/http_client/README.md b/packages/fetchai/connections/http_client/README.md
index f4080b1cc0..0686f336e5 100644
--- a/packages/fetchai/connections/http_client/README.md
+++ b/packages/fetchai/connections/http_client/README.md
@@ -4,4 +4,4 @@ This connection wraps an HTTP client. It consumes messages from the AEA, transla
 
 ## Usage
 
-First, add the connection to your AEA project (`aea add connection fetchai/http_client:0.8.0`). Then, update the `config` in `connection.yaml` by providing a `host` and `port` of the server.
+First, add the connection to your AEA project (`aea add connection fetchai/http_client:0.9.0`). Then, update the `config` in `connection.yaml` by providing a `host` and `port` of the server.
diff --git a/packages/fetchai/connections/http_client/connection.py b/packages/fetchai/connections/http_client/connection.py
index 72ed44788f..3c86c22d22 100644
--- a/packages/fetchai/connections/http_client/connection.py
+++ b/packages/fetchai/connections/http_client/connection.py
@@ -47,7 +47,7 @@
 NOT_FOUND = 404
 REQUEST_TIMEOUT = 408
 SERVER_ERROR = 500
-PUBLIC_ID = PublicId.from_str("fetchai/http_client:0.8.0")
+PUBLIC_ID = PublicId.from_str("fetchai/http_client:0.9.0")
 
 logger = logging.getLogger("aea.packages.fetchai.connections.http_client")
 
diff --git a/packages/fetchai/connections/http_client/connection.yaml b/packages/fetchai/connections/http_client/connection.yaml
index 462f0c8937..dd5d64ad4c 100644
--- a/packages/fetchai/connections/http_client/connection.yaml
+++ b/packages/fetchai/connections/http_client/connection.yaml
@@ -1,25 +1,25 @@
 name: http_client
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: connection
 description: The HTTP_client connection that wraps a web-based client connecting to
   a RESTful API specification.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmXfZJPAh4Ujt3xj8xzd6ng6HbrpJQUuvjWe8DNQSwSKWU
+  README.md: QmV5yDm9hsPKzhW3xA8GgViryhbwGEcRSqxwtrEzFm1fuQ
   __init__.py: QmPdKAks8A6XKAgZiopJzPZYXJumTeUqChd8UorqmLQQPU
-  connection.py: QmW9DVSJwTdD8BkjiZc8fYa2ndHVCy6HepFpmnX8H8TVMH
+  connection.py: QmPWU31DeNecH9Ch62hFZ5a1peEk5p7UXYj2qRgm3TBLFD
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 class_name: HTTPClientConnection
 config:
   host: 127.0.0.1
   port: 8000
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 dependencies:
   aiohttp:
     version: '>=3.6.2,<3.7'
diff --git a/packages/fetchai/connections/http_server/README.md b/packages/fetchai/connections/http_server/README.md
index 80680ce445..20aee30556 100644
--- a/packages/fetchai/connections/http_server/README.md
+++ b/packages/fetchai/connections/http_server/README.md
@@ -4,4 +4,4 @@ This connection wraps an HTTP server. It consumes requests from clients, transla
 
 ## Usage
 
-First, add the connection to your AEA project (`aea add connection fetchai/http_server:0.8.0`). Then, update the `config` in `connection.yaml` by providing a `host` and `port` of the server. Optionally, provide a path to an [OpenAPI spec](https://swagger.io/docs/specification/about/) for request validation.
\ No newline at end of file
+First, add the connection to your AEA project (`aea add connection fetchai/http_server:0.9.0`). Then, update the `config` in `connection.yaml` by providing a `host` and `port` of the server. Optionally, provide a path to an [OpenAPI spec](https://swagger.io/docs/specification/about/) for request validation.
\ No newline at end of file
diff --git a/packages/fetchai/connections/http_server/connection.py b/packages/fetchai/connections/http_server/connection.py
index 9655657e13..c906ca6960 100644
--- a/packages/fetchai/connections/http_server/connection.py
+++ b/packages/fetchai/connections/http_server/connection.py
@@ -66,7 +66,7 @@
 _default_logger = logging.getLogger("aea.packages.fetchai.connections.http_server")
 
 RequestId = DialogueLabel
-PUBLIC_ID = PublicId.from_str("fetchai/http_server:0.8.0")
+PUBLIC_ID = PublicId.from_str("fetchai/http_server:0.9.0")
 
 
 class HttpDialogues(BaseHttpDialogues):
diff --git a/packages/fetchai/connections/http_server/connection.yaml b/packages/fetchai/connections/http_server/connection.yaml
index 9f5b628ccb..d9db65c7dd 100644
--- a/packages/fetchai/connections/http_server/connection.yaml
+++ b/packages/fetchai/connections/http_server/connection.yaml
@@ -1,18 +1,18 @@
 name: http_server
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: connection
 description: The HTTP server connection that wraps http server implementing a RESTful
   API specification.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmTmQcnUPKaDHHJHngBFXnUVPdgBLanP9DbjVHZT55Scfn
+  README.md: QmUeXiba13kjgsW8EMYvWnMYb6GzSirTPyr3L2dLU4J9gT
   __init__.py: Qmb6JEAkJeb5JweqrSGiGoQp1vGXqddjGgb9WMkm2phTgA
-  connection.py: QmNxiS2h8QhqraJTiNdrGtM7BNCxiFfZvgdaWK9T1ghgxj
+  connection.py: QmPjqaEpWNRM412ZbxCN2dp3qUM1jTEYmhABbYUDejTm6w
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 class_name: HTTPServerConnection
 config:
   api_spec_path: ''
@@ -20,7 +20,7 @@ config:
   port: 8000
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 dependencies:
   aiohttp:
     version: '>=3.6.2,<3.7'
diff --git a/packages/fetchai/connections/ledger/README.md b/packages/fetchai/connections/ledger/README.md
index 807387e685..0da1b56662 100644
--- a/packages/fetchai/connections/ledger/README.md
+++ b/packages/fetchai/connections/ledger/README.md
@@ -2,7 +2,7 @@
 
 The ledger connection wraps the APIs needed to interact with multiple ledgers, including smart contracts deployed on those ledgers.
 
-The AEA communicates with the ledger connection via the `fetchai/ledger_api:0.3.0` and `fetchai/contract_api:0.5.0` protocols.
+The AEA communicates with the ledger connection via the `fetchai/ledger_api:0.4.0` and `fetchai/contract_api:0.5.0` protocols.
 
 The connection uses the ledger apis registered in the ledger api registry.
 
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index abf2098efc..63641cb273 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -6,7 +6,7 @@ description: A connection to interact with any ledger API and contract API.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmfQN7UK1M4pBUzKVzPannPLVi8iiULKHNtJ7XpoWpjqfc
+  README.md: QmY6YCoxyUXSwQzFvNPKd3nfHaoMsjCLCZAvTGSGwZnZbP
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
   base.py: QmNnSBVmVgdDFwzqDUncwLHeyDfMEfmvujJdKbdGNGH4Be
   connection.py: Qmdibf99GzdFjFCcoTX7AiiBVWznKvPZWvur8cngSRNdye
@@ -15,7 +15,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/ledger_api:0.3.0
+- fetchai/ledger_api:0.4.0
 class_name: LedgerConnection
 config:
   ledger_apis:
@@ -27,5 +27,5 @@ config:
 excluded_protocols: []
 restricted_to_protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/ledger_api:0.3.0
+- fetchai/ledger_api:0.4.0
 dependencies: {}
diff --git a/packages/fetchai/connections/local/connection.py b/packages/fetchai/connections/local/connection.py
index 53c10fe68c..db08d23349 100644
--- a/packages/fetchai/connections/local/connection.py
+++ b/packages/fetchai/connections/local/connection.py
@@ -47,7 +47,7 @@
 RESPONSE_TARGET = MESSAGE_ID
 RESPONSE_MESSAGE_ID = MESSAGE_ID + 1
 STUB_DIALOGUE_ID = 0
-PUBLIC_ID = PublicId.from_str("fetchai/local:0.8.0")
+PUBLIC_ID = PublicId.from_str("fetchai/local:0.9.0")
 
 
 class OefSearchDialogues(BaseOefSearchDialogues):
@@ -181,7 +181,7 @@ async def _handle_envelope(self, envelope: Envelope) -> None:
         :param envelope: the envelope
         :return: None
         """
-        if envelope.protocol_id == ProtocolId.from_str("fetchai/oef_search:0.6.0"):
+        if envelope.protocol_id == ProtocolId.from_str("fetchai/oef_search:0.7.0"):
             await self._handle_oef_message(envelope)
         else:
             await self._handle_agent_message(envelope)
diff --git a/packages/fetchai/connections/local/connection.yaml b/packages/fetchai/connections/local/connection.yaml
index 625d62d1ef..4f86525679 100644
--- a/packages/fetchai/connections/local/connection.yaml
+++ b/packages/fetchai/connections/local/connection.yaml
@@ -1,6 +1,6 @@
 name: local
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: connection
 description: The local connection provides a stub for an OEF node.
 license: Apache-2.0
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmbK7MtyAVqh2LmSh9TY6yBZqfWaAXURP4rQGATyP2hTKC
   __init__.py: QmeeoX5E38Ecrb1rLdeFyyxReHLrcJoETnBcPbcNWVbiKG
-  connection.py: QmXtme7q9RZaLb53Gjsv2GcBg1XfrPGZprzxu2eNHyFdFY
+  connection.py: QmUVta4sBNBna7bmhpa1aV8nfHrUQ6e8GsV5758GJT5BT9
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 class_name: OEFLocalConnection
 config: {}
 excluded_protocols: []
diff --git a/packages/fetchai/connections/oef/README.md b/packages/fetchai/connections/oef/README.md
index 4e30cbd2ba..3f6b09fce2 100644
--- a/packages/fetchai/connections/oef/README.md
+++ b/packages/fetchai/connections/oef/README.md
@@ -4,4 +4,4 @@ Connection to interact with an OEF node (https://fetchai.github.io/oef-sdk-pytho
 
 ## Usage
 
-Register/unregister services, perform searches using `fetchai/oef_search:0.6.0` protocol and send messages of any protocol to other agents connected to the same node.
\ No newline at end of file
+Register/unregister services, perform searches using `fetchai/oef_search:0.7.0` protocol and send messages of any protocol to other agents connected to the same node.
\ No newline at end of file
diff --git a/packages/fetchai/connections/oef/connection.py b/packages/fetchai/connections/oef/connection.py
index 124d6ad822..b99a6ff66f 100644
--- a/packages/fetchai/connections/oef/connection.py
+++ b/packages/fetchai/connections/oef/connection.py
@@ -59,7 +59,7 @@
 STUB_MESSAGE_ID = 0
 STUB_DIALOGUE_ID = 0
 DEFAULT_OEF = "oef"
-PUBLIC_ID = PublicId.from_str("fetchai/oef:0.9.0")
+PUBLIC_ID = PublicId.from_str("fetchai/oef:0.10.0")
 
 
 class OefSearchDialogue(BaseOefSearchDialogue):
@@ -411,7 +411,7 @@ def send(self, envelope: Envelope) -> None:
                 )
                 raise ValueError("Cannot send message.")
 
-        if envelope.protocol_id == PublicId.from_str("fetchai/oef_search:0.6.0"):
+        if envelope.protocol_id == PublicId.from_str("fetchai/oef_search:0.7.0"):
             self.send_oef_message(envelope)
         else:
             self.send_default_message(envelope)
diff --git a/packages/fetchai/connections/oef/connection.yaml b/packages/fetchai/connections/oef/connection.yaml
index 807f12d66e..d788e1ffa1 100644
--- a/packages/fetchai/connections/oef/connection.yaml
+++ b/packages/fetchai/connections/oef/connection.yaml
@@ -1,20 +1,20 @@
 name: oef
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 type: connection
 description: The oef connection provides a wrapper around the OEF SDK for connection
   with the OEF search and communication node.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmVHWxThR1u9a4BEm89oCxUTPGnN6PznvNgo6oZLqDD3n5
+  README.md: Qma1rPtWWsKVgrutuRKqtP4uCzhs6ZDRbwLFaH5DF75KZs
   __init__.py: QmUAen8tmoBHuCerjA3FSGKJRLG6JYyUS3chuWzPxKYzez
-  connection.py: QmfDKjDageCc4Pxdqokw7s2foEgwrWnoexcdHL9PcVWS45
+  connection.py: QmNgAS6quG3NJtrTBQa6d4g4s1oMuFpXUiPb5FY2d85tX9
   object_translator.py: QmZbRaJgFC1RKDA8hox6xTpqmrpTbp8SyYQoKarTmS5HwG
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/oef_search:0.7.0
 class_name: OEFConnection
 config:
   addr: 127.0.0.1
diff --git a/packages/fetchai/connections/p2p_stub/README.md b/packages/fetchai/connections/p2p_stub/README.md
index f72f38a289..5116ec9244 100644
--- a/packages/fetchai/connections/p2p_stub/README.md
+++ b/packages/fetchai/connections/p2p_stub/README.md
@@ -4,6 +4,6 @@ Simple file based connection to perform interaction between multiple local agent
 
 ## Usage
 
-First, add the connection to your AEA project: `aea add connection fetchai/p2p_stub:0.6.0`.
+First, add the connection to your AEA project: `aea add connection fetchai/p2p_stub:0.7.0`.
 
 Optionally, in the `connection.yaml` file under `config` set the `namespace_dir` to the desired file path. The `p2p_stub` connection reads encoded envelopes from its input file and writes encoded envelopes to its output file. Multiple agents can be pointed to the same `namespace_dir` and are then able to exchange envelopes via the file system.
diff --git a/packages/fetchai/connections/p2p_stub/connection.py b/packages/fetchai/connections/p2p_stub/connection.py
index 868ef46cb8..b24e1ceebf 100644
--- a/packages/fetchai/connections/p2p_stub/connection.py
+++ b/packages/fetchai/connections/p2p_stub/connection.py
@@ -29,7 +29,7 @@
 from aea.mail.base import Envelope
 
 
-PUBLIC_ID = PublicId.from_str("fetchai/p2p_stub:0.6.0")
+PUBLIC_ID = PublicId.from_str("fetchai/p2p_stub:0.7.0")
 
 
 class P2PStubConnection(StubConnection):
diff --git a/packages/fetchai/connections/p2p_stub/connection.yaml b/packages/fetchai/connections/p2p_stub/connection.yaml
index cd89b62ea5..94f70002ba 100644
--- a/packages/fetchai/connections/p2p_stub/connection.yaml
+++ b/packages/fetchai/connections/p2p_stub/connection.yaml
@@ -1,15 +1,15 @@
 name: p2p_stub
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: connection
 description: The stub p2p connection implements a local p2p connection allowing agents
   to communicate with each other through files created in the namespace directory.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmbAStnFJj6jMTwqNu7DG9dt2uy5JGrGhKtCbYuAhWLBCk
+  README.md: QmW9vG1qAt8hjycMMK6LUFNaDp52KnakgjbRrTCMCRTnNW
   __init__.py: QmW9XFKGsea4u3fupkFMcQutgsjqusCMBMyTcTmLLmQ4tR
-  connection.py: QmVcCQYuXoXbYUVDi3BBarf6fxeg9GjKYkr814CMGUq3UW
+  connection.py: QmbeuHyjBW7PjEuZXGr9BsLTmV5WEe6YE9sNYszX7iirek
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: P2PStubConnection
diff --git a/packages/fetchai/connections/soef/README.md b/packages/fetchai/connections/soef/README.md
index 14c6d3d3f1..10cdfc89b8 100644
--- a/packages/fetchai/connections/soef/README.md
+++ b/packages/fetchai/connections/soef/README.md
@@ -4,6 +4,6 @@ The SOEF connection is used to connect to an SOEF node. The SOEF provides OEF se
 
 ## Usage
 
-First, add the connection to your AEA project: `aea add connection fetchai/soef:0.8.0`. Then ensure the `config` in `connection.yaml` matches your need. In particular, make sure `chain_identifier` matches your `default_ledger`.
+First, add the connection to your AEA project: `aea add connection fetchai/soef:0.9.0`. Then ensure the `config` in `connection.yaml` matches your need. In particular, make sure `chain_identifier` matches your `default_ledger`.
 
-To register/unregister services and perform searches use the `fetchai/oef_search:0.6.0` protocol
\ No newline at end of file
+To register/unregister services and perform searches use the `fetchai/oef_search:0.7.0` protocol
\ No newline at end of file
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index b6dd3a9a14..61764a7a6a 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -64,7 +64,7 @@
 
 _default_logger = logging.getLogger("aea.packages.fetchai.connections.oef")
 
-PUBLIC_ID = PublicId.from_str("fetchai/soef:0.8.0")
+PUBLIC_ID = PublicId.from_str("fetchai/soef:0.9.0")
 
 NOT_SPECIFIED = object()
 
@@ -1095,7 +1095,7 @@ def __init__(self, **kwargs):
         if kwargs.get("configuration") is None:  # pragma: nocover
             kwargs["excluded_protocols"] = kwargs.get("excluded_protocols") or []
             kwargs["restricted_to_protocols"] = kwargs.get("excluded_protocols") or [
-                PublicId.from_str("fetchai/oef_search:0.6.0")
+                PublicId.from_str("fetchai/oef_search:0.7.0")
             ]
 
         super().__init__(**kwargs)
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 5e40dea962..1c74d5b68d 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -1,17 +1,17 @@
 name: soef
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: connection
 description: The soef connection provides a connection api to the simple OEF.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmWwjETX39APP9RD5oVPeeCiDnUoDvjAcoVe2FK2Jc6anM
+  README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmYzSA9zWn4r3kdBxvV1TGeqb1oGKCuvHruoH8Nkexneb7
+  connection.py: QmQ1yNBGWB8driD2bFokLYjmKUJ2FWQhPfWxYLGEHCAfC8
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 class_name: SOEFConnection
 config:
   api_key: TwiCIriSl0mLahw17pyqoA
@@ -20,6 +20,6 @@ config:
   soef_port: 9002
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 dependencies:
   defusedxml: {}
diff --git a/packages/fetchai/connections/tcp/README.md b/packages/fetchai/connections/tcp/README.md
index e2487613c0..1b933ee4af 100644
--- a/packages/fetchai/connections/tcp/README.md
+++ b/packages/fetchai/connections/tcp/README.md
@@ -4,4 +4,4 @@ A simple TCP client/server connection to use the TCP protocol for sending and re
 
 ## Usage
 
-Add the connection to your AEA project: `aea add connection fetchai/tcp:0.7.0`.
+Add the connection to your AEA project: `aea add connection fetchai/tcp:0.8.0`.
diff --git a/packages/fetchai/connections/tcp/base.py b/packages/fetchai/connections/tcp/base.py
index dc5bddd500..48be8f5012 100644
--- a/packages/fetchai/connections/tcp/base.py
+++ b/packages/fetchai/connections/tcp/base.py
@@ -31,7 +31,7 @@
 
 logger = logging.getLogger("aea.packages.fetchai.connections.tcp")
 
-PUBLIC_ID = PublicId.from_str("fetchai/tcp:0.7.0")
+PUBLIC_ID = PublicId.from_str("fetchai/tcp:0.8.0")
 
 
 class TCPConnection(Connection, ABC):
diff --git a/packages/fetchai/connections/tcp/connection.yaml b/packages/fetchai/connections/tcp/connection.yaml
index 0e740d4432..92863a30ee 100644
--- a/packages/fetchai/connections/tcp/connection.yaml
+++ b/packages/fetchai/connections/tcp/connection.yaml
@@ -1,14 +1,14 @@
 name: tcp
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: connection
 description: The tcp connection implements a tcp server and client.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmVtv8cSd49aAYHFjbCdmvJJoD4mPCuG5PR7QKXxcAquJw
+  README.md: Qmf1JEZWHRcP8jecLrQ4tGxCdmYLEzhnRJqpZqJmpfNDxZ
   __init__.py: QmTxAtQ9ffraStxxLAkvmWxyGhoV3jE16Sw6SJ9xzTthLb
-  base.py: Qmf3rJCzi6dmEXa87X1HpZRqWvuirAykeTnNyEt5SKzLJ9
+  base.py: QmT8ZwAGWNAibUvnucaM2jiPu6ixPfaG14YKuXSaRp6b2b
   connection.py: QmcQnyUagAhE7UsSBxiBSqsuF4mTMdU26LZLhUhdq5QygR
   tcp_client.py: QmfTTuC41Wp8dRBeNJWXKa6ryu98TRT8H3oSCFmvfypCEy
   tcp_server.py: QmZ8tNfGzqNepjjspMfjWdwsGX2Afj56nSEdyAJfdHcHqS
diff --git a/packages/fetchai/connections/webhook/README.md b/packages/fetchai/connections/webhook/README.md
index 306c158e06..562a56a87f 100644
--- a/packages/fetchai/connections/webhook/README.md
+++ b/packages/fetchai/connections/webhook/README.md
@@ -4,4 +4,4 @@ An HTTP webhook connection which registers a webhook and waits for incoming requ
 
 ## Usage
 
-First, add the connection to your AEA project: `aea add connection fetchai/webhook:0.6.0`. Then ensure the `config` in `connection.yaml` matches your need. In particular, set `webhook_address`, `webhook_port` and `webhook_url_path` appropriately.
+First, add the connection to your AEA project: `aea add connection fetchai/webhook:0.7.0`. Then ensure the `config` in `connection.yaml` matches your need. In particular, set `webhook_address`, `webhook_port` and `webhook_url_path` appropriately.
diff --git a/packages/fetchai/connections/webhook/connection.py b/packages/fetchai/connections/webhook/connection.py
index 18d65e6d1a..a3b923a14d 100644
--- a/packages/fetchai/connections/webhook/connection.py
+++ b/packages/fetchai/connections/webhook/connection.py
@@ -42,7 +42,7 @@
 NOT_FOUND = 404
 REQUEST_TIMEOUT = 408
 SERVER_ERROR = 500
-PUBLIC_ID = PublicId.from_str("fetchai/webhook:0.6.0")
+PUBLIC_ID = PublicId.from_str("fetchai/webhook:0.7.0")
 
 _default_logger = logging.getLogger("aea.packages.fetchai.connections.webhook")
 
diff --git a/packages/fetchai/connections/webhook/connection.yaml b/packages/fetchai/connections/webhook/connection.yaml
index ca03a8df41..f89110fe3f 100644
--- a/packages/fetchai/connections/webhook/connection.yaml
+++ b/packages/fetchai/connections/webhook/connection.yaml
@@ -1,17 +1,17 @@
 name: webhook
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: connection
 description: The webhook connection that wraps a webhook functionality.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmQDqfKKsksKsUqdqTcYe8P8Fw3MGovVuZBFHPbhupkkxf
+  README.md: QmX8P6hQej8CDXxbALfad9199k63JQAY7YQ23cDr9fQirG
   __init__.py: QmWUKSmXaBgGMvKgdmzKmMjCx43BnrfW6og2n3afNoAALq
-  connection.py: QmVZv722GNjJkXxQSnvVBQgWCTnG2uBfAVAkgvn2E5qWzX
+  connection.py: QmRxk2Kf7vufXvQA6chasUzAQaqQKoojWd1EHNLxhb8UoJ
 fingerprint_ignore_patterns: []
 protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 class_name: WebhookConnection
 config:
   webhook_address: 127.0.0.1
@@ -19,7 +19,7 @@ config:
   webhook_url_path: /some/url/path
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 dependencies:
   aiohttp:
     version: ==3.6.2
diff --git a/packages/fetchai/protocols/fipa/README.md b/packages/fetchai/protocols/fipa/README.md
index 186a559a8e..fd4f8577de 100644
--- a/packages/fetchai/protocols/fipa/README.md
+++ b/packages/fetchai/protocols/fipa/README.md
@@ -10,7 +10,7 @@ This is a protocol for two agents to negotiate over a fixed set of resources.
 ---
 name: fipa
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 description: A protocol for FIPA ACL.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/protocols/fipa/message.py b/packages/fetchai/protocols/fipa/message.py
index 57f781e3ac..84fb9195d4 100644
--- a/packages/fetchai/protocols/fipa/message.py
+++ b/packages/fetchai/protocols/fipa/message.py
@@ -40,7 +40,7 @@
 class FipaMessage(Message):
     """A protocol for FIPA ACL."""
 
-    protocol_id = ProtocolId.from_str("fetchai/fipa:0.6.0")
+    protocol_id = ProtocolId.from_str("fetchai/fipa:0.7.0")
 
     Description = CustomDescription
 
diff --git a/packages/fetchai/protocols/fipa/protocol.yaml b/packages/fetchai/protocols/fipa/protocol.yaml
index 93295d63a5..20f15ddbad 100644
--- a/packages/fetchai/protocols/fipa/protocol.yaml
+++ b/packages/fetchai/protocols/fipa/protocol.yaml
@@ -1,18 +1,18 @@
 name: fipa
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: protocol
 description: A protocol for FIPA ACL.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmRwxwzxfhotek7WUbyAeufBvoHpWbDwfUVMy3FKitiHKy
+  README.md: QmZAX3MEPFvQSmDqu1mLoEe3gWxfkH2VDFHN3dB99A4Z5d
   __init__.py: QmR6pcWX14FsQip4eYJRNeiQdrNMPj6y4m6Tsgd6hd7yU6
   custom_types.py: Qmf72KRbkNsxxAHwMtkmJc5TRL23fU7AuzJAdSTftckwJQ
   dialogues.py: QmWaciW35ZTVeTeLWeyp3hjehKkWB5ZY7Di8N8cDH8Mjwb
   fipa.proto: QmP7JqnuQSQ9BDcKkscrTydKEX4wFBoyFaY1bkzGkamcit
   fipa_pb2.py: QmZMkefJLrb3zJKoimb6a9tdpxDBhc8rR2ghimqg7gZ471
-  message.py: QmSnzY8G89gUsgo21wF2TxnjZr7czba9a7HEfLpWg9tqQq
+  message.py: Qmc32ZmhrmT7FX6EVPwR899BkN8HMivtRHpnkQWkRThXYU
   serialization.py: QmQMb8F8hJm1gkJFSPPCtDAoxSX3bFkshtzRgDWfWB8ynd
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/http/README.md b/packages/fetchai/protocols/http/README.md
index fc76580aa9..a0997cc18a 100644
--- a/packages/fetchai/protocols/http/README.md
+++ b/packages/fetchai/protocols/http/README.md
@@ -10,7 +10,7 @@ This is a protocol for interacting with a client/server via HTTP requests and re
 ---
 name: http
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 description: A protocol for HTTP requests and responses.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/protocols/http/message.py b/packages/fetchai/protocols/http/message.py
index e1facfecc5..94ea11e63b 100644
--- a/packages/fetchai/protocols/http/message.py
+++ b/packages/fetchai/protocols/http/message.py
@@ -35,7 +35,7 @@
 class HttpMessage(Message):
     """A protocol for HTTP requests and responses."""
 
-    protocol_id = ProtocolId.from_str("fetchai/http:0.5.0")
+    protocol_id = ProtocolId.from_str("fetchai/http:0.6.0")
 
     class Performative(Message.Performative):
         """Performatives for the http protocol."""
diff --git a/packages/fetchai/protocols/http/protocol.yaml b/packages/fetchai/protocols/http/protocol.yaml
index 9fd9a926a5..87cb1647ff 100644
--- a/packages/fetchai/protocols/http/protocol.yaml
+++ b/packages/fetchai/protocols/http/protocol.yaml
@@ -1,17 +1,17 @@
 name: http
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 type: protocol
 description: A protocol for HTTP requests and responses.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmY7fxhyNBgwU7uc6LKtCN4aSQ4bym5BwqtwRAfwPokULN
+  README.md: QmYCacuyAELFigc3AvDAD5vm4iGZjan6QEk3dbksGvtFcM
   __init__.py: QmWzgWYrnS7PhjYrrx2mykLoaCbb7rDnVRcDqifsRukTy4
   dialogues.py: QmdwTehjCppcxyDid8m6zuHY5YwprUhato88R9Zdm9aXaM
   http.proto: QmdTUTvvxGxMxSTB67AXjMUSDLdsxBYiSuJNVxHuLKB1jS
   http_pb2.py: QmYYKqdwiueq54EveL9WXn216FXLSQ6XGJJHoiJxwJjzHC
-  message.py: QmcZaEZbRbcx5U5KVEi2QTr6BVyHGDXcRrSqKhpngXRZ15
+  message.py: QmPB7CZ8hzvoN4s1sDLPiWdYfhKPVKQDM2jMPZtbW5TCAJ
   serialization.py: QmTq34k2PD6Ybhk8x1EboY3UcNp8r3H6Tb3egZsWJN9nFv
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/ledger_api/README.md b/packages/fetchai/protocols/ledger_api/README.md
index c7d736e30f..8d45d848d3 100644
--- a/packages/fetchai/protocols/ledger_api/README.md
+++ b/packages/fetchai/protocols/ledger_api/README.md
@@ -10,7 +10,7 @@ This is a protocol for interacting with ledger APIs.
 ---
 name: ledger_api
 author: fetchai
-version: 0.3.0
+version: 0.4.0
 description: A protocol for ledger APIs requests and responses.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/protocols/ledger_api/message.py b/packages/fetchai/protocols/ledger_api/message.py
index ef64a3fcf8..414cde154a 100644
--- a/packages/fetchai/protocols/ledger_api/message.py
+++ b/packages/fetchai/protocols/ledger_api/message.py
@@ -49,7 +49,7 @@
 class LedgerApiMessage(Message):
     """A protocol for ledger APIs requests and responses."""
 
-    protocol_id = ProtocolId.from_str("fetchai/ledger_api:0.3.0")
+    protocol_id = ProtocolId.from_str("fetchai/ledger_api:0.4.0")
 
     RawTransaction = CustomRawTransaction
 
diff --git a/packages/fetchai/protocols/ledger_api/protocol.yaml b/packages/fetchai/protocols/ledger_api/protocol.yaml
index b08f57e1c4..30e6f0e21e 100644
--- a/packages/fetchai/protocols/ledger_api/protocol.yaml
+++ b/packages/fetchai/protocols/ledger_api/protocol.yaml
@@ -1,18 +1,18 @@
 name: ledger_api
 author: fetchai
-version: 0.3.0
+version: 0.4.0
 type: protocol
 description: A protocol for ledger APIs requests and responses.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmSoo6ds8mKhtoG8CBbu9rb9yj7sqeeuBfcU7CLj584uRX
+  README.md: QmRxa7K9cDbKyBMK5yWuoAPc3dKB1jinUv78dkbPJfstjM
   __init__.py: QmX6ta6j6ust7qhVk1kZygzZK3gTTg7hSCBbSMKUxJgWgG
   custom_types.py: QmWRrvFStMhVJy8P2WD6qjDgk14ZnxErN7XymxUtof7HQo
   dialogues.py: QmRtWkAfR9WTvygMJ36R758RzdY2mGQs2fgtHCfjxmeaHy
   ledger_api.proto: QmfLcv7jJcGJ1gAdCMqsyxJcRud7RaTWteSXHL5NvGuViP
   ledger_api_pb2.py: QmQhM848REJTDKDoiqxkTniChW8bNNm66EtwMRkvVdbMry
-  message.py: QmNnb5uwsWZjQizDnuTwCAw1sGmmiARLeesTVDE4nLJi7j
+  message.py: QmQz3Kf3JqQ8Zv7Y2TM8HQ3vHASn6EPc2zfdF9EfXZERNi
   serialization.py: QmRuTqH9t9JtsnpWX5wpC438DdRxWKiqAB2u9fvQ2oy1GE
 fingerprint_ignore_patterns: []
 dependencies:
diff --git a/packages/fetchai/protocols/ml_trade/README.md b/packages/fetchai/protocols/ml_trade/README.md
index 068774302c..0a2dbf8448 100644
--- a/packages/fetchai/protocols/ml_trade/README.md
+++ b/packages/fetchai/protocols/ml_trade/README.md
@@ -10,7 +10,7 @@ This is a protocol for trading data for training and prediction purposes.
 ---
 name: ml_trade
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 description: A protocol for trading data for training and prediction purposes.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/protocols/ml_trade/message.py b/packages/fetchai/protocols/ml_trade/message.py
index 7cf62d08ed..b4cd6b46a3 100644
--- a/packages/fetchai/protocols/ml_trade/message.py
+++ b/packages/fetchai/protocols/ml_trade/message.py
@@ -40,7 +40,7 @@
 class MlTradeMessage(Message):
     """A protocol for trading data for training and prediction purposes."""
 
-    protocol_id = ProtocolId.from_str("fetchai/ml_trade:0.5.0")
+    protocol_id = ProtocolId.from_str("fetchai/ml_trade:0.6.0")
 
     Description = CustomDescription
 
diff --git a/packages/fetchai/protocols/ml_trade/protocol.yaml b/packages/fetchai/protocols/ml_trade/protocol.yaml
index b519b0114f..fc84c1f186 100644
--- a/packages/fetchai/protocols/ml_trade/protocol.yaml
+++ b/packages/fetchai/protocols/ml_trade/protocol.yaml
@@ -1,16 +1,16 @@
 name: ml_trade
 author: fetchai
-version: 0.5.0
+version: 0.6.0
 type: protocol
 description: A protocol for trading data for training and prediction purposes.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmSRtzACMh3x3LSjYqWXWTpYpE4C7G8EHbW4zQQoMFFZ4K
+  README.md: QmdL1CDvD1fQH112oqefGxiTB4RXRxRYr9vfZMXEZDS1Dj
   __init__.py: QmcCS9uUQTTS2w85dTNiN5rQ14wyBhmBkr7pPPPcbLphcn
   custom_types.py: QmPa6mxbN8WShsniQxJACfzAPRjGzYLbUFGoVU4N9DewUw
   dialogues.py: QmVvP34aKWEtHrKmccNMvEdDnx5B7xpE5aEGzr6GU2u8UK
-  message.py: QmZ8HzNw27TdxoZBHRf1YJheACo7kU6n1497DYgxjbCwZu
+  message.py: Qmb1Z2wXMR1SVGFVezRaPogyhnmvrGmdY9ZEU4pr2vRKiq
   ml_trade.proto: QmeB21MQduEGQCrtiYZQzPpRqHL4CWEkvvcaKZ9GsfE8f6
   ml_trade_pb2.py: QmZVvugPysR1og6kWCJkvo3af2s9pQRHfuj4BptE7gU1EU
   serialization.py: QmTamQzo8ZNM6T7QnsA7qNzs2uJ7CHTUczzCsHwU9Q6Z5K
diff --git a/packages/fetchai/protocols/oef_search/README.md b/packages/fetchai/protocols/oef_search/README.md
index 9ab8c67a1f..4972b642e2 100644
--- a/packages/fetchai/protocols/oef_search/README.md
+++ b/packages/fetchai/protocols/oef_search/README.md
@@ -11,7 +11,7 @@ It allows for registering of agents and services, and searching of agents and se
 ---
 name: oef_search
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 description: A protocol for interacting with an OEF search service.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
diff --git a/packages/fetchai/protocols/oef_search/message.py b/packages/fetchai/protocols/oef_search/message.py
index 824e80d505..75bb56b7a7 100644
--- a/packages/fetchai/protocols/oef_search/message.py
+++ b/packages/fetchai/protocols/oef_search/message.py
@@ -46,7 +46,7 @@
 class OefSearchMessage(Message):
     """A protocol for interacting with an OEF search service."""
 
-    protocol_id = ProtocolId.from_str("fetchai/oef_search:0.6.0")
+    protocol_id = ProtocolId.from_str("fetchai/oef_search:0.7.0")
 
     AgentsInfo = CustomAgentsInfo
 
diff --git a/packages/fetchai/protocols/oef_search/protocol.yaml b/packages/fetchai/protocols/oef_search/protocol.yaml
index 4ab18b4d2f..ebf61fc6c5 100644
--- a/packages/fetchai/protocols/oef_search/protocol.yaml
+++ b/packages/fetchai/protocols/oef_search/protocol.yaml
@@ -1,16 +1,16 @@
 name: oef_search
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: protocol
 description: A protocol for interacting with an OEF search service.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmaGSTqxvQFKccBnLovhBbfSH3C3Sorrj7kFyZqW9qptLa
+  README.md: QmUYKYTTvPQWDHgB2N8LLKquwgGEA8vEoDYroCEEcGSugy
   __init__.py: Qmdr5ks5X4YtnpH6yKUcNu9uouyv3EGmrKFhyvNH7ZBjvT
   custom_types.py: QmYAkKYj9gGHaij7uTejoJe9KRhNcsU4sJC1utMfhUYhg3
   dialogues.py: QmQPLnW3jAs6tLLmhkX4C7texGRHM9bfdjs83dUH5TkJ4v
-  message.py: QmWFvjX7spNHQx6QQevBRXmFyJBuenyAPYAjxVLYvKdC7B
+  message.py: QmRTyiB6yaN1rwvZ412dMNdTwRGy3U3HSC4xN8k5La3Nr1
   oef_search.proto: QmNU8WsxT6XNFFneKKeDaZkNn3CEFDfZQkmKv9TyhyxzDB
   oef_search_pb2.py: QmSAFT1xxYRzJU6h1aFVDuYcx672sZ2vzV6c2ico7f4BLK
   serialization.py: QmU3ipyvogbpkFuQki6xqscdiPahDVYw4sBaPHaH3LVvwJ
diff --git a/packages/fetchai/protocols/tac/README.md b/packages/fetchai/protocols/tac/README.md
index 7f10c50f17..286ad842ef 100644
--- a/packages/fetchai/protocols/tac/README.md
+++ b/packages/fetchai/protocols/tac/README.md
@@ -10,7 +10,7 @@ This is a protocol for participating in a Trading Agent Competition (TAC).
 ---
 name: tac
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 description: The tac protocol implements the messages an AEA needs to participate
   in the TAC.
 license: Apache-2.0
diff --git a/packages/fetchai/protocols/tac/message.py b/packages/fetchai/protocols/tac/message.py
index 29a6c32f5c..c06c9e6a50 100644
--- a/packages/fetchai/protocols/tac/message.py
+++ b/packages/fetchai/protocols/tac/message.py
@@ -37,7 +37,7 @@
 class TacMessage(Message):
     """The tac protocol implements the messages an AEA needs to participate in the TAC."""
 
-    protocol_id = ProtocolId.from_str("fetchai/tac:0.6.0")
+    protocol_id = ProtocolId.from_str("fetchai/tac:0.7.0")
 
     ErrorCode = CustomErrorCode
 
diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml
index d33f7cc5c9..cc916bf083 100644
--- a/packages/fetchai/protocols/tac/protocol.yaml
+++ b/packages/fetchai/protocols/tac/protocol.yaml
@@ -1,17 +1,17 @@
 name: tac
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: protocol
 description: The tac protocol implements the messages an AEA needs to participate
   in the TAC.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmVhm6VBbggxjTe3PEhCBfTomWekNa5buYy3sY7YYN6Er6
+  README.md: QmcUpwxG2ZzdwMeMGGTVyJgsRVbrCUKtYB2qqLy4YsuBez
   __init__.py: QmSAC7PGra9fig8RhhF1j3XEVpgie9UZNNYPc2AB9Kx9xJ
   custom_types.py: QmXQATfnvuCpt4FicF4QcqCcLj9PQNsSHjCBvVQknWpyaN
   dialogues.py: QmTxHrcGujP1RUYvfJygZyQoUwmDg2GBWfmbR3tWUSbyop
-  message.py: QmfNRtqEpLyAf4knnTecsiNxzehqwWjk8agfg9oe2XvCt3
+  message.py: QmWD79nj4kcMPN9xuDkgSDXnwgDnT6XE1WcdfBKsKKPqTP
   serialization.py: QmTk2Jp19dQ4SJdjSHAr8wbxw4rQSMheSuf1XzXG8CaoB4
   tac.proto: QmdpPZNhUW593qVNVoSTWZgd9R69bmBbw6Y9xjzYpvuDvV
   tac_pb2.py: QmUwW3kixKwD2o1RRdq4NoNoihPb5BXKKRngWXztq32fea
diff --git a/packages/fetchai/skills/aries_alice/skill.yaml b/packages/fetchai/skills/aries_alice/skill.yaml
index 10baa733fa..ac08ddc5a1 100644
--- a/packages/fetchai/skills/aries_alice/skill.yaml
+++ b/packages/fetchai/skills/aries_alice/skill.yaml
@@ -1,6 +1,6 @@
 name: aries_alice
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: skill
 description: The aries_alice skill implements the alice player in the aries cloud
   agent demo
@@ -16,9 +16,9 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/http:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/http:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   alice:
diff --git a/packages/fetchai/skills/aries_faber/skill.yaml b/packages/fetchai/skills/aries_faber/skill.yaml
index 1841b6823a..97410686ed 100644
--- a/packages/fetchai/skills/aries_faber/skill.yaml
+++ b/packages/fetchai/skills/aries_faber/skill.yaml
@@ -1,6 +1,6 @@
 name: aries_faber
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: skill
 description: The aries_faber skill implements the faber player in the aries cloud
   agent demo
@@ -16,9 +16,9 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/http:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/http:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   faber:
diff --git a/packages/fetchai/skills/carpark_client/skill.yaml b/packages/fetchai/skills/carpark_client/skill.yaml
index 9b81cf6b92..97a1234d50 100644
--- a/packages/fetchai/skills/carpark_client/skill.yaml
+++ b/packages/fetchai/skills/carpark_client/skill.yaml
@@ -16,10 +16,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_buyer:0.12.0
 behaviours:
diff --git a/packages/fetchai/skills/carpark_detection/skill.yaml b/packages/fetchai/skills/carpark_detection/skill.yaml
index 57a671e830..1aaadad48e 100644
--- a/packages/fetchai/skills/carpark_detection/skill.yaml
+++ b/packages/fetchai/skills/carpark_detection/skill.yaml
@@ -18,10 +18,10 @@ fingerprint_ignore_patterns:
 - temp_files_placeholder/*
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_seller:0.13.0
 behaviours:
diff --git a/packages/fetchai/skills/echo/skill.yaml b/packages/fetchai/skills/echo/skill.yaml
index e83fba6fd6..977f02e359 100644
--- a/packages/fetchai/skills/echo/skill.yaml
+++ b/packages/fetchai/skills/echo/skill.yaml
@@ -1,6 +1,6 @@
 name: echo
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: skill
 description: The echo skill implements simple echo functionality.
 license: Apache-2.0
@@ -14,7 +14,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills: []
 behaviours:
   echo:
diff --git a/packages/fetchai/skills/erc1155_client/skill.yaml b/packages/fetchai/skills/erc1155_client/skill.yaml
index 8f419f4185..8825d73db8 100644
--- a/packages/fetchai/skills/erc1155_client/skill.yaml
+++ b/packages/fetchai/skills/erc1155_client/skill.yaml
@@ -18,11 +18,11 @@ contracts:
 - fetchai/erc1155:0.10.0
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
 skills: []
 behaviours:
   search:
diff --git a/packages/fetchai/skills/erc1155_deploy/skill.yaml b/packages/fetchai/skills/erc1155_deploy/skill.yaml
index a69c4d2d60..3023314d4a 100644
--- a/packages/fetchai/skills/erc1155_deploy/skill.yaml
+++ b/packages/fetchai/skills/erc1155_deploy/skill.yaml
@@ -18,11 +18,11 @@ contracts:
 - fetchai/erc1155:0.10.0
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
 skills: []
 behaviours:
   service_registration:
diff --git a/packages/fetchai/skills/generic_buyer/skill.yaml b/packages/fetchai/skills/generic_buyer/skill.yaml
index 3d6c91eef6..786d8ef236 100644
--- a/packages/fetchai/skills/generic_buyer/skill.yaml
+++ b/packages/fetchai/skills/generic_buyer/skill.yaml
@@ -15,10 +15,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   search:
diff --git a/packages/fetchai/skills/generic_seller/skill.yaml b/packages/fetchai/skills/generic_seller/skill.yaml
index 942e3dfa32..2a435a6efc 100644
--- a/packages/fetchai/skills/generic_seller/skill.yaml
+++ b/packages/fetchai/skills/generic_seller/skill.yaml
@@ -16,10 +16,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   service_registration:
diff --git a/packages/fetchai/skills/http_echo/skill.yaml b/packages/fetchai/skills/http_echo/skill.yaml
index 1866ee9702..d9ee0961c5 100644
--- a/packages/fetchai/skills/http_echo/skill.yaml
+++ b/packages/fetchai/skills/http_echo/skill.yaml
@@ -1,6 +1,6 @@
 name: http_echo
 author: fetchai
-version: 0.6.0
+version: 0.7.0
 type: skill
 description: The http echo skill prints out the content of received http messages
   and responds with success.
@@ -14,7 +14,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/http:0.5.0
+- fetchai/http:0.6.0
 skills: []
 behaviours: {}
 handlers:
diff --git a/packages/fetchai/skills/ml_data_provider/skill.yaml b/packages/fetchai/skills/ml_data_provider/skill.yaml
index a4cdf26aed..ae4d9a6241 100644
--- a/packages/fetchai/skills/ml_data_provider/skill.yaml
+++ b/packages/fetchai/skills/ml_data_provider/skill.yaml
@@ -16,10 +16,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/ledger_api:0.3.0
-- fetchai/ml_trade:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/ledger_api:0.4.0
+- fetchai/ml_trade:0.6.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_seller:0.13.0
 behaviours:
diff --git a/packages/fetchai/skills/ml_train/skill.yaml b/packages/fetchai/skills/ml_train/skill.yaml
index 5f20f79b17..1d84f5e241 100644
--- a/packages/fetchai/skills/ml_train/skill.yaml
+++ b/packages/fetchai/skills/ml_train/skill.yaml
@@ -19,10 +19,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/ledger_api:0.3.0
-- fetchai/ml_trade:0.5.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/ledger_api:0.4.0
+- fetchai/ml_trade:0.6.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_buyer:0.12.0
 behaviours:
diff --git a/packages/fetchai/skills/simple_service_registration/skill.yaml b/packages/fetchai/skills/simple_service_registration/skill.yaml
index ebd93696c0..83bb6ec2e4 100644
--- a/packages/fetchai/skills/simple_service_registration/skill.yaml
+++ b/packages/fetchai/skills/simple_service_registration/skill.yaml
@@ -15,7 +15,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   service:
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 8c6978739b..d79d945a4f 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -1,6 +1,6 @@
 name: tac_control
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: skill
 description: The tac control skill implements the logic for an AEA to control an instance
   of the TAC.
@@ -18,8 +18,8 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
-- fetchai/tac:0.6.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
 skills: []
 behaviours:
   tac:
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 360abaaf9b..3c667d87a6 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -18,8 +18,8 @@ fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
-- fetchai/oef_search:0.6.0
-- fetchai/tac:0.6.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
 skills: []
 behaviours:
   contract:
diff --git a/packages/fetchai/skills/tac_negotiation/skill.yaml b/packages/fetchai/skills/tac_negotiation/skill.yaml
index 267b3e3a04..ff609eb1bd 100644
--- a/packages/fetchai/skills/tac_negotiation/skill.yaml
+++ b/packages/fetchai/skills/tac_negotiation/skill.yaml
@@ -19,8 +19,8 @@ fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
-- fetchai/fipa:0.6.0
-- fetchai/oef_search:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/tac_participation:0.9.0
 behaviours:
diff --git a/packages/fetchai/skills/tac_participation/skill.yaml b/packages/fetchai/skills/tac_participation/skill.yaml
index 74cd860e52..018167aae6 100644
--- a/packages/fetchai/skills/tac_participation/skill.yaml
+++ b/packages/fetchai/skills/tac_participation/skill.yaml
@@ -17,8 +17,8 @@ fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
-- fetchai/oef_search:0.6.0
-- fetchai/tac:0.6.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
 skills: []
 behaviours:
   tac_search:
diff --git a/packages/fetchai/skills/thermometer/skill.yaml b/packages/fetchai/skills/thermometer/skill.yaml
index 1e1194ec55..cfd58afabc 100644
--- a/packages/fetchai/skills/thermometer/skill.yaml
+++ b/packages/fetchai/skills/thermometer/skill.yaml
@@ -15,10 +15,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_seller:0.13.0
 behaviours:
diff --git a/packages/fetchai/skills/thermometer_client/skill.yaml b/packages/fetchai/skills/thermometer_client/skill.yaml
index 8f53b3b101..cdcb6fe238 100644
--- a/packages/fetchai/skills/thermometer_client/skill.yaml
+++ b/packages/fetchai/skills/thermometer_client/skill.yaml
@@ -16,10 +16,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_buyer:0.12.0
 behaviours:
diff --git a/packages/fetchai/skills/weather_client/skill.yaml b/packages/fetchai/skills/weather_client/skill.yaml
index c0f0253f86..074dc33692 100644
--- a/packages/fetchai/skills/weather_client/skill.yaml
+++ b/packages/fetchai/skills/weather_client/skill.yaml
@@ -15,10 +15,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_buyer:0.12.0
 behaviours:
diff --git a/packages/fetchai/skills/weather_station/skill.yaml b/packages/fetchai/skills/weather_station/skill.yaml
index 4dc6ece6a5..fde55e17ea 100644
--- a/packages/fetchai/skills/weather_station/skill.yaml
+++ b/packages/fetchai/skills/weather_station/skill.yaml
@@ -19,10 +19,10 @@ fingerprint_ignore_patterns:
 - '*.db'
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills:
 - fetchai/generic_seller:0.13.0
 behaviours:
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 06d740acae..24e36d42a3 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -1,72 +1,72 @@
-fetchai/agents/aries_alice,QmSzfcX1hnJ4raTS4yREwSEKQastCHM4Z9a6irY5Es3Toc
-fetchai/agents/aries_faber,QmaJEpXeh1rKsYyggoj5L2S3N37AAJdMuZxVQExyyKUDqx
-fetchai/agents/car_data_buyer,QmYNak5SGrrfkfp28Zm2osp5xKeFTBJPTPXruh2zTpcYH4
-fetchai/agents/car_detector,QmPDuvJLVi1kfobAEnHMouobZCBniwrxRnZiGRQt5KJHYi
-fetchai/agents/erc1155_client,QmQQmTrnLuVAqeez4vuL1pFLT8sNtHJWZCp9NTXcJvcupS
-fetchai/agents/erc1155_deployer,QmVa7cpE6dzhRA9RRnLvcXjftUs4ELDxh5MsvsZBVsK9BL
-fetchai/agents/generic_buyer,QmSsZKZos8qgQFBkqLdPb12dBXKGsfrkVMs6nuqJswJvx2
-fetchai/agents/generic_seller,QmdRy5T4qCF6njPBk7ZhWmKJrLJAte2aXCHsAURNXpb4R2
-fetchai/agents/gym_aea,QmUtKrUwVt63iKZxjncrBSz6eZ9g4RGWFM49qtA4JtFMCm
-fetchai/agents/ml_data_provider,QmQtHQkYgNivnP1WuBbpnRLFKtjZbhRyeZFBW64GXXqhEy
-fetchai/agents/ml_model_trainer,Qmbk9YkJ7AX4VPcxS1anFU1sEgcU8oZn5fbSv2KuErBWMW
-fetchai/agents/my_first_aea,QmdYThnxTmqZizzvJvYH1HmnT5HKn5MsprkkHA8k3dgDPZ
-fetchai/agents/simple_service_registration,QmWKm97p72CSV9A9i4yrVi5ucWhw2jqAurbBE8xkuwHLSQ
-fetchai/agents/tac_controller,QmSLFA3m31SB45De8SEYixvAGkPcpv6dqtKKkssTW97HpB
-fetchai/agents/tac_controller_contract,QmXY3FHDmK8RYh6Hb4aodxzjuG1d5iggn6UtnoJph8wvVE
-fetchai/agents/tac_participant,Qme3EP7MYHKre7GK2X5jZ4Pq973DaJPfpPXZX64gtp5iUk
-fetchai/agents/thermometer_aea,QmZzUqFVaDNGfwPnq5EvfPKNoMSfGzgpBic2z8HHWfu1RE
-fetchai/agents/thermometer_client,QmfMjh5gCDrdipCDYYrAr7jRDXJ2CpfWFij9t6J4EKdXYT
-fetchai/agents/weather_client,QmXyXQHxeJyBFSXLU2GZnV49t17iwnNLWWpUEFqMTAb8AE
-fetchai/agents/weather_station,QmW4kSbF5eKuh4itMJ8xKonaPejutaMp2GyobcN7V4zJR8
+fetchai/agents/aries_alice,Qme8sHgd9CZbBEbnS9zwDs53mYZM4EDpJf5RzQnE2QMy35
+fetchai/agents/aries_faber,QmVQXALXYg5M1Qbqznc4PqM5i4jDt8rFeHvDrq7DcoJx3B
+fetchai/agents/car_data_buyer,QmWk7So9UabsjTEKCkecYN9xwkwJxm4m78GA5VRYcWsQwe
+fetchai/agents/car_detector,QmbUnQ95vMmrL7ootzabP5hKr1iR2srJy3QWg6H2wr9Qib
+fetchai/agents/erc1155_client,QmYUsNAEr2dmx6CP9Jkd33eJMuSQL1uiBADivuUzM8tgiE
+fetchai/agents/erc1155_deployer,QmcbNaXp8vN2Vzbqy4vSKXj27WJK1sBcRf2HtL4eacTnac
+fetchai/agents/generic_buyer,Qme5rHfbeEhmia2RM4vjbiwk1h1o2JiiyyfYZze9jG3mUD
+fetchai/agents/generic_seller,QmPVuku1Cefn76S8rN6GsqdVz12AhbcK6hFMdDMYxsjiAM
+fetchai/agents/gym_aea,QmPP3rtaUY3jdzn1HXjV4dPyY2wYetbbNCqFCQbzbH1GRS
+fetchai/agents/ml_data_provider,QmZFTtD54jcwY8ozmhsdHHZqc2RNX9FZ8dfV8SgYJE9QYM
+fetchai/agents/ml_model_trainer,QmeZmVsNLUw7TP73s5cSomPnwggcrimXHh1RhrPRUDkoQ3
+fetchai/agents/my_first_aea,QmcHnFYQCyXnAM2pN2M4HqLNGJpWApUP7PuiKaPcLkxbas
+fetchai/agents/simple_service_registration,QmWtA9eDYnGKkg5hov887LRJSXTXovb9pp4NJzU7JMq5Lg
+fetchai/agents/tac_controller,QmaG56sZaJRm8DwJXXt9Ci18Va8NfXx6v8vEGKPJngKL4q
+fetchai/agents/tac_controller_contract,QmdaEL2THaQNNvvDqEhB3iN2mZva1g7RdyhhWV5mTDrbus
+fetchai/agents/tac_participant,QmQxN75ZFVEgizNHa3sqd2zHSnmPvRwS8PCv5FAsJBDnZw
+fetchai/agents/thermometer_aea,QmQ8KgTrt5fH8ZRDpioKGmeyUyc2EUkan4D5KzoFnCwxcG
+fetchai/agents/thermometer_client,QmUY6rmZnufWWmwfSi1m5gR6vD1ZowXpchpUJXgAH6xdNP
+fetchai/agents/weather_client,QmeMHc9hqpciJiRWrAJJszvyjTCs9rgsKC5S1nJRKV9sxQ
+fetchai/agents/weather_station,QmdJcUYuaTbb2J5k9jPcG215bJhKFQUQqJPhiaNoirijJ1
 fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
-fetchai/connections/http_client,QmfSuWhrseBCVcmzwKmqFDC6qX3ryFzfx2uuUTb8HPGuEd
-fetchai/connections/http_server,QmcqvHZbzGX1zdfwVTpqq5j6ugJhpuKEcrWkCW6JJrLJSC
-fetchai/connections/ledger,Qmb7dP2cQcYdYMthh5P7EwipNops9CKn2N3TBGNgwNnA2u
-fetchai/connections/local,Qmconur9cKrzYY1113AukHUPhgxUjzFrHExWnVpPBV8cRx
-fetchai/connections/oef,QmNpYX8XX6uXbFmBDi3s3W9qA48bRcrJatqSHAXDjhLwax
+fetchai/connections/http_client,QmaCa98anLuMAduNWtnApEwLWBcqdVkNBREBZ9T5VPSaUm
+fetchai/connections/http_server,QmT6JV2sB1rv7XZgx1bEpMjfQJAtpq775D2n8yvzKzSXYK
+fetchai/connections/ledger,QmYzBWDgAETzBr8PGPyKvdDMJMGPSo3KFiKVP9MmkVGfd9
+fetchai/connections/local,QmNXMDuB7vfGrhv2Q4R8REDicSUgXfVPd7x1tAP3847jsr
+fetchai/connections/oef,QmT6nbEYgjHPTwoXqV5FNeg7SUaraXGQGUhGeVGEhqXVDg
 fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
-fetchai/connections/p2p_stub,QmaP81r3ZCqKdL925fbRB8YKxHYaVBR1yW3iwzaErUYDSC
+fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmNLzoPJXUrFLoTKSy8WgF1ivedTyXrKXwd4tmA8mxn7As
+fetchai/connections/soef,QmRTHKvUhxiGjs3wWZKadWCD5fq6zG2m4sdhmyEbvADEaR
 fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
-fetchai/connections/tcp,QmQZBeN6EqH61GMLwuHqAw3LzdyKi7uj7zJtJ5ekYDpY4n
-fetchai/connections/webhook,QmXLbSSUSbsgqk3Zwo7sfBob5nKL6MLA4MCTQ3BXA2Bex3
+fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
+fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd
 fetchai/contracts/erc1155,QmWu22zW9AVMBVySwF413JMiT5dcWsLsU2gk1KvFYWAwPq
 fetchai/contracts/scaffold,QmTKkXifQKq5sTVdVKeD9UGnDwdJoEAoJDjY6qUPt9Bsv2
 fetchai/protocols/contract_api,QmZbbYPdpewfBfLWBQNGzjYr45ZDYJ5PqL5TMrMxa7PrjZ
-fetchai/protocols/default,QmaU6VsHxLfrFxcnBAzXNmYA7yQ23kRY1Ddq5pq4NsVhyu
-fetchai/protocols/fipa,QmYtTLb4Gk7eHo2Q8VwYZomTdUoa5N37a22Dnh4bjpTvxt
+fetchai/protocols/default,QmNjse6y7aBhtT2WZh3t7JYuGb4dYd2BmJzcYK3BeX641t
+fetchai/protocols/fipa,QmXdUfENAXFUntcybMjWvo816ccxG1Rf4DEv41TQVC85XM
 fetchai/protocols/gym,QmWv9Hi8cDypDYPLJTbbgXGmw6jvzZLUB2idbMTFdbDDqM
-fetchai/protocols/http,QmWDjfvkAGGt6eA1Ja6sXeBeGqE3vtNbGBwnVhGPJrEq4g
-fetchai/protocols/ledger_api,QmQERKQhT9JQNvy6vvT2xsQpv4GnEdvwGdFx7J6AY1j3hw
-fetchai/protocols/ml_trade,QmVrv8SnxKoRM5pZLWNB3tZP9VggvDK4ygDqy6DmweFKQH
-fetchai/protocols/oef_search,QmYPsjL1m3KUbT9UFSUickf19ydK6DLTNXT1sqtftJA1py
+fetchai/protocols/http,QmePja5ZBEv6nN7FfnURzgPa445vK9GQ2rdBPugZMVbkWR
+fetchai/protocols/ledger_api,QmS1zebL2Q6qPL8B6tD9iCLmXSCgAXSnCFmfeHAqGDdWa3
+fetchai/protocols/ml_trade,QmZoHGtvrAr5z4FrL7BTyKew2eQBudCJXwTpPciwrmcpuP
+fetchai/protocols/oef_search,QmWiRygk9JHtCJ6FbSK49uwkCzsSu6wJVqc27iQEwGphFR
 fetchai/protocols/scaffold,QmaQJxMae5XaHKDc838pcGEKhhYSUyKHGWiMfU6zEcVHsy
-fetchai/protocols/signing,QmaaX5WnjhFE4BKR99B2KN3yY9DmnHnavbUpzb8EQ612T3
-fetchai/protocols/state_update,QmeczT1eBFtY2Kr9ZcpzATJRmjDgqKSGhi3x1arCbhXTb6
-fetchai/protocols/tac,QmYryedEw85W99BYM8exZSERbkzHXPag6hp6HQtmmJppJ7
-fetchai/skills/aries_alice,QmXFSjt8FSHMnw4yjsmw4SVxKRj9N1i5aPcnmPpyoh3Bu1
-fetchai/skills/aries_faber,QmX3k9N3VmUE8bYaZ4KCq1Ny3ANTVw7sN8nuCRLDZcTTZK
-fetchai/skills/carpark_client,QmdfgS34Q7mo7yZ4uThZePudEoPgsmybC66YdVZAXYEybv
-fetchai/skills/carpark_detection,QmXwpLqW72SNbfEXrkHXCq6wucmsx6eTUTn9aZzXJaB8Gw
-fetchai/skills/echo,QmPu8BeKw5DRYdjHqVWqQnXjW1ZgRBjVthGmVerHLBmJPA
-fetchai/skills/erc1155_client,QmPceeYCnt1PC9dDv9EN9dHfzfFUESSZdEsKGTcesEVpsR
-fetchai/skills/erc1155_deploy,QmYyerCPVQg7zUagT6FxZEthdSFrLXKMG5LtJbCYnRPALN
-fetchai/skills/error,QmanfpyCmvUkqG9xsEyWULvi1ZZzqvggvs9LnQvSjuRhLb
-fetchai/skills/generic_buyer,Qmdx6M3y9gRCPJv5Lp8YnJP9nqJCgYAyp4gggqw9V85rY3
-fetchai/skills/generic_seller,Qmf1SYiBVfF6NYSir7ES9reSBpAGqtN9GkULH3fpBjatNZ
+fetchai/protocols/signing,Qmazm8bkwpPVV7BiJZx2Aha96AcmAxwiYbjgYGwvcgXGYi
+fetchai/protocols/state_update,QmS1xuSYYgHkQq8Ww2btsS88rTXXjhchyStzUfcWYQKNda
+fetchai/protocols/tac,QmY6N5spfcwikq3pb99mdYAEieECqmtawbcitGJRicDh7H
+fetchai/skills/aries_alice,QmefZJ27H36RZYgA6eEcnbv8yNPyf3YYXnBm5E88C8xBLQ
+fetchai/skills/aries_faber,QmYAQ8gVsokPsXHd7RDXb8KCkmH7XpB8JC7VMx3QrJX3Uh
+fetchai/skills/carpark_client,QmYjZXvq2h2DCXZF2ba9W5cvJAvsRFvBrw7h7EwcvWThfW
+fetchai/skills/carpark_detection,QmRLr3ALHF1iLFFpUmXHKZmMwbFz5vfph8qCv7rKQpte2r
+fetchai/skills/echo,QmYKGMNs5NU7ycWXRBQnKrfBcg5HPnUnH13K1YFnPLQgW6
+fetchai/skills/erc1155_client,Qmd6KJbis7Me39teeHA8y3JZHQrS1hjovMxhqiwViRZhgc
+fetchai/skills/erc1155_deploy,QmYbL8hgHTsEh7PkUJhK6pfENPai5XDtq6eH2RWQsARMKS
+fetchai/skills/error,QmTFECCHQHaSN3wP16EYgKeqgSgxBvfCRwX7F5uvxfkN3a
+fetchai/skills/generic_buyer,QmXFFS6V4ZaNWNqVdx5TnaqU5DizQDd9aWjbE9ACqCZsEU
+fetchai/skills/generic_seller,QmQivEfxdFGkWmaw9iMHJmEmgVv1TAAqihNT9CM8x3XzV2
 fetchai/skills/gym,QmUqB5EJafEGWX5xkTngAgXW2857RnCEk6St2HE5x9hgtZ
-fetchai/skills/http_echo,QmQk7NbMpMRT3GEKtPVkWFv2UzwJHajU27qQV9UHKV1xPz
-fetchai/skills/ml_data_provider,QmZS1fm9ZCmZ1quW1LH2K9tdBPWL2woHBdJ1N912vL7BsV
-fetchai/skills/ml_train,QmRgu8MwTF8CWfGTudkRPc6bGkQy3P8tLNmWYXCLcJiehg
+fetchai/skills/http_echo,QmQDMH3L5F5AzTDurwZkSd8S4LCyPVJhtrqrXe1KCa9NGk
+fetchai/skills/ml_data_provider,QmaKyLjyvcj35bCHaKKo15MeF7k48hKPCfFbrtvXCogYwV
+fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
-fetchai/skills/simple_service_registration,QmR3SLTfRxyqUQGpBkq3nGbB6Cfm9fXzXgaknJDGNe1Mkr
-fetchai/skills/tac_control,QmWtrSiEfdPocyDFHwADj2xmPCeP29iFhdcbfgWrRfT68b
-fetchai/skills/tac_control_contract,QmbhmoLPCWY7sKBDnN3qVxtnzsE8tXCJFEZsXyJBKwnfYL
-fetchai/skills/tac_negotiation,QmYHjhKPCNQ83gsthbW7qYygrLzuFUy3tiqwhwtieHdXEu
-fetchai/skills/tac_participation,Qmdh6sM8GPf53Kbr9HGPBvUD5goz4fYnFLwLLcdqo5pedn
-fetchai/skills/thermometer,Qmf2ntUbVmfawJw8AU2nfUf2m9Nrn8Qg6CQZNg1ECrcitc
-fetchai/skills/thermometer_client,QmP5vL38Nw4pkJ6y1UVvMwmBWazenMzSs2afHEfTzNqLEb
-fetchai/skills/weather_client,QmYDzApib8cgGnaQVfsibV7sfKNQzrDTeTFiYAakfUyoSb
-fetchai/skills/weather_station,QmXF23jHpe56wXr8HfBUgYBR63zRaHFsLkCWaWfXvb2mHi
+fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
+fetchai/skills/tac_control,QmP1T3wDa1e7Q692KkBuqtws9M2da3kdn5dNkB1WNPemuq
+fetchai/skills/tac_control_contract,QmSn9k1rLmfoq2wtKpQqfnSiKpka6pJ23pATsG4bw63Eh9
+fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
+fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
+fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1
+fetchai/skills/thermometer_client,QmXBkiJU23UVygpX5Zz34DaCNiKKGxkgJMs3RfLEPLSdTH
+fetchai/skills/weather_client,QmWohsaia5um76sce6gXN9jMeuHve26v6dm4xWHdwRaGA3
+fetchai/skills/weather_station,QmdcFK1rBSMbNVLXLwFyNizCfa77xUCUkEeBpvJChQurDV
diff --git a/tests/conftest.py b/tests/conftest.py
index 8e125d7ae3..6eda95ebaa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -198,7 +198,7 @@
 UNKNOWN_SKILL_PUBLIC_ID = PublicId("unknown_author", "unknown_skill", "0.1.0")
 LOCAL_CONNECTION_PUBLIC_ID = PublicId("fetchai", "local", "0.1.0")
 P2P_CLIENT_CONNECTION_PUBLIC_ID = PublicId("fetchai", "p2p_client", "0.1.0")
-HTTP_CLIENT_CONNECTION_PUBLIC_ID = PublicId.from_str("fetchai/http_client:0.8.0")
+HTTP_CLIENT_CONNECTION_PUBLIC_ID = PublicId.from_str("fetchai/http_client:0.9.0")
 HTTP_PROTOCOL_PUBLIC_ID = PublicId("fetchai", "http", "0.1.0")
 STUB_CONNECTION_PUBLIC_ID = DEFAULT_CONNECTION
 DUMMY_PROTOCOL_PUBLIC_ID = PublicId("dummy_author", "dummy", "0.1.0")
diff --git a/tests/data/aea-config.example.yaml b/tests/data/aea-config.example.yaml
index 9ac1a74f99..7c690e3e7e 100644
--- a/tests/data/aea-config.example.yaml
+++ b/tests/data/aea-config.example.yaml
@@ -7,16 +7,16 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/oef:0.9.0
+- fetchai/oef:0.10.0
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
-- fetchai/default:0.5.0
-- fetchai/tac:0.6.0
-- fetchai/fipa:0.6.0
+- fetchai/oef_search:0.7.0
+- fetchai/default:0.6.0
+- fetchai/tac:0.7.0
+- fetchai/fipa:0.7.0
 skills:
-- fetchai/echo:0.7.0
-default_connection: fetchai/oef:0.9.0
+- fetchai/echo:0.8.0
+default_connection: fetchai/oef:0.10.0
 default_ledger: cosmos
 logging_config:
   disable_existing_loggers: false
diff --git a/tests/data/aea-config.example_w_keys.yaml b/tests/data/aea-config.example_w_keys.yaml
index dd6aed732d..bb2da28530 100644
--- a/tests/data/aea-config.example_w_keys.yaml
+++ b/tests/data/aea-config.example_w_keys.yaml
@@ -7,16 +7,16 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/oef:0.9.0
+- fetchai/oef:0.10.0
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
-- fetchai/default:0.5.0
-- fetchai/tac:0.6.0
-- fetchai/fipa:0.6.0
+- fetchai/oef_search:0.7.0
+- fetchai/default:0.6.0
+- fetchai/tac:0.7.0
+- fetchai/fipa:0.7.0
 skills:
-- fetchai/echo:0.7.0
-default_connection: fetchai/oef:0.9.0
+- fetchai/echo:0.8.0
+default_connection: fetchai/oef:0.10.0
 default_ledger: cosmos
 logging_config:
   disable_existing_loggers: false
diff --git a/tests/data/dependencies_skill/skill.yaml b/tests/data/dependencies_skill/skill.yaml
index ecafdddd87..b8005667c3 100644
--- a/tests/data/dependencies_skill/skill.yaml
+++ b/tests/data/dependencies_skill/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills: []
 behaviours: {}
 handlers: {}
diff --git a/tests/data/dummy_aea/aea-config.yaml b/tests/data/dummy_aea/aea-config.yaml
index 3dc734de13..5c038adebf 100644
--- a/tests/data/dummy_aea/aea-config.yaml
+++ b/tests/data/dummy_aea/aea-config.yaml
@@ -7,17 +7,17 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/local:0.8.0
+- fetchai/local:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/oef_search:0.7.0
 skills:
 - dummy_author/dummy:0.1.0
-- fetchai/error:0.5.0
-default_connection: fetchai/local:0.8.0
+- fetchai/error:0.6.0
+default_connection: fetchai/local:0.9.0
 default_ledger: cosmos
 logging_config:
   disable_existing_loggers: false
diff --git a/tests/data/dummy_connection/connection.yaml b/tests/data/dummy_connection/connection.yaml
index c403c1a98c..606cb1eb8c 100644
--- a/tests/data/dummy_connection/connection.yaml
+++ b/tests/data/dummy_connection/connection.yaml
@@ -14,7 +14,7 @@ class_name: DummyConnection
 config: {}
 excluded_protocols: []
 restricted_to_protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 dependencies:
   dep1:
     version: ==1.0.0
diff --git a/tests/data/dummy_skill/skill.yaml b/tests/data/dummy_skill/skill.yaml
index a90fe3a4b6..4e8dd1ef71 100644
--- a/tests/data/dummy_skill/skill.yaml
+++ b/tests/data/dummy_skill/skill.yaml
@@ -16,7 +16,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills: []
 behaviours:
   dummy:
diff --git a/tests/data/hashes.csv b/tests/data/hashes.csv
index 8e4ba4b05d..f068b6b33c 100644
--- a/tests/data/hashes.csv
+++ b/tests/data/hashes.csv
@@ -1,6 +1,6 @@
-dummy_author/agents/dummy_aea,QmeFNeXh5vk81YwPnPY9qmBA5wrHeH8VsHkDcv6TqHvmFn
-dummy_author/skills/dummy_skill,QmQpimGAQ56nihemchgE29Mfan57YdGixj3kat69FGkrjK
-fetchai/connections/dummy_connection,QmT7zw62fDK1mmwYqTvw4pWqFg8Fc1DYQHUxcxd7sqZiLu
+dummy_author/agents/dummy_aea,QmaFcsXAx9mCjPnYEzATwGJyBFJRgCHftfYmKCfZtSGSLw
+dummy_author/skills/dummy_skill,QmTBZg36AhCipACz8x7eJsA5CHKqUQN1SwT3n8zX6n9XNF
+fetchai/connections/dummy_connection,QmWegP8qsY6Ngdh9xorMDCSA1UBjt4CrrPeVWQqyVfHvob
 fetchai/contracts/dummy_contract,QmPMs9VDGZGF8xJ8XBYLVb1xK5XAgiaJr5Gwcq7Vr3TUyu
-fetchai/skills/dependencies_skill,QmaLBgnwTXdTzue7H3UbVuKmPxaqoK4Azpj85tKTdQi29j
+fetchai/skills/dependencies_skill,Qmdn8AArsVSXPut57BXBjkctMYsFYeNnwUuRNe6cuTpbMu
 fetchai/skills/exception_skill,QmT2RiM95EVbXTD31zU6pKKoERkrCLuyxpAJfkm3dTsTp2
diff --git a/tests/test_aea.py b/tests/test_aea.py
index 57e5dca9aa..943b7e5be4 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -160,10 +160,10 @@ def test_react():
         builder.add_connection(
             Path(ROOT_DIR, "packages", "fetchai", "connections", "local")
         )
-        local_connection_id = PublicId.from_str("fetchai/local:0.8.0")
+        local_connection_id = PublicId.from_str("fetchai/local:0.9.0")
         builder.set_default_connection(local_connection_id)
         builder.add_skill(Path(CUR_PATH, "data", "dummy_skill"))
-        agent = builder.build(connection_ids=[PublicId.from_str("fetchai/local:0.8.0")])
+        agent = builder.build(connection_ids=[PublicId.from_str("fetchai/local:0.9.0")])
         # This is a temporary workaround to feed the local node to the OEF Local connection
         # TODO remove it.
         local_connection = agent.resources.get_connection(local_connection_id)
@@ -212,10 +212,10 @@ def test_handle():
         builder.add_connection(
             Path(ROOT_DIR, "packages", "fetchai", "connections", "local")
         )
-        local_connection_id = PublicId.from_str("fetchai/local:0.8.0")
+        local_connection_id = PublicId.from_str("fetchai/local:0.9.0")
         builder.set_default_connection(local_connection_id)
         builder.add_skill(Path(CUR_PATH, "data", "dummy_skill"))
-        aea = builder.build(connection_ids=[PublicId.from_str("fetchai/local:0.8.0")])
+        aea = builder.build(connection_ids=[PublicId.from_str("fetchai/local:0.9.0")])
         # This is a temporary workaround to feed the local node to the OEF Local connection
         # TODO remove it.
         local_connection = aea.resources.get_connection(local_connection_id)
@@ -310,10 +310,10 @@ def test_initialize_aea_programmatically():
         builder.add_connection(
             Path(ROOT_DIR, "packages", "fetchai", "connections", "local")
         )
-        local_connection_id = PublicId.from_str("fetchai/local:0.8.0")
+        local_connection_id = PublicId.from_str("fetchai/local:0.9.0")
         builder.set_default_connection(local_connection_id)
         builder.add_skill(Path(CUR_PATH, "data", "dummy_skill"))
-        aea = builder.build(connection_ids=[PublicId.from_str("fetchai/local:0.8.0")])
+        aea = builder.build(connection_ids=[PublicId.from_str("fetchai/local:0.9.0")])
         local_connection = aea.resources.get_connection(local_connection_id)
         local_connection._local_node = node
 
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index c7f15be116..60c1c3858b 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -96,7 +96,7 @@ def test_add_package_already_existing():
     builder.add_component(ComponentType.PROTOCOL, fipa_package_path)
 
     expected_message = re.escape(
-        "Component 'fetchai/fipa:0.6.0' of type 'protocol' already added."
+        "Component 'fetchai/fipa:0.7.0' of type 'protocol' already added."
     )
     with pytest.raises(AEAException, match=expected_message):
         builder.add_component(ComponentType.PROTOCOL, fipa_package_path)
@@ -106,12 +106,12 @@ def test_when_package_has_missing_dependency():
     """Test the case when the builder tries to load the packages, but fails because of a missing dependency."""
     builder = AEABuilder()
     expected_message = re.escape(
-        "Package 'fetchai/oef:0.9.0' of type 'connection' cannot be added. "
-        "Missing dependencies: ['(protocol, fetchai/oef_search:0.6.0)']"
+        "Package 'fetchai/oef:0.10.0' of type 'connection' cannot be added. "
+        "Missing dependencies: ['(protocol, fetchai/oef_search:0.7.0)']"
     )
     with pytest.raises(AEAException, match=expected_message):
-        # connection "fetchai/oef:0.9.0" requires
-        # "fetchai/oef_search:0.6.0" and "fetchai/fipa:0.6.0" protocols.
+        # connection "fetchai/oef:0.10.0" requires
+        # "fetchai/oef_search:0.7.0" and "fetchai/fipa:0.7.0" protocols.
         builder.add_component(
             ComponentType.CONNECTION,
             Path(ROOT_DIR) / "packages" / "fetchai" / "connections" / "oef",
diff --git a/tests/test_cli/test_add/test_connection.py b/tests/test_cli/test_add/test_connection.py
index 47cbef9433..97a6118774 100644
--- a/tests/test_cli/test_add/test_connection.py
+++ b/tests/test_cli/test_add/test_connection.py
@@ -57,7 +57,7 @@ def setup_class(cls):
         cls.connection_name = "http_client"
         cls.connection_author = "fetchai"
         cls.connection_version = "0.3.0"
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
 
@@ -148,7 +148,7 @@ def setup_class(cls):
         cls.connection_name = "http_client"
         cls.connection_author = "fetchai"
         cls.connection_version = "0.3.0"
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
 
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
@@ -345,7 +345,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
         cls.connection_name = "http_client"
 
         # copy the 'packages' directory in the parent of the agent folder.
@@ -413,7 +413,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
         cls.connection_name = "http_client"
 
         # copy the 'packages' directory in the parent of the agent folder.
diff --git a/tests/test_cli/test_add/test_skill.py b/tests/test_cli/test_add/test_skill.py
index 01d3a980ed..a2355f93e0 100644
--- a/tests/test_cli/test_add/test_skill.py
+++ b/tests/test_cli/test_add/test_skill.py
@@ -60,7 +60,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = PublicId.from_str("fetchai/error:0.5.0")
+        cls.skill_id = PublicId.from_str("fetchai/error:0.6.0")
         cls.skill_name = cls.skill_id.name
         cls.skill_author = cls.skill_id.author
         cls.skill_version = cls.skill_id.version
@@ -142,7 +142,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = PublicId.from_str("fetchai/echo:0.7.0")
+        cls.skill_id = PublicId.from_str("fetchai/echo:0.8.0")
         cls.skill_name = cls.skill_id.name
         cls.skill_author = cls.skill_id.author
         cls.skill_version = cls.skill_id.version
@@ -337,7 +337,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = "fetchai/echo:0.7.0"
+        cls.skill_id = "fetchai/echo:0.8.0"
         cls.skill_name = "echo"
 
         # copy the 'packages' directory in the parent of the agent folder.
@@ -409,7 +409,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.skill_id = "fetchai/echo:0.7.0"
+        cls.skill_id = "fetchai/echo:0.8.0"
         cls.skill_name = "echo"
 
         # copy the 'packages' directory in the parent of the agent folder.
@@ -487,7 +487,7 @@ class TestAddSkillFromRemoteRegistry(AEATestCaseEmpty):
     def test_add_skill_from_remote_registry_positive(self):
         """Test add skill from Registry positive result."""
         self.run_cli_command(
-            *["remove", "protocol", "fetchai/default:0.5.0"], cwd=self._get_cwd()
+            *["remove", "protocol", "fetchai/default:0.6.0"], cwd=self._get_cwd()
         )
         self.add_item("skill", "fetchai/echo:0.3.0", local=False)
 
diff --git a/tests/test_cli/test_interact.py b/tests/test_cli/test_interact.py
index 9d8adb5697..abd4b995da 100644
--- a/tests/test_cli/test_interact.py
+++ b/tests/test_cli/test_interact.py
@@ -201,7 +201,7 @@ class TestInteractEcho(AEATestCaseEmpty):
     @pytest.mark.integration
     def test_interact(self):
         """Test the 'aea interact' command with the echo skill."""
-        self.add_item("skill", "fetchai/echo:0.7.0")
+        self.add_item("skill", "fetchai/echo:0.8.0")
         self.run_agent()
         process = self.run_interaction()
 
@@ -209,7 +209,7 @@ def test_interact(self):
             process,
             [
                 "Starting AEA interaction channel...",
-                "Provide message of protocol fetchai/default:0.5.0 for performative bytes",
+                "Provide message of protocol fetchai/default:0.6.0 for performative bytes",
             ],
             timeout=10,
             is_terminating=False,
@@ -225,9 +225,9 @@ def test_interact(self):
                 "Sending envelope:",
                 f"to: {self.agent_name}",
                 f"sender: {self.agent_name}_interact",
-                "protocol_id: fetchai/default:0.5.0",
+                "protocol_id: fetchai/default:0.6.0",
                 "message_id=1,target=0,performative=bytes,content=b'hello')",
-                "Provide message of protocol fetchai/default:0.5.0 for performative bytes:",
+                "Provide message of protocol fetchai/default:0.6.0 for performative bytes:",
             ],
             timeout=10,
             is_terminating=False,
@@ -243,9 +243,9 @@ def test_interact(self):
                 "Received envelope:",
                 f"to: {self.agent_name}_interact",
                 f"sender: {self.agent_name}",
-                "protocol_id: fetchai/default:0.5.0",
+                "protocol_id: fetchai/default:0.6.0",
                 "message_id=2,target=1,performative=bytes,content=b'hello')",
-                "Provide message of protocol fetchai/default:0.5.0 for performative bytes:",
+                "Provide message of protocol fetchai/default:0.6.0 for performative bytes:",
             ],
             timeout=10,
             is_terminating=False,
@@ -259,7 +259,7 @@ def test_interact(self):
             [
                 "Interrupting input, checking inbox ...",
                 "Received no new envelope!",
-                "Provide message of protocol fetchai/default:0.5.0 for performative bytes:",
+                "Provide message of protocol fetchai/default:0.6.0 for performative bytes:",
             ],
             timeout=10,
             is_terminating=False,
diff --git a/tests/test_cli/test_remove/test_connection.py b/tests/test_cli/test_remove/test_connection.py
index 3e4b5f69b0..2ed0523fbd 100644
--- a/tests/test_cli/test_remove/test_connection.py
+++ b/tests/test_cli/test_remove/test_connection.py
@@ -47,7 +47,7 @@ def setup_class(cls):
         cls.t = tempfile.mkdtemp()
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
         cls.connection_name = "http_client"
 
         os.chdir(cls.t)
@@ -109,7 +109,7 @@ def setup_class(cls):
         cls.agent_name = "myagent"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
-        cls.connection_id = "fetchai/local:0.8.0"
+        cls.connection_id = "fetchai/local:0.9.0"
 
         os.chdir(cls.t)
         result = cls.runner.invoke(
@@ -164,7 +164,7 @@ def setup_class(cls):
         cls.t = tempfile.mkdtemp()
         # copy the 'packages' directory in the parent of the agent folder.
         shutil.copytree(Path(CUR_PATH, "..", "packages"), Path(cls.t, "packages"))
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
         cls.connection_name = "http_client"
 
         os.chdir(cls.t)
diff --git a/tests/test_cli/test_run.py b/tests/test_cli/test_run.py
index b263fe0677..d4f258cce7 100644
--- a/tests/test_cli/test_run.py
+++ b/tests/test_cli/test_run.py
@@ -76,7 +76,7 @@ def test_run():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
 
@@ -87,7 +87,7 @@ def test_run():
             "config",
             "set",
             "agent.default_connection",
-            "fetchai/http_client:0.8.0",
+            "fetchai/http_client:0.9.0",
         ],
     )
     assert result.exit_code == 0
@@ -168,9 +168,9 @@ def test_run_with_default_connection():
 @pytest.mark.parametrize(
     argnames=["connection_ids"],
     argvalues=[
-        ["fetchai/http_client:0.8.0,{}".format(str(DEFAULT_CONNECTION))],
-        ["'fetchai/http_client:0.8.0, {}'".format(str(DEFAULT_CONNECTION))],
-        ["fetchai/http_client:0.8.0,,{},".format(str(DEFAULT_CONNECTION))],
+        ["fetchai/http_client:0.9.0,{}".format(str(DEFAULT_CONNECTION))],
+        ["'fetchai/http_client:0.9.0, {}'".format(str(DEFAULT_CONNECTION))],
+        ["fetchai/http_client:0.9.0,,{},".format(str(DEFAULT_CONNECTION))],
     ],
 )
 def test_run_multiple_connections(connection_ids):
@@ -195,7 +195,7 @@ def test_run_multiple_connections(connection_ids):
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
 
@@ -251,7 +251,7 @@ def test_run_unknown_private_key():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
     result = runner.invoke(
@@ -261,7 +261,7 @@ def test_run_unknown_private_key():
             "config",
             "set",
             "agent.default_connection",
-            "fetchai/http_client:0.8.0",
+            "fetchai/http_client:0.9.0",
         ],
     )
     assert result.exit_code == 0
@@ -290,7 +290,7 @@ def test_run_unknown_private_key():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.9.0"],
         standalone_mode=False,
     )
 
@@ -326,7 +326,7 @@ def test_run_fet_private_key_config():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
 
@@ -350,7 +350,7 @@ def test_run_fet_private_key_config():
 
     error_msg = ""
     try:
-        cli.main([*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.8.0"])
+        cli.main([*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.9.0"])
     except SystemExit as e:
         error_msg = str(e)
 
@@ -385,7 +385,7 @@ def test_run_ethereum_private_key_config():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
 
@@ -409,7 +409,7 @@ def test_run_ethereum_private_key_config():
 
     error_msg = ""
     try:
-        cli.main([*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.8.0"])
+        cli.main([*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.9.0"])
     except SystemExit as e:
         error_msg = str(e)
 
@@ -447,7 +447,7 @@ def test_run_with_install_deps():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
     result = runner.invoke(
@@ -457,7 +457,7 @@ def test_run_with_install_deps():
             "config",
             "set",
             "agent.default_connection",
-            "fetchai/http_client:0.8.0",
+            "fetchai/http_client:0.9.0",
         ],
     )
     assert result.exit_code == 0
@@ -473,7 +473,7 @@ def test_run_with_install_deps():
                 "run",
                 "--install-deps",
                 "--connections",
-                "fetchai/http_client:0.8.0",
+                "fetchai/http_client:0.9.0",
             ],
             env=os.environ,
             maxread=10000,
@@ -519,7 +519,7 @@ def test_run_with_install_deps_and_requirement_file():
 
     result = runner.invoke(
         cli,
-        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.8.0"],
+        [*CLI_LOG_OPTION, "add", "--local", "connection", "fetchai/http_client:0.9.0"],
     )
     assert result.exit_code == 0
     result = runner.invoke(
@@ -529,7 +529,7 @@ def test_run_with_install_deps_and_requirement_file():
             "config",
             "set",
             "agent.default_connection",
-            "fetchai/http_client:0.8.0",
+            "fetchai/http_client:0.9.0",
         ],
     )
     assert result.exit_code == 0
@@ -549,7 +549,7 @@ def test_run_with_install_deps_and_requirement_file():
                 "run",
                 "--install-deps",
                 "--connections",
-                "fetchai/http_client:0.8.0",
+                "fetchai/http_client:0.9.0",
             ],
             env=os.environ,
             maxread=10000,
@@ -607,7 +607,7 @@ def setup_class(cls):
                 "add",
                 "--local",
                 "connection",
-                "fetchai/http_client:0.8.0",
+                "fetchai/http_client:0.9.0",
             ],
             standalone_mode=False,
         )
@@ -624,7 +624,7 @@ def setup_class(cls):
 
         try:
             cli.main(
-                [*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.8.0"]
+                [*CLI_LOG_OPTION, "run", "--connections", "fetchai/http_client:0.9.0"]
             )
         except SystemExit as e:
             cls.exit_code = e.code
@@ -874,7 +874,7 @@ def setup_class(cls):
         """Set the test up."""
         cls.runner = CliRunner()
         cls.agent_name = "myagent"
-        cls.connection_id = PublicId.from_str("fetchai/http_client:0.8.0")
+        cls.connection_id = PublicId.from_str("fetchai/http_client:0.9.0")
         cls.connection_name = cls.connection_id.name
         cls.connection_author = cls.connection_id.author
         cls.cwd = os.getcwd()
@@ -908,7 +908,7 @@ def setup_class(cls):
                 "config",
                 "set",
                 "agent.default_connection",
-                "fetchai/http_client:0.8.0",
+                "fetchai/http_client:0.9.0",
             ],
         )
         assert result.exit_code == 0
@@ -967,7 +967,7 @@ def setup_class(cls):
         """Set the test up."""
         cls.runner = CliRunner()
         cls.agent_name = "myagent"
-        cls.connection_id = PublicId.from_str("fetchai/http_client:0.8.0")
+        cls.connection_id = PublicId.from_str("fetchai/http_client:0.9.0")
         cls.connection_author = cls.connection_id.author
         cls.connection_name = cls.connection_id.name
         cls.cwd = os.getcwd()
@@ -1001,7 +1001,7 @@ def setup_class(cls):
                 "config",
                 "set",
                 "agent.default_connection",
-                "fetchai/http_client:0.8.0",
+                "fetchai/http_client:0.9.0",
             ],
         )
         assert result.exit_code == 0
@@ -1059,7 +1059,7 @@ def setup_class(cls):
         """Set the test up."""
         cls.runner = CliRunner()
         cls.agent_name = "myagent"
-        cls.connection_id = "fetchai/http_client:0.8.0"
+        cls.connection_id = "fetchai/http_client:0.9.0"
         cls.connection_name = "http_client"
         cls.cwd = os.getcwd()
         cls.t = tempfile.mkdtemp()
@@ -1092,7 +1092,7 @@ def setup_class(cls):
                 "config",
                 "set",
                 "agent.default_connection",
-                "fetchai/http_client:0.8.0",
+                "fetchai/http_client:0.9.0",
             ],
         )
         assert result.exit_code == 0
@@ -1246,7 +1246,7 @@ def setup_class(cls):
 
         result = cls.runner.invoke(
             cli,
-            [*CLI_LOG_OPTION, "add", "--local", "protocol", "fetchai/fipa:0.6.0"],
+            [*CLI_LOG_OPTION, "add", "--local", "protocol", "fetchai/fipa:0.7.0"],
             standalone_mode=False,
         )
         assert result.exit_code == 0
diff --git a/tests/test_cli/test_search.py b/tests/test_cli/test_search.py
index ebcad61cad..606f70e860 100644
--- a/tests/test_cli/test_search.py
+++ b/tests/test_cli/test_search.py
@@ -363,8 +363,8 @@ def test_exit_code_equal_to_zero(self):
 
     def test_correct_output(self,):
         """Test that the command has printed the correct output.."""
-        public_id_echo = PublicId.from_str("fetchai/echo:0.7.0")
-        public_id_error = PublicId.from_str("fetchai/error:0.5.0")
+        public_id_echo = PublicId.from_str("fetchai/echo:0.8.0")
+        public_id_error = PublicId.from_str("fetchai/error:0.6.0")
         expected = (
             'Searching for ""...\n'
             "Skills found:\n\n"
@@ -445,8 +445,8 @@ def test_exit_code_equal_to_zero(self):
 
     def test_correct_output(self,):
         """Test that the command has printed the correct output.."""
-        public_id_echo = PublicId.from_str("fetchai/echo:0.7.0")
-        public_id_error = PublicId.from_str("fetchai/error:0.5.0")
+        public_id_echo = PublicId.from_str("fetchai/echo:0.8.0")
+        public_id_error = PublicId.from_str("fetchai/error:0.6.0")
         expected = (
             'Searching for ""...\n'
             "Skills found:\n\n"
diff --git a/tests/test_cli/test_utils/test_utils.py b/tests/test_cli/test_utils/test_utils.py
index 341dc18c3f..90b33bee2e 100644
--- a/tests/test_cli/test_utils/test_utils.py
+++ b/tests/test_cli/test_utils/test_utils.py
@@ -280,7 +280,7 @@ class FindItemLocallyTestCase(TestCase):
     )
     def test_find_item_locally_bad_config(self, *mocks):
         """Test find_item_locally for bad config result."""
-        public_id = PublicIdMock.from_str("fetchai/echo:0.7.0")
+        public_id = PublicIdMock.from_str("fetchai/echo:0.8.0")
         with self.assertRaises(ClickException) as cm:
             find_item_locally(ContextMock(), "skill", public_id)
 
@@ -294,7 +294,7 @@ def test_find_item_locally_bad_config(self, *mocks):
     )
     def test_find_item_locally_cant_find(self, from_conftype_mock, *mocks):
         """Test find_item_locally for can't find result."""
-        public_id = PublicIdMock.from_str("fetchai/echo:0.7.0")
+        public_id = PublicIdMock.from_str("fetchai/echo:0.8.0")
         with self.assertRaises(ClickException) as cm:
             find_item_locally(ContextMock(), "skill", public_id)
 
@@ -313,7 +313,7 @@ class FindItemInDistributionTestCase(TestCase):
     )
     def testfind_item_in_distribution_bad_config(self, *mocks):
         """Test find_item_in_distribution for bad config result."""
-        public_id = PublicIdMock.from_str("fetchai/echo:0.7.0")
+        public_id = PublicIdMock.from_str("fetchai/echo:0.8.0")
         with self.assertRaises(ClickException) as cm:
             find_item_in_distribution(ContextMock(), "skill", public_id)
 
@@ -322,7 +322,7 @@ def testfind_item_in_distribution_bad_config(self, *mocks):
     @mock.patch("aea.cli.utils.package_utils.Path.exists", return_value=False)
     def testfind_item_in_distribution_not_found(self, *mocks):
         """Test find_item_in_distribution for not found result."""
-        public_id = PublicIdMock.from_str("fetchai/echo:0.7.0")
+        public_id = PublicIdMock.from_str("fetchai/echo:0.8.0")
         with self.assertRaises(ClickException) as cm:
             find_item_in_distribution(ContextMock(), "skill", public_id)
 
@@ -336,7 +336,7 @@ def testfind_item_in_distribution_not_found(self, *mocks):
     )
     def testfind_item_in_distribution_cant_find(self, from_conftype_mock, *mocks):
         """Test find_item_locally for can't find result."""
-        public_id = PublicIdMock.from_str("fetchai/echo:0.7.0")
+        public_id = PublicIdMock.from_str("fetchai/echo:0.8.0")
         with self.assertRaises(ClickException) as cm:
             find_item_in_distribution(ContextMock(), "skill", public_id)
 
diff --git a/tests/test_cli_gui/test_run_agent.py b/tests/test_cli_gui/test_run_agent.py
index cdf4611e31..1912b998f1 100644
--- a/tests/test_cli_gui/test_run_agent.py
+++ b/tests/test_cli_gui/test_run_agent.py
@@ -63,7 +63,7 @@ def test_create_and_run_agent():
             response_add = app.post(
                 "api/agent/" + agent_id + "/connection",
                 content_type="application/json",
-                data=json.dumps("fetchai/local:0.8.0"),
+                data=json.dumps("fetchai/local:0.9.0"),
             )
             assert response_add.status_code == 201
 
diff --git a/tests/test_connections/test_stub.py b/tests/test_connections/test_stub.py
index 113b9936d6..d6c9346796 100644
--- a/tests/test_connections/test_stub.py
+++ b/tests/test_connections/test_stub.py
@@ -140,11 +140,11 @@ def test_reception_b(self):
 
     def test_reception_c(self):
         """Test that the connection receives what has been enqueued in the input file."""
-        encoded_envelope = b"0x5E22777dD831A459535AA4306AceC9cb22eC4cB5,default_oef,fetchai/oef_search:0.6.0,\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd,"
+        encoded_envelope = b"0x5E22777dD831A459535AA4306AceC9cb22eC4cB5,default_oef,fetchai/oef_search:0.7.0,\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd,"
         expected_envelope = Envelope(
             to="0x5E22777dD831A459535AA4306AceC9cb22eC4cB5",
             sender="default_oef",
-            protocol_id=PublicId.from_str("fetchai/oef_search:0.6.0"),
+            protocol_id=PublicId.from_str("fetchai/oef_search:0.7.0"),
             message=b"\x08\x02\x12\x011\x1a\x011 \x01:,\n*0x32468dB8Ab79549B49C88DC991990E7910891dbd",
         )
         with open(self.input_file_path, "ab+") as f:
diff --git a/tests/test_docs/test_agent_vs_aea/agent_code_block.py b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
index e219fd1420..0a7f29ac47 100644
--- a/tests/test_docs/test_agent_vs_aea/agent_code_block.py
+++ b/tests/test_docs/test_agent_vs_aea/agent_code_block.py
@@ -113,7 +113,7 @@ def run():
 
         # Create a message inside an envelope and get the stub connection to pass it into the agent
         message_text = (
-            b"my_agent,other_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            b"my_agent,other_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         with open(INPUT_FILE, "wb") as f:
             write_with_lock(f, message_text)
diff --git a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
index 154f9bf84d..65ff225dc2 100644
--- a/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
+++ b/tests/test_docs/test_agent_vs_aea/test_agent_vs_aea.py
@@ -61,7 +61,7 @@ def test_run_agent(self):
         assert os.path.exists(Path(self.t, "input_file"))
 
         message_text = (
-            b"other_agent,my_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            b"other_agent,my_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         path = os.path.join(self.t, "output_file")
         with open(path, "rb") as file:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md b/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md
index 0c2e6b7738..17edd0104d 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-aries-cloud-agent-demo.md
@@ -22,10 +22,10 @@ cd aries_alice
 aea create aries_alice
 cd aries_alice
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/http_client:0.8.0
-aea add connection fetchai/webhook:0.6.0
-aea add skill fetchai/aries_alice:0.7.0
+aea add connection fetchai/soef:0.9.0
+aea add connection fetchai/http_client:0.9.0
+aea add connection fetchai/webhook:0.7.0
+aea add skill fetchai/aries_alice:0.8.0
 ```
 ``` bash
 aea config set vendor.fetchai.skills.aries_alice.models.strategy.args.admin_host 127.0.0.1
@@ -61,10 +61,10 @@ cd aries_faber
 aea create aries_faber
 cd aries_faber
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
-aea add connection fetchai/http_client:0.8.0
-aea add connection fetchai/webhook:0.6.0
-aea add skill fetchai/aries_faber:0.6.0
+aea add connection fetchai/soef:0.9.0
+aea add connection fetchai/http_client:0.9.0
+aea add connection fetchai/webhook:0.7.0
+aea add skill fetchai/aries_faber:0.7.0
 ```
 ``` bash
 aea config set vendor.fetchai.skills.aries_faber.models.strategy.args.admin_host 127.0.0.1
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md
index de141063dc..526aada233 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-car-park-skills.md
@@ -7,7 +7,7 @@ aea install
 aea create car_detector
 cd car_detector
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/carpark_detection:0.12.0
 aea install
@@ -22,7 +22,7 @@ aea install
 aea create car_data_buyer
 cd car_data_buyer
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/carpark_client:0.12.0
 aea install
@@ -54,13 +54,13 @@ aea delete car_data_buyer
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-config.md b/tests/test_docs/test_bash_yaml/md_files/bash-config.md
index 0041a7c21b..0032df43c0 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-config.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-config.md
@@ -17,9 +17,9 @@ connections:                                    # The list of connection public
 - fetchai/stub:0.9.0
 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:0.5.0
+- fetchai/default:0.6.0
 skills:                                         # The list of skill public ids the AEA project depends on (each public id must satisfy PUBLIC_ID_REGEX).
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 default_connection: fetchai/p2p_libp2p:0.10.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)
 logging_config:                                 # The logging configurations the AEA project uses
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md
index d44f8d086b..5dba54b5a9 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-erc1155-skills.md
@@ -7,7 +7,7 @@ aea install
 aea create erc1155_deployer
 cd erc1155_deployer
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/erc1155_deploy:0.14.0
 aea install
@@ -33,7 +33,7 @@ aea install
 aea create erc1155_client
 cd erc1155_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/erc1155_client:0.13.0
 aea install
@@ -76,14 +76,14 @@ aea delete erc1155_client
 ``` yaml
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md
index 760425d948..d0349421f3 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills-step-by-step.md
@@ -49,19 +49,19 @@ aea generate-wealth fetchai --sync
 ```
 ``` bash
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
-aea add protocol fetchai/fipa:0.6.0
+aea add protocol fetchai/fipa:0.7.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea run
 ```
 ``` bash 
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
-aea add protocol fetchai/fipa:0.6.0
-aea add protocol fetchai/signing:0.3.0
+aea add protocol fetchai/fipa:0.7.0
+aea add protocol fetchai/signing:0.4.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 ```
@@ -91,10 +91,10 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   service_registration:
@@ -160,11 +160,11 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/default:0.5.0
-- fetchai/fipa:0.6.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
 skills: []
 behaviours:
   search:
@@ -225,8 +225,8 @@ addr: ${OEF_ADDR: 127.0.0.1}
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md
index 6f01f1085c..f4454ad427 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-generic-skills.md
@@ -7,7 +7,7 @@ aea install
 aea create my_seller_aea
 cd my_seller_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/generic_seller:0.13.0
 aea install
@@ -22,7 +22,7 @@ aea install
 aea create my_buyer_aea
 cd my_buyer_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/generic_buyer:0.12.0
 aea install
@@ -62,13 +62,13 @@ aea delete my_buyer_aea
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 models:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md
index c456c45c1e..2c64e18ca6 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-http-connection-and-skill.md
@@ -3,10 +3,10 @@ aea create my_aea
 cd my_aea
 ```
 ``` bash
-aea add connection fetchai/http_server:0.8.0
+aea add connection fetchai/http_server:0.9.0
 ```
 ``` bash
-aea config set agent.default_connection fetchai/http_server:0.8.0
+aea config set agent.default_connection fetchai/http_server:0.9.0
 ```
 ``` bash
 aea config set vendor.fetchai.connections.http_server.config.api_spec_path "../examples/http_ex/petstore.yaml"
@@ -18,7 +18,7 @@ aea install
 aea scaffold skill http_echo
 ```
 ``` bash
-aea fingerprint skill fetchai/http_echo:0.6.0
+aea fingerprint skill fetchai/http_echo:0.7.0
 ```
 ``` bash
 aea run
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-logging.md b/tests/test_docs/test_bash_yaml/md_files/bash-logging.md
index 569ad3f700..2482123a70 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-logging.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-logging.md
@@ -15,9 +15,9 @@ connections:
 - fetchai/stub:0.9.0
 contracts: []
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 skills:
-- fetchai/error:0.5.0
+- fetchai/error:0.6.0
 default_connection: fetchai/stub:0.9.0
 default_ledger: fetchai
 logging_config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md
index 901ad6cab9..8d369d30e1 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-ml-skills.md
@@ -7,7 +7,7 @@ aea install
 aea create ml_data_provider
 cd ml_data_provider
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/ml_data_provider:0.12.0
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
@@ -22,7 +22,7 @@ aea install
 aea create ml_model_trainer
 cd ml_model_trainer
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/ml_train:0.12.0
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
@@ -54,13 +54,13 @@ aea delete ml_model_trainer
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md b/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md
index 9984fab6fd..d62b6c9dcb 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-orm-integration.md
@@ -7,7 +7,7 @@ aea install
 aea create my_thermometer_aea
 cd my_thermometer_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer:0.12.0
 aea install
@@ -22,7 +22,7 @@ aea install
 aea create my_thermometer_client
 cd my_thermometer_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer_client:0.11.0
 aea install
@@ -63,13 +63,13 @@ aea delete my_thermometer_client
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 models:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md b/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md
index e316c52cb9..422262bf4b 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-p2p-connection.md
@@ -54,8 +54,8 @@ config:
 ```
 ``` yaml
 default_routing:
-  ? "fetchai/oef_search:0.6.0"
-  : "fetchai/oef:0.9.0"
+  ? "fetchai/oef_search:0.7.0"
+  : "fetchai/oef:0.10.0"
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
index bb68980c7a..fd9adbf3d6 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
@@ -41,7 +41,7 @@ v0.6.1
 AEA configurations successfully initialized: {'author': 'fetchai'}
 ```
 ``` bash
-aea fetch fetchai/my_first_aea:0.11.0
+aea fetch fetchai/my_first_aea:0.12.0
 cd my_first_aea
 ```
 ``` bash
@@ -49,13 +49,13 @@ aea create my_first_aea
 cd my_first_aea
 ```
 ``` bash
-aea add skill fetchai/echo:0.7.0
+aea add skill fetchai/echo:0.8.0
 ```
 ``` bash
 TO,SENDER,PROTOCOL_ID,ENCODED_MESSAGE,
 ```
 ``` bash
-recipient_aea,sender_aea,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,
+recipient_aea,sender_aea,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,
 ```
 ``` bash
 aea run
@@ -92,7 +92,7 @@ info: Echo Behaviour: act method called.
 info: Echo Behaviour: act method called.
 ```
 ``` bash
-echo 'my_first_aea,sender_aea,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,' >> input_file
+echo 'my_first_aea,sender_aea,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,' >> input_file
 ```
 ``` bash
 info: Echo Behaviour: act method called.
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md b/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md
index d132e978f1..2cf8e232b9 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-skill-guide.md
@@ -6,10 +6,10 @@ aea scaffold skill my_search
 aea fingerprint skill fetchai/my_search:0.1.0
 ```
 ``` bash
-aea add protocol fetchai/oef_search:0.6.0
+aea add protocol fetchai/oef_search:0.7.0
 ```
 ``` bash
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/p2p_libp2p:0.10.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
@@ -45,7 +45,7 @@ fingerprint: {}
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   my_search_behaviour:
@@ -72,7 +72,7 @@ dependencies: {}
 ```
 ``` yaml
 default_routing:
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 name: simple_service_registration
@@ -91,7 +91,7 @@ fingerprint:
 fingerprint_ignore_patterns: []
 contracts: []
 protocols:
-- fetchai/oef_search:0.6.0
+- fetchai/oef_search:0.7.0
 skills: []
 behaviours:
   service:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-skill.md b/tests/test_docs/test_bash_yaml/md_files/bash-skill.md
index 16c892b336..ef0ab5fad6 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-skill.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-skill.md
@@ -16,5 +16,5 @@ handlers:
 models: {}
 dependencies: {}
 protocols:
-- fetchai/default:0.5.0
+- fetchai/default:0.6.0
 ```
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
index dba8940de7..0003698f96 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
@@ -7,7 +7,7 @@ aea install
 aea create tac_controller_contract
 cd tac_controller_contract
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_control_contract:0.9.0
 aea install
@@ -43,7 +43,7 @@ aea create tac_participant_two
 ``` bash
 cd tac_participant_one
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -56,7 +56,7 @@ aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_con
 ``` bash
 cd tac_participant_two
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -124,5 +124,5 @@ models:
     class_name: Transactions
     args:
       pending_transaction_timeout: 30
-protocols: ['fetchai/oef_search:0.6.0', 'fetchai/fipa:0.6.0']
+protocols: ['fetchai/oef_search:0.7.0', 'fetchai/fipa:0.7.0']
 ```
\ No newline at end of file
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
index 1eb1768963..b21b9cf691 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
@@ -7,9 +7,9 @@ aea install
 aea create tac_controller
 cd tac_controller
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
-aea add skill fetchai/tac_control:0.7.0
+aea add skill fetchai/tac_control:0.8.0
 aea install
 aea config set agent.default_connection fetchai/p2p_libp2p:0.10.0
 aea config set agent.default_ledger fetchai
@@ -27,7 +27,7 @@ aea create tac_participant_two
 ``` bash
 cd tac_participant_one
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -38,7 +38,7 @@ aea config set agent.default_ledger fetchai
 ``` bash
 cd tac_participant_two
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/tac_participation:0.9.0
 aea add skill fetchai/tac_negotiation:0.10.0
@@ -68,17 +68,17 @@ aea delete tac_participant_two
 ```
 ``` yaml
 default_routing:
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md
index 61fe285d41..f592063fc2 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-thermometer-skills.md
@@ -7,7 +7,7 @@ aea install
 aea create my_thermometer_aea
 cd my_thermometer_aea
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer:0.12.0
 aea install
@@ -22,7 +22,7 @@ aea install
 aea create my_thermometer_client
 cd my_thermometer_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/thermometer_client:0.11.0
 aea install
@@ -54,13 +54,13 @@ aea delete my_thermometer_client
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md
index c138469064..f1057e4bd7 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-weather-skills.md
@@ -7,7 +7,7 @@ aea install
 aea create my_weather_station
 cd my_weather_station
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/weather_station:0.12.0
 aea install
@@ -22,7 +22,7 @@ aea install
 aea create my_weather_client
 cd my_weather_client
 aea add connection fetchai/p2p_libp2p:0.10.0
-aea add connection fetchai/soef:0.8.0
+aea add connection fetchai/soef:0.9.0
 aea add connection fetchai/ledger:0.6.0
 aea add skill fetchai/weather_client:0.11.0
 aea install
@@ -54,13 +54,13 @@ aea delete my_weather_client
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 default_routing:
-  fetchai/ledger_api:0.3.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ```
 ``` yaml
 config:
diff --git a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
index bdbac810af..656673d69d 100644
--- a/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/programmatic_aea.py
@@ -100,7 +100,7 @@ def handle(self, message: Message) -> None:
         time.sleep(4)
 
         # Create a message inside an envelope and get the stub connection to pass it on to the echo skill
-        message_text = b"my_aea,other_agent,fetchai/default:0.5.0,\x08\x01\x12\x011*\x07\n\x05hello,"
+        message_text = b"my_aea,other_agent,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello,"
         with open(INPUT_FILE, "wb") as f:
             write_with_lock(f, message_text)
             print(b"input message: " + message_text)
diff --git a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
index 290a7a7295..bdb7052a06 100644
--- a/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
+++ b/tests/test_docs/test_build_aea_programmatically/test_programmatic_aea.py
@@ -59,7 +59,7 @@ def test_run_agent(self):
         assert os.path.exists(Path(self.t, "output_file"))
         assert os.path.exists(Path(self.t, DEFAULT_PRIVATE_KEY_FILE))
 
-        message_text_1 = b"other_agent,my_aea,fetchai/default:0.5.0,"
+        message_text_1 = b"other_agent,my_aea,fetchai/default:0.6.0,"
         message_text_2 = b"\x01*\x07\n\x05hello,"
         path = os.path.join(self.t, "output_file")
         with open(path, "rb") as file:
diff --git a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
index 79428e901d..4785ffb54d 100644
--- a/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
+++ b/tests/test_docs/test_cli_vs_programmatic_aeas/programmatic_aea.py
@@ -78,8 +78,8 @@ def run():
 
     # specify the default routing for some protocols
     default_routing = {
-        PublicId.from_str("fetchai/ledger_api:0.3.0"): LedgerConnection.connection_id,
-        PublicId.from_str("fetchai/oef_search:0.6.0"): SOEFConnection.connection_id,
+        PublicId.from_str("fetchai/ledger_api:0.4.0"): LedgerConnection.connection_id,
+        PublicId.from_str("fetchai/oef_search:0.7.0"): SOEFConnection.connection_id,
     }
     default_connection = P2PLibp2pConnection.connection_id
 
@@ -146,7 +146,7 @@ def run():
         api_key=API_KEY,
         soef_addr=SOEF_ADDR,
         soef_port=SOEF_PORT,
-        restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.6.0")},
+        restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.7.0")},
         connection_id=SOEFConnection.connection_id,
     )
     soef_connection = SOEFConnection(configuration=configuration, identity=identity)
diff --git a/tests/test_docs/test_docs_protocol.py b/tests/test_docs/test_docs_protocol.py
index 1bec995f56..00a6ce763f 100644
--- a/tests/test_docs/test_docs_protocol.py
+++ b/tests/test_docs/test_docs_protocol.py
@@ -69,7 +69,7 @@ def test_custom_protocol(self):
         )
 
     def test_oef_search_protocol(self):
-        """Test the fetchai/oef_search:0.6.0 protocol documentation."""
+        """Test the fetchai/oef_search:0.7.0 protocol documentation."""
         # this is the offset of code blocks for the section under testing
         offset = 4
 
@@ -106,7 +106,7 @@ def test_oef_search_protocol(self):
         compare_enum_classes(ExpectedOefErrorOperation, ActualOefErrorOperation)
 
     def test_fipa_protocol(self):
-        """Test the fetchai/fipa:0.6.0 documentation."""
+        """Test the fetchai/fipa:0.7.0 documentation."""
         offset = 15
         locals_dict = {"Enum": Enum}
         compile_and_exec(self.code_blocks[offset]["text"], locals_dict=locals_dict)
diff --git a/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
index 53c69f4f8b..69d4cfaebc 100644
--- a/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/multiplexer_standalone.py
@@ -65,7 +65,7 @@ def run():
 
         # Create a message inside an envelope and get the stub connection to pass it into the multiplexer
         message_text = (
-            "multiplexer,some_agent,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            "multiplexer,some_agent,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         with open(INPUT_FILE, "w") as f:
             write_with_lock(f, message_text)
diff --git a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
index b67134a50c..62dfe2ab8a 100644
--- a/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
+++ b/tests/test_docs/test_multiplexer_standalone/test_multiplexer_standalone.py
@@ -58,7 +58,7 @@ def test_run_agent(self):
         assert os.path.exists(Path(self.t, "output.txt"))
 
         message_text = (
-            "some_agent,multiplexer,fetchai/default:0.5.0,\x08\x01*\x07\n\x05hello,"
+            "some_agent,multiplexer,fetchai/default:0.6.0,\x08\x01*\x07\n\x05hello,"
         )
         path = os.path.join(str(self.t), "output.txt")
         with open(path, "r", encoding="utf-8") as file:
diff --git a/tests/test_docs/test_orm_integration/test_orm_integration.py b/tests/test_docs/test_orm_integration/test_orm_integration.py
index 5b3448a617..c82b6eb22a 100644
--- a/tests/test_docs/test_orm_integration/test_orm_integration.py
+++ b/tests/test_docs/test_orm_integration/test_orm_integration.py
@@ -126,8 +126,8 @@ def test_orm_integration_docs_example(self):
         self.create_agents(seller_aea_name, buyer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -139,7 +139,7 @@ def test_orm_integration_docs_example(self):
         # Setup seller
         self.set_agent_context(seller_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/thermometer:0.12.0")
@@ -185,7 +185,7 @@ def test_orm_integration_docs_example(self):
         # Setup Buyer
         self.set_agent_context(buyer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/thermometer_client:0.11.0")
diff --git a/tests/test_docs/test_skill_guide/test_skill_guide.py b/tests/test_docs/test_skill_guide/test_skill_guide.py
index 87fcc76cad..c48519f435 100644
--- a/tests/test_docs/test_skill_guide/test_skill_guide.py
+++ b/tests/test_docs/test_skill_guide/test_skill_guide.py
@@ -94,7 +94,7 @@ def test_update_skill_and_run(self):
         self.force_set_config(setting_path, COSMOS)
 
         default_routing = {
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # replace location
@@ -108,7 +108,7 @@ def test_update_skill_and_run(self):
         skill_id = AUTHOR + "/" + skill_name + ":" + DEFAULT_VERSION
         self.scaffold_item("skill", skill_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server.py b/tests/test_packages/test_connections/test_http_server/test_http_server.py
index a3db1f3fe9..7f8ce4bc3d 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server.py
@@ -119,7 +119,7 @@ def setup(self):
             ROOT_DIR, "tests", "data", "petstore_sim.yaml"
         )
         self.connection_id = HTTPServerConnection.connection_id
-        self.protocol_id = PublicId.from_str("fetchai/http:0.5.0")
+        self.protocol_id = PublicId.from_str("fetchai/http:0.6.0")
 
         self.configuration = ConnectionConfig(
             host=self.host,
diff --git a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
index 7998701578..6dc25ac3c2 100644
--- a/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
+++ b/tests/test_packages/test_connections/test_http_server/test_http_server_and_client.py
@@ -53,7 +53,7 @@ def setup_server(self):
         self.host = get_host()
         self.port = get_unused_tcp_port()
         self.connection_id = HTTPServerConnection.connection_id
-        self.protocol_id = PublicId.from_str("fetchai/http:0.5.0")
+        self.protocol_id = PublicId.from_str("fetchai/http:0.6.0")
 
         self.configuration = ConnectionConfig(
             host=self.host,
diff --git a/tests/test_packages/test_connections/test_soef/test_soef.py b/tests/test_packages/test_connections/test_soef/test_soef.py
index 7f887bea0d..4666c67b9b 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef.py
@@ -120,7 +120,7 @@ def setup(self):
             api_key="TwiCIriSl0mLahw17pyqoA",
             soef_addr="soef.fetch.ai",
             soef_port=9002,
-            restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.6.0")},
+            restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.7.0")},
             connection_id=SOEFConnection.connection_id,
         )
         self.connection = SOEFConnection(
@@ -661,7 +661,7 @@ def test_chain_identifier_fail(self):
             api_key="TwiCIriSl0mLahw17pyqoA",
             soef_addr="soef.fetch.ai",
             soef_port=9002,
-            restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.6.0")},
+            restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.7.0")},
             connection_id=SOEFConnection.connection_id,
             chain_identifier=chain_identifier,
         )
@@ -679,7 +679,7 @@ def test_chain_identifier_ok(self):
             api_key="TwiCIriSl0mLahw17pyqoA",
             soef_addr="soef.fetch.ai",
             soef_port=9002,
-            restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.6.0")},
+            restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.7.0")},
             connection_id=SOEFConnection.connection_id,
             chain_identifier=chain_identifier,
         )
diff --git a/tests/test_packages/test_connections/test_soef/test_soef_integration.py b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
index 0ab0ef729a..d3680d26f2 100644
--- a/tests/test_packages/test_connections/test_soef/test_soef_integration.py
+++ b/tests/test_packages/test_connections/test_soef/test_soef_integration.py
@@ -66,7 +66,7 @@ def make_multiplexer_and_dialogues() -> Tuple[Multiplexer, OefSearchDialogues, C
         api_key="TwiCIriSl0mLahw17pyqoA",
         soef_addr="soef.fetch.ai",
         soef_port=9002,
-        restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.6.0")},
+        restricted_to_protocols={PublicId.from_str("fetchai/oef_search:0.7.0")},
         connection_id=SOEFConnection.connection_id,
     )
     soef_connection = SOEFConnection(configuration=configuration, identity=identity,)
diff --git a/tests/test_packages/test_connections/test_webhook/test_webhook.py b/tests/test_packages/test_connections/test_webhook/test_webhook.py
index 83b37b13fd..1c40eabdc6 100644
--- a/tests/test_packages/test_connections/test_webhook/test_webhook.py
+++ b/tests/test_packages/test_connections/test_webhook/test_webhook.py
@@ -164,7 +164,7 @@ async def test_send(self):
         envelope = Envelope(
             to="addr",
             sender="my_id",
-            protocol_id=PublicId.from_str("fetchai/http:0.5.0"),
+            protocol_id=PublicId.from_str("fetchai/http:0.6.0"),
             message=http_message,
         )
         with patch.object(self.webhook_connection.logger, "warning") as mock_logger:
diff --git a/tests/test_packages/test_skills/test_carpark.py b/tests/test_packages/test_skills/test_carpark.py
index a95f7128b1..28d3996b69 100644
--- a/tests/test_packages/test_skills/test_carpark.py
+++ b/tests/test_packages/test_skills/test_carpark.py
@@ -51,8 +51,8 @@ def test_carpark(self):
         self.create_agents(carpark_aea_name, carpark_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -64,7 +64,7 @@ def test_carpark(self):
         # Setup agent one
         self.set_agent_context(carpark_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/carpark_detection:0.12.0")
@@ -99,7 +99,7 @@ def test_carpark(self):
         # Setup agent two
         self.set_agent_context(carpark_client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/carpark_client:0.12.0")
@@ -226,8 +226,8 @@ def test_carpark(self):
         self.create_agents(carpark_aea_name, carpark_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -239,7 +239,7 @@ def test_carpark(self):
         # Setup agent one
         self.set_agent_context(carpark_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/carpark_detection:0.12.0")
@@ -277,7 +277,7 @@ def test_carpark(self):
         # Setup agent two
         self.set_agent_context(carpark_client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/carpark_client:0.12.0")
diff --git a/tests/test_packages/test_skills/test_echo.py b/tests/test_packages/test_skills/test_echo.py
index 5a8826f941..9a59110501 100644
--- a/tests/test_packages/test_skills/test_echo.py
+++ b/tests/test_packages/test_skills/test_echo.py
@@ -65,7 +65,7 @@ class TestEchoSkill(AEATestCaseEmpty):
 
     def test_echo(self):
         """Run the echo skill sequence."""
-        self.add_item("skill", "fetchai/echo:0.7.0")
+        self.add_item("skill", "fetchai/echo:0.8.0")
 
         process = self.run_agent()
         is_running = self.is_running(process)
diff --git a/tests/test_packages/test_skills/test_erc1155.py b/tests/test_packages/test_skills/test_erc1155.py
index f785a87681..30b13cded6 100644
--- a/tests/test_packages/test_skills/test_erc1155.py
+++ b/tests/test_packages/test_skills/test_erc1155.py
@@ -56,9 +56,9 @@ def test_generic(self):
 
         # add ethereum ledger in both configuration files
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
             "fetchai/contract_api:0.5.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -71,7 +71,7 @@ def test_generic(self):
         self.set_agent_context(deploy_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.set_config("agent.default_ledger", ETHEREUM)
         setting_path = "agent.default_routing"
@@ -115,7 +115,7 @@ def test_generic(self):
         self.set_agent_context(client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.set_config("agent.default_ledger", ETHEREUM)
         setting_path = "agent.default_routing"
diff --git a/tests/test_packages/test_skills/test_generic.py b/tests/test_packages/test_skills/test_generic.py
index d320798742..77c13b6cb9 100644
--- a/tests/test_packages/test_skills/test_generic.py
+++ b/tests/test_packages/test_skills/test_generic.py
@@ -50,8 +50,8 @@ def test_generic(self, pytestconfig):
         self.create_agents(seller_aea_name, buyer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -63,7 +63,7 @@ def test_generic(self, pytestconfig):
         # prepare seller agent
         self.set_agent_context(seller_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/generic_seller:0.13.0")
@@ -102,7 +102,7 @@ def test_generic(self, pytestconfig):
         # prepare buyer agent
         self.set_agent_context(buyer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/generic_buyer:0.12.0")
@@ -231,8 +231,8 @@ def test_generic(self, pytestconfig):
         self.create_agents(seller_aea_name, buyer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -244,7 +244,7 @@ def test_generic(self, pytestconfig):
         # prepare seller agent
         self.set_agent_context(seller_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/generic_seller:0.13.0")
@@ -286,7 +286,7 @@ def test_generic(self, pytestconfig):
         # prepare buyer agent
         self.set_agent_context(buyer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/generic_buyer:0.12.0")
diff --git a/tests/test_packages/test_skills/test_http_echo.py b/tests/test_packages/test_skills/test_http_echo.py
index 6052165361..1385db73cb 100644
--- a/tests/test_packages/test_skills/test_http_echo.py
+++ b/tests/test_packages/test_skills/test_http_echo.py
@@ -36,9 +36,9 @@ class TestHttpEchoSkill(AEATestCaseEmpty):
 
     def test_echo(self):
         """Run the echo skill sequence."""
-        self.add_item("connection", "fetchai/http_server:0.8.0")
-        self.add_item("skill", "fetchai/http_echo:0.6.0")
-        self.set_config("agent.default_connection", "fetchai/http_server:0.8.0")
+        self.add_item("connection", "fetchai/http_server:0.9.0")
+        self.add_item("skill", "fetchai/http_echo:0.7.0")
+        self.set_config("agent.default_connection", "fetchai/http_server:0.9.0")
         self.set_config(
             "vendor.fetchai.connections.http_server.config.api_spec_path", API_SPEC_PATH
         )
diff --git a/tests/test_packages/test_skills/test_ml_skills.py b/tests/test_packages/test_skills/test_ml_skills.py
index 3ed1c80747..9d7aaa4e37 100644
--- a/tests/test_packages/test_skills/test_ml_skills.py
+++ b/tests/test_packages/test_skills/test_ml_skills.py
@@ -64,8 +64,8 @@ def test_ml_skills(self, pytestconfig):
         self.create_agents(data_provider_aea_name, model_trainer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -77,7 +77,7 @@ def test_ml_skills(self, pytestconfig):
         # prepare data provider agent
         self.set_agent_context(data_provider_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/ml_data_provider:0.12.0")
@@ -112,7 +112,7 @@ def test_ml_skills(self, pytestconfig):
         # prepare model trainer agent
         self.set_agent_context(model_trainer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/ml_train:0.12.0")
@@ -241,8 +241,8 @@ def test_ml_skills(self, pytestconfig):
         self.create_agents(data_provider_aea_name, model_trainer_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -254,7 +254,7 @@ def test_ml_skills(self, pytestconfig):
         # prepare data provider agent
         self.set_agent_context(data_provider_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/ml_data_provider:0.12.0")
@@ -292,7 +292,7 @@ def test_ml_skills(self, pytestconfig):
         # prepare model trainer agent
         self.set_agent_context(model_trainer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/ml_train:0.12.0")
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index a2397ffcbc..1ff948a692 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -61,15 +61,15 @@ def test_tac(self):
         )
 
         default_routing = {
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # prepare tac controller for test
         self.set_agent_context(tac_controller_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
-        self.add_item("skill", "fetchai/tac_control:0.7.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
+        self.add_item("skill", "fetchai/tac_control:0.8.0")
         self.set_config("agent.default_ledger", FETCHAI)
         setting_path = "agent.default_routing"
         self.force_set_config(setting_path, default_routing)
@@ -96,8 +96,8 @@ def test_tac(self):
         self.force_set_config(setting_path, COSMOS)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # prepare agents for test
@@ -108,7 +108,7 @@ def test_tac(self):
             self.set_agent_context(agent_name)
             self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
             self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
-            self.add_item("connection", "fetchai/soef:0.8.0")
+            self.add_item("connection", "fetchai/soef:0.9.0")
             self.add_item("connection", "fetchai/ledger:0.6.0")
             self.add_item("skill", "fetchai/tac_participation:0.9.0")
             self.add_item("skill", "fetchai/tac_negotiation:0.10.0")
diff --git a/tests/test_packages/test_skills/test_thermometer.py b/tests/test_packages/test_skills/test_thermometer.py
index 0d87abf663..d78f337397 100644
--- a/tests/test_packages/test_skills/test_thermometer.py
+++ b/tests/test_packages/test_skills/test_thermometer.py
@@ -51,8 +51,8 @@ def test_thermometer(self):
         self.create_agents(thermometer_aea_name, thermometer_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -64,7 +64,7 @@ def test_thermometer(self):
         # add packages for agent one and run it
         self.set_agent_context(thermometer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/thermometer:0.12.0")
@@ -96,7 +96,7 @@ def test_thermometer(self):
         # add packages for agent two and run it
         self.set_agent_context(thermometer_client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/thermometer_client:0.11.0")
@@ -227,8 +227,8 @@ def test_thermometer(self):
         self.create_agents(thermometer_aea_name, thermometer_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -240,7 +240,7 @@ def test_thermometer(self):
         # add packages for agent one and run it
         self.set_agent_context(thermometer_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/thermometer:0.12.0")
@@ -275,7 +275,7 @@ def test_thermometer(self):
         # add packages for agent two and run it
         self.set_agent_context(thermometer_client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/thermometer_client:0.11.0")
diff --git a/tests/test_packages/test_skills/test_weather.py b/tests/test_packages/test_skills/test_weather.py
index 76f159df7a..7b6b15d03a 100644
--- a/tests/test_packages/test_skills/test_weather.py
+++ b/tests/test_packages/test_skills/test_weather.py
@@ -50,8 +50,8 @@ def test_weather(self):
         self.create_agents(weather_station_aea_name, weather_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -63,7 +63,7 @@ def test_weather(self):
         # prepare agent one (weather station)
         self.set_agent_context(weather_station_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/weather_station:0.12.0")
@@ -98,7 +98,7 @@ def test_weather(self):
         # prepare agent two (weather client)
         self.set_agent_context(weather_client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/weather_client:0.11.0")
@@ -222,8 +222,8 @@ def test_weather(self):
         self.create_agents(weather_station_aea_name, weather_client_aea_name)
 
         default_routing = {
-            "fetchai/ledger_api:0.3.0": "fetchai/ledger:0.6.0",
-            "fetchai/oef_search:0.6.0": "fetchai/soef:0.8.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
         }
 
         # generate random location
@@ -235,7 +235,7 @@ def test_weather(self):
         # add packages for agent one
         self.set_agent_context(weather_station_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/weather_station:0.12.0")
@@ -272,7 +272,7 @@ def test_weather(self):
         # add packages for agent two
         self.set_agent_context(weather_client_aea_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
-        self.add_item("connection", "fetchai/soef:0.8.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
         self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/weather_client:0.11.0")
diff --git a/tests/test_protocols/test_generator/test_end_to_end.py b/tests/test_protocols/test_generator/test_end_to_end.py
index c91a16a3c7..1fc3d6d87c 100644
--- a/tests/test_protocols/test_generator/test_end_to_end.py
+++ b/tests/test_protocols/test_generator/test_end_to_end.py
@@ -75,7 +75,7 @@ def test_generated_protocol_end_to_end(self):
         builder_1.set_name(agent_name_1)
         builder_1.add_private_key(DEFAULT_LEDGER, self.private_key_path_1)
         builder_1.set_default_ledger(DEFAULT_LEDGER)
-        builder_1.set_default_connection(PublicId.from_str("fetchai/oef:0.9.0"))
+        builder_1.set_default_connection(PublicId.from_str("fetchai/oef:0.10.0"))
         builder_1.add_protocol(
             Path(ROOT_DIR, "packages", "fetchai", "protocols", "fipa")
         )
@@ -101,7 +101,7 @@ def test_generated_protocol_end_to_end(self):
         builder_2.add_protocol(
             Path(ROOT_DIR, "packages", "fetchai", "protocols", "oef_search")
         )
-        builder_2.set_default_connection(PublicId.from_str("fetchai/oef:0.9.0"))
+        builder_2.set_default_connection(PublicId.from_str("fetchai/oef:0.10.0"))
         builder_2.add_component(
             ComponentType.PROTOCOL,
             Path(PATH_TO_T_PROTOCOL),
@@ -112,8 +112,12 @@ def test_generated_protocol_end_to_end(self):
         )
 
         # create AEAs
-        aea_1 = builder_1.build(connection_ids=[PublicId.from_str("fetchai/oef:0.9.0")])
-        aea_2 = builder_2.build(connection_ids=[PublicId.from_str("fetchai/oef:0.9.0")])
+        aea_1 = builder_1.build(
+            connection_ids=[PublicId.from_str("fetchai/oef:0.10.0")]
+        )
+        aea_2 = builder_2.build(
+            connection_ids=[PublicId.from_str("fetchai/oef:0.10.0")]
+        )
 
         # dialogues
         def role_from_first_message_1(
diff --git a/tests/test_registries/test_base.py b/tests/test_registries/test_base.py
index 35c145764a..693b2f2875 100644
--- a/tests/test_registries/test_base.py
+++ b/tests/test_registries/test_base.py
@@ -153,7 +153,7 @@ def setup_class(cls):
 
         cls.expected_protocol_ids = {
             DEFAULT_PROTOCOL,
-            PublicId.from_str("fetchai/fipa:0.6.0"),
+            PublicId.from_str("fetchai/fipa:0.7.0"),
         }
 
     def test_fetch_all(self):
diff --git a/tests/test_test_tools/test_testcases.py b/tests/test_test_tools/test_testcases.py
index 0a4567d923..eee7a70b28 100644
--- a/tests/test_test_tools/test_testcases.py
+++ b/tests/test_test_tools/test_testcases.py
@@ -102,7 +102,7 @@ def fn():
     def test_fetch_and_delete(self):
         """Fetch and delete agent from repo."""
         agent_name = "some_agent_for_tests"
-        self.fetch_agent("fetchai/my_first_aea:0.11.0", agent_name)
+        self.fetch_agent("fetchai/my_first_aea:0.12.0", agent_name)
         assert os.path.exists(agent_name)
         self.delete_agents(agent_name)
         assert not os.path.exists(agent_name)
@@ -110,7 +110,7 @@ def test_fetch_and_delete(self):
     def test_diff(self):
         """Test difference_to_fetched_agent."""
         agent_name = "some_agent_for_tests2"
-        self.fetch_agent("fetchai/my_first_aea:0.11.0", agent_name)
+        self.fetch_agent("fetchai/my_first_aea:0.12.0", agent_name)
         self.run_cli_command(
             "config", "set", "agent.default_ledger", "test_ledger", cwd=agent_name
         )
@@ -119,7 +119,7 @@ def test_diff(self):
         )
         assert b"test_ledger" in result.stdout_bytes
         diff = self.difference_to_fetched_agent(
-            "fetchai/my_first_aea:0.11.0", agent_name
+            "fetchai/my_first_aea:0.12.0", agent_name
         )
         assert diff
         assert "test_ledger" in diff[1]
@@ -127,9 +127,9 @@ def test_diff(self):
     def test_no_diff(self):
         """Test no difference for two aea configs."""
         agent_name = "some_agent_for_tests3"
-        self.fetch_agent("fetchai/my_first_aea:0.11.0", agent_name)
+        self.fetch_agent("fetchai/my_first_aea:0.12.0", agent_name)
         diff = self.difference_to_fetched_agent(
-            "fetchai/my_first_aea:0.11.0", agent_name
+            "fetchai/my_first_aea:0.12.0", agent_name
         )
         assert not diff
 
@@ -168,10 +168,10 @@ class TestAddAndRejectComponent(AEATestCaseEmpty):
 
     def test_add_and_eject(self):
         """Test add/reject components."""
-        result = self.add_item("skill", "fetchai/echo:0.7.0", local=True)
+        result = self.add_item("skill", "fetchai/echo:0.8.0", local=True)
         assert result.exit_code == 0
 
-        result = self.eject_item("skill", "fetchai/echo:0.7.0")
+        result = self.eject_item("skill", "fetchai/echo:0.8.0")
         assert result.exit_code == 0
 
 
@@ -218,7 +218,7 @@ class TestSendReceiveEnvelopesSkill(AEATestCaseEmpty):
 
     def test_send_receive_envelope(self):
         """Run the echo skill sequence."""
-        self.add_item("skill", "fetchai/echo:0.7.0")
+        self.add_item("skill", "fetchai/echo:0.8.0")
 
         process = self.run_agent()
         is_running = self.is_running(process)

From ea6e546349038cf07e3592ddb79cdafdf975dd0c Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 22 Sep 2020 16:31:59 +0200
Subject: [PATCH 052/131] Avoid public ids with 'latest' version are stored in
 configuration files.

---
 aea/cli/add.py                              | 2 +-
 aea/configurations/schemas/definitions.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aea/cli/add.py b/aea/cli/add.py
index 093a881751..ae3c86133c 100644
--- a/aea/cli/add.py
+++ b/aea/cli/add.py
@@ -128,7 +128,7 @@ def add_item(ctx: Context, item_type: str, item_public_id: PublicId) -> None:
         raise click.ClickException("Failed to add an item with incorrect fingerprint.")
 
     _add_item_deps(ctx, item_type, item_config)
-    register_item(ctx, item_type, item_public_id)
+    register_item(ctx, item_type, item_config.public_id)
 
 
 def _add_item_deps(ctx: Context, item_type: str, item_config) -> None:
diff --git a/aea/configurations/schemas/definitions.json b/aea/configurations/schemas/definitions.json
index 6f956b5d10..c723ad8584 100644
--- a/aea/configurations/schemas/definitions.json
+++ b/aea/configurations/schemas/definitions.json
@@ -79,7 +79,7 @@
     },
     "public_id": {
       "type": "string",
-      "pattern": "^[a-zA-Z0-9_]*/[a-zA-Z_][a-zA-Z0-9_]*:(latest|(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)$"
+      "pattern": "^[a-zA-Z0-9_]*/[a-zA-Z_][a-zA-Z0-9_]*:(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
     },
     "version_specifiers": {
       "type": "string",

From ad675454b3a03e8a36916d4ad0cd472e67faa946 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 22 Sep 2020 16:43:53 +0200
Subject: [PATCH 053/131] make isort to skip recursive links

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 66cc5a801c..37bfb84bfa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,6 +36,9 @@ line_length=88
 order_by_type=False
 case_sensitive=True
 lines_after_imports=2
+skip =
+    tests/data/dummy_aea/vendor/
+    tests/data/dummy_aea/skills/dummy
 skip_glob = **/*_pb2.py
 known_first_party=aea
 known_packages=packages

From 5e9f1d6b66ed12edb4b067a83ad3e924a832df45 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 22 Sep 2020 21:08:41 +0100
Subject: [PATCH 054/131] add docs for generic command usage

---
 aea/registries/base.py   |  8 ++++++--
 docs/simple-oef-usage.md | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/aea/registries/base.py b/aea/registries/base.py
index 6daffeea9b..2d32db2864 100644
--- a/aea/registries/base.py
+++ b/aea/registries/base.py
@@ -142,13 +142,17 @@ def register(  # pylint: disable=arguments-differ,unused-argument
             raise ValueError(f"Item already registered with item id '{public_id}'")
         self._public_id_to_item[public_id] = item
 
-    def unregister(self, public_id: PublicId) -> None:
+    def unregister(  # pylint: disable=arguments-differ
+        self, public_id: PublicId
+    ) -> None:
         """Unregister an item."""
         if public_id not in self._public_id_to_item:
             raise ValueError(f"No item registered with item id '{public_id}'")
         self._public_id_to_item.pop(public_id)
 
-    def fetch(self, public_id: PublicId) -> Optional[Item]:
+    def fetch(  # pylint: disable=arguments-differ
+        self, public_id: PublicId
+    ) -> Optional[Item]:
         """
         Fetch an item associated with a public id.
 
diff --git a/docs/simple-oef-usage.md b/docs/simple-oef-usage.md
index 450f96d605..db1a22de30 100644
--- a/docs/simple-oef-usage.md
+++ b/docs/simple-oef-usage.md
@@ -154,4 +154,33 @@ message = OefSearchMessage(
 )
 ```
 
-In case of error you will received a message with `OefSearchMessage.Performative.OEF_ERROR`. In case of successful search you will receive a message with performative `OefSearchMessage.Performative.SEARCH_RESULT` and the list of matched agents addresses.
\ No newline at end of file
+In case of error you will received a message with `OefSearchMessage.Performative.OEF_ERROR`. In case of successful search you will receive a message with performative `OefSearchMessage.Performative.SEARCH_RESULT` and the list of matched agents addresses.
+
+## Generic command
+
+To send a generic command request to the SOEF use the following (here on the example of setting a declared name):
+``` python
+import urllib
+
+AGENT_GENERIC_COMMAND_MODEL = DataModel(
+    "generic_command",
+    [
+        Attribute("command", str, True, "Command name to execute."),
+        Attribute("parameters", str, False, "Url encoded parameters string."),
+    ],
+    "A data model to describe the generic soef command.",
+)
+
+declared_name = "new_declared_name"
+service_description = Description(
+    {
+        "command": "set_declared_name",
+        "parameters": urllib.parse.urlencode({"name": declared_name}),
+    },
+    data_model=AGENT_GENERIC_COMMAND_MODEL,
+)
+message = OefSearchMessage(
+    performative=OefSearchMessage.Performative.REGISTER_SERVICE,
+    service_description=service_description,
+)
+```
\ No newline at end of file

From eab7b9f552876d6d96fbf60e269497beae69f347 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 22 Sep 2020 22:46:23 +0100
Subject: [PATCH 055/131] small fixes to configs and soef

---
 aea/cli/utils/config.py                       |  4 +++-
 aea/configurations/base.py                    |  2 +-
 docs/tac-skills.md                            |  5 +++--
 .../tac_controller_contract/aea-config.yaml   | 20 +++++++++++++++++++
 .../fetchai/connections/soef/connection.py    |  2 +-
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 .../fetchai/skills/tac_control/skill.yaml     |  1 -
 packages/hashes.csv                           |  4 ++--
 8 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/aea/cli/utils/config.py b/aea/cli/utils/config.py
index 71bc9b50ff..cddfa28a32 100644
--- a/aea/cli/utils/config.py
+++ b/aea/cli/utils/config.py
@@ -46,7 +46,7 @@
     _get_default_configuration_file_name_from_type,
 )
 from aea.configurations.loader import ConfigLoader, ConfigLoaders
-from aea.exceptions import AEAException
+from aea.exceptions import AEAException, AEAEnforceError
 
 
 def try_to_load_agent_config(
@@ -83,6 +83,8 @@ def try_to_load_agent_config(
                     DEFAULT_AEA_CONFIG_FILE
                 )
             )
+    except AEAEnforceError as e:
+        raise click.ClickException(str(e))
 
 
 def _init_cli_config() -> None:
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 1a68f8de41..0d664ada0b 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -1105,7 +1105,7 @@ class SkillConfig(ComponentConfiguration):
 
     default_configuration_filename = DEFAULT_SKILL_CONFIG_FILE
     package_type = PackageType.SKILL
-    configurable_fields = {"handlers", "behaviours", "models"}
+    configurable_fields = {"handlers", "behaviours", "models", "is_abstract"}
 
     def __init__(
         self,
diff --git a/docs/tac-skills.md b/docs/tac-skills.md
index c70415a668..7813d82cb9 100644
--- a/docs/tac-skills.md
+++ b/docs/tac-skills.md
@@ -206,8 +206,9 @@ aea add-key fetchai fetchai_private_key.txt --connection
 Navigate to the tac controller project, then use the command line to get and set the start time (set it to at least two minutes in the future):
 
 ``` bash
-aea config get vendor.fetchai.skills.tac_control.models.parameters.args.start_time
-aea config set vendor.fetchai.skills.tac_control.models.parameters.args.start_time '01 01 2020  00:01'
+aea config get vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time
+aea config set vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time '01 01 2020  00:01'
+aea config set vendor.fetchai.skills.tac_control.is_abstract false --type bool
 ```
 
 ### Update the connection params
diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 5e20c223bc..78c49b9a9a 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -36,3 +36,23 @@ default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
   fetchai/ledger_api:0.5.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+...
+---
+author: fetchai
+name: soef
+version: 0.8.0
+type: connection
+config:
+  api_key: TwiCIriSl0mLahw17pyqoA
+  chain_identifier: ethereum
+  soef_addr: soef.fetch.ai
+  soef_port: 9002
+...
+---
+author: fetchai
+name: tac_control
+version: 0.7.0
+type: skill
+is_abstract: true
+...
+    
\ No newline at end of file
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 622543e773..4d35f8bf9f 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -820,7 +820,7 @@ async def _register_agent(self) -> None:
                 unique_token = child.text
         if not (len(unique_page_address) > 0 and len(unique_token) > 0):
             raise SOEFException.error(
-                "Agent registration error - page address or token not received"
+                f"Agent registration error - page address or token not received. Response text: {response_text}"
             )
         self.logger.debug("Registering agent")
         params = {"token": unique_token}
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index f11cd94684..f9a8051241 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmWwjETX39APP9RD5oVPeeCiDnUoDvjAcoVe2FK2Jc6anM
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmfK5khjQuqewKVuqyedgmToQvRbh69oT8f5WcSvzvvjJL
+  connection.py: QmTcFbNone1bWPiAAAbVNfB1LEdTGMHv2s4iJBTAbuFJFv
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.6.0
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 222032e936..db890e4335 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -73,4 +73,3 @@ models:
     class_name: TacDialogues
 dependencies:
   numpy: {}
-is_abstract: true
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 90e6d12884..18edf9fbda 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -28,7 +28,7 @@ fetchai/connections/p2p_libp2p,QmVXSnhCn37mgacK7iG1HENbEkSvSZMMaf9RTFCUUDa2C9
 fetchai/connections/p2p_libp2p_client,QmVEwABjAPTZcA4BaAgn8BnzUCpHQbSzc4pJ6mdR4bW222
 fetchai/connections/p2p_stub,QmX8EWvFok3UAdqXGgir4TrhfDj2kLhfjuXRg82b6G6XtW
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmQWyjmHg6HWsLEuighe2vrWQSKBZAXvoXSXF33XhaVyE8
+fetchai/connections/soef,QmQ9EoLHBwmhnfbsaTBWYaf6NHKx2uCC9q7F95zwySmtYU
 fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
 fetchai/connections/tcp,QmU93B7yajCHwXsgDXXhv1uSuXi7VmFBhdahcFosbrr6nA
 fetchai/connections/webhook,QmaJunWQT1ypkqGnzrj5gYjjQBywjTHJmyktCZXZsa8hv8
@@ -62,7 +62,7 @@ fetchai/skills/ml_data_provider,QmdgxfES4XpmREpp9QqPQRMH9TvTF9nZ21zKM5RHLGCLke
 fetchai/skills/ml_train,QmbRQZz1MPXXuWyNW3BqhcsZKtZPhYakxGkVrBswNTgfk9
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmeckN8mcKLeqmJoQfdYqPsJ49nbxxwBhYPhjkTS99v1De
-fetchai/skills/tac_control,QmTcQU7qs8toZMB4KgpxbcBiQj8Eucytq48XP4tGGTYPDD
+fetchai/skills/tac_control,QmebwggsT7Shux6S2qw9Rg7WC1MF2rdbWUYmDz8ChrGf21
 fetchai/skills/tac_control_contract,QmahExwhU8sYaZC7PGD1ShrPNdzAM4AEPZ6eGhsrQk8umk
 fetchai/skills/tac_negotiation,QmRCZWxUh6mkaBsa1CYNk3fmNKzSVxfiqwYGbzU1E3672F
 fetchai/skills/tac_participation,QmWBATSrN9J3XoqMJ89iniMnMDZZpLqoenWTigukaDasQG

From 2d71d1772a287c5b3bbb19cc14117ae99fb9feee Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 23 Sep 2020 12:53:44 +0200
Subject: [PATCH 056/131] update generate_ipfs_hashes script to support
 multipaged yamls

---
 .../agents/tac_controller_contract/aea-config.yaml     |  8 ++------
 packages/hashes.csv                                    |  2 +-
 scripts/generate_ipfs_hashes.py                        | 10 +++++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 78c49b9a9a..e4e41fa851 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -36,10 +36,9 @@ default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
   fetchai/ledger_api:0.5.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
-...
 ---
-author: fetchai
 name: soef
+author: fetchai
 version: 0.8.0
 type: connection
 config:
@@ -47,12 +46,9 @@ config:
   chain_identifier: ethereum
   soef_addr: soef.fetch.ai
   soef_port: 9002
-...
 ---
-author: fetchai
 name: tac_control
+author: fetchai
 version: 0.7.0
 type: skill
 is_abstract: true
-...
-    
\ No newline at end of file
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 0b9c68e00b..ea255ffa61 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -12,7 +12,7 @@ fetchai/agents/ml_model_trainer,QmeZmVsNLUw7TP73s5cSomPnwggcrimXHh1RhrPRUDkoQ3
 fetchai/agents/my_first_aea,QmcHnFYQCyXnAM2pN2M4HqLNGJpWApUP7PuiKaPcLkxbas
 fetchai/agents/simple_service_registration,QmWtA9eDYnGKkg5hov887LRJSXTXovb9pp4NJzU7JMq5Lg
 fetchai/agents/tac_controller,QmaG56sZaJRm8DwJXXt9Ci18Va8NfXx6v8vEGKPJngKL4q
-fetchai/agents/tac_controller_contract,QmWQRysyhhATUqxRxrAqvEvcdjzCiDGkZDzp7f7yvRTAz4
+fetchai/agents/tac_controller_contract,QmebUjsztRPpidkaDLdxDqM3JGbQG3Rb5Li8CSwyrnLMWp
 fetchai/agents/tac_participant,QmQxN75ZFVEgizNHa3sqd2zHSnmPvRwS8PCv5FAsJBDnZw
 fetchai/agents/thermometer_aea,QmQ8KgTrt5fH8ZRDpioKGmeyUyc2EUkan4D5KzoFnCwxcG
 fetchai/agents/thermometer_client,QmUY6rmZnufWWmwfSi1m5gR6vD1ZowXpchpUJXgAH6xdNP
diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py
index 017b7deb42..4813357fe5 100755
--- a/scripts/generate_ipfs_hashes.py
+++ b/scripts/generate_ipfs_hashes.py
@@ -41,7 +41,6 @@
 from typing import Collection, Dict, List, Optional, Tuple, Type, cast
 
 import ipfshttpclient
-import yaml
 
 from aea.configurations.base import (
     AgentConfig,
@@ -53,6 +52,7 @@
     SkillConfig,
     _compute_fingerprint,
 )
+from aea.configurations.loader import ConfigLoaders
 from aea.helpers.base import yaml_dump, yaml_dump_all
 
 
@@ -254,10 +254,10 @@ def load_configuration(
     configuration_filepath = (
         package_path / configuration_class.default_configuration_filename
     )
-    configuration_obj = cast(
-        PackageConfiguration,
-        configuration_class.from_json(yaml.safe_load(configuration_filepath.open())),
-    )
+
+    loader = ConfigLoaders.from_package_type(package_type)
+    with configuration_filepath.open() as fp:
+        configuration_obj = loader.load(fp)
     configuration_obj._directory = package_path  # pylint: disable=protected-access
     return cast(PackageConfiguration, configuration_obj)
 

From 07bea7bbdf09c920a6a0eb90c67d34e0b6974f0a Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 23 Sep 2020 14:02:50 +0200
Subject: [PATCH 057/131] update check_package_dependencies script to
 accomodate multi-paged yamls

---
 .../tac_controller_contract/aea-config.yaml   | 16 ++++++-------
 .../skills/tac_control_contract/skill.yaml    | 10 ++++----
 scripts/check_package_dependencies.py         | 24 ++++++++++++++++---
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index e4e41fa851..07f496c969 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -10,20 +10,20 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
-- fetchai/soef:0.8.0
+- fetchai/soef:0.9.0
 - fetchai/stub:0.9.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/default:0.5.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
-- fetchai/tac:0.6.0
+- fetchai/default:0.6.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
+- fetchai/tac:0.7.0
 skills:
-- fetchai/error:0.5.0
-- fetchai/tac_control:0.7.0
+- fetchai/error:0.6.0
+- fetchai/tac_control:0.8.0
 - fetchai/tac_control_contract:0.9.0
 default_connection: fetchai/p2p_libp2p:0.10.0
 default_ledger: ethereum
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 24ade8c708..7f0c33ec9e 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -20,12 +20,12 @@ contracts:
 - fetchai/erc1155:0.10.0
 protocols:
 - fetchai/contract_api:0.5.0
-- fetchai/ledger_api:0.3.0
-- fetchai/oef_search:0.6.0
-- fetchai/signing:0.3.0
-- fetchai/tac:0.6.0
+- fetchai/ledger_api:0.4.0
+- fetchai/oef_search:0.7.0
+- fetchai/signing:0.4.0
+- fetchai/tac:0.7.0
 skills:
-- fetchai/tac_control:0.7.0
+- fetchai/tac_control:0.8.0
 behaviours:
   tac:
     args: {}
diff --git a/scripts/check_package_dependencies.py b/scripts/check_package_dependencies.py
index 882030b6e8..8904b9675b 100755
--- a/scripts/check_package_dependencies.py
+++ b/scripts/check_package_dependencies.py
@@ -30,7 +30,7 @@
 from functools import partial
 from itertools import chain
 from pathlib import Path
-from typing import Set
+from typing import Dict, Set
 
 import yaml
 
@@ -88,7 +88,7 @@ def get_public_id_from_yaml(configuration_file: Path):
 
     :param configuration_file: the path to the config yaml
     """
-    data = yaml.safe_load(configuration_file.open())
+    data = unified_yaml_load(configuration_file)
     author = data["author"]
     # handle the case when it's a package or agent config file.
     name = data["name"] if "name" in data else data["agent_name"]
@@ -118,6 +118,24 @@ def handle_dependency_not_found(e: DependencyNotFound):
     print(f"Missing: {pprint.pformat(sorted_missing)}")
 
 
+def unified_yaml_load(configuration_file: Path) -> Dict:
+    """
+    Load YAML file, unified (both single- and multi-paged).
+
+    :param configuration_file: the configuration file path.
+    :return: the data.
+    """
+    package_type = configuration_file.parent.parent.name
+    with configuration_file.open() as fp:
+        if package_type != "agents":
+            return yaml.safe_load(fp)
+        # when it is an agent configuration file,
+        # we are interested only in the first page of the YAML,
+        # because the dependencies are contained only there.
+        data = yaml.safe_load_all(fp)
+        return list(data)[0]
+
+
 def check_dependencies(configuration_file: Path, all_packages_ids: Set[PackageId]):
     """
     Check dependencies of configuration file.
@@ -126,7 +144,7 @@ def check_dependencies(configuration_file: Path, all_packages_ids: Set[PackageId
     :param all_packages_ids: all the package ids.
     :return: None
     """
-    data = yaml.safe_load(configuration_file.open())
+    data = unified_yaml_load(configuration_file)
 
     def _add_package_type(package_type, public_id_str):
         return PackageId(package_type, PublicId.from_str(public_id_str))

From f87d67c4b2a10d1eebbf4520fff9bc35373f71f8 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 23 Sep 2020 14:07:09 +0200
Subject: [PATCH 058/131] update 'check_package_versions_in_docs'

---
 scripts/check_package_versions_in_docs.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/scripts/check_package_versions_in_docs.py b/scripts/check_package_versions_in_docs.py
index 33ddb38144..e89d59d6fa 100755
--- a/scripts/check_package_versions_in_docs.py
+++ b/scripts/check_package_versions_in_docs.py
@@ -29,7 +29,7 @@
 import sys
 from itertools import chain
 from pathlib import Path
-from typing import Callable, Set
+from typing import Callable, Dict, Set
 
 import yaml
 
@@ -92,13 +92,31 @@ def default_config_file_paths():
         yield item
 
 
+def unified_yaml_load(configuration_file: Path) -> Dict:
+    """
+    Load YAML file, unified (both single- and multi-paged).
+
+    :param configuration_file: the configuration file path.
+    :return: the data.
+    """
+    package_type = configuration_file.parent.parent.name
+    with configuration_file.open() as fp:
+        if package_type != "agents":
+            return yaml.safe_load(fp)
+        # when it is an agent configuration file,
+        # we are interested only in the first page of the YAML,
+        # because the dependencies are contained only there.
+        data = yaml.safe_load_all(fp)
+        return list(data)[0]
+
+
 def get_public_id_from_yaml(configuration_file: Path):
     """
     Get the public id from yaml.
 
     :param configuration_file: the path to the config yaml
     """
-    data = yaml.safe_load(configuration_file.open())
+    data = unified_yaml_load(configuration_file)
     author = data["author"]
     # handle the case when it's a package or agent config file.
     name = data["name"] if "name" in data else data["agent_name"]

From 087a3dce49d7d5d4dae647d405c4c8296f0a95d5 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 23 Sep 2020 14:13:36 +0200
Subject: [PATCH 059/131] fix versions in tac_controller_contract agent

---
 .../fetchai/agents/tac_controller_contract/aea-config.yaml    | 4 ++--
 packages/hashes.csv                                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 07f496c969..efbe561f76 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -39,7 +39,7 @@ default_routing:
 ---
 name: soef
 author: fetchai
-version: 0.8.0
+version: 0.9.0
 type: connection
 config:
   api_key: TwiCIriSl0mLahw17pyqoA
@@ -49,6 +49,6 @@ config:
 ---
 name: tac_control
 author: fetchai
-version: 0.7.0
+version: 0.8.0
 type: skill
 is_abstract: true
diff --git a/packages/hashes.csv b/packages/hashes.csv
index ea255ffa61..37510f2a00 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -12,7 +12,7 @@ fetchai/agents/ml_model_trainer,QmeZmVsNLUw7TP73s5cSomPnwggcrimXHh1RhrPRUDkoQ3
 fetchai/agents/my_first_aea,QmcHnFYQCyXnAM2pN2M4HqLNGJpWApUP7PuiKaPcLkxbas
 fetchai/agents/simple_service_registration,QmWtA9eDYnGKkg5hov887LRJSXTXovb9pp4NJzU7JMq5Lg
 fetchai/agents/tac_controller,QmaG56sZaJRm8DwJXXt9Ci18Va8NfXx6v8vEGKPJngKL4q
-fetchai/agents/tac_controller_contract,QmebUjsztRPpidkaDLdxDqM3JGbQG3Rb5Li8CSwyrnLMWp
+fetchai/agents/tac_controller_contract,QmXhKdptR5aW4TAx9J4auFGqwR3TpiTzdpsKp8KRHL7w7B
 fetchai/agents/tac_participant,QmQxN75ZFVEgizNHa3sqd2zHSnmPvRwS8PCv5FAsJBDnZw
 fetchai/agents/thermometer_aea,QmQ8KgTrt5fH8ZRDpioKGmeyUyc2EUkan4D5KzoFnCwxcG
 fetchai/agents/thermometer_client,QmUY6rmZnufWWmwfSi1m5gR6vD1ZowXpchpUJXgAH6xdNP
@@ -63,7 +63,7 @@ fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
 fetchai/skills/tac_control,QmTgw37facaPnt9RQcHNPzFasDmgG1PktEo2ZHfNqPjXet
-fetchai/skills/tac_control_contract,QmbQgPstHthGrNE4tFyreFhp4K1HzGzEdtEcxPtGpeJT1N
+fetchai/skills/tac_control_contract,QmTLPBLPZKdQRreeMbeuppRNJnGUr7YSqh7RULnEKkrKFy
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1

From 1b93527b99c4348435e442310581c41a25786c56 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 23 Sep 2020 14:42:29 +0200
Subject: [PATCH 060/131] make 'is_abstract' a configurable field for skills

---
 aea/aea_builder.py         | 12 ++++++------
 aea/configurations/base.py |  2 ++
 tests/test_aea_builder.py  | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index a3570bbdef..3eb5421f15 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -1365,6 +1365,12 @@ def _load_and_add_components(
         for configuration in self._package_dependency_manager.get_components_by_type(
             component_type
         ).values():
+            configuration = deepcopy(configuration)
+            configuration.update(
+                self._custom_component_configurations.get(
+                    configuration.component_id, {}
+                )
+            )
             if configuration.is_abstract_component:
                 load_aea_package(configuration)
                 continue
@@ -1376,12 +1382,6 @@ def _load_and_add_components(
                         logging.Logger, make_logger(configuration, agent_name)
                     )
             else:
-                configuration = deepcopy(configuration)
-                configuration.update(
-                    self._custom_component_configurations.get(
-                        configuration.component_id, {}
-                    )
-                )
                 _logger = make_logger(configuration, agent_name)
                 component = load_component_from_config(
                     configuration, logger=_logger, **kwargs
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 09671d7c89..d59c28b5bd 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -1333,6 +1333,8 @@ def update(self, data: Dict) -> None:
             model_config = SkillComponentConfiguration.from_json(model_data)
             self.models.update(model_id, model_config)
 
+        self.is_abstract = data.get("is_abstract", self.is_abstract)
+
 
 class AgentConfig(PackageConfiguration):
     """Class to represent the agent configuration file."""
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 60c1c3858b..0bffd7927a 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -654,6 +654,43 @@ def test_from_project(self):
         assert dummy_model.config == self.expected_model_args
 
 
+class TestFromAEAProjectMakeSkillAbstract(AEATestCase):
+    """Test builder set from project dir, to make a skill 'abstract'."""
+
+    path_to_aea = Path(CUR_PATH) / "data" / "dummy_aea"
+
+    def _add_dummy_skill_config(self):
+        """Add custom stub connection config."""
+        cwd = self._get_cwd()
+        aea_config_file = Path(cwd, DEFAULT_AEA_CONFIG_FILE)
+        configuration = aea_config_file.read_text()
+        # here we change all the dummy skill configurations
+        configuration += dedent(
+            f"""
+        ---
+        name: dummy
+        author: dummy_author
+        version: 0.1.0
+        type: skill
+        is_abstract: true
+        ...
+        """
+        )
+        aea_config_file.write_text(configuration)
+
+    def test_from_project(self):
+        """Test builder set from project dir."""
+        self._add_dummy_skill_config()
+        builder = AEABuilder.from_aea_project(Path(self._get_cwd()))
+        with cd(self._get_cwd()):
+            aea = builder.build()
+
+        dummy_skill = aea.resources.get_skill(
+            PublicId("dummy_author", "dummy", "0.1.0")
+        )
+        assert dummy_skill is None, "Shouldn't have found the skill in Resources."
+
+
 class TestFromAEAProjectCustomConfigFailsWhenComponentNotDeclared(AEATestCaseEmpty):
     """Test builder set from project dir with custom component config fails when the component is not declared in the agent configuration."""
 

From 63d0d7b70127dbd73c44175a9bf8e0fea3629ab9 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 23 Sep 2020 14:51:30 +0200
Subject: [PATCH 061/131] update custom component config only for non-instance
 components in builder

---
 aea/aea_builder.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index 3eb5421f15..ee5b77abe8 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -1365,16 +1365,6 @@ def _load_and_add_components(
         for configuration in self._package_dependency_manager.get_components_by_type(
             component_type
         ).values():
-            configuration = deepcopy(configuration)
-            configuration.update(
-                self._custom_component_configurations.get(
-                    configuration.component_id, {}
-                )
-            )
-            if configuration.is_abstract_component:
-                load_aea_package(configuration)
-                continue
-
             if configuration in self._component_instances[component_type].keys():
                 component = self._component_instances[component_type][configuration]
                 if configuration.component_type != ComponentType.SKILL:
@@ -1382,6 +1372,15 @@ def _load_and_add_components(
                         logging.Logger, make_logger(configuration, agent_name)
                     )
             else:
+                configuration = deepcopy(configuration)
+                configuration.update(
+                    self._custom_component_configurations.get(
+                        configuration.component_id, {}
+                    )
+                )
+                if configuration.is_abstract_component:
+                    load_aea_package(configuration)
+                    continue
                 _logger = make_logger(configuration, agent_name)
                 component = load_component_from_config(
                     configuration, logger=_logger, **kwargs

From f5ee060be0b882f12feceeccefa371b6959745ef Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 15:14:14 +0100
Subject: [PATCH 062/131] fix tests

---
 docs/tac-skills-contract.md                               | 4 ++--
 docs/tac-skills.md                                        | 1 -
 packages/fetchai/skills/tac_control_contract/dialogues.py | 2 +-
 packages/fetchai/skills/tac_control_contract/skill.yaml   | 2 +-
 packages/hashes.csv                                       | 2 +-
 tests/test_aea_builder.py                                 | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/tac-skills-contract.md b/docs/tac-skills-contract.md
index 0ef6ee0985..75f3f7e628 100644
--- a/docs/tac-skills-contract.md
+++ b/docs/tac-skills-contract.md
@@ -217,8 +217,8 @@ Similar to how you funded the controller, fund both tac participants.
 Navigate to the tac controller project, then use the command line to get and set the start time (set it to at least five minutes - better 10 - in the future):
 
 ``` bash
-aea config get vendor.fetchai.skills.tac_control_contract.models.parameters.args.start_time
-aea config set vendor.fetchai.skills.tac_control_contract.models.parameters.args.start_time '01 01 2020  00:01'
+aea config get vendor.fetchai.skills.tac_control_contract.models.parameters.args.registration_start_time
+aea config set vendor.fetchai.skills.tac_control_contract.models.parameters.args.registration_start_time '01 01 2020  00:01'
 ```
 
 ### Run the AEAs
diff --git a/docs/tac-skills.md b/docs/tac-skills.md
index 75aa76e58e..873c72ddf8 100644
--- a/docs/tac-skills.md
+++ b/docs/tac-skills.md
@@ -208,7 +208,6 @@ Navigate to the tac controller project, then use the command line to get and set
 ``` bash
 aea config get vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time
 aea config set vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time '01 01 2020  00:01'
-aea config set vendor.fetchai.skills.tac_control.is_abstract false --type bool
 ```
 
 ### Update the connection params
diff --git a/packages/fetchai/skills/tac_control_contract/dialogues.py b/packages/fetchai/skills/tac_control_contract/dialogues.py
index be35d63101..9e2b5c2588 100644
--- a/packages/fetchai/skills/tac_control_contract/dialogues.py
+++ b/packages/fetchai/skills/tac_control_contract/dialogues.py
@@ -124,7 +124,7 @@ def __init__(
         self._callable = None  # type: Optional[ContractApiDialogue.Callable]
 
     @property
-    def callable(self) -> Callable:
+    def callable(self) -> "Callable":
         """Get the callable."""
         if self._callable is None:
             raise ValueError("Callable not set!")
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 7f0c33ec9e..73c3ff5b53 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
   behaviours.py: QmYcW84nnvCuv2HeDntixfWnFuJA2k9xqrhCWdmVFerLPv
-  dialogues.py: QmPNoMrAPBQb8ib5uwxxMXd8U8nG81uXt4no6WStS3pNob
+  dialogues.py: QmPJyBPETi7MggXLMKHWeYsAZbckxK2UFpci19dw3xwHDn
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
   handlers.py: QmSzNcZ3s3RjVm7mCXBhGjA379nwv3Tm9viEmw193WcNTd
   helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 37510f2a00..f2278b6f3a 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -63,7 +63,7 @@ fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
 fetchai/skills/tac_control,QmTgw37facaPnt9RQcHNPzFasDmgG1PktEo2ZHfNqPjXet
-fetchai/skills/tac_control_contract,QmTLPBLPZKdQRreeMbeuppRNJnGUr7YSqh7RULnEKkrKFy
+fetchai/skills/tac_control_contract,QmYX4gNaGbx1EAuASwhpSgTdLYwUzuzajtKTuqvNFR9f2Q
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 0bffd7927a..ff6a6b85e7 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -666,7 +666,7 @@ def _add_dummy_skill_config(self):
         configuration = aea_config_file.read_text()
         # here we change all the dummy skill configurations
         configuration += dedent(
-            f"""
+            """
         ---
         name: dummy
         author: dummy_author

From b3b65bb3f88601985dd84a16e71c4a2f79a61feb Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 16:20:54 +0100
Subject: [PATCH 063/131] add additional pylint options

---
 .pylintrc                                     |  7 +++--
 aea/aea.py                                    |  2 +-
 aea/cli_gui/__init__.py                       |  2 +-
 aea/crypto/cosmos.py                          |  4 ---
 aea/helpers/async_utils.py                    |  2 +-
 aea/helpers/exec_timeout.py                   |  2 +-
 aea/helpers/search/generic.py                 |  2 +-
 .../generator/extract_specification.py        |  2 +-
 aea/test_tools/test_cases.py                  |  2 +-
 .../fetchai/connections/soef/connection.py    | 29 ++++++++++---------
 scripts/whitelist.py                          |  1 -
 .../test_connections/test_soef/models.py      | 12 ++++----
 12 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 9b2784db56..eebe04c217 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -2,7 +2,7 @@
 ignore-patterns=serialization.py,message.py,__main__.py,.*_pb2.py
 
 [MESSAGES CONTROL]
-disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,R0914,R0801,R0904,R0903,R0911,R0912,R0901,R0916,R1702,R0915,R1725
+disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,R0914,R0801,R0904,R0911,R0912,R0901,R0916,R1702,R0915
 
 ## Eventually resolve these:
 # W0707: raise-missing-from
@@ -10,14 +10,12 @@ disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,
 # R0913: too-many-arguments
 # R0914: too-many-locals
 # R0904: too-many-public-methods
-# R0903: too-few-public-methods
 # R0911: too-many-return-statements
 # R0912: too-many-branches
 # R0901: too-many-ancestors
 # R0916: too-many-boolean-expressions
 # R1702: too-many-nested-blocks
 # R0915: too-many-statements
-# R1725: super-with-arguments
 # decide on a logging policy:
 # W1202: logging-format-interpolation
 # W1203: logging-fstring-interpolation
@@ -34,3 +32,6 @@ disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,
 
 [IMPORTS]
 ignored-modules=aiohttp,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,vyper,web3
+
+[DESIGN]
+min-public-methods=1
\ No newline at end of file
diff --git a/aea/aea.py b/aea/aea.py
index bb3ff4c5e2..89a5022189 100644
--- a/aea/aea.py
+++ b/aea/aea.py
@@ -341,7 +341,7 @@ def get_message_handlers(self) -> List[Tuple[Callable[[Any], None], Callable]]:
 
         :return: List of tuples of callables: handler and coroutine to get a message
         """
-        return super(AEA, self).get_message_handlers() + [
+        return super().get_message_handlers() + [
             (self.filter.handle_internal_message, self.filter.get_internal_message,),
         ]
 
diff --git a/aea/cli_gui/__init__.py b/aea/cli_gui/__init__.py
index e9a490bbf9..2690348e64 100644
--- a/aea/cli_gui/__init__.py
+++ b/aea/cli_gui/__init__.py
@@ -70,7 +70,7 @@
 max_log_lines = 100
 
 
-class AppContext:
+class AppContext:  # pylint: disable=too-few-public-methods
     """Store useful global information about the app.
 
     Can't add it into the app object itself because mypy complains.
diff --git a/aea/crypto/cosmos.py b/aea/crypto/cosmos.py
index d0a94db085..59533cd3d9 100644
--- a/aea/crypto/cosmos.py
+++ b/aea/crypto/cosmos.py
@@ -864,10 +864,6 @@ class CosmosApi(_CosmosApi, CosmosHelper):
     """Class to interact with the Cosmos SDK via a HTTP APIs."""
 
 
-class CosmWasmCLIWrapper:
-    """Wrapper of the CosmWasm CLI."""
-
-
 """ Equivalent to:
 
 @dataclass
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 3adb111db1..0723a00b58 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -474,6 +474,6 @@ def __init__(self, getters: List[Tuple[Callable[[Any], None], Callable]]):
 
         :param getters: List of tuples of handler and couroutine to be awaiteed for an item.
         """
-        super(HandlerItemGetter, self).__init__(
+        super().__init__(
             [self._make_getter(handler, getter) for handler, getter in getters]
         )
diff --git a/aea/helpers/exec_timeout.py b/aea/helpers/exec_timeout.py
index 674e80e79b..b6b605cb18 100644
--- a/aea/helpers/exec_timeout.py
+++ b/aea/helpers/exec_timeout.py
@@ -136,7 +136,7 @@ def _remove_timeout_watch(self) -> None:
         raise NotImplementedError  # pragma: nocover
 
 
-class ExecTimeoutSigAlarm(BaseExecTimeout):
+class ExecTimeoutSigAlarm(BaseExecTimeout):  # pylint: disable=too-few-public-methods
     """
     ExecTimeout context manager implementation using signals and SIGALARM.
 
diff --git a/aea/helpers/search/generic.py b/aea/helpers/search/generic.py
index 5891d71a3a..ec9abd8c3d 100644
--- a/aea/helpers/search/generic.py
+++ b/aea/helpers/search/generic.py
@@ -28,7 +28,7 @@
 SUPPORTED_TYPES = {"str": str, "int": int, "float": float, "bool": bool}
 
 
-class GenericDataModel(DataModel):
+class GenericDataModel(DataModel):  # pylint: disable=too-few-public-methods
     """Generic data model."""
 
     def __init__(self, data_model_name: str, data_model_attributes: Dict[str, Any]):
diff --git a/aea/protocols/generator/extract_specification.py b/aea/protocols/generator/extract_specification.py
index e3f42cf45c..550c3d5dc1 100644
--- a/aea/protocols/generator/extract_specification.py
+++ b/aea/protocols/generator/extract_specification.py
@@ -143,7 +143,7 @@ def _specification_type_to_python_type(specification_type: str) -> str:
     return python_type
 
 
-class PythonicProtocolSpecification:
+class PythonicProtocolSpecification:  # pylint: disable=too-few-public-methods
     """This class represents a protocol specification in python."""
 
     def __init__(self) -> None:
diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index 55e1b9d2bc..d058f4d1f9 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -798,7 +798,7 @@ def teardown_class(cls):
 
 
 @pytest.mark.integration
-class UseOef:
+class UseOef:  # pylint: disable=too-few-public-methods
     """Inherit from this class to launch an OEF node."""
 
     @pytest.fixture(autouse=True)
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 0a0f6c4a28..66a39a80b3 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -26,6 +26,7 @@
 from concurrent.futures._base import CancelledError as ConcurrentCancelledError
 from concurrent.futures.thread import ThreadPoolExecutor
 from contextlib import suppress
+from enum import Enum
 from typing import Callable, Dict, List, Optional, Set, Type, Union, cast
 from urllib import parse
 from uuid import uuid4
@@ -80,16 +81,16 @@
 ]
 
 
-class ModelNames:
+class ModelNames(Enum):
     """Enum of supported data models."""
 
-    location_agent = "location_agent"
-    set_service_key = "set_service_key"
-    remove_service_key = "remove_service_key"
-    personality_agent = "personality_agent"
-    search_model = "search_model"
-    ping = "ping"
-    generic_command = "generic_command"
+    LOCATION_AGENT = "location_agent"
+    SET_SERVICE_KEY = "set_service_key"
+    REMOVE_SERVICE_KEY = "remove_service_key"
+    PERSONALITY_AGENT = "personality_agent"
+    SEARCH_MODEL = "search_model"
+    PING = "ping"
+    GENERIC_COMMAND = "generic_command"
 
 
 class SOEFException(Exception):
@@ -511,7 +512,7 @@ async def _ping_handler(
 
         :return None
         """
-        self._check_data_model(service_description, ModelNames.ping)
+        self._check_data_model(service_description, ModelNames.PING.value)
         await self._ping_command()
 
     async def _generic_command_handler(
@@ -531,7 +532,7 @@ async def _generic_command_handler(
             """not connected."""
             return
 
-        self._check_data_model(service_description, ModelNames.generic_command)
+        self._check_data_model(service_description, ModelNames.GENERIC_COMMAND.value)
         command = service_description.values.get("command", None)
         params = service_description.values.get("parameters", {})
 
@@ -593,7 +594,7 @@ async def _set_service_key_handler(
         :param service_description: Service description
         :return None
         """
-        self._check_data_model(service_description, ModelNames.set_service_key)
+        self._check_data_model(service_description, ModelNames.SET_SERVICE_KEY.value)
 
         key = service_description.values.get("key", None)
         value = service_description.values.get("value", NOT_SPECIFIED)
@@ -654,7 +655,7 @@ async def _remove_service_key_handler(
         :param service_description: Service description
         :return None
         """
-        self._check_data_model(service_description, ModelNames.remove_service_key)
+        self._check_data_model(service_description, ModelNames.REMOVE_SERVICE_KEY.value)
         key = service_description.values.get("key", None)
 
         if key is None:  # pragma: nocover
@@ -683,7 +684,7 @@ async def _register_location_handler(
         :param service_description: Service description
         :return None
         """
-        self._check_data_model(service_description, ModelNames.location_agent)
+        self._check_data_model(service_description, ModelNames.LOCATION_AGENT.value)
 
         agent_location = service_description.values.get("location", None)
 
@@ -761,7 +762,7 @@ async def _set_personality_piece_handler(
         :param piece: the piece to be set
         :param value: the value to be set
         """
-        self._check_data_model(service_description, ModelNames.personality_agent)
+        self._check_data_model(service_description, ModelNames.PERSONALITY_AGENT.value)
         piece = service_description.values.get("piece", None)
         value = service_description.values.get("value", None)
 
diff --git a/scripts/whitelist.py b/scripts/whitelist.py
index 296f020813..9547a8a7fa 100644
--- a/scripts/whitelist.py
+++ b/scripts/whitelist.py
@@ -78,7 +78,6 @@
 _.try_execute_wasm_query  # unused method (aea/crypto/cosmos.py:571)
 _.get_last_code_id  # unused method (aea/crypto/cosmos.py:837)
 _.get_contract_address  # unused method (aea/crypto/cosmos.py:849)
-CosmWasmCLIWrapper  # unused class (aea/crypto/cosmos.py:863)
 CosmosFaucetApi  # unused class (aea/crypto/cosmos.py:867)
 testnet_name  # unused variable (aea/crypto/cosmos.py:871)
 EthereumFaucetApi  # unused class (aea/crypto/ethereum.py:507)
diff --git a/tests/test_packages/test_connections/test_soef/models.py b/tests/test_packages/test_connections/test_soef/models.py
index 0f523d5807..aab233f1b1 100644
--- a/tests/test_packages/test_connections/test_soef/models.py
+++ b/tests/test_packages/test_connections/test_soef/models.py
@@ -24,7 +24,7 @@
 
 
 AGENT_LOCATION_MODEL = DataModel(
-    ModelNames.location_agent,
+    ModelNames.LOCATION_AGENT.value,
     [
         Attribute("location", Location, True, "The location where the agent is."),
         Attribute("disclosure_accuracy", str, False, "Optional disclosure accuracy."),
@@ -34,7 +34,7 @@
 
 
 AGENT_PERSONALITY_MODEL = DataModel(
-    ModelNames.personality_agent,
+    ModelNames.PERSONALITY_AGENT.value,
     [
         Attribute("piece", str, True, "The personality piece key."),
         Attribute("value", str, True, "The personality piece value."),
@@ -44,7 +44,7 @@
 
 
 SET_SERVICE_KEY_MODEL = DataModel(
-    ModelNames.set_service_key,
+    ModelNames.SET_SERVICE_KEY.value,
     [
         Attribute("key", str, True, "Service key name."),
         Attribute("value", str, True, "Service key value."),
@@ -54,12 +54,12 @@
 
 
 REMOVE_SERVICE_KEY_MODEL = DataModel(
-    ModelNames.remove_service_key,
+    ModelNames.REMOVE_SERVICE_KEY.value,
     [Attribute("key", str, True, "Service key name.")],
     "A data model to remove service key.",
 )
 
-PING_MODEL = DataModel(ModelNames.ping, [], "A data model for ping command.",)
+PING_MODEL = DataModel(ModelNames.PING.value, [], "A data model for ping command.",)
 
 
 SEARCH_MODEL = DataModel(
@@ -70,7 +70,7 @@
 
 
 AGENT_GENERIC_COMMAND_MODEL = DataModel(
-    ModelNames.generic_command,
+    ModelNames.GENERIC_COMMAND.value,
     [
         Attribute("command", str, True, "Command name to execute."),
         Attribute("parameters", str, False, "Url encoded parameters string."),

From 5c674907cfc5769636a4a78996e235151429ff10 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 19:57:37 +0100
Subject: [PATCH 064/131] fix docs tests

---
 aea/cli/utils/config.py                                      | 2 +-
 packages/fetchai/connections/soef/connection.yaml            | 2 +-
 packages/hashes.csv                                          | 2 +-
 .../test_bash_yaml/md_files/bash-tac-skills-contract.md      | 5 +++--
 tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md   | 4 ++--
 tests/test_packages/test_connections/test_soef/models.py     | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/aea/cli/utils/config.py b/aea/cli/utils/config.py
index 4850c71eba..9ca1237d60 100644
--- a/aea/cli/utils/config.py
+++ b/aea/cli/utils/config.py
@@ -82,7 +82,7 @@ def try_to_load_agent_config(
                 )
             )
     except AEAEnforceError as e:
-        raise click.ClickException(str(e))
+        raise click.ClickException(str(e))  # pragma: nocover
 
 
 def _init_cli_config() -> None:
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 82f6d15805..da4a8d5dc4 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmToZaADzMNpPZr6SMhM4ACwCP3iLi3XfmXxx4F89NxZe5
+  connection.py: QmRTPeJ8aTDuWs28EM7vbBEDbZ75XqqzCo8zhSNXEGmeK3
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.7.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index f2278b6f3a..0dbe4d6617 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -28,7 +28,7 @@ fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmWgtvW6vvXKhmmAS1n61LZ4rhFnuLcUM61XLW47WiuBfd
+fetchai/connections/soef,Qme2vP55mGemMKMWdHKGUaC1nW88ZEdD55qgdY9a984T7i
 fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
index 0003698f96..e7d2030463 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills-contract.md
@@ -67,8 +67,9 @@ aea config set vendor.fetchai.skills.tac_participation.models.game.args.is_using
 aea config set vendor.fetchai.skills.tac_negotiation.models.strategy.args.is_contract_tx 'True' --type bool
 ```
 ``` bash
-aea config get vendor.fetchai.skills.tac_control_contract.models.parameters.args.start_time
-aea config set vendor.fetchai.skills.tac_control_contract.models.parameters.args.start_time '01 01 2020  00:01'
+aea config get vendor.fetchai.skills.tac_control_contract.models.parameters.args.registration_start_time
+aea config set vendor.fetchai.skills.tac_control_contract.models.parameters.args.registration_start_time '01 01 2020  00:01'
+```
 ```
 ``` bash
 aea launch tac_controller_contract tac_participant_one tac_participant_two
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
index b21b9cf691..f2ef4b05a6 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-tac-skills.md
@@ -52,8 +52,8 @@ aea add-key fetchai fetchai_private_key.txt
 aea add-key fetchai fetchai_private_key.txt --connection
 ```
 ``` bash
-aea config get vendor.fetchai.skills.tac_control.models.parameters.args.start_time
-aea config set vendor.fetchai.skills.tac_control.models.parameters.args.start_time '01 01 2020  00:01'
+aea config get vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time
+aea config set vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time '01 01 2020  00:01'
 ```
 ``` bash
 aea run
diff --git a/tests/test_packages/test_connections/test_soef/models.py b/tests/test_packages/test_connections/test_soef/models.py
index aab233f1b1..29beaae8fa 100644
--- a/tests/test_packages/test_connections/test_soef/models.py
+++ b/tests/test_packages/test_connections/test_soef/models.py
@@ -63,7 +63,7 @@
 
 
 SEARCH_MODEL = DataModel(
-    ModelNames.search_model,
+    ModelNames.SEARCH_MODEL.value,
     [Attribute("location", Location, True, "The location where the agent is.")],
     "A data model to perform search.",
 )

From 1e7828248a554eb9ac01f7a3e4ba2bc91199163b Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 20:04:46 +0100
Subject: [PATCH 065/131] enable max-public-methods check and resolve issues

---
 .pylintrc                                             | 6 +++---
 packages/fetchai/skills/carpark_detection/database.py | 2 +-
 packages/fetchai/skills/carpark_detection/skill.yaml  | 2 +-
 packages/hashes.csv                                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index eebe04c217..83401493fb 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -2,14 +2,13 @@
 ignore-patterns=serialization.py,message.py,__main__.py,.*_pb2.py
 
 [MESSAGES CONTROL]
-disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,R0914,R0801,R0904,R0911,R0912,R0901,R0916,R1702,R0915
+disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,R0914,R0801,R0911,R0912,R0901,R0916,R1702,R0915
 
 ## Eventually resolve these:
 # W0707: raise-missing-from
 # R0902: too-many-instance-attributes
 # R0913: too-many-arguments
 # R0914: too-many-locals
-# R0904: too-many-public-methods
 # R0911: too-many-return-statements
 # R0912: too-many-branches
 # R0901: too-many-ancestors
@@ -34,4 +33,5 @@ disable=C0103,C0201,C0301,C0302,C0330,W0105,W0107,W0707,W1202,W1203,R0902,R0913,
 ignored-modules=aiohttp,defusedxml,gym,fetch,matplotlib,memory_profiler,numpy,oef,openapi_core,psutil,tensorflow,temper,skimage,vyper,web3
 
 [DESIGN]
-min-public-methods=1
\ No newline at end of file
+min-public-methods=1
+max-public-methods=35
diff --git a/packages/fetchai/skills/carpark_detection/database.py b/packages/fetchai/skills/carpark_detection/database.py
index 31dd90e8f9..245d4c0155 100644
--- a/packages/fetchai/skills/carpark_detection/database.py
+++ b/packages/fetchai/skills/carpark_detection/database.py
@@ -33,7 +33,7 @@
 )
 
 
-class DetectionDatabase:
+class DetectionDatabase:  # pylint: disable=too-many-public-methods
     """Communicate between the database and the python objects."""
 
     def __init__(
diff --git a/packages/fetchai/skills/carpark_detection/skill.yaml b/packages/fetchai/skills/carpark_detection/skill.yaml
index 1aaadad48e..4d5e40c87a 100644
--- a/packages/fetchai/skills/carpark_detection/skill.yaml
+++ b/packages/fetchai/skills/carpark_detection/skill.yaml
@@ -10,7 +10,7 @@ fingerprint:
   README.md: QmcwNhv5N8m4ZtWvXY5eMDeL5ciivryDZPtGWXMFfTbYR7
   __init__.py: QmQoECB7dpCDCG3xCnBsoMy6oqgSdu69CzRcAcuZuyapnQ
   behaviours.py: QmTNboU3YH8DehWnpZmoiDUCncpNmqoSVt1Yp4j7NsgY2S
-  database.py: QmcZ7zomRfpVakRQBaDFzkuAN8noEWkHo2LLxUMNpF1xUp
+  database.py: QmPQqzgsmFKBSMoYbuEpEMnikmkEadaT9VrD8ics5Het2b
   dialogues.py: QmPXfUWDxnHDaHQqsgtVhJ2v9dEgGWLtvEHKFvvFcDXGms
   handlers.py: QmbkmEP9K4Qu2MsRtnkdx3PGNbSW46qi48bCHVCUJHpcQF
   strategy.py: QmUCmsvvKqRsM4nFuhsUUTfCnZ6zPffXytD3PjMjFdqHdU
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 0dbe4d6617..76ae3305fb 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -49,7 +49,7 @@ fetchai/protocols/tac,QmY6N5spfcwikq3pb99mdYAEieECqmtawbcitGJRicDh7H
 fetchai/skills/aries_alice,QmefZJ27H36RZYgA6eEcnbv8yNPyf3YYXnBm5E88C8xBLQ
 fetchai/skills/aries_faber,QmYAQ8gVsokPsXHd7RDXb8KCkmH7XpB8JC7VMx3QrJX3Uh
 fetchai/skills/carpark_client,QmYjZXvq2h2DCXZF2ba9W5cvJAvsRFvBrw7h7EwcvWThfW
-fetchai/skills/carpark_detection,QmRLr3ALHF1iLFFpUmXHKZmMwbFz5vfph8qCv7rKQpte2r
+fetchai/skills/carpark_detection,QmV5qPay1FMk3tsygygRL4ThsBRxFL5nZe7x5NrXFXpSJN
 fetchai/skills/echo,QmYKGMNs5NU7ycWXRBQnKrfBcg5HPnUnH13K1YFnPLQgW6
 fetchai/skills/erc1155_client,Qmd6KJbis7Me39teeHA8y3JZHQrS1hjovMxhqiwViRZhgc
 fetchai/skills/erc1155_deploy,QmZHDmFaxJmieLaCUJKBwp1EsTEAAxbFvFkfLjL4fVyhfK

From a42c51d0a59e09468c723c2702693edf2fd9bed6 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 21:35:23 +0100
Subject: [PATCH 066/131] attempt to fix tac control skill

---
 packages/fetchai/skills/tac_control/parameters.py | 2 +-
 packages/fetchai/skills/tac_control/skill.yaml    | 5 +++--
 packages/hashes.csv                               | 2 +-
 tests/test_packages/test_skills/test_tac.py       | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/fetchai/skills/tac_control/parameters.py b/packages/fetchai/skills/tac_control/parameters.py
index f4bfe793b9..a490fa92c9 100644
--- a/packages/fetchai/skills/tac_control/parameters.py
+++ b/packages/fetchai/skills/tac_control/parameters.py
@@ -207,7 +207,7 @@ def nb_goods(self) -> int:
     @property
     def nb_currencies(self) -> int:
         """Currency number for a TAC instance."""
-        return self._nb_goods
+        return self._nb_currencies
 
     @property
     def currency_id_to_name(self) -> Dict[str, str]:
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index e62dd6ce2d..85cb506acc 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -14,7 +14,7 @@ fingerprint:
   game.py: QmTovmW5vuhUcnvW4wQQcbPpiUFLLvMH7LaeTZYVvjqLcF
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
   helpers.py: QmQXrtqV3h4oU5cDwWKhtNiTTAGLNZGhjoVnDvGj7mGwpe
-  parameters.py: QmbdCERZFXWjP4ov7uLvmFGxvrTep3RwiQauXevLcJNLbY
+  parameters.py: QmeviKY6o3H2FYNFaB9PibZGZc1CwMgLbrCbPoSmZDsikv
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
@@ -58,7 +58,8 @@ models:
       lower_bound_factor: 1
       min_nb_agents: 2
       money_endowment: 2000000
-      nb_goods: 10
+      nb_currencies: 1
+      nb_goods: 9
       registration_start_time: 01 01 2020  00:01
       registration_timeout: 60
       service_data:
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 76ae3305fb..7800832144 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -62,7 +62,7 @@ fetchai/skills/ml_data_provider,QmaKyLjyvcj35bCHaKKo15MeF7k48hKPCfFbrtvXCogYwV
 fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
-fetchai/skills/tac_control,QmTgw37facaPnt9RQcHNPzFasDmgG1PktEo2ZHfNqPjXet
+fetchai/skills/tac_control,QmPFxFsYqRZvz7BRStWLV9Fo4Wd77iTNBWuBSU2VZeqrwL
 fetchai/skills/tac_control_contract,QmYX4gNaGbx1EAuASwhpSgTdLYwUzuzajtKTuqvNFR9f2Q
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index 1ff948a692..f9e319525c 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -47,7 +47,7 @@ class TestTacSkills(AEATestCaseMany):
 
     @pytest.mark.integration
     @pytest.mark.flaky(
-        reruns=MAX_FLAKY_RERUNS_INTEGRATION
+        reruns=0
     )  # cause possible network issues
     def test_tac(self):
         """Run the tac skills sequence."""
@@ -143,10 +143,10 @@ def test_tac(self):
         self.set_agent_context(tac_controller_name)
         now = datetime.datetime.now().strftime("%d %m %Y %H:%M")
         now_min = datetime.datetime.strptime(now, "%d %m %Y %H:%M")
-        fut = now_min + datetime.timedelta(0, 120)
+        fut = now_min  # + datetime.timedelta(0, 120)
         start_time = fut.strftime("%d %m %Y %H:%M")
         setting_path = (
-            "vendor.fetchai.skills.tac_control.models.parameters.args.start_time"
+            "vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time"
         )
         self.set_config(setting_path, start_time)
         tac_controller_process = self.run_agent()

From 84785415cd80bb2ce3cc7ced06566ad747ee5c2b Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 22:08:06 +0100
Subject: [PATCH 067/131] update tac protocol

---
 packages/fetchai/protocols/tac/README.md     | 2 +-
 packages/fetchai/protocols/tac/dialogues.py  | 1 +
 packages/fetchai/protocols/tac/protocol.yaml | 4 ++--
 packages/hashes.csv                          | 2 +-
 tests/test_packages/test_skills/test_tac.py  | 6 ++----
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/fetchai/protocols/tac/README.md b/packages/fetchai/protocols/tac/README.md
index 286ad842ef..4a7397b04e 100644
--- a/packages/fetchai/protocols/tac/README.md
+++ b/packages/fetchai/protocols/tac/README.md
@@ -71,7 +71,7 @@ initiation: [register]
 reply:
   register: [tac_error, game_data, cancelled]
   unregister: [tac_error]
-  transaction: [transaction_confirmation, tac_error, cancelled]
+  transaction: [transaction, transaction_confirmation, tac_error, cancelled]
   cancelled: []
   game_data: [transaction, transaction_confirmation, cancelled]
   transaction_confirmation: [transaction, transaction_confirmation, cancelled]
diff --git a/packages/fetchai/protocols/tac/dialogues.py b/packages/fetchai/protocols/tac/dialogues.py
index 250ae33e75..fb09acd3fa 100644
--- a/packages/fetchai/protocols/tac/dialogues.py
+++ b/packages/fetchai/protocols/tac/dialogues.py
@@ -66,6 +66,7 @@ class TacDialogue(Dialogue):
         ),
         TacMessage.Performative.TRANSACTION: frozenset(
             {
+                TacMessage.Performative.TRANSACTION,
                 TacMessage.Performative.TRANSACTION_CONFIRMATION,
                 TacMessage.Performative.TAC_ERROR,
                 TacMessage.Performative.CANCELLED,
diff --git a/packages/fetchai/protocols/tac/protocol.yaml b/packages/fetchai/protocols/tac/protocol.yaml
index cc916bf083..7b320ff557 100644
--- a/packages/fetchai/protocols/tac/protocol.yaml
+++ b/packages/fetchai/protocols/tac/protocol.yaml
@@ -7,10 +7,10 @@ description: The tac protocol implements the messages an AEA needs to participat
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
-  README.md: QmcUpwxG2ZzdwMeMGGTVyJgsRVbrCUKtYB2qqLy4YsuBez
+  README.md: QmSZJ6wsgqjYN6cqWQKShj2xpruYMCxbK1m6TKk4V4Aopn
   __init__.py: QmSAC7PGra9fig8RhhF1j3XEVpgie9UZNNYPc2AB9Kx9xJ
   custom_types.py: QmXQATfnvuCpt4FicF4QcqCcLj9PQNsSHjCBvVQknWpyaN
-  dialogues.py: QmTxHrcGujP1RUYvfJygZyQoUwmDg2GBWfmbR3tWUSbyop
+  dialogues.py: QmQvuivrjhVFu7pjSFfv6FrWwVeBC7p8Hm3P4gjCnVx5Ym
   message.py: QmWD79nj4kcMPN9xuDkgSDXnwgDnT6XE1WcdfBKsKKPqTP
   serialization.py: QmTk2Jp19dQ4SJdjSHAr8wbxw4rQSMheSuf1XzXG8CaoB4
   tac.proto: QmdpPZNhUW593qVNVoSTWZgd9R69bmBbw6Y9xjzYpvuDvV
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 7800832144..382daea0fa 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -45,7 +45,7 @@ fetchai/protocols/oef_search,QmWiRygk9JHtCJ6FbSK49uwkCzsSu6wJVqc27iQEwGphFR
 fetchai/protocols/scaffold,QmaQJxMae5XaHKDc838pcGEKhhYSUyKHGWiMfU6zEcVHsy
 fetchai/protocols/signing,Qmazm8bkwpPVV7BiJZx2Aha96AcmAxwiYbjgYGwvcgXGYi
 fetchai/protocols/state_update,QmS1xuSYYgHkQq8Ww2btsS88rTXXjhchyStzUfcWYQKNda
-fetchai/protocols/tac,QmY6N5spfcwikq3pb99mdYAEieECqmtawbcitGJRicDh7H
+fetchai/protocols/tac,QmYuMW1tNE5eLdKEo5T6uyTYmVmGuavQLT4xx3hDaGNLJJ
 fetchai/skills/aries_alice,QmefZJ27H36RZYgA6eEcnbv8yNPyf3YYXnBm5E88C8xBLQ
 fetchai/skills/aries_faber,QmYAQ8gVsokPsXHd7RDXb8KCkmH7XpB8JC7VMx3QrJX3Uh
 fetchai/skills/carpark_client,QmYjZXvq2h2DCXZF2ba9W5cvJAvsRFvBrw7h7EwcvWThfW
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index f9e319525c..b74dbb2f4a 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -47,7 +47,7 @@ class TestTacSkills(AEATestCaseMany):
 
     @pytest.mark.integration
     @pytest.mark.flaky(
-        reruns=0
+        reruns=MAX_FLAKY_RERUNS_INTEGRATION
     )  # cause possible network issues
     def test_tac(self):
         """Run the tac skills sequence."""
@@ -145,9 +145,7 @@ def test_tac(self):
         now_min = datetime.datetime.strptime(now, "%d %m %Y %H:%M")
         fut = now_min  # + datetime.timedelta(0, 120)
         start_time = fut.strftime("%d %m %Y %H:%M")
-        setting_path = (
-            "vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time"
-        )
+        setting_path = "vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time"
         self.set_config(setting_path, start_time)
         tac_controller_process = self.run_agent()
 

From 3c79fc24e729da18e90c7dc72e078f5aca713fac Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 22:38:21 +0100
Subject: [PATCH 068/131] mute cancel error in stub connection

---
 aea/connections/stub/connection.py   | 3 +++
 aea/connections/stub/connection.yaml | 2 +-
 packages/hashes.csv                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/aea/connections/stub/connection.py b/aea/connections/stub/connection.py
index a80267f0c9..9797a9094d 100644
--- a/aea/connections/stub/connection.py
+++ b/aea/connections/stub/connection.py
@@ -251,6 +251,9 @@ async def receive(self, *args, **kwargs) -> Optional["Envelope"]:
 
         try:
             return await self.in_queue.get()
+        except CancelledError:  # pragma: no cover
+            self.logger.debug("Receive cancelled.")
+            return None
         except Exception:  # pylint: disable=broad-except
             logger.exception("Stub connection receive error:")
             return None
diff --git a/aea/connections/stub/connection.yaml b/aea/connections/stub/connection.yaml
index 743ee3598a..d9bb0817dd 100644
--- a/aea/connections/stub/connection.yaml
+++ b/aea/connections/stub/connection.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmWwepN9Fy9gHAp39vUGFSLdnB9JZjdyE3STnbowSUhJkC
-  connection.py: QmTSESVFvsDc9iq2QM3YdZju3yHqTA3wHbLkAzHXEFY17Z
+  connection.py: QmVjZwuNd6JLRDp2DzZxbLwF5feSrGiULWowZSan9Caogk
   readme.md: QmXSAtxSY7C2YkvUxeVnpqCJY9uJYZxZBmuUcE4zjFXcXz
 fingerprint_ignore_patterns: []
 protocols: []
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 382daea0fa..29718482ad 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -29,7 +29,7 @@ fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4J
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
 fetchai/connections/soef,Qme2vP55mGemMKMWdHKGUaC1nW88ZEdD55qgdY9a984T7i
-fetchai/connections/stub,QmSuUAA2k1E1M9dpeAgkWpfKdssjqghSDfFfrQzC9ZLKbD
+fetchai/connections/stub,QmWarW8MTJ3CHRgXdkbwKK7DyDKzvQKdZeb95uy8kSnxrT
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd
 fetchai/contracts/erc1155,QmWu22zW9AVMBVySwF413JMiT5dcWsLsU2gk1KvFYWAwPq

From 70ee5aa4bd79ddbf3a4f7c9fac15e9de5f27be88 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 22:47:45 +0100
Subject: [PATCH 069/131] fix yaml loading in scripts and fix tac test

---
 scripts/deploy_to_registry.py               | 22 +++++++++++++++++++--
 scripts/update_package_versions.py          | 20 ++++++++++++++++++-
 tests/test_packages/test_skills/test_tac.py |  2 +-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/scripts/deploy_to_registry.py b/scripts/deploy_to_registry.py
index 97729d068a..769139bd04 100644
--- a/scripts/deploy_to_registry.py
+++ b/scripts/deploy_to_registry.py
@@ -25,7 +25,7 @@
 import sys
 from itertools import chain
 from pathlib import Path
-from typing import Set
+from typing import Dict, Set
 
 import yaml
 from click.testing import CliRunner
@@ -51,13 +51,31 @@ def default_config_file_paths():
         yield item
 
 
+def unified_yaml_load(configuration_file: Path) -> Dict:
+    """
+    Load YAML file, unified (both single- and multi-paged).
+
+    :param configuration_file: the configuration file path.
+    :return: the data.
+    """
+    package_type = configuration_file.parent.parent.name
+    with configuration_file.open() as fp:
+        if package_type != "agents":
+            return yaml.safe_load(fp)
+        # when it is an agent configuration file,
+        # we are interested only in the first page of the YAML,
+        # because the dependencies are contained only there.
+        data = yaml.safe_load_all(fp)
+        return list(data)[0]
+
+
 def get_public_id_from_yaml(configuration_file: Path):
     """
     Get the public id from yaml.
 
     :param configuration_file: the path to the config yaml
     """
-    data = yaml.safe_load(configuration_file.open())
+    data = unified_yaml_load(configuration_file)
     author = data["author"]
     # handle the case when it's a package or agent config file.
     name = data["name"] if "name" in data else data["agent_name"]
diff --git a/scripts/update_package_versions.py b/scripts/update_package_versions.py
index a93f1067f0..e0ef1d5010 100644
--- a/scripts/update_package_versions.py
+++ b/scripts/update_package_versions.py
@@ -196,13 +196,31 @@ def get_configuration_file_path(type_: str, name: str) -> Path:
     sys.exit(1)
 
 
+def unified_yaml_load(configuration_file: Path) -> Dict:
+    """
+    Load YAML file, unified (both single- and multi-paged).
+
+    :param configuration_file: the configuration file path.
+    :return: the data.
+    """
+    package_type = configuration_file.parent.parent.name
+    with configuration_file.open() as fp:
+        if package_type != "agents":
+            return yaml.safe_load(fp)
+        # when it is an agent configuration file,
+        # we are interested only in the first page of the YAML,
+        # because the dependencies are contained only there.
+        data = yaml.safe_load_all(fp)
+        return list(data)[0]
+
+
 def get_public_id_from_yaml(configuration_file_path: Path) -> PublicId:
     """
     Get the public id from yaml.
 
     :param configuration_file_path: the path to the config yaml
     """
-    data = yaml.safe_load(configuration_file_path.open())
+    data = unified_yaml_load(configuration_file_path)
     author = data["author"]
     # handle the case when it's a package or agent config file.
     name = data["name"] if "name" in data else data["agent_name"]
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index b74dbb2f4a..88a8c90156 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -143,7 +143,7 @@ def test_tac(self):
         self.set_agent_context(tac_controller_name)
         now = datetime.datetime.now().strftime("%d %m %Y %H:%M")
         now_min = datetime.datetime.strptime(now, "%d %m %Y %H:%M")
-        fut = now_min  # + datetime.timedelta(0, 120)
+        fut = now_min + datetime.timedelta(0, 60)
         start_time = fut.strftime("%d %m %Y %H:%M")
         setting_path = "vendor.fetchai.skills.tac_control.models.parameters.args.registration_start_time"
         self.set_config(setting_path, start_time)

From 2cd1b88039efc9f5f9851717fc2160629764cf07 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 22:50:51 +0100
Subject: [PATCH 070/131] bump stub connection

---
 aea/configurations/constants.py               |  2 +-
 aea/connections/stub/connection.py            |  2 +-
 aea/connections/stub/connection.yaml          |  6 +--
 aea/connections/stub/readme.md                |  2 +-
 docs/build-aea-programmatically.md            |  2 +-
 docs/config.md                                |  2 +-
 docs/core-components-1.md                     |  2 +-
 docs/logging.md                               |  4 +-
 docs/package-imports.md                       |  2 +-
 docs/questions-and-answers.md                 |  2 +-
 docs/quickstart.md                            |  4 +-
 .../agents/aries_alice/aea-config.yaml        |  2 +-
 .../agents/aries_faber/aea-config.yaml        |  2 +-
 .../agents/car_data_buyer/aea-config.yaml     |  2 +-
 .../agents/car_detector/aea-config.yaml       |  2 +-
 .../agents/erc1155_client/aea-config.yaml     |  2 +-
 .../agents/erc1155_deployer/aea-config.yaml   |  2 +-
 .../agents/generic_buyer/aea-config.yaml      |  2 +-
 .../agents/generic_seller/aea-config.yaml     |  2 +-
 .../fetchai/agents/gym_aea/aea-config.yaml    |  2 +-
 .../agents/ml_data_provider/aea-config.yaml   |  2 +-
 .../agents/ml_model_trainer/aea-config.yaml   |  2 +-
 .../agents/my_first_aea/aea-config.yaml       |  4 +-
 .../aea-config.yaml                           |  2 +-
 .../agents/tac_controller/aea-config.yaml     |  2 +-
 .../tac_controller_contract/aea-config.yaml   |  2 +-
 .../agents/tac_participant/aea-config.yaml    |  2 +-
 .../agents/thermometer_aea/aea-config.yaml    |  2 +-
 .../agents/thermometer_client/aea-config.yaml |  2 +-
 .../agents/weather_client/aea-config.yaml     |  2 +-
 .../agents/weather_station/aea-config.yaml    |  2 +-
 packages/hashes.csv                           | 42 +++++++++----------
 tests/test_aea_builder.py                     |  2 +-
 tests/test_cli/test_get_multiaddress.py       | 22 +++++-----
 tests/test_configurations/test_aea_config.py  |  2 +-
 .../test_bash_yaml/md_files/bash-config.md    |  2 +-
 .../test_bash_yaml/md_files/bash-logging.md   |  4 +-
 .../md_files/bash-package-imports.md          |  2 +-
 .../md_files/bash-quickstart.md               |  2 +-
 39 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/aea/configurations/constants.py b/aea/configurations/constants.py
index 5cfb525c7b..169bb58945 100644
--- a/aea/configurations/constants.py
+++ b/aea/configurations/constants.py
@@ -26,7 +26,7 @@
 from aea.crypto.helpers import PRIVATE_KEY_PATH_SCHEMA
 
 
-DEFAULT_CONNECTION = PublicId.from_str("fetchai/stub:0.9.0")
+DEFAULT_CONNECTION = PublicId.from_str("fetchai/stub:0.10.0")
 DEFAULT_PROTOCOL = PublicId.from_str("fetchai/default:0.6.0")
 DEFAULT_SKILL = PublicId.from_str("fetchai/error:0.6.0")
 DEFAULT_LEDGER = FetchAICrypto.identifier
diff --git a/aea/connections/stub/connection.py b/aea/connections/stub/connection.py
index 9797a9094d..63f718e25b 100644
--- a/aea/connections/stub/connection.py
+++ b/aea/connections/stub/connection.py
@@ -44,7 +44,7 @@
 DEFAULT_OUTPUT_FILE_NAME = "./output_file"
 SEPARATOR = b","
 
-PUBLIC_ID = PublicId.from_str("fetchai/stub:0.9.0")
+PUBLIC_ID = PublicId.from_str("fetchai/stub:0.10.0")
 
 
 def _encode(e: Envelope, separator: bytes = SEPARATOR):
diff --git a/aea/connections/stub/connection.yaml b/aea/connections/stub/connection.yaml
index d9bb0817dd..4f7c8c820c 100644
--- a/aea/connections/stub/connection.yaml
+++ b/aea/connections/stub/connection.yaml
@@ -1,6 +1,6 @@
 name: stub
 author: fetchai
-version: 0.9.0
+version: 0.10.0
 type: connection
 description: The stub connection implements a connection stub which reads/writes messages
   from/to file.
@@ -8,8 +8,8 @@ license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   __init__.py: QmWwepN9Fy9gHAp39vUGFSLdnB9JZjdyE3STnbowSUhJkC
-  connection.py: QmVjZwuNd6JLRDp2DzZxbLwF5feSrGiULWowZSan9Caogk
-  readme.md: QmXSAtxSY7C2YkvUxeVnpqCJY9uJYZxZBmuUcE4zjFXcXz
+  connection.py: QmRSc6Edy9u9yQMRtvs7MZeq1NRDT57gRy6T19QVLdCkus
+  readme.md: QmQ2Y2sk2xnH45KzxdMna1pUXDGQ5S32fJk1qwdTSfAGc2
 fingerprint_ignore_patterns: []
 protocols: []
 class_name: StubConnection
diff --git a/aea/connections/stub/readme.md b/aea/connections/stub/readme.md
index 839993ec33..177d94c9ef 100644
--- a/aea/connections/stub/readme.md
+++ b/aea/connections/stub/readme.md
@@ -2,6 +2,6 @@
 A simple connection for communication with an AEA, using the file system as a point of data exchange.
 
 ## Usage
-First, add the connection to your AEA project: `aea add connection fetchai/stub:0.9.0`. (If you have created your AEA project with `aea create` then the connection will already be available by default.)
+First, add the connection to your AEA project: `aea add connection fetchai/stub:0.10.0`. (If you have created your AEA project with `aea create` then the connection will already be available by default.)
 
 Optionally, in the `connection.yaml` file under `config` set the `input_file` and `output_file` to the desired file path. The `stub` connection reads encoded envelopes from the `input_file` and writes encoded envelopes to the `output_file`.
diff --git a/docs/build-aea-programmatically.md b/docs/build-aea-programmatically.md
index 407925e113..5c162b7651 100644
--- a/docs/build-aea-programmatically.md
+++ b/docs/build-aea-programmatically.md
@@ -48,7 +48,7 @@ We will use the stub connection to pass envelopes in and out of the AEA. Ensure
 ```
 
 ## Initialise the AEA
-We use the <a href="../api/aea_builder#aeabuilder-objects">`AEABuilder`</a> to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:0.6.0` protocol, the `fetchai/stub:0.9.0` connection and the `fetchai/error:0.6.0` skill.
+We use the <a href="../api/aea_builder#aeabuilder-objects">`AEABuilder`</a> to readily build an AEA. By default, the `AEABuilder` adds the `fetchai/default:0.6.0` protocol, the `fetchai/stub:0.10.0` connection and the `fetchai/error:0.6.0` skill.
 ``` python
     # Instantiate the builder and build the AEA
     # By default, the default protocol, error skill and stub connection are added
diff --git a/docs/config.md b/docs/config.md
index 9cc4e49ae8..6e4435706e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -21,7 +21,7 @@ aea_version: '>=0.6.0, <0.7.0'                  # AEA framework version(s) compa
 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.9.0
+- fetchai/stub:0.10.0
 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:0.6.0
diff --git a/docs/core-components-1.md b/docs/core-components-1.md
index d7500f3322..e549fc63b4 100644
--- a/docs/core-components-1.md
+++ b/docs/core-components-1.md
@@ -42,7 +42,7 @@ Protocol specific `Messages`, wrapped in `Envelopes`, are sent and received to o
 
 A <a href="../api/connections/base#connection-objects">`Connection`</a> wraps an SDK or API and provides an interface to network, ledgers and 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.9.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.10.0`). 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` also read the `Connection` guide <a href="../connection">here</a>.
 
diff --git a/docs/logging.md b/docs/logging.md
index 8f0e4c0230..db47eac014 100644
--- a/docs/logging.md
+++ b/docs/logging.md
@@ -22,13 +22,13 @@ aea_version: 0.6.0
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
 skills:
 - fetchai/error:0.6.0
-default_connection: fetchai/stub:0.9.0
+default_connection: fetchai/stub:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/docs/package-imports.md b/docs/package-imports.md
index b6202ee219..b30e656e0d 100644
--- a/docs/package-imports.md
+++ b/docs/package-imports.md
@@ -47,7 +47,7 @@ The `aea-config.yaml` is the top level configuration file of an AEA. It defines
 For the AEA to use a package, the `public_id` for the package must be listed in the `aea-config.yaml` file, e.g.
 ``` yaml
 connections:
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 ```
 
 The above shows a part of the `aea-config.yaml`. If you see the connections, you will see that we follow a pattern of `author/name_package:version` to identify each package, also referred to as `public_id`. Here the `author` is the author of the package.
diff --git a/docs/questions-and-answers.md b/docs/questions-and-answers.md
index 9b0a634e69..8a99afb531 100644
--- a/docs/questions-and-answers.md
+++ b/docs/questions-and-answers.md
@@ -72,7 +72,7 @@ You can find more details about the CLI commands <a href="../cli-commands/">here
 </details>
 
 <details><summary>When a new AEA is created, is the `vendor` folder populated with some default packages?</summary>
-All AEA projects by default hold the `fetchai/stub:0.9.0` connection, the `fetchai/default:0.6.0` protocol and the `fetchai/error:0.6.0` skill. These (as all other packages installed from the registry) are placed in the vendor's folder.
+All AEA projects by default hold the `fetchai/stub:0.10.0` connection, the `fetchai/default:0.6.0` protocol and the `fetchai/error:0.6.0` skill. These (as all other packages installed from the registry) are placed in the vendor's folder.
 <br><br>
 You can find more details about the file structure <a href="../package-imports/">here</a>
 </details>
diff --git a/docs/quickstart.md b/docs/quickstart.md
index beae01bce4..42f57ff4ad 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -154,7 +154,7 @@ recipient_aea,sender_aea,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello
 
 ## Run the AEA
 
-Run the AEA with the default `fetchai/stub:0.9.0` connection.
+Run the AEA with the default `fetchai/stub:0.10.0` connection.
 
 ``` bash
 aea run
@@ -163,7 +163,7 @@ aea run
 or
 
 ``` bash
-aea run --connections fetchai/stub:0.9.0
+aea run --connections fetchai/stub:0.10.0
 ```
 
 You will see the echo skill running in the terminal window.
diff --git a/packages/fetchai/agents/aries_alice/aea-config.yaml b/packages/fetchai/agents/aries_alice/aea-config.yaml
index 7efbe1b67a..9be95df03d 100644
--- a/packages/fetchai/agents/aries_alice/aea-config.yaml
+++ b/packages/fetchai/agents/aries_alice/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/http_client:0.9.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 - fetchai/webhook:0.7.0
 contracts: []
 protocols:
diff --git a/packages/fetchai/agents/aries_faber/aea-config.yaml b/packages/fetchai/agents/aries_faber/aea-config.yaml
index 60858d53c7..ab87ebe399 100644
--- a/packages/fetchai/agents/aries_faber/aea-config.yaml
+++ b/packages/fetchai/agents/aries_faber/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/http_client:0.9.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 - fetchai/webhook:0.7.0
 contracts: []
 protocols:
diff --git a/packages/fetchai/agents/car_data_buyer/aea-config.yaml b/packages/fetchai/agents/car_data_buyer/aea-config.yaml
index d4300cd29e..10463565e5 100644
--- a/packages/fetchai/agents/car_data_buyer/aea-config.yaml
+++ b/packages/fetchai/agents/car_data_buyer/aea-config.yaml
@@ -11,7 +11,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/car_detector/aea-config.yaml b/packages/fetchai/agents/car_detector/aea-config.yaml
index b63aafca67..6351d2f41c 100644
--- a/packages/fetchai/agents/car_detector/aea-config.yaml
+++ b/packages/fetchai/agents/car_detector/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/erc1155_client/aea-config.yaml b/packages/fetchai/agents/erc1155_client/aea-config.yaml
index 19ad7cf3c4..a38ca8c0ae 100644
--- a/packages/fetchai/agents/erc1155_client/aea-config.yaml
+++ b/packages/fetchai/agents/erc1155_client/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
diff --git a/packages/fetchai/agents/erc1155_deployer/aea-config.yaml b/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
index abc22baa84..0e8764b869 100644
--- a/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
+++ b/packages/fetchai/agents/erc1155_deployer/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
diff --git a/packages/fetchai/agents/generic_buyer/aea-config.yaml b/packages/fetchai/agents/generic_buyer/aea-config.yaml
index b0482b5822..2be2666c1f 100644
--- a/packages/fetchai/agents/generic_buyer/aea-config.yaml
+++ b/packages/fetchai/agents/generic_buyer/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/generic_seller/aea-config.yaml b/packages/fetchai/agents/generic_seller/aea-config.yaml
index e53783701c..4c9a7ad097 100644
--- a/packages/fetchai/agents/generic_seller/aea-config.yaml
+++ b/packages/fetchai/agents/generic_seller/aea-config.yaml
@@ -11,7 +11,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/gym_aea/aea-config.yaml b/packages/fetchai/agents/gym_aea/aea-config.yaml
index d18a4ad991..357713694e 100644
--- a/packages/fetchai/agents/gym_aea/aea-config.yaml
+++ b/packages/fetchai/agents/gym_aea/aea-config.yaml
@@ -9,7 +9,7 @@ fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
 - fetchai/gym:0.8.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/ml_data_provider/aea-config.yaml b/packages/fetchai/agents/ml_data_provider/aea-config.yaml
index d6c4f22331..6edfe08859 100644
--- a/packages/fetchai/agents/ml_data_provider/aea-config.yaml
+++ b/packages/fetchai/agents/ml_data_provider/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/ml_model_trainer/aea-config.yaml b/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
index b6c7e4f8c6..70796a0f06 100644
--- a/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
+++ b/packages/fetchai/agents/ml_model_trainer/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/my_first_aea/aea-config.yaml b/packages/fetchai/agents/my_first_aea/aea-config.yaml
index cab085b44c..a855b3aa89 100644
--- a/packages/fetchai/agents/my_first_aea/aea-config.yaml
+++ b/packages/fetchai/agents/my_first_aea/aea-config.yaml
@@ -7,14 +7,14 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
 skills:
 - fetchai/echo:0.8.0
 - fetchai/error:0.6.0
-default_connection: fetchai/stub:0.9.0
+default_connection: fetchai/stub:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/packages/fetchai/agents/simple_service_registration/aea-config.yaml b/packages/fetchai/agents/simple_service_registration/aea-config.yaml
index 6e6d8adceb..e58f388a4b 100644
--- a/packages/fetchai/agents/simple_service_registration/aea-config.yaml
+++ b/packages/fetchai/agents/simple_service_registration/aea-config.yaml
@@ -9,7 +9,7 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/tac_controller/aea-config.yaml b/packages/fetchai/agents/tac_controller/aea-config.yaml
index 9ce1d7381f..442993e0b4 100644
--- a/packages/fetchai/agents/tac_controller/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller/aea-config.yaml
@@ -9,7 +9,7 @@ fingerprint_ignore_patterns: []
 connections:
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index efbe561f76..8b7256a5ed 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -11,7 +11,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
diff --git a/packages/fetchai/agents/tac_participant/aea-config.yaml b/packages/fetchai/agents/tac_participant/aea-config.yaml
index 0c2333eece..c5e96b4791 100644
--- a/packages/fetchai/agents/tac_participant/aea-config.yaml
+++ b/packages/fetchai/agents/tac_participant/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts:
 - fetchai/erc1155:0.10.0
 protocols:
diff --git a/packages/fetchai/agents/thermometer_aea/aea-config.yaml b/packages/fetchai/agents/thermometer_aea/aea-config.yaml
index f3e7d966b4..a3ed35fd38 100644
--- a/packages/fetchai/agents/thermometer_aea/aea-config.yaml
+++ b/packages/fetchai/agents/thermometer_aea/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/thermometer_client/aea-config.yaml b/packages/fetchai/agents/thermometer_client/aea-config.yaml
index 64aa7e7bc6..22a8eacc24 100644
--- a/packages/fetchai/agents/thermometer_client/aea-config.yaml
+++ b/packages/fetchai/agents/thermometer_client/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/weather_client/aea-config.yaml b/packages/fetchai/agents/weather_client/aea-config.yaml
index a86fbf5abb..44841b8f5f 100644
--- a/packages/fetchai/agents/weather_client/aea-config.yaml
+++ b/packages/fetchai/agents/weather_client/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/fetchai/agents/weather_station/aea-config.yaml b/packages/fetchai/agents/weather_station/aea-config.yaml
index 0b892a4102..aab1c30c5c 100644
--- a/packages/fetchai/agents/weather_station/aea-config.yaml
+++ b/packages/fetchai/agents/weather_station/aea-config.yaml
@@ -10,7 +10,7 @@ connections:
 - fetchai/ledger:0.6.0
 - fetchai/p2p_libp2p:0.10.0
 - fetchai/soef:0.9.0
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 29718482ad..56e70841c7 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -1,23 +1,23 @@
-fetchai/agents/aries_alice,Qme8sHgd9CZbBEbnS9zwDs53mYZM4EDpJf5RzQnE2QMy35
-fetchai/agents/aries_faber,QmVQXALXYg5M1Qbqznc4PqM5i4jDt8rFeHvDrq7DcoJx3B
-fetchai/agents/car_data_buyer,QmWk7So9UabsjTEKCkecYN9xwkwJxm4m78GA5VRYcWsQwe
-fetchai/agents/car_detector,QmbUnQ95vMmrL7ootzabP5hKr1iR2srJy3QWg6H2wr9Qib
-fetchai/agents/erc1155_client,QmYUsNAEr2dmx6CP9Jkd33eJMuSQL1uiBADivuUzM8tgiE
-fetchai/agents/erc1155_deployer,QmcbNaXp8vN2Vzbqy4vSKXj27WJK1sBcRf2HtL4eacTnac
-fetchai/agents/generic_buyer,Qme5rHfbeEhmia2RM4vjbiwk1h1o2JiiyyfYZze9jG3mUD
-fetchai/agents/generic_seller,QmPVuku1Cefn76S8rN6GsqdVz12AhbcK6hFMdDMYxsjiAM
-fetchai/agents/gym_aea,QmPP3rtaUY3jdzn1HXjV4dPyY2wYetbbNCqFCQbzbH1GRS
-fetchai/agents/ml_data_provider,QmZFTtD54jcwY8ozmhsdHHZqc2RNX9FZ8dfV8SgYJE9QYM
-fetchai/agents/ml_model_trainer,QmeZmVsNLUw7TP73s5cSomPnwggcrimXHh1RhrPRUDkoQ3
-fetchai/agents/my_first_aea,QmcHnFYQCyXnAM2pN2M4HqLNGJpWApUP7PuiKaPcLkxbas
-fetchai/agents/simple_service_registration,QmWtA9eDYnGKkg5hov887LRJSXTXovb9pp4NJzU7JMq5Lg
-fetchai/agents/tac_controller,QmaG56sZaJRm8DwJXXt9Ci18Va8NfXx6v8vEGKPJngKL4q
-fetchai/agents/tac_controller_contract,QmXhKdptR5aW4TAx9J4auFGqwR3TpiTzdpsKp8KRHL7w7B
-fetchai/agents/tac_participant,QmQxN75ZFVEgizNHa3sqd2zHSnmPvRwS8PCv5FAsJBDnZw
-fetchai/agents/thermometer_aea,QmQ8KgTrt5fH8ZRDpioKGmeyUyc2EUkan4D5KzoFnCwxcG
-fetchai/agents/thermometer_client,QmUY6rmZnufWWmwfSi1m5gR6vD1ZowXpchpUJXgAH6xdNP
-fetchai/agents/weather_client,QmeMHc9hqpciJiRWrAJJszvyjTCs9rgsKC5S1nJRKV9sxQ
-fetchai/agents/weather_station,QmdJcUYuaTbb2J5k9jPcG215bJhKFQUQqJPhiaNoirijJ1
+fetchai/agents/aries_alice,QmYHiYqWNEhmzhBNQCE6cUzRBtnmPbbC5yT47rSZLnoGgk
+fetchai/agents/aries_faber,QmTSTfkJW1UtKtsRjboCQa7BGXrBPJsaKmAwZ5B1vgMwPp
+fetchai/agents/car_data_buyer,QmNuEJZWSZrS4JSbuRHaRg82kQGjMJxYTrWFwHTBQFmE46
+fetchai/agents/car_detector,QmebrWVrc9DiQW5SMqz7M2MU7wjRb5qMK1VqhemUoErjVk
+fetchai/agents/erc1155_client,QmbeW3bPTgxRtromSt8EArKZU1Mmx2pSP497Kyx2WYTCsy
+fetchai/agents/erc1155_deployer,QmWGF4m36HZvWpa49AE6cQmWpxrWvrCu7PL5wKkGUQYKsK
+fetchai/agents/generic_buyer,QmfMAT5Vk7vengDfMiH5D2iajAhmtWMUWM2CaVKz5ucxRG
+fetchai/agents/generic_seller,Qmb9PnhRUkc2jBMpDhEeeuqhxHYu8v3ANxXXrat2z9gCU5
+fetchai/agents/gym_aea,QmU4dvEtznNgVpGjo9ptMf46tcuhVAu5tv8dgNGgzEak8p
+fetchai/agents/ml_data_provider,QmeqfbEW6J11SKjrqnCRxjZCMr4VWvr9K1gJRd7ZCWP3uF
+fetchai/agents/ml_model_trainer,QmWnBK6TGFro2VrtcwwBq1eztiT5y4DV92DdeyHPQqGzcY
+fetchai/agents/my_first_aea,QmYqeuaG7mkxqPZTM2qUHP2bMm1A7VsSDLi6BfW6SaFbuZ
+fetchai/agents/simple_service_registration,QmY4oz8n2zjJnAa3vHRRDuzpZi8Taf8qsScX7NJoXrTk3u
+fetchai/agents/tac_controller,QmWVvJemSdE5N5iyMuDt5ZHh1FA32oijHxBqq91zaNkdY3
+fetchai/agents/tac_controller_contract,QmNYxVrNhHy4tfnr48ekReEVHvH1PBzciNQbj8jbJgn2Aj
+fetchai/agents/tac_participant,QmRmswKxJ9mdQe6zFRqxr9U1ZpYTybQf3DKsrAySt39aVc
+fetchai/agents/thermometer_aea,QmT1GNUCcB6xqnmB1vv3jTs4HqeYM6tLnnL4TSjv5raHpk
+fetchai/agents/thermometer_client,QmdWMJCb7Pkz8F3emJ8wKhNWpnEUXHpBFQTGcmJyziu6kH
+fetchai/agents/weather_client,Qmd5iiwyqEuw7Fg8NkdLsNjkuZQRatNRADpXVXwG13BvtP
+fetchai/agents/weather_station,QmRAs7AY2R9RNi5M4gnSDiQzLb58z4nuCYAnG2UAnv3XC2
 fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
 fetchai/connections/http_client,QmaCa98anLuMAduNWtnApEwLWBcqdVkNBREBZ9T5VPSaUm
 fetchai/connections/http_server,QmT6JV2sB1rv7XZgx1bEpMjfQJAtpq775D2n8yvzKzSXYK
@@ -29,7 +29,7 @@ fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4J
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
 fetchai/connections/soef,Qme2vP55mGemMKMWdHKGUaC1nW88ZEdD55qgdY9a984T7i
-fetchai/connections/stub,QmWarW8MTJ3CHRgXdkbwKK7DyDKzvQKdZeb95uy8kSnxrT
+fetchai/connections/stub,QmQxzFLTBjPUMkpE1uBdkoyhb7iXY4k8VPzyykpjhuUcK1
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd
 fetchai/contracts/erc1155,QmWu22zW9AVMBVySwF413JMiT5dcWsLsU2gk1KvFYWAwPq
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index ff6a6b85e7..578a857d65 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -588,7 +588,7 @@ def test_from_project(self):
             aea = builder.build()
         assert aea.name == self.agent_name
         stub_connection = aea.resources.get_connection(
-            PublicId.from_str("fetchai/stub:0.9.0")
+            PublicId.from_str("fetchai/stub:0.10.0")
         )
         assert stub_connection.configuration.config == dict(
             input_file=self.expected_input_file, output_file=self.expected_output_file
diff --git a/tests/test_cli/test_get_multiaddress.py b/tests/test_cli/test_get_multiaddress.py
index 6f2c13e138..0f7643724c 100644
--- a/tests/test_cli/test_get_multiaddress.py
+++ b/tests/test_cli/test_get_multiaddress.py
@@ -79,7 +79,7 @@ def test_run(self, *mocks):
             FETCHAI,
             "--connection",
             "--connection-id",
-            "fetchai/stub:0.9.0",
+            "fetchai/stub:0.10.0",
             "--host-field",
             "host",
             "--port-field",
@@ -112,7 +112,7 @@ def test_run(self, *mocks):
             FETCHAI,
             "--connection",
             "--connection-id",
-            "fetchai/stub:0.9.0",
+            "fetchai/stub:0.10.0",
             "--uri-field",
             "public_uri",
             cwd=self.current_agent_context,
@@ -188,14 +188,14 @@ def test_run(self, *mocks):
         # this will cause exception because no host configuration is in stub connection by default.
         with pytest.raises(
             Exception,
-            match="Host field 'some_host' not present in connection configuration fetchai/stub:0.9.0",
+            match="Host field 'some_host' not present in connection configuration fetchai/stub:0.10.0",
         ):
             self.run_cli_command(
                 "get-multiaddress",
                 FETCHAI,
                 "--connection",
                 "--connection-id",
-                "fetchai/stub:0.9.0",
+                "fetchai/stub:0.10.0",
                 "--host-field",
                 "some_host",
                 "--port-field",
@@ -219,14 +219,14 @@ def test_run(self, *mocks):
         # this will cause exception because no port configuration is in stub connection by default.
         with pytest.raises(
             Exception,
-            match="Port field 'some_port' not present in connection configuration fetchai/stub:0.9.0",
+            match="Port field 'some_port' not present in connection configuration fetchai/stub:0.10.0",
         ):
             self.run_cli_command(
                 "get-multiaddress",
                 FETCHAI,
                 "--connection",
                 "--connection-id",
-                "fetchai/stub:0.9.0",
+                "fetchai/stub:0.10.0",
                 "--host-field",
                 "host",
                 "--port-field",
@@ -286,7 +286,7 @@ def test_run(self, *mocks):
                 FETCHAI,
                 "--connection",
                 "--connection-id",
-                "fetchai/stub:0.9.0",
+                "fetchai/stub:0.10.0",
                 "--host-field",
                 "host",
                 "--port-field",
@@ -313,7 +313,7 @@ def test_run(self, *mocks):
                 FETCHAI,
                 "--connection",
                 "--connection-id",
-                "fetchai/stub:0.9.0",
+                "fetchai/stub:0.10.0",
                 "--host-field",
                 "some_host",
                 cwd=self.current_agent_context,
@@ -331,14 +331,14 @@ def test_run(self, *mocks):
         # this will cause exception because only the host, and not the port, are specified.
         with pytest.raises(
             Exception,
-            match="URI field 'some_uri' not present in connection configuration fetchai/stub:0.9.0",
+            match="URI field 'some_uri' not present in connection configuration fetchai/stub:0.10.0",
         ):
             self.run_cli_command(
                 "get-multiaddress",
                 FETCHAI,
                 "--connection",
                 "--connection-id",
-                "fetchai/stub:0.9.0",
+                "fetchai/stub:0.10.0",
                 "--uri-field",
                 "some_uri",
                 cwd=self.current_agent_context,
@@ -367,7 +367,7 @@ def test_run(self, *mocks):
                 FETCHAI,
                 "--connection",
                 "--connection-id",
-                "fetchai/stub:0.9.0",
+                "fetchai/stub:0.10.0",
                 "--uri-field",
                 "some_uri",
                 cwd=self.current_agent_context,
diff --git a/tests/test_configurations/test_aea_config.py b/tests/test_configurations/test_aea_config.py
index e7616166e4..54ae447d41 100644
--- a/tests/test_configurations/test_aea_config.py
+++ b/tests/test_configurations/test_aea_config.py
@@ -59,7 +59,7 @@ class NotSet(type):
 contracts: []
 protocols: []
 skills: []
-default_connection: fetchai/stub:0.9.0
+default_connection: fetchai/stub:0.10.0
 default_ledger: cosmos
 private_key_paths:
     cosmos: tests/data/cosmos_private_key.txt
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-config.md b/tests/test_docs/test_bash_yaml/md_files/bash-config.md
index 0032df43c0..e7db01434d 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-config.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-config.md
@@ -14,7 +14,7 @@ aea_version: '>=0.6.0, <0.7.0'                  # AEA framework version(s) compa
 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.9.0
+- fetchai/stub:0.10.0
 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:0.6.0
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-logging.md b/tests/test_docs/test_bash_yaml/md_files/bash-logging.md
index 2482123a70..2001ac16c8 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-logging.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-logging.md
@@ -12,13 +12,13 @@ aea_version: 0.6.0
 fingerprint: {}
 fingerprint_ignore_patterns: []
 connections:
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 contracts: []
 protocols:
 - fetchai/default:0.6.0
 skills:
 - fetchai/error:0.6.0
-default_connection: fetchai/stub:0.9.0
+default_connection: fetchai/stub:0.10.0
 default_ledger: fetchai
 logging_config:
   disable_existing_loggers: false
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-package-imports.md b/tests/test_docs/test_bash_yaml/md_files/bash-package-imports.md
index 2141939abe..35404987c2 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-package-imports.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-package-imports.md
@@ -29,5 +29,5 @@ aea_name/
 ```
 ``` yaml
 connections:
-- fetchai/stub:0.9.0
+- fetchai/stub:0.10.0
 ```
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
index fd9adbf3d6..e81c856ac9 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
@@ -61,7 +61,7 @@ recipient_aea,sender_aea,fetchai/default:0.6.0,\x08\x01\x12\x011*\x07\n\x05hello
 aea run
 ```
 ``` bash
-aea run --connections fetchai/stub:0.9.0
+aea run --connections fetchai/stub:0.10.0
 ```
 ``` bash
     _     _____     _

From 04658164a0495bfad1017096657e60f8cfd96ee6 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 23 Sep 2020 23:16:28 +0100
Subject: [PATCH 071/131] fix aea builder test

---
 tests/test_aea_builder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 578a857d65..667a3b6a96 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -568,7 +568,7 @@ def _add_stub_connection_config(self):
         ---
         name: stub
         author: fetchai
-        version: 0.9.0
+        version: 0.10.0
         type: connection
         config:
             input_file: "{self.expected_input_file}"

From 063653ef4e1f77406f15d19dc2fdf8d48ea6eadc Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Thu, 24 Sep 2020 10:22:20 +0300
Subject: [PATCH 072/131] aea.Manager: projects handling, agent alias creation

---
 aea/aea_builder.py           |  25 +++-
 aea/cli/registry/fetch.py    |  19 ++-
 aea/configurations/loader.py |  10 +-
 aea/manager.py               | 228 ++++++++++++++++++++++++++++++-----
 tests/test_manager.py        | 107 ++++++++++++++++
 5 files changed, 348 insertions(+), 41 deletions(-)
 create mode 100644 tests/test_manager.py

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index a3570bbdef..2f9fdd22f8 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -292,6 +292,8 @@ class AEABuilder:
     DEFAULT_RUNTIME_MODE = "threaded"
     DEFAULT_SEARCH_SERVICE_ADDRESS = "fetchai/soef:*"
 
+    loader = ConfigLoader.from_configuration_type(PackageType.AGENT)
+
     # pylint: disable=attribute-defined-outside-init
 
     def __init__(self, with_default_packages: bool = True):
@@ -1336,16 +1338,33 @@ def from_aea_project(
         builder = AEABuilder(with_default_packages=False)
 
         # load agent configuration file
-        configuration_file = aea_project_path / DEFAULT_AEA_CONFIG_FILE
+        configuration_file = cls.get_configuration_file_path(aea_project_path)
+        agent_configuration = cls.loader.load(configuration_file.open())
 
-        loader = ConfigLoader.from_configuration_type(PackageType.AGENT)
-        agent_configuration = loader.load(configuration_file.open())
+        builder.set_from_configuration(
+            agent_configuration, aea_project_path, skip_consistency_check
+        )
+        return builder
+
+    @classmethod
+    def from_config_json(
+        cls, json_data, aea_project_path: PathLike, skip_consistency_check: bool = False
+    ):
+        aea_project_path = Path(aea_project_path)
+        builder = AEABuilder(with_default_packages=False)
+
+        # load agent configuration file
+        agent_configuration = cls.loader._load_agent_config_from_json(json_data)
 
         builder.set_from_configuration(
             agent_configuration, aea_project_path, skip_consistency_check
         )
         return builder
 
+    @staticmethod
+    def get_configuration_file_path(aea_project_path):
+        return Path(aea_project_path) / DEFAULT_AEA_CONFIG_FILE
+
     def _load_and_add_components(
         self,
         component_type: ComponentType,
diff --git a/aea/cli/registry/fetch.py b/aea/cli/registry/fetch.py
index 8efdd4e051..cf0270c391 100644
--- a/aea/cli/registry/fetch.py
+++ b/aea/cli/registry/fetch.py
@@ -16,6 +16,9 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
+from aea.helpers.base import cd
+import shutil
+
 """Methods for CLI fetch functionality."""
 
 import os
@@ -32,7 +35,12 @@
 
 
 @clean_after
-def fetch_agent(ctx: Context, public_id: PublicId, alias: Optional[str] = None) -> None:
+def fetch_agent(
+    ctx: Context,
+    public_id: PublicId,
+    alias: Optional[str] = None,
+    dir: Optional[str] = None,
+) -> None:
     """
     Fetch Agent from Registry.
 
@@ -49,14 +57,17 @@ def fetch_agent(ctx: Context, public_id: PublicId, alias: Optional[str] = None)
 
     filepath = download_file(file_url, ctx.cwd)
 
-    folder_name = name if alias is None else alias
+    folder_name = dir or (name if alias is None else alias)
     aea_folder = os.path.join(ctx.cwd, folder_name)
+    print(aea_folder)
     ctx.clean_paths.append(aea_folder)
 
     extract(filepath, ctx.cwd)
 
-    if alias is not None:
-        os.rename(name, alias)
+    if alias or dir:
+        shutil.move(
+            os.path.join(ctx.cwd, name), aea_folder,
+        )
 
     ctx.cwd = aea_folder
     try_to_load_agent_config(ctx)
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 8a5c1e84d0..4956406c95 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -229,10 +229,7 @@ def _load_from_json(self, configuration_file_json: Dict) -> T:
         configuration_obj._key_order = key_order  # pylint: disable=protected-access
         return configuration_obj
 
-    def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
-        """Load an agent configuration."""
-        configuration_file_jsons = yaml_load_all(file_pointer)
-
+    def _load_agent_config_from_json(self, configuration_file_jsons) -> AgentConfig:
         if len(configuration_file_jsons) == 0:
             raise ValueError("Agent configuration file was empty.")
         agent_config_json = configuration_file_jsons[0]
@@ -260,6 +257,11 @@ def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
         agent_configuration_obj.component_configurations = component_configurations
         return agent_configuration_obj
 
+    def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
+        """Load an agent configuration."""
+        configuration_file_jsons = yaml_load_all(file_pointer)
+        return self._load_agent_config_from_json(configuration_file_jsons)
+
     def _dump_agent_config(
         self, configuration: AgentConfig, file_pointer: TextIO
     ) -> None:
diff --git a/aea/manager.py b/aea/manager.py
index bbb289d858..643543597f 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -17,29 +17,82 @@
 #
 # ------------------------------------------------------------------------------
 """This module contains the implementation of AEA agents manager."""
-from abc import ABC, abstractmethod
-from typing import Dict, List
-
-from aea.aea_builder import PathLike
-from aea.configurations.base import PublicId
-
-
-class AbstractManager(ABC):
+import copy
+import os
+from shutil import rmtree
+from typing import Dict, List, Optional, Set
+
+from aea.aea import AEA
+from aea.aea_builder import AEABuilder
+from aea.cli.registry.fetch import fetch_agent
+from aea.cli.utils.context import Context
+from aea.configurations.base import ComponentId, PublicId
+from aea.configurations.constants import DEFAULT_LEDGER
+from aea.crypto.helpers import create_private_key
+from aea.helpers.base import yaml_load_all
+
+
+class Project:
+    """Agent project representation."""
+
+    def __init__(self, public_id: PublicId, path: str):
+        """Init project with public_id and project's path."""
+        self.public_id = public_id
+        self.path = path
+        self.agents: Set[str] = set()
+
+    @classmethod
+    def load(cls, working_dir, public_id) -> "Project":
+        """Load project with given pubblic_id to working_dir."""
+        ctx = Context(cwd=working_dir)
+        path = os.path.join(working_dir, public_id.author, public_id.name)
+        fetch_agent(ctx, public_id, dir=os.path.join(public_id.author, public_id.name))
+        return cls(public_id, path)
+
+    def remove(self):
+        """Remove project, do cleanup."""
+        rmtree(self.path)
+
+
+class AgentAlias:
+    """Agent alias representation."""
+
+    def __init__(self, project: Project, name: str, config: List[Dict], agent: AEA):
+        """Init agent alias with project, config, name, agent."""
+        self.project = project
+        self.config = config
+        self.name = name
+        self.agent = agent
+        self.project.agents.add(self.name)
+
+    def remove(self):
+        """Remove agent alias from project."""
+        self.project.agents.remove(self.name)
+
+
+class Manager:
     """Abstract agents manager."""
 
-    def __init__(self, working_dir: PathLike) -> None:
+    AGENT_DO_NOT_OVERRIDE_VALUES = ["skills", "connections", "protocols", "contracts"]
+
+    def __init__(self, working_dir: str) -> None:
         """
         Initialize manager.
 
         :param working_dir: directory to store base agents.
         """
         self.working_dir = working_dir
+        self._was_working_dir_created = False
+        self.is_started = False
+        self._projects: Dict[PublicId, Project] = {}
+        self._keys_dir = os.path.abspath(os.path.join(self.working_dir, "keys"))
+        self._agents: Dict[str, AgentAlias] = {}
 
-    @abstractmethod
     def start_manager(self) -> None:
         """Start manager."""
+        self._ensure_working_dir()
+        self.is_started = True
 
-    @abstractmethod
     def stop_manager(self, cleanup: bool = False) -> None:
         """
         Stop manager.
@@ -50,40 +103,66 @@ def stop_manager(self, cleanup: bool = False) -> None:
 
         :return: None
         """
+        if self._was_working_dir_created:
+            rmtree(self.working_dir)
+
+        self.is_started = False
 
-    @abstractmethod
     def add_project(self, public_id: PublicId) -> None:
         """Fetch agent project and all dependencies to working_dir."""
+        if public_id in self._projects:
+            raise ValueError(f"Project {public_id} was already added!")
+        self._projects[public_id] = Project.load(self.working_dir, public_id)
 
-    @abstractmethod
     def remove_project(self, public_id: PublicId) -> None:
         """Remove agent project."""
+        if public_id not in self._projects:
+            raise ValueError(f"Project {public_id} was not added!")
+
+        self._projects.pop(public_id).remove()
 
-    @abstractmethod
     def list_projects(self) -> List[PublicId]:
         """
         List all agents projects added.
 
         :return: lit of public ids of projects
         """
+        return list(self._projects.keys())
 
-    @abstractmethod
     def add_agent(
-        self, project_id: PublicId, agent_name: str, config_overrides: Dict
+        self,
+        public_id: PublicId,
+        agent_name: str,
+        agent_overrides: Optional[dict] = None,
+        component_overrides: Optional[List[dict]] = None,
     ) -> None:
         """
         Create new agent configuration based on project with config overrides applied.
 
         Alias is stored in memory only!
 
-        :param project_id: base agent public id
+        :param public_id: base agent project public id
         :param agent_name: unique name for the agent
-        :param config_overrides: overrides for component section.
+        :param agent_overrides: overrides for agent config.
+        :param component_overrides: overrides for component section.
 
         :return: None
         """
+        if agent_name in self._agents:
+            raise ValueError(f"Agent with name {agent_name} already exists!")
+
+        if public_id not in self._projects:
+            raise ValueError(f"{public_id} project is not added!")
+        project = self._projects[public_id]
+
+        agent_alias = self._build_agent_alias(
+            project=project,
+            agent_name=agent_name,
+            agent_overrides=agent_overrides,
+            component_overrides=component_overrides,
+        )
+        self._agents[agent_name] = agent_alias
 
-    @abstractmethod
     def list_agents(self, running_only: bool = False) -> List[str]:
         """
         List all agents.
@@ -92,8 +171,8 @@ def list_agents(self, running_only: bool = False) -> List[str]:
 
         :return: list of agents names
         """
+        return list(self._agents.keys())
 
-    @abstractmethod
     def remove_agent(self, agent_name: str) -> None:
         """
         Remove agent alias definition from registry.
@@ -102,8 +181,12 @@ def remove_agent(self, agent_name: str) -> None:
 
         :return: None
         """
+        if agent_name not in self._agents:
+            raise ValueError(f"Agent with name {agent_name} does not exist!")
+
+        agent_alias = self._agents.pop(agent_name)
+        agent_alias.remove()
 
-    @abstractmethod
     def start_agent(self, agent_name: str) -> None:
         """
         Start selected agent.
@@ -113,7 +196,6 @@ def start_agent(self, agent_name: str) -> None:
         :return: None
         """
 
-    @abstractmethod
     def start_all_agents(self) -> None:
         """
         Start all not started agents.
@@ -121,7 +203,6 @@ def start_all_agents(self) -> None:
         :return: None
         """
 
-    @abstractmethod
     def stop_agent(self, agent_name: str) -> None:
         """
         Stop running agent.
@@ -131,7 +212,6 @@ def stop_agent(self, agent_name: str) -> None:
         :return: None
         """
 
-    @abstractmethod
     def stop_all_agents(self) -> None:
         """
         Stop all agents running.
@@ -139,13 +219,101 @@ def stop_all_agents(self) -> None:
         :return: None
         """
 
-    @abstractmethod
-    def get_agent_details(self, agent_name: str) -> dict:
+    def stop_agents(self, agent_names: List[str]) -> None:
+        """
+        Stop specified agents.
+
+        :return: None
+        """
+
+    def start_agents(self, agent_names: List[str]) -> None:
+        """
+        Stop specified agents.
+
+        :return: None
+        """
+
+    def get_agent_details(self, agent_name: str) -> AgentAlias:
         """
         Return details about agent definition.
 
-        {
-            "project": str
-            "overrides": dict
-        }
+        :return: AgentAlias
         """
+        if agent_name not in self._agents:
+            raise ValueError(f"Agent with name {agent_name} does not exist!")
+        return self._agents[agent_name]
+
+    def _ensure_working_dir(self) -> None:
+        """Create working dir if needed."""
+        if not os.path.exists(self.working_dir):
+            os.makedirs(self.working_dir)
+            self._was_working_dir_created = True
+
+        if not os.path.isdir(self.working_dir):
+            raise ValueError(f"{self.working_dir} is not a directory!")
+        os.makedirs(self._keys_dir)
+
+    def _build_agent_alias(
+        self,
+        project: Project,
+        agent_name: str,
+        agent_overrides=None,
+        component_overrides=None,
+    ) -> AgentAlias:
+        """Create agent alias for project, with given name and overrided values."""
+        json_config = self._make_config(
+            project.path, agent_overrides, component_overrides
+        )
+
+        builder = AEABuilder.from_config_json(json_config, project.path)
+        builder.set_name(agent_name)
+
+        if not builder.private_key_paths:
+            default_ledger = json_config[0].get("default_ledger", DEFAULT_LEDGER)
+            builder.add_private_key(
+                default_ledger, self._create_private_key(agent_name, default_ledger)
+            )
+        agent = builder.build()
+        return AgentAlias(project, agent_name, json_config, agent)
+
+    def _update_dict(self, base: dict, override: dict) -> dict:
+        """Apply overrides for dict."""
+        base = copy.deepcopy(base)
+        base.update(override)
+        return base
+
+    def _make_config(
+        self,
+        project_path: str,
+        agent_overrides: Optional[dict] = None,
+        component_overrides: Optional[List[dict]] = None,
+    ) -> List[dict]:
+        """Make new config baseed on proejct's config with overrides applied."""
+        agent_overrides = agent_overrides or {}
+        component_overrides = component_overrides or []
+
+        if any([key in agent_overrides for key in self.AGENT_DO_NOT_OVERRIDE_VALUES]):
+            raise ValueError(
+                'Do not override any of {" ".join(self.AGENT_DO_NOT_OVERRIDE_VALUES)}'
+            )
+
+        json_data = yaml_load_all(
+            AEABuilder.get_configuration_file_path(project_path).open()
+        )
+        agent_config = self._update_dict(json_data[0], agent_overrides)
+
+        components_configs = {PublicId.from_json(obj): obj for obj in json_data[1:]}
+
+        for obj in component_overrides:
+            component_id = ComponentId(obj["type"], PublicId.from_json(obj))
+            components_configs[component_id] = self._update_dict(
+                components_configs.get(component_id, {}), obj
+            )
+
+        return [agent_config] + list(components_configs.values())
+
+    def _create_private_key(self, name, ledger) -> str:
+        """Create new key for agent alias in working dir keys dir."""
+        path = os.path.join(self._keys_dir, f"{name}_{ledger}_private.key")
+        create_private_key(ledger, path)
+        return path
diff --git a/tests/test_manager.py b/tests/test_manager.py
new file mode 100644
index 0000000000..e5a4c6af57
--- /dev/null
+++ b/tests/test_manager.py
@@ -0,0 +1,107 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+"""This module contains tests for aea manager."""
+import os
+from contextlib import suppress
+from shutil import rmtree
+from typing import Dict, List, Optional, Set
+
+import pytest
+
+from aea.configurations.base import PublicId
+from aea.manager import Manager
+
+
+def test_manager():
+    """Perform some tests."""
+
+    try:
+        working_dir = "manager_dir"
+        project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
+        project_path = os.path.join(
+            working_dir, project_public_id.author, project_public_id.name
+        )
+        assert not os.path.exists(working_dir)
+        manager = Manager(working_dir)
+        manager.start_manager()
+        assert os.path.exists(working_dir)
+        assert manager.is_started
+
+        manager.add_project(project_public_id)
+
+        assert project_public_id in manager.list_projects()
+        assert os.path.exists(project_path)
+        assert manager._projects[project_public_id].path == project_path
+
+        with pytest.raises(ValueError, match=r".*was already added.*"):
+            manager.add_project(project_public_id)
+
+        echo_skill_id = PublicId("fetchai", "echo", "0.7.0")
+        new_tick_interval = 1.1111
+        agent_name = "test_what_ever12"
+        manager.add_agent(
+            project_public_id,
+            agent_name,
+            component_overrides=[
+                {
+                    "type": "skill",
+                    **echo_skill_id.json,
+                    "behaviours": {
+                        "echo": {
+                            "args": {"tick_interval": new_tick_interval},
+                            "class_name": "EchoBehaviour",
+                        }
+                    },
+                }
+            ],
+        )
+        agent_alias = manager.get_agent_details(agent_name)
+        assert agent_alias.name == agent_name
+        assert (
+            agent_alias.agent.resources.get_behaviour(
+                echo_skill_id, "echo"
+            ).tick_interval
+            == new_tick_interval
+        )
+        with pytest.raises(ValueError, match="already exists"):
+            manager.add_agent(
+                project_public_id, agent_name,
+            )
+        assert agent_name in manager.list_agents()
+
+        manager.remove_agent(agent_name)
+        assert agent_name not in manager.list_agents()
+
+        with pytest.raises(ValueError, match="does not exist!"):
+            manager.remove_agent(agent_name)
+
+        manager.remove_project(project_public_id)
+        assert project_public_id not in manager._projects
+        assert not os.path.exists(project_path)
+        assert project_public_id not in manager.list_projects()
+
+        with pytest.raises(ValueError, match=r"was not added"):
+            manager.remove_project(project_public_id)
+
+        manager.stop_manager()
+        assert not os.path.exists(working_dir)
+        assert not manager.is_started
+    finally:
+        with suppress(FileNotFoundError):
+            rmtree(working_dir)

From 413ddee4cafa6cca52b667799cec2903cfcb1837 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 24 Sep 2020 10:01:54 +0100
Subject: [PATCH 073/131] fix tac contract yaml and dialogues

---
 .../agents/tac_controller_contract/aea-config.yaml       | 2 +-
 .../fetchai/skills/tac_control_contract/behaviours.py    | 9 +++++++++
 .../fetchai/skills/tac_control_contract/dialogues.py     | 6 ++++++
 packages/fetchai/skills/tac_control_contract/skill.yaml  | 4 ++--
 packages/hashes.csv                                      | 4 ++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 8b7256a5ed..1d9f658154 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -34,7 +34,7 @@ private_key_paths: {}
 registry_path: ../packages
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
-  fetchai/ledger_api:0.5.0: fetchai/ledger:0.6.0
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
   fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
 ---
 name: soef
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index dee52e40e7..bbf02c9ae4 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -75,6 +75,9 @@ def _request_contract_deploy_transaction(self) -> None:
         )
         contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue,)
         contract_api_dialogue.terms = parameters.get_deploy_terms()
+        contract_api_dialogue.callable = (
+            ContractApiDialogue.Callable.GET_DEPLOY_TRANSACTION
+        )
         self.context.outbox.put_message(message=contract_api_msg)
         self.context.logger.info("requesting contract deployment transaction...")
 
@@ -162,6 +165,9 @@ def _request_create_items_transaction(self, game: Game) -> None:
         )
         contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
         contract_api_dialogue.terms = parameters.get_create_token_terms()
+        contract_api_dialogue.callable = (
+            ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION
+        )
         self.context.outbox.put_message(message=contract_api_msg)
         self.context.logger.info("requesting create items transaction...")
 
@@ -203,4 +209,7 @@ def _request_mint_items_transaction(self, game: Game) -> None:
             )
             contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
             contract_api_dialogue.terms = parameters.get_mint_token_terms()
+            contract_api_dialogue.callable = (
+                ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
+            )
             self.context.outbox.put_message(message=contract_api_msg)
diff --git a/packages/fetchai/skills/tac_control_contract/dialogues.py b/packages/fetchai/skills/tac_control_contract/dialogues.py
index 9e2b5c2588..6f7fadfc61 100644
--- a/packages/fetchai/skills/tac_control_contract/dialogues.py
+++ b/packages/fetchai/skills/tac_control_contract/dialogues.py
@@ -130,6 +130,12 @@ def callable(self) -> "Callable":
             raise ValueError("Callable not set!")
         return self._callable
 
+    @callable.setter
+    def callable(self, callable: "Callable") -> None:
+        """Set the callable."""
+        enforce(self._callable is None, "Callable already set!")
+        self._callable = callable
+
     @property
     def terms(self) -> Terms:
         """Get the terms."""
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 73c3ff5b53..a27a4461f6 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,8 +9,8 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmYcW84nnvCuv2HeDntixfWnFuJA2k9xqrhCWdmVFerLPv
-  dialogues.py: QmPJyBPETi7MggXLMKHWeYsAZbckxK2UFpci19dw3xwHDn
+  behaviours.py: QmaNbF9fuhEzrh56q7tnFF3hKXQtFYGr1tnsgELp3z3jRS
+  dialogues.py: QmYQ5XiaRoGeLdz7z3d8gcDTzY8EeyHCgB9Nagkuwmfwjy
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
   handlers.py: QmSzNcZ3s3RjVm7mCXBhGjA379nwv3Tm9viEmw193WcNTd
   helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 56e70841c7..9e4075b83d 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -12,7 +12,7 @@ fetchai/agents/ml_model_trainer,QmWnBK6TGFro2VrtcwwBq1eztiT5y4DV92DdeyHPQqGzcY
 fetchai/agents/my_first_aea,QmYqeuaG7mkxqPZTM2qUHP2bMm1A7VsSDLi6BfW6SaFbuZ
 fetchai/agents/simple_service_registration,QmY4oz8n2zjJnAa3vHRRDuzpZi8Taf8qsScX7NJoXrTk3u
 fetchai/agents/tac_controller,QmWVvJemSdE5N5iyMuDt5ZHh1FA32oijHxBqq91zaNkdY3
-fetchai/agents/tac_controller_contract,QmNYxVrNhHy4tfnr48ekReEVHvH1PBzciNQbj8jbJgn2Aj
+fetchai/agents/tac_controller_contract,QmXmUu3XQj3E5jcSzi6fRT5ZkWw65HFnvzwqRDS5hcLqSz
 fetchai/agents/tac_participant,QmRmswKxJ9mdQe6zFRqxr9U1ZpYTybQf3DKsrAySt39aVc
 fetchai/agents/thermometer_aea,QmT1GNUCcB6xqnmB1vv3jTs4HqeYM6tLnnL4TSjv5raHpk
 fetchai/agents/thermometer_client,QmdWMJCb7Pkz8F3emJ8wKhNWpnEUXHpBFQTGcmJyziu6kH
@@ -63,7 +63,7 @@ fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
 fetchai/skills/tac_control,QmPFxFsYqRZvz7BRStWLV9Fo4Wd77iTNBWuBSU2VZeqrwL
-fetchai/skills/tac_control_contract,QmYX4gNaGbx1EAuASwhpSgTdLYwUzuzajtKTuqvNFR9f2Q
+fetchai/skills/tac_control_contract,QmSFbu21xtJTUqKXW5t1V6fQvVV49eA4FGtR4rgkcs8cBK
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1

From 712a7b78a77778b66a30cdfa70848131444562f0 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 24 Sep 2020 11:27:35 +0100
Subject: [PATCH 074/131] fix contract deployment in tac skill

---
 .../tac_participant_contract/aea-config.yaml  | 44 +++++++++++++++++++
 packages/fetchai/skills/tac_control/game.py   |  3 --
 .../fetchai/skills/tac_control/parameters.py  |  2 +-
 .../fetchai/skills/tac_control/skill.yaml     |  4 +-
 .../skills/tac_control_contract/behaviours.py |  4 +-
 .../skills/tac_control_contract/dialogues.py  |  4 +-
 .../skills/tac_control_contract/handlers.py   |  5 ++-
 .../skills/tac_control_contract/skill.yaml    |  6 +--
 packages/hashes.csv                           |  5 ++-
 9 files changed, 63 insertions(+), 14 deletions(-)
 create mode 100644 packages/fetchai/agents/tac_participant_contract/aea-config.yaml

diff --git a/packages/fetchai/agents/tac_participant_contract/aea-config.yaml b/packages/fetchai/agents/tac_participant_contract/aea-config.yaml
new file mode 100644
index 0000000000..cde745ed9b
--- /dev/null
+++ b/packages/fetchai/agents/tac_participant_contract/aea-config.yaml
@@ -0,0 +1,44 @@
+agent_name: tac_participant
+author: fetchai
+version: 0.11.0
+description: An AEA to participate in the TAC (trading agent competition)
+license: Apache-2.0
+aea_version: '>=0.6.0, <0.7.0'
+fingerprint: {}
+fingerprint_ignore_patterns: []
+connections:
+- fetchai/ledger:0.6.0
+- fetchai/p2p_libp2p:0.10.0
+- fetchai/soef:0.9.0
+- fetchai/stub:0.10.0
+contracts:
+- fetchai/erc1155:0.10.0
+protocols:
+- fetchai/default:0.6.0
+- fetchai/fipa:0.7.0
+- fetchai/oef_search:0.7.0
+- fetchai/tac:0.7.0
+skills:
+- fetchai/error:0.6.0
+- fetchai/tac_negotiation:0.10.0
+- fetchai/tac_participation:0.9.0
+default_connection: fetchai/p2p_libp2p:0.10.0
+default_ledger: fetchai
+logging_config:
+  disable_existing_loggers: false
+  version: 1
+private_key_paths: {}
+registry_path: ../packages
+default_routing:
+  fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
+---
+name: tac_participation
+author: fetchai
+version: 0.9.0
+type: skill
+---
+name: tac_negotiation
+author: fetchai
+version: 0.10.0
+type: skill
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 84b2469433..94f5277f55 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -72,15 +72,12 @@ class Phase(Enum):
 
     PRE_GAME = "pre_game"
     CONTRACT_DEPLOYMENT_PROPOSAL = "contract_deployment_proposal"
-    CONTRACT_DEPLOYING = "contract_deploying"
     CONTRACT_DEPLOYED = "contract_deployed"
     GAME_REGISTRATION = "game_registration"
     GAME_SETUP = "game_setup"
     TOKENS_CREATION_PROPOSAL = "token_creation_proposal"  # nosec
-    TOKENS_CREATING = "tokens_creating"
     TOKENS_CREATED = "tokens_created"  # nosec
     TOKENS_MINTING_PROPOSAL = "token_minting_proposal"
-    TOKENS_MINTING = "token_minting"  # nosec
     TOKENS_MINTED = "tokens_minted"  # nosec
     GAME = "game"
     POST_GAME = "post_game"
diff --git a/packages/fetchai/skills/tac_control/parameters.py b/packages/fetchai/skills/tac_control/parameters.py
index a490fa92c9..df7a105677 100644
--- a/packages/fetchai/skills/tac_control/parameters.py
+++ b/packages/fetchai/skills/tac_control/parameters.py
@@ -57,7 +57,7 @@ def __init__(self, **kwargs):
         """Instantiate the parameter class."""
         self._ledger_id = kwargs.pop("ledger_id", DEFAULT_LEDGER_ID)
         self._contract_address = kwargs.pop(
-            "contract_adress", None
+            "contract_address", None
         )  # type: Optional[str]
         self._good_ids = kwargs.pop("good_ids", [])  # type: List[int]
         self._currency_ids = kwargs.pop("currency_ids", [])  # type: List[int]
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 85cb506acc..c52139d7eb 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -11,10 +11,10 @@ fingerprint:
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
   behaviours.py: QmcznM3tsmEDNx9Vbhv48o3PNtBEz5W1MVQ7SxJFGkH7di
   dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
-  game.py: QmTovmW5vuhUcnvW4wQQcbPpiUFLLvMH7LaeTZYVvjqLcF
+  game.py: QmPabHgmR3vmhWLJh4BE1GUHPb7GkBwprpUq8mRcCtXdNN
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
   helpers.py: QmQXrtqV3h4oU5cDwWKhtNiTTAGLNZGhjoVnDvGj7mGwpe
-  parameters.py: QmeviKY6o3H2FYNFaB9PibZGZc1CwMgLbrCbPoSmZDsikv
+  parameters.py: QmefuFt5DPCBciu4z17UJWcXxtb4vwA879pNwh4DoMKPUm
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/erc1155:0.10.0
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index bbf02c9ae4..46cc65528a 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -99,7 +99,9 @@ def act(self) -> None:
             game.phase = Phase.GAME_REGISTRATION
             self._register_tac()
             self.context.logger.info(
-                "TAC open for registration until: {}".format(parameters.start_time)
+                "TAC open for registration until: {}".format(
+                    parameters.registration_end_time
+                )
             )
         elif (
             game.phase.value == Phase.GAME_REGISTRATION.value
diff --git a/packages/fetchai/skills/tac_control_contract/dialogues.py b/packages/fetchai/skills/tac_control_contract/dialogues.py
index 6f7fadfc61..af0adf5faa 100644
--- a/packages/fetchai/skills/tac_control_contract/dialogues.py
+++ b/packages/fetchai/skills/tac_control_contract/dialogues.py
@@ -131,7 +131,9 @@ def callable(self) -> "Callable":
         return self._callable
 
     @callable.setter
-    def callable(self, callable: "Callable") -> None:
+    def callable(  # pylint: disable=redefined-builtin
+        self, callable: "Callable"
+    ) -> None:
         """Set the callable."""
         enforce(self._callable is None, "Callable already set!")
         self._callable = callable
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index a286adde7c..bf14e68ec6 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -423,11 +423,13 @@ def _handle_transaction_receipt(
                 )
                 parameters.contract_address = contract_address
                 game.phase = Phase.CONTRACT_DEPLOYED
+                self.context.logger.info("contract deployed.")
             elif (
                 contract_api_dialogue.callable
                 == ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION
             ):
                 game.phase = Phase.TOKENS_CREATED
+                self.context.logger.info("TOKENS_CREATED created.")
             elif (
                 contract_api_dialogue.callable
                 == ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
@@ -435,8 +437,9 @@ def _handle_transaction_receipt(
                 parameters.nb_completed_minting += 1
                 if game.registration.nb_agents == parameters.nb_completed_minting:
                     game.phase = Phase.TOKENS_MINTED
+                    self.context.logger.info("tokens minted.")
             else:
-                self.context.logger.error("Unexpected transaction receipt!")
+                self.context.logger.error("unexpected transaction receipt!")
         else:
             self.context.logger.error(
                 "transaction failed. Transaction receipt={}".format(
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index a27a4461f6..3a779d6a0b 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmaNbF9fuhEzrh56q7tnFF3hKXQtFYGr1tnsgELp3z3jRS
-  dialogues.py: QmYQ5XiaRoGeLdz7z3d8gcDTzY8EeyHCgB9Nagkuwmfwjy
+  behaviours.py: QmVwuR8bhRfoSnYDZ7hmSy8o8bvUmdf52Vp3Tt8EHhEmyL
+  dialogues.py: QmWvhTeUnDimhQQTzuSfJJ6d2ViqgBNooCMfRiVzvzApw3
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
-  handlers.py: QmSzNcZ3s3RjVm7mCXBhGjA379nwv3Tm9viEmw193WcNTd
+  handlers.py: QmTgbPjKaKQYmTr9SgJkCvTaP96NNbDs6BFfbNXE9tr9bz
   helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
   parameters.py: QmVMNP52fPxkzEbXPhXtQXspnaj2f4ErZNcNdPAqv4cvwq
 fingerprint_ignore_patterns: []
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 9e4075b83d..0fe1906508 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -14,6 +14,7 @@ fetchai/agents/simple_service_registration,QmY4oz8n2zjJnAa3vHRRDuzpZi8Taf8qsScX7
 fetchai/agents/tac_controller,QmWVvJemSdE5N5iyMuDt5ZHh1FA32oijHxBqq91zaNkdY3
 fetchai/agents/tac_controller_contract,QmXmUu3XQj3E5jcSzi6fRT5ZkWw65HFnvzwqRDS5hcLqSz
 fetchai/agents/tac_participant,QmRmswKxJ9mdQe6zFRqxr9U1ZpYTybQf3DKsrAySt39aVc
+fetchai/agents/tac_participant_contract,QmaZQ17y4Lm8MNVpDP9kUm31z5HpLDrGWW8yy3FWPwcFN4
 fetchai/agents/thermometer_aea,QmT1GNUCcB6xqnmB1vv3jTs4HqeYM6tLnnL4TSjv5raHpk
 fetchai/agents/thermometer_client,QmdWMJCb7Pkz8F3emJ8wKhNWpnEUXHpBFQTGcmJyziu6kH
 fetchai/agents/weather_client,Qmd5iiwyqEuw7Fg8NkdLsNjkuZQRatNRADpXVXwG13BvtP
@@ -62,8 +63,8 @@ fetchai/skills/ml_data_provider,QmaKyLjyvcj35bCHaKKo15MeF7k48hKPCfFbrtvXCogYwV
 fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
-fetchai/skills/tac_control,QmPFxFsYqRZvz7BRStWLV9Fo4Wd77iTNBWuBSU2VZeqrwL
-fetchai/skills/tac_control_contract,QmSFbu21xtJTUqKXW5t1V6fQvVV49eA4FGtR4rgkcs8cBK
+fetchai/skills/tac_control,QmSjh4JAzWG3oPUzazXvnTvKRBJ4nqRGLr9hCQeUP5x4eR
+fetchai/skills/tac_control_contract,QmQpFb1rWiR1TLfyDx3fJcCQNcAEZSh669iZhgAvgK98Us
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1

From 89eff75542df6dbd382b45b23927f53c44c16be8 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 24 Sep 2020 11:31:09 +0100
Subject: [PATCH 075/131] fix log statement in tac control contract

---
 packages/fetchai/skills/tac_control_contract/handlers.py | 2 +-
 packages/fetchai/skills/tac_control_contract/skill.yaml  | 2 +-
 packages/hashes.csv                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index bf14e68ec6..0c93082691 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -429,7 +429,7 @@ def _handle_transaction_receipt(
                 == ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION
             ):
                 game.phase = Phase.TOKENS_CREATED
-                self.context.logger.info("TOKENS_CREATED created.")
+                self.context.logger.info("tokens created.")
             elif (
                 contract_api_dialogue.callable
                 == ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 3a779d6a0b..d01fa264a8 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -12,7 +12,7 @@ fingerprint:
   behaviours.py: QmVwuR8bhRfoSnYDZ7hmSy8o8bvUmdf52Vp3Tt8EHhEmyL
   dialogues.py: QmWvhTeUnDimhQQTzuSfJJ6d2ViqgBNooCMfRiVzvzApw3
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
-  handlers.py: QmTgbPjKaKQYmTr9SgJkCvTaP96NNbDs6BFfbNXE9tr9bz
+  handlers.py: QmT1TaYDstQewEVptuRuUCgcEcyX1R47ZRzB2MGQWg2NxC
   helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
   parameters.py: QmVMNP52fPxkzEbXPhXtQXspnaj2f4ErZNcNdPAqv4cvwq
 fingerprint_ignore_patterns: []
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 0fe1906508..0d51597d5a 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -64,7 +64,7 @@ fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
 fetchai/skills/tac_control,QmSjh4JAzWG3oPUzazXvnTvKRBJ4nqRGLr9hCQeUP5x4eR
-fetchai/skills/tac_control_contract,QmQpFb1rWiR1TLfyDx3fJcCQNcAEZSh669iZhgAvgK98Us
+fetchai/skills/tac_control_contract,QmUNSvgheuMrerJ5aX2PhGLX2xVwdMXdepYsBoKYJ649VX
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1

From 51da3a65d3ef3cdea5c13fdb4aa926730ee7b012 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 24 Sep 2020 19:20:42 +0100
Subject: [PATCH 076/131] fix contract deployment, minting and creating

---
 .../tac_controller_contract/aea-config.yaml   |  2 +-
 packages/fetchai/skills/tac_control/game.py   | 12 +++
 .../fetchai/skills/tac_control/skill.yaml     |  2 +-
 .../skills/tac_control_contract/behaviours.py | 80 ++++++++++---------
 .../skills/tac_control_contract/handlers.py   |  3 +-
 .../skills/tac_control_contract/skill.yaml    |  7 +-
 packages/hashes.csv                           |  6 +-
 7 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
index 1d9f658154..9846c1d80b 100644
--- a/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_controller_contract/aea-config.yaml
@@ -35,7 +35,7 @@ registry_path: ../packages
 default_routing:
   fetchai/contract_api:0.5.0: fetchai/ledger:0.6.0
   fetchai/ledger_api:0.4.0: fetchai/ledger:0.6.0
-  fetchai/oef_search:0.6.0: fetchai/soef:0.8.0
+  fetchai/oef_search:0.7.0: fetchai/soef:0.9.0
 ---
 name: soef
 author: fetchai
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 94f5277f55..795d56349b 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -742,6 +742,7 @@ def __init__(self, **kwargs):
         self._initial_agent_states = None  # type: Optional[Dict[str, AgentState]]
         self._current_agent_states = None  # type: Optional[Dict[str, AgentState]]
         self._transactions = Transactions()
+        self._already_minted_agents = []  # type: List[str]
 
     @property
     def phase(self) -> Phase:
@@ -798,6 +799,17 @@ def create(self):
         self._phase = Phase.GAME_SETUP
         self._generate()
 
+    def get_next_agent_state_for_minting(self) -> Optional[AgentState]:
+        """Get next agent state for token minting."""
+        result = None
+        for agent_addr, agent_state in self.initial_agent_states.items():
+            if agent_addr in self._already_minted_agents:
+                continue
+            self._already_minted_agents.append(agent_addr)
+            result = agent_state
+            break
+        return result
+
     def _generate(self):
         """Generate a TAC game."""
         parameters = cast(Parameters, self.context.parameters)
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index c52139d7eb..365cd3f603 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
   behaviours.py: QmcznM3tsmEDNx9Vbhv48o3PNtBEz5W1MVQ7SxJFGkH7di
   dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
-  game.py: QmPabHgmR3vmhWLJh4BE1GUHPb7GkBwprpUq8mRcCtXdNN
+  game.py: QmaDGFufEofsvo62E8KGUfaAeyDrPc5Mxih3JjDFSEpkqU
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
   helpers.py: QmQXrtqV3h4oU5cDwWKhtNiTTAGLNZGhjoVnDvGj7mGwpe
   parameters.py: QmefuFt5DPCBciu4z17UJWcXxtb4vwA879pNwh4DoMKPUm
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 46cc65528a..50671a53ad 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -131,6 +131,8 @@ def act(self) -> None:
         elif game.phase.value == Phase.TOKENS_CREATED.value:
             game.phase = Phase.TOKENS_MINTING_PROPOSAL
             self._request_mint_items_transaction(game)
+        elif game.phase.value == Phase.TOKENS_MINTING_PROPOSAL.value:
+            self._request_mint_items_transaction(game)
         elif (
             game.phase.value == Phase.TOKENS_MINTED.value
             and parameters.start_time < now < parameters.end_time
@@ -160,6 +162,7 @@ def _request_create_items_transaction(self, game: Game) -> None:
             performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
             ledger_id=parameters.ledger_id,
             contract_id="fetchai/erc1155:0.10.0",
+            contract_address=parameters.contract_address,
             callable=ContractApiDialogue.Callable.GET_CREATE_BATCH_TRANSACTION.value,
             kwargs=ContractApiMessage.Kwargs(
                 {"deployer_address": self.context.agent_address, "token_ids": token_ids}
@@ -179,39 +182,44 @@ def _request_mint_items_transaction(self, game: Game) -> None:
 
         :return: None
         """
-        self.context.logger.info("requesting mint_items transactions.")
-        for agent_state in game.initial_agent_states.values():
-            parameters = cast(Parameters, self.context.parameters)
-            token_ids = []  # type: List[int]
-            mint_quantities = []  # type: List[int]
-            for good_id, quantity in agent_state.quantities_by_good_id.items():
-                token_ids.append(int(good_id))
-                mint_quantities.append(quantity)
-            for currency_id, amount in agent_state.amount_by_currency_id.items():
-                token_ids.append(int(currency_id))
-                mint_quantities.append(amount)
-            contract_api_dialogues = cast(
-                ContractApiDialogues, self.context.contract_api_dialogues
-            )
-            contract_api_msg, contract_api_dialogue = contract_api_dialogues.create(
-                counterparty=LEDGER_API_ADDRESS,
-                performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
-                ledger_id=parameters.ledger_id,
-                contract_id="fetchai/erc1155:0.10.0",
-                contract_address=parameters.contract_address,
-                callable=ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION.value,
-                kwargs=ContractApiMessage.Kwargs(
-                    {
-                        "deployer_address": self.context.agent_address,
-                        "recipient_address": self.context.agent_address,
-                        "token_ids": token_ids,
-                        "mint_quantities": mint_quantities,
-                    }
-                ),
-            )
-            contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
-            contract_api_dialogue.terms = parameters.get_mint_token_terms()
-            contract_api_dialogue.callable = (
-                ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
-            )
-            self.context.outbox.put_message(message=contract_api_msg)
+        agent_state = game.get_next_agent_state_for_minting()
+        if agent_state is None:
+            return
+        name = game.registration.agent_addr_to_name[agent_state.agent_address]
+        self.context.logger.info(
+            f"requesting mint_items transactions for agent={name}."
+        )
+        parameters = cast(Parameters, self.context.parameters)
+        token_ids = []  # type: List[int]
+        mint_quantities = []  # type: List[int]
+        for good_id, quantity in agent_state.quantities_by_good_id.items():
+            token_ids.append(int(good_id))
+            mint_quantities.append(quantity)
+        for currency_id, amount in agent_state.amount_by_currency_id.items():
+            token_ids.append(int(currency_id))
+            mint_quantities.append(amount)
+        contract_api_dialogues = cast(
+            ContractApiDialogues, self.context.contract_api_dialogues
+        )
+        contract_api_msg, contract_api_dialogue = contract_api_dialogues.create(
+            counterparty=LEDGER_API_ADDRESS,
+            performative=ContractApiMessage.Performative.GET_RAW_TRANSACTION,
+            ledger_id=parameters.ledger_id,
+            contract_id="fetchai/erc1155:0.10.0",
+            contract_address=parameters.contract_address,
+            callable=ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION.value,
+            kwargs=ContractApiMessage.Kwargs(
+                {
+                    "deployer_address": self.context.agent_address,
+                    "recipient_address": self.context.agent_address,
+                    "token_ids": token_ids,
+                    "mint_quantities": mint_quantities,
+                }
+            ),
+        )
+        contract_api_dialogue = cast(ContractApiDialogue, contract_api_dialogue)
+        contract_api_dialogue.terms = parameters.get_mint_token_terms()
+        contract_api_dialogue.callable = (
+            ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
+        )
+        self.context.outbox.put_message(message=contract_api_msg)
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index 0c93082691..87079deb32 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -434,10 +434,11 @@ def _handle_transaction_receipt(
                 contract_api_dialogue.callable
                 == ContractApiDialogue.Callable.GET_MINT_BATCH_TRANSACTION
             ):
+                self.context.logger.info("tokens minted.")
                 parameters.nb_completed_minting += 1
                 if game.registration.nb_agents == parameters.nb_completed_minting:
                     game.phase = Phase.TOKENS_MINTED
-                    self.context.logger.info("tokens minted.")
+                    self.context.logger.info("all tokens minted.")
             else:
                 self.context.logger.error("unexpected transaction receipt!")
         else:
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index d01fa264a8..7dc2f629f5 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmVwuR8bhRfoSnYDZ7hmSy8o8bvUmdf52Vp3Tt8EHhEmyL
+  behaviours.py: QmUKPVxyvj3XbEX5CSJh3PBCX6HUvvkgzQ3TqHnLa1r3xh
   dialogues.py: QmWvhTeUnDimhQQTzuSfJJ6d2ViqgBNooCMfRiVzvzApw3
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
-  handlers.py: QmT1TaYDstQewEVptuRuUCgcEcyX1R47ZRzB2MGQWg2NxC
+  handlers.py: QmZse9uaY8XFzwLtiGM55if93Zx9PRCuZdSQSCYTRLyjq1
   helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
   parameters.py: QmVMNP52fPxkzEbXPhXtQXspnaj2f4ErZNcNdPAqv4cvwq
 fingerprint_ignore_patterns: []
@@ -77,7 +77,8 @@ models:
       lower_bound_factor: 1
       min_nb_agents: 2
       money_endowment: 2000000
-      nb_goods: 10
+      nb_currencies: 1
+      nb_goods: 9
       registration_start_time: 01 01 2020  00:01
       registration_timeout: 60
       service_data:
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 0d51597d5a..0cbad7258c 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -12,7 +12,7 @@ fetchai/agents/ml_model_trainer,QmWnBK6TGFro2VrtcwwBq1eztiT5y4DV92DdeyHPQqGzcY
 fetchai/agents/my_first_aea,QmYqeuaG7mkxqPZTM2qUHP2bMm1A7VsSDLi6BfW6SaFbuZ
 fetchai/agents/simple_service_registration,QmY4oz8n2zjJnAa3vHRRDuzpZi8Taf8qsScX7NJoXrTk3u
 fetchai/agents/tac_controller,QmWVvJemSdE5N5iyMuDt5ZHh1FA32oijHxBqq91zaNkdY3
-fetchai/agents/tac_controller_contract,QmXmUu3XQj3E5jcSzi6fRT5ZkWw65HFnvzwqRDS5hcLqSz
+fetchai/agents/tac_controller_contract,QmSZRM9QqFpZDosBuY1gCgX4Ho8icAMAnyh6VMti6UdwVE
 fetchai/agents/tac_participant,QmRmswKxJ9mdQe6zFRqxr9U1ZpYTybQf3DKsrAySt39aVc
 fetchai/agents/tac_participant_contract,QmaZQ17y4Lm8MNVpDP9kUm31z5HpLDrGWW8yy3FWPwcFN4
 fetchai/agents/thermometer_aea,QmT1GNUCcB6xqnmB1vv3jTs4HqeYM6tLnnL4TSjv5raHpk
@@ -63,8 +63,8 @@ fetchai/skills/ml_data_provider,QmaKyLjyvcj35bCHaKKo15MeF7k48hKPCfFbrtvXCogYwV
 fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
-fetchai/skills/tac_control,QmSjh4JAzWG3oPUzazXvnTvKRBJ4nqRGLr9hCQeUP5x4eR
-fetchai/skills/tac_control_contract,QmUNSvgheuMrerJ5aX2PhGLX2xVwdMXdepYsBoKYJ649VX
+fetchai/skills/tac_control,QmVHPpD3mHoBq523jkkDyZcmwWwWYUJsPp11yCdweKEADy
+fetchai/skills/tac_control_contract,QmPC8HhVYcSJW8TubwqxT1RLK4rV4AVrLAEFuJe4gNkHVR
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1

From e7add9b6acc663818c9012cf2db61aa1f86db31b Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 24 Sep 2020 20:43:57 +0100
Subject: [PATCH 077/131] fix contract address forwarding

---
 packages/fetchai/skills/tac_control/behaviours.py     |  2 +-
 packages/fetchai/skills/tac_control/game.py           | 11 +++++++++++
 packages/fetchai/skills/tac_control/skill.yaml        |  4 ++--
 .../fetchai/skills/tac_control_contract/behaviours.py |  4 ++++
 .../fetchai/skills/tac_control_contract/handlers.py   |  1 +
 .../fetchai/skills/tac_control_contract/skill.yaml    |  4 ++--
 packages/hashes.csv                                   |  4 ++--
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/fetchai/skills/tac_control/behaviours.py b/packages/fetchai/skills/tac_control/behaviours.py
index 6b79c0f094..72fcf955d7 100644
--- a/packages/fetchai/skills/tac_control/behaviours.py
+++ b/packages/fetchai/skills/tac_control/behaviours.py
@@ -79,6 +79,7 @@ def act(self) -> None:
                 self._unregister_tac()
             else:
                 game.phase = Phase.GAME_SETUP
+                game.create()
                 self._start_tac(game)
                 self._unregister_tac()
                 game.phase = Phase.GAME
@@ -174,7 +175,6 @@ def _unregister_agent(self) -> None:
 
     def _start_tac(self, game: Game):
         """Create a game and send the game configuration to every registered agent."""
-        game.create()
         self.context.logger.info(
             "started competition:\n{}".format(game.holdings_summary)
         )
diff --git a/packages/fetchai/skills/tac_control/game.py b/packages/fetchai/skills/tac_control/game.py
index 795d56349b..e211937816 100644
--- a/packages/fetchai/skills/tac_control/game.py
+++ b/packages/fetchai/skills/tac_control/game.py
@@ -743,6 +743,7 @@ def __init__(self, **kwargs):
         self._current_agent_states = None  # type: Optional[Dict[str, AgentState]]
         self._transactions = Transactions()
         self._already_minted_agents = []  # type: List[str]
+        self._is_allowed_to_mint = True
 
     @property
     def phase(self) -> Phase:
@@ -799,6 +800,16 @@ def create(self):
         self._phase = Phase.GAME_SETUP
         self._generate()
 
+    @property
+    def is_allowed_to_mint(self):
+        """Get is allowed to mint."""
+        return self._is_allowed_to_mint
+
+    @is_allowed_to_mint.setter
+    def is_allowed_to_mint(self, is_allowed_to_mint: bool):
+        """Get is allowed to mint."""
+        self._is_allowed_to_mint = is_allowed_to_mint
+
     def get_next_agent_state_for_minting(self) -> Optional[AgentState]:
         """Get next agent state for token minting."""
         result = None
diff --git a/packages/fetchai/skills/tac_control/skill.yaml b/packages/fetchai/skills/tac_control/skill.yaml
index 365cd3f603..45fe2a38f5 100644
--- a/packages/fetchai/skills/tac_control/skill.yaml
+++ b/packages/fetchai/skills/tac_control/skill.yaml
@@ -9,9 +9,9 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmdWECpRXZXH5JPV6wVHqeUtvjBhieUFTEoT2e7EY16N8M
   __init__.py: Qme9YfgfPXymvupw1EHMJWGUSMTT6JQZxk2qaeKE76pgyN
-  behaviours.py: QmcznM3tsmEDNx9Vbhv48o3PNtBEz5W1MVQ7SxJFGkH7di
+  behaviours.py: QmPtGBEFGEdQCzeXC3ZkJuNTrSe217JupP1wtP8DMnm6cK
   dialogues.py: QmcVYVTZ95UKBnXzmKyGLo5LwSVcGYUTrifosQMSpzNnCX
-  game.py: QmaDGFufEofsvo62E8KGUfaAeyDrPc5Mxih3JjDFSEpkqU
+  game.py: QmU3jm1yqhtnW1XK9EGZAMx9iWeCiX8Cdvb55kQQKDXav1
   handlers.py: QmSjwPKEN83C2gQS4WVH8uaHMv5ze7EJ9S8ugmRcKnSwnW
   helpers.py: QmQXrtqV3h4oU5cDwWKhtNiTTAGLNZGhjoVnDvGj7mGwpe
   parameters.py: QmefuFt5DPCBciu4z17UJWcXxtb4vwA879pNwh4DoMKPUm
diff --git a/packages/fetchai/skills/tac_control_contract/behaviours.py b/packages/fetchai/skills/tac_control_contract/behaviours.py
index 50671a53ad..5bf5178685 100644
--- a/packages/fetchai/skills/tac_control_contract/behaviours.py
+++ b/packages/fetchai/skills/tac_control_contract/behaviours.py
@@ -121,6 +121,7 @@ def act(self) -> None:
             else:
                 game.phase = Phase.GAME_SETUP
                 game.create()
+                game.conf.contract_address = parameters.contract_address
                 self._unregister_tac()
         elif (
             game.phase.value == Phase.GAME_SETUP.value
@@ -182,6 +183,9 @@ def _request_mint_items_transaction(self, game: Game) -> None:
 
         :return: None
         """
+        if not game.is_allowed_to_mint:
+            return
+        game.is_allowed_to_mint = False
         agent_state = game.get_next_agent_state_for_minting()
         if agent_state is None:
             return
diff --git a/packages/fetchai/skills/tac_control_contract/handlers.py b/packages/fetchai/skills/tac_control_contract/handlers.py
index 87079deb32..2794aa4dec 100644
--- a/packages/fetchai/skills/tac_control_contract/handlers.py
+++ b/packages/fetchai/skills/tac_control_contract/handlers.py
@@ -436,6 +436,7 @@ def _handle_transaction_receipt(
             ):
                 self.context.logger.info("tokens minted.")
                 parameters.nb_completed_minting += 1
+                game.is_allowed_to_mint = True
                 if game.registration.nb_agents == parameters.nb_completed_minting:
                     game.phase = Phase.TOKENS_MINTED
                     self.context.logger.info("all tokens minted.")
diff --git a/packages/fetchai/skills/tac_control_contract/skill.yaml b/packages/fetchai/skills/tac_control_contract/skill.yaml
index 7dc2f629f5..7057bc6e20 100644
--- a/packages/fetchai/skills/tac_control_contract/skill.yaml
+++ b/packages/fetchai/skills/tac_control_contract/skill.yaml
@@ -9,10 +9,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmUiw6Dt97mXLzSizbnMNTsfLy3edGXKdYTNR5bke6sFsm
   __init__.py: QmW9WBy1sNYVKpymGnpJY2pW5MEqGgVga2kBFUT9S34Yt5
-  behaviours.py: QmUKPVxyvj3XbEX5CSJh3PBCX6HUvvkgzQ3TqHnLa1r3xh
+  behaviours.py: QmSfxtgDawQai52wzoYp58KHEVjXPsFiHQpyv4cYCcBo28
   dialogues.py: QmWvhTeUnDimhQQTzuSfJJ6d2ViqgBNooCMfRiVzvzApw3
   game.py: QmQwskD5DBVNv1ouRpqGNLb3zQ5krLUcR6XXHUcJ5EVc8L
-  handlers.py: QmZse9uaY8XFzwLtiGM55if93Zx9PRCuZdSQSCYTRLyjq1
+  handlers.py: QmUevEFLkj94XQDPKqkWxRRRZJnY3XQBZFKXDK69xpwabB
   helpers.py: QmX3iv37Z5CmGupCtikc4muTpJyQ9zvjeLbNKDLF7iPhSZ
   parameters.py: QmVMNP52fPxkzEbXPhXtQXspnaj2f4ErZNcNdPAqv4cvwq
 fingerprint_ignore_patterns: []
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 0cbad7258c..e11657a607 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -63,8 +63,8 @@ fetchai/skills/ml_data_provider,QmaKyLjyvcj35bCHaKKo15MeF7k48hKPCfFbrtvXCogYwV
 fetchai/skills/ml_train,QmNoV8PRFQj7WEj9We6sEtX9G1Qb8qESoZ2QRK4MybVNoG
 fetchai/skills/scaffold,QmRVUvLnRRPjgNDYw2gNZFY8MFBhGez1CfvY7z3N8yFMux
 fetchai/skills/simple_service_registration,QmVTVvRoxKsP9N97TRGrj92bgPcEYhKYfYtohVuQ8BNzbr
-fetchai/skills/tac_control,QmVHPpD3mHoBq523jkkDyZcmwWwWYUJsPp11yCdweKEADy
-fetchai/skills/tac_control_contract,QmPC8HhVYcSJW8TubwqxT1RLK4rV4AVrLAEFuJe4gNkHVR
+fetchai/skills/tac_control,QmQqF4n4M1kYBHUFAUXsWoEdGZBDwvjwBDmtot5bzWtRMF
+fetchai/skills/tac_control_contract,QmQaYhgXfyZ3xP6USHWsVQ76hTQnuLxHUt2YGGXHEpUHqx
 fetchai/skills/tac_negotiation,QmU6rghC95ESWaxM8gENDuRxuCXDgXQR3xkhrqFurQSEEo
 fetchai/skills/tac_participation,QmdiCxur8qx2beRKz2HxGTF4GLzM6k7GEiecy67NvQ4iKt
 fetchai/skills/thermometer,QmTud9hXxRq8wRzcf7hVeszou3crmAEZBaw5MjV8x4XtH1

From 3eb7cd9811e0d0d43e7d7261537d5bf805d81f89 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Fri, 25 Sep 2020 12:47:32 +0300
Subject: [PATCH 078/131] anget manager. start stop agents

---
 aea/manager.py        | 225 +++++++++++++++++++++++++++++++++++++++++-
 tests/test_manager.py |  22 +++--
 2 files changed, 236 insertions(+), 11 deletions(-)

diff --git a/aea/manager.py b/aea/manager.py
index 643543597f..de92bf7edb 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -17,10 +17,14 @@
 #
 # ------------------------------------------------------------------------------
 """This module contains the implementation of AEA agents manager."""
+import asyncio
 import copy
 import os
+import threading
+from asyncio.tasks import FIRST_COMPLETED
 from shutil import rmtree
-from typing import Dict, List, Optional, Set
+from threading import Thread
+from typing import Callable, Dict, List, Optional, Set
 
 from aea.aea import AEA
 from aea.aea_builder import AEABuilder
@@ -70,12 +74,96 @@ def remove(self):
         self.project.agents.remove(self.name)
 
 
+class AsyncTask:
+    """Async task wrapper for agent."""
+
+    def __init__(self, agent: AEA, loop: asyncio.AbstractEventLoop) -> None:
+        """Init task with agent and loop."""
+        self.run_loop: asyncio.AbstractEventLoop = loop
+        self.caller_loop: asyncio.AbstractEventLoop = loop
+        self._done_future: Optional[asyncio.Future] = None
+        self.task: Optional[asyncio.Task] = None
+        self.agent = agent
+
+    def create_run_loop(self) -> None:
+        """Create run loop."""
+        pass
+
+    def start(self) -> None:
+        """Start task."""
+        self.create_run_loop()
+        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."""
+        if not self._done_future:
+            raise ValueError("Task not started!")
+        return self._done_future
+
+    def stop(self) -> None:
+        """Stop task."""
+        if not self.run_loop or not self.task:
+            raise ValueError("Task was not started!")
+        self.run_loop.call_soon_threadsafe(self.task.cancel)
+
+    async def _run_wrapper(self) -> None:
+        """Run task internals."""
+        if not self._done_future:
+            raise ValueError("Task was not started! please use start method")
+        try:
+            await self.run()
+            self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
+        except asyncio.CancelledError:
+            self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
+        except Exception as e:
+            self.caller_loop.call_soon_threadsafe(self._done_future.set_exception, e)
+
+    async def run(self) -> None:
+        """Run task body."""
+        self.agent.runtime.set_loop(self.run_loop)
+        try:
+            self.agent.runtime.start()
+            while True:
+                await asyncio.sleep(1)
+        finally:
+            self.agent.runtime.stop()
+
+    @property
+    def is_running(self) -> bool:
+        """Return is task running."""
+        return not self.wait().done()
+
+
+class ThreadedTask(AsyncTask):
+    """Threaded task."""
+
+    def __init__(self, agent: AEA, loop: asyncio.AbstractEventLoop) -> None:
+        """Init task with agent and loop."""
+        AsyncTask.__init__(self, agent, loop)
+        self._thread: Optional[Thread] = None
+
+    def create_run_loop(self) -> None:
+        """Create run loop."""
+        self.run_loop = asyncio.new_event_loop()
+
+    def start(self) -> None:
+        """Run task in a dedicated thread."""
+        super().start()
+        self._thread = threading.Thread(
+            target=self.run_loop.run_until_complete, args=[self.task], daemon=True
+        )
+        self._thread.start()
+
+
 class Manager:
     """Abstract agents manager."""
 
     AGENT_DO_NOT_OVERRIDE_VALUES = ["skills", "connections", "protocols", "contracts"]
+    MODES = ["async", "threaded"]
+    DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS = 60
 
-    def __init__(self, working_dir: str) -> None:
+    def __init__(self, working_dir: str, mode: str = "async") -> None:
         """
         Initialize manager.
 
@@ -83,15 +171,74 @@ def __init__(self, working_dir: str) -> None:
         """
         self.working_dir = working_dir
         self._was_working_dir_created = False
-        self.is_started = False
+        self._is_running = False
         self._projects: Dict[PublicId, Project] = {}
         self._keys_dir = os.path.abspath(os.path.join(self.working_dir, "keys"))
         self._agents: Dict[str, AgentAlias] = {}
+        self._agents_tasks: Dict[str, AsyncTask] = {}
+
+        self._thread = Thread(target=self._run_thread, daemon=True)
+        self._loop: Optional[asyncio.AbstractEventLoop] = None
+        self._event: Optional[asyncio.Event] = None
+
+        self._error_callbacks: List[Callable[[str, BaseException], None]] = []
+
+        if mode not in self.MODES:
+            raise ValueError(
+                f'Invalid mode {mode}. Valid modes are {", ".join(self.MODES)}'
+            )
+        self._started_event = threading.Event()
+        self._mode = mode
+
+    @property
+    def is_running(self) -> bool:
+        """Is manager running."""
+        return self._is_running
+
+    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:
+        """Perform manager stop."""
+        if not self._event:
+            raise ValueError("Do not use this method directly, use start_manager.")
+
+        self._started_event.set()
+
+        while self._is_running:
+            tasks_for_agents = {
+                task.wait(): agent_name
+                for agent_name, task in self._agents_tasks.items()
+            }
+            wait_tasks = list(tasks_for_agents.keys()) + [self._event.wait()]  # type: ignore
+            done, _ = await asyncio.wait(wait_tasks, return_when=FIRST_COMPLETED)
+
+            if self._event.is_set():
+                self._event.clear()
+
+            for task in done:
+                if task not in tasks_for_agents:
+                    await task
+                    continue
+                agent_name = tasks_for_agents[task]
+                self._agents_tasks.pop(agent_name)
+                if task.exception():
+                    print(agent_name, "exceptioned", task.exception())
+                    for callback in self._error_callbacks:
+                        callback(agent_name, task.exception())
+                else:
+                    await task
 
     def start_manager(self) -> None:
         """Start manager."""
         self._ensure_working_dir()
-        self.is_started = True
+        self._started_event.clear()
+        self._is_running = True
+        self._thread.start()
+        self._started_event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
     def stop_manager(self, cleanup: bool = False) -> None:
         """
@@ -103,10 +250,16 @@ def stop_manager(self, cleanup: bool = False) -> None:
 
         :return: None
         """
+        if not self._loop or not self._event:
+            raise ValueError("Manager was not started!")
         if self._was_working_dir_created:
             rmtree(self.working_dir)
 
-        self.is_started = False
+        if self._thread.is_alive():
+            self.stop_all_agents()
+        self._is_running = False
+        self._loop.call_soon_threadsafe(self._event.set)
+        self._thread.join(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
     def add_project(self, public_id: PublicId) -> None:
         """Fetch agent project and all dependencies to working_dir."""
@@ -119,6 +272,11 @@ def remove_project(self, public_id: PublicId) -> None:
         if public_id not in self._projects:
             raise ValueError(f"Project {public_id} was not added!")
 
+        if self._projects[public_id].agents:
+            raise ValueError(
+                f"Can not remove projects with aliases exists: {self._projects[public_id].agents}"
+            )
+
         self._projects.pop(public_id).remove()
 
     def list_projects(self) -> List[PublicId]:
@@ -171,6 +329,8 @@ def list_agents(self, running_only: bool = False) -> List[str]:
 
         :return: list of agents names
         """
+        if running_only:
+            return list(self._agents_tasks.keys())
         return list(self._agents.keys())
 
     def remove_agent(self, agent_name: str) -> None:
@@ -184,6 +344,9 @@ def remove_agent(self, agent_name: str) -> None:
         if agent_name not in self._agents:
             raise ValueError(f"Agent with name {agent_name} does not exist!")
 
+        if self._is_agent_running(agent_name):
+            raise ValueError("Agent is running. stop it first!")
+
         agent_alias = self._agents.pop(agent_name)
         agent_alias.remove()
 
@@ -195,6 +358,33 @@ def start_agent(self, agent_name: str) -> None:
 
         :return: None
         """
+        if not self._loop or not self._event:
+            raise ValueError("agent is not started!")
+
+        agent_alias = self._agents.get(agent_name)
+        if not agent_alias:
+            raise ValueError(f"{agent_name} is not registered!")
+        if self._is_agent_running(agent_name):
+            raise ValueError(f"{agent_name} is already started!")
+
+        if self._mode == "async":
+            task = AsyncTask(agent_alias.agent, self._loop)
+        elif self._mode == "threaded":
+            task = ThreadedTask(agent_alias.agent, self._loop)
+
+        task.start()
+        self._agents_tasks[agent_name] = task
+        self._loop.call_soon_threadsafe(self._event.set)
+
+    def _is_agent_running(self, agent_name):
+        if agent_name not in self._agents_tasks:
+            return False
+
+        task = self._agents_tasks[agent_name]
+        if task.is_running:
+            return True
+        del self._agents_tasks[agent_name]
+        return False
 
     def start_all_agents(self) -> None:
         """
@@ -202,6 +392,10 @@ def start_all_agents(self) -> None:
 
         :return: None
         """
+        for agent_name in self.list_agents():
+            if self._is_agent_running(agent_name):
+                continue
+            self.start_agent(agent_name)
 
     def stop_agent(self, agent_name: str) -> None:
         """
@@ -211,6 +405,16 @@ def stop_agent(self, agent_name: str) -> None:
 
         :return: None
         """
+        if not self._is_agent_running(agent_name):
+            raise ValueError(f"{agent_name} is not running!")
+        if self._thread.ident == threading.get_ident():
+            # In same thread do not perform blocking operations!
+            self._agents_tasks[agent_name].stop()
+            return
+        event = threading.Event()
+        self._agents_tasks[agent_name].wait().add_done_callback(lambda x: event.set())
+        self._agents_tasks[agent_name].stop()
+        event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
     def stop_all_agents(self) -> None:
         """
@@ -218,6 +422,8 @@ def stop_all_agents(self) -> None:
 
         :return: None
         """
+        for agent_name in self.list_agents(running_only=True):
+            self.stop_agent(agent_name)
 
     def stop_agents(self, agent_names: List[str]) -> None:
         """
@@ -225,6 +431,12 @@ def stop_agents(self, agent_names: List[str]) -> None:
 
         :return: None
         """
+        for agent_name in agent_names:
+            if not self._is_agent_running(agent_name):
+                raise ValueError(f"{agent_name} is not running!")
+
+        for agent_name in agent_names:
+            self.stop_agent(agent_name)
 
     def start_agents(self, agent_names: List[str]) -> None:
         """
@@ -232,6 +444,8 @@ def start_agents(self, agent_names: List[str]) -> None:
 
         :return: None
         """
+        for agent_name in agent_names:
+            self.start_agent(agent_name)
 
     def get_agent_details(self, agent_name: str) -> AgentAlias:
         """
@@ -267,6 +481,7 @@ def _build_agent_alias(
 
         builder = AEABuilder.from_config_json(json_config, project.path)
         builder.set_name(agent_name)
+        # builder.set_runtime_mode("async")
 
         if not builder.private_key_paths:
             default_ledger = json_config[0].get("default_ledger", DEFAULT_LEDGER)
diff --git a/tests/test_manager.py b/tests/test_manager.py
index e5a4c6af57..170ea6b96e 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -18,9 +18,9 @@
 # ------------------------------------------------------------------------------
 """This module contains tests for aea manager."""
 import os
+import time
 from contextlib import suppress
 from shutil import rmtree
-from typing import Dict, List, Optional, Set
 
 import pytest
 
@@ -30,7 +30,7 @@
 
 def test_manager():
     """Perform some tests."""
-
+    # pydocsyle
     try:
         working_dir = "manager_dir"
         project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
@@ -41,7 +41,7 @@ def test_manager():
         manager = Manager(working_dir)
         manager.start_manager()
         assert os.path.exists(working_dir)
-        assert manager.is_started
+        assert manager.is_running
 
         manager.add_project(project_public_id)
 
@@ -84,13 +84,24 @@ def test_manager():
                 project_public_id, agent_name,
             )
         assert agent_name in manager.list_agents()
+        manager.start_all_agents()
+        assert agent_name in manager.list_agents(running_only=True)
+        manager.start_all_agents()
+
+        with pytest.raises(ValueError, match="is already started!"):
+            manager.start_agents(manager.list_agents())
+
+        with pytest.raises(ValueError, match="Agent is running. stop it first!"):
+            manager.remove_agent(agent_name)
+
+        time.sleep(2)
+        manager.stop_all_agents()
 
         manager.remove_agent(agent_name)
         assert agent_name not in manager.list_agents()
 
         with pytest.raises(ValueError, match="does not exist!"):
             manager.remove_agent(agent_name)
-
         manager.remove_project(project_public_id)
         assert project_public_id not in manager._projects
         assert not os.path.exists(project_path)
@@ -98,10 +109,9 @@ def test_manager():
 
         with pytest.raises(ValueError, match=r"was not added"):
             manager.remove_project(project_public_id)
-
         manager.stop_manager()
         assert not os.path.exists(working_dir)
-        assert not manager.is_started
+        assert not manager.is_running
     finally:
         with suppress(FileNotFoundError):
             rmtree(working_dir)

From 90ac861f61d2fb600e54e8c59088de42fe123d38 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Fri, 25 Sep 2020 11:59:48 +0100
Subject: [PATCH 079/131] add test for tac_control_contract

---
 aea/test_tools/test_cases.py                  |   4 +-
 .../tac_participant_contract/aea-config.yaml  |   9 +-
 packages/hashes.csv                           |   2 +-
 tests/test_packages/test_skills/test_tac.py   | 203 +++++++++++++-----
 4 files changed, 159 insertions(+), 59 deletions(-)

diff --git a/aea/test_tools/test_cases.py b/aea/test_tools/test_cases.py
index d058f4d1f9..ac19fa1dee 100644
--- a/aea/test_tools/test_cases.py
+++ b/aea/test_tools/test_cases.py
@@ -269,11 +269,11 @@ def is_allowed_diff_in_agent_config(
             with open(
                 os.path.join(path_to_fetched_aea, "aea-config.yaml"), "r"
             ) as file:
-                content1 = yaml.full_load(file)
+                content1 = list(yaml.safe_load_all(file))[0]  # only load first page
             with open(
                 os.path.join(path_to_manually_created_aea, "aea-config.yaml"), "r"
             ) as file:
-                content2 = yaml.full_load(file)
+                content2 = list(yaml.safe_load_all(file))[0]
             content1c = copy.deepcopy(content1)
             for key, value in content1c.items():
                 if content2[key] == value:
diff --git a/packages/fetchai/agents/tac_participant_contract/aea-config.yaml b/packages/fetchai/agents/tac_participant_contract/aea-config.yaml
index cde745ed9b..32726f5f0d 100644
--- a/packages/fetchai/agents/tac_participant_contract/aea-config.yaml
+++ b/packages/fetchai/agents/tac_participant_contract/aea-config.yaml
@@ -1,7 +1,8 @@
-agent_name: tac_participant
+agent_name: tac_participant_contract
 author: fetchai
-version: 0.11.0
-description: An AEA to participate in the TAC (trading agent competition)
+version: 0.1.0
+description: An AEA to participate in the TAC (trading agent competition) using an
+  ERC1155 smart contract.
 license: Apache-2.0
 aea_version: '>=0.6.0, <0.7.0'
 fingerprint: {}
@@ -23,7 +24,7 @@ skills:
 - fetchai/tac_negotiation:0.10.0
 - fetchai/tac_participation:0.9.0
 default_connection: fetchai/p2p_libp2p:0.10.0
-default_ledger: fetchai
+default_ledger: ethereum
 logging_config:
   disable_existing_loggers: false
   version: 1
diff --git a/packages/hashes.csv b/packages/hashes.csv
index e11657a607..8826c1bb2b 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -14,7 +14,7 @@ fetchai/agents/simple_service_registration,QmY4oz8n2zjJnAa3vHRRDuzpZi8Taf8qsScX7
 fetchai/agents/tac_controller,QmWVvJemSdE5N5iyMuDt5ZHh1FA32oijHxBqq91zaNkdY3
 fetchai/agents/tac_controller_contract,QmSZRM9QqFpZDosBuY1gCgX4Ho8icAMAnyh6VMti6UdwVE
 fetchai/agents/tac_participant,QmRmswKxJ9mdQe6zFRqxr9U1ZpYTybQf3DKsrAySt39aVc
-fetchai/agents/tac_participant_contract,QmaZQ17y4Lm8MNVpDP9kUm31z5HpLDrGWW8yy3FWPwcFN4
+fetchai/agents/tac_participant_contract,QmVuA9fJAM2jrJH6PCfcq12mgp6999LFCktwkLNjhHhsLz
 fetchai/agents/thermometer_aea,QmT1GNUCcB6xqnmB1vv3jTs4HqeYM6tLnnL4TSjv5raHpk
 fetchai/agents/thermometer_client,QmdWMJCb7Pkz8F3emJ8wKhNWpnEUXHpBFQTGcmJyziu6kH
 fetchai/agents/weather_client,Qmd5iiwyqEuw7Fg8NkdLsNjkuZQRatNRADpXVXwG13BvtP
diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index 88a8c90156..c5c4f3bcfd 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -260,25 +260,34 @@ def test_tac(self):
 class TestTacSkillsContract(AEATestCaseMany):
     """Test that tac skills work."""
 
-    @pytest.mark.unstable
     @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS_ETH)  # cause possible network issues
     def test_tac(self):
         """Run the tac skills sequence."""
         tac_aea_one = "tac_participant_one"
         tac_aea_two = "tac_participant_two"
-        tac_controller_name = "tac_controller"
+        tac_controller_name = "tac_controller_contract"
 
         # create tac controller, agent one and agent two
         self.create_agents(
             tac_aea_one, tac_aea_two, tac_controller_name,
         )
 
+        default_routing = {
+            "fetchai/contract_api:0.5.0": "fetchai/ledger:0.6.0",
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
+        }
+
         # prepare tac controller for test
         self.set_agent_context(tac_controller_name)
         self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
         self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+        self.add_item("connection", "fetchai/soef:0.9.0")
+        self.add_item("connection", "fetchai/ledger:0.6.0")
         self.add_item("skill", "fetchai/tac_control_contract:0.9.0")
         self.set_config("agent.default_ledger", ETHEREUM)
+        setting_path = "agent.default_routing"
+        self.force_set_config(setting_path, default_routing)
         self.run_install()
 
         diff = self.difference_to_fetched_agent(
@@ -288,23 +297,46 @@ def test_tac(self):
             diff == []
         ), "Difference between created and fetched project for files={}".format(diff)
 
+        # add keys
         self.generate_private_key(ETHEREUM)
+        self.generate_private_key(COSMOS, COSMOS_PRIVATE_KEY_FILE_CONNECTION)
         self.add_private_key(ETHEREUM, ETHEREUM_PRIVATE_KEY_FILE)
+        self.add_private_key(
+            COSMOS, COSMOS_PRIVATE_KEY_FILE_CONNECTION, connection=True
+        )
         self.replace_private_key_in_file(
             FUNDED_ETH_PRIVATE_KEY_1, ETHEREUM_PRIVATE_KEY_FILE
         )
+        self.replace_private_key_in_file(
+            NON_FUNDED_COSMOS_PRIVATE_KEY_1, COSMOS_PRIVATE_KEY_FILE_CONNECTION
+        )
+        setting_path = "vendor.fetchai.connections.p2p_libp2p.config.ledger_id"
+        self.force_set_config(setting_path, COSMOS)
+        setting_path = "vendor.fetchai.connections.soef.config.chain_identifier"
+        self.force_set_config(setting_path, ETHEREUM)
+        setting_path = "vendor.fetchai.skills.tac_control.is_abstract"
+        self.force_set_config(setting_path, True)
+
+        default_routing = {
+            "fetchai/ledger_api:0.4.0": "fetchai/ledger:0.6.0",
+            "fetchai/oef_search:0.7.0": "fetchai/soef:0.9.0",
+        }
 
         # prepare agents for test
-        for agent_name, eth_private_key in zip(
-            (tac_aea_one, tac_aea_two),
-            (FUNDED_ETH_PRIVATE_KEY_2, FUNDED_ETH_PRIVATE_KEY_3),
+        for agent_name, config, private_key in (
+            (tac_aea_one, NON_GENESIS_CONFIG, FUNDED_ETH_PRIVATE_KEY_2),
+            (tac_aea_two, NON_GENESIS_CONFIG_TWO, FUNDED_ETH_PRIVATE_KEY_3),
         ):
             self.set_agent_context(agent_name)
             self.add_item("connection", "fetchai/p2p_libp2p:0.10.0")
             self.set_config("agent.default_connection", "fetchai/p2p_libp2p:0.10.0")
+            self.add_item("connection", "fetchai/soef:0.9.0")
+            self.add_item("connection", "fetchai/ledger:0.6.0")
             self.add_item("skill", "fetchai/tac_participation:0.9.0")
             self.add_item("skill", "fetchai/tac_negotiation:0.10.0")
             self.set_config("agent.default_ledger", ETHEREUM)
+            setting_path = "agent.default_routing"
+            self.force_set_config(setting_path, default_routing)
             self.set_config(
                 "vendor.fetchai.skills.tac_participation.models.game.args.is_using_contract",
                 True,
@@ -317,34 +349,59 @@ def test_tac(self):
             )
             self.run_install()
             diff = self.difference_to_fetched_agent(
-                "fetchai/tac_participant:0.11.0", agent_name
+                "fetchai/tac_participant_contract:0.1.0", agent_name
             )
             assert (
                 diff == []
             ), "Difference between created and fetched project for files={}".format(
                 diff
             )
+
+            # add keys
             self.generate_private_key(ETHEREUM)
+            self.generate_private_key(COSMOS, COSMOS_PRIVATE_KEY_FILE_CONNECTION)
             self.add_private_key(ETHEREUM, ETHEREUM_PRIVATE_KEY_FILE)
-            self.replace_private_key_in_file(eth_private_key, ETHEREUM_PRIVATE_KEY_FILE)
+            self.add_private_key(
+                COSMOS, COSMOS_PRIVATE_KEY_FILE_CONNECTION, connection=True
+            )
+            self.replace_private_key_in_file(private_key, ETHEREUM_PRIVATE_KEY_FILE)
+
+            # set p2p configs
+            setting_path = "vendor.fetchai.connections.p2p_libp2p.config"
+            self.force_set_config(setting_path, config)
+            setting_path = "vendor.fetchai.connections.p2p_libp2p.config.ledger_id"
+            self.force_set_config(setting_path, COSMOS)
 
         # run tac controller
         self.set_agent_context(tac_controller_name)
         now = datetime.datetime.now().strftime("%d %m %Y %H:%M")
         now_min = datetime.datetime.strptime(now, "%d %m %Y %H:%M")
-        fut = now_min + datetime.timedelta(0, 360)
+        fut = now_min + datetime.timedelta(
+            0, 180
+        )  # we provide 3 minutes time for contract deployment
         start_time = fut.strftime("%d %m %Y %H:%M")
-        setting_path = "vendor.fetchai.skills.tac_control_contract.models.parameters.args.start_time"
+        setting_path = "vendor.fetchai.skills.tac_control_contract.models.parameters.args.registration_start_time"
         self.set_config(setting_path, start_time)
-        tac_controller_process = self.run_agent(
-            "--connections", "fetchai/p2p_libp2p:0.10.0"
-        )
+        tac_controller_process = self.run_agent()
 
         check_strings = (
-            "Sending deploy transaction to decision maker.",
-            "Sending deployment transaction to the ledger...",
-            "The contract was successfully deployed. Contract address:",
-            "Registering TAC data model",
+            "Downloading golang dependencies. This may take a while...",
+            "Finished downloading golang dependencies.",
+            "Starting libp2p node...",
+            "Connecting to libp2p node...",
+            "Successfully connected to libp2p node!",
+            "My libp2p addresses:",
+            "registering agent on SOEF.",
+            "requesting contract deployment transaction...",
+            "Start processing messages...",
+            "received raw transaction=",
+            "transaction signing was successful.",
+            "sending transaction to ledger.",
+            "transaction was successfully submitted. Transaction digest=",
+            "requesting transaction receipt.",
+            "transaction was successfully settled. Transaction receipt=",
+            "contract deployed.",
+            "registering TAC data model on SOEF.",
             "TAC open for registration until:",
         )
         missing_strings = self.missing_from_output(
@@ -354,65 +411,107 @@ def test_tac(self):
             missing_strings == []
         ), "Strings {} didn't appear in tac_controller output.".format(missing_strings)
 
-        # run two participants as well
+        # run two agents (participants)
         self.set_agent_context(tac_aea_one)
-        tac_aea_one_process = self.run_agent(
-            "--connections", "fetchai/p2p_libp2p:0.10.0"
-        )
+        tac_aea_one_process = self.run_agent()
 
         self.set_agent_context(tac_aea_two)
-        tac_aea_two_process = self.run_agent(
-            "--connections", "fetchai/p2p_libp2p:0.10.0"
+        tac_aea_two_process = self.run_agent()
+
+        check_strings = (
+            "Downloading golang dependencies. This may take a while...",
+            "Finished downloading golang dependencies.",
+            "Starting libp2p node...",
+            "Connecting to libp2p node...",
+            "Successfully connected to libp2p node!",
+            "My libp2p addresses:",
+            "Start processing messages...",
+            "searching for TAC, search_id=",
+            "found the TAC controller. Registering...",
         )
+        missing_strings = self.missing_from_output(
+            tac_aea_one_process, check_strings, timeout=240, is_terminating=False
+        )
+        assert (
+            missing_strings == []
+        ), "Strings {} didn't appear in tac_aea_one output.".format(missing_strings)
 
         check_strings = (
-            "Agent registered:",
-            "Closing registration!",
-            "Setting Up the TAC game.",
-            "Unregistering TAC data model",
-            "Registering TAC data model",
-            "Sending create_items transaction to decision maker.",
-            "Sending creation transaction to the ledger..",
-            "Successfully created the tokens. Transaction hash:",
-            "Sending mint_items transactions to decision maker.",
-            "Sending minting transaction to the ledger...",
-            "Successfully minted the tokens for agent_addr=",
-            "All tokens minted!",
-            "Starting competition with configuration:",
-            "Current good & money allocation & score:",
+            "Downloading golang dependencies. This may take a while...",
+            "Finished downloading golang dependencies.",
+            "Starting libp2p node...",
+            "Connecting to libp2p node...",
+            "Successfully connected to libp2p node!",
+            "My libp2p addresses:",
+            "Start processing messages...",
+            "searching for TAC, search_id=",
+            "found the TAC controller. Registering...",
         )
         missing_strings = self.missing_from_output(
-            tac_controller_process, check_strings, timeout=300, is_terminating=False
+            tac_aea_two_process, check_strings, timeout=240, is_terminating=False
+        )
+        assert (
+            missing_strings == []
+        ), "Strings {} didn't appear in tac_aea_two output.".format(missing_strings)
+
+        check_strings = (
+            "agent registered:",
+            "closing registration!",
+            "unregistering TAC data model from SOEF.",
+            "requesting create items transaction...",
+            "received raw transaction=",
+            "proposing the transaction to the decision maker. Waiting for confirmation ...",
+            "transaction signing was successful.",
+            "transaction was successfully submitted. Transaction digest=",
+            "requesting transaction receipt.",
+            "transaction was successfully settled. Transaction receipt=",
+            "tokens created.",
+            "requesting mint_items transactions for agent=",
+            "tokens minted.",
+            "requesting mint_items transactions for agent=",
+            "tokens minted.",
+            "all tokens minted.",
+            "started competition:",
+        )
+        missing_strings = self.missing_from_output(
+            tac_controller_process, check_strings, timeout=240, is_terminating=False
         )
         assert (
             missing_strings == []
         ), "Strings {} didn't appear in tac_controller output.".format(missing_strings)
 
         check_strings = (
-            "Searching for TAC, search_id=",
-            "Found the TAC controller. Registering...",
-            "Received start event from the controller. Starting to compete...",
-            "Searching for sellers which match the demand of the agent, search_id=",
-            "Searching for buyers which match the supply of the agent, search_id=",
+            "received start event from the controller. Starting to compete..."
+            "received a contract address:",
+            "registering agent on SOEF.",
+            "searching for sellers, search_id=",
+            "searching for buyers, search_id=",
             "found potential sellers agents=",
             "sending CFP to agent=",
-            "Accepting propose",
-            "sending match accept to",
-            "sending atomic swap tx to ledger.",
-            "tx_digest=",
-            "waiting for tx to confirm. Sleeping for 3 seconds ...",
-            "Successfully conducted atomic swap. Transaction digest:",
-            "found potential buyers agents=",
-            "sending CFP to agent=",
-            "Declining propose",
         )
         missing_strings = self.missing_from_output(
-            tac_aea_one_process, check_strings, timeout=360, is_terminating=False
+            tac_aea_one_process, check_strings, timeout=300, is_terminating=False
         )
         assert (
             missing_strings == []
         ), "Strings {} didn't appear in tac_aea_one output.".format(missing_strings)
 
+        check_strings = (
+            "received start event from the controller. Starting to compete..."
+            "received a contract address:",
+            "registering agent on SOEF.",
+            "searching for sellers, search_id=",
+            "searching for buyers, search_id=",
+            "found potential sellers agents=",
+            "sending CFP to agent=",
+        )
+        missing_strings = self.missing_from_output(
+            tac_aea_two_process, check_strings, timeout=360, is_terminating=False
+        )
+        assert (
+            missing_strings == []
+        ), "Strings {} didn't appear in tac_aea_two output.".format(missing_strings)
+
         # Note, we do not need to check std output of the other participant as it is implied
 
         self.terminate_agents(

From 50c581b0e81aa4a0aa01c920c88794b82f35b201 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Fri, 25 Sep 2020 13:20:04 +0100
Subject: [PATCH 080/131] fix tac test marks

---
 tests/test_packages/test_skills/test_tac.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_packages/test_skills/test_tac.py b/tests/test_packages/test_skills/test_tac.py
index c5c4f3bcfd..251bf42dca 100644
--- a/tests/test_packages/test_skills/test_tac.py
+++ b/tests/test_packages/test_skills/test_tac.py
@@ -256,10 +256,11 @@ def test_tac(self):
         ), "Agents weren't successfully terminated."
 
 
-@pytest.mark.ledger
 class TestTacSkillsContract(AEATestCaseMany):
     """Test that tac skills work."""
 
+    @pytest.mark.integration
+    @pytest.mark.ledger
     @pytest.mark.flaky(reruns=MAX_FLAKY_RERUNS_ETH)  # cause possible network issues
     def test_tac(self):
         """Run the tac skills sequence."""
@@ -371,6 +372,8 @@ def test_tac(self):
             self.force_set_config(setting_path, config)
             setting_path = "vendor.fetchai.connections.p2p_libp2p.config.ledger_id"
             self.force_set_config(setting_path, COSMOS)
+            setting_path = "vendor.fetchai.connections.soef.config.chain_identifier"
+            self.force_set_config(setting_path, ETHEREUM)
 
         # run tac controller
         self.set_agent_context(tac_controller_name)

From f2e7a4e9acd90f84419e093d7309b57d4a8fe253 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Fri, 25 Sep 2020 18:10:37 +0100
Subject: [PATCH 081/131] add video from cvc to docs

---
 docs/oef-ledger.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/oef-ledger.md b/docs/oef-ledger.md
index 7b73b5202d..9575ac8e42 100644
--- a/docs/oef-ledger.md
+++ b/docs/oef-ledger.md
@@ -96,4 +96,10 @@ The Python version of the AEA Framework currently integrates with three ledgers:
 - <a href="https://ethereum.org/en/build/" target="_blank">Ethereum ledger</a>
 - <a href="https://cosmos.network/sdk" target="_blank">Cosmos ledger</a>
 
-However, the framework makes it straightforward for further ledgers to be added by any developer.
\ No newline at end of file
+However, the framework makes it straightforward for further ledgers to be added by any developer.
+
+### AEAs as second layer technology
+
+The following presentation discusses how AEAs can be seen as second layer technology to ledgers.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/gvzYX7CYk-A" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

From 42b89a029c974017e971f240deca315fcacb1be9 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Fri, 28 Aug 2020 11:52:48 +0300
Subject: [PATCH 082/131] runtime and agent loop async interface

---
 aea/aea.py                             |  12 +-
 aea/agent.py                           |   4 +-
 aea/agent_loop.py                      |  95 +++++----
 aea/helpers/async_utils.py             | 190 ++++++++++++++++--
 aea/helpers/multiple_executor.py       |   3 -
 aea/launcher.py                        |   2 +-
 aea/multiplexer.py                     |  73 ++++---
 aea/runner.py                          |   4 +-
 aea/runtime.py                         | 254 ++++++++-----------------
 tests/test_aea.py                      |  28 +--
 tests/test_agent.py                    |   8 +-
 tests/test_agent_loop.py               | 102 +++++-----
 tests/test_helpers/test_async_utils.py | 153 +++++++++++++--
 tests/test_launcher.py                 |   1 -
 tests/test_runtime.py                  |  50 ++---
 tests/test_skills/test_error.py        |   1 +
 16 files changed, 590 insertions(+), 390 deletions(-)

diff --git a/aea/aea.py b/aea/aea.py
index 89a5022189..63086fdd02 100644
--- a/aea/aea.py
+++ b/aea/aea.py
@@ -55,6 +55,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.registries.filter import Filter
 from aea.registries.resources import Resources
+from aea.runtime import StopRuntime
 from aea.skills.base import Behaviour, Handler
 from aea.skills.error.handlers import ErrorHandler
 
@@ -241,8 +242,8 @@ def _get_msg_and_handlers_for_envelope(
 
         if error_handler is None:
             self.logger.warning("ErrorHandler not initialized. Stopping AEA!")
-            self.stop()
-            return None, []
+            raise StopRuntime()
+
         error_handler = cast(ErrorHandler, error_handler)
 
         if protocol is None:
@@ -363,9 +364,10 @@ def log_exception(e, fn):
 
         if self._skills_exception_policy == ExceptionPolicyEnum.stop_and_exit:
             log_exception(exception, function)
-            self.stop()
-            raise AEAException(
-                f"AEA was terminated cause exception `{exception}` in skills {function}! Please check logs."
+            raise StopRuntime(
+                AEAException(
+                    f"AEA was terminated cause exception `{exception}` in skills {function}! Please check logs."
+                )
             )
 
         if self._skills_exception_policy == ExceptionPolicyEnum.just_log:
diff --git a/aea/agent.py b/aea/agent.py
index b62acaadf6..70cd8fdc47 100644
--- a/aea/agent.py
+++ b/aea/agent.py
@@ -191,7 +191,8 @@ def start(self) -> None:
 
         :return: None
         """
-        self.runtime.start()
+        if self.runtime.start():
+            self.runtime.wait(sync=True)
 
     def stop(self) -> None:
         """
@@ -206,6 +207,7 @@ def stop(self) -> None:
         :return: None
         """
         self.runtime.stop()
+        self.runtime.wait(sync=True)
 
     @property
     def state(self) -> RuntimeStates:
diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index 59fff7c62d..40196f37a6 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -16,6 +16,8 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
+
+
 """This module contains the implementation of an agent loop using asyncio."""
 import asyncio
 import datetime
@@ -24,6 +26,7 @@
 from asyncio import CancelledError
 from asyncio.events import AbstractEventLoop
 from asyncio.tasks import Task
+from contextlib import suppress
 from enum import Enum
 from functools import partial
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple
@@ -34,7 +37,7 @@
     AsyncState,
     HandlerItemGetter,
     PeriodicCaller,
-    ensure_loop,
+    Runnable,
 )
 from aea.helpers.exec_timeout import ExecTimeoutThreadGuard, TimeoutException
 from aea.helpers.logging import WithLogger
@@ -43,11 +46,28 @@
 logger = logging.getLogger(__name__)
 
 
-class BaseAgentLoop(WithLogger, ABC):
+class AgentLoopException(AEAException):
+    """Exception for agent loop runtime errors."""
+
+
+class AgentLoopStates(Enum):
+    """Internal agent loop states."""
+
+    initial = None
+    started = "started"
+    stopped = "stopped"
+    stopping = "stopping"
+    error = "error"
+
+
+class BaseAgentLoop(Runnable, WithLogger, ABC):
     """Base abstract  agent loop class."""
 
     def __init__(
-        self, agent: AbstractAgent, loop: Optional[AbstractEventLoop] = None
+        self,
+        agent: AbstractAgent,
+        loop: Optional[AbstractEventLoop] = None,
+        threaded=False,
     ) -> None:
         """Init loop.
 
@@ -55,8 +75,9 @@ def __init__(
         :params loop: optional asyncio event loop. if not specified a new loop will be created.
         """
         WithLogger.__init__(self, logger)
+        Runnable.__init__(self, loop=loop, threaded=threaded)
+
         self._agent: AbstractAgent = agent
-        self.set_loop(ensure_loop(loop))
         self._tasks: List[asyncio.Task] = []
         self._state: AsyncState = AsyncState()
         self._exceptions: List[Exception] = []
@@ -70,11 +91,6 @@ def set_loop(self, loop: AbstractEventLoop) -> None:
         """Set event loop and all event loopp related objects."""
         self._loop: AbstractEventLoop = loop
 
-    def start(self) -> None:
-        """Start agent loop synchronously in own asyncio loop."""
-        self.setup()
-        self._loop.run_until_complete(self.run_loop())
-
     def setup(self) -> None:  # pylint: disable=no-self-use
         """Set up loop before started."""
         # start and stop methods are classmethods cause one instance shared across muiltiple threads
@@ -85,16 +101,23 @@ def teardown(self):  # pylint: disable=no-self-use
         # start and stop methods are classmethods cause one instance shared across muiltiple threads
         ExecTimeoutThreadGuard.stop()
 
-    async def run_loop(self) -> None:
+    async def run(self) -> None:
         """Run agent loop."""
         self.logger.debug("agent loop started")
+        self.setup()
         self._set_tasks()
         try:
             await self._gather_tasks()
         except (CancelledError, KeyboardInterrupt):
-            await self.wait_run_loop_stopped()
-        logger.debug("agent loop stopped")
-        self._state.set(AgentLoopStates.stopped)
+            pass
+        finally:
+            self.teardown()
+            self._stop_tasks()
+            for t in self._tasks:
+                with suppress(BaseException):
+                    await t
+            self._state.set(AgentLoopStates.stopped)
+            logger.debug("agent loop stopped")
 
     async def _gather_tasks(self) -> None:
         """Wait till first task exception."""
@@ -105,27 +128,6 @@ def _set_tasks(self) -> None:  # pragma: nocover
         """Set run loop tasks."""
         raise NotImplementedError
 
-    async def wait_run_loop_stopped(self) -> None:
-        """Wait all tasks stopped."""
-        return await asyncio.gather(
-            *self._tasks, loop=self._loop, return_exceptions=True
-        )
-
-    def stop(self) -> None:
-        """Stop agent loop."""
-        self.teardown()
-        self._state.set(AgentLoopStates.stopping)
-        logger.debug("agent loop stopping!")
-        if self._loop.is_running():
-            self._loop.call_soon_threadsafe(self._stop_tasks)
-        else:
-
-            async def stop():
-                self._stop_tasks()
-                await self.wait_run_loop_stopped()
-
-            self._loop.run_until_complete(stop())
-
     def _stop_tasks(self) -> None:
         """Cancel all tasks."""
         for task in self._tasks:
@@ -133,39 +135,32 @@ def _stop_tasks(self) -> None:
                 continue  #  pragma: nocover
             task.cancel()
 
+    @property
+    def state(self) -> AgentLoopStates:
+        """Get current main loop state."""
+        return self._state.get()
+
     @property
     def is_running(self) -> bool:
         """Get running state of the loop."""
         return self._state.get() == AgentLoopStates.started
 
 
-class AgentLoopException(AEAException):
-    """Exception for agent loop runtime errors."""
-
-
-class AgentLoopStates(Enum):
-    """Internal agent loop states."""
-
-    initial = None
-    started = "started"
-    stopped = "stopped"
-    stopping = "stopping"
-    error = "error"
-
-
 class AsyncAgentLoop(BaseAgentLoop):
     """Asyncio based agent loop suitable only for AEA."""
 
     NEW_BEHAVIOURS_PROCESS_SLEEP = 1  # check new behaviours registered every second.
 
-    def __init__(self, agent: AbstractAgent, loop: AbstractEventLoop = None):
+    def __init__(
+        self, agent: AbstractAgent, loop: AbstractEventLoop = None, threaded=False
+    ):
         """
         Init agent loop.
 
         :param agent: AEA instance
         :param loop: asyncio loop to use. optional
         """
-        super().__init__(agent=agent, loop=loop)
+        super().__init__(agent=agent, loop=loop, threaded=threaded)
         self._agent: AbstractAgent = self._agent
 
         self._periodic_tasks: Dict[Callable, PeriodicCaller] = {}
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 0723a00b58..64155f510b 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -23,6 +23,7 @@
 import logging
 import subprocess  # nosec
 import time
+from abc import ABC, abstractmethod
 from asyncio import CancelledError
 from asyncio.events import AbstractEventLoop, TimerHandle
 from asyncio.futures import Future
@@ -259,27 +260,6 @@ def stop(self) -> None:
         self._timerhandle = None
 
 
-def ensure_loop(loop: Optional[AbstractEventLoop] = None) -> AbstractEventLoop:
-    """
-    Use loop provided or create new if not provided or closed.
-
-    Return loop passed if its provided,not closed and not running, otherwise returns new event loop.
-
-    :param loop: optional event loop
-    :return: asyncio event loop
-    """
-    try:
-        loop = loop or asyncio.new_event_loop()
-        if loop.is_closed():
-            raise ValueError("Event loop closed.")  # pragma: nocover
-        if loop.is_running():
-            raise ValueError("Event loop running.")
-    except (RuntimeError, ValueError):
-        loop = asyncio.new_event_loop()
-
-    return loop
-
-
 class AnotherThreadTask:
     """
     Schedule a task to run on the loop in another thread.
@@ -477,3 +457,171 @@ def __init__(self, getters: List[Tuple[Callable[[Any], None], Callable]]):
         super().__init__(
             [self._make_getter(handler, getter) for handler, getter in getters]
         )
+
+
+ready_future: Future = Future()
+ready_future.set_result(None)
+
+
+class Runnable(ABC):
+    """Abstract Runnable class."""
+
+    def __init__(self, loop=None, threaded=False) -> None:
+        """
+        Init runnable.
+
+        :param loop: asyncio event loop to use.
+        :param threaded: bool. start in thread if True.
+
+        :return: None
+        """
+        if loop and threaded:
+            raise ValueError(
+                "You can not set a loop in threaded mode, cause own loop will be created"
+            )
+        self._loop = loop
+        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
+
+    def start(self) -> bool:
+        """
+        Start runnable.
+
+        :return: bool started or not.
+        """
+        if self._task and not self._task.done():
+            logger.debug("already running")
+            return False
+
+        self._got_result = False
+        self._set_loop()
+        self._completed_event = asyncio.Event(loop=self._loop)
+        self._set_task()
+
+        if self._threaded:
+            self._thread = Thread(
+                target=self._loop.run_until_complete, args=[self._task]
+            )
+            self._thread.start()
+
+        return True
+
+    def _set_loop(self) -> None:
+        """Select and set loop."""
+        if self._threaded:
+            self._loop = asyncio.new_event_loop()
+        else:
+            try:
+                self._loop = self._loop or asyncio.get_event_loop()
+            except RuntimeError:
+                self._loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(self._loop)
+
+    def _set_task(self) -> None:
+        """Create task."""
+        self._task = self._loop.create_task(self._run_wrapper())
+
+    async def _run_wrapper(self) -> None:
+        """Wrap run() method."""
+        if not self._completed_event:
+            raise ValueError("Start was not called!")
+        try:
+            with suppress(asyncio.CancelledError):
+                return await self.run()
+        finally:
+            self._loop.call_soon_threadsafe(self._completed_event.set)
+
+    @abstractmethod
+    async def run(self) -> Any:
+        """Implement run logic respectfull to CancelError on termination."""
+
+    def wait(
+        self, sync: bool = False, timeout: float = None, force_result: bool = False
+    ) -> Awaitable:
+        """
+        Wait task to complete.
+
+        :param sync: bool. blocking wait
+        :param timeout: float seconds
+        :param force_result: check result even it was waited.
+
+        :return: awaitable if sync is False, otherise None
+        """
+        if not self._task:
+            logger.warning("Runnable is not no started")
+            return ready_future
+
+        if self._got_result and not force_result:
+            logger.warning("Already got result, skip")
+            return ready_future
+
+        if self._task.done():
+            return ready_future
+
+        coro = self._wait()
+        if timeout is not None:
+            coro = asyncio.wait_for(self._wait(), timeout=timeout)  # type: ignore
+
+        if sync:
+            if self._loop.is_running():
+                start_time = time.time()
+                while not self._task.done():
+                    time.sleep(0.01)
+                    if timeout is not None and time.time() - start_time > timeout:
+                        raise asyncio.TimeoutError()
+                self._got_result = True
+                if self._task.exception():
+                    raise self._task.exception()
+            else:
+                self._loop.run_until_complete(coro)
+            return ready_future
+
+        if self._threaded:
+            loop = asyncio.get_event_loop()
+            fut = loop.create_future()
+
+            def done(task):
+                if fut.done():  # pragma: nocover
+                    return
+                if task.exception():
+                    fut.set_exception(task.exception())
+                else:  # pragma: nocover
+                    fut.set_result(None)
+
+            self._task.add_done_callback(
+                lambda task: loop.call_soon_threadsafe(lambda: done(task))
+            )
+            return fut
+
+        return coro
+
+    async def _wait(self) -> None:
+        """Wait internal method."""
+        if not self._task or not self._completed_event:  # pragma: nocover
+            raise ValueError("Not started")
+
+        await self._completed_event.wait()
+
+        try:
+            await self._task
+        finally:
+            self._got_result = True
+
+    def stop(self) -> None:
+        """Stop runnable."""
+        logger.debug(f"{self} is going to be stopped {self._task}")
+        if not self._task:
+            logger.debug("not running!")
+            return
+        if self._task.done():
+            logger.debug("already completed")
+            return
+        self._loop.call_soon_threadsafe(self._task.cancel)
+
+    def start_and_wait(self, sync=False):
+        """Alias for start and wait methods."""
+        self.start()
+        return self.wait(sync=sync)
diff --git a/aea/helpers/multiple_executor.py b/aea/helpers/multiple_executor.py
index a4d0772c12..3fa00c859e 100644
--- a/aea/helpers/multiple_executor.py
+++ b/aea/helpers/multiple_executor.py
@@ -186,8 +186,6 @@ def stop(self) -> None:
             self._loop.run_until_complete(
                 self._wait_tasks_complete(skip_exceptions=True)
             )
-        if self._executor_pool:
-            self._executor_pool.shutdown(wait=True)
 
         if self._executor_pool:
             self._executor_pool.shutdown(wait=True)
@@ -393,7 +391,6 @@ def stop(self, timeout: float = 0) -> None:
         :return: None
         """
         self._executor.stop()
-
         if self._thread is not None:
             self._thread.join(timeout=timeout)
 
diff --git a/aea/launcher.py b/aea/launcher.py
index c8af13f718..f093e96d76 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -144,7 +144,7 @@ def create_async_task(self, loop: AbstractEventLoop) -> TaskAwaitable:
             raise ValueError(
                 "Agent runtime is not async compatible. Please use runtime_mode=async"
             )
-        return loop.create_task(self._agent.runtime.run_runtime())
+        return loop.create_task(self._agent.runtime.start_and_wait())
 
     @property
     def id(self) -> Union[PathLike, str]:
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index e58db114a6..bc58fac40a 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -29,7 +29,11 @@
 from aea.connections.base import Connection, ConnectionStates
 from aea.exceptions import enforce
 from aea.helpers.async_friendly_queue import AsyncFriendlyQueue
-from aea.helpers.async_utils import AsyncState, ThreadedAsyncRunner
+from aea.helpers.async_utils import (
+    AsyncState,
+    Runnable,
+    ThreadedAsyncRunner,
+)
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.helpers.logging import WithLogger
 from aea.mail.base import AEAConnectionError, Empty, Envelope, EnvelopeContext
@@ -67,7 +71,7 @@ def is_disconnecting(self) -> bool:  # pragma: nocover
         return self.get() == ConnectionStates.disconnecting
 
 
-class AsyncMultiplexer(WithLogger):
+class AsyncMultiplexer(Runnable, WithLogger):
     """This class can handle multiple connections at once."""
 
     def __init__(
@@ -76,6 +80,7 @@ def __init__(
         default_connection_index: int = 0,
         loop: Optional[AbstractEventLoop] = None,
         exception_policy: ExceptionPolicyEnum = ExceptionPolicyEnum.propagate,
+        threaded: bool = False,
     ):
         """
         Initialize the connection multiplexer.
@@ -89,6 +94,8 @@ def __init__(
         """
         super().__init__(default_logger)
         self._exception_policy: ExceptionPolicyEnum = exception_policy
+        WithLogger.__init__(self, default_logger)
+        Runnable.__init__(self, loop=loop, threaded=threaded)
         self._connections: List[Connection] = []
         self._id_to_connection: Dict[PublicId, Connection] = {}
         self._default_connection: Optional[Connection] = None
@@ -102,8 +109,21 @@ def __init__(
         self._recv_loop_task = None  # type: Optional[asyncio.Task]
         self._send_loop_task = None  # type: Optional[asyncio.Task]
         self._default_routing = {}  # type: Dict[PublicId, PublicId]
+        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)
+
+    async def run(self) -> None:
+        """Run multiplexer connect and recv/send tasks."""
+        self.set_loop(asyncio.get_event_loop())
+        try:
+            await self.connect()
+            if not self._recv_loop_task or not self._send_loop_task:
+                raise ValueError("Multiplexer is not connected properly.")
 
-        self.set_loop(loop if loop is not None else asyncio.new_event_loop())
+            await asyncio.gather(self._recv_loop_task, self._send_loop_task)
+        finally:
+            await self.disconnect()
 
     @property
     def default_connection(self) -> Optional[Connection]:
@@ -117,8 +137,8 @@ def set_loop(self, loop: AbstractEventLoop) -> None:
         :param loop: asyncio event loop.
         :return: None
         """
-        self._loop: AbstractEventLoop = loop
-        self._lock: asyncio.Lock = asyncio.Lock(loop=self._loop)
+        self._loop = loop
+        self._lock = asyncio.Lock(loop=self._loop)
 
     def _initialize_connections_if_any(
         self, connections: Optional[Sequence[Connection]], default_connection_index: int
@@ -226,6 +246,7 @@ def connection_status(self) -> MultiplexerStatus:
 
     async def connect(self) -> None:
         """Connect the multiplexer."""
+        self._loop = asyncio.get_event_loop()
         self.logger.debug("Multiplexer connecting...")
         self._connection_consistency_checks()
         self._set_default_connection_if_none()
@@ -559,6 +580,25 @@ def put(self, envelope: Envelope) -> None:
         """
         self.out_queue.put_nowait(envelope)
 
+    def setup(
+        self,
+        connections: Collection[Connection],
+        default_routing: Optional[Dict[PublicId, PublicId]] = None,
+        default_connection: Optional[PublicId] = None,
+    ) -> None:
+        """
+        Set up the multiplexer.
+
+        :param connections: the connections to use. It will replace the other ones.
+        :param default_routing: the default routing.
+        :param default_connection: the default connection.
+        :return: None.
+        """
+        self.default_routing = default_routing or {}
+        self._connections = []
+        for c in connections:
+            self.add_connection(c, c.public_id == default_connection)
+
 
 class Multiplexer(AsyncMultiplexer):
     """Transit sync multiplexer for compatibility."""
@@ -635,30 +675,11 @@ def put(self, envelope: Envelope) -> None:  # type: ignore  # cause overrides co
         """
         self._thread_runner.call(super()._put(envelope))  # .result(240)
 
-    def setup(
-        self,
-        connections: Collection[Connection],
-        default_routing: Optional[Dict[PublicId, PublicId]] = None,
-        default_connection: Optional[PublicId] = None,
-    ) -> None:
-        """
-        Set up the multiplexer.
-
-        :param connections: the connections to use. It will replace the other ones.
-        :param default_routing: the default routing.
-        :param default_connection: the default connection.
-        :return: None.
-        """
-        self.default_routing = default_routing or {}
-        self._connections = []
-        for c in connections:
-            self.add_connection(c, c.public_id == default_connection)
-
 
 class InBox:
     """A queue from where you can only consume envelopes."""
 
-    def __init__(self, multiplexer: Multiplexer):
+    def __init__(self, multiplexer: AsyncMultiplexer):
         """
         Initialize the inbox.
 
@@ -745,7 +766,7 @@ async def async_wait(self) -> None:
 class OutBox:
     """A queue from where you can only enqueue envelopes."""
 
-    def __init__(self, multiplexer: Multiplexer):
+    def __init__(self, multiplexer: AsyncMultiplexer):
         """
         Initialize the outbox.
 
diff --git a/aea/runner.py b/aea/runner.py
index 4b00f4e0a4..782df4defc 100644
--- a/aea/runner.py
+++ b/aea/runner.py
@@ -59,7 +59,7 @@ def start(self) -> None:
 
     def stop(self) -> None:
         """Stop task."""
-        self._agent.stop()
+        self._agent.runtime.stop()
 
     def create_async_task(self, loop: AbstractEventLoop) -> TaskAwaitable:
         """
@@ -73,7 +73,7 @@ def create_async_task(self, loop: AbstractEventLoop) -> TaskAwaitable:
             raise ValueError(
                 "Agent runtime is not async compatible. Please use runtime_mode=async"
             )
-        return loop.create_task(self._agent.runtime.run_runtime())
+        return loop.create_task(self._agent.runtime.start_and_wait())
 
     @property
     def id(self):
diff --git a/aea/runtime.py b/aea/runtime.py
index d8c81f139c..766929fb35 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -22,24 +22,40 @@
 
 import asyncio
 import logging
-from abc import ABC, abstractmethod
 from asyncio.events import AbstractEventLoop
+from concurrent.futures._base import CancelledError
 from contextlib import suppress
 from enum import Enum
 from typing import Dict, Optional, Type, cast
 
 from aea.abstract_agent import AbstractAgent
 from aea.agent_loop import AsyncAgentLoop, AsyncState, BaseAgentLoop, SyncAgentLoop
+from aea.connections.base import ConnectionStates
 from aea.decision_maker.base import DecisionMaker, DecisionMakerHandler
-from aea.helpers.async_utils import ensure_loop
+from aea.helpers.async_utils import Runnable
 from aea.helpers.exception_policy import ExceptionPolicyEnum
-from aea.multiplexer import AsyncMultiplexer, Multiplexer
+from aea.multiplexer import AsyncMultiplexer
 from aea.skills.tasks import TaskManager
 
 
 logger = logging.getLogger(__name__)
 
 
+class StopRuntime(Exception):
+    """Exception to stop runtime."""
+
+    def __init__(self, reraise: Optional[Exception] = None):
+        """
+        Init StopRuntime exception.
+
+        :param reraise: exception to reraise.
+
+        :return: None
+        """
+        self.reraise = reraise
+        super().__init__("Stop runtime exception.")
+
+
 class RuntimeStates(Enum):
     """Runtime states."""
 
@@ -50,7 +66,7 @@ class RuntimeStates(Enum):
     error = "error"
 
 
-class BaseRuntime(ABC):
+class BaseRuntime(Runnable):
     """Abstract runtime class to create implementations."""
 
     RUN_LOOPS: Dict[str, Type[BaseAgentLoop]] = {
@@ -64,6 +80,7 @@ def __init__(
         agent: AbstractAgent,
         loop_mode: Optional[str] = None,
         loop: Optional[AbstractEventLoop] = None,
+        threaded=False,
     ) -> None:
         """
         Init runtime.
@@ -73,12 +90,12 @@ def __init__(
         :param loop: optional event loop. if not provided a new one will be created.
         :return: None
         """
+        Runnable.__init__(self, threaded=threaded, loop=loop if not threaded else None)
         self._agent: AbstractAgent = agent
-        self._loop: AbstractEventLoop = ensure_loop(loop)
         self._state: AsyncState = AsyncState(RuntimeStates.stopped, RuntimeStates)
         self._state.add_callback(self._log_runtime_state)
 
-        self._multiplexer: Multiplexer = self._get_multiplexer_instance()
+        self._multiplexer: AsyncMultiplexer = self._get_multiplexer_instance()
         self._task_manager = TaskManager()
         self._decision_maker: Optional[DecisionMaker] = None
 
@@ -107,16 +124,16 @@ def loop(self) -> AbstractEventLoop:
         return self._loop
 
     @property
-    def multiplexer(self) -> Multiplexer:
+    def multiplexer(self) -> AsyncMultiplexer:
         """Get multiplexer."""
         return self._multiplexer
 
-    def _get_multiplexer_instance(self) -> Multiplexer:
+    def _get_multiplexer_instance(self) -> AsyncMultiplexer:
         """Create multiplexer instance."""
         exception_policy = getattr(
             self._agent, "_connection_exception_policy", ExceptionPolicyEnum.propagate
         )
-        return Multiplexer(
+        return AsyncMultiplexer(
             self._agent.connections, loop=self.loop, exception_policy=exception_policy
         )
 
@@ -134,6 +151,9 @@ def _get_main_loop_class(self, loop_mode: str) -> Type[BaseAgentLoop]:
             )
         return self.RUN_LOOPS[loop_mode]
 
+    def _set_task(self):
+        self._task = self._loop.create_task(self._run_wrapper(), name=self._agent.name)
+
     @property
     def decision_maker(self) -> DecisionMaker:
         """Return decision maker if set."""
@@ -162,29 +182,6 @@ def _log_runtime_state(self, state) -> None:
         """Log a runtime state changed."""
         logger.debug(f"[{self._agent.name}]: Runtime state changed to {state}.")
 
-    def start(self) -> None:
-        """Start agent using runtime."""
-        if self._state.get() is not RuntimeStates.stopped:
-            logger.error(
-                "[{}]: Runtime is not stopped. Please stop it and start after.".format(
-                    self._agent.name
-                )
-            )
-            return
-        self._start()
-
-    def stop(self) -> None:
-        """Stop agent and runtime."""
-        if self._state.get() in (RuntimeStates.stopped, RuntimeStates.stopping):
-            logger.error(
-                "[{}]: Runtime is already stopped or stopping.".format(self._agent.name)
-            )
-            return
-
-        logger.debug("[{}]: Runtime stopping...".format(self._agent.name))
-        self._teardown()
-        self._stop()
-
     def _teardown(self) -> None:
         """Tear down runtime."""
         logger.debug("[{}]: Runtime teardown...".format(self._agent.name))
@@ -194,16 +191,6 @@ def _teardown(self) -> None:
         self._agent.teardown()
         logger.debug("[{}]: Runtime teardown completed".format(self._agent.name))
 
-    @abstractmethod
-    def _start(self) -> None:  # pragma: nocover
-        """Implement runtime start function here."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def _stop(self) -> None:  # pragma: nocover
-        """Implement runtime stop function here."""
-        raise NotImplementedError
-
     @property
     def is_running(self) -> bool:
         """Get running state of the runtime."""
@@ -241,6 +228,7 @@ def __init__(
         agent: AbstractAgent,
         loop_mode: Optional[str] = None,
         loop: Optional[AbstractEventLoop] = None,
+        threaded=False,
     ) -> None:
         """
         Init runtime.
@@ -250,9 +238,7 @@ def __init__(
         :param loop: optional event loop. if not provided a new one will be created.
         :return: None
         """
-        super().__init__(agent=agent, loop_mode=loop_mode, loop=loop)
-        self._stopping_task: Optional[asyncio.Task] = None
-        self._async_stop_lock: Optional[asyncio.Lock] = None
+        super().__init__(agent=agent, loop_mode=loop_mode, loop=loop, threaded=threaded)
         self._task: Optional[asyncio.Task] = None
 
     def set_loop(self, loop: AbstractEventLoop) -> None:
@@ -261,165 +247,75 @@ def set_loop(self, loop: AbstractEventLoop) -> None:
 
         :param loop: event loop to use.
         """
-        super().set_loop(loop)
-        self.multiplexer.set_loop(self.loop)
-        self.main_loop.set_loop(self.loop)
-        self._async_stop_lock = asyncio.Lock()
-
-    def _start(self) -> None:
-        """
-        Start runtime synchronously.
+        BaseRuntime.set_loop(self, loop)
 
-        Set event loops for multiplexer and agent run loop.
+    async def run(self) -> None:
+        """Start multiplexeor task."""
+        terminal_state = RuntimeStates.error
+        try:
+            await self.run_runtime()
+        except StopRuntime as e:
+            self._state.set(RuntimeStates.stopping)
+            terminal_state = RuntimeStates.stopped
+            if e.reraise:
+                raise e.reraise
+        except (asyncio.CancelledError, CancelledError, KeyboardInterrupt):
+            self._state.set(RuntimeStates.stopping)
+            terminal_state = RuntimeStates.stopped
+        finally:
+            await self.stop_runtime()
+            self._state.set(terminal_state)
 
-        Start runtime asynchonously in own event loop.
+    async def stop_runtime(self) -> None:
         """
-        self.set_loop(self.loop)
+        Stop runtime coroutine.
 
-        logger.debug(f"Start runtime event loop {self.loop}: {id(self.loop)}")
-        self._task = self.loop.create_task(self.run_runtime())
+        Stop main loop.
+        Agent teardown.
+        Disconnect multiplexer.
+        """
+        self.main_loop.stop()
+        with suppress(StopRuntime):
+            await self.main_loop.wait()
+        self._teardown()
 
-        try:
-            self.loop.run_until_complete(self._task)
-            logger.debug("Runtime loop stopped!")
-        except Exception:
-            logger.exception("Exception raised during runtime processing")
-            self._state.set(RuntimeStates.error)
-            raise
-        finally:
-            self._stopping_task = None
+        self.multiplexer.stop()
+        await self.multiplexer.wait()
+        logger.debug("Runtime loop stopped!")
 
     async def run_runtime(self) -> None:
         """Run agent and starts multiplexer."""
         self._state.set(RuntimeStates.starting)
-        try:
-            await self._start_multiplexer()
-            await self._start_agent_loop()
-        except Exception:
-            logger.exception("AsyncRuntime exception during run:")
-            raise
-        finally:
-            if self._stopping_task and not self._stopping_task.done():
-                await self._stopping_task
-
-    async def _multiplexer_disconnect(self) -> None:
-        """Call multiplexer disconnect asynchronous way."""
-        await AsyncMultiplexer.disconnect(self.multiplexer)
+        await asyncio.gather(self._start_multiplexer(), self._start_agent_loop())
 
     async def _start_multiplexer(self) -> None:
         """Call multiplexer connect asynchronous way."""
         self.setup_multiplexer()
-        await AsyncMultiplexer.connect(self.multiplexer)
+        self.multiplexer.set_loop(self._loop)
+        self.multiplexer.start()
+        await self.multiplexer.wait()
 
     async def _start_agent_loop(self) -> None:
         """Start agent main loop asynchronous way."""
         logger.debug("[{}]: Runtime started".format(self._agent.name))
+
+        await self.multiplexer.connection_status.wait(ConnectionStates.connected)
+
         self.task_manager.start()
         if self._decision_maker is not None:  # pragma: nocover
             self.decision_maker.start()
         logger.debug("[{}]: Calling setup method...".format(self._agent.name))
         self._agent.setup()
-        self._state.set(RuntimeStates.running)
         logger.debug("[{}]: Run main loop...".format(self._agent.name))
-        await self.main_loop.run_loop()
-
-    async def _stop_runtime(self) -> None:
-        """
-        Stop runtime.
-
-        Disconnect multiplexer.
-        Tear down agent.
-        Stop agent main loop.
-        """
+        self.main_loop.start()
+        self._state.set(RuntimeStates.running)
         try:
-            if self._async_stop_lock is None:  # pragma: nocover
-                return  # even not started
-
-            async with self._async_stop_lock:
-
-                if self._state.get() in (
-                    RuntimeStates.stopped,
-                    RuntimeStates.stopping,
-                ):  # pragma: nocover
-                    return
-
-                self._state.set(RuntimeStates.stopping)
-                self.main_loop.stop()
-
-                with suppress(BaseException):
-                    await self.main_loop.wait_run_loop_stopped()
-
-                self._teardown()
-
-                await self._multiplexer_disconnect()
-
-        except BaseException:  # pragma: nocover
-            logger.exception("Runtime exception during stop:")
+            await self.main_loop.wait()
+        except asyncio.CancelledError:
+            self.main_loop.stop()
+            await self.main_loop.wait()
             raise
-        finally:
-            self._state.set(RuntimeStates.stopped)
-            logger.debug("[{}]: Runtime stopped".format(self._agent.name))
-
-    def _stop(self) -> None:
-        """
-        Stop synchronously.
-
-        This one calls async functions and does not guarantee to wait till runtime stopped.
-        """
-        logger.debug("Stop runtime coroutine.")
-        if not self.loop.is_running():  # pragma: nocover
-            logger.debug(
-                "Runtime event loop is not running, start loop with `stop` coroutine"
-            )
-
-            with suppress(BaseException):
-                self.loop.run_until_complete(asyncio.sleep(0.01))
-
-            self.loop.run_until_complete(self._stop_runtime())
-            return
-
-        def set_task():
-            self._stopping_task = self.loop.create_task(self._stop_runtime())
 
-        self.loop.call_soon_threadsafe(set_task)
 
-
-class ThreadedRuntime(BaseRuntime):
+class ThreadedRuntime(AsyncRuntime):
     """Run agent and multiplexer in different threads with own asyncio loops."""
-
-    def _start(self) -> None:
-        """Implement runtime start function here."""
-        self._state.set(RuntimeStates.starting)
-
-        self.multiplexer.set_loop(asyncio.new_event_loop())
-
-        self.setup_multiplexer()
-        self.multiplexer.connect()
-        self._agent.setup()
-        self._start_agent_loop()
-
-    def _start_agent_loop(self) -> None:
-        """Start aget's main loop."""
-        logger.debug("[{}]: Runtime started".format(self._agent.name))
-        self.task_manager.start()
-        if self._decision_maker is not None:  # pragma: nocover
-            self.decision_maker.start()
-        try:
-            self._state.set(RuntimeStates.running)
-            self.main_loop.start()
-            logger.debug("[{}]: Runtime stopped".format(self._agent.name))
-        except KeyboardInterrupt:  # pragma: nocover
-            raise
-        except BaseException:  # pragma: nocover
-            logger.exception("Runtime exception during stop:")
-            self._state.set(RuntimeStates.error)
-            raise
-
-    def _stop(self) -> None:
-        """Implement runtime stop function here."""
-        self._state.set(RuntimeStates.stopping)
-        self.main_loop.stop()
-        self._teardown()
-        self.multiplexer.disconnect()
-        logger.debug("[{}]: Runtime stopped".format(self._agent.name))
-        self._state.set(RuntimeStates.stopped)
diff --git a/tests/test_aea.py b/tests/test_aea.py
index 943b7e5be4..1f6f9be7dc 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -43,6 +43,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
 from aea.registries.resources import Resources
+from aea.runtime import RuntimeStates, StopRuntime
 from aea.skills.base import Skill, SkillContext
 
 from packages.fetchai.connections.local.connection import LocalNode
@@ -137,7 +138,7 @@ def test_double_start():
     with run_in_thread(agent.start, timeout=20):
         try:
             wait_for_condition(lambda: agent.is_running, timeout=20)
-
+            print(111, "started!")
             t = Thread(target=agent.start)
             t.start()
             time.sleep(1)
@@ -530,11 +531,9 @@ def test_error_handler_is_not_set():
         message=msg,
     )
 
-    with patch.object(agent, "stop") as mocked_stop:
+    with pytest.raises(StopRuntime):
         agent.handle_envelope(envelope)
 
-    mocked_stop.assert_called()
-
 
 def test_no_handlers_registered():
     """Test no handlers are registered for message processing."""
@@ -562,11 +561,15 @@ def test_no_handlers_registered():
             protocol_id=DefaultMessage.protocol_id,
             message=msg,
         )
-        with patch.object(aea.filter, "get_active_handlers", return_value=[]):
+        with patch.object(
+            aea.filter, "get_active_handlers", return_value=[]
+        ), patch.object(
+            aea.runtime.multiplexer, "put",
+        ):
             aea.handle_envelope(envelope)
-            mock_logger.assert_any_call(
-                f"Cannot handle envelope: no active handler registered for the protocol_id='{DefaultMessage.protocol_id}'."
-            )
+        mock_logger.assert_any_call(
+            f"Cannot handle envelope: no active handler registered for the protocol_id='{DefaultMessage.protocol_id}'."
+        )
 
 
 class TestContextNamespace:
@@ -721,7 +724,6 @@ def test_handle_just_log(self) -> None:
         with patch.object(self.aea._logger, "exception") as patched:
             t = Thread(target=self.aea.start)
             t.start()
-
             self.aea_tool.put_inbox(self.aea_tool.dummy_envelope())
             self.aea_tool.put_inbox(self.aea_tool.dummy_envelope())
             time.sleep(1)
@@ -736,14 +738,17 @@ def test_act_propagate(self) -> None:
         with pytest.raises(ExpectedExcepton):
             self.aea.start()
 
-        assert not self.aea.is_running
+        assert self.aea.runtime.state == RuntimeStates.error
 
     def test_act_stop_and_exit(self) -> None:
         """Test stop and exit policy on behaviour act."""
         self.aea._skills_exception_policy = ExceptionPolicyEnum.stop_and_exit
         self.behaviour.act = self.raise_exception  # type: ignore # cause error: Cannot assign to a method
 
-        self.aea.start()
+        with pytest.raises(
+            AEAException, match=r"AEA was terminated cause exception .*"
+        ):
+            self.aea.start()
 
         assert not self.aea.is_running
 
@@ -772,7 +777,6 @@ def test_act_bad_policy(self) -> None:
 
     def teardown(self) -> None:
         """Stop AEA if not stopped."""
-        self.aea.teardown()
         self.aea.stop()
 
 
diff --git a/tests/test_agent.py b/tests/test_agent.py
index b0de015614..010896682b 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -81,16 +81,14 @@ def test_run_agent():
         assert agent.state == RuntimeStates.stopped
         agent_thread.start()
         try:
-            wait_for_condition(
-                lambda: agent.state == RuntimeStates.starting,
-                timeout=10,
-                error_msg="Agent state must be 'starting'",
-            )
             wait_for_condition(
                 lambda: agent.state == RuntimeStates.running,
                 timeout=10,
                 error_msg="Agent state must be 'running'",
             )
+            print(33333)
+        except Exception as e:
+            print(111111111111111111111111, e)
         finally:
             agent.stop()
             assert agent.state == RuntimeStates.stopped
diff --git a/tests/test_agent_loop.py b/tests/test_agent_loop.py
index 77f81453b2..cf3ad24fc6 100644
--- a/tests/test_agent_loop.py
+++ b/tests/test_agent_loop.py
@@ -26,7 +26,7 @@
 import pytest
 
 from aea.aea import AEA
-from aea.agent_loop import AsyncAgentLoop, BaseAgentLoop, SyncAgentLoop
+from aea.agent_loop import AgentLoopStates, AsyncAgentLoop, BaseAgentLoop, SyncAgentLoop
 from aea.helpers.async_friendly_queue import AsyncFriendlyQueue
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.mail.base import Envelope
@@ -36,7 +36,7 @@
 from aea.skills.base import Behaviour, Handler, SkillContext
 from aea.skills.behaviours import TickerBehaviour
 
-from tests.common.utils import run_in_thread, wait_for_condition
+from tests.common.utils import wait_for_condition
 
 
 class CountHandler(Handler):
@@ -200,23 +200,27 @@ class TestAsyncAgentLoop:
 
     def test_loop_start_stop(self):
         """Test loop start and stopped properly."""
-        agent_loop = self.AGENT_LOOP_CLASS(self.FAKE_AGENT_CLASS())
-        with run_in_thread(agent_loop.start):
-            wait_for_condition(lambda: agent_loop.is_running, timeout=10)
-            agent_loop.stop()
+        agent_loop = self.AGENT_LOOP_CLASS(self.FAKE_AGENT_CLASS(), threaded=True)
+
+        agent_loop.start()
+        wait_for_condition(lambda: agent_loop.is_running, timeout=10)
+        agent_loop.stop()
+        agent_loop.wait(sync=True)
+        assert not agent_loop.is_running, agent_loop.state
 
     def test_handle_envelope(self):
         """Test one envelope handling."""
         handler = CountHandler.make()
         agent = self.FAKE_AGENT_CLASS(handlers=[handler])
-        agent_loop = self.AGENT_LOOP_CLASS(agent)
+        agent_loop = self.AGENT_LOOP_CLASS(agent, threaded=True)
 
         handler.setup()
-        with run_in_thread(agent_loop.start, timeout=10):
-            wait_for_condition(lambda: agent_loop.is_running, timeout=10)
-            agent.put_inbox("msg")
-            wait_for_condition(lambda: handler.counter == 1, timeout=2)
-            agent_loop.stop()
+        agent_loop.start()
+        wait_for_condition(lambda: agent_loop.is_running, timeout=10)
+        agent.put_inbox("msg")
+        wait_for_condition(lambda: handler.counter == 1, timeout=2)
+        agent_loop.stop()
+        agent_loop.wait(sync=True)
 
     def test_behaviour_act(self):
         """Test behaviour act called by schedule."""
@@ -225,44 +229,43 @@ def test_behaviour_act(self):
         behaviour = CountBehaviour.make(tick_interval=tick_interval)
         behaviour.setup()
         agent = self.FAKE_AGENT_CLASS(behaviours=[behaviour])
-        agent_loop = self.AGENT_LOOP_CLASS(agent)
+        agent_loop = self.AGENT_LOOP_CLASS(agent, threaded=True)
 
-        with run_in_thread(agent_loop.start, timeout=5):
-            wait_for_condition(lambda: agent_loop.is_running, timeout=10)
+        agent_loop.start()
+        wait_for_condition(lambda: agent_loop.is_running, timeout=10)
 
-            # test behaviour called
-            wait_for_condition(
-                lambda: behaviour.counter >= 1, timeout=tick_interval * 2
-            )
-
-            agent_loop.stop()
+        wait_for_condition(lambda: behaviour.counter >= 1, timeout=tick_interval * 2)
+        agent_loop.stop()
+        agent_loop.wait(sync=True)
 
     def test_internal_messages(self):
         """Test internal meesages are processed."""
         agent = self.FAKE_AGENT_CLASS()
-        agent_loop = self.AGENT_LOOP_CLASS(agent)
+        agent_loop = self.AGENT_LOOP_CLASS(agent, threaded=True)
 
-        with run_in_thread(agent_loop.start, timeout=5):
-            wait_for_condition(lambda: agent_loop.is_running, timeout=10)
-            agent.put_internal_message("msg")
-            wait_for_condition(
-                lambda: agent.filter.handle_internal_message.called is True, timeout=5,
-            )
-            agent_loop.stop()
+        agent_loop.start()
+        wait_for_condition(lambda: agent_loop.is_running, timeout=10)
+        agent.put_internal_message("msg")
+        wait_for_condition(
+            lambda: agent.filter.handle_internal_message.called is True, timeout=5,
+        )
+        agent_loop.stop()
+        agent_loop.wait(sync=True)
 
     def test_new_behaviours(self):
         """Test new behaviours are added."""
         agent = self.FAKE_AGENT_CLASS()
-        agent_loop = self.AGENT_LOOP_CLASS(agent)
+        agent_loop = self.AGENT_LOOP_CLASS(agent, threaded=True)
         agent_loop.NEW_BEHAVIOURS_PROCESS_SLEEP = 0.5
 
-        with run_in_thread(agent_loop.start, timeout=5):
-            wait_for_condition(lambda: agent_loop.is_running, timeout=10)
-            wait_for_condition(
-                lambda: agent.filter.handle_new_handlers_and_behaviours.call_count >= 2,
-                timeout=agent_loop.NEW_BEHAVIOURS_PROCESS_SLEEP * 3,
-            )
-            agent_loop.stop()
+        agent_loop.start()
+        wait_for_condition(lambda: agent_loop.is_running, timeout=10)
+        wait_for_condition(
+            lambda: agent.filter.handle_new_handlers_and_behaviours.call_count >= 2,
+            timeout=agent_loop.NEW_BEHAVIOURS_PROCESS_SLEEP * 3,
+        )
+        agent_loop.stop()
+        agent_loop.wait(sync=True)
 
     @pytest.mark.asyncio
     async def test_behaviour_exception(self):
@@ -270,25 +273,26 @@ async def test_behaviour_exception(self):
         tick_interval = 0.1
         behaviour = FailBehaviour.make(tick_interval)
         agent = self.FAKE_AGENT_CLASS(behaviours=[behaviour])
-        loop = asyncio.get_event_loop()
-        agent_loop = self.AGENT_LOOP_CLASS(agent)
-        agent_loop.set_loop(loop)
-        loop_task = loop.create_task(agent_loop.run_loop())
-        await asyncio.sleep(tick_interval * 2)
+        agent_loop = self.AGENT_LOOP_CLASS(agent, threaded=True)
+
         agent._skills_exception_policy = ExceptionPolicyEnum.propagate
         with pytest.raises(ValueError, match="expected!"):
-            await loop_task
+            agent_loop.start()
+            agent_loop.wait(sync=True)
 
-    def test_stop(self):
+    @pytest.mark.asyncio
+    async def test_stop(self):
         """Test loop stoped."""
         agent = self.FAKE_AGENT_CLASS()
-        loop = asyncio.get_event_loop()
         agent_loop = self.AGENT_LOOP_CLASS(agent)
-        agent_loop.set_loop(loop)
-        loop_task = loop.create_task(agent_loop.run_loop())
+        agent_loop.start()
+        await asyncio.wait_for(
+            agent_loop._state.wait(AgentLoopStates.started), timeout=10
+        )
         agent_loop.stop()
-        loop.run_until_complete(asyncio.sleep(0.1))
-        assert loop_task.done()
+        await asyncio.wait_for(
+            agent_loop._state.wait(AgentLoopStates.stopped), timeout=10
+        )
 
 
 class TestSyncAgentLoop:
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index 6c008a29fd..c106cb595c 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -20,6 +20,7 @@
 import asyncio
 from concurrent.futures._base import CancelledError
 from contextlib import suppress
+from threading import Thread
 
 import pytest
 
@@ -28,9 +29,9 @@
     AwaitableProc,
     HandlerItemGetter,
     PeriodicCaller,
+    Runnable,
     ThreadedAsyncRunner,
     ensure_list,
-    ensure_loop,
 )
 
 
@@ -167,16 +168,6 @@ def callback():
     periodic_caller.stop()
 
 
-@pytest.mark.asyncio
-async def test_ensure_loop():
-    """Test ensure_loop."""
-    loop = asyncio.new_event_loop()
-    assert ensure_loop(loop) == loop
-
-    loop = asyncio.get_event_loop()
-    assert ensure_loop(loop) != loop
-
-
 @pytest.mark.asyncio
 async def test_threaded_async_run():
     """Test threaded async runner."""
@@ -254,3 +245,143 @@ def test_libp2pconnection_awaitable_proc_cancelled():
     proc = AwaitableProc(["sleep", "100"], shell=False)
     proc_task = asyncio.ensure_future(proc.start())
     proc_task.cancel()
+
+
+class RunAndExit(Runnable):
+    """Test class."""
+
+    async def run(self):
+        """Test method."""
+        await asyncio.sleep(0.2)
+
+
+class TestRunnable:
+    """Tests for Runnable object."""
+
+    def test_no_loop_and_threded(self):
+        """Test runnable fails on threaded mode and loop provided.."""
+        with pytest.raises(ValueError,):
+            RunAndExit(loop=asyncio.get_event_loop(), threaded=True)
+
+    @pytest.mark.asyncio
+    async def test_runnable_async(self):
+        """Test runnable async methods."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                while True:
+                    await asyncio.sleep(1)
+
+        run = TestRun()
+        run.start()
+        run.stop()
+        await run.wait()
+
+        run = TestRun(threaded=True)
+        run.start()
+        run.stop()
+        run.wait(sync=True)
+
+        run = RunAndExit()
+        await run.start_and_wait()
+
+    def test_runnable_sync(self):
+        """Test runnable sync methods."""
+        run = RunAndExit()
+        run.start_and_wait(sync=True)
+
+    @pytest.mark.asyncio
+    async def test_double_start(self):
+        """Test runnable async methods."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                while True:
+                    await asyncio.sleep(1)
+
+        run = TestRun()
+        await run.wait()
+        assert run.start()
+        assert not run.start()
+        run.stop()
+        await run.wait()
+        await run.wait()
+
+    @pytest.mark.asyncio
+    async def test_run_in_thread(self):
+        """Test runnable async methods."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                while True:
+                    await asyncio.sleep(1)
+
+        run = TestRun()
+        t = Thread(target=run.start)
+        t.start()
+        run.stop()
+        t.join()
+
+    @pytest.mark.asyncio
+    async def test_timeout(self):
+        """Test runnable async methods."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                while True:
+                    await asyncio.sleep(1)
+
+        run = TestRun(threaded=True)
+        run.start()
+        with pytest.raises(asyncio.TimeoutError):
+            run.wait(sync=True, timeout=0.1)
+
+        run.stop()
+        run.wait(sync=True)
+
+        run = TestRun()
+        run.start()
+        with pytest.raises(asyncio.TimeoutError):
+            await run.wait(timeout=0.1)
+        run.stop()
+        await run.wait()
+
+    @pytest.mark.asyncio
+    async def test_exception(self):
+        """Test runnable async methods."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                raise Exception("awaited")
+
+        run = TestRun(threaded=True)
+        run.start()
+        with pytest.raises(Exception, match="awaited"):
+            run.wait(sync=True, timeout=0.1)
+
+        run.stop()
+        run.wait(sync=True)
+
+        run = TestRun()
+        run.start()
+        with pytest.raises(Exception, match="awaited"):
+            await run.wait(timeout=0.1)
+
+        run.stop()
+        await run.wait()
+
+    @pytest.mark.asyncio
+    async def test_wait_async_threaded(self):
+        """Test runnable async methods."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                raise Exception("awaited")
+
+        run = TestRun(threaded=True)
+        run.start()
+        with pytest.raises(Exception, match="awaited"):
+            await run.wait(timeout=0.2)
+
+        run.stop()
+        await run.wait()
diff --git a/tests/test_launcher.py b/tests/test_launcher.py
index 2ea05053ff..b6ee6083b5 100644
--- a/tests/test_launcher.py
+++ b/tests/test_launcher.py
@@ -132,7 +132,6 @@ def test_one_fails(self) -> None:
 
             with pytest.raises(Exception, match="Expected exception!"):
                 runner.start()
-            time.sleep(1)
         finally:
             runner.stop()
 
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
index 05cc970e66..1a4608e9a3 100644
--- a/tests/test_runtime.py
+++ b/tests/test_runtime.py
@@ -28,7 +28,8 @@
 from aea.configurations.constants import DEFAULT_LEDGER, DEFAULT_PRIVATE_KEY_FILE
 from aea.runtime import AsyncRuntime, BaseRuntime, RuntimeStates, ThreadedRuntime
 
-from tests.common.utils import run_in_thread, wait_for_condition
+from tests.common.utils import wait_for_condition
+
 from tests.conftest import CUR_PATH
 
 
@@ -46,33 +47,36 @@ def setup(self):
         builder.add_private_key(DEFAULT_LEDGER, private_key_path)
         builder.add_skill(Path(CUR_PATH, "data", "dummy_skill"))
         self.agent = builder.build()
-        self.runtime = self.RUNTIME(self.agent)
+        self.runtime = self.RUNTIME(self.agent, threaded=True)
+
+    def teardown(self):
+        self.runtime.stop()
+        self.runtime.wait(sync=True)
 
     def test_start_stop(self):
         """Test runtime tart/stop."""
-        with run_in_thread(self.runtime.start, timeout=20):
-            wait_for_condition(lambda: self.runtime.is_running, timeout=20)
-            self.runtime.stop()
-            wait_for_condition(lambda: not self.runtime.is_running, timeout=20)
+        self.runtime.start()
+        wait_for_condition(lambda: self.runtime.is_running, timeout=20)
+        self.runtime.stop()
+        self.runtime.wait(sync=True)
 
     def test_double_start(self):
         """Test runtime double start do nothing."""
-        with patch.object(self.runtime, "_start", side_effect=ValueError("oops")):
-            with pytest.raises(ValueError, match="oops"):
-                self.runtime.start()
-
-            self.runtime._state.set(RuntimeStates.running)
-            self.runtime.start()
+        assert self.runtime.start()
+        assert not self.runtime.start()
+        wait_for_condition(lambda: self.runtime.is_running, timeout=20)
 
     def test_double_stop(self):
         """Test runtime double stop do nothing."""
-        with patch.object(self.runtime, "_stop", side_effect=ValueError("oops")):
-            self.runtime._state.set(RuntimeStates.running)
-            with pytest.raises(ValueError, match="oops"):
-                self.runtime.stop()
+        self.runtime.start()
+        wait_for_condition(lambda: self.runtime.is_running, timeout=20)
+        self.runtime.stop()
+        self.runtime.wait(sync=True)
+        assert self.runtime.is_stopped
 
-            self.runtime._state.set(RuntimeStates.stopped)
-            self.runtime.stop()
+        self.runtime.stop()
+        self.runtime.wait(sync=True)
+        assert self.runtime.is_stopped
 
     def test_error_state(self):
         """Test runtime fails on start."""
@@ -80,9 +84,9 @@ def test_error_state(self):
             self.runtime, "_start_agent_loop", side_effect=ValueError("oops")
         ):
             with pytest.raises(ValueError, match="oops"):
-                self.runtime.start()
+                self.runtime.start_and_wait(sync=True)
 
-        assert self.runtime.state == RuntimeStates.error
+        assert self.runtime.state == RuntimeStates.error, self.runtime.state
 
 
 class TestThreadedRuntime(TestAsyncRuntime):
@@ -96,8 +100,6 @@ def test_error_state(self):
             self.runtime.main_loop, "start", side_effect=ValueError("oops")
         ):
             with pytest.raises(ValueError, match="oops"):
-                self.runtime.start()
-
-        assert self.runtime.state == RuntimeStates.error
+                self.runtime.start_and_wait(sync=True)
 
-        self.runtime._stop()
+        assert self.runtime.state == RuntimeStates.error, self.runtime.state
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index 926951face..70a1e7a358 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -188,6 +188,7 @@ def test_error_unsupported_skill(self):
         msg = envelope.message
         assert msg.performative == DefaultMessage.Performative.ERROR
         assert msg.error_code == DefaultMessage.ErrorCode.UNSUPPORTED_SKILL
+        print("\n1111111, STOP in TEST\n", flush=True)
 
     def test_error_unsupported_skill_when_skill_id_is_none(self):
         """Test the 'send_unsupported_skill' when the skill id in the envelope is None."""

From 699561453f001474e68a760f3c9c0e2e4eca2d8a Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Thu, 10 Sep 2020 17:52:44 +0300
Subject: [PATCH 083/131] threaded runtime. fixes. asyncio fix for stub
 conection

---
 aea/agent.py                           | 10 ++-
 aea/agent_loop.py                      | 20 ++++--
 aea/cli/launch.py                      |  1 -
 aea/helpers/async_utils.py             | 96 +++++++++++++++++---------
 aea/launcher.py                        | 14 +++-
 aea/multiplexer.py                     | 11 ++-
 aea/runner.py                          |  2 +-
 aea/runtime.py                         | 14 ++--
 tests/test_aea.py                      |  5 +-
 tests/test_agent.py                    |  3 -
 tests/test_agent_loop.py               | 12 ++--
 tests/test_helpers/test_async_utils.py | 50 ++++++++------
 tests/test_runtime.py                  | 13 ++--
 tests/test_skills/test_error.py        |  1 -
 14 files changed, 156 insertions(+), 96 deletions(-)

diff --git a/aea/agent.py b/aea/agent.py
index 70cd8fdc47..6246e45451 100644
--- a/aea/agent.py
+++ b/aea/agent.py
@@ -191,8 +191,12 @@ def start(self) -> None:
 
         :return: None
         """
-        if self.runtime.start():
-            self.runtime.wait(sync=True)
+        was_started = self.runtime.start()
+
+        if was_started:
+            self.runtime.wait_completed(sync=True)
+        else:
+            raise ValueError("Failed to start runtime! Ws it already started?")
 
     def stop(self) -> None:
         """
@@ -207,7 +211,7 @@ def stop(self) -> None:
         :return: None
         """
         self.runtime.stop()
-        self.runtime.wait(sync=True)
+        self.runtime.wait_completed(sync=True)
 
     @property
     def state(self) -> RuntimeStates:
diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index 40196f37a6..dd02d1eca3 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -55,6 +55,7 @@ class AgentLoopStates(Enum):
 
     initial = None
     started = "started"
+    starting = "starting"
     stopped = "stopped"
     stopping = "stopping"
     error = "error"
@@ -104,6 +105,7 @@ def teardown(self):  # pylint: disable=no-self-use
     async def run(self) -> None:
         """Run agent loop."""
         self.logger.debug("agent loop started")
+        self._state.set(AgentLoopStates.starting)
         self.setup()
         self._set_tasks()
         try:
@@ -111,13 +113,17 @@ async def run(self) -> None:
         except (CancelledError, KeyboardInterrupt):
             pass
         finally:
-            self.teardown()
-            self._stop_tasks()
-            for t in self._tasks:
-                with suppress(BaseException):
-                    await t
-            self._state.set(AgentLoopStates.stopped)
-            logger.debug("agent loop stopped")
+            await self._stop()
+
+    async def _stop(self) -> None:
+        """Stop and cleanup."""
+        self.teardown()
+        self._stop_tasks()
+        for t in self._tasks:
+            with suppress(BaseException):
+                await t
+        self._state.set(AgentLoopStates.stopped)
+        logger.debug("agent loop stopped")
 
     async def _gather_tasks(self) -> None:
         """Wait till first task exception."""
diff --git a/aea/cli/launch.py b/aea/cli/launch.py
index a35458d39b..dba5695ba7 100644
--- a/aea/cli/launch.py
+++ b/aea/cli/launch.py
@@ -115,7 +115,6 @@ def _launch_threads(agents: List[Path]) -> int:
     for agent_directory in agents:
         with cd(agent_directory):
             aeas.append(AEABuilder.from_aea_project(".").build())
-
     runner = AEARunner(
         agents=aeas, mode="threaded", fail_policy=ExecutorExceptionPolicies.log_only
     )
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 64155f510b..7ca18a6b7f 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -373,7 +373,7 @@ def __init__(self, *args, **kwargs):
         self.future = None
 
     async def start(self):
-        """Start the subprocess"""
+        """Start the subprocess."""
         self.proc = subprocess.Popen(*self.args, **self.kwargs)  # nosec
         self.loop = asyncio.get_event_loop()
         self.future = asyncio.futures.Future()
@@ -388,6 +388,7 @@ async def start(self):
             self._thread.join()
 
     def _in_thread(self):
+        """Run in dedicated thread."""
         self.proc.wait()
         self.loop.call_soon_threadsafe(self.future.set_result, self.proc.returncode)
 
@@ -485,6 +486,8 @@ def __init__(self, loop=None, threaded=False) -> 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
 
     def start(self) -> bool:
         """
@@ -495,10 +498,11 @@ def start(self) -> bool:
         if self._task and not self._task.done():
             logger.debug("already running")
             return False
-
+        self._is_running = False
         self._got_result = False
         self._set_loop()
         self._completed_event = asyncio.Event(loop=self._loop)
+        self._was_cancelled = False
         self._set_task()
 
         if self._threaded:
@@ -528,21 +532,27 @@ async def _run_wrapper(self) -> None:
         """Wrap run() method."""
         if not self._completed_event:
             raise ValueError("Start was not called!")
+
         try:
             with suppress(asyncio.CancelledError):
                 return await self.run()
         finally:
             self._loop.call_soon_threadsafe(self._completed_event.set)
 
+    @property
+    def is_running(self) -> bool:
+        """Get running state."""
+        return self._is_running
+
     @abstractmethod
     async def run(self) -> Any:
         """Implement run logic respectfull to CancelError on termination."""
 
-    def wait(
+    def wait_completed(
         self, sync: bool = False, timeout: float = None, force_result: bool = False
     ) -> Awaitable:
         """
-        Wait task to complete.
+        Wait runnable execution completed.
 
         :param sync: bool. blocking wait
         :param timeout: float seconds
@@ -559,44 +569,53 @@ def wait(
             return ready_future
 
         if self._task.done():
-            return ready_future
-
-        coro = self._wait()
-        if timeout is not None:
-            coro = asyncio.wait_for(self._wait(), timeout=timeout)  # type: ignore
+            self._got_result = True
+            return self._task
 
         if sync:
-            if self._loop.is_running():
-                start_time = time.time()
-                while not self._task.done():
-                    time.sleep(0.01)
-                    if timeout is not None and time.time() - start_time > timeout:
-                        raise asyncio.TimeoutError()
-                self._got_result = True
-                if self._task.exception():
-                    raise self._task.exception()
-            else:
-                self._loop.run_until_complete(coro)
+            self._wait_sync(timeout)
             return ready_future
 
-        if self._threaded:
-            loop = asyncio.get_event_loop()
-            fut = loop.create_future()
+        if not self._threaded:
+            return asyncio.wait_for(self._wait(), timeout=timeout)
+
+        # for threaded mode create a future and bind it to task
+        loop = asyncio.get_event_loop()
+        fut = loop.create_future()
 
-            def done(task):
+        def done(task):
+            try:
                 if fut.done():  # pragma: nocover
                     return
                 if task.exception():
                     fut.set_exception(task.exception())
                 else:  # pragma: nocover
                     fut.set_result(None)
+            finally:
+                self._got_result = True
 
-            self._task.add_done_callback(
-                lambda task: loop.call_soon_threadsafe(lambda: done(task))
-            )
-            return fut
+        self._task.add_done_callback(
+            lambda task: loop.call_soon_threadsafe(lambda: done(task))
+        )
+        return fut
 
-        return coro
+    def _wait_sync(self, timeout: Optional[float] = None) -> None:
+        """Wait task completed in sync manner."""
+        if self._task is None:
+            raise ValueError("task is not set!")
+        if self._loop.is_running():
+            start_time = time.time()
+            while not self._task.done():
+                time.sleep(0.01)
+                if timeout is not None and time.time() - start_time > timeout:
+                    raise asyncio.TimeoutError()
+            self._got_result = True
+            if self._task.exception():
+                raise self._task.exception()
+        else:
+            self._loop.run_until_complete(
+                asyncio.wait_for(self._wait(), timeout=timeout)
+            )
 
     async def _wait(self) -> None:
         """Wait internal method."""
@@ -610,7 +629,7 @@ async def _wait(self) -> None:
         finally:
             self._got_result = True
 
-    def stop(self) -> None:
+    def stop(self, force: bool = False) -> None:
         """Stop runnable."""
         logger.debug(f"{self} is going to be stopped {self._task}")
         if not self._task:
@@ -619,9 +638,20 @@ def stop(self) -> None:
         if self._task.done():
             logger.debug("already completed")
             return
-        self._loop.call_soon_threadsafe(self._task.cancel)
+        self._loop.call_soon_threadsafe(self._task_cancel, force)
+
+    def _task_cancel(self, force: bool = False) -> None:
+        """Cancel task internal method."""
+        if self._task is None:
+            return
+
+        if self._was_cancelled and not force:
+            return
+
+        self._was_cancelled = True
+        self._task.cancel()
 
-    def start_and_wait(self, sync=False):
+    def start_and_wait_completed(self, *args, **kwargs) -> Awaitable:
         """Alias for start and wait methods."""
         self.start()
-        return self.wait(sync=sync)
+        return self.wait_completed(*args, **kwargs)
diff --git a/aea/launcher.py b/aea/launcher.py
index f093e96d76..cc6eaf0903 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -89,8 +89,10 @@ def _run_agent(
     _set_logger(log_level=log_level)
 
     agent = load_agent(agent_dir)
+    on_stop = False
 
     def stop_event_thread():
+        nonlocal on_stop
         try:
             stop_event.wait()
         except (KeyboardInterrupt, EOFError, BrokenPipeError) as e:  # pragma: nocover
@@ -98,7 +100,10 @@ def stop_event_thread():
                 f"Exception raised in stop_event_thread {e} {type(e)}. Skip it, looks process is closed."
             )
         finally:
-            agent.stop()
+            if not on_stop:
+                logger.debug("_run_agent: stop event raised. call agent.stop")
+                on_stop = True
+                agent.stop()
 
     Thread(target=stop_event_thread, daemon=True).start()
     try:
@@ -111,7 +116,10 @@ def stop_event_thread():
         exc.__traceback__ = e.__traceback__
         raise exc
     finally:
-        agent.stop()
+        if not on_stop:
+            logger.debug("_run_agent: call agent.stop")
+            on_stop = True
+            agent.stop()
 
 
 class AEADirTask(AbstractExecutorTask):
@@ -144,7 +152,7 @@ def create_async_task(self, loop: AbstractEventLoop) -> TaskAwaitable:
             raise ValueError(
                 "Agent runtime is not async compatible. Please use runtime_mode=async"
             )
-        return loop.create_task(self._agent.runtime.start_and_wait())
+        return loop.create_task(self._agent.runtime.start_and_wait_completed())
 
     @property
     def id(self) -> Union[PathLike, str]:
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index bc58fac40a..ec4896ba0a 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -251,6 +251,7 @@ async def connect(self) -> None:
         self._connection_consistency_checks()
         self._set_default_connection_if_none()
         self._out_queue = asyncio.Queue()
+
         async with self._lock:
             if self.connection_status.is_connected:
                 self.logger.debug("Multiplexer already connected.")
@@ -377,9 +378,9 @@ async def _disconnect_all(self) -> None:
         self.logger.debug("Tear the multiplexer connections down.")
         for connection_id, connection in self._id_to_connection.items():
             try:
-                await self._disconnect_one(connection_id)
+                await asyncio.wait_for(self._disconnect_one(connection_id), timeout=5)
             except Exception as e:  # pylint: disable=broad-except
-                self.logger.error(
+                self.logger.exception(
                     "Error while disconnecting {}: {}".format(
                         str(type(connection)), str(e)
                     )
@@ -423,6 +424,7 @@ async def _send_loop(self) -> None:
                         "Received empty envelope. Quitting the sending loop..."
                     )
                     return None
+
                 self.logger.debug("Sending envelope {}".format(str(envelope)))
                 await self._send(envelope)
             except asyncio.CancelledError:
@@ -578,7 +580,10 @@ def put(self, envelope: Envelope) -> None:
         :param envelope: the envelope to be sent.
         :return: None
         """
-        self.out_queue.put_nowait(envelope)
+        if self._threaded:
+            self._loop.call_soon_threadsafe(self.out_queue.put_nowait, envelope)
+        else:
+            self.out_queue.put_nowait(envelope)
 
     def setup(
         self,
diff --git a/aea/runner.py b/aea/runner.py
index 782df4defc..5c6791925b 100644
--- a/aea/runner.py
+++ b/aea/runner.py
@@ -73,7 +73,7 @@ def create_async_task(self, loop: AbstractEventLoop) -> TaskAwaitable:
             raise ValueError(
                 "Agent runtime is not async compatible. Please use runtime_mode=async"
             )
-        return loop.create_task(self._agent.runtime.start_and_wait())
+        return loop.create_task(self._agent.runtime.start_and_wait_completed())
 
     @property
     def id(self):
diff --git a/aea/runtime.py b/aea/runtime.py
index 766929fb35..ea906653f7 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -276,11 +276,11 @@ async def stop_runtime(self) -> None:
         """
         self.main_loop.stop()
         with suppress(StopRuntime):
-            await self.main_loop.wait()
+            await self.main_loop.wait_completed()
         self._teardown()
 
         self.multiplexer.stop()
-        await self.multiplexer.wait()
+        await self.multiplexer.wait_completed()
         logger.debug("Runtime loop stopped!")
 
     async def run_runtime(self) -> None:
@@ -293,7 +293,7 @@ async def _start_multiplexer(self) -> None:
         self.setup_multiplexer()
         self.multiplexer.set_loop(self._loop)
         self.multiplexer.start()
-        await self.multiplexer.wait()
+        await self.multiplexer.wait_completed()
 
     async def _start_agent_loop(self) -> None:
         """Start agent main loop asynchronous way."""
@@ -310,12 +310,16 @@ async def _start_agent_loop(self) -> None:
         self.main_loop.start()
         self._state.set(RuntimeStates.running)
         try:
-            await self.main_loop.wait()
+            await self.main_loop.wait_completed()
         except asyncio.CancelledError:
             self.main_loop.stop()
-            await self.main_loop.wait()
+            await self.main_loop.wait_completed()
             raise
 
 
 class ThreadedRuntime(AsyncRuntime):
     """Run agent and multiplexer in different threads with own asyncio loops."""
+
+    def _get_multiplexer_instance(self) -> AsyncMultiplexer:
+        """Create multiplexer instance."""
+        return AsyncMultiplexer(self._agent.connections, threaded=True)
diff --git a/tests/test_aea.py b/tests/test_aea.py
index 1f6f9be7dc..a4108c8c3e 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -138,7 +138,6 @@ def test_double_start():
     with run_in_thread(agent.start, timeout=20):
         try:
             wait_for_condition(lambda: agent.is_running, timeout=20)
-            print(111, "started!")
             t = Thread(target=agent.start)
             t.start()
             time.sleep(1)
@@ -185,13 +184,17 @@ def test_react():
 
         with run_in_thread(agent.start, timeout=20, on_exit=agent.stop):
             wait_for_condition(lambda: agent.is_running, timeout=20)
+            time.sleep(1)
             agent.outbox.put(envelope)
+            print("111 msg put", flush=True)
             default_protocol_public_id = DefaultMessage.protocol_id
             dummy_skill_public_id = DUMMY_SKILL_PUBLIC_ID
             handler = agent.resources.get_handler(
                 default_protocol_public_id, dummy_skill_public_id
             )
+
             assert handler is not None, "Handler is not set."
+
             wait_for_condition(
                 lambda: len(handler.handled_messages) > 0,
                 timeout=20,
diff --git a/tests/test_agent.py b/tests/test_agent.py
index 010896682b..93d6bcb58f 100644
--- a/tests/test_agent.py
+++ b/tests/test_agent.py
@@ -86,9 +86,6 @@ def test_run_agent():
                 timeout=10,
                 error_msg="Agent state must be 'running'",
             )
-            print(33333)
-        except Exception as e:
-            print(111111111111111111111111, e)
         finally:
             agent.stop()
             assert agent.state == RuntimeStates.stopped
diff --git a/tests/test_agent_loop.py b/tests/test_agent_loop.py
index cf3ad24fc6..641f6537d4 100644
--- a/tests/test_agent_loop.py
+++ b/tests/test_agent_loop.py
@@ -205,7 +205,7 @@ def test_loop_start_stop(self):
         agent_loop.start()
         wait_for_condition(lambda: agent_loop.is_running, timeout=10)
         agent_loop.stop()
-        agent_loop.wait(sync=True)
+        agent_loop.wait_completed(sync=True)
         assert not agent_loop.is_running, agent_loop.state
 
     def test_handle_envelope(self):
@@ -220,7 +220,7 @@ def test_handle_envelope(self):
         agent.put_inbox("msg")
         wait_for_condition(lambda: handler.counter == 1, timeout=2)
         agent_loop.stop()
-        agent_loop.wait(sync=True)
+        agent_loop.wait_completed(sync=True)
 
     def test_behaviour_act(self):
         """Test behaviour act called by schedule."""
@@ -236,7 +236,7 @@ def test_behaviour_act(self):
 
         wait_for_condition(lambda: behaviour.counter >= 1, timeout=tick_interval * 2)
         agent_loop.stop()
-        agent_loop.wait(sync=True)
+        agent_loop.wait_completed(sync=True)
 
     def test_internal_messages(self):
         """Test internal meesages are processed."""
@@ -250,7 +250,7 @@ def test_internal_messages(self):
             lambda: agent.filter.handle_internal_message.called is True, timeout=5,
         )
         agent_loop.stop()
-        agent_loop.wait(sync=True)
+        agent_loop.wait_completed(sync=True)
 
     def test_new_behaviours(self):
         """Test new behaviours are added."""
@@ -265,7 +265,7 @@ def test_new_behaviours(self):
             timeout=agent_loop.NEW_BEHAVIOURS_PROCESS_SLEEP * 3,
         )
         agent_loop.stop()
-        agent_loop.wait(sync=True)
+        agent_loop.wait_completed(sync=True)
 
     @pytest.mark.asyncio
     async def test_behaviour_exception(self):
@@ -278,7 +278,7 @@ async def test_behaviour_exception(self):
         agent._skills_exception_policy = ExceptionPolicyEnum.propagate
         with pytest.raises(ValueError, match="expected!"):
             agent_loop.start()
-            agent_loop.wait(sync=True)
+            agent_loop.wait_completed(sync=True)
 
     @pytest.mark.asyncio
     async def test_stop(self):
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index c106cb595c..aba1ad6361 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -266,7 +266,7 @@ def test_no_loop_and_threded(self):
     @pytest.mark.asyncio
     async def test_runnable_async(self):
         """Test runnable async methods."""
-
+        # for pydocstyle
         class TestRun(Runnable):
             async def run(self):
                 while True:
@@ -275,42 +275,42 @@ async def run(self):
         run = TestRun()
         run.start()
         run.stop()
-        await run.wait()
+        await run.wait_completed()
 
         run = TestRun(threaded=True)
         run.start()
         run.stop()
-        run.wait(sync=True)
+        run.wait_completed(sync=True)
 
         run = RunAndExit()
-        await run.start_and_wait()
+        await run.start_and_wait_completed()
 
     def test_runnable_sync(self):
         """Test runnable sync methods."""
         run = RunAndExit()
-        run.start_and_wait(sync=True)
+        run.start_and_wait_completed(sync=True)
 
     @pytest.mark.asyncio
     async def test_double_start(self):
         """Test runnable async methods."""
-
+        # for pydocstyle
         class TestRun(Runnable):
             async def run(self):
                 while True:
                     await asyncio.sleep(1)
 
         run = TestRun()
-        await run.wait()
+        await run.wait_completed()
         assert run.start()
         assert not run.start()
         run.stop()
-        await run.wait()
-        await run.wait()
+        await run.wait_completed()
+        await run.wait_completed()
 
     @pytest.mark.asyncio
     async def test_run_in_thread(self):
         """Test runnable async methods."""
-
+        # for pydocstyle
         class TestRun(Runnable):
             async def run(self):
                 while True:
@@ -325,7 +325,7 @@ async def run(self):
     @pytest.mark.asyncio
     async def test_timeout(self):
         """Test runnable async methods."""
-
+        # for pydocstyle
         class TestRun(Runnable):
             async def run(self):
                 while True:
@@ -333,23 +333,24 @@ async def run(self):
 
         run = TestRun(threaded=True)
         run.start()
+        await asyncio.sleep(0.5)
         with pytest.raises(asyncio.TimeoutError):
-            run.wait(sync=True, timeout=0.1)
+            run.wait_completed(sync=True, timeout=1)
 
         run.stop()
-        run.wait(sync=True)
+        run.wait_completed(sync=True)
 
         run = TestRun()
         run.start()
         with pytest.raises(asyncio.TimeoutError):
-            await run.wait(timeout=0.1)
+            await run.wait_completed(timeout=1)
         run.stop()
-        await run.wait()
+        await run.wait_completed()
 
     @pytest.mark.asyncio
     async def test_exception(self):
         """Test runnable async methods."""
-
+        # for pydocstyle
         class TestRun(Runnable):
             async def run(self):
                 raise Exception("awaited")
@@ -357,31 +358,34 @@ async def run(self):
         run = TestRun(threaded=True)
         run.start()
         with pytest.raises(Exception, match="awaited"):
-            run.wait(sync=True, timeout=0.1)
+            run.wait_completed(sync=True, timeout=1)
 
         run.stop()
-        run.wait(sync=True)
+        run.wait_completed(sync=True)
 
         run = TestRun()
         run.start()
         with pytest.raises(Exception, match="awaited"):
-            await run.wait(timeout=0.1)
+            await run.wait_completed(timeout=1)
 
         run.stop()
-        await run.wait()
+        await run.wait_completed()
 
     @pytest.mark.asyncio
     async def test_wait_async_threaded(self):
         """Test runnable async methods."""
-
+        # for pydocstyle
         class TestRun(Runnable):
             async def run(self):
                 raise Exception("awaited")
 
         run = TestRun(threaded=True)
         run.start()
+        await asyncio.sleep(1)
+        assert run._task
+
         with pytest.raises(Exception, match="awaited"):
-            await run.wait(timeout=0.2)
+            await run.wait_completed(timeout=1)
 
         run.stop()
-        await run.wait()
+        await run.wait_completed()
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
index 1a4608e9a3..d5481a17b6 100644
--- a/tests/test_runtime.py
+++ b/tests/test_runtime.py
@@ -50,15 +50,16 @@ def setup(self):
         self.runtime = self.RUNTIME(self.agent, threaded=True)
 
     def teardown(self):
+        """Tear down."""
         self.runtime.stop()
-        self.runtime.wait(sync=True)
+        self.runtime.wait_completed(sync=True)
 
     def test_start_stop(self):
         """Test runtime tart/stop."""
         self.runtime.start()
         wait_for_condition(lambda: self.runtime.is_running, timeout=20)
         self.runtime.stop()
-        self.runtime.wait(sync=True)
+        self.runtime.wait_completed(sync=True)
 
     def test_double_start(self):
         """Test runtime double start do nothing."""
@@ -71,11 +72,11 @@ def test_double_stop(self):
         self.runtime.start()
         wait_for_condition(lambda: self.runtime.is_running, timeout=20)
         self.runtime.stop()
-        self.runtime.wait(sync=True)
+        self.runtime.wait_completed(sync=True)
         assert self.runtime.is_stopped
 
         self.runtime.stop()
-        self.runtime.wait(sync=True)
+        self.runtime.wait_completed(sync=True)
         assert self.runtime.is_stopped
 
     def test_error_state(self):
@@ -84,7 +85,7 @@ def test_error_state(self):
             self.runtime, "_start_agent_loop", side_effect=ValueError("oops")
         ):
             with pytest.raises(ValueError, match="oops"):
-                self.runtime.start_and_wait(sync=True)
+                self.runtime.start_and_wait_completed(sync=True)
 
         assert self.runtime.state == RuntimeStates.error, self.runtime.state
 
@@ -100,6 +101,6 @@ def test_error_state(self):
             self.runtime.main_loop, "start", side_effect=ValueError("oops")
         ):
             with pytest.raises(ValueError, match="oops"):
-                self.runtime.start_and_wait(sync=True)
+                self.runtime.start_and_wait_completed(sync=True)
 
         assert self.runtime.state == RuntimeStates.error, self.runtime.state
diff --git a/tests/test_skills/test_error.py b/tests/test_skills/test_error.py
index 70a1e7a358..926951face 100644
--- a/tests/test_skills/test_error.py
+++ b/tests/test_skills/test_error.py
@@ -188,7 +188,6 @@ def test_error_unsupported_skill(self):
         msg = envelope.message
         assert msg.performative == DefaultMessage.Performative.ERROR
         assert msg.error_code == DefaultMessage.ErrorCode.UNSUPPORTED_SKILL
-        print("\n1111111, STOP in TEST\n", flush=True)
 
     def test_error_unsupported_skill_when_skill_id_is_none(self):
         """Test the 'send_unsupported_skill' when the skill id in the envelope is None."""

From aecd47ac9a3196a0aeb41c8778143b701645596c Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 14 Sep 2020 11:50:08 +0300
Subject: [PATCH 084/131] fixes

---
 aea/agent.py    |  2 +-
 aea/launcher.py | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/aea/agent.py b/aea/agent.py
index 6246e45451..920c4804f9 100644
--- a/aea/agent.py
+++ b/aea/agent.py
@@ -196,7 +196,7 @@ def start(self) -> None:
         if was_started:
             self.runtime.wait_completed(sync=True)
         else:
-            raise ValueError("Failed to start runtime! Ws it already started?")
+            raise ValueError("Failed to start runtime! Was it already started?")
 
     def stop(self) -> None:
         """
diff --git a/aea/launcher.py b/aea/launcher.py
index cc6eaf0903..0bcbc5faa8 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -89,10 +89,8 @@ def _run_agent(
     _set_logger(log_level=log_level)
 
     agent = load_agent(agent_dir)
-    on_stop = False
 
     def stop_event_thread():
-        nonlocal on_stop
         try:
             stop_event.wait()
         except (KeyboardInterrupt, EOFError, BrokenPipeError) as e:  # pragma: nocover
@@ -100,10 +98,8 @@ def stop_event_thread():
                 f"Exception raised in stop_event_thread {e} {type(e)}. Skip it, looks process is closed."
             )
         finally:
-            if not on_stop:
-                logger.debug("_run_agent: stop event raised. call agent.stop")
-                on_stop = True
-                agent.stop()
+            logger.debug("_run_agent: stop event raised. call agent.stop")
+            agent.runtime.stop()
 
     Thread(target=stop_event_thread, daemon=True).start()
     try:
@@ -116,10 +112,8 @@ def stop_event_thread():
         exc.__traceback__ = e.__traceback__
         raise exc
     finally:
-        if not on_stop:
-            logger.debug("_run_agent: call agent.stop")
-            on_stop = True
-            agent.stop()
+        logger.debug("_run_agent: call agent.stop")
+        agent.stop()
 
 
 class AEADirTask(AbstractExecutorTask):

From 1f33720f3be96890a40936f5eef88912cf570d9d Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 14 Sep 2020 19:37:28 +0300
Subject: [PATCH 085/131] fix for Runnable.wait_completed

---
 aea/helpers/async_utils.py             | 54 ++++++++++++++------------
 tests/test_helpers/test_async_utils.py |  5 ++-
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 7ca18a6b7f..73b393f951 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -568,14 +568,34 @@ def wait_completed(
             logger.warning("Already got result, skip")
             return ready_future
 
-        if self._task.done():
-            self._got_result = True
-            return self._task
-
         if sync:
             self._wait_sync(timeout)
             return ready_future
 
+        return self._wait_async(timeout)
+
+    def _wait_sync(self, timeout: Optional[float] = None) -> None:
+        """Wait task completed in sync manner."""
+        if self._task is None:
+            raise ValueError("task is not set!")
+
+        if self._threaded or self._loop.is_running():
+            start_time = time.time()
+
+            while not self._task.done():
+                time.sleep(0.01)
+                if timeout is not None and time.time() - start_time > timeout:
+                    raise asyncio.TimeoutError()
+
+            self._got_result = True
+            if self._task.exception():
+                raise self._task.exception()
+        else:
+            self._loop.run_until_complete(
+                asyncio.wait_for(self._wait(), timeout=timeout)
+            )
+
+    def _wait_async(self, timeout):
         if not self._threaded:
             return asyncio.wait_for(self._wait(), timeout=timeout)
 
@@ -594,29 +614,15 @@ def done(task):
             finally:
                 self._got_result = True
 
-        self._task.add_done_callback(
-            lambda task: loop.call_soon_threadsafe(lambda: done(task))
-        )
-        return fut
-
-    def _wait_sync(self, timeout: Optional[float] = None) -> None:
-        """Wait task completed in sync manner."""
-        if self._task is None:
-            raise ValueError("task is not set!")
-        if self._loop.is_running():
-            start_time = time.time()
-            while not self._task.done():
-                time.sleep(0.01)
-                if timeout is not None and time.time() - start_time > timeout:
-                    raise asyncio.TimeoutError()
-            self._got_result = True
-            if self._task.exception():
-                raise self._task.exception()
+        if self._task.done():
+            done(self._task)
         else:
-            self._loop.run_until_complete(
-                asyncio.wait_for(self._wait(), timeout=timeout)
+            self._task.add_done_callback(
+                lambda task: loop.call_soon_threadsafe(lambda: done(task))
             )
 
+        return fut
+
     async def _wait(self) -> None:
         """Wait internal method."""
         if not self._task or not self._completed_event:  # pragma: nocover
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index aba1ad6361..0cb3f2b843 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -351,12 +351,15 @@ async def run(self):
     async def test_exception(self):
         """Test runnable async methods."""
         # for pydocstyle
+        import time
+
         class TestRun(Runnable):
             async def run(self):
                 raise Exception("awaited")
 
         run = TestRun(threaded=True)
         run.start()
+        time.sleep(0.1)
         with pytest.raises(Exception, match="awaited"):
             run.wait_completed(sync=True, timeout=1)
 
@@ -381,7 +384,7 @@ async def run(self):
 
         run = TestRun(threaded=True)
         run.start()
-        await asyncio.sleep(1)
+        await asyncio.sleep(0.4)
         assert run._task
 
         with pytest.raises(Exception, match="awaited"):

From a7539a895bf5798cfdc04a7bd714d5dbc59f18c5 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Thu, 17 Sep 2020 17:55:57 +0300
Subject: [PATCH 086/131] fixes

---
 aea/runtime.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aea/runtime.py b/aea/runtime.py
index ea906653f7..d4781fe124 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -152,7 +152,7 @@ def _get_main_loop_class(self, loop_mode: str) -> Type[BaseAgentLoop]:
         return self.RUN_LOOPS[loop_mode]
 
     def _set_task(self):
-        self._task = self._loop.create_task(self._run_wrapper(), name=self._agent.name)
+        self._task = self._loop.create_task(self._run_wrapper())
 
     @property
     def decision_maker(self) -> DecisionMaker:

From 6ec838c47ba5d195694514f58498c9babe717008 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 21 Sep 2020 10:40:18 +0300
Subject: [PATCH 087/131] multplexer fix for exception supression in receive
 and send loops

---
 aea/multiplexer.py | 58 +++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index ec4896ba0a..252c6fab1a 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -291,19 +291,22 @@ async def disconnect(self) -> None:
     async def _stop_receive_send_loops(self) -> None:
         """Stop receive and send loops."""
         self.logger.debug("Stopping recv loop...")
+
         if self._recv_loop_task:
             self._recv_loop_task.cancel()
-            with suppress(Exception):
+            with suppress(Exception, asyncio.CancelledError):
                 await self._recv_loop_task
+
         self._recv_loop_task = None
         self.logger.debug("Recv loop stopped.")
 
         self.logger.debug("Stopping send loop...")
+
         if self._send_loop_task:
             # send a 'stop' token (a None value) to wake up the coroutine waiting for outgoing envelopes.
             await self.out_queue.put(None)
             self._send_loop_task.cancel()
-            with suppress(Exception):
+            with suppress(Exception, asyncio.CancelledError):
                 await self._send_loop_task
 
         self._send_loop_task = None
@@ -415,8 +418,8 @@ async def _send_loop(self) -> None:
             )
             return
 
-        while self.is_connected:
-            try:
+        try:
+            while self.is_connected:
                 self.logger.debug("Waiting for outgoing envelopes...")
                 envelope = await self.out_queue.get()
                 if envelope is None:  # pragma: nocover
@@ -424,17 +427,18 @@ async def _send_loop(self) -> None:
                         "Received empty envelope. Quitting the sending loop..."
                     )
                     return None
-
                 self.logger.debug("Sending envelope {}".format(str(envelope)))
-                await self._send(envelope)
-            except asyncio.CancelledError:
-                self.logger.debug("Sending loop cancelled.")
-                return
-            except AEAConnectionError as e:
-                self.logger.error(str(e))
-            except Exception as e:  # pylint: disable=broad-except  # pragma: nocover
-                self.logger.error("Error in the sending loop: {}".format(str(e)))
-                raise
+                try:
+                    await self._send(envelope)
+                except AEAConnectionError as e:
+                    self.logger.error(str(e))
+
+        except asyncio.CancelledError:
+            self.logger.debug("Sending loop cancelled.")
+            raise
+        except Exception as e:  # pylint: disable=broad-except  # pragma: nocover
+            self.logger.error("Error in the sending loop: {}".format(str(e)))
+            raise
 
     async def _receiving_loop(self) -> None:
         """Process incoming envelopes."""
@@ -443,8 +447,8 @@ async def _receiving_loop(self) -> None:
             asyncio.ensure_future(conn.receive()): conn for conn in self.connections
         }
 
-        while self.connection_status.is_connected and len(task_to_connection) > 0:
-            try:
+        try:
+            while self.connection_status.is_connected and len(task_to_connection) > 0:
                 done, _pending = await asyncio.wait(
                     task_to_connection.keys(), return_when=asyncio.FIRST_COMPLETED
                 )
@@ -461,17 +465,17 @@ async def _receiving_loop(self) -> None:
                         new_task = asyncio.ensure_future(connection.receive())
                         task_to_connection[new_task] = connection
 
-            except asyncio.CancelledError:  # pragma: nocover
-                self.logger.debug("Receiving loop cancelled.")
-                break
-            except Exception as e:  # pylint: disable=broad-except
-                self.logger.exception("Error in the receiving loop: {}".format(str(e)))
-                break
-
-        # cancel all the receiving tasks.
-        for t in task_to_connection.keys():
-            t.cancel()
-        self.logger.debug("Receiving loop terminated.")
+        except asyncio.CancelledError:  # pragma: nocover
+            self.logger.debug("Receiving loop cancelled.")
+            raise
+        except Exception as e:  # pylint: disable=broad-except
+            self.logger.exception("Error in the receiving loop: {}".format(str(e)))
+            raise
+        finally:
+            # cancel all the receiving tasks.
+            for t in task_to_connection.keys():
+                t.cancel()
+            self.logger.debug("Receiving loop terminated.")
 
     async def _send(self, envelope: Envelope) -> None:
         """

From 57e16a240d2c9159b1977d4f263df5b5ab84384b Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Fri, 25 Sep 2020 13:19:52 +0300
Subject: [PATCH 088/131] mac os fix

---
 aea/launcher.py       | 9 +++++++++
 aea/multiplexer.py    | 6 +-----
 tests/test_runtime.py | 1 -
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/aea/launcher.py b/aea/launcher.py
index 0bcbc5faa8..a8927e494e 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -86,6 +86,15 @@ def _run_agent(
 
     :return: None
     """
+    import asyncio  # pylint: disable=import-outside-toplevel
+    import select  # pylint: disable=import-outside-toplevel
+    import selectors  # pylint: disable=import-outside-toplevel
+
+    if hasattr(select, "kqueue"):
+        selector = selectors.SelectSelector()
+        loop = asyncio.SelectorEventLoop(selector)  # type: ignore
+        asyncio.set_event_loop(loop)
+
     _set_logger(log_level=log_level)
 
     agent = load_agent(agent_dir)
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index 252c6fab1a..de24c957d1 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -29,11 +29,7 @@
 from aea.connections.base import Connection, ConnectionStates
 from aea.exceptions import enforce
 from aea.helpers.async_friendly_queue import AsyncFriendlyQueue
-from aea.helpers.async_utils import (
-    AsyncState,
-    Runnable,
-    ThreadedAsyncRunner,
-)
+from aea.helpers.async_utils import AsyncState, Runnable, ThreadedAsyncRunner
 from aea.helpers.exception_policy import ExceptionPolicyEnum
 from aea.helpers.logging import WithLogger
 from aea.mail.base import AEAConnectionError, Empty, Envelope, EnvelopeContext
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
index d5481a17b6..9f754bddf9 100644
--- a/tests/test_runtime.py
+++ b/tests/test_runtime.py
@@ -29,7 +29,6 @@
 from aea.runtime import AsyncRuntime, BaseRuntime, RuntimeStates, ThreadedRuntime
 
 from tests.common.utils import wait_for_condition
-
 from tests.conftest import CUR_PATH
 
 

From 1599dcc4ef1af4f88e9f0b9295542c7a70839204 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 28 Sep 2020 11:32:04 +0300
Subject: [PATCH 089/131] coverage fixes

---
 aea/agent_loop.py                      |  2 +-
 aea/helpers/async_utils.py             |  6 +++---
 aea/launcher.py                        |  2 +-
 aea/multiplexer.py                     |  1 +
 tests/test_agent_loop.py               | 14 ++++++++++++++
 tests/test_helpers/test_async_utils.py | 11 +++++++++++
 tests/test_multiplexer.py              | 12 ++++++++++++
 7 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index dd02d1eca3..8de41f5f86 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -80,7 +80,7 @@ def __init__(
 
         self._agent: AbstractAgent = agent
         self._tasks: List[asyncio.Task] = []
-        self._state: AsyncState = AsyncState()
+        self._state: AsyncState = AsyncState(AgentLoopStates.initial)
         self._exceptions: List[Exception] = []
 
     @property
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 73b393f951..58c61314f8 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -530,7 +530,7 @@ def _set_task(self) -> None:
 
     async def _run_wrapper(self) -> None:
         """Wrap run() method."""
-        if not self._completed_event:
+        if not self._completed_event:  # pragma: nocover
             raise ValueError("Start was not called!")
 
         try:
@@ -540,7 +540,7 @@ async def _run_wrapper(self) -> None:
             self._loop.call_soon_threadsafe(self._completed_event.set)
 
     @property
-    def is_running(self) -> bool:
+    def is_running(self) -> bool:  # pragma: nocover
         """Get running state."""
         return self._is_running
 
@@ -576,7 +576,7 @@ def wait_completed(
 
     def _wait_sync(self, timeout: Optional[float] = None) -> None:
         """Wait task completed in sync manner."""
-        if self._task is None:
+        if self._task is None:  # pragma: nocover
             raise ValueError("task is not set!")
 
         if self._threaded or self._loop.is_running():
diff --git a/aea/launcher.py b/aea/launcher.py
index a8927e494e..7f1198b21e 100644
--- a/aea/launcher.py
+++ b/aea/launcher.py
@@ -90,7 +90,7 @@ def _run_agent(
     import select  # pylint: disable=import-outside-toplevel
     import selectors  # pylint: disable=import-outside-toplevel
 
-    if hasattr(select, "kqueue"):
+    if hasattr(select, "kqueue"):  # pragma: nocover  # cause platform specific
         selector = selectors.SelectSelector()
         loop = asyncio.SelectorEventLoop(selector)  # type: ignore
         asyncio.set_event_loop(loop)
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index de24c957d1..e4923995cd 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -114,6 +114,7 @@ async def run(self) -> None:
         self.set_loop(asyncio.get_event_loop())
         try:
             await self.connect()
+
             if not self._recv_loop_task or not self._send_loop_task:
                 raise ValueError("Multiplexer is not connected properly.")
 
diff --git a/tests/test_agent_loop.py b/tests/test_agent_loop.py
index 641f6537d4..aa6bd5482d 100644
--- a/tests/test_agent_loop.py
+++ b/tests/test_agent_loop.py
@@ -208,6 +208,20 @@ def test_loop_start_stop(self):
         agent_loop.wait_completed(sync=True)
         assert not agent_loop.is_running, agent_loop.state
 
+    def test_set_loop(self):
+        """Test set loop."""
+        agent_loop = self.AGENT_LOOP_CLASS(self.FAKE_AGENT_CLASS())
+
+        loop = asyncio.new_event_loop()
+        agent_loop.set_loop(loop=loop)
+        assert agent_loop._loop == loop
+
+    def test_state_property(self):
+        """Test state property."""
+        agent_loop = self.AGENT_LOOP_CLASS(self.FAKE_AGENT_CLASS())
+
+        assert agent_loop.state == AgentLoopStates.initial
+
     def test_handle_envelope(self):
         """Test one envelope handling."""
         handler = CountHandler.make()
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index 0cb3f2b843..b5ee1e636c 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -263,6 +263,17 @@ def test_no_loop_and_threded(self):
         with pytest.raises(ValueError,):
             RunAndExit(loop=asyncio.get_event_loop(), threaded=True)
 
+    def test_task_cancel_not_set(self):
+        """Test task cancel."""
+
+        class TestRun(Runnable):
+            async def run(self):
+                while True:
+                    await asyncio.sleep(1)
+
+        run = TestRun()
+        run._task_cancel()
+
     @pytest.mark.asyncio
     async def test_runnable_async(self):
         """Test runnable async methods."""
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index e6129619a4..85fbf8c415 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -134,6 +134,18 @@ async def test_connect_twice_a_single_connection():
         await multiplexer._disconnect_one(connection.connection_id)
 
 
+@pytest.mark.asyncio
+async def test_run_bad_conneect():
+    """Test that connecting twice a single connection behaves correctly."""
+    connection = _make_dummy_connection()
+    multiplexer = AsyncMultiplexer([connection])
+    f = asyncio.Future()
+    f.set_result(None)
+    with unittest.mock.patch.object(multiplexer, "connect", return_value=f):
+        with pytest.raises(ValueError, match="Multiplexer is not connected properly."):
+            await multiplexer.run()
+
+
 def test_multiplexer_connect_all_raises_error():
     """Test the case when the multiplexer raises an exception while connecting."""
     multiplexer = Multiplexer([_make_dummy_connection()])

From 58c5a0332759a0fe40673a528d6fae66184a89f9 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 28 Sep 2020 12:37:18 +0300
Subject: [PATCH 090/131] fixes

---
 aea/aea.py                             |  6 ++---
 aea/agent.py                           |  4 +++-
 aea/agent_loop.py                      |  8 +++----
 aea/helpers/async_utils.py             | 32 +++++++++++++++++---------
 aea/multiplexer.py                     |  1 -
 aea/runtime.py                         | 27 +++++++++++++++-------
 tests/test_aea.py                      | 10 ++++----
 tests/test_helpers/test_async_utils.py |  2 +-
 8 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/aea/aea.py b/aea/aea.py
index 63086fdd02..be8265b06e 100644
--- a/aea/aea.py
+++ b/aea/aea.py
@@ -55,7 +55,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.registries.filter import Filter
 from aea.registries.resources import Resources
-from aea.runtime import StopRuntime
+from aea.runtime import _StopRuntime
 from aea.skills.base import Behaviour, Handler
 from aea.skills.error.handlers import ErrorHandler
 
@@ -242,7 +242,7 @@ def _get_msg_and_handlers_for_envelope(
 
         if error_handler is None:
             self.logger.warning("ErrorHandler not initialized. Stopping AEA!")
-            raise StopRuntime()
+            raise _StopRuntime()
 
         error_handler = cast(ErrorHandler, error_handler)
 
@@ -364,7 +364,7 @@ def log_exception(e, fn):
 
         if self._skills_exception_policy == ExceptionPolicyEnum.stop_and_exit:
             log_exception(exception, function)
-            raise StopRuntime(
+            raise _StopRuntime(
                 AEAException(
                     f"AEA was terminated cause exception `{exception}` in skills {function}! Please check logs."
                 )
diff --git a/aea/agent.py b/aea/agent.py
index 920c4804f9..ac15fa6cfb 100644
--- a/aea/agent.py
+++ b/aea/agent.py
@@ -16,6 +16,7 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
+
 """This module contains the implementation of a generic agent."""
 import datetime
 import logging
@@ -24,6 +25,7 @@
 
 from aea.abstract_agent import AbstractAgent
 from aea.connections.base import Connection
+from aea.exceptions import AEAException
 from aea.identity.base import Identity
 from aea.mail.base import Envelope
 from aea.multiplexer import InBox, OutBox
@@ -196,7 +198,7 @@ def start(self) -> None:
         if was_started:
             self.runtime.wait_completed(sync=True)
         else:
-            raise ValueError("Failed to start runtime! Was it already started?")
+            raise AEAException("Failed to start runtime! Was it already started?")
 
     def stop(self) -> None:
         """
diff --git a/aea/agent_loop.py b/aea/agent_loop.py
index 8de41f5f86..2285f02451 100644
--- a/aea/agent_loop.py
+++ b/aea/agent_loop.py
@@ -92,12 +92,12 @@ def set_loop(self, loop: AbstractEventLoop) -> None:
         """Set event loop and all event loopp related objects."""
         self._loop: AbstractEventLoop = loop
 
-    def setup(self) -> None:  # pylint: disable=no-self-use
+    def _setup(self) -> None:  # pylint: disable=no-self-use
         """Set up loop before started."""
         # start and stop methods are classmethods cause one instance shared across muiltiple threads
         ExecTimeoutThreadGuard.start()
 
-    def teardown(self):  # pylint: disable=no-self-use
+    def _teardown(self):  # pylint: disable=no-self-use
         """Tear down loop on stop."""
         # start and stop methods are classmethods cause one instance shared across muiltiple threads
         ExecTimeoutThreadGuard.stop()
@@ -106,7 +106,7 @@ async def run(self) -> None:
         """Run agent loop."""
         self.logger.debug("agent loop started")
         self._state.set(AgentLoopStates.starting)
-        self.setup()
+        self._setup()
         self._set_tasks()
         try:
             await self._gather_tasks()
@@ -117,7 +117,7 @@ async def run(self) -> None:
 
     async def _stop(self) -> None:
         """Stop and cleanup."""
-        self.teardown()
+        self._teardown()
         self._stop_tasks()
         for t in self._tasks:
             with suppress(BaseException):
diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 58c61314f8..54022720c1 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -465,9 +465,17 @@ def __init__(self, getters: List[Tuple[Callable[[Any], None], Callable]]):
 
 
 class Runnable(ABC):
-    """Abstract Runnable class."""
+    """
+    Abstract Runnable class.
+
+    Use to run async task in same event loop or in dedicated thread.
+    Provides: start, stop sync methods to start and stop task
+    Use wait_completed to await task was completed.
+    """
 
-    def __init__(self, loop=None, threaded=False) -> None:
+    def __init__(
+        self, loop: asyncio.AbstractEventLoop = None, threaded: bool = False
+    ) -> None:
         """
         Init runnable.
 
@@ -496,8 +504,9 @@ def start(self) -> bool:
         :return: bool started or not.
         """
         if self._task and not self._task.done():
-            logger.debug("already running")
+            logger.debug(f"{self} already running")
             return False
+
         self._is_running = False
         self._got_result = False
         self._set_loop()
@@ -507,7 +516,7 @@ def start(self) -> bool:
 
         if self._threaded:
             self._thread = Thread(
-                target=self._loop.run_until_complete, args=[self._task]
+                target=self._loop.run_until_complete, args=[self._task]  # type: ignore # loop was set in set_loop
             )
             self._thread.start()
 
@@ -526,11 +535,13 @@ def _set_loop(self) -> None:
 
     def _set_task(self) -> None:
         """Create task."""
+        if not self._loop:  # pragma: nocover
+            raise ValueError("Loop was not set.")
         self._task = self._loop.create_task(self._run_wrapper())
 
     async def _run_wrapper(self) -> None:
         """Wrap run() method."""
-        if not self._completed_event:  # pragma: nocover
+        if not self._completed_event or not self._loop:  # pragma: nocover
             raise ValueError("Start was not called!")
 
         try:
@@ -561,11 +572,10 @@ def wait_completed(
         :return: awaitable if sync is False, otherise None
         """
         if not self._task:
-            logger.warning("Runnable is not no started")
+            logger.warning("Runnable is not started")
             return ready_future
 
         if self._got_result and not force_result:
-            logger.warning("Already got result, skip")
             return ready_future
 
         if sync:
@@ -576,7 +586,7 @@ def wait_completed(
 
     def _wait_sync(self, timeout: Optional[float] = None) -> None:
         """Wait task completed in sync manner."""
-        if self._task is None:  # pragma: nocover
+        if self._task is None or not self._loop:  # pragma: nocover
             raise ValueError("task is not set!")
 
         if self._threaded or self._loop.is_running():
@@ -638,12 +648,12 @@ async def _wait(self) -> None:
     def stop(self, force: bool = False) -> None:
         """Stop runnable."""
         logger.debug(f"{self} is going to be stopped {self._task}")
-        if not self._task:
-            logger.debug("not running!")
+        if not self._task or not self._loop:
             return
+
         if self._task.done():
-            logger.debug("already completed")
             return
+
         self._loop.call_soon_threadsafe(self._task_cancel, force)
 
     def _task_cancel(self, force: bool = False) -> None:
diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index e4923995cd..d604b1e1f0 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -88,7 +88,6 @@ def __init__(
         :param loop: the event loop to run the multiplexer. If None, a new event loop is created.
         :param agent_name: the name of the agent that owns the multiplexer, for logging purposes.
         """
-        super().__init__(default_logger)
         self._exception_policy: ExceptionPolicyEnum = exception_policy
         WithLogger.__init__(self, default_logger)
         Runnable.__init__(self, loop=loop, threaded=threaded)
diff --git a/aea/runtime.py b/aea/runtime.py
index d4781fe124..04e70e1ed9 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -41,12 +41,17 @@
 logger = logging.getLogger(__name__)
 
 
-class StopRuntime(Exception):
-    """Exception to stop runtime."""
+class _StopRuntime(Exception):
+    """
+    Exception to stop runtime.
+
+    For internal usage only!
+    Used to perform asyncio call from sync callbacks.
+    """
 
     def __init__(self, reraise: Optional[Exception] = None):
         """
-        Init StopRuntime exception.
+        Init _StopRuntime exception.
 
         :param reraise: exception to reraise.
 
@@ -119,7 +124,7 @@ def task_manager(self) -> TaskManager:
         return self._task_manager
 
     @property
-    def loop(self) -> AbstractEventLoop:
+    def loop(self) -> Optional[AbstractEventLoop]:
         """Get event loop."""
         return self._loop
 
@@ -250,11 +255,15 @@ def set_loop(self, loop: AbstractEventLoop) -> None:
         BaseRuntime.set_loop(self, loop)
 
     async def run(self) -> None:
-        """Start multiplexeor task."""
+        """
+        Start runtime task.
+
+        Starts multiplexer and agent loop.
+        """
         terminal_state = RuntimeStates.error
         try:
             await self.run_runtime()
-        except StopRuntime as e:
+        except _StopRuntime as e:
             self._state.set(RuntimeStates.stopping)
             terminal_state = RuntimeStates.stopped
             if e.reraise:
@@ -271,11 +280,11 @@ async def stop_runtime(self) -> None:
         Stop runtime coroutine.
 
         Stop main loop.
-        Agent teardown.
+        Tear down the agent..
         Disconnect multiplexer.
         """
         self.main_loop.stop()
-        with suppress(StopRuntime):
+        with suppress(_StopRuntime):
             await self.main_loop.wait_completed()
         self._teardown()
 
@@ -291,6 +300,8 @@ async def run_runtime(self) -> None:
     async def _start_multiplexer(self) -> None:
         """Call multiplexer connect asynchronous way."""
         self.setup_multiplexer()
+        if not self._loop:
+            raise ValueError("no loop is set for runtime.")
         self.multiplexer.set_loop(self._loop)
         self.multiplexer.start()
         await self.multiplexer.wait_completed()
diff --git a/tests/test_aea.py b/tests/test_aea.py
index a4108c8c3e..afaca49536 100644
--- a/tests/test_aea.py
+++ b/tests/test_aea.py
@@ -43,7 +43,7 @@
 from aea.protocols.default.message import DefaultMessage
 from aea.protocols.default.serialization import DefaultSerializer
 from aea.registries.resources import Resources
-from aea.runtime import RuntimeStates, StopRuntime
+from aea.runtime import RuntimeStates, _StopRuntime
 from aea.skills.base import Skill, SkillContext
 
 from packages.fetchai.connections.local.connection import LocalNode
@@ -184,9 +184,7 @@ def test_react():
 
         with run_in_thread(agent.start, timeout=20, on_exit=agent.stop):
             wait_for_condition(lambda: agent.is_running, timeout=20)
-            time.sleep(1)
             agent.outbox.put(envelope)
-            print("111 msg put", flush=True)
             default_protocol_public_id = DefaultMessage.protocol_id
             dummy_skill_public_id = DUMMY_SKILL_PUBLIC_ID
             handler = agent.resources.get_handler(
@@ -534,7 +532,7 @@ def test_error_handler_is_not_set():
         message=msg,
     )
 
-    with pytest.raises(StopRuntime):
+    with pytest.raises(_StopRuntime):
         agent.handle_envelope(envelope)
 
 
@@ -809,7 +807,7 @@ def setUpClass(cls) -> None:
     def tearDown(self) -> None:
         """Tear down."""
         self.aea_tool.teardown()
-        self.aea_tool.aea.runtime.main_loop.teardown()
+        self.aea_tool.aea.runtime.main_loop._teardown()
 
     def prepare(self, function: Callable) -> None:
         """Prepare aea_tool for testing.
@@ -848,7 +846,7 @@ def handler_func(*args, **kwargs):
         aea = builder.build()
         self.aea_tool = AeaTool(aea)
         self.envelope = AeaTool.dummy_envelope()
-        self.aea_tool.aea.runtime.main_loop.setup()
+        self.aea_tool.aea.runtime.main_loop._setup()
 
     def test_long_handler_cancelled_by_timeout(self):
         """Test long function terminated by timeout."""
diff --git a/tests/test_helpers/test_async_utils.py b/tests/test_helpers/test_async_utils.py
index b5ee1e636c..6264b21e13 100644
--- a/tests/test_helpers/test_async_utils.py
+++ b/tests/test_helpers/test_async_utils.py
@@ -320,7 +320,7 @@ async def run(self):
 
     @pytest.mark.asyncio
     async def test_run_in_thread(self):
-        """Test runnable async methods."""
+        """Test runnable in thread mode."""
         # for pydocstyle
         class TestRun(Runnable):
             async def run(self):

From 7403f5a6f0eb6737f98f2106197c83188d277a13 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Tue, 22 Sep 2020 11:33:48 +0300
Subject: [PATCH 091/131] agents manager interface

---
 aea/manager.py | 151 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 aea/manager.py

diff --git a/aea/manager.py b/aea/manager.py
new file mode 100644
index 0000000000..bbb289d858
--- /dev/null
+++ b/aea/manager.py
@@ -0,0 +1,151 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+"""This module contains the implementation of AEA agents manager."""
+from abc import ABC, abstractmethod
+from typing import Dict, List
+
+from aea.aea_builder import PathLike
+from aea.configurations.base import PublicId
+
+
+class AbstractManager(ABC):
+    """Abstract agents manager."""
+
+    def __init__(self, working_dir: PathLike) -> None:
+        """
+        Initialize manager.
+
+        :param working_dir: directory to store base agents.
+        """
+        self.working_dir = working_dir
+
+    @abstractmethod
+    def start_manager(self) -> None:
+        """Start manager."""
+
+    @abstractmethod
+    def stop_manager(self, cleanup: bool = False) -> None:
+        """
+        Stop manager.
+
+        Stops all running agents and stop agent.
+
+        :param cleanup: remove agents_dir and purge in memory registry.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def add_project(self, public_id: PublicId) -> None:
+        """Fetch agent project and all dependencies to working_dir."""
+
+    @abstractmethod
+    def remove_project(self, public_id: PublicId) -> None:
+        """Remove agent project."""
+
+    @abstractmethod
+    def list_projects(self) -> List[PublicId]:
+        """
+        List all agents projects added.
+
+        :return: lit of public ids of projects
+        """
+
+    @abstractmethod
+    def add_agent(
+        self, project_id: PublicId, agent_name: str, config_overrides: Dict
+    ) -> None:
+        """
+        Create new agent configuration based on project with config overrides applied.
+
+        Alias is stored in memory only!
+
+        :param project_id: base agent public id
+        :param agent_name: unique name for the agent
+        :param config_overrides: overrides for component section.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def list_agents(self, running_only: bool = False) -> List[str]:
+        """
+        List all agents.
+
+        :param running_only: returns only running if set to True
+
+        :return: list of agents names
+        """
+
+    @abstractmethod
+    def remove_agent(self, agent_name: str) -> None:
+        """
+        Remove agent alias definition from registry.
+
+        :param agent_name: agent name to remove
+
+        :return: None
+        """
+
+    @abstractmethod
+    def start_agent(self, agent_name: str) -> None:
+        """
+        Start selected agent.
+
+        :param agent_name: agent name to start
+
+        :return: None
+        """
+
+    @abstractmethod
+    def start_all_agents(self) -> None:
+        """
+        Start all not started agents.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def stop_agent(self, agent_name: str) -> None:
+        """
+        Stop running agent.
+
+        :param agent_name: agent name to stop
+
+        :return: None
+        """
+
+    @abstractmethod
+    def stop_all_agents(self) -> None:
+        """
+        Stop all agents running.
+
+        :return: None
+        """
+
+    @abstractmethod
+    def get_agent_details(self, agent_name: str) -> dict:
+        """
+        Return details about agent definition.
+
+        {
+            "project": str
+            "overrides": dict
+        }
+        """

From 02bcb67e55bb693d9eb9af941c146a8dba7abd6c Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Thu, 24 Sep 2020 10:22:20 +0300
Subject: [PATCH 092/131] aea.Manager: projects handling, agent alias creation

---
 aea/aea_builder.py           |  25 +++-
 aea/cli/registry/fetch.py    |  19 ++-
 aea/configurations/loader.py |  10 +-
 aea/manager.py               | 228 ++++++++++++++++++++++++++++++-----
 tests/test_manager.py        | 107 ++++++++++++++++
 5 files changed, 348 insertions(+), 41 deletions(-)
 create mode 100644 tests/test_manager.py

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index ee5b77abe8..54e89d1642 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -292,6 +292,8 @@ class AEABuilder:
     DEFAULT_RUNTIME_MODE = "threaded"
     DEFAULT_SEARCH_SERVICE_ADDRESS = "fetchai/soef:*"
 
+    loader = ConfigLoader.from_configuration_type(PackageType.AGENT)
+
     # pylint: disable=attribute-defined-outside-init
 
     def __init__(self, with_default_packages: bool = True):
@@ -1336,16 +1338,33 @@ def from_aea_project(
         builder = AEABuilder(with_default_packages=False)
 
         # load agent configuration file
-        configuration_file = aea_project_path / DEFAULT_AEA_CONFIG_FILE
+        configuration_file = cls.get_configuration_file_path(aea_project_path)
+        agent_configuration = cls.loader.load(configuration_file.open())
 
-        loader = ConfigLoader.from_configuration_type(PackageType.AGENT)
-        agent_configuration = loader.load(configuration_file.open())
+        builder.set_from_configuration(
+            agent_configuration, aea_project_path, skip_consistency_check
+        )
+        return builder
+
+    @classmethod
+    def from_config_json(
+        cls, json_data, aea_project_path: PathLike, skip_consistency_check: bool = False
+    ):
+        aea_project_path = Path(aea_project_path)
+        builder = AEABuilder(with_default_packages=False)
+
+        # load agent configuration file
+        agent_configuration = cls.loader._load_agent_config_from_json(json_data)
 
         builder.set_from_configuration(
             agent_configuration, aea_project_path, skip_consistency_check
         )
         return builder
 
+    @staticmethod
+    def get_configuration_file_path(aea_project_path):
+        return Path(aea_project_path) / DEFAULT_AEA_CONFIG_FILE
+
     def _load_and_add_components(
         self,
         component_type: ComponentType,
diff --git a/aea/cli/registry/fetch.py b/aea/cli/registry/fetch.py
index 8efdd4e051..cf0270c391 100644
--- a/aea/cli/registry/fetch.py
+++ b/aea/cli/registry/fetch.py
@@ -16,6 +16,9 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
+from aea.helpers.base import cd
+import shutil
+
 """Methods for CLI fetch functionality."""
 
 import os
@@ -32,7 +35,12 @@
 
 
 @clean_after
-def fetch_agent(ctx: Context, public_id: PublicId, alias: Optional[str] = None) -> None:
+def fetch_agent(
+    ctx: Context,
+    public_id: PublicId,
+    alias: Optional[str] = None,
+    dir: Optional[str] = None,
+) -> None:
     """
     Fetch Agent from Registry.
 
@@ -49,14 +57,17 @@ def fetch_agent(ctx: Context, public_id: PublicId, alias: Optional[str] = None)
 
     filepath = download_file(file_url, ctx.cwd)
 
-    folder_name = name if alias is None else alias
+    folder_name = dir or (name if alias is None else alias)
     aea_folder = os.path.join(ctx.cwd, folder_name)
+    print(aea_folder)
     ctx.clean_paths.append(aea_folder)
 
     extract(filepath, ctx.cwd)
 
-    if alias is not None:
-        os.rename(name, alias)
+    if alias or dir:
+        shutil.move(
+            os.path.join(ctx.cwd, name), aea_folder,
+        )
 
     ctx.cwd = aea_folder
     try_to_load_agent_config(ctx)
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 8a5c1e84d0..4956406c95 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -229,10 +229,7 @@ def _load_from_json(self, configuration_file_json: Dict) -> T:
         configuration_obj._key_order = key_order  # pylint: disable=protected-access
         return configuration_obj
 
-    def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
-        """Load an agent configuration."""
-        configuration_file_jsons = yaml_load_all(file_pointer)
-
+    def _load_agent_config_from_json(self, configuration_file_jsons) -> AgentConfig:
         if len(configuration_file_jsons) == 0:
             raise ValueError("Agent configuration file was empty.")
         agent_config_json = configuration_file_jsons[0]
@@ -260,6 +257,11 @@ def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
         agent_configuration_obj.component_configurations = component_configurations
         return agent_configuration_obj
 
+    def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
+        """Load an agent configuration."""
+        configuration_file_jsons = yaml_load_all(file_pointer)
+        return self._load_agent_config_from_json(configuration_file_jsons)
+
     def _dump_agent_config(
         self, configuration: AgentConfig, file_pointer: TextIO
     ) -> None:
diff --git a/aea/manager.py b/aea/manager.py
index bbb289d858..643543597f 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -17,29 +17,82 @@
 #
 # ------------------------------------------------------------------------------
 """This module contains the implementation of AEA agents manager."""
-from abc import ABC, abstractmethod
-from typing import Dict, List
-
-from aea.aea_builder import PathLike
-from aea.configurations.base import PublicId
-
-
-class AbstractManager(ABC):
+import copy
+import os
+from shutil import rmtree
+from typing import Dict, List, Optional, Set
+
+from aea.aea import AEA
+from aea.aea_builder import AEABuilder
+from aea.cli.registry.fetch import fetch_agent
+from aea.cli.utils.context import Context
+from aea.configurations.base import ComponentId, PublicId
+from aea.configurations.constants import DEFAULT_LEDGER
+from aea.crypto.helpers import create_private_key
+from aea.helpers.base import yaml_load_all
+
+
+class Project:
+    """Agent project representation."""
+
+    def __init__(self, public_id: PublicId, path: str):
+        """Init project with public_id and project's path."""
+        self.public_id = public_id
+        self.path = path
+        self.agents: Set[str] = set()
+
+    @classmethod
+    def load(cls, working_dir, public_id) -> "Project":
+        """Load project with given pubblic_id to working_dir."""
+        ctx = Context(cwd=working_dir)
+        path = os.path.join(working_dir, public_id.author, public_id.name)
+        fetch_agent(ctx, public_id, dir=os.path.join(public_id.author, public_id.name))
+        return cls(public_id, path)
+
+    def remove(self):
+        """Remove project, do cleanup."""
+        rmtree(self.path)
+
+
+class AgentAlias:
+    """Agent alias representation."""
+
+    def __init__(self, project: Project, name: str, config: List[Dict], agent: AEA):
+        """Init agent alias with project, config, name, agent."""
+        self.project = project
+        self.config = config
+        self.name = name
+        self.agent = agent
+        self.project.agents.add(self.name)
+
+    def remove(self):
+        """Remove agent alias from project."""
+        self.project.agents.remove(self.name)
+
+
+class Manager:
     """Abstract agents manager."""
 
-    def __init__(self, working_dir: PathLike) -> None:
+    AGENT_DO_NOT_OVERRIDE_VALUES = ["skills", "connections", "protocols", "contracts"]
+
+    def __init__(self, working_dir: str) -> None:
         """
         Initialize manager.
 
         :param working_dir: directory to store base agents.
         """
         self.working_dir = working_dir
+        self._was_working_dir_created = False
+        self.is_started = False
+        self._projects: Dict[PublicId, Project] = {}
+        self._keys_dir = os.path.abspath(os.path.join(self.working_dir, "keys"))
+        self._agents: Dict[str, AgentAlias] = {}
 
-    @abstractmethod
     def start_manager(self) -> None:
         """Start manager."""
+        self._ensure_working_dir()
+        self.is_started = True
 
-    @abstractmethod
     def stop_manager(self, cleanup: bool = False) -> None:
         """
         Stop manager.
@@ -50,40 +103,66 @@ def stop_manager(self, cleanup: bool = False) -> None:
 
         :return: None
         """
+        if self._was_working_dir_created:
+            rmtree(self.working_dir)
+
+        self.is_started = False
 
-    @abstractmethod
     def add_project(self, public_id: PublicId) -> None:
         """Fetch agent project and all dependencies to working_dir."""
+        if public_id in self._projects:
+            raise ValueError(f"Project {public_id} was already added!")
+        self._projects[public_id] = Project.load(self.working_dir, public_id)
 
-    @abstractmethod
     def remove_project(self, public_id: PublicId) -> None:
         """Remove agent project."""
+        if public_id not in self._projects:
+            raise ValueError(f"Project {public_id} was not added!")
+
+        self._projects.pop(public_id).remove()
 
-    @abstractmethod
     def list_projects(self) -> List[PublicId]:
         """
         List all agents projects added.
 
         :return: lit of public ids of projects
         """
+        return list(self._projects.keys())
 
-    @abstractmethod
     def add_agent(
-        self, project_id: PublicId, agent_name: str, config_overrides: Dict
+        self,
+        public_id: PublicId,
+        agent_name: str,
+        agent_overrides: Optional[dict] = None,
+        component_overrides: Optional[List[dict]] = None,
     ) -> None:
         """
         Create new agent configuration based on project with config overrides applied.
 
         Alias is stored in memory only!
 
-        :param project_id: base agent public id
+        :param public_id: base agent project public id
         :param agent_name: unique name for the agent
-        :param config_overrides: overrides for component section.
+        :param agent_overrides: overrides for agent config.
+        :param component_overrides: overrides for component section.
 
         :return: None
         """
+        if agent_name in self._agents:
+            raise ValueError(f"Agent with name {agent_name} already exists!")
+
+        if public_id not in self._projects:
+            raise ValueError(f"{public_id} project is not added!")
+        project = self._projects[public_id]
+
+        agent_alias = self._build_agent_alias(
+            project=project,
+            agent_name=agent_name,
+            agent_overrides=agent_overrides,
+            component_overrides=component_overrides,
+        )
+        self._agents[agent_name] = agent_alias
 
-    @abstractmethod
     def list_agents(self, running_only: bool = False) -> List[str]:
         """
         List all agents.
@@ -92,8 +171,8 @@ def list_agents(self, running_only: bool = False) -> List[str]:
 
         :return: list of agents names
         """
+        return list(self._agents.keys())
 
-    @abstractmethod
     def remove_agent(self, agent_name: str) -> None:
         """
         Remove agent alias definition from registry.
@@ -102,8 +181,12 @@ def remove_agent(self, agent_name: str) -> None:
 
         :return: None
         """
+        if agent_name not in self._agents:
+            raise ValueError(f"Agent with name {agent_name} does not exist!")
+
+        agent_alias = self._agents.pop(agent_name)
+        agent_alias.remove()
 
-    @abstractmethod
     def start_agent(self, agent_name: str) -> None:
         """
         Start selected agent.
@@ -113,7 +196,6 @@ def start_agent(self, agent_name: str) -> None:
         :return: None
         """
 
-    @abstractmethod
     def start_all_agents(self) -> None:
         """
         Start all not started agents.
@@ -121,7 +203,6 @@ def start_all_agents(self) -> None:
         :return: None
         """
 
-    @abstractmethod
     def stop_agent(self, agent_name: str) -> None:
         """
         Stop running agent.
@@ -131,7 +212,6 @@ def stop_agent(self, agent_name: str) -> None:
         :return: None
         """
 
-    @abstractmethod
     def stop_all_agents(self) -> None:
         """
         Stop all agents running.
@@ -139,13 +219,101 @@ def stop_all_agents(self) -> None:
         :return: None
         """
 
-    @abstractmethod
-    def get_agent_details(self, agent_name: str) -> dict:
+    def stop_agents(self, agent_names: List[str]) -> None:
+        """
+        Stop specified agents.
+
+        :return: None
+        """
+
+    def start_agents(self, agent_names: List[str]) -> None:
+        """
+        Stop specified agents.
+
+        :return: None
+        """
+
+    def get_agent_details(self, agent_name: str) -> AgentAlias:
         """
         Return details about agent definition.
 
-        {
-            "project": str
-            "overrides": dict
-        }
+        :return: AgentAlias
         """
+        if agent_name not in self._agents:
+            raise ValueError(f"Agent with name {agent_name} does not exist!")
+        return self._agents[agent_name]
+
+    def _ensure_working_dir(self) -> None:
+        """Create working dir if needed."""
+        if not os.path.exists(self.working_dir):
+            os.makedirs(self.working_dir)
+            self._was_working_dir_created = True
+
+        if not os.path.isdir(self.working_dir):
+            raise ValueError(f"{self.working_dir} is not a directory!")
+        os.makedirs(self._keys_dir)
+
+    def _build_agent_alias(
+        self,
+        project: Project,
+        agent_name: str,
+        agent_overrides=None,
+        component_overrides=None,
+    ) -> AgentAlias:
+        """Create agent alias for project, with given name and overrided values."""
+        json_config = self._make_config(
+            project.path, agent_overrides, component_overrides
+        )
+
+        builder = AEABuilder.from_config_json(json_config, project.path)
+        builder.set_name(agent_name)
+
+        if not builder.private_key_paths:
+            default_ledger = json_config[0].get("default_ledger", DEFAULT_LEDGER)
+            builder.add_private_key(
+                default_ledger, self._create_private_key(agent_name, default_ledger)
+            )
+        agent = builder.build()
+        return AgentAlias(project, agent_name, json_config, agent)
+
+    def _update_dict(self, base: dict, override: dict) -> dict:
+        """Apply overrides for dict."""
+        base = copy.deepcopy(base)
+        base.update(override)
+        return base
+
+    def _make_config(
+        self,
+        project_path: str,
+        agent_overrides: Optional[dict] = None,
+        component_overrides: Optional[List[dict]] = None,
+    ) -> List[dict]:
+        """Make new config baseed on proejct's config with overrides applied."""
+        agent_overrides = agent_overrides or {}
+        component_overrides = component_overrides or []
+
+        if any([key in agent_overrides for key in self.AGENT_DO_NOT_OVERRIDE_VALUES]):
+            raise ValueError(
+                'Do not override any of {" ".join(self.AGENT_DO_NOT_OVERRIDE_VALUES)}'
+            )
+
+        json_data = yaml_load_all(
+            AEABuilder.get_configuration_file_path(project_path).open()
+        )
+        agent_config = self._update_dict(json_data[0], agent_overrides)
+
+        components_configs = {PublicId.from_json(obj): obj for obj in json_data[1:]}
+
+        for obj in component_overrides:
+            component_id = ComponentId(obj["type"], PublicId.from_json(obj))
+            components_configs[component_id] = self._update_dict(
+                components_configs.get(component_id, {}), obj
+            )
+
+        return [agent_config] + list(components_configs.values())
+
+    def _create_private_key(self, name, ledger) -> str:
+        """Create new key for agent alias in working dir keys dir."""
+        path = os.path.join(self._keys_dir, f"{name}_{ledger}_private.key")
+        create_private_key(ledger, path)
+        return path
diff --git a/tests/test_manager.py b/tests/test_manager.py
new file mode 100644
index 0000000000..e5a4c6af57
--- /dev/null
+++ b/tests/test_manager.py
@@ -0,0 +1,107 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+"""This module contains tests for aea manager."""
+import os
+from contextlib import suppress
+from shutil import rmtree
+from typing import Dict, List, Optional, Set
+
+import pytest
+
+from aea.configurations.base import PublicId
+from aea.manager import Manager
+
+
+def test_manager():
+    """Perform some tests."""
+
+    try:
+        working_dir = "manager_dir"
+        project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
+        project_path = os.path.join(
+            working_dir, project_public_id.author, project_public_id.name
+        )
+        assert not os.path.exists(working_dir)
+        manager = Manager(working_dir)
+        manager.start_manager()
+        assert os.path.exists(working_dir)
+        assert manager.is_started
+
+        manager.add_project(project_public_id)
+
+        assert project_public_id in manager.list_projects()
+        assert os.path.exists(project_path)
+        assert manager._projects[project_public_id].path == project_path
+
+        with pytest.raises(ValueError, match=r".*was already added.*"):
+            manager.add_project(project_public_id)
+
+        echo_skill_id = PublicId("fetchai", "echo", "0.7.0")
+        new_tick_interval = 1.1111
+        agent_name = "test_what_ever12"
+        manager.add_agent(
+            project_public_id,
+            agent_name,
+            component_overrides=[
+                {
+                    "type": "skill",
+                    **echo_skill_id.json,
+                    "behaviours": {
+                        "echo": {
+                            "args": {"tick_interval": new_tick_interval},
+                            "class_name": "EchoBehaviour",
+                        }
+                    },
+                }
+            ],
+        )
+        agent_alias = manager.get_agent_details(agent_name)
+        assert agent_alias.name == agent_name
+        assert (
+            agent_alias.agent.resources.get_behaviour(
+                echo_skill_id, "echo"
+            ).tick_interval
+            == new_tick_interval
+        )
+        with pytest.raises(ValueError, match="already exists"):
+            manager.add_agent(
+                project_public_id, agent_name,
+            )
+        assert agent_name in manager.list_agents()
+
+        manager.remove_agent(agent_name)
+        assert agent_name not in manager.list_agents()
+
+        with pytest.raises(ValueError, match="does not exist!"):
+            manager.remove_agent(agent_name)
+
+        manager.remove_project(project_public_id)
+        assert project_public_id not in manager._projects
+        assert not os.path.exists(project_path)
+        assert project_public_id not in manager.list_projects()
+
+        with pytest.raises(ValueError, match=r"was not added"):
+            manager.remove_project(project_public_id)
+
+        manager.stop_manager()
+        assert not os.path.exists(working_dir)
+        assert not manager.is_started
+    finally:
+        with suppress(FileNotFoundError):
+            rmtree(working_dir)

From 935395e40f8e27b295162092f0a6348efa1ccebf Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Fri, 25 Sep 2020 12:47:32 +0300
Subject: [PATCH 093/131] anget manager. start stop agents

---
 aea/manager.py        | 225 +++++++++++++++++++++++++++++++++++++++++-
 tests/test_manager.py |  22 +++--
 2 files changed, 236 insertions(+), 11 deletions(-)

diff --git a/aea/manager.py b/aea/manager.py
index 643543597f..de92bf7edb 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -17,10 +17,14 @@
 #
 # ------------------------------------------------------------------------------
 """This module contains the implementation of AEA agents manager."""
+import asyncio
 import copy
 import os
+import threading
+from asyncio.tasks import FIRST_COMPLETED
 from shutil import rmtree
-from typing import Dict, List, Optional, Set
+from threading import Thread
+from typing import Callable, Dict, List, Optional, Set
 
 from aea.aea import AEA
 from aea.aea_builder import AEABuilder
@@ -70,12 +74,96 @@ def remove(self):
         self.project.agents.remove(self.name)
 
 
+class AsyncTask:
+    """Async task wrapper for agent."""
+
+    def __init__(self, agent: AEA, loop: asyncio.AbstractEventLoop) -> None:
+        """Init task with agent and loop."""
+        self.run_loop: asyncio.AbstractEventLoop = loop
+        self.caller_loop: asyncio.AbstractEventLoop = loop
+        self._done_future: Optional[asyncio.Future] = None
+        self.task: Optional[asyncio.Task] = None
+        self.agent = agent
+
+    def create_run_loop(self) -> None:
+        """Create run loop."""
+        pass
+
+    def start(self) -> None:
+        """Start task."""
+        self.create_run_loop()
+        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."""
+        if not self._done_future:
+            raise ValueError("Task not started!")
+        return self._done_future
+
+    def stop(self) -> None:
+        """Stop task."""
+        if not self.run_loop or not self.task:
+            raise ValueError("Task was not started!")
+        self.run_loop.call_soon_threadsafe(self.task.cancel)
+
+    async def _run_wrapper(self) -> None:
+        """Run task internals."""
+        if not self._done_future:
+            raise ValueError("Task was not started! please use start method")
+        try:
+            await self.run()
+            self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
+        except asyncio.CancelledError:
+            self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
+        except Exception as e:
+            self.caller_loop.call_soon_threadsafe(self._done_future.set_exception, e)
+
+    async def run(self) -> None:
+        """Run task body."""
+        self.agent.runtime.set_loop(self.run_loop)
+        try:
+            self.agent.runtime.start()
+            while True:
+                await asyncio.sleep(1)
+        finally:
+            self.agent.runtime.stop()
+
+    @property
+    def is_running(self) -> bool:
+        """Return is task running."""
+        return not self.wait().done()
+
+
+class ThreadedTask(AsyncTask):
+    """Threaded task."""
+
+    def __init__(self, agent: AEA, loop: asyncio.AbstractEventLoop) -> None:
+        """Init task with agent and loop."""
+        AsyncTask.__init__(self, agent, loop)
+        self._thread: Optional[Thread] = None
+
+    def create_run_loop(self) -> None:
+        """Create run loop."""
+        self.run_loop = asyncio.new_event_loop()
+
+    def start(self) -> None:
+        """Run task in a dedicated thread."""
+        super().start()
+        self._thread = threading.Thread(
+            target=self.run_loop.run_until_complete, args=[self.task], daemon=True
+        )
+        self._thread.start()
+
+
 class Manager:
     """Abstract agents manager."""
 
     AGENT_DO_NOT_OVERRIDE_VALUES = ["skills", "connections", "protocols", "contracts"]
+    MODES = ["async", "threaded"]
+    DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS = 60
 
-    def __init__(self, working_dir: str) -> None:
+    def __init__(self, working_dir: str, mode: str = "async") -> None:
         """
         Initialize manager.
 
@@ -83,15 +171,74 @@ def __init__(self, working_dir: str) -> None:
         """
         self.working_dir = working_dir
         self._was_working_dir_created = False
-        self.is_started = False
+        self._is_running = False
         self._projects: Dict[PublicId, Project] = {}
         self._keys_dir = os.path.abspath(os.path.join(self.working_dir, "keys"))
         self._agents: Dict[str, AgentAlias] = {}
+        self._agents_tasks: Dict[str, AsyncTask] = {}
+
+        self._thread = Thread(target=self._run_thread, daemon=True)
+        self._loop: Optional[asyncio.AbstractEventLoop] = None
+        self._event: Optional[asyncio.Event] = None
+
+        self._error_callbacks: List[Callable[[str, BaseException], None]] = []
+
+        if mode not in self.MODES:
+            raise ValueError(
+                f'Invalid mode {mode}. Valid modes are {", ".join(self.MODES)}'
+            )
+        self._started_event = threading.Event()
+        self._mode = mode
+
+    @property
+    def is_running(self) -> bool:
+        """Is manager running."""
+        return self._is_running
+
+    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:
+        """Perform manager stop."""
+        if not self._event:
+            raise ValueError("Do not use this method directly, use start_manager.")
+
+        self._started_event.set()
+
+        while self._is_running:
+            tasks_for_agents = {
+                task.wait(): agent_name
+                for agent_name, task in self._agents_tasks.items()
+            }
+            wait_tasks = list(tasks_for_agents.keys()) + [self._event.wait()]  # type: ignore
+            done, _ = await asyncio.wait(wait_tasks, return_when=FIRST_COMPLETED)
+
+            if self._event.is_set():
+                self._event.clear()
+
+            for task in done:
+                if task not in tasks_for_agents:
+                    await task
+                    continue
+                agent_name = tasks_for_agents[task]
+                self._agents_tasks.pop(agent_name)
+                if task.exception():
+                    print(agent_name, "exceptioned", task.exception())
+                    for callback in self._error_callbacks:
+                        callback(agent_name, task.exception())
+                else:
+                    await task
 
     def start_manager(self) -> None:
         """Start manager."""
         self._ensure_working_dir()
-        self.is_started = True
+        self._started_event.clear()
+        self._is_running = True
+        self._thread.start()
+        self._started_event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
     def stop_manager(self, cleanup: bool = False) -> None:
         """
@@ -103,10 +250,16 @@ def stop_manager(self, cleanup: bool = False) -> None:
 
         :return: None
         """
+        if not self._loop or not self._event:
+            raise ValueError("Manager was not started!")
         if self._was_working_dir_created:
             rmtree(self.working_dir)
 
-        self.is_started = False
+        if self._thread.is_alive():
+            self.stop_all_agents()
+        self._is_running = False
+        self._loop.call_soon_threadsafe(self._event.set)
+        self._thread.join(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
     def add_project(self, public_id: PublicId) -> None:
         """Fetch agent project and all dependencies to working_dir."""
@@ -119,6 +272,11 @@ def remove_project(self, public_id: PublicId) -> None:
         if public_id not in self._projects:
             raise ValueError(f"Project {public_id} was not added!")
 
+        if self._projects[public_id].agents:
+            raise ValueError(
+                f"Can not remove projects with aliases exists: {self._projects[public_id].agents}"
+            )
+
         self._projects.pop(public_id).remove()
 
     def list_projects(self) -> List[PublicId]:
@@ -171,6 +329,8 @@ def list_agents(self, running_only: bool = False) -> List[str]:
 
         :return: list of agents names
         """
+        if running_only:
+            return list(self._agents_tasks.keys())
         return list(self._agents.keys())
 
     def remove_agent(self, agent_name: str) -> None:
@@ -184,6 +344,9 @@ def remove_agent(self, agent_name: str) -> None:
         if agent_name not in self._agents:
             raise ValueError(f"Agent with name {agent_name} does not exist!")
 
+        if self._is_agent_running(agent_name):
+            raise ValueError("Agent is running. stop it first!")
+
         agent_alias = self._agents.pop(agent_name)
         agent_alias.remove()
 
@@ -195,6 +358,33 @@ def start_agent(self, agent_name: str) -> None:
 
         :return: None
         """
+        if not self._loop or not self._event:
+            raise ValueError("agent is not started!")
+
+        agent_alias = self._agents.get(agent_name)
+        if not agent_alias:
+            raise ValueError(f"{agent_name} is not registered!")
+        if self._is_agent_running(agent_name):
+            raise ValueError(f"{agent_name} is already started!")
+
+        if self._mode == "async":
+            task = AsyncTask(agent_alias.agent, self._loop)
+        elif self._mode == "threaded":
+            task = ThreadedTask(agent_alias.agent, self._loop)
+
+        task.start()
+        self._agents_tasks[agent_name] = task
+        self._loop.call_soon_threadsafe(self._event.set)
+
+    def _is_agent_running(self, agent_name):
+        if agent_name not in self._agents_tasks:
+            return False
+
+        task = self._agents_tasks[agent_name]
+        if task.is_running:
+            return True
+        del self._agents_tasks[agent_name]
+        return False
 
     def start_all_agents(self) -> None:
         """
@@ -202,6 +392,10 @@ def start_all_agents(self) -> None:
 
         :return: None
         """
+        for agent_name in self.list_agents():
+            if self._is_agent_running(agent_name):
+                continue
+            self.start_agent(agent_name)
 
     def stop_agent(self, agent_name: str) -> None:
         """
@@ -211,6 +405,16 @@ def stop_agent(self, agent_name: str) -> None:
 
         :return: None
         """
+        if not self._is_agent_running(agent_name):
+            raise ValueError(f"{agent_name} is not running!")
+        if self._thread.ident == threading.get_ident():
+            # In same thread do not perform blocking operations!
+            self._agents_tasks[agent_name].stop()
+            return
+        event = threading.Event()
+        self._agents_tasks[agent_name].wait().add_done_callback(lambda x: event.set())
+        self._agents_tasks[agent_name].stop()
+        event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
     def stop_all_agents(self) -> None:
         """
@@ -218,6 +422,8 @@ def stop_all_agents(self) -> None:
 
         :return: None
         """
+        for agent_name in self.list_agents(running_only=True):
+            self.stop_agent(agent_name)
 
     def stop_agents(self, agent_names: List[str]) -> None:
         """
@@ -225,6 +431,12 @@ def stop_agents(self, agent_names: List[str]) -> None:
 
         :return: None
         """
+        for agent_name in agent_names:
+            if not self._is_agent_running(agent_name):
+                raise ValueError(f"{agent_name} is not running!")
+
+        for agent_name in agent_names:
+            self.stop_agent(agent_name)
 
     def start_agents(self, agent_names: List[str]) -> None:
         """
@@ -232,6 +444,8 @@ def start_agents(self, agent_names: List[str]) -> None:
 
         :return: None
         """
+        for agent_name in agent_names:
+            self.start_agent(agent_name)
 
     def get_agent_details(self, agent_name: str) -> AgentAlias:
         """
@@ -267,6 +481,7 @@ def _build_agent_alias(
 
         builder = AEABuilder.from_config_json(json_config, project.path)
         builder.set_name(agent_name)
+        # builder.set_runtime_mode("async")
 
         if not builder.private_key_paths:
             default_ledger = json_config[0].get("default_ledger", DEFAULT_LEDGER)
diff --git a/tests/test_manager.py b/tests/test_manager.py
index e5a4c6af57..170ea6b96e 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -18,9 +18,9 @@
 # ------------------------------------------------------------------------------
 """This module contains tests for aea manager."""
 import os
+import time
 from contextlib import suppress
 from shutil import rmtree
-from typing import Dict, List, Optional, Set
 
 import pytest
 
@@ -30,7 +30,7 @@
 
 def test_manager():
     """Perform some tests."""
-
+    # pydocsyle
     try:
         working_dir = "manager_dir"
         project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
@@ -41,7 +41,7 @@ def test_manager():
         manager = Manager(working_dir)
         manager.start_manager()
         assert os.path.exists(working_dir)
-        assert manager.is_started
+        assert manager.is_running
 
         manager.add_project(project_public_id)
 
@@ -84,13 +84,24 @@ def test_manager():
                 project_public_id, agent_name,
             )
         assert agent_name in manager.list_agents()
+        manager.start_all_agents()
+        assert agent_name in manager.list_agents(running_only=True)
+        manager.start_all_agents()
+
+        with pytest.raises(ValueError, match="is already started!"):
+            manager.start_agents(manager.list_agents())
+
+        with pytest.raises(ValueError, match="Agent is running. stop it first!"):
+            manager.remove_agent(agent_name)
+
+        time.sleep(2)
+        manager.stop_all_agents()
 
         manager.remove_agent(agent_name)
         assert agent_name not in manager.list_agents()
 
         with pytest.raises(ValueError, match="does not exist!"):
             manager.remove_agent(agent_name)
-
         manager.remove_project(project_public_id)
         assert project_public_id not in manager._projects
         assert not os.path.exists(project_path)
@@ -98,10 +109,9 @@ def test_manager():
 
         with pytest.raises(ValueError, match=r"was not added"):
             manager.remove_project(project_public_id)
-
         manager.stop_manager()
         assert not os.path.exists(working_dir)
-        assert not manager.is_started
+        assert not manager.is_running
     finally:
         with suppress(FileNotFoundError):
             rmtree(working_dir)

From 659bb2da99d4fe12b5a2c28fb4c03ed823660882 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 28 Sep 2020 15:52:27 +0200
Subject: [PATCH 094/131] add jsonschema for skill configurable part

---
 .../skill-custom_config.json                  | 37 +++++++++++++++++++
 .../schemas/skill-config_schema.json          | 31 ++++++++++------
 2 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 aea/configurations/schemas/configurable_parts/skill-custom_config.json

diff --git a/aea/configurations/schemas/configurable_parts/skill-custom_config.json b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
new file mode 100644
index 0000000000..1b2befcd2a
--- /dev/null
+++ b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Schema for the configurable part of a skill configuration file.",
+  "additionalProperties": false,
+  "required": [
+    "name",
+    "author",
+    "version",
+    "type"
+  ],
+  "properties": {
+    "name": {
+      "$ref": "definitions.json#/definitions/resource_name"
+    },
+    "author": {
+      "$ref": "definitions.json#/definitions/author"
+    },
+    "version": {
+      "$ref": "definitions.json#/definitions/package_version"
+    },
+    "type": {
+      "$ref": "definitions.json#/definitions/component_type"
+    },
+    "handlers": {
+      "$ref": "skill-config_schema.json#/definitions/handlers"
+    },
+    "behaviours": {
+      "$ref": "skill-config_schema.json#/definitions/behaviours"
+    },
+    "models": {
+      "$ref": "skill-config_schema.json#/definitions/models"
+    },
+    "is_abstract": {
+      "$ref": "skill-config_schema.json#/properties/is_abstract"
+    }
+  }
+}
diff --git a/aea/configurations/schemas/skill-config_schema.json b/aea/configurations/schemas/skill-config_schema.json
index bfb97e3d9d..69f0532f36 100644
--- a/aea/configurations/schemas/skill-config_schema.json
+++ b/aea/configurations/schemas/skill-config_schema.json
@@ -62,6 +62,26 @@
         "$ref": "definitions.json#/definitions/public_id"
       }
     },
+    "handlers": {
+      "$ref": "#/definitions/handlers"
+    },
+    "behaviours": {
+      "$ref": "#/definitions/behaviours"
+    },
+    "models": {
+      "$ref": "#/definitions/models"
+    },
+    "dependencies": {
+      "$ref": "definitions.json#/definitions/dependencies"
+    },
+    "description": {
+      "$ref": "definitions.json#/definitions/description"
+    },
+    "is_abstract": {
+      "type": "boolean"
+    }
+  },
+  "definitions": {
     "handlers": {
       "type": "object",
       "additionalProperties": false,
@@ -90,17 +110,6 @@
         }
       }
     },
-    "dependencies": {
-      "$ref": "definitions.json#/definitions/dependencies"
-    },
-    "description": {
-      "$ref": "definitions.json#/definitions/description"
-    },
-    "is_abstract": {
-      "type": "boolean"
-    }
-  },
-  "definitions": {
     "behaviour": {
       "type": "object",
       "additionalProperties": false,

From 843cf906e8f87975485701b928326223f84839ca Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Mon, 28 Sep 2020 15:48:28 +0100
Subject: [PATCH 095/131] Update aea/helpers/async_utils.py

---
 aea/helpers/async_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aea/helpers/async_utils.py b/aea/helpers/async_utils.py
index 54022720c1..80c6218b5b 100644
--- a/aea/helpers/async_utils.py
+++ b/aea/helpers/async_utils.py
@@ -486,7 +486,7 @@ def __init__(
         """
         if loop and threaded:
             raise ValueError(
-                "You can not set a loop in threaded mode, cause own loop will be created"
+                "You can not set a loop in threaded mode. A separate loop will be created in each thread."
             )
         self._loop = loop
         self._threaded = threaded

From 26feda7686abb174318b408a730b16a4e4c9345f Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Mon, 28 Sep 2020 18:53:32 +0200
Subject: [PATCH 096/131] use jsonschema validators for custom configs

---
 aea/configurations/base.py                    |  14 +-
 aea/configurations/loader.py                  | 152 +++++++++---------
 .../base-custom_config.json                   |  25 +++
 .../connection-custom_config.json             |  28 ++++
 .../skill-custom_config.json                  |   2 +-
 5 files changed, 135 insertions(+), 86 deletions(-)
 create mode 100644 aea/configurations/schemas/configurable_parts/base-custom_config.json
 create mode 100644 aea/configurations/schemas/configurable_parts/connection-custom_config.json

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index d59c28b5bd..ff92bf616b 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -753,7 +753,6 @@ class PackageConfiguration(Configuration, ABC):
 
     default_configuration_filename: str
     package_type: PackageType
-    configurable_fields: Set[str] = set()
 
     def __init__(
         self,
@@ -930,7 +929,6 @@ class ConnectionConfig(ComponentConfiguration):
 
     default_configuration_filename = DEFAULT_CONNECTION_CONFIG_FILE
     package_type = PackageType.CONNECTION
-    configurable_fields = {"config"}
 
     def __init__(
         self,
@@ -1166,7 +1164,6 @@ class SkillConfig(ComponentConfiguration):
 
     default_configuration_filename = DEFAULT_SKILL_CONFIG_FILE
     package_type = PackageType.SKILL
-    configurable_fields = {"handlers", "behaviours", "models", "is_abstract"}
 
     def __init__(
         self,
@@ -1518,16 +1515,7 @@ def default_ledger(self, ledger_id: str):
 
     def component_configurations_json(self) -> List[OrderedDict]:
         """Get the component configurations in JSON format."""
-        return [
-            OrderedDict(
-                name=component_id.name,
-                author=component_id.author,
-                version=component_id.version,
-                type=component_id.component_type.value,
-                **obj,
-            )
-            for component_id, obj in self.component_configurations.items()
-        ]
+        return list(map(OrderedDict, self.component_configurations.values()))
 
     @property
     def json(self) -> Dict:
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 8a5c1e84d0..515dcfd615 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -25,7 +25,7 @@
 import re
 from copy import deepcopy
 from pathlib import Path
-from typing import Dict, Generic, List, TextIO, Tuple, Type, TypeVar, Union, cast
+from typing import Dict, Generic, List, TextIO, Type, TypeVar, Union, cast
 
 import jsonschema
 import yaml
@@ -45,7 +45,6 @@
     PublicId,
     SkillConfig,
 )
-from aea.exceptions import enforce
 from aea.helpers.base import yaml_dump, yaml_dump_all, yaml_load, yaml_load_all
 
 
@@ -77,37 +76,74 @@ def make_jsonschema_base_uri(base_uri_path: Path) -> str:
     return root_path
 
 
-class ConfigLoader(Generic[T]):
-    """This class implement parsing, serialization and validation functionalities for the 'aea' configuration files."""
+def _get_path_to_custom_config_schema_from_type(component_type: ComponentType) -> str:
+    """
+    Get the path to the custom config schema
 
-    def __init__(self, schema_filename: str, configuration_class: Type[T]):
+    :param component_type: a component type.
+    :return: the path to the JSON schema file.
+    """
+    path_prefix: Path = Path(_SCHEMAS_DIR) / "configurable_parts"
+    if component_type in {ComponentType.SKILL, ComponentType.CONNECTION}:
+        filename_prefix = component_type.value
+    else:
+        filename_prefix = "base"
+    full_path = path_prefix / (filename_prefix + "-custom_config.json")
+    return str(full_path)
+
+
+class BaseConfigLoader:
+    """Base class for configuration loader classes."""
+
+    def __init__(self, schema_filename: str):
         """
-        Initialize the parser for configuration files.
+        Initialize the base configuration loader.
 
-        :param schema_filename: the path to the JSON-schema file in 'aea/configurations/schemas'.
-        :param configuration_class: the configuration class (e.g. AgentConfig, SkillConfig etc.)
+        :param schema_filename: the path to the schema.
         """
         base_uri = Path(_SCHEMAS_DIR)
         self._schema = json.load((base_uri / schema_filename).open())
         root_path = make_jsonschema_base_uri(base_uri)
         self._resolver = jsonschema.RefResolver(root_path, self._schema)
         self._validator = Draft4Validator(self._schema, resolver=self._resolver)
-        self._configuration_class = configuration_class  # type: Type[T]
 
     @property
     def validator(self) -> Draft4Validator:
         """Get the json schema validator."""
         return self._validator
 
+    def validate(self, json_data: Dict) -> None:
+        """
+        Validate a JSON object.
+
+        :param json_data: the JSON data.
+        :return: None.
+        """
+        self.validator.validate(json_data)
+
     @property
     def required_fields(self) -> List[str]:
         """
-        Get required fields.
+        Get the required fields.
 
         :return: list of required fields.
         """
         return self._schema["required"]
 
+
+class ConfigLoader(Generic[T], BaseConfigLoader):
+    """Parsing, serialization and validation for package configuration files."""
+
+    def __init__(self, schema_filename: str, configuration_class: Type[T]):
+        """
+        Initialize the parser for configuration files.
+
+        :param schema_filename: the path to the JSON-schema file in 'aea/configurations/schemas'.
+        :param configuration_class: the configuration class (e.g. AgentConfig, SkillConfig etc.)
+        """
+        super().__init__(schema_filename)
+        self._configuration_class = configuration_class  # type: Type[T]
+
     @property
     def configuration_class(self) -> Type[T]:
         """Get the configuration class of the loader."""
@@ -245,20 +281,33 @@ def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
             key_order
         )
 
+        component_configurations = self._get_component_configurations(
+            configuration_file_jsons
+        )
+        agent_configuration_obj.component_configurations = component_configurations
+        return agent_configuration_obj
+
+    def _get_component_configurations(
+        self, configuration_file_jsons
+    ) -> Dict[ComponentId, Dict]:
+        """
+        Get the component configurations from the tail pages of the aea-config.yaml file.
+
+        :param configuration_file_jsons: the JSON objects of the custom configurations of a aea-config.yaml file.
+        :return: a dictionary whose keys are component ids and values are the configurations.
+        """
         component_configurations: Dict[ComponentId, Dict] = {}
         # load the other components.
         for i, component_configuration_json in enumerate(configuration_file_jsons[1:]):
-            component_id, component_config = self._process_component_section(
+            component_id = self._process_component_section(
                 i, component_configuration_json
             )
             if component_id in component_configurations:
                 raise ValueError(
                     f"Configuration of component {component_id} occurs more than once."
                 )
-            component_configurations[component_id] = component_config
-
-        agent_configuration_obj.component_configurations = component_configurations
-        return agent_configuration_obj
+            component_configurations[component_id] = component_configuration_json
+        return component_configurations
 
     def _dump_agent_config(
         self, configuration: AgentConfig, file_pointer: TextIO
@@ -278,7 +327,7 @@ def _dump_component_config(self, configuration: T, file_pointer: TextIO) -> None
 
     def _process_component_section(
         self, i: int, component_configuration_json: Dict
-    ) -> Tuple[ComponentId, Dict]:
+    ) -> ComponentId:
         """
         Process a component configuration in an agent configuration file.
 
@@ -291,17 +340,18 @@ def _process_component_section(
         :param component_configuration_json: the JSON object.
         :return: the processed component configuration.
         """
-        component_id, result = self._split_component_id_and_config(
+        component_id = self._split_component_id_and_config(
             i, component_configuration_json
         )
-        self._validate_component_configuration(component_id, result)
-        self._check_only_configurable_fields(component_id, result)
-        return component_id, result
+        self._validate_component_configuration(
+            component_id, component_configuration_json
+        )
+        return component_id
 
     @staticmethod
     def _split_component_id_and_config(
         i: int, component_configuration_json: Dict
-    ) -> Tuple[ComponentId, Dict]:
+    ) -> ComponentId:
         """
         Split component id and configuration.
 
@@ -310,7 +360,6 @@ def _split_component_id_and_config(
         :return: the component id and the configuration object.
         :raises ValueError: if the component id cannot be extracted.
         """
-        result = deepcopy(component_configuration_json)
         # author, name, version, type are mandatory fields
         missing_fields = {"author", "name", "version", "type"}.difference(
             component_configuration_json.keys()
@@ -319,15 +368,15 @@ def _split_component_id_and_config(
             raise ValueError(
                 f"There are missing fields in component id {i + 1}: {missing_fields}."
             )
-        component_name = result.pop("name")
-        component_author = result.pop("author")
-        component_version = result.pop("version")
-        component_type = ComponentType(result.pop("type"))
+        component_name = component_configuration_json["name"]
+        component_author = component_configuration_json["author"]
+        component_version = component_configuration_json["version"]
+        component_type = ComponentType(component_configuration_json["type"])
         component_public_id = PublicId(
             component_author, component_name, component_version
         )
         component_id = ComponentId(component_type, component_public_id)
-        return component_id, result
+        return component_id
 
     @staticmethod
     def _validate_component_configuration(
@@ -343,56 +392,15 @@ def _validate_component_configuration(
         :return: None
         :raises ValueError: if the configuration is not valid.
         """
-        # we need to populate the required fields to validate the configurations.
-        temporary_config = deepcopy(configuration)
-        # common to every package
-        temporary_config["name"] = component_id.name
-        temporary_config["author"] = component_id.author
-        temporary_config["version"] = component_id.version
-        temporary_config["license"] = "some_license"
-        temporary_config["aea_version"] = "0.1.0"
-        if component_id.component_type == ComponentType.PROTOCOL:
-            pass  # no other required field
-        elif component_id.component_type == ComponentType.CONNECTION:
-            temporary_config["class_name"] = "SomeClassName"
-            temporary_config["protocols"] = []
-            temporary_config.setdefault("config", {})
-        elif component_id.component_type == ComponentType.CONTRACT:
-            temporary_config["class_name"] = "SomeClassName"
-        elif component_id.component_type == ComponentType.SKILL:
-            temporary_config["protocols"] = []
-            temporary_config["contracts"] = []
-            temporary_config["skills"] = []
-        loader = ConfigLoaders.from_package_type(component_id.package_type)
+        schema_file = _get_path_to_custom_config_schema_from_type(
+            component_id.component_type
+        )
         try:
-            loader._load_from_json(temporary_config)  # pylint: disable=protected-access
+            BaseConfigLoader(schema_file).validate(configuration)
         except jsonschema.ValidationError as e:
             raise ValueError(
                 f"Configuration of component {component_id} is not valid."
             ) from e
-        # all good!
-
-    @staticmethod
-    def _check_only_configurable_fields(
-        component_id: ComponentId, configuration: Dict
-    ) -> None:
-        """
-        Check that there are only configurable fields.
-
-        :param component_id: the component id.
-        :param configuration: the configuration object.
-        :return: None
-        """
-        configurable_fields = (
-            component_id.package_type.configuration_class().configurable_fields
-        )
-        non_configurable_fields = set(configuration.keys()).difference(
-            configurable_fields
-        )
-        enforce(
-            len(non_configurable_fields) == 0,
-            f"Bad configuration for component {component_id}: {non_configurable_fields} are non-configurable fields.",
-        )
 
 
 class ConfigLoaders:
diff --git a/aea/configurations/schemas/configurable_parts/base-custom_config.json b/aea/configurations/schemas/configurable_parts/base-custom_config.json
new file mode 100644
index 0000000000..7e44b416bf
--- /dev/null
+++ b/aea/configurations/schemas/configurable_parts/base-custom_config.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Base schema for a custom component configuration in the agent configuration file.",
+  "additionalProperties": false,
+  "required": [
+    "name",
+    "author",
+    "version",
+    "type"
+  ],
+  "properties": {
+    "name": {
+      "$ref": "definitions.json#/definitions/resource_name"
+    },
+    "author": {
+      "$ref": "definitions.json#/definitions/author"
+    },
+    "version": {
+      "$ref": "definitions.json#/definitions/package_version"
+    },
+    "type": {
+      "$ref": "definitions.json#/definitions/component_type"
+    }
+  }
+}
diff --git a/aea/configurations/schemas/configurable_parts/connection-custom_config.json b/aea/configurations/schemas/configurable_parts/connection-custom_config.json
new file mode 100644
index 0000000000..a81b002836
--- /dev/null
+++ b/aea/configurations/schemas/configurable_parts/connection-custom_config.json
@@ -0,0 +1,28 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Schema for the configurable part of a connection configuration in the agent configuration file.",
+  "additionalProperties": false,
+  "required": [
+    "name",
+    "author",
+    "version",
+    "type"
+  ],
+  "properties": {
+    "name": {
+      "$ref": "definitions.json#/definitions/resource_name"
+    },
+    "author": {
+      "$ref": "definitions.json#/definitions/author"
+    },
+    "version": {
+      "$ref": "definitions.json#/definitions/package_version"
+    },
+    "type": {
+      "$ref": "definitions.json#/definitions/component_type"
+    },
+    "config": {
+      "type": "object"
+    }
+  }
+}
diff --git a/aea/configurations/schemas/configurable_parts/skill-custom_config.json b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
index 1b2befcd2a..a1c43e2618 100644
--- a/aea/configurations/schemas/configurable_parts/skill-custom_config.json
+++ b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "Schema for the configurable part of a skill configuration file.",
+  "description": "Schema for the configurable part of a skill configuration in the agent configuration file.",
   "additionalProperties": false,
   "required": [
     "name",

From b6e46346be05818745ceedc571b75bbaae4634f7 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 28 Sep 2020 21:59:11 +0300
Subject: [PATCH 097/131] fixes

---
 aea/aea_builder.py            | 21 +++++++--
 aea/cli/registry/fetch.py     | 11 ++---
 aea/configurations/loader.py  | 19 +++++---
 aea/configurations/project.py | 50 +++++++++++++++++++++
 aea/manager.py                | 84 ++++++++++++++++-------------------
 5 files changed, 124 insertions(+), 61 deletions(-)
 create mode 100644 aea/configurations/project.py

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index 54e89d1642..99ceef4f71 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -1348,13 +1348,25 @@ def from_aea_project(
 
     @classmethod
     def from_config_json(
-        cls, json_data, aea_project_path: PathLike, skip_consistency_check: bool = False
-    ):
+        cls,
+        json_data: List[Dict],
+        aea_project_path: PathLike,
+        skip_consistency_check: bool = False,
+    ) -> "AEABuilder":
+        """
+        Load agent configuration for alreaady provided json data.
+
+        :param json_data: list of dicts with agent configuration
+        :param aea_project_path: path to project root
+        :param skip_consistency_check: skip consistency check on configs load.
+
+        :return: AEABuilder instance
+        """
         aea_project_path = Path(aea_project_path)
         builder = AEABuilder(with_default_packages=False)
 
         # load agent configuration file
-        agent_configuration = cls.loader._load_agent_config_from_json(json_data)
+        agent_configuration = cls.loader.load_agent_config_from_json(json_data)
 
         builder.set_from_configuration(
             agent_configuration, aea_project_path, skip_consistency_check
@@ -1362,7 +1374,8 @@ def from_config_json(
         return builder
 
     @staticmethod
-    def get_configuration_file_path(aea_project_path):
+    def get_configuration_file_path(aea_project_path: Union[Path, str]) -> Path:
+        """Return path to aea-config file for the given aea project path."""
         return Path(aea_project_path) / DEFAULT_AEA_CONFIG_FILE
 
     def _load_and_add_components(
diff --git a/aea/cli/registry/fetch.py b/aea/cli/registry/fetch.py
index cf0270c391..7d03503cb9 100644
--- a/aea/cli/registry/fetch.py
+++ b/aea/cli/registry/fetch.py
@@ -16,12 +16,10 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
-from aea.helpers.base import cd
-import shutil
-
 """Methods for CLI fetch functionality."""
 
 import os
+import shutil
 from typing import Optional
 
 import click
@@ -39,7 +37,7 @@ def fetch_agent(
     ctx: Context,
     public_id: PublicId,
     alias: Optional[str] = None,
-    dir: Optional[str] = None,
+    target_dir: Optional[str] = None,
 ) -> None:
     """
     Fetch Agent from Registry.
@@ -57,14 +55,13 @@ def fetch_agent(
 
     filepath = download_file(file_url, ctx.cwd)
 
-    folder_name = dir or (name if alias is None else alias)
+    folder_name = target_dir or (name if alias is None else alias)
     aea_folder = os.path.join(ctx.cwd, folder_name)
-    print(aea_folder)
     ctx.clean_paths.append(aea_folder)
 
     extract(filepath, ctx.cwd)
 
-    if alias or dir:
+    if alias or target_dir:
         shutil.move(
             os.path.join(ctx.cwd, name), aea_folder,
         )
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 4956406c95..eef1a20ff1 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -229,10 +229,19 @@ def _load_from_json(self, configuration_file_json: Dict) -> T:
         configuration_obj._key_order = key_order  # pylint: disable=protected-access
         return configuration_obj
 
-    def _load_agent_config_from_json(self, configuration_file_jsons) -> AgentConfig:
-        if len(configuration_file_jsons) == 0:
+    def load_agent_config_from_json(
+        self, configuration_json: List[Dict]
+    ) -> AgentConfig:
+        """
+        Load agent configuration from configuration json data.
+
+        :param configuration_json: list of dicts with aea configuration
+
+        :return: AgentConfig instance
+        """
+        if len(configuration_json) == 0:
             raise ValueError("Agent configuration file was empty.")
-        agent_config_json = configuration_file_jsons[0]
+        agent_config_json = configuration_json[0]
         self._validate(agent_config_json)
         key_order = list(agent_config_json.keys())
         agent_configuration_obj = cast(
@@ -244,7 +253,7 @@ def _load_agent_config_from_json(self, configuration_file_jsons) -> AgentConfig:
 
         component_configurations: Dict[ComponentId, Dict] = {}
         # load the other components.
-        for i, component_configuration_json in enumerate(configuration_file_jsons[1:]):
+        for i, component_configuration_json in enumerate(configuration_json[1:]):
             component_id, component_config = self._process_component_section(
                 i, component_configuration_json
             )
@@ -260,7 +269,7 @@ def _load_agent_config_from_json(self, configuration_file_jsons) -> AgentConfig:
     def _load_agent_config(self, file_pointer: TextIO) -> AgentConfig:
         """Load an agent configuration."""
         configuration_file_jsons = yaml_load_all(file_pointer)
-        return self._load_agent_config_from_json(configuration_file_jsons)
+        return self.load_agent_config_from_json(configuration_file_jsons)
 
     def _dump_agent_config(
         self, configuration: AgentConfig, file_pointer: TextIO
diff --git a/aea/configurations/project.py b/aea/configurations/project.py
new file mode 100644
index 0000000000..8aeace45b8
--- /dev/null
+++ b/aea/configurations/project.py
@@ -0,0 +1,50 @@
+# -*- 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.
+#
+# ------------------------------------------------------------------------------
+"""This module contains the implementation of AEA agents project configuiration."""
+import os
+from shutil import rmtree
+from typing import Set
+
+from aea.cli.registry.fetch import fetch_agent
+from aea.cli.utils.context import Context
+from aea.configurations.base import PublicId
+
+
+class Project:
+    """Agent project representation."""
+
+    def __init__(self, public_id: PublicId, path: str):
+        """Init project with public_id and project's path."""
+        self.public_id: PublicId = public_id
+        self.path: str = path
+        self.agents: Set[str] = set()
+
+    @classmethod
+    def load(cls, working_dir: str, public_id: PublicId) -> "Project":
+        """Load project with given pubblic_id to working_dir."""
+        ctx = Context(cwd=working_dir)
+        path = os.path.join(working_dir, public_id.author, public_id.name)
+        fetch_agent(
+            ctx, public_id, target_dir=os.path.join(public_id.author, public_id.name)
+        )
+        return cls(public_id, path)
+
+    def remove(self) -> None:
+        """Remove project, do cleanup."""
+        rmtree(self.path)
diff --git a/aea/manager.py b/aea/manager.py
index de92bf7edb..d39e89b296 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -16,6 +16,7 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
+
 """This module contains the implementation of AEA agents manager."""
 import asyncio
 import copy
@@ -24,40 +25,17 @@
 from asyncio.tasks import FIRST_COMPLETED
 from shutil import rmtree
 from threading import Thread
-from typing import Callable, Dict, List, Optional, Set
+from typing import Callable, Dict, List, Optional
 
 from aea.aea import AEA
 from aea.aea_builder import AEABuilder
-from aea.cli.registry.fetch import fetch_agent
-from aea.cli.utils.context import Context
 from aea.configurations.base import ComponentId, PublicId
 from aea.configurations.constants import DEFAULT_LEDGER
+from aea.configurations.project import Project
 from aea.crypto.helpers import create_private_key
 from aea.helpers.base import yaml_load_all
 
 
-class Project:
-    """Agent project representation."""
-
-    def __init__(self, public_id: PublicId, path: str):
-        """Init project with public_id and project's path."""
-        self.public_id = public_id
-        self.path = path
-        self.agents: Set[str] = set()
-
-    @classmethod
-    def load(cls, working_dir, public_id) -> "Project":
-        """Load project with given pubblic_id to working_dir."""
-        ctx = Context(cwd=working_dir)
-        path = os.path.join(working_dir, public_id.author, public_id.name)
-        fetch_agent(ctx, public_id, dir=os.path.join(public_id.author, public_id.name))
-        return cls(public_id, path)
-
-    def remove(self):
-        """Remove project, do cleanup."""
-        rmtree(self.path)
-
-
 class AgentAlias:
     """Agent alias representation."""
 
@@ -116,7 +94,7 @@ async def _run_wrapper(self) -> None:
             self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
         except asyncio.CancelledError:
             self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
-        except Exception as e:
+        except Exception as e:  # pylint: disable=broad-except
             self.caller_loop.call_soon_threadsafe(self._done_future.set_exception, e)
 
     async def run(self) -> None:
@@ -232,22 +210,21 @@ async def _manager_loop(self) -> None:
                 else:
                     await task
 
-    def start_manager(self) -> None:
+    def start_manager(self) -> "Manager":
         """Start manager."""
         self._ensure_working_dir()
         self._started_event.clear()
         self._is_running = True
         self._thread.start()
         self._started_event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+        return self
 
-    def stop_manager(self, cleanup: bool = False) -> None:
+    def stop_manager(self) -> "Manager":
         """
         Stop manager.
 
         Stops all running agents and stop agent.
 
-        :param cleanup: remove agents_dir and purge in memory registry.
-
         :return: None
         """
         if not self._loop or not self._event:
@@ -260,14 +237,16 @@ def stop_manager(self, cleanup: bool = False) -> None:
         self._is_running = False
         self._loop.call_soon_threadsafe(self._event.set)
         self._thread.join(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+        return self
 
-    def add_project(self, public_id: PublicId) -> None:
+    def add_project(self, public_id: PublicId) -> "Manager":
         """Fetch agent project and all dependencies to working_dir."""
         if public_id in self._projects:
             raise ValueError(f"Project {public_id} was already added!")
         self._projects[public_id] = Project.load(self.working_dir, public_id)
+        return self
 
-    def remove_project(self, public_id: PublicId) -> None:
+    def remove_project(self, public_id: PublicId) -> "Manager":
         """Remove agent project."""
         if public_id not in self._projects:
             raise ValueError(f"Project {public_id} was not added!")
@@ -278,6 +257,7 @@ def remove_project(self, public_id: PublicId) -> None:
             )
 
         self._projects.pop(public_id).remove()
+        return self
 
     def list_projects(self) -> List[PublicId]:
         """
@@ -293,7 +273,7 @@ def add_agent(
         agent_name: str,
         agent_overrides: Optional[dict] = None,
         component_overrides: Optional[List[dict]] = None,
-    ) -> None:
+    ) -> "Manager":
         """
         Create new agent configuration based on project with config overrides applied.
 
@@ -304,7 +284,7 @@ def add_agent(
         :param agent_overrides: overrides for agent config.
         :param component_overrides: overrides for component section.
 
-        :return: None
+        :return: manager
         """
         if agent_name in self._agents:
             raise ValueError(f"Agent with name {agent_name} already exists!")
@@ -320,6 +300,7 @@ def add_agent(
             component_overrides=component_overrides,
         )
         self._agents[agent_name] = agent_alias
+        return self
 
     def list_agents(self, running_only: bool = False) -> List[str]:
         """
@@ -333,7 +314,7 @@ def list_agents(self, running_only: bool = False) -> List[str]:
             return list(self._agents_tasks.keys())
         return list(self._agents.keys())
 
-    def remove_agent(self, agent_name: str) -> None:
+    def remove_agent(self, agent_name: str) -> "Manager":
         """
         Remove agent alias definition from registry.
 
@@ -349,8 +330,9 @@ def remove_agent(self, agent_name: str) -> None:
 
         agent_alias = self._agents.pop(agent_name)
         agent_alias.remove()
+        return self
 
-    def start_agent(self, agent_name: str) -> None:
+    def start_agent(self, agent_name: str) -> "Manager":
         """
         Start selected agent.
 
@@ -375,6 +357,7 @@ def start_agent(self, agent_name: str) -> None:
         task.start()
         self._agents_tasks[agent_name] = task
         self._loop.call_soon_threadsafe(self._event.set)
+        return self
 
     def _is_agent_running(self, agent_name):
         if agent_name not in self._agents_tasks:
@@ -386,7 +369,7 @@ def _is_agent_running(self, agent_name):
         del self._agents_tasks[agent_name]
         return False
 
-    def start_all_agents(self) -> None:
+    def start_all_agents(self) -> "Manager":
         """
         Start all not started agents.
 
@@ -397,7 +380,9 @@ def start_all_agents(self) -> None:
                 continue
             self.start_agent(agent_name)
 
-    def stop_agent(self, agent_name: str) -> None:
+        return self
+
+    def stop_agent(self, agent_name: str) -> "Manager":
         """
         Stop running agent.
 
@@ -410,13 +395,15 @@ def stop_agent(self, agent_name: str) -> None:
         if self._thread.ident == threading.get_ident():
             # In same thread do not perform blocking operations!
             self._agents_tasks[agent_name].stop()
-            return
+            return self
         event = threading.Event()
         self._agents_tasks[agent_name].wait().add_done_callback(lambda x: event.set())
         self._agents_tasks[agent_name].stop()
         event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
-    def stop_all_agents(self) -> None:
+        return self
+
+    def stop_all_agents(self) -> "Manager":
         """
         Stop all agents running.
 
@@ -425,7 +412,9 @@ def stop_all_agents(self) -> None:
         for agent_name in self.list_agents(running_only=True):
             self.stop_agent(agent_name)
 
-    def stop_agents(self, agent_names: List[str]) -> None:
+        return self
+
+    def stop_agents(self, agent_names: List[str]) -> "Manager":
         """
         Stop specified agents.
 
@@ -438,7 +427,9 @@ def stop_agents(self, agent_names: List[str]) -> None:
         for agent_name in agent_names:
             self.stop_agent(agent_name)
 
-    def start_agents(self, agent_names: List[str]) -> None:
+        return self
+
+    def start_agents(self, agent_names: List[str]) -> "Manager":
         """
         Stop specified agents.
 
@@ -447,9 +438,11 @@ def start_agents(self, agent_names: List[str]) -> None:
         for agent_name in agent_names:
             self.start_agent(agent_name)
 
-    def get_agent_details(self, agent_name: str) -> AgentAlias:
+        return self
+
+    def get_agent_alias(self, agent_name: str) -> AgentAlias:
         """
-        Return details about agent definition.
+        Return details about agent alias definition.
 
         :return: AgentAlias
         """
@@ -491,7 +484,8 @@ def _build_agent_alias(
         agent = builder.build()
         return AgentAlias(project, agent_name, json_config, agent)
 
-    def _update_dict(self, base: dict, override: dict) -> dict:
+    @staticmethod
+    def _update_dict(base: dict, override: dict) -> dict:
         """Apply overrides for dict."""
         base = copy.deepcopy(base)
         base.update(override)

From 807044747fe3d00d7cc42db8ee21ec5d28c4835e Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Mon, 28 Sep 2020 22:02:28 +0300
Subject: [PATCH 098/131] small fix

---
 aea/runtime.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aea/runtime.py b/aea/runtime.py
index 04e70e1ed9..e6af111556 100644
--- a/aea/runtime.py
+++ b/aea/runtime.py
@@ -299,9 +299,11 @@ async def run_runtime(self) -> None:
 
     async def _start_multiplexer(self) -> None:
         """Call multiplexer connect asynchronous way."""
-        self.setup_multiplexer()
-        if not self._loop:
+        if not self._loop:  # pragma: nocover
             raise ValueError("no loop is set for runtime.")
+
+        self.setup_multiplexer()
+
         self.multiplexer.set_loop(self._loop)
         self.multiplexer.start()
         await self.multiplexer.wait_completed()

From 16cf1a1634f454a6eaf5d44f2db0ad2e2031c97a Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 29 Sep 2020 11:42:39 +0200
Subject: [PATCH 099/131] Update only arguments of components

---
 aea/aea_builder.py                            | 28 +++++--
 aea/configurations/base.py                    | 50 +++++++++----
 .../skill-custom_config.json                  | 74 ++++++++++++++++++-
 aea/helpers/base.py                           | 35 +++++++++
 tests/conftest.py                             |  4 +-
 tests/data/aea-config.example_multipage.yaml  |  4 -
 tests/test_configurations/test_base.py        | 45 +++++++++--
 7 files changed, 201 insertions(+), 39 deletions(-)

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index ee5b77abe8..3e71026779 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -1372,18 +1372,13 @@ def _load_and_add_components(
                         logging.Logger, make_logger(configuration, agent_name)
                     )
             else:
-                configuration = deepcopy(configuration)
-                configuration.update(
-                    self._custom_component_configurations.get(
-                        configuration.component_id, {}
-                    )
-                )
                 if configuration.is_abstract_component:
                     load_aea_package(configuration)
                     continue
-                _logger = make_logger(configuration, agent_name)
+                new_configuration = self._overwrite_custom_configuration(configuration)
+                _logger = make_logger(new_configuration, agent_name)
                 component = load_component_from_config(
-                    configuration, logger=_logger, **kwargs
+                    new_configuration, logger=_logger, **kwargs
                 )
 
             resources.add_component(component)
@@ -1397,6 +1392,23 @@ def _check_we_can_build(self):
                 "Please call 'reset() if you want to build another agent."
             )
 
+    def _overwrite_custom_configuration(self, configuration: ComponentConfiguration):
+        """
+        Overwrite custom configurations.
+
+        It deep-copies the configuration, to avoid undesired side-effects.
+
+        :param configuration: the configuration object.
+        :param custom_config: the configurations to apply.
+        :return: the new configuration instance.
+        """
+        new_configuration = deepcopy(configuration)
+        custom_config = self._custom_component_configurations.get(
+            new_configuration.component_id, {}
+        )
+        new_configuration.update(custom_config)
+        return new_configuration
+
 
 def make_logger(
     configuration: ComponentConfiguration, agent_name: str,
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index ff92bf616b..48cd40aa98 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -53,6 +53,7 @@
 
 from aea.__version__ import __version__ as __aea_version__
 from aea.exceptions import enforce
+from aea.helpers.base import merge_update
 from aea.helpers.ipfs.base import IPFSHashOnly
 
 
@@ -1058,10 +1059,13 @@ def update(self, data: Dict) -> None:
         """
         Update configuration with other data.
 
-        :param data: the data to replace.
+        This method does side-effect on the configuration object.
+
+        :param data: the data to populate or replace.
         :return: None
         """
-        self.config = data.get("config", self.config)
+        new_config = data.get("config", {})
+        merge_update(self.config, new_config)
 
 
 class ProtocolConfig(ComponentConfiguration):
@@ -1318,18 +1322,34 @@ def update(self, data: Dict) -> None:
         :param data: the data to replace.
         :return: None
         """
-        for behaviour_id, behaviour_data in data.get("behaviours", {}).items():
-            behaviour_config = SkillComponentConfiguration.from_json(behaviour_data)
-            self.behaviours.update(behaviour_id, behaviour_config)
 
-        for handler_id, handler_data in data.get("handlers", {}).items():
-            handler_config = SkillComponentConfiguration.from_json(handler_data)
-            self.handlers.update(handler_id, handler_config)
+        def _update_skill_component_config(type_plural: str, data: Dict):
+            """
+            Update skill component configurations with new data.
 
-        for model_id, model_data in data.get("models", {}).items():
-            model_config = SkillComponentConfiguration.from_json(model_data)
-            self.models.update(model_id, model_config)
+            Also check that there are not undeclared components.
+            """
+            registry: CRUDCollection[SkillComponentConfiguration] = getattr(
+                self, type_plural
+            )
+            new_component_config = data.get(type_plural, {})
+            all_component_names = dict(registry.read_all())
+
+            new_skill_component_names = set(new_component_config.keys()).difference(
+                set(all_component_names.keys())
+            )
+            if len(new_skill_component_names) > 0:
+                raise ValueError(
+                    f"The custom configuration for skill {self.public_id} includes new {type_plural}: {new_skill_component_names}. This is not allowed."
+                )
+
+            for component_name, component_data in data.get(type_plural, {}).items():
+                component_config = registry.read(component_name)
+                merge_update(component_config.args, component_data.get("args", {}))
 
+        _update_skill_component_config("behaviours", data)
+        _update_skill_component_config("handlers", data)
+        _update_skill_component_config("models", data)
         self.is_abstract = data.get("is_abstract", self.is_abstract)
 
 
@@ -1625,10 +1645,10 @@ def from_json(cls, obj: Dict):
         component_configurations = {}
         for config in obj.get("component_configurations", []):
             tmp = deepcopy(config)
-            name = tmp.pop("name")
-            author = tmp.pop("author")
-            version = tmp.pop("version")
-            type_ = tmp.pop("type")
+            name = tmp["name"]
+            author = tmp["author"]
+            version = tmp["version"]
+            type_ = tmp["type"]
             component_id = ComponentId(
                 ComponentType(type_), PublicId(author, name, version)
             )
diff --git a/aea/configurations/schemas/configurable_parts/skill-custom_config.json b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
index a1c43e2618..b470606888 100644
--- a/aea/configurations/schemas/configurable_parts/skill-custom_config.json
+++ b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
@@ -22,16 +22,82 @@
       "$ref": "definitions.json#/definitions/component_type"
     },
     "handlers": {
-      "$ref": "skill-config_schema.json#/definitions/handlers"
+      "$ref": "#/definitions/handlers"
     },
     "behaviours": {
-      "$ref": "skill-config_schema.json#/definitions/behaviours"
+      "$ref": "#/definitions/behaviours"
     },
     "models": {
-      "$ref": "skill-config_schema.json#/definitions/models"
+      "$ref": "#/definitions/models"
     },
     "is_abstract": {
-      "$ref": "skill-config_schema.json#/properties/is_abstract"
+      "$ref": "#/properties/is_abstract"
+    }
+  },
+  "definitions": {
+    "handlers": {
+      "type": "object",
+      "additionalProperties": false,
+      "uniqueItems": true,
+      "patternProperties": {
+        "^[^\\d\\W]\\w*\\Z": {
+          "$ref": "#/definitions/handler"
+        }
+      }
+    },
+    "behaviours": {
+      "type": "object",
+      "uniqueItems": true,
+      "patternProperties": {
+        "^[^\\d\\W]\\w*\\Z": {
+          "$ref": "#/definitions/behaviour"
+        }
+      }
+    },
+    "models": {
+      "type": "object",
+      "uniqueItems": true,
+      "patternProperties": {
+        "^[^\\d\\W]\\w*\\Z": {
+          "$ref": "#/definitions/model"
+        }
+      }
+    },
+    "behaviour": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "args"
+      ],
+      "properties": {
+        "args": {
+          "type": "object"
+        }
+      }
+    },
+    "handler": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "args"
+      ],
+      "properties": {
+        "args": {
+          "type": "object"
+        }
+      }
+    },
+    "model": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "args"
+      ],
+      "properties": {
+        "args": {
+          "type": "object"
+        }
+      }
     }
   }
 }
diff --git a/aea/helpers/base.py b/aea/helpers/base.py
index 89cd6e3e71..e39a9fe80b 100644
--- a/aea/helpers/base.py
+++ b/aea/helpers/base.py
@@ -390,3 +390,38 @@ def exception_log_and_reraise(log_method: Callable, message: str):
     except BaseException as e:  # pylint: disable=broad-except  # pragma: no cover  # generic code
         log_method(message.format(e))
         raise
+
+
+def merge_update(to_update: Dict, new_values: Dict):
+    """
+    Merge two dictionaries by replacing conflicts with the new values.
+
+    It does side-effects to the first dictionary.
+
+    >>> to_update = dict(a=1, b=2, subdict=dict(subfield1=1))
+    >>> new_values = dict(b=3, c=4, subdict=dict(subfield2=2))
+    >>> merge_update(to_update, new_values)
+    >>> to_update
+    {'a': 1, 'b': 3, 'subdict': {'subfield1': 1, 'subfield2': 2}, 'c': 4}
+
+    :param to_update: the dictionary to update.
+    :param new_values: the dictionary of new values to add/replace.
+    :return: the merged dictionary.
+    """
+    for key, value in new_values.items():
+        if key not in to_update:
+            to_update[key] = value
+            continue
+
+        value_to_update = to_update[key]
+        value_type = type(value)
+        value_to_update_type = type(value_to_update)
+        if value_type != value_to_update_type:
+            raise ValueError(
+                f"Trying to replace value '{value}' with value '{value_to_update}' which is of different type."
+            )
+
+        if value_type == value_to_update_type == dict:
+            merge_update(value_to_update, value)
+        else:
+            to_update[key] = value
diff --git a/tests/conftest.py b/tests/conftest.py
index 6eda95ebaa..6efe975b86 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -205,6 +205,8 @@
 DUMMY_CONNECTION_PUBLIC_ID = PublicId("dummy_author", "dummy", "0.1.0")
 DUMMY_SKILL_PUBLIC_ID = PublicId("dummy_author", "dummy", "0.1.0")
 
+DUMMY_SKILL_PATH = os.path.join(CUR_PATH, "data", "dummy_skill", SKILL_YAML)
+
 MAX_FLAKY_RERUNS = 3
 MAX_FLAKY_RERUNS_ETH = 1
 MAX_FLAKY_RERUNS_INTEGRATION = 1
@@ -278,7 +280,7 @@
     os.path.join(FETCHAI_PREF, "skills", "thermometer_client", SKILL_YAML),
     os.path.join(FETCHAI_PREF, "skills", "weather_client", SKILL_YAML),
     os.path.join(FETCHAI_PREF, "skills", "weather_station", SKILL_YAML),
-    os.path.join(CUR_PATH, "data", "dummy_skill", SKILL_YAML),
+    DUMMY_SKILL_PATH,
     os.path.join(CUR_PATH, "data", "dummy_aea", "skills", "dummy", SKILL_YAML),
     os.path.join(CUR_PATH, "data", "dependencies_skill", SKILL_YAML),
     os.path.join(CUR_PATH, "data", "exception_skill", SKILL_YAML),
diff --git a/tests/data/aea-config.example_multipage.yaml b/tests/data/aea-config.example_multipage.yaml
index 03ba6f66ee..1b205cb297 100644
--- a/tests/data/aea-config.example_multipage.yaml
+++ b/tests/data/aea-config.example_multipage.yaml
@@ -39,22 +39,18 @@ behaviours:
     args:
       behaviour_arg_1: 1
       behaviour_arg_2: '2'
-    class_name: DummyBehaviour
 handlers:
   dummy:
     args:
       handler_arg_1: 1
       handler_arg_2: '2'
-    class_name: DummyHandler
   dummy_internal:
     args:
       handler_arg_1: 1
       handler_arg_2: '2'
-    class_name: DummyInternalHandler
 models:
   dummy:
     args:
       model_arg_1: 1
       model_arg_2: '2'
-    class_name: DummyModel
 ...
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index b8e3f700b2..f75385294f 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -19,6 +19,7 @@
 
 """This module contains the tests for the aea.configurations.base module."""
 import re
+from copy import copy
 from pathlib import Path
 from unittest import TestCase, mock
 
@@ -52,6 +53,7 @@
 
 from tests.conftest import (
     AUTHOR,
+    DUMMY_SKILL_PATH,
     ROOT_DIR,
     agent_config_files,
     connection_config_files,
@@ -200,6 +202,37 @@ def test_from_json_and_to_json(self, skill_path):
 
     def test_update_method(self):
         """Test the update method."""
+        skill_config_path = Path(DUMMY_SKILL_PATH)
+        loader = ConfigLoaders.from_package_type(PackageType.SKILL)
+        skill_config = loader.load(skill_config_path.open())
+
+        dummy_behaviour = skill_config.behaviours.read("dummy")
+        expected_dummy_behaviour_args = copy(dummy_behaviour.args)
+        expected_dummy_behaviour_args["new_arg"] = 1
+
+        dummy_handler = skill_config.handlers.read("dummy")
+        expected_dummy_handler_args = copy(dummy_handler.args)
+        expected_dummy_handler_args["new_arg"] = 1
+
+        dummy_model = skill_config.models.read("dummy")
+        expected_dummy_model_args = copy(dummy_model.args)
+        expected_dummy_model_args["new_arg"] = 1
+
+        new_configurations = {
+            "behaviours": {"dummy": {"args": dict(new_arg=1)}},
+            "handlers": {"dummy": {"args": dict(new_arg=1)}},
+            "models": {"dummy": {"args": dict(new_arg=1)}},
+        }
+        skill_config.update(new_configurations)
+
+        assert (
+            expected_dummy_behaviour_args == skill_config.behaviours.read("dummy").args
+        )
+        assert expected_dummy_handler_args == skill_config.handlers.read("dummy").args
+        assert expected_dummy_model_args == skill_config.models.read("dummy").args
+
+    def test_update_method_raises_error_if_skill_component_not_allowed(self):
+        """Test that we raise error if the custom configuration contain unexpected skill components."""
         skill_config_path = Path(
             ROOT_DIR, "aea", "skills", "error", DEFAULT_SKILL_CONFIG_FILE
         )
@@ -210,14 +243,12 @@ def test_update_method(self):
             "handlers": {"new_handler": {"args": {}, "class_name": "SomeClass"}},
             "models": {"new_model": {"args": {}, "class_name": "SomeClass"}},
         }
-        skill_config.update(new_configurations)
 
-        new_behaviour = skill_config.behaviours.read("new_behaviour")
-        assert new_behaviour.json == new_configurations["behaviours"]["new_behaviour"]
-        new_handler = skill_config.handlers.read("new_handler")
-        assert new_handler.json == new_configurations["handlers"]["new_handler"]
-        new_model = skill_config.models.read("new_model")
-        assert new_model.json == new_configurations["models"]["new_model"]
+        with pytest.raises(
+            ValueError,
+            match="The custom configuration for skill fetchai/error:0.6.0 includes new behaviours: {'new_behaviour'}. This is not allowed.",
+        ):
+            skill_config.update(new_configurations)
 
 
 class TestAgentConfig:

From 3b1637ce20d8a69354a66c1116f53fa4a77841d1 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 29 Sep 2020 15:29:46 +0200
Subject: [PATCH 100/131] fix recursion in jsonschema

---
 aea/configurations/loader.py                         | 12 ++++++------
 .../configurable_parts/skill-custom_config.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 515dcfd615..0f19ddaea4 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -326,7 +326,7 @@ def _dump_component_config(self, configuration: T, file_pointer: TextIO) -> None
         yaml_dump(result, file_pointer)
 
     def _process_component_section(
-        self, i: int, component_configuration_json: Dict
+        self, component_index: int, component_configuration_json: Dict
     ) -> ComponentId:
         """
         Process a component configuration in an agent configuration file.
@@ -336,12 +336,12 @@ def _process_component_section(
         - validate the component configuration
         - check that there are only configurable fields
 
-        :param i: the index of the component in the file.
+        :param component_index: the index of the component in the file.
         :param component_configuration_json: the JSON object.
         :return: the processed component configuration.
         """
         component_id = self._split_component_id_and_config(
-            i, component_configuration_json
+            component_index, component_configuration_json
         )
         self._validate_component_configuration(
             component_id, component_configuration_json
@@ -350,12 +350,12 @@ def _process_component_section(
 
     @staticmethod
     def _split_component_id_and_config(
-        i: int, component_configuration_json: Dict
+        component_index: int, component_configuration_json: Dict
     ) -> ComponentId:
         """
         Split component id and configuration.
 
-        :param i: the position of the component configuration in the agent config file..
+        :param component_index: the position of the component configuration in the agent config file..
         :param component_configuration_json: the JSON object to process.
         :return: the component id and the configuration object.
         :raises ValueError: if the component id cannot be extracted.
@@ -366,7 +366,7 @@ def _split_component_id_and_config(
         )
         if len(missing_fields) > 0:
             raise ValueError(
-                f"There are missing fields in component id {i + 1}: {missing_fields}."
+                f"There are missing fields in component id {component_index + 1}: {missing_fields}."
             )
         component_name = component_configuration_json["name"]
         component_author = component_configuration_json["author"]
diff --git a/aea/configurations/schemas/configurable_parts/skill-custom_config.json b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
index b470606888..b5ab051d3c 100644
--- a/aea/configurations/schemas/configurable_parts/skill-custom_config.json
+++ b/aea/configurations/schemas/configurable_parts/skill-custom_config.json
@@ -31,7 +31,7 @@
       "$ref": "#/definitions/models"
     },
     "is_abstract": {
-      "$ref": "#/properties/is_abstract"
+      "$ref": "skill-config_schema.json#/properties/is_abstract"
     }
   },
   "definitions": {

From 56860c903995daaf0fbf36d727b032eaa596d36f Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 29 Sep 2020 15:34:19 +0200
Subject: [PATCH 101/131] address PR comments

---
 aea/configurations/base.py   |  4 +++-
 aea/configurations/loader.py | 15 +++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 48cd40aa98..2b4d2e6e26 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -1344,7 +1344,9 @@ def _update_skill_component_config(type_plural: str, data: Dict):
                 )
 
             for component_name, component_data in data.get(type_plural, {}).items():
-                component_config = registry.read(component_name)
+                component_config = cast(
+                    SkillComponentConfiguration, registry.read(component_name)
+                )
                 merge_update(component_config.args, component_data.get("args", {}))
 
         _update_skill_component_config("behaviours", data)
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index 0f19ddaea4..4723b209f1 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -51,6 +51,11 @@
 _CUR_DIR = os.path.dirname(inspect.getfile(inspect.currentframe()))  # type: ignore
 _SCHEMAS_DIR = os.path.join(_CUR_DIR, "schemas")
 
+_PREFIX_BASE_CONFIGURABLE_PARTS = "base"
+_SCHEMAS_CONFIGURABLE_PARTS_DIRNAME = "configurable_parts"
+_POSTFIX_CUSTOM_CONFIG = "-custom_config.json"
+STARTING_INDEX_CUSTOM_CONFIGS = 1
+
 T = TypeVar(
     "T",
     AgentConfig,
@@ -83,12 +88,12 @@ def _get_path_to_custom_config_schema_from_type(component_type: ComponentType) -
     :param component_type: a component type.
     :return: the path to the JSON schema file.
     """
-    path_prefix: Path = Path(_SCHEMAS_DIR) / "configurable_parts"
+    path_prefix: Path = Path(_SCHEMAS_DIR) / _SCHEMAS_CONFIGURABLE_PARTS_DIRNAME
     if component_type in {ComponentType.SKILL, ComponentType.CONNECTION}:
         filename_prefix = component_type.value
     else:
-        filename_prefix = "base"
-    full_path = path_prefix / (filename_prefix + "-custom_config.json")
+        filename_prefix = _PREFIX_BASE_CONFIGURABLE_PARTS
+    full_path = path_prefix / (filename_prefix + _POSTFIX_CUSTOM_CONFIG)
     return str(full_path)
 
 
@@ -298,7 +303,9 @@ def _get_component_configurations(
         """
         component_configurations: Dict[ComponentId, Dict] = {}
         # load the other components.
-        for i, component_configuration_json in enumerate(configuration_file_jsons[1:]):
+        for i, component_configuration_json in enumerate(
+            configuration_file_jsons[STARTING_INDEX_CUSTOM_CONFIGS:]
+        ):
             component_id = self._process_component_section(
                 i, component_configuration_json
             )

From d1223914eedde0517952e677396699be8b052e36 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 29 Sep 2020 16:03:54 +0100
Subject: [PATCH 102/131] fix logger name in some connections

---
 packages/fetchai/connections/ledger/base.py           | 11 ++---------
 packages/fetchai/connections/ledger/connection.yaml   |  6 +++---
 .../fetchai/connections/ledger/contract_dispatcher.py | 10 +++++++++-
 .../fetchai/connections/ledger/ledger_dispatcher.py   | 10 +++++++++-
 packages/fetchai/connections/soef/connection.py       |  2 +-
 packages/fetchai/connections/soef/connection.yaml     |  2 +-
 packages/hashes.csv                                   |  4 ++--
 7 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/fetchai/connections/ledger/base.py b/packages/fetchai/connections/ledger/base.py
index c9fbdd4411..b26b5f8bf9 100644
--- a/packages/fetchai/connections/ledger/base.py
+++ b/packages/fetchai/connections/ledger/base.py
@@ -18,7 +18,6 @@
 # ------------------------------------------------------------------------------
 """This module contains base classes for the ledger API connection."""
 import asyncio
-import logging
 from abc import ABC, abstractmethod
 from asyncio import Task
 from concurrent.futures._base import Executor
@@ -45,11 +44,11 @@ class RequestDispatcher(ABC):
 
     def __init__(
         self,
+        logger: Logger,
         connection_state: AsyncState,
         loop: Optional[asyncio.AbstractEventLoop] = None,
         executor: Optional[Executor] = None,
         api_configs: Optional[Dict[str, Dict[str, str]]] = None,
-        logger: Optional[Logger] = None,
     ):
         """
         Initialize the request dispatcher.
@@ -61,13 +60,7 @@ def __init__(
         self.loop = loop if loop is not None else asyncio.get_event_loop()
         self.executor = executor
         self._api_configs = api_configs
-        self.logger = (
-            logger
-            if logger is not None
-            else logging.getLogger(
-                "aea.packages.fetchai.connections.ledger.contract_dispatcher"
-            )
-        )
+        self.logger = logger
 
     def api_config(self, ledger_id: str) -> Dict[str, str]:
         """Get api config."""
diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index 63641cb273..2edc0b499a 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -8,10 +8,10 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmY6YCoxyUXSwQzFvNPKd3nfHaoMsjCLCZAvTGSGwZnZbP
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
-  base.py: QmNnSBVmVgdDFwzqDUncwLHeyDfMEfmvujJdKbdGNGH4Be
+  base.py: QmdWmK8S9dX1U6jiRotdFrEfAbPhLUDvPj8yPiCwsJnUDZ
   connection.py: Qmdibf99GzdFjFCcoTX7AiiBVWznKvPZWvur8cngSRNdye
-  contract_dispatcher.py: QmXMPf7Mekyfo8SofcVYWWgMwADQZw68cXbmtf1pyKchVc
-  ledger_dispatcher.py: QmTGvnN5W7VHZ9McQSyDQ1jPQoFWmQmuR2a3y8LL6J7aiM
+  contract_dispatcher.py: QmNYR1K1MAMo6jZE84XhsTQBDtUZMuCE1PeBpJ2sMxM4dc
+  ledger_dispatcher.py: QmcpASNeDRwuPJ9wLfTHp3qEMutrUZV9VUzLWzvk312K2i
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/contract_api:0.5.0
diff --git a/packages/fetchai/connections/ledger/contract_dispatcher.py b/packages/fetchai/connections/ledger/contract_dispatcher.py
index c553633baa..f9cddf8341 100644
--- a/packages/fetchai/connections/ledger/contract_dispatcher.py
+++ b/packages/fetchai/connections/ledger/contract_dispatcher.py
@@ -19,6 +19,7 @@
 
 """This module contains the implementation of the contract API request dispatcher."""
 import inspect
+import logging
 from typing import Callable, Optional, cast
 
 from aea.contracts import Contract, contract_registry
@@ -38,6 +39,11 @@
 )
 
 
+_default_logger = logging.getLogger(
+    "aea.packages.fetchai.connections.ledger.contract_dispatcher"
+)
+
+
 class ContractApiDialogues(BaseContractApiDialogues):
     """The dialogues class keeps track of all dialogues."""
 
@@ -73,7 +79,9 @@ class ContractApiRequestDispatcher(RequestDispatcher):
 
     def __init__(self, *args, **kwargs):
         """Initialize the dispatcher."""
-        super().__init__(*args, **kwargs)
+        logger = kwargs.pop("logger", None)
+        logger = logger if logger is not None else _default_logger
+        super().__init__(*args, **kwargs, logger=logger)
         self._contract_api_dialogues = ContractApiDialogues()
 
     @property
diff --git a/packages/fetchai/connections/ledger/ledger_dispatcher.py b/packages/fetchai/connections/ledger/ledger_dispatcher.py
index 224e5dfbe3..9f38cfd79c 100644
--- a/packages/fetchai/connections/ledger/ledger_dispatcher.py
+++ b/packages/fetchai/connections/ledger/ledger_dispatcher.py
@@ -17,6 +17,7 @@
 #
 # ------------------------------------------------------------------------------
 """This module contains the implementation of the ledger API request dispatcher."""
+import logging
 import time
 from typing import cast
 
@@ -36,6 +37,11 @@
 from packages.fetchai.protocols.ledger_api.message import LedgerApiMessage
 
 
+_default_logger = logging.getLogger(
+    "aea.packages.fetchai.connections.ledger.ledger_dispatcher"
+)
+
+
 class LedgerApiDialogues(BaseLedgerApiDialogues):
     """The dialogues class keeps track of all dialogues."""
 
@@ -71,7 +77,9 @@ class LedgerApiRequestDispatcher(RequestDispatcher):
 
     def __init__(self, *args, **kwargs):
         """Initialize the dispatcher."""
-        super().__init__(*args, **kwargs)
+        logger = kwargs.pop("logger", None)
+        logger = logger if logger is not None else _default_logger
+        super().__init__(*args, **kwargs, logger=logger)
         self._ledger_api_dialogues = LedgerApiDialogues()
 
     def get_ledger_id(self, message: Message) -> str:
diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 66a39a80b3..9760e022db 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -63,7 +63,7 @@
 from packages.fetchai.protocols.oef_search.message import OefSearchMessage
 
 
-_default_logger = logging.getLogger("aea.packages.fetchai.connections.oef")
+_default_logger = logging.getLogger("aea.packages.fetchai.connections.soef")
 
 PUBLIC_ID = PublicId.from_str("fetchai/soef:0.9.0")
 
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index da4a8d5dc4..3d84862432 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmRTPeJ8aTDuWs28EM7vbBEDbZ75XqqzCo8zhSNXEGmeK3
+  connection.py: QmZaBtcck4gXs92SH5vcptJMm1d1f8WqUuCwvfTXnxsc3y
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.7.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 8826c1bb2b..2c5b8f816b 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -22,14 +22,14 @@ fetchai/agents/weather_station,QmRAs7AY2R9RNi5M4gnSDiQzLb58z4nuCYAnG2UAnv3XC2
 fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
 fetchai/connections/http_client,QmaCa98anLuMAduNWtnApEwLWBcqdVkNBREBZ9T5VPSaUm
 fetchai/connections/http_server,QmT6JV2sB1rv7XZgx1bEpMjfQJAtpq775D2n8yvzKzSXYK
-fetchai/connections/ledger,QmYzBWDgAETzBr8PGPyKvdDMJMGPSo3KFiKVP9MmkVGfd9
+fetchai/connections/ledger,QmQRTE8m3ABL8cPeckfsL3pSYyaMFqqo6CFyZJuSfo62BH
 fetchai/connections/local,QmNXMDuB7vfGrhv2Q4R8REDicSUgXfVPd7x1tAP3847jsr
 fetchai/connections/oef,QmT6nbEYgjHPTwoXqV5FNeg7SUaraXGQGUhGeVGEhqXVDg
 fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,Qme2vP55mGemMKMWdHKGUaC1nW88ZEdD55qgdY9a984T7i
+fetchai/connections/soef,QmXBtvcw2mQdMwkEaoU9h4pRLkGGZueqJNzGCHA279CNQk
 fetchai/connections/stub,QmQxzFLTBjPUMkpE1uBdkoyhb7iXY4k8VPzyykpjhuUcK1
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd

From 1b93a80c052b9e00983c9ca3e091bfb8daf6343b Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Tue, 29 Sep 2020 18:36:46 +0300
Subject: [PATCH 103/131] fixes and tests

---
 aea/manager.py        | 142 ++++++++++++++------
 tests/test_manager.py | 292 +++++++++++++++++++++++++++++++++---------
 2 files changed, 334 insertions(+), 100 deletions(-)

diff --git a/aea/manager.py b/aea/manager.py
index a303eb7991..2c711f8057 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -16,6 +16,7 @@
 #   limitations under the License.
 #
 # ------------------------------------------------------------------------------
+
 """This module contains the implementation of AEA agents manager."""
 import asyncio
 import copy
@@ -74,37 +75,43 @@ def start(self) -> None:
 
     def wait(self) -> asyncio.Future:
         """Return future to wait task completed."""
-        if not self._done_future:
+        if not self._done_future:  # pragma: nocover
             raise ValueError("Task not started!")
         return self._done_future
 
     def stop(self) -> None:
         """Stop task."""
-        if not self.run_loop or not self.task:
+        if not self.run_loop or not self.task:  # pragma: nocover
             raise ValueError("Task was not started!")
         self.run_loop.call_soon_threadsafe(self.task.cancel)
 
     async def _run_wrapper(self) -> None:
         """Run task internals."""
-        if not self._done_future:
+        if not self._done_future:  # pragma: nocover
             raise ValueError("Task was not started! please use start method")
+        exc = None
         try:
             await self.run()
-            self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
-        except asyncio.CancelledError:
-            self.caller_loop.call_soon_threadsafe(self._done_future.set_result, None)
+        except asyncio.CancelledError:  # pragma: nocover
+            pass
         except Exception as e:  # pylint: disable=broad-except
-            self.caller_loop.call_soon_threadsafe(self._done_future.set_exception, e)
+            exc = e
+        finally:
+            self.caller_loop.call_soon_threadsafe(self._set_result, exc)
+
+    def _set_result(self, exc: Optional[BaseException]) -> None:
+        """Set result of task execution."""
+        if not self._done_future:  # pragma: nocover
+            return
+        if exc:
+            self._done_future.set_exception(exc)
+        else:
+            self._done_future.set_result(None)
 
     async def run(self) -> None:
         """Run task body."""
         self.agent.runtime.set_loop(self.run_loop)
-        try:
-            self.agent.runtime.start()
-            while True:
-                await asyncio.sleep(1)
-        finally:
-            self.agent.runtime.stop()
+        await self.agent.runtime.run()
 
     @property
     def is_running(self) -> bool:
@@ -154,7 +161,7 @@ def __init__(self, working_dir: str, mode: str = "async") -> None:
         self._agents: Dict[str, AgentAlias] = {}
         self._agents_tasks: Dict[str, AsyncTask] = {}
 
-        self._thread = Thread(target=self._run_thread, daemon=True)
+        self._thread: Optional[Thread] = None
         self._loop: Optional[asyncio.AbstractEventLoop] = None
         self._event: Optional[asyncio.Event] = None
 
@@ -203,17 +210,26 @@ async def _manager_loop(self) -> None:
                 agent_name = tasks_for_agents[task]
                 self._agents_tasks.pop(agent_name)
                 if task.exception():
-                    print(agent_name, "exceptioned", task.exception())
                     for callback in self._error_callbacks:
                         callback(agent_name, task.exception())
                 else:
                     await task
 
+    def add_error_callback(
+        self, error_callback: Callable[[str, BaseException], None]
+    ) -> None:
+        """Add error callback to call on error raised."""
+        self._error_callbacks.append(error_callback)
+
     def start_manager(self) -> "Manager":
         """Start manager."""
+        if self._is_running:
+            return self
+
         self._ensure_working_dir()
         self._started_event.clear()
         self._is_running = True
+        self._thread = Thread(target=self._run_thread, daemon=True)
         self._thread.start()
         self._started_event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
         return self
@@ -226,18 +242,40 @@ def stop_manager(self) -> "Manager":
 
         :return: None
         """
-        if not self._loop or not self._event:
+        if not self._is_running:
+            return self
+
+        if not self._loop or not self._event or not self._thread:  # pragma: nocover
             raise ValueError("Manager was not started!")
-        if self._was_working_dir_created:
-            rmtree(self.working_dir)
 
-        if self._thread.is_alive():
-            self.stop_all_agents()
+        if not self._thread.is_alive():  # pragma: nocover
+            return self
+
+        self.stop_all_agents()
+
+        for agent_name in self.list_agents():
+            self.remove_agent(agent_name)
+
+        for project in list(self._projects.keys()):
+            self.remove_project(project)
+
+        self._cleanup()
+
         self._is_running = False
+
         self._loop.call_soon_threadsafe(self._event.set)
-        self._thread.join(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+
+        if self._thread.ident != threading.get_ident():
+            self._thread.join(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+
+        self._thread = None
         return self
 
+    def _cleanup(self) -> None:
+        """Remove workdir if was created."""
+        if self._was_working_dir_created and os.path.exists(self.working_dir):
+            rmtree(self.working_dir)
+
     def add_project(self, public_id: PublicId) -> "Manager":
         """Fetch agent project and all dependencies to working_dir."""
         if public_id in self._projects:
@@ -290,6 +328,7 @@ def add_agent(
 
         if public_id not in self._projects:
             raise ValueError(f"{public_id} project is not added!")
+
         project = self._projects[public_id]
 
         agent_alias = self._build_agent_alias(
@@ -310,7 +349,7 @@ def list_agents(self, running_only: bool = False) -> List[str]:
         :return: list of agents names
         """
         if running_only:
-            return list(self._agents_tasks.keys())
+            return [i for i in self._agents.keys() if self._is_agent_running(i)]
         return list(self._agents.keys())
 
     def remove_agent(self, agent_name: str) -> "Manager":
@@ -339,12 +378,14 @@ def start_agent(self, agent_name: str) -> "Manager":
 
         :return: None
         """
-        if not self._loop or not self._event:
+        if not self._loop or not self._event:  # pragma: nocover
             raise ValueError("agent is not started!")
 
         agent_alias = self._agents.get(agent_name)
+
         if not agent_alias:
             raise ValueError(f"{agent_name} is not registered!")
+
         if self._is_agent_running(agent_name):
             raise ValueError(f"{agent_name} is already started!")
 
@@ -358,15 +399,13 @@ def start_agent(self, agent_name: str) -> "Manager":
         self._loop.call_soon_threadsafe(self._event.set)
         return self
 
-    def _is_agent_running(self, agent_name):
+    def _is_agent_running(self, agent_name: str) -> bool:
+        """Return is agent running state."""
         if agent_name not in self._agents_tasks:
             return False
 
         task = self._agents_tasks[agent_name]
-        if task.is_running:
-            return True
-        del self._agents_tasks[agent_name]
-        return False
+        return task.is_running
 
     def start_all_agents(self) -> "Manager":
         """
@@ -374,10 +413,13 @@ def start_all_agents(self) -> "Manager":
 
         :return: None
         """
-        for agent_name in self.list_agents():
-            if self._is_agent_running(agent_name):
-                continue
-            self.start_agent(agent_name)
+        self.start_agents(
+            [
+                agent_name
+                for agent_name in self.list_agents()
+                if not self._is_agent_running(agent_name)
+            ]
+        )
 
         return self
 
@@ -389,15 +431,31 @@ def stop_agent(self, agent_name: str) -> "Manager":
 
         :return: None
         """
-        if not self._is_agent_running(agent_name):
+        if not self._is_agent_running(agent_name) or not self._thread or not self._loop:
             raise ValueError(f"{agent_name} is not running!")
-        if self._thread.ident == threading.get_ident():
+
+        agent_task = self._agents_tasks[agent_name]
+
+        if self._thread.ident == threading.get_ident():  # pragma: nocover
             # In same thread do not perform blocking operations!
-            self._agents_tasks[agent_name].stop()
+            agent_task.stop()
             return self
+
+        wait_future = agent_task.wait()
+
         event = threading.Event()
-        self._agents_tasks[agent_name].wait().add_done_callback(lambda x: event.set())
-        self._agents_tasks[agent_name].stop()
+
+        def event_set(*args):  # pylint: disable=unused-argument
+            event.set()
+
+        def _add_cb():
+            if wait_future.done():
+                event_set()  # pragma: nocover
+            else:
+                wait_future.add_done_callback(event_set)  # pramga: nocover
+
+        self._loop.call_soon_threadsafe(_add_cb)
+        agent_task.stop()
         event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
         return self
@@ -408,8 +466,8 @@ def stop_all_agents(self) -> "Manager":
 
         :return: None
         """
-        for agent_name in self.list_agents(running_only=True):
-            self.stop_agent(agent_name)
+        agents_list = self.list_agents(running_only=True)
+        self.stop_agents(agents_list)
 
         return self
 
@@ -445,7 +503,7 @@ def get_agent_alias(self, agent_name: str) -> AgentAlias:
 
         :return: AgentAlias
         """
-        if agent_name not in self._agents:
+        if agent_name not in self._agents:  # pragma: nocover
             raise ValueError(f"Agent with name {agent_name} does not exist!")
         return self._agents[agent_name]
 
@@ -455,7 +513,7 @@ def _ensure_working_dir(self) -> None:
             os.makedirs(self.working_dir)
             self._was_working_dir_created = True
 
-        if not os.path.isdir(self.working_dir):
+        if not os.path.isdir(self.working_dir):  # pragma: nocover
             raise ValueError(f"{self.working_dir} is not a directory!")
         os.makedirs(self._keys_dir)
 
@@ -473,7 +531,7 @@ def _build_agent_alias(
 
         builder = AEABuilder.from_config_json(json_config, project.path)
         builder.set_name(agent_name)
-        # builder.set_runtime_mode("async")
+        builder.set_runtime_mode("threaded")
 
         if not builder.private_key_paths:
             default_ledger = json_config[0].get("default_ledger", DEFAULT_LEDGER)
diff --git a/tests/test_manager.py b/tests/test_manager.py
index 170ea6b96e..a0b08ecf6a 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -18,50 +18,91 @@
 # ------------------------------------------------------------------------------
 """This module contains tests for aea manager."""
 import os
-import time
-from contextlib import suppress
-from shutil import rmtree
+from unittest.mock import Mock, patch
 
 import pytest
 
 from aea.configurations.base import PublicId
 from aea.manager import Manager
 
+from tests.common.utils import wait_for_condition
 
-def test_manager():
-    """Perform some tests."""
-    # pydocsyle
-    try:
-        working_dir = "manager_dir"
-        project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
-        project_path = os.path.join(
-            working_dir, project_public_id.author, project_public_id.name
+
+class TestManagerAsyncMode:  # pylint: disable=unused-argument,protected-access,attribute-defined-outside-init
+    """Tests for manager in async mode."""
+
+    MODE = "async"
+
+    echo_skill_id = PublicId("fetchai", "echo", "0.7.0")
+
+    def setup(self):
+        """Set test case."""
+        self.agent_name = "test_what_ever12"
+        self.working_dir = "manager_dir"
+        self.project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
+        self.project_path = os.path.join(
+            self.working_dir, self.project_public_id.author, self.project_public_id.name
         )
-        assert not os.path.exists(working_dir)
-        manager = Manager(working_dir)
-        manager.start_manager()
-        assert os.path.exists(working_dir)
-        assert manager.is_running
+        assert not os.path.exists(self.working_dir)
+        self.manager = Manager(self.working_dir, mode=self.MODE)
+
+    def teardown(self):
+        """Tear down test case."""
+        self.manager.stop_manager()
+
+    def test_workdir_created_removed(self):
+        """Check work dit created removed on manager start and stop."""
+        assert not os.path.exists(self.working_dir)
+        self.manager.start_manager()
+        assert os.path.exists(self.working_dir)
+        self.manager.stop_manager()
+        assert not os.path.exists(self.working_dir)
+
+    def test_manager_is_running(self):
+        """Check manager is running property reflects state."""
+        assert not self.manager.is_running
+        self.manager.start_manager()
+        assert self.manager.is_running
+        self.manager.stop_manager()
+        assert not self.manager.is_running
 
-        manager.add_project(project_public_id)
+    def test_add_remove_project(self):
+        """Test add and remove project."""
+        self.manager.start_manager()
 
-        assert project_public_id in manager.list_projects()
-        assert os.path.exists(project_path)
-        assert manager._projects[project_public_id].path == project_path
+        self.manager.add_project(self.project_public_id)
+
+        assert self.project_public_id in self.manager.list_projects()
+        assert os.path.exists(self.project_path)
 
         with pytest.raises(ValueError, match=r".*was already added.*"):
-            manager.add_project(project_public_id)
-
-        echo_skill_id = PublicId("fetchai", "echo", "0.7.0")
-        new_tick_interval = 1.1111
-        agent_name = "test_what_ever12"
-        manager.add_agent(
-            project_public_id,
-            agent_name,
+            self.manager.add_project(self.project_public_id)
+
+        self.manager.remove_project(self.project_public_id)
+        assert self.project_public_id not in self.manager.list_projects()
+
+        with pytest.raises(ValueError, match=r"was not added"):
+            self.manager.remove_project(self.project_public_id)
+
+        self.manager.add_project(self.project_public_id)
+        assert self.project_public_id in self.manager.list_projects()
+        assert os.path.exists(self.project_path)
+
+    def test_add_agent(self):
+        """Test add agent alias."""
+        self.manager.start_manager()
+
+        self.manager.add_project(self.project_public_id)
+
+        new_tick_interval = 0.2111
+
+        self.manager.add_agent(
+            self.project_public_id,
+            self.agent_name,
             component_overrides=[
                 {
                     "type": "skill",
-                    **echo_skill_id.json,
+                    **self.echo_skill_id.json,
                     "behaviours": {
                         "echo": {
                             "args": {"tick_interval": new_tick_interval},
@@ -71,47 +112,182 @@ def test_manager():
                 }
             ],
         )
-        agent_alias = manager.get_agent_details(agent_name)
-        assert agent_alias.name == agent_name
+        agent_alias = self.manager.get_agent_alias(self.agent_name)
+        assert agent_alias.name == self.agent_name
         assert (
             agent_alias.agent.resources.get_behaviour(
-                echo_skill_id, "echo"
+                self.echo_skill_id, "echo"
             ).tick_interval
             == new_tick_interval
         )
         with pytest.raises(ValueError, match="already exists"):
-            manager.add_agent(
-                project_public_id, agent_name,
+            self.manager.add_agent(
+                self.project_public_id, self.agent_name,
             )
-        assert agent_name in manager.list_agents()
-        manager.start_all_agents()
-        assert agent_name in manager.list_agents(running_only=True)
-        manager.start_all_agents()
+
+    def test_remove_agent(self):
+        """Test remove agent alias."""
+        self.test_add_agent()
+        assert self.agent_name in self.manager.list_agents()
+        self.manager.remove_agent(self.agent_name)
+        assert self.agent_name not in self.manager.list_agents()
+
+        with pytest.raises(ValueError, match="does not exist!"):
+            self.manager.remove_agent(self.agent_name)
+
+    def test_remove_project_with_alias(self):
+        """Test remove project with alias presents."""
+        self.test_add_agent()
+
+        with pytest.raises(
+            ValueError, match="Can not remove projects with aliases exists"
+        ):
+            self.manager.remove_project(self.project_public_id)
+
+    def test_add_agent_for_non_exist_project(self):
+        """Test add agent when no project added."""
+        with pytest.raises(ValueError, match=" project is not added"):
+            self.manager.add_agent(PublicId("test", "test", "0.1.0"), "another_agent")
+
+    def test_agent_acually_running(self):
+        """Test manager starts agent correctly and agent perform acts."""
+        self.test_add_agent()
+        agent_alias = self.manager.get_agent_alias(self.agent_name)
+        behaviour = agent_alias.agent.resources.get_behaviour(
+            self.echo_skill_id, "echo"
+        )
+        assert behaviour
+        with patch.object(behaviour, "act") as act_mock:
+            self.manager.start_all_agents()
+            wait_for_condition(lambda: act_mock.call_count > 0, timeout=10)
+
+    def test_exception_handling(self):
+        """Test erro callback works."""
+        self.test_add_agent()
+        agent_alias = self.manager.get_agent_alias(self.agent_name)
+        behaviour = agent_alias.agent.resources.get_behaviour(
+            self.echo_skill_id, "echo"
+        )
+        callback_mock = Mock()
+
+        self.manager.add_error_callback(callback_mock)
+        assert behaviour
+
+        with patch.object(behaviour, "act", side_effect=ValueError("expected")):
+            self.manager.start_all_agents()
+            wait_for_condition(lambda: callback_mock.call_count > 0, timeout=10)
+
+    def test_stop_from_exception_handling(self):
+        """Test stop manager from erro callback."""
+        self.test_add_agent()
+        agent_alias = self.manager.get_agent_alias(self.agent_name)
+        behaviour = agent_alias.agent.resources.get_behaviour(
+            self.echo_skill_id, "echo"
+        )
+
+        def handler(*args, **kwargs):
+            self.manager.stop_manager()
+
+        self.manager.add_error_callback(handler)
+
+        assert behaviour
+
+        with patch.object(behaviour, "act", side_effect=ValueError("expected")):
+            self.manager.start_all_agents()
+            wait_for_condition(lambda: not self.manager.is_running, timeout=10)
+
+    def test_start_all(self):
+        """Test manager start all agents."""
+        self.test_add_agent()
+        assert self.agent_name in self.manager.list_agents()
+        assert self.agent_name not in self.manager.list_agents(running_only=True)
+        self.manager.start_all_agents()
+        assert self.agent_name in self.manager.list_agents(running_only=True)
+
+        self.manager.start_all_agents()
+
+        with pytest.raises(ValueError, match="is already started!"):
+            self.manager.start_agents(self.manager.list_agents())
 
         with pytest.raises(ValueError, match="is already started!"):
-            manager.start_agents(manager.list_agents())
+            self.manager.start_agent(self.agent_name)
+
+        with pytest.raises(ValueError, match="is not registered!"):
+            self.manager.start_agent("non_exists_agent")
+
+    def test_stop_agent(self):
+        """Test stop agent."""
+        self.test_start_all()
+        wait_for_condition(
+            lambda: self.manager.list_agents(running_only=True), timeout=10
+        )
+        self.manager.stop_all_agents()
+
+        assert not self.manager.list_agents(running_only=True)
 
+        with pytest.raises(ValueError, match=" is not running!"):
+            self.manager.stop_agent(self.agent_name)
+
+        with pytest.raises(ValueError, match=" is not running!"):
+            self.manager.stop_agents([self.agent_name])
+
+    def test_do_no_allow_override_some_fields(self):
+        """Do not allo to override some values in agent config."""
+        self.manager.start_manager()
+
+        self.manager.add_project(self.project_public_id)
+
+        BAD_OVERRIDES = ["skills", "connections", "contracts", "protocols"]
+
+        for bad_override in BAD_OVERRIDES:
+            with pytest.raises(ValueError, match="Do not override any"):
+                self.manager.add_agent(
+                    self.project_public_id,
+                    self.agent_name,
+                    agent_overrides={bad_override: "some value"},
+                )
+
+    @staticmethod
+    def test_invalid_mode():
+        """Test manager fails on invalid mode."""
+        with pytest.raises(ValueError, match="Invalid mode"):
+            Manager("test_dir", mode="invalid_mode")
+
+    def test_double_start(self):
+        """Test double manager start."""
+        self.manager.start_manager()
+        self.manager.start_manager()
+
+    def test_double_stop(self):
+        """Test double manager stop."""
+        self.manager.start_manager()
+        self.manager.stop_manager()
+        self.manager.stop_manager()
+
+    @pytest.mark.asyncio
+    async def test_run_loop_direct_call(self):
+        """Test do not allow to run manager_loop directly."""
+        with pytest.raises(
+            ValueError, match="Do not use this method directly, use start_manager"
+        ):
+            await self.manager._manager_loop()
+
+    def test_remove_running_agent(self):
+        """Test fail on remove running agent."""
+        self.test_start_all()
         with pytest.raises(ValueError, match="Agent is running. stop it first!"):
-            manager.remove_agent(agent_name)
+            self.manager.remove_agent(self.agent_name)
 
-        time.sleep(2)
-        manager.stop_all_agents()
+        self.manager.stop_all_agents()
+        wait_for_condition(
+            lambda: self.agent_name not in self.manager.list_agents(running_only=True),
+            timeout=5,
+        )
+        self.manager.remove_agent(self.agent_name)
+        assert self.agent_name not in self.manager.list_agents()
 
-        manager.remove_agent(agent_name)
-        assert agent_name not in manager.list_agents()
 
-        with pytest.raises(ValueError, match="does not exist!"):
-            manager.remove_agent(agent_name)
-        manager.remove_project(project_public_id)
-        assert project_public_id not in manager._projects
-        assert not os.path.exists(project_path)
-        assert project_public_id not in manager.list_projects()
+class TestManagerThreadedMode(TestManagerAsyncMode):
+    """Tests for manager in threaded mode."""
 
-        with pytest.raises(ValueError, match=r"was not added"):
-            manager.remove_project(project_public_id)
-        manager.stop_manager()
-        assert not os.path.exists(working_dir)
-        assert not manager.is_running
-    finally:
-        with suppress(FileNotFoundError):
-            rmtree(working_dir)
+    MODE = "threaded"

From 8eb1b6d7492b41b7bbf6f9f34691c0e8f4acd58a Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 29 Sep 2020 17:03:54 +0100
Subject: [PATCH 104/131] fix issues with previous commit

---
 packages/fetchai/connections/ledger/connection.yaml        | 4 ++--
 packages/fetchai/connections/ledger/contract_dispatcher.py | 3 ++-
 packages/fetchai/connections/ledger/ledger_dispatcher.py   | 2 +-
 packages/hashes.csv                                        | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/fetchai/connections/ledger/connection.yaml b/packages/fetchai/connections/ledger/connection.yaml
index 2edc0b499a..e5e6fb9093 100644
--- a/packages/fetchai/connections/ledger/connection.yaml
+++ b/packages/fetchai/connections/ledger/connection.yaml
@@ -10,8 +10,8 @@ fingerprint:
   __init__.py: QmZvYZ5ECcWwqiNGh8qNTg735wu51HqaLxTSifUxkQ4KGj
   base.py: QmdWmK8S9dX1U6jiRotdFrEfAbPhLUDvPj8yPiCwsJnUDZ
   connection.py: Qmdibf99GzdFjFCcoTX7AiiBVWznKvPZWvur8cngSRNdye
-  contract_dispatcher.py: QmNYR1K1MAMo6jZE84XhsTQBDtUZMuCE1PeBpJ2sMxM4dc
-  ledger_dispatcher.py: QmcpASNeDRwuPJ9wLfTHp3qEMutrUZV9VUzLWzvk312K2i
+  contract_dispatcher.py: QmbwomSmrddSY4wREL7ywHF2p9qQ3daCiv9VoYf9cbBR61
+  ledger_dispatcher.py: QmfFNHQQdGiE33Cef5vRHMnXJmLVr6mQGR3iENx5ShDnQk
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/contract_api:0.5.0
diff --git a/packages/fetchai/connections/ledger/contract_dispatcher.py b/packages/fetchai/connections/ledger/contract_dispatcher.py
index f9cddf8341..503d116088 100644
--- a/packages/fetchai/connections/ledger/contract_dispatcher.py
+++ b/packages/fetchai/connections/ledger/contract_dispatcher.py
@@ -81,7 +81,8 @@ def __init__(self, *args, **kwargs):
         """Initialize the dispatcher."""
         logger = kwargs.pop("logger", None)
         logger = logger if logger is not None else _default_logger
-        super().__init__(*args, **kwargs, logger=logger)
+
+        super().__init__(logger, *args, **kwargs)
         self._contract_api_dialogues = ContractApiDialogues()
 
     @property
diff --git a/packages/fetchai/connections/ledger/ledger_dispatcher.py b/packages/fetchai/connections/ledger/ledger_dispatcher.py
index 9f38cfd79c..4756d9a1eb 100644
--- a/packages/fetchai/connections/ledger/ledger_dispatcher.py
+++ b/packages/fetchai/connections/ledger/ledger_dispatcher.py
@@ -79,7 +79,7 @@ def __init__(self, *args, **kwargs):
         """Initialize the dispatcher."""
         logger = kwargs.pop("logger", None)
         logger = logger if logger is not None else _default_logger
-        super().__init__(*args, **kwargs, logger=logger)
+        super().__init__(logger, *args, **kwargs)
         self._ledger_api_dialogues = LedgerApiDialogues()
 
     def get_ledger_id(self, message: Message) -> str:
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 2c5b8f816b..712b147ae5 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -22,7 +22,7 @@ fetchai/agents/weather_station,QmRAs7AY2R9RNi5M4gnSDiQzLb58z4nuCYAnG2UAnv3XC2
 fetchai/connections/gym,Qmack3EaCW6ARrHrtCnJmL3kR2xrHutJmgD8uoRVGFz6kH
 fetchai/connections/http_client,QmaCa98anLuMAduNWtnApEwLWBcqdVkNBREBZ9T5VPSaUm
 fetchai/connections/http_server,QmT6JV2sB1rv7XZgx1bEpMjfQJAtpq775D2n8yvzKzSXYK
-fetchai/connections/ledger,QmQRTE8m3ABL8cPeckfsL3pSYyaMFqqo6CFyZJuSfo62BH
+fetchai/connections/ledger,QmPwbSbzK66j147Bjjxaqp3jRAR2ui59zthqFAqB5i7Uxy
 fetchai/connections/local,QmNXMDuB7vfGrhv2Q4R8REDicSUgXfVPd7x1tAP3847jsr
 fetchai/connections/oef,QmT6nbEYgjHPTwoXqV5FNeg7SUaraXGQGUhGeVGEhqXVDg
 fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh

From f82f467650c86c74d1622ddb5002a4d3a93762f5 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Tue, 29 Sep 2020 18:18:08 +0200
Subject: [PATCH 105/131] update tests

---
 aea/aea_builder.py                     |  4 +-
 aea/configurations/base.py             |  6 +--
 aea/helpers/base.py                    | 23 ++++++------
 tests/test_aea_builder.py              | 21 +++++------
 tests/test_configurations/test_base.py | 21 ++++++++---
 tests/test_helpers/test_base.py        | 51 +++++++++++++++++++++++++-
 6 files changed, 91 insertions(+), 35 deletions(-)

diff --git a/aea/aea_builder.py b/aea/aea_builder.py
index 3e71026779..82e66e5276 100644
--- a/aea/aea_builder.py
+++ b/aea/aea_builder.py
@@ -1372,10 +1372,10 @@ def _load_and_add_components(
                         logging.Logger, make_logger(configuration, agent_name)
                     )
             else:
-                if configuration.is_abstract_component:
+                new_configuration = self._overwrite_custom_configuration(configuration)
+                if new_configuration.is_abstract_component:
                     load_aea_package(configuration)
                     continue
-                new_configuration = self._overwrite_custom_configuration(configuration)
                 _logger = make_logger(new_configuration, agent_name)
                 component = load_component_from_config(
                     new_configuration, logger=_logger, **kwargs
diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 2b4d2e6e26..190dee4ef3 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -53,7 +53,7 @@
 
 from aea.__version__ import __version__ as __aea_version__
 from aea.exceptions import enforce
-from aea.helpers.base import merge_update
+from aea.helpers.base import recursive_update
 from aea.helpers.ipfs.base import IPFSHashOnly
 
 
@@ -1065,7 +1065,7 @@ def update(self, data: Dict) -> None:
         :return: None
         """
         new_config = data.get("config", {})
-        merge_update(self.config, new_config)
+        recursive_update(self.config, new_config)
 
 
 class ProtocolConfig(ComponentConfiguration):
@@ -1347,7 +1347,7 @@ def _update_skill_component_config(type_plural: str, data: Dict):
                 component_config = cast(
                     SkillComponentConfiguration, registry.read(component_name)
                 )
-                merge_update(component_config.args, component_data.get("args", {}))
+                recursive_update(component_config.args, component_data.get("args", {}))
 
         _update_skill_component_config("behaviours", data)
         _update_skill_component_config("handlers", data)
diff --git a/aea/helpers/base.py b/aea/helpers/base.py
index e39a9fe80b..3289f0c175 100644
--- a/aea/helpers/base.py
+++ b/aea/helpers/base.py
@@ -392,36 +392,37 @@ def exception_log_and_reraise(log_method: Callable, message: str):
         raise
 
 
-def merge_update(to_update: Dict, new_values: Dict):
+def recursive_update(to_update: Dict, new_values: Dict):
     """
-    Merge two dictionaries by replacing conflicts with the new values.
+    Update a dictionary by replacing conflicts with the new values.
 
     It does side-effects to the first dictionary.
 
     >>> to_update = dict(a=1, b=2, subdict=dict(subfield1=1))
-    >>> new_values = dict(b=3, c=4, subdict=dict(subfield2=2))
-    >>> merge_update(to_update, new_values)
+    >>> new_values = dict(b=3, subdict=dict(subfield1=2))
+    >>> recursive_update(to_update, new_values)
     >>> to_update
-    {'a': 1, 'b': 3, 'subdict': {'subfield1': 1, 'subfield2': 2}, 'c': 4}
+    {'a': 1, 'b': 3, 'subdict': {'subfield1': 2}}
 
     :param to_update: the dictionary to update.
-    :param new_values: the dictionary of new values to add/replace.
-    :return: the merged dictionary.
+    :param new_values: the dictionary of new values to replace.
+    :return: the updated dictionary.
     """
     for key, value in new_values.items():
         if key not in to_update:
-            to_update[key] = value
-            continue
+            raise ValueError(
+                f"Key '{key}' is not contained in the dictionary to update."
+            )
 
         value_to_update = to_update[key]
         value_type = type(value)
         value_to_update_type = type(value_to_update)
         if value_type != value_to_update_type:
             raise ValueError(
-                f"Trying to replace value '{value}' with value '{value_to_update}' which is of different type."
+                f"Trying to replace value '{value_to_update}' with value '{value}' which is of different type."
             )
 
         if value_type == value_to_update_type == dict:
-            merge_update(value_to_update, value)
+            recursive_update(value_to_update, value)
         else:
             to_update[key] = value
diff --git a/tests/test_aea_builder.py b/tests/test_aea_builder.py
index 667a3b6a96..f99aa5fbec 100644
--- a/tests/test_aea_builder.py
+++ b/tests/test_aea_builder.py
@@ -616,18 +616,15 @@ def _add_dummy_skill_config(self):
         behaviours:
           dummy:
             args:
-            {indent(yaml.dump(self.expected_behaviour_args), "  ")}
-            class_name: DummyBehaviour
+            {indent(yaml.dump(self.new_behaviour_args), "  ")}
         handlers:
           dummy:
             args:
-            {indent(yaml.dump(self.expected_handler_args), "  ")}
-            class_name: DummyHandler
+            {indent(yaml.dump(self.new_handler_args), "  ")}
         models:
           dummy:
             args:
-            {indent(yaml.dump(self.expected_model_args), "  ")}
-            class_name: DummyModel
+            {indent(yaml.dump(self.new_model_args), "  ")}
         ...
         """
         )
@@ -635,9 +632,9 @@ def _add_dummy_skill_config(self):
 
     def test_from_project(self):
         """Test builder set from project dir."""
-        self.expected_behaviour_args = {"behaviour_arg_1": 42}
-        self.expected_handler_args = {"handler_arg_1": 42}
-        self.expected_model_args = {"model_arg_1": 42}
+        self.new_behaviour_args = {"behaviour_arg_1": 42}
+        self.new_handler_args = {"handler_arg_1": 42}
+        self.new_model_args = {"model_arg_1": 42}
         self._add_dummy_skill_config()
         builder = AEABuilder.from_aea_project(Path(self._get_cwd()))
         with cd(self._get_cwd()):
@@ -647,11 +644,11 @@ def test_from_project(self):
             PublicId("dummy_author", "dummy", "0.1.0")
         )
         dummy_behaviour = dummy_skill.behaviours["dummy"]
-        assert dummy_behaviour.config == self.expected_behaviour_args
+        assert dummy_behaviour.config == {"behaviour_arg_1": 42, "behaviour_arg_2": "2"}
         dummy_handler = dummy_skill.handlers["dummy"]
-        assert dummy_handler.config == self.expected_handler_args
+        assert dummy_handler.config == {"handler_arg_1": 42, "handler_arg_2": "2"}
         dummy_model = dummy_skill.models["dummy"]
-        assert dummy_model.config == self.expected_model_args
+        assert dummy_model.config == {"model_arg_1": 42, "model_arg_2": "2"}
 
 
 class TestFromAEAProjectMakeSkillAbstract(AEATestCase):
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index f75385294f..c2fb7954ec 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -208,20 +208,20 @@ def test_update_method(self):
 
         dummy_behaviour = skill_config.behaviours.read("dummy")
         expected_dummy_behaviour_args = copy(dummy_behaviour.args)
-        expected_dummy_behaviour_args["new_arg"] = 1
+        expected_dummy_behaviour_args["behaviour_arg_1"] = 42
 
         dummy_handler = skill_config.handlers.read("dummy")
         expected_dummy_handler_args = copy(dummy_handler.args)
-        expected_dummy_handler_args["new_arg"] = 1
+        expected_dummy_handler_args["handler_arg_1"] = 42
 
         dummy_model = skill_config.models.read("dummy")
         expected_dummy_model_args = copy(dummy_model.args)
-        expected_dummy_model_args["new_arg"] = 1
+        expected_dummy_model_args["model_arg_1"] = 42
 
         new_configurations = {
-            "behaviours": {"dummy": {"args": dict(new_arg=1)}},
-            "handlers": {"dummy": {"args": dict(new_arg=1)}},
-            "models": {"dummy": {"args": dict(new_arg=1)}},
+            "behaviours": {"dummy": {"args": dict(behaviour_arg_1=42)}},
+            "handlers": {"dummy": {"args": dict(handler_arg_1=42)}},
+            "models": {"dummy": {"args": dict(model_arg_1=42)}},
         }
         skill_config.update(new_configurations)
 
@@ -744,3 +744,12 @@ def test_package_version_lt():
     v2 = PackageVersion("0.2.0")
     v3 = PackageVersion("latest")
     assert v1 < v2 < v3
+
+
+def test_configuration_class():
+    """Test the attribute 'configuration class' of PackageType."""
+    assert PackageType.PROTOCOL.configuration_class() == ProtocolConfig
+    assert PackageType.CONNECTION.configuration_class() == ConnectionConfig
+    assert PackageType.CONTRACT.configuration_class() == ContractConfig
+    assert PackageType.SKILL.configuration_class() == SkillConfig
+    assert PackageType.AGENT.configuration_class() == AgentConfig
diff --git a/tests/test_helpers/test_base.py b/tests/test_helpers/test_base.py
index b063cc3732..24b5678032 100644
--- a/tests/test_helpers/test_base.py
+++ b/tests/test_helpers/test_base.py
@@ -38,6 +38,7 @@
     load_env_file,
     load_module,
     locate,
+    recursive_update,
     retry_decorator,
     send_control_c,
     try_decorator,
@@ -209,7 +210,7 @@ def test_send_control_c():
     # because o/w pytest would be stopped.
     process = Popen(  # nosec
         ["timeout" if platform.system() == "Windows" else "sleep", "5"],
-        **win_popen_kwargs()
+        **win_popen_kwargs(),
     )
     time.sleep(0.001)
     send_control_c(process)
@@ -241,3 +242,51 @@ def test_yaml_dump_all_load_all():
 
     f.seek(0)
     assert yaml_load_all(f) == data
+
+
+def test_recursive_update_no_recursion():
+    """Test the 'recursive update' utility, in the case there's no recursion."""
+    to_update = dict(not_updated=0, an_integer=1, a_list=[1, 2, 3], a_tuple=(1, 2, 3))
+
+    new_integer, new_list, new_tuple = 2, [3], (3,)
+    new_values = dict(an_integer=new_integer, a_list=new_list, a_tuple=new_tuple)
+    recursive_update(to_update, new_values)
+    assert to_update == dict(
+        not_updated=0, an_integer=new_integer, a_list=new_list, a_tuple=new_tuple
+    )
+
+
+def test_recursive_update_with_recursion():
+    """Test the 'recursive update' utility with recursion."""
+    # here we try to update an integer and add a new value
+    to_update = dict(subdict=dict(to_update=1))
+    new_values = dict(subdict=dict(to_update=2))
+
+    recursive_update(to_update, new_values)
+    assert to_update == dict(subdict=dict(to_update=2))
+
+
+def test_recursive_update_negative_different_type():
+    """Test the 'recursive update' utility, when the types are different."""
+    # here we try to update an integer with a boolean - it raises error.
+    to_update = dict(subdict=dict(to_update=1))
+    new_values = dict(subdict=dict(to_update=False))
+
+    with pytest.raises(
+        ValueError,
+        match=f"Trying to replace value '1' with value 'False' which is of different type.",
+    ):
+        recursive_update(to_update, new_values)
+
+
+def test_recursive_update_negative_unknown_field():
+    """Test the 'recursive update' utility, when there are unknown fields."""
+    # here we try to update an integer with a boolean - it raises error.
+    to_update = dict(subdict=dict(field=1))
+    new_values = dict(subdict=dict(new_field=False))
+
+    with pytest.raises(
+        ValueError,
+        match=f"Key 'new_field' is not contained in the dictionary to update.",
+    ):
+        recursive_update(to_update, new_values)

From 437c116e969acc9b844d690fbe9a03203f1cca4a Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Tue, 29 Sep 2020 23:59:35 +0300
Subject: [PATCH 106/131] fixes

---
 aea/configurations/project.py | 21 ++++++++-
 aea/manager.py                | 88 +++++++++++++++--------------------
 scripts/whitelist.py          |  9 ++++
 tests/test_manager.py         | 40 ++++++++--------
 4 files changed, 87 insertions(+), 71 deletions(-)

diff --git a/aea/configurations/project.py b/aea/configurations/project.py
index 8aeace45b8..11e6631807 100644
--- a/aea/configurations/project.py
+++ b/aea/configurations/project.py
@@ -19,8 +19,9 @@
 """This module contains the implementation of AEA agents project configuiration."""
 import os
 from shutil import rmtree
-from typing import Set
+from typing import Dict, List, Set
 
+from aea.aea import AEA
 from aea.cli.registry.fetch import fetch_agent
 from aea.cli.utils.context import Context
 from aea.configurations.base import PublicId
@@ -48,3 +49,21 @@ def load(cls, working_dir: str, public_id: PublicId) -> "Project":
     def remove(self) -> None:
         """Remove project, do cleanup."""
         rmtree(self.path)
+
+
+class AgentAlias:
+    """Agent alias representation."""
+
+    def __init__(
+        self, project: Project, agent_name: str, config: List[Dict], agent: AEA
+    ):
+        """Init agent alias with project, config, name, agent."""
+        self.project = project
+        self.config = config
+        self.agent_name = agent_name
+        self.agent = agent
+        self.project.agents.add(self.agent_name)
+
+    def remove_from_project(self):
+        """Remove agent alias from project."""
+        self.project.agents.remove(self.agent_name)
diff --git a/aea/manager.py b/aea/manager.py
index 2c711f8057..470e4f8e0f 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -31,28 +31,12 @@
 from aea.aea_builder import AEABuilder
 from aea.configurations.base import ComponentId, PublicId
 from aea.configurations.constants import DEFAULT_LEDGER
-from aea.configurations.project import Project
+from aea.configurations.project import AgentAlias, Project
 from aea.crypto.helpers import create_private_key
 from aea.helpers.base import yaml_load_all
 
 
-class AgentAlias:
-    """Agent alias representation."""
-
-    def __init__(self, project: Project, name: str, config: List[Dict], agent: AEA):
-        """Init agent alias with project, config, name, agent."""
-        self.project = project
-        self.config = config
-        self.name = name
-        self.agent = agent
-        self.project.agents.add(self.name)
-
-    def remove(self):
-        """Remove agent alias from project."""
-        self.project.agents.remove(self.name)
-
-
-class AsyncTask:
+class AgentRunAsyncTask:
     """Async task wrapper for agent."""
 
     def __init__(self, agent: AEA, loop: asyncio.AbstractEventLoop) -> None:
@@ -119,12 +103,12 @@ def is_running(self) -> bool:
         return not self.wait().done()
 
 
-class ThreadedTask(AsyncTask):
-    """Threaded task."""
+class AgentRunThreadTask(AgentRunAsyncTask):
+    """Threaded wrapper to run agent."""
 
     def __init__(self, agent: AEA, loop: asyncio.AbstractEventLoop) -> None:
         """Init task with agent and loop."""
-        AsyncTask.__init__(self, agent, loop)
+        AgentRunAsyncTask.__init__(self, agent, loop)
         self._thread: Optional[Thread] = None
 
     def create_run_loop(self) -> None:
@@ -140,12 +124,12 @@ def start(self) -> None:
         self._thread.start()
 
 
-class Manager:
-    """Abstract agents manager."""
+class MultiAgentManager:
+    """Multi agents manager."""
 
     AGENT_DO_NOT_OVERRIDE_VALUES = ["skills", "connections", "protocols", "contracts"]
     MODES = ["async", "threaded"]
-    DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS = 60
+    DEFAULT_TIMEOUT_FOR_BLOCKING_OPERATIONS = 60
 
     def __init__(self, working_dir: str, mode: str = "async") -> None:
         """
@@ -159,7 +143,7 @@ def __init__(self, working_dir: str, mode: str = "async") -> None:
         self._projects: Dict[PublicId, Project] = {}
         self._keys_dir = os.path.abspath(os.path.join(self.working_dir, "keys"))
         self._agents: Dict[str, AgentAlias] = {}
-        self._agents_tasks: Dict[str, AsyncTask] = {}
+        self._agents_tasks: Dict[str, AgentRunAsyncTask] = {}
 
         self._thread: Optional[Thread] = None
         self._loop: Optional[asyncio.AbstractEventLoop] = None
@@ -186,28 +170,30 @@ def _run_thread(self) -> None:
         self._loop.run_until_complete(self._manager_loop())
 
     async def _manager_loop(self) -> None:
-        """Perform manager stop."""
+        """Await and control running manager."""
         if not self._event:
             raise ValueError("Do not use this method directly, use start_manager.")
 
         self._started_event.set()
 
         while self._is_running:
-            tasks_for_agents = {
+            agents_run_tasks_futures = {
                 task.wait(): agent_name
                 for agent_name, task in self._agents_tasks.items()
             }
-            wait_tasks = list(tasks_for_agents.keys()) + [self._event.wait()]  # type: ignore
+            wait_tasks = list(agents_run_tasks_futures.keys()) + [self._event.wait()]  # type: ignore
             done, _ = await asyncio.wait(wait_tasks, return_when=FIRST_COMPLETED)
 
             if self._event.is_set():
                 self._event.clear()
 
             for task in done:
-                if task not in tasks_for_agents:
+                if task not in agents_run_tasks_futures:
+                    # task not in agents_run_tasks_futures, so it's event_wait, skip it
                     await task
                     continue
-                agent_name = tasks_for_agents[task]
+
+                agent_name = agents_run_tasks_futures[task]
                 self._agents_tasks.pop(agent_name)
                 if task.exception():
                     for callback in self._error_callbacks:
@@ -221,7 +207,7 @@ def add_error_callback(
         """Add error callback to call on error raised."""
         self._error_callbacks.append(error_callback)
 
-    def start_manager(self) -> "Manager":
+    def start_manager(self) -> "MultiAgentManager":
         """Start manager."""
         if self._is_running:
             return self
@@ -231,10 +217,10 @@ def start_manager(self) -> "Manager":
         self._is_running = True
         self._thread = Thread(target=self._run_thread, daemon=True)
         self._thread.start()
-        self._started_event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+        self._started_event.wait(self.DEFAULT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
         return self
 
-    def stop_manager(self) -> "Manager":
+    def stop_manager(self) -> "MultiAgentManager":
         """
         Stop manager.
 
@@ -266,7 +252,7 @@ def stop_manager(self) -> "Manager":
         self._loop.call_soon_threadsafe(self._event.set)
 
         if self._thread.ident != threading.get_ident():
-            self._thread.join(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+            self._thread.join(self.DEFAULT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
         self._thread = None
         return self
@@ -276,17 +262,17 @@ def _cleanup(self) -> None:
         if self._was_working_dir_created and os.path.exists(self.working_dir):
             rmtree(self.working_dir)
 
-    def add_project(self, public_id: PublicId) -> "Manager":
+    def add_project(self, public_id: PublicId) -> "MultiAgentManager":
         """Fetch agent project and all dependencies to working_dir."""
         if public_id in self._projects:
             raise ValueError(f"Project {public_id} was already added!")
         self._projects[public_id] = Project.load(self.working_dir, public_id)
         return self
 
-    def remove_project(self, public_id: PublicId) -> "Manager":
+    def remove_project(self, public_id: PublicId) -> "MultiAgentManager":
         """Remove agent project."""
         if public_id not in self._projects:
-            raise ValueError(f"Project {public_id} was not added!")
+            raise ValueError(f"Project {public_id} is not present!")
 
         if self._projects[public_id].agents:
             raise ValueError(
@@ -307,10 +293,10 @@ def list_projects(self) -> List[PublicId]:
     def add_agent(
         self,
         public_id: PublicId,
-        agent_name: str,
+        agent_name: Optional[str] = None,
         agent_overrides: Optional[dict] = None,
         component_overrides: Optional[List[dict]] = None,
-    ) -> "Manager":
+    ) -> "MultiAgentManager":
         """
         Create new agent configuration based on project with config overrides applied.
 
@@ -323,6 +309,8 @@ def add_agent(
 
         :return: manager
         """
+        agent_name = agent_name or public_id.name
+
         if agent_name in self._agents:
             raise ValueError(f"Agent with name {agent_name} already exists!")
 
@@ -352,7 +340,7 @@ def list_agents(self, running_only: bool = False) -> List[str]:
             return [i for i in self._agents.keys() if self._is_agent_running(i)]
         return list(self._agents.keys())
 
-    def remove_agent(self, agent_name: str) -> "Manager":
+    def remove_agent(self, agent_name: str) -> "MultiAgentManager":
         """
         Remove agent alias definition from registry.
 
@@ -367,10 +355,10 @@ def remove_agent(self, agent_name: str) -> "Manager":
             raise ValueError("Agent is running. stop it first!")
 
         agent_alias = self._agents.pop(agent_name)
-        agent_alias.remove()
+        agent_alias.remove_from_project()
         return self
 
-    def start_agent(self, agent_name: str) -> "Manager":
+    def start_agent(self, agent_name: str) -> "MultiAgentManager":
         """
         Start selected agent.
 
@@ -390,9 +378,9 @@ def start_agent(self, agent_name: str) -> "Manager":
             raise ValueError(f"{agent_name} is already started!")
 
         if self._mode == "async":
-            task = AsyncTask(agent_alias.agent, self._loop)
+            task = AgentRunAsyncTask(agent_alias.agent, self._loop)
         elif self._mode == "threaded":
-            task = ThreadedTask(agent_alias.agent, self._loop)
+            task = AgentRunThreadTask(agent_alias.agent, self._loop)
 
         task.start()
         self._agents_tasks[agent_name] = task
@@ -407,7 +395,7 @@ def _is_agent_running(self, agent_name: str) -> bool:
         task = self._agents_tasks[agent_name]
         return task.is_running
 
-    def start_all_agents(self) -> "Manager":
+    def start_all_agents(self) -> "MultiAgentManager":
         """
         Start all not started agents.
 
@@ -423,7 +411,7 @@ def start_all_agents(self) -> "Manager":
 
         return self
 
-    def stop_agent(self, agent_name: str) -> "Manager":
+    def stop_agent(self, agent_name: str) -> "MultiAgentManager":
         """
         Stop running agent.
 
@@ -456,11 +444,11 @@ def _add_cb():
 
         self._loop.call_soon_threadsafe(_add_cb)
         agent_task.stop()
-        event.wait(self.DEFALUT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
+        event.wait(self.DEFAULT_TIMEOUT_FOR_BLOCKING_OPERATIONS)
 
         return self
 
-    def stop_all_agents(self) -> "Manager":
+    def stop_all_agents(self) -> "MultiAgentManager":
         """
         Stop all agents running.
 
@@ -471,7 +459,7 @@ def stop_all_agents(self) -> "Manager":
 
         return self
 
-    def stop_agents(self, agent_names: List[str]) -> "Manager":
+    def stop_agents(self, agent_names: List[str]) -> "MultiAgentManager":
         """
         Stop specified agents.
 
@@ -486,7 +474,7 @@ def stop_agents(self, agent_names: List[str]) -> "Manager":
 
         return self
 
-    def start_agents(self, agent_names: List[str]) -> "Manager":
+    def start_agents(self, agent_names: List[str]) -> "MultiAgentManager":
         """
         Stop specified agents.
 
diff --git a/scripts/whitelist.py b/scripts/whitelist.py
index 9547a8a7fa..e16caa277f 100644
--- a/scripts/whitelist.py
+++ b/scripts/whitelist.py
@@ -190,3 +190,12 @@
 receiver_address  # unused variable (aea/decision_maker/default.py:99)
 create_with_message  # unused method (aea/helpers/dialogue/base.py:1054)
 _.is_disconnecting  # unused property (aea/multiplexer.py:67)
+MultiAgentManager  # unused class (aea/manager.py:127)
+_.add_error_callback  # unused method (aea/manager.py:202)
+_.start_manager  # unused method (aea/manager.py:208)
+_.stop_manager  # unused method (aea/manager.py:221)
+_.add_project  # unused method (aea/manager.py:263)
+_.list_projects  # unused method (aea/manager.py:283)
+_.add_agent  # unused method (aea/manager.py:291)
+_.start_all_agents  # unused method (aea/manager.py:396)
+_.get_agent_alias  # unused method (aea/manager.py:486)
diff --git a/tests/test_manager.py b/tests/test_manager.py
index a0b08ecf6a..46237f3b1e 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -23,13 +23,13 @@
 import pytest
 
 from aea.configurations.base import PublicId
-from aea.manager import Manager
+from aea.manager import MultiAgentManager
 
 from tests.common.utils import wait_for_condition
 
 
-class TestManagerAsyncMode:  # pylint: disable=unused-argument,protected-access,attribute-defined-outside-init
-    """Tests for manager in async mode."""
+class TestMultiAgentManagerAsyncMode:  # pylint: disable=unused-argument,protected-access,attribute-defined-outside-init
+    """Tests for MultiAgentManager in async mode."""
 
     MODE = "async"
 
@@ -38,28 +38,28 @@ class TestManagerAsyncMode:  # pylint: disable=unused-argument,protected-access,
     def setup(self):
         """Set test case."""
         self.agent_name = "test_what_ever12"
-        self.working_dir = "manager_dir"
+        self.working_dir = "MultiAgentManager_dir"
         self.project_public_id = PublicId("fetchai", "my_first_aea", "0.11.0")
         self.project_path = os.path.join(
             self.working_dir, self.project_public_id.author, self.project_public_id.name
         )
         assert not os.path.exists(self.working_dir)
-        self.manager = Manager(self.working_dir, mode=self.MODE)
+        self.manager = MultiAgentManager(self.working_dir, mode=self.MODE)
 
     def teardown(self):
         """Tear down test case."""
         self.manager.stop_manager()
 
     def test_workdir_created_removed(self):
-        """Check work dit created removed on manager start and stop."""
+        """Check work dit created removed on MultiAgentManager start and stop."""
         assert not os.path.exists(self.working_dir)
         self.manager.start_manager()
         assert os.path.exists(self.working_dir)
         self.manager.stop_manager()
         assert not os.path.exists(self.working_dir)
 
-    def test_manager_is_running(self):
-        """Check manager is running property reflects state."""
+    def test_MultiAgentManager_is_running(self):
+        """Check MultiAgentManager is running property reflects state."""
         assert not self.manager.is_running
         self.manager.start_manager()
         assert self.manager.is_running
@@ -81,7 +81,7 @@ def test_add_remove_project(self):
         self.manager.remove_project(self.project_public_id)
         assert self.project_public_id not in self.manager.list_projects()
 
-        with pytest.raises(ValueError, match=r"was not added"):
+        with pytest.raises(ValueError, match=r"is not present"):
             self.manager.remove_project(self.project_public_id)
 
         self.manager.add_project(self.project_public_id)
@@ -113,7 +113,7 @@ def test_add_agent(self):
             ],
         )
         agent_alias = self.manager.get_agent_alias(self.agent_name)
-        assert agent_alias.name == self.agent_name
+        assert agent_alias.agent_name == self.agent_name
         assert (
             agent_alias.agent.resources.get_behaviour(
                 self.echo_skill_id, "echo"
@@ -150,7 +150,7 @@ def test_add_agent_for_non_exist_project(self):
             self.manager.add_agent(PublicId("test", "test", "0.1.0"), "another_agent")
 
     def test_agent_acually_running(self):
-        """Test manager starts agent correctly and agent perform acts."""
+        """Test MultiAgentManager starts agent correctly and agent perform acts."""
         self.test_add_agent()
         agent_alias = self.manager.get_agent_alias(self.agent_name)
         behaviour = agent_alias.agent.resources.get_behaviour(
@@ -178,7 +178,7 @@ def test_exception_handling(self):
             wait_for_condition(lambda: callback_mock.call_count > 0, timeout=10)
 
     def test_stop_from_exception_handling(self):
-        """Test stop manager from erro callback."""
+        """Test stop MultiAgentManager from erro callback."""
         self.test_add_agent()
         agent_alias = self.manager.get_agent_alias(self.agent_name)
         behaviour = agent_alias.agent.resources.get_behaviour(
@@ -197,7 +197,7 @@ def handler(*args, **kwargs):
             wait_for_condition(lambda: not self.manager.is_running, timeout=10)
 
     def test_start_all(self):
-        """Test manager start all agents."""
+        """Test MultiAgentManager start all agents."""
         self.test_add_agent()
         assert self.agent_name in self.manager.list_agents()
         assert self.agent_name not in self.manager.list_agents(running_only=True)
@@ -249,24 +249,24 @@ def test_do_no_allow_override_some_fields(self):
 
     @staticmethod
     def test_invalid_mode():
-        """Test manager fails on invalid mode."""
+        """Test MultiAgentManager fails on invalid mode."""
         with pytest.raises(ValueError, match="Invalid mode"):
-            Manager("test_dir", mode="invalid_mode")
+            MultiAgentManager("test_dir", mode="invalid_mode")
 
     def test_double_start(self):
-        """Test double manager start."""
+        """Test double MultiAgentManager start."""
         self.manager.start_manager()
         self.manager.start_manager()
 
     def test_double_stop(self):
-        """Test double manager stop."""
+        """Test double MultiAgentManager stop."""
         self.manager.start_manager()
         self.manager.stop_manager()
         self.manager.stop_manager()
 
     @pytest.mark.asyncio
     async def test_run_loop_direct_call(self):
-        """Test do not allow to run manager_loop directly."""
+        """Test do not allow to run MultiAgentManager_loop directly."""
         with pytest.raises(
             ValueError, match="Do not use this method directly, use start_manager"
         ):
@@ -287,7 +287,7 @@ def test_remove_running_agent(self):
         assert self.agent_name not in self.manager.list_agents()
 
 
-class TestManagerThreadedMode(TestManagerAsyncMode):
-    """Tests for manager in threaded mode."""
+class TestMultiAgentManagerThreadedMode(TestMultiAgentManagerAsyncMode):
+    """Tests for MultiAgentManager in threaded mode."""
 
     MODE = "threaded"

From 10cbc3911c6c7ff1d7ba046e00fd426edd05432c Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 30 Sep 2020 11:27:42 +0100
Subject: [PATCH 107/131] docs updates, including multi agent manager

---
 docs/acn.md                 |  4 +++
 docs/config.md              |  2 +-
 docs/message-routing.md     |  8 +++---
 docs/multi-agent-manager.md | 54 +++++++++++++++++++++++++++++++++++++
 mkdocs.yml                  |  1 +
 5 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 docs/multi-agent-manager.md

diff --git a/docs/acn.md b/docs/acn.md
index ff5e4ec970..63d7572a7d 100644
--- a/docs/acn.md
+++ b/docs/acn.md
@@ -4,4 +4,8 @@
   <p>Details coming soon. In the meantime check out <a href="../p2p-connection">this section.</a></p>
 </div>
 
+
+missing:
+- different configurations of setting up peer and client
+
 <br />
diff --git a/docs/config.md b/docs/config.md
index 6e4435706e..1173780dbf 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -10,7 +10,7 @@ PUBLIC_ID_REGEX: "^[a-zA-Z0-9_]*/[a-zA-Z_][a-zA-Z0-9_]*:(0|[1-9]\\d*)\\.(0|[1-9]
 LEDGER_ID_REGEX: "^[^\\d\\W]\\w*\\Z"
 ```
 
-The `aea-config.yaml` defines the AEA project. The compulsary components are listed below:
+The `aea-config.yaml` defines the AEA project. The compulsory components are listed below:
 ``` yaml
 agent_name: my_agent                            # Name of the AEA project (must satisfy PACKAGE_REGEX)
 author: fetchai                                 # Author handle of the project's author (must satisfy AUTHOR_REGEX)
diff --git a/docs/message-routing.md b/docs/message-routing.md
index a387eab022..8b2741aaf1 100644
--- a/docs/message-routing.md
+++ b/docs/message-routing.md
@@ -13,9 +13,11 @@ Message routing can be split up into the routing of incoming and outgoing `Messa
 - `Skills` deposit `Messages` in `OutBox`
 - `OutBox` constructs an `Envelope` from the `Message`
 - `Multiplexer` assigns messages to relevant `Connection` based on three rules:
-1. checks if `EnvelopeContext` exists and specifies a `Connection`, if so uses that else
-2. checks if default routing is specified for the `protocol_id` referenced in the `Envelope`, if so uses that else
-3. sends to default `Connection`.
+
+	1. checks if `EnvelopeContext` exists and specifies a `Connection`, if so uses that else
+	2. checks if default routing is specified for the `protocol_id` referenced in the `Envelope`, if so uses that else
+	3. sends to default `Connection`.
+
 - `Connections` can encode envelopes where necessary or pass them on for transport to another agent
 
 ## Address fields in `Envelopes`/`Messages`
diff --git a/docs/multi-agent-manager.md b/docs/multi-agent-manager.md
new file mode 100644
index 0000000000..4ff3d1747f
--- /dev/null
+++ b/docs/multi-agent-manager.md
@@ -0,0 +1,54 @@
+
+The <a href="../api/manager">`MultiAgentManager`</a> allows managing multiple agent projects programmatically.
+
+## Setup
+
+We intantiate the manager by providing it with the working directory in which to operate and starting it:
+
+``` python
+from aea.manager import MultiAgentManager
+
+WORKING_DIR = "."
+
+manager = MultiAgentManager(WORKING_DIR)
+manager.start_manager()
+```
+
+## Adding projects
+
+We first add a couple of finished AEA project:
+
+``` python
+manager.add_project("fetchai/weather_client:0.13.0")
+manager.add_project("fetchai/weather_station:0.13.0")
+```
+
+## Adding agent instances
+
+``` python
+manager.add_agent("fetchai/weather_client:0.13.0")
+manager.add_agent("fetchai/weather_station:0.13.0")
+```
+
+missing:
+- configuring private keys
+- configure delayed startup sequence
+
+
+## Running the agents:
+
+``` python
+manager.start_all_agents()
+```
+
+## Stopping the agents:
+
+``` python
+manager.stop_all_agents()
+```
+
+## Cleaning up
+
+``` python
+manager.stop_manager()
+```
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 749294b81b..d68fc85c12 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -62,6 +62,7 @@ nav:
         - AEAs vs agents: 'agent-vs-aea.md'
         - Upgrading versions: 'upgrading.md'
         - Modes of running an AEA: 'modes.md'
+        - Multi agent manager: 'multi-agent-manager.md'
       - Use case components:
         - Generic skills: 'generic-skills.md'
         - Front-end intergration: 'connect-a-frontend.md'

From 0ba97ccf5aaa29d909b74ae8ad3e1c755685ffda Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Wed, 30 Sep 2020 13:19:06 +0300
Subject: [PATCH 108/131] fix for cancellerror supression in
 multiplexer._connect_all

---
 aea/multiplexer.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index d604b1e1f0..8c2e58b907 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -264,7 +264,10 @@ async def connect(self) -> None:
                 self._recv_loop_task = self._loop.create_task(self._receiving_loop())
                 self._send_loop_task = self._loop.create_task(self._send_loop())
                 self.logger.debug("Multiplexer connected and running.")
-            except (CancelledError, Exception):
+            except (CancelledError, asyncio.CancelledError):
+                await self._stop()
+                raise asyncio.CancelledError()
+            except Exception:
                 self.logger.exception("Exception on connect:")
                 await self._stop()
                 raise AEAConnectionError("Failed to connect the multiplexer.")
@@ -274,7 +277,7 @@ async def disconnect(self) -> None:
         self.logger.debug("Multiplexer disconnecting...")
         async with self._lock:
             if self.connection_status.is_disconnected:
-                self.logger.debug("Multiplexer already disconnected.")
+                self.logger.debug("Multiplexer disconnected.")
                 return
             try:
                 self.connection_status.set(ConnectionStates.disconnecting)
@@ -341,14 +344,13 @@ async def _connect_all(self) -> None:
                 await self._connect_one(connection_id)
                 connected.append(connection_id)
             except Exception as e:  # pylint: disable=broad-except
-                self.logger.error(
-                    "Error while connecting {}: {}".format(
-                        str(type(connection)), str(e)
+                if not isinstance(e, (asyncio.CancelledError, CancelledError)):
+                    self.logger.exception(
+                        "Error while connecting {}: {}".format(
+                            str(type(connection)), repr(e)
+                        )
                     )
-                )
-                for c in connected:
-                    await self._disconnect_one(c)
-                break
+                raise
         self.logger.debug("Multiplexer connections are set.")
 
     async def _connect_one(self, connection_id: PublicId) -> None:

From 86c0b9304bf4e6b74845c99589d9ee585c90cf16 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 30 Sep 2020 16:02:37 +0200
Subject: [PATCH 109/131] overwrite agent configs in manager

---
 aea/configurations/base.py | 63 +++++++++++++++++++++++++++++---------
 aea/helpers/base.py        |  4 +--
 aea/manager.py             | 53 +++++++++++++++++++-------------
 tests/test_manager.py      |  7 ++---
 4 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 190dee4ef3..a8ba960947 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -27,7 +27,7 @@
 import re
 from abc import ABC, abstractmethod
 from collections import OrderedDict
-from copy import deepcopy
+from copy import copy, deepcopy
 from enum import Enum
 from pathlib import Path
 from typing import (
@@ -833,6 +833,14 @@ def package_dependencies(self) -> Set[ComponentId]:
         """Get the package dependencies."""
         return set()
 
+    def update(self, data: Dict) -> None:
+        """
+        Update configuration with other data.
+
+        :param data: the data to replace.
+        :return: None
+        """
+
 
 class ComponentConfiguration(PackageConfiguration, ABC):
     """Class to represent an agent component configuration."""
@@ -916,14 +924,6 @@ def check_aea_version(self):
         """
         _check_aea_version(self)
 
-    def update(self, data: Dict) -> None:
-        """
-        Update configuration with other data.
-
-        :param data: the data to replace.
-        :return: None
-        """
-
 
 class ConnectionConfig(ComponentConfiguration):
     """Handle connection configuration."""
@@ -1537,7 +1537,18 @@ def default_ledger(self, ledger_id: str):
 
     def component_configurations_json(self) -> List[OrderedDict]:
         """Get the component configurations in JSON format."""
-        return list(map(OrderedDict, self.component_configurations.values()))
+        result: List[OrderedDict] = []
+        for component_id, config in self.component_configurations.items():
+            result.append(
+                OrderedDict(
+                    author=component_id.author,
+                    name=component_id.name,
+                    version=component_id.version,
+                    type=str(component_id.component_type),
+                    **config,
+                )
+            )
+        return result
 
     @property
     def json(self) -> Dict:
@@ -1647,10 +1658,10 @@ def from_json(cls, obj: Dict):
         component_configurations = {}
         for config in obj.get("component_configurations", []):
             tmp = deepcopy(config)
-            name = tmp["name"]
-            author = tmp["author"]
-            version = tmp["version"]
-            type_ = tmp["type"]
+            name = tmp.pop("name")
+            author = tmp.pop("author")
+            version = tmp.pop("version")
+            type_ = tmp.pop("type")
             component_id = ComponentId(
                 ComponentType(type_), PublicId(author, name, version)
             )
@@ -1665,6 +1676,30 @@ def from_json(cls, obj: Dict):
 
         return agent_config
 
+    def update(self, data: Dict) -> None:
+        """
+        Update configuration with other data.
+
+        To update the component parts, populate the field "component_configurations" as a
+        mapping from ComponentId to configurations.
+
+        :param data: the data to replace.
+        :return: None
+        """
+        data = copy(data)
+        # update component parts
+        new_component_configurations: Dict = data.pop("component_configurations", {})
+        result: Dict[ComponentId, Dict] = copy(self.component_configurations)
+        for component_id, obj in new_component_configurations.items():
+            if component_id not in result:
+                result[component_id] = obj
+            else:
+                recursive_update(result[component_id], obj)
+        self.component_configurations = result
+
+        # update other fields
+        # currently not supported.
+
 
 class SpeechActContentConfig(Configuration):
     """Handle a speech_act content configuration."""
diff --git a/aea/helpers/base.py b/aea/helpers/base.py
index 3289f0c175..b4a22ced9f 100644
--- a/aea/helpers/base.py
+++ b/aea/helpers/base.py
@@ -392,7 +392,7 @@ def exception_log_and_reraise(log_method: Callable, message: str):
         raise
 
 
-def recursive_update(to_update: Dict, new_values: Dict):
+def recursive_update(to_update: Dict, new_values: Dict) -> None:
     """
     Update a dictionary by replacing conflicts with the new values.
 
@@ -406,7 +406,7 @@ def recursive_update(to_update: Dict, new_values: Dict):
 
     :param to_update: the dictionary to update.
     :param new_values: the dictionary of new values to replace.
-    :return: the updated dictionary.
+    :return: None
     """
     for key, value in new_values.items():
         if key not in to_update:
diff --git a/aea/manager.py b/aea/manager.py
index 470e4f8e0f..ce40d6756f 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -23,17 +23,18 @@
 import os
 import threading
 from asyncio.tasks import FIRST_COMPLETED
+from pathlib import Path
 from shutil import rmtree
 from threading import Thread
 from typing import Callable, Dict, List, Optional
 
 from aea.aea import AEA
 from aea.aea_builder import AEABuilder
-from aea.configurations.base import ComponentId, PublicId
+from aea.configurations.base import AgentConfig, ComponentId, PackageType, PublicId
 from aea.configurations.constants import DEFAULT_LEDGER
+from aea.configurations.loader import ConfigLoaders
 from aea.configurations.project import AgentAlias, Project
 from aea.crypto.helpers import create_private_key
-from aea.helpers.base import yaml_load_all
 
 
 class AgentRunAsyncTask:
@@ -509,8 +510,8 @@ def _build_agent_alias(
         self,
         project: Project,
         agent_name: str,
-        agent_overrides=None,
-        component_overrides=None,
+        agent_overrides: Optional[dict] = None,
+        component_overrides: Optional[List[dict]] = None,
     ) -> AgentAlias:
         """Create agent alias for project, with given name and overrided values."""
         json_config = self._make_config(
@@ -529,13 +530,6 @@ def _build_agent_alias(
         agent = builder.build()
         return AgentAlias(project, agent_name, json_config, agent)
 
-    @staticmethod
-    def _update_dict(base: dict, override: dict) -> dict:
-        """Apply overrides for dict."""
-        base = copy.deepcopy(base)
-        base.update(override)
-        return base
-
     def _make_config(
         self,
         project_path: str,
@@ -551,20 +545,35 @@ def _make_config(
                 'Do not override any of {" ".join(self.AGENT_DO_NOT_OVERRIDE_VALUES)}'
             )
 
-        json_data = yaml_load_all(
-            AEABuilder.get_configuration_file_path(project_path).open()
+        agent_configuration_file_path: Path = AEABuilder.get_configuration_file_path(
+            project_path
         )
-        agent_config = self._update_dict(json_data[0], agent_overrides)
-
-        components_configs = {PublicId.from_json(obj): obj for obj in json_data[1:]}
-
+        loader = ConfigLoaders.from_package_type(PackageType.AGENT)
+        with agent_configuration_file_path.open() as fp:
+            agent_config: AgentConfig = loader.load(fp)
+
+        # prepare configuration overrides
+        # - agent part
+        agent_update_dictionary: Dict = dict(**agent_overrides)
+        # - components part
+        components_configs: Dict[ComponentId, Dict] = {}
         for obj in component_overrides:
-            component_id = ComponentId(obj["type"], PublicId.from_json(obj))
-            components_configs[component_id] = self._update_dict(
-                components_configs.get(component_id, {}), obj
+            obj = copy.copy(obj)
+            author, name, version = (
+                obj.pop("author"),
+                obj.pop("name"),
+                obj.pop("version"),
             )
-
-        return [agent_config] + list(components_configs.values())
+            component_id = ComponentId(obj.pop("type"), PublicId(author, name, version))
+            components_configs[component_id] = obj
+        agent_update_dictionary["component_configurations"] = components_configs
+        # do the override (and valiation)
+        agent_config.update(agent_update_dictionary)
+
+        # return the multi-paged JSON object.
+        json_data = agent_config.ordered_json
+        result: List[Dict] = [json_data] + json_data.pop("component_configurations")
+        return result
 
     def _create_private_key(self, name, ledger) -> str:
         """Create new key for agent alias in working dir keys dir."""
diff --git a/tests/test_manager.py b/tests/test_manager.py
index 46237f3b1e..7b680ee698 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -101,13 +101,10 @@ def test_add_agent(self):
             self.agent_name,
             component_overrides=[
                 {
-                    "type": "skill",
                     **self.echo_skill_id.json,
+                    "type": "skill",
                     "behaviours": {
-                        "echo": {
-                            "args": {"tick_interval": new_tick_interval},
-                            "class_name": "EchoBehaviour",
-                        }
+                        "echo": {"args": {"tick_interval": new_tick_interval}}
                     },
                 }
             ],

From a8102c62ad74f9ffe1c3a0f14d6dfb958895e891 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 30 Sep 2020 17:07:04 +0200
Subject: [PATCH 110/131] fix tests on aea builder

---
 aea/configurations/base.py   |  5 +++++
 aea/configurations/loader.py | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index a8ba960947..91e046ccbb 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -733,6 +733,11 @@ def prefix_import_path(self) -> str:
             self.public_id.author, self.component_type.to_plural(), self.public_id.name
         )
 
+    @property
+    def json(self) -> Dict:
+        """Get the JSON representation."""
+        return dict(**self.public_id.json, type=str(self.component_type))
+
 
 ProtocolId = PublicId
 ContractId = PublicId
diff --git a/aea/configurations/loader.py b/aea/configurations/loader.py
index f58eb43fa9..2779585959 100644
--- a/aea/configurations/loader.py
+++ b/aea/configurations/loader.py
@@ -386,10 +386,10 @@ def _split_component_id_and_config(
             raise ValueError(
                 f"There are missing fields in component id {component_index + 1}: {missing_fields}."
             )
-        component_name = component_configuration_json["name"]
-        component_author = component_configuration_json["author"]
-        component_version = component_configuration_json["version"]
-        component_type = ComponentType(component_configuration_json["type"])
+        component_name = component_configuration_json.pop("name")
+        component_author = component_configuration_json.pop("author")
+        component_version = component_configuration_json.pop("version")
+        component_type = ComponentType(component_configuration_json.pop("type"))
         component_public_id = PublicId(
             component_author, component_name, component_version
         )
@@ -414,7 +414,9 @@ def _validate_component_configuration(
             component_id.component_type
         )
         try:
-            BaseConfigLoader(schema_file).validate(configuration)
+            BaseConfigLoader(schema_file).validate(
+                dict(**component_id.json, **configuration)
+            )
         except jsonschema.ValidationError as e:
             raise ValueError(
                 f"Configuration of component {component_id} is not valid."

From 5136887ccb7c6071880a405a2746e657e7a72d52 Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Wed, 30 Sep 2020 16:22:39 +0300
Subject: [PATCH 111/131] fixes

---
 aea/multiplexer.py            |  2 +-
 tests/common/pexpect_popen.py | 10 ++++++++--
 tests/test_cli/test_launch.py |  4 ++--
 tests/test_multiplexer.py     |  9 ++++++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index 8c2e58b907..a766694392 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -277,7 +277,7 @@ async def disconnect(self) -> None:
         self.logger.debug("Multiplexer disconnecting...")
         async with self._lock:
             if self.connection_status.is_disconnected:
-                self.logger.debug("Multiplexer disconnected.")
+                self.logger.debug("Multiplexer already disconnected.")
                 return
             try:
                 self.connection_status.set(ConnectionStates.disconnecting)
diff --git a/tests/common/pexpect_popen.py b/tests/common/pexpect_popen.py
index e4e591a9b3..220bfd58c3 100644
--- a/tests/common/pexpect_popen.py
+++ b/tests/common/pexpect_popen.py
@@ -86,12 +86,15 @@ def aea_cli(cls, args) -> "PexpectWrapper":
             logfile=sys.stdout,
         )
 
-    def expect_all(self, pattern_list: List[str], timeout: float = 10) -> None:
+    def expect_all(
+        self, pattern_list: List[str], timeout: float = 10, strict: bool = True
+    ) -> None:
         """
         Wait for all patterns appear in process output.
 
         :param pattern_list: list of string to expect
         :param timeout: timeout in seconds
+        :param strict: if non strict, it allows regular expression
 
         :return: None
         """
@@ -102,7 +105,10 @@ def expect_all(self, pattern_list: List[str], timeout: float = 10) -> None:
             time_spent = time.time() - start_time
             if time_spent > timeout:
                 raise TIMEOUT(timeout)
-            idx = self.expect_exact(pattern_list, timeout - time_spent)
+            if strict:
+                idx = self.expect_exact(pattern_list, timeout - time_spent)
+            else:
+                idx = self.expect(pattern_list, timeout - time_spent)
             pattern_list.pop(idx)
 
     def wait_eof(self, timeout: float = 10) -> None:
diff --git a/tests/test_cli/test_launch.py b/tests/test_cli/test_launch.py
index 91b7a65fba..0918f98772 100644
--- a/tests/test_cli/test_launch.py
+++ b/tests/test_cli/test_launch.py
@@ -213,11 +213,11 @@ def test_exit_code_equal_to_zero(self):
                     f"[{self.agent_name_1}] Start processing messages",
                     f"[{self.agent_name_2}] Start processing messages",
                 ],
-                timeout=20,
+                timeout=30,
             )
             process_launch.control_c()
             process_launch.expect_all(
-                ["Exit cli. code: 0"], timeout=20,
+                ["Exit cli. code: 0"], timeout=30,
             )
 
 
diff --git a/tests/test_multiplexer.py b/tests/test_multiplexer.py
index 93b206e796..e16806ca3b 100644
--- a/tests/test_multiplexer.py
+++ b/tests/test_multiplexer.py
@@ -728,12 +728,15 @@ def test_multiplexer_disconnected_on_early_interruption(self):
         )
 
         self.proc.expect_all(
-            ["Finished downloading golang dependencies"], timeout=20,
+            ["Finished downloading golang dependencies"], timeout=50,
         )
         self.proc.control_c()
         self.proc.expect_all(
-            ["Multiplexer disconnecting...", "Multiplexer disconnected.", EOF],
-            timeout=20,
+            ["Multiplexer .*disconnected."], timeout=20, strict=False,
+        )
+
+        self.proc.expect_all(
+            [EOF], timeout=20,
         )
 
     def test_multiplexer_disconnected_on_termination_after_connected(self):

From 6c1a327f16790d699614a2620aa1af7226e18cd9 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Wed, 30 Sep 2020 17:13:18 +0200
Subject: [PATCH 112/131] add basic test to AgentConfig.update

---
 tests/test_configurations/test_base.py | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index c2fb7954ec..6506a797ed 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -34,6 +34,7 @@
     ComponentType,
     ConnectionConfig,
     ContractConfig,
+    DEFAULT_AEA_CONFIG_FILE,
     DEFAULT_SKILL_CONFIG_FILE,
     PackageId,
     PackageType,
@@ -53,7 +54,9 @@
 
 from tests.conftest import (
     AUTHOR,
+    CUR_PATH,
     DUMMY_SKILL_PATH,
+    DUMMY_SKILL_PUBLIC_ID,
     ROOT_DIR,
     agent_config_files,
     connection_config_files,
@@ -270,6 +273,45 @@ def test_from_json_and_to_json(self, agent_path):
         actual_json = actual_config.json
         assert expected_json == actual_json
 
+    def test_update(self):
+        """Test the update method."""
+        aea_config_path = Path(CUR_PATH, "data", "dummy_aea", DEFAULT_AEA_CONFIG_FILE)
+        loader = ConfigLoaders.from_package_type(PackageType.AGENT)
+        aea_config: AgentConfig = loader.load(aea_config_path.open())
+
+        dummy_skill_component_id = ComponentId(
+            ComponentType.SKILL, DUMMY_SKILL_PUBLIC_ID
+        )
+
+        new_dummy_skill_config = {
+            "behaviours": {"dummy": {"args": dict(behaviour_arg_1=42)}},
+            "handlers": {"dummy": {"args": dict(handler_arg_1=42)}},
+            "models": {"dummy": {"args": dict(model_arg_1=42)}},
+        }
+
+        aea_config.update(
+            dict(
+                component_configurations={
+                    dummy_skill_component_id: new_dummy_skill_config
+                }
+            )
+        )
+        assert (
+            aea_config.component_configurations[dummy_skill_component_id]
+            == new_dummy_skill_config
+        )
+        aea_config.update(
+            dict(
+                component_configurations={
+                    dummy_skill_component_id: new_dummy_skill_config
+                }
+            )
+        )
+        assert (
+            aea_config.component_configurations[dummy_skill_component_id]
+            == new_dummy_skill_config
+        )
+
 
 class GetDefaultConfigurationFileNameFromStrTestCase(TestCase):
     """Test case for _get_default_configuration_file_name_from_type method."""

From 9fa4f988871db01b8eead2fc45be711c8f013bbc Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 30 Sep 2020 18:20:31 +0100
Subject: [PATCH 113/131] fix based on PR comments

---
 aea/cli/registry/fetch.py       | 5 ++---
 aea/manager.py                  | 2 +-
 tests/test_helpers/test_base.py | 4 ++--
 tests/test_manager.py           | 7 ++++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/aea/cli/registry/fetch.py b/aea/cli/registry/fetch.py
index c3eedebc9d..c98f6a47d3 100644
--- a/aea/cli/registry/fetch.py
+++ b/aea/cli/registry/fetch.py
@@ -42,9 +42,9 @@ def fetch_agent(
     Fetch Agent from Registry.
 
     :param ctx: Context
-    :param public_id: str public ID of desirable Agent.
-    :param ctx: a Context object.
+    :param public_id: str public ID of desirable agent.
     :param alias: an optional alias.
+    :param target_dir: the target directory to which the agent is fetched.
     :return: None
     """
     author, name, version = public_id.author, public_id.name, public_id.version
@@ -56,7 +56,6 @@ def fetch_agent(
 
     folder_name = target_dir or (name if alias is None else alias)
     aea_folder = os.path.join(ctx.cwd, folder_name)
-    print(aea_folder)
     ctx.clean_paths.append(aea_folder)
 
     extract(filepath, ctx.cwd)
diff --git a/aea/manager.py b/aea/manager.py
index ce40d6756f..8dff9ff952 100644
--- a/aea/manager.py
+++ b/aea/manager.py
@@ -536,7 +536,7 @@ def _make_config(
         agent_overrides: Optional[dict] = None,
         component_overrides: Optional[List[dict]] = None,
     ) -> List[dict]:
-        """Make new config baseed on proejct's config with overrides applied."""
+        """Make new config based on project's config with overrides applied."""
         agent_overrides = agent_overrides or {}
         component_overrides = component_overrides or []
 
diff --git a/tests/test_helpers/test_base.py b/tests/test_helpers/test_base.py
index 24b5678032..916b4218f1 100644
--- a/tests/test_helpers/test_base.py
+++ b/tests/test_helpers/test_base.py
@@ -274,7 +274,7 @@ def test_recursive_update_negative_different_type():
 
     with pytest.raises(
         ValueError,
-        match=f"Trying to replace value '1' with value 'False' which is of different type.",
+        match="Trying to replace value '1' with value 'False' which is of different type.",
     ):
         recursive_update(to_update, new_values)
 
@@ -287,6 +287,6 @@ def test_recursive_update_negative_unknown_field():
 
     with pytest.raises(
         ValueError,
-        match=f"Key 'new_field' is not contained in the dictionary to update.",
+        match="Key 'new_field' is not contained in the dictionary to update.",
     ):
         recursive_update(to_update, new_values)
diff --git a/tests/test_manager.py b/tests/test_manager.py
index 7b680ee698..b78e9866bb 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -146,7 +146,7 @@ def test_add_agent_for_non_exist_project(self):
         with pytest.raises(ValueError, match=" project is not added"):
             self.manager.add_agent(PublicId("test", "test", "0.1.0"), "another_agent")
 
-    def test_agent_acually_running(self):
+    def test_agent_actually_running(self):
         """Test MultiAgentManager starts agent correctly and agent perform acts."""
         self.test_add_agent()
         agent_alias = self.manager.get_agent_alias(self.agent_name)
@@ -253,13 +253,18 @@ def test_invalid_mode():
     def test_double_start(self):
         """Test double MultiAgentManager start."""
         self.manager.start_manager()
+        assert self.manager.is_running
         self.manager.start_manager()
+        assert self.manager.is_running
 
     def test_double_stop(self):
         """Test double MultiAgentManager stop."""
         self.manager.start_manager()
+        assert self.manager.is_running
         self.manager.stop_manager()
+        assert not self.manager.is_running
         self.manager.stop_manager()
+        assert not self.manager.is_running
 
     @pytest.mark.asyncio
     async def test_run_loop_direct_call(self):

From 57bff07981ca54ff0c34ff946043deca6f92c0e0 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 30 Sep 2020 19:49:40 +0100
Subject: [PATCH 114/131] ignore coverage

---
 aea/multiplexer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aea/multiplexer.py b/aea/multiplexer.py
index a766694392..ea384fe5a1 100644
--- a/aea/multiplexer.py
+++ b/aea/multiplexer.py
@@ -258,7 +258,7 @@ async def connect(self) -> None:
 
                 if all(c.is_connected for c in self._connections):
                     self.connection_status.set(ConnectionStates.connected)
-                else:
+                else:  # pragma: nocover
                     raise AEAConnectionError("Failed to connect the multiplexer.")
 
                 self._recv_loop_task = self._loop.create_task(self._receiving_loop())

From 93fb0012a1c954176ef58424f619fe2f52a2cc77 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Wed, 30 Sep 2020 21:55:23 +0100
Subject: [PATCH 115/131] extend agent manager documentation

---
 docs/multi-agent-manager.md | 53 ++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/docs/multi-agent-manager.md b/docs/multi-agent-manager.md
index 4ff3d1747f..f23c3ac4a5 100644
--- a/docs/multi-agent-manager.md
+++ b/docs/multi-agent-manager.md
@@ -19,26 +19,61 @@ manager.start_manager()
 We first add a couple of finished AEA project:
 
 ``` python
-manager.add_project("fetchai/weather_client:0.13.0")
-manager.add_project("fetchai/weather_station:0.13.0")
+from aea.configurations.base import PublicId
+
+weather_client_id = PublicId.from_str("fetchai/weather_client:0.13.0")
+weather_station_id = PublicId.from_str("fetchai/weather_station:0.13.0")
+manager.add_project(weather_client_id)
+manager.add_project(weather_station_id)
 ```
 
 ## Adding agent instances
 
+Save the following private keys in the respective files.
 ``` python
-manager.add_agent("fetchai/weather_client:0.13.0")
-manager.add_agent("fetchai/weather_station:0.13.0")
+# 72d3149f5689f0749eaec5ebf6dba5deeb1e89b93ae1c58c71fd43dfaa231e87
+FET_PRIVATE_KEY_PATH_1 = "fetchai_private_key_1.txt"
+# bf529acb2546e13615ef6004c48e393f0638a5dc0c4979631a9a4bc554079f6f
+COSMOS_PRIVATE_KEY_PATH_1 = "cosmos_private_key_1.txt"
+# 589839ae54b71b8754a7fe96b52045364077c28705a1806b74441debcae16e0a
+FET_PRIVATE_KEY_PATH_2 = "fetchai_private_key_2.txt"
+# c9b38eff57f678f5ab5304447997351edb08eceb883267fa4ad849074bec07e4
+COSMOS_PRIVATE_KEY_PATH_2 = "cosmos_private_key_2.txt"
 ```
 
-missing:
-- configuring private keys
-- configure delayed startup sequence
-
+Add the agent instances
+``` python
+agent_overrides = {
+    "private_key_paths": {"fetchai": FET_PRIVATE_KEY_PATH_1},
+    "connection_private_key_paths": {"cosmos": COSMOS_PRIVATE_KEY_PATH_1}
+}
+manager.add_agent(weather_station_id, agent_overrides=agent_overrides)
+
+component_overrides = {
+    "name": "p2p_libp2p",
+    "author": "fetchai",
+    "version": "0.9.0",
+    "type": "connection",
+    "config": {
+        "delegate_uri": "127.0.0.1:11001",
+        "entry_peers": ['/dns4/127.0.0.1/tcp/9000/p2p/16Uiu2HAkzgZYyk25XjAhmgXcdMbahrHYi18uuAzHuxPn1KkdmLRw'],
+        "local_uri": "127.0.0.1:9001",
+        "public_uri": "127.0.0.1:9001",
+    }
+}
+agent_overrides = {
+    "private_key_paths": {"fetchai": FET_PRIVATE_KEY_PATH_2},
+    "connection_private_key_paths": {"cosmos": COSMOS_PRIVATE_KEY_PATH_2}
+}
+manager.add_agent(weather_client_id, component_overrides=[component_overrides], agent_overrides=agent_overrides)
+```
 
 ## Running the agents:
 
 ``` python
-manager.start_all_agents()
+manager.start_agent(weather_station_id.name)
+# wait for ~10 seconds for peer node to go live
+manager.start_agent(weather_station_id.name)
 ```
 
 ## Stopping the agents:

From 36d578052cfd5b70323b22ca838422b61b5597d0 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Thu, 1 Oct 2020 00:42:39 +0200
Subject: [PATCH 116/131] add update of agent config all configurable fields

---
 aea/configurations/base.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 91e046ccbb..5d4d8ae8b8 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -1402,8 +1402,8 @@ def __init__(
         self.agent_name = agent_name
         self.registry_path = registry_path
         self.description = description
-        self.private_key_paths = CRUDCollection[str]()
-        self.connection_private_key_paths = CRUDCollection[str]()
+        self.private_key_paths: CRUDCollection[str] = CRUDCollection[str]()
+        self.connection_private_key_paths: CRUDCollection[str] = CRUDCollection[str]()
 
         self.logging_config = logging_config if logging_config is not None else {}
         self._default_ledger = None  # type: Optional[str]
@@ -1703,7 +1703,14 @@ def update(self, data: Dict) -> None:
         self.component_configurations = result
 
         # update other fields
-        # currently not supported.
+        for item_id, value in data.get("private_key_paths", {}):
+            self.private_key_paths.update(item_id, value)
+
+        for item_id, value in data.get("connection_private_key_paths", {}):
+            self.connection_private_key_paths.update(item_id, value)
+
+        self.logging_config = data.get("logging_config", self.logging_config)
+        self.registry_path = data.get("registry_path", self.registry_path)
 
 
 class SpeechActContentConfig(Configuration):

From c15fd2293d9d3a4a5f28f6614eb05c0e98b3d326 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Thu, 1 Oct 2020 00:55:26 +0200
Subject: [PATCH 117/131] overwrite only existing private keys ids.

---
 aea/configurations/base.py             | 10 ++++++----
 tests/test_configurations/test_base.py | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 5d4d8ae8b8..30786ca9e3 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -347,6 +347,8 @@ def update(self, item_id: str, item: T) -> None:
         :param item: the item to be added.
         :return: None
         """
+        if item_id not in self._items_by_id:
+            raise ValueError(f"No item registered with id '{item_id}'.")
         self._items_by_id[item_id] = item
 
     def delete(self, item_id: str) -> None:
@@ -1402,8 +1404,8 @@ def __init__(
         self.agent_name = agent_name
         self.registry_path = registry_path
         self.description = description
-        self.private_key_paths: CRUDCollection[str] = CRUDCollection[str]()
-        self.connection_private_key_paths: CRUDCollection[str] = CRUDCollection[str]()
+        self.private_key_paths = CRUDCollection[str]()
+        self.connection_private_key_paths = CRUDCollection[str]()
 
         self.logging_config = logging_config if logging_config is not None else {}
         self._default_ledger = None  # type: Optional[str]
@@ -1703,10 +1705,10 @@ def update(self, data: Dict) -> None:
         self.component_configurations = result
 
         # update other fields
-        for item_id, value in data.get("private_key_paths", {}):
+        for item_id, value in data.get("private_key_paths", {}).items():
             self.private_key_paths.update(item_id, value)
 
-        for item_id, value in data.get("connection_private_key_paths", {}):
+        for item_id, value in data.get("connection_private_key_paths", {}).items():
             self.connection_private_key_paths.update(item_id, value)
 
         self.logging_config = data.get("logging_config", self.logging_config)
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 6506a797ed..6956269208 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -99,6 +99,9 @@ def test_update(self):
         collection.update("one", 2)
         assert collection.read("one") == 2
 
+        with pytest.raises(ValueError, match=f"No item registered with id 'two'."):
+            collection.update("two", 2)
+
     def test_delete(self):
         """Test that the delete method works correctly."""
         collection = CRUDCollection()
@@ -293,13 +296,21 @@ def test_update(self):
             dict(
                 component_configurations={
                     dummy_skill_component_id: new_dummy_skill_config
-                }
+                },
+                private_key_paths=dict(foo="bar"),
+                connection_private_key_paths=dict(foo="bar"),
             )
         )
         assert (
             aea_config.component_configurations[dummy_skill_component_id]
             == new_dummy_skill_config
         )
+        assert dict(aea_config.private_key_paths.read_all()) == {"foo": "bar"}
+        assert dict(aea_config.connection_private_key_paths.read_all()) == {
+            "foo": "bar"
+        }
+
+        # test idempotence
         aea_config.update(
             dict(
                 component_configurations={

From 68814b9250126287f807b84c4d5d0a8e232fbce2 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Thu, 1 Oct 2020 01:02:34 +0200
Subject: [PATCH 118/131] update test on overwrite of private keys config

---
 aea/configurations/base.py             |  2 +-
 tests/data/dummy_aea/aea-config.yaml   |  3 +++
 tests/data/hashes.csv                  |  2 +-
 tests/test_configurations/test_base.py | 14 ++++++++------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 30786ca9e3..8ad9f910c8 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -1548,8 +1548,8 @@ def component_configurations_json(self) -> List[OrderedDict]:
         for component_id, config in self.component_configurations.items():
             result.append(
                 OrderedDict(
-                    author=component_id.author,
                     name=component_id.name,
+                    author=component_id.author,
                     version=component_id.version,
                     type=str(component_id.component_type),
                     **config,
diff --git a/tests/data/dummy_aea/aea-config.yaml b/tests/data/dummy_aea/aea-config.yaml
index 5c038adebf..cea1bf386a 100644
--- a/tests/data/dummy_aea/aea-config.yaml
+++ b/tests/data/dummy_aea/aea-config.yaml
@@ -25,4 +25,7 @@ logging_config:
 private_key_paths:
   cosmos: cosmos_private_key.txt
   ethereum: ethereum_private_key.txt
+connection_private_key_paths:
+  cosmos: cosmos_private_key.txt
+  ethereum: ethereum_private_key.txt
 registry_path: ../../packages
diff --git a/tests/data/hashes.csv b/tests/data/hashes.csv
index f068b6b33c..5a2e72f81a 100644
--- a/tests/data/hashes.csv
+++ b/tests/data/hashes.csv
@@ -1,4 +1,4 @@
-dummy_author/agents/dummy_aea,QmaFcsXAx9mCjPnYEzATwGJyBFJRgCHftfYmKCfZtSGSLw
+dummy_author/agents/dummy_aea,QmYEVtxkYh889JfQy5umXqM7KBNVfjDunV1SWf1Kd9zDfm
 dummy_author/skills/dummy_skill,QmTBZg36AhCipACz8x7eJsA5CHKqUQN1SwT3n8zX6n9XNF
 fetchai/connections/dummy_connection,QmWegP8qsY6Ngdh9xorMDCSA1UBjt4CrrPeVWQqyVfHvob
 fetchai/contracts/dummy_contract,QmPMs9VDGZGF8xJ8XBYLVb1xK5XAgiaJr5Gwcq7Vr3TUyu
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index 6956269208..c7f5ab549a 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -292,23 +292,25 @@ def test_update(self):
             "models": {"dummy": {"args": dict(model_arg_1=42)}},
         }
 
+        new_private_key_paths = dict(ethereum="foo", cosmos="bar")
         aea_config.update(
             dict(
                 component_configurations={
                     dummy_skill_component_id: new_dummy_skill_config
                 },
-                private_key_paths=dict(foo="bar"),
-                connection_private_key_paths=dict(foo="bar"),
+                private_key_paths=new_private_key_paths,
+                connection_private_key_paths=new_private_key_paths,
             )
         )
         assert (
             aea_config.component_configurations[dummy_skill_component_id]
             == new_dummy_skill_config
         )
-        assert dict(aea_config.private_key_paths.read_all()) == {"foo": "bar"}
-        assert dict(aea_config.connection_private_key_paths.read_all()) == {
-            "foo": "bar"
-        }
+        assert dict(aea_config.private_key_paths.read_all()) == new_private_key_paths
+        assert (
+            dict(aea_config.connection_private_key_paths.read_all())
+            == new_private_key_paths
+        )
 
         # test idempotence
         aea_config.update(

From fb7349b8de20dc33eeaee134fec7cf55ac63c81b Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 09:24:46 +0100
Subject: [PATCH 119/131] add acn documentation

---
 docs/acn.md                        |  60 +++++++++++++++++++++++++++--
 docs/assets/acn-tiers.png          | Bin 0 -> 69774 bytes
 docs/assets/acn-trust-security.png | Bin 0 -> 92534 bytes
 docs/assets/dht.png                | Bin 0 -> 159612 bytes
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 docs/assets/acn-tiers.png
 create mode 100644 docs/assets/acn-trust-security.png
 create mode 100644 docs/assets/dht.png

diff --git a/docs/acn.md b/docs/acn.md
index 63d7572a7d..e091fdab46 100644
--- a/docs/acn.md
+++ b/docs/acn.md
@@ -1,11 +1,65 @@
 
+The agent communication network (ACN) provides the agents with a system to find each other based on their addresses and communicate.
+
+An agent owner faces the following problem: Given a wallet address, how can my agent whilst maintaining certain guarantees deliver a message to the holder of this address (i.e. another agent)?
+
+The guarantees we would like to have are:
+
+- Reliability: with guarantees on message delivery
+- Security: no third-party can tamper with the message
+- Authentication: prevent impersonation
+- Confidentiality: prevent exposing sensitive information
+- Availability: some guarantees about the liveness of the service (tampering detection)
+
+The problem statement and the context impose a number of design constraints:
+
+- Distributed environment: no assumption are placed about the location of the agent, they can be anywhere in the publicly reachable internet
+- Decentralized environment: no trusted central authority
+- Support for resource-constrained devices
+
+The ACN solves the above problem whilst providing the above guarantees and satisfying the constraints.
+
+## Peers
+
+The ACN is maintained by peers. Peers are not to be equated with agents. They are processes (usually distributed and decentralized) that together maintain the service.
+
+## Distributed hash table
+
+At its core, the ACN comrises of a distributed hash table (DHT). A DHT is similar to a regular hash table in that it stores key-value pairs. However, storage is distributed across multiple machines (peers) with an efficient lookup mechanism. This is enabled by:
+
+- Consistent hashing: assignment
+- Structured overlays: (efficient) routing
+
+<img src="../assets/dht.png" alt="DHT" class="center" style="display: block; margin-left: auto; margin-right: auto;width:50%;">
+
+For the ACN, we use the DHT to store and maintain association between an agent address and the (network) location of its peer.
+
+
+## N-tier architecture
+
+To satisfy different resource constraints and flexible deployment the ACN is implemented as a multi-tier architecture. As such, it provides an extension of the client-server model. For the agent framework different tiers implemented as different <a href="../api/connections/base#connection-objects">`Connections`</a>:
+
+<img src="../assets/acn-tiers.png" alt="DHT" class="center" style="display: block; margin-left: auto; margin-right: auto;width:80%;">
+
 <div class="admonition note">
   <p class="admonition-title">Note</p>
-  <p>Details coming soon. In the meantime check out <a href="../p2p-connection">this section.</a></p>
+  <p>The `p2p_libp2p_mailbox` connection is not available yet.
+</p>
 </div>
 
+## Trust and security
+
+An agent can choose which connection to use depending on the resource and trust requirements:
+
+- `p2p_libp2p` connection: the agent maintains a peer of the ACN. The agent does not need to trust any other entity.
+- `p2p_libp2p_client` connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer.
+
+The main protocol uses public cryptography to provide trust and security:
+- DHT process starts with a public key pair signed by agent
+- Lookup for agent addresses includes agent signature
+- TLS handshake (with self-signed certificates)
+
+<img src="../assets/acn-trust-security.png" alt="DHT" class="center" style="display: block; margin-left: auto; margin-right: auto;width:80%;">
 
-missing:
-- different configurations of setting up peer and client
 
 <br />
diff --git a/docs/assets/acn-tiers.png b/docs/assets/acn-tiers.png
new file mode 100644
index 0000000000000000000000000000000000000000..92b7560f391b866c60e017cc8a19309f04592811
GIT binary patch
literal 69774
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
RGWLKEy{kr73bY&_{0~YndxHP~

literal 0
HcmV?d00001

diff --git a/docs/assets/acn-trust-security.png b/docs/assets/acn-trust-security.png
new file mode 100644
index 0000000000000000000000000000000000000000..fce4ed3366281e9bc15e421f037606dae57f9f57
GIT binary patch
literal 92534
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%0DDz!
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

literal 0
HcmV?d00001

diff --git a/docs/assets/dht.png b/docs/assets/dht.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7044b1201526ffcadae1b167faaaebde3b8007
GIT binary patch
literal 159612
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
K2cJ3zB>f9_Ga>8%

literal 0
HcmV?d00001


From 9b551d554f2ff3191f601e3295377dc7ece63b05 Mon Sep 17 00:00:00 2001
From: MarcoFavorito <marco.favorito@gmail.com>
Date: Thu, 1 Oct 2020 10:30:57 +0200
Subject: [PATCH 120/131] replace private key paths entirely

---
 aea/configurations/base.py             |  2 --
 tests/test_configurations/test_base.py | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aea/configurations/base.py b/aea/configurations/base.py
index 8ad9f910c8..75160b6424 100644
--- a/aea/configurations/base.py
+++ b/aea/configurations/base.py
@@ -347,8 +347,6 @@ def update(self, item_id: str, item: T) -> None:
         :param item: the item to be added.
         :return: None
         """
-        if item_id not in self._items_by_id:
-            raise ValueError(f"No item registered with id '{item_id}'.")
         self._items_by_id[item_id] = item
 
     def delete(self, item_id: str) -> None:
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
index c7f5ab549a..78fd3b0fd8 100644
--- a/tests/test_configurations/test_base.py
+++ b/tests/test_configurations/test_base.py
@@ -99,9 +99,6 @@ def test_update(self):
         collection.update("one", 2)
         assert collection.read("one") == 2
 
-        with pytest.raises(ValueError, match=f"No item registered with id 'two'."):
-            collection.update("two", 2)
-
     def test_delete(self):
         """Test that the delete method works correctly."""
         collection = CRUDCollection()
@@ -292,7 +289,10 @@ def test_update(self):
             "models": {"dummy": {"args": dict(model_arg_1=42)}},
         }
 
-        new_private_key_paths = dict(ethereum="foo", cosmos="bar")
+        new_private_key_paths = dict(ethereum="foo")
+        expected_private_key_paths = dict(
+            ethereum="foo", cosmos="cosmos_private_key.txt"
+        )
         aea_config.update(
             dict(
                 component_configurations={
@@ -306,10 +306,12 @@ def test_update(self):
             aea_config.component_configurations[dummy_skill_component_id]
             == new_dummy_skill_config
         )
-        assert dict(aea_config.private_key_paths.read_all()) == new_private_key_paths
+        assert (
+            dict(aea_config.private_key_paths.read_all()) == expected_private_key_paths
+        )
         assert (
             dict(aea_config.connection_private_key_paths.read_all())
-            == new_private_key_paths
+            == expected_private_key_paths
         )
 
         # test idempotence

From b2aed44e637c448ca31d57ece458b3d492ee9d7f Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 11:24:59 +0100
Subject: [PATCH 121/131] temporary lock add to soef

---
 .../fetchai/connections/soef/connection.py    | 33 +++++++++++--------
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 packages/hashes.csv                           |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 9760e022db..876fe24f5f 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -265,6 +265,7 @@ def __init__(
         self._find_around_me_queue: Optional[asyncio.Queue] = None
         self._find_around_me_processor_task: Optional[asyncio.Task] = None
         self.logger = logger
+        self._unregister_lock: Optional[asyncio.Lock] = None
 
     async def _find_around_me_processor(self) -> None:
         """Process find me around requests in background task."""
@@ -902,19 +903,24 @@ async def _unregister_agent(self) -> None:  # pylint: disable=unused-argument
 
         :return: None
         """
-        await self._stop_periodic_ping_task()
-        if self.unique_page_address is None:  # pragma: nocover
-            self.logger.debug(
-                "The service is not registered to the simple OEF. Cannot unregister."
-            )
-            return
+        if self._unregister_lock is None:
+            raise ValueError("Lock is not set, use connect first!")  # pragma: nocover
+        async with self._unregister_lock:
+            await self._stop_periodic_ping_task()
+            if self.unique_page_address is None:  # pragma: nocover
+                self.logger.debug(
+                    "The service is not registered to the simple OEF. Cannot unregister."
+                )
+                return
 
-        response = await self._generic_oef_command("unregister", check_success=False)
-        enforce(
-            "<response><message>Goodbye!</message></response>" in response,
-            "No Goodbye response.",
-        )
-        self.unique_page_address = None
+            response = await self._generic_oef_command(
+                "unregister", check_success=False
+            )
+            enforce(
+                "<response><message>Goodbye!</message></response>" in response,
+                "No Goodbye response.",
+            )
+            self.unique_page_address = None
 
     async def _stop_periodic_ping_task(self) -> None:
         """Cancel periodic ping task."""
@@ -934,6 +940,7 @@ async def connect(self) -> None:
         self._find_around_me_processor_task = self._loop.create_task(
             self._find_around_me_processor()
         )
+        self._unregister_lock = asyncio.Lock()
 
     async def disconnect(self) -> None:
         """
@@ -941,8 +948,6 @@ async def disconnect(self) -> None:
 
         :return: None
         """
-        await self._stop_periodic_ping_task()
-
         if self.in_queue is None:
             raise ValueError("Queue is not set, use connect first!")  # pragma: nocover
         await self._unregister_agent()
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 3d84862432..e306ca6178 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmZaBtcck4gXs92SH5vcptJMm1d1f8WqUuCwvfTXnxsc3y
+  connection.py: QmcWSUrozGZeNbkyKs32oEEy9Knz9jAnzK4Zyoqgk4d7xF
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.7.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 712b147ae5..bbbf5e8794 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -29,7 +29,7 @@ fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmXBtvcw2mQdMwkEaoU9h4pRLkGGZueqJNzGCHA279CNQk
+fetchai/connections/soef,Qme5g5U1MAYV5naZnJCzne4n4cGqQSpfzTWKs8VRWeTK9J
 fetchai/connections/stub,QmQxzFLTBjPUMkpE1uBdkoyhb7iXY4k8VPzyykpjhuUcK1
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd

From baeef26355b6d92ea7e22191b8c9dde89b3f7c0f Mon Sep 17 00:00:00 2001
From: "Yuri (solarw) Turchenkov" <solarw.mail@gmail.com>
Date: Thu, 1 Oct 2020 16:46:18 +0300
Subject: [PATCH 122/131] soef connection unregister: lock and shield from
 cancelation

---
 .../fetchai/connections/soef/connection.py    | 43 +++++++++++++------
 .../fetchai/connections/soef/connection.yaml  |  2 +-
 packages/hashes.csv                           |  2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 9760e022db..c8ff7714ed 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -265,6 +265,7 @@ def __init__(
         self._find_around_me_queue: Optional[asyncio.Queue] = None
         self._find_around_me_processor_task: Optional[asyncio.Task] = None
         self.logger = logger
+        self._unregister_lock: Optional[asyncio.Lock] = None
 
     async def _find_around_me_processor(self) -> None:
         """Process find me around requests in background task."""
@@ -276,7 +277,11 @@ async def _find_around_me_processor(self) -> None:
                     oef_message, oef_search_dialogue, radius, params
                 )
                 await asyncio.sleep(self.FIND_AROUND_ME_REQUEST_DELAY)
-            except asyncio.CancelledError:  # pylint: disable=try-except-raise
+            except (
+                asyncio.CancelledError,
+                CancelledError,
+                GeneratorExit,
+            ):  # pylint: disable=try-except-raise
                 return
             except Exception:  # pylint: disable=broad-except  # pragma: nocover
                 self.logger.exception(
@@ -902,19 +907,29 @@ async def _unregister_agent(self) -> None:  # pylint: disable=unused-argument
 
         :return: None
         """
-        await self._stop_periodic_ping_task()
-        if self.unique_page_address is None:  # pragma: nocover
-            self.logger.debug(
-                "The service is not registered to the simple OEF. Cannot unregister."
+        if not self._unregister_lock:
+            raise ValueError("unregistered lock is not set, please call connect!")
+
+        async with self._unregister_lock:
+            if self.unique_page_address is None:  # pragma: nocover
+                self.logger.debug(
+                    "The service is not registered to the simple OEF. Cannot unregister."
+                )
+                return
+
+            task = asyncio.ensure_future(
+                self._generic_oef_command("unregister", check_success=False)
             )
-            return
 
-        response = await self._generic_oef_command("unregister", check_success=False)
-        enforce(
-            "<response><message>Goodbye!</message></response>" in response,
-            "No Goodbye response.",
-        )
-        self.unique_page_address = None
+            try:
+                response = await asyncio.shield(task)
+            finally:
+                response = await task
+                enforce(
+                    "<response><message>Goodbye!</message></response>" in response,
+                    "No Goodbye response.",
+                )
+                self.unique_page_address = None
 
     async def _stop_periodic_ping_task(self) -> None:
         """Cancel periodic ping task."""
@@ -930,6 +945,7 @@ async def connect(self) -> None:
         self._loop = asyncio.get_event_loop()
         self.in_queue = asyncio.Queue()
         self._find_around_me_queue = asyncio.Queue()
+        self._unregister_lock = asyncio.Lock()
         self._executor_pool = ThreadPoolExecutor(max_workers=10)
         self._find_around_me_processor_task = self._loop.create_task(
             self._find_around_me_processor()
@@ -945,13 +961,14 @@ async def disconnect(self) -> None:
 
         if self.in_queue is None:
             raise ValueError("Queue is not set, use connect first!")  # pragma: nocover
-        await self._unregister_agent()
 
         if self._find_around_me_processor_task:
             if not self._find_around_me_processor_task.done():
                 self._find_around_me_processor_task.cancel()
             await self._find_around_me_processor_task
 
+        await self._unregister_agent()
+
         await self.in_queue.put(None)
         self._find_around_me_queue = None
 
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 3d84862432..56638797f8 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmZaBtcck4gXs92SH5vcptJMm1d1f8WqUuCwvfTXnxsc3y
+  connection.py: QmWuGDjmuK75F1EnyNt7t3kso2ywHHPH8197Scw64HPmdp
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.7.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 712b147ae5..c4bf60fc0b 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -29,7 +29,7 @@ fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmXBtvcw2mQdMwkEaoU9h4pRLkGGZueqJNzGCHA279CNQk
+fetchai/connections/soef,Qmd6RwK9x8yTY5XdM8QgZc25TCu4tT7Kab7St8NsRSQd9S
 fetchai/connections/stub,QmQxzFLTBjPUMkpE1uBdkoyhb7iXY4k8VPzyykpjhuUcK1
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd

From 5c6b8224cfee23b9204d780f9c8d117154949cf5 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 16:43:56 +0100
Subject: [PATCH 123/131] Apply suggestions from code review

Co-authored-by: Lokman Rahmani <lrahmani@users.noreply.github.com>
---
 docs/acn.md | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/acn.md b/docs/acn.md
index e091fdab46..5929eaf79d 100644
--- a/docs/acn.md
+++ b/docs/acn.md
@@ -1,17 +1,18 @@
 
-The agent communication network (ACN) provides the agents with a system to find each other based on their addresses and communicate.
+The agent communication network (ACN) provides a system for agents to find each other and communicate, solely based on their wallet addresses. It addresses the message delivery problem.
 
-An agent owner faces the following problem: Given a wallet address, how can my agent whilst maintaining certain guarantees deliver a message to the holder of this address (i.e. another agent)?
+## Message delivery problem
+Agents need to contact each others. Given the wallet address of a target agent, how can the originator agent deliver a message to it whilst guarantying certain properties?
 
-The guarantees we would like to have are:
+The properties we would like to have are:
 
-- Reliability: with guarantees on message delivery
+- Reliability: with guarantees on message reception
 - Security: no third-party can tamper with the message
-- Authentication: prevent impersonation
-- Confidentiality: prevent exposing sensitive information
+- Authentication: to prevent impersonation
+- Confidentiality: to prevent exposing sensitive information within the message
 - Availability: some guarantees about the liveness of the service (tampering detection)
 
-The problem statement and the context impose a number of design constraints:
+The problem statement and the agents framework context impose a number of design constraints:
 
 - Distributed environment: no assumption are placed about the location of the agent, they can be anywhere in the publicly reachable internet
 - Decentralized environment: no trusted central authority
@@ -21,14 +22,14 @@ The ACN solves the above problem whilst providing the above guarantees and satis
 
 ## Peers
 
-The ACN is maintained by peers. Peers are not to be equated with agents. They are processes (usually distributed and decentralized) that together maintain the service.
+The ACN is maintained by peers. Peers are not to be equated with agents. They are processes (usually distributed and decentralized) that together maintain the service. To use the service, agents need to associate themselves with peers. Thanks to digital signatures, the association between a given peer and agent can be verified by any participant in the system.
 
 ## Distributed hash table
 
-At its core, the ACN comrises of a distributed hash table (DHT). A DHT is similar to a regular hash table in that it stores key-value pairs. However, storage is distributed across multiple machines (peers) with an efficient lookup mechanism. This is enabled by:
+At its core, the ACN implements a distributed hash table (DHT). A DHT is similar to a regular hash table in that it stores key-value pairs. However, storage is distributed across the participating machines (peers) with an efficient lookup operation. This is enabled by:
 
-- Consistent hashing: assignment
-- Structured overlays: (efficient) routing
+- Consistent hashing: decide responsibility for assignment of the DHT key-value storage
+- Structured overlays: organize the participating peers in a well defined topology for efficient routing
 
 <img src="../assets/dht.png" alt="DHT" class="center" style="display: block; margin-left: auto; margin-right: auto;width:50%;">
 
@@ -37,7 +38,7 @@ For the ACN, we use the DHT to store and maintain association between an agent a
 
 ## N-tier architecture
 
-To satisfy different resource constraints and flexible deployment the ACN is implemented as a multi-tier architecture. As such, it provides an extension of the client-server model. For the agent framework different tiers implemented as different <a href="../api/connections/base#connection-objects">`Connections`</a>:
+To satisfy different resource constraints and flexible deployment the ACN is implemented as a multi-tier architecture. As such, it provides an extension of the client-server model. The agent framework exploits this by implementing different tiers as different <a href="../api/connections/base#connection-objects">`Connections`</a>:
 
 <img src="../assets/acn-tiers.png" alt="DHT" class="center" style="display: block; margin-left: auto; margin-right: auto;width:80%;">
 
@@ -51,13 +52,10 @@ To satisfy different resource constraints and flexible deployment the ACN is imp
 
 An agent can choose which connection to use depending on the resource and trust requirements:
 
-- `p2p_libp2p` connection: the agent maintains a peer of the ACN. The agent does not need to trust any other entity.
+- `p2p_libp2p` connection: the agent maintains a peer of the ACN. The agent has full control over the peer and does not need to trust any other entity.
 - `p2p_libp2p_client` connection: the agent maintains a client connection to a server which is operated by a peer of the ACN. The agent does need to trust the entity operating the peer.
 
-The main protocol uses public cryptography to provide trust and security:
-- DHT process starts with a public key pair signed by agent
-- Lookup for agent addresses includes agent signature
-- TLS handshake (with self-signed certificates)
+All communication protocols use public cryptography to ensure security (authentication, confidentiality, and availability) using TLS handshakes with pre-shared public keys.
 
 <img src="../assets/acn-trust-security.png" alt="DHT" class="center" style="display: block; margin-left: auto; margin-right: auto;width:80%;">
 

From b0dc33dc81108596941d313b50ae7682e359f69e Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 16:52:08 +0100
Subject: [PATCH 124/131] fix overwrite

---
 packages/fetchai/connections/soef/connection.py   | 3 ++-
 packages/fetchai/connections/soef/connection.yaml | 2 +-
 packages/hashes.csv                               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 46cab80324..0b41b15501 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -952,7 +952,6 @@ async def connect(self) -> None:
         self._find_around_me_processor_task = self._loop.create_task(
             self._find_around_me_processor()
         )
-        self._unregister_lock = asyncio.Lock()
 
     async def disconnect(self) -> None:
         """
@@ -960,6 +959,8 @@ async def disconnect(self) -> None:
 
         :return: None
         """
+        await self._stop_periodic_ping_task()
+
         if self.in_queue is None:
             raise ValueError("Queue is not set, use connect first!")  # pragma: nocover
 
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index a7e416dc69..07f0d6aaf4 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmPXMo6hVXE6Zdbvn2sfP2cN63FK5ebtDU3tj9GDwK3bWq
+  connection.py: QmYXqA1b1YBgwNuf6nUYTJgJeHVb7d8UNmCaQmkN2mY9KZ
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.7.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 2471d31f9a..7777abae93 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -29,7 +29,7 @@ fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmNTp8AL4nVdXt5FQRPdqYLrx9Br5bdz16dutDaAp95x4a
+fetchai/connections/soef,QmW3x9tzEaE4fqBsqzMXmke8fh2y75CrFZFtMrn8WRGyZD
 fetchai/connections/stub,QmQxzFLTBjPUMkpE1uBdkoyhb7iXY4k8VPzyykpjhuUcK1
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd

From c85337cffa594c96a3f500c0912e6d63e72b956d Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 17:07:37 +0100
Subject: [PATCH 125/131] fix doc links, update api docs

---
 docs/api/aea_builder.md                |  30 ++
 docs/api/agent_loop.md                 |  93 ++-----
 docs/api/configurations/base.md        | 163 +++++++++--
 docs/api/configurations/loader.md      |  80 +++++-
 docs/api/configurations/project.md     |  69 +++++
 docs/api/crypto/cosmos.md              |   9 -
 docs/api/helpers/async_utils.md        | 124 +++++++--
 docs/api/helpers/base.md               |  26 ++
 docs/api/helpers/multiaddr/base.md     |   6 +-
 docs/api/helpers/pipe.md               | 103 ++++---
 docs/api/helpers/transaction/base.md   | 144 ++++++++++
 docs/api/manager.md                    | 365 +++++++++++++++++++++++++
 docs/api/multiplexer.md                |  55 ++--
 docs/api/protocols/generator/base.md   |   3 +
 docs/api/protocols/generator/common.md |  17 ++
 docs/api/registries/base.md            | 134 ++++++++-
 docs/api/runtime.md                    |  83 ++++--
 docs/oef-ledger.md                     |   2 +-
 docs/p2p-connection.md                 |   4 +-
 scripts/generate_api_docs.py           |   2 +
 20 files changed, 1289 insertions(+), 223 deletions(-)
 create mode 100644 docs/api/configurations/project.md
 create mode 100644 docs/api/manager.md

diff --git a/docs/api/aea_builder.md b/docs/api/aea_builder.md
index bb39ff9170..55c78bd993 100644
--- a/docs/api/aea_builder.md
+++ b/docs/api/aea_builder.md
@@ -785,6 +785,36 @@ Construct the builder from an AEA project.
 
 an AEABuilder.
 
+<a name="aea.aea_builder.AEABuilder.from_config_json"></a>
+#### from`_`config`_`json
+
+```python
+ | @classmethod
+ | from_config_json(cls, json_data: List[Dict], aea_project_path: PathLike, skip_consistency_check: bool = False) -> "AEABuilder"
+```
+
+Load agent configuration for alreaady provided json data.
+
+**Arguments**:
+
+- `json_data`: list of dicts with agent configuration
+- `aea_project_path`: path to project root
+- `skip_consistency_check`: skip consistency check on configs load.
+
+**Returns**:
+
+AEABuilder instance
+
+<a name="aea.aea_builder.AEABuilder.get_configuration_file_path"></a>
+#### get`_`configuration`_`file`_`path
+
+```python
+ | @staticmethod
+ | get_configuration_file_path(aea_project_path: Union[Path, str]) -> Path
+```
+
+Return path to aea-config file for the given aea project path.
+
 <a name="aea.aea_builder.make_logger"></a>
 #### make`_`logger
 
diff --git a/docs/api/agent_loop.md b/docs/api/agent_loop.md
index 9860d50b64..2afb2f1034 100644
--- a/docs/api/agent_loop.md
+++ b/docs/api/agent_loop.md
@@ -3,11 +3,29 @@
 
 This module contains the implementation of an agent loop using asyncio.
 
+<a name="aea.agent_loop.AgentLoopException"></a>
+## AgentLoopException Objects
+
+```python
+class AgentLoopException(AEAException)
+```
+
+Exception for agent loop runtime errors.
+
+<a name="aea.agent_loop.AgentLoopStates"></a>
+## AgentLoopStates Objects
+
+```python
+class AgentLoopStates(Enum)
+```
+
+Internal agent loop states.
+
 <a name="aea.agent_loop.BaseAgentLoop"></a>
 ## BaseAgentLoop Objects
 
 ```python
-class BaseAgentLoop(WithLogger,  ABC)
+class BaseAgentLoop(Runnable,  WithLogger,  ABC)
 ```
 
 Base abstract  agent loop class.
@@ -16,7 +34,7 @@ Base abstract  agent loop class.
 #### `__`init`__`
 
 ```python
- | __init__(agent: AbstractAgent, loop: Optional[AbstractEventLoop] = None) -> None
+ | __init__(agent: AbstractAgent, loop: Optional[AbstractEventLoop] = None, threaded=False) -> None
 ```
 
 Init loop.
@@ -43,59 +61,24 @@ Get agent.
 
 Set event loop and all event loopp related objects.
 
-<a name="aea.agent_loop.BaseAgentLoop.start"></a>
-#### start
-
-```python
- | start() -> None
-```
-
-Start agent loop synchronously in own asyncio loop.
-
-<a name="aea.agent_loop.BaseAgentLoop.setup"></a>
-#### setup
+<a name="aea.agent_loop.BaseAgentLoop.run"></a>
+#### run
 
 ```python
- | setup() -> None
-```
-
-Set up loop before started.
-
-<a name="aea.agent_loop.BaseAgentLoop.teardown"></a>
-#### teardown
-
-```python
- | teardown()
-```
-
-Tear down loop on stop.
-
-<a name="aea.agent_loop.BaseAgentLoop.run_loop"></a>
-#### run`_`loop
-
-```python
- | async run_loop() -> None
+ | async run() -> None
 ```
 
 Run agent loop.
 
-<a name="aea.agent_loop.BaseAgentLoop.wait_run_loop_stopped"></a>
-#### wait`_`run`_`loop`_`stopped
-
-```python
- | async wait_run_loop_stopped() -> None
-```
-
-Wait all tasks stopped.
-
-<a name="aea.agent_loop.BaseAgentLoop.stop"></a>
-#### stop
+<a name="aea.agent_loop.BaseAgentLoop.state"></a>
+#### state
 
 ```python
- | stop() -> None
+ | @property
+ | state() -> AgentLoopStates
 ```
 
-Stop agent loop.
+Get current main loop state.
 
 <a name="aea.agent_loop.BaseAgentLoop.is_running"></a>
 #### is`_`running
@@ -107,24 +90,6 @@ Stop agent loop.
 
 Get running state of the loop.
 
-<a name="aea.agent_loop.AgentLoopException"></a>
-## AgentLoopException Objects
-
-```python
-class AgentLoopException(AEAException)
-```
-
-Exception for agent loop runtime errors.
-
-<a name="aea.agent_loop.AgentLoopStates"></a>
-## AgentLoopStates Objects
-
-```python
-class AgentLoopStates(Enum)
-```
-
-Internal agent loop states.
-
 <a name="aea.agent_loop.AsyncAgentLoop"></a>
 ## AsyncAgentLoop Objects
 
@@ -138,7 +103,7 @@ Asyncio based agent loop suitable only for AEA.
 #### `__`init`__`
 
 ```python
- | __init__(agent: AbstractAgent, loop: AbstractEventLoop = None)
+ | __init__(agent: AbstractAgent, loop: AbstractEventLoop = None, threaded=False)
 ```
 
 Init agent loop.
diff --git a/docs/api/configurations/base.md b/docs/api/configurations/base.md
index 6ebf8cafdf..02f7c60415 100644
--- a/docs/api/configurations/base.md
+++ b/docs/api/configurations/base.md
@@ -23,6 +23,66 @@ The package name must satisfy  <a href="https://www.python.org/dev/peps/pep-0426
 The main advantage of having a dictionary is that we implicitly filter out dependency duplicates.
 We cannot have two items with the same package name since the keys of a YAML object form a set.
 
+<a name="aea.configurations.base.PackageVersion"></a>
+## PackageVersion Objects
+
+```python
+@functools.total_ordering
+class PackageVersion()
+```
+
+A package version.
+
+<a name="aea.configurations.base.PackageVersion.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(version_like: PackageVersionLike)
+```
+
+Initialize a package version.
+
+**Arguments**:
+
+- `version_like`: a string, os a semver.VersionInfo object.
+
+<a name="aea.configurations.base.PackageVersion.is_latest"></a>
+#### is`_`latest
+
+```python
+ | @property
+ | is_latest() -> bool
+```
+
+Check whether the version is 'latest'.
+
+<a name="aea.configurations.base.PackageVersion.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__() -> str
+```
+
+Get the string representation.
+
+<a name="aea.configurations.base.PackageVersion.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other) -> bool
+```
+
+Check equality.
+
+<a name="aea.configurations.base.PackageVersion.__lt__"></a>
+#### `__`lt`__`
+
+```python
+ | __lt__(other)
+```
+
+Compare with another object.
+
 <a name="aea.configurations.base.PackageType"></a>
 ## PackageType Objects
 
@@ -324,12 +384,17 @@ The concatenation of those three elements gives the public identifier:
 >>> another_public_id = PublicId("author", "my_package", "0.1.0")
 >>> assert hash(public_id) == hash(another_public_id)
 >>> assert public_id == another_public_id
+>>> latest_public_id = PublicId("author", "my_package", "latest")
+>>> latest_public_id
+<author/my_package:latest>
+>>> latest_public_id.package_version.is_latest
+True
 
 <a name="aea.configurations.base.PublicId.__init__"></a>
 #### `__`init`__`
 
 ```python
- | __init__(author: str, name: str, version: PackageVersionLike)
+ | __init__(author: str, name: str, version: Optional[PackageVersionLike] = None)
 ```
 
 Initialize the public identifier.
@@ -362,17 +427,17 @@ Get the name.
  | version() -> str
 ```
 
-Get the version.
+Get the version string.
 
-<a name="aea.configurations.base.PublicId.version_info"></a>
-#### version`_`info
+<a name="aea.configurations.base.PublicId.package_version"></a>
+#### package`_`version
 
 ```python
  | @property
- | version_info() -> PackageVersion
+ | package_version() -> PackageVersion
 ```
 
-Get the package version.
+Get the package version object.
 
 <a name="aea.configurations.base.PublicId.latest"></a>
 #### latest
@@ -384,6 +449,24 @@ Get the package version.
 
 Get the public id in `latest` form.
 
+<a name="aea.configurations.base.PublicId.same_prefix"></a>
+#### same`_`prefix
+
+```python
+ | same_prefix(other: "PublicId") -> bool
+```
+
+Check if the other public id has the same author and name of this.
+
+<a name="aea.configurations.base.PublicId.to_latest"></a>
+#### to`_`latest
+
+```python
+ | to_latest() -> "PublicId"
+```
+
+Return the same public id, but with latest version.
+
 <a name="aea.configurations.base.PublicId.from_str"></a>
 #### from`_`str
 
@@ -765,6 +848,16 @@ Get the component identifier without the version.
 
 Get the prefix import path for this component.
 
+<a name="aea.configurations.base.ComponentId.json"></a>
+#### json
+
+```python
+ | @property
+ | json() -> Dict
+```
+
+Get the JSON representation.
+
 <a name="aea.configurations.base.PackageConfiguration"></a>
 ## PackageConfiguration Objects
 
@@ -853,6 +946,23 @@ Get the public id.
 
 Get the package dependencies.
 
+<a name="aea.configurations.base.PackageConfiguration.update"></a>
+#### update
+
+```python
+ | update(data: Dict) -> None
+```
+
+Update configuration with other data.
+
+**Arguments**:
+
+- `data`: the data to replace.
+
+**Returns**:
+
+None
+
 <a name="aea.configurations.base.ComponentConfiguration"></a>
 ## ComponentConfiguration Objects
 
@@ -945,23 +1055,6 @@ Check that the AEA version matches the specifier set.
 
 :raises ValueError if the version of the aea framework falls within a specifier.
 
-<a name="aea.configurations.base.ComponentConfiguration.update"></a>
-#### update
-
-```python
- | update(data: Dict) -> None
-```
-
-Update configuration with other data.
-
-**Arguments**:
-
-- `data`: the data to replace.
-
-**Returns**:
-
-None
-
 <a name="aea.configurations.base.ConnectionConfig"></a>
 ## ConnectionConfig Objects
 
@@ -1019,9 +1112,11 @@ Initialize from a JSON object.
 
 Update configuration with other data.
 
+This method does side-effect on the configuration object.
+
 **Arguments**:
 
-- `data`: the data to replace.
+- `data`: the data to populate or replace.
 
 **Returns**:
 
@@ -1337,6 +1432,26 @@ Return the JSON representation.
 
 Initialize from a JSON object.
 
+<a name="aea.configurations.base.AgentConfig.update"></a>
+#### update
+
+```python
+ | update(data: Dict) -> None
+```
+
+Update configuration with other data.
+
+To update the component parts, populate the field "component_configurations" as a
+mapping from ComponentId to configurations.
+
+**Arguments**:
+
+- `data`: the data to replace.
+
+**Returns**:
+
+None
+
 <a name="aea.configurations.base.SpeechActContentConfig"></a>
 ## SpeechActContentConfig Objects
 
diff --git a/docs/api/configurations/loader.md b/docs/api/configurations/loader.md
index 5898403b87..954ba2685b 100644
--- a/docs/api/configurations/loader.md
+++ b/docs/api/configurations/loader.md
@@ -20,30 +20,29 @@ Make the JSONSchema base URI, cross-platform.
 
 the string in URI form.
 
-<a name="aea.configurations.loader.ConfigLoader"></a>
-## ConfigLoader Objects
+<a name="aea.configurations.loader.BaseConfigLoader"></a>
+## BaseConfigLoader Objects
 
 ```python
-class ConfigLoader(Generic[T])
+class BaseConfigLoader()
 ```
 
-This class implement parsing, serialization and validation functionalities for the 'aea' configuration files.
+Base class for configuration loader classes.
 
-<a name="aea.configurations.loader.ConfigLoader.__init__"></a>
+<a name="aea.configurations.loader.BaseConfigLoader.__init__"></a>
 #### `__`init`__`
 
 ```python
- | __init__(schema_filename: str, configuration_class: Type[T])
+ | __init__(schema_filename: str)
 ```
 
-Initialize the parser for configuration files.
+Initialize the base configuration loader.
 
 **Arguments**:
 
-- `schema_filename`: the path to the JSON-schema file in 'aea/configurations/schemas'.
-- `configuration_class`: the configuration class (e.g. AgentConfig, SkillConfig etc.)
+- `schema_filename`: the path to the schema.
 
-<a name="aea.configurations.loader.ConfigLoader.validator"></a>
+<a name="aea.configurations.loader.BaseConfigLoader.validator"></a>
 #### validator
 
 ```python
@@ -53,7 +52,24 @@ Initialize the parser for configuration files.
 
 Get the json schema validator.
 
-<a name="aea.configurations.loader.ConfigLoader.required_fields"></a>
+<a name="aea.configurations.loader.BaseConfigLoader.validate"></a>
+#### validate
+
+```python
+ | validate(json_data: Dict) -> None
+```
+
+Validate a JSON object.
+
+**Arguments**:
+
+- `json_data`: the JSON data.
+
+**Returns**:
+
+None.
+
+<a name="aea.configurations.loader.BaseConfigLoader.required_fields"></a>
 #### required`_`fields
 
 ```python
@@ -61,12 +77,35 @@ Get the json schema validator.
  | required_fields() -> List[str]
 ```
 
-Get required fields.
+Get the required fields.
 
 **Returns**:
 
 list of required fields.
 
+<a name="aea.configurations.loader.ConfigLoader"></a>
+## ConfigLoader Objects
+
+```python
+class ConfigLoader(Generic[T],  BaseConfigLoader)
+```
+
+Parsing, serialization and validation for package configuration files.
+
+<a name="aea.configurations.loader.ConfigLoader.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(schema_filename: str, configuration_class: Type[T])
+```
+
+Initialize the parser for configuration files.
+
+**Arguments**:
+
+- `schema_filename`: the path to the JSON-schema file in 'aea/configurations/schemas'.
+- `configuration_class`: the configuration class (e.g. AgentConfig, SkillConfig etc.)
+
 <a name="aea.configurations.loader.ConfigLoader.configuration_class"></a>
 #### configuration`_`class
 
@@ -157,6 +196,23 @@ None
 
 Get the configuration loader from the type.
 
+<a name="aea.configurations.loader.ConfigLoader.load_agent_config_from_json"></a>
+#### load`_`agent`_`config`_`from`_`json
+
+```python
+ | load_agent_config_from_json(configuration_json: List[Dict]) -> AgentConfig
+```
+
+Load agent configuration from configuration json data.
+
+**Arguments**:
+
+- `configuration_json`: list of dicts with aea configuration
+
+**Returns**:
+
+AgentConfig instance
+
 <a name="aea.configurations.loader.ConfigLoaders"></a>
 ## ConfigLoaders Objects
 
diff --git a/docs/api/configurations/project.md b/docs/api/configurations/project.md
new file mode 100644
index 0000000000..b98b950b04
--- /dev/null
+++ b/docs/api/configurations/project.md
@@ -0,0 +1,69 @@
+<a name="aea.configurations.project"></a>
+# aea.configurations.project
+
+This module contains the implementation of AEA agents project configuiration.
+
+<a name="aea.configurations.project.Project"></a>
+## Project Objects
+
+```python
+class Project()
+```
+
+Agent project representation.
+
+<a name="aea.configurations.project.Project.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(public_id: PublicId, path: str)
+```
+
+Init project with public_id and project's path.
+
+<a name="aea.configurations.project.Project.load"></a>
+#### load
+
+```python
+ | @classmethod
+ | load(cls, working_dir: str, public_id: PublicId) -> "Project"
+```
+
+Load project with given pubblic_id to working_dir.
+
+<a name="aea.configurations.project.Project.remove"></a>
+#### remove
+
+```python
+ | remove() -> None
+```
+
+Remove project, do cleanup.
+
+<a name="aea.configurations.project.AgentAlias"></a>
+## AgentAlias Objects
+
+```python
+class AgentAlias()
+```
+
+Agent alias representation.
+
+<a name="aea.configurations.project.AgentAlias.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(project: Project, agent_name: str, config: List[Dict], agent: AEA)
+```
+
+Init agent alias with project, config, name, agent.
+
+<a name="aea.configurations.project.AgentAlias.remove_from_project"></a>
+#### remove`_`from`_`project
+
+```python
+ | remove_from_project()
+```
+
+Remove agent alias from project.
+
diff --git a/docs/api/crypto/cosmos.md b/docs/api/crypto/cosmos.md
index 8e4566442f..1b9ddd5be4 100644
--- a/docs/api/crypto/cosmos.md
+++ b/docs/api/crypto/cosmos.md
@@ -614,15 +614,6 @@ class CosmosApi(_CosmosApi,  CosmosHelper)
 
 Class to interact with the Cosmos SDK via a HTTP APIs.
 
-<a name="aea.crypto.cosmos.CosmWasmCLIWrapper"></a>
-## CosmWasmCLIWrapper Objects
-
-```python
-class CosmWasmCLIWrapper()
-```
-
-Wrapper of the CosmWasm CLI.
-
 <a name="aea.crypto.cosmos.CosmosFaucetApi"></a>
 ## CosmosFaucetApi Objects
 
diff --git a/docs/api/helpers/async_utils.md b/docs/api/helpers/async_utils.md
index a55cc92680..4b6bc6857c 100644
--- a/docs/api/helpers/async_utils.md
+++ b/docs/api/helpers/async_utils.md
@@ -151,25 +151,6 @@ Activate period calls.
 
 Remove from schedule.
 
-<a name="aea.helpers.async_utils.ensure_loop"></a>
-#### ensure`_`loop
-
-```python
-ensure_loop(loop: Optional[AbstractEventLoop] = None) -> AbstractEventLoop
-```
-
-Use loop provided or create new if not provided or closed.
-
-Return loop passed if its provided,not closed and not running, otherwise returns new event loop.
-
-**Arguments**:
-
-- `loop`: optional event loop
-
-**Returns**:
-
-asyncio event loop
-
 <a name="aea.helpers.async_utils.AnotherThreadTask"></a>
 ## AnotherThreadTask Objects
 
@@ -295,7 +276,7 @@ Stop event loop in thread.
 class AwaitableProc()
 ```
 
-Async-friendly subprocess.Popen
+Async-friendly subprocess.Popen.
 
 <a name="aea.helpers.async_utils.AwaitableProc.__init__"></a>
 #### `__`init`__`
@@ -313,7 +294,7 @@ Initialise awaitable proc.
  | async start()
 ```
 
-Start the subprocess
+Start the subprocess.
 
 <a name="aea.helpers.async_utils.ItemGetter"></a>
 ## ItemGetter Objects
@@ -368,3 +349,104 @@ Init HandlerItemGetter.
 
 - `getters`: List of tuples of handler and couroutine to be awaiteed for an item.
 
+<a name="aea.helpers.async_utils.Runnable"></a>
+## Runnable Objects
+
+```python
+class Runnable(ABC)
+```
+
+Abstract Runnable class.
+
+Use to run async task in same event loop or in dedicated thread.
+Provides: start, stop sync methods to start and stop task
+Use wait_completed to await task was completed.
+
+<a name="aea.helpers.async_utils.Runnable.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(loop: asyncio.AbstractEventLoop = None, threaded: bool = False) -> None
+```
+
+Init runnable.
+
+**Arguments**:
+
+- `loop`: asyncio event loop to use.
+- `threaded`: bool. start in thread if True.
+
+**Returns**:
+
+None
+
+<a name="aea.helpers.async_utils.Runnable.start"></a>
+#### start
+
+```python
+ | start() -> bool
+```
+
+Start runnable.
+
+**Returns**:
+
+bool started or not.
+
+<a name="aea.helpers.async_utils.Runnable.is_running"></a>
+#### is`_`running
+
+```python
+ | @property
+ | is_running() -> bool
+```
+
+Get running state.
+
+<a name="aea.helpers.async_utils.Runnable.run"></a>
+#### run
+
+```python
+ | @abstractmethod
+ | async run() -> Any
+```
+
+Implement run logic respectfull to CancelError on termination.
+
+<a name="aea.helpers.async_utils.Runnable.wait_completed"></a>
+#### wait`_`completed
+
+```python
+ | wait_completed(sync: bool = False, timeout: float = None, force_result: bool = False) -> Awaitable
+```
+
+Wait runnable execution completed.
+
+**Arguments**:
+
+- `sync`: bool. blocking wait
+- `timeout`: float seconds
+- `force_result`: check result even it was waited.
+
+**Returns**:
+
+awaitable if sync is False, otherise None
+
+<a name="aea.helpers.async_utils.Runnable.stop"></a>
+#### stop
+
+```python
+ | stop(force: bool = False) -> None
+```
+
+Stop runnable.
+
+<a name="aea.helpers.async_utils.Runnable.start_and_wait_completed"></a>
+#### start`_`and`_`wait`_`completed
+
+```python
+ | start_and_wait_completed(*args, **kwargs) -> Awaitable
+```
+
+Alias for start and wait methods.
+
diff --git a/docs/api/helpers/base.md b/docs/api/helpers/base.md
index 708e1a5c7d..bf6420d777 100644
--- a/docs/api/helpers/base.md
+++ b/docs/api/helpers/base.md
@@ -269,3 +269,29 @@ Run code in context to log and re raise exception.
 - `log_method`: function to print log
 - `message`: message template to add error text.
 
+<a name="aea.helpers.base.recursive_update"></a>
+#### recursive`_`update
+
+```python
+recursive_update(to_update: Dict, new_values: Dict) -> None
+```
+
+Update a dictionary by replacing conflicts with the new values.
+
+It does side-effects to the first dictionary.
+
+>>> to_update = dict(a=1, b=2, subdict=dict(subfield1=1))
+>>> new_values = dict(b=3, subdict=dict(subfield1=2))
+>>> recursive_update(to_update, new_values)
+>>> to_update
+{'a': 1, 'b': 3, 'subdict': {'subfield1': 2}}
+
+**Arguments**:
+
+- `to_update`: the dictionary to update.
+- `new_values`: the dictionary of new values to replace.
+
+**Returns**:
+
+None
+
diff --git a/docs/api/helpers/multiaddr/base.md b/docs/api/helpers/multiaddr/base.md
index d7a9062ce3..371ee50517 100644
--- a/docs/api/helpers/multiaddr/base.md
+++ b/docs/api/helpers/multiaddr/base.md
@@ -10,7 +10,7 @@ This module contains multiaddress class.
 class MultiAddr()
 ```
 
-Protocol Labs' Multiaddress representation of a network address
+Protocol Labs' Multiaddress representation of a network address.
 
 <a name="aea.helpers.multiaddr.base.MultiAddr.__init__"></a>
 #### `__`init`__`
@@ -19,7 +19,7 @@ Protocol Labs' Multiaddress representation of a network address
  | __init__(host: str, port: int, public_key: str)
 ```
 
-Initialize a multiaddress
+Initialize a multiaddress.
 
 **Arguments**:
 
@@ -75,7 +75,7 @@ Get the peer id.
  | format() -> str
 ```
 
-Canonical representation of a multiaddress
+Canonical representation of a multiaddress.
 
 <a name="aea.helpers.multiaddr.base.MultiAddr.__str__"></a>
 #### `__`str`__`
diff --git a/docs/api/helpers/pipe.md b/docs/api/helpers/pipe.md
index 0597f6acfc..47262b7de2 100644
--- a/docs/api/helpers/pipe.md
+++ b/docs/api/helpers/pipe.md
@@ -10,7 +10,7 @@ Portable pipe implementation for Linux, MacOS, and Windows.
 class IPCChannelClient(ABC)
 ```
 
-Multi-platform interprocess communication channel for the client side
+Multi-platform interprocess communication channel for the client side.
 
 <a name="aea.helpers.pipe.IPCChannelClient.connect"></a>
 #### connect
@@ -35,6 +35,7 @@ Connect to communication channel
 ```
 
 Write `data` bytes to the other end of the channel
+
 Will first write the size than the actual data
 
 **Arguments**:
@@ -50,6 +51,7 @@ Will first write the size than the actual data
 ```
 
 Read bytes from the other end of the channel
+
 Will first read the size than the actual data
 
 **Returns**:
@@ -64,7 +66,11 @@ read bytes
  | async close() -> None
 ```
 
-Close the communication channel
+Close the communication channel.
+
+**Returns**:
+
+None
 
 <a name="aea.helpers.pipe.IPCChannel"></a>
 ## IPCChannel Objects
@@ -73,7 +79,7 @@ Close the communication channel
 class IPCChannel(IPCChannelClient)
 ```
 
-Multi-platform interprocess communication channel
+Multi-platform interprocess communication channel.
 
 <a name="aea.helpers.pipe.IPCChannel.in_path"></a>
 #### in`_`path
@@ -84,7 +90,11 @@ Multi-platform interprocess communication channel
  | in_path() -> str
 ```
 
-Rendezvous point for incoming communication
+Rendezvous point for incoming communication.
+
+**Returns**:
+
+path
 
 <a name="aea.helpers.pipe.IPCChannel.out_path"></a>
 #### out`_`path
@@ -95,7 +105,11 @@ Rendezvous point for incoming communication
  | out_path() -> str
 ```
 
-Rendezvous point for outgoing communication
+Rendezvous point for outgoing communication.
+
+**Returns**:
+
+path
 
 <a name="aea.helpers.pipe.PosixNamedPipeProtocol"></a>
 ## PosixNamedPipeProtocol Objects
@@ -104,7 +118,7 @@ Rendezvous point for outgoing communication
 class PosixNamedPipeProtocol()
 ```
 
-Posix named pipes async wrapper communication protocol
+Posix named pipes async wrapper communication protocol.
 
 <a name="aea.helpers.pipe.PosixNamedPipeProtocol.__init__"></a>
 #### `__`init`__`
@@ -113,7 +127,7 @@ Posix named pipes async wrapper communication protocol
  | __init__(in_path: str, out_path: str, logger: logging.Logger = _default_logger, loop: Optional[AbstractEventLoop] = None)
 ```
 
-Initialize a new posix named pipe
+Initialize a new posix named pipe.
 
 **Arguments**:
 
@@ -170,7 +184,7 @@ read bytes
  | async close() -> None
 ```
 
-Disconnect pipe
+Disconnect pipe.
 
 <a name="aea.helpers.pipe.TCPSocketProtocol"></a>
 ## TCPSocketProtocol Objects
@@ -179,7 +193,7 @@ Disconnect pipe
 class TCPSocketProtocol()
 ```
 
-TCP socket communication protocol
+TCP socket communication protocol.
 
 <a name="aea.helpers.pipe.TCPSocketProtocol.__init__"></a>
 #### `__`init`__`
@@ -188,7 +202,7 @@ TCP socket communication protocol
  | __init__(reader: asyncio.StreamReader, writer: asyncio.StreamWriter, logger: logging.Logger = _default_logger, loop: Optional[AbstractEventLoop] = None)
 ```
 
-Initialize the tcp socket protocol
+Initialize the tcp socket protocol.
 
 **Arguments**:
 
@@ -228,7 +242,7 @@ read bytes
  | async close() -> None
 ```
 
-Disconnect socket
+Disconnect socket.
 
 <a name="aea.helpers.pipe.TCPSocketChannel"></a>
 ## TCPSocketChannel Objects
@@ -237,7 +251,7 @@ Disconnect socket
 class TCPSocketChannel(IPCChannel)
 ```
 
-Interprocess communication channel implementation using tcp sockets
+Interprocess communication channel implementation using tcp sockets.
 
 <a name="aea.helpers.pipe.TCPSocketChannel.__init__"></a>
 #### `__`init`__`
@@ -246,7 +260,7 @@ Interprocess communication channel implementation using tcp sockets
  | __init__(logger: logging.Logger = _default_logger, loop: Optional[AbstractEventLoop] = None)
 ```
 
-Initialize tcp socket interprocess communication channel
+Initialize tcp socket interprocess communication channel.
 
 <a name="aea.helpers.pipe.TCPSocketChannel.connect"></a>
 #### connect
@@ -255,7 +269,7 @@ Initialize tcp socket interprocess communication channel
  | async connect(timeout: float = PIPE_CONN_TIMEOUT) -> bool
 ```
 
-Setup communication channel and wait for other end to connect
+Setup communication channel and wait for other end to connect.
 
 **Arguments**:
 
@@ -294,7 +308,7 @@ Read from channel.
  | async close() -> None
 ```
 
-Disconnect from channel and clean it up
+Disconnect from channel and clean it up.
 
 <a name="aea.helpers.pipe.TCPSocketChannel.in_path"></a>
 #### in`_`path
@@ -304,7 +318,7 @@ Disconnect from channel and clean it up
  | in_path() -> str
 ```
 
-Rendezvous point for incoming communication
+Rendezvous point for incoming communication.
 
 <a name="aea.helpers.pipe.TCPSocketChannel.out_path"></a>
 #### out`_`path
@@ -314,7 +328,7 @@ Rendezvous point for incoming communication
  | out_path() -> str
 ```
 
-Rendezvous point for outgoing communication
+Rendezvous point for outgoing communication.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannel"></a>
 ## PosixNamedPipeChannel Objects
@@ -323,7 +337,7 @@ Rendezvous point for outgoing communication
 class PosixNamedPipeChannel(IPCChannel)
 ```
 
-Interprocess communication channel implementation using Posix named pipes
+Interprocess communication channel implementation using Posix named pipes.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannel.__init__"></a>
 #### `__`init`__`
@@ -332,7 +346,7 @@ Interprocess communication channel implementation using Posix named pipes
  | __init__(logger: logging.Logger = _default_logger, loop: Optional[AbstractEventLoop] = None)
 ```
 
-Initialize posix named pipe interprocess communication channel
+Initialize posix named pipe interprocess communication channel.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannel.connect"></a>
 #### connect
@@ -341,12 +355,16 @@ Initialize posix named pipe interprocess communication channel
  | async connect(timeout: float = PIPE_CONN_TIMEOUT) -> bool
 ```
 
-Setup communication channel and wait for other end to connect
+Setup communication channel and wait for other end to connect.
 
 **Arguments**:
 
 - `timeout`: timeout for connection to be established
 
+**Returns**:
+
+bool, indicating sucess
+
 <a name="aea.helpers.pipe.PosixNamedPipeChannel.write"></a>
 #### write
 
@@ -380,7 +398,7 @@ read bytes
  | async close() -> None
 ```
 
-Close the channel and clean it up
+Close the channel and clean it up.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannel.in_path"></a>
 #### in`_`path
@@ -390,7 +408,7 @@ Close the channel and clean it up
  | in_path() -> str
 ```
 
-Rendezvous point for incoming communication
+Rendezvous point for incoming communication.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannel.out_path"></a>
 #### out`_`path
@@ -400,7 +418,7 @@ Rendezvous point for incoming communication
  | out_path() -> str
 ```
 
-Rendezvous point for outgoing communication
+Rendezvous point for outgoing communication.
 
 <a name="aea.helpers.pipe.TCPSocketChannelClient"></a>
 ## TCPSocketChannelClient Objects
@@ -409,7 +427,7 @@ Rendezvous point for outgoing communication
 class TCPSocketChannelClient(IPCChannelClient)
 ```
 
-Interprocess communication channel client using tcp sockets
+Interprocess communication channel client using tcp sockets.
 
 <a name="aea.helpers.pipe.TCPSocketChannelClient.__init__"></a>
 #### `__`init`__`
@@ -418,7 +436,7 @@ Interprocess communication channel client using tcp sockets
  | __init__(in_path: str, out_path: str, logger: logging.Logger = _default_logger, loop: Optional[AbstractEventLoop] = None)
 ```
 
-Initialize a tcp socket communication channel client
+Initialize a tcp socket communication channel client.
 
 **Arguments**:
 
@@ -432,7 +450,7 @@ Initialize a tcp socket communication channel client
  | async connect(timeout: float = PIPE_CONN_TIMEOUT) -> bool
 ```
 
-Connect to the other end of the communication channel
+Connect to the other end of the communication channel.
 
 **Arguments**:
 
@@ -445,7 +463,7 @@ Connect to the other end of the communication channel
  | async write(data: bytes) -> None
 ```
 
-Write data to channel
+Write data to channel.
 
 **Arguments**:
 
@@ -458,7 +476,7 @@ Write data to channel
  | async read() -> Optional[bytes]
 ```
 
-Read data from channel
+Read data from channel.
 
 **Returns**:
 
@@ -471,7 +489,7 @@ read bytes
  | async close() -> None
 ```
 
-Disconnect from communication channel
+Disconnect from communication channel.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannelClient"></a>
 ## PosixNamedPipeChannelClient Objects
@@ -480,7 +498,7 @@ Disconnect from communication channel
 class PosixNamedPipeChannelClient(IPCChannelClient)
 ```
 
-Interprocess communication channel client using Posix named pipes
+Interprocess communication channel client using Posix named pipes.
 
 <a name="aea.helpers.pipe.PosixNamedPipeChannelClient.__init__"></a>
 #### `__`init`__`
@@ -489,7 +507,7 @@ Interprocess communication channel client using Posix named pipes
  | __init__(in_path: str, out_path: str, logger: logging.Logger = _default_logger, loop: Optional[AbstractEventLoop] = None)
 ```
 
-Initialize a posix named pipe communication channel client
+Initialize a posix named pipe communication channel client.
 
 **Arguments**:
 
@@ -503,7 +521,7 @@ Initialize a posix named pipe communication channel client
  | async connect(timeout: float = PIPE_CONN_TIMEOUT) -> bool
 ```
 
-Connect to the other end of the communication channel
+Connect to the other end of the communication channel.
 
 **Arguments**:
 
@@ -516,7 +534,7 @@ Connect to the other end of the communication channel
  | async write(data: bytes) -> None
 ```
 
-Write data to channel
+Write data to channel.
 
 **Arguments**:
 
@@ -529,7 +547,7 @@ Write data to channel
  | async read() -> Optional[bytes]
 ```
 
-Read data from channel
+Read data from channel.
 
 **Returns**:
 
@@ -542,7 +560,7 @@ read bytes
  | async close() -> None
 ```
 
-Disconnect from communication channel
+Disconnect from communication channel.
 
 <a name="aea.helpers.pipe.make_ipc_channel"></a>
 #### make`_`ipc`_`channel
@@ -553,6 +571,15 @@ make_ipc_channel(logger: logging.Logger = _default_logger, loop: Optional[Abstra
 
 Build a portable bidirectional InterProcess Communication channel
 
+**Arguments**:
+
+- `logger`: the logger
+- `loop`: the loop
+
+**Returns**:
+
+IPCChannel
+
 <a name="aea.helpers.pipe.make_ipc_channel_client"></a>
 #### make`_`ipc`_`channel`_`client
 
@@ -566,4 +593,10 @@ Build a portable bidirectional InterProcess Communication client channel
 
 - `in_path`: rendezvous point for incoming communication
 - `out_path`: rendezvous point for outgoing outgoing
+- `logger`: the logger
+- `loop`: the loop
+
+**Returns**:
+
+IPCChannel
 
diff --git a/docs/api/helpers/transaction/base.md b/docs/api/helpers/transaction/base.md
index d7f9b47d5f..2db69505a1 100644
--- a/docs/api/helpers/transaction/base.md
+++ b/docs/api/helpers/transaction/base.md
@@ -82,6 +82,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'raw_transaction_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.RawTransaction.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.RawTransaction.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.RawMessage"></a>
 ## RawMessage Objects
 
@@ -171,6 +189,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'raw_message_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.RawMessage.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.RawMessage.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.SignedTransaction"></a>
 ## SignedTransaction Objects
 
@@ -250,6 +286,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'signed_transaction_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.SignedTransaction.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.SignedTransaction.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.SignedMessage"></a>
 ## SignedMessage Objects
 
@@ -339,6 +393,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'signed_message_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.SignedMessage.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.SignedMessage.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.State"></a>
 ## State Objects
 
@@ -418,6 +490,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'state_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.State.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.State.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.Terms"></a>
 ## Terms Objects
 
@@ -784,6 +874,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'terms_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.Terms.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.Terms.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.TransactionDigest"></a>
 ## TransactionDigest Objects
 
@@ -863,6 +971,24 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'transaction_digest_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.TransactionDigest.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.TransactionDigest.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
 <a name="aea.helpers.transaction.base.TransactionReceipt"></a>
 ## TransactionReceipt Objects
 
@@ -952,3 +1078,21 @@ A new instance of this class must be created that matches the protocol buffer ob
 
 A new instance of this class that matches the protocol buffer object in the 'transaction_receipt_protobuf_object' argument.
 
+<a name="aea.helpers.transaction.base.TransactionReceipt.__eq__"></a>
+#### `__`eq`__`
+
+```python
+ | __eq__(other)
+```
+
+Check equality.
+
+<a name="aea.helpers.transaction.base.TransactionReceipt.__str__"></a>
+#### `__`str`__`
+
+```python
+ | __str__()
+```
+
+Get string representation.
+
diff --git a/docs/api/manager.md b/docs/api/manager.md
new file mode 100644
index 0000000000..2c9a7aca94
--- /dev/null
+++ b/docs/api/manager.md
@@ -0,0 +1,365 @@
+<a name="aea.manager"></a>
+# aea.manager
+
+This module contains the implementation of AEA agents manager.
+
+<a name="aea.manager.AgentRunAsyncTask"></a>
+## AgentRunAsyncTask Objects
+
+```python
+class AgentRunAsyncTask()
+```
+
+Async task wrapper for agent.
+
+<a name="aea.manager.AgentRunAsyncTask.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(agent: AEA, loop: asyncio.AbstractEventLoop) -> None
+```
+
+Init task with agent and loop.
+
+<a name="aea.manager.AgentRunAsyncTask.create_run_loop"></a>
+#### create`_`run`_`loop
+
+```python
+ | create_run_loop() -> None
+```
+
+Create run loop.
+
+<a name="aea.manager.AgentRunAsyncTask.start"></a>
+#### start
+
+```python
+ | start() -> None
+```
+
+Start task.
+
+<a name="aea.manager.AgentRunAsyncTask.wait"></a>
+#### wait
+
+```python
+ | wait() -> asyncio.Future
+```
+
+Return future to wait task completed.
+
+<a name="aea.manager.AgentRunAsyncTask.stop"></a>
+#### stop
+
+```python
+ | stop() -> None
+```
+
+Stop task.
+
+<a name="aea.manager.AgentRunAsyncTask.run"></a>
+#### run
+
+```python
+ | async run() -> None
+```
+
+Run task body.
+
+<a name="aea.manager.AgentRunAsyncTask.is_running"></a>
+#### is`_`running
+
+```python
+ | @property
+ | is_running() -> bool
+```
+
+Return is task running.
+
+<a name="aea.manager.AgentRunThreadTask"></a>
+## AgentRunThreadTask Objects
+
+```python
+class AgentRunThreadTask(AgentRunAsyncTask)
+```
+
+Threaded wrapper to run agent.
+
+<a name="aea.manager.AgentRunThreadTask.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(agent: AEA, loop: asyncio.AbstractEventLoop) -> None
+```
+
+Init task with agent and loop.
+
+<a name="aea.manager.AgentRunThreadTask.create_run_loop"></a>
+#### create`_`run`_`loop
+
+```python
+ | create_run_loop() -> None
+```
+
+Create run loop.
+
+<a name="aea.manager.AgentRunThreadTask.start"></a>
+#### start
+
+```python
+ | start() -> None
+```
+
+Run task in a dedicated thread.
+
+<a name="aea.manager.MultiAgentManager"></a>
+## MultiAgentManager Objects
+
+```python
+class MultiAgentManager()
+```
+
+Multi agents manager.
+
+<a name="aea.manager.MultiAgentManager.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(working_dir: str, mode: str = "async") -> None
+```
+
+Initialize manager.
+
+**Arguments**:
+
+- `working_dir`: directory to store base agents.
+
+<a name="aea.manager.MultiAgentManager.is_running"></a>
+#### is`_`running
+
+```python
+ | @property
+ | is_running() -> bool
+```
+
+Is manager running.
+
+<a name="aea.manager.MultiAgentManager.add_error_callback"></a>
+#### add`_`error`_`callback
+
+```python
+ | add_error_callback(error_callback: Callable[[str, BaseException], None]) -> None
+```
+
+Add error callback to call on error raised.
+
+<a name="aea.manager.MultiAgentManager.start_manager"></a>
+#### start`_`manager
+
+```python
+ | start_manager() -> "MultiAgentManager"
+```
+
+Start manager.
+
+<a name="aea.manager.MultiAgentManager.stop_manager"></a>
+#### stop`_`manager
+
+```python
+ | stop_manager() -> "MultiAgentManager"
+```
+
+Stop manager.
+
+Stops all running agents and stop agent.
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.add_project"></a>
+#### add`_`project
+
+```python
+ | add_project(public_id: PublicId) -> "MultiAgentManager"
+```
+
+Fetch agent project and all dependencies to working_dir.
+
+<a name="aea.manager.MultiAgentManager.remove_project"></a>
+#### remove`_`project
+
+```python
+ | remove_project(public_id: PublicId) -> "MultiAgentManager"
+```
+
+Remove agent project.
+
+<a name="aea.manager.MultiAgentManager.list_projects"></a>
+#### list`_`projects
+
+```python
+ | list_projects() -> List[PublicId]
+```
+
+List all agents projects added.
+
+**Returns**:
+
+lit of public ids of projects
+
+<a name="aea.manager.MultiAgentManager.add_agent"></a>
+#### add`_`agent
+
+```python
+ | add_agent(public_id: PublicId, agent_name: Optional[str] = None, agent_overrides: Optional[dict] = None, component_overrides: Optional[List[dict]] = None) -> "MultiAgentManager"
+```
+
+Create new agent configuration based on project with config overrides applied.
+
+Alias is stored in memory only!
+
+**Arguments**:
+
+- `public_id`: base agent project public id
+- `agent_name`: unique name for the agent
+- `agent_overrides`: overrides for agent config.
+- `component_overrides`: overrides for component section.
+
+**Returns**:
+
+manager
+
+<a name="aea.manager.MultiAgentManager.list_agents"></a>
+#### list`_`agents
+
+```python
+ | list_agents(running_only: bool = False) -> List[str]
+```
+
+List all agents.
+
+**Arguments**:
+
+- `running_only`: returns only running if set to True
+
+**Returns**:
+
+list of agents names
+
+<a name="aea.manager.MultiAgentManager.remove_agent"></a>
+#### remove`_`agent
+
+```python
+ | remove_agent(agent_name: str) -> "MultiAgentManager"
+```
+
+Remove agent alias definition from registry.
+
+**Arguments**:
+
+- `agent_name`: agent name to remove
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.start_agent"></a>
+#### start`_`agent
+
+```python
+ | start_agent(agent_name: str) -> "MultiAgentManager"
+```
+
+Start selected agent.
+
+**Arguments**:
+
+- `agent_name`: agent name to start
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.start_all_agents"></a>
+#### start`_`all`_`agents
+
+```python
+ | start_all_agents() -> "MultiAgentManager"
+```
+
+Start all not started agents.
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.stop_agent"></a>
+#### stop`_`agent
+
+```python
+ | stop_agent(agent_name: str) -> "MultiAgentManager"
+```
+
+Stop running agent.
+
+**Arguments**:
+
+- `agent_name`: agent name to stop
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.stop_all_agents"></a>
+#### stop`_`all`_`agents
+
+```python
+ | stop_all_agents() -> "MultiAgentManager"
+```
+
+Stop all agents running.
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.stop_agents"></a>
+#### stop`_`agents
+
+```python
+ | stop_agents(agent_names: List[str]) -> "MultiAgentManager"
+```
+
+Stop specified agents.
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.start_agents"></a>
+#### start`_`agents
+
+```python
+ | start_agents(agent_names: List[str]) -> "MultiAgentManager"
+```
+
+Stop specified agents.
+
+**Returns**:
+
+None
+
+<a name="aea.manager.MultiAgentManager.get_agent_alias"></a>
+#### get`_`agent`_`alias
+
+```python
+ | get_agent_alias(agent_name: str) -> AgentAlias
+```
+
+Return details about agent alias definition.
+
+**Returns**:
+
+AgentAlias
+
diff --git a/docs/api/multiplexer.md b/docs/api/multiplexer.md
index 0323f016dc..3349f0916d 100644
--- a/docs/api/multiplexer.md
+++ b/docs/api/multiplexer.md
@@ -65,7 +65,7 @@ Return is disconnected.
 ## AsyncMultiplexer Objects
 
 ```python
-class AsyncMultiplexer(WithLogger)
+class AsyncMultiplexer(Runnable,  WithLogger)
 ```
 
 This class can handle multiple connections at once.
@@ -74,7 +74,7 @@ This class can handle multiple connections at once.
 #### `__`init`__`
 
 ```python
- | __init__(connections: Optional[Sequence[Connection]] = None, default_connection_index: int = 0, loop: Optional[AbstractEventLoop] = None, exception_policy: ExceptionPolicyEnum = ExceptionPolicyEnum.propagate)
+ | __init__(connections: Optional[Sequence[Connection]] = None, default_connection_index: int = 0, loop: Optional[AbstractEventLoop] = None, exception_policy: ExceptionPolicyEnum = ExceptionPolicyEnum.propagate, threaded: bool = False)
 ```
 
 Initialize the connection multiplexer.
@@ -88,6 +88,15 @@ If connections is None, this parameter is ignored.
 - `loop`: the event loop to run the multiplexer. If None, a new event loop is created.
 - `agent_name`: the name of the agent that owns the multiplexer, for logging purposes.
 
+<a name="aea.multiplexer.AsyncMultiplexer.run"></a>
+#### run
+
+```python
+ | async run() -> None
+```
+
+Run multiplexer connect and recv/send tasks.
+
 <a name="aea.multiplexer.AsyncMultiplexer.default_connection"></a>
 #### default`_`connection
 
@@ -285,6 +294,25 @@ running on a different thread than the one used in this function.
 
 None
 
+<a name="aea.multiplexer.AsyncMultiplexer.setup"></a>
+#### setup
+
+```python
+ | setup(connections: Collection[Connection], default_routing: Optional[Dict[PublicId, PublicId]] = None, default_connection: Optional[PublicId] = None) -> None
+```
+
+Set up the multiplexer.
+
+**Arguments**:
+
+- `connections`: the connections to use. It will replace the other ones.
+- `default_routing`: the default routing.
+- `default_connection`: the default connection.
+
+**Returns**:
+
+None.
+
 <a name="aea.multiplexer.Multiplexer"></a>
 ## Multiplexer Objects
 
@@ -370,25 +398,6 @@ running on a different thread than the one used in this function.
 
 None
 
-<a name="aea.multiplexer.Multiplexer.setup"></a>
-#### setup
-
-```python
- | setup(connections: Collection[Connection], default_routing: Optional[Dict[PublicId, PublicId]] = None, default_connection: Optional[PublicId] = None) -> None
-```
-
-Set up the multiplexer.
-
-**Arguments**:
-
-- `connections`: the connections to use. It will replace the other ones.
-- `default_routing`: the default routing.
-- `default_connection`: the default connection.
-
-**Returns**:
-
-None.
-
 <a name="aea.multiplexer.InBox"></a>
 ## InBox Objects
 
@@ -402,7 +411,7 @@ A queue from where you can only consume envelopes.
 #### `__`init`__`
 
 ```python
- | __init__(multiplexer: Multiplexer)
+ | __init__(multiplexer: AsyncMultiplexer)
 ```
 
 Initialize the inbox.
@@ -498,7 +507,7 @@ A queue from where you can only enqueue envelopes.
 #### `__`init`__`
 
 ```python
- | __init__(multiplexer: Multiplexer)
+ | __init__(multiplexer: AsyncMultiplexer)
 ```
 
 Initialize the outbox.
diff --git a/docs/api/protocols/generator/base.md b/docs/api/protocols/generator/base.md
index 8859ed4742..666c4eb5b2 100644
--- a/docs/api/protocols/generator/base.md
+++ b/docs/api/protocols/generator/base.md
@@ -39,6 +39,7 @@ None
 ```
 
 Run the generator in "protobuf only" mode:
+
 a) validate the protocol specification.
 b) create the protocol buffer schema file.
 
@@ -54,6 +55,7 @@ None
 ```
 
 Run the generator in "full" mode:
+
 a) validates the protocol specification.
 b) creates the protocol buffer schema file.
 c) generates python modules.
@@ -72,6 +74,7 @@ None
 ```
 
 Run the generator. If in "full" mode (protobuf_only is False), it:
+
 a) validates the protocol specification.
 b) creates the protocol buffer schema file.
 c) generates python modules.
diff --git a/docs/api/protocols/generator/common.md b/docs/api/protocols/generator/common.md
index 67247544c4..1bc0a01466 100644
--- a/docs/api/protocols/generator/common.md
+++ b/docs/api/protocols/generator/common.md
@@ -67,6 +67,23 @@ Run Black code formatting via subprocess.
 
 None
 
+<a name="aea.protocols.generator.common.try_run_isort_formatting"></a>
+#### try`_`run`_`isort`_`formatting
+
+```python
+try_run_isort_formatting(path_to_protocol_package: str) -> None
+```
+
+Run Isort code formatting via subprocess.
+
+**Arguments**:
+
+- `path_to_protocol_package`: a path where formatting should be applied.
+
+**Returns**:
+
+None
+
 <a name="aea.protocols.generator.common.try_run_protoc"></a>
 #### try`_`run`_`protoc
 
diff --git a/docs/api/registries/base.md b/docs/api/registries/base.md
index 9306db7d64..ea7799d533 100644
--- a/docs/api/registries/base.md
+++ b/docs/api/registries/base.md
@@ -35,7 +35,7 @@ Register an item.
 
 - `item_id`: the public id of the item.
 - `item`: the item.
-- `is_dynamicall_added`: whether or not the item is dynamicall added.
+- `is_dynamically_added`: whether or not the item is dynamically added.
 
 **Returns**:
 
@@ -93,6 +93,20 @@ Fetch all the items.
 
 the list of items.
 
+<a name="aea.registries.base.Registry.ids"></a>
+#### ids
+
+```python
+ | @abstractmethod
+ | ids() -> Set[ItemId]
+```
+
+Return the set of all the used item ids.
+
+**Returns**:
+
+the set of item ids.
+
 <a name="aea.registries.base.Registry.setup"></a>
 #### setup
 
@@ -121,6 +135,98 @@ Teardown the registry.
 
 None
 
+<a name="aea.registries.base.PublicIdRegistry"></a>
+## PublicIdRegistry Objects
+
+```python
+class PublicIdRegistry(Generic[Item],  Registry[PublicId, Item])
+```
+
+This class implement a registry whose keys are public ids.
+
+In particular, it is able to handle the case when the public id
+points to the 'latest' version of a package.
+
+<a name="aea.registries.base.PublicIdRegistry.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__()
+```
+
+Initialize the registry.
+
+<a name="aea.registries.base.PublicIdRegistry.register"></a>
+#### register
+
+```python
+ | register(public_id: PublicId, item: Item, is_dynamically_added: bool = False) -> None
+```
+
+Register an item.
+
+<a name="aea.registries.base.PublicIdRegistry.unregister"></a>
+#### unregister
+
+```python
+ | unregister(public_id: PublicId) -> None
+```
+
+Unregister an item.
+
+<a name="aea.registries.base.PublicIdRegistry.fetch"></a>
+#### fetch
+
+```python
+ | fetch(public_id: PublicId) -> Optional[Item]
+```
+
+Fetch an item associated with a public id.
+
+**Arguments**:
+
+- `public_id`: the public id.
+
+**Returns**:
+
+an item, or None if the key is not present.
+
+<a name="aea.registries.base.PublicIdRegistry.fetch_all"></a>
+#### fetch`_`all
+
+```python
+ | fetch_all() -> List[Item]
+```
+
+Fetch all the items.
+
+<a name="aea.registries.base.PublicIdRegistry.ids"></a>
+#### ids
+
+```python
+ | ids() -> Set[PublicId]
+```
+
+Get all the item ids.
+
+<a name="aea.registries.base.PublicIdRegistry.setup"></a>
+#### setup
+
+```python
+ | setup() -> None
+```
+
+Set up the items.
+
+<a name="aea.registries.base.PublicIdRegistry.teardown"></a>
+#### teardown
+
+```python
+ | teardown() -> None
+```
+
+Tear down the items.
+
 <a name="aea.registries.base.AgentComponentRegistry"></a>
 ## AgentComponentRegistry Objects
 
@@ -156,7 +262,7 @@ Register a component.
 
 - `component_id`: the id of the component.
 - `component`: the component object.
-- `is_dynamicall_added`: whether or not the item is dynamicall added.
+- `is_dynamically_added`: whether or not the item is dynamically added.
 
 <a name="aea.registries.base.AgentComponentRegistry.unregister"></a>
 #### unregister
@@ -213,6 +319,15 @@ Fetch all the components by a given type..
 - `component_type`: a component type
 :return the list of registered components of a given type.
 
+<a name="aea.registries.base.AgentComponentRegistry.ids"></a>
+#### ids
+
+```python
+ | ids() -> Set[ComponentId]
+```
+
+Get the item ids.
+
 <a name="aea.registries.base.AgentComponentRegistry.setup"></a>
 #### setup
 
@@ -275,7 +390,7 @@ Register a item.
 
 - `item_id`: a pair (skill id, item name).
 - `item`: the item to register.
-- `is_dynamicall_added`: whether or not the item is dynamicall added.
+- `is_dynamically_added`: whether or not the item is dynamically added.
 
 **Returns**:
 
@@ -321,7 +436,7 @@ the Item
 #### fetch`_`by`_`skill
 
 ```python
- | fetch_by_skill(skill_id: SkillId) -> List[Item]
+ | fetch_by_skill(skill_id: SkillId) -> List[SkillComponentType]
 ```
 
 Fetch all the items of a given skill.
@@ -344,6 +459,15 @@ Fetch all the items.
 
 Unregister all the components by skill.
 
+<a name="aea.registries.base.ComponentRegistry.ids"></a>
+#### ids
+
+```python
+ | ids() -> Set[Tuple[SkillId, str]]
+```
+
+Get the item ids.
+
 <a name="aea.registries.base.ComponentRegistry.setup"></a>
 #### setup
 
@@ -405,7 +529,7 @@ Register a handler.
 
 - `item_id`: the item id.
 - `item`: the handler.
-- `is_dynamicall_added`: whether or not the item is dynamicall added.
+- `is_dynamically_added`: whether or not the item is dynamically added.
 
 **Returns**:
 
diff --git a/docs/api/runtime.md b/docs/api/runtime.md
index 64d57ce31a..9e18f7cfcf 100644
--- a/docs/api/runtime.md
+++ b/docs/api/runtime.md
@@ -3,6 +3,35 @@
 
 This module contains the implementation of runtime for economic agent (AEA).
 
+<a name="aea.runtime._StopRuntime"></a>
+## `_`StopRuntime Objects
+
+```python
+class _StopRuntime(Exception)
+```
+
+Exception to stop runtime.
+
+For internal usage only!
+Used to perform asyncio call from sync callbacks.
+
+<a name="aea.runtime._StopRuntime.__init__"></a>
+#### `__`init`__`
+
+```python
+ | __init__(reraise: Optional[Exception] = None)
+```
+
+Init _StopRuntime exception.
+
+**Arguments**:
+
+- `reraise`: exception to reraise.
+
+**Returns**:
+
+None
+
 <a name="aea.runtime.RuntimeStates"></a>
 ## RuntimeStates Objects
 
@@ -16,7 +45,7 @@ Runtime states.
 ## BaseRuntime Objects
 
 ```python
-class BaseRuntime(ABC)
+class BaseRuntime(Runnable)
 ```
 
 Abstract runtime class to create implementations.
@@ -25,7 +54,7 @@ Abstract runtime class to create implementations.
 #### `__`init`__`
 
 ```python
- | __init__(agent: AbstractAgent, loop_mode: Optional[str] = None, loop: Optional[AbstractEventLoop] = None) -> None
+ | __init__(agent: AbstractAgent, loop_mode: Optional[str] = None, loop: Optional[AbstractEventLoop] = None, threaded=False) -> None
 ```
 
 Init runtime.
@@ -74,7 +103,7 @@ Get the task manager.
 
 ```python
  | @property
- | loop() -> AbstractEventLoop
+ | loop() -> Optional[AbstractEventLoop]
 ```
 
 Get event loop.
@@ -84,7 +113,7 @@ Get event loop.
 
 ```python
  | @property
- | multiplexer() -> Multiplexer
+ | multiplexer() -> AsyncMultiplexer
 ```
 
 Get multiplexer.
@@ -108,24 +137,6 @@ Return decision maker if set.
 
 Set decision maker with handler provided.
 
-<a name="aea.runtime.BaseRuntime.start"></a>
-#### start
-
-```python
- | start() -> None
-```
-
-Start agent using runtime.
-
-<a name="aea.runtime.BaseRuntime.stop"></a>
-#### stop
-
-```python
- | stop() -> None
-```
-
-Stop agent and runtime.
-
 <a name="aea.runtime.BaseRuntime.is_running"></a>
 #### is`_`running
 
@@ -186,7 +197,7 @@ Asynchronous runtime: uses asyncio loop for multiplexer and async agent main loo
 #### `__`init`__`
 
 ```python
- | __init__(agent: AbstractAgent, loop_mode: Optional[str] = None, loop: Optional[AbstractEventLoop] = None) -> None
+ | __init__(agent: AbstractAgent, loop_mode: Optional[str] = None, loop: Optional[AbstractEventLoop] = None, threaded=False) -> None
 ```
 
 Init runtime.
@@ -214,6 +225,30 @@ Set event loop to be used.
 
 - `loop`: event loop to use.
 
+<a name="aea.runtime.AsyncRuntime.run"></a>
+#### run
+
+```python
+ | async run() -> None
+```
+
+Start runtime task.
+
+Starts multiplexer and agent loop.
+
+<a name="aea.runtime.AsyncRuntime.stop_runtime"></a>
+#### stop`_`runtime
+
+```python
+ | async stop_runtime() -> None
+```
+
+Stop runtime coroutine.
+
+Stop main loop.
+Tear down the agent..
+Disconnect multiplexer.
+
 <a name="aea.runtime.AsyncRuntime.run_runtime"></a>
 #### run`_`runtime
 
@@ -227,7 +262,7 @@ Run agent and starts multiplexer.
 ## ThreadedRuntime Objects
 
 ```python
-class ThreadedRuntime(BaseRuntime)
+class ThreadedRuntime(AsyncRuntime)
 ```
 
 Run agent and multiplexer in different threads with own asyncio loops.
diff --git a/docs/oef-ledger.md b/docs/oef-ledger.md
index 9575ac8e42..9020561da9 100644
--- a/docs/oef-ledger.md
+++ b/docs/oef-ledger.md
@@ -93,7 +93,7 @@ Whilst a ledger can, in principle, also be used to store structured data - for i
 The Python version of the AEA Framework currently integrates with three ledgers:
 
 - <a href="https://docs.fetch.ai/ledger/" target="_blank">Fetch.ai ledger</a>
-- <a href="https://ethereum.org/en/build/" target="_blank">Ethereum ledger</a>
+- <a href="https://ethereum.org/en/developers/learning-tools/" target="_blank">Ethereum ledger</a>
 - <a href="https://cosmos.network/sdk" target="_blank">Cosmos ledger</a>
 
 However, the framework makes it straightforward for further ledgers to be added by any developer.
diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md
index 8537bfe080..1e8163ba4b 100644
--- a/docs/p2p-connection.md
+++ b/docs/p2p-connection.md
@@ -77,9 +77,9 @@ To learn more about how to configure your `fetchai/p2p_libp2p:0.10.0` connection
 
 You can run the peer node in standalone mode, that is, as a Go process with no dependency to the agents framework. 
 To facilitate the deployment, we provide a script
- <a href="https://github.com/fetchai/agents-aea/tree/master/scripts/acn/run_acn_node_standalone.py">`run_acn_node_standalone.py`</a>
+ <a href="https://github.com/fetchai/agents-aea/blob/master/scripts/acn/run_acn_node_standalone.py" target="_blank">`run_acn_node_standalone.py`</a>
  and a corresponding 
- <a href="https://github.com/fetchai/agents-aea/tree/master/scripts/acn/Dockerfile">Dockerfile</a>.
+ <a href="https://github.com/fetchai/agents-aea/blob/master/scripts/acn/Dockerfile" target="_blank">Dockerfile</a>.
 
 First, you need to build the node's binary (`libp2p_node`) either:
 
diff --git a/scripts/generate_api_docs.py b/scripts/generate_api_docs.py
index a282611af5..90ad331f18 100755
--- a/scripts/generate_api_docs.py
+++ b/scripts/generate_api_docs.py
@@ -36,6 +36,7 @@
     "aea.common": "api/common.md",
     "aea.exceptions": "api/exceptions.md",
     "aea.launcher": "api/launcher.md",
+    "aea.manager": "api/manager.md",
     "aea.multiplexer": "api/multiplexer.md",
     "aea.runner": "api/runner.md",
     "aea.runtime": "api/runtime.md",
@@ -44,6 +45,7 @@
     "aea.configurations.base": "api/configurations/base.md",
     "aea.configurations.constants": "api/configurations/constants.md",
     "aea.configurations.loader": "api/configurations/loader.md",
+    "aea.configurations.project": "api/configurations/project.md",
     "aea.configurations.pypi": "api/configurations/pypi.md",
     "aea.connections.base": "api/connections/base.md",
     "aea.connections.stub.connection": "api/connections/stub/connection.md",

From 36db577a324968c45ddc39e029844899a925a4fb Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 17:12:33 +0100
Subject: [PATCH 126/131] increase timeout for ipfs daemon exit

---
 scripts/generate_ipfs_hashes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_ipfs_hashes.py b/scripts/generate_ipfs_hashes.py
index 4813357fe5..04b6020faf 100755
--- a/scripts/generate_ipfs_hashes.py
+++ b/scripts/generate_ipfs_hashes.py
@@ -233,7 +233,7 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_val, exc_tb):
         """Terminate the ipfs daemon."""
         self.process.send_signal(signal.SIGTERM)
-        self.process.wait(timeout=10)
+        self.process.wait(timeout=30)
         poll = self.process.poll()
         if poll is None:
             self.process.terminate()

From d4de3228a46dcb5b0af6309cb2cf2eff85295d44 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 17:15:17 +0100
Subject: [PATCH 127/131] fix soef pragma statement

---
 packages/fetchai/connections/soef/connection.py   | 4 ++--
 packages/fetchai/connections/soef/connection.yaml | 2 +-
 packages/hashes.csv                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/fetchai/connections/soef/connection.py b/packages/fetchai/connections/soef/connection.py
index 0b41b15501..ab150d35a5 100644
--- a/packages/fetchai/connections/soef/connection.py
+++ b/packages/fetchai/connections/soef/connection.py
@@ -908,9 +908,9 @@ async def _unregister_agent(self) -> None:  # pylint: disable=unused-argument
         :return: None
         """
         if not self._unregister_lock:
-            raise ValueError(
+            raise ValueError(  # pragma: nocover
                 "unregistered lock is not set, please call connect!"
-            )  # pragma: nocover
+            )
 
         async with self._unregister_lock:
             if self.unique_page_address is None:  # pragma: nocover
diff --git a/packages/fetchai/connections/soef/connection.yaml b/packages/fetchai/connections/soef/connection.yaml
index 07f0d6aaf4..83c44646c6 100644
--- a/packages/fetchai/connections/soef/connection.yaml
+++ b/packages/fetchai/connections/soef/connection.yaml
@@ -8,7 +8,7 @@ aea_version: '>=0.6.0, <0.7.0'
 fingerprint:
   README.md: QmS9zorTodmaRyaxocELEwEqHEPowKoG9wgSAak7s59rZD
   __init__.py: Qmd5VBGFJHXFe1H45XoUh5mMSYBwvLSViJuGFeMgbPdQts
-  connection.py: QmYXqA1b1YBgwNuf6nUYTJgJeHVb7d8UNmCaQmkN2mY9KZ
+  connection.py: QmaH2heEFqpA7tECzQKrzcZKuXHpBQ3oKofKj2b2dtz5zk
 fingerprint_ignore_patterns: []
 protocols:
 - fetchai/oef_search:0.7.0
diff --git a/packages/hashes.csv b/packages/hashes.csv
index 7777abae93..89725bf818 100644
--- a/packages/hashes.csv
+++ b/packages/hashes.csv
@@ -29,7 +29,7 @@ fetchai/connections/p2p_libp2p,QmbPgTY8am7PgLoP3ksaHyuwZzfFGXN4cBrvjV9byramEh
 fetchai/connections/p2p_libp2p_client,QmSbfL2DT9L1oooKn2pme1tjivEzkzaiRqJ4zahB4Jb27b
 fetchai/connections/p2p_stub,QmecGYtXsb7HA2dSWrw2ARNTPFqZsKXAbVroBo57cdUQSG
 fetchai/connections/scaffold,QmNUta43nLexAHaXLgmLQYEjntLXSV6MLNvc6Q2CTx7eBS
-fetchai/connections/soef,QmW3x9tzEaE4fqBsqzMXmke8fh2y75CrFZFtMrn8WRGyZD
+fetchai/connections/soef,QmaaC1Va79rkztC2GDEwDXEugkiDGqe9hPkPgYsHRdn7d7
 fetchai/connections/stub,QmQxzFLTBjPUMkpE1uBdkoyhb7iXY4k8VPzyykpjhuUcK1
 fetchai/connections/tcp,QmPADQqZJQ4cw1ecdMC2wR7NwFCdk7MYzvmyP62nbfGk7E
 fetchai/connections/webhook,QmWcm3WGxcm5JvhuYRyauQp5wmzFAkV61e2aYpDvYmNvWd

From 8d3db2aab1063f9878d2a3fb89c638f3b18a1744 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 17:55:32 +0100
Subject: [PATCH 128/131] prep develop for release 0.6.2

---
 HISTORY.md                                        | 15 +++++++++++++++
 aea/__version__.py                                |  2 +-
 benchmark/run_from_branch.sh                      |  2 +-
 deploy-image/docker-env.sh                        |  2 +-
 develop-image/docker-env.sh                       |  2 +-
 docs/acn.md                                       |  1 -
 docs/quickstart.md                                |  4 ++--
 docs/upgrading.md                                 |  4 ++++
 .../test_bash_yaml/md_files/bash-quickstart.md    |  4 ++--
 9 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9668f9fbd4..9d22b1514c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,20 @@
 # Release History
 
+## 0.6.2 (2020-10-01)
+
+- Adds MultiAgentManager to manage multiple agent projects programmatically
+- Improves SOEF connection reliability on unregister
+- Extends configuration classes to handle overriding configurations programmatically
+- Fixes Multiplexer termination errors
+- Allow finger-grained override of component configurations from aea-config
+- Fixes tac controller to work with Ethereum contracts again
+- Fixes to multiple deploy and development scripts
+- Introduces isort to development dependencies for automated import sorting
+- Adds reset password command to CLI
+- Adds additional docstring linters for improved api documentation checks
+- Multiple docs updates including additional explanations of ACN architecture
+- Multiple additional tests and test stability fixes
+
 ## 0.6.1 (2020-09-17)
 
 - Adds a standalone script to deploy an ACN node
diff --git a/aea/__version__.py b/aea/__version__.py
index 254b018066..5a9f575037 100644
--- a/aea/__version__.py
+++ b/aea/__version__.py
@@ -22,7 +22,7 @@
 __title__ = "aea"
 __description__ = "Autonomous Economic Agent framework"
 __url__ = "https://github.com/fetchai/agents-aea.git"
-__version__ = "0.6.1"
+__version__ = "0.6.2"
 __author__ = "Fetch.AI Limited"
 __license__ = "Apache-2.0"
 __copyright__ = "2019 Fetch.AI Limited"
diff --git a/benchmark/run_from_branch.sh b/benchmark/run_from_branch.sh
index 0027e2644c..f5bc0a4d35 100755
--- a/benchmark/run_from_branch.sh
+++ b/benchmark/run_from_branch.sh
@@ -12,7 +12,7 @@ pip install pipenv
 # this is to install benchmark dependencies
 pipenv install --dev --skip-lock
 # this is to install the AEA in the Pipenv virtual env
-pipenv run pip install --upgrade aea[all]=="0.6.1"
+pipenv run pip install --upgrade aea[all]=="0.6.2"
 
 chmod +x benchmark/checks/run_benchmark.sh
 echo "Start the experiments."
diff --git a/deploy-image/docker-env.sh b/deploy-image/docker-env.sh
index cc70ac7041..7279162c26 100755
--- a/deploy-image/docker-env.sh
+++ b/deploy-image/docker-env.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=aea-deploy:0.6.1
+DOCKER_IMAGE_TAG=aea-deploy:0.6.2
 # DOCKER_IMAGE_TAG=aea-deploy:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..
diff --git a/develop-image/docker-env.sh b/develop-image/docker-env.sh
index 2b49119402..e9010daaca 100755
--- a/develop-image/docker-env.sh
+++ b/develop-image/docker-env.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Swap the following lines if you want to work with 'latest'
-DOCKER_IMAGE_TAG=aea-develop:0.6.1
+DOCKER_IMAGE_TAG=aea-develop:0.6.2
 # DOCKER_IMAGE_TAG=aea-develop:latest
 
 DOCKER_BUILD_CONTEXT_DIR=..
diff --git a/docs/acn.md b/docs/acn.md
index 5929eaf79d..d903ccaa6f 100644
--- a/docs/acn.md
+++ b/docs/acn.md
@@ -7,7 +7,6 @@ Agents need to contact each others. Given the wallet address of a target agent,
 The properties we would like to have are:
 
 - Reliability: with guarantees on message reception
-- Security: no third-party can tamper with the message
 - Authentication: to prevent impersonation
 - Confidentiality: to prevent exposing sensitive information within the message
 - Availability: some guarantees about the liveness of the service (tampering detection)
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 42f57ff4ad..6c7729d9d5 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -86,7 +86,7 @@ Confirm password:
  / ___ \ | |___  / ___ \
 /_/   \_\|_____|/_/   \_\
 
-v0.6.1
+v0.6.2
 
 AEA configurations successfully initialized: {'author': 'fetchai'}
 ```
@@ -175,7 +175,7 @@ You will see the echo skill running in the terminal window.
  / ___ \ | |___  / ___ \
 /_/   \_\|_____|/_/   \_\
 
-v0.6.1
+v0.6.2
 
 Starting AEA 'my_first_aea' in 'async' mode ...
 info: Echo Handler: setup method called.
diff --git a/docs/upgrading.md b/docs/upgrading.md
index ec0120a156..1142a43044 100644
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -1,5 +1,9 @@
 This page provides some tipps of how to upgrade between versions.
 
+## v0.6.1 to v0.6.2
+
+No public APIs have been changed.
+
 ## v0.6.0 to v0.6.1
 
 The `soef` connection and `oef_search` protocol have backward incompatible changes.
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
index e81c856ac9..8a9bfd9c2b 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md
@@ -36,7 +36,7 @@ Confirm password:
  / ___ \ | |___  / ___ \
 /_/   \_\|_____|/_/   \_\
 
-v0.6.1
+v0.6.2
 
 AEA configurations successfully initialized: {'author': 'fetchai'}
 ```
@@ -70,7 +70,7 @@ aea run --connections fetchai/stub:0.10.0
  / ___ \ | |___  / ___ \
 /_/   \_\|_____|/_/   \_\
 
-v0.6.1
+v0.6.2
 
 Starting AEA 'my_first_aea' in 'async' mode ...
 info: Echo Handler: setup method called.

From 788c97ef51817ebff8e20f6ee362bc8fc48247eb Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 18:09:58 +0100
Subject: [PATCH 129/131] add missing release details

---
 HISTORY.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/HISTORY.md b/HISTORY.md
index 9d22b1514c..09f840efb2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -11,6 +11,7 @@
 - Fixes to multiple deploy and development scripts
 - Introduces isort to development dependencies for automated import sorting
 - Adds reset password command to CLI
+- Adds support for abbreviated public ids (latest) to CLI and configurations
 - Adds additional docstring linters for improved api documentation checks
 - Multiple docs updates including additional explanations of ACN architecture
 - Multiple additional tests and test stability fixes

From 1aa7951ceeabcadf62017ab9b87cfe1822985a96 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 18:10:39 +0100
Subject: [PATCH 130/131] add missing release details 2

---
 HISTORY.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 09f840efb2..ac78542d04 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -5,10 +5,11 @@
 - Adds MultiAgentManager to manage multiple agent projects programmatically
 - Improves SOEF connection reliability on unregister
 - Extends configuration classes to handle overriding configurations programmatically
+- Improves configuration schemas and validations
 - Fixes Multiplexer termination errors
-- Allow finger-grained override of component configurations from aea-config
+- Allow finer-grained override of component configurations from aea-config
 - Fixes tac controller to work with Ethereum contracts again
-- Fixes to multiple deploy and development scripts
+- Fixes multiple deploy and development scripts
 - Introduces isort to development dependencies for automated import sorting
 - Adds reset password command to CLI
 - Adds support for abbreviated public ids (latest) to CLI and configurations

From b0f98322860713363a30578168d07968edd78b0c Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Thu, 1 Oct 2020 20:43:18 +0100
Subject: [PATCH 131/131] fix mkdocs doc paths

---
 mkdocs.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mkdocs.yml b/mkdocs.yml
index d68fc85c12..7c02d4ccc0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -107,6 +107,7 @@ nav:
         - Common: 'api/common.md'
         - Exceptions: 'api/exceptions.md'
         - Launcher: 'api/launcher.md'
+        - Manager: 'api/manager.md'
         - Multiplexer: 'api/multiplexer.md'
         - Runner: 'api/runner.md'
         - Runtime: 'api/runtime.md'
@@ -117,6 +118,7 @@ nav:
           - Base: 'api/configurations/base.md'
           - Constants: 'api/configurations/constants.md'
           - Loader: 'api/configurations/loader.md'
+          - Project: 'api/configurations/project.md'
           - Pypi: 'api/configurations/pypi.md'
         - Connections:
           - Base: 'api/connections/base.md'