From 4abe4468a0626c2adfd170459c26c3fe973595a0 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Fri, 21 Aug 2020 14:27:59 -0600
Subject: [PATCH] feat: add `ag-setup-solo` compatibility, `ag-solo setup`

---
 packages/cosmic-swingset/docker/ag-setup-solo |  4 ++--
 packages/cosmic-swingset/lib/ag-solo/main.js  | 14 ++++++++++++++
 packages/deployment/Makefile                  |  8 +-------
 packages/deployment/main.js                   |  2 --
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/cosmic-swingset/docker/ag-setup-solo b/packages/cosmic-swingset/docker/ag-setup-solo
index 0d0165d5279..dacda98cf45 100755
--- a/packages/cosmic-swingset/docker/ag-setup-solo
+++ b/packages/cosmic-swingset/docker/ag-setup-solo
@@ -3,7 +3,7 @@ SOLO_NAME=${SOLO_NAME-agoric}
 SOLO_HOME=${SOLO_HOME-$SOLO_NAME}
 PORT=${PORT-8000}
 HOST_PORT=${HOST_PORT-$PORT}
-IMAGE=agoric/cosmic-swingset-setup-solo
+IMAGE=agoric/cosmic-swingset-solo
 case "$1" in
 --pull)
   shift
@@ -24,4 +24,4 @@ exec docker run \
   --volume=ag-solo-state:/usr/src/app/solo \
   -eAG_SOLO_BASEDIR="$SOLO_HOME" \
   --rm -it $FLAGS \
-  "$IMAGE" ${1+"$@"}
+  "$IMAGE" setup ${1+"$@"}
diff --git a/packages/cosmic-swingset/lib/ag-solo/main.js b/packages/cosmic-swingset/lib/ag-solo/main.js
index bd4c50de2dd..57efb0d1fdf 100644
--- a/packages/cosmic-swingset/lib/ag-solo/main.js
+++ b/packages/cosmic-swingset/lib/ag-solo/main.js
@@ -57,6 +57,20 @@ start
   }
 
   switch (argv[0]) {
+    case 'setup': {
+      const { netconfig } = parseArgs(argv.slice(1));
+      if (!AG_SOLO_BASEDIR) {
+        console.error(`setup: you must set $AG_SOLO_BASEDIR`);
+        return;
+      }
+      if (!fs.existsSync(AG_SOLO_BASEDIR)) {
+        await solo(progname, ['init', AG_SOLO_BASEDIR, ...rawArgv.slice(1)]);
+      }
+      process.chdir(AG_SOLO_BASEDIR);
+      await solo(progname, ['add-chain', netconfig]);
+      await solo(progname, ['start']);
+      break;
+    }
     case 'init': {
       const { _: subArgs, ...subOpts } = parseArgs(argv.slice(1), {
         default: {
diff --git a/packages/deployment/Makefile b/packages/deployment/Makefile
index 824e4c5db4e..31163f00d0a 100644
--- a/packages/deployment/Makefile
+++ b/packages/deployment/Makefile
@@ -11,7 +11,7 @@ docker-show-fat:
 	docker build --file=Dockerfile.show-fat ../..
 
 docker-build: docker-build-base docker-build-sdk docker-build-solo \
-	docker-build-pserver docker-build-setup docker-build-setup-solo
+	docker-build-setup
 
 docker-build-sdk:
 	docker build -t $(REPOSITORY_SDK):latest --file=Dockerfile.sdk ../..
@@ -25,15 +25,9 @@ docker-build-base:
 	  echo "$$hash$$dirty" > $(SS)lib/git-revision.txt
 	docker build -t $(REPOSITORY):latest $(SS)
 
-docker-build-pserver:
-	docker build -t $(REPOSITORY)-pserver:latest $(SS)provisioning-server
-
 docker-build-solo:
 	docker build -t $(REPOSITORY)-solo:latest $(SS)lib/ag-solo
 
-docker-build-setup-solo:
-	docker build -t $(REPOSITORY)-setup-solo:latest $(SS)setup-solo
-
 docker-push: docker-push-base docker-push-solo docker-push-setup \
 	docker-push-pserver docker-push-setup-solo docker-push-ibc-alpha
 
diff --git a/packages/deployment/main.js b/packages/deployment/main.js
index ffc5fbef384..ac65860f597 100644
--- a/packages/deployment/main.js
+++ b/packages/deployment/main.js
@@ -560,8 +560,6 @@ show-config      display the client connection parameters
 ${chalk.yellow.bold(
   `ag-setup-solo --netconfig='${pserverHost}/network-config'`,
 )}
-and get your codes from:
-${chalk.yellow.bold(`curl ${pserverUrl}/request-code?nickname=MY-NICK`)}
 `,
       );
       if (await exists('/vagrant')) {