Merge branch 'andrehadianto/design-system-components' of https://github.com/snowball-tools/snowballtools-base into ayungavis/T-4864-radio

.gitea/workflows/deploy-frontend.yaml

@@ -1,61 +0,0 @@
-name: Deploy Snowball frontend
-
-on:
-  push:
-    branches:
-      - main
-
-env:
-  REGISTRY_USER_KEY: ${{ secrets.REGISTRY_USER_KEY }}
-  REGISTRY_BOND_ID: ${{ secrets.REGISTRY_BOND_ID }}
-  DEPLOYER_LRN: lrn://vaasl-provider/deployers/webapp-deployer-api.apps.vaasl.io
-  AUTHORITY: laconic-deploy
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Download yarn
-        run: |
-          curl -fsSL -o /usr/local/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.21/yarn-1.22.21.js
-          chmod +x /usr/local/bin/yarn
-
-      - name: Install dependencies
-        run: |
-          yarn install
-
-      - name: Set up environment
-        run: |
-          # Create a .env file with the necessary variables
-          echo "REGISTRY_BOND_ID=$REGISTRY_BOND_ID" > packages/deployer/.env
-          echo "DEPLOYER_LRN=$DEPLOYER_LRN" >> packages/deployer/.env
-          echo "AUTHORITY=$AUTHORITY" >> packages/deployer/.env
-
-          # Create a config file with necessary endpoints and secrets
-          cat > packages/deployer/config.yml <<EOF
-          services:
-            registry:
-              rpcEndpoint: https://laconicd-sapo.laconic.com
-              gqlEndpoint: https://laconicd-sapo.laconic.com/api
-              userKey: $REGISTRY_USER_KEY
-              bondId: $REGISTRY_BOND_ID
-              chainId: laconic-testnet-2
-              gasPrice: 0.001alnt
-          EOF
-
-      - name: Run deploy script
-        run: |
-          cd packages/deployer
-          ./deploy-frontend.sh

.gitea/workflows/lint.yaml

@@ -1,30 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - staging
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Download yarn
-        run: |
-          curl -fsSL -o /usr/local/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.21/yarn-1.22.21.js
-          chmod +x /usr/local/bin/yarn
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - run: yarn
-      - name: Build libs
-        run: yarn workspace gql-client run build
-      - name: Linter check
-        run: yarn lint

.github/workflows/lint.yaml

@@ -19,7 +19,5 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn
-      - name: Build libs
-        run: yarn workspace gql-client run build
       - name: Linter check
         run: yarn lint

.github/workflows/test-app-deployment.yaml

@@ -1,39 +0,0 @@
-name: Test webapp deployment
-
-on:
-  schedule:
-    - cron: '0 3 * * *'
-  workflow_dispatch:
-
-jobs:
-  test_app_deployment:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Install dependencies
-        run: yarn
-      - name: Test webapp deployment
-        run: ./packages/deployer/test/test-webapp-deployment-undeployment.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS_WEBHOOK }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS_WEBHOOK }}

.gitignore

@@ -1,12 +1 @@
 node_modules/
-yarn-error.log
-.yarnrc.yml
-.yarn/
-.yarnrc
-
-packages/backend/environments/local.toml
-packages/backend/dev/
-packages/frontend/dist/
-
-# ignore all .DS_Store files
-**/.DS_Store

.node-version

@@ -1 +0,0 @@
-v20.12.1

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
   // IntelliSense for taiwind variants
   "tailwindCSS.experimental.classRegex": [
-    "tv\\('([^)]*)\\')",
+    ["tv\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
-    "(?:'|\"|`)([^\"'`]*)(?:'|\"|`)"
   ]
 }

README.md

@@ -1,23 +1,150 @@
-# snowballtools-base
+# snowballtools
 
-This is a [yarn workspace](https://yarnpkg.com/features/workspaces) monorepo for the dashboard.
+## Setup
 
-## Getting Started
+- Clone the  `snowballtools` repo
 
-### Install dependencies
+  ```bash
+  git clone git@github.com:snowball-tools/snowballtools-base.git
+  ```
 
-In the root of the project, run:
+- In root of the repo, install depedencies
 
-```zsh
+  ```bash
-yarn
+  yarn
-```
+  ```
 
-### Build backend
+- Build packages
 
-```zsh
+  ```bash
-yarn build --ignore frontend
+  yarn build --ignore frontend
-```
+  ```
 
-### Environment variables, running the development server, and deployment
+## Backend
+
+- Change directory to `packages/backend`
+
+  ```bash
+  cd packages/backend
+  ```
+
+- Load fixtures in database
+
+  ```bash
+  yarn test:db:load:fixtures
+  ```
+
+- Set `gitHub.oAuth.clientId` and `gitHub.oAuth.clientSecret` in backend [config file](packages/backend/environments/local.toml)
+  - Client ID and secret will be available after creating Github OAuth app
+    - https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app
+    - In "Homepage URL", type `http://localhost:3000`
+    - In "Authorization callback URL", type `http://localhost:3000/organization/projects/create`
+    - Generate a new client secret after app is created
+
+- Run the laconicd stack following this [doc](https://git.vdb.to/cerc-io/stack-orchestrator/src/branch/main/docs/laconicd-with-console.md)
+
+- Get the private key and set `registryConfig.privateKey` in backend [config file](packages/backend/environments/local.toml)
+
+  ```bash
+  laconic-so --stack fixturenet-laconic-loaded deploy exec laconicd "laconicd keys export mykey --unarmored-hex --unsafe"
+  # WARNING: The private key will be exported as an unarmored hexadecimal string. USE AT YOUR OWN RISK. Continue? [y/N]: y
+  # 754cca7b4b729a99d156913aea95366411d072856666e95ba09ef6c664357d81
+  ```
+
+- Get the REST and GQL endpoint ports of Laconicd and replace the ports for `registryConfig.restEndpoint` and `registryConfig.gqlEndpoint` in backend [config file](packages/backend/environments/local.toml)
+
+  ```bash
+  # For registryConfig.restEndpoint
+  laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 1317
+  # 0.0.0.0:32777
+
+  # For registryConfig.gqlEndpoint
+  laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 9473
+  # 0.0.0.0:32771
+  ```
+
+- Run the script to create bond, reserve the authority and set authority bond
+
+  ```bash
+  yarn test:registry:init
+  # snowball:initialize-registry bondId: 6af0ab81973b93d3511ae79841756fb5da3fd2f70ea1279e81fae7c9b19af6c4 +0ms
+  ```
+
+  - Get the bond id and set `registryConfig.bondId` in backend [config file](packages/backend/environments/local.toml)
+
+- Setup ngrok for GitHub webhooks
+  - https://ngrok.com/docs/getting-started/
+  - Start ngrok and point to backend server endpoint
+    ```bash
+    ngrok http http://localhost:8000
+    ```
+  - Look for the forwarding URL in ngrok
+    ```
+    ...
+    Forwarding                    https://19c1-61-95-158-116.ngrok-free.app -> http://localhost:8000
+    ...
+    ```
+  - Set `gitHub.webhookUrl` in backend [config file](packages/backend/environments/local.toml)
+    ```toml
+    ...
+    [gitHub]
+      webhookUrl = "https://19c1-61-95-158-116.ngrok-free.app"
+    ...
+    ```
+
+- Start the server in `packages/backend`
+
+  ```bash
+  yarn start
+  ```
+
+## Frontend
+
+- Change directory to `packages/frontend` in a new terminal
+
+  ```bash
+  cd packages/frontend
+  ```
+
+- Copy the graphQL endpoint from terminal and add the endpoint in the [.env](packages/frontend/.env) file present in `packages/frontend`
+
+  ```env
+  REACT_APP_GQL_SERVER_URL = 'http://localhost:8000/graphql'
+  ```
+
+- Copy the GitHub OAuth app client ID from previous steps and set it in frontend [.env](packages/frontend/.env) file
+
+  ```env
+  REACT_APP_GITHUB_CLIENT_ID = <CLIENT_ID>
+  ```
+
+- Set `REACT_APP_GITHUB_TEMPLATE_REPO` in [.env](packages/frontend/.env) file
+
+  ```env
+  REACT_APP_GITHUB_TEMPLATE_REPO = cerc-io/test-progressive-web-app
+  ```
+
+### Development
+
+- Start the React application
+
+  ```bash
+  yarn start
+  ```
+
+- The React application will be running in `http://localhost:3000/`
+
+### Production
+
+- Build the React application
+
+  ```bash
+  yarn build
+  ```
+
+- Use a web server for hosting static built files
+
+  ```bash
+  python3 -m http.server -d build 3000
+  ```
 
-Follow the instructions in the README.md files of the [backend](packages/backend/README.md) and [frontend](packages/frontend/README.md) packages.

build-webapp.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-PKG_DIR="./packages/frontend"
-OUTPUT_DIR="${PKG_DIR}/dist"
-DEST_DIR=${1:-/data}
-
-if [[ -d "$DEST_DIR" ]]; then
-  echo "${DEST_DIR} already exists." 1>&2
-  exit 1
-fi
-
-cat > $PKG_DIR/.env <<EOF
-VITE_SERVER_URL = 'LACONIC_HOSTED_CONFIG_server_url'
-VITE_GITHUB_CLIENT_ID = 'LACONIC_HOSTED_CONFIG_github_clientid'
-VITE_GITHUB_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_pwa_templaterepo'
-VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo'
-VITE_GITHUB_NEXT_APP_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_next_app_templaterepo'
-VITE_WALLET_CONNECT_ID = 'LACONIC_HOSTED_CONFIG_wallet_connect_id'
-VITE_LACONICD_CHAIN_ID = 'LACONIC_HOSTED_CONFIG_laconicd_chain_id'
-VITE_WALLET_IFRAME_URL = 'LACONIC_HOSTED_CONFIG_wallet_iframe_url'
-VITE_LIT_RELAY_API_KEY = 'LACONIC_HOSTED_CONFIG_lit_relay_api_key'
-VITE_BUGSNAG_API_KEY = 'LACONIC_HOSTED_CONFIG_bugsnag_api_key'
-VITE_PASSKEY_WALLET_RPID = 'LACONIC_HOSTED_CONFIG_passkey_wallet_rpid'
-VITE_TURNKEY_API_BASE_URL = 'LACONIC_HOSTED_CONFIG_turnkey_api_base_url'
-EOF
-
-yarn || exit 1
-yarn build --ignore backend || exit 1
-
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  echo "Missing output directory: $OUTPUT_DIR" 1>&2
-  exit 1
-fi
-
-mv "$OUTPUT_DIR" "$DEST_DIR"

package.json

@@ -4,15 +4,15 @@
   "workspaces": [
     "packages/*"
   ],
+  "dependencies": {},
   "devDependencies": {
-    "depcheck": "^1.4.2",
     "husky": "^8.0.3",
     "lerna": "^8.0.0",
-    "patch-package": "^8.0.0"
+    "depcheck": "^1.4.2"
   },
   "scripts": {
     "prepare": "husky install",
     "build": "lerna run build --stream",
-    "lint": "lerna run lint --stream"
+    "lint": "lerna run lint --stream -- --max-warnings=0"
   }
 }

packages/backend/.eslintrc.json

@@ -25,9 +25,6 @@
         "allowArgumentsExplicitlyTypedAsAny": true
       }
     ],
-    "@typescript-eslint/no-unused-vars": [
+    "@typescript-eslint/no-unused-vars": ["error", { "ignoreRestSiblings": true }]
-      "error",
-      { "ignoreRestSiblings": true }
-    ]
   }
 }

packages/backend/.gitignore

@@ -1,3 +1,2 @@
 db
 dist
-environments/local.toml

packages/backend/.node-version

@@ -1 +0,0 @@
-v20.12.1

packages/backend/README.md

