B 03313 - Update holo-envoy with rsm

.gitignore

@@ -12,3 +12,4 @@ AGENTID
 conductor.log
 sim2h.log
 holochain-conductor/storage
+holochain-conductor.log

API.md

@@ -2,24 +2,19 @@
 # RPC WebSocket API
 
 ### `holo/agent/signup`
-Request Envoy to set up new hApp instances for this Agent.  We should have a way to verify that this
+Request Envoy to set up new installed app for this Agent.  We should have a way to verify that this
 Agent is actually unregisterd for the given hApp.
 
 Arguments
 - `<hha_hash>`
 - `<agent_id>`
 
 
-### `holo/agent/identify`
-Endpoint for asking a Host if they are hosting the given Agent ID.
+### `holo/app_info`
+Endpoint for fetching app data, including a list of cell_data and nicknames for each dna in the app.
 
 Arguments
-- `<agent_id>`
-
-Failure modes
-- Host does not have expected instances
-- Host does not have the correct chains
-- Host does not have up-to-date chains
+- `<installed_app_id>`
 
 
 ### `holo/call`
@@ -37,7 +32,7 @@ Arguments
           "call_spec": {
               "hha_hash"     : string,
               "dna_alias"    : string,
-              "instance_id"  : string,
+              "cell_id"      : string,
               "zome"         : string,
               "function"     : string,
               "args"         : array

CONTRIBUTING.md

@@ -73,16 +73,16 @@ make test-e2e
 
 ### Outgoing Connections
 
-- **Admin (Admin Server)**	- used for creating new hosted Agents and their instances
+- **Admin (Admin Server)**	- used for creating new hosted Agents and their installed-apps
 - **Internal (Conductor)**	- used for service logger traffic
 - **Public (Conductor)**	- used for hosted agent traffic
 
 
 ## Concepts
 
 ### Anonymous Agent
-These are ephemeral Agent identities that can connect to any Host running an anonymous instance of a
-hApp's DNA(s).  When an anonymous connection is made, Envoy does not need to do anything special for
+These are ephemeral Agent identities that can connect to any Host running an anonymous installed-app (which runs the cells
+attached to the anonymous id for this happ).  When an anonymous connection is made, Envoy does not need to do anything special for
 that Agent.
 
 ### Signed-in Agent
@@ -94,11 +94,11 @@ The Agent is connecting to this Host for the first time and has never used this
 
 *Process*
 - register this Agent as a Hosted Agent in Conductor
-- start instances for each of the hApp's DNAs
+- start cells for each of the hApp's DNAs
 - and continue to sign-in process...
 
 #### Sign-in
-The Agent has used this hApp before and expects this Host to have their instances running
+The Agent has used this hApp before and expects this Host to have their installed-happs running
 
 *Process*
 - Register Agent's wormhole endpoint in RPC events

Makefile

@@ -15,39 +15,59 @@ docs/index.html:	build/index.js
 .PRECIOUS:	keystore-%.key
 .PHONY:		src build docs docs-watch build-watch
 
+dnas:
+	mkdir -p ./dnas
+dnas/holo-hosting-app.dna.gz:	dnas
+	curl 'https://holo-host.github.io/holo-hosting-app-rsm/releases/downloads/v0.0.1-alpha3/holo-hosting-app.dna.gz' -o $@
+dnas/servicelogger.dna.gz:	dnas
+	curl 'https://holo-host.github.io/servicelogger-rsm/releases/downloads/v0.0.1-alpha3/servicelogger.dna.gz' -o $@
+dnas/elemental-chat.dna.gz:	dnas
+	curl -LJ 'https://github.com/holochain/elemental-chat/releases/download/v0.0.1-alpha9/elemental-chat.dna.gz' -o $@
+
 build:			node_modules build/index.js
 docs:			node_modules docs/index.html
+DNAs:			dnas/elemental-chat.dna.gz dnas/holo-hosting-app.dna.gz dnas/servicelogger.dna.gz
 
 MOCHA_OPTS		= 
 
-test:			build DNAs conductor-1.toml start-sim2h
+test:			build
 	make test-unit;
-	make reset-hcc; make test-integration
-	make reset-hcc; make test-e2e
-test-nix:		build DNAs conductor-1.toml start-sim2h
+	make test-integration;
+	make test-e2e
+test-nix:		build
 	make test-unit;
-	CONDUCTOR_LOGS=error,warn LOG_LEVEL=silly make reset-hcc; make test-integration
-test-debug:		build DNAs conductor-1.toml start-sim2h
+	CONDUCTOR_LOGS=error,warn LOG_LEVEL=silly make test-integration
+test-debug:		build
 	CONDUCTOR_LOGS=error,warn LOG_LEVEL=silly npx mocha $(MOCHA_OPTS) ./tests/unit/
-	make reset-hcc; make test-integration-debug
-	make reset-hcc; make test-e2e-debug2
+	make test-integration-debug
+	make test-e2e-debug2
 
 test-unit:		build
 	npx mocha $(MOCHA_OPTS) ./tests/unit/
 test-unit-debug:	build
 	LOG_LEVEL=silly npx mocha $(MOCHA_OPTS) ./tests/unit/
 
-test-integration:	build DNAs conductor-1.toml start-sim2h
+test-integration:	build DNAs
+	npx holochain-run-dna -c ./app-config.yml -a 4444 &> holochain-conductor.log &
 	npx mocha $(MOCHA_OPTS) ./tests/integration/
-test-integration-debug:	build DNAs conductor-1.toml start-sim2h
+	killall holochain
+test-integration-debug:	build DNAs
+	npx holochain-run-dna -c ./app-config.yml -a 4444 &> holochain-conductor.log &
 	LOG_LEVEL=silly CONDUCTOR_LOGS=error,warn npx mocha $(MOCHA_OPTS) ./tests/integration/
+	killall holochain
 
-test-e2e:		build DNAs conductor-1.toml start-sim2h dist/holo_hosting_chaperone.js
+test-e2e:		build DNAs dist/holo_hosting_chaperone.js
+	npx holochain-run-dna -c ./app-config.yml -a 4444 &> holochain-conductor.log &
 	npx mocha $(MOCHA_OPTS) ./tests/e2e
-test-e2e-debug:		build DNAs conductor-1.toml start-sim2h dist/holo_hosting_chaperone.js
+	killall holochain
+test-e2e-debug:		build DNAs dist/holo_hosting_chaperone.js
+	npx holochain-run-dna -c ./app-config.yml -a 4444 &> holochain-conductor.log &
 	LOG_LEVEL=silly npx mocha $(MOCHA_OPTS) ./tests/e2e/
-test-e2e-debug2:	build DNAs conductor-1.toml start-sim2h dist/holo_hosting_chaperone.js
+	killall holochain
+test-e2e-debug2:	build DNAs dist/holo_hosting_chaperone.js
+	npx holochain-run-dna -c ./app-config.yml -a 4444 &> holochain-conductor.log &
 	LOG_LEVEL=silly CONDUCTOR_LOGS=error,warn npx mocha $(MOCHA_OPTS) ./tests/e2e/
+	killall holochain
 
 docs-watch:
 build-watch:
@@ -75,56 +95,16 @@ publish-docs:
 	git checkout $(CURRENT_BRANCH)
 
 
-# Generate Conductor TOML config
-HCC_DIR		= ./holochain-conductor
-HCC_STORAGE	= $(shell pwd)/holochain-conductor/storage
+# Manage Holochain Conductor config
+HC_LOCAL_STORAGE	= $(shell pwd)/holochain-conductor/storage
 
 .PHONY:		start-hcc-%
 conductor.log:
 	touch $@
 
-reset-hcc:
-	rm $(HCC_STORAGE)/* -rf
-	rm -f dnas/*
-	rm -f conductor-*.toml
-start-hcc-%:		DNAs conductor-%.toml conductor.log
-	holochain -c conductor-$*.toml > conductor.log 2>&1 & tail -f conductor.log
-
 dist/holo_hosting_chaperone.js:
 	ln -s node_modules/@holo-host/chaperone/dist dist
 
-DNAs:			dnas/happ-store.dna.json dnas/holo-hosting-app.dna.json dnas/holofuel.dna.json dnas/servicelogger.dna.json
-rm-DNAs:
-	rm dnas/*.json
-update-DNAs:		rm-DNAs DNAs
-
-dnas/%.dna.json:
-	@mkdir -p ./dnas
-	@for p in $$buildInputs; do \
-	    if [[ "$${p#*-}" == "$*" ]]; then \
-		echo "Linking $${p} to $@"; \
-		ln -fs $${p}/$*.dna.json $@; \
-	    fi \
-	done
-
-check-sim2h:
-	ps -efH | grep sim2h_server | grep 9000 | grep -v grep
-restart-sim2h:		stop-sim2h start-sim2h
-start-sim2h:
-	@if [[ $$(ps -efH | grep sim2h_server | grep 9000 | grep -v grep) ]]; then	\
-		echo "sim2h is already running on port 9000";				\
-	else										\
-		echo "Starting sim2h_server on port 9000";				\
-		sim2h_server -p 9000 > sim2h.log 2>&1 &					\
-	fi
-stop-sim2h:
-	@if [[ $$(ps -efH | grep sim2h_server | grep 9000 | grep -v grep) ]]; then	\
-		echo "Stopping sim2h_server...";					\
-		killall sim2h_server || true;						\
-	else										\
-		echo "sim2h is not running on port 9000";				\
-	fi
-
 check-conductor:	check-holochain
 check-holochain:
 	ps -efH | grep holochain | grep -E "conductor-[0-9]+.toml"
@@ -137,24 +117,6 @@ stop-holochain:
 		echo "holochain conductor is not running";				\
 	fi
 
-conductor-%.toml:	keystore-%.key $(HCC_DIR)/conductor.master.toml Makefile
-	@echo "Creating Holochain conductor config for Agent $*...";			\
-	AGENT=$*;									\
-	PUBKEY=$$(cat AGENTID);								\
-	KEYFILE=$<;									\
-	S2HURI=ws://localhost:9000;							\
-	WORMHOLE=http://localhost:9676;							\
-	HCC_STORAGE=$(HCC_STORAGE);							\
-	sed -e "s|AGENT|$$AGENT|g"							\
-	    -e "s/PUBKEY/$$PUBKEY/g"							\
-	    -e "s/KEYFILE/$$KEYFILE/g"							\
-	    -e "s|S2HURI|$$S2HURI|g"							\
-	    -e "s|WORMHOLE|$$WORMHOLE|g"						\
-	    -e "s|HCC_STORAGE|$$HCC_STORAGE|g"						\
-	    < $(HCC_DIR)/conductor.master.toml						\
-	    > $@;									\
-	echo " ... Wrote new $@ (from $(HCC_DIR)/conductor.master.toml and $<)"
-
 keystore-%.key:
 	@echo "Creating Holochain key for Agent $*: keystore-$*.key";
 	echo $$( hc keygen --nullpass --quiet --path ./keystore-$*.key)			\
@@ -164,7 +126,6 @@ keystore-%.key:
 	@echo "Agent ID: $$(cat AGENTID)";
 
 # TMP targets
-
 use-local-chaperone:
 	npm uninstall --save @holo-host/chaperone; npm install --save-dev ../chaperone
 use-npm-chaperone:

app-config.yml

@@ -0,0 +1,19 @@
+
+# Servicelogger App
+- dnas:
+  - ./dnas/servicelogger.dna.gz
+  app_name: hosted-app-hha-hash::servicelogger
+  app_port: 42222 # service port
+
+# HoloHosting App
+- dnas:
+  - ./dnas/holo-hosting-app.dna.gz
+# NB: Make sure the hha app_name matches the harded HHA_INSTALLED_APP_ID value in index.ts
+  app_name: holo-hosting-app
+  app_port: 42233 # internal port
+
+# Hosted App
+- dnas:
+  - ./dnas/elemental-chat.dna.gz
+  app_name: hosted-app
+  app_port: 42244 # hosted port

default.nix

@@ -8,14 +8,9 @@ with pkgs;
     src = gitignoreSource ./.;
 
     buildInputs = [
-      holochain-rust
+      holochain
+      lair-keystore
       python
-
-      # dnaPackages.happ-store
-      # dnaPackages.holo-hosting-app
-      dnaPackages.hosted-holofuel
-      # dnaPackages.holofuel
-      dnaPackages.servicelogger
     ];
 
     nativeBuildInputs = [