Merge branch 'marlowe-deploy-cherrypicks'

Author: shlevy

.github/workflows/deploy.yml

@@ -12,5 +12,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Inject slug/short variables
+        uses: rlespinasse/[email protected]
+
       - name: Deploy to bitte
-        run: ./scripts/deploy-bitte master
+        run: ./scripts/deploy-bitte

bitte/default.nix

@@ -11,23 +11,19 @@ in
   plutus-playground-server-entrypoint = pkgs.callPackage ./plutus-playground-server.nix {
     variant = "plutus";
     pkg = plutus-playground.server;
-    port = 4003;
   };
   plutus-playground-client-entrypoint = playgroundStatic {
     client = plutus-playground.client;
     variant = "plutus";
-    port = 8081;
   };
 
   marlowe-playground-server-entrypoint = pkgs.callPackage ./plutus-playground-server.nix {
     variant = "marlowe";
     pkg = marlowe-playground.server;
-    port = 4004;
   };
   marlowe-playground-client-entrypoint = playgroundStatic {
     client = marlowe-playground.client;
     variant = "marlowe";
-    port = 8087;
   };
 
   marlowe-run-entrypoint = pkgs.callPackage ./pab.nix {
@@ -37,6 +33,5 @@ in
 
   marlowe-website-entrypoint = staticSite {
     root = marlowe-web;
-    port = 8088;
   };
 }

bitte/pab.nix

@@ -1,41 +1,37 @@
-{ writeShellScriptBin, writeText, pabExe, staticPkg, cacert, coreutils, lib }:
+{ writeShellScriptBin, writeText, pabExe, staticPkg, cacert, coreutils, lib, gnused }:
 let
   dbFile = "/var/lib/pab/pab-core.db";
 
-  webserverPort = 9080;
-  walletPort = 8086;
-  nodePort = 8082;
-  chainIndexPort = 8083;
-  signingProcessPort = 8084;
-  metadataPort = 8085;
+  # /var/lib isn't right but whatever
+  pabYaml = "/var/lib/pab/pab.yaml";
 
-  slotZeroTime = 1591566291000; # POSIX time of 2020-06-07T21:44:51Z (Sunday, June 7, 2020 21:44:51)
+  slotZeroTime = 1596059091000; # POSIX time of slot zeron is milliseconds. See note [Datetime to slot] in Marlowe.Slot
   slotLengthMillis = 1000;
 
   constantFee = 10; # Constant fee per transaction in lovelace
-  scriptsFeeFactor = 1.0; # Factor by which to multiply the size-dependent scripts fee in lovelace
+  scriptsFeeFactor = 0.0; # Factor by which to multiply the size-dependent scripts fee in lovelace
 
