From d1fd5aa915bf71de00cc0eb2ca3edbe09c877419 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Mon, 20 Jun 2022 18:45:08 +0200
Subject: [PATCH 01/16] docs: add ipfs hashes

---
 docs/echo_demo.md      |  4 ++--
 docs/gym-skill.md      |  2 +-
 docs/http-echo-demo.md | 14 +++++++-------
 docs/quickstart.md     | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/echo_demo.md b/docs/echo_demo.md
index d7890bf30d..bcdc7367d3 100644
--- a/docs/echo_demo.md
+++ b/docs/echo_demo.md
@@ -1,4 +1,4 @@
-This is a simple demo that introduces you to the main components of an AEA. 
+This is a simple demo that introduces you to the main components of an AEA.
 
 A full break down of the development is covered within the <a href="../quickstart/">Development Quickstart</a>. It is highly recommended that developers begin by following the quick start!
 
@@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch open_aea/my_first_aea:0.1.0 --local
+aea fetch fetchai/my_first_aea:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies
diff --git a/docs/gym-skill.md b/docs/gym-skill.md
index cc5f2b881d..add93d6352 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 open_aea/gym_aea:0.1.0 --local
+aea fetch open_aea/gym_aea:QmddxSr8ZfKgHw5Urdxjdw52yofjLLRgM1AyJvxRaK4V6U --remote
 cd gym_aea
 aea install
 ```
diff --git a/docs/http-echo-demo.md b/docs/http-echo-demo.md
index 1b7dc1b789..7d1a4786c5 100644
--- a/docs/http-echo-demo.md
+++ b/docs/http-echo-demo.md
@@ -3,20 +3,20 @@
 The purpose of this demonstration is to show the `open-aea` framework can be used as a HTTP server. More concretely, an AEA with a http server connection and an appropriate skill can be used as a server.
 
 
-A full break down of the development flow is covered within the <a href="../quickstart/">Development Quickstart</a>. 
+A full break down of the development flow is covered within the <a href="../quickstart/">Development Quickstart</a>.
 
 It is highly recommended that developers begin by following the quick start!
 
 It is assumed that developers are within a pipenv virtual environment.
 
-A full break down of the development flow is covered within the <a href="../quickstart/">Development Quickstart</a>. 
+A full break down of the development flow is covered within the <a href="../quickstart/">Development Quickstart</a>.
 The easiest way to get started with the http server is to use our pre-built example skill.
 
 
 
 ``` bash
 pipenv shell
-aea fetch open_aea/http_echo:0.1.0 --local 
+aea fetch open_aea/http_echo:QmdyEJWRz4B2PU7ioD17HVVGELihjc4feos6nS2DSL94Rf --remote
 cd http_echo
 aea generate-key ethereum; aea add-key ethereum
 aea run --aev
@@ -31,10 +31,10 @@ Successfully added connection 'fetchai/http_server:0.22.0'.
 Adding skill 'fetchai/http_echo:0.20.0'...
 Successfully added skill 'fetchai/http_echo:0.20.0'.
 Agent http_echo successfully fetched.
-    _     _____     _    
-   / \   | ____|   / \   
-  / _ \  |  _|    / _ \  
- / ___ \ | |___  / ___ \ 
+    _     _____     _
+   / \   | ____|   / \
+  / _ \  |  _|    / _ \
+ / ___ \ | |___  / ___ \
 /_/   \_\|_____|/_/   \_\
 
 v1.4.0
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 50c0a807fb..97f711d23d 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -22,9 +22,9 @@ The following hints can help:
 <ul>
 <li>To install Go, follow the official guide, depending on your platform <a href="https://go.dev/doc/install" target="_blank">here</a></li>
 
-<li>Python is already included by default on 
+<li>Python is already included by default on
 many Linux distributions (e.g. Ubuntu), as well as MacOS.
-To check you have the right version, open a terminal and run: 
+To check you have the right version, open a terminal and run:
 ``` bash
 python3 --version
 ```
@@ -34,7 +34,7 @@ python3 --version
 
 <li>Ubuntu/Debian systems only: install Python headers,
   depending on the Python version you have installed on your machine.
-  E.g. for Python 3.8: 
+  E.g. for Python 3.8:
 ``` bash
 sudo apt-get install python3.8-dev
 ```
@@ -80,16 +80,16 @@ docker pull fetchai/aea-user:latest
 To run the image on Linux and MacOs:
 
 ``` bash
-docker run -it -v $(pwd):/agents --workdir=/agents fetchai/aea-user:latest 
+docker run -it -v $(pwd):/agents --workdir=/agents fetchai/aea-user:latest
 ```
 
 And on Windows:
 
 ``` bash
-docker run -it -v %cd%:/agents --workdir=/agents fetchai/aea-user:latest 
+docker run -it -v %cd%:/agents --workdir=/agents fetchai/aea-user:latest
 ```
 
-Once successfully logged into the docker container, 
+Once successfully logged into the docker container,
 you can follow the rest of the guide the same way as if not using docker.
 ​
 </details>
@@ -158,12 +158,12 @@ svn checkout https://github.com/valory-xyz/open-aea/tags/v1.10.0/packages packag
 
 ## Echo skill demo
 
-This is a simple demo that introduces you to the main components of an AEA. 
+This is a simple demo that introduces you to the main components of an AEA.
 
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch open_aea/my_first_aea:0.1.0 --local
+aea fetch fetchai/my_first_aea:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies

From 7b42dbb7a34087e05e8d71565ad76e32f64fb2db Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Mon, 20 Jun 2022 18:45:56 +0200
Subject: [PATCH 02/16] feat: hash fixer script

---
 Makefile                       |   9 +--
 scripts/fix_doc_ipfs_hashes.py | 117 +++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 scripts/fix_doc_ipfs_hashes.py

diff --git a/Makefile b/Makefile
index ed1915d4fa..49e9f24c2c 100644
--- a/Makefile
+++ b/Makefile
@@ -92,8 +92,8 @@ test-sub-p:
 
 .PHONY: hashes
 hashes:
-	python -m aea.cli hash all 
-	python -m aea.cli hash all --packages-dir=./tests/data/packages 
+	python -m aea.cli hash all
+	python -m aea.cli hash all --packages-dir=./tests/data/packages
 
 .PHONY: test-all
 test-all:
@@ -191,10 +191,11 @@ security:
 generators:
 	python -m aea.cli generate-all-protocols
 	python -m aea.cli generate-all-protocols tests/data/packages
-	python -m aea.cli hash all 
-	python -m aea.cli hash all --packages-dir=./tests/data/packages 
+	python -m aea.cli hash all
+	python -m aea.cli hash all --packages-dir=./tests/data/packages
 	python scripts/generate_api_docs.py
 	python scripts/check_copyright_notice.py
+	python scripts/fix_doc_ipfs_hashes.py
 
 .PHONY: common-checks
 common-checks:
