Upstream merge

.dockerignore

@@ -7,3 +7,6 @@
 !tsconfig.json
 !env.*.config.json
 !src
+
+/src/**/*.e2e.ts
+/src/**/*.spec.ts

.env.example

@@ -1,40 +1,34 @@
-# BOT
-SMF_BOT_BACKEND_URL="http://localhost:5555"
-SMF_BOT_DRIP_AMOUNT=10
+SMF_CONFIG_NETWORK="rococo"
+
+SMF_CONFIG_PORT=5555
+SMF_CONFIG_DEPLOYED_REF=local
 
 # Steps to retrieve this token:
 # 1. Create a bot account (see instructions below for SMF_BOT_MATRIX_BOT_USER_ID)
 # 2. Log in to the bots matrix account. Click on the name in the top left corner, then "Settings".
 # 3. Click the "Help & About" tab (left side of the dialog).
 # 4. Scroll to the bottom and click on <click to reveal> part of Access Token.
 # Note: Keep the browser login active as the token will be invalidated once you logout
-SMF_BOT_MATRIX_ACCESS_TOKEN="NotValidExampleToken"
+SMF_CONFIG_MATRIX_ACCESS_TOKEN="NotValidExampleToken"
 
 # See https://github.com/paritytech/devops/wiki/Matrix%3A-Registering-a-Matrix-Bot for how to register a bot
 # Note: The bot account needs to be created in SMF_BOT_MATRIX_SERVER
-SMF_BOT_MATRIX_BOT_USER_ID="@NotValidExampleAccount:matrix.parity.io"
-SMF_BOT_NETWORK_DECIMALS=12
-SMF_BOT_NETWORK_UNIT="UNIT"
-SMF_BOT_FAUCET_IGNORE_LIST=""
-SMF_BOT_MATRIX_SERVER=https://matrix.parity.io
-SMF_BOT_DEPLOYED_REF=local
-SMF_BOT_DEPLOYED_TIME=local
-
-# BACKEND
+SMF_CONFIG_MATRIX_BOT_USER_ID="@NotValidExampleAccount:matrix.parity.io"
+SMF_CONFIG_FAUCET_IGNORE_LIST=""
+SMF_CONFIG_MATRIX_SERVER=https://m.parity.io
 
 # To get account mnemonic - create an account in https://polkadot.js.org/apps/#/accounts (save details in password manager)
 # Prior creating, make sure to switch to according network (in case of westend - TEST WESTEND & PARACHAINS => Westend)
 # To feed new account with test tokens, go to https://matrix.to/#/#westend_faucet:matrix.org and drip to new address
 # some convenient for tests amount "!drip <address> <amount>"
-SMF_BACKEND_FAUCET_ACCOUNT_MNEMONIC="this is a fake mnemonic"
-SMF_BACKEND_FAUCET_BALANCE_CAP=100
-SMF_BACKEND_INJECTED_TYPES="{ "Address": "AccountId", "LookupSource": "AccountId" }"
-SMF_BACKEND_NETWORK_DECIMALS=12
-SMF_BACKEND_PORT=5555
-SMF_BACKEND_RPC_ENDPOINT="wss://westend-rpc.polkadot.io/"
-SMF_BACKEND_DEPLOYED_REF=local
-SMF_BACKEND_DEPLOYED_TIME=local
-SMF_BACKEND_DRIP_AMOUNT="0.5"
-SMF_BACKEND_EXTERNAL_ACCESS=false
+SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC="this is a fake mnemonic"
+
 # Only used with external access
-SMF_BACKEND_RECAPTCHA_SECRET="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe" # Public testing secret, will accept all tokens.
+SMF_CONFIG_RECAPTCHA_SECRET="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe" # Public testing secret, will accept all tokens.
+
+# Database
+SMF_CONFIG_DB_HOST=localhost
+SMF_CONFIG_DB_PORT=5432
+SMF_CONFIG_DB_USERNAME=postgres
+SMF_CONFIG_DB_PASSWORD=postgres
+SMF_CONFIG_DB_DATABASE_NAME=faucet

.eslintignore

@@ -1,3 +1,5 @@
 data
 build