-  pabYaml = writeText "pab.yaml" (builtins.toJSON {
+  pabYamlIn = writeText "pab.yaml.in" (builtins.toJSON {
     dbConfig = {
       dbConfigFile = dbFile;
       dbConfigPoolSize = 20;
     };
 
     pabWebserverConfig = {
-      baseUrl = "http://localhost:${builtins.toString webserverPort}";
+      baseUrl = "http://localhost:@WEBSERVER_PORT@";
       staticDir = "${staticPkg}";
       permissiveCorsPolicy = false;
     };
 
     walletServerConfig = {
-      baseUrl = "http://localhost:${builtins.toString walletPort}";
+      baseUrl = "http://localhost:@WALLET_PORT@";
       wallet = {
         getWallet = 1;
       };
     };
 
     nodeServerConfig = {
-      mscBaseUrl = "http://localhost:${builtins.toString nodePort}";
+      mscBaseUrl = "http://localhost:@NODE_PORT@";
       mscSocketPath = "/tmp/node-server.sock";
       mscRandomTxInterval = 20000000;
       mscSlotConfig = {
@@ -59,7 +55,7 @@ let
     };
 
     chainIndexConfig = {
-      ciBaseUrl = "http://localhost:${builtins.toString chainIndexPort}";
+      ciBaseUrl = "http://localhost:@CHAIN_INDEX_PORT@";
       ciWatchedAddresses = [ ];
     };
 
@@ -68,15 +64,11 @@ let
     };
 
     signingProcessConfig = {
-      spBaseUrl = "http://localhost:${builtins.toString signingProcessPort}";
+      spBaseUrl = "http://localhost:@SIGNING_PROCESS_PORT@";
       spWallet = {
         getWallet = "1";
       };
     };
-
-    metadataServerConfig = {
-      mdBaseUrl = "http://localhost:${builtins.toString metadataPort}";
-    };
   });
 
   # Note: The db is dropped as a workaround for a problem with
@@ -100,6 +92,14 @@ writeShellScriptBin "entrypoint" ''
 
   export SYSTEM_CERTIFICATE_PATH=${cacert}/etc/ssl/certs/ca-bundle.crt
 
+  ${gnused}/bin/sed -e "s|@WEBSERVER_PORT@|$((PORT_RANGE_BASE))|g" \
+      -e "s|@NODE_PORT@|$((PORT_RANGE_BASE + 1))|g" \
+      -e "s|@CHAIN_INDEX_PORT@|$((PORT_RANGE_BASE + 2))|g" \
+      -e "s|@SIGNING_PROCESS_PORT@|$((PORT_RANGE_BASE + 3))|g" \
+      -e "s|@WALLET_PORT@|$((PORT_RANGE_BASE + 4))|g" \
+      ${pabYamlIn} > ${pabYaml}
+
+
   ${pab-init-cmd}/bin/pab-init-cmd
 
   exec ${pabExe} --config=${pabYaml} all-servers

bitte/playground-static.nix

@@ -2,10 +2,9 @@
 let
   shiftedDocs = linkFarm docs.name [{ name = "doc"; path = docs; }];
 in
-{ variant, client, port }: staticSite {
+{ variant, client }: staticSite {
   root = (symlinkJoin {
     name = "${variant}-playground-client-and-docs";
     paths = [ client shiftedDocs ];
   });
-  inherit port;
 }

bitte/plutus-playground-server.nix

@@ -1,11 +1,11 @@
-{ writeShellScriptBin, pkg, variant, symlinkJoin, lib, cacert, port }:
+{ writeShellScriptBin, pkg, variant, symlinkJoin, lib, cacert }:
 
 let
   deps = [ pkg ];
   entrypoint = writeShellScriptBin "entrypoint" ''
     export PATH=${lib.makeBinPath deps}
     export SYSTEM_CERTIFICATE_PATH=${cacert}/etc/ssl/certs/ca-bundle.crt
-    ${variant}-playground-server webserver -p ${toString port}
+    ${variant}-playground-server webserver -p $PORT
   '';
 in
 symlinkJoin {

bitte/static-site.nix

@@ -1,10 +1,10 @@
-{ writeShellScriptBin, symlinkJoin, lib, writeText, lighttpd }: { root, port }:
+{ writeShellScriptBin, symlinkJoin, lib, writeText, lighttpd }: { root }:
 
 let
   config = writeText "lighttpd.conf" ''
     server.modules = ("mod_deflate")
     server.document-root = "${root}"
-    server.port = ${toString port}
+    server.port = env.PORT
     index-file.names = ("index.html")
     mimetype.assign = (
       ".css" => "text/css",

bitte/web-ghc-server.nix

@@ -2,7 +2,7 @@
 
 let
   entrypoint = writeShellScriptBin "entrypoint" ''
-    ${web-ghc-server}/bin/web-ghc-server webserver -p 8009 --bind 0.0.0.0
+    ${web-ghc-server}/bin/web-ghc-server webserver -p $PORT --bind 0.0.0.0
   '';
 in
 symlinkJoin {

scripts/deploy-bitte

@@ -7,20 +7,36 @@ error () {
 }
 
 readonly ops_repo="input-output-hk/plutus-ops"
+readonly ops_branch="master"
 readonly plutus_rev="${GITHUB_SHA:-}"
+
 if [ -z "${plutus_rev}" ]
 then
     error "GITHUB_SHA environment variable not set!"
 fi
 
-### Argument parsing
+readonly plutus_ref="${GITHUB_REF_SLUG:-}"
 
-if [ "$#" -ne 1 ]
+if [ -z "${plutus_ref}" ]
 then
-    error "USAGE: $0 OPS_BRANCH"
+    error "GITHUB_REF_SLUG environment variable not set!"
 fi
 
-readonly ops_branch="$1"
+declare -A ref_env_mapping=(
+    # TODO Make this the production branch
+    [bitte]=production
+)
+
+if [ ! -v 'ref_env_mapping[${plutus_ref}]' ]
+then
+    error "Ref ${plutus_ref} does not correspond to any known env"
+fi
+plutus_env="${ref_env_mapping[${plutus_ref}]}"
+
+if [ "$#" -ne 0 ]
+then
+    error "USAGE: $0"
+fi
 
 ### Set up scratch space
 
@@ -38,31 +54,31 @@ tmp="$(mktemp -d)"
 
 declare -r tmp
 
-### Write the new plutus-rev.cue
+### Write the new revision cue file
 
-cat > "${tmp}/plutus-rev.cue" <<EOF
-package bitte
+cat > "${tmp}/${plutus_env}.cue" <<EOF
+package revisions
 
-plutusRev: "${plutus_rev}"
+${plutus_env}: "${plutus_rev}"
 EOF
 
 
 
-### Get the old plutus-rev.cue, exit if it's unchanged
-hub api -XGET -F ref="${ops_branch}" "/repos/${ops_repo}/contents/plutus-rev.cue" > "${tmp}/plutus-rev.cue-contents.json"
-prev_hash="$(jq --join-output '.sha' < "${tmp}/plutus-rev.cue-contents.json")"
-jq --join-output '.content' < "${tmp}/plutus-rev.cue-contents.json" | base64 -d > "${tmp}/plutus-rev-old.cue"
-if diff -q "${tmp}/plutus-rev.cue" "${tmp}/plutus-rev-old.cue" >/dev/null
+### Get the old revision cue file, exit if it's unchanged
+hub api -XGET -F ref="${ops_branch}" "/repos/${ops_repo}/contents/revisions/${plutus_env}.cue" > "${tmp}/${plutus_env}.cue-contents.json"
+prev_hash="$(jq --join-output '.sha' < "${tmp}/${plutus_env}.cue-contents.json")"
+jq --join-output '.content' < "${tmp}/${plutus_env}.cue-contents.json" | base64 -d > "${tmp}/${plutus_env}-old.cue"
+if diff -q "${tmp}/${plutus_env}.cue" "${tmp}/${plutus_env}-old.cue" >/dev/null
 then
     exit 0
 fi
 
-### Commit the new plutus-rev.cue
-base64 "${tmp}/plutus-rev.cue" > "${tmp}/plutus-rev.cue-encoded"
-echo "Automatic update: Bump plutus to ${plutus_rev}" > "${tmp}/commit-message"
+### Commit the new revision cue file
+base64 "${tmp}/${plutus_env}.cue" > "${tmp}/${plutus_env}.cue-encoded"
+echo "${plutus_env}: Bump plutus to ${plutus_rev}" > "${tmp}/commit-message"
 hub api -XPUT \
     -F message=@"${tmp}/commit-message" \
-    -F content=@"${tmp}/plutus-rev.cue-encoded" \
+    -F content=@"${tmp}/${plutus_env}.cue-encoded" \
     -F sha="${prev_hash}" \
     -F branch="${ops_branch}" \
-    "/repos/${ops_repo}/contents/plutus-rev.cue"
+    "/repos/${ops_repo}/contents/revisions/${plutus_env}.cue"