more demo records for the console (#597)

* increase gas

* create six demo records

* print record

* use moon

* typos

* use git.vdb.t

* use the right moon

* ok

.gitea/workflows/fixturenet-payments-test.yml

@@ -1,48 +0,0 @@
-name: Fixturenet-Payments-Test
-
-on:
-  push:
-    branches: '*'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/fixturenet-payments-test'
-
-# Needed until we can incorporate docker startup into the executor container
-env:
-  DOCKER_HOST: unix:///var/run/dind.sock
-
-
-jobs:
-  test:
-    name: "Run a payments fixturenet test"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: Start dockerd # Also needed until we can incorporate into the executor
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
-      - name: "Run fixturenet-payments tests"
-        run: ./tests/fixturenet-payments/run-test.sh
-

.gitea/workflows/triggers/fixturenet-payments-test

@@ -1,2 +0,0 @@
-Change this file to trigger running the fixturenet-payments-test CI job
-

.github/workflows/fixturenet-payments.yml

@@ -1,30 +0,0 @@
-name: Fixturenet-Payments Test
-
-on:
-  pull_request:
-    branches: '*'
-  push:
-    branches: '*'
-
-jobs:
-  test:
-    name: "Run basic test suite"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      - name: "Install Python"
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install shiv"
-        run: pip install shiv
-      - name: "Generate build version file"
-        run: ./scripts/create_build_tag_file.sh
-      - name: "Build local shiv package"
-        run: ./scripts/build_shiv_package.sh
-      - name: "Run fixturenet-payments tests"
-        run: ./tests/fixturenet-payments/run-test.sh
-        

app/data/config/fixturenet-laconicd/registry-cli-config-template.yml

@@ -5,5 +5,5 @@ services:
     userKey: REPLACE_WITH_MYKEY
     bondId:
     chainId: laconic_9000-1
-    gas: 250000
+    gas: 350000
     fees: 200000aphoton

app/data/container-build/cerc-laconic-registry-cli/Dockerfile

@@ -54,8 +54,10 @@ RUN yarn global add @cerc-io/laconic-registry-cli
 
 # Add scripts
 RUN mkdir /scripts
+RUN mkdir /scripts/demo-records
 ENV PATH="${PATH}:/scripts"
 COPY ./create-demo-records.sh /scripts
+COPY ./demo-records /scripts/demo-records
 COPY ./import-key.sh /scripts
 COPY ./import-address.sh /scripts
 

app/data/container-build/cerc-laconic-registry-cli/create-demo-records.sh

@@ -4,26 +4,26 @@ set -e
 if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
+
 registry_command="laconic cns"
-record_1_filename=demo-record-1.yml
-cat <<EOF > ${record_1_filename}
-record:
-  type: WebsiteRegistrationRecord
-  url: 'https://cerc.io'
-  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
-  build_artifact_cid: QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
-  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
-  version: 1.0.23
-EOF
+demo_records_dir="scripts/demo-records"
+
 # Check we have funds
 funds_response=$(${registry_command} account get --address $(cat my-address.txt))
 funds_balance=$(echo ${funds_response} | jq -r .[0].balance[0].quantity)
 echo "Balance is: ${funds_balance}"
+
 # Create a bond
 bond_create_result=$(${registry_command} bond create --type aphoton --quantity 1000000000)
 bond_id=$(echo ${bond_create_result} | jq -r .bondId)
 echo "Created bond with id: ${bond_id}"
-# Publish a demo record
-publish_response=$(${registry_command} record publish --filename ${record_1_filename} --bond-id ${bond_id})
-published_record_id=$(echo ${publish_response} | jq -r .id)
-echo "Published ${record_1_filename} with id: ${published_record_id}"
+
+## Publish the demo records
+if [ -d $demo_records_dir ]; then
+  for demo_record in "${demo_records_dir}"/*; do
+    publish_response=$(${registry_command} record publish --filename ${demo_record} --bond-id ${bond_id})
+    published_record_id=$(echo ${publish_response} | jq -r .id)
+    echo "Published ${demo_record} with id: ${published_record_id}"
+    cat ${demo_record}
+  done
+fi

app/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-1.yml

@@ -0,0 +1,7 @@
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://hello-urbit.laconic.com'
+  repo_registration_record_cid: QmTZQ8ZJS6mALjEM2wY71msFno6zzxFftVCiZELj9xREPx
+  build_artifact_cid: '~lostex-rabdur-labtul-moltev/hello-urbit'
+  tls_cert_cid: QmR1acEmQt7Tjmhp9cFtymie2eFcrHURQKt9kGto1TQTW1
+  version: 0.2.4

app/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-2.yml

@@ -0,0 +1,7 @@
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://dev-hello-urbit.laconic.com'
+  repo_registration_record_cid: QmPbKkK7gKojnGAgKAE6bK5qBY8BcYp2YDB1e4b28NxvVv
+  build_artifact_cid: '~lostex-rabdur-labtul-moltev/hello-urbit-dev'
+  tls_cert_cid: QmWbCv4k9Q9P6XptHNJN6EupDyKVLSLRV6W6T2sAYkfBxr
+  version: 0.2.5

app/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-3.yml

@@ -0,0 +1,7 @@
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://app.osmosis.zone'
+  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
+  build_artifact_cid: '~larryx-woldyr/osmosis:latest'
+  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
+  version: 1.3.5

app/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-4.yml

@@ -0,0 +1,7 @@
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://dev.osmosis.zone'
+  repo_registration_record_cid: QmPbKkK7gKojnGAgKAE6bK5qBY8BcYp2YDB1e4b28NxvVv
+  build_artifact_cid: '~larryx-woldyr/osmosis:dev'
+  tls_cert_cid: QmWbCv4k9Q9P6XptHNJN6EupDyKVLSLRV6W6T2sAYkfBxr
+  version: 1.3.6

app/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-5.yml

@@ -0,0 +1,7 @@
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://pwa-1-1-3.iglootools.xyz'
+  repo_registration_record_cid: QmSnuWmxptJZdLJpKRarxBMS2Ju2oANVrgbr2xWbie9b2D
+  build_artifact_cid: https://ipfs.io/ipfs/QmP8jTG1m9GSDJLCbeWhVSVgEzCPPwXRdCRuJtQ5Tz9Kc9
+  tls_cert_cid: QmbWqxBEKC3P8tqsKc98xmWNzrzDtRLMiMPL8wBuTGsMnR
+  version: 1.1.3

app/data/container-build/cerc-laconic-registry-cli/demo-records/demo-record-6.yml

@@ -0,0 +1,7 @@
+record:
+  type: WebsiteRegistrationRecord
+  url: 'https://pwa-1-2-3.iglootools.xyz'
+  repo_registration_record_cid: QmVjYQ59z3fuKfYUV1aXhDR82JAKxdqB5JMPfUsHkJUkJq
+  build_artifact_cid: https://ipfs.io/ipfs/QmN2yevgjC92gzGi2BY6Q2yBWmR6JNWQ9yscoPPyy1V2Hv
+  tls_cert_cid: QmTAnmDMSnzqAN3yyXtFD4KpyATkeze62ZkbmXHjJ8xQW8
+  version: 1.2.3

docs/laconicd-with-console.md

@@ -2,10 +2,10 @@
 
 The following tutorial explains the steps to run a laconicd fixturenet with CLI and web console that displays records in the registry. It is designed as an introduction to Stack Orchestrator and to showcase one component of the Laconic Stack. Prior to Stack Orchestrator, the following 4 repositories had to be cloned and setup manually:
 
-- https://github.com/cerc-io/laconicd
-- https://github.com/cerc-io/laconic-sdk
-- https://github.com/cerc-io/laconic-registry-cli
-- https://github.com/cerc-io/laconic-console
+- https://git.vdb.to/cerc-io/laconicd
+- https://git.vdb.to/cerc-io/laconic-sdk
+- https://git.vdb.to/cerc-io/laconic-registry-cli
+- https://git.vdb.to/cerc-io/laconic-console
 
 Now, with Stack Orchestrator, it is a few quick commands. Additionally, the `docker` and `docker compose` integration on the back-end allows the stack to easily persist, facilitating workflows.
 
@@ -52,7 +52,7 @@ laconic-so version
 1. Get the repositories
 
 ```
-laconic-so --stack fixturenet-laconic-loaded setup-repositories --include github.com/cerc-io/laconicd,github.com/cerc-io/laconic-sdk,github.com/cerc-io/laconic-registry-cli,github.com/cerc-io/laconic-console
+laconic-so --stack fixturenet-laconic-loaded setup-repositories --include git.vdb.to/cerc-io/laconicd,git.vdb.to/cerc-io/laconic-sdk,git.vdb.to/cerc-io/laconic-registry-cli,git.vdb.to/cerc-io/laconic-console
 ```
 
 2. Set this environment variable to the Laconic self-hosted Gitea instance:
@@ -212,7 +212,7 @@ record:
 
 3. Try out additional CLI commands
 
-- these are documented [here](https://github.com/cerc-io/laconic-registry-cli#readme) and updates are forthcoming
+- these are documented [here](https://git.vdb.to/cerc-io/laconic-registry-cli#readme) and updates are forthcoming
 - e.g,:
 
 ```

tests/fixturenet-payments/run-test.sh

@@ -1,105 +0,0 @@
-#!/usr/bin/env bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-echo "$(date +"%Y-%m-%d %T"): Running stack-orchestrator Payments stack fixturenet test"
-# Bit of a hack, test the most recent package
-TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
-# Set a new unique repo dir
-export CERC_REPO_BASE_DIR=$(mktemp -d stack-orchestrator-fixturenet-payments-test.XXXXXXXXXX)
-echo "$(date +"%Y-%m-%d %T"): Testing this package: $TEST_TARGET_SO"
-echo "$(date +"%Y-%m-%d %T"): Test version command"
-reported_version_string=$( $TEST_TARGET_SO version )
-echo "$(date +"%Y-%m-%d %T"): Version reported is: ${reported_version_string}"
-echo "$(date +"%Y-%m-%d %T"): Cloning repositories into: $CERC_REPO_BASE_DIR"
-$TEST_TARGET_SO --stack fixturenet-payments setup-repositories --pull
-echo "$(date +"%Y-%m-%d %T"): Building containers"
-$TEST_TARGET_SO --stack fixturenet-payments build-containers
-echo "$(date +"%Y-%m-%d %T"): Starting stack"
-$TEST_TARGET_SO --stack fixturenet-payments deploy --cluster payments up
-echo "$(date +"%Y-%m-%d %T"): Stack started"
-# Verify that the fixturenet is up and running
-$TEST_TARGET_SO --stack fixturenet-payments deploy --cluster payments ps
-
-# get watcher payments channel id
-timeout=600 # 10 minutes
-echo "$(date +"%Y-%m-%d %T"): Waiting for watcher payment channel id. Timeout set to $timeout seconds"
-start_time=$(date +%s)
-elapsed_time=0
-while [ -z "$WATCHER_UPSTREAM_PAYMENT_CHANNEL" ]  && [ $elapsed_time -lt $timeout ]; do
-  sleep 10
-  echo "$(date +"%Y-%m-%d %T"): Waiting for channel..."
-  WATCHER_UPSTREAM_PAYMENT_CHANNEL=$(docker logs $(docker ps -aq --filter name="mobymask-watcher-server") 2>&1 | \
-    grep "payment channel created with id" | \
-    grep -o '0x[0-9a-fA-F]\+') \
-    || true
-  current_time=$(date +%s)
-  elapsed_time=$((current_time - start_time))
-done
-
-echo "Watcher payment channel id: $WATCHER_UPSTREAM_PAYMENT_CHANNEL"  
-
-sleep 120
-
-# check watcher payment channel status. Expected result: 'Open'
-timeout=600 # 10 minutes
-echo "$(date +"%Y-%m-%d %T"): Querying watcher payment channel status. Timeout set to $timeout seconds"
-start_time=$(date +%s)
-elapsed_time=0
-query="Status:"
-while [ -z "$watcher_query_result" ]  && [ $elapsed_time -lt $timeout ]; do
-  sleep 10
-  echo "$(date +"%Y-%m-%d %T"): Waiting for channel..."
-  watcher_query_result=$(docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $WATCHER_UPSTREAM_PAYMENT_CHANNEL -s false -h ipld-eth-server-1 -p 4005" | \
-    grep "$query" | \
-    grep -o "'.*'") \
-    || true
-  current_time=$(date +%s)
-  elapsed_time=$((current_time - start_time))
-done
-
-# run ponder indexer to get ponder payment channel id
-timeout=600 # 10 minutes
-echo "$(date +"%Y-%m-%d %T"): Starting Ponder indexer and waiting for payment channel id. Timeout set to $timeout seconds"
-start_time=$(date +%s)
-elapsed_time=0
-docker exec -itd payments-ponder-app-indexer-1-1 bash -c "DEBUG=laconic:payments pnpm start > /output.log 2>&1"
-while [ -z "$PONDER_UPSTREAM_PAYMENT_CHANNEL" ]  && [ $elapsed_time -lt $timeout ]; do
-  sleep 10
-  echo "$(date +"%Y-%m-%d %T"): Waiting for channel id..."
-  PONDER_UPSTREAM_PAYMENT_CHANNEL=$(docker exec payments-ponder-app-indexer-1-1 bash -c "grep 'Using payment channel' /output.log" | grep -o '0x[0-9a-fA-F]\+' || true)
-  current_time=$(date +%s)
-  elapsed_time=$((current_time - start_time))
-done
-
-echo "Ponder payment channel id: $PONDER_UPSTREAM_PAYMENT_CHANNEL" 
-
-if [[ -z "$PONDER_UPSTREAM_PAYMENT_CHANNEL" ]]; then
-  echo "Ponder payment channel id not found."
-  ponder_query_result=0
-else
-  echo "Ponder payment channel id: $PONDER_UPSTREAM_PAYMENT_CHANNEL"
-  # query ponder payment channel, Expected result: PaidSoFar is nonzero
-  query="PaidSoFar"
-  ponder_query_result=$(docker exec payments-nitro-rpc-client-1 npm exec -c "nitro-rpc-client get-payment-channel $PONDER_UPSTREAM_PAYMENT_CHANNEL -s false -h go-nitro -p 4006" | \
-    grep "$query" | \
-    grep -o '[0-9]\+') \
-    || true
-fi
-
-if [[ "$watcher_query_result" == "'Open'" && "$ponder_query_result" -gt 0 ]]; then
-  echo "Test passed"
-  test_result=0
-else
-  echo "Test failed: watcher_query_result was $watcher_query_result and ponder_query_result was $ponder_query_result"
-  echo "Logs from stack:"
-  $TEST_TARGET_SO --stack fixturenet-payments deploy logs
-  test_result=1
-fi
-$TEST_TARGET_SO --stack fixturenet-payments deploy --cluster payments down 30 --delete-volumes
-echo "$(date +"%Y-%m-%d %T"): Removing cloned repositories"
-rm -rf $CERC_REPO_BASE_DIR
-echo "$(date +"%Y-%m-%d %T"): Test finished"
-exit $test_result