@@ -1,76 +1 @@
-# backend
+# Backend for Snowball Tools
-
-This backend is a [node.js](https://nodejs.org/) [express.js](https://expressjs.com/) [apollo server](https://www.apollographql.com/docs/apollo-server/) project in a [yarn workspace](https://yarnpkg.com/features/workspaces).
-
-## Getting Started
-
-### Install dependencies
-
-In the root of the project, run:
-
-```zsh
-yarn
-```
-
-### Build backend
-
-```zsh
-yarn build --ignore frontend
-```
-
-### Environment variables
-
-#### Local
-
-Copy the `environments/local.toml.example` file to `environments/local.toml`:
-
-```zsh
-cp environments/local.toml.example environments/local.toml
-```
-
-#### Staging environment variables
-
-In the deployment repository, update staging [staging/configmaps/config/prod.toml](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments/src/commit/318c2bc09f334dca79c3501838512749f9431bf1/deployments/staging/configmaps/config/prod.toml)
-
-#### Production environment variables
-
-In the deployment repository, update production [production/configmaps/config/prod.toml](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments/src/commit/318c2bc09f334dca79c3501838512749f9431bf1/deployments/production/configmaps/config/prod.toml)
-
-### Run development server
-
-```zsh
-yarn start
-```
-
-## Deployment
-
-Clone the [deployer repository](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments):
-
-```zsh
-git clone git@git.vdb.to:cerc-io/snowballtools-base-api-deployments.git
-```
-
-### Staging
-
-```zsh
-echo trigger >> .gitea/workflows/triggers/staging-deploy
-git commit -a -m "Deploy v0.0.8"  # replace with version number
-git push
-```
-
-### Production
-
-```zsh
-echo trigger >> .gitea/workflows/triggers/production-deploy
-git commit -a -m "Deploy v0.0.8" # replace with version number
-git push
-```
-
-### Deployment status
-
-Dumb for now
-
-- [Staging](https://snowballtools-base-api.staging.apps.snowballtools.com/staging/version)
-- [Production](https://snowballtools-base-api.apps.snowballtools.com/staging/version)
-
-Update version number manually in [routes/staging.ts](/packages/backend/src/routes/staging.ts)

packages/backend/environments/local.toml

@@ -0,0 +1,25 @@
+[server]
+  host = "127.0.0.1"
+  port = 8000
+  gqlPath = "/graphql"
+
+[database]
+  dbPath = "db/snowball"
+
+[gitHub]
+  webhookUrl = ""
+  [gitHub.oAuth]
+    clientId = ""
+    clientSecret = ""
+
+[registryConfig]
+  fetchDeploymentRecordDelay = 5000
+  restEndpoint = "http://localhost:1317"
+  gqlEndpoint = "http://localhost:9473/api"
+  chainId = "laconic_9000-1"
+  privateKey = ""
+  bondId = ""
+  [registryConfig.fee]
+    amount = "200000"
+    denom = "aphoton"
+    gas = "550000"

packages/backend/environments/local.toml.example

@@ -1,43 +0,0 @@
-[server]
-  host = "127.0.0.1"
-  port = 8000
-  gqlPath = "/graphql"
-  [server.session]
-    secret = ""
-    # Frontend webapp URL origin
-    appOriginUrl = "http://localhost:3000"
-    # Set to true if server running behind proxy
-    trustProxy = false
-    # Backend URL hostname
-    domain = "localhost"
-
-[database]
-  dbPath = "db/snowball"
-
-[gitHub]
-  webhookUrl = ""
-  [gitHub.oAuth]
-    clientId = ""
-    clientSecret = ""
-
-[registryConfig]
-  fetchDeploymentRecordDelay = 5000
-  checkAuctionStatusDelay = 5000
-  restEndpoint = "http://localhost:1317"
-  gqlEndpoint = "http://localhost:9473/api"
-  chainId = "laconic_9000-1"
-  privateKey = ""
-  bondId = ""
-  authority = ""
-  [registryConfig.fee]
-    gas = ""
-    fees = ""
-    gasPrice = "1alnt"
-
-# Durations are set to 2 mins as deployers may take time with ongoing deployments and auctions
-[auction]
-  commitFee = "100000"
-  commitsDuration = "120s"
-  revealFee = "100000"
-  revealsDuration = "120s"
-  denom = "alnt"

packages/backend/package.json

@@ -1,26 +1,19 @@
 {
   "name": "backend",
-  "license": "UNLICENSED",
   "version": "1.0.0",
   "main": "index.js",
   "dependencies": {
-    "@cerc-io/registry-sdk": "^0.2.11",
+    "@cerc-io/laconic-sdk": "^0.1.14",
     "@graphql-tools/schema": "^10.0.2",
     "@graphql-tools/utils": "^10.0.12",
     "@octokit/oauth-app": "^6.1.0",
-    "@turnkey/sdk-server": "^0.1.0",
     "@types/debug": "^4.1.5",
     "@types/express": "^4.17.21",
     "@types/node": "^20.11.0",
-    "@types/semver": "^7.5.8",
     "apollo-server-core": "^3.13.0",
     "apollo-server-express": "^3.13.0",
-    "cookie-session": "^2.1.0",
-    "cors": "^2.8.5",
     "debug": "^4.3.1",
     "express": "^4.18.2",
-    "express-async-errors": "^3.1.1",
-    "express-session": "^1.18.0",
     "fs-extra": "^11.2.0",
     "graphql": "^16.8.1",
     "luxon": "^3.4.4",
@@ -40,21 +33,29 @@
     "copy-assets": "copyfiles -u 1 src/**/*.gql dist/",
     "clean": "rm -rf ./dist",
     "build": "yarn clean && tsc && yarn copy-assets",
+    "lint": "eslint .",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "lint": "tsc --noEmit",
     "test:registry:init": "DEBUG=snowball:* ts-node ./test/initialize-registry.ts",
     "test:registry:publish-deploy-records": "DEBUG=snowball:* ts-node ./test/publish-deploy-records.ts",
-    "test:registry:publish-deployment-removal-records": "DEBUG=snowball:* ts-node ./test/publish-deployment-removal-records.ts",
     "test:db:load:fixtures": "DEBUG=snowball:* ts-node ./test/initialize-db.ts",
     "test:db:delete": "DEBUG=snowball:* ts-node ./test/delete-db.ts"
   },
   "devDependencies": {
-    "@types/cookie-session": "^2.0.49",
-    "@types/express-session": "^1.17.10",
     "@types/fs-extra": "^11.0.4",
+    "@typescript-eslint/eslint-plugin": "^6.18.1",
+    "@typescript-eslint/parser": "^6.18.1",
     "better-sqlite3": "^9.2.2",
     "copyfiles": "^2.4.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-semistandard": "^15.0.1",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-standard": "^5.0.0",
     "prettier": "^3.1.1",
     "workspace": "^0.0.1-preview.1"
   }

packages/backend/src/config.ts

@@ -1,18 +1,7 @@
-export interface SessionConfig {
-  secret: string;
-  appOriginUrl: string;
-  trustProxy: boolean;
-  domain: string;
-}
-
 export interface ServerConfig {
   host: string;
   port: number;
   gqlPath?: string;
-  sessionSecret: string;
-  appOriginUrl: string;
-  isProduction: boolean;
-  session: SessionConfig;
 }
 
 export interface DatabaseConfig {
@@ -24,7 +13,7 @@ export interface GitHubConfig {
   oAuth: {
     clientId: string;
     clientSecret: string;
-  };
+  }
 }
 
 export interface RegistryConfig {
@@ -34,21 +23,11 @@ export interface RegistryConfig {
   privateKey: string;
   bondId: string;
   fetchDeploymentRecordDelay: number;
-  checkAuctionStatusDelay: number;
-  authority: string;
   fee: {
-    gas: string;
+    amount: string;
-    fees: string;
-    gasPrice: string;
-  };
-}
-
-export interface AuctionConfig {
-  commitFee: string;
-  commitsDuration: string;
-  revealFee: string;
-  revealsDuration: string;
     denom: string;
+    gas: string;
+  }
 }
 
 export interface Config {
@@ -56,11 +35,4 @@ export interface Config {
   database: DatabaseConfig;
   gitHub: GitHubConfig;
   registryConfig: RegistryConfig;
-  auction: AuctionConfig;
-  turnkey: {
-    apiBaseUrl: string;
-    apiPublicKey: string;
-    apiPrivateKey: string;
-    defaultOrganizationId: string;
-  };
 }

packages/backend/src/constants.ts

@@ -1,6 +1,8 @@
-import process from 'process';
+export const DEFAULT_CONFIG_FILE_PATH = 'environments/local.toml';
-
-export const DEFAULT_CONFIG_FILE_PATH =
-  process.env.SNOWBALL_BACKEND_CONFIG_FILE_PATH || 'environments/local.toml';
 
 export const DEFAULT_GQL_PATH = '/graphql';
+
+// Note: temporary hardcoded user, later to be derived from auth token
+export const USER_ID = '59f4355d-9549-4aac-9b54-eeefceeabef0';
+
+export const PROJECT_DOMAIN = 'snowball.xyz';

packages/backend/src/database.ts

@@ -1,12 +1,4 @@
-import {
+import { DataSource, DeepPartial, FindManyOptions, FindOneOptions, FindOptionsWhere } from 'typeorm';
-  DataSource,
-  DeepPartial,
-  FindManyOptions,
-  FindOneOptions,
-  FindOptionsWhere,
-  IsNull,
-  Not
-} from 'typeorm';
 import path from 'path';
 import debug from 'debug';
 import assert from 'assert';
@@ -21,11 +13,7 @@ import { Deployment } from './entity/Deployment';
 import { ProjectMember } from './entity/ProjectMember';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
 import { Domain } from './entity/Domain';
-import { getEntities, loadAndSaveData } from './utils';
+import { PROJECT_DOMAIN } from './constants';
-import { UserOrganization } from './entity/UserOrganization';
-import { Deployer } from './entity/Deployer';
-
-const ORGANIZATION_DATA_PATH = '../test/fixtures/organizations.json';
 
 const log = debug('snowball:database');
 
@@ -35,7 +23,7 @@ const nanoid = customAlphabet(lowercase + numbers, 8);
 export class Database {
   private dataSource: DataSource;
 
-  constructor({ dbPath }: DatabaseConfig) {
+  constructor ({ dbPath }: DatabaseConfig) {
     this.dataSource = new DataSource({
       type: 'better-sqlite3',
       database: dbPath,
@@ -45,73 +33,41 @@ export class Database {
     });
   }
 
-  async init(): Promise<void> {
+  async init (): Promise<void> {
     await this.dataSource.initialize();
     log('database initialized');
-
-    let organizations = await this.getOrganizations({});
-
-    // Load an organization if none exist
-    if (!organizations.length) {
-      const orgEntities = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
-      organizations = await loadAndSaveData(Organization, this.dataSource, [orgEntities[0]]);
   }
 
-    // Hotfix for updating old DB data
+  async getUser (options: FindOneOptions<User>): Promise<User | null> {
-    if (organizations[0].slug === 'snowball-tools-1') {
-      const [orgEntity] = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
-      
-      await this.updateOrganization(
-        organizations[0].id,
-        {
-          slug: orgEntity.slug as string,
-          name: orgEntity.name as string
-        }
-      )
-    }
-  }
-
-  async getUser(options: FindOneOptions<User>): Promise<User | null> {
     const userRepository = this.dataSource.getRepository(User);
     const user = await userRepository.findOne(options);
 
     return user;
   }
 
-  async addUser(data: DeepPartial<User>): Promise<User> {
+  async addUser (data: DeepPartial<User>): Promise<User> {
     const userRepository = this.dataSource.getRepository(User);
     const user = await userRepository.save(data);
 
     return user;
   }
 
-  async updateUser(user: User, data: DeepPartial<User>): Promise<boolean> {
+  async updateUser (userId: string, data: DeepPartial<User>): Promise<boolean> {
     const userRepository = this.dataSource.getRepository(User);
-    const updateResult = await userRepository.update({ id: user.id }, data);
+    const updateResult = await userRepository.update({ id: userId }, data);
     assert(updateResult.affected);
 
     return updateResult.affected > 0;
   }
 
-  async getOrganizations(
+  async getOrganization (options: FindOneOptions<Organization>): Promise<Organization | null> {
-    options: FindManyOptions<Organization>
-  ): Promise<Organization[]> {
-    const organizationRepository = this.dataSource.getRepository(Organization);
-    const organizations = await organizationRepository.find(options);
-
-    return organizations;
-  }
-
-  async getOrganization(
-    options: FindOneOptions<Organization>
-  ): Promise<Organization | null> {
     const organizationRepository = this.dataSource.getRepository(Organization);
     const organization = await organizationRepository.findOne(options);
 
     return organization;
   }
 
-  async getOrganizationsByUserId(userId: string): Promise<Organization[]> {
+  async getOrganizationsByUserId (userId: string): Promise<Organization[]> {
     const organizationRepository = this.dataSource.getRepository(Organization);
 
     const userOrgs = await organizationRepository.find({
@@ -127,43 +83,22 @@ export class Database {
     return userOrgs;
   }
 
-  async addUserOrganization(data: DeepPartial<UserOrganization>): Promise<UserOrganization> {
+  async getProjects (options: FindManyOptions<Project>): Promise<Project[]> {
-    const userOrganizationRepository = this.dataSource.getRepository(UserOrganization);
-    const newUserOrganization = await userOrganizationRepository.save(data);
-
-    return newUserOrganization;
-  }
-
-  async updateOrganization(organizationId: string, data: DeepPartial<Organization>): Promise<boolean> {
-    const organizationRepository = this.dataSource.getRepository(Organization);
-    const updateResult = await organizationRepository.update({ id: organizationId }, data);
-    assert(updateResult.affected);
-
-    return updateResult.affected > 0;
-  }
-
-  async getProjects(options: FindManyOptions<Project>): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
     const projects = await projectRepository.find(options);
 
     return projects;
   }
 
-  async getProjectById(projectId: string): Promise<Project | null> {
+  async getProjectById (projectId: string): Promise<Project | null> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     const project = await projectRepository
       .createQueryBuilder('project')
-      .leftJoinAndSelect(
+      .leftJoinAndSelect('project.deployments', 'deployments', 'deployments.isCurrent = true')
-        'project.deployments',
-        'deployments',
-        'deployments.isCurrent = true'
-      )
       .leftJoinAndSelect('deployments.createdBy', 'user')
       .leftJoinAndSelect('deployments.domain', 'domain')
-      .leftJoinAndSelect('deployments.deployer', 'deployer')
       .leftJoinAndSelect('project.owner', 'owner')
-      .leftJoinAndSelect('project.deployers', 'deployers')
       .leftJoinAndSelect('project.organization', 'organization')
       .where('project.id = :projectId', {
         projectId
@@ -173,47 +108,19 @@ export class Database {
     return project;
   }
 
-  async allProjectsWithoutDeployments(): Promise<Project[]> {
+  async getProjectsInOrganization (userId: string, organizationSlug: string): Promise<Project[]> {
-    const allProjects = await this.getProjects({
-      where: {
-        auctionId: Not(IsNull()),
-      },
-      relations: ['deployments'],
-      withDeleted: true,
-    });
-
-    const projects = allProjects.filter(project => {
-      if (project.deletedAt !== null) return false;
-
-      return project.deployments.length === 0;
-    });
-
-    return projects;
-  }
-
-  async getProjectsInOrganization(
-    userId: string,
-    organizationSlug: string
-  ): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     const projects = await projectRepository
       .createQueryBuilder('project')
-      .leftJoinAndSelect(
+      .leftJoinAndSelect('project.deployments', 'deployments', 'deployments.isCurrent = true')
-        'project.deployments',
-        'deployments',
-        'deployments.isCurrent = true'
-      )
       .leftJoinAndSelect('deployments.domain', 'domain')
       .leftJoin('project.projectMembers', 'projectMembers')
       .leftJoin('project.organization', 'organization')
-      .where(
+      .where('(project.ownerId = :userId OR projectMembers.userId = :userId) AND organization.slug = :organizationSlug', {
-        '(project.ownerId = :userId OR projectMembers.userId = :userId) AND organization.slug = :organizationSlug',
-        {
         userId,
         organizationSlug
-        }
+      })
-      )
       .getMany();
 
     return projects;
@@ -222,22 +129,19 @@ export class Database {
   /**
    * Get deployments with specified filter
    */
-  async getDeployments(
+  async getDeployments (options: FindManyOptions<Deployment>): Promise<Deployment[]> {
-    options: FindManyOptions<Deployment>
-  ): Promise<Deployment[]> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployments = await deploymentRepository.find(options);
 
     return deployments;
   }
 
-  async getDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
+  async getDeploymentsByProjectId (projectId: string): Promise<Deployment[]> {
     return this.getDeployments({
       relations: {
         project: true,
         domain: true,
-        createdBy: true,
+        createdBy: true
-        deployer: true,
       },
       where: {
         project: {
@@ -250,23 +154,21 @@ export class Database {
     });
   }
 
-  async getDeployment(
+  async getDeployment (options: FindOneOptions<Deployment>): Promise<Deployment | null> {
-    options: FindOneOptions<Deployment>
-  ): Promise<Deployment | null> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployment = await deploymentRepository.findOne(options);
 
     return deployment;
   }
 
-  async getDomains(options: FindManyOptions<Domain>): Promise<Domain[]> {
+  async getDomains (options: FindManyOptions<Domain>): Promise<Domain[]> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const domains = await domainRepository.find(options);
 
     return domains;
   }
 
-  async addDeployment(data: DeepPartial<Deployment>): Promise<Deployment> {
+  async addDeployment (data: DeepPartial<Deployment>): Promise<Deployment> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
 
     const id = nanoid();
@@ -280,11 +182,8 @@ export class Database {
     return deployment;
   }
 
-  async getProjectMembersByProjectId(
+  async getProjectMembersByProjectId (projectId: string): Promise<ProjectMember[]> {
-    projectId: string
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
-  ): Promise<ProjectMember[]> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
 
     const projectMembers = await projectMemberRepository.find({
       relations: {
@@ -301,12 +200,8 @@ export class Database {
     return projectMembers;
   }
 
-  async getEnvironmentVariablesByProjectId(
+  async getEnvironmentVariablesByProjectId (projectId: string, filter?: FindOptionsWhere<EnvironmentVariable>): Promise<EnvironmentVariable[]> {
-    projectId: string,
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
-    filter?: FindOptionsWhere<EnvironmentVariable>
-  ): Promise<EnvironmentVariable[]> {
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
 
     const environmentVariables = await environmentVariableRepository.find({
       where: {
@@ -320,13 +215,10 @@ export class Database {
     return environmentVariables;
   }
 
-  async removeProjectMemberById(projectMemberId: string): Promise<boolean> {
+  async removeProjectMemberById (projectMemberId: string): Promise<boolean> {
-    const projectMemberRepository =
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
-      this.dataSource.getRepository(ProjectMember);
 
-    const deleteResult = await projectMemberRepository.delete({
+    const deleteResult = await projectMemberRepository.delete({ id: projectMemberId });
-      id: projectMemberId
-    });
 
     if (deleteResult.affected) {
       return deleteResult.affected > 0;
@@ -335,63 +227,37 @@ export class Database {
     }
   }
 
-  async updateProjectMemberById(
+  async updateProjectMemberById (projectMemberId: string, data: DeepPartial<ProjectMember>): Promise<boolean> {
-    projectMemberId: string,
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
-    data: DeepPartial<ProjectMember>
+    const updateResult = await projectMemberRepository.update({ id: projectMemberId }, data);
-  ): Promise<boolean> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
-    const updateResult = await projectMemberRepository.update(
-      { id: projectMemberId },
-      data
-    );
 
     return Boolean(updateResult.affected);
   }
 
-  async addProjectMember(
+  async addProjectMember (data: DeepPartial<ProjectMember>): Promise<ProjectMember> {
-    data: DeepPartial<ProjectMember>
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
-  ): Promise<ProjectMember> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
     const newProjectMember = await projectMemberRepository.save(data);
 
     return newProjectMember;
   }
 
-  async addEnvironmentVariables(
+  async addEnvironmentVariables (data: DeepPartial<EnvironmentVariable>[]): Promise<EnvironmentVariable[]> {
-    data: DeepPartial<EnvironmentVariable>[]
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
-  ): Promise<EnvironmentVariable[]> {
+    const savedEnvironmentVariables = await environmentVariableRepository.save(data);
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
-    const savedEnvironmentVariables =
-      await environmentVariableRepository.save(data);
 
     return savedEnvironmentVariables;
   }
 
-  async updateEnvironmentVariable(
+  async updateEnvironmentVariable (environmentVariableId: string, data: DeepPartial<EnvironmentVariable>): Promise<boolean> {
-    environmentVariableId: string,
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
-    data: DeepPartial<EnvironmentVariable>
+    const updateResult = await environmentVariableRepository.update({ id: environmentVariableId }, data);
-  ): Promise<boolean> {
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
-    const updateResult = await environmentVariableRepository.update(
-      { id: environmentVariableId },
-      data
-    );
 
     return Boolean(updateResult.affected);
   }
 
-  async deleteEnvironmentVariable(
+  async deleteEnvironmentVariable (environmentVariableId: string): Promise<boolean> {
-    environmentVariableId: string
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
-  ): Promise<boolean> {
+    const deleteResult = await environmentVariableRepository.delete({ id: environmentVariableId });
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
-    const deleteResult = await environmentVariableRepository.delete({
-      id: environmentVariableId
-    });
 
     if (deleteResult.affected) {
       return deleteResult.affected > 0;
@@ -400,9 +266,8 @@ export class Database {
     }
   }
 
-  async getProjectMemberById(projectMemberId: string): Promise<ProjectMember> {
+  async getProjectMemberById (projectMemberId: string): Promise<ProjectMember> {
-    const projectMemberRepository =
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
-      this.dataSource.getRepository(ProjectMember);
 
     const projectMemberWithProject = await projectMemberRepository.find({
       relations: {
@@ -414,7 +279,8 @@ export class Database {
       where: {
         id: projectMemberId
       }
-    });
+    }
+    );
 
     if (projectMemberWithProject.length === 0) {
       throw new Error('Member does not exist');
@@ -423,49 +289,34 @@ export class Database {
     return projectMemberWithProject[0];
   }
 
-  async getProjectsBySearchText(
+  async getProjectsBySearchText (userId: string, searchText: string): Promise<Project[]> {
-    userId: string,
-    searchText: string
-  ): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     const projects = await projectRepository
       .createQueryBuilder('project')
       .leftJoinAndSelect('project.organization', 'organization')
       .leftJoin('project.projectMembers', 'projectMembers')
-      .where(
+      .where('(project.owner = :userId OR projectMembers.member.id = :userId) AND project.name LIKE :searchText', {
-        '(project.owner = :userId OR projectMembers.member.id = :userId) AND project.name LIKE :searchText',
-        {
         userId,
         searchText: `%${searchText}%`
-        }
+      })
-      )
       .getMany();
 
     return projects;
   }
 
-  async updateDeploymentById(
+  async updateDeploymentById (deploymentId: string, data: DeepPartial<Deployment>): Promise<boolean> {
-    deploymentId: string,
-    data: DeepPartial<Deployment>
-  ): Promise<boolean> {
     return this.updateDeployment({ id: deploymentId }, data);
   }
 
-  async updateDeployment(
+  async updateDeployment (criteria: FindOptionsWhere<Deployment>, data: DeepPartial<Deployment>): Promise<boolean> {
-    criteria: FindOptionsWhere<Deployment>,
-    data: DeepPartial<Deployment>
-  ): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const updateResult = await deploymentRepository.update(criteria, data);
 
     return Boolean(updateResult.affected);
   }
 
-  async updateDeploymentsByProjectIds(
+  async updateDeploymentsByProjectIds (projectIds: string[], data: DeepPartial<Deployment>): Promise<boolean> {
-    projectIds: string[],
-    data: DeepPartial<Deployment>
-  ): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
 
     const updateResult = await deploymentRepository
@@ -478,20 +329,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async deleteDeploymentById(deploymentId: string): Promise<boolean> {
+  async addProject (userId: string, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
-    const deploymentRepository = this.dataSource.getRepository(Deployment);
-    const deployment = await deploymentRepository.findOneOrFail({
-      where: {
-        id: deploymentId
-      }
-    });
-
-    const deleteResult = await deploymentRepository.softRemove(deployment);
-
-    return Boolean(deleteResult);
-  }
-
-  async addProject(user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     // TODO: Check if organization exists
@@ -501,35 +339,27 @@ export class Database {
     // TODO: Set icon according to framework
     newProject.icon = '';
 
-    newProject.owner = user;
+    newProject.owner = Object.assign(new User(), {
+      id: userId
+    });
 
     newProject.organization = Object.assign(new Organization(), {
       id: organizationId
     });
 
+    newProject.subDomain = `${newProject.name}.${PROJECT_DOMAIN}`;
+
     return projectRepository.save(newProject);
   }
 
-  async saveProject(project: Project): Promise<Project> {
+  async updateProjectById (projectId: string, data: DeepPartial<Project>): Promise<boolean> {
     const projectRepository = this.dataSource.getRepository(Project);
-
+    const updateResult = await projectRepository.update({ id: projectId }, data);
-    return projectRepository.save(project);
-  }
-
-  async updateProjectById(
-    projectId: string,
-    data: DeepPartial<Project>
-  ): Promise<boolean> {
-    const projectRepository = this.dataSource.getRepository(Project);
-    const updateResult = await projectRepository.update(
-      { id: projectId },
-      data
-    );
 
     return Boolean(updateResult.affected);
   }
 
-  async deleteProjectById(projectId: string): Promise<boolean> {
+  async deleteProjectById (projectId: string): Promise<boolean> {
     const projectRepository = this.dataSource.getRepository(Project);
     const project = await projectRepository.findOneOrFail({
       where: {
@@ -545,7 +375,7 @@ export class Database {
     return Boolean(deleteResult);
   }
 
-  async deleteDomainById(domainId: string): Promise<boolean> {
+  async deleteDomainById (domainId: string): Promise<boolean> {
     const domainRepository = this.dataSource.getRepository(Domain);
 
     const deleteResult = await domainRepository.softDelete({ id: domainId });
@@ -557,34 +387,28 @@ export class Database {
     }
   }
 
-  async addDomain(data: DeepPartial<Domain>): Promise<Domain> {
+  async addDomain (data: DeepPartial<Domain>): Promise<Domain> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const newDomain = await domainRepository.save(data);
 
     return newDomain;
   }
 
-  async getDomain(options: FindOneOptions<Domain>): Promise<Domain | null> {
+  async getDomain (options: FindOneOptions<Domain>): Promise<Domain | null> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const domain = await domainRepository.findOne(options);
 
     return domain;
   }
 
-  async updateDomainById(
+  async updateDomainById (domainId: string, data: DeepPartial<Domain>): Promise<boolean> {
-    domainId: string,
-    data: DeepPartial<Domain>
-  ): Promise<boolean> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const updateResult = await domainRepository.update({ id: domainId }, data);
 
     return Boolean(updateResult.affected);
   }
 
-  async getDomainsByProjectId(
+  async getDomainsByProjectId (projectId: string, filter?: FindOptionsWhere<Domain>): Promise<Domain[]> {
-    projectId: string,
-    filter?: FindOptionsWhere<Domain>
-  ): Promise<Domain[]> {
     const domainRepository = this.dataSource.getRepository(Domain);
 
     const domains = await domainRepository.find({
@@ -601,24 +425,4 @@ export class Database {
 
     return domains;
   }
-
-  async addDeployer(data: DeepPartial<Deployer>): Promise<Deployer> {
-    const deployerRepository = this.dataSource.getRepository(Deployer);
-    const newDomain = await deployerRepository.save(data);
-
-    return newDomain;
-  }
-
-  async getDeployers(): Promise<Deployer[]> {
-    const deployerRepository = this.dataSource.getRepository(Deployer);
-    const deployers = await deployerRepository.find();
-    return deployers;
-  }
-
-  async getDeployerByLRN(deployerLrn: string): Promise<Deployer | null> {
-    const deployerRepository = this.dataSource.getRepository(Deployer);
-    const deployer = await deployerRepository.findOne({ where: { deployerLrn } });
-
-    return deployer;
-  }
 }

packages/backend/src/entity/Deployer.ts

@@ -1,26 +0,0 @@
-import { Entity, PrimaryColumn, Column, ManyToMany } from 'typeorm';
-import { Project } from './Project';
-
-@Entity()
-export class Deployer {
-  @PrimaryColumn('varchar')
-    deployerLrn!: string;
-
-  @Column('varchar')
-    deployerId!: string;
-
-  @Column('varchar')
-    deployerApiUrl!: string;
-
-  @Column('varchar')
-    baseDomain!: string;
-
-  @Column('varchar', { nullable: true })
-    minimumPayment!: string | null;
-
-  @Column('varchar', { nullable: true })
-    paymentAddress!: string | null;
-
-  @ManyToMany(() => Project, (project) => project.deployers)
-    projects!: Project[];
-}

packages/backend/src/entity/Deployment.ts

@@ -6,15 +6,13 @@ import {
   UpdateDateColumn,
   ManyToOne,
   OneToOne,
-  JoinColumn,
+  JoinColumn
-  DeleteDateColumn
 } from 'typeorm';
 
 import { Project } from './Project';
 import { Domain } from './Domain';
 import { User } from './User';
-import { Deployer } from './Deployer';
+import { AppDeploymentRecordAttributes } from '../types';
-import { AppDeploymentRecordAttributes, AppDeploymentRemovalRecordAttributes } from '../types';
 
 export enum Environment {
   Production = 'Production',
@@ -26,42 +24,20 @@ export enum DeploymentStatus {
   Building = 'Building',
   Ready = 'Ready',
   Error = 'Error',
-  Deleting = 'Deleting',
 }
 
-export interface ApplicationDeploymentRequest {
-  type: string;
-  version: string;
-  name: string;
-  application: string;
-  lrn?: string;
-  auction?: string;
-  config: string;
-  meta: string;
-  payment?: string;
-}
-
-export interface ApplicationDeploymentRemovalRequest {
-  type: string;
-  version: string;
-  deployment: string;
-  auction?: string;
-  payment?: string;
-}
-
-
 export interface ApplicationRecord {
   type: string;
-  version: string;
+  version:string
-  name: string;
+  name: string
-  description?: string;
+  description?: string
-  homepage?: string;
+  homepage?: string
-  license?: string;
+  license?: string
-  author?: string;
+  author?: string
-  repository?: string[];
+  repository?: string[],
-  app_version?: string;
+  app_version?: string
-  repository_ref: string;
+  repository_ref: string
-  app_type: string;
+  app_type: string
 }
 
 @Entity()
@@ -102,34 +78,12 @@ export class Deployment {
   @Column('simple-json')
     applicationRecordData!: ApplicationRecord;
 
-  @Column('varchar', { nullable: true })
-    applicationDeploymentRequestId!: string | null;
-
-  @Column('simple-json', { nullable: true })
-    applicationDeploymentRequestData!: ApplicationDeploymentRequest | null;
-
   @Column('varchar', { nullable: true })
     applicationDeploymentRecordId!: string | null;
 
   @Column('simple-json', { nullable: true })
     applicationDeploymentRecordData!: AppDeploymentRecordAttributes | null;
 
-  @Column('varchar', { nullable: true })
-    applicationDeploymentRemovalRequestId!: string | null;
-
-  @Column('simple-json', { nullable: true })
-    applicationDeploymentRemovalRequestData!: ApplicationDeploymentRemovalRequest | null;
-
-  @Column('varchar', { nullable: true })
-    applicationDeploymentRemovalRecordId!: string | null;
-
-  @Column('simple-json', { nullable: true })
-    applicationDeploymentRemovalRecordData!: AppDeploymentRemovalRecordAttributes | null;
-
-  @ManyToOne(() => Deployer)
-  @JoinColumn({ name: 'deployerLrn' })
-    deployer!: Deployer;
-
   @Column({
     enum: Environment
   })
@@ -152,7 +106,4 @@ export class Deployment {
 
   @UpdateDateColumn()
     updatedAt!: Date;
-
-  @DeleteDateColumn()
-    deletedAt!: Date | null;
 }

packages/backend/src/entity/Organization.ts

@@ -27,12 +27,8 @@ export class Organization {
   @UpdateDateColumn()
     updatedAt!: Date;
 
-  @OneToMany(
+  @OneToMany(() => UserOrganization, userOrganization => userOrganization.organization, {
-    () => UserOrganization,
-    (userOrganization) => userOrganization.organization,
-    {
     cascade: ['soft-remove']
-    }
+  })
-  )
     userOrganizations!: UserOrganization[];
 }

packages/backend/src/entity/Project.ts

@@ -7,16 +7,22 @@ import {
   ManyToOne,
   JoinColumn,
   OneToMany,
-  DeleteDateColumn,
+  DeleteDateColumn
-  JoinTable,
-  ManyToMany
 } from 'typeorm';
 
 import { User } from './User';
 import { Organization } from './Organization';
 import { ProjectMember } from './ProjectMember';
 import { Deployment } from './Deployment';
-import { Deployer } from './Deployer';
+
+export interface ApplicationDeploymentRequest {
+  type: string
+  version: string
+  name: string
+  application: string
+  config: string,
+  meta: string
+}
 
 @Entity()
 export class Project {
@@ -46,23 +52,15 @@ export class Project {
   @Column('varchar', { length: 255, default: 'main' })
     prodBranch!: string;
 
+  @Column('varchar', { nullable: true })
+    applicationDeploymentRequestId!: string | null;
+
+  @Column('simple-json', { nullable: true })
+    applicationDeploymentRequestData!: ApplicationDeploymentRequest | null;
+
   @Column('text', { default: '' })
     description!: string;
 
-  @Column('varchar', { nullable: true })
-    auctionId!: string | null;
-
-  // Tx hash for sending coins from snowball to deployer
-  @Column('varchar', { nullable: true })
-    txHash!: string | null;
-
-  @ManyToMany(() => Deployer, (deployer) => (deployer.projects))
-  @JoinTable()
-    deployers!: Deployer[]
-
-  @Column('boolean', { default: false, nullable: true })
-    fundsReleased!: boolean;
-
   // TODO: Compute template & framework in import repository
   @Column('varchar', { nullable: true })
     template!: string | null;
@@ -70,10 +68,6 @@ export class Project {
   @Column('varchar', { nullable: true })
     framework!: string | null;
 
-  // Address of the user who created the project i.e. requested deployments
-  @Column('varchar')
-    paymentAddress!: string;
-
   @Column({
     type: 'simple-array'
   })
@@ -82,6 +76,9 @@ export class Project {
   @Column('varchar')
     icon!: string;
 
+  @Column('varchar')
+    subDomain!: string;
+
   @CreateDateColumn()
     createdAt!: Date;
 
@@ -94,7 +91,7 @@ export class Project {
   @OneToMany(() => Deployment, (deployment) => deployment.project)
     deployments!: Deployment[];
 
-  @OneToMany(() => ProjectMember, (projectMember) => projectMember.project, {
+  @OneToMany(() => ProjectMember, projectMember => projectMember.project, {
     cascade: ['soft-remove']
   })
     projectMembers!: ProjectMember[];

packages/backend/src/entity/ProjectMember.ts

@@ -15,7 +15,7 @@ import { User } from './User';
 
 export enum Permission {
   View = 'View',
-  Edit = 'Edit',
+  Edit = 'Edit'
 }
 
 @Entity()

packages/backend/src/entity/User.ts

@@ -12,15 +12,10 @@ import { UserOrganization } from './UserOrganization';
 
 @Entity()
 @Unique(['email'])
-@Unique(['ethAddress'])
 export class User {
   @PrimaryGeneratedColumn('uuid')
     id!: string;
 
-  // TODO: Set ethAddress as ID
-  @Column()
-    ethAddress!: string;
-
   @Column('varchar', { length: 255, nullable: true })
     name!: string | null;
 
@@ -39,23 +34,13 @@ export class User {
   @CreateDateColumn()
     updatedAt!: Date;
 
-  @Column()
+  @OneToMany(() => ProjectMember, projectMember => projectMember.project, {
-    subOrgId!: string;
-
-  @Column()
-    turnkeyWalletId!: string;
-
-  @OneToMany(() => ProjectMember, (projectMember) => projectMember.project, {
     cascade: ['soft-remove']
   })
     projectMembers!: ProjectMember[];
 
-  @OneToMany(
+  @OneToMany(() => UserOrganization, UserOrganization => UserOrganization.member, {
-    () => UserOrganization,
-    (UserOrganization) => UserOrganization.member,
-    {
     cascade: ['soft-remove']
-    }
+  })
-  )
     userOrganizations!: UserOrganization[];
 }

packages/backend/src/entity/UserOrganization.ts

@@ -12,7 +12,7 @@ import {
 import { User } from './User';
 import { Organization } from './Organization';
 
-export enum Role {
+enum Role {
   Owner = 'Owner',
   Maintainer = 'Maintainer',
   Reader = 'Reader',

packages/backend/src/index.ts

@@ -1,4 +1,3 @@
-import 'express-async-errors';
 import 'reflect-metadata';
 import debug from 'debug';
 import fs from 'fs';
@@ -10,6 +9,8 @@ import { Database } from './database';
 import { createAndStartServer } from './server';
 import { createResolvers } from './resolvers';
 import { getConfig } from './utils';
+import { Config } from './config';
+import { DEFAULT_CONFIG_FILE_PATH } from './constants';
 import { Service } from './service';
 import { Registry } from './registry';
 
@@ -17,28 +18,22 @@ const log = debug('snowball:server');
 const OAUTH_CLIENT_TYPE = 'oauth-app';
 
 export const main = async (): Promise<void> => {
-  const { server, database, gitHub, registryConfig } = await getConfig();
+  // TODO: get config path using cli
+  const { server, database, gitHub, registryConfig } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
   const app = new OAuthApp({
     clientType: OAUTH_CLIENT_TYPE,
     clientId: gitHub.oAuth.clientId,
-    clientSecret: gitHub.oAuth.clientSecret,
+    clientSecret: gitHub.oAuth.clientSecret
   });
 
   const db = new Database(database);
   await db.init();
 
   const registry = new Registry(registryConfig);
-  const service = new Service(
+  const service = new Service({ gitHubConfig: gitHub, registryConfig }, db, app, registry);
-    { gitHubConfig: gitHub, registryConfig },
-    db,
-    app,
-    registry,
-  );
 
-  const typeDefs = fs
+  const typeDefs = fs.readFileSync(path.join(__dirname, 'schema.gql')).toString();
-    .readFileSync(path.join(__dirname, 'schema.gql'))
-    .toString();
   const resolvers = await createResolvers(service);
 
   await createAndStartServer(server, typeDefs, resolvers, service);

packages/backend/src/registry.ts

@@ -1,89 +1,55 @@
-import assert from 'assert';
 import debug from 'debug';
-import { DateTime } from 'luxon';
+import assert from 'assert';
-import { Octokit } from 'octokit';
 import { inc as semverInc } from 'semver';
-import { DeepPartial } from 'typeorm';
+import { DateTime } from 'luxon';
 
-import { Account, DEFAULT_GAS_ESTIMATION_MULTIPLIER, Registry as LaconicRegistry, getGasPrice, parseGasAndFees } from '@cerc-io/registry-sdk';
+import { Registry as LaconicRegistry } from '@cerc-io/laconic-sdk';
-import { DeliverTxResponse, IndexedTx } from '@cosmjs/stargate';
 
 import { RegistryConfig } from './config';
-import {
+import { ApplicationDeploymentRequest } from './entity/Project';
-  ApplicationRecord,
+import { ApplicationRecord, Deployment } from './entity/Deployment';
-  Deployment,
+import { AppDeploymentRecord, PackageJSON } from './types';
-  ApplicationDeploymentRequest,
-  ApplicationDeploymentRemovalRequest
-} from './entity/Deployment';
-import { AppDeploymentRecord, AppDeploymentRemovalRecord, AuctionParams, DeployerRecord } from './types';
-import { getConfig, getRepoDetails, registryTransactionWithRetry, sleep } from './utils';
 
 const log = debug('snowball:registry');
 
 const APP_RECORD_TYPE = 'ApplicationRecord';
-const APP_DEPLOYMENT_AUCTION_RECORD_TYPE = 'ApplicationDeploymentAuction';
 const APP_DEPLOYMENT_REQUEST_TYPE = 'ApplicationDeploymentRequest';
-const APP_DEPLOYMENT_REMOVAL_REQUEST_TYPE = 'ApplicationDeploymentRemovalRequest';
 const APP_DEPLOYMENT_RECORD_TYPE = 'ApplicationDeploymentRecord';
-const APP_DEPLOYMENT_REMOVAL_RECORD_TYPE = 'ApplicationDeploymentRemovalRecord';
-const WEBAPP_DEPLOYER_RECORD_TYPE = 'WebappDeployer'
-const SLEEP_DURATION = 1000;
 
-// TODO: Move registry code to registry-sdk/watcher-ts
+// TODO: Move registry code to laconic-sdk/watcher-ts
 export class Registry {
   private registry: LaconicRegistry;
   private registryConfig: RegistryConfig;
 
-  constructor(registryConfig: RegistryConfig) {
+  constructor (registryConfig : RegistryConfig) {
     this.registryConfig = registryConfig;
-
+    this.registry = new LaconicRegistry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, registryConfig.chainId);
-    const gasPrice = getGasPrice(registryConfig.fee.gasPrice);
-
-    this.registry = new LaconicRegistry(
-      registryConfig.gqlEndpoint,
-      registryConfig.restEndpoint,
-      { chainId: registryConfig.chainId, gasPrice }
-    );
   }
 
-  async createApplicationRecord({
+  async createApplicationRecord ({
-    octokit,
+    packageJSON,
-    repository,
     commitHash,
     appType,
+    repoUrl
   }: {
-    octokit: Octokit
+    packageJSON: PackageJSON
-    repository: string;
+    commitHash: string,
-    commitHash: string;
+    appType: string,
-    appType: string;
+    repoUrl: string
-  }): Promise<{
+  }): Promise<{applicationRecordId: string, applicationRecordData: ApplicationRecord}> {
-    applicationRecordId: string;
+    assert(packageJSON.name, "name field doesn't exist in package.json");
-    applicationRecordData: ApplicationRecord;
+    // Use laconic-sdk to publish record
-  }> {
-    const { repo, repoUrl, packageJSON } = await getRepoDetails(octokit, repository, commitHash)
-    // Use registry-sdk to publish record
     // Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts/publish-app-record.sh
     // Fetch previous records
-    const records = await this.registry.queryRecords(
+    const records = await this.registry.queryRecords({
-      {
       type: APP_RECORD_TYPE,
       name: packageJSON.name
-      },
+    }, true);
-      true
-    );
 
     // Get next version of record
-    const bondRecords = records.filter(
+    const bondRecords = records.filter((record: any) => record.bondId === this.registryConfig.bondId);
-      (record: any) => record.bondId === this.registryConfig.bondId
+    const [latestBondRecord] = bondRecords.sort((a: any, b: any) => new Date(b.createTime).getTime() - new Date(a.createTime).getTime());
-    );
+    const nextVersion = semverInc(latestBondRecord?.attributes.version ?? '0.0.0', 'patch');
-    const [latestBondRecord] = bondRecords.sort(
-      (a: any, b: any) =>
-        new Date(b.createTime).getTime() - new Date(a.createTime).getTime()
-    );
-    const nextVersion = semverInc(
-      latestBondRecord?.attributes.version ?? '0.0.0',
-      'patch'
-    );
 
     assert(nextVersion, 'Application record version not valid');
 
@@ -94,171 +60,52 @@ export class Registry {
       repository_ref: commitHash,
       repository: [repoUrl],
       app_type: appType,
-      name: repo,
+      name: packageJSON.name,
       ...(packageJSON.description && { description: packageJSON.description }),
       ...(packageJSON.homepage && { homepage: packageJSON.homepage }),
       ...(packageJSON.license && { license: packageJSON.license }),
-      ...(packageJSON.author && {
+      ...(packageJSON.author && { author: typeof packageJSON.author === 'object' ? JSON.stringify(packageJSON.author) : packageJSON.author }),
-        author:
-          typeof packageJSON.author === 'object'
-            ? JSON.stringify(packageJSON.author)
-            : packageJSON.author
-      }),
       ...(packageJSON.version && { app_version: packageJSON.version })
     };
 
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
+    const result = await this.registry.setRecord(
-
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
       {
         privateKey: this.registryConfig.privateKey,
         record: applicationRecord,
         bondId: this.registryConfig.bondId
       },
-        this.registryConfig.privateKey,
+      '',
-        fee
+      this.registryConfig.fee
-      )
     );
 
-    log(`Published application record ${result.id}`);
     log('Application record data:', applicationRecord);
 
-    // TODO: Discuss computation of LRN
+    // TODO: Discuss computation of CRN
-    const lrn = this.getLrn(repo);
+    const crn = this.getCrn(packageJSON.name);
-    log(`Setting name: ${lrn} for record ID: ${result.id}`);
+    log(`Setting name: ${crn} for record ID: ${result.data.id}`);
 
-    await sleep(SLEEP_DURATION);
+    await this.registry.setName({ cid: result.data.id, crn }, this.registryConfig.privateKey, this.registryConfig.fee);
-    await registryTransactionWithRetry(() =>
+    await this.registry.setName({ cid: result.data.id, crn: `${crn}@${applicationRecord.app_version}` }, this.registryConfig.privateKey, this.registryConfig.fee);
-      this.registry.setName(
+    await this.registry.setName({ cid: result.data.id, crn: `${crn}@${applicationRecord.repository_ref}` }, this.registryConfig.privateKey, this.registryConfig.fee);
-        {
-          cid: result.id,
-          lrn
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
 
-    await sleep(SLEEP_DURATION);
+    return { applicationRecordId: result.data.id, applicationRecordData: applicationRecord };
-    await registryTransactionWithRetry(() =>
-      this.registry.setName(
-        {
-          cid: result.id,
-          lrn: `${lrn}@${applicationRecord.app_version}`
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
-
-    await sleep(SLEEP_DURATION);
-    await registryTransactionWithRetry(() =>
-      this.registry.setName(
-        {
-          cid: result.id,
-          lrn: `${lrn}@${applicationRecord.repository_ref}`
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
-
-    return {
-      applicationRecordId: result.id,
-      applicationRecordData: applicationRecord
-    };
   }
 
-  async createApplicationDeploymentAuction(
+  async createApplicationDeploymentRequest (data: {
-    appName: string,
-    octokit: Octokit,
-    auctionParams: AuctionParams,
-    data: DeepPartial<Deployment>,
-  ): Promise<{
-    applicationDeploymentAuctionId: string;
-  }> {
-    assert(data.project?.repository, 'Project repository not found');
-
-    await this.createApplicationRecord({
-      octokit,
-      repository: data.project.repository,
-      appType: data.project!.template!,
-      commitHash: data.commitHash!,
-    });
-
-    const lrn = this.getLrn(appName);
-    const config = await getConfig();
-    const auctionConfig = config.auction;
-
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
-    const auctionResult = await registryTransactionWithRetry(() =>
-      this.registry.createProviderAuction(
-        {
-          commitFee: auctionConfig.commitFee,
-          commitsDuration: auctionConfig.commitsDuration,
-          revealFee: auctionConfig.revealFee,
-          revealsDuration: auctionConfig.revealsDuration,
-          denom: auctionConfig.denom,
-          maxPrice: auctionParams.maxPrice,
-          numProviders: auctionParams.numProviders,
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
-
-    if (!auctionResult.auction) {
-      throw new Error('Error creating auction');
-    }
-
-    // Create record of type applicationDeploymentAuction and publish
-    const applicationDeploymentAuction = {
-      application: lrn,
-      auction: auctionResult.auction.id,
-      type: APP_DEPLOYMENT_AUCTION_RECORD_TYPE,
-    };
-
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
-        {
-          privateKey: this.registryConfig.privateKey,
-          record: applicationDeploymentAuction,
-          bondId: this.registryConfig.bondId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
-
-    log(`Application deployment auction created: ${auctionResult.auction.id}`);
-    log(`Application deployment auction record published: ${result.id}`);
-    log('Application deployment auction data:', applicationDeploymentAuction);
-
-    return {
-      applicationDeploymentAuctionId: auctionResult.auction.id,
-    };
-  }
-
-  async createApplicationDeploymentRequest(data: {
-    deployment: Deployment,
     appName: string,
+    commitHash: string,
     repository: string,
-    auctionId?: string | null,
+    environmentVariables: { [key: string]: string }
-    lrn: string,
-    environmentVariables: { [key: string]: string },
-    dns: string,
-    payment?: string | null
   }): Promise<{
-    applicationDeploymentRequestId: string;
+    applicationDeploymentRequestId: string,
-    applicationDeploymentRequestData: ApplicationDeploymentRequest;
+    applicationDeploymentRequestData: ApplicationDeploymentRequest
   }> {
-    const lrn = this.getLrn(data.appName);
+    const crn = this.getCrn(data.appName);
-    const records = await this.registry.resolveNames([lrn]);
+    const records = await this.registry.resolveNames([crn]);
     const applicationRecord = records[0];
 
     if (!applicationRecord) {
-      throw new Error(`No record found for ${lrn}`);
+      throw new Error(`No record found for ${crn}`);
     }
 
     // Create record of type ApplicationDeploymentRequest and publish
@@ -266,270 +113,60 @@ export class Registry {
       type: APP_DEPLOYMENT_REQUEST_TYPE,
       version: '1.0.0',
       name: `${applicationRecord.attributes.name}@${applicationRecord.attributes.app_version}`,
-      application: `${lrn}@${applicationRecord.attributes.app_version}`,
+      application: `${crn}@${applicationRecord.attributes.app_version}`,
-      dns: data.dns,
+
+      // TODO: Not set in test-progressive-web-app CI
+      // dns: '$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME',
+      // deployment: '$CERC_REGISTRY_DEPLOYMENT_CRN',
 
       // https://git.vdb.to/cerc-io/laconic-registry-cli/commit/129019105dfb93bebcea02fde0ed64d0f8e5983b
       config: JSON.stringify({
         env: data.environmentVariables
       }),
       meta: JSON.stringify({
-        note: `Added by Snowball @ ${DateTime.utc().toFormat(
+        note: `Added by Snowball @ ${DateTime.utc().toFormat('EEE LLL dd HH:mm:ss \'UTC\' yyyy')}`,
-          "EEE LLL dd HH:mm:ss 'UTC' yyyy"
-        )}`,
         repository: data.repository,
-        repository_ref: data.deployment.commitHash
+        repository_ref: data.commitHash
-      }),
+      })
-      deployer: data.lrn,
-      ...(data.auctionId && { auction: data.auctionId }),
-      ...(data.payment && { payment: data.payment }),
     };
 
-    await sleep(SLEEP_DURATION);
+    const result = await this.registry.setRecord(
-
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
-
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
       {
         privateKey: this.registryConfig.privateKey,
         record: applicationDeploymentRequest,
         bondId: this.registryConfig.bondId
       },
-        this.registryConfig.privateKey,
+      '',
-        fee
+      this.registryConfig.fee
-      )
     );
-
+    log(`Application deployment request record published: ${result.data.id}`);
-    log(`Application deployment request record published: ${result.id}`);
     log('Application deployment request data:', applicationDeploymentRequest);
 
-    return {
+    return { applicationDeploymentRequestId: result.data.id, applicationDeploymentRequestData: applicationDeploymentRequest };
-      applicationDeploymentRequestId: result.id,
-      applicationDeploymentRequestData: applicationDeploymentRequest
-    };
-  }
-
-  async getAuctionWinningDeployerRecords(
-    auctionId: string
-  ): Promise<DeployerRecord[]> {
-    const records = await this.registry.getAuctionsByIds([auctionId]);
-    const auctionResult = records[0];
-
-    let deployerRecords = [];
-    const { winnerAddresses } = auctionResult;
-
-    for (const auctionWinner of winnerAddresses) {
-      const records = await this.getDeployerRecordsByFilter({
-        paymentAddress: auctionWinner,
-      });
-
-      const newRecords = records.filter(record => {
-        return record.names !== null && record.names.length > 0;
-      });
-
-      for (const record of newRecords) {
-        if (record.id) {
-          deployerRecords.push(record);
-          break;
-        }
-      }
-    }
-
-    return deployerRecords;
-  }
-
-  async releaseDeployerFunds(
-    auctionId: string
-  ): Promise<any> {
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
-    const auction = await registryTransactionWithRetry(() =>
-      this.registry.releaseFunds(
-        {
-          auctionId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
-
-    return auction;
   }
 
   /**
    * Fetch ApplicationDeploymentRecords for deployments
    */
-  async getDeploymentRecords(
+  async getDeploymentRecords (deployments: Deployment[]): Promise<AppDeploymentRecord[]> {
-    deployments: Deployment[]
-  ): Promise<AppDeploymentRecord[]> {
     // Fetch ApplicationDeploymentRecords for corresponding ApplicationRecord set in deployments
     // TODO: Implement Laconicd GQL query to filter records by multiple values for an attribute
-    const records = await this.registry.queryRecords(
+    const records = await this.registry.queryRecords({
-      {
       type: APP_DEPLOYMENT_RECORD_TYPE
-      },
+    }, true);
-      true
-    );
 
-    // Filter records with ApplicationDeploymentRequestId ID and Deployment specific URL
+    // Filter records with ApplicationRecord ids
-    return records.filter((record: AppDeploymentRecord) =>
+    return records.filter((record: AppDeploymentRecord) => deployments.some(deployment => deployment.applicationRecordId === record.attributes.application));
-      deployments.some(
-        (deployment) =>
-          deployment.applicationDeploymentRequestId === record.attributes.request &&
-          record.attributes.url.includes(deployment.id)
-      )
-    );
   }
 
-  /**
+  getCrn (packageJsonName: string): string {
-   * Fetch WebappDeployer Records by filter
+    const [arg1, arg2] = packageJsonName.split('/');
-   */
+
-  async getDeployerRecordsByFilter(filter: { [key: string]: any }): Promise<DeployerRecord[]> {
+    if (arg2) {
-    return this.registry.queryRecords(
+      const authority = arg1.replace('@', '');
-      {
+      return `crn://${authority}/applications/${arg2}`;
-        type: WEBAPP_DEPLOYER_RECORD_TYPE,
-        ...filter
-      },
-      true
-    );
     }
 
-  /**
+    return `crn://${arg1}/applications/${arg1}`;
-   * Fetch ApplicationDeploymentRecords by filter
-   */
-  async getDeploymentRecordsByFilter(filter: { [key: string]: any }): Promise<AppDeploymentRecord[]> {
-    return this.registry.queryRecords(
-      {
-        type: APP_DEPLOYMENT_RECORD_TYPE,
-        ...filter
-      },
-      true
-    );
-  }
-
-  /**
-   * Fetch ApplicationDeploymentRemovalRecords for deployments
-   */
-  async getDeploymentRemovalRecords(
-    deployments: Deployment[]
-  ): Promise<AppDeploymentRemovalRecord[]> {
-    // Fetch ApplicationDeploymentRemovalRecords for corresponding ApplicationDeploymentRecord set in deployments
-    const records = await this.registry.queryRecords(
-      {
-        type: APP_DEPLOYMENT_REMOVAL_RECORD_TYPE
-      },
-      true
-    );
-
-    // Filter records with ApplicationDeploymentRecord and ApplicationDeploymentRemovalRequest IDs
-    return records.filter((record: AppDeploymentRemovalRecord) =>
-      deployments.some(
-        (deployment) =>
-          deployment.applicationDeploymentRemovalRequestId === record.attributes.request &&
-          deployment.applicationDeploymentRecordId === record.attributes.deployment
-      )
-    );
-  }
-
-  async createApplicationDeploymentRemovalRequest(data: {
-    deploymentId: string;
-    deployerLrn: string;
-    auctionId?: string | null;
-    payment?: string | null;
-  }): Promise<{
-    applicationDeploymentRemovalRequestId: string;
-    applicationDeploymentRemovalRequestData: ApplicationDeploymentRemovalRequest;
-  }> {
-    const applicationDeploymentRemovalRequest = {
-      type: APP_DEPLOYMENT_REMOVAL_REQUEST_TYPE,
-      version: '1.0.0',
-      deployment: data.deploymentId,
-      deployer: data.deployerLrn,
-      ...(data.auctionId && { auction: data.auctionId }),
-      ...(data.payment && { payment: data.payment }),
-    };
-
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
-
-    const result = await registryTransactionWithRetry(() =>
-      this.registry.setRecord(
-        {
-          privateKey: this.registryConfig.privateKey,
-          record: applicationDeploymentRemovalRequest,
-          bondId: this.registryConfig.bondId
-        },
-        this.registryConfig.privateKey,
-        fee
-      )
-    );
-
-    log(`Application deployment removal request record published: ${result.id}`);
-    log('Application deployment removal request data:', applicationDeploymentRemovalRequest);
-
-    return {
-      applicationDeploymentRemovalRequestId: result.id,
-      applicationDeploymentRemovalRequestData: applicationDeploymentRemovalRequest
-    };
-  }
-
-  async getCompletedAuctionIds(auctionIds: string[]): Promise<string[]> {
-    if (auctionIds.length === 0) {
-      return [];
-    }
-
-    const auctions = await this.registry.getAuctionsByIds(auctionIds);
-
-    const completedAuctions = auctions
-      .filter((auction: { id: string, status: string }) => auction.status === 'completed')
-      .map((auction: { id: string, status: string }) => auction.id);
-
-    return completedAuctions;
-  }
-
-  async getRecordsByName(name: string): Promise<any> {
-    return this.registry.resolveNames([name]);
-  }
-
-  async getAuctionData(auctionId: string): Promise<any> {
-    return this.registry.getAuctionsByIds([auctionId]);
-  }
-
-  async sendTokensToAccount(receiverAddress: string, amount: string): Promise<DeliverTxResponse> {
-    const fee = parseGasAndFees(this.registryConfig.fee.gas, this.registryConfig.fee.fees);
-    const account = await this.getAccount();
-    const laconicClient = await this.registry.getLaconicClient(account);
-    const txResponse: DeliverTxResponse =
-      await registryTransactionWithRetry(() =>
-        laconicClient.sendTokens(account.address, receiverAddress,
-          [
-            {
-              denom: 'alnt',
-              amount
-            }
-          ],
-          fee || DEFAULT_GAS_ESTIMATION_MULTIPLIER)
-      );
-
-    return txResponse;
-  }
-
-  async getAccount(): Promise<Account> {
-    const account = new Account(Buffer.from(this.registryConfig.privateKey, 'hex'));
-    await account.init();
-
-    return account;
-  }
-
-  async getTxResponse(txHash: string): Promise<IndexedTx | null> {
-    const account = await this.getAccount();
-    const laconicClient = await this.registry.getLaconicClient(account);
-    const txResponse: IndexedTx | null = await laconicClient.getTx(txHash);
-
-    return txResponse;
-  }
-
-  getLrn(appName: string): string {
-    assert(this.registryConfig.authority, "Authority doesn't exist");
-    return `lrn://${this.registryConfig.authority}/applications/${appName}`;
   }
 }

packages/backend/src/resolvers.ts

@@ -6,7 +6,6 @@ import { Permission } from './entity/ProjectMember';
 import { Domain } from './entity/Domain';
 import { Project } from './entity/Project';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
-import { AddProjectFromTemplateInput, AuctionParams, EnvironmentVariables } from './types';
 
 const log = debug('snowball:resolver');
 
@@ -15,36 +14,26 @@ export const createResolvers = async (service: Service): Promise<any> => {
     Query: {
       // TODO: add custom type for context
       user: (_: any, __: any, context: any) => {
-        return context.user;
+        return service.getUser(context.userId);
       },
 
-      organizations: async (_: any, __: any, context: any) => {
+      organizations: async (_:any, __: any, context: any) => {
-        return service.getOrganizationsByUserId(context.user);
+        return service.getOrganizationsByUserId(context.userId);
       },
 
-      project: async (_: any, { projectId }: { projectId: string }, context: any) => {
+      project: async (_: any, { projectId }: { projectId: string }) => {
-        return service.getProjectById(context.user, projectId);
+        return service.getProjectById(projectId);
       },
 
-      projectsInOrganization: async (
+      projectsInOrganization: async (_: any, { organizationSlug }: {organizationSlug: string }, context: any) => {
-        _: any,
+        return service.getProjectsInOrganization(context.userId, organizationSlug);
-        { organizationSlug }: { organizationSlug: string },
-        context: any,
-      ) => {
-        return service.getProjectsInOrganization(
-          context.user,
-          organizationSlug,
-        );
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
         return service.getDeploymentsByProjectId(projectId);
       },
 
-      environmentVariables: async (
+      environmentVariables: async (_: any, { projectId }: { projectId: string }) => {
-        _: any,
-        { projectId }: { projectId: string },
-      ) => {
         return service.getEnvironmentVariablesByProjectId(projectId);
       },
 
@@ -52,81 +41,32 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectMembersByProjectId(projectId);
       },
 
-      searchProjects: async (
+      searchProjects: async (_: any, { searchText }: { searchText: string }, context: any) => {
-        _: any,
+        return service.searchProjects(context.userId, searchText);
-        { searchText }: { searchText: string },
-        context: any,
-      ) => {
-        return service.searchProjects(context.user, searchText);
       },
 
-      domains: async (
+      domains: async (_:any, { projectId, filter }: { projectId: string, filter?: FindOptionsWhere<Domain> }) => {
-        _: any,
-        {
-          projectId,
-          filter,
-        }: { projectId: string; filter?: FindOptionsWhere<Domain> },
-      ) => {
         return service.getDomainsByProjectId(projectId, filter);
-      },
+      }
-
-      getAuctionData: async (
-        _: any,
-        { auctionId }: { auctionId: string },
-      ) => {
-        return service.getAuctionData(auctionId);
-      },
-
-      deployers: async (_: any, __: any, context: any) => {
-        return service.getDeployers();
-      },
-
-      address: async (_: any, __: any, context: any) => {
-        return service.getAddress();
-      },
-
-      verifyTx: async (
-        _: any,
-        {
-          txHash,
-          amount,
-          senderAddress,
-        }: { txHash: string; amount: string; senderAddress: string },
-      ) => {
-        return service.verifyTx(txHash, amount, senderAddress);
-      },
     },
 
     // TODO: Return error in GQL response
     Mutation: {
-      removeProjectMember: async (
+      removeProjectMember: async (_: any, { projectMemberId }: { projectMemberId: string }, context: any) => {
-        _: any,
-        { projectMemberId }: { projectMemberId: string },
-        context: any,
-      ) => {
         try {
-          return await service.removeProjectMember(
+          return await service.removeProjectMember(context.userId, projectMemberId);
-            context.user,
-            projectMemberId,
-          );
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      updateProjectMember: async (
+      updateProjectMember: async (_: any, { projectMemberId, data }: {
-        _: any,
+        projectMemberId: string,
-        {
-          projectMemberId,
-          data,
-        }: {
-          projectMemberId: string;
         data: {
-            permissions: Permission[];
+          permissions: Permission[]
-          };
+        }
-        },
+      }) => {
-      ) => {
         try {
           return await service.updateProjectMember(projectMemberId, data);
         } catch (err) {
@@ -135,19 +75,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      addProjectMember: async (
+      addProjectMember: async (_: any, { projectId, data }: {
-        _: any,
+        projectId: string,
-        {
-          projectId,
-          data,
-        }: {
-          projectId: string;
         data: {
-            email: string;
+          email: string,
-            permissions: Permission[];
+          permissions: Permission[]
-          };
+        }
-        },
+      }) => {
-      ) => {
         try {
           return Boolean(await service.addProjectMember(projectId, data));
         } catch (err) {
@@ -156,51 +90,25 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      addEnvironmentVariables: async (
+      addEnvironmentVariables: async (_: any, { projectId, data }: { projectId: string, data: { environments: string[], key: string, value: string}[] }) => {
-        _: any,
-        {
-          projectId,
-          data,
-        }: {
-          projectId: string;
-          data: { environments: string[]; key: string; value: string }[];
-        },
-      ) => {
         try {
-          return Boolean(
+          return Boolean(await service.addEnvironmentVariables(projectId, data));
-            await service.addEnvironmentVariables(projectId, data),
-          );
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      updateEnvironmentVariable: async (
+      updateEnvironmentVariable: async (_: any, { environmentVariableId, data }: { environmentVariableId: string, data : DeepPartial<EnvironmentVariable>}) => {
-        _: any,
-        {
-          environmentVariableId,
-          data,
-        }: {
-          environmentVariableId: string;
-          data: DeepPartial<EnvironmentVariable>;
-        },
-      ) => {
         try {
-          return await service.updateEnvironmentVariable(
+          return await service.updateEnvironmentVariable(environmentVariableId, data);
-            environmentVariableId,
-            data,
-          );
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      removeEnvironmentVariable: async (
+      removeEnvironmentVariable: async (_: any, { environmentVariableId }: { environmentVariableId: string}) => {
-        _: any,
-        { environmentVariableId }: { environmentVariableId: string },
-      ) => {
         try {
           return await service.removeEnvironmentVariable(environmentVariableId);
         } catch (err) {
@@ -209,89 +117,25 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      updateDeploymentToProd: async (
+      updateDeploymentToProd: async (_: any, { deploymentId }: { deploymentId: string }, context: any) => {
-        _: any,
-        { deploymentId }: { deploymentId: string },
-        context: any,
-      ) => {
         try {
-          return Boolean(
+          return Boolean(await service.updateDeploymentToProd(context.userId, deploymentId));
-            await service.updateDeploymentToProd(context.user, deploymentId),
-          );
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      addProjectFromTemplate: async (
+      addProject: async (_: any, { organizationSlug, data }: { organizationSlug: string, data: DeepPartial<Project> }, context: any) => {
-        _: any,
-        {
-          organizationSlug,
-          data,
-          lrn,
-          auctionParams,
-          environmentVariables
-        }: {
-          organizationSlug: string;
-          data: AddProjectFromTemplateInput;
-          lrn: string;
-          auctionParams: AuctionParams;
-          environmentVariables: EnvironmentVariables[];
-        },
-        context: any,
-      ) => {
         try {
-          return await service.addProjectFromTemplate(
+          return await service.addProject(context.userId, organizationSlug, data);
-            context.user,
-            organizationSlug,
-            data,
-            lrn,
-            auctionParams,
-            environmentVariables
-          );
         } catch (err) {
           log(err);
           throw err;
         }
       },
 
-      addProject: async (
+      updateProject: async (_: any, { projectId, data }: { projectId: string, data: DeepPartial<Project> }) => {
-        _: any,
-        {
-          organizationSlug,
-          data,
-          lrn,
-          auctionParams,
-          environmentVariables
-        }: {
-          organizationSlug: string;
-          data: DeepPartial<Project>;
-          lrn: string;
-          auctionParams: AuctionParams,
-          environmentVariables: EnvironmentVariables[];
-        },
-        context: any,
-      ) => {
-        try {
-          return await service.addProject(
-            context.user,
-            organizationSlug,
-            data,
-            lrn,
-            auctionParams,
-            environmentVariables
-          );
-        } catch (err) {
-          log(err);
-          throw err;
-        }
-      },
-
-      updateProject: async (
-        _: any,
-        { projectId, data }: { projectId: string; data: DeepPartial<Project> },
-      ) => {
         try {
           return await service.updateProject(projectId, data);
         } catch (err) {
@@ -300,15 +144,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      redeployToProd: async (
+      redeployToProd: async (_: any, { deploymentId }: { deploymentId: string }, context: any) => {
-        _: any,
-        { deploymentId }: { deploymentId: string },
-        context: any,
-      ) => {
         try {
-          return Boolean(
+          return Boolean(await service.redeployToProd(context.userId, deploymentId));
-            await service.redeployToProd(context.user, deploymentId),
-          );
         } catch (err) {
           log(err);
           return false;
@@ -319,8 +157,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         try {
           return await service.deleteProject(projectId);
         } catch (err) {
-          log(err);
+          log(err); return false;
-          return false;
         }
       },
 
@@ -333,13 +170,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      rollbackDeployment: async (
+      rollbackDeployment: async (_: any, { projectId, deploymentId }: {deploymentId: string, projectId: string }) => {
-        _: any,
-        {
-          projectId,
-          deploymentId,
-        }: { deploymentId: string; projectId: string },
-      ) => {
         try {
           return await service.rollbackDeployment(projectId, deploymentId);
         } catch (err) {
@@ -348,22 +179,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      deleteDeployment: async (
+      addDomain: async (_: any, { projectId, data }: { projectId: string, data: { name: string } }) => {
-        _: any,
-        { deploymentId }: { deploymentId: string },
-      ) => {
-        try {
-          return await service.deleteDeployment(deploymentId);
-        } catch (err) {
-          log(err);
-          return false;
-        }
-      },
-
-      addDomain: async (
-        _: any,
-        { projectId, data }: { projectId: string; data: { name: string } },
-      ) => {
         try {
           return Boolean(await service.addDomain(projectId, data));
         } catch (err) {
@@ -372,10 +188,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      updateDomain: async (
+      updateDomain: async (_: any, { domainId, data }: { domainId: string, data: DeepPartial<Domain>}) => {
-        _: any,
-        { domainId, data }: { domainId: string; data: DeepPartial<Domain> },
-      ) => {
         try {
           return await service.updateDomain(domainId, data);
         } catch (err) {
@@ -384,13 +197,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      authenticateGitHub: async (
+      authenticateGitHub: async (_: any, { code }: { code: string }, context: any) => {
-        _: any,
-        { code }: { code: string },
-        context: any,
-      ) => {
         try {
-          return await service.authenticateGitHub(code, context.user);
+          return await service.authenticateGitHub(code, context.userId);
         } catch (err) {
           log(err);
           return false;
@@ -399,14 +208,12 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       unauthenticateGitHub: async (_: any, __: object, context: any) => {
         try {
-          return service.unauthenticateGitHub(context.user, {
+          return service.unauthenticateGitHub(context.userId, { gitHubToken: null });
-            gitHubToken: null,
-          });
         } catch (err) {
           log(err);
           return false;
         }
-      },
+      }
-    },
+    }
   };
 };

packages/backend/src/routes/auth.ts

@@ -1,106 +0,0 @@
-import { Router } from 'express';
-import { SiweMessage } from 'siwe';
-import { Service } from '../service';
-import { authenticateUser, createUser } from '../turnkey-backend';
-
-const router = Router();
-
-//
-// Turnkey
-//
-router.get('/registration/:email', async (req, res) => {
-  const service: Service = req.app.get('service');
-  const user = await service.getUserByEmail(req.params.email);
-  if (user) {
-    return res.send({ subOrganizationId: user?.subOrgId });
-  } else {
-    return res.sendStatus(204);
-  }
-});
-
-router.post('/register', async (req, res) => {
-  console.log('Register', req.body);
-  const { email, challenge, attestation } = req.body;
-  const user = await createUser(req.app.get('service'), {
-    challenge,
-    attestation,
-    userEmail: email,
-    userName: email.split('@')[0],
-  });
-  req.session.address = user.id;
-  res.sendStatus(200);
-});
-
-router.post('/authenticate', async (req, res) => {
-  console.log('Authenticate', req.body);
-  const { signedWhoamiRequest } = req.body;
-  const user = await authenticateUser(
-    req.app.get('service'),
-    signedWhoamiRequest,
-  );
-  if (user) {
-    req.session.address = user.id;
-    res.sendStatus(200);
-  } else {
-    res.sendStatus(401);
-  }
-});
-
-//
-// SIWE Auth
-//
-router.post('/validate', async (req, res) => {
-  const { message, signature } = req.body;
-  const { success, data } = await new SiweMessage(message).verify({
-    signature,
-  });
-
-  if (!success) {
-    return res.send({ success });
-  }
-  const service: Service = req.app.get('service');
-  const user = await service.getUserByEthAddress(data.address);
-
-  if (!user) {
-    const newUser = await service.createUser({
-      ethAddress: data.address,
-      email: `${data.address}@example.com`,
-      subOrgId: '',
-      turnkeyWalletId: '',
-    });
-
-    // SIWESession from the web3modal library requires both address and chain ID
-    req.session.address = newUser.id;
-    req.session.chainId = data.chainId;
-  } else {
-    req.session.address = user.id;
-    req.session.chainId = data.chainId;
-  }
-
-  res.send({ success });
-});
-
-//
-// General
-//
-router.get('/session', (req, res) => {
-  if (req.session.address && req.session.chainId) {
-    res.send({
-      address: req.session.address,
-      chainId: req.session.chainId
-    });
-  } else {
-    res.status(401).send({ error: 'Unauthorized: No active session' });
-  }
-});
-
-router.post('/logout', (req, res) => {
-  req.session.destroy((err) => {
-    if (err) {
-      return res.send({ success: false });
-    }
-    res.send({ success: true });
-  });
-});
-
-export default router;

packages/backend/src/routes/staging.ts

@@ -1,9 +0,0 @@
-import { Router } from 'express';
-
-const router = Router();
-
-router.get('/version', async (req, res) => {
-  return res.send({ version: '0.0.9' });
-});
-
-export default router;

packages/backend/src/schema.gql

@@ -19,14 +19,6 @@ enum DeploymentStatus {
   Building
   Ready
   Error
-  Deleting
-}
-
-enum AuctionStatus {
-  completed
-  reveal
-  commit
-  expired
 }
 
 enum DomainStatus {
@@ -72,13 +64,8 @@ type Project {
   repository: String!
   prodBranch: String!
   description: String
-  deployers: [Deployer!]
-  auctionId: String
-  fundsReleased: Boolean
   template: String
   framework: String
-  paymentAddress: String!
-  txHash: String!
   webhooks: [String!]
   members: [ProjectMember!]
   environmentVariables: [EnvironmentVariable!]
@@ -86,7 +73,7 @@ type Project {
   updatedAt: String!
   organization: Organization!
   icon: String
-  baseDomains: [String!]
+  subDomain: String
 }
 
 type ProjectMember {
@@ -106,10 +93,7 @@ type Deployment {
   commitMessage: String!
   url: String
   environment: Environment!
-  deployer: Deployer
-  applicationDeploymentRequestId: String
   isCurrent: Boolean!
-  baseDomain: String
   status: DeploymentStatus!
   createdAt: String!
   updatedAt: String!
@@ -135,17 +119,6 @@ type EnvironmentVariable {
   updatedAt: String!
 }
 
-type Deployer {
-  deployerLrn: String!
-  deployerId: String!
-  deployerApiUrl: String!
-  minimumPayment: String
-  paymentAddress: String
-  createdAt: String!
-  updatedAt: String!
-  baseDomain: String
-}
-
 type AuthResult {
   token: String!
 }
@@ -156,23 +129,11 @@ input AddEnvironmentVariableInput {
   value: String!
 }
 
-input AddProjectFromTemplateInput {
-  templateOwner: String!
-  templateRepo: String!
-  owner: String!
-  name: String!
-  isPrivate: Boolean!
-  paymentAddress: String!
-  txHash: String!
-}
-
 input AddProjectInput {
   name: String!
   repository: String!
   prodBranch: String!
   template: String
-  paymentAddress: String!
-  txHash: String!
 }
 
 input UpdateProjectInput {
@@ -212,48 +173,6 @@ input FilterDomainsInput {
   status: DomainStatus
 }
 
-type Fee {
-  type: String!
-  quantity: String!
-}
-
-type Bid {
-  auctionId: String!
-  bidderAddress: String!
-  status: String!
-  commitHash: String!
-  commitTime: String
-  commitFee: Fee
-  revealTime: String
-  revealFee: Fee
-  bidAmount: Fee
-}
-
-type Auction {
-  id: String!
-  kind: String!
-  status: String!
-  ownerAddress: String!
-  createTime: String!
-  commitsEndTime: String!
-  revealsEndTime: String!
-  commitFee: Fee!
-  revealFee: Fee!
-  minimumBid: Fee
-  winnerAddresses: [String!]!
-  winnerBids: [Fee!]
-  winnerPrice: Fee
-  maxPrice: Fee
-  numProviders: Int!
-  fundsReleased: Boolean!
-  bids: [Bid!]!
-}
-
-input AuctionParams {
-  maxPrice: String,
-  numProviders: Int,
-}
-
 type Query {
   user: User!
   organizations: [Organization!]
@@ -264,50 +183,23 @@ type Query {
   environmentVariables(projectId: String!): [EnvironmentVariable!]
   projectMembers(projectId: String!): [ProjectMember!]
   searchProjects(searchText: String!): [Project!]
-  getAuctionData(auctionId: String!): Auction!
   domains(projectId: String!, filter: FilterDomainsInput): [Domain]
-  deployers: [Deployer]
-  address: String!
-  verifyTx(txHash: String!, amount: String!, senderAddress: String!): Boolean!
 }
 
 type Mutation {
   addProjectMember(projectId: String!, data: AddProjectMemberInput): Boolean!
-  updateProjectMember(
+  updateProjectMember(projectMemberId: String!, data: UpdateProjectMemberInput): Boolean!
-    projectMemberId: String!
-    data: UpdateProjectMemberInput
-  ): Boolean!
   removeProjectMember(projectMemberId: String!): Boolean!
-  addEnvironmentVariables(
+  addEnvironmentVariables(projectId: String!, data: [AddEnvironmentVariableInput!]): Boolean!
-    projectId: String!
+  updateEnvironmentVariable(environmentVariableId: String!, data: UpdateEnvironmentVariableInput!): Boolean!
-    data: [AddEnvironmentVariableInput!]
-  ): Boolean!
-  updateEnvironmentVariable(
-    environmentVariableId: String!
-    data: UpdateEnvironmentVariableInput!
-  ): Boolean!
   removeEnvironmentVariable(environmentVariableId: String!): Boolean!
   updateDeploymentToProd(deploymentId: String!): Boolean!
-  addProjectFromTemplate(
+  addProject(organizationSlug: String!, data: AddProjectInput): Project!
-    organizationSlug: String!
-    data: AddProjectFromTemplateInput
-    lrn: String
-    auctionParams: AuctionParams
-    environmentVariables: [AddEnvironmentVariableInput!]
-  ): Project!
-  addProject(
-    organizationSlug: String!
-    data: AddProjectInput!
-    lrn: String
-    auctionParams: AuctionParams
-    environmentVariables: [AddEnvironmentVariableInput!]
-  ): Project!
   updateProject(projectId: String!, data: UpdateProjectInput): Boolean!
   redeployToProd(deploymentId: String!): Boolean!
   deleteProject(projectId: String!): Boolean!
   deleteDomain(domainId: String!): Boolean!
   rollbackDeployment(projectId: String!, deploymentId: String!): Boolean!
-  deleteDeployment(deploymentId: String!): Boolean!
   addDomain(projectId: String!, data: AddDomainInput!): Boolean!
   updateDomain(domainId: String!, data: UpdateDomainInput!): Boolean!
   authenticateGitHub(code: String!): AuthResult!

packages/backend/src/server.ts

@@ -1,45 +1,29 @@
 import debug from 'debug';
 import express from 'express';
-import cors from 'cors';
 import { ApolloServer } from 'apollo-server-express';
 import { createServer } from 'http';
 import {
   ApolloServerPluginDrainHttpServer,
-  ApolloServerPluginLandingPageLocalDefault,
+  ApolloServerPluginLandingPageLocalDefault
-  AuthenticationError,
 } from 'apollo-server-core';
-import session from 'express-session';
 
 import { TypeSource } from '@graphql-tools/utils';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 
 import { ServerConfig } from './config';
-import { DEFAULT_GQL_PATH } from './constants';
+import { DEFAULT_GQL_PATH, USER_ID } from './constants';
 import githubRouter from './routes/github';
-import authRouter from './routes/auth';
-import stagingRouter from './routes/staging';
 import { Service } from './service';
 
 const log = debug('snowball:server');
 
-// Set cookie expiration to 1 month in milliseconds
-const COOKIE_MAX_AGE = 30 * 24 * 60 * 60 * 1000;
-
-declare module 'express-session' {
-  interface SessionData {
-    address: string;
-    chainId: number;
-  }
-}
-
 export const createAndStartServer = async (
   serverConfig: ServerConfig,
   typeDefs: TypeSource,
   resolvers: any,
-  service: Service,
+  service: Service
 ): Promise<ApolloServer> => {
   const { host, port, gqlPath = DEFAULT_GQL_PATH } = serverConfig;
-  const { appOriginUrl, secret, domain, trustProxy } = serverConfig.session;
 
   const app = express();
 
@@ -49,81 +33,33 @@ export const createAndStartServer = async (
   // Create the schema
   const schema = makeExecutableSchema({
     typeDefs,
-    resolvers,
+    resolvers
   });
 
   const server = new ApolloServer({
     schema,
     csrfPrevention: true,
-    context: async ({ req }) => {
+    context: () => {
-      // https://www.apollographql.com/docs/apollo-server/v3/security/authentication#api-wide-authorization
+      // TODO: Use userId derived from auth token
-
+      return { userId: USER_ID };
-      const { address } = req.session;
-
-      if (!address) {
-        throw new AuthenticationError('Unauthorized: No active session');
-      }
-
-      const user = await service.getUser(address);
-      return { user };
     },
     plugins: [
       // Proper shutdown for the HTTP server
       ApolloServerPluginDrainHttpServer({ httpServer }),
-      ApolloServerPluginLandingPageLocalDefault({ embed: true }),
+      ApolloServerPluginLandingPageLocalDefault({ embed: true })
-    ],
+    ]
   });
 
   await server.start();
 
-  app.use(
-    cors({
-      origin: appOriginUrl,
-      credentials: true,
-    }),
-  );
-
-  const sessionOptions: session.SessionOptions = {
-    secret: secret,
-    resave: false,
-    saveUninitialized: true,
-    cookie: {
-      secure: new URL(appOriginUrl).protocol === 'https:',
-      maxAge: COOKIE_MAX_AGE,
-      domain: domain || undefined,
-      sameSite: new URL(appOriginUrl).protocol === 'https:' ? 'none' : 'lax',
-    }
-  };
-
-  if (trustProxy) {
-    // trust first proxy
-    app.set('trust proxy', 1);
-  }
-
-  app.use(
-    session(sessionOptions)
-  );
-
   server.applyMiddleware({
     app,
-    path: gqlPath,
+    path: gqlPath
-    cors: {
-      origin: [appOriginUrl],
-      credentials: true,
-    },
   });
 
-  app.use(express.json());
-
   app.set('service', service);
-  app.use('/auth', authRouter);
+  app.use(express.json());
   app.use('/api/github', githubRouter);
-  app.use('/staging', stagingRouter);
-
-  app.use((err: any, req: any, res: any, next: any) => {
-    console.error(err);
-    res.status(500).json({ error: err.message });
-  });
 
   httpServer.listen(port, host, () => {
     log(`Server is listening on ${host}:${port}${server.graphqlPath}`);

packages/backend/src/turnkey-backend.ts

@@ -1,130 +0,0 @@
-import { Turnkey, TurnkeyApiTypes } from '@turnkey/sdk-server';
-
-// Default path for the first Ethereum address in a new HD wallet.
-// See https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki, paths are in the form:
-//     m / purpose' / coin_type' / account' / change / address_index
-// - Purpose is a constant set to 44' following the BIP43 recommendation.
-// - Coin type is set to 60 (ETH) -- see https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-// - Account, Change, and Address Index are set to 0
-import { DEFAULT_ETHEREUM_ACCOUNTS } from '@turnkey/sdk-server';
-import { getConfig } from './utils';
-import { Service } from './service';
-
-type TAttestation = TurnkeyApiTypes['v1Attestation'];
-
-type CreateUserParams = {
-  userName: string;
-  userEmail: string;
-  challenge: string;
-  attestation: TAttestation;
-};
-
-export async function createUser(
-  service: Service,
-  { userName, userEmail, challenge, attestation }: CreateUserParams,
-) {
-  try {
-    if (await service.getUserByEmail(userEmail)) {
-      throw new Error(`User already exists: ${userEmail}`);
-    }
-
-    const config = await getConfig();
-    const turnkey = new Turnkey(config.turnkey);
-
-    const apiClient = turnkey.api();
-
-    const walletName = `Default ETH Wallet`;
-
-    const createSubOrgResponse = await apiClient.createSubOrganization({
-      subOrganizationName: `Default SubOrg for ${userEmail}`,
-      rootQuorumThreshold: 1,
-      rootUsers: [
-        {
-          userName,
-          userEmail,
-          apiKeys: [],
-          authenticators: [
-            {
-              authenticatorName: 'Passkey',
-              challenge,
-              attestation,
-            },
-          ],
-        },
-      ],
-      wallet: {
-        walletName: walletName,
-        accounts: DEFAULT_ETHEREUM_ACCOUNTS,
-      },
-    });
-
-    const subOrgId = refineNonNull(createSubOrgResponse.subOrganizationId);
-    const wallet = refineNonNull(createSubOrgResponse.wallet);
-
-    const result = {
-      id: wallet.walletId,
-      address: wallet.addresses[0],
-      subOrgId: subOrgId,
-    };
-    console.log('Turnkey success', result);
-
-    const user = await service.createUser({
-      name: userName,
-      email: userEmail,
-      subOrgId,
-      ethAddress: wallet.addresses[0],
-      turnkeyWalletId: wallet.walletId,
-    });
-    console.log('New user', user);
-
-    return user;
-  } catch (e) {
-    console.error('Failed to create user:', e);
-    throw e;
-  }
-}
-
-export async function authenticateUser(
-  service: Service,
-  signedWhoamiRequest: {
-    url: string;
-    body: any;
-    stamp: {
-      stampHeaderName: string;
-      stampHeaderValue: string;
-    };
-  },
-) {
-  try {
-    const tkRes = await fetch(signedWhoamiRequest.url, {
-      method: 'POST',
-      body: signedWhoamiRequest.body,
-      headers: {
-        [signedWhoamiRequest.stamp.stampHeaderName]:
-          signedWhoamiRequest.stamp.stampHeaderValue,
-      },
-    });
-    console.log('AUTH RESULT', tkRes.status);
-    if (tkRes.status !== 200) {
-      console.log(await tkRes.text());
-      return null;
-    }
-    const orgId = (await tkRes.json()).organizationId;
-    const user = await service.getUserBySubOrgId(orgId);
-    return user;
-  } catch (e) {
-    console.error('Failed to authenticate:', e);
-    throw e;
-  }
-}
-
-function refineNonNull<T>(
-  input: T | null | undefined,
-  errorMessage?: string,
-): T {
-  if (input == null) {
-    throw new Error(errorMessage ?? `Unexpected ${JSON.stringify(input)}`);
-  }
-
-  return input;
-}

packages/backend/src/types.ts

@@ -1,6 +1,6 @@
 export interface PackageJSON {
-  name: string;
+  name?: string;
-  version: string;
+  version?: string;
   author?: string;
   description?: string;
   homepage?: string;
@@ -24,13 +24,10 @@ export interface GitPushEventPayload {
     id: string;
     message: string;
   };
-  deleted: boolean;
 }
 
 export interface AppDeploymentRecordAttributes {
   application: string;
-  auction: string;
-  deployer: string;
   dns: string;
   meta: string;
   name: string;
@@ -40,13 +37,6 @@ export interface AppDeploymentRecordAttributes {
   version: string;
 }
 
-export interface AppDeploymentRemovalRecordAttributes {
-  deployment: string;
-  request: string;
-  type: 'ApplicationDeploymentRemovalRecord';
-  version: string;
-}
-
 interface RegistryRecord {
   id: string;
   names: string[] | null;
@@ -57,48 +47,5 @@ interface RegistryRecord {
 }
 
 export interface AppDeploymentRecord extends RegistryRecord {
-  attributes: AppDeploymentRecordAttributes;
+  attributes: AppDeploymentRecordAttributes
-}
-
-export interface AppDeploymentRemovalRecord extends RegistryRecord {
-  attributes: AppDeploymentRemovalRecordAttributes;
-}
-
-export interface AddProjectFromTemplateInput {
-  templateOwner: string;
-  templateRepo: string;
-  owner: string;
-  name: string;
-  isPrivate: boolean;
-  paymentAddress: string;
-  txHash: string;
-}
-
-export interface AuctionParams {
-  maxPrice: string,
-  numProviders: number,
-}
-
-export interface EnvironmentVariables {
-  environments: string[],
-  key: string,
-  value: string,
-}
-
-export interface DeployerRecord {
-  id: string;
-  names: string[];
-  owners: string[];
-  bondId: string;
-  createTime: string;
-  expiryTime: string;
-  attributes: {
-    apiUrl: string;
-    minimumPayment: string | null;
-    name: string;
-    paymentAddress: string;
-    publicKey: string;
-    type: string;
-    version: string;
-  };
 }

packages/backend/src/utils.ts

@@ -1,24 +1,12 @@
-import assert from 'assert';
-import debug from 'debug';
 import fs from 'fs-extra';
-import { Octokit } from 'octokit';
 import path from 'path';
 import toml from 'toml';
-import { DataSource, DeepPartial, EntityTarget, ObjectLiteral } from 'typeorm';
+import debug from 'debug';
-
-import { Config } from './config';
-import { DEFAULT_CONFIG_FILE_PATH } from './constants';
-import { PackageJSON } from './types';
 
 const log = debug('snowball:utils');
 
-export async function getConfig() {
+export const getConfig = async <ConfigType>(
-  // TODO: get config path using cli
+  configFile: string
-  return await _getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
-}
-
-const _getConfig = async <ConfigType>(
-  configFile: string,
 ): Promise<ConfigType> => {
   const configFilePath = path.resolve(configFile);
   const fileExists = await fs.pathExists(configFilePath);
@@ -31,113 +19,3 @@ const _getConfig = async <ConfigType>(
 
   return config;
 };
-
-export const checkFileExists = async (filePath: string): Promise<boolean> => {
-  try {
-    await fs.access(filePath, fs.constants.F_OK);
-    return true;
-  } catch (err) {
-    log(err);
-    return false;
-  }
-};
-
-export const getEntities = async (filePath: string): Promise<any> => {
-  const entitiesData = await fs.readFile(filePath, 'utf-8');
-  const entities = JSON.parse(entitiesData);
-  return entities;
-};
-
-export const loadAndSaveData = async <Entity extends ObjectLiteral>(
-  entityType: EntityTarget<Entity>,
-  dataSource: DataSource,
-  entities: any,
-  relations?: any | undefined,
-): Promise<Entity[]> => {
-  const entityRepository = dataSource.getRepository(entityType);
-
-  const savedEntity: Entity[] = [];
-
-  for (const entityData of entities) {
-    let entity = entityRepository.create(entityData as DeepPartial<Entity>);
-
-    if (relations) {
-      for (const field in relations) {
-        const valueIndex = String(field + 'Index');
-
-        entity = {
-          ...entity,
-          [field]: relations[field][entityData[valueIndex]],
-        };
-      }
-    }
-    const dbEntity = await entityRepository.save(entity);
-    savedEntity.push(dbEntity);
-  }
-
-  return savedEntity;
-};
-
-export const sleep = async (ms: number): Promise<void> =>
-  new Promise((resolve) => setTimeout(resolve, ms));
-
-export const getRepoDetails = async (
-  octokit: Octokit,
-  repository: string,
-  commitHash: string | undefined,
-): Promise<{
-  repo: string;
-  packageJSON: PackageJSON;
-  repoUrl: string;
-}> => {
-  const [owner, repo] = repository.split('/');
-  const { data: packageJSONData } = await octokit.rest.repos.getContent({
-    owner,
-    repo,
-    path: 'package.json',
-    ref: commitHash,
-  });
-
-  if (!packageJSONData) {
-    throw new Error('Package.json file not found');
-  }
-
-  assert(!Array.isArray(packageJSONData) && packageJSONData.type === 'file');
-  const packageJSON: PackageJSON = JSON.parse(atob(packageJSONData.content));
-
-  assert(packageJSON.name, "name field doesn't exist in package.json");
-
-  const repoUrl = (
-    await octokit.rest.repos.get({
-      owner,
-      repo,
-    })
-  ).data.html_url;
-
-  return {
-    repo,
-    packageJSON,
-    repoUrl
-  };
-}
-
-// Wrapper method for registry txs to retry once if 'account sequence mismatch' occurs
-export const registryTransactionWithRetry = async (
-  txMethod: () => Promise<any>
-): Promise<any> => {
-  try {
-    return await txMethod();
-  } catch (error: any) {
-    if (!error.message.includes('account sequence mismatch')) {
-      throw error;
-    }
-
-    console.error(`Transaction failed due to account sequence mismatch. Retrying...`);
-
-    try {
-      return await txMethod();
-    } catch (retryError: any) {
-      throw new Error(`Transaction failed again after retry: ${retryError.message}`);
-    }
-  }
-}

packages/backend/test/delete-db.ts

@@ -2,6 +2,8 @@ import * as fs from 'fs/promises';
 import debug from 'debug';
 
 import { getConfig } from '../src/utils';
+import { Config } from '../src/config';
+import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
 
 const log = debug('snowball:delete-database');
 
@@ -11,9 +13,9 @@ const deleteFile = async (filePath: string) => {
 };
 
 const main = async () => {
-  const config = await getConfig();
+  const config = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
   deleteFile(config.database.dbPath);
 };
 
-main().catch((err) => log(err));
+main().catch(err => log(err));

packages/backend/test/fixtures/deployments.json

@@ -1,16 +1,14 @@
 [
   {
     "projectIndex": 0,
-    "domainIndex": 0,
+    "domainIndex":0,
     "createdByIndex": 0,
-    "id": "ffhae3zq",
+    "id":"ffhae3zq",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
     "applicationRecordId": "qbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "xqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "main",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -18,16 +16,14 @@
   },
   {
     "projectIndex": 0,
-    "domainIndex": 1,
+    "domainIndex":1,
     "createdByIndex": 0,
-    "id": "vehagei8",
+    "id":"vehagei8",
     "status": "Ready",
     "environment": "Preview",
     "isCurrent": false,
     "applicationRecordId": "wbafyreihvzya6ovp4yfpkqnddkui2iw7thbhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "wqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -35,16 +31,14 @@
   },
   {
     "projectIndex": 0,
-    "domainIndex": 2,
+    "domainIndex":2,
     "createdByIndex": 0,
-    "id": "qmgekyte",
+    "id":"qmgekyte",
     "status": "Ready",
     "environment": "Development",
     "isCurrent": false,
     "applicationRecordId": "ebafyreihvzya6ovp4yfpkqnddkui2iw7t6bhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "kqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -54,14 +48,12 @@
     "projectIndex": 0,
     "domainIndex": null,
     "createdByIndex": 0,
-    "id": "f8wsyim6",
+    "id":"f8wsyim6",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": false,
     "applicationRecordId": "rbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhw74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "yqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "prod",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -69,16 +61,14 @@
   },
   {
     "projectIndex": 1,
-    "domainIndex": 3,
+    "domainIndex":3,
     "createdByIndex": 1,
-    "id": "eO8cckxk",
+    "id":"eO8cckxk",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
     "applicationRecordId": "tbafyreihvzya6ovp4yfpqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "pqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "main",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -86,16 +76,14 @@
   },
   {
     "projectIndex": 1,
-    "domainIndex": 4,
+    "domainIndex":4,
     "createdByIndex": 1,
-    "id": "yaq0t5yw",
+    "id":"yaq0t5yw",
     "status": "Ready",
     "environment": "Preview",
     "isCurrent": false,
     "applicationRecordId": "ybafyreihvzya6ovp4yfpkqnddkui2iw7t6bhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "tqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -103,16 +91,14 @@
   },
   {
     "projectIndex": 1,
-    "domainIndex": 5,
+    "domainIndex":5,
     "createdByIndex": 1,
-    "id": "hwwr6sbx",
+    "id":"hwwr6sbx",
     "status": "Ready",
     "environment": "Development",
     "isCurrent": false,
     "applicationRecordId": "ubafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "eqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -120,16 +106,14 @@
   },
   {
     "projectIndex": 2,
-    "domainIndex": 9,
+    "domainIndex":9,
     "createdByIndex": 2,
-    "id": "ndxje48a",
+    "id":"ndxje48a",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
     "applicationRecordId": "ibayreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "dqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "main",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -137,16 +121,14 @@
   },
   {
     "projectIndex": 2,
-    "domainIndex": 7,
+    "domainIndex":7,
     "createdByIndex": 2,
-    "id": "gtgpgvei",
+    "id":"gtgpgvei",
     "status": "Ready",
     "environment": "Preview",
     "isCurrent": false,
     "applicationRecordId": "obafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "aqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -154,16 +136,14 @@
   },
   {
     "projectIndex": 2,
-    "domainIndex": 8,
+    "domainIndex":8,
     "createdByIndex": 2,
-    "id": "b4bpthjr",
+    "id":"b4bpthjr",
     "status": "Ready",
     "environment": "Development",
     "isCurrent": false,
     "applicationRecordId": "pbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowo",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "uqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",
@@ -173,14 +153,12 @@
     "projectIndex": 3,
     "domainIndex": 6,
     "createdByIndex": 2,
-    "id": "b4bpthjr",
+    "id":"b4bpthjr",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
     "applicationRecordId": "pbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowo",
     "applicationRecordData": {},
-    "applicationDeploymentRequestId": "pqbafyrehvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
-    "applicationDeploymentRequestData": {},
     "branch": "test",
     "commitHash": "d5dfd7b827226b0d09d897346d291c256e113e00",
     "commitMessage": "subscription added",

packages/backend/test/fixtures/organizations.json

@@ -1,7 +1,12 @@
 [
   {
     "id": "2379cf1f-a232-4ad2-ae14-4d881131cc26",
-    "name": "Deploy Tools",
+    "name": "Snowball Tools",
-    "slug": "deploy-tools"
+    "slug": "snowball-tools-1"
+  },
+  {
+    "id": "7eb9b3eb-eb74-4b53-b59a-69884c82a7fb",
+    "name": "Laconic",
+    "slug": "laconic-2"
   }
 ]

packages/backend/test/fixtures/project-members.json

@@ -2,55 +2,77 @@
   {
     "memberIndex": 1,
     "projectIndex": 0,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 0,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 1,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 0,
     "projectIndex": 2,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 1,
     "projectIndex": 2,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 0,
     "projectIndex": 3,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 3,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 1,
     "projectIndex": 4,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 4,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   }
 ]

packages/backend/test/fixtures/projects.json

@@ -10,6 +10,8 @@
     "framework": "test",
     "webhooks": [],
     "icon": "",
+    "applicationDeploymentRequestId": "hbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
+    "applicationDeploymentRequestData": {},
     "subDomain": "testProject.snowball.xyz"
   },
   {
@@ -23,6 +25,8 @@
     "framework": "test-2",
     "webhooks": [],
     "icon": "",
+    "applicationDeploymentRequestId": "gbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
+    "applicationDeploymentRequestData": {},
     "subDomain": "testProject-2.snowball.xyz"
   },
   {
@@ -36,6 +40,8 @@
     "framework": "test-3",
     "webhooks": [],
     "icon": "",
+    "applicationDeploymentRequestId": "ebafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
+    "applicationDeploymentRequestData": {},
     "subDomain": "iglootools.snowball.xyz"
   },
   {
@@ -49,6 +55,8 @@
     "framework": "test-4",
     "webhooks": [],
     "icon": "",
+    "applicationDeploymentRequestId": "qbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
+    "applicationDeploymentRequestData": {},
     "subDomain": "iglootools-2.snowball.xyz"
   },
   {
@@ -62,6 +70,8 @@
     "framework": "test-5",
     "webhooks": [],
     "icon": "",
+    "applicationDeploymentRequestId": "xbafyreihvzya6ovp4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi",
+    "applicationDeploymentRequestData": {},
     "subDomain": "snowball-2.snowball.xyz"
   }
 ]

packages/backend/test/fixtures/users.json

@@ -1,23 +1,20 @@
 [
   {
     "id": "59f4355d-9549-4aac-9b54-eeefceeabef0",
-    "name": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+    "name": "Snowball",
     "email": "snowball@snowballtools.xyz",
-    "isVerified": true,
+    "isVerified": true
-    "ethAddress": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
   },
   {
     "id": "e505b212-8da6-48b2-9614-098225dab34b",
-    "name": "0xbe0eb53f46cd790cd13851d5eff43d12404d33e8",
+    "name": "Alice Anderson",
     "email": "alice@snowballtools.xyz",
-    "isVerified": true,
+    "isVerified": true
-    "ethAddress": "0xbe0eb53f46cd790cd13851d5eff43d12404d33e8"
   },
   {
     "id": "cd892fad-9138-4aa2-a62c-414a32776ea7",
-    "name": "0x8315177ab297ba92a06054ce80a67ed4dbd7ed3a",
+    "name": "Bob Banner",
     "email": "bob@snowballtools.xyz",
-    "isVerified": true,
+    "isVerified": true
-    "ethAddress": "0x8315177ab297ba92a06054ce80a67ed4dbd7ed3a"
   }
 ]

packages/backend/test/initialize-db.ts

@@ -1,4 +1,5 @@
-import { DataSource } from 'typeorm';
+import { DataSource, DeepPartial, EntityTarget, ObjectLiteral } from 'typeorm';
+import * as fs from 'fs/promises';
 import debug from 'debug';
 import path from 'path';
 
@@ -10,12 +11,9 @@ import { EnvironmentVariable } from '../src/entity/EnvironmentVariable';
 import { Domain } from '../src/entity/Domain';
 import { ProjectMember } from '../src/entity/ProjectMember';
 import { Deployment } from '../src/entity/Deployment';
-import {
+import { getConfig } from '../src/utils';
-  checkFileExists,
+import { Config } from '../src/config';
-  getConfig,
+import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
-  getEntities,
-  loadAndSaveData
-} from '../src/utils';
 
 const log = debug('snowball:initialize-database');
 
@@ -29,35 +27,43 @@ const DEPLOYMENT_DATA_PATH = './fixtures/deployments.json';
 const ENVIRONMENT_VARIABLE_DATA_PATH = './fixtures/environment-variables.json';
 const REDIRECTED_DOMAIN_DATA_PATH = './fixtures/redirected-domains.json';
 
-const generateTestData = async (dataSource: DataSource) => {
+const loadAndSaveData = async <Entity extends ObjectLiteral>(entityType: EntityTarget<Entity>, dataSource: DataSource, filePath: string, relations?: any | undefined) => {
-  const userEntities = await getEntities(
+  const entitiesData = await fs.readFile(filePath, 'utf-8');
-    path.resolve(__dirname, USER_DATA_PATH)
+  const entities = JSON.parse(entitiesData);
-  );
+  const entityRepository = dataSource.getRepository(entityType);
-  const savedUsers = await loadAndSaveData(User, dataSource, userEntities);
 
-  const orgEntities = await getEntities(
+  const savedEntity:Entity[] = [];
-    path.resolve(__dirname, ORGANIZATION_DATA_PATH)
+
-  );
+  for (const entityData of entities) {
-  const savedOrgs = await loadAndSaveData(
+    let entity = entityRepository.create(entityData as DeepPartial<Entity>);
-    Organization,
+
-    dataSource,
+    if (relations) {
-    orgEntities
+      for (const field in relations) {
-  );
+        const valueIndex = String(field + 'Index');
+
+        entity = {
+          ...entity,
+          [field]: relations[field][entityData[valueIndex]]
+        };
+      }
+    }
+    const dbEntity = await entityRepository.save(entity);
+    savedEntity.push(dbEntity);
+  }
+
+  return savedEntity;
+};
+
+const generateTestData = async (dataSource: DataSource) => {
+  const savedUsers = await loadAndSaveData(User, dataSource, path.resolve(__dirname, USER_DATA_PATH));
+  const savedOrgs = await loadAndSaveData(Organization, dataSource, path.resolve(__dirname, ORGANIZATION_DATA_PATH));
 
   const projectRelations = {
     owner: savedUsers,
     organization: savedOrgs
   };
 
-  const projectEntities = await getEntities(
+  const savedProjects = await loadAndSaveData(Project, dataSource, path.resolve(__dirname, PROJECT_DATA_PATH), projectRelations);
-    path.resolve(__dirname, PROJECT_DATA_PATH)
-  );
-  const savedProjects = await loadAndSaveData(
-    Project,
-    dataSource,
-    projectEntities,
-    projectRelations
-  );
 
   const domainRepository = dataSource.getRepository(Domain);
 
@@ -65,30 +71,14 @@ const generateTestData = async (dataSource: DataSource) => {
     project: savedProjects
   };
 
-  const primaryDomainsEntities = await getEntities(
+  const savedPrimaryDomains = await loadAndSaveData(Domain, dataSource, path.resolve(__dirname, PRIMARY_DOMAIN_DATA_PATH), domainPrimaryRelations);
-    path.resolve(__dirname, PRIMARY_DOMAIN_DATA_PATH)
-  );
-  const savedPrimaryDomains = await loadAndSaveData(
-    Domain,
-    dataSource,
-    primaryDomainsEntities,
-    domainPrimaryRelations
-  );
 
   const domainRedirectedRelations = {
     project: savedProjects,
     redirectTo: savedPrimaryDomains
   };
 
-  const redirectDomainsEntities = await getEntities(
+  await loadAndSaveData(Domain, dataSource, path.resolve(__dirname, REDIRECTED_DOMAIN_DATA_PATH), domainRedirectedRelations);
-    path.resolve(__dirname, REDIRECTED_DOMAIN_DATA_PATH)
-  );
-  await loadAndSaveData(
-    Domain,
-    dataSource,
-    redirectDomainsEntities,
-    domainRedirectedRelations
-  );
 
   const savedDomains = await domainRepository.find();
 
@@ -97,30 +87,14 @@ const generateTestData = async (dataSource: DataSource) => {
     organization: savedOrgs
   };
 
-  const userOrganizationsEntities = await getEntities(
+  await loadAndSaveData(UserOrganization, dataSource, path.resolve(__dirname, USER_ORGANIZATION_DATA_PATH), userOrganizationRelations);
-    path.resolve(__dirname, USER_ORGANIZATION_DATA_PATH)
-  );
-  await loadAndSaveData(
-    UserOrganization,
-    dataSource,
-    userOrganizationsEntities,
-    userOrganizationRelations
-  );
 
   const projectMemberRelations = {
     member: savedUsers,
     project: savedProjects
   };
 
-  const projectMembersEntities = await getEntities(
+  await loadAndSaveData(ProjectMember, dataSource, path.resolve(__dirname, PROJECT_MEMBER_DATA_PATH), projectMemberRelations);
-    path.resolve(__dirname, PROJECT_MEMBER_DATA_PATH)
-  );
-  await loadAndSaveData(
-    ProjectMember,
-    dataSource,
-    projectMembersEntities,
-    projectMemberRelations
-  );
 
   const deploymentRelations = {
     project: savedProjects,
@@ -128,33 +102,27 @@ const generateTestData = async (dataSource: DataSource) => {
     createdBy: savedUsers
   };
 
-  const deploymentsEntities = await getEntities(
+  await loadAndSaveData(Deployment, dataSource, path.resolve(__dirname, DEPLOYMENT_DATA_PATH), deploymentRelations);
-    path.resolve(__dirname, DEPLOYMENT_DATA_PATH)
-  );
-  await loadAndSaveData(
-    Deployment,
-    dataSource,
-    deploymentsEntities,
-    deploymentRelations
-  );
 
   const environmentVariableRelations = {
     project: savedProjects
   };
 
-  const environmentVariablesEntities = await getEntities(
+  await loadAndSaveData(EnvironmentVariable, dataSource, path.resolve(__dirname, ENVIRONMENT_VARIABLE_DATA_PATH), environmentVariableRelations);
-    path.resolve(__dirname, ENVIRONMENT_VARIABLE_DATA_PATH)
+};
-  );
+
-  await loadAndSaveData(
+const checkFileExists = async (filePath: string) => {
-    EnvironmentVariable,
+  try {
-    dataSource,
+    await fs.access(filePath, fs.constants.F_OK);
-    environmentVariablesEntities,
+    return true;
-    environmentVariableRelations
+  } catch (err) {
-  );
+    log(err);
+    return false;
+  }
 };
 
 const main = async () => {
-  const config = await getConfig();
+  const config = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
   const isDbPresent = await checkFileExists(config.database.dbPath);
 
   if (!isDbPresent) {

packages/backend/test/initialize-registry.ts

@@ -1,41 +1,32 @@
 import debug from 'debug';
 
-import { parseGasAndFees, Registry } from '@cerc-io/registry-sdk';
+import { Registry } from '@cerc-io/laconic-sdk';
 
+import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
+import { Config } from '../src/config';
 import { getConfig } from '../src/utils';
 
 const log = debug('snowball:initialize-registry');
 
-const DENOM = 'alnt';
+const DENOM = 'aphoton';
 const BOND_AMOUNT = '1000000000';
 
+// TODO: Get authority names from args
+const AUTHORITY_NAMES = ['snowballtools', 'cerc-io'];
+
 async function main () {
-  const { registryConfig } = await getConfig();
+  const { registryConfig } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
-  // TODO: Get authority names from args
+  const registry = new Registry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, registryConfig.chainId);
-  const authorityNames = ['snowballtools', registryConfig.authority];
-
-  const registry = new Registry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, {chainId: registryConfig.chainId});
 
   const bondId = await registry.getNextBondId(registryConfig.privateKey);
   log('bondId:', bondId);
+  await registry.createBond({ denom: DENOM, amount: BOND_AMOUNT }, registryConfig.privateKey, registryConfig.fee);
 
-  const fee = parseGasAndFees(registryConfig.fee.gas, registryConfig.fee.fees);
+  for await (const name of AUTHORITY_NAMES) {
-
+    await registry.reserveAuthority({ name }, registryConfig.privateKey, registryConfig.fee);
-  await registry.createBond(
-    { denom: DENOM, amount: BOND_AMOUNT },
-    registryConfig.privateKey,
-    fee
-  );
-
-  for await (const name of authorityNames) {
-    await registry.reserveAuthority({ name }, registryConfig.privateKey, fee);
     log('Reserved authority name:', name);
-    await registry.setAuthorityBond(
+    await registry.setAuthorityBond({ name, bondId }, registryConfig.privateKey, registryConfig.fee);
-      { name, bondId },
-      registryConfig.privateKey,
-      fee
-    );
     log(`Bond ${bondId} set for authority ${name}`);
   }
 }

packages/backend/test/publish-deploy-records.ts

@@ -2,21 +2,19 @@ import debug from 'debug';
 import { DataSource } from 'typeorm';
 import path from 'path';
 
-import { parseGasAndFees, Registry } from '@cerc-io/registry-sdk';
+import { Registry } from '@cerc-io/laconic-sdk';
 
+import { Config } from '../src/config';
+import { DEFAULT_CONFIG_FILE_PATH, PROJECT_DOMAIN } from '../src/constants';
 import { getConfig } from '../src/utils';
-import { Deployment, DeploymentStatus, Environment } from '../src/entity/Deployment';
+import { Deployment, DeploymentStatus } from '../src/entity/Deployment';
 
 const log = debug('snowball:publish-deploy-records');
 
-async function main() {
+async function main () {
-  const { registryConfig, database, misc } = await getConfig();
+  const { registryConfig, database } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
-  const registry = new Registry(
+  const registry = new Registry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, registryConfig.chainId);
-    registryConfig.gqlEndpoint,
-    registryConfig.restEndpoint,
-    { chainId: registryConfig.chainId }
-  );
 
   const dataSource = new DataSource({
     type: 'better-sqlite3',
@@ -38,7 +36,7 @@ async function main() {
   });
 
   for await (const deployment of deployments) {
-    const url = `https://${(deployment.project.name).toLowerCase()}-${deployment.id}.${deployment.deployer.baseDomain}`;
+    const url = `${deployment.project.name}-${deployment.id}.${PROJECT_DOMAIN}`;
 
     const applicationDeploymentRecord = {
       type: 'ApplicationDeploymentRecord',
@@ -55,12 +53,10 @@ async function main() {
         so: '66fcfa49a1664d4cb4ce4f72c1c0e151'
       }),
 
-      request: deployment.applicationDeploymentRequestId,
+      request: deployment.project.applicationDeploymentRequestId,
       url
     };
 
-    const fee = parseGasAndFees(registryConfig.fee.gas, registryConfig.fee.fees);
-
     const result = await registry.setRecord(
       {
         privateKey: registryConfig.privateKey,
@@ -68,26 +64,11 @@ async function main() {
         bondId: registryConfig.bondId
       },
       '',
-      fee
+      registryConfig.fee
     );
 
-    // Remove deployment for project subdomain if deployment is for production environment
-    if (deployment.environment === Environment.Production) {
-      applicationDeploymentRecord.url = `https://${deployment.project.name}.${deployment.deployer.baseDomain}`;
-
-      await registry.setRecord(
-        {
-          privateKey: registryConfig.privateKey,
-          record: applicationDeploymentRecord,
-          bondId: registryConfig.bondId
-        },
-        '',
-        fee
-      );
-    }
-
     log('Application deployment record data:', applicationDeploymentRecord);
-    log(`Application deployment record published: ${result.id}`);
+    log(`Application deployment record published: ${result.data.id}`);
   }
 }
 

packages/backend/test/publish-deployment-removal-records.ts

@@ -1,67 +0,0 @@
-import debug from 'debug';
-import { DataSource } from 'typeorm';
-import path from 'path';
-
-import { parseGasAndFees, Registry } from '@cerc-io/registry-sdk';
-
-import { getConfig } from '../src/utils';
-import { Deployment, DeploymentStatus } from '../src/entity/Deployment';
-
-const log = debug('snowball:publish-deployment-removal-records');
-
-async function main () {
-  const { registryConfig, database } = await getConfig();
-
-  const registry = new Registry(
-    registryConfig.gqlEndpoint,
-    registryConfig.restEndpoint,
-    { chainId: registryConfig.chainId }
-  );
-
-  const dataSource = new DataSource({
-    type: 'better-sqlite3',
-    database: database.dbPath,
-    synchronize: true,
-    entities: [path.join(__dirname, '../src/entity/*')]
-  });
-
-  await dataSource.initialize();
-
-  const deploymentRepository = dataSource.getRepository(Deployment);
-  const deployments = await deploymentRepository.find({
-    relations: {
-      project: true
-    },
-    where: {
-      status: DeploymentStatus.Deleting
-    }
-  });
-
-  for await (const deployment of deployments) {
-    const applicationDeploymentRemovalRecord = {
-      type: "ApplicationDeploymentRemovalRecord",
-      version: "1.0.0",
-      deployment: deployment.applicationDeploymentRecordId,
-      request: deployment.applicationDeploymentRemovalRequestId,
-    }
-
-    const fee = parseGasAndFees(registryConfig.fee.gas, registryConfig.fee.fees);
-
-    const result = await registry.setRecord(
-      {
-        privateKey: registryConfig.privateKey,
-        record: applicationDeploymentRemovalRecord,
-        bondId: registryConfig.bondId
-      },
-      '',
-      fee
-    );
-
-    log('Application deployment removal record data:', applicationDeploymentRemovalRecord);
-    log(`Application deployment removal record published: ${result.id}`);
-  }
-}
-
-main().catch((err) => {
-  log(err);
-});

packages/deployer/.env.example

@@ -1,3 +0,0 @@
-REGISTRY_BOND_ID=
-DEPLOYER_LRN=
-AUTHORITY=

packages/deployer/.gitignore

@@ -1 +0,0 @@
-records/*.yml

packages/deployer/README.md

@@ -1,64 +0,0 @@
-# deployer
-
-- Install dependencies
-
-  ```bash
-  yarn
-  ```
-
-  ```bash
-  brew install jq # if you do not have jq installed already
-  ```
-
-- Run script to deploy app
-
-  - To deploy frontend app to `dashboard.staging.apps.snowballtools.com`
-
-    ```bash
-    ./deploy-frontend.staging.sh
-    ```
-
-  - To deploy frontend app to `dashboard.apps.snowballtools.com`
-
-    ```bash
-    ./deploy-frontend.sh
-    ```
-
-- Commit the updated [ApplicationRecord](records/application-record.yml) and [ApplicationDeploymentRequest](records/application-deployment-request.yml) files to the repository
-
-## Notes
-
-- Any config env can be updated in [records/application-deployment-request.yml](records/application-deployment-request.yml)
-
-  ```yml
-  record:
-    ...
-    config:
-      env:
-        LACONIC_HOSTED_CONFIG_app_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
-        ...
-  ```
-
-  - On changing `LACONIC_HOSTED_CONFIG_app_github_clientid`, the GitHub client ID and secret need to be changed in backend config too
-
-## Troubleshoot
-
-- Check deployment status in [web-app deployer](https://console.laconic.com/deployer).
-- Check records in [registry console app](https://console.laconic.com/#/registry).
-
-- If deployment fails due to low bond balance
-  - Check balances
-
-    ```bash
-    # Account balance
-    yarn laconic registry account get
-
-    # Bond balance
-    yarn laconic registry bond get --id 99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32
-    ```
-
-  - Command to refill bond
-
-    ```bash
-    yarn laconic registry bond refill --id 99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32 --type alnt --quantity 10000000
-    ```

packages/deployer/config.staging.yml

@@ -1,10 +0,0 @@
-services:
-  registry:
-    restEndpoint: 'http://console.laconic.com:1317'
-    gqlEndpoint: 'http://console.laconic.com:9473/api'
-    userKey: 87d00f66a73e2ca428adeb49ba9164d0ad9a87edc60e33d46ad3031b9c5701fe
-    bondId: 89c75c7bc5759861d10285aff6f9e7227d6855e446b77ad5d8324822dfec7deb
-    chainId: laconic_9000-1
-    gas:
-    fees:
-    gasPrice: 1

packages/deployer/config.yml

@@ -1,8 +0,0 @@
-services:
-  registry:
-    rpcEndpoint: https://laconicd-sapo.laconic.com
-    gqlEndpoint: https://laconicd-sapo.laconic.com/api
-    userKey:
-    bondId:
-    chainId: laconic-testnet-2
-    gasPrice: 0.001alnt

packages/deployer/deploy-frontend.sh

@@ -1,156 +0,0 @@
-#!/bin/bash
-
-source .env
-echo "Using REGISTRY_BOND_ID: $REGISTRY_BOND_ID"
-echo "Using DEPLOYER_LRN: $DEPLOYER_LRN"
-echo "Using AUTHORITY: $AUTHORITY"
-
-# Repository URL
-REPO_URL="https://git.vdb.to/cerc-io/snowballtools-base"
-
-# Get the latest commit hash for a branch
-BRANCH_NAME="main"
-LATEST_HASH=$(git ls-remote $REPO_URL refs/heads/$BRANCH_NAME | awk '{print $1}')
-
-echo "Latest commit hash for branch $BRANCH_NAME: $LATEST_HASH"
-
-# Extract version from ../frontend/package.json
-PACKAGE_VERSION=$(jq -r '.version' ../frontend/package.json)
-
-# Current date and time for note
-CURRENT_DATE_TIME=$(date -u)
-
-CONFIG_FILE=config.yml
-
-# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
-
-# Get latest version from registry and increment application-record version
-NEW_APPLICATION_VERSION=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationRecord --all --name "deploy-frontend" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
-
-if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; then
-  # Set application-record version if no previous records were found
-  NEW_APPLICATION_VERSION=0.0.1
-fi
-
-# Generate application-record.yml with incremented version
-cat >./records/application-record.yml <<EOF
-record:
-  type: ApplicationRecord
-  version: $NEW_APPLICATION_VERSION
-  repository_ref: $LATEST_HASH
-  repository: ["$REPO_URL"]
-  app_type: webapp
-  name: deploy-frontend
-  app_version: $PACKAGE_VERSION
-EOF
-
-echo "Files generated successfully"
-
-RECORD_FILE=records/application-record.yml
-
-# Publish ApplicationRecord
-publish_response=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE)
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to publish record"
-  exit $rc
-fi
-RECORD_ID=$(echo $publish_response | jq -r '.id')
-echo "ApplicationRecord published"
-echo $RECORD_ID
-
-# Set name to record
-REGISTRY_APP_LRN="lrn://$AUTHORITY/applications/deploy-frontend"
-
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN@${PACKAGE_VERSION}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set name: $REGISTRY_APP_LRN@${PACKAGE_VERSION}"
-  exit $rc
-fi
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN@${LATEST_HASH}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set hash"
-  exit $rc
-fi
-sleep 2
-# Set name if latest release
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set release"
-  exit $rc
-fi
-echo "$REGISTRY_APP_LRN set for ApplicationRecord"
-
-# Check if record found for REGISTRY_APP_LRN
-query_response=$(yarn --silent laconic -c $CONFIG_FILE registry name resolve "$REGISTRY_APP_LRN")
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query name"
-  exit $rc
-fi
-APP_RECORD=$(echo $query_response | jq '.[0]')
-if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
-  echo "No record found for $REGISTRY_APP_LRN."
-  exit 1
-fi
-
-# Get payment address for deployer
-paymentAddress=$(yarn --silent laconic -c config.yml registry name resolve "$DEPLOYER_LRN" | jq -r '.[0].attributes.paymentAddress')
-paymentAmount=$(yarn --silent laconic -c config.yml registry name resolve "$DEPLOYER_LRN" | jq -r '.[0].attributes.minimumPayment' | sed 's/alnt//g')
-
-echo "Paying address: $paymentAddress with amount $paymentAmount..."
-
-# Pay deployer if paymentAmount is not null
-if [[ -n "$paymentAmount" && "$paymentAmount" != "null" ]]; then
-  payment=$(yarn --silent laconic -c config.yml registry tokens send --address "$paymentAddress" --type alnt --quantity "$paymentAmount")
-
-  # Extract the transaction hash
-  txHash=$(echo "$payment" | jq -r '.tx.hash')
-  echo "Paid deployer with txHash as $txHash"
-
-else
-  echo "Payment amount is null; skipping payment."
-fi
-
-# Generate application-deployment-request.yml
-cat >./records/application-deployment-request.yml <<EOF
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: deploy-frontend@$PACKAGE_VERSION
-  application: lrn://$AUTHORITY/applications/deploy-frontend@$PACKAGE_VERSION
-  deployer: $DEPLOYER_LRN
-  dns: deploy.laconic.com
-  config:
-    env:
-      LACONIC_HOSTED_CONFIG_server_url: https://deploy-backend.laconic.com
-      LACONIC_HOSTED_CONFIG_github_clientid: Ov23li4NtYybQlF6u5Dk
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: laconic-templates/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: laconic-templates/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_next_app_templaterepo: laconic-templates/starter.nextjs-react-tailwind
-      LACONIC_HOSTED_CONFIG_wallet_connect_id: 63cad7ba97391f63652161f484670e15
-      LACONIC_HOSTED_CONFIG_laconicd_chain_id: laconic-testnet-2
-      LACONIC_HOSTED_CONFIG_wallet_iframe_url: https://wallet.laconic.com
-  meta:
-    note: Added @ $CURRENT_DATE_TIME
-    repository: "$REPO_URL"
-    repository_ref: $LATEST_HASH
-  payment: $txHash
-EOF
-
-RECORD_FILE=records/application-deployment-request.yml
-
-sleep 2
-deployment_response=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE)
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query deployment request"
-  exit $rc
-fi
-DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
-echo "ApplicationDeploymentRequest published"
-echo $DEPLOYMENT_REQUEST_ID

packages/deployer/deploy-frontend.vaasl.sh

@@ -1,149 +0,0 @@
-#!/bin/bash
-
-source .env
-echo "Using REGISTRY_BOND_ID: $REGISTRY_BOND_ID"
-echo "Using DEPLOYER_LRN: $DEPLOYER_LRN"
-echo "Using AUTHORITY: $AUTHORITY"
-
-# Repository URL
-REPO_URL="https://git.vdb.to/cerc-io/snowballtools-base"
-
-# Get the latest commit hash from the repository
-LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
-
-# Extract version from ../frontend/package.json
-PACKAGE_VERSION=$(jq -r '.version' ../frontend/package.json)
-
-# Current date and time for note
-CURRENT_DATE_TIME=$(date -u)
-
-CONFIG_FILE=config.yml
-
-# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
-
-# Get latest version from registry and increment application-record version
-NEW_APPLICATION_VERSION=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationRecord --all --name "deploy-frontend" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
-
-if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; then
-  # Set application-record version if no previous records were found
-  NEW_APPLICATION_VERSION=0.0.1
-fi
-
-# Generate application-record.yml with incremented version
-cat >./records/application-record.yml <<EOF
-record:
-  type: ApplicationRecord
-  version: $NEW_APPLICATION_VERSION
-  repository_ref: $LATEST_HASH
-  repository: ["$REPO_URL"]
-  app_type: webapp
-  name: deploy-frontend
-  app_version: $PACKAGE_VERSION
-EOF
-
-echo "Files generated successfully"
-
-RECORD_FILE=records/application-record.yml
-
-# Publish ApplicationRecord
-publish_response=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE)
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to publish record"
-  exit $rc
-fi
-RECORD_ID=$(echo $publish_response | jq -r '.id')
-echo "ApplicationRecord published"
-echo $RECORD_ID
-
-# Set name to record
-REGISTRY_APP_LRN="lrn://$AUTHORITY/applications/deploy-frontend"
-
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN@${PACKAGE_VERSION}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set name: $REGISTRY_APP_LRN@${PACKAGE_VERSION}"
-  exit $rc
-fi
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN@${LATEST_HASH}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set hash"
-  exit $rc
-fi
-sleep 2
-# Set name if latest release
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set release"
-  exit $rc
-fi
-echo "$REGISTRY_APP_LRN set for ApplicationRecord"
-
-# Check if record found for REGISTRY_APP_LRN
-query_response=$(yarn --silent laconic -c $CONFIG_FILE registry name resolve "$REGISTRY_APP_LRN")
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query name"
-  exit $rc
-fi
-APP_RECORD=$(echo $query_response | jq '.[0]')
-if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
-  echo "No record found for $REGISTRY_APP_LRN."
-  exit 1
-fi
-
-# Get payment address for deployer
-paymentAddress=$(yarn --silent laconic -c config.yml registry name resolve "$DEPLOYER_LRN" | jq -r '.[0].attributes.paymentAddress')
-paymentAmount=$(yarn --silent laconic -c config.yml registry name resolve "$DEPLOYER_LRN" | jq -r '.[0].attributes.minimumPayment' | sed 's/alnt//g')
-# Pay deployer if paymentAmount is not null
-if [[ -n "$paymentAmount" && "$paymentAmount" != "null" ]]; then
-  payment=$(yarn --silent laconic -c config.yml registry tokens send --address "$paymentAddress" --type alnt --quantity "$paymentAmount")
-
-  # Extract the transaction hash
-  txHash=$(echo "$payment" | jq -r '.tx.hash')
-  echo "Paid deployer with txHash as $txHash"
-
-else
-  echo "Payment amount is null; skipping payment."
-fi
-
-# Generate application-deployment-request.yml
-cat >./records/application-deployment-request.yml <<EOF
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: deploy-frontend@$PACKAGE_VERSION
-  application: lrn://$AUTHORITY/applications/deploy-frontend@$PACKAGE_VERSION
-  deployer: $DEPLOYER_LRN
-  dns: deploy
-  config:
-    env:
-      LACONIC_HOSTED_CONFIG_server_url: https://deploy-backend.apps.vaasl.io
-      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liaet4yc0KX0iM1c
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: laconic-templates/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: laconic-templates/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_next_app_templaterepo: laconic-templates/starter.nextjs-react-tailwind
-      LACONIC_HOSTED_CONFIG_wallet_connect_id: 63cad7ba97391f63652161f484670e15
-      LACONIC_HOSTED_CONFIG_laconicd_chain_id: laconic-testnet-2
-  meta:
-    note: Added by Snowball @ $CURRENT_DATE_TIME
-    repository: "$REPO_URL"
-    repository_ref: $LATEST_HASH
-  payment: $txHash
-EOF
-
-RECORD_FILE=records/application-deployment-request.yml
-
-sleep 2
-deployment_response=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE)
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query deployment request"
-  exit $rc
-fi
-DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
-echo "ApplicationDeploymentRequest published"
-echo $DEPLOYMENT_REQUEST_ID

packages/deployer/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "deployer",
-  "version": "1.0.0",
-  "main": "index.js",
-  "private": true,
-  "devDependencies": {
-    "@cerc-io/laconic-registry-cli": "^0.2.9"
-  }
-}

packages/deployer/remove-deployment.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-source .env
-echo "Using DEPLOYER_LRN: $DEPLOYER_LRN"
-
-# Generate application-deployment-removal-request.yml
-REMOVAL_REQUEST_RECORD_FILE=records/application-deployment-removal-request.yml
-# TODO: Pass deployment record ID as arg
-DEPLOYMENT_RECORD_ID=bafyreidjho77xeczaqpyawhc4wbpm5it5atibtuxk6ost6vnpu2svlp3ka
-
-cat > $REMOVAL_REQUEST_RECORD_FILE <<EOF
-record:
-  deployer: $DEPLOYER_LRN
-  deployment: $DEPLOYMENT_RECORD_ID
-  type: ApplicationDeploymentRemovalRequest
-  version: 1.0.0
-EOF
-
-CONFIG_FILE=config.yml
-
-sleep 2
-REMOVAL_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $REMOVAL_REQUEST_RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRemovalRequest published"
-echo $REMOVAL_REQUEST_ID
-
-# Deployment checks
-RETRY_INTERVAL=30
-MAX_RETRIES=20
-
-# Check that an ApplicationDeploymentRemovalRecord is published
-retry_count=0
-while true; do
-  removal_records_response=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationDeploymentRemovalRecord --all request $REMOVAL_REQUEST_ID)
-  len_removal_records=$(echo $removal_records_response | jq 'length')
-
-  # Check if number of records returned is 0
-  if [ $len_removal_records -eq 0 ]; then
-    # Check if retries are exhausted
-    if [ $retry_count -eq $MAX_RETRIES ]; then
-      echo "Retries exhausted"
-      echo "ApplicationDeploymentRemovalRecord for deployment removal request $REMOVAL_REQUEST_ID not found"
-      exit 1
-    else
-      echo "ApplicationDeploymentRemovalRecord not found, retrying in $RETRY_INTERVAL sec..."
-      sleep $RETRY_INTERVAL
-      retry_count=$((retry_count+1))
-    fi
-  else
-    echo "ApplicationDeploymentRemovalRecord found"
-    REMOVAL_RECORD_ID=$(echo $removal_records_response | jq -r '.[0].id')
-    echo $REMOVAL_RECORD_ID
-    break
-  fi
-done
-
-echo "Deployment removal successful"

packages/deployer/test/README.md

@@ -1,23 +0,0 @@
-# deployer test
-
-Check if the live web app deployer is in a working state
-
-- Web app repo used: <https://github.com/snowball-tools/test-progressive-web-app> (main branch)
-- Config used: [../config.yml](../config.yml)
-- The script [test-webapp-deployment-undeployment.sh](./test-webapp-deployment-undeployment.sh) performs the following:
-  - Create / update [`ApplicationRecord`](./records/application-record.yml) and [`ApplicationDeploymentRequest`](./records/application-deployment-request.yml) records with latest meta data from the repo
-  - Fetch the latest version of `deployment-test-app` from registry and increment `ApplicationRecord` version
-  - Publish the resulting `ApplicationRecord` record
-  - Set names to the record and check name resolution
-  - Publish the `ApplicationDeploymentRequest` record
-  - Check that the deployment occurs
-    - Check that a `ApplicationDeploymentRecord` is created
-    - Check that the deployment record has correct `ApplicationRecord` id
-    - Check that the URL present in deployment record is active
-  - Create and publish a [`ApplicationDeploymentRemovalRequest`](./records/application-deployment-removal-request.yml) record
-  - Check that the deployment is removed
-    - Check that a `ApplicationDeploymentRemovalRecord` is created
-    - Check that the deployment URL goes down
-- The test script is run in a GitHub CI [workflow](../../../.github/workflows/test-app-deployment.yaml) that:
-  - Is scheduled to run everyday on the default (`main`) branch or can be triggered manually
-  - Sends Slack alerts to configured channels on failure

packages/deployer/test/records/application-deployment-removal-request.yml

@@ -1,4 +0,0 @@
-record:
-  deployment: <APPLICATION_DEPLOYMENT_RECORD_ID>
-  type: ApplicationDeploymentRemovalRequest
-  version: 1.0.0

packages/deployer/test/records/application-deployment-request.yml

@@ -1,15 +0,0 @@
-record:
-  type: ApplicationDeploymentRequest
-  version: "1.0.0"
-  name: deployment-test-app@0.1.24
-  application: crn://snowballtools/applications/deployment-test-app@0.1.24
-  dns: deployment-ci-test
-  config:
-    env:
-      CERC_TEST_WEBAPP_CONFIG1: "deployment test config 1"
-      CERC_TEST_WEBAPP_CONFIG2: "deployment test config 2"
-      CERC_WEBAPP_DEBUG: 0
-  meta:
-    note: Deployment test @ Thu 11 Apr 2024 07:29:19 AM UTC
-    repository: "https://github.com/snowball-tools/test-progressive-web-app"
-    repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26

packages/deployer/test/records/application-record.yml

@@ -1,8 +0,0 @@
-record:
-  type: ApplicationRecord
-  version: 0.0.1
-  repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26
-  repository: ["https://github.com/snowball-tools/test-progressive-web-app"]
-  app_type: webapp
-  name: deployment-test-app
-  app_version: 0.1.24

packages/deployer/test/test-webapp-deployment-undeployment.sh

@@ -1,225 +0,0 @@
-#!/bin/bash
-
-# Repository URL
-REPO_URL="https://github.com/snowball-tools/test-progressive-web-app"
-
-# Get the latest commit hash from the repository
-LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
-
-# Fetch the package.json file content
-# Extract version from package.json content
-package_json=$(wget -qO- "$REPO_URL/raw/$LATEST_HASH/package.json")
-PACKAGE_VERSION=$(echo "$package_json" | jq -r '.version')
-
-# Current date and time for note
-CURRENT_DATE_TIME=$(date -u)
-
-CONFIG_FILE=packages/deployer/config.yml
-REGISTRY_BOND_ID="99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32"
-
-# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
-
-APP_NAME=deployment-test-app
-
-# Get latest version from registry and increment application-record version
-NEW_APPLICATION_VERSION=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationRecord --all --name "$APP_NAME" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
-
-if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; then
-  # Set application-record version if no previous records were found
-  NEW_APPLICATION_VERSION=0.0.1
-fi
-
-# Generate application-record.yml with incremented version
-RECORD_FILE=packages/deployer/test/records/application-record.yml
-
-cat >$RECORD_FILE <<EOF
-record:
-  type: ApplicationRecord
-  version: $NEW_APPLICATION_VERSION
-  repository_ref: $LATEST_HASH
-  repository: ["$REPO_URL"]
-  app_type: webapp
-  name: $APP_NAME
-  app_version: $PACKAGE_VERSION
-EOF
-
-# Generate application-deployment-request.yml
-REQUEST_RECORD_FILE=packages/deployer/test/records/application-deployment-request.yml
-
-cat >$REQUEST_RECORD_FILE <<EOF
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: $APP_NAME@$PACKAGE_VERSION
-  application: lrn://snowballtools/applications/$APP_NAME@$PACKAGE_VERSION
-  dns: deployment-ci-test
-  config:
-    env:
-      CERC_TEST_WEBAPP_CONFIG1: "deployment test config 1"
-      CERC_TEST_WEBAPP_CONFIG2: "deployment test config 2"
-      CERC_WEBAPP_DEBUG: 0
-  meta:
-    note: Deployment test @ $CURRENT_DATE_TIME
-    repository: "$REPO_URL"
-    repository_ref: $LATEST_HASH
-EOF
-
-echo "Record files generated successfully."
-
-# Publish ApplicationRecord
-RECORD_ID=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE | jq -r '.id')
-echo "ApplicationRecord published"
-echo $RECORD_ID
-
-# Set name to record
-REGISTRY_APP_LRN="lrn://snowballtools/applications/$APP_NAME"
-
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN@${PACKAGE_VERSION}" "$RECORD_ID"
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN@${LATEST_HASH}" "$RECORD_ID"
-sleep 2
-# Set name if latest release
-yarn --silent laconic -c $CONFIG_FILE registry name set "$REGISTRY_APP_LRN" "$RECORD_ID"
-echo "$REGISTRY_APP_LRN set for ApplicationRecord"
-
-# Check if record exists for REGISTRY_APP_LRN
-APP_RECORD=$(yarn --silent laconic -c $CONFIG_FILE registry name resolve "$REGISTRY_APP_LRN" | jq '.[0]')
-if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
-  echo "No record found for $REGISTRY_APP_LRN."
-  exit 1
-fi
-
-sleep 2
-DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $REQUEST_RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRequest published"
-echo $DEPLOYMENT_REQUEST_ID
-
-# Deployment checks
-RETRY_INTERVAL=30
-MAX_RETRIES=20
-
-# Check that a ApplicationDeploymentRecord is published
-retry_count=0
-while true; do
-  deployment_records_response=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationDeploymentRecord --all --name "$APP_NAME" request $DEPLOYMENT_REQUEST_ID)
-  len_deployment_records=$(echo $deployment_records_response | jq 'length')
-
-  # Check if number of records returned is 0
-  if [ $len_deployment_records -eq 0 ]; then
-    # Check if retries are exhausted
-    if [ $retry_count -eq $MAX_RETRIES ]; then
-      echo "Retries exhausted"
-      echo "ApplicationDeploymentRecord for deployment request $DEPLOYMENT_REQUEST_ID not found, exiting"
-      exit 1
-    else
-      echo "ApplicationDeploymentRecord not found, retrying in $RETRY_INTERVAL sec..."
-      sleep $RETRY_INTERVAL
-      retry_count=$((retry_count + 1))
-    fi
-  else
-    echo "ApplicationDeploymentRecord found"
-    break
-  fi
-done
-
-DEPLOYMENT_RECORD_ID=$(echo $deployment_records_response | jq -r '.[0].id')
-echo $DEPLOYMENT_RECORD_ID
-
-# Check if ApplicationDeploymentRecord has the correct record id
-fetched_application_record_id=$(echo $deployment_records_response | jq -r '.[0].attributes.application')
-if [ "$fetched_application_record_id" = "$RECORD_ID" ]; then
-  echo "ApplicationRecord id matched"
-else
-  echo "ApplicationRecord id does not match, expected: $RECORD_ID, received: $fetched_application_record_id"
-  exit 1
-fi
-
-# Check if the url present in ApplicationDeploymentRecord is active
-fetched_url=$(echo $deployment_records_response | jq -r '.[0].attributes.url')
-
-retry_count=0
-max_retries=10
-retry_interval=10
-while true; do
-  url_response=$(curl -s -o /dev/null -I -w "%{http_code}" $fetched_url)
-  if [ "$url_response" = "200" ]; then
-    echo "Deployment URL $fetched_url is active"
-    break
-  else
-    if [ $retry_count -eq $max_retries ]; then
-      echo "Retries exhausted"
-      echo "Deployment URL $fetched_url is not active, exiting"
-      exit 1
-    else
-      echo "Deployment URL $fetched_url is not active, received code $url_response, retrying in $retry_interval sec..."
-      sleep $retry_interval
-      retry_count=$((retry_count + 1))
-    fi
-  fi
-done
-
-# Generate application-deployment-removal-request.yml
-REMOVAL_REQUEST_RECORD_FILE=packages/deployer/test/records/application-deployment-removal-request.yml
-
-cat >$REMOVAL_REQUEST_RECORD_FILE <<EOF
-record:
-  deployment: $DEPLOYMENT_RECORD_ID
-  type: ApplicationDeploymentRemovalRequest
-  version: 1.0.0
-EOF
-
-sleep 2
-REMOVAL_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE registry record publish --filename $REMOVAL_REQUEST_RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRemovalRequest published"
-echo $REMOVAL_REQUEST_ID
-
-# Check that an ApplicationDeploymentRemovalRecord is published
-retry_count=0
-while true; do
-  removal_records_response=$(yarn --silent laconic -c $CONFIG_FILE registry record list --type ApplicationDeploymentRemovalRecord --all request $REMOVAL_REQUEST_ID)
-  len_removal_records=$(echo $removal_records_response | jq 'length')
-
-  # Check if number of records returned is 0
-  if [ $len_removal_records -eq 0 ]; then
-    # Check if retries are exhausted
-    if [ $retry_count -eq $MAX_RETRIES ]; then
-      echo "Retries exhausted"
-      echo "ApplicationDeploymentRemovalRecord for deployment removal request $REMOVAL_REQUEST_ID not found"
-      exit 1
-    else
-      echo "ApplicationDeploymentRemovalRecord not found, retrying in $RETRY_INTERVAL sec..."
-      sleep $RETRY_INTERVAL
-      retry_count=$((retry_count + 1))
-    fi
-  else
-    echo "ApplicationDeploymentRemovalRecord found"
-    REMOVAL_RECORD_ID=$(echo $removal_records_response | jq -r '.[0].id')
-    echo $REMOVAL_RECORD_ID
-    break
-  fi
-done
-
-# Check if the application url is down after deployment removal
-retry_count=0
-max_retries=10
-retry_interval=5
-while true; do
-  url_response=$(curl -s -o /dev/null -I -w "%{http_code}" $fetched_url)
-  if [ "$url_response" = "404" ]; then
-    echo "Deployment URL $fetched_url is down"
-    break
-  else
-    if [ $retry_count -eq $max_retries ]; then
-      echo "Retries exhausted"
-      echo "Deployment URL $fetched_url is still active, exiting"
-      exit 1
-    else
-      echo "Deployment URL $fetched_url is still active, received code $url_response, retrying in $retry_interval sec..."
-      sleep $retry_interval
-      retry_count=$((retry_count + 1))
-    fi
-  fi
-done
-
-echo "Test successful"

packages/frontend/.env

@@ -0,0 +1,4 @@
+REACT_APP_GQL_SERVER_URL = 'http://localhost:8000/graphql'
+
+REACT_APP_GITHUB_CLIENT_ID =
+REACT_APP_GITHUB_TEMPLATE_REPO =

packages/frontend/.env.example

@@ -1,18 +0,0 @@
-VITE_SERVER_URL='http://localhost:8000'
-
-VITE_GITHUB_CLIENT_ID=
-VITE_GITHUB_PWA_TEMPLATE_REPO="snowball-tools/test-progressive-web-app"
-VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO="snowball-tools/image-upload-pwa-example"
-VITE_GITHUB_NEXT_APP_TEMPLATE_REPO="snowball-tools/starter.nextjs-react-tailwind"
-
-VITE_WALLET_CONNECT_ID=
-
-VITE_LIT_RELAY_API_KEY=
-
-VITE_BUGSNAG_API_KEY=
-
-VITE_PASSKEY_WALLET_RPID=
-VITE_TURNKEY_API_BASE_URL=
-
-VITE_LACONICD_CHAIN_ID=
-VITE_WALLET_IFRAME_URL=

packages/frontend/.eslintignore

@@ -0,0 +1 @@
+build

packages/frontend/.eslintrc.cjs

@@ -1,19 +0,0 @@
-module.exports = {
-  root: true,
-  env: { browser: true, es2020: true },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-    'plugin:storybook/recommended',
-  ],
-  ignorePatterns: ['dist', '.eslintrc.cjs'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
-  rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
-  },
-};

packages/frontend/.eslintrc.json

@@ -0,0 +1,20 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 13,
+    "sourceType": "module"
+  },
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "plugins": ["react", "@typescript-eslint"],
+  "extends": [
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ]
+}

packages/frontend/.gitignore

@@ -13,7 +13,6 @@
 
 # misc
 .DS_Store
-.env
 .env.local
 .env.development.local
 .env.test.local
@@ -22,4 +21,3 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-*storybook.log

packages/frontend/.node-version

@@ -1 +0,0 @@
-v20.12.1

packages/frontend/.prettierignore

@@ -1 +1,3 @@
-dist/
+# artifacts
+build
+coverage

packages/frontend/.storybook/main.ts

@@ -1,33 +0,0 @@
-import type { StorybookConfig } from '@storybook/react-vite';
-
-import { join, dirname } from 'path';
-
-/**
- * This function is used to resolve the absolute path of a package.
- * It is needed in projects that use Yarn PnP or are set up within a monorepo.
- */
-function getAbsolutePath(value: string): any {
-  return dirname(require.resolve(join(value, 'package.json')));
-}
-
-const config: StorybookConfig = {
-  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: [
-    getAbsolutePath('@storybook/addon-onboarding'),
-    getAbsolutePath('@storybook/addon-links'),
-    getAbsolutePath('@storybook/addon-essentials'),
-    getAbsolutePath('@chromatic-com/storybook'),
-    getAbsolutePath('@storybook/addon-interactions'),
-    getAbsolutePath('storybook-addon-remix-react-router'),
-  ],
-  framework: {
-    name: getAbsolutePath('@storybook/react-vite'),
-    options: {},
-  },
-  docs: {
-    autodocs: 'tag',
-  },
-  staticDirs: ['../public'],
-};
-
-export default config;

packages/frontend/.storybook/preview.ts

@@ -1,16 +0,0 @@
-import type { Preview } from '@storybook/react';
-
-import '../src/index.css';
-
-const preview: Preview = {
-  parameters: {
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/i,
-      },
-    },
-  },
-};
-
-export default preview;

packages/frontend/.vscode/settings.json

@@ -0,0 +1,39 @@
+{
+  // eslint extension options
+  "eslint.enable": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "css.customData": [".vscode/tailwind.json"],
+  // prettier extension setting
+  "editor.formatOnSave": true,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "editor.rulers": [80],
+  "editor.codeActionsOnSave": [
+    "source.addMissingImports",
+    "source.fixAll",
+    "source.organizeImports"
+  ],
+  // Show in vscode "Problems" tab when there are errors
+  "typescript.tsserver.experimental.enableProjectDiagnostics": true,
+  // Use absolute import for typescript files
+  "typescript.preferences.importModuleSpecifier": "non-relative",
+  // IntelliSense for taiwind variants
+  "tailwindCSS.experimental.classRegex": [
+    ["tv\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
+  ]
+}

packages/frontend/README.md

@@ -1,63 +1,46 @@
-# frontend
+# Getting Started with Create React App
 
-This is a [vite](https://vitejs.dev/) [react](https://reactjs.org/) [nextjs](https://nextjs.org/) project in a [yarn workspace](https://yarnpkg.com/features/workspaces).
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app), using [typescript-tailwindcss-eslint-prettier](https://github.com/cufarvid/cra-templates) template.
 
-## Getting Started
+## Available Scripts
 
-### Install dependencies
+In the project directory, you can run:
 
-In the root of the project, run:
+### `yarn start`
 
-```zsh
+Runs the app in the development mode.\
-yarn
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-```
 
-### Build backend
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
 
-```zsh
+### `yarn test`
-yarn build --ignore frontend
-```
 
-### Environment variables
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
 
-#### Local
+### `yarn build`
 
-Copy the `.env.example` file to `.env`:
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
 
-```zsh
+The build is minified and the filenames include the hashes.\
-cp .env.example .env
+Your app is ready to be deployed!
-```
 
-#### Staging environment variables
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
 
-Change in [deployer/deploy-frontend.staging.sh](/packages/deployer/deploy-frontend.staging.sh)
+### `yarn eject`
 
-#### Production environment variables
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
 
-Change in [deployer/deploy-frontend.sh](/packages/deployer/deploy-frontend.sh)
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
 
-### Run development server
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
 
-```zsh
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-yarn dev
-```
 
-## Deployment
+## Learn More
 
-From the root of the project,
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
 
-### Staging
+To learn React, check out the [React documentation](https://reactjs.org/).
-
-```zsh
-cd packages/deployer && ./deploy-frontend.staging.sh
-```
-
-### Production
-
-```zsh
-cd packages/deployer && ./deploy-frontend.sh
-```
-
-### Deployment status
-
-Check the status of the deployment [here](https://webapp-deployer.apps.snowballtools.com)

packages/frontend/chromatic.config.json

@@ -1,4 +0,0 @@
-{
-  "projectId": "Project:663d04870db27ed66a48e466",
-  "zip": true
-}

packages/frontend/index.html

@@ -1,24 +0,0 @@
-<!doctype html>
-<html lang="en" class="dark dark:bg-background dark:text-foreground">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="description" content="laconic tools dashboard" />
-    <link rel="icon" href="/favicon.ico" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <meta name="msapplication-TileColor" content="#2d89ef" />
-    <meta name="theme-color" content="#ffffff" />
-    <link rel="manifest" href="/manifest.json" />
-    <title>Laconic</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=DM+Mono:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap"
-      rel="stylesheet"
-    />
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
-  </body>
-</html>

packages/frontend/package.json

@@ -1,57 +1,27 @@
 {
   "name": "frontend",
+  "version": "0.1.0",
   "private": true,
-  "version": "1.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite --port 3000",
-    "build": "vite build",
-    "lint": "tsc --noEmit",
-    "preview": "vite preview",
-    "format": "prettier --write .",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
-  },
   "dependencies": {
-    "@bugsnag/browser-performance": "^2.4.1",
-    "@bugsnag/js": "^7.22.7",
-    "@bugsnag/plugin-react": "^7.22.7",
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.13.0",
-    "@fontsource-variable/jetbrains-mono": "^5.0.19",
     "@fontsource/inter": "^5.0.16",
-    "@mui/material": "^6.1.3",
+    "@material-tailwind/react": "^2.1.7",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-radio-group": "^1.1.3",
-    "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-toast": "^1.1.5",
-    "@radix-ui/react-tooltip": "^1.0.7",
-    "@snowballtools/material-tailwind-react-fork": "^2.1.10",
-    "@snowballtools/smartwallet-alchemy-light": "^0.2.0",
-    "@snowballtools/types": "^0.2.0",
-    "@snowballtools/utils": "^0.1.1",
-    "@tanstack/react-query": "^5.22.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
-    "@turnkey/http": "^2.10.0",
+    "@types/jest": "^27.5.2",
-    "@turnkey/sdk-react": "^0.1.0",
+    "@types/node": "^16.18.68",
-    "@turnkey/webauthn-stamper": "^0.5.0",
+    "@types/react": "^18.2.42",
-    "@walletconnect/ethereum-provider": "^2.16.1",
+    "@types/react-dom": "^18.2.17",
-    "@web3modal/siwe": "4.0.5",
-    "@web3modal/wagmi": "4.0.5",
     "assert": "^2.1.0",
-    "axios": "^1.6.7",
     "clsx": "^2.1.0",
     "date-fns": "^3.3.1",
-    "downshift": "^8.3.2",
+    "downshift": "^8.2.3",
-    "framer-motion": "^11.0.8",
+    "eslint-config-react-app": "^7.0.1",
     "gql-client": "^1.0.0",
-    "lottie-react": "^2.4.0",
     "luxon": "^3.4.4",
     "octokit": "^3.1.2",
     "react": "^18.2.0",
@@ -61,44 +31,54 @@
     "react-dom": "^18.2.0",
     "react-dropdown": "^1.11.0",
     "react-hook-form": "^7.49.0",
+    "react-hot-toast": "^2.4.1",
     "react-oauth-popup": "^1.0.5",
     "react-router-dom": "^6.20.1",
+    "react-scripts": "5.0.1",
     "react-timer-hook": "^3.0.7",
-    "siwe": "2.1.4",
     "tailwind-variants": "^0.2.0",
-    "usehooks-ts": "^2.15.1",
+    "typescript": "^4.9.5",
-    "uuid": "^9.0.1",
+    "usehooks-ts": "^2.10.0",
-    "viem": "^2.7.11",
+    "vertical-stepper-nav": "^1.0.2",
-    "wagmi": "2.5.7",
     "web-vitals": "^2.1.4"
   },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "lint": "eslint ."
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
   "devDependencies": {
-    "@chromatic-com/storybook": "^1.3.3",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@storybook/addon-essentials": "^8.0.10",
-    "@storybook/addon-interactions": "^8.0.10",
-    "@storybook/addon-links": "^8.0.10",
-    "@storybook/addon-onboarding": "^8.0.10",
-    "@storybook/blocks": "^8.0.10",
-    "@storybook/react": "^8.0.10",
-    "@storybook/react-vite": "^8.0.10",
-    "@storybook/test": "^8.0.10",
-    "@types/jest": "^27.5.2",
-    "@types/lodash": "^4.17.0",
     "@types/luxon": "^3.3.7",
-    "@types/node": "^16.18.68",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@types/react": "^18.2.66",
+    "@typescript-eslint/parser": "^6.13.2",
-    "@types/react-dom": "^18.2.22",
+    "eslint": "^8.55.0",
-    "@types/uuid": "^9.0.8",
+    "eslint-config-prettier": "^9.1.0",
-    "@vitejs/plugin-react": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.1",
-    "autoprefixer": "^10.4.19",
+    "eslint-plugin-react": "^7.33.2",
-    "chromatic": "^11.3.2",
-    "eslint-plugin-storybook": "^0.8.0",
-    "postcss": "^8.4.38",
     "prettier": "^3.1.0",
-    "storybook": "^8.0.10",
+    "tailwindcss": "^3.4.1"
-    "storybook-addon-remix-react-router": "^3.0.0",
-    "tailwindcss": "^3.4.3",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.0"
   }
 }

packages/frontend/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

packages/frontend/public/.well-known/walletconnect.txt

@@ -1 +0,0 @@
-350e9ac2-8b27-4a79-9a82-78cfdb68ef71=0eacb7ae462f82c8b0199d28193b0bfa5265973dbb1fe991eec2cab737dfc1ec

packages/frontend/public/browserconfig.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#2d89ef</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>

packages/frontend/public/dot-border-line.svg

@@ -1,3 +0,0 @@
-<svg width="197" height="2" viewBox="0 0 197 2" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="0.5" y1="1.19141" x2="197" y2="1.19141" stroke="#94A7B8" stroke-dasharray="1 12"/>
-</svg>