-test
+test
+**/test.ts
+**/*.e2e.ts

.eslintrc.cjs

@@ -1,4 +1,4 @@
-const { getConfiguration, getTypescriptOverride } = require("opstooling-js-style/src/eslint/configuration");
+const { getConfiguration, getTypescriptOverride } = require("@eng-automation/js-style/src/eslint/configuration");
 
 const tsConfParams = { rootDir: __dirname };
 

.github/workflows/deploy-site.yml

@@ -18,14 +18,13 @@ jobs:
         working-directory: client
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn install --frozen-lockfile
       - run: yarn run check
-      - run: yarn run lint
       - name: Install Playwright
         run: npx playwright install
       - run: yarn run test
@@ -35,15 +34,16 @@ jobs:
           PUBLIC_FAUCET_URL: https://faucet-api-rococo.liberti.social/drip/web
           GITHUB_PAGES: "/${{ github.event.repository.name }}"
           STATIC: true
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
         with:
           name: faucet
           path: ./client/build
           if-no-files-found: error
+          retention-days: 5
   test-image:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Check that the image builds
         run: docker build ./client --file ./client/Dockerfile
   deploy-to-github-pages:
@@ -55,18 +55,18 @@ jobs:
     needs: [build-faucet]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download page
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: faucet
           path: ./dist
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v4
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./dist
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.github/workflows/verify-pr.yml

@@ -21,14 +21,13 @@ jobs:
         working-directory: client
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn install --frozen-lockfile
       - run: yarn run check
-      - run: yarn run lint
       - name: Install Playwright
         run: npx playwright install
       - run: yarn run test
@@ -46,6 +45,6 @@ jobs:
   test-image:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - name: Check that the image builds
         run: docker build ./client --file ./client/Dockerfile

.gitignore

@@ -4,7 +4,12 @@ node_modules
 storage.db
 sqlite.db
 build
+e2e/containter_logs
+e2e/zombienet_logs
 
 # Autogenerated
 env.*.config.json.d.ts
 !.env.example
+
+/data
+/src/test/codegen

.gitlab-ci.yml

@@ -18,13 +18,12 @@ variables:
   KUBE_NAMESPACE:                  "faucetbots"
   CI_REGISTRY:                     "docker.io/paritytech"
   GIT_STRATEGY:                    fetch
-  CI_IMAGE:                        node:16.10-alpine
-  BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.29"
+  CI_IMAGE:                        node:18.16-alpine
+  # BUILDAH_IMAGE is defined in group variables
   BUILDAH_COMMAND:                 "buildah --storage-driver overlay2"
   ARGOCD_IMAGE:                    argoproj/argocd:v2.5.5
   DOCKERHUB_REPO:                  "paritytech"
   IMAGE_NAME:                      docker.io/$DOCKERHUB_REPO/faucet
-  UI_IMAGE_NAME:                   docker.io/$DOCKERHUB_REPO/faucet-ui
   DOCKER_TAG:                      "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
 
 .common-refs:                      &common-refs
@@ -72,22 +71,11 @@ variables:
         --tag "$IMAGE_NAME:${DOCKER_TAG}"
         --tag "$IMAGE_NAME:latest"
         --file "$DOCKERFILE" .
-    - $BUILDAH_COMMAND build
-        --format=docker
-        --build-arg VCS_REF="${CI_COMMIT_SHA}"
-        --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-        --build-arg VERSION="${DOCKER_TAG}"
-        --build-arg PROJECT_NAME="${CI_PROJECT_NAME}"
-        --tag "$UI_IMAGE_NAME:${DOCKER_TAG}"
-        --tag "$UI_IMAGE_NAME:latest"
-        --file "$DOCKERFILE" ./client
     - echo "$Docker_Hub_Pass_Parity" |
         buildah login --username "$Docker_Hub_User_Parity" --password-stdin docker.io
     - $BUILDAH_COMMAND info
     - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:${DOCKER_TAG}"
-    - $BUILDAH_COMMAND push --format=v2s2 "$UI_IMAGE_NAME:${DOCKER_TAG}"
     - $BUILDAH_COMMAND push --format=v2s2 "$IMAGE_NAME:latest"
-    - $BUILDAH_COMMAND push --format=v2s2 "$UI_IMAGE_NAME:latest"
   after_script:
     - buildah logout --all
 
@@ -103,13 +91,6 @@ variables:
           --build-arg PROJECT_NAME="${CI_PROJECT_NAME}"
           --tag "$IMAGE_NAME:latest"
           --file "$DOCKERFILE" .
-    - $BUILDAH_COMMAND build
-          --format=docker
-          --build-arg VCS_REF="${CI_COMMIT_SHA}"
-          --build-arg BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-          --build-arg PROJECT_NAME="${CI_PROJECT_NAME}"
-          --tag "$UI_IMAGE_NAME:latest"
-          --file "$DOCKERFILE" ./client
     - $BUILDAH_COMMAND info
 
 #### stage:                        test
@@ -119,17 +100,17 @@ check-linting:
   <<:                              *common-refs
   <<:                              *kubernetes-env
   script:
-    - apk add git==2.30.6-r0
-    - yarn --network-concurrency 1 --frozen-lockfile
+    - yarn --frozen-lockfile
+    - yarn generate:papi:e2e
+    - cd client && yarn --frozen-lockfile && cd ..
     - yarn typecheck && yarn format && yarn lint
 
 check-tests:
   stage:                           test
   <<:                              *common-refs
   <<:                              *kubernetes-env
   script:
-    - apk add git==2.30.6-r0
-    - yarn --network-concurrency 1 --frozen-lockfile
+    - yarn --frozen-lockfile
     - yarn test
 
 #### stage:                        build
@@ -173,41 +154,41 @@ deploy-versi:
     DOMAIN: parity-versi
     APP: substrate-faucet-versi
 
-deploy-wococo:
+deploy-rococo:
   stage: deploy
-  <<: *deploy-stg-refs
+  <<: *deploy-prod-refs
   extends: .deploy-with-argocd
-  environment: wococo
+  environment: rococo
   variables:
     DOMAIN: parity-testnet
-    APP: substrate-faucet-wococo
+    APP: substrate-faucet-rococo
 
-deploy-rococo:
+deploy-westend:
   stage: deploy
   <<: *deploy-prod-refs
   extends: .deploy-with-argocd
-  environment: rococo
+  environment: westend
   variables:
     DOMAIN: parity-testnet
-    APP: substrate-faucet-rococo
+    APP: substrate-faucet-westend
 
-deploy-rococo-ink-docs:
+deploy-trappist:
   stage: deploy
   <<: *deploy-prod-refs
   extends: .deploy-with-argocd
-  environment: rococo-ink-docs
+  environment: trappist
   variables:
     DOMAIN: parity-testnet
-    APP: substrate-faucet-rococo-ink-docs
+    APP: substrate-faucet-trappist
 
-deploy-westend:
+deploy-paseo:
   stage: deploy
   <<: *deploy-prod-refs
   extends: .deploy-with-argocd
-  environment: westend
+  environment: paseo
   variables:
     DOMAIN: parity-testnet
-    APP: substrate-faucet-westend
+    APP: substrate-faucet-paseo
 
 #### stage:                        publish-docker-description
 .publish-docker-image-description:
@@ -230,14 +211,3 @@ publish-docker-image-description-faucet:
     - if: $CI_COMMIT_REF_NAME == "main"
       changes:
         - Dockerfile.README.md
-
-publish-docker-image-description-faucet-ui:
-  extends:                         .publish-docker-image-description
-  variables:
-    DOCKERHUB_REPOSITORY:          $DOCKERHUB_REPO/$UI_IMAGE_NAME
-    README_FILEPATH:               $CI_PROJECT_DIR/client/Dockerfile.README.md
-    SHORT_DESCRIPTION:             "Generic Faucet-UI for Substrate based chains"
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "main"
-      changes:
-        - client/Dockerfile.README.md

.prettierrc.cjs

@@ -1 +1 @@
-module.exports = require("opstooling-js-style/src/prettier/configuration")
+module.exports = require("@eng-automation/js-style/src/prettier/configuration")

.tool-versions

@@ -1 +1 @@
-nodejs 18.16.0
+nodejs 20.11.1

Dockerfile

@@ -5,14 +5,14 @@ FROM docker.io/library/node:18.16.0-alpine
 RUN apk add git
 
 LABEL maintainer="Frequency"
-LABEL description="Frequency Rococo faucet backend"
+LABEL description="Frequency Testnet faucet backend"
 
 WORKDIR /faucet
 
 COPY ./package.json ./yarn.lock ./
-RUN yarn --network-concurrency 1 --frozen-lockfile
+RUN yarn --frozen-lockfile
 
 COPY . .
 RUN yarn build
 
-CMD yarn start:backend
+CMD yarn migrations:run && yarn start