Merge pull request #1865 from fetchai/feature/prep_release

DavidMinarsch · web-flow · commit 9006d026ddfb · 2020-10-22T10:34:55.000+01:00
Feature/prep release
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,25 @@
 # Release History
 
+## 0.7.0 (2020-10-22)
+
+- Adds two AEAs for Agent World 1
+- Adds support to apply config overrides to CLI calls transfer and get-wealth
+- Adds install scripts to install AEA and dependencies on all major OS (Windows, MacOs, Ubuntu)
+- Adds developer mailing list opt-in step to CLI init
+- Modifies custom configs in aea-config to use public id
+- Adds all non-optional fields in aea-config by default
+- Fixes upgrade command to properly handle dependencies of non-vendor packages
+- Remove all distributed packages and add them to registry
+- Adds public ids to all skill init files and makes it a requirement
+- Adds primitive benchmarks for libp2p node
+- Adds Prometheus monitoring to libp2p node
+- Makes body a private attribute in message base class
+- Renames bodyy to body in http protocol
+- Adds support for abstract connections
+- Refactors protobuf schemas for protocols to avoid code duplication
+- Multiple docs updates based on user feedback
+- Multiple additional tests and test stability fixes
+
 ## 0.6.3 (2020-10-16)
 
 - Adds skill testing tools and documentation
diff --git a/aea/crypto/ethereum.py b/aea/crypto/ethereum.py
@@ -546,7 +546,7 @@ def _try_get_wealth(address: Address) -> None:
         response = requests.get(ETHEREUM_TESTNET_FAUCET_URL + address)
         if response.status_code // 100 == 5:
             _default_logger.error("Response: {}".format(response.status_code))
