Merge branch 'master' into hotfix-startup-params

Author: wip-abramson

README.md

@@ -29,11 +29,13 @@ Verify that **s2i** is in your PATH.  If not, then edit your PATH and add the di
 
 Ensure that Docker is running. If it is not try `sudo dockerd` in another terminal.
 
+## Running a Tutorial or Project
+
 You should now be able to run any of the tutorials or projects within this repo.
 
 E.g for the main tutorial on the aries-basic-controller
 1. Navigate to the root directory of the tutorial
-`cd tutorials/aries-basic-controller`
+`cd tutorials/1. Learning Aries, ACA-Py and the Basic Controller`
 2. Spin up the docker-compose configuration
 `./manage start`
 3. Get the urls and tokens for the juypter notebook instances within the project
@@ -45,15 +47,26 @@ E.g for the main tutorial on the aries-basic-controller
 
 In the tutorials folder you will find a set of series of juypter notebook tutorials walking through how to use the libraries contained within this repository. Each tutorial series can be run from it's folder using `./manage start`
 
-### [SSI Basics with Hyperledger](./tutorials/aries-basic-controller)
+### [Learning Aries, ACA-Py and the Basic Controller](./tutorials/1.%20Learning%20Aries,%20ACA-Py%20and%20the%20Basic%20Controller)
 
 This series introduces Self-Sovereign Identity and provides all the information needed to get started developing with the Hyperledger SSI stack using the aries-basic-controller library we developed to provide code examples within the notebooks.
 
 **This is a great place to start!** 
 
-### [Making SSI "Real"](./tutorials/aries-stagingnet)
+### [Public Ledgers and Mobile Wallets](./tutorials/2.%20Public%20Ledgers%20and%20Mobile%20Wallets)
+
+In this series you will learn how to move your solutions from a local test network onto the publicly accessible internet by connecting to the Sovrin StagingNet. You will interact with the agents through the notebooks using a publically available mobile agent that you can download from the app store.
+
+### [Sending files](./tutorials/3.%20Attachments)
+
+In this series you will learn how to attach files and send them from Alice to Bob.
+
+### [Multi-tenancy and Mediation](./tutorials/4.%20Multitenancy)
+
+In this series you will learn mainly three things. Firstly, we show how to create wallets for Alice and Bob on the same agent. These wallets are called subwallets and are managed by a base wallet. We continue by exploring mediation of communication ([see here for more details](https://github.com/hyperledger/aries-cloudagent-python/blob/main/Mediation.md)). Lastly, the tutorial expands on these concept by introducing an external agent - external as in from an outside network. Here, we use familiar concepts from the second tutorial series. 
+
+**This configuration also gives an example of how to configure an agent to use postgres for it's wallet storage**
 
-In this series you will learn how to move your solutions from a local test network onto the publicly accessible internet by connecting to the Sovrin StagingNet.
 
 ## Libraries
 

configuration/aries-args-advanced.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>
@@ -33,7 +33,7 @@ auto-ping-connection: true
 wallet-type: !ENV ${WALLET_TYPE}
 wallet-name: !ENV ${WALLET_NAME}
 wallet-key: !ENV ${WALLET_KEY}
-seed: !ENV ${WALLET_SEED}
+#seed: !ENV ${WALLET_SEED}
 
 ## run a local postgres (docker) like:
 ##    docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d -p 5432:5432 postgres:10

configuration/aries-args-basic.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

configuration/aries-args-multitenant.yaml

@@ -15,7 +15,7 @@ genesis-url: !ENV ${GENESIS_URL}
 admin: [0.0.0.0, !ENV '${ADMIN_PORT}']
 label: !ENV ${AGENT_NAME}
 # the following is the callback url for your controller
-webhook-url: !ENV ${WEBHOOK_URL}
+#webhook-url: !ENV ${WEBHOOK_URL}
 # assumes you are running a local von-network, like:
 #    cd von-network
 #    ./manage start <my local ip>

libs/aries-basic-controller/README.md

@@ -4,13 +4,13 @@ A simple pip installable package for controlling aries agents through admin API
 
 # Install
 
-Current version 0.2
+Current version 0.3
 
 `python3 -m pip install aries_basic_controller`
 
 
 ## Tutorial
 
-Find out how to use this package by taking our [jupyter notebook tutorial series](../../tutorials/aries-basic-controller).
+Find out how to use this package by taking our [jupyter notebook tutorial series](../../tutorials/).