diff --git a/scripts/fix_doc_ipfs_hashes.py b/scripts/fix_doc_ipfs_hashes.py
new file mode 100644
index 0000000000..3273195ff6
--- /dev/null
+++ b/scripts/fix_doc_ipfs_hashes.py
@@ -0,0 +1,117 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2022 Valory AG
+#
+#   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 tools for autoupdating ipfs hashes in the documentation."""
+
+import re
+from pathlib import Path
+from typing import Dict, Tuple
+
+
+FETCH_COMMAND_REGEX = (
+    r"aea fetch (?P<vendor>.*)\/(?P<package>.*):(?P<hash>Q.*) \-\-remote"
+)
+
+
+def read_file(filepath: str) -> str:
+    """Loads a file into a string"""
+    with open(filepath, "r", encoding="utf-8") as file_:
+        file_str = file_.read()
+    return file_str
+
+
+def get_hashes() -> Tuple[Dict[str, str], Dict[str, str]]:
+    """Get a dictionary with all packages and their hashes"""
+    CSV_HASH_REGEX = r"(?P<vendor>.*)\/(?P<type>.*)\/(?P<name>.*),(?P<hash>.*)\n"
+    hashes_file = Path("packages", "hashes.csv").relative_to(".")
+    hashes_content = read_file(str(hashes_file))
+    package_to_hashes = {}
+    hashes_to_package = {}
+    for match in re.findall(CSV_HASH_REGEX, hashes_content):
+        package_to_hashes[f"{match[0]}/{match[1]}/{match[2]}"] = match[3]
+        hashes_to_package[match[3]] = f"{match[0]}/{match[1]}/{match[2]}"
+    return package_to_hashes, hashes_to_package
+
+
+def fix_ipfs_hashes() -> None:
+    """Fix ipfs hashes in the docs"""
+    _, hashes_to_package = get_hashes()
+
+    all_md_files = [p for p in Path("docs").rglob("*.md")]
+    errors = False
+
+    for md_file in all_md_files:
+        print(f"Checking {md_file}")
+        content = read_file(str(md_file))
+        for match in re.findall(FETCH_COMMAND_REGEX, content):
+            doc_vendor, doc_package, doc_hash = match
+
+            # Look for potential matching packages
+            potential_packages = {
+                p: h
+                for h, p in hashes_to_package.items()
+                if p.startswith(doc_vendor) and p.endswith(doc_package)
+            }
+
+            if not potential_packages:
+                print(
+                    f"Could not check an IPFS hash on doc file {md_file} because it references an unknown package: '{doc_vendor}/{doc_package}:{doc_hash}'"
+                )
+                errors = True
+                continue
+
+            if (
+                len(potential_packages) != 1
+                and doc_hash not in potential_packages.values()
+            ):
+                print(
+                    f"\nCould not check an IPFS hash on doc file {md_file} because there are multiple matching packages in hashes.csv. Fix it manually:\n"
+                    f"Referenced package in docs {doc_vendor}/{doc_package}:{doc_hash}\nPotential packages: {potential_packages}.\n"
+                )
+                errors = True
+                continue
+
+            # Overwrite with new hash
+            expected_hash = list(potential_packages.values())[0]
+
+            if doc_hash == expected_hash:
+                continue
+
+            new_command = (
+                f"aea fetch {doc_vendor}/{doc_package}:{expected_hash} --remote"
+            )
+
+            new_content = re.sub(
+                FETCH_COMMAND_REGEX, new_command, content, count=0, flags=0
+            )
+
+            with open(str(md_file), "w", encoding="utf-8") as qs_file:
+                qs_file.write(new_content)
+            print(f"Fixed an IPFS hash on doc file {md_file}")
+
+    if errors:
+        raise ValueError(
+            "There were some errors while processing the docs. Check the logs."
+        )
+    print("OK")
+
+
+if __name__ == "__main__":
+    fix_ipfs_hashes()

From d7bb507cb9884a7d149e7b29c4774faef9c379d7 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Mon, 20 Jun 2022 18:46:07 +0200
Subject: [PATCH 03/16] test: ipfs hash tests

---
 tests/test_docs/test_ipfs_hashes.py | 71 +++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 tests/test_docs/test_ipfs_hashes.py

diff --git a/tests/test_docs/test_ipfs_hashes.py b/tests/test_docs/test_ipfs_hashes.py
new file mode 100644
index 0000000000..c21d98b0ec
--- /dev/null
+++ b/tests/test_docs/test_ipfs_hashes.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------------------------
+#
+#   Copyright 2022 Valory AG
+#
+#   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 tests for checking ipfs hashes in the documentation."""
+
+import re
+from pathlib import Path
+
+from scripts.fix_doc_ipfs_hashes import get_hashes, read_file
+
+from tests.conftest import ROOT_DIR
+
+
+FETCH_COMMAND_REGEX = (
+    r"aea fetch (?P<vendor>.*)\/(?P<package>.*):(?P<hash>Q.*) \-\-remote"
+)
+
+
+def test_ipfs_hashes() -> None:
+    """Check doc ipfs hashes"""
+    # Get the hashes dicts
+    _, hashes_to_package = get_hashes()
+
+    # Get all doc files
+    all_md_files = [
+        p.relative_to(ROOT_DIR) for p in Path(ROOT_DIR, "docs").rglob("*.md")
+    ]
+
+    for md_file in all_md_files:
+        content = read_file(str(md_file))
+        for match in re.findall(FETCH_COMMAND_REGEX, content):
+            doc_vendor, doc_package, doc_hash = match
+
+            # Look for potential matching packages
+            potential_packages = {
+                p: h
+                for h, p in hashes_to_package.items()
+                if p.startswith(doc_vendor) and p.endswith(doc_package)
+            }
+            # Check that there is at least one similar package in hashes.csv
+            assert (
+                potential_packages
+            ), f"The doc file {md_file} contains an 'aea fetch' command with a reference to an unknown package: '{doc_vendor}/{doc_package}:{doc_hash}'"
+
+            # Check that there is only one similar package in hashes.csv. If there is more than one, at least one of those has a matching hash.
+            assert (
+                len(potential_packages) == 1 or doc_hash in potential_packages.values()
+            ), f"More than one package can correspond to the 'aea fecth' command in {md_file}. Candidates: {potential_packages}"
+
+            # If there was only one match, check that the hashes match
+            if len(potential_packages) == 1:
+                expected_hash = list(potential_packages.values())[0]
+                assert (
+                    doc_hash == expected_hash
+                ), f"IPFS hash not matching in {md_file}. Expected {expected_hash}, got {doc_hash}"

From 7ceef360e1c09fa53458d9440a6f2c4461ae1fda Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Mon, 20 Jun 2022 18:57:54 +0200
Subject: [PATCH 04/16] fix: unndeeded list comprehension

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

diff --git a/scripts/fix_doc_ipfs_hashes.py b/scripts/fix_doc_ipfs_hashes.py
index 3273195ff6..11996a0209 100644
--- a/scripts/fix_doc_ipfs_hashes.py
+++ b/scripts/fix_doc_ipfs_hashes.py
@@ -54,7 +54,7 @@ def fix_ipfs_hashes() -> None:
     """Fix ipfs hashes in the docs"""
     _, hashes_to_package = get_hashes()
 
-    all_md_files = [p for p in Path("docs").rglob("*.md")]
+    all_md_files = Path("docs").rglob("*.md")
     errors = False
 
     for md_file in all_md_files:

From a93183206d1475e4fcb3704f6a253782c49592f4 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 09:46:46 +0200
Subject: [PATCH 05/16] fix: recover versions

---
 docs/echo_demo.md      | 2 +-
 docs/gym-skill.md      | 2 +-
 docs/http-echo-demo.md | 2 +-
 docs/quickstart.md     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/echo_demo.md b/docs/echo_demo.md
index bcdc7367d3..a5d83ad9c0 100644
--- a/docs/echo_demo.md
+++ b/docs/echo_demo.md
@@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch fetchai/my_first_aea:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
+aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies
diff --git a/docs/gym-skill.md b/docs/gym-skill.md
index add93d6352..02194f56bc 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 open_aea/gym_aea:QmddxSr8ZfKgHw5Urdxjdw52yofjLLRgM1AyJvxRaK4V6U --remote
+aea fetch open_aea/gym_aea:0.1.0:QmddxSr8ZfKgHw5Urdxjdw52yofjLLRgM1AyJvxRaK4V6U --remote
 cd gym_aea
 aea install
 ```
diff --git a/docs/http-echo-demo.md b/docs/http-echo-demo.md
index 7d1a4786c5..c3109f0844 100644
--- a/docs/http-echo-demo.md
+++ b/docs/http-echo-demo.md
@@ -16,7 +16,7 @@ The easiest way to get started with the http server is to use our pre-built exam
 
 ``` bash
 pipenv shell
-aea fetch open_aea/http_echo:QmdyEJWRz4B2PU7ioD17HVVGELihjc4feos6nS2DSL94Rf --remote
+aea fetch open_aea/http_echo:0.1.0:QmdyEJWRz4B2PU7ioD17HVVGELihjc4feos6nS2DSL94Rf --remote
 cd http_echo
 aea generate-key ethereum; aea add-key ethereum
 aea run --aev
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 97f711d23d..eacbefcd09 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -163,7 +163,7 @@ This is a simple demo that introduces you to the main components of an AEA.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch fetchai/my_first_aea:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
+aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies

From 519921c3235bbc35e8438cfa682910212144d390 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 09:47:48 +0200
Subject: [PATCH 06/16] fix: include versions in test/fixer

