next rc

Author: alexmatson-da

dabl-meta.yaml

@@ -1,17 +1,17 @@
 catalog:
   name: da-marketplace
-  version: 0.3.0-rc.2
+  version: 0.3.0-rc.3
   short_description: DA Marketplace
   description: A marketplace for issuing and trading digital tokens.
   release_date: 2020-10-14
   author: Digital Asset (Switzerland) GmbH
   url: https://github.com/digital-asset/da-marketplace
   source_url: https://github.com/digital-asset/da-marketplace
   license: 0BSD
-  tags: [dabl-sample-app, application, experimental]
+  tags: '[dabl-sample-app, application, experimental]'
   icon_file: da-marketplace.svg
 subdeployments:
   - da-marketplace-0.3.0.dar
   - da-marketplace-triggers-0.3.0.dar
   - da-marketplace-exberry-adapter-0.3.0.tar.gz
-  - da-marketplace-ui-0.3.0-rc.2.zip
+  - da-marketplace-ui-0.3.0-rc.3.zip

docs/damlhub_deployment.md

@@ -40,7 +40,7 @@ Under the deployments tab, click on "Upload File":
 
 ![3_upload_file](https://user-images.githubusercontent.com/71082197/98857330-ec817480-242c-11eb-8b07-4b0f88d3a39f.png)
 
-Upload the packaged `da-marketplace-0.3.0-rc.2.dit` file.
+Upload the packaged `da-marketplace-0.3.0-rc.2` file.
 
 Click "Launch" for both the UI and the Model:
 
@@ -69,7 +69,7 @@ In your marketplace repo:
 $ ./scripts/create_ledger_parties.py path/to/participants.json ledger_parties.json
 
 # runs a Daml Script that adds all relevant information to the project ledger
-$ daml script --participant-config participants.json --json-api --dar .daml/dist/da-marketplace-0.3.0-rc.2.dar --script-name Setup:doSetup --input-file ledger-parties.json
+$ daml script --participant-config participants.json --json-api --dar .daml/dist/da-marketplace-0.3.0 --script-name Setup:doSetup --input-file ledger-parties.json
 ```
 
 If you would like to boostrap the marketplace with your own data, you can either change the `doSetup` function in `daml/Setup.daml`, or create your own setup function and change the `--script-name` to `MyModule:myFunction`.
@@ -129,6 +129,6 @@ Next, in deployments, click on the Integration and configure it with your Exberr
 
 ![13_click_exberry](https://user-images.githubusercontent.com/71082197/98867872-50139e00-243d-11eb-8448-479e46fd85df.png)
 
-Finally, deploy an instance of `da-marketplace-exberry-adapter-0.3.0-rc.2.tar.gz` and launch the automation as `Exchange`.
+Finally, deploy an instance of `da-marketplace-exberry-adapter-0.3.0.tar.gz` and launch the automation as `Exchange`.
 
 If you would like to change which `SID` the Exberry adapter begins counting at for the `orderId` calls to Exberry, create a `Marketplace.Utils.ExberrySID` contract as the `Exchange` party _after_ launching the adapter.

docs/local_development.md

@@ -32,7 +32,7 @@ Alternatively, to only build the DAR file and regenerate the TypeScript bindings
 
 ```sh
 $ daml build
-$ daml codegen js .daml/dist/da-marketplace-0.3.0-rc.2.dar -o daml.js
+$ daml codegen js .daml/dist/da-marketplace-0.3.0.dar -o daml.js
 $ cd ui
 $ yarn install --force --frozen-lockfile
 ```

scripts/tag-versions.sh

@@ -28,6 +28,13 @@ docs_damlhub=$9
 
 echo "Retagging versions in all files..."
 
+echo "  Tagging dabl-meta.yaml"
+if echo "$app_version" | grep -q '-'; then
+    yq w -i $dabl_meta 'catalog.tags' '[dabl-sample-app, application, experimental]'
+else
+    yq w -i $dabl_meta 'catalog.tags' '[dabl-sample-app, application]'
+fi
+
 echo "  Tagging daml.yaml"
 yq w -i $daml_yaml 'version' "$daml_version"
 
@@ -49,9 +56,10 @@ sed -ri "s/\"version\": \"$vregex/\"version\": \"$app_version/" $package_json
 sed -ri "s/da-marketplace\-$vregex\"/da-marketplace\-$daml_version\"/" $package_json
 
 echo "  Tagging docs"
-sed -ri "s/da-marketplace\-$vregex/da-marketplace\-$app_version/" $docs_localdev
+sed -ri "s/da-marketplace\-$vregex/da-marketplace\-$daml_version/" $docs_localdev
 
-sed -ri "s/da-marketplace\-$vregex/da-marketplace\-$app_version/g" $docs_damlhub
-sed -ri "s/da-marketplace-exberry-adapter\-$vregex/da-marketplace-exberry-adapter\-$app_version/" $docs_damlhub
+sed -ri "s/da-marketplace\-$vregex.dit/da-marketplace\-$app_version/" $docs_damlhub
+sed -ri "s/da-marketplace\-$vregex.dar/da-marketplace\-$daml_version/" $docs_damlhub
+sed -ri "s/da-marketplace-exberry-adapter\-$vregex/da-marketplace-exberry-adapter\-$daml_version/" $docs_damlhub
 
 echo "Tagged all files... check results before committing"

scripts/verify-versions.sh

@@ -5,10 +5,19 @@ set -eu
 # match exactly with the canonical version supplied in `dabl-meta.yaml`
 
 app_version=$(yq r dabl-meta.yaml 'catalog.version')
+
+# daml.yaml files can't handle full semver versions, keep just the
+# MAJOR.MINOR.PATCH fields for them
+capture_regex="([0-9]*)\.([0-9]*)\.([0-9]*)(-[a-zA-Z]*\.[0-9]*)?"
+short_version=$(echo $app_version | sed -r "s/^$capture_regex/\1.\2.\3/")
+
+echo "Application version is $app_version, short version is $short_version."
+
 return_code=0
 
 green='\033[0;92m'
 red='\033[0;91m'
+orange='\033[0;33m'
 nc='\033[0m' # No Color
 
 decorate_error () {
@@ -19,47 +28,69 @@ decorate_error () {
 
 printf "Verifying versions match up with app version: ${green}${app_version}${nc}...\n"
 
-daml_version=`cat daml.yaml | grep "$app_version" | wc -l`
+if echo "$app_version" | grep -q '-'; then
+    if cat dabl-meta.yaml | grep -q 'experimental'; then
+        :
+    else
+        decorate_error "  Missing the ['experimental'] tag in " dabl-meta.yaml
+        return_code=1
+    fi
+else
+    if cat dabl-meta.yaml | grep -q 'experimental'; then
+        decorate_error "  Found an ['experimental'] tag that must be removed in " dabl-meta.yaml
+        return_code=1
+    fi
+fi
+
+# Escape . characters in the version string
+short_version=${short_version//./\\.}
+
+daml_version=`cat daml.yaml | grep "$short_version" | wc -l`
 if [[ daml_version -ne 1 ]] ; then
-    decorate_error "Mismatched version in %s" daml.yaml
+    decorate_error "  Mismatched version in %s" daml.yaml
     return_code=1
 fi
 
-daml_trigger_version=`cat triggers/daml.yaml | grep $app_version | wc -l`
+daml_trigger_version=`cat triggers/daml.yaml | grep $short_version | wc -l`
 if [[ daml_trigger_version -ne 2 ]] ; then
-    decorate_error "Mismatched version(s) in %s" triggers/daml.yaml
+    decorate_error "  Mismatched version(s) in %s" triggers/daml.yaml
     return_code=1
 fi
 
-daml_it_version=`cat integrationTesting/daml.yaml | grep $app_version | wc -l`
+daml_it_version=`cat integrationTesting/daml.yaml | grep $short_version | wc -l`
 if [[ daml_it_version -ne 2 ]] ; then
-    decorate_error "Mismatched version(s) in %s" integrationTest/daml.yaml
+    decorate_error "  Mismatched version(s) in %s" integrationTest/daml.yaml
     return_code=1
 fi
 
-exberry_adapter_version=`cat exberry_adapter/setup.py | grep "version='$app_version" | wc -l`
+exberry_adapter_version=`cat exberry_adapter/setup.py | grep "version='$short_version" | wc -l`
 if [[ exberry_adapter_version -ne 1 ]] ; then
-    decorate_error "Mismatched version in %s" exberry_adapter/setup.py
+    decorate_error "  Mismatched version in %s" exberry_adapter/setup.py
     return_code=1
 fi
 
-ui_version=`cat ui/package.json | grep $app_version | wc -l`
+ui_version=`cat ui/package.json | grep $short_version | wc -l`
 if [[ ui_version -ne 2 ]] ; then
-    decorate_error "Mismatched version(s) in %s" package.json
+    decorate_error "  Mismatched version(s) in %s" package.json
+    return_code=1
+fi
+
+local_docs_version=`cat docs/local_development.md | grep $short_version | wc -l`
+if [[ local_docs_version -ne 1 ]] ; then
+    decorate_error "  Mismatched version in %s" docs/local_development.md
     return_code=1
 fi
 
-docs_version=`cat docs/local_development.md | grep $app_version | wc -l`
-if [[ docs_version -ne 1 ]] ; then
-    decorate_error "Mismatched version in %s" docs/local_development.md
+damlhub_docs_version=`cat docs/damlhub_deployment.md | grep $short_version | wc -l`
+if [[ damlhub_docs_version -ne 3 ]] ; then
+    decorate_error "  Mismatched version(s) in %s" docs/damlhub_deployment.md
     return_code=1
 fi
 
 if [[ $return_code -eq 0 ]] ; then
     echo "Success: All versions match!"
 else
-    echo "Error: Found mismatching versions :("
-    echo "Run \`make tag\` to attempt a fix automatically. Commit and push the resulting changes."
+    printf "\n${orange}Version verification failed :(${nc}\nRun \`${green}make tag${nc}\` to attempt a fix automatically. Commit and push the resulting changes.\n"
 fi
 
 exit $return_code

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "da-marketplace-ui",
-  "version": "0.3.0-rc.2",
+  "version": "0.3.0-rc.3",
   "private": true,
   "dependencies": {
     "@daml.js/da-marketplace": "file:../daml.js/da-marketplace-0.3.0",