-        elif response.status_code // 100 in [3, 4]:
+        elif response.status_code // 100 in [3, 4]:  # pragma: nocover
             response_dict = json.loads(response.text)
             _default_logger.warning(
                 "Response: {}\nMessage: {}".format(
diff --git a/docs/api/aea_builder.md b/docs/api/aea_builder.md
@@ -757,6 +757,16 @@ the AEA object.
 
 - `ValueError`: if we cannot
 
+<a name="aea.aea_builder.AEABuilder.find_component_directory_from_component_id"></a>
+#### find`_`component`_`directory`_`from`_`component`_`id
+
+```python
+ | @staticmethod
+ | find_component_directory_from_component_id(aea_project_directory: Path, component_id: ComponentId) -> Path
+```
+
+Find a component directory from component id.
+
 <a name="aea.aea_builder.AEABuilder.set_from_configuration"></a>
 #### set`_`from`_`configuration
 
diff --git a/docs/api/configurations/project.md b/docs/api/configurations/project.md
@@ -26,7 +26,7 @@ Init project with public_id and project's path.
 
 ```python
  | @classmethod
- | load(cls, working_dir: str, public_id: PublicId, is_local: bool = False, registry_path: str = "packages") -> "Project"
+ | load(cls, working_dir: str, public_id: PublicId, is_local: bool = False, registry_path: str = "packages", skip_consistency_check: bool = False) -> "Project"
 ```
 
 Load project with given public_id to working_dir.
@@ -36,6 +36,8 @@ Load project with given public_id to working_dir.
 - `working_dir`: the working directory
 - `public_id`: the public id
 - `is_local`: whether to fetch from local or remote
+- `registry_path`: the path to the registry locally
+- `skip_consistency_check`: consistency checks flag
 
 <a name="aea.configurations.project.Project.remove"></a>
 #### remove
diff --git a/docs/api/crypto/ledger_apis.md b/docs/api/crypto/ledger_apis.md
@@ -233,3 +233,17 @@ Get the hash of a message.
 
 the hash of the message.
 
+<a name="aea.crypto.ledger_apis.LedgerApis.is_valid_address"></a>
+#### is`_`valid`_`address
+
+```python
+ | @staticmethod
+ | is_valid_address(identifier: str, address: Address) -> bool
+```
+
+Check if the address is valid.
+
+**Arguments**:
+
+- `address`: the address to validate
+
diff --git a/docs/aries-cloud-agent-demo.md b/docs/aries-cloud-agent-demo.md
@@ -258,7 +258,7 @@ Finally run **Alice_AEA**:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address. We will refer to this as **Alice_AEA's p2p address**.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address. We will refer to this as **Alice_AEA's p2p address**.
 
 ### Faber_AEA
 
diff --git a/docs/car-park-skills.md b/docs/car-park-skills.md
@@ -154,7 +154,7 @@ First, run the car data seller AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 Then, update the configuration of the car data buyer AEA's p2p connection (in `vendor/fetchai/connections/p2p_libp2p/connection.yaml`) replace the following:
 
diff --git a/docs/cli-commands.md b/docs/cli-commands.md
@@ -27,11 +27,11 @@
 | `login USERNAME [--password password]`      | Login to a registry account with credentials.                                |
 | `logout`                                    | Logout from registry account.                                                |
 | `publish`                                   | Publish the AEA to registry. Needs to be executed from an AEA project.`publish --local` to publish to local `packages` directory. |
-| `push [protocol_type] [public_id]`          | Push connection, protocol, or skill with `public_id` to registry.	`push --local` to push to local `packages` directory. |
-| `remove [protocol_type] [name]`             | Remove connection, protocol, or skill, called `name`, from AEA.            |
+| `push [package_type] [public_id]`          | Push connection, protocol, or skill with `public_id` to registry.	`push --local` to push to local `packages` directory. |
+| `remove [package_type] [name]`             | Remove connection, protocol, or skill, called `name`, from AEA.            |
 | `run {using [connections, ...]}`            | Run the AEA on the Fetch.ai network with default or specified connections.   |
-| `search [protocol_type]`                    | Search for components in the registry. `search --local [protocol_type] [--query searching_query]` to search in local `packages` directory. |
-| `scaffold [protocol_type] [name]`           | Scaffold a new connection, protocol, or skill called `name`.               |
+| `search [package_type]`                    | Search for components in the registry. `search --local [package_type] [--query searching_query]` to search in local `packages` directory. |
+| `scaffold [package_type] [name]`           | Scaffold a new connection, protocol, or skill called `name`.               |
 | `-v DEBUG run`                              | Run with debugging.                                                          |
 
 <!--
diff --git a/docs/cli-vs-programmatic-aeas.md b/docs/cli-vs-programmatic-aeas.md
@@ -54,7 +54,7 @@ aea add-key fetchai fetchai_private_key.txt --connection
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 ### Create the weather client AEA
 
diff --git a/docs/erc1155-skills.md b/docs/erc1155-skills.md
@@ -166,7 +166,7 @@ First, run the deployer AEA.
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 It will perform the following steps:
 - deploy the smart contract
diff --git a/docs/generic-skills-step-by-step.md b/docs/generic-skills-step-by-step.md
@@ -2921,7 +2921,7 @@ aea config set agent.default_connection fetchai/p2p_libp2p:0.12.0
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 #### Run buyer AEA
 
diff --git a/docs/generic-skills.md b/docs/generic-skills.md
@@ -226,7 +226,7 @@ First, run the seller AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 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/ml-skills.md b/docs/ml-skills.md
@@ -161,7 +161,7 @@ First, run the data provider AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 Then, update the configuration of the model trainer AEA's p2p connection (in `vendor/fetchai/connections/p2p_libp2p/connection.yaml`) replace the following:
 
diff --git a/docs/orm-integration.md b/docs/orm-integration.md
@@ -297,7 +297,7 @@ First, run the thermometer AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 Then, update the configuration of the thermometer client AEA's p2p connection (in `vendor/fetchai/connections/p2p_libp2p/connection.yaml`) replace the following:
 
diff --git a/docs/skill-guide.md b/docs/skill-guide.md
@@ -447,7 +447,7 @@ Then we run the aea:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 <details><summary>Click here to see full code</summary>
 <p>
diff --git a/docs/tac-skills.md b/docs/tac-skills.md
@@ -218,7 +218,7 @@ Briefly run the controller AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 Then, update the configuration of the weather client AEA's p2p connection (in `aea-config.yaml`) add the following:
 
diff --git a/docs/thermometer-skills.md b/docs/thermometer-skills.md
@@ -161,7 +161,7 @@ First, run the thermometer AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 Then, update the configuration of the thermometer client AEA's p2p connection (in `vendor/fetchai/connections/p2p_libp2p/connection.yaml`) replace the following:
 
diff --git a/docs/upgrading.md b/docs/upgrading.md
@@ -1,5 +1,28 @@
 This page provides some tipps of how to upgrade between versions.
 
+## v0.6.3 to v0.7.0
+
+Multiple breaking changes require action in this order:
+- Custom configuration overrides in `aea-config.yaml` are now identified via `public_id` rather than `author`, `name` and `version` individually. Please replace the three fields with the equivalent `public_id`.
+- Run `aea upgrade` command to upgrade your project's dependencies. Note, you still do have to manually update the public ids under `default_routing` and `default_connection` in `aea-config.yaml` as well as the public ids in the non-vendor packages.
+- Previously, connection `fetchai/stub`, skill `fetchai/error` and protocols `fetchai/default`, `fetchai/signing` and `fetchai/state_update` where part of the AEA distribution. Now they need to be fetched from registry. If you create a new project with `aea create` then this happens automatically. For existing projects, add the dependencies explicitly if not already present. You also must update the import paths as follows:
+    - `aea.connections.stub` > `packages.fetchai.connections.stub`
+    - `aea.protocols.default` > `packages.fetchai.protocols.default`
+    - `aea.protocols.signing` > `packages.fetchai.protocols.signing`
+    - `aea.protocols.state_update` > `packages.fetchai.protocols.state_update`
+    - `aea.skills.error` > `packages.fetchai.skills.error`
+- If you use custom protocols, regenerate them.
+- In your own skills' `__init__.py` files add the public id (updating the string as appropriate):
+
+``` python
+from aea.configurations.base import PublicId
+
+
+PUBLIC_ID = PublicId.from_str("author/name:0.1.0")
+```
+- The `fetchai/http` protocol's `bodyy` field has been renamed to `body`.
+
+
 ## v0.6.2 to v0.6.3
 
 A new `upgrade` command is introduced to upgrade agent projects and components to their latest versions on the registry. To use the command first upgrade the AEA PyPI package to the latest version, then enter your project and run `aea upgrade`. The project's vendor dependencies will be updated where possible.
diff --git a/docs/weather-skills.md b/docs/weather-skills.md
@@ -162,7 +162,7 @@ First, run the weather station AEA:
 aea run
 ```
 
-Once you see a message of the form `My libp2p addresses: ['SOME_ADDRESS']` take note of the address.
+Once you see a message of the form `To join its network use multiaddr: ['SOME_ADDRESS']` take note of the address.
 
 Then, update the configuration of the weather client AEA's p2p connection (in `vendor/fetchai/connections/p2p_libp2p/connection.yaml`) replace the following:
 
diff --git a/packages/fetchai/connections/p2p_libp2p/connection.py b/packages/fetchai/connections/p2p_libp2p/connection.py
@@ -561,7 +561,7 @@ def __init__(self, **kwargs):
 
         monitoring_uri = None
         if libp2p_monitoring_uri is not None:
-            monitoring_uri = Uri(libp2p_monitoring_uri)
+            monitoring_uri = Uri(libp2p_monitoring_uri)  # pragma: nocover
 
         entry_peers = [
             MultiAddr.from_string(str(maddr)) for maddr in libp2p_entry_peers
diff --git 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: QmZiqiSwXuWCStCCv3VDwL8UQg9j3DmSFCd6YQ63JcHHEf
+  connection.py: QmQksMwB6RrKVQ5LhFBuzztoUKAeiCHazdV4BkcpDHsWzt
   dht/dhtclient/dhtclient.go: QmasA3GrgswTnUJoffBzeeqxeT3GjLu6foN6PHJhWNpMMa
   dht/dhtclient/dhtclient_test.go: QmPfnHSHXtbaW5VYuq1QsKQWey64pUEvLEaKKkT9eAcmws
   dht/dhtclient/options.go: QmPorj38wNrxGrzsbFe5wwLmiHzxbTJ2VsgvSd8tLDYS8s
diff --git a/packages/fetchai/skills/confirmation_aw1/skill.yaml b/packages/fetchai/skills/confirmation_aw1/skill.yaml
@@ -11,7 +11,7 @@ fingerprint:
   dialogues.py: QmdMjuAT8h7ZUSfqMVkF88Hnz1kc6advg8oVg8QB7xGPw1
   handlers.py: QmWoEyJnVURKtvFYrx9ykVao5y7iA8eKRGEsndeMREkVDY
   registration_db.py: QmZUL4XxvDZn7EGvYBBtwcVyncL5ffTjE25cCaurG5ysUM
-  strategy.py: QmQDVzjLaVJxFG4aJiTRqD3qFvBbgYLcWnygagQ5uMNLsn
+  strategy.py: QmS5kx3LcmgYWLxaAMsrF8VEeXjg1cJD2XoirC9KK8WqAe
 fingerprint_ignore_patterns: []
 contracts:
 - fetchai/staking_erc20:0.1.0
diff --git a/packages/fetchai/skills/confirmation_aw1/strategy.py b/packages/fetchai/skills/confirmation_aw1/strategy.py
@@ -165,9 +165,8 @@ def valid_registration(
             return (False, 1, "already registered!")
         return (True, 0, "all good!")
 
-    @staticmethod
     def _valid_signature(
-        expected_signer: str, signature: str, message_str: str, ledger_id: str
+        self, expected_signer: str, signature: str, message_str: str, ledger_id: str
     ) -> bool:
         """
         Check if the signature and message match the expected signer.
@@ -178,9 +177,13 @@ def _valid_signature(
         :param ledger_id: the ledger id
         :return: bool indiciating validity
         """
-        result = expected_signer in LedgerApis.recover_message(
-            ledger_id, message_str.encode("utf-8"), signature
-        )
+        try:
+            result = expected_signer in LedgerApis.recover_message(
+                ledger_id, message_str.encode("utf-8"), signature
+            )
+        except Exception as e:  # pylint: disable=broad-except
+            self.context.logger.warning(f"Signing exception: {e}")
+            result = False
         return result
 
     def get_terms(self, counterparty: str) -> Terms:
diff --git a/packages/hashes.csv b/packages/hashes.csv
@@ -27,7 +27,7 @@ fetchai/connections/http_server,QmfCszQbpJKMJjEczrxRxRaBwzfSEhWtfoApPUjNLquaTt
 fetchai/connections/ledger,QmWbSbrjJVuguCYLcDthpPkkvY4zei4VCk2Kvjes8Q9pvC
 fetchai/connections/local,QmerRMTZGusL1YigunFDq67LvrVqaeZ4DheWXCJvPxmo3k
 fetchai/connections/oef,Qmaf1F8arWYx2HCpKoXRzWfynYZ4LDaAy8Fzm5yXDWAbSH
-fetchai/connections/p2p_libp2p,QmYVdaQ4XBjfzrTTSHaBbHVzN4PJepupLCsHJ5DBfc7HsK
+fetchai/connections/p2p_libp2p,QmbR5jTFBF5Kwd2sHb3WGWPXbPLu3fDuNQexn81bXm1QPv
 fetchai/connections/p2p_libp2p_client,QmSWq7zoyovRBLS5dSCeEaxFMS9nQqFD3XzM8z7iEd4C9V
 fetchai/connections/p2p_stub,QmaHtQs9dJRnF27WDZSVW3FFEGbY1419NH8u67B8hgnteV
 fetchai/connections/scaffold,QmW2cQNEbRWWLQ1EyyzwJznET6bFboS9TyeAtxPNaxCMuq
@@ -55,7 +55,7 @@ fetchai/skills/aries_alice,QmZkAfGzoXi2HQiASrESEbbpN99qAXsw3sWUyXYiEHCh1S
 fetchai/skills/aries_faber,QmVZwHEepJWA6oHwxVywVK1PQ5hXMdrYqEtf8xJ84dSCqw
 fetchai/skills/carpark_client,QmSBJG8orVcuHw3UsaCKPpXyqNfPaHtkB8gKc5AZ35U4VA
 fetchai/skills/carpark_detection,QmVPAz6qNU1c5dn2YVUBhz5RFcx6rbCECkjGjZE1bsYKvi
-fetchai/skills/confirmation_aw1,QmPr13DF2DmJoLe6LY3e47PDuDug6YfiigZncqCnQNHqu4
+fetchai/skills/confirmation_aw1,QmNoCZr7HVQvSdQvQYBGUY1DaFs4suvS4n9y6GMLsjw42g
 fetchai/skills/echo,QmTLLAiWCy7FJR2Y3xXSDoB2cR4sJzbchjTGojrubGyfM7
 fetchai/skills/erc1155_client,QmUyQQFgc63T1M3wuP559BejmnnsN4mfnjM5SCXSbhUGSw
 fetchai/skills/erc1155_deploy,QmVxKNTnSs8x9Qn2VZHKR7PySyF3wbLySqvoy7FDK8WBS6
diff --git a/tests/test_configurations/test_base.py b/tests/test_configurations/test_base.py
@@ -391,6 +391,9 @@ def test_update(self):
             == self.new_dummy_skill_config
         )
 
+        # to json
+        self.aea_config.json
+
 
 class GetDefaultConfigurationFileNameFromStrTestCase(TestCase):
     """Test case for _get_default_configuration_file_name_from_type method."""
@@ -737,6 +740,7 @@ def test_component_id_prefix_import_path():
         ComponentType.PROTOCOL, PublicId("author", "name", "0.1.0")
     )
     assert component_id.prefix_import_path == "packages.author.protocols.name"
+    assert component_id.json
 
 
 def test_component_configuration_load_file_not_found():