---
 scripts/fix_doc_ipfs_hashes.py      | 6 +++---
 tests/test_docs/test_ipfs_hashes.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/fix_doc_ipfs_hashes.py b/scripts/fix_doc_ipfs_hashes.py
index 11996a0209..8f0d9e09ff 100644
--- a/scripts/fix_doc_ipfs_hashes.py
+++ b/scripts/fix_doc_ipfs_hashes.py
@@ -26,7 +26,7 @@
 
 
 FETCH_COMMAND_REGEX = (
-    r"aea fetch (?P<vendor>.*)\/(?P<package>.*):(?P<hash>Q.*) \-\-remote"
+    r"aea fetch (?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?(?P<hash>Q.*) \-\-remote"
 )
 
 
@@ -61,7 +61,7 @@ def fix_ipfs_hashes() -> None:
         print(f"Checking {md_file}")
         content = read_file(str(md_file))
         for match in re.findall(FETCH_COMMAND_REGEX, content):
-            doc_vendor, doc_package, doc_hash = match
+            doc_vendor, doc_package, doc_version, doc_hash = match
 
             # Look for potential matching packages
             potential_packages = {
@@ -95,7 +95,7 @@ def fix_ipfs_hashes() -> None:
                 continue
 
             new_command = (
-                f"aea fetch {doc_vendor}/{doc_package}:{expected_hash} --remote"
+                f"aea fetch {doc_vendor}/{doc_package}:{doc_version + ':' if doc_version else ''}{expected_hash} --remote"
             )
 
             new_content = re.sub(
diff --git a/tests/test_docs/test_ipfs_hashes.py b/tests/test_docs/test_ipfs_hashes.py
index c21d98b0ec..53e28b9d0e 100644
--- a/tests/test_docs/test_ipfs_hashes.py
+++ b/tests/test_docs/test_ipfs_hashes.py
@@ -28,7 +28,7 @@
 
 
 FETCH_COMMAND_REGEX = (
-    r"aea fetch (?P<vendor>.*)\/(?P<package>.*):(?P<hash>Q.*) \-\-remote"
+    r"aea fetch (?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?(?P<hash>Q.*) \-\-remote"
 )
 
 
@@ -45,7 +45,7 @@ def test_ipfs_hashes() -> None:
     for md_file in all_md_files:
         content = read_file(str(md_file))
         for match in re.findall(FETCH_COMMAND_REGEX, content):
-            doc_vendor, doc_package, doc_hash = match
+            doc_vendor, doc_package, _, doc_hash = match
 
             # Look for potential matching packages
             potential_packages = {

From 9ebf42f7af3d2fb34f60f3114dcb64461548ebb8 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 16:19:43 +0200
Subject: [PATCH 07/16] docs: add hashes to aea add commands

---
 docs/gym-skill.md                 |  2 +-
 docs/http-connection-and-skill.md | 12 ++++++------
 docs/ipfs_registry.md             |  4 ++--
 docs/p2p-connection.md            | 18 +++++++++---------
 docs/quickstart.md                |  4 ++--
 docs/registry.md                  | 10 +++++-----
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/gym-skill.md b/docs/gym-skill.md
index 02194f56bc..ee038b7f2c 100644
--- a/docs/gym-skill.md
+++ b/docs/gym-skill.md
@@ -36,7 +36,7 @@ cd my_gym_aea
 
 ### Add the gym skill
 ``` bash
-aea add skill fetchai/gym:0.20.0
+aea add skill fetchai/gym:0.20.0:QmdQisuqLhq81NHuas9ALYgP1tw1cZoE3vGueREgG8PgCZ
 ```
 
 ### Set gym connection as default
diff --git a/docs/http-connection-and-skill.md b/docs/http-connection-and-skill.md
index cf41287e47..80ff9f6f09 100644
--- a/docs/http-connection-and-skill.md
+++ b/docs/http-connection-and-skill.md
@@ -1,6 +1,6 @@
 ## Description
 
-The HTTP client and HTTP server connections enable an AEA to communicate with external servers, respectively clients, via HTTP. 
+The HTTP client and HTTP server connections enable an AEA to communicate with external servers, respectively clients, via HTTP.
 
 The HTTP client connection receives request envelops from an agent's skill, translates each into an HTTP request and sends it to a server external to the agent. If it receives an HTTP response from the server within a timeout window, it translates it into a response envelope, and sends this back to the relevant skill inside the agent.
 
@@ -12,7 +12,7 @@ The `fetchai/simple_data_request:0.13.0` skill demonstrates a simple use case of
 
 The `HttpRequestBehaviour` in `behaviours.py` periodically sends HTTP envelops to the HTTP client connection. Its `act()` method, periodically called, simply calls `_generate_http_request` which contains the logic for enqueueing an HTTP request envelop.
 
-The `HttpHandler` in `handler.py` is a basic handler for dealing with HTTP response envelops received from the HTTP client connection. In the `handle()` method, the responses are dealt with by the private `_handle_response` method which essentially logs the response and adds the body of the response into the skill's shared state. 
+The `HttpHandler` in `handler.py` is a basic handler for dealing with HTTP response envelops received from the HTTP client connection. In the `handle()` method, the responses are dealt with by the private `_handle_response` method which essentially logs the response and adds the body of the response into the skill's shared state.
 
 ## HTTP Server
 
@@ -26,7 +26,7 @@ cd my_aea
 Add the http server connection package:
 
 ``` bash
-aea add connection fetchai/http_server:0.22.0
+aea add connection fetchai/http_server:0.22.0:Qmdr2Ajx5BRBJCC6xP8wUNSCMbhStHHZaVgzkoSW6Pvu7S
 ```
 
 Update the default connection:
@@ -46,7 +46,7 @@ Ensure the file exists under the specified path!
 Create and add a private key:
 
 ``` bash
-aea generate-key ethereum 
+aea generate-key ethereum
 aea add-key ethereum
 ```
 
@@ -71,7 +71,7 @@ Next implement a basic handler which prints the received envelopes and responds.
 
 
 Then, replace the content of `handlers.py` with the following code snippet,
-after having replaced the placeholder `YOUR_USERNAME` with 
+after having replaced the placeholder `YOUR_USERNAME` with
 the author username (i.e. the output of `aea config get agent.author`):
 
 ``` python
@@ -327,7 +327,7 @@ In our case, this is the `http_echo` that you have just scaffolded.
 Its public id will be `<your-author-name>/http_echo:0.1.0`.
 
 ``` bash
-aea config set vendor.fetchai.connections.http_server.config.target_skill_id "$(aea config get agent.author)/http_echo:0.1.0" 
+aea config set vendor.fetchai.connections.http_server.config.target_skill_id "$(aea config get agent.author)/http_echo:0.1.0"
 ```
 
 You can now run the AEA:
diff --git a/docs/ipfs_registry.md b/docs/ipfs_registry.md
index 75a787ef1b..7bd532502f 100644
--- a/docs/ipfs_registry.md
+++ b/docs/ipfs_registry.md
@@ -38,11 +38,11 @@ Packages can be downloaded using both extended public ids and hashes
 
 Add the signing protocol using
 
-`aea add protocol QmdrqznAYpnTWtLvLtLXiyMVr8PRfmj251puWbMZMNBw41`
+`aea add protocol QmWdCAiXpeT1tgrcf8uofKdQ6fLxMH77D5jwgQbbMo41df`
 
 Or
 
-`aea add protocol open_aea/signing:1.0.0:QmdrqznAYpnTWtLvLtLXiyMVr8PRfmj251puWbMZMNBw41`
+`aea add protocol open_aea/signing:1.0.0:QmWdCAiXpeT1tgrcf8uofKdQ6fLxMH77D5jwgQbbMo41df`
 
 ## Publishing agents
 
diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md
index 729933bd2d..1187004ace 100644
--- a/docs/p2p-connection.md
+++ b/docs/p2p-connection.md
@@ -4,16 +4,16 @@ The `valory/p2p_libp2p:0.26.0` connection allows AEAs to create a peer-to-peer c
 
 <div class="admonition note">
   <p class="admonition-title">Note</p>
-  <p>Currently <code>p2p_libp2p</code> does not support the 
+  <p>Currently <code>p2p_libp2p</code> does not support the
   ethereum keys generated by open-aea-ledger-ethereum yet.
-  This does not affect the agents' ability to interact with the 
-  ethereum ledger and solely necessitates a separate set of 
+  This does not affect the agents' ability to interact with the
+  ethereum ledger and solely necessitates a separate set of
   cosmos keys for establishing the libp2p connection.
 </p>
 </div>
 
 First, make sure you have installed the crypto plugin
-of the target test-net. 
+of the target test-net.
 ``` bash
 pip install open-aea-ledger-cosmos
 pip install open-aea-ledger-ethereum
@@ -26,7 +26,7 @@ Create one AEA as follows:
 ``` bash
 aea create my_genesis_aea
 cd my_genesis_aea
-aea add connection valory/p2p_libp2p:0.1.0
+aea add connection valory/p2p_libp2p:0.1.0:QmYW7Q5iFN6RwWmHj7wvjUBZfxu3hJN4KvcTWW1AhdKhki
 aea config set agent.default_connection valory/p2p_libp2p:0.1.0
 aea install
 aea build
@@ -58,7 +58,7 @@ Create a second AEA:
 ``` bash
 aea create my_other_aea
 cd my_other_aea
-aea add connection valory/p2p_libp2p:0.1.0
+aea add connection valory/p2p_libp2p:0.1.0:QmYW7Q5iFN6RwWmHj7wvjUBZfxu3hJN4KvcTWW1AhdKhki
 aea config set agent.default_connection valory/p2p_libp2p:0.1.0
 aea install
 aea build
@@ -136,7 +136,7 @@ To learn more about how to configure your `valory/p2p_libp2p:0.1.0` connection c
 
 You can run a peer node in _standalone mode_; that is, as a Go process with no dependency on the AEA framework. To facilitate such a deployment, we provide a script
  <a href="https://github.com/valory-xyz/open-aea/blob/main/scripts/acn/run_acn_node_standalone.py" target="_blank">`run_acn_node_standalone.py`</a>
- and a corresponding 
+ and a corresponding
  <a href="https://github.com/valory-xyz/open-aea/blob/main/scripts/acn/Dockerfile" target="_blank">Dockerfile</a>.
 
 First, you need to build the node's binary (`libp2p_node`) either:
@@ -160,7 +160,7 @@ Next, to run the node binary in standalone mode, it requires values for the foll
 - `AEA_P2P_URI`: the local host and port to use by node
 - `AEA_P2P_URI_PUBLIC`: the URI under which the peer is publicly reachable
 - `AEA_P2P_DELEGATE_URI`: the URI under which the peer receives delegate connections
-- `AEA_P2P_ENTRY_URIS`: an optionally supplied list of comma-separated (`,`) entry <a href="https://multiformats.io/multiaddr/" target="_blank">Multiaddrs</a> for the peer to bootstrap 
+- `AEA_P2P_ENTRY_URIS`: an optionally supplied list of comma-separated (`,`) entry <a href="https://multiformats.io/multiaddr/" target="_blank">Multiaddrs</a> for the peer to bootstrap
 
 The script allows different methods to pass these values to the node:
 
@@ -183,7 +183,7 @@ The script allows different methods to pass these values to the node:
     --uri-delegate <AEA_P2P_DELEGATE_URI> \
     --entry-peers-maddrs <AEA_P2P_ENTRY_URI_1> <AEA_P2P_ENTRY_URI_2> ...
   ```
-  or 
+  or
   ``` bash
   docker run -v <node_private_key.txt>:/acn/key.txt -it acn_node_standalone --key-file /acn/key.txt \
     --uri <AEA_P2P_URI> --uri-external <AEA_P2P_URI_PUBLIC>  \
diff --git a/docs/quickstart.md b/docs/quickstart.md
index eacbefcd09..ea0eb56f88 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -259,14 +259,14 @@ cd my_first_aea
 <br>
 Second, add the stub connection to the project.
 ``` bash
-aea add connection fetchai/stub:0.21.0
+aea add connection fetchai/stub:0.21.0:QmektTWmXcjThQd8md8nSYgLapR3Gks3n3WEzwAWQFgc4z
 ```
 <br>
 <b>Add the echo skill</b>
 <br>
 Third, add the echo skill to the project.
 ``` bash
-aea add skill fetchai/echo:0.19.0
+aea add skill fetchai/echo:0.19.0:QmReV2qgjE4mkY9n5iwJDoEcv174Sxbjhxo84YZpLyvcR2
 ```
 This copies the <code>fetchai/echo:0.19.0</code> skill code containing the "behaviours", and "handlers" into the project, ready to run. The identifier of the skill <code>fetchai/echo:0.19.0</code> consists of the name of the author of the skill, followed by the skill name and its version.
 </details>
diff --git a/docs/registry.md b/docs/registry.md
index 80197cfc02..b12f22c4b3 100644
--- a/docs/registry.md
+++ b/docs/registry.md
@@ -1,6 +1,6 @@
 # Component Registry
 
-Individual components are stored on the  <a href="https://ipfs.io" target="_blank">`IPFS registry`</a>. This registry allows other developer to reuse these components. Anyone case register a new component which is uniquely identifiable by a hash of the contents of the component. 
+Individual components are stored on the  <a href="https://ipfs.io" target="_blank">`IPFS registry`</a>. This registry allows other developer to reuse these components. Anyone case register a new component which is uniquely identifiable by a hash of the contents of the component.
 
 ## Creating a Project
 We can create a new agent with the bare minimal components as so;
@@ -12,7 +12,7 @@ Creating project directory './agent'
 Creating config file aea-config.yaml
 Adding default packages ...
 Adding protocol 'open_aea/signing:latest'...
-Using registry: ipfs 
+Using registry: ipfs
 Downloading open_aea/signing:latest from IPFS.
 Successfully added protocol 'open_aea/signing:1.0.0'.
 ```
@@ -22,14 +22,14 @@ Successfully added protocol 'open_aea/signing:1.0.0'.
 Once we have an agent, we can add individual components to the agent as so;
 
 ```
-aea add skill fetchai/echo:0.19.0
+aea add skill fetchai/echo:0.19.0:QmReV2qgjE4mkY9n5iwJDoEcv174Sxbjhxo84YZpLyvcR2
 Registry path not provided and local registry `packages` not found in current (.) and parent directory.
 Trying remote registry (`--remote`).
 Adding skill 'fetchai/echo:latest'...
-Using registry: ipfs 
+Using registry: ipfs
 Downloading fetchai/echo:latest from IPFS.
 Adding protocol 'fetchai/default:1.0.0'...
-Using registry: ipfs 
+Using registry: ipfs
 Downloading fetchai/default:1.0.0 from IPFS.
 Successfully added protocol 'fetchai/default:1.0.0'.
 Successfully added skill 'fetchai/echo:0.19.0'.

From e0371a78345eed257e48654c8ed301fbc79dfbef Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 17:04:57 +0200
Subject: [PATCH 08/16] docs: replace svn commands

---
 docs/agent-vs-aea.md               | 2 +-
 docs/decision-maker-transaction.md | 2 +-
 docs/multiplexer-standalone.md     | 2 +-
 docs/quickstart.md                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index ca43c1b710..d411e07498 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -6,7 +6,7 @@ In this guide we show some of the differences in terms of code.
 
 The <a href="../build-aea-programmatically">Build an AEA programmatically</a> guide shows how to programmatically build an AEA. We can build an agent of the <a href="../api/agent#agent-objects">`Agent`</a> class programmatically as well.
 
-First, import the python and application specific libraries. (Get the packages directory from the AEA repository `svn export https://github.com/valory-xyz/open-aea.git/trunk/packages`.)
+First, import the python and application specific libraries. (Get the packages directory from the AEA repository `aea fetch PUBLIC_ID_OR_HASH`.)
 ``` python
 import os
 import time
diff --git a/docs/decision-maker-transaction.md b/docs/decision-maker-transaction.md
index 572ab93af6..5d3c16651d 100644
--- a/docs/decision-maker-transaction.md
+++ b/docs/decision-maker-transaction.md
@@ -1,6 +1,6 @@
 This guide can be considered as a part 2 of the <a href="../standalone-transaction/">the stand-alone transaction demo</a>. The main difference is that now we are going to use the decision-maker to sign the transaction.
 
-First, import the libraries and the set the constant values. (Get the packages directory from the AEA repository `svn export https://github.com/valory-xyz/open-aea.git/trunk/packages`.)
+First, import the libraries and the set the constant values. (Get the packages directory from the AEA repository `aea fetch PUBLIC_ID_OR_HASH`.)
 
 ``` python
 import logging
diff --git a/docs/multiplexer-standalone.md b/docs/multiplexer-standalone.md
index 40f8787f82..af8ca8106d 100644
--- a/docs/multiplexer-standalone.md
+++ b/docs/multiplexer-standalone.md
@@ -1,6 +1,6 @@
 The `Multiplexer` can be used stand-alone. This way a developer can utilise the protocols and connections independent of the `Agent` or `AEA` classes.
 
-First, import the Python and application specific libraries and set the static variables. (Get the packages directory from the AEA repository `svn export https://github.com/valory-xyz/open-aea.git/trunk/packages`.)
+First, import the Python and application specific libraries and set the static variables. (Get the packages directory from the AEA repository `aea fetch PUBLIC_ID_OR_HASH`.)
 ``` python
 import os
 import time
diff --git a/docs/quickstart.md b/docs/quickstart.md
index ea0eb56f88..0a7e96315a 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -150,9 +150,9 @@ aea init --local
 AEAs are composed of components. AEAs and AEA components can be developed by anyone and pushed to an <a href="https://ipfs.io/" target="_blank">IPFS registry</a> for others to use.
 
 
-To load Valory packages please use <a href="https://subversion.apache.org/packages.html" target="_blank">SVN</a> to checkout the specific folders;
+To load Valory packages please use <a href="https://subversion.apache.org/packages.html" target="_blank">aea fetch</a> to checkout the specific packages;
 ```bash
-svn checkout https://github.com/valory-xyz/open-aea/tags/v1.10.0/packages packages
+aea fetch PUBLIC_ID_OR_HASH
 ```
 
 
@@ -321,7 +321,7 @@ The following test class replicates the preceding demo and tests it's correct be
 First, get the packages directory from the AEA repository (execute from the working directory which contains the <code>my_first_aea</code> folder):
 
 ``` bash
-svn export https://github.com/valory-xyz/open-aea.git/trunk/packages
+aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
 ```
 
 Then write the test:

From 2e77f123dbfaba35b8c376baca6c269caf90bf5f Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 17:05:48 +0200
Subject: [PATCH 09/16] test: improve test

---
 tests/test_docs/test_ipfs_hashes.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/test_docs/test_ipfs_hashes.py b/tests/test_docs/test_ipfs_hashes.py
index 53e28b9d0e..9bd153eff7 100644
--- a/tests/test_docs/test_ipfs_hashes.py
+++ b/tests/test_docs/test_ipfs_hashes.py
@@ -27,8 +27,8 @@
 from tests.conftest import ROOT_DIR
 
 
-FETCH_COMMAND_REGEX = (
-    r"aea fetch (?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?(?P<hash>Q.*) \-\-remote"
+AEA_COMMAND_REGEX = (
+    r"(?P<cli>aea|autonomy) (?P<cmd>fetch|add .*) (?:(?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?)?(?P<hash>Q[A-Za-z0-9]+)"
 )
 
 
@@ -44,8 +44,13 @@ def test_ipfs_hashes() -> None:
 
     for md_file in all_md_files:
         content = read_file(str(md_file))
-        for match in re.findall(FETCH_COMMAND_REGEX, content):
-            doc_vendor, doc_package, _, doc_hash = match
+        for match in re.findall(AEA_COMMAND_REGEX, content):
+            _, _, doc_vendor, doc_package, _, doc_hash = match
+
+            if not doc_vendor and not doc_package:
+                # Some commands only reference the has, not the vendor or the package name
+                assert doc_hash in hashes_to_package.keys(), f"Unknown IPFS hash referenced in {md_file}: {doc_hash}"
+                continue
 
             # Look for potential matching packages
             potential_packages = {
@@ -53,6 +58,7 @@ def test_ipfs_hashes() -> None:
                 for h, p in hashes_to_package.items()
                 if p.startswith(doc_vendor) and p.endswith(doc_package)
             }
+
             # Check that there is at least one similar package in hashes.csv
             assert (
                 potential_packages
@@ -69,3 +75,5 @@ def test_ipfs_hashes() -> None:
                 assert (
                     doc_hash == expected_hash
                 ), f"IPFS hash not matching in {md_file}. Expected {expected_hash}, got {doc_hash}"
+
+

From 0084571561e6e17483c2e240f75385d8f3b4a815 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 17:06:31 +0200
Subject: [PATCH 10/16] fix: linters

---
 scripts/fix_doc_ipfs_hashes.py      |  8 ++------
 tests/test_docs/test_ipfs_hashes.py | 10 ++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/scripts/fix_doc_ipfs_hashes.py b/scripts/fix_doc_ipfs_hashes.py
index 8f0d9e09ff..26cee2f5a3 100644
--- a/scripts/fix_doc_ipfs_hashes.py
+++ b/scripts/fix_doc_ipfs_hashes.py
@@ -25,9 +25,7 @@
 from typing import Dict, Tuple
 
 
-FETCH_COMMAND_REGEX = (
-    r"aea fetch (?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?(?P<hash>Q.*) \-\-remote"
-)
+FETCH_COMMAND_REGEX = r"aea fetch (?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?(?P<hash>Q.*) \-\-remote"
 
 
 def read_file(filepath: str) -> str:
@@ -94,9 +92,7 @@ def fix_ipfs_hashes() -> None:
             if doc_hash == expected_hash:
                 continue
 
-            new_command = (
-                f"aea fetch {doc_vendor}/{doc_package}:{doc_version + ':' if doc_version else ''}{expected_hash} --remote"
-            )
+            new_command = f"aea fetch {doc_vendor}/{doc_package}:{doc_version + ':' if doc_version else ''}{expected_hash} --remote"
 
             new_content = re.sub(
                 FETCH_COMMAND_REGEX, new_command, content, count=0, flags=0
diff --git a/tests/test_docs/test_ipfs_hashes.py b/tests/test_docs/test_ipfs_hashes.py
index 9bd153eff7..d6cd24eb7e 100644
--- a/tests/test_docs/test_ipfs_hashes.py
+++ b/tests/test_docs/test_ipfs_hashes.py
@@ -27,9 +27,7 @@
 from tests.conftest import ROOT_DIR
 
 
-AEA_COMMAND_REGEX = (
-    r"(?P<cli>aea|autonomy) (?P<cmd>fetch|add .*) (?:(?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?)?(?P<hash>Q[A-Za-z0-9]+)"
-)
+AEA_COMMAND_REGEX = r"(?P<cli>aea|autonomy) (?P<cmd>fetch|add .*) (?:(?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?)?(?P<hash>Q[A-Za-z0-9]+)"
 
 
 def test_ipfs_hashes() -> None:
@@ -49,7 +47,9 @@ def test_ipfs_hashes() -> None:
 
             if not doc_vendor and not doc_package:
                 # Some commands only reference the has, not the vendor or the package name
-                assert doc_hash in hashes_to_package.keys(), f"Unknown IPFS hash referenced in {md_file}: {doc_hash}"
+                assert (
+                    doc_hash in hashes_to_package.keys()
+                ), f"Unknown IPFS hash referenced in {md_file}: {doc_hash}"
                 continue
 
             # Look for potential matching packages
@@ -75,5 +75,3 @@ def test_ipfs_hashes() -> None:
                 assert (
                     doc_hash == expected_hash
                 ), f"IPFS hash not matching in {md_file}. Expected {expected_hash}, got {doc_hash}"
-
-

From 31fcd2e9fa134e92fa1bdfd401fe724c4daa7cef Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 17:28:32 +0200
Subject: [PATCH 11/16] fix: improve script

---
 scripts/fix_doc_ipfs_hashes.py | 40 +++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/scripts/fix_doc_ipfs_hashes.py b/scripts/fix_doc_ipfs_hashes.py
index 26cee2f5a3..5ffe670aa0 100644
--- a/scripts/fix_doc_ipfs_hashes.py
+++ b/scripts/fix_doc_ipfs_hashes.py
@@ -25,7 +25,7 @@
 from typing import Dict, Tuple
 
 
-FETCH_COMMAND_REGEX = r"aea fetch (?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?(?P<hash>Q.*) \-\-remote"
+AEA_COMMAND_REGEX = r"(?P<full_cmd>(?P<cli>aea|autonomy) (?P<cmd>fetch|add .*) (?:(?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?)?(?P<hash>Q[A-Za-z0-9]+))"
 
 
 def read_file(filepath: str) -> str:
@@ -56,10 +56,23 @@ def fix_ipfs_hashes() -> None:
     errors = False
 
     for md_file in all_md_files:
-        print(f"Checking {md_file}")
         content = read_file(str(md_file))
-        for match in re.findall(FETCH_COMMAND_REGEX, content):
-            doc_vendor, doc_package, doc_version, doc_hash = match
+        for match in re.findall(AEA_COMMAND_REGEX, content):
+            (
+                doc_full_cmd,
+                doc_cli,
+                doc_cmd,
+                doc_vendor,
+                doc_package,
+                doc_version,
+                doc_hash,
+            ) = match
+
+            if not doc_vendor and not doc_package:
+                print(
+                    f"Warning: can't check a IPFS hash in {md_file} because this commands just uses the hash:\n\t{doc_full_cmd}"
+                )
+                continue
 
             # Look for potential matching packages
             potential_packages = {
@@ -68,6 +81,15 @@ def fix_ipfs_hashes() -> None:
                 if p.startswith(doc_vendor) and p.endswith(doc_package)
             }
 
+            package_type = (
+                doc_cmd.replace("add", "").strip() if "add" in doc_cmd else None
+            )
+
+            if package_type:
+                potential_packages = {
+                    p: h for p, h in potential_packages.items() if package_type in p
+                }
+
             if not potential_packages:
                 print(
                     f"Could not check an IPFS hash on doc file {md_file} because it references an unknown package: '{doc_vendor}/{doc_package}:{doc_hash}'"
@@ -92,11 +114,13 @@ def fix_ipfs_hashes() -> None:
             if doc_hash == expected_hash:
                 continue
 
-            new_command = f"aea fetch {doc_vendor}/{doc_package}:{doc_version + ':' if doc_version else ''}{expected_hash} --remote"
+            new_command = ""
+            if doc_vendor and doc_package:
+                new_command = f"{doc_cli} {doc_cmd} {doc_vendor}/{doc_package}:{doc_version + ':' if doc_version else ''}{expected_hash}"
+            else:
+                new_command = f"{doc_cli} {doc_cmd} {expected_hash}"
 
-            new_content = re.sub(
-                FETCH_COMMAND_REGEX, new_command, content, count=0, flags=0
-            )
+            new_content = content.replace(doc_full_cmd, new_command)
 
             with open(str(md_file), "w", encoding="utf-8") as qs_file:
                 qs_file.write(new_content)

From 74eab20ca8a4c904d63e6bcc5d17b15c7044a293 Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 17:37:45 +0200
Subject: [PATCH 12/16] test: update test

---
 tests/test_docs/test_ipfs_hashes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_docs/test_ipfs_hashes.py b/tests/test_docs/test_ipfs_hashes.py
index d6cd24eb7e..75123e9e9f 100644
--- a/tests/test_docs/test_ipfs_hashes.py
+++ b/tests/test_docs/test_ipfs_hashes.py
@@ -27,7 +27,7 @@
 from tests.conftest import ROOT_DIR
 
 
-AEA_COMMAND_REGEX = r"(?P<cli>aea|autonomy) (?P<cmd>fetch|add .*) (?:(?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?)?(?P<hash>Q[A-Za-z0-9]+)"
+AEA_COMMAND_REGEX = r"(?P<full_cmd>(?P<cli>aea|autonomy) (?P<cmd>fetch|add .*) (?:(?P<vendor>.*)\/(?P<package>.[^:]*):(?P<version>\d+\.\d+\.\d+)?:?)?(?P<hash>Q[A-Za-z0-9]+))"
 
 
 def test_ipfs_hashes() -> None:
@@ -43,7 +43,7 @@ def test_ipfs_hashes() -> None:
     for md_file in all_md_files:
         content = read_file(str(md_file))
         for match in re.findall(AEA_COMMAND_REGEX, content):
-            _, _, doc_vendor, doc_package, _, doc_hash = match
+            _, _, _, doc_vendor, doc_package, _, doc_hash = match
 
             if not doc_vendor and not doc_package:
                 # Some commands only reference the has, not the vendor or the package name

From 6f879f29920d20a2cb80badf354f615d926c54df Mon Sep 17 00:00:00 2001
From: David Vilela <dvilelaf@gmail.com>
Date: Tue, 21 Jun 2022 18:53:41 +0200
Subject: [PATCH 13/16] fix: more tests

---
 .../test_bash_yaml/md_files/bash-gym-skill.md     |  4 ++--
 .../md_files/bash-http-connection-and-skill.md    |  6 +++---
 .../md_files/bash-http-echo-demo.md               | 10 +++++-----
 .../test_bash_yaml/md_files/bash-quickstart.md    | 15 ++++++++++++---
 4 files changed, 22 insertions(+), 13 deletions(-)

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 8be3c33e68..f1a6693a7a 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 open_aea/gym_aea:0.1.0 --local
+aea fetch open_aea/gym_aea:0.1.0:QmddxSr8ZfKgHw5Urdxjdw52yofjLLRgM1AyJvxRaK4V6U --remote
 cd gym_aea
 aea install
 ```
@@ -8,7 +8,7 @@ aea create my_gym_aea
 cd my_gym_aea
 ```
 ``` bash
-aea add skill fetchai/gym:0.20.0
+aea add skill fetchai/gym:0.20.0:QmdQisuqLhq81NHuas9ALYgP1tw1cZoE3vGueREgG8PgCZ
 ```
 ``` bash
 aea config set agent.default_connection fetchai/gym:0.19.0
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 195c0c8c46..290cbf07f6 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,7 +3,7 @@ aea create my_aea
 cd my_aea
 ```
 ``` bash
-aea add connection fetchai/http_server:0.22.0
+aea add connection fetchai/http_server:0.22.0:Qmdr2Ajx5BRBJCC6xP8wUNSCMbhStHHZaVgzkoSW6Pvu7S
 ```
 ``` bash
 aea config set agent.default_connection fetchai/http_server:0.22.0
@@ -12,7 +12,7 @@ aea config set agent.default_connection fetchai/http_server:0.22.0
 aea config set vendor.fetchai.connections.http_server.config.api_spec_path "../examples/http_ex/petstore.yaml"
 ```
 ``` bash
-aea generate-key ethereum 
+aea generate-key ethereum
 aea add-key ethereum
 ```
 ``` bash
@@ -25,7 +25,7 @@ aea scaffold skill http_echo
 aea fingerprint skill fetchai/http_echo:0.20.0
 ```
 ``` bash
-aea config set vendor.fetchai.connections.http_server.config.target_skill_id "$(aea config get agent.author)/http_echo:0.1.0" 
+aea config set vendor.fetchai.connections.http_server.config.target_skill_id "$(aea config get agent.author)/http_echo:0.1.0"
 ```
 ``` bash
 aea run
diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md b/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md
index 7938004d4f..98d311d08f 100644
--- a/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md
+++ b/tests/test_docs/test_bash_yaml/md_files/bash-http-echo-demo.md
@@ -1,6 +1,6 @@
 ``` bash
 pipenv shell
-aea fetch open_aea/http_echo:0.1.0 --local 
+aea fetch open_aea/http_echo:0.1.0:QmdyEJWRz4B2PU7ioD17HVVGELihjc4feos6nS2DSL94Rf --remote
 cd http_echo
 aea generate-key ethereum; aea add-key ethereum
 aea run --aev
@@ -15,10 +15,10 @@ Successfully added connection 'fetchai/http_server:0.22.0'.
 Adding skill 'fetchai/http_echo:0.20.0'...
 Successfully added skill 'fetchai/http_echo:0.20.0'.
 Agent http_echo successfully fetched.
-    _     _____     _    
-   / \   | ____|   / \   
-  / _ \  |  _|    / _ \  
- / ___ \ | |___  / ___ \ 
+    _     _____     _
+   / \   | ____|   / \
+  / _ \  |  _|    / _ \
+ / ___ \ | |___  / ___ \
 /_/   \_\|_____|/_/   \_\
 
 v1.4.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 4ad5a4f41f..659ffc4db0 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
@@ -13,10 +13,10 @@ chmod +x install.sh
 docker pull fetchai/aea-user:latest
 ```
 ```bash
-docker run -it -v $(pwd):/agents --workdir=/agents fetchai/aea-user:latest 
+docker run -it -v $(pwd):/agents --workdir=/agents fetchai/aea-user:latest
 ```
 ```bash
-docker run -it -v %cd%:/agents --workdir=/agents fetchai/aea-user:latest 
+docker run -it -v %cd%:/agents --workdir=/agents fetchai/aea-user:latest
 ```
 ``` bash
 mkdir my_aea_projects/
@@ -44,7 +44,7 @@ svn checkout https://github.com/valory-xyz/open-aea/tags/v1.10.0/packages packag
 ``` bash
 sudo apt-get install python3.7-dev
 ```
-``` bash 
+``` bash
 aea init --local
 ```
 ``` bash
@@ -149,3 +149,12 @@ pipenv run pytest test.py
 ``` bash
 aea delete my_first_aea
 ```
+
+```bash
+aea fetch PUBLIC_ID_OR_HASH
+```
+
+``` bash
+aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
+cd my_first_aea
+```
\ No newline at end of file

From 1eb82f7a27a81b5f2d7b5b6408e4d7302dfd44e0 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 21 Jun 2022 20:27:36 +0100
Subject: [PATCH 14/16] Apply suggestions from code review

---
 docs/agent-vs-aea.md                                      | 2 +-
 docs/decision-maker-transaction.md                        | 2 +-
 docs/echo_demo.md                                         | 2 +-
 docs/quickstart.md                                        | 8 ++------
 .../test_docs/test_bash_yaml/md_files/bash-quickstart.md  | 3 ---
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/docs/agent-vs-aea.md b/docs/agent-vs-aea.md
index d411e07498..ca43c1b710 100644
--- a/docs/agent-vs-aea.md
+++ b/docs/agent-vs-aea.md
@@ -6,7 +6,7 @@ In this guide we show some of the differences in terms of code.
 
 The <a href="../build-aea-programmatically">Build an AEA programmatically</a> guide shows how to programmatically build an AEA. We can build an agent of the <a href="../api/agent#agent-objects">`Agent`</a> class programmatically as well.
 
-First, import the python and application specific libraries. (Get the packages directory from the AEA repository `aea fetch PUBLIC_ID_OR_HASH`.)
+First, import the python and application specific libraries. (Get the packages directory from the AEA repository `svn export https://github.com/valory-xyz/open-aea.git/trunk/packages`.)
 ``` python
 import os
 import time
diff --git a/docs/decision-maker-transaction.md b/docs/decision-maker-transaction.md
index 5d3c16651d..572ab93af6 100644
--- a/docs/decision-maker-transaction.md
+++ b/docs/decision-maker-transaction.md
@@ -1,6 +1,6 @@
 This guide can be considered as a part 2 of the <a href="../standalone-transaction/">the stand-alone transaction demo</a>. The main difference is that now we are going to use the decision-maker to sign the transaction.
 
-First, import the libraries and the set the constant values. (Get the packages directory from the AEA repository `aea fetch PUBLIC_ID_OR_HASH`.)
+First, import the libraries and the set the constant values. (Get the packages directory from the AEA repository `svn export https://github.com/valory-xyz/open-aea.git/trunk/packages`.)
 
 ``` python
 import logging
diff --git a/docs/echo_demo.md b/docs/echo_demo.md
index a5d83ad9c0..cdcb3effbc 100644
--- a/docs/echo_demo.md
+++ b/docs/echo_demo.md
@@ -7,7 +7,7 @@ This demo assumes you have followed the setup guide.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
+aea fetch open_aea/my_first_aea:0.1.0:QmbyFaoHWikC8dHcpdTVboxVnkXX2vMgch4UUXmwCfJhRu --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 0a7e96315a..87a00ec5db 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -150,10 +150,6 @@ aea init --local
 AEAs are composed of components. AEAs and AEA components can be developed by anyone and pushed to an <a href="https://ipfs.io/" target="_blank">IPFS registry</a> for others to use.
 
 
-To load Valory packages please use <a href="https://subversion.apache.org/packages.html" target="_blank">aea fetch</a> to checkout the specific packages;
-```bash
-aea fetch PUBLIC_ID_OR_HASH
-```
 
 
 ## Echo skill demo
@@ -163,7 +159,7 @@ This is a simple demo that introduces you to the main components of an AEA.
 The fastest way to have your first AEA is to fetch one that already exists!
 
 ``` bash
-aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
+aea fetch open_aea/my_first_aea:0.1.0:QmbyFaoHWikC8dHcpdTVboxVnkXX2vMgch4UUXmwCfJhRu --remote
 cd my_first_aea
 ```
 ### Install AEA dependencies
@@ -321,7 +317,7 @@ The following test class replicates the preceding demo and tests it's correct be
 First, get the packages directory from the AEA repository (execute from the working directory which contains the <code>my_first_aea</code> folder):
 
 ``` bash
-aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote
+svn export https://github.com/valory-xyz/open-aea.git/trunk/packages
 ```
 
 Then write the test:
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 659ffc4db0..810f8f7fcb 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
@@ -150,9 +150,6 @@ pipenv run pytest test.py
 aea delete my_first_aea
 ```
 
-```bash
-aea fetch PUBLIC_ID_OR_HASH
-```
 
 ``` bash
 aea fetch fetchai/my_first_aea:0.27.0:QmcmunuEAvaKfLCJsgeqF8M5dKARHixu4otUFVGbEenaCm --remote

From 72c3f26dd188cdb9291f14e03b6e6cbbcdee0317 Mon Sep 17 00:00:00 2001
From: David Minarsch <david.minarsch@googlemail.com>
Date: Tue, 21 Jun 2022 20:33:34 +0100
Subject: [PATCH 15/16] Apply suggestions from code review

---
 docs/gym-skill.md                                             | 2 +-
 docs/http-connection-and-skill.md                             | 2 +-
 docs/ipfs_registry.md                                         | 4 ++--
 docs/multiplexer-standalone.md                                | 2 +-
 docs/p2p-connection.md                                        | 4 ++--
 docs/quickstart.md                                            | 4 ++--
 docs/registry.md                                              | 2 +-
 tests/test_docs/test_bash_yaml/md_files/bash-gym-skill.md     | 2 +-
 .../test_bash_yaml/md_files/bash-http-connection-and-skill.md | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/gym-skill.md b/docs/gym-skill.md
index ee038b7f2c..d28712afc9 100644
--- a/docs/gym-skill.md
+++ b/docs/gym-skill.md
@@ -36,7 +36,7 @@ cd my_gym_aea
 
 ### Add the gym skill
 ``` bash
-aea add skill fetchai/gym:0.20.0:QmdQisuqLhq81NHuas9ALYgP1tw1cZoE3vGueREgG8PgCZ
+aea add skill fetchai/gym:0.20.0:QmdQisuqLhq81NHuas9ALYgP1tw1cZoE3vGueREgG8PgCZ --remote
 ```
 
 ### Set gym connection as default
diff --git a/docs/http-connection-and-skill.md b/docs/http-connection-and-skill.md
index 80ff9f6f09..1fbc2aecfc 100644
--- a/docs/http-connection-and-skill.md
+++ b/docs/http-connection-and-skill.md
@@ -26,7 +26,7 @@ cd my_aea
 Add the http server connection package:
 
 ``` bash
-aea add connection fetchai/http_server:0.22.0:Qmdr2Ajx5BRBJCC6xP8wUNSCMbhStHHZaVgzkoSW6Pvu7S
+aea add connection fetchai/http_server:0.22.0:Qmdr2Ajx5BRBJCC6xP8wUNSCMbhStHHZaVgzkoSW6Pvu7S --remote
 ```
 
 Update the default connection:
diff --git a/docs/ipfs_registry.md b/docs/ipfs_registry.md
index 7bd532502f..2ee57ab732 100644
--- a/docs/ipfs_registry.md
+++ b/docs/ipfs_registry.md
@@ -38,11 +38,11 @@ Packages can be downloaded using both extended public ids and hashes
 
 Add the signing protocol using
 
-`aea add protocol QmWdCAiXpeT1tgrcf8uofKdQ6fLxMH77D5jwgQbbMo41df`
+`aea add protocol QmWdCAiXpeT1tgrcf8uofKdQ6fLxMH77D5jwgQbbMo41df --remote`
 
 Or
 
-`aea add protocol open_aea/signing:1.0.0:QmWdCAiXpeT1tgrcf8uofKdQ6fLxMH77D5jwgQbbMo41df`
+`aea add protocol open_aea/signing:1.0.0:QmWdCAiXpeT1tgrcf8uofKdQ6fLxMH77D5jwgQbbMo41df --remote`
 
 ## Publishing agents
 
diff --git a/docs/multiplexer-standalone.md b/docs/multiplexer-standalone.md
index af8ca8106d..40f8787f82 100644
--- a/docs/multiplexer-standalone.md
+++ b/docs/multiplexer-standalone.md
@@ -1,6 +1,6 @@
 The `Multiplexer` can be used stand-alone. This way a developer can utilise the protocols and connections independent of the `Agent` or `AEA` classes.
 
-First, import the Python and application specific libraries and set the static variables. (Get the packages directory from the AEA repository `aea fetch PUBLIC_ID_OR_HASH`.)
+First, import the Python and application specific libraries and set the static variables. (Get the packages directory from the AEA repository `svn export https://github.com/valory-xyz/open-aea.git/trunk/packages`.)
 ``` python
 import os
 import time
diff --git a/docs/p2p-connection.md b/docs/p2p-connection.md
index 1187004ace..8b3a2d3670 100644
--- a/docs/p2p-connection.md
+++ b/docs/p2p-connection.md
@@ -26,7 +26,7 @@ Create one AEA as follows:
 ``` bash
 aea create my_genesis_aea
 cd my_genesis_aea
-aea add connection valory/p2p_libp2p:0.1.0:QmYW7Q5iFN6RwWmHj7wvjUBZfxu3hJN4KvcTWW1AhdKhki
+aea add connection valory/p2p_libp2p:0.1.0:QmYW7Q5iFN6RwWmHj7wvjUBZfxu3hJN4KvcTWW1AhdKhki --remote
 aea config set agent.default_connection valory/p2p_libp2p:0.1.0
 aea install
 aea build
@@ -58,7 +58,7 @@ Create a second AEA:
 ``` bash
 aea create my_other_aea
 cd my_other_aea
-aea add connection valory/p2p_libp2p:0.1.0:QmYW7Q5iFN6RwWmHj7wvjUBZfxu3hJN4KvcTWW1AhdKhki
+aea add connection valory/p2p_libp2p:0.1.0:QmYW7Q5iFN6RwWmHj7wvjUBZfxu3hJN4KvcTWW1AhdKhki --remote
 aea config set agent.default_connection valory/p2p_libp2p:0.1.0
 aea install
 aea build
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 87a00ec5db..d393c998d2 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -255,14 +255,14 @@ cd my_first_aea
 <br>
 Second, add the stub connection to the project.
 ``` bash
-aea add connection fetchai/stub:0.21.0:QmektTWmXcjThQd8md8nSYgLapR3Gks3n3WEzwAWQFgc4z
+aea add connection fetchai/stub:0.21.0:QmektTWmXcjThQd8md8nSYgLapR3Gks3n3WEzwAWQFgc4z --remote
 ```
 <br>
 <b>Add the echo skill</b>
 <br>
 Third, add the echo skill to the project.
 ``` bash
-aea add skill fetchai/echo:0.19.0:QmReV2qgjE4mkY9n5iwJDoEcv174Sxbjhxo84YZpLyvcR2
+aea add skill fetchai/echo:0.19.0:QmReV2qgjE4mkY9n5iwJDoEcv174Sxbjhxo84YZpLyvcR2 --remote
 ```
 This copies the <code>fetchai/echo:0.19.0</code> skill code containing the "behaviours", and "handlers" into the project, ready to run. The identifier of the skill <code>fetchai/echo:0.19.0</code> consists of the name of the author of the skill, followed by the skill name and its version.
 </details>
diff --git a/docs/registry.md b/docs/registry.md
index b12f22c4b3..fd9f1c8c63 100644
--- a/docs/registry.md
+++ b/docs/registry.md
@@ -22,7 +22,7 @@ Successfully added protocol 'open_aea/signing:1.0.0'.
 Once we have an agent, we can add individual components to the agent as so;
 
 ```
-aea add skill fetchai/echo:0.19.0:QmReV2qgjE4mkY9n5iwJDoEcv174Sxbjhxo84YZpLyvcR2
+aea add skill fetchai/echo:0.19.0:QmReV2qgjE4mkY9n5iwJDoEcv174Sxbjhxo84YZpLyvcR2 --remote
 Registry path not provided and local registry `packages` not found in current (.) and parent directory.
 Trying remote registry (`--remote`).
 Adding skill 'fetchai/echo:latest'...
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 f1a6693a7a..8e5d9d6e0c 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
@@ -8,7 +8,7 @@ aea create my_gym_aea
 cd my_gym_aea
 ```
 ``` bash
-aea add skill fetchai/gym:0.20.0:QmdQisuqLhq81NHuas9ALYgP1tw1cZoE3vGueREgG8PgCZ
+aea add skill fetchai/gym:0.20.0:QmdQisuqLhq81NHuas9ALYgP1tw1cZoE3vGueREgG8PgCZ --remote
 ```
 ``` bash
 aea config set agent.default_connection fetchai/gym:0.19.0
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 290cbf07f6..f68af4b575 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,7 +3,7 @@ aea create my_aea
 cd my_aea
 ```
 ``` bash
-aea add connection fetchai/http_server:0.22.0:Qmdr2Ajx5BRBJCC6xP8wUNSCMbhStHHZaVgzkoSW6Pvu7S
+aea add connection fetchai/http_server:0.22.0:Qmdr2Ajx5BRBJCC6xP8wUNSCMbhStHHZaVgzkoSW6Pvu7S --remote
 ```
 ``` bash
 aea config set agent.default_connection fetchai/http_server:0.22.0

From eeb702c239c56f7aa277c6361a95c1895ca4fef2 Mon Sep 17 00:00:00 2001
From: Viraj Patel <vptl185@gmail.com>
Date: Wed, 22 Jun 2022 05:54:22 +0000
Subject: [PATCH 16/16] test: fix failing doc tests

---
 tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md | 3 +--
 tests/test_docs/test_quickstart.py                         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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 810f8f7fcb..ae41b56077 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
@@ -40,7 +40,6 @@ pip install open-aea[all]
 svn checkout https://github.com/valory-xyz/open-aea/tags/v1.10.0/packages packages
 ```
 
-
 ``` bash
 sudo apt-get install python3.7-dev
 ```
@@ -66,7 +65,7 @@ v1.7.0
 AEA configurations successfully initialized: {'author': 'fetchai'}
 ```
 ``` bash
-aea fetch open_aea/my_first_aea:0.1.0 --local
+aea fetch open_aea/my_first_aea:0.1.0:QmbyFaoHWikC8dHcpdTVboxVnkXX2vMgch4UUXmwCfJhRu --remote
 cd my_first_aea
 ```
 ``` bash
diff --git a/tests/test_docs/test_quickstart.py b/tests/test_docs/test_quickstart.py
index 54b8aaa667..2d23bf36fc 100644
--- a/tests/test_docs/test_quickstart.py
+++ b/tests/test_docs/test_quickstart.py
@@ -37,7 +37,7 @@ def test_correct_echo_string():
     """Test the echo string in the quickstart is using the correct protocol specification id."""
     file_path = Path(ROOT_DIR, "docs", "quickstart.md")
     bash_code_blocks = extract_code_blocks(filepath=file_path, filter_="bash")
-    echo_bloc = bash_code_blocks[18]
+    echo_bloc = bash_code_blocks[17]
     default_protocol_spec_id = echo_bloc.split(",")[2]
     assert (
         str(DefaultMessage.protocol_specification_id) == default_protocol_spec_id